[SCM] jigsaw packaging branch, master, updated. 0644bb23ff81609966ebe9fd335ab6f80d434c85
Guillaume Mazoyer
respawneral at gmail.com
Fri Apr 6 19:13:35 UTC 2012
The following commit has been merged in the master branch:
commit 0644bb23ff81609966ebe9fd335ab6f80d434c85
Author: Guillaume Mazoyer <respawneral at gmail.com>
Date: Fri Apr 6 21:04:20 2012 +0200
Merge of upstream souces.
diff --git a/.hg/cache/branchheads b/.hg/cache/branchheads
index 06be576..1249c31 100644
--- a/.hg/cache/branchheads
+++ b/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-51c793afb1eb1d579fe0e2864dd07842edb4cb3a 425
-51c793afb1eb1d579fe0e2864dd07842edb4cb3a default
+405b7e1ee80424dbd35a88f471c070c50d5c6aac 449
+405b7e1ee80424dbd35a88f471c070c50d5c6aac default
diff --git a/.hg/dirstate b/.hg/dirstate
index e185348..c9e57f0 100644
Binary files a/.hg/dirstate and b/.hg/dirstate differ
diff --git a/.hg/store/00changelog.i b/.hg/store/00changelog.i
index 8ccd626..b929e55 100644
Binary files a/.hg/store/00changelog.i and b/.hg/store/00changelog.i differ
diff --git a/.hg/store/00manifest.i b/.hg/store/00manifest.i
index 8a41efa..0e59c36 100644
Binary files a/.hg/store/00manifest.i and b/.hg/store/00manifest.i differ
diff --git a/.hg/store/data/make/_defs-internal.gmk.i b/.hg/store/data/make/_defs-internal.gmk.i
index af2ef00..8625e8b 100644
Binary files a/.hg/store/data/make/_defs-internal.gmk.i and b/.hg/store/data/make/_defs-internal.gmk.i differ
diff --git a/.hg/store/data/make/jprt.properties.i b/.hg/store/data/make/jprt.properties.i
index 15af253..620f695 100644
Binary files a/.hg/store/data/make/jprt.properties.i and b/.hg/store/data/make/jprt.properties.i differ
diff --git a/.hg/store/data/make/sanity-rules.gmk.i b/.hg/store/data/make/sanity-rules.gmk.i
index 1d10fdd..06e8fec 100644
Binary files a/.hg/store/data/make/sanity-rules.gmk.i and b/.hg/store/data/make/sanity-rules.gmk.i differ
diff --git a/.hg/store/data/~2ehgignore.i b/.hg/store/data/~2ehgignore.i
index 13b3807..555880c 100644
Binary files a/.hg/store/data/~2ehgignore.i and b/.hg/store/data/~2ehgignore.i differ
diff --git a/.hg/store/data/~2ehgtags.i b/.hg/store/data/~2ehgtags.i
index 823a8eb..636dd4e 100644
Binary files a/.hg/store/data/~2ehgtags.i and b/.hg/store/data/~2ehgtags.i differ
diff --git a/.hg/store/fncache b/.hg/store/fncache
index aae7c78..414c729 100644
--- a/.hg/store/fncache
+++ b/.hg/store/fncache
@@ -4,30 +4,31 @@ data/test/Makefile.i
data/make/scripts/vsvars.sh.i
data/make/Defs-internal.gmk.i
data/Makefile.i
-data/make/README.pre-components.i
-data/make/jaxp-rules.gmk.i
+data/make/scripts/hgforest.sh.i
+data/make/deploy-rules.gmk.i
data/make/jprt.config.i
+data/make/scripts/normalizer.pl.i
data/make/sanity-rules.gmk.i
data/make/jaxws-rules.gmk.i
-data/make/scripts/hgforest.sh.i
+data/make/README.pre-components.i
data/make/sponsors-rules.gmk.i
data/LICENSE.i
data/make/jprt.properties.i
data/.jcheck/conf.i
data/README-builds.html.i
-data/make/hotspot-rules.gmk.i
+data/make/corba-rules.gmk.i
data/make/langtools-rules.gmk.i
data/make/templates/bsd-header.i
data/make/jdk-rules.gmk.i
data/.hgignore.i
data/make/jprt.gmk.i
-data/get_source.sh.i
-data/make/corba-rules.gmk.i
-data/make/scripts/webrev.ksh.i
+data/make/jaxp-rules.gmk.i
+data/make/hotspot-rules.gmk.i
+data/ASSEMBLY_EXCEPTION.i
data/.hgtags.i
data/README.i
data/make/scripts/update_copyright_year.sh.i
data/THIRD_PARTY_README.i
data/make/templates/gpl-header.i
-data/make/deploy-rules.gmk.i
-data/ASSEMBLY_EXCEPTION.i
+data/get_source.sh.i
+data/make/scripts/webrev.ksh.i
diff --git a/.hg/store/undo b/.hg/store/undo
index 5030ded..0419f45 100644
Binary files a/.hg/store/undo and b/.hg/store/undo differ
diff --git a/.hg/undo.desc b/.hg/undo.desc
index 1dbe62c..e2480b8 100644
--- a/.hg/undo.desc
+++ b/.hg/undo.desc
@@ -1,3 +1,3 @@
-412
+426
pull
http://hg.openjdk.java.net/jigsaw/jigsaw
diff --git a/.hg/undo.dirstate b/.hg/undo.dirstate
index 9d63be2..e185348 100644
Binary files a/.hg/undo.dirstate and b/.hg/undo.dirstate differ
diff --git a/.hgignore b/.hgignore
index 8fde2ca..156055a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -3,3 +3,4 @@
/nbproject/private/
^webrev
^.hgtip
+.DS_Store
diff --git a/.hgtags b/.hgtags
index ed8f1ad..60a2df1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -151,3 +151,12 @@ a4f28069d44a379cda99dd1d921d19f819726d22 jdk8-b15
cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21
7ad075c809952e355d25030605da6af30456ed74 jdk8-b22
60d6f64a86b1e511169d264727f6d51415978df0 jdk8-b23
+1a5f1d6b98d6827cdb529a4abe6e52a886d944f4 jdk8-b24
+221a378e06a326f45e5d89e2123cd6323e0181d1 jdk8-b25
+2accafff224ae39caf5f532c305251ba624bf2c0 jdk8-b26
+1533dfab9903e4edcfead3b0192643f38c418b9b jdk8-b27
+6e2541d60f4e342b5b67140271d7611643929dc3 jdk8-b28
+41460de042580bc4a4ce3f863779c66f39cb8578 jdk8-b29
+6cea54809b51db92979c22fd8aa8fcb1cb13d12e jdk8-b30
+0b66f43b89a6c0ac1c15d7ec51992c541cdc9089 jdk8-b31
+88176171e940f02916a312c265a34c32552a8376 jdk8-b32
diff --git a/corba/.hg/cache/branchheads b/corba/.hg/cache/branchheads
index c8e59bf..65972ec 100644
--- a/corba/.hg/cache/branchheads
+++ b/corba/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-c61ae6ba3603675ec0bb2f39526d09488b5f090a 356
-c61ae6ba3603675ec0bb2f39526d09488b5f090a default
+7d8d971b41ebbbd3838292056a4a3525b820c53c 374
+7d8d971b41ebbbd3838292056a4a3525b820c53c default
diff --git a/corba/.hg/dirstate b/corba/.hg/dirstate
index 1c03b81..1259106 100644
Binary files a/corba/.hg/dirstate and b/corba/.hg/dirstate differ
diff --git a/corba/.hg/store/00changelog.i b/corba/.hg/store/00changelog.i
index f38aa40..c72a442 100644
Binary files a/corba/.hg/store/00changelog.i and b/corba/.hg/store/00changelog.i differ
diff --git a/corba/.hg/store/00manifest.d b/corba/.hg/store/00manifest.d
index f92d734..b90cc7a 100644
Binary files a/corba/.hg/store/00manifest.d and b/corba/.hg/store/00manifest.d differ
diff --git a/corba/.hg/store/00manifest.i b/corba/.hg/store/00manifest.i
index a7d3d4c..f3499d3 100644
Binary files a/corba/.hg/store/00manifest.i and b/corba/.hg/store/00manifest.i differ
diff --git a/corba/.hg/store/data/make/common/internal/_resources.gmk.i b/corba/.hg/store/data/make/common/internal/_resources.gmk.i
index 37d532c..d63ef95 100644
Binary files a/corba/.hg/store/data/make/common/internal/_resources.gmk.i and b/corba/.hg/store/data/make/common/internal/_resources.gmk.i differ
diff --git a/corba/.hg/store/data/make/common/shared/_defs-utils.gmk.i b/corba/.hg/store/data/make/common/shared/_defs-utils.gmk.i
index e3f325c..9bb5e72 100644
Binary files a/corba/.hg/store/data/make/common/shared/_defs-utils.gmk.i and b/corba/.hg/store/data/make/common/shared/_defs-utils.gmk.i differ
diff --git a/corba/.hg/store/data/make/common/shared/_platform.gmk.i b/corba/.hg/store/data/make/common/shared/_platform.gmk.i
index 02f7945..ccbfde2 100644
Binary files a/corba/.hg/store/data/make/common/shared/_platform.gmk.i and b/corba/.hg/store/data/make/common/shared/_platform.gmk.i differ
diff --git a/corba/.hg/store/data/make/tools/strip__properties/_makefile.i b/corba/.hg/store/data/make/tools/strip__properties/_makefile.i
index cdb8d12..14575e5 100644
Binary files a/corba/.hg/store/data/make/tools/strip__properties/_makefile.i and b/corba/.hg/store/data/make/tools/strip__properties/_makefile.i differ
diff --git a/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_factory_impl.java.i b/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_factory_impl.java.i
index b6115da..376903f 100644
Binary files a/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_factory_impl.java.i and b/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_factory_impl.java.i differ
diff --git a/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_impl.java.i b/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_impl.java.i
index e1c80c4..af7c7f7 100644
Binary files a/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_impl.java.i and b/corba/.hg/store/data/src/share/classes/com/sun/corba/se/impl/dynamicany/_dyn_any_impl.java.i differ
diff --git a/corba/.hg/store/data/src/share/classes/com/sun/org/omg/_sending_context/___code_base_impl_base.java.i b/corba/.hg/store/data/src/share/classes/com/sun/org/omg/_sending_context/___code_base_impl_base.java.i
index f1ef627..44a981e 100644
Binary files a/corba/.hg/store/data/src/share/classes/com/sun/org/omg/_sending_context/___code_base_impl_base.java.i and b/corba/.hg/store/data/src/share/classes/com/sun/org/omg/_sending_context/___code_base_impl_base.java.i differ
diff --git a/corba/.hg/store/data/~2ehgignore.i b/corba/.hg/store/data/~2ehgignore.i
index ebca361..1bcaf5b 100644
Binary files a/corba/.hg/store/data/~2ehgignore.i and b/corba/.hg/store/data/~2ehgignore.i differ
diff --git a/corba/.hg/store/data/~2ehgtags.i b/corba/.hg/store/data/~2ehgtags.i
index 6898c7c..7de7d92 100644
Binary files a/corba/.hg/store/data/~2ehgtags.i and b/corba/.hg/store/data/~2ehgtags.i differ
diff --git a/corba/.hg/store/fncache b/corba/.hg/store/fncache
index d094f43..c5addbf 100644
--- a/corba/.hg/store/fncache
+++ b/corba/.hg/store/fncache
@@ -6,7 +6,7 @@ data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BinaryExpr.java.i
data/src/share/classes/com/sun/org/omg/SendingContext/CodeBase.java.i
data/src/share/classes/com/sun/org/omg/CORBA/VersionSpecHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLType.java.i
-data/src/share/classes/javax/activity/package.html.i
+data/make/sun/Makefile.i
data/src/share/classes/com/sun/corba/se/spi/orb/StringPair.java.i
data/src/share/classes/com/sun/corba/se/impl/legacy/connection/EndPointInfoImpl.java.i
data/make/tools/idlj/Makefile.i
@@ -18,13 +18,12 @@ data/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java.i
data/src/share/classes/org/omg/CORBA/DynAnyPackage/InvalidSeq.java.i
data/src/share/classes/com/sun/corba/se/impl/activation/ServerMain.java.i
data/src/share/classes/com/sun/org/omg/CORBA/ValueMemberSeqHelper.java.i
-data/src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java.i
+data/src/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_spi_servicecontext.jmk.i
data/src/share/classes/org/omg/CORBA/FREE_MEM.java.i
data/make/jprt.config.i
-data/src/share/classes/org/omg/CORBA/DynEnum.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/ValueBoxGen.java.i
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java.i
data/src/share/classes/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java.i
@@ -38,7 +37,7 @@ data/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdStrings.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_2.java.i
-data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java.i
+data/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java.i
data/make/common/shared/Defs.gmk.i
data/src/share/classes/com/sun/corba/se/spi/orb/ParserDataFactory.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/Writeable.java.i
@@ -116,6 +115,7 @@ data/src/share/classes/com/sun/org/omg/CORBA/OpDescriptionSeqHelper.java.i
data/src/share/classes/org/omg/CORBA/IMP_LIMIT.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ShiftLeft.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/Policies.java.i
+data/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm.i
data/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/TransientNameServer.java.i
data/src/share/classes/com/sun/corba/se/impl/corba/TCUtility.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java.i
@@ -132,12 +132,14 @@ data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ExceptionHandler.j
data/src/share/classes/com/sun/corba/se/spi/protocol/RetryType.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/IncludeEntry.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/WireObjectKeyTemplate.java.i
+data/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java.i
data/src/share/classes/javax/rmi/package.html.i
data/src/share/classes/com/sun/tools/corba/se/idl/Arguments.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/IncludeGen.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties.i
data/src/share/classes/com/sun/corba/se/internal/corba/ORBSingleton.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/SpecialMethod.java.i
+data/make/common/Defs-bsd.gmk.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/toJavaPortable.prp.i
data/src/share/classes/com/sun/corba/se/impl/copyobject/ReferenceObjectCopierImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/Mutex.java.i
@@ -172,12 +174,12 @@ data/make/com/sun/corba/se/spi/extension/Makefile.i
data/src/share/classes/org/omg/CORBA/orb.idl.i
data/make/javax/xa/Makefile.i
data/src/share/classes/com/sun/corba/se/spi/ior/EncapsulationFactoryBase.java.i
-data/src/share/classes/com/sun/corba/se/spi/ior/ObjectId.java.i
+data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java.i
data/src/share/classes/javax/rmi/PortableRemoteObject.java.i
data/make/common/BuildToolJar.gmk.i
-data/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java.i
+data/src/share/classes/sun/rmi/rmic/iiop/Util.java.i
data/src/share/classes/com/sun/corba/se/spi/oa/OADestroyed.java.i
-data/src/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java.i
+data/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java.i
data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynValueImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/toa/TOA.java.i
data/src/share/classes/com/sun/corba/se/impl/copyobject/JavaStreamObjectCopierImpl.java.i
@@ -191,7 +193,7 @@ data/src/share/classes/com/sun/corba/se/spi/monitoring/LongMonitoredAttributeBas
data/src/share/classes/com/sun/corba/se/spi/ior/WriteContents.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStream.java.i
data/make/com/sun/corba/se/interceptor/Makefile.i
-data/src/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java.i
+data/src/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/ValueEntry.java.i
data/src/share/classes/org/omg/CORBA/BAD_POLICY_TYPE.java.i
data/make/common/Classes.gmk.i
@@ -200,9 +202,9 @@ data/make/com/sun/corba/se/impl/oa/Makefile.i
data/src/share/classes/org/omg/CORBA/CurrentHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/CacheTable.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/JIDLLocalCRDImpl.java.i
-data/src/share/classes/org/omg/CORBA/ARG_OUT.java.i
+data/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties.i
data/src/share/classes/sun/rmi/rmic/iiop/Generator.java.i
-data/src/share/classes/org/omg/CORBA/BAD_POLICY.java.i
+data/src/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java.i
data/src/share/classes/com/sun/corba/se/pept/transport/ConnectionCache.java.i
data/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtable.java.i
data/src/share/classes/org/omg/CORBA/Principal.java.i
@@ -225,7 +227,7 @@ data/src/share/classes/com/sun/corba/se/spi/transport/CorbaTransportManager.java
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypesUtil_save.sjava.i
data/src/share/classes/org/omg/CORBA/Object.java.i
data/src/share/classes/com/sun/corba/se/impl/util/IdentityHashtableEnumerator.java.i
-data/src/share/classes/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java.i
+data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_2.java.i
data/src/share/classes/com/sun/corba/se/spi/orb/ORBConfigurator.java.i
data/src/share/classes/org/omg/CORBA/ULongLongSeqHolder.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java.i
@@ -248,24 +250,25 @@ data/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressBase.java.i
data/src/share/classes/com/sun/org/omg/CORBA/_IDLTypeStub.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/JIDLObjectKeyTemplate.java.i
data/src/share/classes/com/sun/org/omg/CORBA/IdentifierHelper.java.i
-data/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java.i
+data/src/share/classes/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java.i
data/src/share/classes/com/sun/corba/se/internal/io/IIOPInputStream.java.i
data/src/share/classes/org/omg/CORBA/ObjectHolder.java.i
data/src/share/classes/com/sun/corba/se/impl/resolver/LocalResolverImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/WorkQueueImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/orb/ORBVersionImpl.java.i
+data/src/share/classes/org/omg/CORBA/PolicyListHolder.java.i
data/src/share/classes/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Not.java.i
-data/src/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java.i
+data/src/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java.i
data/src/share/classes/org/omg/CORBA/DynUnion.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_spi_oa.jmk.i
data/src/share/classes/com/sun/corba/se/impl/encoding/MarkAndResetHandler.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/CorbaServerRequestDispatcherImpl.java.i
-data/src/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java.i
+data/src/share/classes/com/sun/tools/corba/se/idl/Compile.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Divide.java.i
-data/src/share/classes/org/omg/CORBA/Any.java.i
+data/src/share/classes/org/omg/CORBA/TypeCode.java.i
data/make/sun/rmi/rmic/Makefile.i
data/src/share/classes/com/sun/corba/se/impl/transport/ByteBufferPoolImpl.java.i
data/make/common/internal/Resources.gmk.i
@@ -281,11 +284,11 @@ data/src/share/classes/org/omg/CORBA/AnyHolder.java.i
data/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoFactoryImpl.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/Identifiable.java.i
data/make/com/sun/corba/se/connection/Makefile.i
-data/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc.i
+data/src/share/classes/org/omg/CORBA/INV_IDENT.java.i
data/src/share/classes/com/sun/corba/se/impl/transport/CorbaResponseWaitingRoomImpl.java.i
data/src/share/classes/sun/rmi/rmic/iiop/NameContext.java.i
data/src/share/classes/org/omg/CORBA/AnySeqHolder.java.i
-data/src/share/classes/org/omg/CORBA/DomainManager.java.i
+data/make/common/shared/Defs-linux.gmk.i
data/src/share/classes/com/sun/corba/se/impl/orb/ParserAction.java.i
data/src/share/classes/org/omg/CORBA/PrincipalHolder.java.i
data/src/share/classes/com/sun/corba/se/impl/resolver/SplitLocalResolverImpl.java.i
@@ -294,10 +297,9 @@ data/src/share/classes/org/omg/CORBA/IdentifierHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/CDROutputStream_1_2.java.i
data/src/share/classes/org/omg/CORBA/StructMember.java.i
data/make/com/sun/corba/minclude/org_omg_PortableServer.jmk.i
-data/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_spi_extension.jmk.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/LifespanPolicyImpl.java.i
-data/src/share/classes/org/omg/CORBA/portable/ServantObject.java.i
+data/src/share/classes/org/omg/CORBA/ContextList.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java.i
data/src/share/classes/sun/rmi/rmic/iiop/Constants.java.i
data/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/NamingContextImpl.java.i
@@ -306,7 +308,7 @@ data/src/share/classes/org/omg/SendingContext/RunTime.java.i
data/src/share/classes/com/sun/corba/se/impl/io/TypeMismatchException.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/ActiveObjectMap.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_1.java.i
-data/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.i
+data/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java.i
data/make/com/sun/corba/se/impl/naming/Makefile.i
data/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfoFactory.java.i
data/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredAttributeInfoImpl.java.i
@@ -321,11 +323,11 @@ data/src/share/classes/org/omg/CORBA/NameValuePairHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/ReflectiveTie.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/InterfaceState.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java.i
-data/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties.i
+data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/TaggedComponent.java.i
data/src/share/classes/org/omg/CORBA/DataOutputStream.java.i
data/src/share/classes/org/omg/CORBA/Request.java.i
-data/src/share/classes/org/omg/CORBA_2_3/portable/package.html.i
+data/src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/MakeImmutable.java.i
data/src/share/classes/org/omg/CORBA/portable/Delegate.java.i
data/src/share/classes/org/omg/CORBA/ExceptionList.java.i
@@ -352,7 +354,7 @@ data/make/Makefile.i
data/make/com/sun/corba/minclude/com_sun_corba_se_spi_monitoring.jmk.i
data/src/share/classes/com/sun/corba/se/impl/transport/CorbaContactInfoListImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/legacy/connection/SocketFactoryContactInfoImpl.java.i
-data/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java.i
+data/.hgtags.i
data/src/share/classes/com/sun/org/omg/CORBA/Repository.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_spi_activation.jmk.i
data/src/share/classes/com/sun/corba/se/pept/transport/TransportManager.java.i
@@ -374,7 +376,7 @@ data/src/share/classes/org/omg/CORBA/ARG_INOUT.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_core.jmk.i
data/src/share/classes/com/sun/corba/se/impl/encoding/MarshalOutputStream.java.i
data/src/share/classes/org/omg/CORBA/INV_POLICY.java.i
-data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java.i
+data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/BufferQueue.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/iiop/MaxStreamFormatVersionComponentImpl.java.i
data/src/share/classes/com/sun/corba/se/spi/orbutil/closure/Closure.java.i
@@ -390,7 +392,7 @@ data/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/iiop/CodeSetsComponentImpl.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties.i
-data/src/share/classes/org/omg/CORBA/INV_IDENT.java.i
+data/src/share/classes/com/sun/corba/se/spi/logging/data/Util.mc.i
data/make/com/sun/Makefile.i
data/src/share/classes/javax/rmi/CORBA/GetORBPropertiesFileAction.java.i
data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynSequenceImpl.java.i
@@ -401,7 +403,7 @@ data/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputStreamBase.java.i
data/src/share/classes/com/sun/corba/se/impl/copyobject/JavaInputStream.sjava.i
data/src/share/classes/org/omg/CORBA/DoubleSeqHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/copyobject/ORBStreamObjectCopierImpl.java.i
-data/make/common/shared/Defs-linux.gmk.i
+data/src/share/classes/org/omg/CORBA/DomainManager.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/OldJIDLObjectKeyTemplate.java.i
data/src/share/classes/org/omg/CORBA/CompletionStatus.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdBase.java.i
@@ -428,14 +430,13 @@ data/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableFactoryFinder.java.i
data/make/common/internal/NativeCompileRules.gmk.i
data/make/com/sun/corba/se/PortableActivationIDL/Makefile.i
data/src/share/classes/com/sun/corba/se/impl/corba/AnyImplHelper.java.i
-data/src/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java.i
+data/src/share/classes/org/omg/CORBA/IDLType.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/MethodEntry.java.i
-data/make/common/Defs.gmk.i
data/src/share/classes/com/sun/tools/corba/se/idl/ForwardValueEntry.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties.i
-data/src/share/classes/com/sun/corba/se/spi/orb/ORB.java.i
+data/src/share/classes/com/sun/corba/se/spi/ior/ObjectKeyTemplate.java.i
data/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java.i
-data/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java.i
+data/src/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java.i
data/make/tools/src/build/tools/stripproperties/StripProperties.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/IORFactories.java.i
data/src/share/classes/com/sun/org/omg/CORBA/portable/ValueHelper.java.i
@@ -489,8 +490,8 @@ data/src/share/classes/org/omg/CORBA/BAD_PARAM.java.i
data/src/share/classes/org/omg/CORBA/DataInputStream.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/StringEntry.java.i
data/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java.i
-data/src/share/classes/org/omg/CORBA/ContextList.java.i
-data/src/share/classes/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java.i
+data/src/share/classes/org/omg/CORBA/portable/ServantObject.java.i
+data/src/share/classes/com/sun/org/omg/CORBA/IDLTypeHelper.java.i
data/make/jprt.properties.i
data/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseOperations.java.i
data/src/share/classes/org/omg/CORBA/LongLongSeqHolder.java.i
@@ -527,11 +528,12 @@ data/src/share/classes/org/omg/CORBA/DynStruct.java.i
data/src/share/classes/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java.i
data/src/share/classes/org/omg/CORBA/CompletionStatusHelper.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_presentation_rmi.jmk.i
+data/src/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java.i
data/make/com/sun/corba/minclude/org_omg_Messaging.jmk.i
data/src/share/classes/com/sun/corba/se/impl/protocol/RequestDispatcherRegistryImpl.java.i
data/src/share/classes/com/sun/corba/se/internal/io/LibraryManager.java.i
-data/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java.i
+data/src/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3_1.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/StubIORImpl.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Equal.java.i
@@ -553,7 +555,7 @@ data/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/InternalBindingKey
data/src/share/classes/org/omg/CORBA/BAD_TYPECODE.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueBoxGen24.java.i
data/src/share/classes/org/omg/CORBA/ORBPackage/InconsistentTypeCode.java.i
-data/src/share/classes/com/sun/org/omg/CORBA/RepositoryHelper.java.i
+data/src/share/classes/com/sun/corba/se/impl/interceptors/PICurrent.java.i
data/src/share/classes/javax/transaction/TransactionRequiredException.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageHandler.java.i
data/src/share/classes/com/sun/corba/se/impl/naming/pcosnaming/ServantManagerImpl.java.i
@@ -565,7 +567,7 @@ data/src/share/classes/org/omg/PortableServer/ServantLocatorPackage/package.html
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java.i
data/src/share/classes/com/sun/org/omg/CORBA/AttributeDescriptionHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/transport/BufferConnectionImpl.sjava.i
-data/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java.i
+data/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/StubDelegateImpl.java.i
data/src/share/classes/javax/activity/InvalidActivityException.java.i
data/make/com/Makefile.i
@@ -576,7 +578,7 @@ data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Holder.java.i
data/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java.i
data/src/share/classes/org/omg/CORBA/WrongTransaction.java.i
data/src/share/classes/com/sun/corba/se/impl/transport/ReaderThreadImpl.java.i
-data/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp.i
+data/src/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/CancelRequestMessage.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_resolver.jmk.i
data/src/share/classes/com/sun/org/omg/CORBA/ExceptionDescription.java.i
@@ -587,7 +589,7 @@ data/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAFactory.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/POAObjectKeyTemplate.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdUtility.java.i
data/make/sun/corba/Makefile.i
-data/src/share/classes/com/sun/tools/corba/se/logutil/scripts/run.i
+data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java.i
data/src/share/classes/com/sun/org/omg/CORBA/ParDescriptionSeqHelper.java.i
data/make/com/sun/corba/minclude/org_omg_CORBAX.jmk.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java.i
@@ -608,7 +610,7 @@ data/src/share/classes/com/sun/corba/se/spi/orb/ParserImplBase.java.i
data/src/share/classes/sun/rmi/rmic/iiop/ClassType.java.i
data/make/common/shared/Compiler.gmk.i
data/src/share/classes/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java.i
-data/src/share/classes/com/sun/corba/se/spi/ior/TaggedProfile.java.i
+data/src/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java.i
data/src/share/classes/sun/rmi/rmic/iiop/SpecialClassType.java.i
data/src/share/classes/com/sun/corba/se/impl/corba/ContextListImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/graph/GraphImpl.java.i
@@ -621,24 +623,24 @@ data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/EvaluationException.
data/src/share/classes/com/sun/corba/se/impl/ior/NewObjectKeyTemplateBase.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/BooleanAnd.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java.i
-data/src/share/classes/org/omg/CORBA/DynValue.java.i
+data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java.i
data/src/share/classes/com/sun/corba/se/spi/legacy/connection/Connection.java.i
data/src/share/classes/org/omg/CORBA/NO_RESPONSE.java.i
data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyBasicImpl.java.i
data/make/com/sun/corba/minclude/org_omg_CosNaming.jmk.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/ThreadPolicyImpl.java.i
-data/src/share/classes/com/sun/org/omg/CORBA/ParameterMode.java.i
+data/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/ReentrantMutex.java.i
data/src/share/classes/org/omg/CORBA/UserException.java.i
-data/src/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java.i
+data/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_2.java.i
data/src/share/classes/org/omg/CORBA_2_3/portable/Delegate.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/som/cff/Messages.java.i
data/src/share/classes/org/omg/CORBA/IntHolder.java.i
data/src/share/classes/org/omg/CORBA/UnionMemberHelper.java.i
-data/src/share/classes/org/omg/CORBA/NO_PERMISSION.java.i
+data/src/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java.i
data/src/share/classes/com/sun/corba/se/spi/orb/PropertyParser.java.i
-data/src/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java.i
+data/src/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java.i
data/src/share/classes/org/omg/CORBA/Policy.java.i
data/src/share/classes/com/sun/corba/se/impl/orb/ParserDataBase.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/ORBUtility.java.i
@@ -671,8 +673,8 @@ data/src/share/classes/javax/rmi/CORBA/ClassDesc.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/GuardedAction.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteGrow.java.i
data/src/share/classes/org/omg/IOP/package.html.i
-data/src/share/classes/com/sun/corba/se/impl/oa/poa/AOMEntry.java.i
-data/src/share/classes/com/sun/tools/corba/se/idl/UnionGen.java.i
+data/src/share/classes/org/omg/CORBA_2_3/portable/package.html.i
+data/src/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAFactory.java.i
data/src/share/classes/com/sun/corba/se/pept/transport/Selector.java.i
data/src/share/classes/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java.i
@@ -690,7 +692,7 @@ data/src/share/classes/sun/rmi/rmic/iiop/PrimitiveType.java.i
data/src/share/classes/org/omg/CORBA/INVALID_ACTIVITY.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/InterfaceEntry.java.i
data/src/share/classes/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java.i
-data/src/share/classes/org/omg/CORBA/portable/UnknownException.java.i
+data/src/share/classes/org/omg/CORBA/OctetSeqHolder.java.i
data/src/share/classes/com/sun/corba/se/impl/io/ValueUtility.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/StructGen.java.i
data/src/share/classes/com/sun/org/omg/CORBA/ExcDescriptionSeqHelper.java.i
@@ -709,7 +711,7 @@ data/make/com/sun/corba/se/corespi/Makefile.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/Message.java.i
data/src/share/classes/org/omg/CORBA/ServerRequest.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Compile.java.i
-data/src/share/classes/com/sun/corba/se/impl/oa/toa/TOAImpl.java.i
+data/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java.i
data/make/common/Defs-windows.gmk.i
data/src/share/classes/org/omg/CORBA/TypeCodeHolder.java.i
data/src/share/classes/com/sun/corba/se/pept/transport/Connection.java.i
@@ -732,7 +734,7 @@ data/src/share/classes/org/omg/CORBA/IRObject.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/RequestMessage_1_0.java.i
data/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_pcosnaming.jmk.i
-data/src/share/classes/com/sun/tools/corba/se/idl/Compile.java.i
+data/src/share/classes/com/sun/corba/se/impl/orb/ParserActionBase.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/ValueHandlerImpl_1_3.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/ModuleGen.java.i
data/src/share/classes/org/omg/CORBA/StructMemberHelper.java.i
@@ -754,17 +756,17 @@ data/src/share/classes/com/sun/corba/se/spi/protocol/LocalClientRequestDispatche
data/src/share/classes/org/omg/CORBA/ShortSeqHolder.java.i
data/src/share/classes/org/omg/CORBA/DynamicImplementation.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/DebugMutex.java.i
-data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyComplexImpl.java.i
+data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/ExprFactory.java.i
data/src/share/classes/org/omg/CORBA/BooleanSeqHelper.java.i
-data/src/share/classes/com/sun/org/omg/CORBA/ContextIdentifierHelper.java.i
+data/src/share/classes/com/sun/tools/corba/se/idl/idl_zh_CN.prp.i
data/src/share/classes/com/sun/tools/corba/se/idl/MethodGen.java.i
data/src/share/classes/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java.i
data/src/share/classes/org/omg/CORBA/BAD_CONTEXT.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/IdentifiableContainerBase.java.i
-data/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java.i
+data/src/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java.i
data/src/share/classes/com/sun/corba/se/impl/orb/NormalDataCollector.java.i
data/src/share/classes/com/sun/corba/se/internal/iiop/ORB.java.i
-data/src/share/classes/com/sun/tools/corba/se/logutil/scripts/mc.scm.i
+data/make/common/Defs.gmk.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Factories.java.i
data/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Action.java.i
data/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java.i
@@ -777,7 +779,7 @@ data/src/share/classes/org/omg/DynamicAny/DynAnyPackage/package.html.i
data/src/share/classes/com/sun/corba/se/impl/transport/DefaultIORToSocketInfoImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/interceptors/CodecFactoryImpl.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/ExceptionGen.java.i
-data/src/share/classes/com/sun/corba/se/impl/activation/RepositoryImpl.java.i
+data/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdCache_1_3_1.java.i
data/make/sun/corba/core/mapfile-vers.i
data/src/share/classes/com/sun/corba/se/impl/naming/cosnaming/NamingContextImpl.java.i
data/make/org/omg/idl/Makefile.i
@@ -796,7 +798,7 @@ data/src/share/classes/com/sun/corba/se/spi/logging/data/POA.mc.i
data/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringConstants.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_spi_copyobject.jmk.i
data/src/share/classes/com/sun/corba/se/impl/ior/ObjectAdapterIdNumber.java.i
-data/src/share/classes/com/sun/corba/se/impl/naming/namingutil/INSURLBase.java.i
+data/src/share/classes/com/sun/org/omg/CORBA/ParameterMode.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/follow.set.i
data/make/common/Defs-linux.gmk.i
data/src/share/classes/com/sun/tools/corba/se/idl/AttributeEntry.java.i
@@ -804,7 +806,7 @@ data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/MessageBase
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ModuleGen.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/FreezableList.java.i
data/make/org/omg/idl/FILES_java.gmk.i
-data/.hgtags.i
+data/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java.i
data/src/share/classes/org/omg/CORBA/portable/ValueOutputStream.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/CDRInputObject.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/StringGen.java.i
@@ -818,13 +820,13 @@ data/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/IdUniquenessPolicyImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/FullServantCacheLocalCRDImpl.java.i
data/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc.i
-data/src/share/classes/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java.i
+data/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerRead.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_protocol.jmk.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/concurrent/SyncUtil.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java.i
data/src/share/classes/com/sun/corba/se/impl/copyobject/FallbackObjectCopierImpl.java.i
data/src/share/classes/org/omg/CosNaming/_NamingContextImplBase.java.i
-data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryProxyImpl.java.i
+data/src/share/classes/com/sun/tools/corba/se/logutil/scripts/run.i
data/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerImpl.java.i
data/src/share/classes/org/omg/CORBA/CTX_RESTRICT_SCOPE.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java.i
@@ -844,7 +846,7 @@ data/src/share/classes/com/sun/corba/se/impl/copyobject/CopierManagerImpl.java.i
data/make/com/sun/corba/se/impl/oa/toa/Makefile.i
data/src/share/classes/org/omg/CORBA/ValueBaseHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoredObjectImpl.java.i
-data/src/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java.i
+data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java.i
data/src/share/classes/org/omg/CORBA/DynAny.java.i
data/make/com/sun/corba/Makefile.i
data/src/share/classes/org/omg/CORBA/ValueMemberHelper.java.i
@@ -895,7 +897,7 @@ data/make/com/sun/corba/se/Makefile.i
data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyUtil.java.i
data/make/com/sun/corba/se/rmi/Makefile.i
data/src/share/classes/com/sun/corba/se/impl/monitoring/MonitoringManagerFactoryImpl.java.i
-data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java.i
+data/src/share/classes/com/sun/corba/se/impl/resolver/FileResolverImpl.java.i
data/src/share/classes/org/omg/CORBA/UShortSeqHolder.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/InterfaceType.java.i
data/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperBase.java.i
@@ -925,8 +927,9 @@ data/src/share/classes/com/sun/corba/se/impl/oa/poa/ServantRetentionPolicyImpl.j
data/src/share/classes/com/sun/org/omg/CORBA/InitializerHelper.java.i
data/src/share/classes/com/sun/corba/se/spi/copyobject/CopierManager.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/iiop/JavaSerializationComponent.java.i
+data/make/common/shared/Defs-bsd.gmk.i
data/src/share/classes/com/sun/corba/se/spi/ior/IORFactory.java.i
-data/make/com/sun/corba/se/impl/Makefile.i
+data/src/share/classes/org/omg/CORBA/BooleanSeqHolder.java.i
data/src/share/classes/com/sun/org/omg/SendingContext/CodeBaseHelper.java.i
data/src/share/classes/org/omg/CORBA/Bounds.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/ExceptionEntry.java.i
@@ -948,6 +951,7 @@ data/src/share/classes/com/sun/tools/corba/se/idl/idl.prp.i
data/src/share/classes/org/omg/CORBA/ACTIVITY_COMPLETED.java.i
data/src/share/classes/org/omg/CORBA/TypeCodePackage/BadKind.java.i
data/src/share/classes/com/sun/org/omg/CORBA/DefinitionKindHelper.java.i
+data/src/share/classes/com/sun/corba/se/spi/logging/LogWrapperFactory.java.i
data/src/share/classes/org/omg/CORBA/Environment.java.i
data/src/share/classes/com/sun/corba/se/impl/orb/DataCollectorBase.java.i
data/src/share/classes/com/sun/corba/se/impl/corba/ContextImpl.java.i
@@ -965,6 +969,7 @@ data/src/share/classes/com/sun/corba/se/impl/transport/CorbaTransportManagerImpl
data/src/share/classes/sun/corba/package.html.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/graph/NodeData.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientDelegateImpl.java.i
+data/make/tools/src/build/tools/stripproperties/StripPropertiesCorba.java.i
data/src/share/classes/sun/rmi/rmic/iiop/ContextElement.java.i
data/src/share/classes/org/omg/CORBA/portable/Streamable.java.i
data/src/share/classes/com/sun/corba/se/spi/resolver/Resolver.java.i
@@ -972,13 +977,14 @@ data/src/share/classes/com/sun/corba/se/impl/interceptors/PIHandlerImpl.java.i
data/src/share/classes/org/omg/CORBA/doc-files/generatedfiles.html.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/DenseIntMapImpl.java.i
data/src/share/classes/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java.i
+data/src/share/classes/com/sun/corba/se/spi/orb/ORB.java.i
data/src/share/classes/org/omg/CORBA/TRANSACTION_MODE.java.i
data/src/share/classes/com/sun/corba/se/spi/orb/DataCollector.java.i
data/src/share/classes/com/sun/corba/se/impl/util/JDKClassLoader.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_interceptors.jmk.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorFactory.java.i
data/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java.i
-data/src/share/classes/org/omg/CORBA/PolicyListHolder.java.i
+data/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java.i
data/src/share/classes/com/sun/corba/se/spi/logging/data/Naming.mc.i
data/src/share/classes/com/sun/corba/se/spi/extension/CopyObjectPolicy.java.i
data/make/common/shared/Platform.gmk.i
@@ -987,7 +993,7 @@ data/src/share/classes/org/omg/CORBA_2_3/package.html.i
data/src/share/classes/org/omg/CORBA/WrongTransactionHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/LessEqual.java.i
-data/src/share/classes/com/sun/corba/se/spi/orbutil/threadpool/Work.java.i
+data/make/com/sun/corba/minclude/com_sun_corba_se_impl_encoding.jmk.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_naming_cosnaming.jmk.i
data/src/share/classes/com/sun/corba/se/spi/monitoring/StatisticMonitoredAttribute.java.i
data/make/tools/strip_properties/Makefile.i
@@ -1039,9 +1045,9 @@ data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/ReplyMessag
data/src/share/classes/org/omg/PortableServer/package.html.i
data/src/share/classes/org/omg/PortableServer/CurrentPackage/package.html.i
data/src/share/classes/org/omg/CORBA/IDLTypeOperations.java.i
-data/src/share/classes/org/omg/CORBA/OctetSeqHolder.java.i
+data/src/share/classes/org/omg/CORBA/portable/UnknownException.java.i
data/src/share/classes/org/omg/stub/java/rmi/_Remote_Stub.java.i
-data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynEnumImpl.java.i
+data/src/share/classes/org/omg/CORBA/DynValue.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/RepIdDelegator_1_3.java.i
data/src/share/classes/com/sun/corba/se/spi/oa/OADefault.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java.i
@@ -1067,7 +1073,6 @@ data/src/share/classes/javax/transaction/package.html.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ExceptionGen.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java.i
data/src/share/classes/org/omg/CORBA/portable/ValueInputStream.java.i
-data/src/share/classes/sun/rmi/rmic/iiop/Util.java.i
data/src/share/classes/com/sun/corba/se/spi/encoding/CorbaOutputObject.java.i
data/src/share/classes/org/omg/CORBA/DynArray.java.i
data/src/share/classes/org/omg/CORBA/ULongLongSeqHelper.java.i
@@ -1086,10 +1091,10 @@ data/src/share/classes/com/sun/corba/se/impl/ior/notes.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/SequenceGen.java.i
data/src/share/classes/org/omg/CORBA/CharSeqHelper.java.i
data/src/share/classes/org/omg/CORBA/PUBLIC_MEMBER.java.i
-data/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetCache.java.i
+data/src/share/classes/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage_1_2.java.i
data/src/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java.i
-data/src/share/classes/com/sun/tools/corba/se/idl/PrimitiveGen.java.i
+data/src/share/classes/org/omg/CORBA/DynEnum.java.i
data/src/share/classes/com/sun/corba/se/impl/legacy/connection/USLPort.java.i
data/src/share/classes/com/sun/corba/se/spi/orb/ORBVersionFactory.java.i
data/src/share/classes/com/sun/corba/se/impl/resolver/ORBDefaultInitRefResolverImpl.java.i
@@ -1111,7 +1116,7 @@ data/src/share/classes/com/sun/corba/se/impl/dynamicany/DynUnionImpl.java.i
data/src/share/classes/org/omg/CORBA/ARG_IN.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/HexOutputStream.java.i
data/src/share/classes/com/sun/org/omg/CORBA/ValueMemberHelper.java.i
-data/src/share/classes/com/sun/corba/se/impl/naming/namingutil/NamingConstants.java.i
+data/src/share/classes/org/omg/CORBA/NO_PERMISSION.java.i
data/src/share/classes/org/omg/CORBA/FieldNameHelper.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/EnumEntry.java.i
data/src/share/classes/org/omg/CORBA/OBJECT_NOT_EXIST.java.i
@@ -1155,12 +1160,12 @@ data/src/share/classes/sun/rmi/rmic/iiop/NCInterfaceType.java.i
data/src/share/classes/org/omg/CORBA/portable/CustomValue.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectUtility.java.i
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicAccessPermission.java.i
-data/src/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java.i
+data/src/share/classes/com/sun/corba/se/spi/ior/ObjectId.java.i
data/src/share/classes/com/sun/corba/se/spi/orbutil/fsm/Guard.java.i
data/src/share/classes/com/sun/tools/corba/se/logutil/IndentingPrintWriter.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/Generator.java.i
data/src/share/classes/javax/transaction/xa/package.html.i
-data/make/sun/Makefile.i
+data/src/share/classes/javax/activity/package.html.i
data/src/share/classes/org/omg/CORBA/WrongTransactionHolder.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamField.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/GenericIdentifiable.java.i
@@ -1208,9 +1213,8 @@ data/make/sun/rmi/rmic/FILES.gmk.i
data/src/share/classes/com/sun/corba/se/impl/transport/CorbaInboundConnectionCacheImpl.java.i
data/src/share/classes/javax/transaction/TransactionRolledbackException.java.i
data/src/share/classes/com/sun/corba/se/spi/logging/data/Interceptors.mc.i
-data/src/share/classes/org/omg/CORBA/TypeCode.java.i
+data/src/share/classes/org/omg/CORBA/Any.java.i
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/DynamicStubImpl.java.i
-data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java.i
data/src/share/classes/com/sun/corba/se/spi/logging/data/OMG.mc.i
data/src/share/classes/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java.i
data/src/share/classes/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java.i
@@ -1222,7 +1226,7 @@ data/src/share/classes/org/omg/CORBA/ServiceDetailHelper.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/som/cff/FileLocator.java.i
data/src/share/classes/com/sun/corba/se/impl/encoding/ByteBufferWithInfo.java.i
data/src/share/classes/com/sun/corba/se/spi/transport/IORTransformer.java.i
-data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Helper.java.i
+data/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb.properties.i
data/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoredAttributeInfo.java.i
data/src/share/classes/org/omg/CORBA/portable/ValueFactory.java.i
data/src/windows/resource/version.rc.i
@@ -1235,7 +1239,7 @@ data/src/share/classes/com/sun/tools/corba/se/idl/InvalidCharacter.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/Preprocessor.java.i
data/src/share/classes/org/omg/PortableServer/POAManagerPackage/package.html.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/RepositoryIdInterface.java.i
-data/src/share/classes/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java.i
+data/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPAddressClosureImpl.java.i
data/src/share/classes/org/omg/CORBA/LocalObject.java.i
data/src/share/classes/org/omg/CORBA/ValueMember.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_spi_resolver.jmk.i
@@ -1248,20 +1252,20 @@ data/src/share/classes/com/sun/tools/corba/se/idl/NoPragma.java.i
data/src/share/classes/com/sun/corba/se/impl/activation/ServerTableEntry.java.i
data/src/share/classes/org/omg/CORBA/RepositoryIdHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserAction.java.i
-data/src/share/classes/org/omg/CORBA/IDLType.java.i
+data/src/share/classes/com/sun/corba/se/impl/oa/poa/RequestProcessingPolicyImpl.java.i
data/src/share/classes/org/omg/CORBA/SetOverrideType.java.i
data/make/common/shared/Compiler-msvc.gmk.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/GenFactory.java.i
-data/src/share/classes/com/sun/corba/se/spi/orb/ORBVersion.java.i
-data/src/share/classes/com/sun/corba/se/spi/transport/ORBSocketFactory.java.i
+data/src/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java.i
+data/src/share/classes/com/sun/corba/se/impl/protocol/RequestCanceledException.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/IORAddressingInfoHelper.java.i
data/src/share/classes/com/sun/corba/se/spi/ior/ObjectKey.java.i
data/src/share/classes/com/sun/corba/se/impl/orbutil/fsm/StateEngineImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/orb/PrefixParserData.java.i
data/src/share/classes/com/sun/tools/corba/se/logutil/Makefile.i
data/src/share/classes/com/sun/corba/se/impl/ior/TestAssertions.i
-data/src/share/classes/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java.i
+data/src/share/classes/com/sun/tools/corba/se/idl/GenFileStream.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/FragmentMessage.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_pept.jmk.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Terminal.java.i
@@ -1276,7 +1280,6 @@ data/src/share/classes/javax/transaction/xa/XAException.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/BadServerIdHandler.java.i
data/src/share/classes/com/sun/tools/corba/se/logutil/InputCode.java.i
data/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLTypeException.java.i
-data/src/share/classes/com/sun/corba/se/spi/ior/ObjectAdapterId.java.i
data/src/share/classes/com/sun/corba/se/spi/oa/NullServant.java.i
data/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseStub.java.i
data/make/com/sun/corba/se/spi/Makefile.i
@@ -1287,7 +1290,7 @@ data/src/share/classes/com/sun/corba/se/impl/protocol/INSServerRequestDispatcher
data/src/share/classes/com/sun/corba/se/spi/monitoring/MonitoringFactories.java.i
data/src/share/classes/com/sun/corba/se/impl/corba/PrincipalImpl.java.i
data/make/common/shared/Defs-solaris.gmk.i
-data/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties.i
+data/src/share/classes/org/omg/CORBA/ARG_OUT.java.i
data/src/share/classes/com/sun/corba/se/spi/resolver/ResolverDefault.java.i
data/src/share/classes/com/sun/corba/se/pept/transport/Acceptor.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/DefaultFactory.java.i
@@ -1295,12 +1298,12 @@ data/src/share/classes/com/sun/corba/se/impl/encoding/CodeSetConversion.java.i
data/make/com/sun/corba/minclude/com_sun_corba_se_impl_legacy.jmk.i
data/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/ValueGen.java.i
data/src/share/classes/com/sun/tools/corba/se/idl/keywords.i
-data/src/share/classes/com/sun/corba/se/spi/transport/TransportDefault.java.i
+data/src/share/classes/com/sun/tools/corba/se/idl/UnionGen.java.i
data/src/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/ServantCacheLocalCRDBase.java.i
data/src/share/classes/org/omg/CORBA/UnknownUserExceptionHolder.java.i
data/src/share/classes/com/sun/corba/se/impl/ior/ObjectIdImpl.java.i
-data/src/share/classes/com/sun/corba/se/impl/corba/EnvironmentImpl.java.i
+data/src/share/classes/org/omg/CORBA/BAD_POLICY.java.i
data/src/share/classes/com/sun/corba/se/pept/transport/ContactInfoListIterator.java.i
data/src/share/classes/com/sun/corba/se/spi/transport/CorbaContactInfoList.java.i
data/src/share/classes/com/sun/corba/se/pept/transport/ListenerThread.java.i
@@ -1332,7 +1335,7 @@ data/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java.i
data/make/com/sun/corba/se/rmi/rmic/Makefile.i
data/src/share/classes/com/sun/tools/corba/se/idl/constExpr/Expression.java.i
data/make/com/sun/corba/se/spi/activation/Makefile.i
-data/src/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java.i
+data/src/share/classes/org/omg/CORBA/FloatHolder.java.i
data/src/share/classes/com/sun/corba/se/pept/transport/ContactInfo.java.i
data/src/share/classes/org/omg/CORBA/_IDLTypeStub.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_0.java.i
@@ -1341,7 +1344,7 @@ data/src/share/classes/com/sun/corba/se/impl/oa/poa/standard_minor_codes.txt.i
data/src/share/classes/com/sun/tools/corba/se/idl/ParseException.java.i
data/src/share/classes/org/omg/CORBA/IDLTypeHelper.java.i
data/make/com/sun/corba/minclude/javax_rmi.jmk.i
-data/src/share/classes/org/omg/CORBA/BooleanSeqHolder.java.i
+data/make/com/sun/corba/se/impl/Makefile.i
data/src/share/classes/com/sun/org/omg/CORBA/OperationMode.java.i
data/src/share/classes/org/omg/CORBA/portable/BoxedValueHelper.java.i
data/src/share/classes/org/omg/CORBA/UnionMember.java.i
@@ -1368,11 +1371,11 @@ data/src/share/classes/com/sun/org/omg/CORBA/AttrDescriptionSeqHelper.java.i
data/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java.i
data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateRequestMessage_1_1.java.i
data/src/share/classes/com/sun/corba/se/impl/oa/poa/POACurrent.java.i
-data/src/share/classes/org/omg/CORBA/FloatHolder.java.i
+data/src/share/classes/sun/rmi/rmic/iiop/SpecialInterfaceType.java.i
data/src/share/classes/sun/rmi/rmic/iiop/Type.java.i
data/make/com/sun/corba/minclude/org_omg_SendingContext.jmk.i
data/.hgignore.i
-data/src/share/classes/org/omg/CORBA/DynAnyPackage/Invalid.java.i
+data/src/share/classes/com/sun/corba/se/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java.i
data/src/share/classes/com/sun/corba/se/spi/logging/data/IOR.mc.i
data/src/share/classes/com/sun/org/omg/SendingContext/CodeBasePackage/URLSeqHelper.java.i
data/src/share/classes/org/omg/CORBA/DefinitionKindHelper.java.i
diff --git a/corba/.hg/store/undo b/corba/.hg/store/undo
index e77f933..93925c8 100644
Binary files a/corba/.hg/store/undo and b/corba/.hg/store/undo differ
diff --git a/corba/.hg/undo.desc b/corba/.hg/undo.desc
index 9708ceb..014bd24 100644
--- a/corba/.hg/undo.desc
+++ b/corba/.hg/undo.desc
@@ -1,3 +1,3 @@
-340
+357
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/corba
diff --git a/corba/.hg/undo.dirstate b/corba/.hg/undo.dirstate
index faea2b4..1c03b81 100644
Binary files a/corba/.hg/undo.dirstate and b/corba/.hg/undo.dirstate differ
diff --git a/corba/.hgignore b/corba/.hgignore
index 83cef21..e05f093 100644
--- a/corba/.hgignore
+++ b/corba/.hgignore
@@ -2,3 +2,4 @@
^dist/
/nbproject/private/
^.hgtip
+.DS_Store
diff --git a/corba/.hgtags b/corba/.hgtags
index b2fa8aa..ee23f2e 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -151,3 +151,11 @@ e1366c5d84ef984095a332bcee70b3938232d07d jdk8-b19
f157fc2a71a38ce44007a6f18d5b011824dce705 jdk8-b21
a11d0062c445d5f36651c78650ab88aa594bcbff jdk8-b22
5218eb256658442b62b05295aafa5b5f35252972 jdk8-b23
+b98f0e6dddf987df565029a1f58417fc1844c3f3 jdk8-b24
+e45d6b406d5f91ff5256a5c82456ab1e7eb8becd jdk8-b25
+79f709a099f40c08f76567fa6d813f9009a69826 jdk8-b26
+4fffe75e4edd39a2517f10b743941bf94edb143d jdk8-b27
+2082eb35d49a9c2aab90b8d4fd31cefb7a23b82e jdk8-b28
+6117395d422682f89d228347e319fcaac7edc729 jdk8-b29
+4605f8418bf562e78be79b25b6b8a5110281acae jdk8-b30
+1954151dfae8f73db24e396380f7c02bdd47c486 jdk8-b31
diff --git a/corba/make/common/internal/Resources.gmk b/corba/make/common/internal/Resources.gmk
index 575fdf6..d9bc99b 100644
--- a/corba/make/common/internal/Resources.gmk
+++ b/corba/make/common/internal/Resources.gmk
@@ -149,8 +149,8 @@ strip_prop_options_clean:
# Strip the properties files
strip_all_props: $(STRIPPROPERTIES_JARFILE) $(STRIP_PROP_options)
@if [ -s $(STRIP_PROP_options) ] ; then \
- $(ECHO) "$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) -optionsfile $(STRIP_PROP_options)" ; \
- $(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) -optionsfile $(STRIP_PROP_options) ; \
+ $(ECHO) "$(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options)" ; \
+ $(BOOT_JAVA_CMD) -jar $(STRIPPROPERTIES_JARFILE) @$(STRIP_PROP_options) ; \
fi
@$(java-vm-cleanup)
diff --git a/corba/make/common/shared/Defs-utils.gmk b/corba/make/common/shared/Defs-utils.gmk
index f8dc58c..40bf468 100644
--- a/corba/make/common/shared/Defs-utils.gmk
+++ b/corba/make/common/shared/Defs-utils.gmk
@@ -31,7 +31,7 @@
# These input UTILS_* variables can be defined at anytime, ideally once.
# Unix Commands: Normally /bin/, /usr/bin/. or C:/mksnt/mksnt/
# UTILS_COMMAND_PATH
-# /usr/bin/
+# /usr/bin/
# UTILS_USR_BIN_PATH
# /usr/ccs/bin/ (sccs, m4, lex, yacc, as, ar, strip, mcs)
# UTILS_CCS_BIN_PATH
@@ -53,6 +53,13 @@ ifeq ($(PLATFORM),linux)
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
endif
+ifeq ($(PLATFORM),bsd)
+ UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
+ UTILS_USR_BIN_PATH=$(USRBIN_PATH)
+ UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
+ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+endif
+
ifeq ($(PLATFORM),solaris)
UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
UTILS_USR_BIN_PATH=$(UNIXCOMMAND_PATH)
@@ -166,15 +173,15 @@ ifeq ($(PLATFORM),linux)
# Also, some distribution (Ubuntu, Debian, others?) place the rpm command
# itself in /usr/bin rather than it's traditional home in /bin.
RPM=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpm) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpm))
+ $(wildcard $(UTILS_USR_BIN_PATH)rpm))
RPMBUILD=$(firstword $(wildcard $(UTILS_COMMAND_PATH)rpmbuild) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
- $(wildcard $(UTILS_COMMAND_PATH)rpm) \
- $(wildcard $(UTILS_USR_BIN_PATH)rpm))
+ $(wildcard $(UTILS_USR_BIN_PATH)rpmbuild) \
+ $(wildcard $(UTILS_COMMAND_PATH)rpm) \
+ $(wildcard $(UTILS_USR_BIN_PATH)rpm))
# Most Linux distros have "sort" in /bin. Ubuntu, Debian and perhaps
# others have it in /usr/bin.
SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- $(wildcard $(UTILS_USR_BIN_PATH)sort))
+ $(wildcard $(UTILS_USR_BIN_PATH)sort))
NAWK = $(USRBIN_PATH)gawk
# Intrinsic unix command, with backslash-escaped character interpretation
ECHO = /bin/echo -e
@@ -198,3 +205,34 @@ ifeq ($(PLATFORM),solaris)
ECHO = /usr/bin/echo
endif
+# BSD specific
+ifeq ($(PLATFORM),bsd)
+ BASENAME = $(UTILS_USR_BIN_PATH)basename
+ EGREP = $(UTILS_USR_BIN_PATH)egrep
+ EXPR = $(UTILS_COMMAND_PATH)expr
+ FMT = $(UTILS_USR_BIN_PATH)fmt
+ GREP = $(UTILS_USR_BIN_PATH)grep
+ GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
+ ID = $(UTILS_USR_BIN_PATH)id
+ MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
+ SED = $(UTILS_USR_BIN_PATH)sed
+ SORT = $(UTILS_USR_BIN_PATH)sort
+ TEST = $(UTILS_COMMAND_PATH)test
+ TOUCH = $(UTILS_USR_BIN_PATH)touch
+ TRUE = $(UTILS_USR_BIN_PATH)true
+ UNAME = $(UTILS_USR_BIN_PATH)uname
+ # BSD OS_VENDOR specific
+ ifeq ($(OS_VENDOR), Apple)
+ NAWK = $(UTILS_USR_BIN_PATH)awk
+ UNZIPSFX = $(UTILS_USR_BIN_PATH)unzipsfx
+ ZIPEXE = $(UTILS_USR_BIN_PATH)zip
+ else
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+ ifeq ($(OS_VENDOR), OpenBSD)
+ NAWK = $(UTILS_USR_BIN_PATH)awk
+ else
+ CPIO = $(UTILS_USR_BIN_PATH)cpio
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
diff --git a/corba/make/common/shared/Platform.gmk b/corba/make/common/shared/Platform.gmk
index 07d0b50..fbb2dba 100644
--- a/corba/make/common/shared/Platform.gmk
+++ b/corba/make/common/shared/Platform.gmk
@@ -62,8 +62,8 @@ PLATFORM_SHARED=done
# CLASSPATH_SEPARATOR separator in classpath, ; or :
# BUNDLE_FILE_SUFFIX suffix for bundles: .tar or .tar.gz
# ISA_DIR solaris only: /sparcv9 or /amd64
-# REQUIRED_WINDOWS_NAME windows only: basic name of windows
-# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
+# REQUIRED_WINDOWS_NAME windows only: basic name of windows
+# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
# USING_CYGWIN windows only: true or false
# WINDOWS_NT_VERSION_STRING windows only: long version name
# REQUIRED_OS_VERSION required OS version, e.g. 5.10, 2.4
@@ -135,7 +135,7 @@ ifeq ($(SYSTEM_UNAME), SunOS)
BUNDLE_FILE_SUFFIX=.tar
# Required Solaris version
REQUIRED_OS_VERSION = 5.10
- # Minimum disk space needed as determined by running 'du -sk' on
+ # Minimum disk space needed as determined by running 'du -sk' on
# a fully built workspace.
ifeq ($(ARCH_FAMILY), sparc)
REQUIRED_FREE_SPACE=1300000
@@ -207,7 +207,7 @@ ifeq ($(SYSTEM_UNAME), Linux)
# Suffix for file bundles used in previous release
BUNDLE_FILE_SUFFIX=.tar.gz
- # Minimum disk space needed as determined by running 'du -sk' on
+ # Minimum disk space needed as determined by running 'du -sk' on
# a fully built workspace.
REQUIRED_FREE_SPACE=1460000
LINUX_VERSION_INFO = /etc/redhat-release
@@ -231,6 +231,98 @@ ifeq ($(SYSTEM_UNAME), Linux)
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
endif
+ifeq ($(SYSTEM_UNAME), FreeBSD)
+ PLATFORM = bsd
+ OS_NAME = freebsd
+ OS_VENDOR = FreeBSD
+ REQUIRED_OS_VERSION = 6.0
+endif
+
+ifeq ($(SYSTEM_UNAME), Darwin)
+ PLATFORM = bsd
+ OS_NAME = darwin
+ OS_VENDOR = Apple
+ REQUIRED_OS_VERSION = 8.0
+endif
+
+ifeq ($(SYSTEM_UNAME), NetBSD)
+ PLATFORM = bsd
+ OS_NAME = netbsd
+ OS_VENDOR = NetBSD
+ REQUIRED_OS_VERSION = 3.0
+endif
+
+ifeq ($(SYSTEM_UNAME), OpenBSD)
+ PLATFORM = bsd
+ OS_NAME = openbsd
+ OS_VENDOR = OpenBSD
+ REQUIRED_OS_VERSION = 4.9
+endif
+
+# Platform settings specific to BSD
+ifeq ($(PLATFORM), bsd)
+ OS_VERSION := $(shell uname -r)
+ # Arch and OS name/version
+ mach := $(shell uname -m)
+ archExpr = case "$(mach)" in \
+ i[3-9]86) \
+ echo i586 \
+ ;; \
+ sparc64) \
+ echo sparcv9 \
+ ;; \
+ sparc*) \
+ echo sparc \
+ ;; \
+ x86_64) \
+ echo amd64 \
+ ;; \
+ "Power Macintosh") \
+ echo ppc \
+ ;; \
+ *) \
+ echo $(mach) \
+ ;; \
+ esac
+ ARCH := $(shell $(archExpr) )
+ ARCH_FAMILY := $(ARCH)
+
+ # Darwin x86 builds are i386/amd64 universal.
+ ifeq ($(SYSTEM_UNAME), Darwin)
+ ifneq ($(ARCH), ppc)
+ ARCH=universal
+ endif
+ endif
+
+ # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
+ ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
+ ARCH_DATA_MODEL=32
+ else
+ ARCH_DATA_MODEL=64
+ endif
+
+ ifeq ($(ARCH), i586)
+ LIBARCH = i386
+ else
+ LIBARCH = $(ARCH)
+ endif
+
+ # Value of Java os.arch property
+ ARCHPROP = $(LIBARCH)
+
+ # Suffix for file bundles used in previous release
+ BUNDLE_FILE_SUFFIX=.tar.gz
+ # Minimum disk space needed as determined by running 'du -sk' on
+ # a fully built workspace.
+ REQUIRED_FREE_SPACE=1500000
+ # How much RAM does this machine have:
+ ifeq ($(OS_VENDOR), OpenBSD)
+ MB_OF_MEMORY=$(shell sysctl -n hw.physmem | awk '{print int($$NF / 1048576); }' )
+ else
+ MB_OF_MEMORY=$(shell (sysctl -n hw.physmem64 2> /dev/null || sysctl -n hw.physmem) | awk '{print int($$NF / 1048576); }' )
+ endif
+endif
+
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
@@ -327,7 +419,7 @@ ifeq ($(PLATFORM), windows)
endif
# Suffix for file bundles used in previous release
BUNDLE_FILE_SUFFIX=.tar
- # Minimum disk space needed as determined by running 'du -sk' on
+ # Minimum disk space needed as determined by running 'du -sk' on
# a fully built workspace.
REQUIRED_FREE_SPACE=500000
# How much RAM does this machine have:
@@ -335,8 +427,8 @@ ifeq ($(PLATFORM), windows)
MB_OF_MEMORY := $(shell \
if [ -f "C:/cygwin/bin/free.exe" ] ; then \
( C:/cygwin/bin/bash.exe -c "C:/cygwin/bin/free.exe -m" ) | \
- grep Mem: | \
- sed -e 's@\ \ *@ @g' | cut -d' ' -f2 ; \
+ grep Mem: | \
+ sed -e 's@\ \ *@ @g' | cut -d' ' -f2 ; \
else \
echo "512"; \
fi)
@@ -392,7 +484,7 @@ ifneq ($(PLATFORM), windows)
# Where is unwanted output to be delivered?
DEV_NULL = /dev/null
export DEV_NULL
- # Character used between entries in classpath
+ # Character used between entries in classpath
CLASSPATH_SEPARATOR = :
# User name determination (set _USER)
ifndef USER
diff --git a/corba/make/tools/src/build/tools/stripproperties/StripProperties.java b/corba/make/tools/src/build/tools/stripproperties/StripProperties.java
deleted file mode 100644
index dcf7114..0000000
--- a/corba/make/tools/src/build/tools/stripproperties/StripProperties.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
- * 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 build.tools.stripproperties;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Reads a properties file from standard input and writes an equivalent
- * properties file without comments to standard output.
- */
-public class StripProperties {
-
- private static void error(String msg, Exception e) {
- System.err.println("ERROR: stripproperties: " + msg);
- if ( e != null ) {
- System.err.println("EXCEPTION: " + e.toString());
- e.printStackTrace();
- }
- }
-
- private static List<String> parseOptions(String args[]) {
- List<String> files = new ArrayList<String>();
- for ( int i = 0; i < args.length ; i++ ) {
- if ( "-optionsfile".equals(args[i]) && i+1 < args.length ) {
- String filename = args[++i];
- FileInputStream finput = null;
- byte contents[] = null;
- try {
- finput = new FileInputStream(filename);
- int byteCount = finput.available();
- if ( byteCount <= 0 ) {
- error("The -optionsfile file is empty", null);
- files = null;
- } else {
- contents = new byte[byteCount];
- int bytesRead = finput.read(contents);
- if ( byteCount != bytesRead ) {
- error("Cannot read all of -optionsfile file", null);
- files = null;
- }
- }
- } catch ( IOException e ) {
- error("cannot open " + filename, e);
- files = null;
- }
- if ( finput != null ) {
- try {
- finput.close();
- } catch ( IOException e ) {
- files = null;
- error("cannot close " + filename, e);
- }
- }
- if ( files != null && contents != null ) {
- String tokens[] = (new String(contents)).split("\\s+");
- if ( tokens.length > 0 ) {
- List<String> ofiles = parseOptions(tokens);
- if ( ofiles != null ) {
- files.addAll(ofiles);
- } else {
- error("No files found in file", null);
- files = null;
- }
- }
- }
- if ( files == null ) {
- break;
- }
- } else {
- files.add(args[i]);
- }
- }
- return files;
- }
-
- private static boolean stripFiles(List<String> files) {
- boolean ok = true;
- for ( String file : files ) {
-
- Properties prop = new Properties();
- InputStream in = null;
- try {
- in = new BufferedInputStream(new FileInputStream(file));
- prop.load(in);
- } catch ( FileNotFoundException e ) {
- error("Cannot access file " + file, e);
- ok = false;
- } catch ( IOException e ) {
- error("IO exception processing file " + file, e);
- ok = false;
- }
- if ( in != null ) {
- try {
- in.close();
- } catch ( IOException e ) {
- error("IO exception closing file " + file, e);
- ok = false;
- }
- }
- if ( !ok ) {
- break;
- }
-
- OutputStream out = null;
- try {
- out = new FileOutputStream(file);
- storeProperties(prop, out);
- out.flush();
- } catch ( IOException e ) {
- error("IO exception processing file " + file, e);
- ok = false;
- }
- if ( out != null ) {
- try {
- out.close();
- } catch ( IOException e ) {
- error("IO exception closing file " + file, e);
- ok = false;
- }
- }
- if ( !ok ) {
- break;
- }
-
- }
- return ok;
- }
-
- /**
- * Strip the properties filenames supplied, replacing their contents.
- * @param args Names of properties files to process and replace contents
- */
- public static void main(String args[]) {
- List<String> files = parseOptions(args);
- if ( files == null || !stripFiles(files) ) {
- System.exit(1);
- }
- }
-
- // --- code below here is adapted from java.util.Properties ---
-
- private static final String specialSaveChars = "=: \t\r\n\f#!";
-
- /*
- * Converts unicodes to encoded \uxxxx
- * and writes out any of the characters in specialSaveChars
- * with a preceding slash
- */
- private static String saveConvert(String theString, boolean escapeSpace) {
- int len = theString.length();
- StringBuffer outBuffer = new StringBuffer(len*2);
-
- for(int x=0; x<len; x++) {
- char aChar = theString.charAt(x);
- switch(aChar) {
- case ' ':
- if (x == 0 || escapeSpace) {
- outBuffer.append('\\');
- }
- outBuffer.append(' ');
- break;
- case '\\':
- outBuffer.append('\\');
- outBuffer.append('\\');
- break;
- case '\t':
- outBuffer.append('\\');
- outBuffer.append('t');
- break;
- case '\n':
- outBuffer.append('\\');
- outBuffer.append('n');
- break;
- case '\r':
- outBuffer.append('\\');
- outBuffer.append('r');
- break;
- case '\f':
- outBuffer.append('\\');
- outBuffer.append('f');
- break;
- default:
- if ((aChar < 0x0020) || (aChar == 0x007e) || (aChar > 0x00ff)) {
- outBuffer.append('\\');
- outBuffer.append('u');
- outBuffer.append(toHex((aChar >> 12) & 0xF));
- outBuffer.append(toHex((aChar >> 8) & 0xF));
- outBuffer.append(toHex((aChar >> 4) & 0xF));
- outBuffer.append(toHex( aChar & 0xF));
- } else {
- if (specialSaveChars.indexOf(aChar) != -1) {
- outBuffer.append('\\');
- }
- outBuffer.append(aChar);
- }
- }
- }
- return outBuffer.toString();
- }
-
- /**
- * Writes the content of <code>properties</code> to <code>out</code>.
- * The format is that of Properties.store with the following modifications:
- * <ul>
- * <li>No header or date is written
- * <li>Latin-1 characters are written as single bytes, not escape sequences
- * <li>Line breaks are indicated by a single \n independent of platform
- * <ul>
- */
- private static void storeProperties(Properties properties, OutputStream out)
- throws IOException {
- BufferedWriter awriter;
- awriter = new BufferedWriter(new OutputStreamWriter(out, "8859_1"));
- for (Enumeration e = properties.keys(); e.hasMoreElements();) {
- String key = (String)e.nextElement();
- String val = (String)properties.get(key);
- key = saveConvert(key, true);
-
- /* No need to escape embedded and trailing spaces for value, hence
- * pass false to flag.
- */
- val = saveConvert(val, false);
- writeln(awriter, key + "=" + val);
- }
- awriter.flush();
- }
-
- private static void writeln(BufferedWriter bw, String s) throws IOException {
- bw.write(s);
- bw.write("\n");
- }
-
- /**
- * Convert a nibble to a hex character
- * @param nibble the nibble to convert.
- */
- private static char toHex(int nibble) {
- return hexDigit[(nibble & 0xF)];
- }
-
- /** A table of hex digits */
- private static final char[] hexDigit = {
- '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
- };
-}
diff --git a/corba/make/tools/strip_properties/Makefile b/corba/make/tools/strip_properties/Makefile
index 7c3a829..75eb2f1 100644
--- a/corba/make/tools/strip_properties/Makefile
+++ b/corba/make/tools/strip_properties/Makefile
@@ -34,7 +34,7 @@ PROGRAM = stripproperties
include $(BUILDDIR)/common/Defs.gmk
BUILDTOOL_SOURCE_ROOT = $(BUILDDIR)/tools/src
-BUILDTOOL_MAIN = $(PKGDIR)/StripProperties.java
+BUILDTOOL_MAIN = $(PKGDIR)/StripPropertiesCorba.java
#
# Build tool jar rules.
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java
index 4704ee1..95025ee 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyFactoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -82,6 +82,6 @@ public class DynAnyFactoryImpl
private String[] __ids = { "IDL:omg.org/DynamicAny/DynAnyFactory:1.0" };
public String[] _ids() {
- return __ids;
+ return (String[]) __ids.clone();
}
}
diff --git a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java b/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java
index f0ba6ee..96da602 100644
--- a/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java
+++ b/corba/src/share/classes/com/sun/corba/se/impl/dynamicany/DynAnyImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -195,6 +195,6 @@ abstract class DynAnyImpl extends org.omg.CORBA.LocalObject implements DynAny
private String[] __ids = { "IDL:omg.org/DynamicAny/DynAny:1.0" };
public String[] _ids() {
- return __ids;
+ return (String[]) __ids.clone();
}
}
diff --git a/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java b/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java
index ab3efdb..508f827 100644
--- a/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java
+++ b/corba/src/share/classes/com/sun/org/omg/SendingContext/_CodeBaseImplBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -138,7 +138,7 @@ public abstract class _CodeBaseImplBase extends org.omg.CORBA.portable.ObjectImp
public String[] _ids ()
{
- return __ids;
+ return (String[]) __ids.clone();
}
diff --git a/hotspot/.hg/cache/branchheads b/hotspot/.hg/cache/branchheads
index dfa75fa..26283c1 100644
--- a/hotspot/.hg/cache/branchheads
+++ b/hotspot/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-62825b3de60f0f8a9f7149d695bfed96008c1068 3056
-62825b3de60f0f8a9f7149d695bfed96008c1068 default
+883606a2be240f5f2cd66275320db9b5ffeb08cb 3278
+883606a2be240f5f2cd66275320db9b5ffeb08cb default
diff --git a/hotspot/.hg/dirstate b/hotspot/.hg/dirstate
index a44a1b3..55defcb 100644
Binary files a/hotspot/.hg/dirstate and b/hotspot/.hg/dirstate differ
diff --git a/hotspot/.hg/store/00changelog.d b/hotspot/.hg/store/00changelog.d
index 84b3a5a..77686fb 100644
Binary files a/hotspot/.hg/store/00changelog.d and b/hotspot/.hg/store/00changelog.d differ
diff --git a/hotspot/.hg/store/00changelog.i b/hotspot/.hg/store/00changelog.i
index 57ef531..9ac0ca3 100644
Binary files a/hotspot/.hg/store/00changelog.i and b/hotspot/.hg/store/00changelog.i differ
diff --git a/hotspot/.hg/store/00manifest.d b/hotspot/.hg/store/00manifest.d
index 635635b..8c63361 100644
Binary files a/hotspot/.hg/store/00manifest.d and b/hotspot/.hg/store/00manifest.d differ
diff --git a/hotspot/.hg/store/00manifest.i b/hotspot/.hg/store/00manifest.i
index 46c33fc..f45b225 100644
Binary files a/hotspot/.hg/store/00manifest.i and b/hotspot/.hg/store/00manifest.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/linux/_makefile.i b/hotspot/.hg/store/data/agent/src/os/linux/_makefile.i
index 97a3d1f..327f3b9 100644
Binary files a/hotspot/.hg/store/data/agent/src/os/linux/_makefile.i and b/hotspot/.hg/store/data/agent/src/os/linux/_makefile.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/linux/libproc__impl.c.i b/hotspot/.hg/store/data/agent/src/os/linux/libproc__impl.c.i
index f4a4e5f..2922263 100644
Binary files a/hotspot/.hg/store/data/agent/src/os/linux/libproc__impl.c.i and b/hotspot/.hg/store/data/agent/src/os/linux/libproc__impl.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_collected_heap.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_collected_heap.java.i
index 33e43eb..2321f1a 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_collected_heap.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_collected_heap.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_monitoring_support.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_monitoring_support.java.i
index 5e58910..42f168c 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_monitoring_support.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/gc__implementation/g1/_g1_monitoring_support.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_connector_impl.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_connector_impl.java.i
index 8a030db..444e5a8 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_connector_impl.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_connector_impl.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_loader_constraint_table.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_loader_constraint_table.java.i
index 424052a..d9f7908 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_loader_constraint_table.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_loader_constraint_table.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i
index 683f89f..f79080d 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i
index 97c40ea..ef855dc 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i
index b58ab0a..6371022 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/_heap_summary.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i
index bf4ad19..b7f3c97 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i differ
diff --git a/hotspot/.hg/store/data/make/_makefile.i b/hotspot/.hg/store/data/make/_makefile.i
index 6987844..26f6000 100644
Binary files a/hotspot/.hg/store/data/make/_makefile.i and b/hotspot/.hg/store/data/make/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/_makefile.i b/hotspot/.hg/store/data/make/bsd/_makefile.i
index b143108..70acf10 100644
Binary files a/hotspot/.hg/store/data/make/bsd/_makefile.i and b/hotspot/.hg/store/data/make/bsd/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i
index beae856..6fb9f70 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i
index b7626a2..6e2eab5 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i
index 22dd11c..fedf271 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i
index 3048fa1..1b5d6e8 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i
index b9a50d8..e7acb4d 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/launcher.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/launcher.make.i
index 9c4daef..843c4e5 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/launcher.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/launcher.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/product.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/product.make.i
index 4ddd182..7850666 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/product.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/product.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/rules.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/rules.make.i
index 3e7734c..8cbe24e 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/rules.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/rules.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i
index a48179b..1a1ab1b 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/sparc_works.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/sparc_works.make.i
index d60fb45..33bd3b1 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/sparc_works.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/sparc_works.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i
index 403ceb1..e540aaf 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i
index fd6ce03..fd40be6 100644
Binary files a/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/make/defs.make.i b/hotspot/.hg/store/data/make/defs.make.i
index e1449f9..bbc2e1e 100644
Binary files a/hotspot/.hg/store/data/make/defs.make.i and b/hotspot/.hg/store/data/make/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/hotspot__version.i b/hotspot/.hg/store/data/make/hotspot__version.i
index 387b299..727204e 100644
Binary files a/hotspot/.hg/store/data/make/hotspot__version.i and b/hotspot/.hg/store/data/make/hotspot__version.i differ
diff --git a/hotspot/.hg/store/data/make/jprt.properties.i b/hotspot/.hg/store/data/make/jprt.properties.i
index 65a2876..8bf0b23 100644
Binary files a/hotspot/.hg/store/data/make/jprt.properties.i and b/hotspot/.hg/store/data/make/jprt.properties.i differ
diff --git a/hotspot/.hg/store/data/make/linux/_makefile.i b/hotspot/.hg/store/data/make/linux/_makefile.i
index a636b6d..a5514a2 100644
Binary files a/hotspot/.hg/store/data/make/linux/_makefile.i and b/hotspot/.hg/store/data/make/linux/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/adlc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/adlc.make.i
index 3017063..d07dc57 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/adlc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/adlc.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i
index 8fc68d4..f6e2a55 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i b/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i
index af14582..1b377af 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i
index 3e4644e..8d43900 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/launcher.make.i b/hotspot/.hg/store/data/make/linux/makefiles/launcher.make.i
index ad64363..d85d3e2 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/launcher.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/launcher.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i
index e0c2fda..65a1de4 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/product.make.i b/hotspot/.hg/store/data/make/linux/makefiles/product.make.i
index e6fe164..2fa9575 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/product.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/product.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/rules.make.i b/hotspot/.hg/store/data/make/linux/makefiles/rules.make.i
index 94ca323..1a368ab 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/rules.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/rules.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i
index 62783d3..0feb56d 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/sparc_works.make.i b/hotspot/.hg/store/data/make/linux/makefiles/sparc_works.make.i
index c34d407..60d0794 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/sparc_works.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/sparc_works.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/top.make.i b/hotspot/.hg/store/data/make/linux/makefiles/top.make.i
index 91e2411..40ee898 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/top.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/top.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i b/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i
index 483a9f4..2ad5acc 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/adlc.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/adlc.make.i
index 4c6ba7d..3f06ad3 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/adlc.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/adlc.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i
index 66745b2..ee9bddf 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i
index cf2455c..ef9a7ae 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i
index 1d3ea34..59f7d6c 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i
index 78b70ae..0dba9df 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/launcher.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/launcher.make.i
index aab57ae..727cbaf 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/launcher.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/launcher.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i
index 20fcb5b..eeca0e5 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/rules.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/rules.make.i
index 8b27ba6..2d8db65 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/rules.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/rules.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i
index fcf0a9c..5fc5e02 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i
index b8e19c1..7d14466 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/top.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/top.make.i
index 1bbbbe2..cd01e6a 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/top.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/top.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i
index 582e516..d93849e 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/build.make.i b/hotspot/.hg/store/data/make/windows/build.make.i
index 49e8100..0e5ccd7 100644
Binary files a/hotspot/.hg/store/data/make/windows/build.make.i and b/hotspot/.hg/store/data/make/windows/build.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/build__vm__def.sh.i b/hotspot/.hg/store/data/make/windows/build__vm__def.sh.i
index 643aade..295e41c 100644
Binary files a/hotspot/.hg/store/data/make/windows/build__vm__def.sh.i and b/hotspot/.hg/store/data/make/windows/build__vm__def.sh.i differ
diff --git a/hotspot/.hg/store/data/make/windows/get__msc__ver.sh.i b/hotspot/.hg/store/data/make/windows/get__msc__ver.sh.i
index d38eb66..d2b2c6d 100644
Binary files a/hotspot/.hg/store/data/make/windows/get__msc__ver.sh.i and b/hotspot/.hg/store/data/make/windows/get__msc__ver.sh.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/adlc.make.i b/hotspot/.hg/store/data/make/windows/makefiles/adlc.make.i
index bffddc7..730d6e8 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/adlc.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/adlc.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i b/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i
index 93aea6c..1d2cdd1 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/debug.make.i b/hotspot/.hg/store/data/make/windows/makefiles/debug.make.i
index 3fcd7b3..bdf4e9b 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/debug.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/debug.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i b/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i
index 3452a9a..4e33560 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/fastdebug.make.i b/hotspot/.hg/store/data/make/windows/makefiles/fastdebug.make.i
index d33f154..4c22392 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/fastdebug.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/fastdebug.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/launcher.make.i b/hotspot/.hg/store/data/make/windows/makefiles/launcher.make.i
index 3bdd56f..b14d723 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/launcher.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/launcher.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/product.make.i b/hotspot/.hg/store/data/make/windows/makefiles/product.make.i
index 208c924..024899c 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/product.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/product.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/projectcreator.make.i b/hotspot/.hg/store/data/make/windows/makefiles/projectcreator.make.i
index cb6c57b..46f73a7 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/projectcreator.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/projectcreator.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i b/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i
index 9d509e6..46a9350 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/sanity.make.i b/hotspot/.hg/store/data/make/windows/makefiles/sanity.make.i
index 8b7d9b0..5f83292 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/sanity.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/sanity.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/shared.make.i b/hotspot/.hg/store/data/make/windows/makefiles/shared.make.i
index 52fc0c7..c2ddf4a 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/shared.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/shared.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i b/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i
index b6759c5..5813e6b 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i
index 44a95da..d639804 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i
index 8787c06..8951e5f 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i
index b7b3c1b..26f0d67 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i
index 4ade831..b9e4cba 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c2__globals__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c2__globals__sparc.hpp.i
index 5fd3b02..307cb06 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c2__globals__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c2__globals__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i
index dc63c25..3d0636b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i
index 921eae7..7a56e2b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/globals__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/globals__sparc.hpp.i
index e1379ac..c1a2314 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/globals__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/globals__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i
index 6d6f584..724be4c 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i
index af15aa1..cb39c68 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i
index a01abbb..246b30c 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i
index fe19c3e..a7a7d05 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i
index cb6acc8..468c7f9 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i
index 6b89807..b0f5cc1 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i
index 4b2478e..4b98d64 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i
index da4f819..a151709 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___code_stubs__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i
index 8730a69..5a57128 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___macro_assembler__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___macro_assembler__x86.cpp.i
index bb290fd..1f526af 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___macro_assembler__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___macro_assembler__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i
index 6ed385b..2d7d5ce 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c2__globals__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c2__globals__x86.hpp.i
index 00eee1c..3cb9fa7 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c2__globals__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c2__globals__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i
index 01f3182..b72e849 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i
index e06e5da..2577778 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i
index ace9e5a..d7a7309 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i
index 863cf7b..04f553b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i
index 2d969fe..7c621f3 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i
index 08fcd90..b4a6d3d 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i
index ad53e3d..1554b36 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i
index 1c37347..77401a0 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.hpp.i
index b1ba0b4..28bc38e 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i
index ef08d67..7042d8e 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i
index f66df9f..4f8bbd8 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/x86.ad.i b/hotspot/.hg/store/data/src/cpu/x86/vm/x86.ad.i
index 12a4c74..0bdd449 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/x86.ad.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/x86.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i
index a01459b..29dcf09 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i
index dd9f5aa..3cacccb 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i
index ae96c89..a3203ab 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/attach_listener__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/attach_listener__bsd.cpp.i
index aa02958..0e12e79 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/attach_listener__bsd.cpp.i and b/hotspot/.hg/store/data/src/os/bsd/vm/attach_listener__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/decoder__mach_o.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/decoder__mach_o.hpp.i
index 52f7f95..65bd62e 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/decoder__mach_o.hpp.i and b/hotspot/.hg/store/data/src/os/bsd/vm/decoder__mach_o.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i
index 6abbc93..613e57d 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i and b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.cpp.i
index 54d1c94..2a9a5bf 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.cpp.i and b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.hpp.i
index 1354597..fa3f386 100644
Binary files a/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.hpp.i and b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i
index c51bd7b..02e67d0 100644
Binary files a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i and b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i b/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i
index 7216848..3267599 100644
Binary files a/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i and b/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i differ
diff --git a/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i b/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i
index 7951264..49cb35d 100644
Binary files a/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i and b/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/solaris/vm/os_thread__solaris.hpp.i b/hotspot/.hg/store/data/src/os/solaris/vm/os_thread__solaris.hpp.i
index 568ad01..a555126 100644
Binary files a/hotspot/.hg/store/data/src/os/solaris/vm/os_thread__solaris.hpp.i and b/hotspot/.hg/store/data/src/os/solaris/vm/os_thread__solaris.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.hpp.i b/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.hpp.i
index 55536d1..01111b7 100644
Binary files a/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.hpp.i and b/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i
index 34dff40..fe5030b 100644
Binary files a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i and b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.ad.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.ad.i
index 7accbbe..dd620d9 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.ad.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.ad.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.ad.i
index f3ea081..be50ccf 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.ad.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i
index 3e02498..47af542 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm_structs__bsd__x86.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm_structs__bsd__x86.hpp.i
index 98ef22f..3bd9198 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm_structs__bsd__x86.hpp.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm_structs__bsd__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i
index c410c42..9d9130d 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__sparc/vm/os__linux__sparc.cpp.i b/hotspot/.hg/store/data/src/os__cpu/linux__sparc/vm/os__linux__sparc.cpp.i
index 9305bc0..ad6e2ea 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__sparc/vm/os__linux__sparc.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/linux__sparc/vm/os__linux__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i
index 17cb285..e8e76f2 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i and b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i
index a787b61..29d014d 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i and b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/os__linux__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/os__linux__x86.cpp.i
index 9a90b3c..00f48fb 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/os__linux__x86.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/os__linux__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/os__linux__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/os__linux__zero.cpp.i
index e56b195..d378089 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/os__linux__zero.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/os__linux__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/os__solaris__sparc.cpp.i b/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/os__solaris__sparc.cpp.i
index 70bb2eb..76418e1 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/os__solaris__sparc.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/os__solaris__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/os__solaris__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/os__solaris__x86.cpp.i
index 07fbaae..490d58d 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/os__solaris__x86.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/os__solaris__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i
index c772f0c..442edbc 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.il.i b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.il.i
index cf6a937..529def3 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.il.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.il.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i
index 49a2bb6..f369e05 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.il.i b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.il.i
index fc42c64..ca747c6 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.il.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.il.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/os__windows__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/os__windows__x86.cpp.i
index 0e0ef49..646f605 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/os__windows__x86.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/os__windows__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__32.ad.i b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__32.ad.i
index 7956ea1..79e0bc2 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__32.ad.i and b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__64.ad.i b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__64.ad.i
index dedc9c3..c630e36 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__64.ad.i and b/hotspot/.hg/store/data/src/os__cpu/windows__x86/vm/windows__x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_compilation.java.i b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_compilation.java.i
index 32b80ed..5d88033 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_compilation.java.i and b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_compilation.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i
index d14183f..0d01a1b 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i and b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_project_creator/_build_config.java.i b/hotspot/.hg/store/data/src/share/tools/_project_creator/_build_config.java.i
index 12721ed..381f4b8 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_project_creator/_build_config.java.i and b/hotspot/.hg/store/data/src/share/tools/_project_creator/_build_config.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/hsdis/hsdis.c.i b/hotspot/.hg/store/data/src/share/tools/hsdis/hsdis.c.i
index d65f8a4..4cc06fc 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/hsdis/hsdis.c.i and b/hotspot/.hg/store/data/src/share/tools/hsdis/hsdis.c.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.cpp.i
index 0ea1711..8ef628d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i
index 67b8ac5..c9fb02f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___canonicalizer.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i
index aae02f1..5d1e13e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i
index 11afce2..4d87453 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.cpp.i
index 2ef1cda..3b20f06 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.hpp.i
index cd64237..dc84fd5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___i_r.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i
index 4b6a2f1..d541b18 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.cpp.i
index 3569e36..0764caf 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.hpp.i
index f396184..24ff098 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction_printer.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i
index 2a4945d..8a410e2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i
index bda01ce..139c8e3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i
index 6c0a6e1..7288829 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i
index 9e2879b..ed6f6eb 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i
index de487ea..90253ee 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.hpp.i
index aada85d..20ac61f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i
index cd9b97e..d898c67 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i
index a9cb18d..96e24ab 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___optimizer.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___optimizer.cpp.i
index 139e20d..c18c111 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___optimizer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___optimizer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i
index 9b08f56..1340e76 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.cpp.i
index 39c04e0..b2170d7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.hpp.i
index ebd1fbc..1aa2b61 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___value_map.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/bc_escape_analyzer.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/bc_escape_analyzer.cpp.i
index db684c2..cd5a6b1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/bc_escape_analyzer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/bc_escape_analyzer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i
index c435494..5598dde 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/dictionary.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/dictionary.cpp.i
index e7abfa4..4983dfa 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/dictionary.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/dictionary.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i
index 91180a8..ddfa3c6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i
index ed6b79c..43c2174 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i
index deac44c..025aeb6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i
index 915635c..91a3a91 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/compiled_i_c.cpp.i b/hotspot/.hg/store/data/src/share/vm/code/compiled_i_c.cpp.i
index d83672b..ada94a8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/compiled_i_c.cpp.i and b/hotspot/.hg/store/data/src/share/vm/code/compiled_i_c.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i b/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i
index 1af7175..c4098c7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i and b/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i b/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i
index f60fb30..8d5fa23 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i and b/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i
index 8f23ac3..9355080 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i and b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i
index 21cb5f0..566f0de 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i and b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i
index 55dfdb6..1174831 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.cpp.i
index 9556e77..6562a98 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i
index 3ead354..2297b0f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i
index 2a23b59..90811b2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i
index eeb64c9..c5e5926 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i
index 3ced368..4917eb6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.inline.hpp.i
index a27d7eb..ce22398 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i
index 97bd304..1506293 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.hpp.i
index 28210e7..4f55be0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i
index f1b775f..7de5ff8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i
index 9805537..c2adf42 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d
index 8dbcbf4..7107f3f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i
index 8b0d65c..e6a9d42 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i
index 1ca6fad..ad62cc5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i
index 98b9e0f..5fc7f54 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i
index 03bb490..31f3172 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.hpp.i
index 2ef1448..f211775 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_evac_failure.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_evac_failure.hpp.i
index 5249a98..59cb98c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_evac_failure.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_evac_failure.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i
index 14db12b..0cc20eb 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_mark_sweep.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i
index 0fec6e9..428cddc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i
index 9e54aff..bc3bc69 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_monitoring_support.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i
index 262961a..53d4f13 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.inline.hpp.i
index 51997df..71ea822 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i
index 02fde55..4926ef4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.hpp.i
index efabe5b..f0b48d4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.inline.hpp.i
index 638ee23..03df88a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_rem_set.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i
index 17840ce..1cc1f79 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i
index a979631..02fd8ee 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.inline.hpp.i
index 35d243d..3aa684a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i
index 743db90..821c91e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_set.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/surv_rate_group.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/surv_rate_group.cpp.i
index 7641c33..c20c334 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/surv_rate_group.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/surv_rate_group.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i
index 05a9bb5..70df55b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm_structs__g1.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm_structs__g1.hpp.i
index 81ce2b6..01777f1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm_structs__g1.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm_structs__g1.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_new_generation.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_new_generation.cpp.i
index 4c1a6dc..ca78496 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_new_generation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_new_generation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i
index b173548..741aa93 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i
index 12623e2..1f4aedc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.inline.hpp.i
index eaf6a6e..de2a08e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i
index 4b81447..e67f64d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.hpp.i
index caae593..7b9a347 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i
index 716d248..972a578 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.hpp.i
index 71ab5bc..91f8eed 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i
index 715f9e9..cb12905 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.hpp.i
index bdd1eb8..7d1bbe1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.inline.hpp.i
index 4dbc92b..ba2898a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_promotion_manager.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i
index de2c43e..740b6dd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.hpp.i
index 75fcb58..ef4d614 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.inline.hpp.i
index ddcfe18..521c038 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_scavenge.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i
index 95cae12..b282197 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i
index dda97c5..1950085 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i
index 6749973..c66a895 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i
index 43a0cf6..adf5e02 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.hpp.i
index 4e6372c..12688e2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/gc_cause.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i
index 085a4f8..4e9191f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/card_table_mod_ref_b_s.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/card_table_mod_ref_b_s.hpp.i
index 5158788..2638d46 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/card_table_mod_ref_b_s.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/card_table_mod_ref_b_s.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.cpp.i
index 6acd12b..b911c50 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.hpp.i
index 381065d..d774431 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/card_table_r_s.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/compacting_perm_gen_gen.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/compacting_perm_gen_gen.cpp.i
index 69521d3..631f298 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/compacting_perm_gen_gen.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/compacting_perm_gen_gen.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i
index 8637d35..9d0c16d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.cpp.i
index 493a957..aee5aaf 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i
index 19653c9..7f84a81 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.inline.hpp.i
index fae7784..cf2a679 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i
index b17fbec..1c7aed9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i
index 57f6624..429125c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i
index 0fc03df..dca5091 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i
index 0223aec..be5c57f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/array_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/array_klass.cpp.i
index 08e0915..c2b97ab 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/array_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/array_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i
index f7454d6..220f3c8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/array_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i
index 2375e21..51f8308 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i
index c866db2..2b6837a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i
index 4935531..c727711 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i
index 0d76649..b5a612e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/klass.cpp.i
index df5e10e..92093e3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/klass.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/klass.hpp.i
index 0f2dec5..ec6cb92 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/klass.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/klass.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i
index 50965dd..0c32cbe 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/method_oop.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/method_oop.hpp.i
index 576ff3c..b0f6934 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/method_oop.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/method_oop.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/obj_array_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/obj_array_klass.cpp.i
index 65f9a6a..ee54b9e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/obj_array_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/obj_array_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i
index c2b1ffb..19a12b4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i
index 57cf66e..6dce37e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i
index dbec344..2ec2966 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i
index 1378048..e470810 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/callnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/callnode.cpp.i
index 4278f7d..87a9dca 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/callnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/callnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i
index 88ff4ee..fe98d84 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/chaitin.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/chaitin.cpp.i
index d0be694..aa76827 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/chaitin.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/chaitin.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i
index d18033d..130c203 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i
index 4f6c044..ade227b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i
index 927689e..a4b5153 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/connode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i
index 4c224e7..7039b04 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i
index 3a97c3e..fe2ce36 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/escape.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i
index 2c46ff9..4bcb593 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/escape.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i
index 4cf17f5..af064e4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i
index 4c6c4f7..8269aa2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i
index 5fb0ba8..40461d4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i
index c175086..3daf349 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i
index c27a216..0765374 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i
index 4b51ace..4bc061e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i
index 1c85901..8380092 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i
index 1456878..832c308 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i
index 92735fc..a987221 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/parse_helper.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/parse_helper.cpp.i
index f92a38d..e1b6790 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/parse_helper.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/parse_helper.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/phase.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/phase.cpp.i
index 7918e5a..f2b3aa0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/phase.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/phase.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/phase.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/phase.hpp.i
index 14837d2..63c2971 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/phase.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/phase.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i
index 53876a5..0a5f968 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i
index 0455e3a..10969b5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i
index 0249c3d..f25d85c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i
index da4f519..3c83568 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.cpp.i
index 4b6b585..9759dba 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.hpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.hpp.i
index 453ca9d..b18aede 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.hpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_thread_state.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i
index 7046473..768dc2c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.hpp.i b/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.hpp.i
index ab02b54..b83fcdd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.hpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i
index 76fb8de..02ac98d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i
index 9cd8f8e..62a5f57 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i
index 07a5357..7cff650 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.cpp.i
index 8fb8909..687f9d3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i
index b3c5da4..a0cfa06 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i
index 2bb1238..ece6248 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/dtrace_j_s_d_t.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/dtrace_j_s_d_t.cpp.i
index b405e84..3df4f6a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/dtrace_j_s_d_t.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/dtrace_j_s_d_t.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i
index 9e74d5b..ef3c3a3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/frame.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i
index df38bcf..9db9205 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/globals.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/globals.cpp.i
index 4a27bb8..3c579ed 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/globals.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/globals.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i
index 260eb69..99f2bb5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/globals__ext.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/globals__ext.hpp.i
index 2bc55b3..feaf0d0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/globals__ext.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/globals__ext.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/init.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/init.cpp.i
index ae6a430..9debbcc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/init.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/init.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i
index 0b8a85e..73bd3a7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i
index 68623fb..19ac6ae 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i
index 9b6f6f5..2ad020d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i
index f643325..59d521e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i
index 3314b8b..651154c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i
index 9819dc2..0664055 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.hpp.i
index 149b8dc..5d6429f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i
index 94cb274..8e50353 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i
index 345c735..4844086 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i
index a89f1f4..bc1e424 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i
index bc9c6e8..db24912 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/sweeper.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/sweeper.cpp.i
index b60ed8d..5508770 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/sweeper.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/sweeper.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i
index 78e06cb..77b39f7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i
index b774583..5affafd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i
index a0e45b6..f34d0ee 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i
index 0503ed8..9004bdf 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i
index 3fdfe65..254fef8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i
index 09d7667..2fa6bf1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.cpp.i
index f9d04fb..e435d32 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.hpp.i b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.hpp.i
index b3e95ef..2f128a9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.hpp.i and b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_argument.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.cpp.i
index 9915c43..7ae8a37 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.hpp.i b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.hpp.i
index c792ee9..9a86ed3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.hpp.i and b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_command.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.cpp.i
index 8d8c31a..9b4dede 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.hpp.i b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.hpp.i
index d1c5940..7a14eb6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.hpp.i and b/hotspot/.hg/store/data/src/share/vm/services/diagnostic_framework.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i
index b7b49f8..7f66ba2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i
index c404443..0354f4e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i and b/hotspot/.hg/store/data/src/share/vm/services/g1_memory_pool.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i
index 4801330..f1efd0a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.hpp.i b/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.hpp.i
index bfb3151..72bd156 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.hpp.i and b/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/management.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/management.cpp.i
index 4f4040e..51c2d75 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/management.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/management.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i
index 487cd0e..45abc22 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/memory_manager.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/memory_manager.hpp.i b/hotspot/.hg/store/data/src/share/vm/services/memory_manager.hpp.i
index f778e63..b8bd078 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/memory_manager.hpp.i and b/hotspot/.hg/store/data/src/share/vm/services/memory_manager.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/trace/trace_macros.hpp.i b/hotspot/.hg/store/data/src/share/vm/trace/trace_macros.hpp.i
index da486b5..17e8574 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/trace/trace_macros.hpp.i and b/hotspot/.hg/store/data/src/share/vm/trace/trace_macros.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.inline.hpp.i
index fbfb5f0..b73018d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i
index 2f5f3b6..6c521a8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/debug.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/debug.hpp.i
index 0316b89..ce01b2e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/debug.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/debug.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i
index 9eccb7f..841e94f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i
index f213b67..7117f84 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/decoder__elf.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/decoder__elf.hpp.i
index 726b470..92e5987 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/decoder__elf.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/decoder__elf.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i
index 314fc17..c7ed0a4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/events.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/events.hpp.i
index adb6893..2033316 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/events.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/events.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i
index 4dd5650..be9c206 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i
index 9030d14..e98e569 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i
index 6e392a4..c1b0166 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i
index 1590434..b481c82 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i
index d6b538d..7e3fdac 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.hpp.i
index 2803530..8f498d9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/hashtable.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.cpp.i
index 3677cd6..195a7f2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.hpp.i
index 916018b..7935463 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/number_seq.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.cpp.i
index cf3bb1d..3e91d40 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i
index d78ede4..68a84f7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.hpp.i
index f5d3de0..150246e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/xmlstream.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/xmlstream.cpp.i
index cebf1a8..ccaf3c1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/xmlstream.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/xmlstream.cpp.i differ
diff --git a/hotspot/.hg/store/data/test/_makefile.i b/hotspot/.hg/store/data/test/_makefile.i
index 85ca7ce..da84174 100644
Binary files a/hotspot/.hg/store/data/test/_makefile.i and b/hotspot/.hg/store/data/test/_makefile.i differ
diff --git a/hotspot/.hg/store/data/~2ehgtags.i b/hotspot/.hg/store/data/~2ehgtags.i
index 12500c6..2e25dcc 100644
Binary files a/hotspot/.hg/store/data/~2ehgtags.i and b/hotspot/.hg/store/data/~2ehgtags.i differ
diff --git a/hotspot/.hg/store/fncache b/hotspot/.hg/store/fncache
index 4c636a2..a9d710a 100644
--- a/hotspot/.hg/store/fncache
+++ b/hotspot/.hg/store/fncache
@@ -1,4 +1,4 @@
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLoadInstruction.java.i
+data/src/share/vm/memory/universe.cpp.i
data/make/windows/projectfiles/compiler2/vm.def.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadContext.java.i
data/make/windows/platform_ia64.i
@@ -9,23 +9,25 @@ data/src/cpu/zero/vm/nativeInst_zero.hpp.i
data/src/cpu/zero/vm/vmreg_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedByte.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FlushDecoder.java.i
+data/src/share/vm/code/vmreg.cpp.i
data/test/compiler/5091921/Test6897150.java.i
-data/src/share/vm/opto/regalloc.cpp.i
+data/src/share/vm/services/heapDumper.cpp.i
data/src/os_cpu/windows_x86/vm/os_windows_x86.inline.hpp.i
+data/src/share/vm/opto/subnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberVisitor.java.i
data/src/share/vm/shark/sharkFunction.hpp.i
data/test/compiler/5091921/Test6186134.java.i
-data/src/cpu/zero/vm/frame_zero.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java.i
data/test/compiler/5091921/Test6850611.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVrInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java.i
+data/src/share/vm/oops/typeArrayKlass.cpp.i
data/src/share/vm/utilities/quickSort.cpp.i
-data/test/Makefile.i
+data/src/share/vm/prims/jni.h.i
data/src/cpu/x86/vm/vm_version_x86.hpp.i
data/src/os/windows/vm/attachListener_windows.cpp.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/build.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Thread.java.i
data/src/cpu/zero/vm/debug_zero.cpp.i
@@ -40,11 +42,12 @@ data/src/share/vm/prims/jvmtiThreadState.hpp.i
data/src/os/windows/vm/chaitin_windows.cpp.i
data/src/os/bsd/vm/dtraceJSDT_bsd.cpp.i
data/src/share/vm/interpreter/linkResolver.cpp.i
+data/src/share/tools/MakeDeps/Macro.java.i
data/agent/src/os/linux/elfmacros.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegisters.java.i
data/src/os/windows/vm/osThread_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/NonConcreteMethodImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java.i
+data/test/compiler/6716441/Tester.java.i
data/test/compiler/6805724/Test6805724.java.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalPub.java.i
@@ -52,10 +55,12 @@ data/agent/src/share/classes/sun/jvm/hotspot/ui/SAListener.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/Bundle.properties.i
data/build/linux/makefiles/adjust-mflags.sh.i
data/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Disassembler.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/InstructionDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java.i
+data/src/cpu/zero/vm/bytecodes_zero.hpp.i
data/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSetBase.java.i
data/src/os/windows/vm/os_windows.cpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/VMVersionInfoPanel.java.i
@@ -63,11 +68,13 @@ data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGener
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedShort.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/DoubleTreeNodeAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Debugger.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTracePanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java.i
data/make/linux/makefiles/sparc.make.i
+data/agent/doc/ReadMe-JavaScript.text.i
data/make/solaris/makefiles/mapfile-vers.i
+data/src/share/vm/interpreter/templateInterpreterGenerator.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32DebuggerLocal.java.i
-data/src/os/solaris/dtrace/libjvm_db.h.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC8.java.i
data/agent/make/heapdumpwindbg.bat.i
data/src/share/vm/runtime/hpi.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisterInstruction.java.i
@@ -78,34 +85,31 @@ data/agent/src/os/solaris/dbx/proc_service_2.h.i
data/src/share/vm/services/gcNotifier.hpp.i
data/src/cpu/x86/vm/c1_FrameMap_x86.hpp.i
data/src/share/vm/shark/sharkStateScanner.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java.i
data/src/cpu/x86/vm/bytes_x86.hpp.i
data/src/share/vm/opto/adlcVMDeps.hpp.i
data/test/compiler/6663854/Test6663854.java.i
data/src/share/vm/runtime/perfData.cpp.i
data/src/share/vm/utilities/exceptions.cpp.i
-data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java.i
data/make/jprt.config.i
-data/agent/test/jdi/runjdb.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/PackageNameFilter.java.i
data/src/share/vm/code/dependencies.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadFactory.java.i
data/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp.i
-data/src/share/vm/trace/traceMacros.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedChar.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java.i
data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp.i
+data/src/share/vm/utilities/yieldingWorkgroup.cpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties.i
data/agent/make/jsdbwindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxWeakExternalRecord.java.i
data/src/share/vm/classfile/resolutionErrors.hpp.i
data/src/share/vm/runtime/rframe.cpp.i
data/src/os/windows/vm/os_windows.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java.i
data/src/share/vm/prims/jvmtiManageCapabilities.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicType.java.i
data/make/solaris/reorder.sh.i
@@ -113,14 +117,14 @@ data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/DeadlockDetector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Register.java.i
data/src/share/vm/gc_implementation/shared/gcUtil.hpp.i
+data/src/share/vm/utilities/array.hpp.i
data/src/share/vm/c1/c1_Compiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties.i
data/src/share/vm/ci/ciMethodBlocks.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/WorkerThread.java.i
-data/make/windows/get_msc_ver.sh.i
data/make/windows/projectfiles/kernel/vm.dsw.i
data/agent/src/share/classes/com/sun/java/swing/ui/OkCancelDialog.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties.i
+data/src/share/vm/opto/memnode.cpp.i
data/src/share/vm/prims/jvmtiEnvFill.java.i
data/src/share/vm/memory/defNewGeneration.inline.hpp.i
data/src/share/vm/utilities/bitMap.cpp.i
@@ -129,14 +133,16 @@ data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/co
data/make/bsd/platform_i486.suncc.i
data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp.i
data/src/share/vm/runtime/threadLocalStorage.hpp.i
+data/src/share/vm/code/location.hpp.i
data/src/os/solaris/vm/os_solaris.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlassKlass.java.i
data/src/share/vm/adlc/dfa.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/NotInHeapException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CStringTreeNodeAdapter.java.i
-data/build/windows/makefiles/debug.make.i
+data/make/solaris/makefiles/reorder_CORE_i486.i
data/src/share/tools/IdealGraphVisualizer/Util/manifest.mf.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java.i
+data/src/share/vm/memory/gcLocker.cpp.i
+data/src/share/vm/shark/sharkNativeWrapper.cpp.i
data/build/windows/projectfiles/compiler1/Makefile.i
data/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp.i
data/src/share/vm/runtime/perfMemory.hpp.i
@@ -145,15 +151,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcL
data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java.i
data/src/share/vm/memory/genOopClosures.hpp.i
data/make/solaris/makefiles/amd64.make.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java.i
data/src/share/vm/ci/ciNullObject.hpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java.i
+data/src/share/vm/runtime/globals.hpp.i
data/src/share/vm/runtime/init.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java.i
+data/agent/src/os/win32/SwDbgSrv.dsw.i
data/src/share/vm/code/scopeDesc.cpp.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties.i
+data/src/share/vm/runtime/fprofiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMemoryInstruction.java.i
data/src/share/vm/oops/symbolOop.hpp.i
@@ -164,44 +170,43 @@ data/src/share/vm/prims/jvmtiCodeBlobEvents.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp.i
+data/src/os/windows/launcher/java_md.c.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Helper.java.i
data/agent/make/jhistoproc.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadFactory.java.i
data/src/share/vm/memory/genRemSet.cpp.i
data/src/share/vm/runtime/reflectionUtils.cpp.i
-data/agent/test/jdi/serialvm.java.i
data/src/share/vm/opto/memnode.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPArithmeticDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBaseClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java.i
data/src/share/vm/runtime/os.cpp.i
data/build/solaris/makefiles/buildtree.make.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties.i
data/agent/make/index.html.i
data/make/bsd/makefiles/mapfile-vers-jsig.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.gif.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/SlotLayout.java.i
data/src/share/vm/opto/phaseX.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java.i
+data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java.i
data/src/os/bsd/dtrace/hs_private.d.i
-data/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp.i
+data/agent/make/pstackwindbg.bat.i
data/agent/test/libproc/Makefile.i
-data/make/solaris/makefiles/reorder_COMPILER2_sparc.i
-data/src/share/vm/gc_implementation/g1/survRateGroup.cpp.i
+data/agent/make/heapdumpproc64.sh.i
+data/src/cpu/sparc/vm/c2_globals_sparc.hpp.i
+data/src/share/vm/memory/filemap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeMultiANewArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSaveInstruction.java.i
-data/src/share/vm/c1/c1_CodeStubs.hpp.i
-data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java.i
+data/agent/src/os/linux/ps_core.c.i
data/src/os/bsd/vm/decoder_bsd.cpp.i
data/agent/test/jdi/runsa.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/JmplDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/triangle.png.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java.i
data/src/share/vm/memory/barrierSet.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxOopHandle.java.i
+data/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DLLCharacteristics.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32CDebugger.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java.i
@@ -213,7 +218,8 @@ data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionFlags.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompressedLineNumberReadStream.java.i
data/src/cpu/x86/vm/globals_x86.hpp.i
-data/src/share/vm/shark/sharkFunction.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFlushInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidValueImpl.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp.i
@@ -222,15 +228,15 @@ data/src/share/vm/runtime/extendedPC.hpp.i
data/make/solaris/makefiles/build_vm_def.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64Thread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java.i
data/test/compiler/5091921/Test7005594.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.i
+data/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java.i
data/src/share/vm/adlc/arena.hpp.i
data/src/os/windows/vm/dtraceJSDT_windows.cpp.i
data/make/linux/platform_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindCrashesAction.java.i
-data/src/cpu/x86/vm/icache_x86.hpp.i
+data/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FlushwInstruction.java.i
data/agent/make/hsdb.sh.i
@@ -238,15 +244,14 @@ data/src/share/vm/runtime/relocator.cpp.i
data/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp.i
data/src/share/vm/ci/ciTypeArrayKlassKlass.cpp.i
data/test/compiler/6896727/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/JCharField.java.i
+data/src/cpu/x86/vm/dump_x86_64.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java.i
data/agent/src/os/solaris/proc/salibproc.h.i
data/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java.i
data/src/share/vm/runtime/park.cpp.i
data/src/share/vm/opto/c2_globals.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/BitData.java.i
-data/src/share/tools/launcher/wildcard.h.i
data/make/solaris/platform_sparcv9.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java.i
data/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.i
@@ -255,30 +260,31 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java.i
data/test/compiler/6946040/TestCharShortByteSwap.java.i
+data/src/share/tools/whitebox/sun/hotspot/WhiteBox.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/MonitorValue.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/UnimpDecoder.java.i
data/src/os/solaris/vm/decoder_solaris.cpp.i
data/src/share/vm/prims/jvmtiHpp.xsl.i
-data/make/solaris/makefiles/top.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/UnalignedAddressException.java.i
-data/src/share/vm/adlc/formsopt.hpp.i
+data/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/AddressTreeNodeAdapter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java.i
+data/src/share/vm/shark/sharkBuilder.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegisters.java.i
data/agent/make/finalizerinfowindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegister.java.i
data/src/cpu/sparc/vm/frame_sparc.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlassKlass.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64/Win32IA64JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/SimpleTreeTableModel.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java.i
data/build/linux/makefiles/mapfile-vers-debug.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDescEnums.java.i
data/src/share/vm/classfile/classFileStream.cpp.i
data/build/solaris/makefiles/gcc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java.i
-data/test/compiler/6716441/Tester.java.i
-data/src/share/vm/classfile/classFileStream.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp.i
data/src/share/vm/memory/gcLocker.inline.hpp.i
data/build/linux/platform_sparc.i
data/agent/src/os/linux/salibelf.h.i
@@ -288,11 +294,11 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisterIns
data/src/share/vm/asm/codeBuffer.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/ActionManager.java.i
data/make/linux/makefiles/mapfile-vers-jsig.i
-data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/genfiles.properties.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java.i
-data/agent/make/jcorewindbg64.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WrprDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorDecoder.java.i
data/src/share/vm/runtime/java.cpp.i
-data/src/os/bsd/vm/osThread_bsd.hpp.i
+data/src/share/vm/opto/ifnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java.i
data/src/share/vm/gc_implementation/shared/generationCounters.hpp.i
@@ -313,15 +319,19 @@ data/make/linux/makefiles/shark.make.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompiledICHolder.java.i
data/src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java.i
+data/src/share/vm/shark/sharkCacheDecache.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetPut.java.i
-data/src/os/windows/vm/interfaceSupport_windows.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties.i
+data/src/share/vm/opto/parse.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java.i
-data/src/os/linux/vm/mutex_linux.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceStoreDecoder.java.i
+data/src/share/vm/oops/oop.psgc.inline.hpp.i
+data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp.i
+data/src/cpu/x86/vm/vmStructs_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java.i
data/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp.i
data/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp.i
+data/src/share/vm/interpreter/interpreter.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java.i
data/src/share/vm/oops/cpCacheKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java.i
@@ -337,9 +347,9 @@ data/src/os/bsd/vm/os_bsd.inline.hpp.i
data/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp.i
data/make/solaris/platform_sparc.i
data/src/cpu/sparc/vm/assembler_sparc.hpp.i
+data/src/share/vm/services/memoryService.hpp.i
data/src/cpu/sparc/vm/disassembler_sparc.cpp.i
data/src/share/vm/oops/constantPoolKlass.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicFieldWrapper.java.i
data/agent/src/os/win32/nt4internals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastIAccess0.java.i
@@ -348,48 +358,44 @@ data/src/share/vm/opto/live.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java.i
data/src/share/vm/code/jvmticmlr.h.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisters.java.i
+data/make/linux/platform_i486.suncc.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFLineNumber.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCUnimpInstruction.java.i
data/test/compiler/6916644/Test6916644.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDesc.java.i
data/src/share/vm/runtime/synchronizer.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisters.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java.i
+data/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp.i
data/agent/test/jdi/sagtarg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LocalSym.java.i
data/agent/src/share/classes/com/sun/java/swing/action/DelegateAction.java.i
data/src/cpu/zero/vm/vm_version_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/JavaSE6ScriptEngine.java.i
data/src/cpu/x86/vm/interp_masm_x86_64.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java.i
-data/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp.i
-data/src/os/windows/vm/mutex_windows.inline.hpp.i
-data/src/share/vm/ci/ciSignature.hpp.i
+data/src/share/vm/shark/sharkIntrinsics.cpp.i
+data/src/share/vm/memory/barrierSet.inline.hpp.i
+data/make/bsd/makefiles/ppc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBTree.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceSwapDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompiledICHolderKlass.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java.i
+data/build/windows/makefiles/shared.make.i
data/src/cpu/x86/vm/methodHandles_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties.i
data/build/windows/projectfiles/compiler1/vm.def.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/IntegerBranchDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlassKlass.java.i
data/src/share/vm/runtime/frame.cpp.i
data/src/share/vm/gc_implementation/g1/g1OopClosures.hpp.i
data/src/os/linux/vm/interfaceSupport_linux.hpp.i
-data/src/share/vm/memory/tenuredGeneration.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolEnums.java.i
data/build/solaris/makefiles/reorder_TIERED_amd64.i
data/agent/test/libproc/libproctest64.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp.i
+data/src/share/vm/adlc/archDesc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/MemRegion.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Opcodes.java.i
data/src/share/vm/compiler/oopMap.cpp.i
data/agent/src/os/win32/toolHelp.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.xml.i
@@ -399,44 +405,43 @@ data/src/share/vm/ci/ciCallProfile.hpp.i
data/src/share/vm/interpreter/oopMapCache.hpp.i
data/src/share/vm/code/exceptionHandlerTable.cpp.i
data/agent/src/share/native/jvmdi/sa.dsw.i
-data/agent/make/dumpflagswindbg64.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterPart.java.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicType.java.i
data/src/share/vm/oops/methodOop.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueContainer.java.i
-data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp.i
+data/test/compiler/7090976/Test7090976.java.i
+data/build/windows/makefiles/generated.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPMoveInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form.i
data/src/share/vm/memory/genRemSet.hpp.i
data/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp.i
-data/src/share/vm/c1/c1_Runtime1.hpp.i
-data/src/share/vm/oops/instanceMirrorKlass.hpp.i
data/agent/src/os/linux/LinuxDebuggerLocal.c.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java.i
data/src/share/vm/ci/ciStreams.hpp.i
data/src/os/bsd/vm/vmError_bsd.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaMethod.java.i
data/src/share/vm/prims/jvmtiGen.java.i
-data/agent/make/finalizerinfowindbg64.bat.i
+data/make/windows/makefiles/projectcreator.make.i
data/src/os/solaris/vm/objectMonitor_solaris.cpp.i
data/src/share/vm/oops/constantPoolOop.cpp.i
data/test/runtime/6929067/invoke.c.i
data/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicNarrowOopField.java.i
data/src/share/vm/memory/blockOffsetTable.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties.i
data/agent/src/os/bsd/libproc_impl.h.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadContext.java.i
data/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp.i
data/test/compiler/6860469/Test.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties.i
data/src/cpu/sparc/vm/stubRoutines_sparc.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSets.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Delete24.gif.i
-data/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml.i
+data/src/share/vm/prims/jvmtiEventController.hpp.i
data/src/os/solaris/vm/dtraceJSDT_solaris.cpp.i
+data/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp.i
data/build/linux/makefiles/vm.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java.i
+data/src/share/vm/opto/loopTransform.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/c1/Runtime1.java.i
data/agent/src/os/solaris/proc/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java.i
@@ -444,9 +449,7 @@ data/src/share/vm/utilities/bitMap.hpp.i
data/src/share/vm/oops/symbol.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeValue.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethodKlass.java.i
-data/agent/src/os/win32/ioUtils.hpp.i
-data/make/bsd/makefiles/zero.make.i
-data/test/compiler/7048332/Test7048332.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/GlobalSym.java.i
data/src/share/vm/memory/allocation.inline.hpp.i
data/src/cpu/x86/vm/vm_version_x86_64.cpp.i
@@ -470,34 +473,36 @@ data/src/cpu/x86/vm/assembler_x86_64.inline.hpp.i
data/src/os/windows/vm/objectMonitor_windows.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JInternalFrameWrapper.java.i
-data/agent/make/clhsdbwindbg64.bat.i
+data/src/share/vm/classfile/vmSymbols.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.properties.i
data/src/share/vm/asm/codeBuffer.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerField.java.i
+data/src/cpu/x86/vm/stubRoutines_x86_64.hpp.i
data/src/share/vm/c1/c1_globals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java.i
data/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java.i
data/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp.i
data/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp.i
data/src/share/vm/shark/sharkValue.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegisters.java.i
data/build/windows/jvmexp.lcf.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java.i
+data/src/share/vm/memory/genCollectedHeap.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp.i
data/agent/make/bugspot.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicNamedFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Page.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/TypeImpl.java.i
data/src/share/vm/prims/methodHandles.hpp.i
+data/src/share/vm/runtime/deoptimization.cpp.i
data/src/share/vm/runtime/reflection.hpp.i
-data/src/cpu/sparc/vm/vmreg_sparc.hpp.i
+data/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp.i
data/src/cpu/x86/vm/vmreg_x86.hpp.i
data/agent/src/os/linux/libproc_impl.h.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFile.java.i
data/src/os/bsd/vm/os_share_bsd.hpp.i
data/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPreComp.java.i
+data/make/linux/makefiles/debug.make.i
data/src/share/vm/c1/c1_Compiler.cpp.i
data/src/share/vm/memory/generationSpec.hpp.i
data/make/linux/makefiles/dtrace.make.i
@@ -505,12 +510,12 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeVisitor.java.i
data/make/cscope.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadContext.java.i
data/src/os/solaris/vm/attachListener_solaris.cpp.i
-data/make/bsd/makefiles/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadFactory.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeRootInputs.filter.i
data/src/share/vm/utilities/elfStringTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LineInfo.java.i
data/make/linux/makefiles/vm.make.i
+data/src/share/vm/gc_implementation/shared/coTracker.cpp.i
data/src/share/vm/oops/cpCacheKlass.cpp.i
data/src/share/vm/runtime/stackValueCollection.hpp.i
data/agent/src/os/solaris/dbx/svc_agent_dbx.cpp.i
@@ -523,24 +528,25 @@ data/src/share/vm/interpreter/invocationCounter.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/PageCache.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIllegalInstruction.java.i
data/src/share/vm/oops/methodKlass.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ShortField.java.i
-data/build/sa.files.i
+data/src/share/vm/shark/sharkState.hpp.i
data/agent/src/os/bsd/Makefile.i
data/src/cpu/sparc/vm/disassembler_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java.i
data/build/solaris/makefiles/tiered.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java.i
data/src/os_cpu/windows_x86/vm/os_windows_x86.cpp.i
data/src/cpu/x86/vm/vtableStubs_x86_32.cpp.i
-data/src/share/vm/utilities/decoder_elf.hpp.i
+data/agent/test/jdi/sasanity.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java.i
data/make/solaris/platform_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SethiDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86JmpInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java.i
data/src/share/vm/opto/domgraph.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/StringTransferable.java.i
data/build/windows/makefiles/fastdebug.make.i
@@ -548,8 +554,6 @@ data/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java.i
data/agent/src/os/win32/nt4internals.hpp.i
data/src/share/vm/runtime/vframeArray.hpp.i
data/src/share/vm/runtime/stubRoutines.hpp.i
-data/agent/make/jsdbwindbg.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java.i
data/src/share/vm/runtime/stackValueCollection.cpp.i
data/agent/make/start-debug-server.i
@@ -560,6 +564,7 @@ data/make/windows/create_obj_files.sh.i
data/src/cpu/x86/vm/dump_x86_32.cpp.i
data/src/share/vm/oops/objArrayKlass.hpp.i
data/build/solaris/makefiles/hp1.make.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/build.xml.i
data/agent/src/share/classes/com/sun/java/swing/action/FileMenu.java.i
data/agent/make/dumpflagsproc64.sh.i
@@ -567,7 +572,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMObjectFactory.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestDebugInfo.java.i
-data/make/bsd/platform_zero.in.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form.i
data/test/compiler/6724218/Test.java.i
data/build/windows/cross_build.bat.i
data/src/share/vm/oops/methodDataOop.hpp.i
@@ -584,10 +589,13 @@ data/agent/src/os/solaris/dbx/shell_imp.h.i
data/build/windows/makefiles/top.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/DefaultScriptObject.java.i
data/build/solaris/makefiles/mapfile-vers-debug.i
-data/src/cpu/x86/vm/frame_x86.hpp.i
-data/src/share/vm/classfile/classFileError.cpp.i
+data/src/cpu/sparc/vm/runtime_sparc.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java.i
+data/test/compiler/5091921/Test6959129.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties.i
+data/test/compiler/6910618/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEMoveDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLoadDecoder.java.i
data/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp.i
data/src/share/vm/runtime/globals.cpp.i
@@ -604,11 +612,11 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeTableswitch.jav
data/src/share/vm/gc_implementation/shared/vmGCOperations.hpp.i
data/agent/src/os/win32/ports.h.i
data/src/share/vm/c1/c1_IR.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReturnInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Registers.java.i
+data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp.i
data/make/bsd/build.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Register.java.i
data/src/share/vm/gc_implementation/shared/markSweep.inline.hpp.i
+data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/Dictionary.java.i
data/src/share/vm/runtime/memprofiler.hpp.i
@@ -621,14 +629,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java
data/agent/src/os/bsd/elfmacros.h.i
data/src/share/vm/code/oopRecorder.cpp.i
data/agent/src/os/win32/Handler.hpp.i
-data/agent/src/os/win32/initWinsock.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java.i
data/build/solaris/makefiles/jvmg.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32CDebugInfoBuilder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java.i
data/make/windows/projectfiles/compiler1/Makefile.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSPermGen.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java.i
+data/src/share/vm/ci/ciSymbol.hpp.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisterInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties.i
data/src/share/tools/IdealGraphVisualizer/Data/manifest.mf.i
data/build/solaris/makefiles/mapfile-vers-jvm_db.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FlushwDecoder.java.i
@@ -640,22 +649,20 @@ data/src/share/vm/services/memoryUsage.hpp.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java.i
data/make/bsd/adlc_updater.i
-data/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf.i
data/src/share/vm/ci/ciTypeArrayKlassKlass.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGenGen.java.i
data/src/share/vm/utilities/globalDefinitions_gcc.hpp.i
data/src/share/vm/c1/c1_Compilation.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java.i
-data/build/solaris/makefiles/reorder_COMPILER2_i486.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java.i
data/src/share/vm/runtime/registerMap.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java.i
data/src/share/vm/utilities/decoder.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPMoveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV8Disassembler.java.i
-data/test/compiler/7116216/StackOverflow.java.i
-data/src/share/vm/opto/phaseX.cpp.i
+data/test/compiler/6832293/Test.java.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java.i
data/src/share/vm/runtime/vmStructs.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/project.properties.i
data/src/share/vm/services/threadService.hpp.i
@@ -665,13 +672,12 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ImpdepInstruction.
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java.i
data/agent/doc/transported_core.html.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/DirectAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/CharTypeImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.gif.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap32.java.i
data/make/solaris/makefiles/fastdebug.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java.i
+data/agent/test/jdi/multivm.java.i
data/src/share/vm/gc_implementation/shared/generationCounters.cpp.i
data/src/share/vm/interpreter/interpreterGenerator.hpp.i
data/make/windows/build.bat.i
@@ -681,35 +687,34 @@ data/build/windows/makefiles/compile.make.i
data/src/share/vm/Xusage.txt.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionHeader.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassLoaderReferenceImpl.java.i
data/src/os/linux/vm/os_share_linux.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathList.java.i
data/src/cpu/zero/vm/interpreterGenerator_zero.hpp.i
data/build/solaris/reorder.sh.i
-data/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp.i
data/make/windows/projectfiles/compiler1/vm.def.i
data/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCFrame.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLdstubInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/breakpoint.png.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java.i
+data/src/cpu/x86/vm/copy_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGoto.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/Immediate.java.i
data/src/os/solaris/dtrace/generateJvmOffsets.cpp.i
data/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPStoreInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMReg.java.i
+data/src/os/linux/vm/c1_globals_linux.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java.i
data/src/cpu/sparc/vm/interpreterRT_sparc.cpp.i
+data/src/share/vm/gc_implementation/g1/heapRegion.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java.i
data/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad.i
data/make/openjdk_distro.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java.i
+data/src/share/vm/runtime/relocator.hpp.i
+data/src/share/tools/hsdis/README.i
data/src/cpu/sparc/vm/jniTypes_sparc.hpp.i
data/src/cpu/sparc/vm/sparc.ad.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties.i
-data/src/cpu/x86/vm/vmreg_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterIndirectAddress.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java.i
data/src/share/vm/opto/parse1.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/RootTreeNodeAdapter.java.i
data/src/share/vm/services/memoryPool.cpp.i
@@ -719,17 +724,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxThreadFactory.java.
data/test/runtime/7100935/TestShortArraycopy.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatform.java.i
+data/src/cpu/sparc/vm/interpreter_sparc.hpp.i
data/test/compiler/6700047/Test6700047.java.i
data/agent/src/share/classes/META-INF/services/com.sun.jdi.connect.Connector.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatDecoder.java.i
data/build/solaris/makefiles/adlc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbol.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectListPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/MethodCallable.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBColor.java.i
-data/src/os/windows/vm/c2_globals_windows.hpp.i
+data/make/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ContigPermSpace.java.i
data/src/share/vm/classfile/loaderConstraints.hpp.i
@@ -743,18 +746,16 @@ data/build/solaris/makefiles/cscope.make.i
data/src/share/vm/utilities/errorReporter.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java.i
data/src/cpu/x86/vm/c2_init_x86.cpp.i
-data/src/share/vm/opto/output.cpp.i
+data/test/compiler/6987555/Test6987555.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/JavaStackTraceAction.java.i
+data/agent/test/jdi/jstack64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/MirrorImpl.java.i
-data/src/os_cpu/linux_sparc/vm/globals_linux_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java.i
data/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp.i
data/src/cpu/zero/vm/interpreterRT_zero.hpp.i
data/build/linux/makefiles/debug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/arrow.png.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArrayKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/DebugServer.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugTypes.java.i
data/src/share/tools/ProjectCreator/Macro.java.i
@@ -763,27 +764,25 @@ data/src/share/vm/code/compiledIC.hpp.i
data/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/CPPExpressions.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObjectComparator.java.i
-data/make/README.i
data/test/compiler/5091921/Test6985295.java.i
data/src/share/vm/code/pcDesc.cpp.i
data/src/share/vm/gc_implementation/g1/g1RemSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicMemberFunctionType.java.i
+data/src/share/vm/runtime/basicLock.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java.i
-data/make/solaris/makefiles/saproc.make.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml.i
+data/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java.i
+data/src/share/vm/gc_implementation/g1/g1_globals.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/SymbolLookup.java.i
data/build/solaris/makefiles/kernel.make.i
data/src/share/vm/adlc/main.cpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp.i
-data/src/cpu/zero/vm/stack_zero.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties.i
+data/src/os/bsd/dtrace/libjvm_db.c.i
+data/test/runtime/6626217/Test6626217.sh.i
data/agent/src/os/win32/Dispatcher.cpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml.i
-data/build/linux/makefiles/i486.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java.i
data/src/share/tools/ProjectCreator/Util.java.i
data/src/cpu/sparc/vm/templateTable_sparc.cpp.i
@@ -791,16 +790,17 @@ data/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp.i
data/agent/make/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FieldTreeNodeAdapter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java.i
-data/src/cpu/zero/vm/interp_masm_zero.cpp.i
+data/src/share/vm/classfile/loaderConstraints.cpp.i
+data/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp.i
data/agent/test/libproc/README.i
data/agent/src/os/bsd/ps_proc.c.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/LongTreeNodeAdapter.java.i
data/src/share/vm/opto/stringopts.hpp.i
data/test/compiler/6849574/Test.java.i
data/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp.i
+data/src/share/vm/includeDB_gc_parallel.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java.i
-data/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp.i
+data/test/compiler/6880034/Test6880034.java.i
data/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp.i
data/src/share/vm/runtime/hpi.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.gif.i
@@ -814,19 +814,21 @@ data/src/share/vm/runtime/sweeper.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DoubleField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpacePrefetchDecoder.java.i
-data/make/windows/README.i
+data/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp.i
data/src/os/linux/launcher/java_md.h.i
data/make/bsd/makefiles/debug.make.i
data/make/bsd/makefiles/sparc.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassLoaderReferenceImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad.i
+data/src/os/bsd/vm/interfaceSupport_bsd.hpp.i
data/make/linux/platform_ppc.i
+data/src/share/vm/services/memoryService.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9DoneRetryDecoder.java.i
data/make/bsd/makefiles/mapfile-vers-debug.i
data/make/linux/platform_i486.i
data/src/share/vm/runtime/stackValue.cpp.i
-data/src/os_cpu/bsd_x86/vm/os_bsd_x86.inline.hpp.i
data/src/share/vm/prims/jvmtiRedefineClasses.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Settings/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBNode.java.i
data/src/share/vm/memory/universe.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BaseClass.java.i
@@ -843,29 +845,28 @@ data/agent/src/share/classes/images/toolbarButtonGraphics/general/New24.gif.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.properties.i
data/src/share/vm/gc_interface/gcCause.cpp.i
data/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp.i
+data/src/share/vm/utilities/bitMap.inline.hpp.i
+data/test/compiler/6837011/Test6837011.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortTypeImpl.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java.i
+data/src/share/vm/oops/typeArrayKlass.hpp.i
data/src/share/vm/oops/objArrayOop.hpp.i
-data/src/os_cpu/linux_x86/vm/os_linux_x86.inline.hpp.i
data/src/cpu/sparc/vm/stubRoutines_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/project.xml.i
-data/src/share/vm/ci/ciExceptionHandler.cpp.i
+data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form.i
-data/src/share/vm/oops/arrayOop.hpp.i
-data/src/share/vm/compiler/disassembler.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/Inspector.java.i
data/src/os/linux/vm/os_linux.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/manifest.mf.i
data/src/cpu/zero/vm/frame_zero.hpp.i
data/test/compiler/5091921/Test6931567.java.i
data/build/linux/Makefile.i
data/src/share/vm/ci/ciObjectFactory.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryIndirectAddress.java.i
data/src/cpu/sparc/vm/registerMap_sparc.hpp.i
-data/make/bsd/makefiles/arm.make.i
data/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties.i
data/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCBranchInstruction.java.i
@@ -874,64 +875,64 @@ data/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSectionDefinitionsRecord.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/platform.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidTypeImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java.i
data/build/linux/makefiles/defs.make.i
data/src/share/vm/utilities/dtrace.hpp.i
data/src/share/vm/oops/oop.inline2.hpp.i
-data/src/os/solaris/vm/thread_solaris.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java.i
data/src/share/vm/c1/c1_FrameMap.cpp.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/platform.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RegisterDecoder.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif.i
+data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.properties.i
data/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVrDecoder.java.i
data/build/solaris/makefiles/reorder_COMPILER1_sparcv9.i
-data/src/cpu/zero/vm/stubGenerator_zero.cpp.i
data/src/share/vm/runtime/simpleThresholdPolicy.hpp.i
data/test/compiler/6865031/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/CIntegerAccessor.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java.i
+data/src/share/vm/compiler/abstractCompiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java.i
data/src/os/bsd/dtrace/generateJvmOffsetsMain.c.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureInfo.java.i
-data/src/cpu/zero/vm/depChecker_zero.cpp.i
+data/src/cpu/x86/vm/codeBuffer_x86.hpp.i
data/src/share/vm/oops/typeArrayOop.cpp.i
data/src/share/vm/runtime/globals_extension.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadGroupReferenceImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceStoreDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveInstruction.java.i
data/agent/src/share/native/jvmdi/sa.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JShortField.java.i
data/src/share/vm/services/attachListener.cpp.i
-data/src/share/vm/opto/locknode.cpp.i
+data/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java.i
data/src/os/windows/vm/globals_windows.hpp.i
data/make/jdk6_hotspot_distro.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Array.java.i
-data/src/share/vm/libadt/vectset.cpp.i
+data/build/solaris/makefiles/adjust-mflags.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java.i
+data/src/share/tools/LogCompilation/README.i
+data/make/solaris/makefiles/mapfile-vers-TIERED.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.i
data/src/share/vm/ci/ciObjArrayKlassKlass.hpp.i
data/src/cpu/sparc/vm/nativeInst_sparc.cpp.i
-data/make/solaris/makefiles/sparc.make.i
+data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties.i
data/src/cpu/x86/vm/assembler_x86_32.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java.i
+data/src/share/vm/code/icBuffer.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form.i
data/src/cpu/zero/vm/vmreg_zero.hpp.i
data/src/share/vm/services/dtraceAttacher.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeNewArray.java.i
data/agent/make/heapdumpwindbg64.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java.i
data/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml.i
data/src/share/vm/interpreter/interpreterRuntime.hpp.i
data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp.i
+data/src/share/vm/memory/oopFactory.cpp.i
data/agent/src/os/win32/windbg/sawindbg.cpp.i
-data/src/os/solaris/vm/threadCritical_solaris.cpp.i
+data/src/share/vm/memory/generation.hpp.i
data/make/windows/makefiles/makedeps.make.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java.i
data/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp.i
@@ -940,49 +941,47 @@ data/agent/src/share/classes/com/sun/java/swing/action/HelpAction.java.i
data/src/share/vm/runtime/handles.inline.hpp.i
data/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JBooleanField.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java.i
data/build/solaris/makefiles/reorder_CORE_i486.i
data/test/compiler/6792161/Test6792161.java.i
data/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp.i
-data/test/compiler/7070134/words.i
data/src/share/vm/opto/addnode.hpp.i
data/src/share/vm/utilities/accessFlags.cpp.i
data/test/compiler/7041100/Test7041100.java.i
data/make/windows/projectfiles/compiler1/vm.dsw.i
-data/agent/make/pmapproc.sh.i
data/agent/make/dumpsyspropsproc64.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java.i
data/src/os/solaris/vm/perfMemory_solaris.cpp.i
data/test/compiler/6795362/Test6795362.java.i
data/src/share/vm/runtime/sharedRuntime.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java.i
-data/src/share/tools/ProjectCreator/FileFormatException.java.i
+data/src/share/vm/runtime/stackValue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSLibraries.java.i
data/agent/src/os/linux/proc_service.h.i
data/src/share/vm/gc_implementation/shared/ageTable.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java.i
-data/make/bsd/makefiles/ia64.make.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVrInstruction.java.i
data/src/os/linux/vm/os_linux.hpp.i
data/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallNode.java.i
+data/LICENSE.i
data/agent/make/pstackwindbg64.bat.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryIndirectAddress.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java.i
data/src/share/vm/runtime/serviceThread.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FieldIdentifier.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java.i
-data/build/linux/makefiles/gcc.make.i
+data/test/compiler/6756768/Test6756768.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java.i
data/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp.i
data/make/linux/makefiles/jsig.make.i
data/src/os/bsd/dtrace/jvm_dtrace.c.i
+data/src/share/vm/shark/sharkType.hpp.i
data/src/os/linux/vm/threadCritical_linux.cpp.i
data/src/share/vm/runtime/os_ext.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/OopVisitor.java.i
data/agent/make/ClosureFinder.java.i
data/src/share/vm/code/debugInfoRec.hpp.i
data/src/cpu/x86/vm/c1_FrameMap_x86.cpp.i
@@ -994,6 +993,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeader.
data/src/share/vm/opto/idealGraphPrinter.cpp.i
data/src/share/vm/runtime/statSampler.hpp.i
data/make/linux/platform_amd64.suncc.i
+data/src/share/vm/classfile/stackMapFrame.hpp.i
data/make/linux/makefiles/mapfile-vers-product.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/FloatTreeNodeAdapter.java.i
data/agent/make/jstackproc.sh.i
@@ -1001,7 +1001,7 @@ data/src/share/vm/adlc/formssel.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java.i
data/build/linux/adlc_updater.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrivilegedReadWriteDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.gif.i
data/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp.i
@@ -1018,30 +1018,27 @@ data/src/share/vm/gc_implementation/shared/ageTable.hpp.i
data/test/compiler/7070134/Test7070134.sh.i
data/src/share/tools/IdealGraphVisualizer/README.i
data/build/windows/makefiles/jvmti.make.i
-data/make/windows/projectfiles/tiered/vm.dsw.i
+data/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp.i
data/src/share/vm/runtime/dtraceJSDT.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolKlass.java.i
data/src/share/vm/runtime/sharedRuntime.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86DirectAddress.java.i
data/src/share/vm/prims/jvmtiLib.xsl.i
data/src/share/vm/oops/objArrayKlass.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciField.java.i
-data/src/share/vm/memory/defNewGeneration.hpp.i
-data/src/share/vm/utilities/stack.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPArithmeticInstruction.java.i
data/src/cpu/x86/vm/registerMap_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/manifest.mf.i
data/agent/make/saenv64.sh.i
+data/src/share/vm/classfile/stackMapTable.hpp.i
data/src/share/vm/oops/compiledICHolderKlass.cpp.i
data/src/share/vm/classfile/placeholders.hpp.i
-data/src/os/windows/vm/c1_globals_windows.hpp.i
+data/make/templates/gpl-header.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindByQueryPanel.java.i
-data/src/os/bsd/vm/mutex_bsd.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMap.java.i
+data/src/share/vm/opto/node.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditorFactory.java.i
-data/src/cpu/sparc/vm/globalDefinitions_sparc.hpp.i
data/make/linux/makefiles/fastdebug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java.i
data/src/share/vm/c1/c1_Compilation.cpp.i
@@ -1056,25 +1053,25 @@ data/src/share/vm/adlc/Test/i486.ad.i
data/src/share/vm/oops/oop.cpp.i
data/src/cpu/sparc/vm/cppInterpreter_sparc.hpp.i
data/make/bsd/makefiles/sa.make.i
-data/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.gif.i
data/src/share/vm/ci/ciType.hpp.i
data/build/solaris/makefiles/dtrace.make.i
data/agent/src/scripts/start-rmiregistry.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadContext.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java.i
+data/src/os/solaris/vm/thread_solaris.inline.hpp.i
data/src/share/vm/memory/compactingPermGenGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/VoidType.java.i
data/agent/src/os/solaris/Makefile.i
data/make/bsd/makefiles/dtrace.make.i
-data/make/templates/gpl-header.i
+data/src/share/vm/gc_implementation/g1/heapRegion.hpp.i
data/make/solaris/makefiles/vm.make.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java.i
-data/src/os/solaris/vm/os_solaris.hpp.i
+data/src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java.i
-data/agent/make/pstackwindbg.bat.i
+data/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp.i
data/test/compiler/7088020/Test7088020.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RotateInstruction.java.i
data/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/HSDBActionManager.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java.i
@@ -1086,7 +1083,9 @@ data/agent/src/share/classes/sun/jvm/hotspot/ui/action/ShowAction.java.i
data/src/share/tools/MakeDeps/MetroWerksMacPlatform.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.properties.i
data/make/linux/platform_arm.i
-data/agent/make/heapdumpproc64.sh.i
+data/make/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/src/share/vm/utilities/stack.inline.hpp.i
+data/src/share/vm/c1/c1_Canonicalizer.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java.i
data/make/windows/jvmexp_g.lcf.i
@@ -1102,21 +1101,22 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86LogicInstruction.java.i
data/build/solaris/makefiles/makedeps.make.i
data/src/share/vm/prims/jni.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp.i
+data/src/share/vm/opto/opcodes.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml.i
data/src/share/vm/memory/specialized_oop_closures.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java.i
-data/test/compiler/6894807/Test6894807.sh.i
+data/src/share/vm/c1/c1_CodeStubs.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Register.java.i
data/build/solaris/build.sh.i
data/src/share/vm/interpreter/bytecodes.cpp.i
+data/src/share/vm/gc_implementation/g1/sparsePRT.hpp.i
data/.hgtags.i
data/build/windows/projectfiles/core/Makefile.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java.i
+data/src/share/vm/adlc/filebuff.hpp.i
data/src/cpu/sparc/vm/c1_Defs_sparc.hpp.i
+data/src/share/vm/gc_implementation/g1/sparsePRT.cpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/extendedColor.filter.i
-data/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp.i
-data/agent/src/os/linux/ps_core.c.i
+data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp.i
data/src/share/vm/services/classLoadingService.cpp.i
data/src/share/vm/interpreter/cppInterpreterGenerator.hpp.i
data/src/share/vm/oops/klass.inline.hpp.i
@@ -1127,38 +1127,41 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/PermGen.java.i
data/src/share/vm/opto/library_call.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/NoSuchSymbolException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/cInterpreter.java.i
+data/src/share/vm/opto/idealKit.cpp.i
+data/src/os/bsd/dtrace/generateJvmOffsets.h.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.i
data/src/share/vm/oops/markOop.inline.hpp.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.d
data/src/share/vm/oops/typeArrayKlassKlass.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp.i
-data/make/bsd/makefiles/sparcv9.make.i
-data/src/cpu/sparc/vm/vm_version_sparc.cpp.i
+data/src/share/vm/runtime/vm_version.cpp.i
+data/src/share/vm/memory/specialized_oop_closures.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/split.filter.i
data/agent/src/os/win32/Message.hpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java.i
+data/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp.i
data/build/solaris/makefiles/hp.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegister.java.i
data/src/share/vm/interpreter/templateInterpreter.hpp.i
data/agent/src/share/classes/com/sun/java/swing/ui/TabsDlg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayTypeImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ArithmeticDecoder.java.i
data/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java.i
data/test/runtime/7051189/Xchecksig.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp.i
-data/src/share/vm/prims/jniExport.hpp.i
data/.jcheck/conf.i
data/test/compiler/6879902/Test6879902.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodDataKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublic.java.i
data/src/cpu/sparc/vm/cppInterpreter_sparc.cpp.i
-data/src/share/vm/ci/ciArrayKlassKlass.hpp.i
+data/test/compiler/6823354/Test6823354.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPInstructionDecoder.java.i
data/src/share/vm/runtime/signature.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/Address.java.i
-data/src/share/vm/ci/ciField.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java.i
+data/make/linux/makefiles/sparcv9.make.i
+data/src/share/vm/classfile/symbolTable.cpp.i
+data/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ObjectHistogram.java.i
data/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/PrimitiveValueImpl.java.i
@@ -1168,12 +1171,11 @@ data/make/bsd/platform_sparc.i
data/src/cpu/zero/vm/sharkFrame_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ShiftDecoder.java.i
data/src/share/vm/prims/jvm.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/AbstractInstruction.java.i
+data/src/share/vm/utilities/histogram.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TemplateType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java.i
data/src/share/vm/shark/sharkRuntime.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NodeFindAction.java.i
data/build/windows/makefiles/sa.make.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/build.xml.i
@@ -1182,39 +1184,40 @@ data/src/share/vm/interpreter/templateTable.cpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupOrganizer.java.i
data/src/cpu/x86/vm/interpreter_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMap.java.i
+data/src/share/vm/opto/indexSet.hpp.i
data/make/hotspot_version.i
data/src/share/vm/utilities/constantTag.cpp.i
-data/src/share/vm/gc_implementation/g1/survRateGroup.hpp.i
data/src/share/vm/opto/postaloc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFileRecord.java.i
-data/src/cpu/x86/vm/register_x86.hpp.i
+data/test/compiler/6689060/Test.java.i
data/src/share/vm/prims/jvmtiUtil.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegisters.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64Frame.java.i
data/src/share/vm/c1/c1_ValueSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescription.java.i
data/src/cpu/x86/vm/sharedRuntime_x86_32.cpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp.i
data/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp.i
data/src/share/vm/shark/sharkBlock.hpp.i
data/src/share/vm/runtime/statSampler.cpp.i
-data/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.gif.i
data/src/cpu/zero/vm/entryFrame_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ObjectVisitor.java.i
data/src/share/vm/runtime/icache.cpp.i
-data/src/cpu/x86/vm/codeBuffer_x86.hpp.i
+data/src/cpu/zero/vm/depChecker_zero.cpp.i
data/src/share/vm/c1/c1_ValueType.cpp.i
data/src/share/vm/compiler/abstractCompiler.cpp.i
data/src/share/vm/interpreter/bytecodeStream.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml.i
data/src/os_cpu/windows_x86/vm/prefetch_windows_x86.inline.hpp.i
-data/src/cpu/sparc/vm/depChecker_sparc.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp.i
data/agent/src/share/lib/maf-1_0.jar.i
data/src/share/vm/oops/instanceOop.hpp.i
data/src/share/vm/utilities/growableArray.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodKlass.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Address.java.i
+data/agent/src/share/classes/com/sun/java/swing/ui/SplashScreen.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WriteInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/EnumTreeNodeAdapter.java.i
data/agent/src/os/win32/windbg/Makefile.i
@@ -1226,15 +1229,16 @@ data/build/linux/makefiles/jsig.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RdprDecoder.java.i
data/src/cpu/x86/vm/bytecodes_x86.cpp.i
data/src/share/vm/memory/compactPermGen.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java.i
+data/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp.i
data/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp.i
+data/src/cpu/x86/vm/jni_x86.h.i
data/src/share/vm/memory/iterator.cpp.i
data/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGotoW.java.i
data/agent/src/share/classes/com/sun/java/swing/action/ViewMenu.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConcreteMethodImpl.java.i
-data/src/share/vm/ci/ciUtilities.cpp.i
+data/src/share/vm/adlc/filebuff.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java.i
+data/src/share/vm/opto/chaitin.hpp.i
data/src/share/vm/memory/allocation.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/platform.properties.i
@@ -1242,16 +1246,16 @@ data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/build-impl.xml.i
data/agent/test/jdi/jstack.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDebugEvent.java.i
data/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp.i
-data/agent/make/start-debug-server-proc64.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java.i
data/src/os/linux/vm/jvm_linux.h.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ExternalVFrame.java.i
data/src/cpu/x86/vm/relocInfo_x86.cpp.i
data/src/os/linux/vm/globals_linux.hpp.i
-data/make/linux/makefiles/ppc.make.i
+data/src/share/vm/oops/symbol.cpp.i
data/src/cpu/sparc/vm/vmreg_sparc.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight24.gif.i
data/src/share/vm/oops/oop.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif.i
+data/src/share/vm/shark/sharkFunction.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ConnectionAnchor.java.i
data/src/share/vm/shark/sharkState.cpp.i
data/src/cpu/zero/vm/disassembler_zero.cpp.i
@@ -1259,14 +1263,16 @@ data/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java.i
data/src/share/vm/oops/symbolKlass.cpp.i
data/src/share/vm/prims/forte.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFileParser.java.i
+data/src/share/vm/opto/superword.cpp.i
+data/src/share/vm/prims/jniFastGetField.hpp.i
+data/src/os/windows/launcher/java_md.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ArithmeticInstruction.java.i
-data/agent/test/jdi/runjpda.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java.i
+data/src/cpu/sparc/vm/frame_sparc.cpp.i
data/src/share/vm/prims/jni_md.h.i
data/src/share/vm/oops/methodKlass.cpp.i
data/agent/src/os/win32/Reaper.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/AddressVisitor.java.i
-data/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp.i
+data/src/share/vm/opto/locknode.cpp.i
data/test/compiler/6857159/Test6857159.sh.i
data/src/share/vm/runtime/fieldType.hpp.i
data/src/os/solaris/launcher/java_md.c.i
@@ -1278,7 +1284,7 @@ data/src/os/posix/launcher/java_md.c.i
data/agent/src/os/solaris/dbx/README.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIndexableFieldIdentifier.java.i
data/src/cpu/zero/vm/templateInterpreter_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java.i
+data/src/share/vm/ci/ciArrayKlass.cpp.i
data/src/share/vm/services/serviceUtil.hpp.i
data/src/os_cpu/linux_x86/vm/linux_x86_32.s.i
data/agent/src/os/win32/LockableList.hpp.i
@@ -1290,36 +1296,34 @@ data/agent/make/clhsdbproc.sh.i
data/src/share/vm/utilities/sizes.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueImpl.java.i
data/agent/make/heapsumwindbg.bat.i
-data/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java.i
data/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp.i
data/src/os/solaris/vm/hpi_solaris.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/JDoubleField.java.i
data/agent/src/os/bsd/salibelf.h.i
data/make/solaris/makefiles/reorder_CORE_sparcv9.i
data/src/share/vm/memory/heap.cpp.i
-data/make/solaris/makefiles/mapfile-vers-TIERED.i
+data/src/share/vm/libadt/vectset.cpp.i
data/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/Callable.java.i
data/build/solaris/makefiles/reorder_COMPILER1_i486.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java.i
data/src/share/vm/runtime/objectMonitor.cpp.i
+data/src/share/vm/prims/jvmtiTrace.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java.i
data/make/templates/gpl-cp-header.i
data/src/share/vm/opto/machnode.hpp.i
data/make/solaris/makefiles/reorder_TIERED_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java.i
data/build/windows/projectfiles/compiler2/ADLCompiler.dsw.i
-data/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJmp.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReturnInstruction.java.i
+data/make/solaris/makefiles/reorder_COMPILER2_amd64.i
data/src/share/vm/prims/jvmtiTrace.hpp.i
-data/src/cpu/zero/vm/copy_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java.i
+data/src/share/vm/shark/sharkContext.hpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGenGen.java.i
data/build/solaris/makefiles/core.make.i
-data/make/linux/makefiles/product.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCShiftInstruction.java.i
+data/src/share/vm/classfile/verifier.cpp.i
data/src/share/vm/oops/methodOop.cpp.i
data/src/share/vm/memory/genRemSet.inline.hpp.i
data/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp.i
@@ -1339,28 +1343,26 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java.i
data/src/share/vm/runtime/atomic.cpp.i
data/src/share/vm/c1/c1_ValueMap.cpp.i
data/src/cpu/x86/vm/vm_version_x86_64.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java.i
+data/build/solaris/makefiles/reorder_CORE_sparcv9.i
data/agent/src/os/win32/IOBuf.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java.i
-data/src/share/vm/code/exceptionHandlerTable.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java.i
+data/build/linux/build.sh.i
data/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.i
data/make/linux/makefiles/launcher.make.i
data/agent/make/dumpsyspropswindbg.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java.i
+data/build/solaris/makefiles/compiler2.make.i
+data/src/share/vm/gc_implementation/shared/spaceDecorator.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java.i
data/build/windows/README.i
-data/src/cpu/zero/vm/relocInfo_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java.i
+data/test/compiler/7116216/StackOverflow.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/SharedObject.java.i
data/make/solaris/build.sh.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBytecode.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open24.gif.i
data/src/share/vm/shark/sharkMemoryManager.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Instruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPopDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublicSym.java.i
data/agent/make/saenv.sh.i
data/src/os_cpu/linux_x86/vm/linux_x86_64.s.i
@@ -1373,23 +1375,25 @@ data/agent/make/permstatproc64.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp.i
data/src/os/solaris/vm/c2_globals_solaris.hpp.i
+data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp.i
data/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp.i
data/src/share/vm/utilities/top.hpp.i
data/src/share/vm/classfile/classLoader.cpp.i
-data/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java.i
+data/make/solaris/makefiles/reorder_COMPILER1_amd64.i
data/src/share/vm/opto/locknode.hpp.i
+data/agent/make/soqlwindbg.bat.i
data/src/share/vm/memory/heapInspection.cpp.i
data/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp.i
data/agent/src/share/classes/com/sun/java/swing/action/NewAction.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/PredecessorSelector.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterDownAction.java.i
-data/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/Stub.java.i
data/src/share/vm/gc_implementation/g1/ptrQueue.cpp.i
data/build/linux/makefiles/mapfile-vers-jsig.i
-data/src/share/vm/prims/privilegedStack.hpp.i
+data/test/compiler/5091921/Test6753639.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp.i
+data/src/os/linux/vm/objectMonitor_linux.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/JNITypeParser.java.i
@@ -1400,7 +1404,6 @@ data/make/bsd/makefiles/optimized.make.i
data/test/compiler/6795465/Test6795465.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/TrapDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java.i
-data/test/runtime/6819213/TestBootNativeLibraryPath.java.i
data/src/share/vm/gc_implementation/shared/markSweep.hpp.i
data/src/share/vm/classfile/dictionary.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java.i
@@ -1409,60 +1412,65 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditorCommands.java.i
data/src/share/vm/utilities/intHisto.cpp.i
data/src/share/tools/LogCompilation/Makefile.i
-data/agent/src/os/win32/SwDbgSrv.dsw.i
-data/agent/src/os/linux/libproc.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegisters.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ReadDecoder.java.i
+data/src/share/vm/runtime/sharedRuntimeTrig.cpp.i
data/src/cpu/x86/vm/x86_64.ad.i
+data/src/share/vm/prims/unsafe.cpp.i
data/test/compiler/7103261/Test7103261.java.i
data/src/os/linux/vm/os_linux.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif.i
data/src/share/vm/classfile/placeholders.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/build.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java.i
+data/src/share/vm/classfile/classFileParser.hpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/WrongTypeException.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java.i
-data/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegisters.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64/Win32IA64JavaThreadPDAccess.java.i
+data/test/compiler/6909839/Test6909839.java.i
+data/src/share/vm/oops/constMethodOop.hpp.i
+data/src/share/vm/adlc/formsopt.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlassKlass.java.i
+data/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ClosestSymbol.java.i
data/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WrprDecoder.java.i
-data/src/share/vm/opto/ifnode.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/Type.java.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java.i
+data/src/os/bsd/vm/osThread_bsd.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java.i
data/src/share/vm/utilities/globalDefinitions.hpp.i
-data/src/share/vm/shark/sharkCacheDecache.hpp.i
-data/src/share/vm/opto/parse.hpp.i
-data/src/cpu/x86/vm/vmStructs_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java.i
+data/src/os/windows/vm/interfaceSupport_windows.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceStoreDecoder.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Information16.gif.i
data/build/solaris/platform_sparcv9.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties.i
data/src/share/vm/runtime/icache.hpp.i
data/make/solaris/makefiles/launcher.make.i
-data/build/windows/makefiles/shared.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Bytes.java.i
data/make/bsd/makefiles/hp.make.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModLineNumberMap.java.i
-data/build/windows/makefiles/generated.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueContainer.java.i
data/agent/test/jdi/SASanityChecker.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicObjectLock.java.i
data/src/cpu/x86/vm/assembler_x86.hpp.i
+data/test/compiler/7009231/Test7009231.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java.i
+data/agent/src/os/win32/ioUtils.hpp.i
+data/make/windows/projectfiles/compiler2/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FPop2Decoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCCallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java.i
-data/src/share/vm/classfile/vmSymbols.hpp.i
+data/build/linux/makefiles/hp.make.i
+data/agent/make/clhsdbwindbg64.bat.i
data/src/share/vm/utilities/preserveException.hpp.i
data/agent/src/os/bsd/mapfile.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciVirtualCallData.java.i
@@ -1471,20 +1479,22 @@ data/make/solaris/makefiles/jvmti.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FloatBranchDecoder.java.i
data/src/os/solaris/launcher/java.c.i
data/test/compiler/6769124/TestArrayCopy6769124.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java.i
-data/agent/src/share/classes/com/sun/java/swing/action/SaveAsAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java.i
+data/src/share/vm/gc_implementation/shared/collectorCounters.cpp.i
data/src/share/vm/opto/phase.cpp.i
data/src/share/vm/runtime/objectMonitor.hpp.i
-data/src/share/vm/services/diagnosticFramework.hpp.i
data/src/share/vm/c1/c1_Runtime1.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form.i
+data/make/bsd/platform_zero.in.i
+data/agent/src/share/classes/com/sun/java/swing/action/BackAction.java.i
data/build/linux/makefiles/sparcWorks.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java.i
data/src/cpu/zero/vm/bytes_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Operand.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86IllegalInstruction.java.i
+data/src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp.i
data/src/share/vm/opto/buildOopMap.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java.i
data/src/share/vm/opto/rootnode.cpp.i
data/src/share/vm/opto/cfgnode.hpp.i
data/src/share/vm/prims/jvmtiAgentThread.hpp.i
@@ -1495,12 +1505,12 @@ data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/co
data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp.i
data/make/linux/makefiles/compiler1.make.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.il.i
-data/agent/test/jdi/multivm.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java.i
data/test/runtime/6626217/bug_21227.java.i
data/src/share/vm/ci/ciInstanceKlassKlass.cpp.i
-data/src/os/linux/vm/c1_globals_linux.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMReg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/DLL.java.i
-data/src/share/vm/runtime/relocator.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java.i
data/src/share/vm/memory/cardTableModRefBS.cpp.i
data/src/share/vm/services/management.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CallDecoder.java.i
@@ -1508,89 +1518,92 @@ data/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp.i
data/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java.i
+data/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp.i
data/src/share/vm/code/compressedStream.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/VMModifiers.java.i
-data/src/os/bsd/dtrace/libjvm_db.c.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp.i
data/src/cpu/zero/vm/templateTable_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolIterator.java.i
+data/src/share/vm/prims/jvmtiRedefineClasses.cpp.i
data/src/share/vm/utilities/elfFile.hpp.i
data/src/share/vm/oops/klassKlass.cpp.i
data/src/os/solaris/dtrace/hs_private.d.i
data/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/manifest.mf.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java.i
+data/build/linux/makefiles/profiled.make.i
data/make/jprt.properties.i
data/src/share/vm/gc_implementation/shared/vmGCOperations.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVccInstruction.java.i
-data/src/share/vm/gc_implementation/parNew/parOopClosures.hpp.i
+data/make/windows/projectfiles/tiered/vm.def.i
+data/src/share/vm/prims/forte.cpp.i
data/src/cpu/x86/vm/templateInterpreter_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SaveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java.i
data/test/compiler/7125879/Test7125879.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java.i
data/agent/make/README.txt.i
data/make/bsd/makefiles/jvmti.make.i
-data/src/cpu/zero/vm/jniFastGetField_zero.cpp.i
+data/src/share/vm/memory/heapInspection.hpp.i
data/test/runtime/6626217/Loader2.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Array.java.i
+data/make/solaris/makefiles/sparc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java.i
data/src/share/vm/opto/output.hpp.i
data/src/share/vm/c1/c1_IR.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java.i
data/build/solaris/makefiles/mapfile-vers-jvm_dtrace.i
-data/build/windows/projectfiles/kernel/vm.def.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterIndirectAddress.java.i
data/src/cpu/x86/vm/nativeInst_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisterAddress.java.i
data/src/share/vm/ci/ciObject.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.gif.i
-data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp.i
-data/test/compiler/6756768/Test6756768.java.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java.i
data/build/windows/projectfiles/core/vm.def.i
data/src/share/vm/ci/ciInstanceKlass.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp.i
data/src/cpu/zero/vm/assembler_zero.cpp.i
data/test/compiler/6837094/Test.java.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp.i
-data/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp.i
-data/make/bsd/makefiles/vm.make.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java.i
+data/make/windows/projectfiles/tiered/vm.dsw.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java.i
-data/src/share/vm/opto/node.hpp.i
+data/src/os/bsd/vm/mutex_bsd.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ThreadInfoPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java.i
+data/src/share/vm/ci/ciFlags.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterIndirectAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.gif.i
+data/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.i
data/src/share/vm/runtime/mutexLocker.hpp.i
-data/agent/src/share/classes/com/sun/java/swing/action/SaveAction.java.i
+data/build/solaris/makefiles/fastdebug.make.i
data/agent/make/jhistowindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedWriteStream.java.i
data/agent/src/share/classes/com/sun/java/swing/action/AlignRightAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java.i
+data/src/share/vm/memory/dump.cpp.i
data/src/share/vm/memory/defNewGeneration.cpp.i
data/src/share/vm/classfile/systemDictionary.cpp.i
data/src/share/vm/gc_interface/collectedHeap.hpp.i
data/src/share/vm/runtime/orderAccess.hpp.i
data/agent/src/os/win32/Monitor.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Sym.java.i
-data/src/os/linux/vm/hpi_linux.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegister.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ArithmeticDecoder.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java.i
+data/src/share/vm/prims/jniExport.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Node_List.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Field.java.i
-data/src/share/vm/utilities/histogram.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/AbstractInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/EdenSpace.java.i
-data/make/solaris/makefiles/mapfile-vers-nonproduct.i
data/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BadOopTreeNodeAdapter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BooleanField.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.gif.i
+data/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVccDecoder.java.i
data/build/solaris/makefiles/debug.make.i
-data/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp.i
+data/src/cpu/sparc/vm/depChecker_sparc.hpp.i
data/src/share/vm/opto/bytecodeInfo.cpp.i
data/src/share/vm/runtime/rframe.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/AssertionFailure.java.i
@@ -1601,32 +1614,33 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCAtomicLoadStoreInstr
data/make/solaris/makefiles/rules.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OopMapForCacheEntry.java.i
-data/src/share/vm/oops/symbol.cpp.i
+data/make/linux/makefiles/ppc.make.i
data/make/linux/platform_sparcv9.i
data/src/share/vm/gc_implementation/shared/immutableSpace.hpp.i
data/src/share/vm/compiler/compileLog.cpp.i
data/src/share/vm/opto/graphKit.cpp.i
-data/src/share/vm/ci/ciArrayKlass.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java.i
+data/test/compiler/6659207/Test.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp.i
-data/make/windows/projectfiles/tiered/Makefile.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java.i
-data/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.i
-data/make/solaris/makefiles/reorder_COMPILER2_amd64.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java.i
+data/build/linux/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReturnInstruction.java.i
+data/src/cpu/sparc/vm/interpreter_sparc.cpp.i
+data/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java.i
-data/test/compiler/6775880/Test.java.i
data/src/cpu/zero/vm/cppInterpreter_zero.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadContext.java.i
-data/make/windows/projectfiles/core/vm.def.i
+data/src/share/vm/oops/klassVtable.cpp.i
data/test/compiler/6895383/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java.i
+data/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java.i
data/test/compiler/7068051/Test7068051.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java.i
-data/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp.i
+data/src/share/vm/opto/escape.hpp.i
data/make/solaris/makefiles/reorder_COMPILER2_sparcv9.i
+data/src/share/vm/c1/c1_Canonicalizer.hpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties.i
data/src/share/vm/ci/ciUtilities.hpp.i
data/src/share/vm/utilities/workgroup.hpp.i
@@ -1650,36 +1664,32 @@ data/src/share/vm/utilities/copy.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.cpp.i
data/agent/src/os/solaris/proc/saproc_audit.cpp.i
data/src/share/vm/opto/loopopts.cpp.i
-data/build/linux/makefiles/profiled.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java.i
data/src/share/tools/IdealGraphVisualizer/Util/build.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterIndirectAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java.i
+data/build/windows/projectfiles/kernel/vm.def.i
+data/src/share/vm/runtime/advancedThresholdPolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java.i
-data/src/share/vm/ci/ciObjectFactory.hpp.i
+data/src/share/vm/classfile/classFileParser.cpp.i
data/test/compiler/6826736/Test.java.i
data/make/bsd/makefiles/build_vm_def.sh.i
data/agent/src/os/win32/Monitor.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java.i
data/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp.i
data/src/share/vm/includeDB_compiler1.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties.i
+data/make/solaris/makefiles/hp1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java.i
data/src/os/bsd/dtrace/generateJvmOffsets.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArithmeticInstruction.java.i
-data/src/share/vm/opto/escape.hpp.i
+data/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObject.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java.i
data/src/share/vm/gc_implementation/includeDB_gc_parNew.i
data/src/share/vm/opto/regmask.hpp.i
-data/src/os/bsd/vm/osThread_bsd.cpp.i
-data/src/share/vm/interpreter/bytecode.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp.i
data/make/linux/makefiles/tiered.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRettInstruction.java.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC6.java.i
data/src/share/vm/opto/mulnode.hpp.i
data/make/linux/makefiles/zeroshark.make.i
-data/make/solaris/makefiles/dtrace.make.i
data/src/cpu/x86/vm/assembler_x86_32.hpp.i
data/src/share/vm/utilities/macros.hpp.i
data/agent/src/os/win32/Dispatcher.hpp.i
@@ -1698,29 +1708,28 @@ data/src/share/vm/utilities/workgroup.cpp.i
data/build/solaris/makefiles/sparcv9.make.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Save24.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java.i
+data/make/solaris/makefiles/cscope.make.i
data/make/solaris/makefiles/reorder_TIERED_sparc.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/genfiles.properties.i
data/make/closed.make.i
data/agent/src/scripts/start-debug-server64.sh.i
data/make/solaris/platform_sparcv9.gcc.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteTypeImpl.java.i
data/src/share/vm/utilities/hashtable.inline.hpp.i
data/build/linux/makefiles/tiered.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java.i
data/make/windows/makefiles/vm.make.i
data/src/cpu/x86/vm/c2_globals_x86.hpp.i
-data/src/os/solaris/dtrace/jvm_dtrace.h.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java.i
+data/src/share/vm/oops/methodDataKlass.cpp.i
data/agent/src/os/linux/symtab.c.i
data/make/solaris/makefiles/makedeps.make.i
data/test/compiler/7046096/Test7046096.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestHelloWorld.java.i
data/src/share/vm/code/icBuffer.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTraceEntry.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/CPUHelper.java.i
-data/make/solaris/makefiles/debug.make.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/platform.properties.i
data/make/windows/makefiles/jvmti.make.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp.i
@@ -1728,7 +1737,7 @@ data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/
data/build/solaris/makefiles/vm.make.i
data/src/share/vm/shark/sharkBlock.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeDisassembler.java.i
-data/src/share/vm/runtime/dtraceJSDT.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp.i
data/src/share/vm/runtime/monitorChunk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java.i
data/src/cpu/x86/vm/assembler_x86.cpp.i
@@ -1740,36 +1749,31 @@ data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/
data/build/linux/makefiles/cscope.make.i
data/src/share/vm/runtime/handles.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java.i
-data/agent/src/os/bsd/salibelf.c.i
data/make/solaris/makefiles/reorder_COMPILER2_i486.i
-data/src/share/vm/shark/sharkIntrinsics.cpp.i
data/build/linux/makefiles/makedeps.make.i
data/src/share/vm/services/classLoadingService.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java.i
-data/build/windows/makefiles/defs.make.i
+data/make/solaris/makefiles/tiered.make.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJFloatField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86ThreadFactory.java.i
data/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp.i
-data/agent/make/jdbcore64.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/LogicInstruction.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignLeft24.gif.i
data/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp.i
data/src/share/vm/prims/jvmtiGetLoadedClasses.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFloatType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrefetchDecoder.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp.i
data/src/share/tools/IdealGraphVisualizer/build.xml.i
data/test/compiler/6431242/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/DebuggerConsolePanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java.i
data/src/share/vm/utilities/sizes.cpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.gif.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java.i
data/src/share/vm/prims/perf.cpp.i
+data/test/compiler/7141637/SpreadNullArg.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/manifest.mf.i
data/src/cpu/zero/vm/sharedRuntime_zero.cpp.i
data/src/share/vm/runtime/arguments.cpp.i
-data/src/share/vm/prims/jvmtiEventController.inline.hpp.i
+data/src/cpu/x86/vm/vm_version_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java.i
data/build/solaris/platform_i486.gcc.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatTypeImpl.java.i
@@ -1778,7 +1782,6 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxDebugger.java.i
data/src/share/vm/services/memoryManager.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFHeader.java.i
data/agent/test/jdi/sagdoit.java.i
-data/src/share/vm/prims/forte.cpp.i
data/src/share/vm/prims/jvmtiExport.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJLongField.java.i
@@ -1790,14 +1793,15 @@ data/src/share/vm/runtime/sharedRuntimeTrans.cpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/combine.filter.i
data/src/share/vm/c1/c1_ValueStack.cpp.i
data/src/cpu/x86/vm/interp_masm_x86_32.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderTable.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCShiftInstruction.java.i
data/src/share/vm/opto/regalloc.hpp.i
data/build/solaris/makefiles/sa.make.i
data/agent/src/os/win32/procList.hpp.i
data/src/share/vm/ci/ciStreams.cpp.i
data/test/runtime/6929067/T.java.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java.i
-data/src/cpu/sparc/vm/debug_sparc.cpp.i
+data/test/compiler/6661247/Test.java.i
data/src/share/vm/oops/markOop.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJIntField.java.i
@@ -1806,18 +1810,18 @@ data/src/cpu/x86/vm/stubRoutines_x86_32.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java.i
data/test/compiler/6603011/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java.i
data/src/cpu/x86/vm/icache_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/build.xml.i
data/test/compiler/6799693/Test.java.i
-data/src/cpu/x86/vm/c1_LinearScan_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/development/Server24.gif.i
data/src/os/windows/vm/decoder_windows.cpp.i
-data/src/share/vm/memory/cardTableRS.cpp.i
data/agent/src/share/classes/com/sun/java/swing/ui/OkCancelButtonPanel.java.i
data/src/cpu/sparc/vm/interp_masm_sparc.hpp.i
+data/src/share/vm/ci/ciTypeArray.hpp.i
data/src/share/vm/gc_implementation/shared/markSweep.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9BranchInstruction.java.i
+data/src/share/vm/utilities/hashtable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SavedInstruction.java.i
data/make/linux/makefiles/cscope.make.i
data/build/windows/projectfiles/compiler2/ADLCompiler.dsp.i
@@ -1833,15 +1837,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegM
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BooleanValueImpl.java.i
data/test/compiler/6958485/Test.java.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif.i
+data/src/share/vm/runtime/fprofiler.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp.i
data/src/os/windows/vm/thread_windows.inline.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/build.xml.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java.i
+data/src/share/vm/utilities/constantTag.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/CancelAction.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java.i
-data/test/runtime/6626217/from_loader2.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/manifest.mf.i
data/make/bsd/makefiles/sparcWorks.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java.i
@@ -1850,7 +1854,6 @@ data/test/compiler/6741738/Tester.java.i
data/src/share/vm/ci/ciMethod.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64RegisterMap.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java.i
-data/make/windows/platform_i486.i
data/agent/src/share/classes/images/toolbarButtonGraphics/navigation/Up16.gif.i
data/make/solaris/Makefile.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/RhinoScriptEngine.java.i
@@ -1865,12 +1868,9 @@ data/src/share/vm/gc_implementation/g1/heapRegionSets.hpp.i
data/src/share/vm/opto/reg_split.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxDebuggerLocal.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/BranchDecoder.java.i
-data/src/share/vm/memory/generation.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ImmediateOrRegister.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf.i
data/src/share/vm/c1/c1_MacroAssembler.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java.i
data/src/cpu/zero/vm/vm_version_zero.cpp.i
@@ -1890,14 +1890,14 @@ data/src/cpu/sparc/vm/depChecker_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/CallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIid.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialStoreDecoder.java.i
-data/make/linux/Queens.class.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java.i
+data/src/share/vm/ci/ciTypeFlow.hpp.i
+data/src/share/vm/shark/sharkTopLevelBlock.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java.i
data/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp.i
data/src/share/vm/code/vmreg.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java.i
+data/make/solaris/makefiles/mapfile-vers-jsig.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java.i
data/src/os/solaris/dtrace/hotspot_jni.d.i
data/src/share/vm/prims/methodComparator.cpp.i
@@ -1907,23 +1907,22 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/DataSource.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ProcessInfo.java.i
data/src/share/tools/IdealGraphVisualizer/View/build.xml.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form.i
+data/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java.i
data/src/os_cpu/windows_x86/vm/assembler_windows_x86_64.cpp.i
data/src/share/vm/opto/coalesce.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java.i
-data/make/windows/makefiles/shared.make.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Source.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties.i
+data/test/runtime/6888954/vmerrors.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BadAddressTreeNodeAdapter.java.i
data/src/share/vm/prims/jniFastGetField.cpp.i
-data/src/share/vm/oops/oop.pcgc.inline.hpp.i
+data/src/share/vm/utilities/array.cpp.i
data/agent/make/build-filelist.i
data/src/cpu/sparc/vm/bytecodes_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderStandardFields.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer.i
data/test/compiler/7070134/Stemmer.java.i
data/src/share/vm/code/compiledIC.cpp.i
data/make/solaris/makefiles/optimized.make.i
@@ -1942,19 +1941,19 @@ data/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp.i
data/make/bsd/makefiles/compiler2.make.i
data/agent/make/start-rmiregistry.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/livejvm/Event.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp.i
data/make/windows/projectfiles/common/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaCallWrapper.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java.i
data/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RegisterBranchDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Instruction.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties.i
data/test/compiler/6973329/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/TableModelComparator.java.i
-data/src/share/tools/MakeDeps/MacroDefinitions.java.i
data/src/share/vm/opto/split_if.cpp.i
data/src/os/solaris/vm/hpi_solaris.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp.i
@@ -1963,49 +1962,51 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC9.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadDecoder.java.i
data/test/compiler/5091921/Test6905845.java.i
+data/src/share/vm/oops/klassOop.hpp.i
data/src/cpu/zero/vm/interp_masm_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Arithmetic.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler.i
+data/make/windows/makefiles/fastdebug.make.i
data/build/solaris/makefiles/mapfile-vers-CORE.i
data/src/share/vm/gc_implementation/g1/ptrQueue.hpp.i
-data/src/os/bsd/vm/decoder_machO.cpp.i
-data/agent/src/os/win32/README-commands.txt.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java.i
+data/make/windows/projectfiles/tiered/Makefile.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolTypes.java.i
-data/src/share/vm/shark/sharkBuilder.hpp.i
+data/src/share/vm/runtime/dtraceJSDT.cpp.i
data/src/share/vm/c1/c1_CFGPrinter.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadContext.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java.i
+data/agent/make/pmapwindbg64.bat.i
data/src/os_cpu/linux_x86/vm/linux_x86_32.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/StubQueue.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleTypeImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java.i
data/src/cpu/x86/vm/javaFrameAnchor_x86.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties.i
data/build/windows/makefiles/rules.make.i
data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_64.cpp.i
-data/build/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java.i
data/agent/src/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java.i
data/make/linux/makefiles/optimized.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlass.java.i
+data/src/share/vm/ci/ciInstance.cpp.i
data/src/share/vm/gc_implementation/g1/g1_globals.cpp.i
data/make/bsd/makefiles/buildtree.make.i
data/make/linux/README.i
-data/src/cpu/x86/vm/depChecker_x86.hpp.i
data/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp.i
data/agent/src/scripts/start-rmiregistry64.sh.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java.i
+data/build/solaris/makefiles/top.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java.i
data/agent/src/share/classes/com/sun/java/swing/action/OpenAction.java.i
data/src/cpu/sparc/vm/codeBuffer_sparc.hpp.i
data/src/share/vm/oops/instanceKlassKlass.hpp.i
data/src/share/vm/code/codeCache.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.i
data/agent/test/jdi/multivm.sh.i
-data/agent/test/jdi/jstack64.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java.i
data/agent/make/jdbproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DefaultHeapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialStoreInstruction.java.i
+data/src/share/vm/shark/sharkConstant.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ShiftDecoder.java.i
data/src/share/vm/opto/vectornode.cpp.i
data/test/compiler/6814842/Test6814842.java.i
@@ -2013,13 +2014,13 @@ data/src/share/vm/libadt/dict.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadContext.java.i
data/agent/make/clhsdbwindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java.i
+data/src/share/vm/runtime/unhandledOops.hpp.i
data/src/share/vm/runtime/task.hpp.i
data/agent/make/jdbproc.sh.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java.i
data/src/os/solaris/vm/os_share_solaris.hpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties.i
-data/src/share/tools/ProjectCreator/DirectoryTree.java.i
+data/src/share/vm/classfile/javaAssertions.cpp.i
data/src/share/vm/oops/objArrayOop.cpp.i
data/make/linux/build.sh.i
data/src/share/vm/runtime/vm_operations.hpp.i
@@ -2032,8 +2033,8 @@ data/src/os_cpu/solaris_sparc/vm/solaris_sparc.s.i
data/src/share/vm/prims/jvmtiEnvThreadState.hpp.i
data/build/solaris/makefiles/reorder_COMPILER2_amd64.i
data/src/share/vm/oops/instanceRefKlass.hpp.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java.i
+data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/VariablePanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisters.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.gif.i
@@ -2043,14 +2044,16 @@ data/src/share/tools/IdealGraphVisualizer/Graph/manifest.mf.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp.i
data/src/share/vm/prims/jvmtiClassFileReconstituter.hpp.i
data/src/cpu/x86/vm/templateTable_x86_64.cpp.i
+data/agent/src/os/win32/initWinsock.hpp.i
data/agent/src/os/win32/Buffer.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml.i
data/make/solaris/makefiles/hp.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp.i
data/test/compiler/6711100/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java.i
data/src/share/vm/opto/callGenerator.cpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java.i
data/agent/src/os/win32/SwDbgSub.dsp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java.i
data/src/share/vm/oops/klassKlass.hpp.i
@@ -2060,15 +2063,15 @@ data/make/bsd/makefiles/amd64.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Information24.gif.i
data/src/cpu/zero/vm/icache_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java.i
-data/make/solaris/makefiles/reorder_COMPILER1_sparcv9.i
+data/src/share/vm/asm/assembler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java.i
data/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeCacheVisitor.java.i
data/src/share/vm/ci/ciCallSite.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java.i
data/src/share/vm/runtime/virtualspace.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectory.java.i
data/agent/src/os/bsd/StubDebuggerLocal.c.i
+data/make/solaris/makefiles/wb.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java.i
data/src/os/windows/vm/hpi_windows.cpp.i
data/src/cpu/x86/vm/interpreterGenerator_x86.hpp.i
@@ -2076,41 +2079,41 @@ data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bund
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9CasInstruction.java.i
data/agent/make/jsdbproc.sh.i
data/src/os_cpu/windows_x86/vm/windows_x86_32.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CMoveDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BreakpointInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TypeIndicators.java.i
data/test/compiler/5091921/Test6992759.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java.i
+data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJDoubleField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactory.java.i
data/src/cpu/zero/vm/register_definitions_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java.i
data/src/share/vm/runtime/vframe_hp.hpp.i
data/test/compiler/6892265/Test.java.i
-data/src/cpu/zero/vm/globals_zero.hpp.i
+data/test/compiler/6663621/IVTest.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java.i
+data/src/cpu/x86/vm/vm_version_x86_32.hpp.i
data/src/share/vm/runtime/reflectionCompat.hpp.i
data/src/cpu/x86/vm/stubRoutines_x86_32.hpp.i
data/src/share/vm/interpreter/bytecodeInterpreter.cpp.i
-data/src/share/vm/ci/ciCallSite.cpp.i
+data/src/share/vm/ci/ciObjArray.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp.i
data/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp.i
data/src/os/linux/vm/osThread_linux.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java.i
-data/src/cpu/sparc/vm/register_definitions_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java.i
+data/src/share/vm/prims/hpi_imported.h.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Opcodes.java.i
-data/src/share/vm/ci/ciKlass.hpp.i
+data/make/linux/makefiles/wb.make.i
+data/src/cpu/x86/vm/assembler_x86_32.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/AdapterBlob.java.i
data/src/cpu/zero/vm/nativeInst_zero.cpp.i
data/src/share/vm/utilities/taskqueue.hpp.i
-data/src/share/vm/gc_interface/collectedHeap.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlassKlass.java.i
data/src/share/vm/code/debugInfo.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif.i
+data/src/share/vm/memory/defNewGeneration.hpp.i
data/test/compiler/6910484/Test.java.i
+data/make/linux/makefiles/adjust-mflags.sh.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java.i
data/src/share/vm/memory/sharedHeap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/AddressOps.java.i
@@ -2120,87 +2123,84 @@ data/src/share/vm/runtime/jfieldIDWorkaround.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgOopHandle.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp.i
-data/src/share/vm/memory/universe.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLoadInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedPanAction.java.i
-data/src/share/vm/ci/ciExceptionHandler.hpp.i
data/src/share/vm/c1/c1_Instruction.cpp.i
-data/src/share/vm/prims/jni.h.i
+data/test/Makefile.i
data/src/share/vm/memory/genMarkSweep.cpp.i
data/src/share/vm/runtime/javaCalls.hpp.i
data/src/share/vm/memory/referencePolicy.hpp.i
data/src/os/bsd/vm/decoder_machO.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTracePanel.java.i
data/src/share/vm/oops/constMethodOop.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java.i
data/src/cpu/zero/vm/entry_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java.i
+data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp.i
data/src/share/vm/ci/ciKlassKlass.hpp.i
-data/src/share/vm/utilities/yieldingWorkgroup.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties.i
-data/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java.i
+data/make/windows/makefiles/rules.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlassKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java.i
-data/src/share/vm/opto/memnode.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties.i
data/src/os/solaris/vm/globals_solaris.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegInfo.java.i
-data/src/share/vm/memory/gcLocker.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java.i
data/src/share/vm/includeDB_shark.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties.i
-data/src/share/vm/runtime/fprofiler.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties.i
data/agent/src/share/classes/com/sun/java/swing/action/ExitAction.java.i
+data/src/cpu/x86/vm/disassembler_x86.cpp.i
data/src/share/vm/gc_interface/gcCause.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/AddressDataSource.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRestoreInstruction.java.i
data/src/share/vm/c1/c1_LIRGenerator.hpp.i
-data/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxOopHandle.java.i
data/src/cpu/zero/vm/stubRoutines_zero.cpp.i
data/make/windows/projectfiles/compiler2/vm.dsw.i
data/make/bsd/makefiles/saproc.make.i
data/src/share/vm/oops/generateOopMap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/RotateDecoder.java.i
-data/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp.i
+data/src/cpu/x86/vm/icache_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/Editor.java.i
-data/src/cpu/x86/vm/dump_x86_64.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java.i
data/src/share/vm/runtime/serviceThread.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCNoopInstruction.java.i
data/make/linux/adlc_updater.i
data/build/windows/build.make.i
-data/src/os/windows/vm/hpi_windows.hpp.i
+data/src/os/windows/vm/vtune_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderCellRenderer.java.i
+data/src/share/vm/services/psMemoryPool.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Type.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java.i
+data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/genfiles.properties.i
data/make/solaris/makefiles/mapfile-vers-debug.i
data/make/solaris/makefiles/reorder_CORE_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantLongValue.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java.i
+data/src/share/vm/runtime/signature.cpp.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.s.i
data/src/share/vm/interpreter/rewriter.cpp.i
data/src/share/vm/opto/loopnode.cpp.i
data/agent/make/pstackproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RetryInstruction.java.i
-data/src/share/tools/ProjectCreator/ProjectCreator.java.i
+data/src/share/vm/prims/jniCheck.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ProcImageClassLoader.java.i
-data/make/solaris/makefiles/reorder_COMPILER1_sparc.i
+data/test/compiler/6778657/Test.java.i
data/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OffsetClosure.java.i
-data/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp.i
-data/make/bsd/makefiles/ppc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java.i
+data/src/share/vm/ci/ciSignature.hpp.i
data/src/share/vm/ci/ciTypeArray.cpp.i
data/src/share/vm/includeDB_compiler2.i
data/src/share/vm/oops/symbolKlass.hpp.i
data/src/cpu/zero/vm/register_zero.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties.i
-data/make/windows/create.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java.i
+data/agent/make/dumpflagswindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/InterpreterCodelet.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java.i
-data/src/share/vm/services/diagnosticCommand.cpp.i
-data/src/os/solaris/launcher/java_md.h.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicField.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties.i
data/src/share/vm/memory/space.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties.i
@@ -2211,67 +2211,67 @@ data/agent/test/jdi/TargetAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodePutStatic.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86BranchInstruction.java.i
data/src/share/vm/interpreter/bytecodeStream.hpp.i
-data/src/cpu/x86/vm/stubRoutines_x86_64.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerField.java.i
data/src/share/tools/ProjectCreator/BuildConfig.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java.i
-data/src/share/vm/compiler/compilerOracle.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java.i
+data/src/share/vm/gc_implementation/shared/gcStats.hpp.i
data/src/share/vm/oops/constantPoolOop.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJBooleanField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVrDecoder.java.i
-data/src/share/vm/shark/sharkState.hpp.i
+data/build/sa.files.i
data/src/os/windows/vm/mutex_windows.cpp.i
-data/make/windows/makefiles/fastdebug.make.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/suite.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LoadDecoder.java.i
+data/src/share/vm/memory/cardTableRS.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java.i
+data/src/share/vm/utilities/preserveException.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/TwoOopHashtable.java.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java.i
-data/test/compiler/6910618/Test.java.i
-data/test/compiler/5091921/Test6959129.java.i
+data/src/cpu/x86/vm/frame_x86.hpp.i
+data/src/share/vm/classfile/classFileError.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSELogicalDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPMoveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java.i
data/agent/make/finalizerinfoproc.sh.i
data/src/share/tools/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties.i
-data/src/share/vm/ci/ciSymbol.hpp.i
-data/make/linux/makefiles/compiler2.make.i
-data/src/os/linux/vm/objectMonitor_linux.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java.i
+data/agent/test/jdi/runjdb.sh.i
data/src/share/vm/opto/parse2.cpp.i
data/src/share/vm/code/debugInfo.hpp.i
data/agent/test/jdi/README.jjh.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMVersionMismatchException.java.i
-data/test/compiler/6832293/Test.java.i
-data/src/os/bsd/vm/jvm_bsd.cpp.i
-data/src/share/vm/c1/c1_ValueStack.hpp.i
+data/src/share/vm/opto/phaseX.cpp.i
data/src/share/vm/memory/heap.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java.i
data/src/cpu/sparc/vm/register_sparc.hpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java.i
+data/src/cpu/x86/vm/vmreg_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSethiInstruction.java.i
data/src/cpu/zero/vm/dump_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/build-impl.xml.i
-data/make/defs.make.i
-data/make/linux/makefiles/defs.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBColor.java.i
+data/make/solaris/makefiles/kernel.make.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/genfiles.properties.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_32.s.i
+data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java.i
-data/test/runtime/6626217/Test6626217.sh.i
-data/agent/src/os/win32/initWinsock.hpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties.i
+data/src/cpu/zero/vm/interp_masm_zero.cpp.i
data/src/share/vm/runtime/vmThread.cpp.i
data/src/share/vm/runtime/biasedLocking.hpp.i
data/src/share/vm/prims/jvmtiH.xsl.i
data/src/cpu/sparc/vm/c1_LIRAssembler_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadStoreDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/amd64/AMD64CFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java.i
data/src/share/vm/code/location.cpp.i
data/test/compiler/7042153/Test7042153.java.i
data/src/share/vm/shark/sharkMemoryManager.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp.i
data/src/share/vm/services/runtimeService.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java.i
@@ -2283,18 +2283,17 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMoveInstruction.java
data/src/share/vm/gc_implementation/g1/concurrentMark.cpp.i
data/src/share/vm/prims/jvm.h.i
data/agent/src/share/classes/sun/jvm/hotspot/types/TypeDataBase.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVccInstruction.java.i
-data/src/cpu/x86/vm/assembler_x86_32.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_sparc/LinuxSPARCJavaThreadPDAccess.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml.i
-data/src/share/vm/code/icBuffer.hpp.i
-data/src/cpu/sparc/vm/c2_init_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java.i
data/agent/src/share/classes/com/sun/java/swing/ui/StatusBar.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCompoundType.java.i
data/src/os/windows/vm/threadCritical_windows.cpp.i
data/build/solaris/makefiles/mapfile-vers.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/LowMemoryDetectorThread.java.i
-data/src/share/vm/runtime/stackValue.hpp.i
+data/src/share/tools/ProjectCreator/FileFormatException.java.i
data/agent/make/dumpsyspropswindbg64.bat.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java.i
@@ -2306,25 +2305,32 @@ data/src/share/vm/ci/ciObjArrayKlass.cpp.i
data/src/share/vm/runtime/vframe.hpp.i
data/test/compiler/6726999/Test.java.i
data/src/os/linux/vm/objectMonitor_linux.inline.hpp.i
+data/agent/src/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java.i
data/src/share/vm/opto/stringopts.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml.i
data/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/HaltNode.java.i
data/src/share/vm/c1/c1_ValueMap.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SavedRestoredDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RestoredInstruction.java.i
+data/src/share/vm/memory/blockOffsetTable.inline.hpp.i
data/test/compiler/5091921/Test5091921.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/VtblAccess.java.i
+data/src/share/vm/prims/whitebox.cpp.i
+data/src/share/vm/libadt/set.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java.i
+data/test/compiler/6795161/Test.java.i
data/src/share/vm/prims/methodHandles.cpp.i
data/test/compiler/7047069/Test7047069.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciReceiverTypeData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedDouble.java.i
data/build/windows/projectfiles/compiler1/vm.dsw.i
-data/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp.i
-data/src/share/vm/runtime/fieldDescriptor.cpp.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java.i
+data/src/share/vm/opto/loopUnswitch.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java.i
data/src/cpu/zero/vm/stack_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java.i
-data/test/compiler/6823354/Test6823354.java.i
-data/make/linux/makefiles/sparcv9.make.i
+data/src/share/vm/ci/ciArrayKlassKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/Address.java.i
data/src/share/vm/prims/jvmtiRawMonitor.hpp.i
data/build/windows/projectfiles/tiered/Makefile.i
data/src/share/vm/ci/ciMethodKlass.cpp.i
@@ -2333,17 +2339,19 @@ data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cp
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java.i
data/make/templates/bsd-header.i
data/src/cpu/zero/vm/templateTable_zero.cpp.i
-data/test/compiler/6837011/Test6837011.java.i
-data/agent/src/share/classes/com/sun/java/swing/ui/SplashScreen.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSaveInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Address.java.i
data/src/os/solaris/dtrace/libjvm_db.c.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderTable.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGraphWriter.java.i
data/src/share/vm/memory/gcLocker.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp.i
+data/src/os/solaris/vm/osThread_solaris.hpp.i
data/src/cpu/zero/vm/jniTypes_zero.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp.i
data/build/linux/platform_i486.suncc.i
+data/src/cpu/zero/vm/stubRoutines_zero.hpp.i
data/src/cpu/x86/vm/vtableStubs_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java.i
data/src/share/vm/ci/ciObject.hpp.i
@@ -2352,83 +2360,85 @@ data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv
data/src/cpu/sparc/vm/templateInterpreter_sparc.hpp.i
data/src/os/linux/vm/jvm_linux.cpp.i
data/src/share/vm/ci/ciInstanceKlass.hpp.i
-data/src/share/vm/opto/compile.hpp.i
data/agent/make/permstatwindbg64.bat.i
data/src/share/vm/runtime/osThread.cpp.i
data/src/share/vm/utilities/errorReporter.hpp.i
-data/build/solaris/makefiles/reorder_CORE_sparcv9.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java.i
data/src/share/vm/ci/ciObjArrayKlass.hpp.i
data/src/share/vm/includeDB_zero.i
-data/src/share/vm/memory/threadLocalAllocBuffer.cpp.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp.i
+data/src/share/vm/compiler/compileLog.hpp.i
data/src/share/vm/classfile/verifier.hpp.i
-data/test/compiler/5091921/Test6753639.java.i
+data/src/share/vm/prims/privilegedStack.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegister.java.i
data/src/share/vm/prims/jvmtiEnv.xsl.i
-data/src/share/vm/runtime/safepoint.cpp.i
-data/make/bsd/makefiles/hp1.make.i
+data/build/linux/Queens.class.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadState.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp.i
-data/src/share/vm/runtime/sharedRuntimeTrig.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java.i
+data/agent/src/os/linux/libproc.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ReadDecoder.java.i
+data/src/cpu/sparc/vm/jni_sparc.h.i
data/src/os/bsd/dtrace/jvm_dtrace.h.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/Type.java.i
data/src/share/vm/services/diagnosticFramework.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCDisassembler.java.i
+data/src/share/vm/opto/lcm.cpp.i
data/src/cpu/sparc/vm/register_sparc.cpp.i
data/src/cpu/zero/vm/cppInterpreter_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java.i
data/src/share/vm/services/diagnosticArgument.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/AddressDataSource.java.i
data/build/solaris/makefiles/compiler1.make.i
data/make/solaris/makefiles/reorder_COMPILER1_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVccDecoder.java.i
data/src/os/solaris/vm/mutex_solaris.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerTypeImpl.java.i
+data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties.i
+data/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayReferenceImpl.java.i
-data/agent/src/share/classes/com/sun/java/swing/action/HelpMenu.java.i
data/agent/test/jdi/TargetListener.java.i
data/build/windows/platform_amd64.i
-data/src/share/vm/ci/ciFlags.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java.i
data/src/share/vm/ci/ciEnv.cpp.i
data/src/share/vm/opto/doCall.cpp.i
-data/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp.i
+data/test/compiler/6930043/Test6930043.java.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif.i
data/build/linux/makefiles/saproc.make.i
data/src/share/vm/opto/macro.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java.i
+data/src/share/vm/ci/ciMethod.cpp.i
data/src/share/tools/MakeDeps/Platform.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java.i
-data/make/solaris/makefiles/mapfile-vers-jvm_db.i
+data/test/compiler/6894807/Test6894807.sh.i
data/src/os/linux/vm/vmError_linux.cpp.i
data/src/share/vm/classfile/javaClasses.hpp.i
-data/make/solaris/makefiles/hp1.make.i
+data/test/runtime/6929067/Test6929067.sh.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties.i
data/src/share/tools/ProjectCreator/ArgsParser.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FloatTreeNodeAdapter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastAAccess0.java.i
data/src/share/vm/compiler/methodLiveness.cpp.i
+data/test/compiler/6935535/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactory.java.i
-data/src/share/vm/code/codeBlob.hpp.i
data/agent/test/jdi/TEST.ROOT.i
data/src/share/vm/includeDB_features.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9IlltrapInstruction.java.i
data/src/share/vm/interpreter/cppInterpreter.hpp.i
data/src/os_cpu/windows_x86/vm/windows_x86_64.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32ThreadContext.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java.i
-data/make/solaris/makefiles/tiered.make.i
+data/build/windows/makefiles/defs.make.i
data/src/share/vm/utilities/events.cpp.i
data/make/solaris/makefiles/i486.make.i
data/make/windows/projectfiles/compiler2/ADLCompiler.dsw.i
-data/src/cpu/x86/vm/vm_version_x86.cpp.i
+data/src/share/vm/prims/jvmtiEventController.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java.i
-data/src/cpu/zero/vm/jni_zero.h.i
+data/src/share/vm/runtime/jniHandles.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/build.xml.i
data/agent/make/jdbcore.sh.i
data/build/windows/projectfiles/core/vm.dsw.i
@@ -2446,90 +2456,84 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntervalTree.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorBranchDecoder.java.i
data/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.i
+data/src/share/vm/utilities/elfFile.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegionSeq.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86ThreadContext.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JavaStackTracePanel.java.i
data/make/windows/makefiles/top.make.i
-data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/livejvm/Event.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java.i
-data/src/share/vm/oops/methodDataKlass.cpp.i
-data/src/share/vm/opto/superword.cpp.i
-data/agent/make/pmapwindbg64.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleTypeImpl.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/StubQueue.java.i
data/src/os/bsd/dtrace/hotspot_jni.d.i
data/src/share/vm/services/jmm.h.i
data/make/linux/makefiles/sa.make.i
data/make/linux/makefiles/arm.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java.i
+data/src/cpu/x86/vm/c1_LinearScan_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfDataEntry.java.i
-data/src/cpu/zero/vm/shark_globals_zero.hpp.i
-data/src/share/vm/classfile/javaAssertions.cpp.i
+data/src/share/tools/ProjectCreator/DirectoryTree.java.i
data/src/share/vm/runtime/reflectionUtils.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugInfoDataBase.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/build-impl.xml.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java.i
+data/src/cpu/sparc/vm/c2_init_sparc.cpp.i
data/src/share/vm/memory/allocationStats.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceMirrorKlass.java.i
data/agent/make/dumpsyspropsproc.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberMapping.java.i
data/src/share/vm/services/runtimeService.cpp.i
-data/test/compiler/6663621/IVTest.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java.i
+data/src/cpu/zero/vm/globals_zero.hpp.i
+data/src/share/vm/oops/cpCacheOop.hpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/FieldTreeNodeAdapter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntryConstants.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LongField.java.i
-data/make/windows/makefiles/rules.make.i
+data/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp.i
data/src/share/vm/utilities/elfStringTable.hpp.i
data/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp.i
data/build/solaris/makefiles/reorder_COMPILER1_sparc.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java.i
-data/src/os/windows/vm/vtune_windows.cpp.i
+data/src/os/windows/vm/hpi_windows.hpp.i
data/test/compiler/6990212/Test6990212.java.i
data/src/share/vm/memory/serialize.cpp.i
-data/src/share/vm/prims/jniCheck.cpp.i
-data/make/solaris/makefiles/sparcWorks.make.i
+data/src/share/tools/ProjectCreator/ProjectCreator.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterDirectAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java.i
data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java.i
-data/src/share/vm/memory/cardTableRS.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LoadDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/search.gif.i
data/src/os/linux/vm/osThread_linux.cpp.i
data/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/RMIHelper.java.i
data/src/share/vm/ci/ciField.cpp.i
data/test/compiler/7002666/Test7002666.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java.i
+data/src/share/vm/shark/sharkContext.cpp.i
data/test/compiler/5091921/Test6890943.java.i
data/src/os/windows/vm/os_windows.inline.hpp.i
data/src/share/vm/precompiled.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/PhiNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RestoredInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SavedRestoredDecoder.java.i
data/build/solaris/makefiles/mapfile-vers-COMPILER2.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegister.java.i
data/src/share/vm/opto/callnode.cpp.i
-data/test/compiler/6863155/Test6863155.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java.i
data/src/share/vm/runtime/mutexLocker.cpp.i
-data/src/share/vm/adlc/arena.cpp.i
data/src/share/vm/utilities/decoder_elf.cpp.i
-data/src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp.i
+data/src/share/vm/memory/threadLocalAllocBuffer.cpp.i
data/src/share/vm/runtime/jniHandles.cpp.i
data/make/bsd/makefiles/rules.make.i
data/agent/make/dumpflagswindbg.bat.i
data/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml.i
-data/make/solaris/Queens.class.i
-data/src/cpu/sparc/vm/assembler_sparc.cpp.i
+data/src/share/vm/gc_implementation/shared/coTracker.hpp.i
data/src/share/vm/runtime/timer.hpp.i
data/src/share/vm/opto/callGenerator.hpp.i
-data/src/share/tools/MakeDeps/Macro.java.i
+data/src/share/vm/interpreter/bytecode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/TypeComponentImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java.i
data/agent/src/os/win32/Buffer.cpp.i
@@ -2538,44 +2542,47 @@ data/src/cpu/zero/vm/stack_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachNode.java.i
data/src/os/bsd/vm/threadCritical_bsd.cpp.i
data/src/share/vm/shark/sharkStack.hpp.i
-data/src/share/vm/oops/cpCacheOop.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java.i
data/src/share/vm/adlc/adlparse.cpp.i
-data/agent/doc/ReadMe-JavaScript.text.i
+data/agent/test/jdi/serialvm.java.i
+data/src/share/vm/services/diagnosticCommand_ext.hpp.i
data/src/share/vm/adlc/adlc.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java.i
-data/src/share/vm/runtime/osThread.hpp.i
+data/test/compiler/6863155/Test6863155.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicField.java.i
data/src/share/vm/runtime/perfMemory.cpp.i
data/src/share/vm/ci/ciFlags.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/InputLexer.java.i
-data/build/windows/projectfiles/tiered/ADLCompiler.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ProcessControl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicField.java.i
-data/src/cpu/sparc/vm/vm_version_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeRet.java.i
data/test/compiler/5091921/input6890943.txt.i
+data/build/linux/makefiles/optimized.make.i
data/agent/src/os/linux/Makefile.i
data/src/share/tools/MakeDeps/FileName.java.i
data/src/cpu/x86/vm/sharedRuntime_x86_64.cpp.i
data/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJShortField.java.i
data/make/windows/makefiles/sanity.make.i
+data/build/solaris/makefiles/mapfile-vers-COMPILER1.i
data/src/share/vm/shark/sharkCompiler.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/RegisterPanel.java.i
-data/build/solaris/platform_i486.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoomin.gif.i
data/make/solaris/makefiles/compiler2.make.i
data/test/compiler/6646020/Tester.java.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java.i
+data/agent/doc/hsdb.html.i
data/build/windows/platform_i486.i
+data/src/share/vm/opto/callnode.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CodeHeap.java.i
+data/make/bsd/makefiles/universal.gmk.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java.i
@@ -2587,16 +2594,16 @@ data/src/cpu/zero/vm/bytecodes_zero.cpp.i
data/src/cpu/x86/vm/c1_Runtime1_x86.cpp.i
data/agent/src/os/win32/isNT4.hpp.i
data/src/share/vm/ci/ciObjArrayKlassKlass.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp.i
+data/src/share/tools/MakeDeps/UnixPlatform.java.i
+data/src/share/vm/prims/jvmtiEventController.cpp.i
data/src/os/bsd/vm/chaitin_bsd.cpp.i
data/src/cpu/zero/vm/fakeStubFrame_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/JavaGroupOrganizer.java.i
data/make/windows/makefiles/defs.make.i
data/src/share/tools/launcher/java.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java.i
+data/src/os/solaris/launcher/java_md.h.i
data/src/share/vm/shark/sharkInvariants.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java.i
-data/src/os/linux/vm/chaitin_linux.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.gif.i
data/src/share/vm/gc_implementation/shared/mutableSpace.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Arguments.java.i
@@ -2608,6 +2615,7 @@ data/make/solaris/makefiles/core.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/SaveAs24.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java.i
data/src/share/vm/ci/ciTypeArrayKlass.cpp.i
+data/src/share/vm/shark/sharkInliner.cpp.i
data/src/cpu/x86/vm/x86.ad.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp.i
@@ -2619,12 +2627,12 @@ data/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp.i
data/src/share/vm/runtime/vtune.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/SafePointNode.java.i
data/agent/src/os/solaris/dbx/Makefile.i
-data/agent/src/share/classes/com/sun/java/swing/action/NextAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java.i
data/src/share/vm/interpreter/bytecodeHistogram.hpp.i
data/make/linux/makefiles/amd64.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatBranchDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/PackageScanner.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp.i
+data/src/share/vm/services/g1MemoryPool.hpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadStore.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/OopHandle.java.i
@@ -2632,46 +2640,42 @@ data/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf.i
data/src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLookupswitch.java.i
data/src/share/vm/gc_implementation/shared/spaceCounters.hpp.i
-data/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.i
+data/src/os/windows/vm/c2_globals_windows.hpp.i
data/src/share/vm/opto/live.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/SafepointBlob.java.i
data/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactoryImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/JmpDecoder.java.i
+data/make/linux/platform_zero.in.i
+data/make/windows/projectfiles/core/vm.dsw.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Zoom16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/BufferBlob.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/InvocableCallable.java.i
data/test/compiler/6636138/Test2.java.i
data/build/solaris/makefiles/reorder_CORE_amd64.i
-data/src/os/windows/vm/jvm_windows.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop2Decoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/UnknownOopException.java.i
data/src/share/vm/oops/fieldInfo.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/MemberFunctionType.java.i
data/src/share/vm/runtime/deoptimization.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceStoreDecoder.java.i
+data/src/os/windows/vm/objectMonitor_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactoryImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.properties.i
-data/src/share/vm/utilities/constantTag.hpp.i
+data/make/bsd/makefiles/wb.make.i
data/src/share/vm/memory/genMarkSweep.hpp.i
-data/src/os/windows/vm/perfMemory_windows.cpp.i
-data/build/linux/build.sh.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml.i
data/src/share/vm/oops/instanceRefKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JByteField.java.i
-data/src/share/vm/code/nmethod.hpp.i
data/src/share/vm/adlc/archDesc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/PCFinder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/development/Server16.gif.i
data/src/share/vm/utilities/utf8.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LdstubDecoder.java.i
-data/test/compiler/6823453/Test.java.i
+data/src/share/vm/runtime/fieldDescriptor.cpp.i
data/agent/src/os/linux/salibelf.c.i
data/src/share/vm/oops/instanceMirrorKlass.cpp.i
data/test/compiler/6579789/Test6579789.java.i
-data/agent/make/Makefile.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.gif.i
data/make/windows/makefiles/product.make.i
data/make/bsd/makefiles/zeroshark.make.i
@@ -2688,9 +2692,10 @@ data/test/runtime/6626217/IFace.java.i
data/test/compiler/6875866/Test.java.i
data/src/share/vm/runtime/vm_version.hpp.i
data/src/cpu/zero/vm/assembler_zero.inline.hpp.i
-data/test/compiler/6880034/Test6880034.java.i
+data/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp.i
data/make/linux/makefiles/mapfile-vers-debug.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml.i
data/build/linux/makefiles/hp1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java.i
@@ -2698,40 +2703,42 @@ data/src/os/solaris/vm/chaitin_solaris.cpp.i
data/agent/make/saenv.bat.i
data/build/windows/projectfiles/tiered/ADLCompiler.dsw.i
data/make/bsd/makefiles/launcher.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLOperations.java.i
-data/src/os/windows/vm/decoder_windows.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp.i
+data/src/os/solaris/vm/vmError_solaris.cpp.i
data/test/compiler/6757316/Test6757316.java.i
data/agent/make/finalizerinfoproc64.sh.i
data/test/compiler/5091921/Test7005594.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCJmplInstruction.java.i
+data/src/cpu/zero/vm/jniFastGetField_zero.cpp.i
data/src/os/bsd/vm/mutex_bsd.cpp.i
-data/agent/test/jdi/serialvm.sh.i
+data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp.i
data/agent/test/libproc/LibprocClient.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGen.java.i
data/test/compiler/6378821/Test6378821.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DoubleType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java.i
data/src/cpu/sparc/vm/methodHandles_sparc.hpp.i
-data/build/solaris/makefiles/mapfile-vers-COMPILER1.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java.i
+data/agent/src/os/solaris/proc/saproc.cpp.i
data/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp.i
data/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp.i
data/test/compiler/6910605/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCStbarInstruction.java.i
-data/src/cpu/zero/vm/interpreterRT_zero.cpp.i
+data/src/os_cpu/bsd_x86/vm/os_bsd_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50.java.i
data/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp.i
data/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp.i
+data/build/linux/makefiles/compiler1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BaseLineInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciSymbol.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java.i
+data/agent/src/os/win32/initWinsock.cpp.i
data/src/share/vm/opto/block.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/IndirectAddress.java.i
+data/src/share/vm/opto/connode.hpp.i
data/make/bsd/makefiles/cscope.make.i
data/src/share/vm/runtime/prefetch.hpp.i
data/src/share/vm/runtime/orderAccess.cpp.i
+data/test/compiler/6589834/Test_ia32.java.i
data/build/windows/build_vm_def.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/SOQLEngine.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/platform.properties.i
@@ -2743,19 +2750,17 @@ data/test/compiler/6636138/Test1.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortableTableModel.java.i
data/agent/test/libproc/LibprocTest.java.i
data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp.i
+data/src/share/vm/utilities/stack.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86CallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CharField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlassKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java.i
-data/src/share/vm/services/threadService.cpp.i
+data/src/share/vm/prims/jvmtiExtensions.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSModule.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/Field.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FrameWrapper.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java.i
-data/src/share/vm/oops/instanceOop.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java.i
+data/make/solaris/Queens.class.i
data/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/PreferenceConstants.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java.i
@@ -2764,7 +2769,6 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadContext.java.i
data/src/share/vm/oops/compiledICHolderOop.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantIntValue.java.i
data/build/windows/makefiles/adlc.make.i
-data/build/linux/makefiles/rules.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java.i
data/src/cpu/sparc/vm/bytes_sparc.hpp.i
@@ -2777,7 +2781,7 @@ data/build/solaris/makefiles/reorder_COMPILER2_sparcv9.i
data/src/share/vm/runtime/atomic.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java.i
data/src/share/vm/runtime/vframeArray.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java.i
data/build/windows/projectfiles/compiler2/Makefile.i
data/src/share/tools/MakeDeps/Database.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ProgressBarPanel.java.i
@@ -2787,15 +2791,16 @@ data/src/share/vm/memory/genOopClosures.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/LongTreeNodeAdapter.java.i
data/src/share/vm/adlc/formsopt.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicType.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/build.xml.i
+data/src/cpu/zero/vm/jni_zero.h.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerException.java.i
data/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp.i
data/build/linux/platform_amd64.i
data/src/share/vm/shark/sharkConstant.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/FindPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java.i
data/build/solaris/platform_sparc.gcc.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CIntField.java.i
data/src/share/vm/ci/ciMethodKlass.hpp.i
+data/make/solaris/makefiles/adlc.make.i
data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.xml.i
data/make/solaris/makefiles/reorder_CORE_sparc.i
data/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp.i
@@ -2806,14 +2811,11 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CasDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEArithmeticDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java.i
data/src/share/vm/opto/divnode.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIndirectCallInstruction.java.i
-data/src/share/vm/opto/mulnode.cpp.i
+data/src/share/vm/interpreter/linkResolver.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoad.java.i
-data/src/share/vm/interpreter/bytecodes.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeGroupNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java.i
data/make/altsrc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJByteField.java.i
data/agent/src/share/classes/com/sun/java/swing/action/ApplyAction.java.i
@@ -2824,141 +2826,141 @@ data/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/build.xml.i
data/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp.i
-data/src/share/vm/prims/jvm_misc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyBlockSym.java.i
data/src/share/vm/opto/addnode.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedStream.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObject.java.i
data/src/share/vm/opto/loopnode.hpp.i
data/make/linux/makefiles/sparcWorks.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java.i
data/agent/src/os/solaris/dbx/helloWorld.cpp.i
data/src/share/vm/memory/permGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java.i
data/src/os/solaris/dtrace/hotspot.d.i
data/build/linux/makefiles/jvmti.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50ReservedTypes.java.i
-data/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.i
+data/agent/make/pmapproc.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java.i
-data/src/cpu/x86/vm/nativeInst_x86.hpp.i
+data/src/share/vm/classfile/symbolTable.hpp.i
data/src/share/vm/memory/oopFactory.hpp.i
data/src/share/vm/interpreter/oopMapCache.cpp.i
data/.hgignore.i
-data/src/share/vm/gc_implementation/g1/satbQueue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LineNumberTableElement.java.i
+data/src/share/vm/memory/collectorPolicy.hpp.i
data/build/solaris/makefiles/amd64.make.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java.i
-data/src/share/vm/code/vmreg.cpp.i
+data/agent/make/finalizerinfowindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCOpcodes.java.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.xml.i
+data/src/cpu/x86/vm/templateTable_x86_64.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/AlignCenterAction.java.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC8.java.i
+data/src/os/solaris/dtrace/libjvm_db.h.i
data/src/share/vm/prims/jvmtiImpl.hpp.i
-data/src/cpu/zero/vm/bytecodes_zero.hpp.i
-data/make/solaris/platform_amd64.i
-data/src/share/vm/gc_implementation/g1/sparsePRT.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SourceCodePanel.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignLeft16.gif.i
data/src/share/vm/interpreter/bytecodeInterpreter.hpp.i
data/src/share/vm/opto/divnode.hpp.i
data/src/share/vm/runtime/javaCalls.cpp.i
-data/make/solaris/makefiles/buildtree.make.i
data/src/cpu/zero/vm/register_zero.cpp.i
data/src/share/vm/opto/ifg.cpp.i
data/src/share/vm/runtime/aprofiler.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstance.java.i
data/src/share/vm/c1/c1_CFGPrinter.cpp.i
-data/src/share/vm/opto/parseHelper.cpp.i
data/src/os/windows/vm/jvm_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeANewArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPArithmeticDecoder.java.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java.i
-data/test/compiler/6932496/Test6932496.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegister.java.i
+data/make/bsd/makefiles/defs.make.i
+data/src/cpu/sparc/vm/debug_sparc.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp.i
-data/src/share/vm/memory/filemap.cpp.i
-data/src/share/vm/oops/oop.psgc.inline.hpp.i
+data/src/share/vm/gc_implementation/g1/survRateGroup.cpp.i
+data/src/share/vm/gc_implementation/g1/satbQueue.hpp.i
data/src/share/vm/utilities/ostream.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java.i
data/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/manifest.mf.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.i
data/test/compiler/7017746/Test.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/JCharField.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Save16.gif.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java.i
data/agent/src/os/linux/test.c.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/SaveAs16.gif.i
data/src/share/vm/utilities/taskqueue.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java.i
+data/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp.i
data/build/solaris/adlc_updater.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp.i
data/src/cpu/sparc/vm/methodHandles_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorDecoder.java.i
-data/test/compiler/6855215/Test6855215.java.i
-data/LICENSE.i
+data/agent/make/jcorewindbg64.bat.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.xml.i
data/src/share/vm/memory/resourceArea.hpp.i
-data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java.i
+data/src/cpu/zero/vm/copy_zero.hpp.i
data/src/share/vm/ci/bcEscapeAnalyzer.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java.i
data/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.i
data/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp.i
data/src/os/bsd/vm/globals_bsd.hpp.i
+data/src/share/vm/services/management.hpp.i
data/src/share/vm/classfile/verificationType.cpp.i
-data/src/share/vm/memory/barrierSet.inline.hpp.i
+data/src/os/windows/vm/mutex_windows.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/StoreInstruction.java.i
data/make/solaris/makefiles/sparcv9.make.i
data/src/share/vm/compiler/compileBroker.cpp.i
-data/agent/src/os/solaris/proc/saproc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPopDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicRefType.java.i
+data/test/compiler/6932496/Test6932496.java.i
data/src/share/vm/runtime/compilationPolicy.hpp.i
data/src/os/solaris/vm/stubRoutines_solaris.cpp.i
data/src/share/vm/opto/coalesce.hpp.i
data/src/share/vm/shark/shark_globals.hpp.i
data/src/share/tools/launcher/jli_util.h.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ArithmeticInstruction.java.i
data/src/share/vm/opto/cfgnode.cpp.i
data/src/cpu/x86/vm/register_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxAddress.java.i
data/test/compiler/6894807/IsInstanceTest.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java.i
data/test/compiler/6539464/Test.java.i
data/make/solaris/makefiles/mapfile-vers-COMPILER1.i
-data/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp.i
+data/src/cpu/sparc/vm/vmreg_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditableAtEndDocument.java.i
+data/test/compiler/6885584/Test6885584.java.i
data/build/windows/projectfiles/compiler2/vm.dsw.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml.i
data/src/os_cpu/solaris_x86/vm/os_solaris_x86.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLdstubDecoder.java.i
+data/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicPointerType.java.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java.i
+data/agent/make/Makefile.i
data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp.i
data/src/cpu/x86/vm/interpreterRT_x86.hpp.i
-data/src/share/vm/memory/allocation.hpp.i
-data/src/share/vm/prims/jvmtiTrace.cpp.i
+data/make/linux/Queens.class.i
data/src/os/solaris/vm/objectMonitor_solaris.hpp.i
-data/agent/make/jhistoproc64.sh.i
-data/src/share/vm/prims/jvmtiTagMap.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp.i
data/src/share/vm/code/compressedStream.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisterInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandleBlock.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ShiftInstruction.java.i
data/src/share/vm/classfile/javaClasses.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegisters.java.i
+data/build/solaris/makefiles/reorder_COMPILER2_i486.i
+data/src/share/vm/ci/ciType.cpp.i
data/src/share/vm/prims/jvmtiEnv.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java.i
data/src/share/vm/oops/compiledICHolderOop.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn24.gif.i
data/src/share/vm/memory/tenuredGeneration.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/MessageQueueBackend.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SAJDIClassLoader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/DummySymbolFinder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java.i
+data/agent/src/share/classes/com/sun/java/swing/action/NextAction.java.i
data/src/share/vm/classfile/stackMapTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Disassembler.java.i
data/build/test/Queens.java.i
@@ -2969,42 +2971,45 @@ data/make/sa.files.i
data/src/os/bsd/vm/jvm_bsd.h.i
data/src/share/vm/shark/sharkCodeBuffer.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/LogicalDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java.i
data/src/share/vm/gc_implementation/g1/g1RemSet.cpp.i
data/src/share/vm/runtime/javaFrameAnchor.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Disassembler.java.i
+data/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp.i
data/agent/src/os/win32/SwDbgSrv.dsp.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java.i
-data/src/share/vm/gc_implementation/g1/g1_globals.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Node_Array.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/manifest.mf.i
-data/src/share/vm/classfile/loaderConstraints.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java.i
data/src/share/vm/c1/c1_Instruction.hpp.i
data/src/cpu/x86/vm/templateInterpreter_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/NativeSignatureIterator.java.i
data/src/share/vm/prims/jvmtiCodeBlobEvents.hpp.i
-data/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp.i
+data/src/cpu/sparc/vm/nativeInst_sparc.hpp.i
+data/make/windows/README.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FloatGRPDecoder.java.i
data/src/cpu/x86/vm/runtime_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectoryEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArray.java.i
data/src/share/vm/trace/traceEventTypes.hpp.i
-data/src/share/vm/oops/typeArrayKlass.hpp.i
+data/src/share/vm/c1/c1_FrameMap.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/ExceptionEvent.java.i
-data/src/share/vm/c1/c1_Optimizer.hpp.i
+data/src/share/vm/ci/ciExceptionHandler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java.i
data/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp.i
data/build/windows/jvmexp_g.lcf.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupReceiver.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidTypeImpl.java.i
data/test/runtime/6925573/SortMethodsTest.java.i
-data/src/share/vm/shark/sharkTopLevelBlock.hpp.i
-data/src/share/vm/compiler/abstractCompiler.hpp.i
+data/src/cpu/zero/vm/stubGenerator_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java.i
data/agent/make/hsdb.bat.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java.i
@@ -3014,23 +3019,22 @@ data/src/os_cpu/solaris_x86/vm/prefetch_solaris_x86.inline.hpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSet.cpp.i
data/src/share/vm/opto/regmask.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/CStringUtilities.java.i
-data/src/os/bsd/vm/attachListener_bsd.cpp.i
+data/src/os/solaris/vm/threadCritical_solaris.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JIntField.java.i
data/src/cpu/x86/vm/stubGenerator_x86_64.cpp.i
data/src/share/vm/c1/c1_Defs.cpp.i
data/src/share/vm/runtime/globals_ext.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64JavaCallWrapper.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties.i
-data/src/share/vm/shark/sharkType.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/OopVisitor.java.i
+data/src/share/vm/interpreter/templateTable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java.i
+data/src/share/vm/compiler/disassembler.cpp.i
+data/make/bsd/makefiles/zero.make.i
data/src/share/vm/shark/sharkValue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/MaskFillerForNative.java.i
data/src/os/solaris/vm/objectMonitor_solaris.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java.i
-data/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java.i
data/test/compiler/6663848/Tester.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java.i
data/src/share/vm/code/relocInfo.cpp.i
@@ -3041,18 +3045,18 @@ data/src/share/vm/runtime/arguments.hpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java.i
data/src/share/vm/memory/allocationStats.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThread.java.i
-data/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java.i
data/src/share/vm/runtime/init.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp.i
data/src/cpu/sparc/vm/relocInfo_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ArrayType.java.i
-data/src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp.i
+data/src/os/solaris/vm/os_solaris.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialLoadInstruction.java.i
-data/test/compiler/6659207/Test.java.i
+data/src/share/vm/opto/parseHelper.cpp.i
data/build/windows/projectfiles/compiler2/vm.def.i
-data/src/share/vm/c1/c1_Canonicalizer.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/RMIHelper.java.i
data/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Assert.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionDirectory.java.i
data/src/share/vm/compiler/compilerOracle.hpp.i
@@ -3061,28 +3065,29 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CVAttributes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSMPC.java.i
data/src/cpu/sparc/vm/jniFastGetField_sparc.cpp.i
data/make/linux/makefiles/jvmg.make.i
-data/src/share/vm/runtime/vm_version.cpp.i
+data/make/bsd/makefiles/sparcv9.make.i
data/agent/src/share/native/jvmdi/sa.cpp.i
-data/src/share/vm/services/dtraceAttacher.hpp.i
+data/src/share/vm/adlc/arena.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java.i
-data/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp.i
-data/test/compiler/6930043/Test6930043.java.i
+data/src/share/vm/ci/ciField.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MembarInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindAction.java.i
+data/src/share/vm/trace/traceMacros.hpp.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_32.il.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModFileDesc.java.i
+data/build/linux/makefiles/i486.make.i
data/make/linux/makefiles/rules.make.i
data/src/share/vm/runtime/aprofiler.cpp.i
data/src/share/vm/gc_implementation/shared/spaceCounters.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicEnumType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstruction.java.i
-data/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp.i
-data/src/share/vm/adlc/filebuff.cpp.i
-data/src/share/vm/shark/sharkContext.cpp.i
-data/src/share/vm/services/psMemoryPool.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ArithmeticDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java.i
+data/src/share/vm/ci/ciUtilities.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java.i
data/src/share/vm/oops/arrayOop.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java.i
data/src/share/tools/hsdis/hsdis.h.i
data/src/share/tools/LogCompilation/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSymbol.java.i
@@ -3096,25 +3101,25 @@ data/make/bsd/platform_sparcv9.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHashTable.java.i
data/make/bsd/makefiles/core.make.i
data/build/linux/makefiles/jvmg.make.i
-data/src/share/vm/opto/chaitin.hpp.i
-data/build/solaris/makefiles/compiler2.make.i
+data/src/share/vm/code/exceptionHandlerTable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java.i
+data/src/share/vm/utilities/accessFlags.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java.i
data/src/share/vm/adlc/dict2.hpp.i
-data/src/cpu/x86/vm/disassembler_x86.cpp.i
-data/make/solaris/makefiles/reorder_COMPILER1_amd64.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml.i
+data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java.i
data/agent/src/os/win32/toolHelp.cpp.i
data/make/pic.make.i
data/src/share/vm/oops/instanceKlass.hpp.i
data/src/share/tools/MakeDeps/DirectoryTree.java.i
data/agent/src/share/lib/jlfgr-1_0.jar.i
-data/make/linux/makefiles/hp.make.i
+data/src/share/vm/gc_implementation/shared/allocationStats.cpp.i
data/build/solaris/makefiles/i486.make.i
-data/src/share/vm/oops/constMethodOop.hpp.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties.i
-data/src/os/windows/vm/objectMonitor_windows.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java.i
+data/src/cpu/zero/vm/stack_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png.i
-data/src/share/vm/oops/arrayKlass.hpp.i
+data/src/share/vm/utilities/hashtable.hpp.i
data/src/cpu/sparc/vm/templateInterpreter_sparc.cpp.i
data/src/share/vm/ci/ciMethodData.cpp.i
data/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp.i
@@ -3123,57 +3128,56 @@ data/src/share/vm/c1/c1_LIRAssembler.hpp.i
data/build/solaris/Queens.class.i
data/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp.i
data/test/compiler/6756768/Test6756768_2.java.i
-data/agent/src/os/solaris/proc/libproc.h.i
-data/src/share/vm/oops/klass.hpp.i
+data/src/os/posix/vm/os_posix.cpp.i
+data/src/share/vm/gc_implementation/parNew/parOopClosures.hpp.i
+data/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java.i
+data/test/compiler/6855215/Test6855215.java.i
data/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp.i
-data/src/share/vm/memory/dump.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java.i
data/make/windows/jvmexp.lcf.i
data/src/share/vm/opto/compile.cpp.i
-data/src/share/vm/ci/ciTypeFlow.hpp.i
+data/src/os/linux/vm/mutex_linux.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/HighPrecisionJScrollBar.java.i
data/src/share/vm/utilities/utf8.cpp.i
data/src/share/vm/c1/c1_LIR.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86PCRelativeAddress.java.i
-data/make/bsd/makefiles/fastdebug.make.i
-data/src/cpu/sparc/vm/interpreter_sparc.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java.i
+data/test/compiler/6714694/Tester.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFormat3AInstruction.java.i
data/src/share/tools/MakeDeps/MakeDeps.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Address.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java.i
data/src/share/vm/interpreter/templateInterpreter.cpp.i
data/src/share/tools/IdealGraphVisualizer/Difference/build.xml.i
-data/src/share/vm/runtime/advancedThresholdPolicy.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/FloatField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberInfo.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/About16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LongTypeImpl.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC6.java.i
+data/src/os/bsd/vm/osThread_bsd.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRettInstruction.java.i
data/src/os/solaris/vm/vtune_solaris.cpp.i
data/src/os/linux/vm/jsig.c.i
data/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp.i
data/src/share/vm/oops/methodDataKlass.hpp.i
-data/make/solaris/makefiles/cscope.make.i
-data/src/cpu/x86/vm/assembler_x86_64.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java.i
+data/src/share/tools/launcher/jli_util.c.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPArithmeticInstruction.java.i
data/src/cpu/x86/vm/stubRoutines_x86_64.cpp.i
data/agent/src/os/win32/serverLists.cpp.i
data/src/share/vm/adlc/forms.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/LogicInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties.i
+data/agent/make/jdbcore64.sh.i
+data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp.i
data/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp.i
data/src/share/tools/MakeDeps/WinGammaPlatformVC7.java.i
data/build/windows/projectfiles/kernel/Makefile.i
data/src/cpu/x86/vm/stubGenerator_x86_32.cpp.i
data/src/share/vm/adlc/output_h.cpp.i
data/agent/src/os/bsd/test.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/PrimitiveTypeImpl.java.i
-data/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java.i
data/src/os/bsd/dtrace/hotspot.d.i
data/agent/src/share/classes/com/sun/java/swing/action/FinishAction.java.i
data/test/compiler/6921969/TestMultiplyLongHiZero.java.i
@@ -3181,13 +3185,13 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformExcept
data/test/compiler/6800154/Test6800154.java.i
data/make/bsd/platform_i486.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.properties.i
-data/src/share/vm/gc_implementation/shared/mutableSpace.cpp.i
+data/test/compiler/7082949/Test7082949.java.i
data/src/share/vm/utilities/defaultStream.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MultiNode.java.i
data/test/compiler/6852078/Test6852078.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86GeneralInstruction.java.i
data/make/windows/projectfiles/tiered/ADLCompiler.dsp.i
-data/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java.i
data/src/share/vm/ci/ciArrayKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/AddressDataSource.java.i
data/agent/src/share/classes/com/sun/java/swing/ui/CommonUI.java.i
@@ -3196,16 +3200,17 @@ data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/platform.properties.i
data/agent/make/jcoreproc.sh.i
data/src/share/vm/oops/fieldStreams.hpp.i
data/build/solaris/makefiles/reorder_TIERED_i486.i
-data/src/share/vm/utilities/array.cpp.i
+data/src/share/vm/oops/oop.pcgc.inline.hpp.i
data/src/share/vm/classfile/classLoader.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java.i
+data/make/solaris/makefiles/compiler1.make.i
data/test/compiler/7009359/Test7009359.java.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RegisterBranchDecoder.java.i
data/src/share/vm/gc_interface/collectedHeap.inline.hpp.i
data/src/share/vm/memory/memRegion.cpp.i
data/src/share/tools/hsdis/hsdis-demo.c.i
-data/src/share/vm/interpreter/bytecodeTracer.cpp.i
-data/test/compiler/6885584/Test6885584.java.i
+data/src/share/vm/oops/klassVtable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Registers.java.i
data/src/cpu/zero/vm/assembler_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java.i
@@ -3213,77 +3218,78 @@ data/src/os/solaris/launcher/java.h.i
data/agent/src/os/linux/symtab.h.i
data/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp.i
data/src/cpu/sparc/vm/icache_sparc.hpp.i
+data/src/share/vm/opto/classes.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java.i
data/src/share/vm/ci/ciArray.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciConstant.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java.i
-data/src/share/vm/includeDB_gc_parallel.i
+data/make/windows/platform_i486.i
data/src/share/vm/runtime/basicLock.hpp.i
data/src/share/vm/runtime/virtualspace.hpp.i
-data/src/share/vm/asm/assembler.cpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.hpp.i
+data/make/solaris/makefiles/reorder_COMPILER1_sparcv9.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ReturnInstruction.java.i
data/src/share/vm/services/diagnosticArgument.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/CallDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java.i
-data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java.i
data/src/share/vm/runtime/vmThread.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java.i
data/src/share/vm/gc_implementation/includeDB_gc_g1.i
-data/build/windows/projectfiles/kernel/vm.dsw.i
data/src/share/vm/ci/ciClassList.hpp.i
data/src/share/tools/ProjectCreator/DirectoryTreeNode.java.i
-data/src/share/vm/ci/ciType.cpp.i
-data/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp.i
-data/src/share/tools/hsdis/README.i
+data/src/share/vm/c1/c1_Runtime1.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Opcodes.java.i
+data/make/solaris/makefiles/mapfile-vers-nonproduct.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Node.java.i
data/src/share/vm/utilities/growableArray.cpp.i
data/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp.i
data/src/share/vm/code/codeBlob.cpp.i
data/src/cpu/x86/vm/templateInterpreterGenerator_x86.hpp.i
-data/src/share/vm/runtime/signature.cpp.i
-data/src/share/vm/utilities/decoder.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java.i
data/make/bsd/makefiles/tiered.make.i
-data/make/windows/cross_build.bat.i
+data/src/cpu/zero/vm/interpreter_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/WatcherThread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java.i
-data/src/share/vm/gc_implementation/shared/gcStats.hpp.i
+data/src/share/vm/compiler/compilerOracle.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEShiftDecoder.java.i
data/make/scm.make.i
data/src/share/vm/oops/constantPoolKlass.hpp.i
-data/test/compiler/7082949/Test7082949.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java.i
data/src/share/vm/services/memoryManager.cpp.i
data/src/share/vm/classfile/stackMapTableFormat.hpp.i
-data/make/solaris/makefiles/kernel.make.i
+data/make/linux/makefiles/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDoubleType.java.i
data/src/share/vm/memory/memRegion.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/amd64/AMD64CFrame.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/suite.properties.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java.i
-data/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVccInstruction.java.i
+data/src/share/vm/ci/ciMethodHandle.hpp.i
+data/src/cpu/zero/vm/shark_globals_zero.hpp.i
data/src/os_cpu/solaris_sparc/vm/solaris_sparc.ad.i
data/src/cpu/zero/vm/javaFrameAnchor_zero.hpp.i
data/make/bsd/makefiles/jvmg.make.i
-data/src/share/vm/utilities/globalDefinitions.cpp.i
+data/src/os/bsd/vm/decoder_machO.cpp.i
data/src/os/linux/launcher/java.h.i
data/src/cpu/zero/vm/vmreg_zero.inline.hpp.i
data/make/bsd/makefiles/jsig.make.i
data/src/share/tools/hsdis/Makefile.i
data/test/gc/7072527/TestFullGCCount.java.i
+data/test/compiler/6823453/Test.java.i
data/src/cpu/x86/vm/methodHandles_x86.hpp.i
data/src/cpu/x86/vm/register_definitions_x86.cpp.i
data/make/bsd/platform_ia64.i
data/src/share/vm/memory/genCollectedHeap.cpp.i
data/make/linux/makefiles/jvmti.make.i
-data/src/share/vm/compiler/compileLog.hpp.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp.i
data/src/os/linux/vm/decoder_linux.cpp.i
data/src/cpu/sparc/vm/sharedRuntime_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldType.java.i
-data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerTypeImpl.java.i
data/src/share/vm/prims/jvmtiThreadState.inline.hpp.i
data/src/share/vm/interpreter/interpreter.hpp.i
-data/src/cpu/sparc/vm/interpreter_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java.i
data/agent/src/os/linux/libproc_impl.c.i
data/src/os/windows/vm/stubRoutines_windows.cpp.i
data/build/solaris/makefiles/sparcWorks.make.i
@@ -3291,48 +3297,48 @@ data/src/cpu/sparc/vm/c1_FpuStackSim_sparc.hpp.i
data/agent/src/os/win32/ioUtils.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/KlassKlass.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ScriptEngineAbstraction.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterPart.java.i
data/src/share/vm/shark/llvmHeaders.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ReadWriteDecoder.java.i
data/build/solaris/makefiles/optimized.make.i
data/src/share/vm/services/diagnosticCommand.hpp.i
data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_32.cpp.i
data/agent/make/hsdbwindbg64.bat.i
-data/agent/src/os/win32/libInfo.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/BranchDecoder.java.i
-data/src/os/windows/vm/osThread_windows.hpp.i
+data/src/share/vm/libadt/port.cpp.i
data/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp.i
-data/test/compiler/6935535/Test.java.i
+data/src/cpu/x86/vm/depChecker_x86.hpp.i
data/agent/make/jcorewindbg.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java.i
+data/make/windows/projectfiles/core/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFP2RegisterInstruction.java.i
-data/src/share/vm/ci/ciCPCache.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java.i
-data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArithmeticInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactory.java.i
data/build/solaris/makefiles/saproc.make.i
data/make/solaris/makefiles/gcc.make.i
data/src/share/vm/runtime/os.hpp.i
-data/make/windows/makefiles/projectcreator.make.i
-data/src/cpu/zero/vm/interpreter_zero.hpp.i
-data/src/cpu/x86/vm/jni_x86.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMap.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java.i
data/src/cpu/x86/vm/runtime_x86_32.cpp.i
data/test/compiler/6478991/NullCheckTest.java.i
-data/src/share/vm/runtime/basicLock.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MappedByteBufferDataSource.java.i
-data/src/share/vm/shark/sharkNativeWrapper.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSafepointInputs.filter.i
data/agent/make/start-debug-server-windbg64.bat.i
data/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp.i
data/test/compiler/6712835/Test6712835.java.i
+data/src/share/vm/prims/whitebox.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVccDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties.i
data/src/share/vm/oops/arrayKlassKlass.hpp.i
data/agent/src/os/win32/isNT4.cpp.i
-data/make/linux/platform_zero.in.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactoryImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/MapScriptObject.java.i
-data/src/os/solaris/vm/osThread_solaris.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf.i
data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/ObjectTreeNodeAdapter.java.i
data/src/share/vm/opto/parse3.cpp.i
@@ -3341,51 +3347,50 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterBranchInst
data/src/cpu/x86/vm/c1_LinearScan_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/IndexableFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicSym.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java.i
+data/src/share/vm/ci/ciCPCache.hpp.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif.i
data/src/share/vm/services/lowMemoryDetector.cpp.i
-data/build/linux/makefiles/compiler1.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java.i
data/src/share/vm/runtime/reflection.cpp.i
data/make/bsd/makefiles/shark.make.i
data/src/os/windows/vm/vmError_windows.cpp.i
-data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp.i
+data/src/cpu/sparc/vm/assembler_sparc.cpp.i
data/src/share/vm/shark/sharkCacheDecache.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/Inspector.java.i
-data/src/share/vm/c1/c1_Canonicalizer.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSELogicalDecoder.java.i
+data/agent/make/jsdbwindbg.bat.i
+data/src/share/tools/MakeDeps/MacroDefinitions.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Bits.java.i
-data/src/share/vm/opto/subnode.cpp.i
-data/build/windows/makefiles/vm.make.i
-data/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp.i
-data/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.i
+data/make/bsd/makefiles/vm.make.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java.i
data/src/share/vm/c1/c1_LIRAssembler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLocalSym.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java.i
+data/make/solaris/makefiles/sparcWorks.make.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java.i
data/src/share/vm/ci/ciEnv.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java.i
data/src/share/vm/prims/jvmtiEnter.hpp.i
data/build/windows/projectfiles/tiered/vm.dsw.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml.i
+data/make/solaris/platform_amd64.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/NarrowOopField.java.i
-data/src/share/vm/utilities/elfFile.cpp.i
+data/make/solaris/makefiles/dtrace.make.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/BreakpointEvent.java.i
-data/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/BoundedZoomAction.java.i
data/src/share/vm/classfile/verificationType.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js.i
data/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/manifest.mf.i
-data/src/share/vm/memory/blockOffsetTable.inline.hpp.i
-data/src/share/vm/utilities/intHisto.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java.i
data/build/linux/makefiles/fastdebug.make.i
data/src/share/vm/opto/macro.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java.i
-data/src/share/vm/memory/oopFactory.cpp.i
+data/src/share/vm/utilities/decoder_elf.hpp.i
data/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp.i
data/src/os/solaris/dtrace/generateJvmOffsetsMain.c.i
-data/src/cpu/sparc/vm/c2_globals_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisters.java.i
data/src/share/vm/runtime/vm_operations.cpp.i
data/agent/make/pmapwindbg.bat.i
data/agent/src/share/classes/com/sun/java/swing/action/AboutAction.java.i
@@ -3394,88 +3399,88 @@ data/src/share/vm/shark/sharkRuntime.cpp.i
data/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.i
data/src/share/vm/prims/jvmtiEnvBase.cpp.i
data/src/share/vm/adlc/forms.hpp.i
-data/agent/src/os/bsd/ps_core.c.i
-data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java.i
+data/src/share/vm/ci/ciArray.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java.i
+data/build/linux/makefiles/rules.make.i
data/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java.i
-data/agent/src/os/win32/procList.cpp.i
+data/src/share/vm/memory/allocation.hpp.i
+data/src/cpu/sparc/vm/icBuffer_sparc.cpp.i
data/src/share/vm/oops/methodDataOop.cpp.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java.i
data/src/share/tools/MakeDeps/DirectoryTreeNode.java.i
-data/src/share/vm/prims/jvmtiEventController.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/UnimpDecoder.java.i
data/test/compiler/6796786/Test6796786.java.i
data/src/share/vm/utilities/debug.cpp.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/LoadInstruction.java.i
-data/test/compiler/6795161/Test.java.i
-data/src/share/vm/gc_implementation/shared/allocationStats.cpp.i
-data/src/share/vm/utilities/hashtable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java.i
+data/make/linux/makefiles/hp.make.i
+data/src/share/vm/oops/arrayKlass.hpp.i
data/test/compiler/6863420/Test.java.i
data/src/cpu/sparc/vm/c1_MacroAssembler_sparc.hpp.i
data/src/cpu/x86/vm/vmreg_x86.inline.hpp.i
-data/src/share/vm/utilities/array.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86DirectAddress.java.i
+data/make/solaris/makefiles/debug.make.i
+data/src/os/windows/vm/perfMemory_windows.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPLoadInstruction.java.i
-data/test/compiler/6589834/Test_ia32.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java.i
+data/src/cpu/sparc/vm/globalDefinitions_sparc.hpp.i
+data/src/share/vm/services/psMemoryPool.cpp.i
data/src/share/vm/ci/ciMethodData.hpp.i
-data/src/share/vm/opto/lcm.cpp.i
+data/src/share/vm/gc_implementation/shared/mutableSpace.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java.i
-data/src/share/vm/utilities/stack.inline.hpp.i
+data/src/share/vm/runtime/osThread.hpp.i
data/src/share/vm/opto/multnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java.i
data/src/share/vm/gc_implementation/g1/g1HRPrinter.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java.i
+data/build/linux/makefiles/gcc.make.i
data/src/os/windows/vm/objectMonitor_windows.hpp.i
data/make/solaris/makefiles/jvmg.make.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/FindPanel.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/Location.java.i
+data/src/share/vm/memory/watermark.hpp.i
data/src/share/vm/memory/permGen.cpp.i
-data/src/share/vm/runtime/deoptimization.cpp.i
+data/src/os/linux/vm/chaitin_linux.cpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java.i
-data/src/share/vm/classfile/symbolTable.cpp.i
+data/make/windows/cross_build.bat.i
data/agent/make/jhistowindbg64.bat.i
data/build/windows/makefiles/sanity.make.i
data/agent/src/os/win32/SwDbgSub.cpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/Annotation.java.i
-data/src/share/vm/libadt/port.cpp.i
-data/make/windows/projectfiles/core/Makefile.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactory.java.i
+data/src/os/windows/vm/osThread_windows.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java.i
+data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp.i
data/build/windows/create.bat.i
data/test/compiler/6991596/Test6991596.java.i
data/src/share/vm/code/nmethod.cpp.i
data/src/share/vm/includeDB_gc.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java.i
+data/build/windows/makefiles/vm.make.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WrprInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java.i
-data/src/share/tools/launcher/jli_util.c.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadFactory.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java.i
data/build/solaris/platform_amd64.gcc.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/ServiceabilityAgentJVMDIModule.java.i
-data/test/runtime/6878713/Test6878713.sh.i
-data/src/cpu/sparc/vm/icBuffer_sparc.cpp.i
-data/agent/test/libproc/libproctest.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java.i
+data/agent/src/os/win32/procList.cpp.i
+data/make/linux/makefiles/top.make.i
data/src/os/linux/launcher/java_md.c.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java.i
-data/src/share/vm/memory/watermark.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/Location.java.i
data/src/share/vm/memory/restore.cpp.i
-data/src/share/vm/services/management.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java.i
+data/src/share/vm/code/codeBlob.hpp.i
+data/agent/src/os/win32/README-commands.txt.i
data/src/share/vm/prims/jvmtiEnter.xsl.i
data/build/solaris/makefiles/rules.make.i
data/src/share/vm/code/scopeDesc.hpp.i
data/src/os/solaris/vm/jvm_solaris.h.i
-data/src/share/vm/oops/compiledICHolderKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedStream.java.i
data/test/runtime/6626217/You_Have_Been_P0wned.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/RegionNode.java.i
data/agent/src/scripts/start-rmiregistry.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java.i
data/test/compiler/6758234/Test6758234.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/AddressField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java.i
@@ -3491,8 +3496,7 @@ data/src/share/vm/opto/multnode.hpp.i
data/src/share/vm/opto/superword.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java.i
data/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/BitData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java.i
data/test/compiler/6877254/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeState.java.i
@@ -3507,8 +3511,7 @@ data/make/linux/makefiles/ia64.make.i
data/src/share/vm/memory/iterator.hpp.i
data/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9DoneInstruction.java.i
-data/make/bsd/makefiles/i486.make.i
-data/make/solaris/adlc_updater.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java.i
data/src/cpu/x86/vm/depChecker_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassObjectReferenceImpl.java.i
@@ -3519,15 +3522,13 @@ data/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9InstructionDecoder.java.i
data/src/share/vm/gc_implementation/includeDB_gc_shared.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeNode.java.i
-data/make/windows/projectfiles/tiered/ADLCompiler.dsw.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThread.java.i
data/src/share/vm/interpreter/bytecode.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ArithmeticDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCJmplInstruction.java.i
data/src/os_cpu/solaris_x86/vm/bytes_solaris_x86.inline.hpp.i
data/src/cpu/x86/vm/assembler_x86_64.hpp.i
data/src/share/vm/classfile/resolutionErrors.cpp.i
data/test/compiler/5091921/Test6935022.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/LocationValue.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java.i
data/src/cpu/sparc/vm/vtableStubs_sparc.cpp.i
data/src/cpu/sparc/vm/icache_sparc.cpp.i
@@ -3539,18 +3540,18 @@ data/test/compiler/5091921/output6890943.txt.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedReadStream.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.gif.i
data/src/cpu/sparc/vm/stubGenerator_sparc.cpp.i
-data/make/jprt.gmk.i
data/src/share/vm/libadt/set.cpp.i
data/make/windows/makefiles/adlc.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/New16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64CurrentFrameGuess.java.i
-data/src/cpu/zero/vm/vtableStubs_zero.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedPanAction.java.i
data/src/share/vm/prims/evmCompat.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopPrinter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/OopField.java.i
+data/src/cpu/sparc/vm/templateTable_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java.i
data/src/share/vm/runtime/memprofiler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeSipush.java.i
@@ -3558,16 +3559,16 @@ data/src/cpu/x86/vm/bytecodes_x86.hpp.i
data/make/linux/makefiles/makedeps.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_ia64/LinuxIA64JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThread.java.i
-data/build/solaris/platform_sparcv9.gcc.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteTypeImpl.java.i
-data/src/cpu/x86/vm/jniFastGetField_x86_32.cpp.i
+data/src/share/vm/opto/c2_globals.hpp.i
+data/build/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java.i
data/make/linux/platform_ia64.i
data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.xml.i
data/src/os/bsd/dtrace/libjvm_db.h.i
data/make/linux/makefiles/i486.make.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.gif.i
-data/src/cpu/zero/vm/methodHandles_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java.i
data/src/share/vm/trace/tracing.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/RefType.java.i
@@ -3575,27 +3576,27 @@ data/src/share/vm/runtime/interfaceSupport.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java.i
data/src/share/vm/memory/universe.inline.hpp.i
data/src/share/vm/oops/oopsHierarchy.cpp.i
+data/agent/make/dumpflagsproc.sh.i
data/agent/src/os/bsd/symtab.h.i
data/src/cpu/x86/vm/vm_version_x86_32.cpp.i
data/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.i
data/src/share/vm/c1/c1_InstructionPrinter.cpp.i
-data/test/compiler/5091921/Test6196102.java.i
+data/make/README.i
data/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86CondJmpInstruction.java.i
data/src/share/vm/c1/c1_LIR.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java.i
data/test/compiler/6851282/Test.java.i
data/src/share/vm/ci/ciTypeFlow.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java.i
+data/src/share/vm/opto/compile.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java.i
data/src/share/vm/memory/sharedHeap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java.i
-data/src/os/linux/vm/dtraceJSDT_linux.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java.i
data/src/share/vm/ci/ciConstantPoolCache.cpp.i
-data/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCWriteInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JFloatField.java.i
-data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp.i
+data/src/share/vm/utilities/decoder.hpp.i
data/THIRD_PARTY_README.i
data/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/HSDB.java.i
@@ -3607,12 +3608,12 @@ data/src/share/vm/ci/ciTypeArrayKlass.hpp.i
data/build/solaris/makefiles/mapfile-vers-TIERED.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Helper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java.i
-data/make/linux/platform_amd64.i
+data/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp.i
data/src/cpu/sparc/vm/bytecodes_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COMDATSelectionTypes.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java.i
data/make/solaris/platform_amd64.gcc.i
-data/src/share/vm/utilities/accessFlags.hpp.i
+data/agent/make/jhistoproc64.sh.i
data/agent/src/scripts/start-debug-server.sh.i
data/make/solaris/makefiles/reorder_TIERED_i486.i
data/test/compiler/6695810/Test.java.i
@@ -3624,48 +3625,47 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java.
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ReadResult.java.i
data/src/share/vm/adlc/formssel.cpp.i
data/src/share/vm/runtime/vmStructs.cpp.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC9.java.i
+data/src/share/vm/c1/c1_ValueStack.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java.i
-data/make/windows/makefiles/launcher.make.i
+data/test/runtime/6626217/many_loader2.java.foo.i
data/build/solaris/platform_sparc.i
-data/make/hotspot_distro.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/build.xml.i
-data/src/share/vm/services/heapDumper.cpp.i
+data/src/share/vm/opto/regalloc.cpp.i
data/src/os/linux/vm/hpi_linux.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Block_List.java.i
-data/src/share/vm/services/memoryService.cpp.i
-data/src/share/vm/opto/classes.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java.i
+data/build/solaris/makefiles/reorder_CORE_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderWindowsSpecificFields.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RdprInstruction.java.i
-data/src/share/vm/classfile/stackMapFrame.hpp.i
+data/src/cpu/zero/vm/interpreterRT_zero.cpp.i
+data/src/share/vm/opto/generateOptoStub.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Interval.java.i
-data/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java.i
data/src/cpu/x86/vm/interpreterRT_x86_32.cpp.i
data/src/cpu/x86/vm/interp_masm_x86_32.hpp.i
-data/src/share/vm/utilities/preserveException.cpp.i
+data/make/windows/makefiles/shared.make.i
data/src/share/vm/c1/c1_Optimizer.cpp.i
data/build/solaris/makefiles/jvmti.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegister.java.i
data/src/share/vm/runtime/jniPeriodicChecker.cpp.i
data/src/cpu/sparc/vm/frame_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop1Decoder.java.i
-data/make/solaris/makefiles/reorder_CORE_i486.i
+data/build/windows/makefiles/debug.make.i
data/src/os/solaris/dtrace/jhelper.d.i
data/src/share/vm/shark/shark_globals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeBipush.java.i
data/build/linux/makefiles/mapfile-vers-product.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java.i
-data/src/os/windows/launcher/java_md.c.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegister.java.i
data/src/share/vm/memory/classify.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java.i
data/make/solaris/makefiles/mapfile-vers-jvm_dtrace.i
-data/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/SlotLayout.java.i
-data/src/share/vm/ci/ciTypeArray.hpp.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open16.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java.i
+data/src/share/vm/ci/ciCPCache.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/suite.properties.i
@@ -3679,18 +3679,19 @@ data/src/share/vm/runtime/vframe.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider.i
data/src/share/vm/runtime/fieldType.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java.i
+data/make/solaris/makefiles/top.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java.i
data/src/share/vm/shark/sharkEntry.hpp.i
data/src/share/vm/services/g1MemoryPool.cpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp.i
+data/src/share/vm/classfile/classFileStream.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java.i
data/src/share/vm/utilities/events.hpp.i
data/src/share/vm/classfile/stackMapFrame.cpp.i
data/src/share/vm/c1/c1_ValueType.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/FindPanel.java.i
+data/src/share/vm/utilities/globalDefinitions.cpp.i
data/src/os/linux/launcher/java.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/JDoubleField.java.i
+data/src/share/vm/ci/ciKlass.hpp.i
data/agent/src/os/linux/ps_proc.c.i
data/make/windows/build_vm_def.sh.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSelfLoops.filter.i
@@ -3698,68 +3699,72 @@ data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp.i
data/src/share/vm/shark/llvmValue.hpp.i
data/src/share/vm/interpreter/cppInterpreter.cpp.i
data/make/linux/makefiles/zero.make.i
-data/src/share/vm/gc_implementation/shared/coTracker.cpp.i
-data/src/share/vm/oops/instanceKlass.cpp.i
-data/src/cpu/x86/vm/vm_version_x86_32.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java.i
+data/make/solaris/adlc_updater.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java.i
+data/build/linux/makefiles/launcher.make.i
+data/agent/test/jdi/VMConnection.java.i
data/src/share/vm/adlc/dict2.cpp.i
data/src/share/vm/oops/arrayKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties.i
+data/src/share/vm/oops/instanceMirrorKlass.hpp.i
data/make/linux/makefiles/buildtree.make.i
data/src/share/vm/libadt/dict.hpp.i
data/src/cpu/x86/vm/jniTypes_x86.hpp.i
-data/src/share/vm/prims/jvmtiEventController.hpp.i
+data/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml.i
data/src/share/vm/runtime/vframe_hp.cpp.i
data/agent/make/mkinstall.i
data/test/compiler/6901572/Test.java.i
+data/src/share/vm/utilities/vmError.cpp.i
data/test/compiler/6797305/Test6797305.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveLoadInstruction.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMObject.java.i
data/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BooleanTypeImpl.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java.i
data/make/solaris/platform_sparc.gcc.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86JmpInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java.i
-data/src/share/vm/adlc/archDesc.hpp.i
+data/make/windows/get_msc_ver.sh.i
data/test/compiler/6912517/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/Main.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEMoveDecoder.java.i
data/src/os/bsd/vm/os_bsd.hpp.i
data/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp.i
-data/src/share/vm/gc_implementation/g1/heapRegion.cpp.i
-data/test/compiler/5057225/Test5057225.java.i
-data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp.i
+data/src/share/vm/code/nmethod.hpp.i
+data/src/os/bsd/vm/attachListener_bsd.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Registers.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphCountGroupOrganizer.java.i
data/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSPermGen.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/InterfaceTypeImpl.java.i
data/agent/src/os/win32/serverLists.hpp.i
data/test/compiler/6866651/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/FindPanel.java.i
+data/src/os_cpu/linux_x86/vm/os_linux_x86.inline.hpp.i
data/build/linux/makefiles/buildtree.make.i
data/make/linux/makefiles/profiled.make.i
+data/test/sanity/WBApi.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java.i
data/make/linux/makefiles/gcc.make.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java.i
-data/src/cpu/x86/vm/copy_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java.i
data/src/cpu/x86/vm/templateInterpreter_x86_32.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/About24.gif.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java.i
data/src/cpu/zero/vm/methodHandles_zero.cpp.i
-data/test/compiler/6987555/Test6987555.java.i
+data/src/share/vm/memory/cardTableRS.cpp.i
data/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp.i
+data/test/compiler/7100757/Test7100757.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java.i
data/src/cpu/x86/vm/relocInfo_x86.hpp.i
data/src/share/vm/services/lowMemoryDetector.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java.i
data/src/share/vm/code/vtableStubs.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java.i
data/agent/make/soqlwindbg64.bat.i
@@ -3767,12 +3772,12 @@ data/src/share/vm/ci/ciInstanceKlassKlass.hpp.i
data/src/share/vm/c1/c1_InstructionPrinter.hpp.i
data/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MutationException.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadContext.java.i
-data/src/share/vm/gc_implementation/g1/heapRegion.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java.i
data/make/linux/Makefile.i
data/src/share/vm/oops/oopsHierarchy.hpp.i
data/src/os/bsd/dtrace/jhelper.d.i
-data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties.i
+data/src/share/vm/memory/tenuredGeneration.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties.i
data/src/os/posix/launcher/launcher.script.i
data/src/share/vm/oops/generateOopMap.cpp.i
@@ -3780,126 +3785,123 @@ data/src/share/vm/oops/symbolOop.cpp.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/suite.properties.i
data/src/share/vm/interpreter/bytecodeTracer.hpp.i
data/src/share/vm/ci/ciSymbol.cpp.i
-data/src/cpu/zero/vm/stubRoutines_zero.hpp.i
+data/src/share/vm/oops/arrayOop.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSTypes.java.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java.i
-data/src/share/vm/utilities/hashtable.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java.i
+data/make/bsd/makefiles/arm.make.i
+data/src/share/tools/launcher/wildcard.h.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebugger.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form.i
-data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/HeapRegion.java.i
+data/src/os/bsd/vm/jvm_bsd.cpp.i
data/src/share/vm/gc_implementation/shared/immutableSpace.cpp.i
-data/src/share/vm/services/psMemoryPool.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java.i
data/test/gc/6581734/Test6581734.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/Immediate.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml.i
data/src/share/vm/classfile/systemDictionary.hpp.i
-data/src/share/vm/oops/typeArrayKlass.cpp.i
-data/src/share/vm/prims/jvmtiRedefineClasses.cpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter.i
+data/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp.i
data/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java.i
-data/src/share/vm/shark/sharkConstant.hpp.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn16.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChain.java.i
+data/make/bsd/makefiles/ia64.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java.i
data/src/share/vm/runtime/biasedLocking.cpp.i
+data/src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp.i
data/src/share/vm/runtime/fieldDescriptor.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java.i
+data/src/share/vm/prims/jvmtiTagMap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntervalNode.java.i
-data/src/share/vm/runtime/frame.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLdstubInstruction.java.i
data/src/share/tools/launcher/wildcard.c.i
data/agent/src/scripts/start-debug-server.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java.i
-data/src/share/vm/classfile/classFileParser.hpp.i
+data/src/os/windows/vm/c1_globals_windows.hpp.i
data/test/compiler/6968348/Test6968348.java.i
data/agent/src/os/win32/Makefile.i
data/src/share/vm/oops/klassOop.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupReceiver.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ByteField.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java.i
-data/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp.i
+data/agent/src/os/bsd/salibelf.c.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties.i
data/src/share/vm/asm/assembler.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.InputGraphProvider.i
data/src/share/vm/memory/referencePolicy.cpp.i
-data/src/share/vm/opto/opcodes.cpp.i
-data/src/share/vm/gc_implementation/g1/sparsePRT.hpp.i
+data/src/share/vm/oops/klass.hpp.i
+data/src/share/vm/oops/instanceKlass.cpp.i
data/src/os/bsd/vm/c2_globals_bsd.hpp.i
data/src/cpu/sparc/vm/c1_LinearScan_sparc.hpp.i
-data/src/share/vm/memory/specialized_oop_closures.hpp.i
+data/src/cpu/sparc/vm/vm_version_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java.i
data/src/cpu/sparc/vm/globals_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLdstubDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCDebugger.java.i
data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java.i
data/agent/make/hsdbproc.sh.i
-data/src/share/vm/opto/indexSet.hpp.i
-data/test/compiler/6689060/Test.java.i
+data/src/share/vm/oops/instanceOop.cpp.i
+data/src/cpu/x86/vm/register_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Register.java.i
-data/src/share/vm/opto/callnode.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConcreteMethodImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml.i
data/src/share/vm/utilities/debug.hpp.i
data/src/share/vm/prims/jvmtiThreadState.cpp.i
data/test/jprt.config.i
-data/build/windows/makefiles/makedeps.make.i
data/src/share/vm/code/relocInfo.hpp.i
-data/agent/src/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java.i
+data/agent/make/start-debug-server-proc64.sh.i
data/make/bsd/makefiles/mapfile-vers-product.i
data/test/compiler/5091921/Test6559156.java.i
data/src/share/vm/prims/jvmti.xml.i
data/src/cpu/zero/vm/depChecker_zero.hpp.i
-data/src/share/vm/prims/jniFastGetField.hpp.i
-data/build/solaris/makefiles/top.make.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java.i
+data/agent/test/jdi/runjpda.sh.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGen.java.i
data/src/cpu/x86/vm/icBuffer_x86.cpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/BranchInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestHelloWorld.java.i
+data/build/solaris/platform_sparcv9.gcc.i
data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp.i
data/build/linux/makefiles/core.make.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp.i
-data/src/share/vm/shark/sharkContext.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java.i
data/src/share/vm/opto/runtime.hpp.i
-data/src/share/vm/classfile/verifier.cpp.i
+data/make/linux/makefiles/product.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceSwapDecoder.java.i
data/src/share/vm/utilities/yieldingWorkgroup.hpp.i
data/src/os/bsd/vm/jsig.c.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeNew.java.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/suite.properties.i
-data/src/share/vm/utilities/bitMap.inline.hpp.i
-data/src/share/vm/utilities/vmError.cpp.i
+data/src/os_cpu/windows_x86/vm/os_windows_x86.hpp.i
+data/make/solaris/makefiles/mapfile-vers-jvm_db.i
+data/src/share/vm/gc_implementation/g1/survRateGroup.hpp.i
data/src/share/vm/adlc/Doc/Syntax.doc.i
data/src/share/vm/shark/sharkInliner.hpp.i
data/src/share/vm/compiler/methodLiveness.hpp.i
data/src/share/vm/prims/jvmtiTagMap.hpp.i
data/test/gc/6845368/bigobj.java.d
-data/make/linux/makefiles/top.make.i
+data/test/runtime/6819213/TestBootNativeLibraryPath.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CCBranchDecoder.java.i
data/test/gc/6845368/bigobj.java.i
-data/make/linux/makefiles/debug.make.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FlushDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java.i
data/src/share/vm/compiler/oopMap.hpp.i
-data/test/compiler/6909839/Test6909839.java.i
+data/src/cpu/zero/vm/vtableStubs_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/genfiles.properties.i
-data/make/windows/projectfiles/compiler2/Makefile.i
+data/make/solaris/makefiles/saproc.make.i
data/src/share/vm/prims/jvmtiExtensions.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntry.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64JavaCallWrapper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAMD64.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.xml.i
data/src/share/vm/prims/jvmtiGetLoadedClasses.cpp.i
data/src/cpu/x86/vm/disassembler_x86.hpp.i
-data/src/share/vm/gc_implementation/shared/collectorCounters.cpp.i
+data/src/share/vm/utilities/intHisto.hpp.i
data/src/share/vm/services/heapDumper.hpp.i
data/src/cpu/x86/vm/interpreter_x86_32.cpp.i
data/src/os/bsd/vm/perfMemory_bsd.cpp.i
@@ -3907,46 +3909,47 @@ data/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.i
data/src/share/vm/code/stubs.hpp.i
data/agent/src/os/bsd/symtab.c.i
data/src/share/vm/utilities/elfSymbolTable.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/VMModifiers.java.i
data/src/share/vm/utilities/xmlstream.cpp.i
-data/make/windows/projectfiles/tiered/vm.def.i
-data/src/share/vm/adlc/filebuff.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVccInstruction.java.i
+data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp.i
data/src/share/vm/prims/jvmtiEnvBase.hpp.i
-data/src/share/vm/memory/heapInspection.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLdstubDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReturnInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties.i
-data/build/solaris/makefiles/fastdebug.make.i
+data/agent/src/share/classes/com/sun/java/swing/action/SaveAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ArgumentSizeComputer.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/WriteDecoder.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java.i
+data/src/os/linux/vm/hpi_linux.hpp.i
data/src/share/vm/prims/privilegedStack.cpp.i
-data/build/linux/makefiles/launcher.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/DebugInformationRecorder.java.i
-data/build/linux/README.i
+data/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.i
data/src/os_cpu/linux_x86/vm/linux_x86_64.ad.i
-data/src/share/vm/oops/klassVtable.cpp.i
+data/make/windows/projectfiles/core/vm.def.i
data/build/linux/platform_i486.i
data/src/os_cpu/windows_x86/vm/vm_version_windows_x86.cpp.i
data/build/linux/makefiles/dtrace.make.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java.i
data/src/share/vm/runtime/compilationPolicy.cpp.i
-data/src/share/vm/classfile/classFileParser.cpp.i
-data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp.i
-data/agent/src/share/classes/com/sun/java/swing/action/ActionUtilities.java.i
+data/src/share/vm/ci/ciObjectFactory.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java.i
+data/agent/src/share/classes/com/sun/java/swing/action/ActionUtilities.java.i
data/build/linux/makefiles/top.make.i
data/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.i
data/agent/src/os/solaris/proc/mapfile.i
data/make/linux/makefiles/adlc.make.i
data/agent/make/saenv64.bat.i
-data/src/os_cpu/windows_x86/vm/os_windows_x86.hpp.i
+data/src/share/vm/runtime/frame.inline.hpp.i
data/src/share/vm/oops/instanceKlassKlass.cpp.i
data/make/solaris/makefiles/jsig.make.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler.i
+data/build/windows/projectfiles/kernel/vm.dsw.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureConverter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java.i
data/test/compiler/7024475/Test7024475.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java.i
@@ -3956,173 +3959,182 @@ data/test/compiler/5091921/Test6357214.java.i
data/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp.i
data/test/runtime/6981737/Test6981737.java.i
data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp.i
-data/agent/doc/hsdb.html.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/WrongTypeException.java.i
data/src/share/vm/compiler/disassemblerEnv.hpp.i
-data/src/share/vm/opto/c2_globals.hpp.i
+data/make/jprt.gmk.i
data/src/share/vm/runtime/park.hpp.i
+data/build/windows/projectfiles/tiered/vm.def.i
+data/src/share/vm/memory/barrierSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/FindObjectByType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/UnmappedAddressException.java.i
data/make/linux/makefiles/core.make.i
data/src/share/vm/runtime/handles.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50WrongNumericTypeException.java.i
data/make/bsd/Makefile.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntryConstants.java.i
data/test/compiler/6769124/TestDeoptInt6769124.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Mark.java.i
-data/src/share/vm/memory/genCollectedHeap.hpp.i
+data/test/runtime/6626217/from_loader2.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Block_Array.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCCFrame.java.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties.i
-data/test/compiler/6661247/Test.java.i
+data/src/cpu/zero/vm/frame_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java.i
data/test/compiler/6769124/TestUnalignedLoad6769124.java.i
data/src/share/vm/shark/sharkCompiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties.i
data/agent/src/os/bsd/MacosxDebuggerLocal.m.i
-data/make/solaris/makefiles/mapfile-vers-jsig.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ConditionFlags.java.i
data/src/share/vm/ci/compilerInterface.hpp.i
-data/test/runtime/6888954/vmerrors.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java.i
data/src/share/vm/code/pcDesc.hpp.i
data/src/share/vm/prims/jvmtiUtil.cpp.i
data/src/os/windows/vm/os_share_windows.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/OkAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactoryImpl.java.i
+data/make/linux/makefiles/saproc.make.i
data/src/os/solaris/dtrace/generateJvmOffsets.h.i
data/src/share/vm/ci/ciMethodHandle.cpp.i
data/src/share/vm/c1/c1_globals.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java.i
-data/src/share/vm/ci/ciInstance.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java.i
+data/src/share/vm/services/diagnosticFramework.hpp.i
+data/src/cpu/x86/vm/jniFastGetField_x86_32.cpp.i
data/src/share/vm/c1/c1_Defs.hpp.i
data/make/solaris/makefiles/mapfile-vers-COMPILER2.i
data/build/solaris/makefiles/defs.make.i
-data/src/share/vm/runtime/unhandledOops.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLOperations.java.i
data/src/share/vm/interpreter/abstractInterpreter.hpp.i
data/test/compiler/6865265/StackOverflowBug.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32OopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PopcInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java.i
data/agent/src/os/win32/libInfo.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js.i
data/src/os/solaris/vm/jsig.c.i
data/src/cpu/zero/vm/globalDefinitions_zero.hpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CMoveDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java.i
-data/src/share/vm/ci/ciObjArray.hpp.i
-data/src/cpu/sparc/vm/dump_sparc.cpp.i
-data/src/share/vm/prims/hpi_imported.h.i
+data/src/share/vm/ci/ciCallSite.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java.i
+data/build/solaris/makefiles/jsig.make.i
data/src/share/vm/memory/filemap.hpp.i
-data/make/linux/platform_i486.suncc.i
+data/src/share/vm/ci/ciExceptionHandler.hpp.i
data/build/linux/makefiles/adlc.make.i
data/src/share/vm/opto/loopPredicate.cpp.i
data/test/runtime/7020373/Test7020373.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlassKlass.java.i
-data/src/share/vm/opto/idealKit.cpp.i
+data/src/os/solaris/dtrace/jvm_dtrace.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRestoreInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java.i
data/make/windows/projectfiles/kernel/Makefile.i
-data/src/share/vm/prims/jvmtiEnvThreadState.cpp.i
-data/test/compiler/6778657/Test.java.i
-data/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp.i
+data/make/solaris/makefiles/reorder_COMPILER1_sparc.i
+data/src/share/vm/opto/output.cpp.i
data/test/runtime/7100935/TestConjointAtomicArraycopy.java.i
-data/src/share/vm/runtime/fprofiler.cpp.i
+data/make/solaris/makefiles/buildtree.make.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/NameFilter.java.i
-data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter.i
+data/test/compiler/7048332/Test7048332.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatDecoder.java.i
data/test/compiler/6942326/Test.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java.i
+data/make/linux/makefiles/compiler2.make.i
data/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad.i
-data/agent/test/jdi/sasanity.sh.i
+data/src/cpu/zero/vm/methodHandles_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Help24.gif.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java.i
-data/src/share/vm/services/memoryService.hpp.i
+data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/DoubleTreeNodeAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/platform.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java.i
data/make/windows/projectfiles/compiler2/ADLCompiler.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/OneContigSpaceCardGeneration.java.i
data/src/os/bsd/vm/thread_bsd.inline.hpp.i
data/src/share/vm/classfile/vmSymbols.cpp.i
data/src/share/vm/opto/indexSet.cpp.i
data/src/cpu/x86/vm/cppInterpreter_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCNoopInstruction.java.i
data/make/windows/platform_amd64.i
-data/src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp.i
+data/src/cpu/sparc/vm/vm_version_sparc.hpp.i
data/test/compiler/6982370/Test6982370.java.i
data/src/share/vm/utilities/elfSymbolTable.hpp.i
data/src/cpu/sparc/vm/c1_LinearScan_sparc.cpp.i
data/src/os_cpu/linux_x86/vm/assembler_linux_x86_32.cpp.i
-data/build/linux/Queens.class.i
+data/make/bsd/makefiles/hp1.make.i
data/src/share/vm/opto/connode.cpp.i
data/src/os/solaris/vm/mutex_solaris.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LogicDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java.i
+data/make/windows/makefiles/wb.make.i
data/src/cpu/x86/vm/c1_CodeStubs_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java.i
data/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp.i
data/src/share/vm/memory/cardTableModRefBS.hpp.i
-data/src/share/vm/runtime/jniHandles.hpp.i
-data/src/os/windows/launcher/java_md.h.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp.i
+data/agent/src/share/classes/com/sun/java/swing/action/SaveAsAction.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java.i
data/ASSEMBLY_EXCEPTION.i
data/src/share/vm/gc_implementation/includeDB_gc_serial.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.xml.i
data/src/share/vm/runtime/objectMonitor.inline.hpp.i
+data/agent/make/clhsdbproc64.sh.i
data/src/share/vm/gc_implementation/shared/gcUtil.cpp.i
-data/src/share/vm/opto/loopUnswitch.cpp.i
-data/test/compiler/7009231/Test7009231.java.i
+data/src/cpu/x86/vm/assembler_x86_64.cpp.i
+data/test/compiler/6775880/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/VMRegImpl.java.i
-data/src/share/vm/gc_implementation/shared/coTracker.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxAddress.java.i
data/make/bsd/makefiles/compiler1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ProfileData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java.i
+data/agent/src/os/win32/README.txt.i
data/test/compiler/6891750/Test6891750.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp.i
data/src/cpu/x86/vm/jniFastGetField_x86_64.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/DiagramConnectionWidget.java.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/RegisterPanel.java.i
data/src/os/bsd/vm/stubRoutines_bsd.cpp.i
data/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp.i
data/src/cpu/x86/vm/frame_x86.cpp.i
data/make/windows/projectfiles/kernel/vm.def.i
-data/src/share/tools/MakeDeps/UnixPlatform.java.i
+data/src/cpu/zero/vm/relocInfo_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/build-impl.xml.i
data/agent/make/hsdbproc64.sh.i
-data/src/share/vm/code/location.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/HeapBlock.java.i
data/src/share/vm/runtime/jniPeriodicChecker.hpp.i
-data/src/share/vm/services/g1MemoryPool.hpp.i
-data/make/windows/projectfiles/core/vm.dsw.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/JmpDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SACoreAttachingConnector.java.i
data/src/share/vm/opto/chaitin.cpp.i
data/build/solaris/makefiles/product.make.i
data/agent/src/os/solaris/dbx/README-commands.txt.i
data/src/share/vm/prims/nativeLookup.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/HistoryComboBox.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ReturnInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties.i
-data/src/share/vm/ci/ciMethodHandle.hpp.i
+data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java.i
+data/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/Space.java.i
data/src/share/vm/utilities/dtrace_usdt2_disabled.hpp.i
data/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp.i
data/src/share/vm/asm/register.hpp.i
-data/src/cpu/sparc/vm/frame_sparc.cpp.i
-data/src/os/solaris/vm/vmError_solaris.cpp.i
+data/test/compiler/5091921/Test6196102.java.i
+data/src/os/windows/vm/decoder_windows.hpp.i
data/src/share/vm/oops/oop.inline.hpp.i
-data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp.i
-data/build/solaris/makefiles/adjust-mflags.sh.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java.i
-data/build/linux/makefiles/hp.make.i
+data/agent/test/jdi/serialvm.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/LocationValue.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java.i
-data/src/share/vm/opto/connode.hpp.i
-data/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/IndirectAddress.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java.i
data/src/share/vm/opto/machnode.cpp.i
-data/src/share/vm/prims/jvmtiExtensions.hpp.i
-data/build/solaris/makefiles/jsig.make.i
+data/src/share/vm/gc_implementation/shared/collectorCounters.hpp.i
+data/src/share/vm/services/threadService.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java.i
data/src/share/vm/ci/ciSymbolKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHistogramElement.java.i
@@ -4130,30 +4142,30 @@ data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Cont
data/src/share/vm/runtime/task.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.gif.i
data/src/share/tools/MakeDeps/WinGammaPlatform.java.i
-data/src/share/vm/interpreter/linkResolver.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIndirectCallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPStoreDecoder.java.i
-data/build/solaris/makefiles/reorder_CORE_sparc.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterIndirectAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml.i
-data/src/cpu/sparc/vm/runtime_sparc.cpp.i
-data/src/share/vm/classfile/symbolTable.hpp.i
+data/src/share/vm/services/diagnosticCommand.cpp.i
+data/src/cpu/x86/vm/nativeInst_x86.hpp.i
data/make/windows/makefiles/debug.make.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java.i
data/src/share/vm/c1/c1_LIRGenerator.cpp.i
data/src/cpu/x86/vm/cppInterpreter_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java.i
+data/src/cpu/sparc/vm/interp_masm_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/MachineTypes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLDataTypes.java.i
data/src/share/vm/opto/gcm.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicLock.java.i
-data/make/linux/makefiles/adjust-mflags.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/SystemDictionaryHelper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLogicInstruction.java.i
data/build/linux/makefiles/product.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderEntry.java.i
data/src/share/vm/compiler/disassembler.hpp.i
data/src/share/vm/libadt/port.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Instruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties.i
@@ -4163,38 +4175,40 @@ data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArray.java.i
data/src/share/vm/memory/classify.hpp.i
data/build/solaris/makefiles/sparc.make.i
data/src/cpu/sparc/vm/relocInfo_sparc.hpp.i
-data/src/share/vm/interpreter/templateTable.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp.i
+data/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SirInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicAddressFieldWrapper.java.i
data/src/share/vm/opto/type.cpp.i
data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp.i
data/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp.i
data/test/compiler/7052494/Test7052494.java.i
-data/agent/src/os/win32/README.txt.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbols.java.i
data/make/bsd/makefiles/profiled.make.i
data/src/os/solaris/vm/c1_globals_solaris.hpp.i
data/src/os/linux/vm/mutex_linux.cpp.i
data/src/os/linux/vm/stubRoutines_linux.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties.i
+data/src/os/linux/vm/dtraceJSDT_linux.cpp.i
data/src/share/tools/MakeDeps/Util.java.i
-data/src/os/posix/vm/os_posix.cpp.i
+data/agent/src/os/solaris/proc/libproc.h.i
data/src/share/vm/ci/ciObjArray.cpp.i
data/build/windows/makefiles/product.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java.i
+data/test/runtime/6878713/Test6878713.sh.i
data/src/share/vm/classfile/javaAssertions.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java.i
+data/src/share/vm/utilities/numberSeq.cpp.i
+data/src/share/vm/oops/objArrayKlassKlass.hpp.i
data/src/share/vm/oops/typeArrayOop.hpp.i
data/src/share/vm/includeDB_core.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp.i
-data/src/share/vm/oops/klassVtable.hpp.i
+data/src/share/vm/interpreter/bytecodeTracer.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java.i
-data/src/share/vm/opto/loopTransform.cpp.i
+data/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp.i
+data/src/cpu/sparc/vm/register_definitions_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCTrapInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/MessageQueue.java.i
@@ -4204,11 +4218,11 @@ data/src/share/vm/utilities/exceptions.hpp.i
data/src/share/vm/code/vtableStubs.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp.i
data/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java.i
-data/src/share/vm/ci/ciMethod.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties.i
+data/agent/src/os/win32/libInfo.hpp.i
+data/agent/test/libproc/libproctest.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WrprInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SpecialStoreDecoder.java.i
-data/build/solaris/makefiles/mapfile-vers-nonproduct.i
+data/src/cpu/x86/vm/templateTable_x86_32.cpp.i
data/src/share/vm/prims/methodHandleWalk.hpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/suite.properties.i
@@ -4216,64 +4230,62 @@ data/src/share/vm/ci/ciConstant.cpp.i
data/src/cpu/zero/vm/vmStructs_zero.hpp.i
data/agent/src/os/win32/IOBuf.cpp.i
data/src/os/bsd/vm/os_bsd.cpp.i
-data/agent/src/share/classes/com/sun/java/swing/action/BackAction.java.i
+data/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp.i
data/src/share/vm/oops/klassPS.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter.i
-data/src/share/vm/ci/ciArray.hpp.i
+data/src/os/windows/vm/jvm_windows.h.i
+data/agent/src/os/bsd/ps_core.c.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/JNIHandleAccessor.java.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp.i
data/src/os/solaris/dtrace/jvm_dtrace.c.i
-data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.properties.i
+data/src/share/vm/oops/compiledICHolderKlass.hpp.i
data/src/share/vm/interpreter/invocationCounter.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/StructuredViewAction.java.i
data/src/share/vm/oops/objArrayKlassKlass.cpp.i
data/src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp.i
data/test/compiler/6855164/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlassKlass.java.i
-data/agent/make/clhsdbproc64.sh.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java.i
data/README.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEShiftDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java.i
data/test/runtime/6878713/testcase.jar.i
data/src/share/vm/gc_implementation/g1/concurrentMark.hpp.i
data/src/cpu/sparc/vm/c1_FpuStackSim_sparc.cpp.i
-data/src/cpu/x86/vm/templateTable_x86_64.hpp.i
+data/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisters.java.i
-data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp.i
+data/make/windows/create.bat.i
data/agent/make/grantAll.policy.i
data/test/compiler/6646019/Test.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.i
data/src/os_cpu/bsd_x86/vm/bsd_x86_32.s.i
data/src/share/tools/MakeDeps/ArgsParser.java.i
data/src/share/vm/oops/cpCacheOop.cpp.i
-data/src/cpu/sparc/vm/templateTable_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/OopField.java.i
+data/src/share/vm/c1/c1_Optimizer.hpp.i
data/src/share/vm/opto/rootnode.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrefetchInstruction.java.i
-data/agent/make/dumpflagsproc.sh.i
+data/make/bsd/makefiles/fastdebug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/opto/Phase.java.i
-data/build/solaris/makefiles/reorder_TIERED_sparc.i
-data/src/share/vm/utilities/numberSeq.cpp.i
-data/src/share/vm/memory/barrierSet.hpp.i
+data/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java.i
+data/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp.i
data/agent/make/jcoreproc64.sh.i
data/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp.i
data/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp.i
data/src/share/vm/runtime/sweeper.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RotateInstruction.java.i
+data/src/share/vm/opto/mulnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java.i
-data/agent/make/jsdbproc64.sh.i
-data/src/share/vm/oops/klassOop.hpp.i
+data/src/share/vm/opto/classes.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9BranchDecoder.java.i
data/src/share/vm/shark/sharkStateScanner.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/MemoryInstructionDecoder.java.i
-data/src/share/vm/interpreter/interpreter.cpp.i
+data/make/linux/platform_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java.i
-data/src/os/bsd/vm/interfaceSupport_bsd.hpp.i
+data/src/share/vm/prims/jvm_misc.hpp.i
data/src/share/vm/runtime/java.hpp.i
data/make/test/Queens.java.i
-data/src/share/vm/c1/c1_FrameMap.hpp.i
+data/src/share/vm/services/dtraceAttacher.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java.i
+data/src/share/tools/IdealGraphVisualizer/Filter/build.xml.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java.i
data/src/share/vm/runtime/mutex.hpp.i
@@ -4283,12 +4295,12 @@ data/src/os/linux/vm/objectMonitor_linux.hpp.i
data/src/share/vm/prims/methodHandleWalk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ResultTypeFinder.java.i
data/src/share/vm/runtime/perfData.hpp.i
-data/src/share/vm/runtime/globals.hpp.i
+data/make/bsd/makefiles/i486.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java.i
data/src/cpu/zero/vm/icBuffer_zero.cpp.i
data/test/compiler/7070134/words.d
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPLoadDecoder.java.i
-data/make/solaris/makefiles/compiler1.make.i
+data/test/compiler/7070134/words.i
data/src/share/vm/code/dependencies.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java.i
data/make/bsd/makefiles/product.make.i
@@ -4296,109 +4308,110 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java.i
data/src/share/vm/utilities/vmError.hpp.i
data/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp.i
data/src/share/vm/ci/ciConstant.hpp.i
-data/src/share/vm/interpreter/templateInterpreterGenerator.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java.i
data/src/cpu/zero/vm/templateInterpreter_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/Win32VtblAccess.java.i
-data/src/share/tools/LogCompilation/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java.i
-data/src/share/vm/memory/collectorPolicy.hpp.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf.i
data/src/share/vm/opto/runtime.cpp.i
data/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/linestyle.filter.i
data/src/share/vm/runtime/threadCritical.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.gif.i
-data/build/linux/makefiles/optimized.make.i
+data/src/share/vm/runtime/safepoint.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png.i
-data/src/share/vm/classfile/stackMapTable.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java.i
data/src/share/vm/oops/arrayKlassKlass.cpp.i
data/src/share/vm/runtime/thread.cpp.i
-data/build/windows/projectfiles/tiered/vm.def.i
+data/make/windows/projectfiles/tiered/ADLCompiler.dsw.i
data/agent/src/share/classes/com/sun/java/swing/ui/CommonMenuBar.java.i
data/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp.i
+data/make/hotspot_distro.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java.i
+data/build/solaris/platform_i486.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.i
data/test/compiler/6772683/InterruptedTest.java.i
-data/make/linux/makefiles/saproc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactoryImpl.java.i
data/src/share/vm/memory/generation.inline.hpp.i
-data/src/share/vm/ci/ciCPCache.hpp.i
+data/src/cpu/sparc/vm/dump_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/SALauncherLoader.java.i
-data/test/compiler/6714694/Tester.java.i
+data/src/share/vm/gc_interface/collectedHeap.cpp.i
data/src/share/vm/opto/idealKit.hpp.i
data/src/share/vm/memory/resourceArea.cpp.i
data/src/share/vm/ci/ciNullObject.cpp.i
-data/src/share/vm/prims/unsafe.cpp.i
+data/src/share/vm/prims/jvmtiEnvThreadState.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerType.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp.i
+data/build/windows/makefiles/makedeps.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapProgressThunk.java.i
data/src/share/vm/asm/register.cpp.i
data/src/cpu/x86/vm/frame_x86.inline.hpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java.i
+data/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.i
data/src/share/vm/ci/ciSymbolKlass.hpp.i
-data/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp.i
-data/agent/make/heapsumproc.sh.i
+data/make/windows/makefiles/launcher.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/MoveDecoder.java.i
data/src/share/vm/interpreter/rewriter.hpp.i
data/src/cpu/x86/vm/c1_globals_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/platform.properties.i
-data/src/share/vm/opto/generateOptoStub.cpp.i
-data/src/os/bsd/dtrace/generateJvmOffsets.h.i
+data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java.i
-data/agent/test/jdi/VMConnection.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java.i
data/make/bsd/README.i
data/make/windows/makefiles/compile.make.i
-data/src/share/vm/shark/sharkInliner.cpp.i
-data/src/cpu/sparc/vm/interp_masm_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLdstubDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp.i
-data/src/share/vm/opto/classes.cpp.i
+data/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.i
data/src/cpu/x86/vm/interpreterRT_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSymbolRecord.java.i
data/src/share/vm/runtime/stubCodeGenerator.hpp.i
data/test/compiler/6833129/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/SingletonBlob.java.i
-data/test/runtime/6929067/Test6929067.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntry.java.i
+data/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp.i
data/src/share/vm/runtime/unhandledOops.cpp.i
-data/src/share/vm/oops/objArrayKlassKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PopcDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java.i
+data/build/solaris/makefiles/reorder_TIERED_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArrayKlass.java.i
-data/test/runtime/6626217/many_loader2.java.foo.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC6.java.i
-data/src/cpu/x86/vm/templateTable_x86_32.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java.i
+data/build/solaris/makefiles/mapfile-vers-nonproduct.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC9.java.i
data/src/share/vm/opto/subnode.hpp.i
data/make/windows/makefiles/generated.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java.i
-data/src/share/vm/gc_implementation/shared/collectorCounters.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.i
data/agent/src/os/win32/Reaper.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp.i
-data/src/share/vm/libadt/set.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialStoreDecoder.java.i
data/test/compiler/5091921/Test6890943.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java.i
+data/agent/make/jsdbproc64.sh.i
data/src/share/vm/oops/klass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50MemberAttributes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIinc.java.i
data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp.i
data/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp.i
-data/src/cpu/sparc/vm/jni_sparc.h.i
+data/agent/src/share/classes/com/sun/java/swing/action/HelpMenu.java.i
data/src/share/vm/opto/block.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCWriteInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32ThreadContext.java.i
+data/test/compiler/5057225/Test5057225.java.i
data/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java.i
+data/agent/make/heapsumproc.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedBoolean.java.i
-data/src/cpu/sparc/vm/nativeInst_sparc.hpp.i
+data/src/share/vm/interpreter/bytecodes.hpp.i
data/src/share/vm/runtime/monitorChunk.hpp.i
-data/make/solaris/makefiles/adlc.make.i
+data/build/windows/projectfiles/tiered/ADLCompiler.dsp.i
data/build/solaris/makefiles/mapfile-vers-jsig.i
-data/test/compiler/7100757/Test7100757.java.i
-data/agent/make/soqlwindbg.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveLoadInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java.i
data/src/share/vm/utilities/numberSeq.hpp.i
-data/src/share/vm/gc_implementation/shared/spaceDecorator.hpp.i
+data/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp.i
diff --git a/hotspot/.hg/store/undo b/hotspot/.hg/store/undo
index c798c1e..9658360 100644
Binary files a/hotspot/.hg/store/undo and b/hotspot/.hg/store/undo differ
diff --git a/hotspot/.hg/undo.desc b/hotspot/.hg/undo.desc
index 762fcae..d420462 100644
--- a/hotspot/.hg/undo.desc
+++ b/hotspot/.hg/undo.desc
@@ -1,3 +1,3 @@
-2891
+3057
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/hotspot
diff --git a/hotspot/.hg/undo.dirstate b/hotspot/.hg/undo.dirstate
index ac9f714..a44a1b3 100644
Binary files a/hotspot/.hg/undo.dirstate and b/hotspot/.hg/undo.dirstate differ
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index ffd5ce5..63e0ae2 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -222,3 +222,23 @@ fe2c8764998112b7fefcd7d41599714813ae4327 jdk8-b20
24727fb37561779077fdfa5a33342246f20e5c0f jdk8-b22
dcc292399a39113957eebbd3e487b7e05e2c79fc hs23-b11
e850d8e7ea54b91c7aa656e297f0f9f38dd4c296 jdk8-b23
+9e177d44b10fe92ecffa965fef9c5ac5433c1b46 hs23-b12
+a80fd4f45d7aaa154ed2f86a129f3c9c4035ec7a jdk8-b24
+b22de824749922986ce4d442bed029916b832807 hs23-b13
+64b46f975ab82948c1e021e17775ff4fab8bc40e hs23-b14
+9ad8feb5afbddec46d3cfe29fb5f73c2e99d5a43 jdk8-b25
+d71e662fe03741b6de498ca2077220148405a978 hs23-b15
+fd3060701216a11c0df6dcd053c6fd7c2b17a42c jdk8-b26
+f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
+f92a171cf0071ca6c3fa8231d7d570377f8b2f4d hs23-b16
+931e5f39e365a0d550d79148ff87a7f9e864d2e1 hs23-b16
+3b24e7e01d20ca590d0f86b1222bb7c3f1a2aa2d jdk8-b27
+975c4105f1e2ef1190a75b77124033f1fd4290b5 hs24-b01
+b183b0863611b85dbac16f3b08b40ba978756d19 jdk8-b28
+030b5306d60f140e822e4a6d301744cb110ff0c8 hs24-b02
+b45b5c564098c58ea69e7cff3f7d341f0254dd1d jdk8-b29
+d61761bf305031c94f7f8eca49abd978b7d3c5da jdk8-b30
+dfae0140457cfb2c381d7679735fbedbae862c62 hs24-b03
+f4767e53d6e0d5da7e3f1775904076cce54247c1 hs24-b04
+0cd147eaa673d1642b2f466f5dc257cf192db524 jdk8-b31
+27863e4586de38be7dd17da4163f542038f4d1d7 hs24-b05
diff --git a/hotspot/agent/src/os/linux/Makefile b/hotspot/agent/src/os/linux/Makefile
index cd9d9c1..b79effe 100644
--- a/hotspot/agent/src/os/linux/Makefile
+++ b/hotspot/agent/src/os/linux/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,7 @@ OBJS = $(SOURCES:.c=.o)
LIBS = -lthread_db
-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
+CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) -D_FILE_OFFSET_BITS=64
LIBSA = $(ARCH)/libsaproc.so
diff --git a/hotspot/agent/src/os/linux/libproc_impl.c b/hotspot/agent/src/os/linux/libproc_impl.c
index 971a828..6ac43ac 100644
--- a/hotspot/agent/src/os/linux/libproc_impl.c
+++ b/hotspot/agent/src/os/linux/libproc_impl.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -50,10 +50,6 @@ int pathmap_open(const char* name) {
char alt_path[PATH_MAX + 1];
init_alt_root();
- fd = open(name, O_RDONLY);
- if (fd >= 0) {
- return fd;
- }
if (alt_root_len > 0) {
strcpy(alt_path, alt_root);
@@ -73,6 +69,11 @@ int pathmap_open(const char* name) {
return fd;
}
}
+ } else {
+ fd = open(name, O_RDONLY);
+ if (fd >= 0) {
+ return fd;
+ }
}
return -1;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
index 502d8e4..b75669e 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1CollectedHeap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,8 +49,12 @@ public class G1CollectedHeap extends SharedHeap {
static private long g1CommittedFieldOffset;
// size_t _summary_bytes_used;
static private CIntegerField summaryBytesUsedField;
- // G1MonitoringSupport* _g1mm
+ // G1MonitoringSupport* _g1mm;
static private AddressField g1mmField;
+ // MasterOldRegionSet _old_set;
+ static private long oldSetFieldOffset;
+ // MasterHumongousRegionSet _humongous_set;
+ static private long humongousSetFieldOffset;
static {
VM.registerVMInitializedObserver(new Observer() {
@@ -67,12 +71,14 @@ public class G1CollectedHeap extends SharedHeap {
g1CommittedFieldOffset = type.getField("_g1_committed").getOffset();
summaryBytesUsedField = type.getCIntegerField("_summary_bytes_used");
g1mmField = type.getAddressField("_g1mm");
+ oldSetFieldOffset = type.getField("_old_set").getOffset();
+ humongousSetFieldOffset = type.getField("_humongous_set").getOffset();
}
public long capacity() {
Address g1CommittedAddr = addr.addOffsetTo(g1CommittedFieldOffset);
- MemRegion g1_committed = new MemRegion(g1CommittedAddr);
- return g1_committed.byteSize();
+ MemRegion g1Committed = new MemRegion(g1CommittedAddr);
+ return g1Committed.byteSize();
}
public long used() {
@@ -94,6 +100,18 @@ public class G1CollectedHeap extends SharedHeap {
return (G1MonitoringSupport) VMObjectFactory.newObject(G1MonitoringSupport.class, g1mmAddr);
}
+ public HeapRegionSetBase oldSet() {
+ Address oldSetAddr = addr.addOffsetTo(oldSetFieldOffset);
+ return (HeapRegionSetBase) VMObjectFactory.newObject(HeapRegionSetBase.class,
+ oldSetAddr);
+ }
+
+ public HeapRegionSetBase humongousSet() {
+ Address humongousSetAddr = addr.addOffsetTo(humongousSetFieldOffset);
+ return (HeapRegionSetBase) VMObjectFactory.newObject(HeapRegionSetBase.class,
+ humongousSetAddr);
+ }
+
private Iterator<HeapRegion> heapRegionIterator() {
return hrs().heapRegionIterator();
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
index 7b03aed..a9ced52 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/g1/G1MonitoringSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -77,6 +77,10 @@ public class G1MonitoringSupport extends VMObject {
return edenUsedField.getValue(addr);
}
+ public long edenRegionNum() {
+ return edenUsed() / HeapRegion.grainBytes();
+ }
+
public long survivorCommitted() {
return survivorCommittedField.getValue(addr);
}
@@ -85,6 +89,10 @@ public class G1MonitoringSupport extends VMObject {
return survivorUsedField.getValue(addr);
}
+ public long survivorRegionNum() {
+ return survivorUsed() / HeapRegion.grainBytes();
+ }
+
public long oldCommitted() {
return oldCommittedField.getValue(addr);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
index 34decad..0cffde9 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -217,8 +217,8 @@ abstract class ConnectorImpl implements Connector {
}
protected void checkNativeLink(SecurityManager sm, String os) {
- if (os.equals("SunOS") || os.equals("Linux")) {
- // link "saproc" - SA native library on SunOS and Linux?
+ if (os.equals("SunOS") || os.equals("Linux") || os.contains("OS X")) {
+ // link "saproc" - SA native library on SunOS, Linux, and Mac OS X
sm.checkLink("saproc");
} else if (os.startsWith("Windows")) {
// link "sawindbg" - SA native library on Windows.
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java
index 582789a..14d6c56 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,15 +42,6 @@ public class LoaderConstraintTable extends TwoOopHashtable {
private static synchronized void initialize(TypeDataBase db) {
Type type = db.lookupType("LoaderConstraintTable");
- nofBuckets = db.lookupIntConstant("LoaderConstraintTable::_nof_buckets").intValue();
- }
-
- // Fields
- private static int nofBuckets;
-
- // Accessors
- public static int getNumOfBuckets() {
- return nofBuckets;
}
public LoaderConstraintTable(Address addr) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
index c999ff1..11adb3c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,6 @@ public class SystemDictionary {
private static AddressField placeholdersField;
private static AddressField loaderConstraintTableField;
private static sun.jvm.hotspot.types.OopField javaSystemLoaderField;
- private static int nofBuckets;
private static sun.jvm.hotspot.types.OopField objectKlassField;
private static sun.jvm.hotspot.types.OopField classLoaderKlassField;
@@ -62,7 +61,6 @@ public class SystemDictionary {
placeholdersField = type.getAddressField("_placeholders");
loaderConstraintTableField = type.getAddressField("_loader_constraints");
javaSystemLoaderField = type.getOopField("_java_system_loader");
- nofBuckets = db.lookupIntConstant("SystemDictionary::_nof_buckets").intValue();
objectKlassField = type.getOopField(WK_KLASS("Object_klass"));
classLoaderKlassField = type.getOopField(WK_KLASS("ClassLoader_klass"));
@@ -142,10 +140,6 @@ public class SystemDictionary {
return newOop(javaSystemLoaderField.getValue());
}
- public static int getNumOfBuckets() {
- return nofBuckets;
- }
-
private static Oop newOop(OopHandle handle) {
return VM.getVM().getObjectHeap().newOop(handle);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
index 5752eae..874512f 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
@@ -648,7 +648,12 @@ public class ConstantPool extends Oop implements ClassConstants {
}
public void printValueOn(PrintStream tty) {
- tty.print("ConstantPool for " + getPoolHolder().getName().asString());
+ Oop holder = poolHolder.getValue(this);
+ if (holder instanceof Klass) {
+ tty.print("ConstantPool for " + ((Klass)holder).getName().asString());
+ } else {
+ tty.print("ConstantPool for partially loaded class");
+ }
}
public long getObjectSize() {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
index bcfc015..d0ff868 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -67,6 +67,7 @@ public class HeapSummary extends Tool {
printValue("SurvivorRatio = ", getFlagValue("SurvivorRatio", flagMap));
printValMB("PermSize = ", getFlagValue("PermSize", flagMap));
printValMB("MaxPermSize = ", getFlagValue("MaxPermSize", flagMap));
+ printValMB("G1HeapRegionSize = ", HeapRegion.grainBytes());
System.out.println();
System.out.println("Heap Usage:");
@@ -100,11 +101,20 @@ public class HeapSummary extends Tool {
} else if (sharedHeap instanceof G1CollectedHeap) {
G1CollectedHeap g1h = (G1CollectedHeap) sharedHeap;
G1MonitoringSupport g1mm = g1h.g1mm();
- System.out.println("G1 Young Generation");
- printG1Space("Eden Space:", g1mm.edenUsed(), g1mm.edenCommitted());
- printG1Space("From Space:", g1mm.survivorUsed(), g1mm.survivorCommitted());
- printG1Space("To Space:", 0, 0);
- printG1Space("G1 Old Generation", g1mm.oldUsed(), g1mm.oldCommitted());
+ long edenRegionNum = g1mm.edenRegionNum();
+ long survivorRegionNum = g1mm.survivorRegionNum();
+ HeapRegionSetBase oldSet = g1h.oldSet();
+ HeapRegionSetBase humongousSet = g1h.humongousSet();
+ long oldRegionNum = oldSet.regionNum() + humongousSet.regionNum();
+ printG1Space("G1 Heap:", g1h.n_regions(),
+ g1h.used(), g1h.capacity());
+ System.out.println("G1 Young Generation:");
+ printG1Space("Eden Space:", edenRegionNum,
+ g1mm.edenUsed(), g1mm.edenCommitted());
+ printG1Space("Survivor Space:", survivorRegionNum,
+ g1mm.survivorUsed(), g1mm.survivorCommitted());
+ printG1Space("G1 Old Generation:", oldRegionNum,
+ g1mm.oldUsed(), g1mm.oldCommitted());
} else {
throw new RuntimeException("unknown SharedHeap type : " + heap.getClass());
}
@@ -216,9 +226,11 @@ public class HeapSummary extends Tool {
System.out.println(alignment + (double)space.used() * 100.0 / space.capacity() + "% used");
}
- private void printG1Space(String spaceName, long used, long capacity) {
+ private void printG1Space(String spaceName, long regionNum,
+ long used, long capacity) {
long free = capacity - used;
System.out.println(spaceName);
+ printValue("regions = ", regionNum);
printValMB("capacity = ", capacity);
printValMB("used = ", used);
printValMB("free = ", free);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
index eff3405..d069db2 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ public class PlatformInfo {
return "bsd";
} else if (os.equals("OpenBSD")) {
return "bsd";
- } else if (os.equals("Darwin") || os.startsWith("Mac OS X")) {
+ } else if (os.equals("Darwin") || os.contains("OS X")) {
return "bsd";
} else if (os.startsWith("Windows")) {
return "win32";
@@ -52,17 +52,17 @@ public class PlatformInfo {
}
}
- /* Returns "sparc" if on SPARC, "x86" if on x86. */
+ /* Returns "sparc" for SPARC based platforms and "x86" for x86 based
+ platforms. Otherwise returns the value of os.arch. If the value
+ is not recognized as supported, an exception is thrown instead. */
public static String getCPU() throws UnsupportedPlatformException {
String cpu = System.getProperty("os.arch");
- if (cpu.equals("i386")) {
+ if (cpu.equals("i386") || cpu.equals("x86")) {
return "x86";
- } else if (cpu.equals("sparc") || cpu.equals("x86") || cpu.equals("ia64")) {
- return cpu;
- } else if (cpu.equals("sparcv9")) {
+ } else if (cpu.equals("sparc") || cpu.equals("sparcv9")) {
return "sparc";
- } else if (cpu.equals("x86_64") || cpu.equals("amd64")) {
- return "amd64";
+ } else if (cpu.equals("ia64") || cpu.equals("amd64") || cpu.equals("x86_64")) {
+ return cpu;
} else {
throw new UnsupportedPlatformException("CPU type " + cpu + " not yet supported");
}
diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile
index 1d6af55..7b3c63b 100644
--- a/hotspot/make/Makefile
+++ b/hotspot/make/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -89,19 +89,31 @@ KERNEL_VM_TARGETS=productkernel fastdebugkernel optimizedkernel jvmgkernel
ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
+COMMON_VM_PRODUCT_TARGETS=product product1 productkernel docs export_product
+COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
+COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 jvmgkernel docs export_debug
+
# JDK directory list
JDK_DIRS=bin include jre lib demo
all: all_product all_fastdebug
-ifndef BUILD_CLIENT_ONLY
-all_product: product product1 productkernel docs export_product
-all_fastdebug: fastdebug fastdebug1 fastdebugkernel docs export_fastdebug
-all_debug: jvmg jvmg1 jvmgkernel docs export_debug
-else
+
+ifdef BUILD_CLIENT_ONLY
all_product: product1 docs export_product
all_fastdebug: fastdebug1 docs export_fastdebug
all_debug: jvmg1 docs export_debug
+else
+ifeq ($(MACOSX_UNIVERSAL),true)
+all_product: universal_product
+all_fastdebug: universal_fastdebug
+all_debug: universal_debug
+else
+all_product: $(COMMON_VM_PRODUCT_TARGETS)
+all_fastdebug: $(COMMON_VM_FASTDEBUG_TARGETS)
+all_debug: $(COMMON_VM_DEBUG_TARGETS)
+endif
endif
+
all_optimized: optimized optimized1 optimizedkernel docs export_optimized
allzero: all_productzero all_fastdebugzero
@@ -232,20 +244,19 @@ export_debug:
$(MAKE) VM_SUBDIR=${VM_DEBUG} EXPORT_SUBDIR=/debug generic_export
export_optimized:
$(MAKE) VM_SUBDIR=optimized EXPORT_SUBDIR=/optimized generic_export
-export_product_jdk:
+export_product_jdk::
$(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
VM_SUBDIR=product generic_export
-export_optimized_jdk:
+export_optimized_jdk::
$(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR) \
VM_SUBDIR=optimized generic_export
-export_fastdebug_jdk:
+export_fastdebug_jdk::
$(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/fastdebug \
VM_SUBDIR=fastdebug generic_export
-export_debug_jdk:
+export_debug_jdk::
$(MAKE) ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/debug \
VM_SUBDIR=${VM_DEBUG} generic_export
-
# Export file copy rules
XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt
DOCS_DIR=$(OUTPUTDIR)/$(VM_PLATFORM)_docs
@@ -260,23 +271,25 @@ KERNEL_DIR=$(KERNEL_BASE_DIR)/$(VM_SUBDIR)
ZERO_DIR=$(ZERO_BASE_DIR)/$(VM_SUBDIR)
SHARK_DIR=$(SHARK_BASE_DIR)/$(VM_SUBDIR)
-# Misc files and generated files need to come from C1 or C2 area
-ifeq ($(ZERO_BUILD), true)
-ifeq ($(SHARK_BUILD), true)
- MISC_DIR=$(SHARK_DIR)
- GEN_DIR=$(SHARK_BASE_DIR)/generated
-else
- MISC_DIR=$(ZERO_DIR)
- GEN_DIR=$(ZERO_BASE_DIR)/generated
+ifeq ($(JVM_VARIANT_SERVER), true)
+ MISC_DIR=$(C2_DIR)
+ GEN_DIR=$(C2_BASE_DIR)/generated
endif
-else
-ifeq ($(ARCH_DATA_MODEL), 32)
- MISC_DIR=$(C1_DIR)
- GEN_DIR=$(C1_BASE_DIR)/generated
-else
- MISC_DIR=$(C2_DIR)
- GEN_DIR=$(C2_BASE_DIR)/generated
+ifeq ($(JVM_VARIANT_CLIENT), true)
+ MISC_DIR=$(C1_DIR)
+ GEN_DIR=$(C1_BASE_DIR)/generated
+endif
+ifeq ($(JVM_VARIANT_KERNEL), true)
+ MISC_DIR=$(C2_DIR)
+ GEN_DIR=$(C2_BASE_DIR)/generated
+endif
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+ MISC_DIR=$(SHARK_DIR)
+ GEN_DIR=$(SHARK_BASE_DIR)/generated
endif
+ifeq ($(JVM_VARIANT_ZERO), true)
+ MISC_DIR=$(ZERO_DIR)
+ GEN_DIR=$(ZERO_BASE_DIR)/generated
endif
# Bin files (windows)
@@ -321,52 +334,55 @@ endif
# Shared Library
ifneq ($(OSNAME),windows)
- ifeq ($(ZERO_BUILD), true)
- ifeq ($(SHARK_BUILD), true)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
- else
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
+ ifeq ($(JVM_VARIANT_SERVER), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+ endif
+ ifeq ($(JVM_VARIANT_CLIENT), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+ $(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+ $(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+ endif
+ ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ endif
+ ifeq ($(JVM_VARIANT_ZERO), true)
+ $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+ $(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
endif
- else
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
- $(install-file)
-
-# Debug info for shared library
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
- $(install-file)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
- $(install-file)
-$(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
- $(install-file)
-$(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
- $(install-file)
-$(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
- $(install-file)
-$(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
- $(install-file)
- endif
endif
# Jar file (sa-jdi.jar)
$(EXPORT_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
$(install-file)
+$(EXPORT_JRE_LIB_DIR)/%.jar: $(GEN_DIR)/%.jar
+ $(install-file)
+
# Include files (jvmti.h, jvmticmlr.h, jni.h, $(JDK_INCLUDE_SUBDIR)/jni_md.h, jmm.h, jfr.h)
$(EXPORT_INCLUDE_DIR)/%: $(GEN_DIR)/jvmtifiles/%
$(install-file)
@@ -391,7 +407,6 @@ $(EXPORT_INCLUDE_DIR)/%: $(HS_ALT_SRC)/share/vm/jfr/agent/%
$(install-file)
else
$(EXPORT_INCLUDE_DIR)/jfr.h:
-
endif
# Doc files (jvmti.html)
@@ -437,21 +452,28 @@ $(JDK_IMAGE_DIR)/jre/lib/rt.jar:
($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
test_jdk:
- ifneq ($(ZERO_BUILD), true)
- ifeq ($(ARCH_DATA_MODEL), 32)
- $(JDK_IMAGE_DIR)/bin/java -client -version
- endif
+ ifeq ($(JVM_VARIANT_CLIENT), true)
+ $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -Xinternalversion
+ $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -client -version
+ endif
+ ifeq ($(findstring true, $(JVM_VARIANT_SERVER)\
+ $(JVM_VARIANT_ZERO)$(JVM_VARIANT_ZEROSHARK)), true)
+ $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -Xinternalversion
+ $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -server -version
+ endif
+ ifeq ($(JVM_VARIANT_KERNEL), true)
+ $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -Xinternalversion
+ $(JDK_IMAGE_DIR)/bin/java -d$(ARCH_DATA_MODEL) -kernel -version
endif
- $(JDK_IMAGE_DIR)/bin/java -server -version
-copy_product_jdk:
+copy_product_jdk::
$(RM) -r $(JDK_IMAGE_DIR)
$(MKDIR) -p $(JDK_IMAGE_DIR)
($(CD) $(JDK_IMPORT_PATH) && \
$(TAR) -cf - $(JDK_DIRS)) | \
($(CD) $(JDK_IMAGE_DIR) && $(TAR) -xf -)
-copy_fastdebug_jdk:
+copy_fastdebug_jdk::
$(RM) -r $(JDK_IMAGE_DIR)/fastdebug
$(MKDIR) -p $(JDK_IMAGE_DIR)/fastdebug
if [ -d $(JDK_IMPORT_PATH)/fastdebug ] ; then \
@@ -464,7 +486,7 @@ copy_fastdebug_jdk:
($(CD) $(JDK_IMAGE_DIR)/fastdebug && $(TAR) -xf -) ; \
fi
-copy_debug_jdk:
+copy_debug_jdk::
$(RM) -r $(JDK_IMAGE_DIR)/debug
$(MKDIR) -p $(JDK_IMAGE_DIR)/debug
if [ -d $(JDK_IMPORT_PATH)/debug ] ; then \
@@ -481,36 +503,6 @@ copy_debug_jdk:
($(CD) $(JDK_IMAGE_DIR)/debug && $(TAR) -xf -) ; \
fi
-# macosx universal builds
-
-ifeq ($(MACOSX_UNIVERSAL), true)
-$(UNIVERSAL_LIPO_LIST):
- lipo -create -output $@ $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)
-
-$(UNIVERSAL_COPY_LIST):
- $(CP) $(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) $@
-
-universalize: $(UNIVERSAL_LIPO_LIST) $(UNIVERSAL_COPY_LIST)
-endif
-
-universal_product:
- $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_product
- $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_product
- $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
- $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
-
-universal_fastdebug:
- $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_fastdebug
- $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_fastdebug
- $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
- $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
-
-universal_debug:
- $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=32 MACOSX_UNIVERSAL=true all_debug
- $(QUIETLY) $(MAKE) ARCH_DATA_MODEL=64 MACOSX_UNIVERSAL=true all_debug
- $(MKDIR) -p $(EXPORT_JRE_LIB_DIR)/{client,server}
- $(QUIETLY) $(MAKE) MACOSX_UNIVERSAL=true universalize
-
#
# Check target
#
@@ -564,6 +556,7 @@ SLASH_JAVA.desc = Root of all build tools, e.g. /java or J:
OUTPUTDIR.desc = Output directory, default is build/<osname>
BOOTDIR.desc = JDK used to compile agent java source and test with
JDK_IMPORT_PATH.desc = Promoted JDK to copy for 'create_jdk'
+JDK_IMAGE_DIR.desc = Directory to place JDK to copy
EXPORT_PATH.desc = Directory to place files to export for JDK build
# Make variables to print out (description and value)
@@ -572,6 +565,7 @@ VARIABLE_PRINTVAL_LIST += \
OUTPUTDIR \
BOOTDIR \
JDK_IMPORT_PATH \
+ JDK_IMAGE_DIR \
EXPORT_PATH
# Make variables that should refer to directories that exist
@@ -630,6 +624,13 @@ examples_help:
@$(ECHO) \
" $(MAKE) ALT_JDK_IMPORT_PATH=/opt/java/jdk$(JDK_VERSION)"
+# Universal build support
+ifeq ($(OS_VENDOR), Darwin)
+ifeq ($(MACOSX_UNIVERSAL),true)
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk
+endif
+endif
+
# JPRT rule to build this workspace
include $(GAMMADIR)/make/jprt.gmk
@@ -639,6 +640,4 @@ include $(GAMMADIR)/make/jprt.gmk
export_product export_fastdebug export_debug export_optimized \
export_jdk_product export_jdk_fastdebug export_jdk_debug \
create_jdk copy_jdk update_jdk test_jdk \
- copy_product_jdk copy_fastdebug_jdk copy_debug_jdk universalize \
- universal_product
-
+ copy_product_jdk copy_fastdebug_jdk copy_debug_jdk
diff --git a/hotspot/make/bsd/Makefile b/hotspot/make/bsd/Makefile
index cef9d7c..518c54f 100644
--- a/hotspot/make/bsd/Makefile
+++ b/hotspot/make/bsd/Makefile
@@ -188,7 +188,7 @@ VARIANTARCH = $(subst i386,i486,$(ZERO_LIBARCH))
# in the build.sh script:
TARGETS = debug jvmg fastdebug optimized profiled product
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs
else
SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
@@ -208,7 +208,7 @@ TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
-BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
+BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX)
BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
diff --git a/hotspot/make/bsd/makefiles/adlc.make b/hotspot/make/bsd/makefiles/adlc.make
index 7686c48..2f161cb 100644
--- a/hotspot/make/bsd/makefiles/adlc.make
+++ b/hotspot/make/bsd/makefiles/adlc.make
@@ -61,10 +61,10 @@ Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED)
INCLUDES += $(Src_Dirs_I:%=-I%)
# set flags for adlc compilation
-CPPFLAGS = $(SYSDEFS) $(INCLUDES)
+CXXFLAGS = $(SYSDEFS) $(INCLUDES)
# Force assertions on.
-CPPFLAGS += -DASSERT
+CXXFLAGS += -DASSERT
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
@@ -111,7 +111,7 @@ all: $(EXEC)
$(EXEC) : $(OBJECTS)
@echo Making adlc
- $(QUIETLY) $(HOST.LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS)
+ $(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
# Random dependencies:
$(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp
@@ -213,14 +213,14 @@ PROCESS_AD_FILES = awk '{ \
$(OUTDIR)/%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
# Some object files are given a prefix, to disambiguate
# them from objects of the same name built for the VM.
$(OUTDIR)/adlc-%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
# #########################################################################
diff --git a/hotspot/make/bsd/makefiles/buildtree.make b/hotspot/make/bsd/makefiles/buildtree.make
index 4d7c25a..5d218ff 100644
--- a/hotspot/make/bsd/makefiles/buildtree.make
+++ b/hotspot/make/bsd/makefiles/buildtree.make
@@ -58,6 +58,7 @@
# needs to be set here since this Makefile doesn't include defs.make
OS_VENDOR:=$(shell uname -s)
+-include $(SPEC)
include $(GAMMADIR)/make/scm.make
include $(GAMMADIR)/make/altsrc.make
@@ -68,7 +69,7 @@ QUIETLY$(MAKE_VERBOSE) = @
# For now, until the compiler is less wobbly:
TESTFLAGS = -Xbatch -showversion
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
else
ifdef USE_SUNCC
@@ -162,20 +163,6 @@ ifndef HOTSPOT_VM_DISTRO
endif
endif
-ifeq ($(OS_VENDOR), Darwin)
- # MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
- ifeq ($(ALWAYS_PASS_TEST_GAMMA),)
- # ALWAYS_PASS_TEST_GAMMA wasn't set so we default to true on MacOS X
- # until MACOSX_PORT-214 is fixed
- ALWAYS_PASS_TEST_GAMMA=true
- endif
-endif
-ifeq ($(ALWAYS_PASS_TEST_GAMMA), true)
- TEST_GAMMA_STATUS= echo 'exit 0';
-else
- TEST_GAMMA_STATUS=
-endif
-
BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
BUILDTREE = \
@@ -261,6 +248,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
echo; \
+ [ -n "$(SPEC)" ] && \
+ echo "include $(SPEC)"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
) > $@
@@ -353,12 +342,10 @@ env.sh: $(BUILDTREE_MAKE)
$(BUILDTREE_COMMENT); \
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
{ \
- echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
- echo "DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \
} | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \
echo "HOTSPOT_BUILD_USER=\"$${LOGNAME:-$$USER} in `basename $(GAMMADIR)`\""; \
- echo "export JAVA_HOME LD_LIBRARY_PATH DYLD_LIBRARY_PATH CLASSPATH HOTSPOT_BUILD_USER"; \
+ echo "export JAVA_HOME CLASSPATH HOTSPOT_BUILD_USER"; \
) > $@
env.csh: env.sh
@@ -412,7 +399,7 @@ JAVA_FLAG/32 = -d32
JAVA_FLAG/64 = -d64
WRONG_DATA_MODE_MSG = \
- echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
+ echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK."
CROSS_COMPILING_MSG = \
echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
@@ -420,20 +407,78 @@ CROSS_COMPILING_MSG = \
test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
@echo Creating $@ ...
$(QUIETLY) ( \
- echo '#!/bin/sh'; \
+ echo "#!/bin/sh"; \
+ echo ""; \
$(BUILDTREE_COMMENT); \
- echo '. ./env.sh'; \
- echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
- echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
- echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
- echo "then"; \
- echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \
+ echo ""; \
+ echo "# Include environment settings for gamma run"; \
+ echo ""; \
+ echo ". ./env.sh"; \
+ echo ""; \
+ echo "# Do not run gamma test for cross compiles"; \
+ echo ""; \
+ echo "if [ -n \"$(CROSS_COMPILE_ARCH)\" ]; then "; \
+ echo " $(CROSS_COMPILING_MSG)"; \
+ echo " exit 0"; \
echo "fi"; \
+ echo ""; \
+ echo "# Make sure JAVA_HOME is set as it is required for gamma"; \
+ echo ""; \
+ echo "if [ -z \"\$${JAVA_HOME}\" ]; then "; \
+ echo " $(NO_JAVA_HOME_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Check JAVA_HOME version to be used for the test"; \
+ echo ""; \
+ echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion > /dev/null 2>&1"; \
+ echo "if [ \$$? -ne 0 ]; then "; \
+ echo " $(WRONG_DATA_MODE_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Use gamma_g if it exists"; \
+ echo ""; \
+ echo "GAMMA_PROG=gamma"; \
+ echo "if [ -f gamma_g ]; then "; \
+ echo " GAMMA_PROG=gamma_g"; \
+ echo "fi"; \
+ echo ""; \
+ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
+ echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \
+ echo " # NOTE: gamma assumes the OpenJDK directory layout."; \
+ echo ""; \
+ echo " GAMMA_ARCH=\"\`file \$${GAMMA_PROG} | awk '{print \$$NF}'\`\""; \
+ echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/libjava.$(LIBRARY_SUFFIX)\""; \
+ echo " if [ ! -f \$${JVM_LIB} ]; then"; \
+ echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/$${LIBARCH}/libjava.$(LIBRARY_SUFFIX)\""; \
+ echo " fi"; \
+ echo " if [ ! -f \$${JVM_LIB} ] || [ -z \"\`file \$${JVM_LIB} | grep \$${GAMMA_ARCH}\`\" ]; then "; \
+ echo " $(WRONG_DATA_MODE_MSG)"; \
+ echo " exit 0"; \
+ echo " fi"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Compile Queens program for test"; \
+ echo ""; \
echo "rm -f Queens.class"; \
echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
- echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
- $(TEST_GAMMA_STATUS) \
+ echo ""; \
+ echo "# Set library path solely for gamma launcher test run"; \
+ echo ""; \
+ echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo "export LD_LIBRARY_PATH"; \
+ echo "unset LD_LIBRARY_PATH_32"; \
+ echo "unset LD_LIBRARY_PATH_64"; \
+ echo ""; \
+ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
+ echo " DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/native_threads:\$${JAVA_HOME}/jre/lib:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo " export DYLD_LIBRARY_PATH"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Use the gamma launcher and JAVA_HOME to run the test"; \
+ echo ""; \
+ echo "./\$${GAMMA_PROG} $(TESTFLAGS) Queens < /dev/null"; \
) > $@
$(QUIETLY) chmod +x $@
diff --git a/hotspot/make/bsd/makefiles/defs.make b/hotspot/make/bsd/makefiles/defs.make
index 040cd7b..1183981 100644
--- a/hotspot/make/bsd/makefiles/defs.make
+++ b/hotspot/make/bsd/makefiles/defs.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ else
endif
# zero
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
ifeq ($(ARCH_DATA_MODEL), 64)
MAKE_ARGS += LP64=1
endif
@@ -124,6 +124,18 @@ ifeq ($(ARCH), ppc)
HS_ARCH = ppc
endif
+# On 32 bit bsd we build server and client, on 64 bit just server.
+ifeq ($(JVM_VARIANTS),)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ JVM_VARIANTS:=client,server
+ JVM_VARIANT_CLIENT:=true
+ JVM_VARIANT_SERVER:=true
+ else
+ JVM_VARIANTS:=server
+ JVM_VARIANT_SERVER:=true
+ endif
+endif
+
JDK_INCLUDE_SUBDIR=bsd
# Library suffix
@@ -142,18 +154,18 @@ EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
# client and server subdirectories have symbolic links to ../libjsig.so
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+
+EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
-ifndef BUILD_CLIENT_ONLY
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
endif
-ifneq ($(ZERO_BUILD), true)
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
- endif
+ifeq ($(JVM_VARIANT_CLIENT),true)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
endif
# Serviceability Binaries
@@ -171,10 +183,39 @@ ADD_SA_BINARIES/zero =
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
-UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
-UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
-UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
+# Universal build settings
+ifeq ($(OS_VENDOR), Darwin)
+ # Build universal binaries by default on Mac OS X
+ MACOSX_UNIVERSAL = true
+ ifneq ($(ALT_MACOSX_UNIVERSAL),)
+ MACOSX_UNIVERSAL = $(ALT_MACOSX_UNIVERSAL)
+ endif
+ MAKE_ARGS += MACOSX_UNIVERSAL=$(MACOSX_UNIVERSAL)
+
+ # Universal settings
+ ifeq ($(MACOSX_UNIVERSAL), true)
+
+ # Set universal export path but avoid using ARCH or PLATFORM subdirs
+ EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
+ ifneq ($(ALT_EXPORT_PATH),)
+ EXPORT_PATH=$(ALT_EXPORT_PATH)
+ endif
+
+ # Set universal image dir
+ JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)
+ ifneq ($(ALT_JDK_IMAGE_DIR),)
+ JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
+ endif
-UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
-UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
-UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
+ # Binaries to 'universalize' if built
+ UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libjsig.$(LIBRARY_SUFFIX)
+ UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/libsaproc.$(LIBRARY_SUFFIX)
+ UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/server/libjvm.$(LIBRARY_SUFFIX)
+ UNIVERSAL_LIPO_LIST += $(EXPORT_JRE_LIB_DIR)/client/libjvm.$(LIBRARY_SUFFIX)
+
+ # Files to simply copy in place
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/server/Xusage.txt
+ UNIVERSAL_COPY_LIST += $(EXPORT_JRE_LIB_DIR)/client/Xusage.txt
+
+ endif
+endif
diff --git a/hotspot/make/bsd/makefiles/dtrace.make b/hotspot/make/bsd/makefiles/dtrace.make
index 77e9c2f..1f5d956 100644
--- a/hotspot/make/bsd/makefiles/dtrace.make
+++ b/hotspot/make/bsd/makefiles/dtrace.make
@@ -105,11 +105,11 @@ LFLAGS_GENOFFS += -L.
lib$(GENOFFS).dylib: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \
$(LIBJVM.o)
- $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
+ $(QUIETLY) $(CXX) $(CXXFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -ljvm
$(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).dylib
- $(QUIETLY) $(LINK.CC) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
+ $(QUIETLY) $(LINK.CXX) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
./lib$(GENOFFS).dylib
# $@.tmp is created first to avoid an empty $(JVMOFFS).h if an error occurs.
@@ -135,7 +135,7 @@ $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
fi
$(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
- $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
+ $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
$(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
@echo Making $@
diff --git a/hotspot/make/bsd/makefiles/gcc.make b/hotspot/make/bsd/makefiles/gcc.make
index c54433e..938da94 100644
--- a/hotspot/make/bsd/makefiles/gcc.make
+++ b/hotspot/make/bsd/makefiles/gcc.make
@@ -25,57 +25,59 @@
OS_VENDOR = $(shell uname -s)
#------------------------------------------------------------------------
-# CC, CPP & AS
-
-# When cross-compiling the ALT_COMPILER_PATH points
-# to the cross-compilation toolset
-ifdef CROSS_COMPILE_ARCH
- CPP = $(ALT_COMPILER_PATH)/g++
- CC = $(ALT_COMPILER_PATH)/gcc
- HOSTCPP = g++
- HOSTCC = gcc
-else ifneq ($(OS_VENDOR), Darwin)
- CXX = g++
- CPP = $(CXX)
- CC = gcc
- HOSTCPP = $(CPP)
- HOSTCC = $(CC)
-endif
-
-# i486 hotspot requires -mstackrealign on Darwin.
-# llvm-gcc supports this in Xcode 3.2.6 and 4.0.
-# gcc-4.0 supports this on earlier versions.
-# Prefer llvm-gcc where available.
-ifeq ($(OS_VENDOR), Darwin)
- ifeq ($(origin CXX), default)
- CXX = llvm-g++
+# CC, CXX & AS
+
+# If a SPEC is not set already, then use these defaults.
+ifeq ($(SPEC),)
+ # When cross-compiling the ALT_COMPILER_PATH points
+ # to the cross-compilation toolset
+ ifdef CROSS_COMPILE_ARCH
+ CXX = $(ALT_COMPILER_PATH)/g++
+ CC = $(ALT_COMPILER_PATH)/gcc
+ HOSTCXX = g++
+ HOSTCC = gcc
+ else ifneq ($(OS_VENDOR), Darwin)
+ CXX = g++
+ CC = gcc
+ HOSTCXX = $(CXX)
+ HOSTCC = $(CC)
endif
- ifeq ($(origin CC), default)
- CC = llvm-gcc
- endif
- CPP = $(CXX)
-
- ifeq ($(ARCH), i486)
- LLVM_SUPPORTS_STACKREALIGN := $(shell \
- [ "0"`llvm-gcc -v 2>&1 | grep LLVM | sed -E "s/.*LLVM build ([0-9]+).*/\1/"` -gt "2333" ] \
- && echo true || echo false)
-
- ifeq ($(LLVM_SUPPORTS_STACKREALIGN), true)
- CXX32 ?= llvm-g++
- CC32 ?= llvm-gcc
- else
- CXX32 ?= g++-4.0
- CC32 ?= gcc-4.0
- endif
- CPP = $(CXX32)
- CC = $(CC32)
+
+ # i486 hotspot requires -mstackrealign on Darwin.
+ # llvm-gcc supports this in Xcode 3.2.6 and 4.0.
+ # gcc-4.0 supports this on earlier versions.
+ # Prefer llvm-gcc where available.
+ ifeq ($(OS_VENDOR), Darwin)
+ ifeq ($(origin CXX), default)
+ CXX = llvm-g++
+ endif
+ ifeq ($(origin CC), default)
+ CC = llvm-gcc
+ endif
+
+ ifeq ($(ARCH), i486)
+ LLVM_SUPPORTS_STACKREALIGN := $(shell \
+ [ "0"`llvm-gcc -v 2>&1 | grep LLVM | sed -E "s/.*LLVM build ([0-9]+).*/\1/"` -gt "2333" ] \
+ && echo true || echo false)
+
+ ifeq ($(LLVM_SUPPORTS_STACKREALIGN), true)
+ CXX32 ?= llvm-g++
+ CC32 ?= llvm-gcc
+ else
+ CXX32 ?= g++-4.0
+ CC32 ?= gcc-4.0
+ endif
+ CXX = $(CXX32)
+ CC = $(CC32)
+ endif
+
+ HOSTCXX = $(CXX)
+ HOSTCC = $(CC)
endif
- HOSTCPP = $(CPP)
- HOSTCC = $(CC)
+ AS = $(CC) -c -x assembler-with-cpp
endif
-AS = $(CC) -c -x assembler-with-cpp
# -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
# prints the numbers (e.g. "2.95", "3.2.1")
@@ -103,11 +105,12 @@ VM_PICFLAG/LIBJVM = $(PICFLAG)
VM_PICFLAG/AOUT =
VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-ifeq ($(ZERO_BUILD), true)
-CFLAGS += $(LIBFFI_CFLAGS)
+ifeq ($(JVM_VARIANT_ZERO), true)
+ CFLAGS += $(LIBFFI_CFLAGS)
endif
-ifeq ($(SHARK_BUILD), true)
-CFLAGS += $(LLVM_CFLAGS)
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+ CFLAGS += $(LIBFFI_CFLAGS)
+ CFLAGS += $(LLVM_CFLAGS)
endif
CFLAGS += $(VM_PICFLAG)
CFLAGS += -fno-rtti
diff --git a/hotspot/make/bsd/makefiles/launcher.make b/hotspot/make/bsd/makefiles/launcher.make
index b405fbc..c78d551 100644
--- a/hotspot/make/bsd/makefiles/launcher.make
+++ b/hotspot/make/bsd/makefiles/launcher.make
@@ -50,14 +50,31 @@ ifeq ($(LINK_INTO),AOUT)
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
LAUNCHER.o = launcher.o
- LFLAGS_LAUNCHER += -L`pwd`
+ LFLAGS_LAUNCHER += -L`pwd`
+
+ # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a
+ # freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting
+ # the library searchpath using ({DY}LD_LIBRARY_PATH) to find the local JVM
+ # first. Gamma dlopen()s libjava from $JAVA_HOME/jre/lib{/$arch}, which is
+ # statically linked with CoreFoundation framework libs. Unfortunately, gamma's
+ # unique searchpath results in some unresolved symbols in the framework
+ # libraries, because JDK libraries are inadvertently discovered first on the
+ # searchpath, e.g. libjpeg. On Mac OS X, filenames are case *insensitive*.
+ # So, the actual filename collision is libjpeg.dylib and libJPEG.dylib.
+ # To resolve this, gamma needs to also statically link with the CoreFoundation
+ # framework libraries.
+
+ ifeq ($(OS_VENDOR),Darwin)
+ LFLAGS_LAUNCHER += -framework CoreFoundation
+ endif
+
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
-LINK_LAUNCHER = $(LINK.c)
+LINK_LAUNCHER = $(LINK.CC)
-LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK)
-LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
+LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK)
+LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK)
LAUNCHER_OUT = launcher
@@ -73,11 +90,11 @@ DEPFILES := $(patsubst %.o,%.d,$(OBJS))
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
$(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
$(QUIETLY) echo Linking launcher...
diff --git a/hotspot/make/bsd/makefiles/product.make b/hotspot/make/bsd/makefiles/product.make
index 1b8acbb..6edcef5 100644
--- a/hotspot/make/bsd/makefiles/product.make
+++ b/hotspot/make/bsd/makefiles/product.make
@@ -55,4 +55,4 @@ STRIP_LIBJVM = $(STRIP) -g $@ || exit 1;
STRIP_AOUT = $(STRIP) -x $@ || exit 1;
# Don't strip in VM build; JDK build will strip libraries later
-# LINK_LIB.CC/POST_HOOK += $(STRIP_$(LINK_INTO))
+# LINK_LIB.CXX/POST_HOOK += $(STRIP_$(LINK_INTO))
diff --git a/hotspot/make/bsd/makefiles/rules.make b/hotspot/make/bsd/makefiles/rules.make
index 12eafe8..a1e4c34 100644
--- a/hotspot/make/bsd/makefiles/rules.make
+++ b/hotspot/make/bsd/makefiles/rules.make
@@ -27,52 +27,39 @@
# Tell make that .cpp is important
.SUFFIXES: .cpp $(SUFFIXES)
-# For now. Other makefiles use CPP as the c++ compiler, but that should really
-# name the preprocessor.
-ifeq ($(CCC),)
-CCC = $(CPP)
-endif
-
DEMANGLER = c++filt
DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
-# $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
-C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
-CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
+# $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++).
+CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS)
+CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
AS.S = $(AS) $(ASFLAGS)
-COMPILE.c = $(C_COMPILE) -c
-GENASM.c = $(C_COMPILE) -S
-LINK.c = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
-LINK_LIB.c = $(CC) $(LFLAGS) $(SHARED_FLAG)
-PREPROCESS.c = $(C_COMPILE) -E
+COMPILE.CC = $(CC_COMPILE) -c
+GENASM.CC = $(CC_COMPILE) -S
+LINK.CC = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
+LINK_LIB.CC = $(CC) $(LFLAGS) $(SHARED_FLAG)
+PREPROCESS.CC = $(CC_COMPILE) -E
-COMPILE.CC = $(CC_COMPILE) -c
-GENASM.CC = $(CC_COMPILE) -S
-LINK.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
-LINK_NOPROF.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS)
-LINK_LIB.CC = $(CCC) $(LFLAGS) $(SHARED_FLAG)
-PREPROCESS.CC = $(CC_COMPILE) -E
+COMPILE.CXX = $(CXX_COMPILE) -c
+GENASM.CXX = $(CXX_COMPILE) -S
+LINK.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
+LINK_NOPROF.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS)
+LINK_LIB.CXX = $(CXX) $(LFLAGS) $(SHARED_FLAG)
+PREPROCESS.CXX = $(CXX_COMPILE) -E
# cross compiling the jvm with c2 requires host compilers to build
# adlc tool
-HOST.CC_COMPILE = $(HOSTCPP) $(CPPFLAGS) $(CFLAGS)
-HOST.COMPILE.CC = $(HOST.CC_COMPILE) -c
-HOST.LINK_NOPROF.CC = $(HOSTCPP) $(LFLAGS) $(AOUT_FLAGS)
+HOST.CXX_COMPILE = $(HOSTCXX) $(CXXFLAGS) $(CFLAGS)
+HOST.COMPILE.CXX = $(HOST.CXX_COMPILE) -c
+HOST.LINK_NOPROF.CXX = $(HOSTCXX) $(LFLAGS) $(AOUT_FLAGS)
# Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k".
REMOVE_TARGET = rm -f $@
-# Synonyms.
-COMPILE.cpp = $(COMPILE.CC)
-GENASM.cpp = $(GENASM.CC)
-LINK.cpp = $(LINK.CC)
-LINK_LIB.cpp = $(LINK_LIB.CC)
-PREPROCESS.cpp = $(PREPROCESS.CC)
-
# Note use of ALT_BOOTDIR to explicitly specify location of java and
# javac; this is the same environment variable used in the J2SE build
# process for overriding the default spec, which is BOOTDIR.
@@ -161,14 +148,14 @@ ifdef LP64
%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
else
%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
- $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
- $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
+ $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
+ $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
endif
%.o: %.s
@@ -178,13 +165,13 @@ endif
%.s: %.cpp
@echo Generating assembly for $<
- $(QUIETLY) $(GENASM.CC) -o $@ $<
+ $(QUIETLY) $(GENASM.CXX) -o $@ $<
$(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
# Intermediate files (for debugging macros)
%.i: %.cpp
@echo Preprocessing $< to $@
- $(QUIETLY) $(PREPROCESS.CC) $< > $@ $(COMPILE_DONE)
+ $(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
# Override gnumake built-in rules which do sccs get operations badly.
# (They put the checked out code in the current directory, not in the
diff --git a/hotspot/make/bsd/makefiles/sa.make b/hotspot/make/bsd/makefiles/sa.make
index b7bb477..cd6c210 100644
--- a/hotspot/make/bsd/makefiles/sa.make
+++ b/hotspot/make/bsd/makefiles/sa.make
@@ -50,6 +50,12 @@ ifeq ($(ALT_SA_CLASSPATH),)
# are in the regular classes.jar file.
APPLE_JAR=$(BOOT_JAVA_HOME)/bundle/Classes/classes.jar
SA_CLASSPATH=$(shell test -f $(APPLE_JAR) && echo $(APPLE_JAR))
+ # if above file doesn't exist, use the openjdk version
+ ifeq ($(SA_CLASSPATH),)
+ # MMM Doesn't matter if in modules case the file doesn't exist
+ # some path needs to be set.
+ SA_CLASSPATH=$(BOOT_JAVA_HOME)/lib/sa-jdi.jar
+ endif
endif
endif
else
diff --git a/hotspot/make/bsd/makefiles/sparcWorks.make b/hotspot/make/bsd/makefiles/sparcWorks.make
index 6e6c841..c87f504 100644
--- a/hotspot/make/bsd/makefiles/sparcWorks.make
+++ b/hotspot/make/bsd/makefiles/sparcWorks.make
@@ -23,14 +23,17 @@
#
#------------------------------------------------------------------------
-# CC, CPP & AS
+# CC, CXX & AS
-CPP = CC
-CC = cc
-AS = $(CC) -c
+# If a SPEC is not set already, then use these defaults.
+ifeq ($(SPEC),)
+ CXX = CC
+ CC = cc
+ AS = $(CC) -c
-HOSTCPP = $(CPP)
-HOSTCC = $(CC)
+ HOSTCXX = $(CXX)
+ HOSTCC = $(CC)
+endif
ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
ARCHFLAG/i486 = -m32
diff --git a/hotspot/make/bsd/makefiles/top.make b/hotspot/make/bsd/makefiles/top.make
index 7b237c4..934e5d1 100644
--- a/hotspot/make/bsd/makefiles/top.make
+++ b/hotspot/make/bsd/makefiles/top.make
@@ -124,8 +124,8 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
@$(UpdatePCH)
@$(MAKE) -f vm.make $(MFLAGS-adjusted)
-install: the_vm
- @$(MAKE) -f vm.make install
+install gamma: the_vm
+ @$(MAKE) -f vm.make $@
# next rules support "make foo.[ois]"
diff --git a/hotspot/make/bsd/makefiles/vm.make b/hotspot/make/bsd/makefiles/vm.make
index 0fad063..f423408 100644
--- a/hotspot/make/bsd/makefiles/vm.make
+++ b/hotspot/make/bsd/makefiles/vm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ DEP_DIR = $(GENERATED)/dependencies
-include $(DEP_DIR)/*.d
# read machine-specific adjustments (%%% should do this via buildtree.make?)
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
include $(MAKEFILES_DIR)/zeroshark.make
else
include $(MAKEFILES_DIR)/$(BUILDARCH).make
@@ -82,18 +82,22 @@ BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
-CPPFLAGS = \
+CXXFLAGS = \
${SYSDEFS} \
${INCLUDES} \
${BUILD_VERSION} \
${BUILD_TARGET} \
${BUILD_USER} \
${HS_LIB_ARCH} \
- ${JRE_VERSION} \
${VM_DISTRO}
+# This is VERY important! The version define must only be supplied to vm_version.o
+# If not, ccache will not re-use the cache at all, since the version string might contain
+# a time and date.
+vm_version.o: CXXFLAGS += ${JRE_VERSION}
+
ifdef DEFAULT_LIBPATH
-CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
+CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
endif
ifndef JAVASE_EMBEDDED
@@ -260,19 +264,19 @@ else
ifeq ($(STATIC_CXX), true)
LFLAGS_VM += $(STATIC_LIBGCC)
LIBS_VM += $(STATIC_STDCXX)
- LINK_VM = $(LINK_LIB.c)
- else
LINK_VM = $(LINK_LIB.CC)
+ else
+ LINK_VM = $(LINK_LIB.CXX)
endif
LIBS_VM += $(LIBS)
endif
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(JVM_VARIANT_ZERO), true)
LIBS_VM += $(LIBFFI_LIBS)
endif
-ifeq ($(SHARK_BUILD), true)
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+ LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
LFLAGS_VM += $(LLVM_LDFLAGS)
- LIBS_VM += $(LLVM_LIBS)
endif
@@ -280,7 +284,7 @@ endif
$(PRECOMPILED_HEADER):
$(QUIETLY) echo Generating precompiled header $@
$(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
- $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
+ $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
# making the library:
@@ -305,10 +309,10 @@ endif
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
$(QUIETLY) { \
echo Linking vm...; \
- $(LINK_LIB.CC/PRE_HOOK) \
+ $(LINK_LIB.CXX/PRE_HOOK) \
$(LINK_VM) $(LD_SCRIPT_FLAG) \
$(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
- $(LINK_LIB.CC/POST_HOOK) \
+ $(LINK_LIB.CXX/POST_HOOK) \
rm -f $@.1; ln -s $@ $@.1; \
[ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
}
@@ -331,17 +335,20 @@ include $(MAKEFILES_DIR)/jsig.make
# Serviceability agent
include $(MAKEFILES_DIR)/saproc.make
+# Whitebox testing API
+include $(MAKEFILES_DIR)/wb.make
+
#----------------------------------------------------------------------
ifeq ($(OS_VENDOR), Darwin)
$(LIBJVM).dSYM: $(LIBJVM)
dsymutil $(LIBJVM)
-# no launcher or libjvm_db for macosx
-build: $(LIBJVM) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM
+# no libjvm_db for macosx
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(BUILDLIBSAPROC) dtraceCheck $(LIBJVM).dSYM $(WB_JAR)
echo "Doing vm.make build:"
else
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(WB_JAR)
endif
install: install_jvm install_jsig install_saproc
diff --git a/hotspot/make/defs.make b/hotspot/make/defs.make
index 3a355c7..b632ded 100644
--- a/hotspot/make/defs.make
+++ b/hotspot/make/defs.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,11 @@
# The common definitions for hotspot builds.
+# Optionally include SPEC file generated by configure.
+ifneq ($(SPEC),)
+ include $(SPEC)
+endif
+
# Default to verbose build logs (show all compile lines):
MAKE_VERBOSE=y
@@ -50,6 +55,27 @@ define prep-target
@$(RM) $@
endef
+# Default values for JVM_VARIANT* variables if configure hasn't set
+# it already.
+ifeq ($(JVM_VARIANTS),)
+ ifeq ($(ZERO_BUILD), true)
+ ifeq ($(SHARK_BUILD), true)
+ JVM_VARIANTS:=zeroshark
+ JVM_VARIANT_ZEROSHARK:=true
+ else
+ JVM_VARIANTS:=zero
+ JVM_VARIANT_ZERO:=true
+ endif
+ else
+ # A default is needed
+ ifeq ($(BUILD_CLIENT_ONLY), true)
+ JVM_VARIANTS:=client
+ JVM_VARIANT_CLIENT:=true
+ endif
+ # Further defaults are platform and arch specific
+ endif
+endif
+
# Directory paths and user name
# Unless GAMMADIR is set on the command line, search upward from
# the current directory for a parent directory containing "src/share/vm".
@@ -185,6 +211,18 @@ ifneq ($(ALT_BOOTDIR),)
BOOTDIR=$(ALT_BOOTDIR)
endif
+# Select name of the export directory and honor ALT overrides
+EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
+ifneq ($(ALT_EXPORT_PATH),)
+ EXPORT_PATH=$(ALT_EXPORT_PATH)
+endif
+
+# Default jdk image if one is created for you with create_jdk
+JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
+ifneq ($(ALT_JDK_IMAGE_DIR),)
+ JDK_IMAGE_DIR=$(ALT_JDK_IMAGE_DIR)
+endif
+
# The platform dependent defs.make defines platform specific variable such
# as ARCH, EXPORT_LIST etc. We must place the include here after BOOTDIR is defined.
include $(GAMMADIR)/make/$(OSNAME)/makefiles/defs.make
@@ -263,15 +301,6 @@ MAKE_ARGS += JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
# includes this make/defs.make file.
MAKE_ARGS += HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION)
-# Select name of export directory
-EXPORT_PATH=$(OUTPUTDIR)/export-$(PLATFORM)$(EXPORT_SUBDIR)
-ifneq ($(ALT_EXPORT_PATH),)
- EXPORT_PATH=$(ALT_EXPORT_PATH)
-endif
-
-# Default jdk image if one is created for you with create_jdk
-JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-$(PLATFORM)
-
# Various export sub directories
EXPORT_INCLUDE_DIR = $(EXPORT_PATH)/include
EXPORT_DOCS_DIR = $(EXPORT_PATH)/docs
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index 82956ba..cc92c18 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -33,9 +33,9 @@
# Don't put quotes (fail windows build).
HOTSPOT_VM_COPYRIGHT=Copyright 2011
-HS_MAJOR_VER=23
+HS_MAJOR_VER=24
HS_MINOR_VER=0
-HS_BUILD_NUMBER=11
+HS_BUILD_NUMBER=05
JDK_MAJOR_VER=1
JDK_MINOR_VER=8
diff --git a/hotspot/make/jprt.properties b/hotspot/make/jprt.properties
index aac31d0..0e00922 100644
--- a/hotspot/make/jprt.properties
+++ b/hotspot/make/jprt.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,9 @@ jprt.need.sibling.build=false
# This tells jprt what default release we want to build
-jprt.tools.default.release=${jprt.submit.release}
+jprt.hotspot.default.release=jdk7
+
+jprt.tools.default.release=${jprt.submit.option.release?${jprt.submit.option.release}:${jprt.hotspot.default.release}}
# Disable syncing the source after builds and tests are done.
@@ -52,154 +54,72 @@ jprt.sync.push=false
# Define the Solaris platforms we want for the various releases
jprt.my.solaris.sparc.jdk8=solaris_sparc_5.10
jprt.my.solaris.sparc.jdk7=solaris_sparc_5.10
-jprt.my.solaris.sparc.jdk7b107=solaris_sparc_5.10
-jprt.my.solaris.sparc.jdk7temp=solaris_sparc_5.10
-jprt.my.solaris.sparc.jdk6=solaris_sparc_5.8
-jprt.my.solaris.sparc.jdk6perf=solaris_sparc_5.8
-jprt.my.solaris.sparc.jdk6u10=solaris_sparc_5.8
-jprt.my.solaris.sparc.jdk6u14=solaris_sparc_5.8
-jprt.my.solaris.sparc.jdk6u18=solaris_sparc_5.8
-jprt.my.solaris.sparc.jdk6u20=solaris_sparc_5.8
-jprt.my.solaris.sparc.ejdk7=${jprt.my.solaris.sparc.jdk7}
-jprt.my.solaris.sparc.ejdk6=${jprt.my.solaris.sparc.jdk6}
+jprt.my.solaris.sparc.jdk7u4=${jprt.my.solaris.sparc.jdk7}
jprt.my.solaris.sparc=${jprt.my.solaris.sparc.${jprt.tools.default.release}}
jprt.my.solaris.sparcv9.jdk8=solaris_sparcv9_5.10
jprt.my.solaris.sparcv9.jdk7=solaris_sparcv9_5.10
-jprt.my.solaris.sparcv9.jdk7b107=solaris_sparcv9_5.10
-jprt.my.solaris.sparcv9.jdk7temp=solaris_sparcv9_5.10
-jprt.my.solaris.sparcv9.jdk6=solaris_sparcv9_5.8
-jprt.my.solaris.sparcv9.jdk6perf=solaris_sparcv9_5.8
-jprt.my.solaris.sparcv9.jdk6u10=solaris_sparcv9_5.8
-jprt.my.solaris.sparcv9.jdk6u14=solaris_sparcv9_5.8
-jprt.my.solaris.sparcv9.jdk6u18=solaris_sparcv9_5.8
-jprt.my.solaris.sparcv9.jdk6u20=solaris_sparcv9_5.8
-jprt.my.solaris.sparcv9.ejdk7=${jprt.my.solaris.sparcv9.jdk7}
-jprt.my.solaris.sparcv9.ejdk6=${jprt.my.solaris.sparcv9.jdk6}
+jprt.my.solaris.sparcv9.jdk7u4=${jprt.my.solaris.sparcv9.jdk7}
jprt.my.solaris.sparcv9=${jprt.my.solaris.sparcv9.${jprt.tools.default.release}}
jprt.my.solaris.i586.jdk8=solaris_i586_5.10
jprt.my.solaris.i586.jdk7=solaris_i586_5.10
-jprt.my.solaris.i586.jdk7b107=solaris_i586_5.10
-jprt.my.solaris.i586.jdk7temp=solaris_i586_5.10
-jprt.my.solaris.i586.jdk6=solaris_i586_5.8
-jprt.my.solaris.i586.jdk6perf=solaris_i586_5.8
-jprt.my.solaris.i586.jdk6u10=solaris_i586_5.8
-jprt.my.solaris.i586.jdk6u14=solaris_i586_5.8
-jprt.my.solaris.i586.jdk6u18=solaris_i586_5.8
-jprt.my.solaris.i586.jdk6u20=solaris_i586_5.8
-jprt.my.solaris.i586.ejdk7=${jprt.my.solaris.i586.jdk7}
-jprt.my.solaris.i586.ejdk6=${jprt.my.solaris.i586.jdk6}
+jprt.my.solaris.i586.jdk7u4=${jprt.my.solaris.i586.jdk7}
jprt.my.solaris.i586=${jprt.my.solaris.i586.${jprt.tools.default.release}}
jprt.my.solaris.x64.jdk8=solaris_x64_5.10
jprt.my.solaris.x64.jdk7=solaris_x64_5.10
-jprt.my.solaris.x64.jdk7b107=solaris_x64_5.10
-jprt.my.solaris.x64.jdk7temp=solaris_x64_5.10
-jprt.my.solaris.x64.jdk6=solaris_x64_5.10
-jprt.my.solaris.x64.jdk6perf=solaris_x64_5.10
-jprt.my.solaris.x64.jdk6u10=solaris_x64_5.10
-jprt.my.solaris.x64.jdk6u14=solaris_x64_5.10
-jprt.my.solaris.x64.jdk6u18=solaris_x64_5.10
-jprt.my.solaris.x64.jdk6u20=solaris_x64_5.10
-jprt.my.solaris.x64.ejdk7=${jprt.my.solaris.x64.jdk7}
-jprt.my.solaris.x64.ejdk6=${jprt.my.solaris.x64.jdk6}
+jprt.my.solaris.x64.jdk7u4=${jprt.my.solaris.x64.jdk7}
jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}}
jprt.my.linux.i586.jdk8=linux_i586_2.6
jprt.my.linux.i586.jdk7=linux_i586_2.6
-jprt.my.linux.i586.jdk7b107=linux_i586_2.6
-jprt.my.linux.i586.jdk7temp=linux_i586_2.6
-jprt.my.linux.i586.jdk6=linux_i586_2.4
-jprt.my.linux.i586.jdk6perf=linux_i586_2.4
-jprt.my.linux.i586.jdk6u10=linux_i586_2.4
-jprt.my.linux.i586.jdk6u14=linux_i586_2.4
-jprt.my.linux.i586.jdk6u18=linux_i586_2.4
-jprt.my.linux.i586.jdk6u20=linux_i586_2.4
-jprt.my.linux.i586.ejdk7=linux_i586_2.6
-jprt.my.linux.i586.ejdk6=linux_i586_2.6
+jprt.my.linux.i586.jdk7u4=${jprt.my.linux.i586.jdk7}
jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}}
jprt.my.linux.x64.jdk8=linux_x64_2.6
jprt.my.linux.x64.jdk7=linux_x64_2.6
-jprt.my.linux.x64.jdk7b107=linux_x64_2.6
-jprt.my.linux.x64.jdk7temp=linux_x64_2.6
-jprt.my.linux.x64.jdk6=linux_x64_2.4
-jprt.my.linux.x64.jdk6perf=linux_x64_2.4
-jprt.my.linux.x64.jdk6u10=linux_x64_2.4
-jprt.my.linux.x64.jdk6u14=linux_x64_2.4
-jprt.my.linux.x64.jdk6u18=linux_x64_2.4
-jprt.my.linux.x64.jdk6u20=linux_x64_2.4
-jprt.my.linux.x64.ejdk7=${jprt.my.linux.x64.jdk7}
-jprt.my.linux.x64.ejdk6=${jprt.my.linux.x64.jdk6}
+jprt.my.linux.x64.jdk7u4=${jprt.my.linux.x64.jdk7}
jprt.my.linux.x64=${jprt.my.linux.x64.${jprt.tools.default.release}}
jprt.my.linux.ppc.jdk8=linux_ppc_2.6
jprt.my.linux.ppc.jdk7=linux_ppc_2.6
-jprt.my.linux.ppc.jdk7b107=linux_ppc_2.6
-jprt.my.linux.ppc.jdk7temp=linux_ppc_2.6
-jprt.my.linux.ppc.ejdk6=linux_ppc_2.6
-jprt.my.linux.ppc.ejdk7=linux_ppc_2.6
+jprt.my.linux.ppc.jdk7u4=${jprt.my.linux.ppc.jdk7}
jprt.my.linux.ppc=${jprt.my.linux.ppc.${jprt.tools.default.release}}
jprt.my.linux.ppcv2.jdk8=linux_ppcv2_2.6
jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
-jprt.my.linux.ppcv2.jdk7b107=linux_ppcv2_2.6
-jprt.my.linux.ppcv2.jdk7temp=linux_ppcv2_2.6
-jprt.my.linux.ppcv2.ejdk6=linux_ppcv2_2.6
-jprt.my.linux.ppcv2.ejdk7=linux_ppcv2_2.6
+jprt.my.linux.ppcv2.jdk7u4=${jprt.my.linux.ppcv2.jdk7}
jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6
jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
-jprt.my.linux.ppcsflt.jdk7b107=linux_ppcsflt_2.6
-jprt.my.linux.ppcsflt.jdk7temp=linux_ppcsflt_2.6
-jprt.my.linux.ppcsflt.ejdk6=linux_ppcsflt_2.6
-jprt.my.linux.ppcsflt.ejdk7=linux_ppcsflt_2.6
+jprt.my.linux.ppcsflt.jdk7u4=${jprt.my.linux.ppcsflt.jdk7}
jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
-jprt.my.linux.armvfp.jdk7b107=linux_armvfp_2.6
-jprt.my.linux.armvfp.jdk7temp=linux_armvfp_2.6
-jprt.my.linux.armvfp.ejdk6=linux_armvfp_2.6
-jprt.my.linux.armvfp.ejdk7=linux_armvfp_2.6
+jprt.my.linux.armvfp.jdk7u4=${jprt.my.linux.armvfp.jdk7}
jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
-jprt.my.linux.armsflt.jdk7b107=linux_armsflt_2.6
-jprt.my.linux.armsflt.jdk7temp=linux_armsflt_2.6
-jprt.my.linux.armsflt.ejdk6=linux_armsflt_2.6
-jprt.my.linux.armsflt.ejdk7=linux_armsflt_2.6
+jprt.my.linux.armsflt.jdk7u4=${jprt.my.linux.armsflt.jdk7}
jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
+jprt.my.macosx.x64.jdk8=macosx_x64_10.7
+jprt.my.macosx.x64.jdk7=macosx_x64_10.7
+jprt.my.macosx.x64.jdk7u4=${jprt.my.macosx.x64.jdk7}
+jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}}
+
jprt.my.windows.i586.jdk8=windows_i586_5.1
jprt.my.windows.i586.jdk7=windows_i586_5.1
-jprt.my.windows.i586.jdk7b107=windows_i586_5.0
-jprt.my.windows.i586.jdk7temp=windows_i586_5.0
-jprt.my.windows.i586.jdk6=windows_i586_5.0
-jprt.my.windows.i586.jdk6perf=windows_i586_5.0
-jprt.my.windows.i586.jdk6u10=windows_i586_5.0
-jprt.my.windows.i586.jdk6u14=windows_i586_5.0
-jprt.my.windows.i586.jdk6u18=windows_i586_5.0
-jprt.my.windows.i586.jdk6u20=windows_i586_5.0
-jprt.my.windows.i586.ejdk7=${jprt.my.windows.i586.jdk7}
-jprt.my.windows.i586.ejdk6=${jprt.my.windows.i586.jdk6}
+jprt.my.windows.i586.jdk7u4=${jprt.my.windows.i586.jdk7}
jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
jprt.my.windows.x64.jdk8=windows_x64_5.2
jprt.my.windows.x64.jdk7=windows_x64_5.2
-jprt.my.windows.x64.jdk7b107=windows_x64_5.2
-jprt.my.windows.x64.jdk7temp=windows_x64_5.2
-jprt.my.windows.x64.jdk6=windows_x64_5.2
-jprt.my.windows.x64.jdk6perf=windows_x64_5.2
-jprt.my.windows.x64.jdk6u10=windows_x64_5.2
-jprt.my.windows.x64.jdk6u14=windows_x64_5.2
-jprt.my.windows.x64.jdk6u18=windows_x64_5.2
-jprt.my.windows.x64.jdk6u20=windows_x64_5.2
-jprt.my.windows.x64.ejdk7=${jprt.my.windows.x64.jdk7}
-jprt.my.windows.x64.ejdk6=${jprt.my.windows.x64.jdk6}
+jprt.my.windows.x64.jdk7u4=${jprt.my.windows.x64.jdk7}
jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}
# Standard list of jprt build targets for this source tree
@@ -211,6 +131,7 @@ jprt.build.targets.standard= \
${jprt.my.solaris.x64}-{product|fastdebug|debug}, \
${jprt.my.linux.i586}-{product|fastdebug|debug}, \
${jprt.my.linux.x64}-{product|fastdebug}, \
+ ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \
${jprt.my.windows.i586}-{product|fastdebug|debug}, \
${jprt.my.windows.x64}-{product|fastdebug|debug}
@@ -232,16 +153,7 @@ jprt.build.targets.all=${jprt.build.targets.standard}, \
jprt.build.targets.jdk8=${jprt.build.targets.all}
jprt.build.targets.jdk7=${jprt.build.targets.all}
-jprt.build.targets.jdk7temp=${jprt.build.targets.all}
-jprt.build.targets.jdk7b107=${jprt.build.targets.all}
-jprt.build.targets.jdk6=${jprt.build.targets.standard}
-jprt.build.targets.jdk6perf=${jprt.build.targets.standard}
-jprt.build.targets.jdk6u10=${jprt.build.targets.standard}
-jprt.build.targets.jdk6u14=${jprt.build.targets.standard}
-jprt.build.targets.jdk6u18=${jprt.build.targets.standard}
-jprt.build.targets.jdk6u20=${jprt.build.targets.standard}
-jprt.build.targets.ejdk6=${jprt.build.targets.all}
-jprt.build.targets.ejdk7=${jprt.build.targets.all}
+jprt.build.targets.jdk7u4=${jprt.build.targets.all}
jprt.build.targets=${jprt.build.targets.${jprt.tools.default.release}}
# Subset lists of test targets for this source tree
@@ -416,6 +328,30 @@ jprt.my.linux.x64.test.targets = \
${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_G1, \
${jprt.my.linux.x64}-{product|fastdebug}-c2-jbb_ParOldGC
+jprt.my.macosx.x64.test.targets = \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jvm98_nontiered, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-scimark, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_default, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParNewGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_CMS, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_G1, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_default, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_SerialGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParallelGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParNewGC, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_CMS, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_G1, \
+ ${jprt.my.macosx.x64}-{product|fastdebug}-c2-GCOld_ParOldGC
+# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default, \
+# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_default_tiered, \
+# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParallelGC, \
+# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_G1, \
+# ${jprt.my.macosx.x64}-{product|fastdebug}-c2-jbb_ParOldGC
+
jprt.my.windows.i586.test.targets = \
${jprt.my.windows.i586}-{product|fastdebug}-{c1|c2}-jvm98, \
${jprt.my.windows.i586}-{product|fastdebug}-c2-jvm98_nontiered, \
@@ -492,6 +428,7 @@ jprt.test.targets.standard = \
${jprt.my.solaris.x64.test.targets}, \
${jprt.my.linux.i586.test.targets}, \
${jprt.my.linux.x64.test.targets}, \
+ ${jprt.my.macosx.x64.test.targets}, \
${jprt.my.windows.i586.test.targets}, \
${jprt.my.windows.x64.test.targets}, \
${jprt.test.targets.open}
@@ -509,16 +446,6 @@ jprt.test.targets.embedded= \
jprt.test.targets.jdk8=${jprt.test.targets.standard}
jprt.test.targets.jdk7=${jprt.test.targets.standard}
-jprt.test.targets.jdk7temp=${jprt.test.targets.standard}
-jprt.test.targets.jdk7b105=${jprt.test.targets.standard}
-jprt.test.targets.jdk6=${jprt.test.targets.standard}
-jprt.test.targets.jdk6perf=${jprt.test.targets.standard}
-jprt.test.targets.jdk6u10=${jprt.test.targets.standard}
-jprt.test.targets.jdk6u14=${jprt.test.targets.standard}
-jprt.test.targets.jdk6u18=${jprt.test.targets.standard}
-jprt.test.targets.jdk6u20=${jprt.test.targets.standard}
-jprt.test.targets.ejdk6=${jprt.test.targets.embedded}
-jprt.test.targets.ejdk7=${jprt.test.targets.embedded}
jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}}
# The default test/Makefile targets that should be run
@@ -538,6 +465,7 @@ jprt.make.rule.test.targets.standard.server = \
${jprt.my.solaris.x64}-*-c2-servertest, \
${jprt.my.linux.i586}-*-c2-servertest, \
${jprt.my.linux.x64}-*-c2-servertest, \
+ ${jprt.my.macosx.x64}-*-c2-servertest, \
${jprt.my.windows.i586}-*-c2-servertest, \
${jprt.my.windows.x64}-*-c2-servertest
@@ -548,28 +476,34 @@ jprt.make.rule.test.targets.standard.internalvmtests = \
${jprt.my.solaris.x64}-fastdebug-c2-internalvmtests, \
${jprt.my.linux.i586}-fastdebug-c2-internalvmtests, \
${jprt.my.linux.x64}-fastdebug-c2-internalvmtests, \
+ ${jprt.my.macosx.x64}-fastdebug-c2-internalvmtests, \
${jprt.my.windows.i586}-fastdebug-c2-internalvmtests, \
${jprt.my.windows.x64}-fastdebug-c2-internalvmtests
-
+
+jprt.make.rule.test.targets.standard.wbapi = \
+ ${jprt.my.solaris.sparc}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.solaris.sparcv9}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.solaris.i586}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.solaris.x64}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.linux.i586}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.linux.x64}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.windows.i586}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.windows.x64}-{product|fastdebug}-c2-wbapitest, \
+ ${jprt.my.solaris.sparc}-{product|fastdebug}-c1-wbapitest, \
+ ${jprt.my.solaris.i586}-{product|fastdebug}-c1-wbapitest, \
+ ${jprt.my.linux.i586}-{product|fastdebug}-c1-wbapitest, \
+ ${jprt.my.windows.i586}-{product|fastdebug}-c1-wbapitest
+
jprt.make.rule.test.targets.standard = \
${jprt.make.rule.test.targets.standard.client}, \
${jprt.make.rule.test.targets.standard.server}, \
- ${jprt.make.rule.test.targets.standard.internalvmtests}
+ ${jprt.make.rule.test.targets.standard.internalvmtests}, \
+ ${jprt.make.rule.test.targets.standard.wbapi}
jprt.make.rule.test.targets.embedded = \
${jprt.make.rule.test.targets.standard.client}
jprt.make.rule.test.targets.jdk8=${jprt.make.rule.test.targets.standard}
jprt.make.rule.test.targets.jdk7=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk7temp=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk7b107=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk6=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk6perf=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk6u10=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk6u14=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk6u18=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.jdk6u20=${jprt.make.rule.test.targets.standard}
-jprt.make.rule.test.targets.ejdk6=${jprt.make.rule.test.targets.embedded}
-jprt.make.rule.test.targets.ejdk7=${jprt.make.rule.test.targets.embedded}
jprt.make.rule.test.targets=${jprt.make.rule.test.targets.${jprt.tools.default.release}}
diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile
index 22dcd53..7aaa940 100644
--- a/hotspot/make/linux/Makefile
+++ b/hotspot/make/linux/Makefile
@@ -188,7 +188,7 @@ VARIANTARCH = $(subst i386,i486,$(ZERO_LIBARCH))
# in the build.sh script:
TARGETS = debug jvmg fastdebug optimized profiled product
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs
else
SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/linux/makefiles/adlc.make
index 33a28ee..16d3ca9 100644
--- a/hotspot/make/linux/makefiles/adlc.make
+++ b/hotspot/make/linux/makefiles/adlc.make
@@ -61,10 +61,10 @@ Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED)
INCLUDES += $(Src_Dirs_I:%=-I%)
# set flags for adlc compilation
-CPPFLAGS = $(SYSDEFS) $(INCLUDES)
+CXXFLAGS = $(SYSDEFS) $(INCLUDES)
# Force assertions on.
-CPPFLAGS += -DASSERT
+CXXFLAGS += -DASSERT
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
# Compiler warnings are treated as errors
@@ -109,7 +109,7 @@ all: $(EXEC)
$(EXEC) : $(OBJECTS)
@echo Making adlc
- $(QUIETLY) $(HOST.LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS)
+ $(QUIETLY) $(HOST.LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
# Random dependencies:
$(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp
@@ -211,14 +211,14 @@ PROCESS_AD_FILES = awk '{ \
$(OUTDIR)/%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
# Some object files are given a prefix, to disambiguate
# them from objects of the same name built for the VM.
$(OUTDIR)/adlc-%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(HOST.COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(HOST.COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
# #########################################################################
diff --git a/hotspot/make/linux/makefiles/buildtree.make b/hotspot/make/linux/makefiles/buildtree.make
index b1eb00b..7d209f4 100644
--- a/hotspot/make/linux/makefiles/buildtree.make
+++ b/hotspot/make/linux/makefiles/buildtree.make
@@ -55,6 +55,7 @@
# The makefiles are split this way so that "make foo" will run faster by not
# having to read the dependency files for the vm.
+-include $(SPEC)
include $(GAMMADIR)/make/scm.make
include $(GAMMADIR)/make/altsrc.make
@@ -65,7 +66,7 @@ QUIETLY$(MAKE_VERBOSE) = @
# For now, until the compiler is less wobbly:
TESTFLAGS = -Xbatch -showversion
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
else
ifdef USE_SUNCC
@@ -244,6 +245,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
echo; \
+ [ -n "$(SPEC)" ] && \
+ echo "include $(SPEC)"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
) > $@
@@ -326,11 +329,10 @@ env.sh: $(BUILDTREE_MAKE)
$(BUILDTREE_COMMENT); \
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
{ \
- echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \
} | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \
echo "HOTSPOT_BUILD_USER=\"$${LOGNAME:-$$USER} in `basename $(GAMMADIR)`\""; \
- echo "export JAVA_HOME LD_LIBRARY_PATH CLASSPATH HOTSPOT_BUILD_USER"; \
+ echo "export JAVA_HOME CLASSPATH HOTSPOT_BUILD_USER"; \
) > $@
env.csh: env.sh
@@ -384,7 +386,7 @@ JAVA_FLAG/32 = -d32
JAVA_FLAG/64 = -d64
WRONG_DATA_MODE_MSG = \
- echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
+ echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK."
CROSS_COMPILING_MSG = \
echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
@@ -392,19 +394,78 @@ CROSS_COMPILING_MSG = \
test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
@echo Creating $@ ...
$(QUIETLY) ( \
- echo '#!/bin/sh'; \
+ echo "#!/bin/sh"; \
+ echo ""; \
$(BUILDTREE_COMMENT); \
- echo '. ./env.sh'; \
- echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
- echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
- echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
- echo "then"; \
- echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \
+ echo ""; \
+ echo "# Include environment settings for gamma run"; \
+ echo ""; \
+ echo ". ./env.sh"; \
+ echo ""; \
+ echo "# Do not run gamma test for cross compiles"; \
+ echo ""; \
+ echo "if [ -n \"$(CROSS_COMPILE_ARCH)\" ]; then "; \
+ echo " $(CROSS_COMPILING_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Make sure JAVA_HOME is set as it is required for gamma"; \
+ echo ""; \
+ echo "if [ -z \"\$${JAVA_HOME}\" ]; then "; \
+ echo " $(NO_JAVA_HOME_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Check JAVA_HOME version to be used for the test"; \
+ echo ""; \
+ echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion > /dev/null 2>&1"; \
+ echo "if [ \$$? -ne 0 ]; then "; \
+ echo " $(WRONG_DATA_MODE_MSG)"; \
+ echo " exit 0"; \
echo "fi"; \
+ echo ""; \
+ echo "# Use gamma_g if it exists"; \
+ echo ""; \
+ echo "GAMMA_PROG=gamma"; \
+ echo "if [ -f gamma_g ]; then "; \
+ echo " GAMMA_PROG=gamma_g"; \
+ echo "fi"; \
+ echo ""; \
+ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
+ echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \
+ echo " # NOTE: gamma assumes the OpenJDK directory layout."; \
+ echo ""; \
+ echo " GAMMA_ARCH=\"\`file \$${GAMMA_PROG} | awk '{print \$$NF}'\`\""; \
+ echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/libjava.$(LIBRARY_SUFFIX)\""; \
+ echo " if [ ! -f \$${JVM_LIB} ]; then"; \
+ echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/$${LIBARCH}/libjava.$(LIBRARY_SUFFIX)\""; \
+ echo " fi"; \
+ echo " if [ ! -f \$${JVM_LIB} ] || [ -z \"\`file \$${JVM_LIB} | grep \$${GAMMA_ARCH}\`\" ]; then "; \
+ echo " $(WRONG_DATA_MODE_MSG)"; \
+ echo " exit 0"; \
+ echo " fi"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Compile Queens program for test"; \
+ echo ""; \
echo "rm -f Queens.class"; \
echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
- echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
+ echo ""; \
+ echo "# Set library path solely for gamma launcher test run"; \
+ echo ""; \
+ echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo "export LD_LIBRARY_PATH"; \
+ echo "unset LD_LIBRARY_PATH_32"; \
+ echo "unset LD_LIBRARY_PATH_64"; \
+ echo ""; \
+ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
+ echo " DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/native_threads:\$${JAVA_HOME}/jre/lib:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo " export DYLD_LIBRARY_PATH"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Use the gamma launcher and JAVA_HOME to run the test"; \
+ echo ""; \
+ echo "./\$${GAMMA_PROG} $(TESTFLAGS) Queens < /dev/null"; \
) > $@
$(QUIETLY) chmod +x $@
diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make
index df5b8e4..2934177 100644
--- a/hotspot/make/linux/makefiles/defs.make
+++ b/hotspot/make/linux/makefiles/defs.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ else
endif
# zero
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
ifeq ($(ARCH_DATA_MODEL), 64)
MAKE_ARGS += LP64=1
endif
@@ -114,6 +114,18 @@ ifeq ($(ARCH), ppc)
HS_ARCH = ppc
endif
+# On 32 bit linux we build server and client, on 64 bit just server.
+ifeq ($(JVM_VARIANTS),)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ JVM_VARIANTS:=client,server
+ JVM_VARIANT_CLIENT:=true
+ JVM_VARIANT_SERVER:=true
+ else
+ JVM_VARIANTS:=server
+ JVM_VARIANT_SERVER:=true
+ endif
+endif
+
# determine if HotSpot is being built in JDK6 or earlier version
JDK6_OR_EARLIER=0
ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
@@ -193,22 +205,22 @@ endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-ifndef BUILD_CLIENT_ONLY
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
+
+ifeq ($(findstring true, $(JVM_VARIANT_SERVER) $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
ifneq ($(OBJCOPY),)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
endif
endif
-ifneq ($(ZERO_BUILD), true)
- ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
- ifneq ($(OBJCOPY),)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
- endif
- endif
+ifeq ($(JVM_VARIANT_CLIENT),true)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ endif
endif
# Serviceability Binaries
diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make
index ba5206c..860db87 100644
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
@@ -23,23 +23,28 @@
#
#------------------------------------------------------------------------
-# CC, CPP & AS
-
-# When cross-compiling the ALT_COMPILER_PATH points
-# to the cross-compilation toolset
-ifdef CROSS_COMPILE_ARCH
-CPP = $(ALT_COMPILER_PATH)/g++
-CC = $(ALT_COMPILER_PATH)/gcc
-HOSTCPP = g++
-HOSTCC = gcc
-else
-CPP = g++
-CC = gcc
-HOSTCPP = $(CPP)
-HOSTCC = $(CC)
+# CC, CXX & AS
+
+# If a SPEC is not set already, then use these defaults.
+ifeq ($(SPEC),)
+ # When cross-compiling the ALT_COMPILER_PATH points
+ # to the cross-compilation toolset
+ ifdef CROSS_COMPILE_ARCH
+ CXX = $(ALT_COMPILER_PATH)/g++
+ CC = $(ALT_COMPILER_PATH)/gcc
+ HOSTCXX = g++
+ HOSTCC = gcc
+ STRIP = $(ALT_COMPILER_PATH)/strip
+ else
+ CXX = g++
+ CC = gcc
+ HOSTCXX = $(CXX)
+ HOSTCC = $(CC)
+ STRIP = strip
+ endif
+ AS = $(CC) -c
endif
-AS = $(CC) -c
# -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
# prints the numbers (e.g. "2.95", "3.2.1")
@@ -67,10 +72,11 @@ VM_PICFLAG/LIBJVM = $(PICFLAG)
VM_PICFLAG/AOUT =
VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(JVM_VARIANT_ZERO), true)
CFLAGS += $(LIBFFI_CFLAGS)
endif
-ifeq ($(SHARK_BUILD), true)
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+CFLAGS += $(LIBFFI_CFLAGS)
CFLAGS += $(LLVM_CFLAGS)
endif
CFLAGS += $(VM_PICFLAG)
@@ -261,9 +267,3 @@ endif
ifdef MINIMIZE_RAM_USAGE
CFLAGS += -DMINIMIZE_RAM_USAGE
endif
-
-ifdef CROSS_COMPILE_ARCH
- STRIP = $(ALT_COMPILER_PATH)/strip
-else
- STRIP = strip
-endif
diff --git a/hotspot/make/linux/makefiles/launcher.make b/hotspot/make/linux/makefiles/launcher.make
index d9e3440..0c102ea 100644
--- a/hotspot/make/linux/makefiles/launcher.make
+++ b/hotspot/make/linux/makefiles/launcher.make
@@ -54,10 +54,10 @@ else
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
-LINK_LAUNCHER = $(LINK.c)
+LINK_LAUNCHER = $(LINK.CC)
-LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK)
-LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
+LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK)
+LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK)
LAUNCHER_OUT = launcher
@@ -73,11 +73,11 @@ DEPFILES := $(patsubst %.o,%.d,$(OBJS))
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
$(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
$(QUIETLY) echo Linking launcher...
diff --git a/hotspot/make/linux/makefiles/ppc.make b/hotspot/make/linux/makefiles/ppc.make
index 92957f9..8d085e6 100644
--- a/hotspot/make/linux/makefiles/ppc.make
+++ b/hotspot/make/linux/makefiles/ppc.make
@@ -28,3 +28,6 @@ OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
# Must also specify if CPU is big endian
CFLAGS += -DVM_BIG_ENDIAN
+ifdef E500V2
+ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1
+endif
diff --git a/hotspot/make/linux/makefiles/product.make b/hotspot/make/linux/makefiles/product.make
index 981a9be..efce43d 100644
--- a/hotspot/make/linux/makefiles/product.make
+++ b/hotspot/make/linux/makefiles/product.make
@@ -52,4 +52,4 @@ STRIP_AOUT = $(STRIP) -x $@ || exit 1;
# If we can create .debuginfo files, then the VM is stripped in vm.make
# and this macro is not used.
-# LINK_LIB.CC/POST_HOOK += $(STRIP_$(LINK_INTO))
+# LINK_LIB.CXX/POST_HOOK += $(STRIP_$(LINK_INTO))
diff --git a/hotspot/make/linux/makefiles/rules.make b/hotspot/make/linux/makefiles/rules.make
index 12eafe8..a1e4c34 100644
--- a/hotspot/make/linux/makefiles/rules.make
+++ b/hotspot/make/linux/makefiles/rules.make
@@ -27,52 +27,39 @@
# Tell make that .cpp is important
.SUFFIXES: .cpp $(SUFFIXES)
-# For now. Other makefiles use CPP as the c++ compiler, but that should really
-# name the preprocessor.
-ifeq ($(CCC),)
-CCC = $(CPP)
-endif
-
DEMANGLER = c++filt
DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
-# $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
-C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
-CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
+# $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++).
+CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS)
+CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
AS.S = $(AS) $(ASFLAGS)
-COMPILE.c = $(C_COMPILE) -c
-GENASM.c = $(C_COMPILE) -S
-LINK.c = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
-LINK_LIB.c = $(CC) $(LFLAGS) $(SHARED_FLAG)
-PREPROCESS.c = $(C_COMPILE) -E
+COMPILE.CC = $(CC_COMPILE) -c
+GENASM.CC = $(CC_COMPILE) -S
+LINK.CC = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
+LINK_LIB.CC = $(CC) $(LFLAGS) $(SHARED_FLAG)
+PREPROCESS.CC = $(CC_COMPILE) -E
-COMPILE.CC = $(CC_COMPILE) -c
-GENASM.CC = $(CC_COMPILE) -S
-LINK.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
-LINK_NOPROF.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS)
-LINK_LIB.CC = $(CCC) $(LFLAGS) $(SHARED_FLAG)
-PREPROCESS.CC = $(CC_COMPILE) -E
+COMPILE.CXX = $(CXX_COMPILE) -c
+GENASM.CXX = $(CXX_COMPILE) -S
+LINK.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
+LINK_NOPROF.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS)
+LINK_LIB.CXX = $(CXX) $(LFLAGS) $(SHARED_FLAG)
+PREPROCESS.CXX = $(CXX_COMPILE) -E
# cross compiling the jvm with c2 requires host compilers to build
# adlc tool
-HOST.CC_COMPILE = $(HOSTCPP) $(CPPFLAGS) $(CFLAGS)
-HOST.COMPILE.CC = $(HOST.CC_COMPILE) -c
-HOST.LINK_NOPROF.CC = $(HOSTCPP) $(LFLAGS) $(AOUT_FLAGS)
+HOST.CXX_COMPILE = $(HOSTCXX) $(CXXFLAGS) $(CFLAGS)
+HOST.COMPILE.CXX = $(HOST.CXX_COMPILE) -c
+HOST.LINK_NOPROF.CXX = $(HOSTCXX) $(LFLAGS) $(AOUT_FLAGS)
# Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k".
REMOVE_TARGET = rm -f $@
-# Synonyms.
-COMPILE.cpp = $(COMPILE.CC)
-GENASM.cpp = $(GENASM.CC)
-LINK.cpp = $(LINK.CC)
-LINK_LIB.cpp = $(LINK_LIB.CC)
-PREPROCESS.cpp = $(PREPROCESS.CC)
-
# Note use of ALT_BOOTDIR to explicitly specify location of java and
# javac; this is the same environment variable used in the J2SE build
# process for overriding the default spec, which is BOOTDIR.
@@ -161,14 +148,14 @@ ifdef LP64
%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
else
%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
- $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
- $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
+ $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
+ $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
endif
%.o: %.s
@@ -178,13 +165,13 @@ endif
%.s: %.cpp
@echo Generating assembly for $<
- $(QUIETLY) $(GENASM.CC) -o $@ $<
+ $(QUIETLY) $(GENASM.CXX) -o $@ $<
$(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
# Intermediate files (for debugging macros)
%.i: %.cpp
@echo Preprocessing $< to $@
- $(QUIETLY) $(PREPROCESS.CC) $< > $@ $(COMPILE_DONE)
+ $(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
# Override gnumake built-in rules which do sccs get operations badly.
# (They put the checked out code in the current directory, not in the
diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make
index 4bca453..36a06ae 100644
--- a/hotspot/make/linux/makefiles/saproc.make
+++ b/hotspot/make/linux/makefiles/saproc.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
fi
@echo Making SA debugger back-end...
$(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \
+ -D_FILE_OFFSET_BITS=64 \
$(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-I$(SASRCDIR) \
-I$(GENERATED) \
diff --git a/hotspot/make/linux/makefiles/sparcWorks.make b/hotspot/make/linux/makefiles/sparcWorks.make
index 6e6c841..c87f504 100644
--- a/hotspot/make/linux/makefiles/sparcWorks.make
+++ b/hotspot/make/linux/makefiles/sparcWorks.make
@@ -23,14 +23,17 @@
#
#------------------------------------------------------------------------
-# CC, CPP & AS
+# CC, CXX & AS
-CPP = CC
-CC = cc
-AS = $(CC) -c
+# If a SPEC is not set already, then use these defaults.
+ifeq ($(SPEC),)
+ CXX = CC
+ CC = cc
+ AS = $(CC) -c
-HOSTCPP = $(CPP)
-HOSTCC = $(CC)
+ HOSTCXX = $(CXX)
+ HOSTCC = $(CC)
+endif
ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
ARCHFLAG/i486 = -m32
diff --git a/hotspot/make/linux/makefiles/top.make b/hotspot/make/linux/makefiles/top.make
index d89f8ff..3f6e73e 100644
--- a/hotspot/make/linux/makefiles/top.make
+++ b/hotspot/make/linux/makefiles/top.make
@@ -115,8 +115,8 @@ the_vm: vm_build_preliminaries $(adjust-mflags)
@$(UpdatePCH)
@$(MAKE) -f vm.make $(MFLAGS-adjusted)
-install: the_vm
- @$(MAKE) -f vm.make install
+install gamma: the_vm
+ @$(MAKE) -f vm.make $@
# next rules support "make foo.[ois]"
diff --git a/hotspot/make/linux/makefiles/vm.make b/hotspot/make/linux/makefiles/vm.make
index fa2bcc3..a42f314 100644
--- a/hotspot/make/linux/makefiles/vm.make
+++ b/hotspot/make/linux/makefiles/vm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ DEP_DIR = $(GENERATED)/dependencies
-include $(DEP_DIR)/*.d
# read machine-specific adjustments (%%% should do this via buildtree.make?)
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(findstring true, $(JVM_VARIANT_ZERO) $(JVM_VARIANT_ZEROSHARK)), true)
include $(MAKEFILES_DIR)/zeroshark.make
else
include $(MAKEFILES_DIR)/$(BUILDARCH).make
@@ -88,16 +88,20 @@ BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
-CPPFLAGS = \
+CXXFLAGS = \
${SYSDEFS} \
${INCLUDES} \
${BUILD_VERSION} \
${BUILD_TARGET} \
${BUILD_USER} \
${HS_LIB_ARCH} \
- ${JRE_VERSION} \
${VM_DISTRO}
+# This is VERY important! The version define must only be supplied to vm_version.o
+# If not, ccache will not re-use the cache at all, since the version string might contain
+# a time and date.
+vm_version.o: CXXFLAGS += ${JRE_VERSION}
+
ifndef JAVASE_EMBEDDED
CFLAGS += -DINCLUDE_TRACE
endif
@@ -232,7 +236,7 @@ mapfile_reorder : mapfile $(REORDERFILE)
vm.def: $(Res_Files) $(Obj_Files)
sh $(GAMMADIR)/make/linux/makefiles/build_vm_def.sh *.o > $@
-ifeq ($(SHARK_BUILD), true)
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
STATIC_CXX = false
else
ifeq ($(ZERO_LIBARCH), ppc64)
@@ -264,21 +268,21 @@ else
LIBS_VM += $(LIBS)
endif
-ifeq ($(ZERO_BUILD), true)
+ifeq ($(JVM_VARIANT_ZERO), true)
LIBS_VM += $(LIBFFI_LIBS)
endif
-ifeq ($(SHARK_BUILD), true)
+ifeq ($(JVM_VARIANT_ZEROSHARK), true)
+ LIBS_VM += $(LIBFFI_LIBS) $(LLVM_LIBS)
LFLAGS_VM += $(LLVM_LDFLAGS)
- LIBS_VM += $(LLVM_LIBS)
endif
-LINK_VM = $(LINK_LIB.c)
+LINK_VM = $(LINK_LIB.CC)
# rule for building precompiled header
$(PRECOMPILED_HEADER):
$(QUIETLY) echo Generating precompiled header $@
$(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
- $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
+ $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
# making the library:
@@ -308,10 +312,10 @@ endif
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
$(QUIETLY) { \
echo Linking vm...; \
- $(LINK_LIB.CC/PRE_HOOK) \
+ $(LINK_LIB.CXX/PRE_HOOK) \
$(LINK_VM) $(LD_SCRIPT_FLAG) \
$(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
- $(LINK_LIB.CC/POST_HOOK) \
+ $(LINK_LIB.CXX/POST_HOOK) \
rm -f $@.1; ln -s $@ $@.1; \
[ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
if [ \"$(CROSS_COMPILE_ARCH)\" = \"\" ] ; then \
@@ -364,9 +368,12 @@ include $(MAKEFILES_DIR)/jsig.make
# Serviceability agent
include $(MAKEFILES_DIR)/saproc.make
+# Whitebox testing API
+include $(MAKEFILES_DIR)/wb.make
+
#----------------------------------------------------------------------
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC) $(WB_JAR)
install: install_jvm install_jsig install_saproc
diff --git a/hotspot/make/solaris/makefiles/adlc.make b/hotspot/make/solaris/makefiles/adlc.make
index b14a187..2d110cf 100644
--- a/hotspot/make/solaris/makefiles/adlc.make
+++ b/hotspot/make/solaris/makefiles/adlc.make
@@ -62,10 +62,10 @@ Src_Dirs_I += $(GAMMADIR)/src/share/vm/adlc $(GENERATED)
INCLUDES += $(Src_Dirs_I:%=-I%)
# set flags for adlc compilation
-CPPFLAGS = $(SYSDEFS) $(INCLUDES)
+CXXFLAGS = $(SYSDEFS) $(INCLUDES)
# Force assertions on.
-CPPFLAGS += -DASSERT
+CXXFLAGS += -DASSERT
ifndef USE_GCC
# We need libCstd.so for adlc
@@ -130,7 +130,7 @@ all: $(EXEC)
$(EXEC) : $(OBJECTS)
@echo Making adlc
- $(QUIETLY) $(LINK_NOPROF.CC) -o $(EXEC) $(OBJECTS)
+ $(QUIETLY) $(LINK_NOPROF.CXX) -o $(EXEC) $(OBJECTS)
# Random dependencies:
$(OBJECTS): opcodes.hpp classes.hpp adlc.hpp adlcVMDeps.hpp adlparse.hpp archDesc.hpp arena.hpp dict2.hpp filebuff.hpp forms.hpp formsopt.hpp formssel.hpp
@@ -228,14 +228,14 @@ PROCESS_AD_FILES = awk '{ \
$(OUTDIR)/%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
# Some object files are given a prefix, to disambiguate
# them from objects of the same name built for the VM.
$(OUTDIR)/adlc-%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(COMPILE.CXX) -o $@ $< $(COMPILE_DONE)
# #########################################################################
diff --git a/hotspot/make/solaris/makefiles/buildtree.make b/hotspot/make/solaris/makefiles/buildtree.make
index a46d6b3..901100f 100644
--- a/hotspot/make/solaris/makefiles/buildtree.make
+++ b/hotspot/make/solaris/makefiles/buildtree.make
@@ -55,6 +55,7 @@
# The makefiles are split this way so that "make foo" will run faster by not
# having to read the dependency files for the vm.
+-include $(SPEC)
include $(GAMMADIR)/make/scm.make
include $(GAMMADIR)/make/altsrc.make
@@ -118,7 +119,7 @@ SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
- env.ksh env.csh jdkpath.sh .dbxrc test_gamma
+ env.sh env.csh jdkpath.sh .dbxrc test_gamma
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
ARCH=$(ARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
@@ -237,6 +238,8 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
echo; \
+ [ -n "$(SPEC)" ] && \
+ echo "include $(SPEC)"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
) > $@
@@ -313,22 +316,19 @@ sa.make: $(BUILDTREE_MAKE)
echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
) > $@
-env.ksh: $(BUILDTREE_MAKE)
+env.sh: $(BUILDTREE_MAKE)
@echo Creating $@ ...
$(QUIETLY) ( \
$(BUILDTREE_COMMENT); \
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
{ \
- echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
- echo "unset LD_LIBRARY_PATH_32"; \
- echo "unset LD_LIBRARY_PATH_64"; \
echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \
} | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \
echo "HOTSPOT_BUILD_USER=\"$${LOGNAME:-$$USER} in `basename $(GAMMADIR)`\""; \
echo "export JAVA_HOME LD_LIBRARY_PATH CLASSPATH HOTSPOT_BUILD_USER"; \
) > $@
-env.csh: env.ksh
+env.csh: env.sh
@echo Creating $@ ...
$(QUIETLY) ( \
$(BUILDTREE_COMMENT); \
@@ -384,23 +384,86 @@ JAVA_FLAG/32 = -d32
JAVA_FLAG/64 = -d64
WRONG_DATA_MODE_MSG = \
- echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
+ echo "JAVA_HOME must point to a $(DATA_MODE)-bit OpenJDK."
+
+CROSS_COMPILING_MSG = \
+ echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
@echo Creating $@ ...
$(QUIETLY) ( \
- echo '#!/bin/ksh'; \
+ echo "#!/bin/sh"; \
+ echo ""; \
$(BUILDTREE_COMMENT); \
- echo '. ./env.ksh'; \
- echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
- echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
- echo "then"; \
- echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \
+ echo ""; \
+ echo "# Include environment settings for gamma run"; \
+ echo ""; \
+ echo ". ./env.sh"; \
+ echo ""; \
+ echo "# Do not run gamma test for cross compiles"; \
+ echo ""; \
+ echo "if [ -n \"$(CROSS_COMPILE_ARCH)\" ]; then "; \
+ echo " $(CROSS_COMPILING_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Make sure JAVA_HOME is set as it is required for gamma"; \
+ echo ""; \
+ echo "if [ -z \"\$${JAVA_HOME}\" ]; then "; \
+ echo " $(NO_JAVA_HOME_MSG)"; \
+ echo " exit 0"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Check JAVA_HOME version to be used for the test"; \
+ echo ""; \
+ echo "\$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion > /dev/null 2>&1"; \
+ echo "if [ \$$? -ne 0 ]; then "; \
+ echo " $(WRONG_DATA_MODE_MSG)"; \
+ echo " exit 0"; \
echo "fi"; \
+ echo ""; \
+ echo "# Use gamma_g if it exists"; \
+ echo ""; \
+ echo "GAMMA_PROG=gamma"; \
+ echo "if [ -f gamma_g ]; then "; \
+ echo " GAMMA_PROG=gamma_g"; \
+ echo "fi"; \
+ echo ""; \
+ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
+ echo " # Ensure architecture for gamma and JAVA_HOME is the same."; \
+ echo " # NOTE: gamma assumes the OpenJDK directory layout."; \
+ echo ""; \
+ echo " GAMMA_ARCH=\"\`file \$${GAMMA_PROG} | awk '{print \$$NF}'\`\""; \
+ echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/libjava.$(LIBRARY_SUFFIX)\""; \
+ echo " if [ ! -f \$${JVM_LIB} ]; then"; \
+ echo " JVM_LIB=\"\$${JAVA_HOME}/jre/lib/$${LIBARCH}/libjava.$(LIBRARY_SUFFIX)\""; \
+ echo " fi"; \
+ echo " if [ ! -f \$${JVM_LIB} ] || [ -z \"\`file \$${JVM_LIB} | grep \$${GAMMA_ARCH}\`\" ]; then "; \
+ echo " $(WRONG_DATA_MODE_MSG)"; \
+ echo " exit 0"; \
+ echo " fi"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Compile Queens program for test"; \
+ echo ""; \
echo "rm -f Queens.class"; \
echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
- echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
- echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
+ echo ""; \
+ echo "# Set library path solely for gamma launcher test run"; \
+ echo ""; \
+ echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo "export LD_LIBRARY_PATH"; \
+ echo "unset LD_LIBRARY_PATH_32"; \
+ echo "unset LD_LIBRARY_PATH_64"; \
+ echo ""; \
+ echo "if [ \"$(OS_VENDOR)\" = \"Darwin\" ]; then "; \
+ echo " DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/native_threads:\$${JAVA_HOME}/jre/lib:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo " export DYLD_LIBRARY_PATH"; \
+ echo "fi"; \
+ echo ""; \
+ echo "# Use the gamma launcher and JAVA_HOME to run the test"; \
+ echo ""; \
+ echo "./\$${GAMMA_PROG} $(TESTFLAGS) Queens < /dev/null"; \
) > $@
$(QUIETLY) chmod +x $@
diff --git a/hotspot/make/solaris/makefiles/defs.make b/hotspot/make/solaris/makefiles/defs.make
index f4b6ea3..79ae201 100644
--- a/hotspot/make/solaris/makefiles/defs.make
+++ b/hotspot/make/solaris/makefiles/defs.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,18 @@ else
endif
endif
+# On 32 bit solaris we build server and client, on 64 bit just server.
+ifeq ($(JVM_VARIANTS),)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ JVM_VARIANTS:=client,server
+ JVM_VARIANT_CLIENT:=true
+ JVM_VARIANT_SERVER:=true
+ else
+ JVM_VARIANTS:=server
+ JVM_VARIANT_SERVER:=true
+ endif
+endif
+
# determine if HotSpot is being built in JDK6 or earlier version
JDK6_OR_EARLIER=0
ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
@@ -148,40 +160,42 @@ ifneq ($(OBJCOPY),)
EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
endif
+EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
+
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
-ifneq ($(BUILD_CLIENT_ONLY),true)
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ifeq ($(JVM_VARIANT_SERVER),true)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifeq ($(ARCH_DATA_MODEL),32)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ endif
ifneq ($(OBJCOPY),)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo
EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo
endif
endif
-ifeq ($(ARCH_DATA_MODEL), 32)
+ifeq ($(JVM_VARIANT_CLIENT),true)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifeq ($(ARCH_DATA_MODEL),32)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ endif
ifneq ($(OBJCOPY),)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo
- endif
- ifneq ($(BUILD_CLIENT_ONLY), true)
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
- ifneq ($(OBJCOPY),)
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo
+ ifeq ($(ARCH_DATA_MODEL),32)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo
endif
endif
endif
diff --git a/hotspot/make/solaris/makefiles/dtrace.make b/hotspot/make/solaris/makefiles/dtrace.make
index c7cc159..8c02735 100644
--- a/hotspot/make/solaris/makefiles/dtrace.make
+++ b/hotspot/make/solaris/makefiles/dtrace.make
@@ -150,11 +150,11 @@ endif
lib$(GENOFFS).so: $(DTRACE_SRCDIR)/$(GENOFFS).cpp $(DTRACE_SRCDIR)/$(GENOFFS).h \
$(LIBJVM.o)
- $(QUIETLY) $(CCC) $(CPPFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
+ $(QUIETLY) $(CXX) $(CXXFLAGS) $(GENOFFS_CFLAGS) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_GENOFFS) -o $@ $(DTRACE_SRCDIR)/$(GENOFFS).cpp -lc
$(GENOFFS): $(DTRACE_SRCDIR)/$(GENOFFS)Main.c lib$(GENOFFS).so
- $(QUIETLY) $(LINK.CC) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
+ $(QUIETLY) $(LINK.CXX) -z nodefs -o $@ $(DTRACE_SRCDIR)/$(GENOFFS)Main.c \
./lib$(GENOFFS).so
CONDITIONALLY_UPDATE_JVMOFFS_TARGET = \
@@ -178,7 +178,7 @@ $(JVMOFFS).cpp: $(GENOFFS) $(JVMOFFS).h $(JVMOFFS)Index.h
$(QUIETLY) $(CONDITIONALLY_UPDATE_JVMOFFS_TARGET)
$(JVMOFFS.o): $(JVMOFFS).h $(JVMOFFS).cpp
- $(QUIETLY) $(CCC) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
+ $(QUIETLY) $(CXX) -c -I. -o $@ $(ARCHFLAG) -D$(TYPE) $(JVMOFFS).cpp
$(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_DB_MAPFILE)
@echo Making $@
diff --git a/hotspot/make/solaris/makefiles/gcc.make b/hotspot/make/solaris/makefiles/gcc.make
index 3725749..4d0db9e 100644
--- a/hotspot/make/solaris/makefiles/gcc.make
+++ b/hotspot/make/solaris/makefiles/gcc.make
@@ -23,11 +23,15 @@
#
#------------------------------------------------------------------------
-# CC, CPP & AS
-
-CPP = g++
-CC = gcc
-AS = $(CC) -c
+# CC, CXX & AS
+
+# If a SPEC is not set already, then use these defaults.
+ifeq ($(SPEC),)
+ CXX = g++
+ CC = gcc
+ AS = $(CC) -c
+ MCS = /usr/ccs/bin/mcs
+endif
Compiler = gcc
@@ -36,12 +40,12 @@ Compiler = gcc
CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1)
CC_VER_MINOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2)
-# Check for the versions of C++ and C compilers ($CPP and $CC) used.
+# Check for the versions of C++ and C compilers ($CXX and $CC) used.
# Get the last thing on the line that looks like x.x+ (x is a digit).
COMPILER_REV := \
-$(shell $(CPP) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1)
-C_COMPILER_REV := \
+$(shell $(CXX) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1)
+CC_COMPILER_REV := \
$(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2)
@@ -193,5 +197,3 @@ DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
DEBUG_CFLAGS += -gstabs
endif
-
-MCS = /usr/ccs/bin/mcs
diff --git a/hotspot/make/solaris/makefiles/launcher.make b/hotspot/make/solaris/makefiles/launcher.make
index e0a2ee3..daf24a3 100644
--- a/hotspot/make/solaris/makefiles/launcher.make
+++ b/hotspot/make/solaris/makefiles/launcher.make
@@ -52,10 +52,10 @@ else
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
-LINK_LAUNCHER = $(LINK.CC)
+LINK_LAUNCHER = $(LINK.CXX)
-LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK)
-LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
+LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CXX/PRE_HOOK)
+LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CXX/POST_HOOK)
ifeq ("${Platform_compiler}", "sparcWorks")
# Enable the following LAUNCHERFLAGS addition if you need to compare the
@@ -86,11 +86,11 @@ DEPFILES := $(patsubst %.o,%.d,$(OBJS))
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
$(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
- $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS)
$(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
diff --git a/hotspot/make/solaris/makefiles/product.make b/hotspot/make/solaris/makefiles/product.make
index 300b70d..8746d51 100644
--- a/hotspot/make/solaris/makefiles/product.make
+++ b/hotspot/make/solaris/makefiles/product.make
@@ -70,7 +70,7 @@ endif
# If we can create .debuginfo files, then the VM is stripped in vm.make
# and this macro is not used.
-# LINK_LIB.CC/POST_HOOK += $(STRIP_LIB.CC/POST_HOOK)
+# LINK_LIB.CXX/POST_HOOK += $(STRIP_LIB.CXX/POST_HOOK)
G_SUFFIX =
SYSDEFS += -DPRODUCT
diff --git a/hotspot/make/solaris/makefiles/rules.make b/hotspot/make/solaris/makefiles/rules.make
index c5bd00f..4401698 100644
--- a/hotspot/make/solaris/makefiles/rules.make
+++ b/hotspot/make/solaris/makefiles/rules.make
@@ -27,44 +27,31 @@
# Tell make that .cpp is important
.SUFFIXES: .cpp $(SUFFIXES)
-# For now. Other makefiles use CPP as the c++ compiler, but that should really
-# name the preprocessor.
-ifeq ($(CCC),)
-CCC = $(CPP)
-endif
-
DEMANGLER = c++filt
DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
-# $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
-C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
-CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
+# $(CC) is the c compiler (cc/gcc), $(CXX) is the c++ compiler (CC/g++).
+CC_COMPILE = $(CC) $(CXXFLAGS) $(CFLAGS)
+CXX_COMPILE = $(CXX) $(CXXFLAGS) $(CFLAGS)
AS.S = $(AS) $(ASFLAGS)
-COMPILE.c = $(C_COMPILE) -c
-GENASM.c = $(C_COMPILE) -S
-LINK.c = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
-LINK_LIB.c = $(CC) $(LFLAGS) $(SHARED_FLAG)
-PREPROCESS.c = $(C_COMPILE) -E
+COMPILE.CC = $(CC_COMPILE) -c
+GENASM.CC = $(CC_COMPILE) -S
+LINK.CC = $(CC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
+LINK_LIB.CC = $(CC) $(LFLAGS) $(SHARED_FLAG)
+PREPROCESS.CC = $(CC_COMPILE) -E
-COMPILE.CC = $(CC_COMPILE) -c
-GENASM.CC = $(CC_COMPILE) -S
-LINK.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
-LINK_NOPROF.CC = $(CCC) $(LFLAGS) $(AOUT_FLAGS)
-LINK_LIB.CC = $(CCC) $(LFLAGS) $(SHARED_FLAG)
-PREPROCESS.CC = $(CC_COMPILE) -E
+COMPILE.CXX = $(CXX_COMPILE) -c
+GENASM.CXX = $(CXX_COMPILE) -S
+LINK.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS) $(PROF_AOUT_FLAGS)
+LINK_NOPROF.CXX = $(CXX) $(LFLAGS) $(AOUT_FLAGS)
+LINK_LIB.CXX = $(CXX) $(LFLAGS) $(SHARED_FLAG)
+PREPROCESS.CXX = $(CXX_COMPILE) -E
# Effect of REMOVE_TARGET is to delete out-of-date files during "gnumake -k".
REMOVE_TARGET = rm -f $@
-# Synonyms.
-COMPILE.cpp = $(COMPILE.CC)
-GENASM.cpp = $(GENASM.CC)
-LINK.cpp = $(LINK.CC)
-LINK_LIB.cpp = $(LINK_LIB.CC)
-PREPROCESS.cpp = $(PREPROCESS.CC)
-
# Note use of ALT_BOOTDIR to explicitly specify location of java and
# javac; this is the same environment variable used in the J2SE build
# process for overriding the default spec, which is BOOTDIR.
@@ -153,14 +140,14 @@ ifdef LP64
%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
- $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
+ $(QUIETLY) $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
else
%.o: %.cpp
@echo Compiling $<
$(QUIETLY) $(REMOVE_TARGET)
$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
- $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
- $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
+ $(subst $(VM_PICFLAG), ,$(COMPILE.CXX)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
+ $(COMPILE.CXX) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
endif
%.o: %.s
@@ -170,13 +157,13 @@ endif
%.s: %.cpp
@echo Generating assembly for $<
- $(QUIETLY) $(GENASM.CC) -o $@ $<
+ $(QUIETLY) $(GENASM.CXX) -o $@ $<
$(QUIETLY) $(DEMANGLE) $(COMPILE_DONE)
# Intermediate files (for debugging macros)
%.i: %.cpp
@echo Preprocessing $< to $@
- $(QUIETLY) $(PREPROCESS.CC) $< > $@ $(COMPILE_DONE)
+ $(QUIETLY) $(PREPROCESS.CXX) $< > $@ $(COMPILE_DONE)
# Override gnumake built-in rules which do sccs get operations badly.
# (They put the checked out code in the current directory, not in the
diff --git a/hotspot/make/solaris/makefiles/saproc.make b/hotspot/make/solaris/makefiles/saproc.make
index 389ed9d..f76e668 100644
--- a/hotspot/make/solaris/makefiles/saproc.make
+++ b/hotspot/make/solaris/makefiles/saproc.make
@@ -93,7 +93,7 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
exit 1; \
fi
@echo Making SA debugger back-end...
- $(QUIETLY) $(CPP) \
+ $(QUIETLY) $(CXX) \
$(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
-I$(SASRCDIR) \
-I$(GENERATED) \
diff --git a/hotspot/make/solaris/makefiles/sparcWorks.make b/hotspot/make/solaris/makefiles/sparcWorks.make
index 67a22a2..8ef47c5 100644
--- a/hotspot/make/solaris/makefiles/sparcWorks.make
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make
@@ -22,38 +22,42 @@
#
#
-# Compiler-specific flags for sparcworks.
+# If a SPEC is not set already, then use these defaults.
+ifeq ($(SPEC),)
+ # Compiler-specific flags for sparcworks.
+ CC = cc
+ CXX = CC
-# tell make which C and C++ compilers to use
-CC = cc
-CPP = CC
+ # Note that this 'as' is an older version of the Sun Studio 'fbe', and will
+ # use the older style options. The 'fbe' options will match 'cc' and 'CC'.
+ AS = /usr/ccs/bin/as
-# Note that this 'as' is an older version of the Sun Studio 'fbe', and will
-# use the older style options. The 'fbe' options will match 'cc' and 'CC'.
-AS = /usr/ccs/bin/as
+ NM = /usr/ccs/bin/nm
+ NAWK = /bin/nawk
-NM = /usr/ccs/bin/nm
-NAWK = /bin/nawk
+ MCS = /usr/ccs/bin/mcs
+ STRIP = /usr/ccs/bin/strip
+endif
REORDER_FLAG = -xF
-# Check for the versions of C++ and C compilers ($CPP and $CC) used.
+# Check for the versions of C++ and C compilers ($CXX and $CC) used.
# Get the last thing on the line that looks like x.x+ (x is a digit).
COMPILER_REV := \
-$(shell $(CPP) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
-C_COMPILER_REV := \
+$(shell $(CXX) -V 2>&1 | sed -n 's/^.*[ ,\t]C++[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
+CC_COMPILER_REV := \
$(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
# Pick which compiler is validated
ifeq ($(JRE_RELEASE_VER),1.6.0)
# Validated compiler for JDK6 is SS11 (5.8)
VALIDATED_COMPILER_REVS := 5.8
- VALIDATED_C_COMPILER_REVS := 5.8
+ VALIDATED_CC_COMPILER_REVS := 5.8
else
# Validated compiler for JDK7 is SS12 update 1 + patches (5.10)
VALIDATED_COMPILER_REVS := 5.10
- VALIDATED_C_COMPILER_REVS := 5.10
+ VALIDATED_CC_COMPILER_REVS := 5.10
endif
# Warning messages about not using the above validated versions
@@ -67,13 +71,13 @@ dummy_var_to_enforce_compiler_rev := $(shell \
warning.)
endif
-ENFORCE_C_COMPILER_REV${ENFORCE_C_COMPILER_REV} := $(strip ${VALIDATED_C_COMPILER_REVS})
-ifeq ($(filter ${ENFORCE_C_COMPILER_REV},${C_COMPILER_REV}),)
-PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_C_COMPILER_REV})
+ENFORCE_CC_COMPILER_REV${ENFORCE_CC_COMPILER_REV} := $(strip ${VALIDATED_CC_COMPILER_REVS})
+ifeq ($(filter ${ENFORCE_CC_COMPILER_REV},${CC_COMPILER_REV}),)
+PRINTABLE_C_REVS := $(subst $(shell echo ' '), or ,${ENFORCE_CC_COMPILER_REV})
dummy_var_to_enforce_c_compiler_rev := $(shell \
- echo >&2 WARNING: You are using cc version ${C_COMPILER_REV} and \
+ echo >&2 WARNING: You are using cc version ${CC_COMPILER_REV} and \
should be using version ${PRINTABLE_C_REVS}.; \
- echo >&2 Set ENFORCE_C_COMPILER_REV=${C_COMPILER_REV} to avoid this \
+ echo >&2 Set ENFORCE_CC_COMPILER_REV=${CC_COMPILER_REV} to avoid this \
warning.)
endif
@@ -98,7 +102,7 @@ JVM_CHECK_SYMBOLS = $(NM) -u -p $(LIBJVM.o) | \
} \
END { exit rc; }'
-LINK_LIB.CC/PRE_HOOK += $(JVM_CHECK_SYMBOLS) || exit 1;
+LINK_LIB.CXX/PRE_HOOK += $(JVM_CHECK_SYMBOLS) || exit 1;
# New architecture options started in SS12 (5.9), we need both styles to build.
# The older arch options for SS11 (5.8) or older and also for /usr/ccs/bin/as.
@@ -518,7 +522,7 @@ endif
#FASTDEBUG_CFLAGS += -Qoption ccfe -xglobalstatic
ifeq (${COMPILER_REV_NUMERIC}, 502)
-COMPILER_DATE := $(shell $(CPP) -V 2>&1 | sed -n '/^.*[ ]C++[ ]\([1-9]\.[0-9][0-9]*\)/p' | awk '{ print $$NF; }')
+COMPILER_DATE := $(shell $(CXX) -V 2>&1 | sed -n '/^.*[ ]C++[ ]\([1-9]\.[0-9][0-9]*\)/p' | awk '{ print $$NF; }')
ifeq (${COMPILER_DATE}, 2001/01/31)
# disable -g0 in fastdebug since SC6.1 dated 2001/01/31 seems to be buggy
# use an innocuous value because it will get -g if it's empty
@@ -557,9 +561,6 @@ else
#LINK_INTO = LIBJVM
endif
-MCS = /usr/ccs/bin/mcs
-STRIP = /usr/ccs/bin/strip
-
# Solaris platforms collect lots of redundant file-ident lines,
# to the point of wasting a significant percentage of file space.
# (The text is stored in ELF .comment sections, contributed by
@@ -568,7 +569,7 @@ STRIP = /usr/ccs/bin/strip
# removing repeated lines. The data can be extracted from
# binaries in the field by using "mcs -p libjvm.so" or the older
# command "what libjvm.so".
-LINK_LIB.CC/POST_HOOK += $(MCS) -c $@ || exit 1;
+LINK_LIB.CXX/POST_HOOK += $(MCS) -c $@ || exit 1;
# (The exit 1 is necessary to cause a build failure if the command fails and
# multiple commands are strung together, and the final semicolon is necessary
# since the hook must terminate itself as a valid command.)
@@ -576,7 +577,7 @@ LINK_LIB.CC/POST_HOOK += $(MCS) -c $@ || exit 1;
# Also, strip debug and line number information (worth about 1.7Mb).
# If we can create .debuginfo files, then the VM is stripped in vm.make
# and this macro is not used.
-STRIP_LIB.CC/POST_HOOK = $(STRIP) -x $@ || exit 1;
-# STRIP_LIB.CC/POST_HOOK is incorporated into LINK_LIB.CC/POST_HOOK
+STRIP_LIB.CXX/POST_HOOK = $(STRIP) -x $@ || exit 1;
+# STRIP_LIB.CXX/POST_HOOK is incorporated into LINK_LIB.CXX/POST_HOOK
# in certain configurations, such as product.make. Other configurations,
# such as debug.make, do not include the strip operation.
diff --git a/hotspot/make/solaris/makefiles/top.make b/hotspot/make/solaris/makefiles/top.make
index 64797bb..bbe1079 100644
--- a/hotspot/make/solaris/makefiles/top.make
+++ b/hotspot/make/solaris/makefiles/top.make
@@ -107,8 +107,8 @@ $(adjust-mflags): $(GAMMADIR)/make/$(Platform_os_family)/makefiles/adjust-mflags
the_vm: vm_build_preliminaries $(adjust-mflags)
@$(MAKE) -f vm.make $(MFLAGS-adjusted)
-install: the_vm
- @$(MAKE) -f vm.make install
+install gamma: the_vm
+ @$(MAKE) -f vm.make $@
# next rules support "make foo.[oi]"
diff --git a/hotspot/make/solaris/makefiles/vm.make b/hotspot/make/solaris/makefiles/vm.make
index 0895ea0..6a10451 100644
--- a/hotspot/make/solaris/makefiles/vm.make
+++ b/hotspot/make/solaris/makefiles/vm.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -76,16 +76,20 @@ BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
-CPPFLAGS = \
+CXXFLAGS = \
${SYSDEFS} \
${INCLUDES} \
${BUILD_VERSION} \
${BUILD_TARGET} \
${BUILD_USER} \
${HS_LIB_ARCH} \
- ${JRE_VERSION} \
${VM_DISTRO}
+# This is VERY important! The version define must only be supplied to vm_version.o
+# If not, ccache will not re-use the cache at all, since the version string might contain
+# a time and date.
+vm_version.o: CXXFLAGS += ${JRE_VERSION}
+
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN)
@@ -265,17 +269,17 @@ endif
endif
ifdef USE_GCC
-LINK_VM = $(LINK_LIB.c)
-else
LINK_VM = $(LINK_LIB.CC)
+else
+LINK_VM = $(LINK_LIB.CXX)
endif
# making the library:
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE)
ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
@echo Linking vm...
- $(QUIETLY) $(LINK_LIB.CC/PRE_HOOK)
+ $(QUIETLY) $(LINK_LIB.CXX/PRE_HOOK)
$(QUIETLY) $(LINK_VM) $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM)
- $(QUIETLY) $(LINK_LIB.CC/POST_HOOK)
+ $(QUIETLY) $(LINK_LIB.CXX/POST_HOOK)
$(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
$(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
$(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
@@ -317,9 +321,12 @@ include $(MAKEFILES_DIR)/jsig.make
# Serviceability agent
include $(MAKEFILES_DIR)/saproc.make
+# Whitebox testing API
+include $(MAKEFILES_DIR)/wb.make
+
#----------------------------------------------------------------------
-build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheck
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(LIBJVM_DTRACE) $(BUILDLIBSAPROC) dtraceCheck $(WB_JAR)
install: install_jvm install_jsig install_saproc
diff --git a/hotspot/make/windows/build.make b/hotspot/make/windows/build.make
index 8ec004d..fff8a85 100644
--- a/hotspot/make/windows/build.make
+++ b/hotspot/make/windows/build.make
@@ -297,6 +297,10 @@ $(variantDir)\local.make: checks
@ echo BUILDARCH=$(BUILDARCH) >> $@
@ echo Platform_arch=$(Platform_arch) >> $@
@ echo Platform_arch_model=$(Platform_arch_model) >> $@
+ @ echo CXX=$(CXX) >> $@
+ @ echo LD=$(LD) >> $@
+ @ echo MT=$(MT) >> $@
+ @ echo RC=$(RC) >> $@
@ sh $(WorkSpace)/make/windows/get_msc_ver.sh >> $@
checks: checkVariant checkWorkSpace checkSA
diff --git a/hotspot/make/windows/build_vm_def.sh b/hotspot/make/windows/build_vm_def.sh
index 9c9593b..35dd9dc 100644
--- a/hotspot/make/windows/build_vm_def.sh
+++ b/hotspot/make/windows/build_vm_def.sh
@@ -57,10 +57,10 @@ DUMPBIN="link.exe /dump"
# When called from IDE the first param should contain the link version, otherwise may be nill
if [ "x$1" != "x" ]; then
-LINK_VER="$1"
+LD_VER="$1"
fi
-if [ "x$LINK_VER" != "x800" -a "x$LINK_VER" != "x900" -a "x$LINK_VER" != "x1000" ]; then
+if [ "x$LD_VER" != "x800" -a "x$LD_VER" != "x900" -a "x$LD_VER" != "x1000" ]; then
$DUMPBIN /symbols *.obj | "$GREP" "??_7.*@@6B@" | "$GREP" -v "type_info" | "$AWK" '{print $7}' | "$SORT" | "$UNIQ" > vm2.def
else
# Can't use pipes when calling cl.exe or link.exe from IDE. Using transit file vm3.def
diff --git a/hotspot/make/windows/get_msc_ver.sh b/hotspot/make/windows/get_msc_ver.sh
index 339e92b..da00db4 100644
--- a/hotspot/make/windows/get_msc_ver.sh
+++ b/hotspot/make/windows/get_msc_ver.sh
@@ -72,8 +72,8 @@ else
echo "MSC_VER_RAW=$MSC_VER_RAW"
fi
-if [ "x$FORCE_LINK_VER" != "x" ]; then
- echo "LINK_VER=$FORCE_LINK_VER"
+if [ "x$FORCE_LD_VER" != "x" ]; then
+ echo "LD_VER=$FORCE_LD_VER"
else
# use the "link" command that is co-located with the "cl" command
cl_cmd=`which cl`
@@ -83,11 +83,11 @@ else
# which can't find "cl" so just use which ever "link" we find
link_cmd="link"
fi
- LINK_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'`
- LINK_VER_MAJOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f1`
- LINK_VER_MINOR=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f2`
- LINK_VER_MICRO=`"$ECHO" $LINK_VER_RAW | "$CUT" -d'.' -f3`
- LINK_VER=`"$EXPR" $LINK_VER_MAJOR \* 100 + $LINK_VER_MINOR`
- echo "LINK_VER=$LINK_VER"
- echo "LINK_VER_RAW=$LINK_VER_RAW"
+ LD_VER_RAW=`"$link_cmd" 2>&1 | "$HEAD" -n 1 | "$SED" 's/.*Version[\ ]*\([0-9][0-9.]*\).*/\1/'`
+ LD_VER_MAJOR=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f1`
+ LD_VER_MINOR=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f2`
+ LD_VER_MICRO=`"$ECHO" $LD_VER_RAW | "$CUT" -d'.' -f3`
+ LD_VER=`"$EXPR" $LD_VER_MAJOR \* 100 + $LD_VER_MINOR`
+ echo "LD_VER=$LD_VER"
+ echo "LD_VER_RAW=$LD_VER_RAW"
fi
diff --git a/hotspot/make/windows/makefiles/adlc.make b/hotspot/make/windows/makefiles/adlc.make
index de607ec..f091b98 100644
--- a/hotspot/make/windows/makefiles/adlc.make
+++ b/hotspot/make/windows/makefiles/adlc.make
@@ -45,9 +45,9 @@ ADLCFLAGS=-q -T -D_LP64
ADLCFLAGS=-q -T -U_LP64
!endif
-ADLC_CPP_FLAGS=$(CPP_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
+ADLC_CXX_FLAGS=$(CXX_FLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
-CPP_INCLUDE_DIRS=\
+CXX_INCLUDE_DIRS=\
/I "..\generated" \
/I "$(WorkSpace)\src\share\vm" \
/I "$(WorkSpace)\src\os\windows\vm" \
@@ -94,14 +94,14 @@ GENERATED_NAMES_IN_DIR=\
$(AdlcOutDir)\dfa_$(Platform_arch_model).cpp
{$(WorkSpace)\src\share\vm\adlc}.cpp.obj::
- $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<
+ $(CXX) $(ADLC_CXX_FLAGS) $(EXH_FLAGS) $(CXX_INCLUDE_DIRS) /c $<
{$(WorkSpace)\src\share\vm\opto}.cpp.obj::
- $(CPP) $(ADLC_CPP_FLAGS) $(EXH_FLAGS) $(CPP_INCLUDE_DIRS) /c $<
+ $(CXX) $(ADLC_CXX_FLAGS) $(EXH_FLAGS) $(CXX_INCLUDE_DIRS) /c $<
adlc.exe: main.obj adlparse.obj archDesc.obj arena.obj dfa.obj dict2.obj filebuff.obj \
forms.obj formsopt.obj formssel.obj opcodes.obj output_c.obj output_h.obj
- $(LINK) $(LINK_FLAGS) /subsystem:console /out:$@ $**
+ $(LD) $(LD_FLAGS) /subsystem:console /out:$@ $**
!if "$(MT)" != ""
# The previous link command created a .manifest file that we want to
# insert into the linked artifact so we do not need to track it
diff --git a/hotspot/make/windows/makefiles/compile.make b/hotspot/make/windows/makefiles/compile.make
index 8cc5677..e1848a4 100644
--- a/hotspot/make/windows/makefiles/compile.make
+++ b/hotspot/make/windows/makefiles/compile.make
@@ -23,9 +23,11 @@
#
# Generic compiler settings
-CPP=cl.exe
+!if "x$(CXX)" == "x"
+CXX=cl.exe
+!endif
-# CPP Flags: (these vary slightly from VC6->VS2003->VS2005 compilers)
+# CXX Flags: (these vary slightly from VC6->VS2003->VS2005 compilers)
# /nologo Supress copyright message at every cl.exe startup
# /W3 Warning level 3
# /Zi Include debugging information
@@ -50,47 +52,47 @@ CPP=cl.exe
# improving the quality of crash log stack traces involving jvm.dll.
# These are always used in all compiles
-CPP_FLAGS=/nologo /W3 /WX
+CXX_FLAGS=/nologo /W3 /WX
# Let's add debug information always too.
-CPP_FLAGS=$(CPP_FLAGS) /Zi
+CXX_FLAGS=$(CXX_FLAGS) /Zi
# Based on BUILDARCH we add some flags and select the default compiler name
!if "$(BUILDARCH)" == "ia64"
MACHINE=IA64
DEFAULT_COMPILER_NAME=VS2003
-CPP_FLAGS=$(CPP_FLAGS) /D "CC_INTERP" /D "_LP64" /D "IA64"
+CXX_FLAGS=$(CXX_FLAGS) /D "CC_INTERP" /D "_LP64" /D "IA64"
!endif
!if "$(BUILDARCH)" == "amd64"
MACHINE=AMD64
DEFAULT_COMPILER_NAME=VS2005
-CPP_FLAGS=$(CPP_FLAGS) /D "_LP64" /D "AMD64"
+CXX_FLAGS=$(CXX_FLAGS) /D "_LP64" /D "AMD64"
LP64=1
!endif
!if "$(BUILDARCH)" == "i486"
MACHINE=I386
DEFAULT_COMPILER_NAME=VS2003
-CPP_FLAGS=$(CPP_FLAGS) /D "IA32"
+CXX_FLAGS=$(CXX_FLAGS) /D "IA32"
!endif
# Sanity check, this is the default if not amd64, ia64, or i486
!ifndef DEFAULT_COMPILER_NAME
-CPP=ARCH_ERROR
+CXX=ARCH_ERROR
!endif
-CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS"
+CXX_FLAGS=$(CXX_FLAGS) /D "WIN32" /D "_WINDOWS"
# Must specify this for sharedRuntimeTrig.cpp
-CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN"
+CXX_FLAGS=$(CXX_FLAGS) /D "VM_LITTLE_ENDIAN"
# Used for platform dispatching
-CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_FAMILY_windows
-CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_$(Platform_arch)
-CPP_FLAGS=$(CPP_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model)
-CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch)
-CPP_FLAGS=$(CPP_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model)
-CPP_FLAGS=$(CPP_FLAGS) /D TARGET_COMPILER_visCPP
+CXX_FLAGS=$(CXX_FLAGS) /D TARGET_OS_FAMILY_windows
+CXX_FLAGS=$(CXX_FLAGS) /D TARGET_ARCH_$(Platform_arch)
+CXX_FLAGS=$(CXX_FLAGS) /D TARGET_ARCH_MODEL_$(Platform_arch_model)
+CXX_FLAGS=$(CXX_FLAGS) /D TARGET_OS_ARCH_windows_$(Platform_arch)
+CXX_FLAGS=$(CXX_FLAGS) /D TARGET_OS_ARCH_MODEL_windows_$(Platform_arch_model)
+CXX_FLAGS=$(CXX_FLAGS) /D TARGET_COMPILER_visCPP
# MSC_VER is a 4 digit number that tells us what compiler is being used
@@ -150,14 +152,14 @@ MS_RUNTIME_OPTION = /MTd /D "_DEBUG"
# Always add the _STATIC_CPPLIB flag
STATIC_CPPLIB_OPTION = /D _STATIC_CPPLIB /D _DISABLE_DEPRECATE_STATIC_CPPLIB
MS_RUNTIME_OPTION = $(MS_RUNTIME_OPTION) $(STATIC_CPPLIB_OPTION)
-CPP_FLAGS=$(CPP_FLAGS) $(MS_RUNTIME_OPTION)
+CXX_FLAGS=$(CXX_FLAGS) $(MS_RUNTIME_OPTION)
# How /GX option is spelled
GX_OPTION = /GX
# Optimization settings for various versions of the compilers and types of
# builds. Three basic sets of settings: product, fastdebug, and debug.
-# These get added into CPP_FLAGS as needed by other makefiles.
+# These get added into CXX_FLAGS as needed by other makefiles.
!if "$(COMPILER_NAME)" == "VC6"
PRODUCT_OPT_OPTION = /Ox /Os /Gy /GF
FASTDEBUG_OPT_OPTION = /Ox /Os /Gy /GF
@@ -180,34 +182,40 @@ GX_OPTION = /EHsc
# externals at link time. Even with /GS-, you need bufferoverflowU.lib.
# NOTE: Currently we decided to not use /GS-
BUFFEROVERFLOWLIB = bufferoverflowU.lib
-LINK_FLAGS = /manifest $(LINK_FLAGS) $(BUFFEROVERFLOWLIB)
+LD_FLAGS = /manifest $(LD_FLAGS) $(BUFFEROVERFLOWLIB)
# Manifest Tool - used in VS2005 and later to adjust manifests stored
# as resources inside build artifacts.
+!if "x$(MT)" == "x"
MT=mt.exe
!endif
+!endif
!if "$(COMPILER_NAME)" == "VS2008"
PRODUCT_OPT_OPTION = /O2 /Oy-
FASTDEBUG_OPT_OPTION = /O2 /Oy-
DEBUG_OPT_OPTION = /Od
GX_OPTION = /EHsc
-LINK_FLAGS = /manifest $(LINK_FLAGS)
+LD_FLAGS = /manifest $(LD_FLAGS)
# Manifest Tool - used in VS2005 and later to adjust manifests stored
# as resources inside build artifacts.
+!if "x$(MT)" == "x"
MT=mt.exe
!endif
+!endif
!if "$(COMPILER_NAME)" == "VS2010"
PRODUCT_OPT_OPTION = /O2 /Oy-
FASTDEBUG_OPT_OPTION = /O2 /Oy-
DEBUG_OPT_OPTION = /Od
GX_OPTION = /EHsc
-LINK_FLAGS = /manifest $(LINK_FLAGS)
+LD_FLAGS = /manifest $(LD_FLAGS)
# Manifest Tool - used in VS2005 and later to adjust manifests stored
# as resources inside build artifacts.
+!if "x$(MT)" == "x"
MT=mt.exe
+!endif
!if "$(BUILDARCH)" == "i486"
-LINK_FLAGS = /SAFESEH $(LINK_FLAGS)
+LD_FLAGS = /SAFESEH $(LD_FLAGS)
!endif
!endif
@@ -225,19 +233,23 @@ FASTDEBUG_OPT_OPTION = $(DEBUG_OPT_OPTION)
!endif
# Generic linker settings
-LINK=link.exe
-LINK_FLAGS= $(LINK_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \
+!if "x$(LD)" == "x"
+LD=link.exe
+!endif
+LD_FLAGS= $(LD_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \
/opt:ICF,8 /map /debug
!if $(MSC_VER) >= 1600
-LINK_FLAGS= $(LINK_FLAGS) psapi.lib
+LD_FLAGS= $(LD_FLAGS) psapi.lib
!endif
# Resource compiler settings
+!if "x$(RC)" == "x"
RC=rc.exe
+!endif
RC_FLAGS=/D "HS_VER=$(HS_VER)" \
/D "HS_DOTVER=$(HS_DOTVER)" \
/D "HS_BUILD_ID=$(HS_BUILD_ID)" \
@@ -250,7 +262,7 @@ RC_FLAGS=/D "HS_VER=$(HS_VER)" \
/D "HS_INTERNAL_NAME=$(HS_INTERNAL_NAME)" \
/D "HS_NAME=$(HS_NAME)"
-# Need this to match the CPP_FLAGS settings
+# Need this to match the CXX_FLAGS settings
!if "$(MFC_DEBUG)" == "true"
RC_FLAGS = $(RC_FLAGS) /D "_DEBUG"
!endif
diff --git a/hotspot/make/windows/makefiles/debug.make b/hotspot/make/windows/makefiles/debug.make
index 32d4f46..8e91bc4 100644
--- a/hotspot/make/windows/makefiles/debug.make
+++ b/hotspot/make/windows/makefiles/debug.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@ GENERATED=../generated
BUILD_PCH_FILE=_build_pch_file.obj
!endif
-default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
+default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA wb
!include ../local.make
!include compile.make
-CPP_FLAGS=$(CPP_FLAGS) $(DEBUG_OPT_OPTION)
+CXX_FLAGS=$(CXX_FLAGS) $(DEBUG_OPT_OPTION)
!include $(WorkSpace)/make/windows/makefiles/vm.make
!include local.make
@@ -52,8 +52,8 @@ vm.def: $(Obj_Files)
sh $(WorkSpace)/make/windows/build_vm_def.sh
$(AOUT): $(Res_Files) $(Obj_Files) vm.def
- $(LINK) @<<
- $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
+ $(LD) @<<
+ $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
<<
!if "$(MT)" != ""
# The previous link command created a .manifest file that we want to
@@ -65,3 +65,4 @@ $(AOUT): $(Res_Files) $(Obj_Files) vm.def
!include $(WorkSpace)/make/windows/makefiles/shared.make
!include $(WorkSpace)/make/windows/makefiles/sa.make
!include $(WorkSpace)/make/windows/makefiles/launcher.make
+!include $(WorkSpace)/make/windows/makefiles/wb.make
diff --git a/hotspot/make/windows/makefiles/defs.make b/hotspot/make/windows/makefiles/defs.make
index c1be7d2..b3147c7 100644
--- a/hotspot/make/windows/makefiles/defs.make
+++ b/hotspot/make/windows/makefiles/defs.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -107,6 +107,19 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
endif
endif
+# On 32 bit windows we build server, client and kernel, on 64 bit just server.
+ifeq ($(JVM_VARIANTS),)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ JVM_VARIANTS:=client,server,kernel
+ JVM_VARIANT_CLIENT:=true
+ JVM_VARIANT_SERVER:=true
+ JVM_VARIANT_KERNEL:=true
+ else
+ JVM_VARIANTS:=server
+ JVM_VARIANT_SERVER:=true
+ endif
+endif
+
JDK_INCLUDE_SUBDIR=win32
# Library suffix
@@ -177,23 +190,28 @@ EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
-EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
-ifeq ($(ARCH_DATA_MODEL), 32)
+ifeq ($(JVM_VARIANT_SERVER),true)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
+ EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
+endif
+ifeq ($(JVM_VARIANT_CLIENT),true)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
- # kernel vm
+endif
+ifeq ($(JVM_VARIANT_KERNEL),true)
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
endif
+EXPORT_LIST += $(EXPORT_JRE_LIB_DIR)/wb.jar
+
ifeq ($(BUILD_WIN_SA), 1)
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
@@ -202,3 +220,19 @@ ifeq ($(BUILD_WIN_SA), 1)
# Must pass this down to nmake.
MAKE_ARGS += BUILD_WIN_SA=1
endif
+
+# Propagate compiler and tools paths from configure to nmake.
+# Need to make sure they contain \\ and not /.
+ifneq ($(SPEC),)
+ ifeq ($(USING_CYGWIN), true)
+ MAKE_ARGS += CXX="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(CXX)))"
+ MAKE_ARGS += LD="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(LD)))"
+ MAKE_ARGS += RC="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(RC)))"
+ MAKE_ARGS += MT="$(subst /,\\,$(shell /bin/cygpath -s -m -a $(MT)))"
+ else
+ MAKE_ARGS += CXX="$(subst /,\\,$(CXX))"
+ MAKE_ARGS += LD="$(subst /,\\,$(LD))"
+ MAKE_ARGS += RC="$(subst /,\\,$(RC))"
+ MAKE_ARGS += MT="$(subst /,\\,$(MT))"
+ endif
+endif
diff --git a/hotspot/make/windows/makefiles/fastdebug.make b/hotspot/make/windows/makefiles/fastdebug.make
index b9e828b..d7d2cf0 100644
--- a/hotspot/make/windows/makefiles/fastdebug.make
+++ b/hotspot/make/windows/makefiles/fastdebug.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,12 @@ GENERATED=../generated
BUILD_PCH_FILE=_build_pch_file.obj
!endif
-default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
+default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA wb
!include ../local.make
!include compile.make
-CPP_FLAGS=$(CPP_FLAGS) $(FASTDEBUG_OPT_OPTION)
+CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION)
!include $(WorkSpace)/make/windows/makefiles/vm.make
!include local.make
@@ -52,8 +52,8 @@ vm.def: $(Obj_Files)
sh $(WorkSpace)/make/windows/build_vm_def.sh
$(AOUT): $(Res_Files) $(Obj_Files) vm.def
- $(LINK) @<<
- $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
+ $(LD) @<<
+ $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
<<
!if "$(MT)" != ""
# The previous link command created a .manifest file that we want to
@@ -65,3 +65,4 @@ $(AOUT): $(Res_Files) $(Obj_Files) vm.def
!include $(WorkSpace)/make/windows/makefiles/shared.make
!include $(WorkSpace)/make/windows/makefiles/sa.make
!include $(WorkSpace)/make/windows/makefiles/launcher.make
+!include $(WorkSpace)/make/windows/makefiles/wb.make
diff --git a/hotspot/make/windows/makefiles/launcher.make b/hotspot/make/windows/makefiles/launcher.make
index 2a5df63..90485aa 100644
--- a/hotspot/make/windows/makefiles/launcher.make
+++ b/hotspot/make/windows/makefiles/launcher.make
@@ -23,7 +23,7 @@
#
-LAUNCHER_FLAGS=$(CPP_FLAGS) $(ARCHFLAG) \
+LAUNCHER_FLAGS=$(CXX_FLAGS) $(ARCHFLAG) \
/D FULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
/D JDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
/D JDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \
@@ -39,18 +39,18 @@ LAUNCHER_FLAGS=$(CPP_FLAGS) $(ARCHFLAG) \
/I $(WorkSpace)\src\cpu\$(Platform_arch)\vm \
/I $(WorkSpace)\src\os\windows\vm
-LINK_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console
+LD_FLAGS=/manifest $(HS_INTERNAL_NAME).lib kernel32.lib user32.lib /nologo /machine:$(MACHINE) /map /debug /subsystem:console
!if "$(COMPILER_NAME)" == "VS2005"
# This VS2005 compiler has /GS as a default and requires bufferoverflowU.lib
# on the link command line, otherwise we get missing __security_check_cookie
# externals at link time. Even with /GS-, you need bufferoverflowU.lib.
BUFFEROVERFLOWLIB = bufferoverflowU.lib
-LINK_FLAGS = $(LINK_FLAGS) $(BUFFEROVERFLOWLIB)
+LD_FLAGS = $(LD_FLAGS) $(BUFFEROVERFLOWLIB)
!endif
!if "$(COMPILER_NAME)" == "VS2010" && "$(BUILDARCH)" == "i486"
-LINK_FLAGS = /SAFESEH $(LINK_FLAGS)
+LD_FLAGS = /SAFESEH $(LD_FLAGS)
!endif
LAUNCHERDIR = $(WorkSpace)/src/os/windows/launcher
@@ -60,14 +60,14 @@ OUTDIR = launcher
{$(LAUNCHERDIR)}.c{$(OUTDIR)}.obj:
-mkdir $(OUTDIR) 2>NUL >NUL
- $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
+ $(CXX) $(LAUNCHER_FLAGS) /c /Fo$@ $<
{$(LAUNCHERDIR_SHARE)}.c{$(OUTDIR)}.obj:
-mkdir $(OUTDIR) 2>NUL >NUL
- $(CPP) $(LAUNCHER_FLAGS) /c /Fo$@ $<
+ $(CXX) $(LAUNCHER_FLAGS) /c /Fo$@ $<
$(OUTDIR)\*.obj: $(LAUNCHERDIR)\*.c $(LAUNCHERDIR)\*.h $(LAUNCHERDIR_SHARE)\*.c $(LAUNCHERDIR_SHARE)\*.h
launcher: $(OUTDIR)\java.obj $(OUTDIR)\java_md.obj $(OUTDIR)\jli_util.obj
echo $(JAVA_HOME) > jdkpath.txt
- $(LINK) $(LINK_FLAGS) /out:hotspot.exe $**
+ $(LD) $(LD_FLAGS) /out:hotspot.exe $**
diff --git a/hotspot/make/windows/makefiles/product.make b/hotspot/make/windows/makefiles/product.make
index 182f1f2..4799c7a 100644
--- a/hotspot/make/windows/makefiles/product.make
+++ b/hotspot/make/windows/makefiles/product.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,12 @@ GENERATED=../generated
BUILD_PCH_FILE=_build_pch_file.obj
!endif
-default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
+default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA wb
!include ../local.make
!include compile.make
-CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION)
+CXX_FLAGS=$(CXX_FLAGS) $(PRODUCT_OPT_OPTION)
RELEASE=
@@ -54,16 +54,16 @@ $(Res_Files): FORCE
# Kernel doesn't need exported vtbl symbols.
!if "$(Variant)" == "kernel"
$(AOUT): $(Res_Files) $(Obj_Files)
- $(LINK) @<<
- $(LINK_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files)
+ $(LD) @<<
+ $(LD_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files)
<<
!else
vm.def: $(Obj_Files)
sh $(WorkSpace)/make/windows/build_vm_def.sh
$(AOUT): $(Res_Files) $(Obj_Files) vm.def
- $(LINK) @<<
- $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
+ $(LD) @<<
+ $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
<<
!endif
!if "$(MT)" != ""
@@ -76,3 +76,4 @@ $(AOUT): $(Res_Files) $(Obj_Files) vm.def
!include $(WorkSpace)/make/windows/makefiles/shared.make
!include $(WorkSpace)/make/windows/makefiles/sa.make
!include $(WorkSpace)/make/windows/makefiles/launcher.make
+!include $(WorkSpace)/make/windows/makefiles/wb.make
diff --git a/hotspot/make/windows/makefiles/projectcreator.make b/hotspot/make/windows/makefiles/projectcreator.make
index 3a6f9aa..0c110f9 100644
--- a/hotspot/make/windows/makefiles/projectcreator.make
+++ b/hotspot/make/windows/makefiles/projectcreator.make
@@ -89,7 +89,7 @@ ProjectCreatorIDEOptions=\
-jdkTargetRoot $(HOTSPOTJDKDIST) \
-define ALIGN_STACK_FRAMES \
-define VM_LITTLE_ENDIAN \
- -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LINK_VER)" \
+ -prelink "" "Generating vm.def..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) set JAVA_HOME=$(HOTSPOTJDKDIST) $(HOTSPOTMKSHOME)\sh $(HOTSPOTWORKSPACE)\make\windows\build_vm_def.sh $(LD_VER)" \
-postbuild "" "Building hotspot.exe..." "cd $(HOTSPOTBUILDSPACE)\%f\%b set HOTSPOTMKSHOME=$(HOTSPOTMKSHOME) nmake -f $(HOTSPOTWORKSPACE)\make\windows\projectfiles\common\Makefile LOCAL_MAKE=$(HOTSPOTBUILDSPACE)\%f\local.make JAVA_HOME=$(HOTSPOTJDKDIST) launcher" \
-ignoreFile jsig.c \
-ignoreFile jvmtiEnvRecommended.cpp \
diff --git a/hotspot/make/windows/makefiles/sa.make b/hotspot/make/windows/makefiles/sa.make
index ac59711..2bea4da 100644
--- a/hotspot/make/windows/makefiles/sa.make
+++ b/hotspot/make/windows/makefiles/sa.make
@@ -91,16 +91,16 @@ SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 $(GX_OPTION) /Od /D "WIN32" /D "WIN
!if "$(COMPILER_NAME)" == "VS2005"
# On amd64, VS2005 compiler requires bufferoverflowU.lib on the link command line,
# otherwise we get missing __security_check_cookie externals at link time.
-SA_LINK_FLAGS = bufferoverflowU.lib
+SA_LD_FLAGS = bufferoverflowU.lib
!endif
!else
SA_CFLAGS = /nologo $(MS_RUNTIME_OPTION) /W3 /Gm $(GX_OPTION) /ZI /Od /D "WIN32" /D "_WINDOWS" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
!endif
!if "$(MT)" != ""
-SA_LINK_FLAGS = /manifest $(SA_LINK_FLAGS)
+SA_LD_FLAGS = /manifest $(SA_LD_FLAGS)
!endif
SASRCFILE = $(AGENT_DIR)/src/os/win32/windbg/sawindbg.cpp
-SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE)
+SA_LFLAGS = $(SA_LD_FLAGS) /nologo /subsystem:console /map /debug /machine:$(MACHINE)
# Note that we do not keep sawindbj.obj around as it would then
# get included in the dumpbin command in build_vm_def.sh
@@ -110,14 +110,14 @@ SA_LFLAGS = $(SA_LINK_FLAGS) /nologo /subsystem:console /map /debug /machine:$(M
# Use ";#2" for .dll and ";#1" for .exe in the MT command below:
$(SAWINDBG): $(SASRCFILE)
set INCLUDE=$(SA_INCLUDE)$(INCLUDE)
- $(CPP) @<<
+ $(CXX) @<<
/I"$(BootStrapDir)/include" /I"$(BootStrapDir)/include/win32"
/I"$(GENERATED)" $(SA_CFLAGS)
$(SASRCFILE)
/out:sawindbg.obj
<<
set LIB=$(SA_LIB)$(LIB)
- $(LINK) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS)
+ $(LD) /out:$@ /DLL sawindbg.obj dbgeng.lib $(SA_LFLAGS)
!if "$(MT)" != ""
$(MT) /manifest $(@F).manifest /outputresource:$(@F);#2
!endif
diff --git a/hotspot/make/windows/makefiles/sanity.make b/hotspot/make/windows/makefiles/sanity.make
index 99f98d7..23e8f4b 100644
--- a/hotspot/make/windows/makefiles/sanity.make
+++ b/hotspot/make/windows/makefiles/sanity.make
@@ -31,5 +31,5 @@ checkCL:
echo *** WARNING *** unrecognized cl.exe version $(MSC_VER) ($(RAW_MSC_VER)). Use FORCE_MSC_VER to override automatic detection.
checkLink:
- @ if "$(LINK_VER)" NEQ "710" if "$(LINK_VER)" NEQ "800" if "$(LINK_VER)" NEQ "900" if "$(LINK_VER)" NEQ "1000" \
- echo *** WARNING *** unrecognized link.exe version $(LINK_VER) ($(RAW_LINK_VER)). Use FORCE_LINK_VER to override automatic detection.
+ @ if "$(LD_VER)" NEQ "710" if "$(LD_VER)" NEQ "800" if "$(LD_VER)" NEQ "900" if "$(LD_VER)" NEQ "1000" \
+ echo *** WARNING *** unrecognized link.exe version $(LD_VER) ($(RAW_LD_VER)). Use FORCE_LD_VER to override automatic detection.
diff --git a/hotspot/make/windows/makefiles/shared.make b/hotspot/make/windows/makefiles/shared.make
index 3ab35a1..cf01423 100644
--- a/hotspot/make/windows/makefiles/shared.make
+++ b/hotspot/make/windows/makefiles/shared.make
@@ -30,8 +30,8 @@ default:: $(SUBDIRS)
DIR=.
!endif
-!ifndef CPP
-CPP=cl.exe
+!ifndef CXX
+CXX=cl.exe
!endif
diff --git a/hotspot/make/windows/makefiles/vm.make b/hotspot/make/windows/makefiles/vm.make
index 821c24a..53333bd 100644
--- a/hotspot/make/windows/makefiles/vm.make
+++ b/hotspot/make/windows/makefiles/vm.make
@@ -32,12 +32,12 @@ ALTSRC=$(WorkSpace)\src\closed
!ifdef RELEASE
!ifdef DEVELOP
-CPP_FLAGS=$(CPP_FLAGS) /D "DEBUG"
+CXX_FLAGS=$(CXX_FLAGS) /D "DEBUG"
!else
-CPP_FLAGS=$(CPP_FLAGS) /D "PRODUCT"
+CXX_FLAGS=$(CXX_FLAGS) /D "PRODUCT"
!endif
!else
-CPP_FLAGS=$(CPP_FLAGS) /D "ASSERT"
+CXX_FLAGS=$(CXX_FLAGS) /D "ASSERT"
!endif
!if "$(Variant)" == "core"
@@ -45,19 +45,19 @@ CPP_FLAGS=$(CPP_FLAGS) /D "ASSERT"
!endif
!if "$(Variant)" == "kernel"
-CPP_FLAGS=$(CPP_FLAGS) /D "KERNEL"
+CXX_FLAGS=$(CXX_FLAGS) /D "KERNEL"
!endif
!if "$(Variant)" == "compiler1"
-CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1"
+CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1"
!endif
!if "$(Variant)" == "compiler2"
-CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER2"
+CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER2"
!endif
!if "$(Variant)" == "tiered"
-CPP_FLAGS=$(CPP_FLAGS) /D "COMPILER1" /D "COMPILER2"
+CXX_FLAGS=$(CXX_FLAGS) /D "COMPILER1" /D "COMPILER2"
!endif
!if "$(BUILDARCH)" == "i486"
@@ -67,21 +67,21 @@ HOTSPOT_LIB_ARCH=$(BUILDARCH)
!endif
# The following variables are defined in the generated local.make file.
-CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\""
-CPP_FLAGS=$(CPP_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
-CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
-CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
-CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
-CPP_FLAGS=$(CPP_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_RELEASE_VERSION=\"$(HS_BUILD_VER)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "JRE_RELEASE_VERSION=\"$(JRE_RELEASE_VER)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_LIB_ARCH=\"$(HOTSPOT_LIB_ARCH)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
!ifndef JAVASE_EMBEDDED
-CPP_FLAGS=$(CPP_FLAGS) /D "INCLUDE_TRACE"
+CXX_FLAGS=$(CXX_FLAGS) /D "INCLUDE_TRACE"
!endif
-CPP_FLAGS=$(CPP_FLAGS) $(CPP_INCLUDE_DIRS)
+CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
# Define that so jni.h is on correct side
-CPP_FLAGS=$(CPP_FLAGS) /D "_JNI_IMPLEMENTATION_"
+CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
!if "$(BUILDARCH)" == "ia64"
STACK_SIZE="/STACK:1048576,262144"
@@ -102,7 +102,7 @@ AGCT_EXPORT=/export:AsyncGetCallTrace
# If you modify exports below please do the corresponding changes in
# src/share/tools/ProjectCreator/WinGammaPlatformVC7.java
-LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
+LD_FLAGS=$(LD_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
/export:JNI_GetDefaultJavaVMInitArgs \
/export:JNI_CreateJavaVM \
/export:JVM_FindClassFromBootLoader \
@@ -119,25 +119,25 @@ LINK_FLAGS=$(LINK_FLAGS) $(STACK_SIZE) /subsystem:windows /dll /base:0x8000000 \
/export:JVM_InitAgentProperties \
/export:JVM_ExtendBootClassPath
-CPP_INCLUDE_DIRS=/I "..\generated"
+CXX_INCLUDE_DIRS=/I "..\generated"
!if exists($(ALTSRC)\share\vm)
-CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
+CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\share\vm"
!endif
!if exists($(ALTSRC)\os\windows\vm)
-CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
+CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os\windows\vm"
!endif
!if exists($(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm)
-CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
+CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm"
!endif
!if exists($(ALTSRC)\cpu\$(Platform_arch)\vm)
-CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
+CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) /I "$(ALTSRC)\cpu\$(Platform_arch)\vm"
!endif
-CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \
+CXX_INCLUDE_DIRS=$(CXX_INCLUDE_DIRS) \
/I "$(COMMONSRC)\share\vm" \
/I "$(COMMONSRC)\share\vm\precompiled" \
/I "$(COMMONSRC)\share\vm\prims" \
@@ -145,12 +145,12 @@ CPP_INCLUDE_DIRS=$(CPP_INCLUDE_DIRS) \
/I "$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm" \
/I "$(COMMONSRC)\cpu\$(Platform_arch)\vm"
-CPP_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
+CXX_DONT_USE_PCH=/D DONT_USE_PRECOMPILED_HEADER
!if "$(USE_PRECOMPILED_HEADER)" != "0"
-CPP_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
+CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp"
!else
-CPP_USE_PCH=$(CPP_DONT_USE_PCH)
+CXX_USE_PCH=$(CXX_DONT_USE_PCH)
!endif
# Where to find the source code for the virtual machine (is this used?)
@@ -195,101 +195,101 @@ VM_PATH={$(VM_PATH)}
# Special case files not using precompiled header files.
c1_RInfo_$(Platform_arch).obj: $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\cpu\$(Platform_arch)\vm\c1_RInfo_$(Platform_arch).cpp
os_windows.obj: $(WorkSpace)\src\os\windows\vm\os_windows.cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\os_windows.cpp
os_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\os_windows_$(Platform_arch).cpp
osThread_windows.obj: $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\osThread_windows.cpp
conditionVar_windows.obj: $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os\windows\vm\conditionVar_windows.cpp
getThread_windows_$(Platform_arch).obj: $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\os_cpu\windows_$(Platform_arch)\vm\getThread_windows_$(Platform_arch).cpp
opcodes.obj: $(WorkSpace)\src\share\vm\opto\opcodes.cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\opto\opcodes.cpp
bytecodeInterpreter.obj: $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c $(WorkSpace)\src\share\vm\interpreter\bytecodeInterpreter.cpp
bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
- $(CPP) $(CPP_FLAGS) $(CPP_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
+ $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp
# Default rules for the Virtual Machine
{$(COMMONSRC)\share\vm\c1}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\compiler}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\code}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\interpreter}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\ci}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\classfile}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\gc_implementation\shared}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\gc_implementation\g1}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\gc_interface}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\asm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\memory}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\oops}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\prims}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\runtime}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\services}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\trace}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\utilities}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\libadt}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\share\vm\opto}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\os\windows\vm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
# This guy should remain a single colon rule because
# otherwise we can't specify the output filename.
@@ -297,113 +297,113 @@ bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWi
@$(RC) $(RC_FLAGS) /fo"$@" $<
{$(COMMONSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(COMMONSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\c1}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\compiler}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\code}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\interpreter}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\ci}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\classfile}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\gc_implementation\parallelScavenge}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\gc_implementation\shared}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\gc_implementation\parNew}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\gc_implementation\concurrentMarkSweep}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\gc_implementation\g1}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\gc_interface}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\asm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\memory}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\oops}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\prims}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\runtime}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\services}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\trace}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\utilities}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\libadt}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\opto}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\os\windows\vm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
# otherwise we can't specify the output filename.
{$(ALTSRC)\os\windows\vm}.rc.res:
@$(RC) $(RC_FLAGS) /fo"$@" $<
{$(ALTSRC)\cpu\$(Platform_arch)\vm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\os_cpu\windows_$(Platform_arch)\vm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{..\generated\incls}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{..\generated\adfiles}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{..\generated\jvmtifiles}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\jfr}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\jfr\agent}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\jfr\agent\isolated_deps\util}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
{$(ALTSRC)\share\vm\jfr\jvm}.cpp.obj::
- $(CPP) $(CPP_FLAGS) $(CPP_USE_PCH) /c $<
+ $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
default::
_build_pch_file.obj:
@echo #include "precompiled.hpp" > ../generated/_build_pch_file.cpp
- $(CPP) $(CPP_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
+ $(CXX) $(CXX_FLAGS) /Fp"vm.pch" /Yc"precompiled.hpp" /c ../generated/_build_pch_file.cpp
diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp b/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp
index 44713a0..d3437ce 100644
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2134,6 +2134,7 @@ public:
// address pseudos: make these names unlike instruction names to avoid confusion
inline intptr_t load_pc_address( Register reg, int bytes_to_skip );
inline void load_contents(const AddressLiteral& addrlit, Register d, int offset = 0);
+ inline void load_bool_contents(const AddressLiteral& addrlit, Register d, int offset = 0);
inline void load_ptr_contents(const AddressLiteral& addrlit, Register d, int offset = 0);
inline void store_contents(Register s, const AddressLiteral& addrlit, Register temp, int offset = 0);
inline void store_ptr_contents(Register s, const AddressLiteral& addrlit, Register temp, int offset = 0);
@@ -2220,7 +2221,7 @@ public:
// traps as per trap.h (SPARC ABI?)
void breakpoint_trap();
- void breakpoint_trap(Condition c, CC cc = icc);
+ void breakpoint_trap(Condition c, CC cc);
void flush_windows_trap();
void clean_windows_trap();
void get_psr_trap();
@@ -2249,7 +2250,7 @@ public:
// this platform we assume byte size
inline void stbool(Register d, const Address& a) { stb(d, a); }
- inline void ldbool(const Address& a, Register d) { ldsb(a, d); }
+ inline void ldbool(const Address& a, Register d) { ldub(a, d); }
inline void movbool( bool boolconst, Register d) { mov( (int) boolconst, d); }
// klass oop manipulations if compressed
diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp b/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
index d9b1aa5..fce5c37 100644
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -692,6 +692,17 @@ inline void MacroAssembler::load_contents(const AddressLiteral& addrlit, Registe
}
+inline void MacroAssembler::load_bool_contents(const AddressLiteral& addrlit, Register d, int offset) {
+ assert_not_delayed();
+ if (ForceUnreachable) {
+ patchable_sethi(addrlit, d);
+ } else {
+ sethi(addrlit, d);
+ }
+ ldub(d, addrlit.low10() + offset, d);
+}
+
+
inline void MacroAssembler::load_ptr_contents(const AddressLiteral& addrlit, Register d, int offset) {
assert_not_delayed();
if (ForceUnreachable) {
diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
index 837488c..c38b82b 100644
--- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
@@ -472,7 +472,7 @@ void G1UnsafeGetObjSATBBarrierStub::emit_code(LIR_Assembler* ce) {
__ load_klass(src_reg, tmp_reg);
Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset());
- __ ld(ref_type_adr, tmp_reg);
+ __ ldub(ref_type_adr, tmp_reg);
// _reference_type field is of type ReferenceType (enum)
assert(REF_NONE == 0, "check this code");
diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
index 565fdee..904489e 100644
--- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
@@ -3231,6 +3231,26 @@ void LIR_Assembler::membar_release() {
// no-op on TSO
}
+void LIR_Assembler::membar_loadload() {
+ // no-op
+ //__ membar(Assembler::Membar_mask_bits(Assembler::loadload));
+}
+
+void LIR_Assembler::membar_storestore() {
+ // no-op
+ //__ membar(Assembler::Membar_mask_bits(Assembler::storestore));
+}
+
+void LIR_Assembler::membar_loadstore() {
+ // no-op
+ //__ membar(Assembler::Membar_mask_bits(Assembler::loadstore));
+}
+
+void LIR_Assembler::membar_storeload() {
+ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
+}
+
+
// Pack two sequential registers containing 32 bit values
// into a single 64 bit register.
// src and src->successor() are packed into dst
diff --git a/hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp b/hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp
index f9d6684..68ecfef 100644
--- a/hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/c2_globals_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ define_pd_global(bool, ProfileInterpreter, false);
#else
define_pd_global(bool, ProfileInterpreter, true);
#endif // CC_INTERP
-define_pd_global(bool, TieredCompilation, true);
+define_pd_global(bool, TieredCompilation, trueInTiered);
define_pd_global(intx, CompileThreshold, 10000);
define_pd_global(intx, BackEdgeThreshold, 140000);
diff --git a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
index f402d62..f85d4e3 100644
--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
@@ -1187,7 +1187,7 @@ void CppInterpreterGenerator::generate_compute_interpreter_state(const Register
#ifdef ASSERT
__ tst(O1);
- __ breakpoint_trap(Assembler::zero);
+ __ breakpoint_trap(Assembler::zero, Assembler::ptr_cc);
#endif // ASSERT
const int entry_size = frame::interpreter_frame_monitor_size() * wordSize;
diff --git a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
index 83fd371..1acc457 100644
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* 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 @@
#include "oops/markOop.hpp"
#include "oops/methodOop.hpp"
#include "oops/oop.inline.hpp"
+#include "prims/methodHandles.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/javaCalls.hpp"
@@ -810,7 +811,7 @@ intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
}
-#ifdef ASSERT
+#ifndef PRODUCT
#define DESCRIBE_FP_OFFSET(name) \
values.describe(frame_no, fp() + frame::name##_offset, #name)
@@ -820,11 +821,19 @@ void frame::describe_pd(FrameValues& values, int frame_no) {
values.describe(frame_no, sp() + w, err_msg("register save area word %d", w), 1);
}
- if (is_interpreted_frame()) {
+ if (is_ricochet_frame()) {
+ MethodHandles::RicochetFrame::describe(this, values, frame_no);
+ } else if (is_interpreted_frame()) {
DESCRIBE_FP_OFFSET(interpreter_frame_d_scratch_fp);
DESCRIBE_FP_OFFSET(interpreter_frame_l_scratch_fp);
DESCRIBE_FP_OFFSET(interpreter_frame_padding);
DESCRIBE_FP_OFFSET(interpreter_frame_oop_temp);
+
+ // esp, according to Lesp (e.g. not depending on bci), if seems valid
+ intptr_t* esp = *interpreter_frame_esp_addr();
+ if ((esp >= sp()) && (esp < fp())) {
+ values.describe(-1, esp, "*Lesp");
+ }
}
if (!is_compiled_frame()) {
@@ -844,4 +853,3 @@ intptr_t *frame::initial_deoptimization_info() {
// unused... but returns fp() to minimize changes introduced by 7087445
return fp();
}
-
diff --git a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
index 42a51bd..dca0441 100644
--- a/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/globals_sparc.hpp
@@ -56,14 +56,15 @@ define_pd_global(intx, InlineSmallCode, 1500);
// Stack slots are 2X larger in LP64 than in the 32 bit VM.
define_pd_global(intx, ThreadStackSize, 1024);
define_pd_global(intx, VMThreadStackSize, 1024);
+define_pd_global(intx, StackShadowPages, 10 DEBUG_ONLY(+1));
#else
define_pd_global(intx, ThreadStackSize, 512);
define_pd_global(intx, VMThreadStackSize, 512);
+define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+1));
#endif
define_pd_global(intx, StackYellowPages, 2);
define_pd_global(intx, StackRedPages, 1);
-define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+1));
define_pd_global(intx, PreInflateSpin, 40); // Determined by running design center
diff --git a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
index 1627685..9adb9d9 100644
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -177,7 +177,7 @@ void MethodHandles::RicochetFrame::generate_ricochet_blob(MacroAssembler* _masm,
BLOCK_COMMENT("ricochet_blob.bounce");
if (VerifyMethodHandles) RicochetFrame::verify_clean(_masm);
- trace_method_handle(_masm, "ricochet_blob.bounce");
+ trace_method_handle(_masm, "return/ricochet_blob.bounce");
__ JMP(L1_continuation, 0);
__ delayed()->nop();
@@ -268,14 +268,16 @@ void MethodHandles::RicochetFrame::leave_ricochet_frame(MacroAssembler* _masm,
}
// Emit code to verify that FP is pointing at a valid ricochet frame.
-#ifdef ASSERT
+#ifndef PRODUCT
enum {
ARG_LIMIT = 255, SLOP = 45,
// use this parameter for checking for garbage stack movements:
UNREASONABLE_STACK_MOVE = (ARG_LIMIT + SLOP)
// the slop defends against false alarms due to fencepost errors
};
+#endif
+#ifdef ASSERT
void MethodHandles::RicochetFrame::verify_clean(MacroAssembler* _masm) {
// The stack should look like this:
// ... keep1 | dest=42 | keep2 | magic | handler | magic | recursive args | [RF]
@@ -1001,31 +1003,142 @@ void MethodHandles::move_return_value(MacroAssembler* _masm, BasicType type,
}
#ifndef PRODUCT
+void MethodHandles::RicochetFrame::describe(const frame* fr, FrameValues& values, int frame_no) {
+ RicochetFrame* rf = new RicochetFrame(*fr);
+
+ // ricochet slots (kept in registers for sparc)
+ values.describe(frame_no, rf->register_addr(I5_savedSP), err_msg("exact_sender_sp reg for #%d", frame_no));
+ values.describe(frame_no, rf->register_addr(L5_conversion), err_msg("conversion reg for #%d", frame_no));
+ values.describe(frame_no, rf->register_addr(L4_saved_args_base), err_msg("saved_args_base reg for #%d", frame_no));
+ values.describe(frame_no, rf->register_addr(L3_saved_args_layout), err_msg("saved_args_layout reg for #%d", frame_no));
+ values.describe(frame_no, rf->register_addr(L2_saved_target), err_msg("saved_target reg for #%d", frame_no));
+ values.describe(frame_no, rf->register_addr(L1_continuation), err_msg("continuation reg for #%d", frame_no));
+
+ // relevant ricochet targets (in caller frame)
+ values.describe(-1, rf->saved_args_base(), err_msg("*saved_args_base for #%d", frame_no));
+ values.describe(-1, (intptr_t *)(STACK_BIAS+(uintptr_t)rf->exact_sender_sp()), err_msg("*exact_sender_sp+STACK_BIAS for #%d", frame_no));
+}
+#endif // ASSERT
+
+#ifndef PRODUCT
extern "C" void print_method_handle(oop mh);
void trace_method_handle_stub(const char* adaptername,
oopDesc* mh,
- intptr_t* saved_sp) {
+ intptr_t* saved_sp,
+ intptr_t* args,
+ intptr_t* tracing_fp) {
bool has_mh = (strstr(adaptername, "return/") == NULL); // return adapters don't have mh
- tty->print_cr("MH %s mh="INTPTR_FORMAT " saved_sp=" INTPTR_FORMAT, adaptername, (intptr_t) mh, saved_sp);
- if (has_mh)
+
+ tty->print_cr("MH %s mh="INTPTR_FORMAT " saved_sp=" INTPTR_FORMAT " args=" INTPTR_FORMAT, adaptername, (intptr_t) mh, saved_sp, args);
+
+ if (Verbose) {
+ // dumping last frame with frame::describe
+
+ JavaThread* p = JavaThread::active();
+
+ ResourceMark rm;
+ PRESERVE_EXCEPTION_MARK; // may not be needed by safer and unexpensive here
+ FrameValues values;
+
+ // Note: We want to allow trace_method_handle from any call site.
+ // While trace_method_handle creates a frame, it may be entered
+ // without a valid return PC in O7 (e.g. not just after a call).
+ // Walking that frame could lead to failures due to that invalid PC.
+ // => carefully detect that frame when doing the stack walking
+
+ // walk up to the right frame using the "tracing_fp" argument
+ intptr_t* cur_sp = StubRoutines::Sparc::flush_callers_register_windows_func()();
+ frame cur_frame(cur_sp, frame::unpatchable, NULL);
+
+ while (cur_frame.fp() != (intptr_t *)(STACK_BIAS+(uintptr_t)tracing_fp)) {
+ cur_frame = os::get_sender_for_C_frame(&cur_frame);
+ }
+
+ // safely create a frame and call frame::describe
+ intptr_t *dump_sp = cur_frame.sender_sp();
+ intptr_t *dump_fp = cur_frame.link();
+
+ bool walkable = has_mh; // whether the traced frame shoud be walkable
+
+ // the sender for cur_frame is the caller of trace_method_handle
+ if (walkable) {
+ // The previous definition of walkable may have to be refined
+ // if new call sites cause the next frame constructor to start
+ // failing. Alternatively, frame constructors could be
+ // modified to support the current or future non walkable
+ // frames (but this is more intrusive and is not considered as
+ // part of this RFE, which will instead use a simpler output).
+ frame dump_frame = frame(dump_sp,
+ cur_frame.sp(), // younger_sp
+ false); // no adaptation
+ dump_frame.describe(values, 1);
+ } else {
+ // Robust dump for frames which cannot be constructed from sp/younger_sp
+ // Add descriptions without building a Java frame to avoid issues
+ values.describe(-1, dump_fp, "fp for #1 <not parsed, cannot trust pc>");
+ values.describe(-1, dump_sp, "sp");
+ }
+
+ bool has_args = has_mh; // whether Gargs is meaningful
+
+ // mark args, if seems valid (may not be valid for some adapters)
+ if (has_args) {
+ if ((args >= dump_sp) && (args < dump_fp)) {
+ values.describe(-1, args, "*G4_args");
+ }
+ }
+
+ // mark saved_sp, if seems valid (may not be valid for some adapters)
+ intptr_t *unbiased_sp = (intptr_t *)(STACK_BIAS+(uintptr_t)saved_sp);
+ if ((unbiased_sp >= dump_sp - UNREASONABLE_STACK_MOVE) && (unbiased_sp < dump_fp)) {
+ values.describe(-1, unbiased_sp, "*saved_sp+STACK_BIAS");
+ }
+
+ // Note: the unextended_sp may not be correct
+ tty->print_cr(" stack layout:");
+ values.print(p);
+ }
+
+ if (has_mh) {
print_method_handle(mh);
+ }
}
+
void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) {
if (!TraceMethodHandles) return;
BLOCK_COMMENT("trace_method_handle {");
// save: Gargs, O5_savedSP
- __ save_frame(16);
+ __ save_frame(16); // need space for saving required FPU state
+
__ set((intptr_t) adaptername, O0);
__ mov(G3_method_handle, O1);
__ mov(I5_savedSP, O2);
+ __ mov(Gargs, O3);
+ __ mov(I6, O4); // frame identifier for safe stack walking
+
+ // Save scratched registers that might be needed. Robustness is more
+ // important than optimizing the saves for this debug only code.
+
+ // save FP result, valid at some call sites (adapter_opt_return_float, ...)
+ Address d_save(FP, -sizeof(jdouble) + STACK_BIAS);
+ __ stf(FloatRegisterImpl::D, Ftos_d, d_save);
+ // Safely save all globals but G2 (handled by call_VM_leaf) and G7
+ // (OS reserved).
__ mov(G3_method_handle, L3);
__ mov(Gargs, L4);
__ mov(G5_method_type, L5);
- __ call_VM_leaf(L7, CAST_FROM_FN_PTR(address, trace_method_handle_stub));
+ __ mov(G6, L6);
+ __ mov(G1, L1);
+
+ __ call_VM_leaf(L2 /* for G2 */, CAST_FROM_FN_PTR(address, trace_method_handle_stub));
__ mov(L3, G3_method_handle);
__ mov(L4, Gargs);
__ mov(L5, G5_method_type);
+ __ mov(L6, G6);
+ __ mov(L1, G1);
+ __ ldf(FloatRegisterImpl::D, d_save, Ftos_d);
+
__ restore();
BLOCK_COMMENT("} trace_method_handle");
}
@@ -1250,7 +1363,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
move_typed_arg(_masm, arg_type, false,
prim_value_addr,
Address(O0_argslot, 0),
- O2_scratch); // must be an even register for !_LP64 long moves (uses O2/O3)
+ O2_scratch); // must be an even register for !_LP64 long moves (uses O2/O3)
}
if (direct_to_method) {
diff --git a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp
index 0c28510..7382b9c 100644
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -145,6 +145,8 @@ class RicochetFrame : public ResourceObj {
}
static void verify_clean(MacroAssembler* _masm) NOT_DEBUG_RETURN;
+
+ static void describe(const frame* fr, FrameValues& values, int frame_no) PRODUCT_RETURN;
};
// Additional helper methods for MethodHandles code generation:
diff --git a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
index 560ced6..bc93716 100644
--- a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -321,6 +321,16 @@ static int reg2offset(VMReg r) {
return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size;
}
+static VMRegPair reg64_to_VMRegPair(Register r) {
+ VMRegPair ret;
+ if (wordSize == 8) {
+ ret.set2(r->as_VMReg());
+ } else {
+ ret.set_pair(r->successor()->as_VMReg(), r->as_VMReg());
+ }
+ return ret;
+}
+
// ---------------------------------------------------------------------------
// Read the array of BasicTypes from a signature, and compute where the
// arguments should go. Values in the VMRegPair regs array refer to 4-byte (VMRegImpl::stack_slot_size)
@@ -1444,6 +1454,25 @@ static void move32_64(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
}
+static void move_ptr(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
+ if (src.first()->is_stack()) {
+ if (dst.first()->is_stack()) {
+ // stack to stack
+ __ ld_ptr(FP, reg2offset(src.first()) + STACK_BIAS, L5);
+ __ st_ptr(L5, SP, reg2offset(dst.first()) + STACK_BIAS);
+ } else {
+ // stack to reg
+ __ ld_ptr(FP, reg2offset(src.first()) + STACK_BIAS, dst.first()->as_Register());
+ }
+ } else if (dst.first()->is_stack()) {
+ // reg to stack
+ __ st_ptr(src.first()->as_Register(), SP, reg2offset(dst.first()) + STACK_BIAS);
+ } else {
+ __ mov(src.first()->as_Register(), dst.first()->as_Register());
+ }
+}
+
+
// An oop arg. Must pass a handle not the oop itself
static void object_move(MacroAssembler* masm,
OopMap* map,
@@ -1748,6 +1777,166 @@ static void create_inner_frame(MacroAssembler* masm, bool* already_created) {
}
}
+
+static void save_or_restore_arguments(MacroAssembler* masm,
+ const int stack_slots,
+ const int total_in_args,
+ const int arg_save_area,
+ OopMap* map,
+ VMRegPair* in_regs,
+ BasicType* in_sig_bt) {
+ // if map is non-NULL then the code should store the values,
+ // otherwise it should load them.
+ if (map != NULL) {
+ // Fill in the map
+ for (int i = 0; i < total_in_args; i++) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ if (in_regs[i].first()->is_stack()) {
+ int offset_in_older_frame = in_regs[i].first()->reg2stack() + SharedRuntime::out_preserve_stack_slots();
+ map->set_oop(VMRegImpl::stack2reg(offset_in_older_frame + stack_slots));
+ } else if (in_regs[i].first()->is_Register()) {
+ map->set_oop(in_regs[i].first());
+ } else {
+ ShouldNotReachHere();
+ }
+ }
+ }
+ }
+
+ // Save or restore double word values
+ int handle_index = 0;
+ for (int i = 0; i < total_in_args; i++) {
+ int slot = handle_index + arg_save_area;
+ int offset = slot * VMRegImpl::stack_slot_size;
+ if (in_sig_bt[i] == T_LONG && in_regs[i].first()->is_Register()) {
+ const Register reg = in_regs[i].first()->as_Register();
+ if (reg->is_global()) {
+ handle_index += 2;
+ assert(handle_index <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ stx(reg, SP, offset + STACK_BIAS);
+ } else {
+ __ ldx(SP, offset + STACK_BIAS, reg);
+ }
+ }
+ } else if (in_sig_bt[i] == T_DOUBLE && in_regs[i].first()->is_FloatRegister()) {
+ handle_index += 2;
+ assert(handle_index <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ stf(FloatRegisterImpl::D, in_regs[i].first()->as_FloatRegister(), SP, offset + STACK_BIAS);
+ } else {
+ __ ldf(FloatRegisterImpl::D, SP, offset + STACK_BIAS, in_regs[i].first()->as_FloatRegister());
+ }
+ }
+ }
+ // Save floats
+ for (int i = 0; i < total_in_args; i++) {
+ int slot = handle_index + arg_save_area;
+ int offset = slot * VMRegImpl::stack_slot_size;
+ if (in_sig_bt[i] == T_FLOAT && in_regs[i].first()->is_FloatRegister()) {
+ handle_index++;
+ assert(handle_index <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ stf(FloatRegisterImpl::S, in_regs[i].first()->as_FloatRegister(), SP, offset + STACK_BIAS);
+ } else {
+ __ ldf(FloatRegisterImpl::S, SP, offset + STACK_BIAS, in_regs[i].first()->as_FloatRegister());
+ }
+ }
+ }
+
+}
+
+
+// Check GC_locker::needs_gc and enter the runtime if it's true. This
+// keeps a new JNI critical region from starting until a GC has been
+// forced. Save down any oops in registers and describe them in an
+// OopMap.
+static void check_needs_gc_for_critical_native(MacroAssembler* masm,
+ const int stack_slots,
+ const int total_in_args,
+ const int arg_save_area,
+ OopMapSet* oop_maps,
+ VMRegPair* in_regs,
+ BasicType* in_sig_bt) {
+ __ block_comment("check GC_locker::needs_gc");
+ Label cont;
+ AddressLiteral sync_state(GC_locker::needs_gc_address());
+ __ load_bool_contents(sync_state, G3_scratch);
+ __ cmp_zero_and_br(Assembler::equal, G3_scratch, cont);
+ __ delayed()->nop();
+
+ // Save down any values that are live in registers and call into the
+ // runtime to halt for a GC
+ OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, map, in_regs, in_sig_bt);
+
+ __ mov(G2_thread, L7_thread_cache);
+
+ __ set_last_Java_frame(SP, noreg);
+
+ __ block_comment("block_for_jni_critical");
+ __ call(CAST_FROM_FN_PTR(address, SharedRuntime::block_for_jni_critical), relocInfo::runtime_call_type);
+ __ delayed()->mov(L7_thread_cache, O0);
+ oop_maps->add_gc_map( __ offset(), map);
+
+ __ restore_thread(L7_thread_cache); // restore G2_thread
+ __ reset_last_Java_frame();
+
+ // Reload all the register arguments
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, NULL, in_regs, in_sig_bt);
+
+ __ bind(cont);
+#ifdef ASSERT
+ if (StressCriticalJNINatives) {
+ // Stress register saving
+ OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, map, in_regs, in_sig_bt);
+ // Destroy argument registers
+ for (int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ const Register reg = in_regs[i].first()->as_Register();
+ if (reg->is_global()) {
+ __ mov(G0, reg);
+ }
+ } else if (in_regs[i].first()->is_FloatRegister()) {
+ __ fneg(FloatRegisterImpl::D, in_regs[i].first()->as_FloatRegister(), in_regs[i].first()->as_FloatRegister());
+ }
+ }
+
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, NULL, in_regs, in_sig_bt);
+ }
+#endif
+}
+
+// Unpack an array argument into a pointer to the body and the length
+// if the array is non-null, otherwise pass 0 for both.
+static void unpack_array_argument(MacroAssembler* masm, VMRegPair reg, BasicType in_elem_type, VMRegPair body_arg, VMRegPair length_arg) {
+ // Pass the length, ptr pair
+ Label is_null, done;
+ if (reg.first()->is_stack()) {
+ VMRegPair tmp = reg64_to_VMRegPair(L2);
+ // Load the arg up from the stack
+ move_ptr(masm, reg, tmp);
+ reg = tmp;
+ }
+ __ cmp(reg.first()->as_Register(), G0);
+ __ brx(Assembler::equal, false, Assembler::pt, is_null);
+ __ delayed()->add(reg.first()->as_Register(), arrayOopDesc::base_offset_in_bytes(in_elem_type), L4);
+ move_ptr(masm, reg64_to_VMRegPair(L4), body_arg);
+ __ ld(reg.first()->as_Register(), arrayOopDesc::length_offset_in_bytes(), L4);
+ move32_64(masm, reg64_to_VMRegPair(L4), length_arg);
+ __ ba_short(done);
+ __ bind(is_null);
+ // Pass zeros
+ move_ptr(masm, reg64_to_VMRegPair(G0), body_arg);
+ move32_64(masm, reg64_to_VMRegPair(G0), length_arg);
+ __ bind(done);
+}
+
// ---------------------------------------------------------------------------
// Generate a native wrapper for a given method. The method takes arguments
// in the Java compiled code convention, marshals them to the native
@@ -1762,6 +1951,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
BasicType *in_sig_bt,
VMRegPair *in_regs,
BasicType ret_type) {
+ bool is_critical_native = true;
+ address native_func = method->critical_native_function();
+ if (native_func == NULL) {
+ native_func = method->native_function();
+ is_critical_native = false;
+ }
+ assert(native_func != NULL, "must have function");
// Native nmethod wrappers never take possesion of the oop arguments.
// So the caller will gc the arguments. The only thing we need an
@@ -1841,22 +2037,70 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// we convert the java signature to a C signature by inserting
// the hidden arguments as arg[0] and possibly arg[1] (static method)
- int total_c_args = total_in_args + 1;
- if (method->is_static()) {
- total_c_args++;
+ int total_c_args = total_in_args;
+ int total_save_slots = 6 * VMRegImpl::slots_per_word;
+ if (!is_critical_native) {
+ total_c_args += 1;
+ if (method->is_static()) {
+ total_c_args++;
+ }
+ } else {
+ for (int i = 0; i < total_in_args; i++) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ // These have to be saved and restored across the safepoint
+ total_c_args++;
+ }
+ }
}
BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
- VMRegPair * out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
+ VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
+ BasicType* in_elem_bt = NULL;
int argc = 0;
- out_sig_bt[argc++] = T_ADDRESS;
- if (method->is_static()) {
- out_sig_bt[argc++] = T_OBJECT;
- }
+ if (!is_critical_native) {
+ out_sig_bt[argc++] = T_ADDRESS;
+ if (method->is_static()) {
+ out_sig_bt[argc++] = T_OBJECT;
+ }
- for (int i = 0; i < total_in_args ; i++ ) {
- out_sig_bt[argc++] = in_sig_bt[i];
+ for (int i = 0; i < total_in_args ; i++ ) {
+ out_sig_bt[argc++] = in_sig_bt[i];
+ }
+ } else {
+ Thread* THREAD = Thread::current();
+ in_elem_bt = NEW_RESOURCE_ARRAY(BasicType, total_in_args);
+ SignatureStream ss(method->signature());
+ for (int i = 0; i < total_in_args ; i++ ) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ // Arrays are passed as int, elem* pair
+ out_sig_bt[argc++] = T_INT;
+ out_sig_bt[argc++] = T_ADDRESS;
+ Symbol* atype = ss.as_symbol(CHECK_NULL);
+ const char* at = atype->as_C_string();
+ if (strlen(at) == 2) {
+ assert(at[0] == '[', "must be");
+ switch (at[1]) {
+ case 'B': in_elem_bt[i] = T_BYTE; break;
+ case 'C': in_elem_bt[i] = T_CHAR; break;
+ case 'D': in_elem_bt[i] = T_DOUBLE; break;
+ case 'F': in_elem_bt[i] = T_FLOAT; break;
+ case 'I': in_elem_bt[i] = T_INT; break;
+ case 'J': in_elem_bt[i] = T_LONG; break;
+ case 'S': in_elem_bt[i] = T_SHORT; break;
+ case 'Z': in_elem_bt[i] = T_BOOLEAN; break;
+ default: ShouldNotReachHere();
+ }
+ }
+ } else {
+ out_sig_bt[argc++] = in_sig_bt[i];
+ in_elem_bt[i] = T_VOID;
+ }
+ if (in_sig_bt[i] != T_VOID) {
+ assert(in_sig_bt[i] == ss.type(), "must match");
+ ss.next();
+ }
+ }
}
// Now figure out where the args must be stored and how much stack space
@@ -1866,6 +2110,35 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
int out_arg_slots;
out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args);
+ if (is_critical_native) {
+ // Critical natives may have to call out so they need a save area
+ // for register arguments.
+ int double_slots = 0;
+ int single_slots = 0;
+ for ( int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ const Register reg = in_regs[i].first()->as_Register();
+ switch (in_sig_bt[i]) {
+ case T_ARRAY:
+ case T_BOOLEAN:
+ case T_BYTE:
+ case T_SHORT:
+ case T_CHAR:
+ case T_INT: assert(reg->is_in(), "don't need to save these"); break;
+ case T_LONG: if (reg->is_global()) double_slots++; break;
+ default: ShouldNotReachHere();
+ }
+ } else if (in_regs[i].first()->is_FloatRegister()) {
+ switch (in_sig_bt[i]) {
+ case T_FLOAT: single_slots++; break;
+ case T_DOUBLE: double_slots++; break;
+ default: ShouldNotReachHere();
+ }
+ }
+ }
+ total_save_slots = double_slots * 2 + single_slots;
+ }
+
// Compute framesize for the wrapper. We need to handlize all oops in
// registers. We must create space for them here that is disjoint from
// the windowed save area because we have no control over when we might
@@ -1885,12 +2158,11 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// Now the space for the inbound oop handle area
- int oop_handle_offset = stack_slots;
- stack_slots += 6*VMRegImpl::slots_per_word;
+ int oop_handle_offset = round_to(stack_slots, 2);
+ stack_slots += total_save_slots;
// Now any space we need for handlizing a klass if static method
- int oop_temp_slot_offset = 0;
int klass_slot_offset = 0;
int klass_offset = -1;
int lock_slot_offset = 0;
@@ -1954,6 +2226,10 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
__ verify_thread();
+ if (is_critical_native) {
+ check_needs_gc_for_critical_native(masm, stack_slots, total_in_args,
+ oop_handle_offset, oop_maps, in_regs, in_sig_bt);
+ }
//
// We immediately shuffle the arguments so that any vm call we have to
@@ -1982,7 +2258,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// caller.
//
OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
- int c_arg = total_c_args - 1;
// Record sp-based slot for receiver on stack for non-static methods
int receiver_offset = -1;
@@ -2002,7 +2277,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
#endif /* ASSERT */
- for ( int i = total_in_args - 1; i >= 0 ; i--, c_arg-- ) {
+ for ( int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0 ; i--, c_arg-- ) {
#ifdef ASSERT
if (in_regs[i].first()->is_Register()) {
@@ -2019,7 +2294,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
switch (in_sig_bt[i]) {
case T_ARRAY:
+ if (is_critical_native) {
+ unpack_array_argument(masm, in_regs[i], in_elem_bt[i], out_regs[c_arg], out_regs[c_arg - 1]);
+ c_arg--;
+ break;
+ }
case T_OBJECT:
+ assert(!is_critical_native, "no oop arguments");
object_move(masm, map, oop_handle_offset, stack_slots, in_regs[i], out_regs[c_arg],
((i == 0) && (!is_static)),
&receiver_offset);
@@ -2029,7 +2310,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
case T_FLOAT:
float_move(masm, in_regs[i], out_regs[c_arg]);
- break;
+ break;
case T_DOUBLE:
assert( i + 1 < total_in_args &&
@@ -2051,7 +2332,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// Pre-load a static method's oop into O1. Used both by locking code and
// the normal JNI call code.
- if (method->is_static()) {
+ if (method->is_static() && !is_critical_native) {
__ set_oop_constant(JNIHandles::make_local(Klass::cast(method->method_holder())->java_mirror()), O1);
// Now handlize the static class mirror in O1. It's known not-null.
@@ -2064,13 +2345,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
const Register L6_handle = L6;
if (method->is_synchronized()) {
+ assert(!is_critical_native, "unhandled");
__ mov(O1, L6_handle);
}
// We have all of the arguments setup at this point. We MUST NOT touch any Oregs
// except O6/O7. So if we must call out we must push a new frame. We immediately
// push a new frame and flush the windows.
-
#ifdef _LP64
intptr_t thepc = (intptr_t) __ pc();
{
@@ -2202,32 +2483,28 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
}
// get JNIEnv* which is first argument to native
-
- __ add(G2_thread, in_bytes(JavaThread::jni_environment_offset()), O0);
+ if (!is_critical_native) {
+ __ add(G2_thread, in_bytes(JavaThread::jni_environment_offset()), O0);
+ }
// Use that pc we placed in O7 a while back as the current frame anchor
-
__ set_last_Java_frame(SP, O7);
- // Transition from _thread_in_Java to _thread_in_native.
- __ set(_thread_in_native, G3_scratch);
- __ st(G3_scratch, G2_thread, JavaThread::thread_state_offset());
-
- // We flushed the windows ages ago now mark them as flushed
-
- // mark windows as flushed
+ // We flushed the windows ages ago now mark them as flushed before transitioning.
__ set(JavaFrameAnchor::flushed, G3_scratch);
+ __ st(G3_scratch, G2_thread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::flags_offset());
- Address flags(G2_thread, JavaThread::frame_anchor_offset() + JavaFrameAnchor::flags_offset());
+ // Transition from _thread_in_Java to _thread_in_native.
+ __ set(_thread_in_native, G3_scratch);
#ifdef _LP64
- AddressLiteral dest(method->native_function());
+ AddressLiteral dest(native_func);
__ relocate(relocInfo::runtime_call_type);
__ jumpl_to(dest, O7, O7);
#else
- __ call(method->native_function(), relocInfo::runtime_call_type);
+ __ call(native_func, relocInfo::runtime_call_type);
#endif
- __ delayed()->st(G3_scratch, flags);
+ __ delayed()->st(G3_scratch, G2_thread, JavaThread::thread_state_offset());
__ restore_thread(L7_thread_cache); // restore G2_thread
@@ -2259,6 +2536,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
ShouldNotReachHere();
}
+ Label after_transition;
// must we block?
// Block, if necessary, before resuming in _thread_in_Java state.
@@ -2303,22 +2581,34 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
// a distinct one for this pc
//
save_native_result(masm, ret_type, stack_slots);
- __ call_VM_leaf(L7_thread_cache,
- CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans),
- G2_thread);
+ if (!is_critical_native) {
+ __ call_VM_leaf(L7_thread_cache,
+ CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans),
+ G2_thread);
+ } else {
+ __ call_VM_leaf(L7_thread_cache,
+ CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans_and_transition),
+ G2_thread);
+ }
// Restore any method result value
restore_native_result(masm, ret_type, stack_slots);
+
+ if (is_critical_native) {
+ // The call above performed the transition to thread_in_Java so
+ // skip the transition logic below.
+ __ ba(after_transition);
+ __ delayed()->nop();
+ }
+
__ bind(no_block);
}
// thread state is thread_in_native_trans. Any safepoint blocking has already
// happened so we can now change state to _thread_in_Java.
-
-
__ set(_thread_in_Java, G3_scratch);
__ st(G3_scratch, G2_thread, JavaThread::thread_state_offset());
-
+ __ bind(after_transition);
Label no_reguard;
__ ld(G2_thread, JavaThread::stack_guard_state_offset(), G3_scratch);
@@ -2416,12 +2706,14 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
__ verify_oop(I0);
}
- // reset handle block
- __ ld_ptr(G2_thread, in_bytes(JavaThread::active_handles_offset()), L5);
- __ st_ptr(G0, L5, JNIHandleBlock::top_offset_in_bytes());
+ if (!is_critical_native) {
+ // reset handle block
+ __ ld_ptr(G2_thread, in_bytes(JavaThread::active_handles_offset()), L5);
+ __ st_ptr(G0, L5, JNIHandleBlock::top_offset_in_bytes());
- __ ld_ptr(G2_thread, in_bytes(Thread::pending_exception_offset()), G3_scratch);
- check_forward_pending_exception(masm, G3_scratch);
+ __ ld_ptr(G2_thread, in_bytes(Thread::pending_exception_offset()), G3_scratch);
+ check_forward_pending_exception(masm, G3_scratch);
+ }
// Return
@@ -2450,6 +2742,10 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
(is_static ? in_ByteSize(klass_offset) : in_ByteSize(receiver_offset)),
in_ByteSize(lock_offset),
oop_maps);
+
+ if (is_critical_native) {
+ nm->set_lazy_critical_native(true);
+ }
return nm;
}
@@ -2473,17 +2769,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
static int fp_offset[ConcreteRegisterImpl::number_of_registers] = { 0 };
static bool offsets_initialized = false;
-static VMRegPair reg64_to_VMRegPair(Register r) {
- VMRegPair ret;
- if (wordSize == 8) {
- ret.set2(r->as_VMReg());
- } else {
- ret.set_pair(r->successor()->as_VMReg(), r->as_VMReg());
- }
- return ret;
-}
-
-
nmethod *SharedRuntime::generate_dtrace_nmethod(
MacroAssembler *masm, methodHandle method) {
@@ -3040,7 +3325,7 @@ static void gen_new_frame(MacroAssembler* masm, bool deopt) {
// make sure that the frames are aligned properly
#ifndef _LP64
__ btst(wordSize*2-1, SP);
- __ breakpoint_trap(Assembler::notZero);
+ __ breakpoint_trap(Assembler::notZero, Assembler::ptr_cc);
#endif
#endif
@@ -3122,7 +3407,7 @@ static void make_new_frames(MacroAssembler* masm, bool deopt) {
#ifdef ASSERT
// make sure that there is at least one entry in the array
__ tst(O4array_size);
- __ breakpoint_trap(Assembler::zero);
+ __ breakpoint_trap(Assembler::zero, Assembler::icc);
#endif
// Now push the new interpreter frames
@@ -3146,6 +3431,9 @@ void SharedRuntime::generate_deopt_blob() {
ResourceMark rm;
// setup code generation tools
int pad = VerifyThread ? 512 : 0;// Extra slop space for more verify code
+ if (UseStackBanging) {
+ pad += StackShadowPages*16 + 32;
+ }
#ifdef _LP64
CodeBuffer buffer("deopt_blob", 2100+pad, 512);
#else
@@ -3365,6 +3653,9 @@ void SharedRuntime::generate_uncommon_trap_blob() {
ResourceMark rm;
// setup code generation tools
int pad = VerifyThread ? 512 : 0;
+ if (UseStackBanging) {
+ pad += StackShadowPages*16 + 32;
+ }
#ifdef _LP64
CodeBuffer buffer("uncommon_trap_blob", 2700+pad, 512);
#else
diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/hotspot/src/cpu/sparc/vm/sparc.ad
index 3063b2d..e4f868b 100644
--- a/hotspot/src/cpu/sparc/vm/sparc.ad
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad
@@ -1832,6 +1832,8 @@ const bool Matcher::match_rule_supported(int opcode) {
case Op_CountLeadingZerosL:
case Op_CountTrailingZerosI:
case Op_CountTrailingZerosL:
+ case Op_PopCountI:
+ case Op_PopCountL:
if (!UsePopCountInstruction)
return false;
break;
diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
index ceb6a59..98028af 100644
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
@@ -379,7 +379,7 @@ void InterpreterGenerator::lock_method(void) {
#ifdef ASSERT
__ tst(O0);
- __ breakpoint_trap(Assembler::zero);
+ __ breakpoint_trap(Assembler::zero, Assembler::ptr_cc);
#endif // ASSERT
__ bind(done);
@@ -2050,7 +2050,7 @@ void TemplateInterpreterGenerator::stop_interpreter_at() {
AddressLiteral stop_at(&StopInterpreterAt);
__ load_ptr_contents(stop_at, G4_scratch);
__ cmp(G3_scratch, G4_scratch);
- __ breakpoint_trap(Assembler::equal);
+ __ breakpoint_trap(Assembler::equal, Assembler::icc);
}
#endif // not PRODUCT
#endif // !CC_INTERP
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
index aa5cd18..a3eb57c 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
@@ -236,6 +236,16 @@ void Assembler::emit_arith(int op1, int op2, Register dst, int32_t imm32) {
}
}
+// Force generation of a 4 byte immediate value even if it fits into 8bit
+void Assembler::emit_arith_imm32(int op1, int op2, Register dst, int32_t imm32) {
+ assert(isByte(op1) && isByte(op2), "wrong opcode");
+ assert((op1 & 0x01) == 1, "should be 32bit operation");
+ assert((op1 & 0x02) == 0, "sign-extension bit should not be set");
+ emit_byte(op1);
+ emit_byte(op2 | encode(dst));
+ emit_long(imm32);
+}
+
// immediate-to-memory forms
void Assembler::emit_arith_operand(int op1, Register rm, Address adr, int32_t imm32) {
assert((op1 & 0x01) == 1, "should be 32bit operation");
@@ -939,6 +949,7 @@ void Assembler::addl(Register dst, Register src) {
}
void Assembler::addr_nop_4() {
+ assert(UseAddressNop, "no CPU support");
// 4 bytes: NOP DWORD PTR [EAX+0]
emit_byte(0x0F);
emit_byte(0x1F);
@@ -947,6 +958,7 @@ void Assembler::addr_nop_4() {
}
void Assembler::addr_nop_5() {
+ assert(UseAddressNop, "no CPU support");
// 5 bytes: NOP DWORD PTR [EAX+EAX*0+0] 8-bits offset
emit_byte(0x0F);
emit_byte(0x1F);
@@ -956,6 +968,7 @@ void Assembler::addr_nop_5() {
}
void Assembler::addr_nop_7() {
+ assert(UseAddressNop, "no CPU support");
// 7 bytes: NOP DWORD PTR [EAX+0] 32-bits offset
emit_byte(0x0F);
emit_byte(0x1F);
@@ -964,6 +977,7 @@ void Assembler::addr_nop_7() {
}
void Assembler::addr_nop_8() {
+ assert(UseAddressNop, "no CPU support");
// 8 bytes: NOP DWORD PTR [EAX+EAX*0+0] 32-bits offset
emit_byte(0x0F);
emit_byte(0x1F);
@@ -2769,6 +2783,12 @@ void Assembler::subl(Register dst, int32_t imm32) {
emit_arith(0x81, 0xE8, dst, imm32);
}
+// Force generation of a 4 byte immediate value even if it fits into 8bit
+void Assembler::subl_imm32(Register dst, int32_t imm32) {
+ prefix(dst);
+ emit_arith_imm32(0x81, 0xE8, dst, imm32);
+}
+
void Assembler::subl(Register dst, Address src) {
InstructionMark im(this);
prefix(src, dst);
@@ -4760,6 +4780,12 @@ void Assembler::subq(Register dst, int32_t imm32) {
emit_arith(0x81, 0xE8, dst, imm32);
}
+// Force generation of a 4 byte immediate value even if it fits into 8bit
+void Assembler::subq_imm32(Register dst, int32_t imm32) {
+ (void) prefixq_and_encode(dst->encoding());
+ emit_arith_imm32(0x81, 0xE8, dst, imm32);
+}
+
void Assembler::subq(Register dst, Address src) {
InstructionMark im(this);
prefixq(src, dst);
@@ -5101,15 +5127,6 @@ void MacroAssembler::extend_sign(Register hi, Register lo) {
}
}
-void MacroAssembler::fat_nop() {
- // A 5 byte nop that is safe for patching (see patch_verified_entry)
- emit_byte(0x26); // es:
- emit_byte(0x2e); // cs:
- emit_byte(0x64); // fs:
- emit_byte(0x65); // gs:
- emit_byte(0x90);
-}
-
void MacroAssembler::jC2(Register tmp, Label& L) {
// set parity bit if FPU flag C2 is set (via rax)
save_rax(tmp);
@@ -5704,17 +5721,6 @@ void MacroAssembler::decrementq(Address dst, int value) {
/* else */ { subq(dst, value) ; return; }
}
-void MacroAssembler::fat_nop() {
- // A 5 byte nop that is safe for patching (see patch_verified_entry)
- // Recommened sequence from 'Software Optimization Guide for the AMD
- // Hammer Processor'
- emit_byte(0x66);
- emit_byte(0x66);
- emit_byte(0x90);
- emit_byte(0x66);
- emit_byte(0x90);
-}
-
void MacroAssembler::incrementq(Register reg, int value) {
if (value == min_jint) { addq(reg, value); return; }
if (value < 0) { decrementq(reg, -value); return; }
@@ -6766,6 +6772,19 @@ void MacroAssembler::enter() {
mov(rbp, rsp);
}
+// A 5 byte nop that is safe for patching (see patch_verified_entry)
+void MacroAssembler::fat_nop() {
+ if (UseAddressNop) {
+ addr_nop_5();
+ } else {
+ emit_byte(0x26); // es:
+ emit_byte(0x2e); // cs:
+ emit_byte(0x64); // fs:
+ emit_byte(0x65); // gs:
+ emit_byte(0x90);
+ }
+}
+
void MacroAssembler::fcmp(Register tmp) {
fcmp(tmp, 1, true, true);
}
@@ -7825,6 +7844,11 @@ void MacroAssembler::subptr(Register dst, int32_t imm32) {
LP64_ONLY(subq(dst, imm32)) NOT_LP64(subl(dst, imm32));
}
+// Force generation of a 4 byte immediate value even if it fits into 8bit
+void MacroAssembler::subptr_imm32(Register dst, int32_t imm32) {
+ LP64_ONLY(subq_imm32(dst, imm32)) NOT_LP64(subl_imm32(dst, imm32));
+}
+
void MacroAssembler::subptr(Register dst, Register src) {
LP64_ONLY(subq(dst, src)) NOT_LP64(subl(dst, src));
}
@@ -9292,6 +9316,80 @@ void MacroAssembler::reinit_heapbase() {
}
#endif // _LP64
+
+// C2 compiled method's prolog code.
+void MacroAssembler::verified_entry(int framesize, bool stack_bang, bool fp_mode_24b) {
+
+ // WARNING: Initial instruction MUST be 5 bytes or longer so that
+ // NativeJump::patch_verified_entry will be able to patch out the entry
+ // code safely. The push to verify stack depth is ok at 5 bytes,
+ // the frame allocation can be either 3 or 6 bytes. So if we don't do
+ // stack bang then we must use the 6 byte frame allocation even if
+ // we have no frame. :-(
+
+ assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
+ // Remove word for return addr
+ framesize -= wordSize;
+
+ // Calls to C2R adapters often do not accept exceptional returns.
+ // We require that their callers must bang for them. But be careful, because
+ // some VM calls (such as call site linkage) can use several kilobytes of
+ // stack. But the stack safety zone should account for that.
+ // See bugs 4446381, 4468289, 4497237.
+ if (stack_bang) {
+ generate_stack_overflow_check(framesize);
+
+ // We always push rbp, so that on return to interpreter rbp, will be
+ // restored correctly and we can correct the stack.
+ push(rbp);
+ // Remove word for ebp
+ framesize -= wordSize;
+
+ // Create frame
+ if (framesize) {
+ subptr(rsp, framesize);
+ }
+ } else {
+ // Create frame (force generation of a 4 byte immediate value)
+ subptr_imm32(rsp, framesize);
+
+ // Save RBP register now.
+ framesize -= wordSize;
+ movptr(Address(rsp, framesize), rbp);
+ }
+
+ if (VerifyStackAtCalls) { // Majik cookie to verify stack depth
+ framesize -= wordSize;
+ movptr(Address(rsp, framesize), (int32_t)0xbadb100d);
+ }
+
+#ifndef _LP64
+ // If method sets FPU control word do it now
+ if (fp_mode_24b) {
+ fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_24()));
+ }
+ if (UseSSE >= 2 && VerifyFPU) {
+ verify_FPU(0, "FPU stack must be clean on entry");
+ }
+#endif
+
+#ifdef ASSERT
+ if (VerifyStackAtCalls) {
+ Label L;
+ push(rax);
+ mov(rax, rsp);
+ andptr(rax, StackAlignmentInBytes-1);
+ cmpptr(rax, StackAlignmentInBytes-wordSize);
+ pop(rax);
+ jcc(Assembler::equal, L);
+ stop("Stack is not properly aligned!");
+ bind(L);
+ }
+#endif
+
+}
+
+
// IndexOf for constant substrings with size >= 8 chars
// which don't need to be loaded through stack.
void MacroAssembler::string_indexofC8(Register str1, Register str2,
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.hpp b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
index 1a2d4af..4a72da8 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
@@ -667,6 +667,8 @@ private:
void emit_arith_b(int op1, int op2, Register dst, int imm8);
void emit_arith(int op1, int op2, Register dst, int32_t imm32);
+ // Force generation of a 4 byte immediate value even if it fits into 8bit
+ void emit_arith_imm32(int op1, int op2, Register dst, int32_t imm32);
// only 32bit??
void emit_arith(int op1, int op2, Register dst, jobject obj);
void emit_arith(int op1, int op2, Register dst, Register src);
@@ -1526,6 +1528,9 @@ private:
void subq(Register dst, Address src);
void subq(Register dst, Register src);
+ // Force generation of a 4 byte immediate value even if it fits into 8bit
+ void subl_imm32(Register dst, int32_t imm32);
+ void subq_imm32(Register dst, int32_t imm32);
// Subtract Scalar Double-Precision Floating-Point Values
void subsd(XMMRegister dst, Address src);
@@ -1763,8 +1768,8 @@ class MacroAssembler: public Assembler {
// Alignment
void align(int modulus);
- // Misc
- void fat_nop(); // 5 byte nop
+ // A 5 byte nop that is safe for patching (see patch_verified_entry)
+ void fat_nop();
// Stack frame creation/removal
void enter();
@@ -2275,6 +2280,8 @@ class MacroAssembler: public Assembler {
void subptr(Register dst, Address src) { LP64_ONLY(subq(dst, src)) NOT_LP64(subl(dst, src)); }
void subptr(Register dst, int32_t src);
+ // Force generation of a 4 byte immediate value even if it fits into 8bit
+ void subptr_imm32(Register dst, int32_t src);
void subptr(Register dst, Register src);
void subptr(Register dst, RegisterOrConstant src) {
if (src.is_constant()) subptr(dst, (int) src.as_constant());
@@ -2566,6 +2573,9 @@ public:
void movl2ptr(Register dst, Address src) { LP64_ONLY(movslq(dst, src)) NOT_LP64(movl(dst, src)); }
void movl2ptr(Register dst, Register src) { LP64_ONLY(movslq(dst, src)) NOT_LP64(if (dst != src) movl(dst, src)); }
+ // C2 compiled method's prolog code.
+ void verified_entry(int framesize, bool stack_bang, bool fp_mode_24b);
+
// IndexOf strings.
// Small strings are loaded through stack if they cross page boundary.
void string_indexof(Register str1, Register str2,
diff --git a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
index fe5495d..24b879a 100644
--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
@@ -520,7 +520,7 @@ void G1UnsafeGetObjSATBBarrierStub::emit_code(LIR_Assembler* ce) {
__ load_klass(tmp_reg, src_reg);
Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset());
- __ cmpl(ref_type_adr, REF_NONE);
+ __ cmpb(ref_type_adr, REF_NONE);
__ jcc(Assembler::equal, _continuation);
// Is marking active?
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
index c745ade..b006240 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
@@ -3713,6 +3713,25 @@ void LIR_Assembler::membar_release() {
// __ store_fence();
}
+void LIR_Assembler::membar_loadload() {
+ // no-op
+ //__ membar(Assembler::Membar_mask_bits(Assembler::loadload));
+}
+
+void LIR_Assembler::membar_storestore() {
+ // no-op
+ //__ membar(Assembler::Membar_mask_bits(Assembler::storestore));
+}
+
+void LIR_Assembler::membar_loadstore() {
+ // no-op
+ //__ membar(Assembler::Membar_mask_bits(Assembler::loadstore));
+}
+
+void LIR_Assembler::membar_storeload() {
+ __ membar(Assembler::Membar_mask_bits(Assembler::StoreLoad));
+}
+
void LIR_Assembler::get_thread(LIR_Opr result_reg) {
assert(result_reg->is_register(), "check");
#ifdef _LP64
diff --git a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp
index ad50757..5ef8cf5 100644
--- a/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp
@@ -381,6 +381,16 @@ void C1_MacroAssembler::unverified_entry(Register receiver, Register ic_klass) {
void C1_MacroAssembler::verified_entry() {
+ if (C1Breakpoint || VerifyFPU || !UseStackBanging) {
+ // Verified Entry first instruction should be 5 bytes long for correct
+ // patching by patch_verified_entry().
+ //
+ // C1Breakpoint and VerifyFPU have one byte first instruction.
+ // Also first instruction will be one byte "push(rbp)" if stack banging
+ // code is not generated (see build_frame() above).
+ // For all these cases generate long instruction first.
+ fat_nop();
+ }
if (C1Breakpoint)int3();
// build frame
verify_FPU(0, "method_entry");
diff --git a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
index 5f2cf38..30df608 100644
--- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
@@ -47,6 +47,12 @@ int StubAssembler::call_RT(Register oop_result1, Register oop_result2, address e
assert(!(oop_result1->is_valid() || oop_result2->is_valid()) || oop_result1 != oop_result2, "registers must be different");
assert(oop_result1 != thread && oop_result2 != thread, "registers must be different");
assert(args_size >= 0, "illegal args_size");
+ bool align_stack = false;
+#ifdef _LP64
+ // At a method handle call, the stack may not be properly aligned
+ // when returning with an exception.
+ align_stack = (stub_id() == Runtime1::handle_exception_from_callee_id);
+#endif
#ifdef _LP64
mov(c_rarg0, thread);
@@ -59,11 +65,21 @@ int StubAssembler::call_RT(Register oop_result1, Register oop_result2, address e
push(thread);
#endif // _LP64
- set_last_Java_frame(thread, noreg, rbp, NULL);
+ int call_offset;
+ if (!align_stack) {
+ set_last_Java_frame(thread, noreg, rbp, NULL);
+ } else {
+ address the_pc = pc();
+ call_offset = offset();
+ set_last_Java_frame(thread, noreg, rbp, the_pc);
+ andptr(rsp, -(StackAlignmentInBytes)); // Align stack
+ }
// do the call
call(RuntimeAddress(entry));
- int call_offset = offset();
+ if (!align_stack) {
+ call_offset = offset();
+ }
// verify callee-saved register
#ifdef ASSERT
guarantee(thread != rax, "change this code");
@@ -78,7 +94,7 @@ int StubAssembler::call_RT(Register oop_result1, Register oop_result2, address e
}
pop(rax);
#endif
- reset_last_Java_frame(thread, true, false);
+ reset_last_Java_frame(thread, true, align_stack);
// discard thread and arguments
NOT_LP64(addptr(rsp, num_rt_args()*BytesPerWord));
diff --git a/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp b/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
index da72d84..749c48f 100644
--- a/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/c2_globals_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +44,7 @@ define_pd_global(bool, ProfileInterpreter, false);
#else
define_pd_global(bool, ProfileInterpreter, true);
#endif // CC_INTERP
-define_pd_global(bool, TieredCompilation, true);
+define_pd_global(bool, TieredCompilation, trueInTiered);
define_pd_global(intx, CompileThreshold, 10000);
define_pd_global(intx, BackEdgeThreshold, 100000);
diff --git a/hotspot/src/cpu/x86/vm/frame_x86.cpp b/hotspot/src/cpu/x86/vm/frame_x86.cpp
index 94166ea..4e87936 100644
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp
@@ -28,6 +28,7 @@
#include "oops/markOop.hpp"
#include "oops/methodOop.hpp"
#include "oops/oop.inline.hpp"
+#include "prims/methodHandles.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/javaCalls.hpp"
@@ -651,13 +652,15 @@ intptr_t* frame::interpreter_frame_tos_at(jint offset) const {
return &interpreter_frame_tos_address()[index];
}
-#ifdef ASSERT
+#ifndef PRODUCT
#define DESCRIBE_FP_OFFSET(name) \
values.describe(frame_no, fp() + frame::name##_offset, #name)
void frame::describe_pd(FrameValues& values, int frame_no) {
- if (is_interpreted_frame()) {
+ if (is_ricochet_frame()) {
+ MethodHandles::RicochetFrame::describe(this, values, frame_no);
+ } else if (is_interpreted_frame()) {
DESCRIBE_FP_OFFSET(interpreter_frame_sender_sp);
DESCRIBE_FP_OFFSET(interpreter_frame_last_sp);
DESCRIBE_FP_OFFSET(interpreter_frame_method);
@@ -667,7 +670,6 @@ void frame::describe_pd(FrameValues& values, int frame_no) {
DESCRIBE_FP_OFFSET(interpreter_frame_bcx);
DESCRIBE_FP_OFFSET(interpreter_frame_initial_sp);
}
-
}
#endif
diff --git a/hotspot/src/cpu/x86/vm/globals_x86.hpp b/hotspot/src/cpu/x86/vm/globals_x86.hpp
index d40f559..1d0ef81 100644
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp
@@ -60,9 +60,9 @@ define_pd_global(intx, StackRedPages, 1);
#ifdef AMD64
// Very large C++ stack frames using solaris-amd64 optimized builds
// due to lack of optimization caused by C++ compiler bugs
-define_pd_global(intx, StackShadowPages, SOLARIS_ONLY(20) NOT_SOLARIS(6) DEBUG_ONLY(+2));
+define_pd_global(intx, StackShadowPages, NOT_WIN64(20) WIN64_ONLY(6) DEBUG_ONLY(+2));
#else
-define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+5));
+define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5));
#endif // AMD64
define_pd_global(intx, PreInflateSpin, 10);
diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
index acd65fb..60c4b01 100644
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -279,14 +279,16 @@ void MethodHandles::RicochetFrame::leave_ricochet_frame(MacroAssembler* _masm,
}
// Emit code to verify that RBP is pointing at a valid ricochet frame.
-#ifdef ASSERT
+#ifndef PRODUCT
enum {
ARG_LIMIT = 255, SLOP = 4,
// use this parameter for checking for garbage stack movements:
UNREASONABLE_STACK_MOVE = (ARG_LIMIT + SLOP)
// the slop defends against false alarms due to fencepost errors
};
+#endif
+#ifdef ASSERT
void MethodHandles::RicochetFrame::verify_clean(MacroAssembler* _masm) {
// The stack should look like this:
// ... keep1 | dest=42 | keep2 | RF | magic | handler | magic | recursive args |
@@ -990,53 +992,103 @@ void MethodHandles::move_return_value(MacroAssembler* _masm, BasicType type,
BLOCK_COMMENT("} move_return_value");
}
+#ifndef PRODUCT
+#define DESCRIBE_RICOCHET_OFFSET(rf, name) \
+ values.describe(frame_no, (intptr_t *) (((uintptr_t)rf) + MethodHandles::RicochetFrame::name##_offset_in_bytes()), #name)
+
+void MethodHandles::RicochetFrame::describe(const frame* fr, FrameValues& values, int frame_no) {
+ address bp = (address) fr->fp();
+ RicochetFrame* rf = (RicochetFrame*)(bp - sender_link_offset_in_bytes());
+
+ // ricochet slots
+ DESCRIBE_RICOCHET_OFFSET(rf, exact_sender_sp);
+ DESCRIBE_RICOCHET_OFFSET(rf, conversion);
+ DESCRIBE_RICOCHET_OFFSET(rf, saved_args_base);
+ DESCRIBE_RICOCHET_OFFSET(rf, saved_args_layout);
+ DESCRIBE_RICOCHET_OFFSET(rf, saved_target);
+ DESCRIBE_RICOCHET_OFFSET(rf, continuation);
+
+ // relevant ricochet targets (in caller frame)
+ values.describe(-1, rf->saved_args_base(), err_msg("*saved_args_base for #%d", frame_no));
+}
+#endif // ASSERT
#ifndef PRODUCT
extern "C" void print_method_handle(oop mh);
void trace_method_handle_stub(const char* adaptername,
oop mh,
intptr_t* saved_regs,
- intptr_t* entry_sp,
- intptr_t* saved_sp,
- intptr_t* saved_bp) {
+ intptr_t* entry_sp) {
// called as a leaf from native code: do not block the JVM!
bool has_mh = (strstr(adaptername, "return/") == NULL); // return adapters don't have rcx_mh
- intptr_t* last_sp = (intptr_t*) saved_bp[frame::interpreter_frame_last_sp_offset];
- intptr_t* base_sp = last_sp;
- typedef MethodHandles::RicochetFrame RicochetFrame;
- RicochetFrame* rfp = (RicochetFrame*)((address)saved_bp - RicochetFrame::sender_link_offset_in_bytes());
- if (Universe::heap()->is_in((address) rfp->saved_args_base())) {
- // Probably an interpreter frame.
- base_sp = (intptr_t*) saved_bp[frame::interpreter_frame_monitor_block_top_offset];
- }
- intptr_t mh_reg = (intptr_t)mh;
- const char* mh_reg_name = "rcx_mh";
- if (!has_mh) mh_reg_name = "rcx";
- tty->print_cr("MH %s %s="PTR_FORMAT" sp=("PTR_FORMAT"+"INTX_FORMAT") stack_size="INTX_FORMAT" bp="PTR_FORMAT,
- adaptername, mh_reg_name, mh_reg,
- (intptr_t)entry_sp, (intptr_t)(saved_sp - entry_sp), (intptr_t)(base_sp - last_sp), (intptr_t)saved_bp);
+ const char* mh_reg_name = has_mh ? "rcx_mh" : "rcx";
+ tty->print_cr("MH %s %s="PTR_FORMAT" sp="PTR_FORMAT, adaptername, mh_reg_name, mh, entry_sp);
+
if (Verbose) {
- tty->print(" reg dump: ");
- int saved_regs_count = (entry_sp-1) - saved_regs;
- // 32 bit: rdi rsi rbp rsp; rbx rdx rcx (*) rax
- int i;
- for (i = 0; i <= saved_regs_count; i++) {
- if (i > 0 && i % 4 == 0 && i != saved_regs_count) {
+ tty->print_cr("Registers:");
+ const int saved_regs_count = RegisterImpl::number_of_registers;
+ for (int i = 0; i < saved_regs_count; i++) {
+ Register r = as_Register(i);
+ // The registers are stored in reverse order on the stack (by pusha).
+ tty->print("%3s=" PTR_FORMAT, r->name(), saved_regs[((saved_regs_count - 1) - i)]);
+ if ((i + 1) % 4 == 0) {
tty->cr();
- tty->print(" + dump: ");
+ } else {
+ tty->print(", ");
}
- tty->print(" %d: "PTR_FORMAT, i, saved_regs[i]);
}
tty->cr();
- if (last_sp != saved_sp && last_sp != NULL)
- tty->print_cr("*** last_sp="PTR_FORMAT, (intptr_t)last_sp);
- int stack_dump_count = 16;
- if (stack_dump_count < (int)(saved_bp + 2 - saved_sp))
- stack_dump_count = (int)(saved_bp + 2 - saved_sp);
- if (stack_dump_count > 64) stack_dump_count = 48;
- for (i = 0; i < stack_dump_count; i += 4) {
- tty->print_cr(" dump at SP[%d] "PTR_FORMAT": "PTR_FORMAT" "PTR_FORMAT" "PTR_FORMAT" "PTR_FORMAT,
- i, (intptr_t) &entry_sp[i+0], entry_sp[i+0], entry_sp[i+1], entry_sp[i+2], entry_sp[i+3]);
+
+ {
+ // dumping last frame with frame::describe
+
+ JavaThread* p = JavaThread::active();
+
+ ResourceMark rm;
+ PRESERVE_EXCEPTION_MARK; // may not be needed by safer and unexpensive here
+ FrameValues values;
+
+ // Note: We want to allow trace_method_handle from any call site.
+ // While trace_method_handle creates a frame, it may be entered
+ // without a PC on the stack top (e.g. not just after a call).
+ // Walking that frame could lead to failures due to that invalid PC.
+ // => carefully detect that frame when doing the stack walking
+
+ // Current C frame
+ frame cur_frame = os::current_frame();
+
+ // Robust search of trace_calling_frame (independant of inlining).
+ // Assumes saved_regs comes from a pusha in the trace_calling_frame.
+ assert(cur_frame.sp() < saved_regs, "registers not saved on stack ?");
+ frame trace_calling_frame = os::get_sender_for_C_frame(&cur_frame);
+ while (trace_calling_frame.fp() < saved_regs) {
+ trace_calling_frame = os::get_sender_for_C_frame(&trace_calling_frame);
+ }
+
+ // safely create a frame and call frame::describe
+ intptr_t *dump_sp = trace_calling_frame.sender_sp();
+ intptr_t *dump_fp = trace_calling_frame.link();
+
+ bool walkable = has_mh; // whether the traced frame shoud be walkable
+
+ if (walkable) {
+ // The previous definition of walkable may have to be refined
+ // if new call sites cause the next frame constructor to start
+ // failing. Alternatively, frame constructors could be
+ // modified to support the current or future non walkable
+ // frames (but this is more intrusive and is not considered as
+ // part of this RFE, which will instead use a simpler output).
+ frame dump_frame = frame(dump_sp, dump_fp);
+ dump_frame.describe(values, 1);
+ } else {
+ // Stack may not be walkable (invalid PC above FP):
+ // Add descriptions without building a Java frame to avoid issues
+ values.describe(-1, dump_fp, "fp for #1 <not parsed, cannot trust pc>");
+ values.describe(-1, dump_sp, "sp for #1");
+ }
+
+ tty->print_cr("Stack layout:");
+ values.print(p);
}
if (has_mh)
print_method_handle(mh);
@@ -1051,41 +1103,58 @@ struct MethodHandleStubArguments {
oopDesc* mh;
intptr_t* saved_regs;
intptr_t* entry_sp;
- intptr_t* saved_sp;
- intptr_t* saved_bp;
};
void trace_method_handle_stub_wrapper(MethodHandleStubArguments* args) {
trace_method_handle_stub(args->adaptername,
args->mh,
args->saved_regs,
- args->entry_sp,
- args->saved_sp,
- args->saved_bp);
+ args->entry_sp);
}
void MethodHandles::trace_method_handle(MacroAssembler* _masm, const char* adaptername) {
if (!TraceMethodHandles) return;
BLOCK_COMMENT("trace_method_handle {");
- __ push(rax);
- __ lea(rax, Address(rsp, wordSize * NOT_LP64(6) LP64_ONLY(14))); // entry_sp __ pusha();
- __ pusha();
- __ mov(rbx, rsp);
__ enter();
- // incoming state:
+ __ andptr(rsp, -16); // align stack if needed for FPU state
+ __ pusha();
+ __ mov(rbx, rsp); // for retreiving saved_regs
+ // Note: saved_regs must be in the entered frame for the
+ // robust stack walking implemented in trace_method_handle_stub.
+
+ // save FP result, valid at some call sites (adapter_opt_return_float, ...)
+ __ increment(rsp, -2 * wordSize);
+ if (UseSSE >= 2) {
+ __ movdbl(Address(rsp, 0), xmm0);
+ } else if (UseSSE == 1) {
+ __ movflt(Address(rsp, 0), xmm0);
+ } else {
+ __ fst_d(Address(rsp, 0));
+ }
+
+ // Incoming state:
// rcx: method handle
- // r13 or rsi: saved sp
- // To avoid calling convention issues, build a record on the stack and pass the pointer to that instead.
- __ push(rbp); // saved_bp
- __ push(rsi); // saved_sp
- __ push(rax); // entry_sp
+ //
+ // To avoid calling convention issues, build a record on the stack
+ // and pass the pointer to that instead.
+ __ push(rbp); // entry_sp (with extra align space)
__ push(rbx); // pusha saved_regs
__ push(rcx); // mh
- __ push(rcx); // adaptername
+ __ push(rcx); // slot for adaptername
__ movptr(Address(rsp, 0), (intptr_t) adaptername);
__ super_call_VM_leaf(CAST_FROM_FN_PTR(address, trace_method_handle_stub_wrapper), rsp);
- __ leave();
+ __ increment(rsp, sizeof(MethodHandleStubArguments));
+
+ if (UseSSE >= 2) {
+ __ movdbl(xmm0, Address(rsp, 0));
+ } else if (UseSSE == 1) {
+ __ movflt(xmm0, Address(rsp, 0));
+ } else {
+ __ fld_d(Address(rsp, 0));
+ }
+ __ increment(rsp, 2 * wordSize);
+
__ popa();
- __ pop(rax);
+ __ leave();
BLOCK_COMMENT("} trace_method_handle");
}
#endif //PRODUCT
@@ -2267,23 +2336,19 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
// grab another temp
Register rsi_temp = rsi;
- { if (rsi_temp == saved_last_sp) __ push(saved_last_sp); }
- // (preceding push must be done after argslot address is taken!)
-#define UNPUSH_RSI \
- { if (rsi_temp == saved_last_sp) __ pop(saved_last_sp); }
// arx_argslot points both to the array and to the first output arg
vmarg = Address(rax_argslot, 0);
// Get the array value.
- Register rsi_array = rsi_temp;
+ Register rdi_array = rdi_temp;
Register rdx_array_klass = rdx_temp;
BasicType elem_type = ek_adapter_opt_spread_type(ek);
int elem_slots = type2size[elem_type]; // 1 or 2
int array_slots = 1; // array is always a T_OBJECT
int length_offset = arrayOopDesc::length_offset_in_bytes();
int elem0_offset = arrayOopDesc::base_offset_in_bytes(elem_type);
- __ movptr(rsi_array, vmarg);
+ __ movptr(rdi_array, vmarg);
Label L_array_is_empty, L_insert_arg_space, L_copy_args, L_args_done;
if (length_can_be_zero) {
@@ -2294,12 +2359,30 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
__ testl(rbx_temp, rbx_temp);
__ jcc(Assembler::notZero, L_skip);
}
- __ testptr(rsi_array, rsi_array);
- __ jcc(Assembler::zero, L_array_is_empty);
+ __ testptr(rdi_array, rdi_array);
+ __ jcc(Assembler::notZero, L_skip);
+
+ // If 'rsi' contains the 'saved_last_sp' (this is only the
+ // case in a 32-bit version of the VM) we have to save 'rsi'
+ // on the stack because later on (at 'L_array_is_empty') 'rsi'
+ // will be overwritten.
+ { if (rsi_temp == saved_last_sp) __ push(saved_last_sp); }
+ // Also prepare a handy macro which restores 'rsi' if required.
+#define UNPUSH_RSI \
+ { if (rsi_temp == saved_last_sp) __ pop(saved_last_sp); }
+
+ __ jmp(L_array_is_empty);
__ bind(L_skip);
}
- __ null_check(rsi_array, oopDesc::klass_offset_in_bytes());
- __ load_klass(rdx_array_klass, rsi_array);
+ __ null_check(rdi_array, oopDesc::klass_offset_in_bytes());
+ __ load_klass(rdx_array_klass, rdi_array);
+
+ // Save 'rsi' if required (see comment above). Do this only
+ // after the null check such that the exception handler which is
+ // called in the case of a null pointer exception will not be
+ // confused by the extra value on the stack (it expects the
+ // return pointer on top of the stack)
+ { if (rsi_temp == saved_last_sp) __ push(saved_last_sp); }
// Check the array type.
Register rbx_klass = rbx_temp;
@@ -2307,18 +2390,18 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
load_klass_from_Class(_masm, rbx_klass);
Label ok_array_klass, bad_array_klass, bad_array_length;
- __ check_klass_subtype(rdx_array_klass, rbx_klass, rdi_temp, ok_array_klass);
+ __ check_klass_subtype(rdx_array_klass, rbx_klass, rsi_temp, ok_array_klass);
// If we get here, the type check failed!
__ jmp(bad_array_klass);
__ BIND(ok_array_klass);
// Check length.
if (length_constant >= 0) {
- __ cmpl(Address(rsi_array, length_offset), length_constant);
+ __ cmpl(Address(rdi_array, length_offset), length_constant);
} else {
Register rbx_vminfo = rbx_temp;
load_conversion_vminfo(_masm, rbx_vminfo, rcx_amh_conversion);
- __ cmpl(rbx_vminfo, Address(rsi_array, length_offset));
+ __ cmpl(rbx_vminfo, Address(rdi_array, length_offset));
}
__ jcc(Assembler::notEqual, bad_array_length);
@@ -2330,9 +2413,9 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
__ lea(rdx_argslot_limit, Address(rax_argslot, Interpreter::stackElementSize));
// 'stack_move' is negative number of words to insert
// This number already accounts for elem_slots.
- Register rdi_stack_move = rdi_temp;
- load_stack_move(_masm, rdi_stack_move, rcx_recv, true);
- __ cmpptr(rdi_stack_move, 0);
+ Register rsi_stack_move = rsi_temp;
+ load_stack_move(_masm, rsi_stack_move, rcx_recv, true);
+ __ cmpptr(rsi_stack_move, 0);
assert(stack_move_unit() < 0, "else change this comparison");
__ jcc(Assembler::less, L_insert_arg_space);
__ jcc(Assembler::equal, L_copy_args);
@@ -2343,12 +2426,12 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
__ jmp(L_args_done); // no spreading to do
__ BIND(L_insert_arg_space);
// come here in the usual case, stack_move < 0 (2 or more spread arguments)
- Register rsi_temp = rsi_array; // spill this
- insert_arg_slots(_masm, rdi_stack_move,
- rax_argslot, rbx_temp, rsi_temp);
+ Register rdi_temp = rdi_array; // spill this
+ insert_arg_slots(_masm, rsi_stack_move,
+ rax_argslot, rbx_temp, rdi_temp);
// reload the array since rsi was killed
// reload from rdx_argslot_limit since rax_argslot is now decremented
- __ movptr(rsi_array, Address(rdx_argslot_limit, -Interpreter::stackElementSize));
+ __ movptr(rdi_array, Address(rdx_argslot_limit, -Interpreter::stackElementSize));
} else if (length_constant >= 1) {
int new_slots = (length_constant * elem_slots) - array_slots;
insert_arg_slots(_masm, new_slots * stack_move_unit(),
@@ -2371,16 +2454,16 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
if (length_constant == -1) {
// [rax_argslot, rdx_argslot_limit) is the area we are inserting into.
// Array element [0] goes at rdx_argslot_limit[-wordSize].
- Register rsi_source = rsi_array;
- __ lea(rsi_source, Address(rsi_array, elem0_offset));
+ Register rdi_source = rdi_array;
+ __ lea(rdi_source, Address(rdi_array, elem0_offset));
Register rdx_fill_ptr = rdx_argslot_limit;
Label loop;
__ BIND(loop);
__ addptr(rdx_fill_ptr, -Interpreter::stackElementSize * elem_slots);
move_typed_arg(_masm, elem_type, true,
- Address(rdx_fill_ptr, 0), Address(rsi_source, 0),
- rbx_temp, rdi_temp);
- __ addptr(rsi_source, type2aelembytes(elem_type));
+ Address(rdx_fill_ptr, 0), Address(rdi_source, 0),
+ rbx_temp, rsi_temp);
+ __ addptr(rdi_source, type2aelembytes(elem_type));
__ cmpptr(rdx_fill_ptr, rax_argslot);
__ jcc(Assembler::above, loop);
} else if (length_constant == 0) {
@@ -2391,8 +2474,8 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
for (int index = 0; index < length_constant; index++) {
slot_offset -= Interpreter::stackElementSize * elem_slots; // fill backward
move_typed_arg(_masm, elem_type, true,
- Address(rax_argslot, slot_offset), Address(rsi_array, elem_offset),
- rbx_temp, rdi_temp);
+ Address(rax_argslot, slot_offset), Address(rdi_array, elem_offset),
+ rbx_temp, rsi_temp);
elem_offset += type2aelembytes(elem_type);
}
}
diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp b/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
index 4cb6662..7557383 100644
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -224,6 +224,8 @@ class RicochetFrame {
}
static void verify_clean(MacroAssembler* _masm) NOT_DEBUG_RETURN;
+
+ static void describe(const frame* fr, FrameValues& values, int frame_no) PRODUCT_RETURN;
};
// Additional helper methods for MethodHandles code generation:
diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
index 9b43aba..c80f7c8 100644
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1091,12 +1091,238 @@ void SharedRuntime::restore_native_result(MacroAssembler *masm, BasicType ret_ty
}
}
+
+static void save_or_restore_arguments(MacroAssembler* masm,
+ const int stack_slots,
+ const int total_in_args,
+ const int arg_save_area,
+ OopMap* map,
+ VMRegPair* in_regs,
+ BasicType* in_sig_bt) {
+ // if map is non-NULL then the code should store the values,
+ // otherwise it should load them.
+ int handle_index = 0;
+ // Save down double word first
+ for ( int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_XMMRegister() && in_sig_bt[i] == T_DOUBLE) {
+ int slot = handle_index * VMRegImpl::slots_per_word + arg_save_area;
+ int offset = slot * VMRegImpl::stack_slot_size;
+ handle_index += 2;
+ assert(handle_index <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ movdbl(Address(rsp, offset), in_regs[i].first()->as_XMMRegister());
+ } else {
+ __ movdbl(in_regs[i].first()->as_XMMRegister(), Address(rsp, offset));
+ }
+ }
+ if (in_regs[i].first()->is_Register() && in_sig_bt[i] == T_LONG) {
+ int slot = handle_index * VMRegImpl::slots_per_word + arg_save_area;
+ int offset = slot * VMRegImpl::stack_slot_size;
+ handle_index += 2;
+ assert(handle_index <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ movl(Address(rsp, offset), in_regs[i].first()->as_Register());
+ if (in_regs[i].second()->is_Register()) {
+ __ movl(Address(rsp, offset + 4), in_regs[i].second()->as_Register());
+ }
+ } else {
+ __ movl(in_regs[i].first()->as_Register(), Address(rsp, offset));
+ if (in_regs[i].second()->is_Register()) {
+ __ movl(in_regs[i].second()->as_Register(), Address(rsp, offset + 4));
+ }
+ }
+ }
+ }
+ // Save or restore single word registers
+ for ( int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ int slot = handle_index++ * VMRegImpl::slots_per_word + arg_save_area;
+ int offset = slot * VMRegImpl::stack_slot_size;
+ assert(handle_index <= stack_slots, "overflow");
+ if (in_sig_bt[i] == T_ARRAY && map != NULL) {
+ map->set_oop(VMRegImpl::stack2reg(slot));;
+ }
+
+ // Value is in an input register pass we must flush it to the stack
+ const Register reg = in_regs[i].first()->as_Register();
+ switch (in_sig_bt[i]) {
+ case T_ARRAY:
+ if (map != NULL) {
+ __ movptr(Address(rsp, offset), reg);
+ } else {
+ __ movptr(reg, Address(rsp, offset));
+ }
+ break;
+ case T_BOOLEAN:
+ case T_CHAR:
+ case T_BYTE:
+ case T_SHORT:
+ case T_INT:
+ if (map != NULL) {
+ __ movl(Address(rsp, offset), reg);
+ } else {
+ __ movl(reg, Address(rsp, offset));
+ }
+ break;
+ case T_OBJECT:
+ default: ShouldNotReachHere();
+ }
+ } else if (in_regs[i].first()->is_XMMRegister()) {
+ if (in_sig_bt[i] == T_FLOAT) {
+ int slot = handle_index++ * VMRegImpl::slots_per_word + arg_save_area;
+ int offset = slot * VMRegImpl::stack_slot_size;
+ assert(handle_index <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ movflt(Address(rsp, offset), in_regs[i].first()->as_XMMRegister());
+ } else {
+ __ movflt(in_regs[i].first()->as_XMMRegister(), Address(rsp, offset));
+ }
+ }
+ } else if (in_regs[i].first()->is_stack()) {
+ if (in_sig_bt[i] == T_ARRAY && map != NULL) {
+ int offset_in_older_frame = in_regs[i].first()->reg2stack() + SharedRuntime::out_preserve_stack_slots();
+ map->set_oop(VMRegImpl::stack2reg(offset_in_older_frame + stack_slots));
+ }
+ }
+ }
+}
+
+// Check GC_locker::needs_gc and enter the runtime if it's true. This
+// keeps a new JNI critical region from starting until a GC has been
+// forced. Save down any oops in registers and describe them in an
+// OopMap.
+static void check_needs_gc_for_critical_native(MacroAssembler* masm,
+ Register thread,
+ int stack_slots,
+ int total_c_args,
+ int total_in_args,
+ int arg_save_area,
+ OopMapSet* oop_maps,
+ VMRegPair* in_regs,
+ BasicType* in_sig_bt) {
+ __ block_comment("check GC_locker::needs_gc");
+ Label cont;
+ __ cmp8(ExternalAddress((address)GC_locker::needs_gc_address()), false);
+ __ jcc(Assembler::equal, cont);
+
+ // Save down any incoming oops and call into the runtime to halt for a GC
+
+ OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
+
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, map, in_regs, in_sig_bt);
+
+ address the_pc = __ pc();
+ oop_maps->add_gc_map( __ offset(), map);
+ __ set_last_Java_frame(thread, rsp, noreg, the_pc);
+
+ __ block_comment("block_for_jni_critical");
+ __ push(thread);
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::block_for_jni_critical)));
+ __ increment(rsp, wordSize);
+
+ __ get_thread(thread);
+ __ reset_last_Java_frame(thread, false, true);
+
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, NULL, in_regs, in_sig_bt);
+
+ __ bind(cont);
+#ifdef ASSERT
+ if (StressCriticalJNINatives) {
+ // Stress register saving
+ OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, map, in_regs, in_sig_bt);
+ // Destroy argument registers
+ for (int i = 0; i < total_in_args - 1; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ const Register reg = in_regs[i].first()->as_Register();
+ __ xorptr(reg, reg);
+ } else if (in_regs[i].first()->is_XMMRegister()) {
+ __ xorpd(in_regs[i].first()->as_XMMRegister(), in_regs[i].first()->as_XMMRegister());
+ } else if (in_regs[i].first()->is_FloatRegister()) {
+ ShouldNotReachHere();
+ } else if (in_regs[i].first()->is_stack()) {
+ // Nothing to do
+ } else {
+ ShouldNotReachHere();
+ }
+ if (in_sig_bt[i] == T_LONG || in_sig_bt[i] == T_DOUBLE) {
+ i++;
+ }
+ }
+
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, NULL, in_regs, in_sig_bt);
+ }
+#endif
+}
+
+// Unpack an array argument into a pointer to the body and the length
+// if the array is non-null, otherwise pass 0 for both.
+static void unpack_array_argument(MacroAssembler* masm, VMRegPair reg, BasicType in_elem_type, VMRegPair body_arg, VMRegPair length_arg) {
+ Register tmp_reg = rax;
+ assert(!body_arg.first()->is_Register() || body_arg.first()->as_Register() != tmp_reg,
+ "possible collision");
+ assert(!length_arg.first()->is_Register() || length_arg.first()->as_Register() != tmp_reg,
+ "possible collision");
+
+ // Pass the length, ptr pair
+ Label is_null, done;
+ VMRegPair tmp(tmp_reg->as_VMReg());
+ if (reg.first()->is_stack()) {
+ // Load the arg up from the stack
+ simple_move32(masm, reg, tmp);
+ reg = tmp;
+ }
+ __ testptr(reg.first()->as_Register(), reg.first()->as_Register());
+ __ jccb(Assembler::equal, is_null);
+ __ lea(tmp_reg, Address(reg.first()->as_Register(), arrayOopDesc::base_offset_in_bytes(in_elem_type)));
+ simple_move32(masm, tmp, body_arg);
+ // load the length relative to the body.
+ __ movl(tmp_reg, Address(tmp_reg, arrayOopDesc::length_offset_in_bytes() -
+ arrayOopDesc::base_offset_in_bytes(in_elem_type)));
+ simple_move32(masm, tmp, length_arg);
+ __ jmpb(done);
+ __ bind(is_null);
+ // Pass zeros
+ __ xorptr(tmp_reg, tmp_reg);
+ simple_move32(masm, tmp, body_arg);
+ simple_move32(masm, tmp, length_arg);
+ __ bind(done);
+}
+
+
// ---------------------------------------------------------------------------
// Generate a native wrapper for a given method. The method takes arguments
// in the Java compiled code convention, marshals them to the native
// convention (handlizes oops, etc), transitions to native, makes the call,
// returns to java state (possibly blocking), unhandlizes any result and
// returns.
+//
+// Critical native functions are a shorthand for the use of
+// GetPrimtiveArrayCritical and disallow the use of any other JNI
+// functions. The wrapper is expected to unpack the arguments before
+// passing them to the callee and perform checks before and after the
+// native call to ensure that they GC_locker
+// lock_critical/unlock_critical semantics are followed. Some other
+// parts of JNI setup are skipped like the tear down of the JNI handle
+// block and the check for pending exceptions it's impossible for them
+// to be thrown.
+//
+// They are roughly structured like this:
+// if (GC_locker::needs_gc())
+// SharedRuntime::block_for_jni_critical();
+// tranistion to thread_in_native
+// unpack arrray arguments and call native entry point
+// check for safepoint in progress
+// check if any thread suspend flags are set
+// call into JVM and possible unlock the JNI critical
+// if a GC was suppressed while in the critical native.
+// transition back to thread_in_Java
+// return to caller
+//
nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
methodHandle method,
int compile_id,
@@ -1105,6 +1331,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
BasicType *in_sig_bt,
VMRegPair *in_regs,
BasicType ret_type) {
+ bool is_critical_native = true;
+ address native_func = method->critical_native_function();
+ if (native_func == NULL) {
+ native_func = method->native_function();
+ is_critical_native = false;
+ }
+ assert(native_func != NULL, "must have function");
// An OopMap for lock (and class if static)
OopMapSet *oop_maps = new OopMapSet();
@@ -1115,30 +1348,72 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// we convert the java signature to a C signature by inserting
// the hidden arguments as arg[0] and possibly arg[1] (static method)
- int total_c_args = total_in_args + 1;
- if (method->is_static()) {
- total_c_args++;
+ int total_c_args = total_in_args;
+ if (!is_critical_native) {
+ total_c_args += 1;
+ if (method->is_static()) {
+ total_c_args++;
+ }
+ } else {
+ for (int i = 0; i < total_in_args; i++) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ total_c_args++;
+ }
+ }
}
BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
- VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
+ VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
+ BasicType* in_elem_bt = NULL;
int argc = 0;
- out_sig_bt[argc++] = T_ADDRESS;
- if (method->is_static()) {
- out_sig_bt[argc++] = T_OBJECT;
- }
+ if (!is_critical_native) {
+ out_sig_bt[argc++] = T_ADDRESS;
+ if (method->is_static()) {
+ out_sig_bt[argc++] = T_OBJECT;
+ }
- int i;
- for (i = 0; i < total_in_args ; i++ ) {
- out_sig_bt[argc++] = in_sig_bt[i];
+ for (int i = 0; i < total_in_args ; i++ ) {
+ out_sig_bt[argc++] = in_sig_bt[i];
+ }
+ } else {
+ Thread* THREAD = Thread::current();
+ in_elem_bt = NEW_RESOURCE_ARRAY(BasicType, total_in_args);
+ SignatureStream ss(method->signature());
+ for (int i = 0; i < total_in_args ; i++ ) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ // Arrays are passed as int, elem* pair
+ out_sig_bt[argc++] = T_INT;
+ out_sig_bt[argc++] = T_ADDRESS;
+ Symbol* atype = ss.as_symbol(CHECK_NULL);
+ const char* at = atype->as_C_string();
+ if (strlen(at) == 2) {
+ assert(at[0] == '[', "must be");
+ switch (at[1]) {
+ case 'B': in_elem_bt[i] = T_BYTE; break;
+ case 'C': in_elem_bt[i] = T_CHAR; break;
+ case 'D': in_elem_bt[i] = T_DOUBLE; break;
+ case 'F': in_elem_bt[i] = T_FLOAT; break;
+ case 'I': in_elem_bt[i] = T_INT; break;
+ case 'J': in_elem_bt[i] = T_LONG; break;
+ case 'S': in_elem_bt[i] = T_SHORT; break;
+ case 'Z': in_elem_bt[i] = T_BOOLEAN; break;
+ default: ShouldNotReachHere();
+ }
+ }
+ } else {
+ out_sig_bt[argc++] = in_sig_bt[i];
+ in_elem_bt[i] = T_VOID;
+ }
+ if (in_sig_bt[i] != T_VOID) {
+ assert(in_sig_bt[i] == ss.type(), "must match");
+ ss.next();
+ }
+ }
}
-
// Now figure out where the args must be stored and how much stack space
- // they require (neglecting out_preserve_stack_slots but space for storing
- // the 1st six register arguments). It's weird see int_stk_helper.
- //
+ // they require.
int out_arg_slots;
out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args);
@@ -1151,9 +1426,44 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
int stack_slots = SharedRuntime::out_preserve_stack_slots() + out_arg_slots;
// Now the space for the inbound oop handle area
+ int total_save_slots = 2 * VMRegImpl::slots_per_word; // 2 arguments passed in registers
+ if (is_critical_native) {
+ // Critical natives may have to call out so they need a save area
+ // for register arguments.
+ int double_slots = 0;
+ int single_slots = 0;
+ for ( int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ const Register reg = in_regs[i].first()->as_Register();
+ switch (in_sig_bt[i]) {
+ case T_ARRAY:
+ case T_BOOLEAN:
+ case T_BYTE:
+ case T_SHORT:
+ case T_CHAR:
+ case T_INT: single_slots++; break;
+ case T_LONG: double_slots++; break;
+ default: ShouldNotReachHere();
+ }
+ } else if (in_regs[i].first()->is_XMMRegister()) {
+ switch (in_sig_bt[i]) {
+ case T_FLOAT: single_slots++; break;
+ case T_DOUBLE: double_slots++; break;
+ default: ShouldNotReachHere();
+ }
+ } else if (in_regs[i].first()->is_FloatRegister()) {
+ ShouldNotReachHere();
+ }
+ }
+ total_save_slots = double_slots * 2 + single_slots;
+ // align the save area
+ if (double_slots != 0) {
+ stack_slots = round_to(stack_slots, 2);
+ }
+ }
int oop_handle_offset = stack_slots;
- stack_slots += 2*VMRegImpl::slots_per_word;
+ stack_slots += total_save_slots;
// Now any space we need for handlizing a klass if static method
@@ -1161,7 +1471,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
int klass_offset = -1;
int lock_slot_offset = 0;
bool is_static = false;
- int oop_temp_slot_offset = 0;
if (method->is_static()) {
klass_slot_offset = stack_slots;
@@ -1221,7 +1530,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// First thing make an ic check to see if we should even be here
// We are free to use all registers as temps without saving them and
- // restoring them except rbp,. rbp, is the only callee save register
+ // restoring them except rbp. rbp is the only callee save register
// as far as the interpreter and the compiler(s) are concerned.
@@ -1230,7 +1539,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
Label hit;
Label exception_pending;
-
__ verify_oop(receiver);
__ cmpptr(ic_reg, Address(receiver, oopDesc::klass_offset_in_bytes()));
__ jcc(Assembler::equal, hit);
@@ -1292,11 +1600,10 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// Generate a new frame for the wrapper.
__ enter();
- // -2 because return address is already present and so is saved rbp,
+ // -2 because return address is already present and so is saved rbp
__ subptr(rsp, stack_size - 2*wordSize);
- // Frame is now completed as far a size and linkage.
-
+ // Frame is now completed as far as size and linkage.
int frame_complete = ((intptr_t)__ pc()) - start;
// Calculate the difference between rsp and rbp,. We need to know it
@@ -1319,7 +1626,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// Compute the rbp, offset for any slots used after the jni call
int lock_slot_rbp_offset = (lock_slot_offset*VMRegImpl::stack_slot_size) - fp_adjustment;
- int oop_temp_slot_rbp_offset = (oop_temp_slot_offset*VMRegImpl::stack_slot_size) - fp_adjustment;
// We use rdi as a thread pointer because it is callee save and
// if we load it once it is usable thru the entire wrapper
@@ -1332,6 +1638,10 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
__ get_thread(thread);
+ if (is_critical_native) {
+ check_needs_gc_for_critical_native(masm, thread, stack_slots, total_c_args, total_in_args,
+ oop_handle_offset, oop_maps, in_regs, in_sig_bt);
+ }
//
// We immediately shuffle the arguments so that any vm call we have to
@@ -1353,7 +1663,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// vectors we have in our possession. We simply walk the java vector to
// get the source locations and the c vector to get the destinations.
- int c_arg = method->is_static() ? 2 : 1 ;
+ int c_arg = is_critical_native ? 0 : (method->is_static() ? 2 : 1 );
// Record rsp-based slot for receiver on stack for non-static methods
int receiver_offset = -1;
@@ -1373,10 +1683,16 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// Are free to temporaries if we have to do stack to steck moves.
// All inbound args are referenced based on rbp, and all outbound args via rsp.
- for (i = 0; i < total_in_args ; i++, c_arg++ ) {
+ for (int i = 0; i < total_in_args ; i++, c_arg++ ) {
switch (in_sig_bt[i]) {
case T_ARRAY:
+ if (is_critical_native) {
+ unpack_array_argument(masm, in_regs[i], in_elem_bt[i], out_regs[c_arg + 1], out_regs[c_arg]);
+ c_arg++;
+ break;
+ }
case T_OBJECT:
+ assert(!is_critical_native, "no oop arguments");
object_move(masm, map, oop_handle_offset, stack_slots, in_regs[i], out_regs[c_arg],
((i == 0) && (!is_static)),
&receiver_offset);
@@ -1408,7 +1724,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// Pre-load a static method's oop into rsi. Used both by locking code and
// the normal JNI call code.
- if (method->is_static()) {
+ if (method->is_static() && !is_critical_native) {
// load opp into a register
__ movoop(oop_handle_reg, JNIHandles::make_local(Klass::cast(method->method_holder())->java_mirror()));
@@ -1463,6 +1779,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// Lock a synchronized method
if (method->is_synchronized()) {
+ assert(!is_critical_native, "unhandled");
const int mark_word_offset = BasicLock::displaced_header_offset_in_bytes();
@@ -1529,14 +1846,15 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// get JNIEnv* which is first argument to native
-
- __ lea(rdx, Address(thread, in_bytes(JavaThread::jni_environment_offset())));
- __ movptr(Address(rsp, 0), rdx);
+ if (!is_critical_native) {
+ __ lea(rdx, Address(thread, in_bytes(JavaThread::jni_environment_offset())));
+ __ movptr(Address(rsp, 0), rdx);
+ }
// Now set thread in native
__ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_native);
- __ call(RuntimeAddress(method->native_function()));
+ __ call(RuntimeAddress(native_func));
// WARNING - on Windows Java Natives use pascal calling convention and pop the
// arguments off of the stack. We could just re-adjust the stack pointer here
@@ -1591,6 +1909,8 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
__ fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_std()));
}
+ Label after_transition;
+
// check for safepoint operation in progress and/or pending suspend requests
{ Label Continue;
@@ -1611,17 +1931,29 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
//
save_native_result(masm, ret_type, stack_slots);
__ push(thread);
- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address,
- JavaThread::check_special_condition_for_native_trans)));
+ if (!is_critical_native) {
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address,
+ JavaThread::check_special_condition_for_native_trans)));
+ } else {
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address,
+ JavaThread::check_special_condition_for_native_trans_and_transition)));
+ }
__ increment(rsp, wordSize);
// Restore any method result value
restore_native_result(masm, ret_type, stack_slots);
+ if (is_critical_native) {
+ // The call above performed the transition to thread_in_Java so
+ // skip the transition logic below.
+ __ jmpb(after_transition);
+ }
+
__ bind(Continue);
}
// change thread state
__ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_Java);
+ __ bind(after_transition);
Label reguard;
Label reguard_done;
@@ -1710,15 +2042,15 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
__ verify_oop(rax);
}
- // reset handle block
- __ movptr(rcx, Address(thread, JavaThread::active_handles_offset()));
-
- __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), NULL_WORD);
-
- // Any exception pending?
- __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
- __ jcc(Assembler::notEqual, exception_pending);
+ if (!is_critical_native) {
+ // reset handle block
+ __ movptr(rcx, Address(thread, JavaThread::active_handles_offset()));
+ __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), NULL_WORD);
+ // Any exception pending?
+ __ cmpptr(Address(thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
+ __ jcc(Assembler::notEqual, exception_pending);
+ }
// no exception, we're almost done
@@ -1829,16 +2161,18 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// BEGIN EXCEPTION PROCESSING
- // Forward the exception
- __ bind(exception_pending);
+ if (!is_critical_native) {
+ // Forward the exception
+ __ bind(exception_pending);
- // remove possible return value from FPU register stack
- __ empty_FPU_stack();
+ // remove possible return value from FPU register stack
+ __ empty_FPU_stack();
- // pop our frame
- __ leave();
- // and forward the exception
- __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+ // pop our frame
+ __ leave();
+ // and forward the exception
+ __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+ }
__ flush();
@@ -1851,6 +2185,11 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
(is_static ? in_ByteSize(klass_offset) : in_ByteSize(receiver_offset)),
in_ByteSize(lock_slot_offset*VMRegImpl::stack_slot_size),
oop_maps);
+
+ if (is_critical_native) {
+ nm->set_lazy_critical_native(true);
+ }
+
return nm;
}
diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
index b03eb92..68a2393 100644
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -938,6 +938,25 @@ static void move32_64(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
}
}
+static void move_ptr(MacroAssembler* masm, VMRegPair src, VMRegPair dst) {
+ if (src.first()->is_stack()) {
+ if (dst.first()->is_stack()) {
+ // stack to stack
+ __ movq(rax, Address(rbp, reg2offset_in(src.first())));
+ __ movq(Address(rsp, reg2offset_out(dst.first())), rax);
+ } else {
+ // stack to reg
+ __ movq(dst.first()->as_Register(), Address(rbp, reg2offset_in(src.first())));
+ }
+ } else if (dst.first()->is_stack()) {
+ // reg to stack
+ __ movq(Address(rsp, reg2offset_out(dst.first())), src.first()->as_Register());
+ } else {
+ if (dst.first() != src.first()) {
+ __ movq(dst.first()->as_Register(), src.first()->as_Register());
+ }
+ }
+}
// An oop arg. Must pass a handle not the oop itself
static void object_move(MacroAssembler* masm,
@@ -1152,6 +1171,368 @@ static void restore_args(MacroAssembler *masm, int arg_count, int first_arg, VMR
}
}
+
+static void save_or_restore_arguments(MacroAssembler* masm,
+ const int stack_slots,
+ const int total_in_args,
+ const int arg_save_area,
+ OopMap* map,
+ VMRegPair* in_regs,
+ BasicType* in_sig_bt) {
+ // if map is non-NULL then the code should store the values,
+ // otherwise it should load them.
+ int slot = arg_save_area;
+ // Save down double word first
+ for ( int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_XMMRegister() && in_sig_bt[i] == T_DOUBLE) {
+ int offset = slot * VMRegImpl::stack_slot_size;
+ slot += VMRegImpl::slots_per_word;
+ assert(slot <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ movdbl(Address(rsp, offset), in_regs[i].first()->as_XMMRegister());
+ } else {
+ __ movdbl(in_regs[i].first()->as_XMMRegister(), Address(rsp, offset));
+ }
+ }
+ if (in_regs[i].first()->is_Register() &&
+ (in_sig_bt[i] == T_LONG || in_sig_bt[i] == T_ARRAY)) {
+ int offset = slot * VMRegImpl::stack_slot_size;
+ if (map != NULL) {
+ __ movq(Address(rsp, offset), in_regs[i].first()->as_Register());
+ if (in_sig_bt[i] == T_ARRAY) {
+ map->set_oop(VMRegImpl::stack2reg(slot));;
+ }
+ } else {
+ __ movq(in_regs[i].first()->as_Register(), Address(rsp, offset));
+ }
+ slot += VMRegImpl::slots_per_word;
+ }
+ }
+ // Save or restore single word registers
+ for ( int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ int offset = slot * VMRegImpl::stack_slot_size;
+ slot++;
+ assert(slot <= stack_slots, "overflow");
+
+ // Value is in an input register pass we must flush it to the stack
+ const Register reg = in_regs[i].first()->as_Register();
+ switch (in_sig_bt[i]) {
+ case T_BOOLEAN:
+ case T_CHAR:
+ case T_BYTE:
+ case T_SHORT:
+ case T_INT:
+ if (map != NULL) {
+ __ movl(Address(rsp, offset), reg);
+ } else {
+ __ movl(reg, Address(rsp, offset));
+ }
+ break;
+ case T_ARRAY:
+ case T_LONG:
+ // handled above
+ break;
+ case T_OBJECT:
+ default: ShouldNotReachHere();
+ }
+ } else if (in_regs[i].first()->is_XMMRegister()) {
+ if (in_sig_bt[i] == T_FLOAT) {
+ int offset = slot * VMRegImpl::stack_slot_size;
+ slot++;
+ assert(slot <= stack_slots, "overflow");
+ if (map != NULL) {
+ __ movflt(Address(rsp, offset), in_regs[i].first()->as_XMMRegister());
+ } else {
+ __ movflt(in_regs[i].first()->as_XMMRegister(), Address(rsp, offset));
+ }
+ }
+ } else if (in_regs[i].first()->is_stack()) {
+ if (in_sig_bt[i] == T_ARRAY && map != NULL) {
+ int offset_in_older_frame = in_regs[i].first()->reg2stack() + SharedRuntime::out_preserve_stack_slots();
+ map->set_oop(VMRegImpl::stack2reg(offset_in_older_frame + stack_slots));
+ }
+ }
+ }
+}
+
+
+// Check GC_locker::needs_gc and enter the runtime if it's true. This
+// keeps a new JNI critical region from starting until a GC has been
+// forced. Save down any oops in registers and describe them in an
+// OopMap.
+static void check_needs_gc_for_critical_native(MacroAssembler* masm,
+ int stack_slots,
+ int total_c_args,
+ int total_in_args,
+ int arg_save_area,
+ OopMapSet* oop_maps,
+ VMRegPair* in_regs,
+ BasicType* in_sig_bt) {
+ __ block_comment("check GC_locker::needs_gc");
+ Label cont;
+ __ cmp8(ExternalAddress((address)GC_locker::needs_gc_address()), false);
+ __ jcc(Assembler::equal, cont);
+
+ // Save down any incoming oops and call into the runtime to halt for a GC
+
+ OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, map, in_regs, in_sig_bt);
+
+ address the_pc = __ pc();
+ oop_maps->add_gc_map( __ offset(), map);
+ __ set_last_Java_frame(rsp, noreg, the_pc);
+
+ __ block_comment("block_for_jni_critical");
+ __ movptr(c_rarg0, r15_thread);
+ __ mov(r12, rsp); // remember sp
+ __ subptr(rsp, frame::arg_reg_save_area_bytes); // windows
+ __ andptr(rsp, -16); // align stack as required by ABI
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, SharedRuntime::block_for_jni_critical)));
+ __ mov(rsp, r12); // restore sp
+ __ reinit_heapbase();
+
+ __ reset_last_Java_frame(false, true);
+
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, NULL, in_regs, in_sig_bt);
+
+ __ bind(cont);
+#ifdef ASSERT
+ if (StressCriticalJNINatives) {
+ // Stress register saving
+ OopMap* map = new OopMap(stack_slots * 2, 0 /* arg_slots*/);
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, map, in_regs, in_sig_bt);
+ // Destroy argument registers
+ for (int i = 0; i < total_in_args - 1; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ const Register reg = in_regs[i].first()->as_Register();
+ __ xorptr(reg, reg);
+ } else if (in_regs[i].first()->is_XMMRegister()) {
+ __ xorpd(in_regs[i].first()->as_XMMRegister(), in_regs[i].first()->as_XMMRegister());
+ } else if (in_regs[i].first()->is_FloatRegister()) {
+ ShouldNotReachHere();
+ } else if (in_regs[i].first()->is_stack()) {
+ // Nothing to do
+ } else {
+ ShouldNotReachHere();
+ }
+ if (in_sig_bt[i] == T_LONG || in_sig_bt[i] == T_DOUBLE) {
+ i++;
+ }
+ }
+
+ save_or_restore_arguments(masm, stack_slots, total_in_args,
+ arg_save_area, NULL, in_regs, in_sig_bt);
+ }
+#endif
+}
+
+// Unpack an array argument into a pointer to the body and the length
+// if the array is non-null, otherwise pass 0 for both.
+static void unpack_array_argument(MacroAssembler* masm, VMRegPair reg, BasicType in_elem_type, VMRegPair body_arg, VMRegPair length_arg) {
+ Register tmp_reg = rax;
+ assert(!body_arg.first()->is_Register() || body_arg.first()->as_Register() != tmp_reg,
+ "possible collision");
+ assert(!length_arg.first()->is_Register() || length_arg.first()->as_Register() != tmp_reg,
+ "possible collision");
+
+ // Pass the length, ptr pair
+ Label is_null, done;
+ VMRegPair tmp;
+ tmp.set_ptr(tmp_reg->as_VMReg());
+ if (reg.first()->is_stack()) {
+ // Load the arg up from the stack
+ move_ptr(masm, reg, tmp);
+ reg = tmp;
+ }
+ __ testptr(reg.first()->as_Register(), reg.first()->as_Register());
+ __ jccb(Assembler::equal, is_null);
+ __ lea(tmp_reg, Address(reg.first()->as_Register(), arrayOopDesc::base_offset_in_bytes(in_elem_type)));
+ move_ptr(masm, tmp, body_arg);
+ // load the length relative to the body.
+ __ movl(tmp_reg, Address(tmp_reg, arrayOopDesc::length_offset_in_bytes() -
+ arrayOopDesc::base_offset_in_bytes(in_elem_type)));
+ move32_64(masm, tmp, length_arg);
+ __ jmpb(done);
+ __ bind(is_null);
+ // Pass zeros
+ __ xorptr(tmp_reg, tmp_reg);
+ move_ptr(masm, tmp, body_arg);
+ move32_64(masm, tmp, length_arg);
+ __ bind(done);
+}
+
+
+class ComputeMoveOrder: public StackObj {
+ class MoveOperation: public ResourceObj {
+ friend class ComputeMoveOrder;
+ private:
+ VMRegPair _src;
+ VMRegPair _dst;
+ int _src_index;
+ int _dst_index;
+ bool _processed;
+ MoveOperation* _next;
+ MoveOperation* _prev;
+
+ static int get_id(VMRegPair r) {
+ return r.first()->value();
+ }
+
+ public:
+ MoveOperation(int src_index, VMRegPair src, int dst_index, VMRegPair dst):
+ _src(src)
+ , _src_index(src_index)
+ , _dst(dst)
+ , _dst_index(dst_index)
+ , _next(NULL)
+ , _prev(NULL)
+ , _processed(false) {
+ }
+
+ VMRegPair src() const { return _src; }
+ int src_id() const { return get_id(src()); }
+ int src_index() const { return _src_index; }
+ VMRegPair dst() const { return _dst; }
+ void set_dst(int i, VMRegPair dst) { _dst_index = i, _dst = dst; }
+ int dst_index() const { return _dst_index; }
+ int dst_id() const { return get_id(dst()); }
+ MoveOperation* next() const { return _next; }
+ MoveOperation* prev() const { return _prev; }
+ void set_processed() { _processed = true; }
+ bool is_processed() const { return _processed; }
+
+ // insert
+ void break_cycle(VMRegPair temp_register) {
+ // create a new store following the last store
+ // to move from the temp_register to the original
+ MoveOperation* new_store = new MoveOperation(-1, temp_register, dst_index(), dst());
+
+ // break the cycle of links and insert new_store at the end
+ // break the reverse link.
+ MoveOperation* p = prev();
+ assert(p->next() == this, "must be");
+ _prev = NULL;
+ p->_next = new_store;
+ new_store->_prev = p;
+
+ // change the original store to save it's value in the temp.
+ set_dst(-1, temp_register);
+ }
+
+ void link(GrowableArray<MoveOperation*>& killer) {
+ // link this store in front the store that it depends on
+ MoveOperation* n = killer.at_grow(src_id(), NULL);
+ if (n != NULL) {
+ assert(_next == NULL && n->_prev == NULL, "shouldn't have been set yet");
+ _next = n;
+ n->_prev = this;
+ }
+ }
+ };
+
+ private:
+ GrowableArray<MoveOperation*> edges;
+
+ public:
+ ComputeMoveOrder(int total_in_args, VMRegPair* in_regs, int total_c_args, VMRegPair* out_regs,
+ BasicType* in_sig_bt, GrowableArray<int>& arg_order, VMRegPair tmp_vmreg) {
+ // Move operations where the dest is the stack can all be
+ // scheduled first since they can't interfere with the other moves.
+ for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ c_arg--;
+ if (out_regs[c_arg].first()->is_stack() &&
+ out_regs[c_arg + 1].first()->is_stack()) {
+ arg_order.push(i);
+ arg_order.push(c_arg);
+ } else {
+ if (out_regs[c_arg].first()->is_stack() ||
+ in_regs[i].first() == out_regs[c_arg].first()) {
+ add_edge(i, in_regs[i].first(), c_arg, out_regs[c_arg + 1]);
+ } else {
+ add_edge(i, in_regs[i].first(), c_arg, out_regs[c_arg]);
+ }
+ }
+ } else if (in_sig_bt[i] == T_VOID) {
+ arg_order.push(i);
+ arg_order.push(c_arg);
+ } else {
+ if (out_regs[c_arg].first()->is_stack() ||
+ in_regs[i].first() == out_regs[c_arg].first()) {
+ arg_order.push(i);
+ arg_order.push(c_arg);
+ } else {
+ add_edge(i, in_regs[i].first(), c_arg, out_regs[c_arg]);
+ }
+ }
+ }
+ // Break any cycles in the register moves and emit the in the
+ // proper order.
+ GrowableArray<MoveOperation*>* stores = get_store_order(tmp_vmreg);
+ for (int i = 0; i < stores->length(); i++) {
+ arg_order.push(stores->at(i)->src_index());
+ arg_order.push(stores->at(i)->dst_index());
+ }
+ }
+
+ // Collected all the move operations
+ void add_edge(int src_index, VMRegPair src, int dst_index, VMRegPair dst) {
+ if (src.first() == dst.first()) return;
+ edges.append(new MoveOperation(src_index, src, dst_index, dst));
+ }
+
+ // Walk the edges breaking cycles between moves. The result list
+ // can be walked in order to produce the proper set of loads
+ GrowableArray<MoveOperation*>* get_store_order(VMRegPair temp_register) {
+ // Record which moves kill which values
+ GrowableArray<MoveOperation*> killer;
+ for (int i = 0; i < edges.length(); i++) {
+ MoveOperation* s = edges.at(i);
+ assert(killer.at_grow(s->dst_id(), NULL) == NULL, "only one killer");
+ killer.at_put_grow(s->dst_id(), s, NULL);
+ }
+ assert(killer.at_grow(MoveOperation::get_id(temp_register), NULL) == NULL,
+ "make sure temp isn't in the registers that are killed");
+
+ // create links between loads and stores
+ for (int i = 0; i < edges.length(); i++) {
+ edges.at(i)->link(killer);
+ }
+
+ // at this point, all the move operations are chained together
+ // in a doubly linked list. Processing it backwards finds
+ // the beginning of the chain, forwards finds the end. If there's
+ // a cycle it can be broken at any point, so pick an edge and walk
+ // backward until the list ends or we end where we started.
+ GrowableArray<MoveOperation*>* stores = new GrowableArray<MoveOperation*>();
+ for (int e = 0; e < edges.length(); e++) {
+ MoveOperation* s = edges.at(e);
+ if (!s->is_processed()) {
+ MoveOperation* start = s;
+ // search for the beginning of the chain or cycle
+ while (start->prev() != NULL && start->prev() != s) {
+ start = start->prev();
+ }
+ if (start->prev() == s) {
+ start->break_cycle(temp_register);
+ }
+ // walk the chain forward inserting to store list
+ while (start != NULL) {
+ stores->append(start);
+ start->set_processed();
+ start = start->next();
+ }
+ }
+ }
+ return stores;
+ }
+};
+
+
// ---------------------------------------------------------------------------
// Generate a native wrapper for a given method. The method takes arguments
// in the Java compiled code convention, marshals them to the native
@@ -1166,10 +1547,14 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
BasicType *in_sig_bt,
VMRegPair *in_regs,
BasicType ret_type) {
- // Native nmethod wrappers never take possesion of the oop arguments.
- // So the caller will gc the arguments. The only thing we need an
- // oopMap for is if the call is static
- //
+ bool is_critical_native = true;
+ address native_func = method->critical_native_function();
+ if (native_func == NULL) {
+ native_func = method->native_function();
+ is_critical_native = false;
+ }
+ assert(native_func != NULL, "must have function");
+
// An OopMap for lock (and class if static)
OopMapSet *oop_maps = new OopMapSet();
intptr_t start = (intptr_t)__ pc();
@@ -1180,27 +1565,72 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// we convert the java signature to a C signature by inserting
// the hidden arguments as arg[0] and possibly arg[1] (static method)
- int total_c_args = total_in_args + 1;
- if (method->is_static()) {
- total_c_args++;
+ int total_c_args = total_in_args;
+ if (!is_critical_native) {
+ total_c_args += 1;
+ if (method->is_static()) {
+ total_c_args++;
+ }
+ } else {
+ for (int i = 0; i < total_in_args; i++) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ total_c_args++;
+ }
+ }
}
BasicType* out_sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_c_args);
- VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
+ VMRegPair* out_regs = NEW_RESOURCE_ARRAY(VMRegPair, total_c_args);
+ BasicType* in_elem_bt = NULL;
int argc = 0;
- out_sig_bt[argc++] = T_ADDRESS;
- if (method->is_static()) {
- out_sig_bt[argc++] = T_OBJECT;
- }
+ if (!is_critical_native) {
+ out_sig_bt[argc++] = T_ADDRESS;
+ if (method->is_static()) {
+ out_sig_bt[argc++] = T_OBJECT;
+ }
- for (int i = 0; i < total_in_args ; i++ ) {
- out_sig_bt[argc++] = in_sig_bt[i];
+ for (int i = 0; i < total_in_args ; i++ ) {
+ out_sig_bt[argc++] = in_sig_bt[i];
+ }
+ } else {
+ Thread* THREAD = Thread::current();
+ in_elem_bt = NEW_RESOURCE_ARRAY(BasicType, total_in_args);
+ SignatureStream ss(method->signature());
+ for (int i = 0; i < total_in_args ; i++ ) {
+ if (in_sig_bt[i] == T_ARRAY) {
+ // Arrays are passed as int, elem* pair
+ out_sig_bt[argc++] = T_INT;
+ out_sig_bt[argc++] = T_ADDRESS;
+ Symbol* atype = ss.as_symbol(CHECK_NULL);
+ const char* at = atype->as_C_string();
+ if (strlen(at) == 2) {
+ assert(at[0] == '[', "must be");
+ switch (at[1]) {
+ case 'B': in_elem_bt[i] = T_BYTE; break;
+ case 'C': in_elem_bt[i] = T_CHAR; break;
+ case 'D': in_elem_bt[i] = T_DOUBLE; break;
+ case 'F': in_elem_bt[i] = T_FLOAT; break;
+ case 'I': in_elem_bt[i] = T_INT; break;
+ case 'J': in_elem_bt[i] = T_LONG; break;
+ case 'S': in_elem_bt[i] = T_SHORT; break;
+ case 'Z': in_elem_bt[i] = T_BOOLEAN; break;
+ default: ShouldNotReachHere();
+ }
+ }
+ } else {
+ out_sig_bt[argc++] = in_sig_bt[i];
+ in_elem_bt[i] = T_VOID;
+ }
+ if (in_sig_bt[i] != T_VOID) {
+ assert(in_sig_bt[i] == ss.type(), "must match");
+ ss.next();
+ }
+ }
}
// Now figure out where the args must be stored and how much stack space
// they require.
- //
int out_arg_slots;
out_arg_slots = c_calling_convention(out_sig_bt, out_regs, total_c_args);
@@ -1213,13 +1643,47 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
int stack_slots = SharedRuntime::out_preserve_stack_slots() + out_arg_slots;
// Now the space for the inbound oop handle area
+ int total_save_slots = 6 * VMRegImpl::slots_per_word; // 6 arguments passed in registers
+ if (is_critical_native) {
+ // Critical natives may have to call out so they need a save area
+ // for register arguments.
+ int double_slots = 0;
+ int single_slots = 0;
+ for ( int i = 0; i < total_in_args; i++) {
+ if (in_regs[i].first()->is_Register()) {
+ const Register reg = in_regs[i].first()->as_Register();
+ switch (in_sig_bt[i]) {
+ case T_BOOLEAN:
+ case T_BYTE:
+ case T_SHORT:
+ case T_CHAR:
+ case T_INT: single_slots++; break;
+ case T_ARRAY:
+ case T_LONG: double_slots++; break;
+ default: ShouldNotReachHere();
+ }
+ } else if (in_regs[i].first()->is_XMMRegister()) {
+ switch (in_sig_bt[i]) {
+ case T_FLOAT: single_slots++; break;
+ case T_DOUBLE: double_slots++; break;
+ default: ShouldNotReachHere();
+ }
+ } else if (in_regs[i].first()->is_FloatRegister()) {
+ ShouldNotReachHere();
+ }
+ }
+ total_save_slots = double_slots * 2 + single_slots;
+ // align the save area
+ if (double_slots != 0) {
+ stack_slots = round_to(stack_slots, 2);
+ }
+ }
int oop_handle_offset = stack_slots;
- stack_slots += 6*VMRegImpl::slots_per_word;
+ stack_slots += total_save_slots;
// Now any space we need for handlizing a klass if static method
- int oop_temp_slot_offset = 0;
int klass_slot_offset = 0;
int klass_offset = -1;
int lock_slot_offset = 0;
@@ -1272,7 +1736,6 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
int stack_size = stack_slots * VMRegImpl::stack_slot_size;
-
// First thing make an ic check to see if we should even be here
// We are free to use all registers as temps without saving them and
@@ -1283,22 +1746,22 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
const Register ic_reg = rax;
const Register receiver = j_rarg0;
- Label ok;
+ Label hit;
Label exception_pending;
assert_different_registers(ic_reg, receiver, rscratch1);
__ verify_oop(receiver);
__ load_klass(rscratch1, receiver);
__ cmpq(ic_reg, rscratch1);
- __ jcc(Assembler::equal, ok);
+ __ jcc(Assembler::equal, hit);
__ jump(RuntimeAddress(SharedRuntime::get_ic_miss_stub()));
- __ bind(ok);
-
// Verified entry point must be aligned
__ align(8);
+ __ bind(hit);
+
int vep_offset = ((intptr_t)__ pc()) - start;
// The instruction at the verified entry point must be 5 bytes or longer
@@ -1319,9 +1782,8 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// -2 because return address is already present and so is saved rbp
__ subptr(rsp, stack_size - 2*wordSize);
- // Frame is now completed as far as size and linkage.
-
- int frame_complete = ((intptr_t)__ pc()) - start;
+ // Frame is now completed as far as size and linkage.
+ int frame_complete = ((intptr_t)__ pc()) - start;
#ifdef ASSERT
{
@@ -1341,7 +1803,10 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
const Register oop_handle_reg = r14;
-
+ if (is_critical_native) {
+ check_needs_gc_for_critical_native(masm, stack_slots, total_c_args, total_in_args,
+ oop_handle_offset, oop_maps, in_regs, in_sig_bt);
+ }
//
// We immediately shuffle the arguments so that any vm call we have to
@@ -1390,9 +1855,43 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
#endif /* ASSERT */
+ // This may iterate in two different directions depending on the
+ // kind of native it is. The reason is that for regular JNI natives
+ // the incoming and outgoing registers are offset upwards and for
+ // critical natives they are offset down.
+ GrowableArray<int> arg_order(2 * total_in_args);
+ VMRegPair tmp_vmreg;
+ tmp_vmreg.set1(rbx->as_VMReg());
+
+ if (!is_critical_native) {
+ for (int i = total_in_args - 1, c_arg = total_c_args - 1; i >= 0; i--, c_arg--) {
+ arg_order.push(i);
+ arg_order.push(c_arg);
+ }
+ } else {
+ // Compute a valid move order, using tmp_vmreg to break any cycles
+ ComputeMoveOrder cmo(total_in_args, in_regs, total_c_args, out_regs, in_sig_bt, arg_order, tmp_vmreg);
+ }
- int c_arg = total_c_args - 1;
- for ( int i = total_in_args - 1; i >= 0 ; i--, c_arg-- ) {
+ int temploc = -1;
+ for (int ai = 0; ai < arg_order.length(); ai += 2) {
+ int i = arg_order.at(ai);
+ int c_arg = arg_order.at(ai + 1);
+ __ block_comment(err_msg("move %d -> %d", i, c_arg));
+ if (c_arg == -1) {
+ assert(is_critical_native, "should only be required for critical natives");
+ // This arg needs to be moved to a temporary
+ __ mov(tmp_vmreg.first()->as_Register(), in_regs[i].first()->as_Register());
+ in_regs[i] = tmp_vmreg;
+ temploc = i;
+ continue;
+ } else if (i == -1) {
+ assert(is_critical_native, "should only be required for critical natives");
+ // Read from the temporary location
+ assert(temploc != -1, "must be valid");
+ i = temploc;
+ temploc = -1;
+ }
#ifdef ASSERT
if (in_regs[i].first()->is_Register()) {
assert(!reg_destroyed[in_regs[i].first()->as_Register()->encoding()], "destroyed reg!");
@@ -1407,7 +1906,20 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
#endif /* ASSERT */
switch (in_sig_bt[i]) {
case T_ARRAY:
+ if (is_critical_native) {
+ unpack_array_argument(masm, in_regs[i], in_elem_bt[i], out_regs[c_arg + 1], out_regs[c_arg]);
+ c_arg++;
+#ifdef ASSERT
+ if (out_regs[c_arg].first()->is_Register()) {
+ reg_destroyed[out_regs[c_arg].first()->as_Register()->encoding()] = true;
+ } else if (out_regs[c_arg].first()->is_XMMRegister()) {
+ freg_destroyed[out_regs[c_arg].first()->as_XMMRegister()->encoding()] = true;
+ }
+#endif
+ break;
+ }
case T_OBJECT:
+ assert(!is_critical_native, "no oop arguments");
object_move(masm, map, oop_handle_offset, stack_slots, in_regs[i], out_regs[c_arg],
((i == 0) && (!is_static)),
&receiver_offset);
@@ -1439,11 +1951,11 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// point c_arg at the first arg that is already loaded in case we
// need to spill before we call out
- c_arg++;
+ int c_arg = total_c_args - total_in_args;
// Pre-load a static method's oop into r14. Used both by locking code and
// the normal JNI call code.
- if (method->is_static()) {
+ if (method->is_static() && !is_critical_native) {
// load oop into a register
__ movoop(oop_handle_reg, JNIHandles::make_local(Klass::cast(method->method_holder())->java_mirror()));
@@ -1509,6 +2021,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
Label lock_done;
if (method->is_synchronized()) {
+ assert(!is_critical_native, "unhandled");
const int mark_word_offset = BasicLock::displaced_header_offset_in_bytes();
@@ -1572,13 +2085,14 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// get JNIEnv* which is first argument to native
-
- __ lea(c_rarg0, Address(r15_thread, in_bytes(JavaThread::jni_environment_offset())));
+ if (!is_critical_native) {
+ __ lea(c_rarg0, Address(r15_thread, in_bytes(JavaThread::jni_environment_offset())));
+ }
// Now set thread in native
__ movl(Address(r15_thread, JavaThread::thread_state_offset()), _thread_in_native);
- __ call(RuntimeAddress(method->native_function()));
+ __ call(RuntimeAddress(native_func));
// Either restore the MXCSR register after returning from the JNI Call
// or verify that it wasn't changed.
@@ -1634,6 +2148,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
}
}
+ Label after_transition;
// check for safepoint operation in progress and/or pending suspend requests
{
@@ -1659,16 +2174,28 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
__ mov(r12, rsp); // remember sp
__ subptr(rsp, frame::arg_reg_save_area_bytes); // windows
__ andptr(rsp, -16); // align stack as required by ABI
- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans)));
+ if (!is_critical_native) {
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans)));
+ } else {
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans_and_transition)));
+ }
__ mov(rsp, r12); // restore sp
__ reinit_heapbase();
// Restore any method result value
restore_native_result(masm, ret_type, stack_slots);
+
+ if (is_critical_native) {
+ // The call above performed the transition to thread_in_Java so
+ // skip the transition logic below.
+ __ jmpb(after_transition);
+ }
+
__ bind(Continue);
}
// change thread state
__ movl(Address(r15_thread, JavaThread::thread_state_offset()), _thread_in_Java);
+ __ bind(after_transition);
Label reguard;
Label reguard_done;
@@ -1746,17 +2273,21 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
__ verify_oop(rax);
}
- // reset handle block
- __ movptr(rcx, Address(r15_thread, JavaThread::active_handles_offset()));
- __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
+ if (!is_critical_native) {
+ // reset handle block
+ __ movptr(rcx, Address(r15_thread, JavaThread::active_handles_offset()));
+ __ movptr(Address(rcx, JNIHandleBlock::top_offset_in_bytes()), (int32_t)NULL_WORD);
+ }
// pop our frame
__ leave();
- // Any exception pending?
- __ cmpptr(Address(r15_thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
- __ jcc(Assembler::notEqual, exception_pending);
+ if (!is_critical_native) {
+ // Any exception pending?
+ __ cmpptr(Address(r15_thread, in_bytes(Thread::pending_exception_offset())), (int32_t)NULL_WORD);
+ __ jcc(Assembler::notEqual, exception_pending);
+ }
// Return
@@ -1764,12 +2295,13 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
// Unexpected paths are out of line and go here
- // forward the exception
- __ bind(exception_pending);
-
- // and forward the exception
- __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+ if (!is_critical_native) {
+ // forward the exception
+ __ bind(exception_pending);
+ // and forward the exception
+ __ jump(RuntimeAddress(StubRoutines::forward_exception_entry()));
+ }
// Slow path locking & unlocking
if (method->is_synchronized()) {
@@ -1876,6 +2408,11 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler *masm,
(is_static ? in_ByteSize(klass_offset) : in_ByteSize(receiver_offset)),
in_ByteSize(lock_slot_offset*VMRegImpl::stack_slot_size),
oop_maps);
+
+ if (is_critical_native) {
+ nm->set_lazy_critical_native(true);
+ }
+
return nm;
}
@@ -3255,8 +3792,12 @@ void OptoRuntime::generate_exception_blob() {
//
// address OptoRuntime::handle_exception_C(JavaThread* thread)
- __ set_last_Java_frame(noreg, noreg, NULL);
+ // At a method handle call, the stack may not be properly aligned
+ // when returning with an exception.
+ address the_pc = __ pc();
+ __ set_last_Java_frame(noreg, noreg, the_pc);
__ mov(c_rarg0, r15_thread);
+ __ andptr(rsp, -(StackAlignmentInBytes)); // Align stack
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, OptoRuntime::handle_exception_C)));
// Set an oopmap for the call site. This oopmap will only be used if we
@@ -3267,9 +3808,9 @@ void OptoRuntime::generate_exception_blob() {
OopMapSet* oop_maps = new OopMapSet();
- oop_maps->add_gc_map( __ pc()-start, new OopMap(SimpleRuntimeFrame::framesize, 0));
+ oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false, true);
// Restore callee-saved registers
diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
index a6fcc78..9d94722 100644
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
@@ -710,6 +710,21 @@ class StubGenerator: public StubCodeGenerator {
return start;
}
+ // Support for intptr_t get_previous_sp()
+ //
+ // This routine is used to find the previous stack pointer for the
+ // caller.
+ address generate_get_previous_sp() {
+ StubCodeMark mark(this, "StubRoutines", "get_previous_sp");
+ address start = __ pc();
+
+ __ movptr(rax, rsp);
+ __ addptr(rax, 8); // return address is at the top of the stack.
+ __ ret(0);
+
+ return start;
+ }
+
//----------------------------------------------------------------------------------------------------
// Support for void verify_mxcsr()
//
@@ -2978,7 +2993,9 @@ class StubGenerator: public StubCodeGenerator {
int frame_complete = __ pc() - start;
// Set up last_Java_sp and last_Java_fp
- __ set_last_Java_frame(rsp, rbp, NULL);
+ address the_pc = __ pc();
+ __ set_last_Java_frame(rsp, rbp, the_pc);
+ __ andptr(rsp, -(StackAlignmentInBytes)); // Align stack
// Call runtime
if (arg1 != noreg) {
@@ -2995,9 +3012,9 @@ class StubGenerator: public StubCodeGenerator {
// Generate oop map
OopMap* map = new OopMap(framesize, 0);
- oop_maps->add_gc_map(__ pc() - start, map);
+ oop_maps->add_gc_map(the_pc - start, map);
- __ reset_last_Java_frame(true, false);
+ __ reset_last_Java_frame(true, true);
__ leave(); // required for proper stackwalking of RuntimeStub frame
@@ -3058,6 +3075,7 @@ class StubGenerator: public StubCodeGenerator {
// platform dependent
StubRoutines::x86::_get_previous_fp_entry = generate_get_previous_fp();
+ StubRoutines::x86::_get_previous_sp_entry = generate_get_previous_sp();
StubRoutines::x86::_verify_mxcsr_entry = generate_verify_mxcsr();
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
index 182872b..782dc90 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
@@ -43,6 +43,7 @@
// a description of how to extend it, see the stubRoutines.hpp file.
address StubRoutines::x86::_get_previous_fp_entry = NULL;
+address StubRoutines::x86::_get_previous_sp_entry = NULL;
address StubRoutines::x86::_verify_mxcsr_entry = NULL;
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp
index 3d2a4fb..7737c4e 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.hpp
@@ -41,6 +41,7 @@ class x86 {
private:
static address _get_previous_fp_entry;
+ static address _get_previous_sp_entry;
static address _verify_mxcsr_entry;
static address _f2i_fixup;
@@ -61,6 +62,11 @@ class x86 {
return _get_previous_fp_entry;
}
+ static address get_previous_sp_entry()
+ {
+ return _get_previous_sp_entry;
+ }
+
static address verify_mxcsr_entry()
{
return _verify_mxcsr_entry;
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
index 2155d76..121be7a 100644
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,8 +65,8 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
address generate_getPsrInfo() {
// Flags to test CPU type.
- const uint32_t EFL_AC = 0x40000;
- const uint32_t EFL_ID = 0x200000;
+ const uint32_t HS_EFL_AC = 0x40000;
+ const uint32_t HS_EFL_ID = 0x200000;
// Values for when we don't have a CPUID instruction.
const int CPU_FAMILY_SHIFT = 8;
const uint32_t CPU_FAMILY_386 = (3 << CPU_FAMILY_SHIFT);
@@ -100,7 +100,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
//
// if we are unable to change the AC flag, we have a 386
//
- __ xorl(rax, EFL_AC);
+ __ xorl(rax, HS_EFL_AC);
__ push(rax);
__ popf();
__ pushf();
@@ -118,7 +118,7 @@ class VM_Version_StubGenerator: public StubCodeGenerator {
//
__ bind(detect_486);
__ mov(rax, rcx);
- __ xorl(rax, EFL_ID);
+ __ xorl(rax, HS_EFL_ID);
__ push(rax);
__ popf();
__ pushf();
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
index 27f3bde..7e30977 100644
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
@@ -249,13 +249,18 @@ protected:
enum {
// AMD
- CPU_FAMILY_AMD_11H = 17,
+ CPU_FAMILY_AMD_11H = 0x11,
// Intel
CPU_FAMILY_INTEL_CORE = 6,
- CPU_MODEL_NEHALEM_EP = 26,
- CPU_MODEL_WESTMERE_EP = 44,
-// CPU_MODEL_IVYBRIDGE_EP = ??, TODO - get real value
- CPU_MODEL_SANDYBRIDGE_EP = 45
+ CPU_MODEL_NEHALEM = 0x1e,
+ CPU_MODEL_NEHALEM_EP = 0x1a,
+ CPU_MODEL_NEHALEM_EX = 0x2e,
+ CPU_MODEL_WESTMERE = 0x25,
+ CPU_MODEL_WESTMERE_EP = 0x2c,
+ CPU_MODEL_WESTMERE_EX = 0x2f,
+ CPU_MODEL_SANDYBRIDGE = 0x2a,
+ CPU_MODEL_SANDYBRIDGE_EP = 0x2d,
+ CPU_MODEL_IVYBRIDGE_EP = 0x3a
} cpuExtendedFamily;
// cpuid information block. All info derived from executing cpuid with
@@ -325,7 +330,7 @@ protected:
uint32_t proc_name_4, proc_name_5, proc_name_6, proc_name_7;
uint32_t proc_name_8, proc_name_9, proc_name_10,proc_name_11;
- // cpuid function 0x80000005 //AMD L1, Intel reserved
+ // cpuid function 0x80000005 // AMD L1, Intel reserved
uint32_t ext_cpuid5_eax; // unused currently
uint32_t ext_cpuid5_ebx; // reserved
ExtCpuid5Ex ext_cpuid5_ecx; // L1 data cache info (AMD)
@@ -547,15 +552,15 @@ public:
static bool is_intel_tsc_synched_at_init() {
if (is_intel_family_core()) {
uint32_t ext_model = extended_cpu_model();
- if (ext_model == CPU_MODEL_NEHALEM_EP ||
- ext_model == CPU_MODEL_WESTMERE_EP ||
-// TODO ext_model == CPU_MODEL_IVYBRIDGE_EP ||
- ext_model == CPU_MODEL_SANDYBRIDGE_EP) {
- // 2-socket invtsc support. EX versions with 4 sockets are not
- // guaranteed to synchronize tscs at initialization via a double
- // handshake. The tscs can be explicitly set in software. Code
- // that uses tsc values must be prepared for them to arbitrarily
- // jump backward or forward.
+ if (ext_model == CPU_MODEL_NEHALEM_EP ||
+ ext_model == CPU_MODEL_WESTMERE_EP ||
+ ext_model == CPU_MODEL_SANDYBRIDGE_EP ||
+ ext_model == CPU_MODEL_IVYBRIDGE_EP) {
+ // <= 2-socket invariant tsc support. EX versions are usually used
+ // in > 2-socket systems and likely don't synchronize tscs at
+ // initialization.
+ // Code that uses tsc values must be prepared for them to arbitrarily
+ // jump forward or backward.
return true;
}
}
diff --git a/hotspot/src/cpu/x86/vm/x86.ad b/hotspot/src/cpu/x86/vm/x86.ad
index 5f165a9..6bd9128 100644
--- a/hotspot/src/cpu/x86/vm/x86.ad
+++ b/hotspot/src/cpu/x86/vm/x86.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -37,10 +37,87 @@ source %{
static address double_signmask() { return (address)double_signmask_pool; }
static address double_signflip() { return (address)double_signflip_pool; }
#endif
+
+#ifndef PRODUCT
+ void MachNopNode::format(PhaseRegAlloc*, outputStream* st) const {
+ st->print("nop \t# %d bytes pad for loops and calls", _count);
+ }
+#endif
+
+ void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc*) const {
+ MacroAssembler _masm(&cbuf);
+ __ nop(_count);
+ }
+
+ uint MachNopNode::size(PhaseRegAlloc*) const {
+ return _count;
+ }
+
+#ifndef PRODUCT
+ void MachBreakpointNode::format(PhaseRegAlloc*, outputStream* st) const {
+ st->print("# breakpoint");
+ }
+#endif
+
+ void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc* ra_) const {
+ MacroAssembler _masm(&cbuf);
+ __ int3();
+ }
+
+ uint MachBreakpointNode::size(PhaseRegAlloc* ra_) const {
+ return MachNode::size(ra_);
+ }
+
+%}
+
+encode %{
+
+ enc_class preserve_SP %{
+ debug_only(int off0 = cbuf.insts_size());
+ MacroAssembler _masm(&cbuf);
+ // RBP is preserved across all calls, even compiled calls.
+ // Use it to preserve RSP in places where the callee might change the SP.
+ __ movptr(rbp_mh_SP_save, rsp);
+ debug_only(int off1 = cbuf.insts_size());
+ assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
+ %}
+
+ enc_class restore_SP %{
+ MacroAssembler _masm(&cbuf);
+ __ movptr(rsp, rbp_mh_SP_save);
+ %}
+
+ enc_class call_epilog %{
+ if (VerifyStackAtCalls) {
+ // Check that stack depth is unchanged: find majik cookie on stack
+ int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3*VMRegImpl::slots_per_word));
+ MacroAssembler _masm(&cbuf);
+ Label L;
+ __ cmpptr(Address(rsp, framesize), (int32_t)0xbadb100d);
+ __ jccb(Assembler::equal, L);
+ // Die if stack mismatch
+ __ int3();
+ __ bind(L);
+ }
+ %}
+
%}
// INSTRUCTIONS -- Platform independent definitions (same for 32- and 64-bit)
+// ============================================================================
+
+instruct ShouldNotReachHere() %{
+ match(Halt);
+ format %{ "int3\t# ShouldNotReachHere" %}
+ ins_encode %{
+ __ int3();
+ %}
+ ins_pipe(pipe_slow);
+%}
+
+// ============================================================================
+
instruct addF_reg(regF dst, regF src) %{
predicate((UseSSE>=1) && (UseAVX == 0));
match(Set dst (AddF dst src));
diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad
index ca85f15..1c5248f 100644
--- a/hotspot/src/cpu/x86/vm/x86_32.ad
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -341,12 +341,6 @@ int CallDynamicJavaDirectNode::compute_padding(int current_offset) const {
return round_to(current_offset, alignment_required()) - current_offset;
}
-#ifndef PRODUCT
-void MachBreakpointNode::format( PhaseRegAlloc *, outputStream* st ) const {
- st->print("INT3");
-}
-#endif
-
// EMIT_RM()
void emit_rm(CodeBuffer &cbuf, int f1, int f2, int f3) {
unsigned char c = (unsigned char)((f1 << 6) | (f2 << 3) | f3);
@@ -550,118 +544,66 @@ void MachConstantBaseNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
//=============================================================================
#ifndef PRODUCT
-void MachPrologNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
+void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
Compile* C = ra_->C;
- if( C->in_24_bit_fp_mode() ) {
- st->print("FLDCW 24 bit fpu control word");
- st->print_cr(""); st->print("\t");
- }
int framesize = C->frame_slots() << LogBytesPerInt;
assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
- // Remove two words for return addr and rbp,
- framesize -= 2*wordSize;
+ // Remove wordSize for return addr which is already pushed.
+ framesize -= wordSize;
- // Calls to C2R adapters often do not accept exceptional returns.
- // We require that their callers must bang for them. But be careful, because
- // some VM calls (such as call site linkage) can use several kilobytes of
- // stack. But the stack safety zone should account for that.
- // See bugs 4446381, 4468289, 4497237.
if (C->need_stack_bang(framesize)) {
- st->print_cr("# stack bang"); st->print("\t");
+ framesize -= wordSize;
+ st->print("# stack bang");
+ st->print("\n\t");
+ st->print("PUSH EBP\t# Save EBP");
+ if (framesize) {
+ st->print("\n\t");
+ st->print("SUB ESP, #%d\t# Create frame",framesize);
+ }
+ } else {
+ st->print("SUB ESP, #%d\t# Create frame",framesize);
+ st->print("\n\t");
+ framesize -= wordSize;
+ st->print("MOV [ESP + #%d], EBP\t# Save EBP",framesize);
}
- st->print_cr("PUSHL EBP"); st->print("\t");
- if( VerifyStackAtCalls ) { // Majik cookie to verify stack depth
- st->print("PUSH 0xBADB100D\t# Majik cookie for stack depth check");
- st->print_cr(""); st->print("\t");
+ if (VerifyStackAtCalls) {
+ st->print("\n\t");
framesize -= wordSize;
+ st->print("MOV [ESP + #%d], 0xBADB100D\t# Majik cookie for stack depth check",framesize);
}
- if ((C->in_24_bit_fp_mode() || VerifyStackAtCalls ) && framesize < 128 ) {
- if (framesize) {
- st->print("SUB ESP,%d\t# Create frame",framesize);
- }
- } else {
- st->print("SUB ESP,%d\t# Create frame",framesize);
+ if( C->in_24_bit_fp_mode() ) {
+ st->print("\n\t");
+ st->print("FLDCW \t# load 24 bit fpu control word");
+ }
+ if (UseSSE >= 2 && VerifyFPU) {
+ st->print("\n\t");
+ st->print("# verify FPU stack (must be clean on entry)");
}
+
+#ifdef ASSERT
+ if (VerifyStackAtCalls) {
+ st->print("\n\t");
+ st->print("# stack alignment check");
+ }
+#endif
+ st->cr();
}
#endif
void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
Compile* C = ra_->C;
-
- if (UseSSE >= 2 && VerifyFPU) {
- MacroAssembler masm(&cbuf);
- masm.verify_FPU(0, "FPU stack must be clean on entry");
- }
-
- // WARNING: Initial instruction MUST be 5 bytes or longer so that
- // NativeJump::patch_verified_entry will be able to patch out the entry
- // code safely. The fldcw is ok at 6 bytes, the push to verify stack
- // depth is ok at 5 bytes, the frame allocation can be either 3 or
- // 6 bytes. So if we don't do the fldcw or the push then we must
- // use the 6 byte frame allocation even if we have no frame. :-(
- // If method sets FPU control word do it now
- if( C->in_24_bit_fp_mode() ) {
- MacroAssembler masm(&cbuf);
- masm.fldcw(ExternalAddress(StubRoutines::addr_fpu_cntrl_wrd_24()));
- }
+ MacroAssembler _masm(&cbuf);
int framesize = C->frame_slots() << LogBytesPerInt;
- assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
- // Remove two words for return addr and rbp,
- framesize -= 2*wordSize;
-
- // Calls to C2R adapters often do not accept exceptional returns.
- // We require that their callers must bang for them. But be careful, because
- // some VM calls (such as call site linkage) can use several kilobytes of
- // stack. But the stack safety zone should account for that.
- // See bugs 4446381, 4468289, 4497237.
- if (C->need_stack_bang(framesize)) {
- MacroAssembler masm(&cbuf);
- masm.generate_stack_overflow_check(framesize);
- }
- // We always push rbp, so that on return to interpreter rbp, will be
- // restored correctly and we can correct the stack.
- emit_opcode(cbuf, 0x50 | EBP_enc);
+ __ verified_entry(framesize, C->need_stack_bang(framesize), C->in_24_bit_fp_mode());
- if( VerifyStackAtCalls ) { // Majik cookie to verify stack depth
- emit_opcode(cbuf, 0x68); // push 0xbadb100d
- emit_d32(cbuf, 0xbadb100d);
- framesize -= wordSize;
- }
-
- if ((C->in_24_bit_fp_mode() || VerifyStackAtCalls ) && framesize < 128 ) {
- if (framesize) {
- emit_opcode(cbuf, 0x83); // sub SP,#framesize
- emit_rm(cbuf, 0x3, 0x05, ESP_enc);
- emit_d8(cbuf, framesize);
- }
- } else {
- emit_opcode(cbuf, 0x81); // sub SP,#framesize
- emit_rm(cbuf, 0x3, 0x05, ESP_enc);
- emit_d32(cbuf, framesize);
- }
C->set_frame_complete(cbuf.insts_size());
-#ifdef ASSERT
- if (VerifyStackAtCalls) {
- Label L;
- MacroAssembler masm(&cbuf);
- masm.push(rax);
- masm.mov(rax, rsp);
- masm.andptr(rax, StackAlignmentInBytes-1);
- masm.cmpptr(rax, StackAlignmentInBytes-wordSize);
- masm.pop(rax);
- masm.jcc(Assembler::equal, L);
- masm.stop("Stack is not properly aligned!");
- masm.bind(L);
- }
-#endif
-
if (C->has_mach_constant_base_node()) {
// NOTE: We set the table base offset here because users might be
// emitted before MachConstantBaseNode.
@@ -1169,7 +1111,7 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
}
#ifndef PRODUCT
-void MachSpillCopyNode::format( PhaseRegAlloc *ra_, outputStream* st ) const {
+void MachSpillCopyNode::format(PhaseRegAlloc *ra_, outputStream* st) const {
implementation( NULL, ra_, false, st );
}
#endif
@@ -1182,22 +1124,6 @@ uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const {
return implementation( NULL, ra_, true, NULL );
}
-//=============================================================================
-#ifndef PRODUCT
-void MachNopNode::format( PhaseRegAlloc *, outputStream* st ) const {
- st->print("NOP \t# %d bytes pad for loops and calls", _count);
-}
-#endif
-
-void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc * ) const {
- MacroAssembler _masm(&cbuf);
- __ nop(_count);
-}
-
-uint MachNopNode::size(PhaseRegAlloc *) const {
- return _count;
-}
-
//=============================================================================
#ifndef PRODUCT
@@ -1367,6 +1293,14 @@ const bool Matcher::match_rule_supported(int opcode) {
if (!has_match_rule(opcode))
return false;
+ switch (opcode) {
+ case Op_PopCountI:
+ case Op_PopCountL:
+ if (!UsePopCountInstruction)
+ return false;
+ break;
+ }
+
return true; // Per default match rules are supported.
}
@@ -1883,21 +1817,6 @@ encode %{
}
%}
- enc_class preserve_SP %{
- debug_only(int off0 = cbuf.insts_size());
- MacroAssembler _masm(&cbuf);
- // RBP is preserved across all calls, even compiled calls.
- // Use it to preserve RSP in places where the callee might change the SP.
- __ movptr(rbp_mh_SP_save, rsp);
- debug_only(int off1 = cbuf.insts_size());
- assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
- %}
-
- enc_class restore_SP %{
- MacroAssembler _masm(&cbuf);
- __ movptr(rsp, rbp_mh_SP_save);
- %}
-
enc_class Java_Static_Call (method meth) %{ // JAVA STATIC CALL
// CALL to fixup routine. Fixup routine uses ScopeDesc info to determine
// who we intended to call.
@@ -3846,9 +3765,9 @@ frame %{
// Ret Addr is on stack in slot 0 if no locks or verification or alignment.
// Otherwise, it is above the locks and verification slot and alignment word
return_addr(STACK - 1 +
- round_to(1+VerifyStackAtCalls+
- Compile::current()->fixed_slots(),
- (StackAlignmentInBytes/wordSize)));
+ round_to((Compile::current()->in_preserve_stack_slots() +
+ Compile::current()->fixed_slots()),
+ stack_alignment_in_slots()));
// Body of function which returns an integer array locating
// arguments either in registers or in stack slots. Passed an array
@@ -13476,6 +13395,25 @@ instruct safePoint_poll(eFlagsReg cr) %{
ins_pipe( ialu_reg_mem );
%}
+
+// ============================================================================
+// This name is KNOWN by the ADLC and cannot be changed.
+// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
+// for this guy.
+instruct tlsLoadP(eRegP dst, eFlagsReg cr) %{
+ match(Set dst (ThreadLocal));
+ effect(DEF dst, KILL cr);
+
+ format %{ "MOV $dst, Thread::current()" %}
+ ins_encode %{
+ Register dstReg = as_Register($dst$$reg);
+ __ get_thread(dstReg);
+ %}
+ ins_pipe( ialu_reg_fat );
+%}
+
+
+
//----------PEEPHOLE RULES-----------------------------------------------------
// These must follow all instruction definitions as they use the names
// defined in the instructions definitions.
diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/hotspot/src/cpu/x86/vm/x86_64.ad
index 338db98..b86d288 100644
--- a/hotspot/src/cpu/x86/vm/x86_64.ad
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -610,13 +610,6 @@ int CallDynamicJavaDirectNode::compute_padding(int current_offset) const
return round_to(current_offset, alignment_required()) - current_offset;
}
-#ifndef PRODUCT
-void MachBreakpointNode::format(PhaseRegAlloc*, outputStream* st) const
-{
- st->print("INT3");
-}
-#endif
-
// EMIT_RM()
void emit_rm(CodeBuffer &cbuf, int f1, int f2, int f3) {
unsigned char c = (unsigned char) ((f1 << 6) | (f2 << 3) | f3);
@@ -853,121 +846,53 @@ void MachConstantBaseNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
//=============================================================================
#ifndef PRODUCT
-void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const
-{
+void MachPrologNode::format(PhaseRegAlloc* ra_, outputStream* st) const {
Compile* C = ra_->C;
int framesize = C->frame_slots() << LogBytesPerInt;
assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
- // Remove wordSize for return adr already pushed
- // and another for the RBP we are going to save
- framesize -= 2*wordSize;
- bool need_nop = true;
+ // Remove wordSize for return addr which is already pushed.
+ framesize -= wordSize;
- // Calls to C2R adapters often do not accept exceptional returns.
- // We require that their callers must bang for them. But be
- // careful, because some VM calls (such as call site linkage) can
- // use several kilobytes of stack. But the stack safety zone should
- // account for that. See bugs 4446381, 4468289, 4497237.
if (C->need_stack_bang(framesize)) {
- st->print_cr("# stack bang"); st->print("\t");
- need_nop = false;
+ framesize -= wordSize;
+ st->print("# stack bang");
+ st->print("\n\t");
+ st->print("pushq rbp\t# Save rbp");
+ if (framesize) {
+ st->print("\n\t");
+ st->print("subq rsp, #%d\t# Create frame",framesize);
+ }
+ } else {
+ st->print("subq rsp, #%d\t# Create frame",framesize);
+ st->print("\n\t");
+ framesize -= wordSize;
+ st->print("movq [rsp + #%d], rbp\t# Save rbp",framesize);
}
- st->print_cr("pushq rbp"); st->print("\t");
if (VerifyStackAtCalls) {
- // Majik cookie to verify stack depth
- st->print_cr("pushq 0xffffffffbadb100d"
- "\t# Majik cookie for stack depth check");
- st->print("\t");
- framesize -= wordSize; // Remove 2 for cookie
- need_nop = false;
- }
-
- if (framesize) {
- st->print("subq rsp, #%d\t# Create frame", framesize);
- if (framesize < 0x80 && need_nop) {
- st->print("\n\tnop\t# nop for patch_verified_entry");
- }
+ st->print("\n\t");
+ framesize -= wordSize;
+ st->print("movq [rsp + #%d], 0xbadb100d\t# Majik cookie for stack depth check",framesize);
+#ifdef ASSERT
+ st->print("\n\t");
+ st->print("# stack alignment check");
+#endif
}
+ st->cr();
}
#endif
-void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const
-{
+void MachPrologNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
Compile* C = ra_->C;
-
- // WARNING: Initial instruction MUST be 5 bytes or longer so that
- // NativeJump::patch_verified_entry will be able to patch out the entry
- // code safely. The fldcw is ok at 6 bytes, the push to verify stack
- // depth is ok at 5 bytes, the frame allocation can be either 3 or
- // 6 bytes. So if we don't do the fldcw or the push then we must
- // use the 6 byte frame allocation even if we have no frame. :-(
- // If method sets FPU control word do it now
+ MacroAssembler _masm(&cbuf);
int framesize = C->frame_slots() << LogBytesPerInt;
- assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
- // Remove wordSize for return adr already pushed
- // and another for the RBP we are going to save
- framesize -= 2*wordSize;
- bool need_nop = true;
-
- // Calls to C2R adapters often do not accept exceptional returns.
- // We require that their callers must bang for them. But be
- // careful, because some VM calls (such as call site linkage) can
- // use several kilobytes of stack. But the stack safety zone should
- // account for that. See bugs 4446381, 4468289, 4497237.
- if (C->need_stack_bang(framesize)) {
- MacroAssembler masm(&cbuf);
- masm.generate_stack_overflow_check(framesize);
- need_nop = false;
- }
-
- // We always push rbp so that on return to interpreter rbp will be
- // restored correctly and we can correct the stack.
- emit_opcode(cbuf, 0x50 | RBP_enc);
-
- if (VerifyStackAtCalls) {
- // Majik cookie to verify stack depth
- emit_opcode(cbuf, 0x68); // pushq (sign-extended) 0xbadb100d
- emit_d32(cbuf, 0xbadb100d);
- framesize -= wordSize; // Remove 2 for cookie
- need_nop = false;
- }
- if (framesize) {
- emit_opcode(cbuf, Assembler::REX_W);
- if (framesize < 0x80) {
- emit_opcode(cbuf, 0x83); // sub SP,#framesize
- emit_rm(cbuf, 0x3, 0x05, RSP_enc);
- emit_d8(cbuf, framesize);
- if (need_nop) {
- emit_opcode(cbuf, 0x90); // nop
- }
- } else {
- emit_opcode(cbuf, 0x81); // sub SP,#framesize
- emit_rm(cbuf, 0x3, 0x05, RSP_enc);
- emit_d32(cbuf, framesize);
- }
- }
+ __ verified_entry(framesize, C->need_stack_bang(framesize), false);
C->set_frame_complete(cbuf.insts_size());
-#ifdef ASSERT
- if (VerifyStackAtCalls) {
- Label L;
- MacroAssembler masm(&cbuf);
- masm.push(rax);
- masm.mov(rax, rsp);
- masm.andptr(rax, StackAlignmentInBytes-1);
- masm.cmpptr(rax, StackAlignmentInBytes-wordSize);
- masm.pop(rax);
- masm.jcc(Assembler::equal, L);
- masm.stop("Stack is not properly aligned!");
- masm.bind(L);
- }
-#endif
-
if (C->has_mach_constant_base_node()) {
// NOTE: We set the table base offset here because users might be
// emitted before MachConstantBaseNode.
@@ -1598,26 +1523,6 @@ uint MachSpillCopyNode::size(PhaseRegAlloc *ra_) const
//=============================================================================
#ifndef PRODUCT
-void MachNopNode::format(PhaseRegAlloc*, outputStream* st) const
-{
- st->print("nop \t# %d bytes pad for loops and calls", _count);
-}
-#endif
-
-void MachNopNode::emit(CodeBuffer &cbuf, PhaseRegAlloc*) const
-{
- MacroAssembler _masm(&cbuf);
- __ nop(_count);
-}
-
-uint MachNopNode::size(PhaseRegAlloc*) const
-{
- return _count;
-}
-
-
-//=============================================================================
-#ifndef PRODUCT
void BoxLockNode::format(PhaseRegAlloc* ra_, outputStream* st) const
{
int offset = ra_->reg2offset(in_RegMask(0).find_first_elem());
@@ -1809,6 +1714,14 @@ const bool Matcher::match_rule_supported(int opcode) {
if (!has_match_rule(opcode))
return false;
+ switch (opcode) {
+ case Op_PopCountI:
+ case Op_PopCountL:
+ if (!UsePopCountInstruction)
+ return false;
+ break;
+ }
+
return true; // Per default match rules are supported.
}
@@ -2323,21 +2236,6 @@ encode %{
RELOC_DISP32);
%}
- enc_class preserve_SP %{
- debug_only(int off0 = cbuf.insts_size());
- MacroAssembler _masm(&cbuf);
- // RBP is preserved across all calls, even compiled calls.
- // Use it to preserve RSP in places where the callee might change the SP.
- __ movptr(rbp_mh_SP_save, rsp);
- debug_only(int off1 = cbuf.insts_size());
- assert(off1 - off0 == preserve_SP_size(), "correct size prediction");
- %}
-
- enc_class restore_SP %{
- MacroAssembler _masm(&cbuf);
- __ movptr(rsp, rbp_mh_SP_save);
- %}
-
enc_class Java_Static_Call(method meth)
%{
// JAVA STATIC CALL
@@ -3276,9 +3174,9 @@ frame
// Ret Addr is on stack in slot 0 if no locks or verification or alignment.
// Otherwise, it is above the locks and verification slot and alignment word
return_addr(STACK - 2 +
- round_to(2 + 2 * VerifyStackAtCalls +
- Compile::current()->fixed_slots(),
- WordsPerLong * 2));
+ round_to((Compile::current()->in_preserve_stack_slots() +
+ Compile::current()->fixed_slots()),
+ stack_alignment_in_slots()));
// Body of function which returns an integer array locating
// arguments either in registers or in stack slots. Passed an array
@@ -11736,6 +11634,21 @@ instruct RethrowException()
%}
+// ============================================================================
+// This name is KNOWN by the ADLC and cannot be changed.
+// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
+// for this guy.
+instruct tlsLoadP(r15_RegP dst) %{
+ match(Set dst (ThreadLocal));
+ effect(DEF dst);
+
+ size(0);
+ format %{ "# TLS is in R15" %}
+ ins_encode( /*empty encoding*/ );
+ ins_pipe(ialu_reg_reg);
+%}
+
+
//----------PEEPHOLE RULES-----------------------------------------------------
// These must follow all instruction definitions as they use the names
// defined in the instructions definitions.
diff --git a/hotspot/src/cpu/zero/vm/frame_zero.cpp b/hotspot/src/cpu/zero/vm/frame_zero.cpp
index 35b6e52..85f0230 100644
--- a/hotspot/src/cpu/zero/vm/frame_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/frame_zero.cpp
@@ -418,7 +418,7 @@ void ZeroFrame::identify_vp_word(int frame_index,
}
}
-#ifdef ASSERT
+#ifndef PRODUCT
void frame::describe_pd(FrameValues& values, int frame_no) {
diff --git a/hotspot/src/os/bsd/vm/attachListener_bsd.cpp b/hotspot/src/os/bsd/vm/attachListener_bsd.cpp
index f742470..53fa2e2 100644
--- a/hotspot/src/os/bsd/vm/attachListener_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/attachListener_bsd.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -206,10 +206,15 @@ int BsdAttachListener::init() {
// put in listen mode, set permissions, and rename into place
res = ::listen(listener, 5);
if (res == 0) {
- RESTARTABLE(::chmod(initial_path, S_IREAD|S_IWRITE), res);
+ RESTARTABLE(::chmod(initial_path, S_IREAD|S_IWRITE), res);
+ if (res == 0) {
+ // make sure the file is owned by the effective user and effective group
+ // (this is the default on linux, but not on mac os)
+ RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res);
if (res == 0) {
- res = ::rename(initial_path, path);
+ res = ::rename(initial_path, path);
}
+ }
}
if (res == -1) {
RESTARTABLE(::close(listener), res);
diff --git a/hotspot/src/os/bsd/vm/decoder_machO.hpp b/hotspot/src/os/bsd/vm/decoder_machO.hpp
index 48d0a9b..9fb1689 100644
--- a/hotspot/src/os/bsd/vm/decoder_machO.hpp
+++ b/hotspot/src/os/bsd/vm/decoder_machO.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,8 +29,9 @@
#include "utilities/decoder.hpp"
-// Just a placehold for now
-class MachODecoder: public NullDecoder {
+// Just a placehold for now, a real implementation should derive
+// from AbstractDecoder
+class MachODecoder : public NullDecoder {
public:
MachODecoder() { }
~MachODecoder() { }
diff --git a/hotspot/src/os/bsd/vm/osThread_bsd.cpp b/hotspot/src/os/bsd/vm/osThread_bsd.cpp
index efac803..98a3f2f 100644
--- a/hotspot/src/os/bsd/vm/osThread_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/osThread_bsd.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,11 @@
void OSThread::pd_initialize() {
assert(this != NULL, "check");
+#ifdef __APPLE__
+ _thread_id = 0;
+#else
_thread_id = NULL;
+#endif
_pthread_id = NULL;
_siginfo = NULL;
_ucontext = NULL;
diff --git a/hotspot/src/os/bsd/vm/osThread_bsd.hpp b/hotspot/src/os/bsd/vm/osThread_bsd.hpp
index 82dd34f..0e60cc3 100644
--- a/hotspot/src/os/bsd/vm/osThread_bsd.hpp
+++ b/hotspot/src/os/bsd/vm/osThread_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,10 +40,17 @@
private:
#ifdef _ALLBSD_SOURCE
- // _thread_id and _pthread_id are the same on BSD
- // keep both to minimize code divergence in os_bsd.cpp
+
+#ifdef __APPLE__
+ thread_t _thread_id;
+#else
pthread_t _thread_id;
+#endif
+
+ // _pthread_id is the pthread id, which is used by library calls
+ // (e.g. pthread_kill).
pthread_t _pthread_id;
+
#else
// _thread_id is kernel thread id (similar to LWP id on Solaris). Each
// thread has a unique thread_id (BsdThreads or NPTL). It can be used
@@ -64,9 +71,15 @@
void set_caller_sigmask(sigset_t sigmask) { _caller_sigmask = sigmask; }
#ifdef _ALLBSD_SOURCE
+#ifdef __APPLE__
+ thread_t thread_id() const {
+ return _thread_id;
+ }
+#else
pthread_t thread_id() const {
return _thread_id;
}
+#endif
#else
pid_t thread_id() const {
return _thread_id;
@@ -84,9 +97,15 @@
}
#endif // ASSERT
#ifdef _ALLBSD_SOURCE
+#ifdef __APPLE__
+ void set_thread_id(thread_t id) {
+ _thread_id = id;
+ }
+#else
void set_thread_id(pthread_t id) {
_thread_id = id;
}
+#endif
#else
void set_thread_id(pid_t id) {
_thread_id = id;
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index 2526e65..5643798 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -301,6 +301,12 @@ static char cpu_arch[] = "sparc";
#error Add appropriate cpu_arch setting
#endif
+// Compiler variant
+#ifdef COMPILER2
+#define COMPILER_VARIANT "server"
+#else
+#define COMPILER_VARIANT "client"
+#endif
#ifndef _ALLBSD_SOURCE
// pid_t gettid()
@@ -562,6 +568,25 @@ void os::init_system_properties_values() {
sprintf(ld_library_path, "%s:%s", v, t);
free(t);
}
+
+#ifdef __APPLE__
+ // Apple's Java6 has "." at the beginning of java.library.path.
+ // OpenJDK on Windows has "." at the end of java.library.path.
+ // OpenJDK on Linux and Solaris don't have "." in java.library.path
+ // at all. To ease the transition from Apple's Java6 to OpenJDK7,
+ // "." is appended to the end of java.library.path. Yes, this
+ // could cause a change in behavior, but Apple's Java6 behavior
+ // can be achieved by putting "." at the beginning of the
+ // JAVA_LIBRARY_PATH environment variable.
+ {
+ char *t = ld_library_path;
+ // that's +3 for appending ":." and the trailing '\0'
+ ld_library_path = (char *) malloc(strlen(t) + 3);
+ sprintf(ld_library_path, "%s:%s", t, ".");
+ free(t);
+ }
+#endif
+
Arguments::set_library_path(ld_library_path);
}
@@ -973,8 +998,13 @@ static void *java_start(Thread *thread) {
}
#ifdef _ALLBSD_SOURCE
+#ifdef __APPLE__
+ // thread_id is mach thread on macos
+ osthread->set_thread_id(::mach_thread_self());
+#else
// thread_id is pthread_id on BSD
osthread->set_thread_id(::pthread_self());
+#endif
#else
// thread_id is kernel thread id (similar to Solaris LWP id)
osthread->set_thread_id(os::Bsd::gettid());
@@ -1165,7 +1195,11 @@ bool os::create_attached_thread(JavaThread* thread) {
// Store pthread info into the OSThread
#ifdef _ALLBSD_SOURCE
+#ifdef __APPLE__
+ osthread->set_thread_id(::mach_thread_self());
+#else
osthread->set_thread_id(::pthread_self());
+#endif
#else
osthread->set_thread_id(os::Bsd::gettid());
#endif
@@ -1782,7 +1816,13 @@ size_t os::lasterror(char *buf, size_t len) {
return n;
}
-intx os::current_thread_id() { return (intx)pthread_self(); }
+intx os::current_thread_id() {
+#ifdef __APPLE__
+ return (intx)::mach_thread_self();
+#else
+ return (intx)::pthread_self();
+#endif
+}
int os::current_process_id() {
// Under the old bsd thread library, bsd gives each thread
@@ -2507,7 +2547,7 @@ void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
static char saved_jvm_path[MAXPATHLEN] = {0};
-// Find the full path to the current module, libjvm.so or libjvm_g.so
+// Find the full path to the current module, libjvm or libjvm_g
void os::jvm_path(char *buf, jint buflen) {
// Error checking.
if (buflen < MAXPATHLEN) {
@@ -2532,11 +2572,11 @@ void os::jvm_path(char *buf, jint buflen) {
if (Arguments::created_by_gamma_launcher()) {
// Support for the gamma launcher. Typical value for buf is
- // "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm.so". If "/jre/lib/" appears at
+ // "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm". If "/jre/lib/" appears at
// the right place in the string, then assume we are installed in a JDK and
- // we're done. Otherwise, check for a JAVA_HOME environment variable and fix
- // up the path so it looks like libjvm.so is installed there (append a
- // fake suffix hotspot/libjvm.so).
+ // we're done. Otherwise, check for a JAVA_HOME environment variable and
+ // construct a path to the JVM being overridden.
+
const char *p = buf + strlen(buf) - 1;
for (int count = 0; p > buf && count < 5; ++count) {
for (--p; p > buf && *p != '/'; --p)
@@ -2550,7 +2590,7 @@ void os::jvm_path(char *buf, jint buflen) {
char* jrelib_p;
int len;
- // Check the current module name "libjvm.so" or "libjvm_g.so".
+ // Check the current module name "libjvm" or "libjvm_g".
p = strrchr(buf, '/');
assert(strstr(p, "/libjvm") == p, "invalid library name");
p = strstr(p, "_g") ? "_g" : "";
@@ -2563,19 +2603,32 @@ void os::jvm_path(char *buf, jint buflen) {
// modules image doesn't have "jre" subdirectory
len = strlen(buf);
jrelib_p = buf + len;
- snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
+
+ // Add the appropriate library subdir
+ snprintf(jrelib_p, buflen-len, "/jre/lib");
if (0 != access(buf, F_OK)) {
- snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
+ snprintf(jrelib_p, buflen-len, "/lib");
}
+ // Add the appropriate client or server subdir
+ len = strlen(buf);
+ jrelib_p = buf + len;
+ snprintf(jrelib_p, buflen-len, "/%s", COMPILER_VARIANT);
+ if (0 != access(buf, F_OK)) {
+ snprintf(jrelib_p, buflen-len, "");
+ }
+
+ // If the path exists within JAVA_HOME, add the JVM library name
+ // to complete the path to JVM being overridden. Otherwise fallback
+ // to the path to the current library.
if (0 == access(buf, F_OK)) {
- // Use current module name "libjvm[_g].so" instead of
- // "libjvm"debug_only("_g")".so" since for fastdebug version
- // we should have "libjvm.so" but debug_only("_g") adds "_g"!
+ // Use current module name "libjvm[_g]" instead of
+ // "libjvm"debug_only("_g")"" since for fastdebug version
+ // we should have "libjvm" but debug_only("_g") adds "_g"!
len = strlen(buf);
- snprintf(buf + len, buflen-len, "/hotspot/libjvm%s.so", p);
+ snprintf(buf + len, buflen-len, "/libjvm%s%s", p, JNI_LIB_SUFFIX);
} else {
- // Go back to path of .so
+ // Fall back to path of current library
rp = realpath(dli_fname, buf);
if (rp == NULL)
return;
@@ -3570,26 +3623,28 @@ void os::loop_breaker(int attempts) {
// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
-int os::java_to_os_priority[MaxPriority + 1] = {
+int os::java_to_os_priority[CriticalPriority + 1] = {
19, // 0 Entry should never be used
0, // 1 MinPriority
3, // 2
6, // 3
- 10, // 4
- 15, // 5 NormPriority
- 18, // 6
+ 10, // 4
+ 15, // 5 NormPriority
+ 18, // 6
+
+ 21, // 7
+ 25, // 8
+ 28, // 9 NearMaxPriority
- 21, // 7
- 25, // 8
- 28, // 9 NearMaxPriority
+ 31, // 10 MaxPriority
- 31 // 10 MaxPriority
+ 31 // 11 CriticalPriority
};
#elif defined(__APPLE__)
/* Using Mach high-level priority assignments */
-int os::java_to_os_priority[MaxPriority + 1] = {
+int os::java_to_os_priority[CriticalPriority + 1] = {
0, // 0 Entry should never be used (MINPRI_USER)
27, // 1 MinPriority
@@ -3604,10 +3659,12 @@ int os::java_to_os_priority[MaxPriority + 1] = {
34, // 8
35, // 9 NearMaxPriority
- 36 // 10 MaxPriority
+ 36, // 10 MaxPriority
+
+ 36 // 11 CriticalPriority
};
#else
-int os::java_to_os_priority[MaxPriority + 1] = {
+int os::java_to_os_priority[CriticalPriority + 1] = {
19, // 0 Entry should never be used
4, // 1 MinPriority
@@ -3622,7 +3679,9 @@ int os::java_to_os_priority[MaxPriority + 1] = {
-3, // 8
-4, // 9 NearMaxPriority
- -5 // 10 MaxPriority
+ -5, // 10 MaxPriority
+
+ -5 // 11 CriticalPriority
};
#endif
@@ -3638,6 +3697,9 @@ static int prio_init() {
ThreadPriorityPolicy = 0;
}
}
+ if (UseCriticalJavaThreadPriority) {
+ os::java_to_os_priority[MaxPriority] = os::java_to_os_priority[CriticalPriority];
+ }
return 0;
}
@@ -5105,9 +5167,9 @@ jlong os::thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
struct thread_basic_info tinfo;
mach_msg_type_number_t tcount = THREAD_INFO_MAX;
kern_return_t kr;
- mach_port_t mach_thread;
+ thread_t mach_thread;
- mach_thread = pthread_mach_thread_np(thread->osthread()->thread_id());
+ mach_thread = thread->osthread()->thread_id();
kr = thread_info(mach_thread, THREAD_BASIC_INFO, (thread_info_t)&tinfo, &tcount);
if (kr != KERN_SUCCESS)
return -1;
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index f2e1988..0297df4 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2547,7 +2547,14 @@ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
}
void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) {
- commit_memory(addr, bytes, alignment_hint, false);
+ // This method works by doing an mmap over an existing mmaping and effectively discarding
+ // the existing pages. However it won't work for SHM-based large pages that cannot be
+ // uncommitted at all. We don't do anything in this case to avoid creating a segment with
+ // small pages on top of the SHM segment. This method always works for small pages, so we
+ // allow that in any case.
+ if (alignment_hint <= (size_t)os::vm_page_size() || !UseSHM) {
+ commit_memory(addr, bytes, alignment_hint, false);
+ }
}
void os::numa_make_global(char *addr, size_t bytes) {
@@ -3383,7 +3390,7 @@ void os::loop_breaker(int attempts) {
// this reason, the code should not be used as default (ThreadPriorityPolicy=0).
// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
-int os::java_to_os_priority[MaxPriority + 1] = {
+int os::java_to_os_priority[CriticalPriority + 1] = {
19, // 0 Entry should never be used
4, // 1 MinPriority
@@ -3398,7 +3405,9 @@ int os::java_to_os_priority[MaxPriority + 1] = {
-3, // 8
-4, // 9 NearMaxPriority
- -5 // 10 MaxPriority
+ -5, // 10 MaxPriority
+
+ -5 // 11 CriticalPriority
};
static int prio_init() {
@@ -3413,6 +3422,9 @@ static int prio_init() {
ThreadPriorityPolicy = 0;
}
}
+ if (UseCriticalJavaThreadPriority) {
+ os::java_to_os_priority[MaxPriority] = os::java_to_os_priority[CriticalPriority];
+ }
return 0;
}
@@ -4685,14 +4697,12 @@ char* os::map_memory(int fd, const char* file_name, size_t file_offset,
char *addr, size_t bytes, bool read_only,
bool allow_exec) {
int prot;
- int flags;
+ int flags = MAP_PRIVATE;
if (read_only) {
prot = PROT_READ;
- flags = MAP_SHARED;
} else {
prot = PROT_READ | PROT_WRITE;
- flags = MAP_PRIVATE;
}
if (allow_exec) {
diff --git a/hotspot/src/os/posix/launcher/java_md.c b/hotspot/src/os/posix/launcher/java_md.c
index 63cee98..8b1542e 100644
--- a/hotspot/src/os/posix/launcher/java_md.c
+++ b/hotspot/src/os/posix/launcher/java_md.c
@@ -701,6 +701,14 @@ GetJREPath(char *path, jint pathsize, char * arch, jboolean speculative)
char libjava[MAXPATHLEN];
if (GetApplicationHome(path, pathsize)) {
+
+ /* Is the JRE universal, i.e. no arch dir? */
+ sprintf(libjava, "%s/jre/lib/" JAVA_DLL, path);
+ if (access(libjava, F_OK) == 0) {
+ strcat(path, "/jre");
+ goto found;
+ }
+
/* Is JRE co-located with the application? */
sprintf(libjava, "%s/lib/%s/" JAVA_DLL, path, arch);
if (access(libjava, F_OK) == 0) {
@@ -734,7 +742,7 @@ LoadJavaVM(const char *jvmpath, InvocationFunctions *ifn)
ifn->GetDefaultJavaVMInitArgs = JNI_GetDefaultJavaVMInitArgs;
return JNI_TRUE;
#else
- Dl_info dlinfo;
+ Dl_info dlinfo;
void *libjvm;
if (_launcher_debug) {
diff --git a/hotspot/src/os/solaris/vm/osThread_solaris.hpp b/hotspot/src/os/solaris/vm/osThread_solaris.hpp
index 07742ac..7fe1417 100644
--- a/hotspot/src/os/solaris/vm/osThread_solaris.hpp
+++ b/hotspot/src/os/solaris/vm/osThread_solaris.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,17 +28,17 @@
// This is embedded via include into the class OSThread
private:
-
- thread_t _thread_id; // Solaris thread id
- unsigned int _lwp_id; // lwp ID, only used with bound threads
- sigset_t _caller_sigmask; // Caller's signal mask
- bool _vm_created_thread; // true if the VM create this thread
- // false if primary thread or attached thread
+ thread_t _thread_id; // Solaris thread id
+ uint _lwp_id; // lwp ID, only used with bound threads
+ int _native_priority; // Saved native priority when starting
+ // a bound thread
+ sigset_t _caller_sigmask; // Caller's signal mask
+ bool _vm_created_thread; // true if the VM created this thread,
+ // false if primary thread or attached thread
public:
-
- thread_t thread_id() const { return _thread_id; }
-
- unsigned int lwp_id() const { return _lwp_id; }
+ thread_t thread_id() const { return _thread_id; }
+ uint lwp_id() const { return _lwp_id; }
+ int native_priority() const { return _native_priority; }
// Set and get state of _vm_created_thread flag
void set_vm_created() { _vm_created_thread = true; }
@@ -62,8 +62,9 @@
return true;
}
#endif
- void set_thread_id(thread_t id) { _thread_id = id; }
- void set_lwp_id(unsigned int id){ _lwp_id = id; }
+ void set_thread_id(thread_t id) { _thread_id = id; }
+ void set_lwp_id(uint id) { _lwp_id = id; }
+ void set_native_priority(int prio) { _native_priority = prio; }
// ***************************************************************
// interrupt support. interrupts (using signals) are used to get
diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index 939ef42..31bd418 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -114,6 +114,7 @@
# include <sys/rtpriocntl.h>
# include <sys/tspriocntl.h>
# include <sys/iapriocntl.h>
+# include <sys/fxpriocntl.h>
# include <sys/loadavg.h>
# include <string.h>
# include <stdio.h>
@@ -129,8 +130,8 @@
#ifdef _GNU_SOURCE
// See bug #6514594
extern "C" int madvise(caddr_t, size_t, int);
-extern "C" int memcntl(caddr_t addr, size_t len, int cmd, caddr_t arg,
- int attr, int mask);
+extern "C" int memcntl(caddr_t addr, size_t len, int cmd, caddr_t arg,
+ int attr, int mask);
#endif //_GNU_SOURCE
/*
@@ -215,8 +216,9 @@ struct memcntl_mha {
#define MaximumPriority 127
// Values for ThreadPriorityPolicy == 1
-int prio_policy1[MaxPriority+1] = { -99999, 0, 16, 32, 48, 64,
- 80, 96, 112, 124, 127 };
+int prio_policy1[CriticalPriority+1] = {
+ -99999, 0, 16, 32, 48, 64,
+ 80, 96, 112, 124, 127, 127 };
// System parameters used internally
static clock_t clock_tics_per_sec = 100;
@@ -1011,15 +1013,6 @@ extern "C" void breakpoint() {
// use debugger to set breakpoint here
}
-// Returns an estimate of the current stack pointer. Result must be guaranteed to
-// point into the calling threads stack, and be no lower than the current stack
-// pointer.
-address os::current_stack_pointer() {
- volatile int dummy;
- address sp = (address)&dummy + 8; // %%%% need to confirm if this is right
- return sp;
-}
-
static thread_t main_thread;
// Thread start routine for all new Java threads
@@ -1048,15 +1041,22 @@ extern "C" void* java_start(void* thread_addr) {
}
// If the creator called set priority before we started,
- // we need to call set priority now that we have an lwp.
- // Get the priority from libthread and set the priority
- // for the new Solaris lwp.
+ // we need to call set_native_priority now that we have an lwp.
+ // We used to get the priority from thr_getprio (we called
+ // thr_setprio way back in create_thread) and pass it to
+ // set_native_priority, but Solaris scales the priority
+ // in java_to_os_priority, so when we read it back here,
+ // we pass trash to set_native_priority instead of what's
+ // in java_to_os_priority. So we save the native priority
+ // in the osThread and recall it here.
+
if ( osthr->thread_id() != -1 ) {
if ( UseThreadPriorities ) {
- thr_getprio(osthr->thread_id(), &prio);
+ int prio = osthr->native_priority();
if (ThreadPriorityVerbose) {
- tty->print_cr("Starting Thread " INTPTR_FORMAT ", LWP is " INTPTR_FORMAT ", setting priority: %d\n",
- osthr->thread_id(), osthr->lwp_id(), prio );
+ tty->print_cr("Starting Thread " INTPTR_FORMAT ", LWP is "
+ INTPTR_FORMAT ", setting priority: %d\n",
+ osthr->thread_id(), osthr->lwp_id(), prio);
}
os::set_native_priority(thread, prio);
}
@@ -1353,13 +1353,12 @@ bool os::create_thread(Thread* thread, ThreadType thr_type, size_t stack_size) {
// Remember that we created this thread so we can set priority on it
osthread->set_vm_created();
- // Set the default thread priority otherwise use NormalPriority
-
- if ( UseThreadPriorities ) {
- thr_setprio(tid, (DefaultThreadPriority == -1) ?
+ // Set the default thread priority. If using bound threads, setting
+ // lwp priority will be delayed until thread start.
+ set_native_priority(thread,
+ DefaultThreadPriority == -1 ?
java_to_os_priority[NormPriority] :
DefaultThreadPriority);
- }
// Initial thread state is INITIALIZED, not SUSPENDED
osthread->set_state(INITIALIZED);
@@ -3728,7 +3727,7 @@ typedef struct {
} SchedInfo;
-static SchedInfo tsLimits, iaLimits, rtLimits;
+static SchedInfo tsLimits, iaLimits, rtLimits, fxLimits;
#ifdef ASSERT
static int ReadBackValidate = 1;
@@ -3739,6 +3738,8 @@ static int myMax = 0;
static int myCur = 0;
static bool priocntl_enable = false;
+static const int criticalPrio = 60; // FX/60 is critical thread class/priority on T4
+static int java_MaxPriority_to_os_priority = 0; // Saved mapping
// Call the version of priocntl suitable for all supported versions
// of Solaris. We need to call through this wrapper so that we can
@@ -3783,19 +3784,27 @@ int lwp_priocntl_init ()
if (os::Solaris::T2_libthread() || UseBoundThreads) {
// If ThreadPriorityPolicy is 1, switch tables
if (ThreadPriorityPolicy == 1) {
- for (i = 0 ; i < MaxPriority+1; i++)
+ for (i = 0 ; i < CriticalPriority+1; i++)
os::java_to_os_priority[i] = prio_policy1[i];
}
+ if (UseCriticalJavaThreadPriority) {
+ // MaxPriority always maps to the FX scheduling class and criticalPrio.
+ // See set_native_priority() and set_lwp_class_and_priority().
+ // Save original MaxPriority mapping in case attempt to
+ // use critical priority fails.
+ java_MaxPriority_to_os_priority = os::java_to_os_priority[MaxPriority];
+ // Set negative to distinguish from other priorities
+ os::java_to_os_priority[MaxPriority] = -criticalPrio;
+ }
}
// Not using Bound Threads, set to ThreadPolicy 1
else {
- for ( i = 0 ; i < MaxPriority+1; i++ ) {
+ for ( i = 0 ; i < CriticalPriority+1; i++ ) {
os::java_to_os_priority[i] = prio_policy1[i];
}
return 0;
}
-
// Get IDs for a set of well-known scheduling classes.
// TODO-FIXME: GETCLINFO returns the current # of classes in the
// the system. We should have a loop that iterates over the
@@ -3828,24 +3837,33 @@ int lwp_priocntl_init ()
rtLimits.maxPrio = ((rtinfo_t*)ClassInfo.pc_clinfo)->rt_maxpri;
rtLimits.minPrio = 0;
+ strcpy(ClassInfo.pc_clname, "FX");
+ ClassInfo.pc_cid = -1;
+ rslt = (*priocntl_ptr)(PC_VERSION, P_ALL, 0, PC_GETCID, (caddr_t)&ClassInfo);
+ if (rslt < 0) return errno;
+ assert(ClassInfo.pc_cid != -1, "cid for FX class is -1");
+ fxLimits.schedPolicy = ClassInfo.pc_cid;
+ fxLimits.maxPrio = ((fxinfo_t*)ClassInfo.pc_clinfo)->fx_maxupri;
+ fxLimits.minPrio = 0;
// Query our "current" scheduling class.
- // This will normally be IA,TS or, rarely, RT.
- memset (&ParmInfo, 0, sizeof(ParmInfo));
+ // This will normally be IA, TS or, rarely, FX or RT.
+ memset(&ParmInfo, 0, sizeof(ParmInfo));
ParmInfo.pc_cid = PC_CLNULL;
- rslt = (*priocntl_ptr) (PC_VERSION, P_PID, P_MYID, PC_GETPARMS, (caddr_t)&ParmInfo );
- if ( rslt < 0 ) return errno;
+ rslt = (*priocntl_ptr) (PC_VERSION, P_PID, P_MYID, PC_GETPARMS, (caddr_t)&ParmInfo);
+ if (rslt < 0) return errno;
myClass = ParmInfo.pc_cid;
// We now know our scheduling classId, get specific information
- // the class.
+ // about the class.
ClassInfo.pc_cid = myClass;
ClassInfo.pc_clname[0] = 0;
- rslt = (*priocntl_ptr) (PC_VERSION, (idtype)0, 0, PC_GETCLINFO, (caddr_t)&ClassInfo );
- if ( rslt < 0 ) return errno;
+ rslt = (*priocntl_ptr) (PC_VERSION, (idtype)0, 0, PC_GETCLINFO, (caddr_t)&ClassInfo);
+ if (rslt < 0) return errno;
- if (ThreadPriorityVerbose)
- tty->print_cr ("lwp_priocntl_init: Class=%d(%s)...", myClass, ClassInfo.pc_clname);
+ if (ThreadPriorityVerbose) {
+ tty->print_cr("lwp_priocntl_init: Class=%d(%s)...", myClass, ClassInfo.pc_clname);
+ }
memset(&ParmInfo, 0, sizeof(pcparms_t));
ParmInfo.pc_cid = PC_CLNULL;
@@ -3865,6 +3883,11 @@ int lwp_priocntl_init ()
myMin = tsLimits.minPrio;
myMax = tsLimits.maxPrio;
myMax = MIN2(myMax, (int)tsInfo->ts_uprilim); // clamp - restrict
+ } else if (ParmInfo.pc_cid == fxLimits.schedPolicy) {
+ fxparms_t *fxInfo = (fxparms_t*)ParmInfo.pc_clparms;
+ myMin = fxLimits.minPrio;
+ myMax = fxLimits.maxPrio;
+ myMax = MIN2(myMax, (int)fxInfo->fx_uprilim); // clamp - restrict
} else {
// No clue - punt
if (ThreadPriorityVerbose)
@@ -3872,8 +3895,9 @@ int lwp_priocntl_init ()
return EINVAL; // no clue, punt
}
- if (ThreadPriorityVerbose)
- tty->print_cr ("Thread priority Range: [%d..%d]\n", myMin, myMax);
+ if (ThreadPriorityVerbose) {
+ tty->print_cr ("Thread priority Range: [%d..%d]\n", myMin, myMax);
+ }
priocntl_enable = true; // Enable changing priorities
return 0;
@@ -3882,6 +3906,7 @@ int lwp_priocntl_init ()
#define IAPRI(x) ((iaparms_t *)((x).pc_clparms))
#define RTPRI(x) ((rtparms_t *)((x).pc_clparms))
#define TSPRI(x) ((tsparms_t *)((x).pc_clparms))
+#define FXPRI(x) ((fxparms_t *)((x).pc_clparms))
// scale_to_lwp_priority
@@ -3900,13 +3925,13 @@ int scale_to_lwp_priority (int rMin, int rMax, int x)
}
-// set_lwp_priority
+// set_lwp_class_and_priority
//
-// Set the priority of the lwp. This call should only be made
-// when using bound threads (T2 threads are bound by default).
+// Set the class and priority of the lwp. This call should only
+// be made when using bound threads (T2 threads are bound by default).
//
-int set_lwp_priority (int ThreadID, int lwpid, int newPrio )
-{
+int set_lwp_class_and_priority(int ThreadID, int lwpid,
+ int newPrio, int new_class, bool scale) {
int rslt;
int Actual, Expected, prv;
pcparms_t ParmInfo; // for GET-SET
@@ -3927,19 +3952,20 @@ int set_lwp_priority (int ThreadID, int lwpid, int newPrio )
return EINVAL;
}
-
// If lwp hasn't started yet, just return
// the _start routine will call us again.
if ( lwpid <= 0 ) {
if (ThreadPriorityVerbose) {
- tty->print_cr ("deferring the set_lwp_priority of thread " INTPTR_FORMAT " to %d, lwpid not set",
+ tty->print_cr ("deferring the set_lwp_class_and_priority of thread "
+ INTPTR_FORMAT " to %d, lwpid not set",
ThreadID, newPrio);
}
return 0;
}
if (ThreadPriorityVerbose) {
- tty->print_cr ("set_lwp_priority(" INTPTR_FORMAT "@" INTPTR_FORMAT " %d) ",
+ tty->print_cr ("set_lwp_class_and_priority("
+ INTPTR_FORMAT "@" INTPTR_FORMAT " %d) ",
ThreadID, lwpid, newPrio);
}
@@ -3948,40 +3974,69 @@ int set_lwp_priority (int ThreadID, int lwpid, int newPrio )
rslt = (*priocntl_ptr)(PC_VERSION, P_LWPID, lwpid, PC_GETPARMS, (caddr_t)&ParmInfo);
if (rslt < 0) return errno;
- if (ParmInfo.pc_cid == rtLimits.schedPolicy) {
+ int cur_class = ParmInfo.pc_cid;
+ ParmInfo.pc_cid = (id_t)new_class;
+
+ if (new_class == rtLimits.schedPolicy) {
rtparms_t *rtInfo = (rtparms_t*)ParmInfo.pc_clparms;
- rtInfo->rt_pri = scale_to_lwp_priority (rtLimits.minPrio, rtLimits.maxPrio, newPrio);
+ rtInfo->rt_pri = scale ? scale_to_lwp_priority(rtLimits.minPrio,
+ rtLimits.maxPrio, newPrio)
+ : newPrio;
rtInfo->rt_tqsecs = RT_NOCHANGE;
rtInfo->rt_tqnsecs = RT_NOCHANGE;
if (ThreadPriorityVerbose) {
tty->print_cr("RT: %d->%d\n", newPrio, rtInfo->rt_pri);
}
- } else if (ParmInfo.pc_cid == iaLimits.schedPolicy) {
- iaparms_t *iaInfo = (iaparms_t*)ParmInfo.pc_clparms;
- int maxClamped = MIN2(iaLimits.maxPrio, (int)iaInfo->ia_uprilim);
- iaInfo->ia_upri = scale_to_lwp_priority(iaLimits.minPrio, maxClamped, newPrio);
- iaInfo->ia_uprilim = IA_NOCHANGE;
+ } else if (new_class == iaLimits.schedPolicy) {
+ iaparms_t* iaInfo = (iaparms_t*)ParmInfo.pc_clparms;
+ int maxClamped = MIN2(iaLimits.maxPrio,
+ cur_class == new_class
+ ? (int)iaInfo->ia_uprilim : iaLimits.maxPrio);
+ iaInfo->ia_upri = scale ? scale_to_lwp_priority(iaLimits.minPrio,
+ maxClamped, newPrio)
+ : newPrio;
+ iaInfo->ia_uprilim = cur_class == new_class
+ ? IA_NOCHANGE : (pri_t)iaLimits.maxPrio;
iaInfo->ia_mode = IA_NOCHANGE;
if (ThreadPriorityVerbose) {
- tty->print_cr ("IA: [%d...%d] %d->%d\n",
- iaLimits.minPrio, maxClamped, newPrio, iaInfo->ia_upri);
+ tty->print_cr("IA: [%d...%d] %d->%d\n",
+ iaLimits.minPrio, maxClamped, newPrio, iaInfo->ia_upri);
}
- } else if (ParmInfo.pc_cid == tsLimits.schedPolicy) {
- tsparms_t *tsInfo = (tsparms_t*)ParmInfo.pc_clparms;
- int maxClamped = MIN2(tsLimits.maxPrio, (int)tsInfo->ts_uprilim);
- prv = tsInfo->ts_upri;
- tsInfo->ts_upri = scale_to_lwp_priority(tsLimits.minPrio, maxClamped, newPrio);
- tsInfo->ts_uprilim = IA_NOCHANGE;
+ } else if (new_class == tsLimits.schedPolicy) {
+ tsparms_t* tsInfo = (tsparms_t*)ParmInfo.pc_clparms;
+ int maxClamped = MIN2(tsLimits.maxPrio,
+ cur_class == new_class
+ ? (int)tsInfo->ts_uprilim : tsLimits.maxPrio);
+ tsInfo->ts_upri = scale ? scale_to_lwp_priority(tsLimits.minPrio,
+ maxClamped, newPrio)
+ : newPrio;
+ tsInfo->ts_uprilim = cur_class == new_class
+ ? TS_NOCHANGE : (pri_t)tsLimits.maxPrio;
+ if (ThreadPriorityVerbose) {
+ tty->print_cr("TS: [%d...%d] %d->%d\n",
+ tsLimits.minPrio, maxClamped, newPrio, tsInfo->ts_upri);
+ }
+ } else if (new_class == fxLimits.schedPolicy) {
+ fxparms_t* fxInfo = (fxparms_t*)ParmInfo.pc_clparms;
+ int maxClamped = MIN2(fxLimits.maxPrio,
+ cur_class == new_class
+ ? (int)fxInfo->fx_uprilim : fxLimits.maxPrio);
+ fxInfo->fx_upri = scale ? scale_to_lwp_priority(fxLimits.minPrio,
+ maxClamped, newPrio)
+ : newPrio;
+ fxInfo->fx_uprilim = cur_class == new_class
+ ? FX_NOCHANGE : (pri_t)fxLimits.maxPrio;
+ fxInfo->fx_tqsecs = FX_NOCHANGE;
+ fxInfo->fx_tqnsecs = FX_NOCHANGE;
if (ThreadPriorityVerbose) {
- tty->print_cr ("TS: %d [%d...%d] %d->%d\n",
- prv, tsLimits.minPrio, maxClamped, newPrio, tsInfo->ts_upri);
+ tty->print_cr("FX: [%d...%d] %d->%d\n",
+ fxLimits.minPrio, maxClamped, newPrio, fxInfo->fx_upri);
}
- if (prv == tsInfo->ts_upri) return 0;
} else {
- if ( ThreadPriorityVerbose ) {
- tty->print_cr ("Unknown scheduling class\n");
+ if (ThreadPriorityVerbose) {
+ tty->print_cr("Unknown new scheduling class %d\n", new_class);
}
- return EINVAL; // no clue, punt
+ return EINVAL; // no clue, punt
}
rslt = (*priocntl_ptr)(PC_VERSION, P_LWPID, lwpid, PC_SETPARMS, (caddr_t)&ParmInfo);
@@ -4016,16 +4071,20 @@ int set_lwp_priority (int ThreadID, int lwpid, int newPrio )
} else if (ParmInfo.pc_cid == tsLimits.schedPolicy) {
Actual = TSPRI(ReadBack)->ts_upri;
Expected = TSPRI(ParmInfo)->ts_upri;
+ } else if (ParmInfo.pc_cid == fxLimits.schedPolicy) {
+ Actual = FXPRI(ReadBack)->fx_upri;
+ Expected = FXPRI(ParmInfo)->fx_upri;
} else {
- if ( ThreadPriorityVerbose ) {
- tty->print_cr("set_lwp_priority: unexpected class in readback: %d\n", ParmInfo.pc_cid);
+ if (ThreadPriorityVerbose) {
+ tty->print_cr("set_lwp_class_and_priority: unexpected class in readback: %d\n",
+ ParmInfo.pc_cid);
}
}
if (Actual != Expected) {
- if ( ThreadPriorityVerbose ) {
- tty->print_cr ("set_lwp_priority(%d %d) Class=%d: actual=%d vs expected=%d\n",
- lwpid, newPrio, ReadBack.pc_cid, Actual, Expected);
+ if (ThreadPriorityVerbose) {
+ tty->print_cr ("set_lwp_class_and_priority(%d %d) Class=%d: actual=%d vs expected=%d\n",
+ lwpid, newPrio, ReadBack.pc_cid, Actual, Expected);
}
}
#endif
@@ -4033,8 +4092,6 @@ int set_lwp_priority (int ThreadID, int lwpid, int newPrio )
return 0;
}
-
-
// Solaris only gives access to 128 real priorities at a time,
// so we expand Java's ten to fill this range. This would be better
// if we dynamically adjusted relative priorities.
@@ -4055,8 +4112,7 @@ int set_lwp_priority (int ThreadID, int lwpid, int newPrio )
// which do not explicitly alter their thread priorities.
//
-
-int os::java_to_os_priority[MaxPriority + 1] = {
+int os::java_to_os_priority[CriticalPriority + 1] = {
-99999, // 0 Entry should never be used
0, // 1 MinPriority
@@ -4071,17 +4127,51 @@ int os::java_to_os_priority[MaxPriority + 1] = {
127, // 8
127, // 9 NearMaxPriority
- 127 // 10 MaxPriority
-};
+ 127, // 10 MaxPriority
+ -criticalPrio // 11 CriticalPriority
+};
OSReturn os::set_native_priority(Thread* thread, int newpri) {
+ OSThread* osthread = thread->osthread();
+
+ // Save requested priority in case the thread hasn't been started
+ osthread->set_native_priority(newpri);
+
+ // Check for critical priority request
+ bool fxcritical = false;
+ if (newpri == -criticalPrio) {
+ fxcritical = true;
+ newpri = criticalPrio;
+ }
+
assert(newpri >= MinimumPriority && newpri <= MaximumPriority, "bad priority mapping");
- if ( !UseThreadPriorities ) return OS_OK;
- int status = thr_setprio(thread->osthread()->thread_id(), newpri);
- if ( os::Solaris::T2_libthread() || (UseBoundThreads && thread->osthread()->is_vm_created()) )
- status |= (set_lwp_priority (thread->osthread()->thread_id(),
- thread->osthread()->lwp_id(), newpri ));
+ if (!UseThreadPriorities) return OS_OK;
+
+ int status = 0;
+
+ if (!fxcritical) {
+ // Use thr_setprio only if we have a priority that thr_setprio understands
+ status = thr_setprio(thread->osthread()->thread_id(), newpri);
+ }
+
+ if (os::Solaris::T2_libthread() ||
+ (UseBoundThreads && osthread->is_vm_created())) {
+ int lwp_status =
+ set_lwp_class_and_priority(osthread->thread_id(),
+ osthread->lwp_id(),
+ newpri,
+ fxcritical ? fxLimits.schedPolicy : myClass,
+ !fxcritical);
+ if (lwp_status != 0 && fxcritical) {
+ // Try again, this time without changing the scheduling class
+ newpri = java_MaxPriority_to_os_priority;
+ lwp_status = set_lwp_class_and_priority(osthread->thread_id(),
+ osthread->lwp_id(),
+ newpri, myClass, false);
+ }
+ status |= lwp_status;
+ }
return (status == 0) ? OS_OK : OS_ERR;
}
diff --git a/hotspot/src/os/windows/vm/decoder_windows.hpp b/hotspot/src/os/windows/vm/decoder_windows.hpp
index 8ba488f..05a5dc2 100644
--- a/hotspot/src/os/windows/vm/decoder_windows.hpp
+++ b/hotspot/src/os/windows/vm/decoder_windows.hpp
@@ -36,7 +36,7 @@ typedef BOOL (WINAPI *pfn_SymInitialize)(HANDLE, PCTSTR, BOOL);
typedef BOOL (WINAPI *pfn_SymGetSymFromAddr64)(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64);
typedef DWORD (WINAPI *pfn_UndecorateSymbolName)(const char*, char*, DWORD, DWORD);
-class WindowsDecoder: public NullDecoder {
+class WindowsDecoder : public AbstractDecoder {
public:
WindowsDecoder();
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index 56d51b6..de38c6c 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -324,16 +324,6 @@ extern "C" void breakpoint() {
os::breakpoint();
}
-// Returns an estimate of the current stack pointer. Result must be guaranteed
-// to point into the calling threads stack, and be no lower than the current
-// stack pointer.
-
-address os::current_stack_pointer() {
- int dummy;
- address sp = (address)&dummy;
- return sp;
-}
-
// os::current_stack_base()
//
// Returns the base of the stack, which is the stack's
@@ -2088,7 +2078,6 @@ LONG Handle_IDiv_Exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
#elif _M_AMD64
PCONTEXT ctx = exceptionInfo->ContextRecord;
address pc = (address)ctx->Rip;
- NOT_PRODUCT(Events::log("idiv overflow exception at " INTPTR_FORMAT , pc));
assert(pc[0] == 0xF7, "not an idiv opcode");
assert((pc[1] & ~0x7) == 0xF8, "cannot handle non-register operands");
assert(ctx->Rax == min_jint, "unexpected idiv exception");
@@ -2100,7 +2089,6 @@ LONG Handle_IDiv_Exception(struct _EXCEPTION_POINTERS* exceptionInfo) {
#else
PCONTEXT ctx = exceptionInfo->ContextRecord;
address pc = (address)ctx->Eip;
- NOT_PRODUCT(Events::log("idiv overflow exception at " INTPTR_FORMAT , pc));
assert(pc[0] == 0xF7, "not an idiv opcode");
assert((pc[1] & ~0x7) == 0xF8, "cannot handle non-register operands");
assert(ctx->Eax == min_jint, "unexpected idiv exception");
@@ -3296,7 +3284,7 @@ void os::yield_all(int attempts) {
// so we compress Java's ten down to seven. It would be better
// if we dynamically adjusted relative priorities.
-int os::java_to_os_priority[MaxPriority + 1] = {
+int os::java_to_os_priority[CriticalPriority + 1] = {
THREAD_PRIORITY_IDLE, // 0 Entry should never be used
THREAD_PRIORITY_LOWEST, // 1 MinPriority
THREAD_PRIORITY_LOWEST, // 2
@@ -3307,10 +3295,11 @@ int os::java_to_os_priority[MaxPriority + 1] = {
THREAD_PRIORITY_ABOVE_NORMAL, // 7
THREAD_PRIORITY_ABOVE_NORMAL, // 8
THREAD_PRIORITY_HIGHEST, // 9 NearMaxPriority
- THREAD_PRIORITY_HIGHEST // 10 MaxPriority
+ THREAD_PRIORITY_HIGHEST, // 10 MaxPriority
+ THREAD_PRIORITY_HIGHEST // 11 CriticalPriority
};
-int prio_policy1[MaxPriority + 1] = {
+int prio_policy1[CriticalPriority + 1] = {
THREAD_PRIORITY_IDLE, // 0 Entry should never be used
THREAD_PRIORITY_LOWEST, // 1 MinPriority
THREAD_PRIORITY_LOWEST, // 2
@@ -3321,17 +3310,21 @@ int prio_policy1[MaxPriority + 1] = {
THREAD_PRIORITY_ABOVE_NORMAL, // 7
THREAD_PRIORITY_HIGHEST, // 8
THREAD_PRIORITY_HIGHEST, // 9 NearMaxPriority
- THREAD_PRIORITY_TIME_CRITICAL // 10 MaxPriority
+ THREAD_PRIORITY_TIME_CRITICAL, // 10 MaxPriority
+ THREAD_PRIORITY_TIME_CRITICAL // 11 CriticalPriority
};
static int prio_init() {
// If ThreadPriorityPolicy is 1, switch tables
if (ThreadPriorityPolicy == 1) {
int i;
- for (i = 0; i < MaxPriority + 1; i++) {
+ for (i = 0; i < CriticalPriority + 1; i++) {
os::java_to_os_priority[i] = prio_policy1[i];
}
}
+ if (UseCriticalJavaThreadPriority) {
+ os::java_to_os_priority[MaxPriority] = os::java_to_os_priority[CriticalPriority] ;
+ }
return 0;
}
@@ -5331,4 +5324,3 @@ BOOL os::Advapi32Dll::AdvapiAvailable() {
}
#endif
-
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad
index 192a78f..f58244e 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
// 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,137 +24,3 @@
// X86 Bsd Architecture Description File
-//----------OS-DEPENDENT ENCODING BLOCK-----------------------------------------------------
-// This block specifies the encoding classes used by the compiler to output
-// byte streams. Encoding classes generate functions which are called by
-// Machine Instruction Nodes in order to generate the bit encoding of the
-// instruction. Operands specify their base encoding interface with the
-// interface keyword. There are currently supported four interfaces,
-// REG_INTER, CONST_INTER, MEMORY_INTER, & COND_INTER. REG_INTER causes an
-// operand to generate a function which returns its register number when
-// queried. CONST_INTER causes an operand to generate a function which
-// returns the value of the constant when queried. MEMORY_INTER causes an
-// operand to generate four functions which return the Base Register, the
-// Index Register, the Scale Value, and the Offset Value of the operand when
-// queried. COND_INTER causes an operand to generate six functions which
-// return the encoding code (ie - encoding bits for the instruction)
-// associated with each basic boolean condition for a conditional instruction.
-// Instructions specify two basic values for encoding. They use the
-// ins_encode keyword to specify their encoding class (which must be one of
-// the class names specified in the encoding block), and they use the
-// opcode keyword to specify, in order, their primary, secondary, and
-// tertiary opcode. Only the opcode sections which a particular instruction
-// needs for encoding need to be specified.
-encode %{
- // Build emit functions for each basic byte or larger field in the intel
- // encoding scheme (opcode, rm, sib, immediate), and call them from C++
- // code in the enc_class source block. Emit functions will live in the
- // main source block for now. In future, we can generalize this by
- // adding a syntax that specifies the sizes of fields in an order,
- // so that the adlc can build the emit functions automagically
-
- enc_class bsd_tlsencode (eRegP dst) %{
- Register dstReg = as_Register($dst$$reg);
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->get_thread(dstReg);
- %}
-
- enc_class bsd_breakpoint %{
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
- %}
-
- enc_class call_epilog %{
- if( VerifyStackAtCalls ) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP,-3*VMRegImpl::slots_per_word));
- if(framesize >= 128) {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0xBC);
- emit_d8(cbuf,0x24);
- emit_d32(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- else {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0x7C);
- emit_d8(cbuf,0x24);
- emit_d8(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- // jmp EQ around INT3
- // QQQ TODO
- const int jump_around = 5; // size of call to breakpoint, 1 for CC
- emit_opcode(cbuf,0x74);
- emit_d8(cbuf, jump_around);
- // QQQ temporary
- emit_break(cbuf);
- // Die if stack mismatch
- // emit_opcode(cbuf,0xCC);
- }
- %}
-
-%}
-
-// INSTRUCTIONS -- Platform dependent
-
-//----------OS and Locking Instructions----------------------------------------
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(eRegP dst, eFlagsReg cr) %{
- match(Set dst (ThreadLocal));
- effect(DEF dst, KILL cr);
-
- format %{ "MOV $dst, Thread::current()" %}
- ins_encode( bsd_tlsencode(dst) );
- ins_pipe( ialu_reg_fat );
-%}
-
-instruct TLS(eRegP dst) %{
- match(Set dst (ThreadLocal));
-
- expand %{
- tlsLoadP(dst);
- %}
-%}
-
-// Die now
-instruct ShouldNotReachHere( )
-%{
- match(Halt);
-
- // Use the following format syntax
- format %{ "INT3 ; ShouldNotReachHere" %}
- // QQQ TODO for now call breakpoint
- // opcode(0xCC);
- // ins_encode(Opc);
- ins_encode(bsd_breakpoint);
- ins_pipe( pipe_slow );
-%}
-
-
-
-// Platform dependent source
-
-source %{
-
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer &cbuf) {
-
- // Debugger doesn't really catch this but best we can do so far QQQ
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
-}
-
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
- emit_break(cbuf);
-}
-
-
-uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
- return 5;
-}
-
-%}
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad
index 233a1fe..f4dc25d 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,7 @@ encode %{
// adding a syntax that specifies the sizes of fields in an order,
// so that the adlc can build the emit functions automagically
- enc_class Java_To_Runtime(method meth)
- %{
+ enc_class Java_To_Runtime(method meth) %{
// No relocation needed
// movq r10, <meth>
@@ -70,104 +69,15 @@ encode %{
emit_opcode(cbuf, 0xD0 | (R10_enc - 8));
%}
- enc_class bsd_breakpoint
- %{
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
- %}
-
- enc_class call_epilog
- %{
- if (VerifyStackAtCalls) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize =
- ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3*VMRegImpl::slots_per_word));
- if (framesize) {
- if (framesize < 0x80) {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0x7C);
- emit_d8(cbuf, 0x24);
- emit_d8(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- } else {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0xBC);
- emit_d8(cbuf, 0x24);
- emit_d32(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- }
- // jmp EQ around INT3
- // QQQ TODO
- const int jump_around = 5; // size of call to breakpoint, 1 for CC
- emit_opcode(cbuf, 0x74);
- emit_d8(cbuf, jump_around);
- // QQQ temporary
- emit_break(cbuf);
- // Die if stack mismatch
- // emit_opcode(cbuf,0xCC);
- }
- %}
-
-%}
-
-// INSTRUCTIONS -- Platform dependent
-
-//----------OS and Locking Instructions----------------------------------------
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(r15_RegP dst)
-%{
- match(Set dst (ThreadLocal));
- effect(DEF dst);
-
- size(0);
- format %{ "# TLS is in R15" %}
- ins_encode( /*empty encoding*/ );
- ins_pipe(ialu_reg_reg);
-%}
-
-// Die now
-instruct ShouldNotReachHere()
-%{
- match(Halt);
-
- // Use the following format syntax
- format %{ "int3\t# ShouldNotReachHere" %}
- // QQQ TODO for now call breakpoint
- // opcode(0xCC);
- // ins_encode(Opc);
- ins_encode(bsd_breakpoint);
- ins_pipe(pipe_slow);
%}
// Platform dependent source
-source
-%{
+source %{
int MachCallRuntimeNode::ret_addr_offset() {
return 13; // movq r10,#addr; callq (r10)
}
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer& cbuf) {
- // Debugger doesn't really catch this but best we can do so far QQQ
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
-}
-
-void MachBreakpointNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
- emit_break(cbuf);
-}
-
-uint MachBreakpointNode::size(PhaseRegAlloc* ra_) const {
- return 5;
-}
-
%}
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
index df67421..12d6871 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -362,7 +362,7 @@ frame os::get_sender_for_C_frame(frame* fr) {
}
intptr_t* _get_previous_fp() {
-#if defined(SPARC_WORKS) || defined(__clang__)
+#if defined(SPARC_WORKS) || defined(__clang__) || defined(__llvm__)
register intptr_t **ebp;
__asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
#else
@@ -1126,3 +1126,8 @@ void os::setup_fpu() {
: "r" (fpu_cntrl) : "memory");
#endif // !AMD64
}
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+}
+#endif
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp b/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp
index 210d5d9..4ccf807 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp
+++ b/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,12 +29,18 @@
// constants required by the Serviceability Agent. This file is
// referenced by vmStructs.cpp.
+#ifdef __APPLE__
+#define OS_THREAD_ID_TYPE thread_t
+#else
+#define OS_THREAD_ID_TYPE pthread_t
+#endif
+
#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
\
/******************************/ \
/* Threads (NOTE: incomplete) */ \
/******************************/ \
- nonstatic_field(OSThread, _thread_id, pthread_t) \
+ nonstatic_field(OSThread, _thread_id, OS_THREAD_ID_TYPE) \
nonstatic_field(OSThread, _pthread_id, pthread_t) \
/* This must be the last entry, and must be present */ \
last_entry()
@@ -46,7 +52,7 @@
/* Posix Thread IDs */ \
/**********************/ \
\
- declare_integer_type(pid_t) \
+ declare_unsigned_integer_type(thread_t) \
declare_unsigned_integer_type(pthread_t) \
\
/* This must be the last entry, and must be present */ \
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
index ff5b32d..4bb5a8a 100644
--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -562,3 +562,8 @@ extern "C" {
}
};
#endif // !_LP64
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+}
+#endif
diff --git a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
index 62131ee..11c90e5 100644
--- a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
+++ b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
@@ -756,3 +756,8 @@ size_t os::Linux::default_guard_size(os::ThreadType thr_type) {
// guard page, only enable glibc guard page for non-Java threads.
return (thr_type == java_thread ? 0 : page_size());
}
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+}
+#endif
diff --git a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad
index 3d8283d..5e234de 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad
+++ b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
// 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,137 +24,3 @@
// X86 Linux Architecture Description File
-//----------OS-DEPENDENT ENCODING BLOCK-----------------------------------------------------
-// This block specifies the encoding classes used by the compiler to output
-// byte streams. Encoding classes generate functions which are called by
-// Machine Instruction Nodes in order to generate the bit encoding of the
-// instruction. Operands specify their base encoding interface with the
-// interface keyword. There are currently supported four interfaces,
-// REG_INTER, CONST_INTER, MEMORY_INTER, & COND_INTER. REG_INTER causes an
-// operand to generate a function which returns its register number when
-// queried. CONST_INTER causes an operand to generate a function which
-// returns the value of the constant when queried. MEMORY_INTER causes an
-// operand to generate four functions which return the Base Register, the
-// Index Register, the Scale Value, and the Offset Value of the operand when
-// queried. COND_INTER causes an operand to generate six functions which
-// return the encoding code (ie - encoding bits for the instruction)
-// associated with each basic boolean condition for a conditional instruction.
-// Instructions specify two basic values for encoding. They use the
-// ins_encode keyword to specify their encoding class (which must be one of
-// the class names specified in the encoding block), and they use the
-// opcode keyword to specify, in order, their primary, secondary, and
-// tertiary opcode. Only the opcode sections which a particular instruction
-// needs for encoding need to be specified.
-encode %{
- // Build emit functions for each basic byte or larger field in the intel
- // encoding scheme (opcode, rm, sib, immediate), and call them from C++
- // code in the enc_class source block. Emit functions will live in the
- // main source block for now. In future, we can generalize this by
- // adding a syntax that specifies the sizes of fields in an order,
- // so that the adlc can build the emit functions automagically
-
- enc_class linux_tlsencode (eRegP dst) %{
- Register dstReg = as_Register($dst$$reg);
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->get_thread(dstReg);
- %}
-
- enc_class linux_breakpoint %{
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
- %}
-
- enc_class call_epilog %{
- if( VerifyStackAtCalls ) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP,-3*VMRegImpl::slots_per_word));
- if(framesize >= 128) {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0xBC);
- emit_d8(cbuf,0x24);
- emit_d32(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- else {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0x7C);
- emit_d8(cbuf,0x24);
- emit_d8(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- // jmp EQ around INT3
- // QQQ TODO
- const int jump_around = 5; // size of call to breakpoint, 1 for CC
- emit_opcode(cbuf,0x74);
- emit_d8(cbuf, jump_around);
- // QQQ temporary
- emit_break(cbuf);
- // Die if stack mismatch
- // emit_opcode(cbuf,0xCC);
- }
- %}
-
-%}
-
-// INSTRUCTIONS -- Platform dependent
-
-//----------OS and Locking Instructions----------------------------------------
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(eRegP dst, eFlagsReg cr) %{
- match(Set dst (ThreadLocal));
- effect(DEF dst, KILL cr);
-
- format %{ "MOV $dst, Thread::current()" %}
- ins_encode( linux_tlsencode(dst) );
- ins_pipe( ialu_reg_fat );
-%}
-
-instruct TLS(eRegP dst) %{
- match(Set dst (ThreadLocal));
-
- expand %{
- tlsLoadP(dst);
- %}
-%}
-
-// Die now
-instruct ShouldNotReachHere( )
-%{
- match(Halt);
-
- // Use the following format syntax
- format %{ "INT3 ; ShouldNotReachHere" %}
- // QQQ TODO for now call breakpoint
- // opcode(0xCC);
- // ins_encode(Opc);
- ins_encode(linux_breakpoint);
- ins_pipe( pipe_slow );
-%}
-
-
-
-// Platform dependent source
-
-source %{
-
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer &cbuf) {
-
- // Debugger doesn't really catch this but best we can do so far QQQ
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
-}
-
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
- emit_break(cbuf);
-}
-
-
-uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
- return MachNode::size(ra_);
-}
-
-%}
diff --git a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad
index 0127df5..cf9adf4 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad
+++ b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,7 @@ encode %{
// adding a syntax that specifies the sizes of fields in an order,
// so that the adlc can build the emit functions automagically
- enc_class Java_To_Runtime(method meth)
- %{
+ enc_class Java_To_Runtime(method meth) %{
// No relocation needed
// movq r10, <meth>
@@ -70,105 +69,15 @@ encode %{
emit_opcode(cbuf, 0xD0 | (R10_enc - 8));
%}
- enc_class linux_breakpoint
- %{
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
- %}
-
- enc_class call_epilog
- %{
- if (VerifyStackAtCalls) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize =
- ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3*VMRegImpl::slots_per_word));
- if (framesize) {
- if (framesize < 0x80) {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0x7C);
- emit_d8(cbuf, 0x24);
- emit_d8(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- } else {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0xBC);
- emit_d8(cbuf, 0x24);
- emit_d32(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- }
- // jmp EQ around INT3
- // QQQ TODO
- const int jump_around = 5; // size of call to breakpoint, 1 for CC
- emit_opcode(cbuf, 0x74);
- emit_d8(cbuf, jump_around);
- // QQQ temporary
- emit_break(cbuf);
- // Die if stack mismatch
- // emit_opcode(cbuf,0xCC);
- }
- %}
-
-%}
-
-// INSTRUCTIONS -- Platform dependent
-
-//----------OS and Locking Instructions----------------------------------------
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(r15_RegP dst)
-%{
- match(Set dst (ThreadLocal));
- effect(DEF dst);
-
- size(0);
- format %{ "# TLS is in R15" %}
- ins_encode( /*empty encoding*/ );
- ins_pipe(ialu_reg_reg);
-%}
-
-// Die now
-instruct ShouldNotReachHere()
-%{
- match(Halt);
-
- // Use the following format syntax
- format %{ "int3\t# ShouldNotReachHere" %}
- // QQQ TODO for now call breakpoint
- // opcode(0xCC);
- // ins_encode(Opc);
- ins_encode(linux_breakpoint);
- ins_pipe(pipe_slow);
%}
// Platform dependent source
-source
-%{
+source %{
int MachCallRuntimeNode::ret_addr_offset() {
return 13; // movq r10,#addr; callq (r10)
}
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer& cbuf) {
- // Debugger doesn't really catch this but best we can do so far QQQ
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
-}
-
-void MachBreakpointNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
- emit_break(cbuf);
-}
-
-uint MachBreakpointNode::size(PhaseRegAlloc* ra_) const {
- // distance could be far and requires load and call through register
- return MachNode::size(ra_);
-}
-
%}
diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
index ba484b9..93bb1f4 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -862,3 +862,11 @@ void os::setup_fpu() {
: "r" (fpu_cntrl) : "memory");
#endif // !AMD64
}
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+#ifdef AMD64
+ assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
+#endif
+}
+#endif
diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
index 32c2d0a..203090c 100644
--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -506,3 +506,8 @@ extern "C" {
}
};
#endif // !_LP64
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+}
+#endif
diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
index 971f600..752daf7 100644
--- a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp
@@ -251,6 +251,15 @@ frame os::get_sender_for_C_frame(frame* fr) {
return frame(fr->sender_sp(), frame::unpatchable, fr->sender_pc());
}
+// Returns an estimate of the current stack pointer. Result must be guaranteed to
+// point into the calling threads stack, and be no lower than the current stack
+// pointer.
+address os::current_stack_pointer() {
+ volatile int dummy;
+ address sp = (address)&dummy + 8; // %%%% need to confirm if this is right
+ return sp;
+}
+
frame os::current_frame() {
intptr_t* sp = StubRoutines::Sparc::flush_callers_register_windows_func()();
frame myframe(sp, frame::unpatchable,
@@ -815,3 +824,8 @@ add_func_t* os::atomic_add_func = os::atomic_add_bootstrap;
__asm__ __volatile__ ("wr %%g0, 0, %%fprs \n\t" : : :);
}
#endif //defined(__sparc) && defined(COMPILER2)
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+}
+#endif
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp b/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
index 78e93ea..ec047c1 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
+++ b/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp
@@ -237,6 +237,12 @@ frame os::get_sender_for_C_frame(frame* fr) {
return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
}
+extern "C" intptr_t *_get_current_sp(); // in .il file
+
+address os::current_stack_pointer() {
+ return (address)_get_current_sp();
+}
+
extern "C" intptr_t *_get_current_fp(); // in .il file
frame os::current_frame() {
@@ -954,3 +960,11 @@ void os::setup_fpu() {
_solaris_raw_setup_fpu(fpu_cntrl);
}
#endif // AMD64
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+#ifdef AMD64
+ assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
+#endif
+}
+#endif
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad
index 0883527..9b95823 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
// 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,144 +24,3 @@
// X86 Solaris Architecture Description File
-//----------OS-DEPENDENT ENCODING BLOCK-----------------------------------------------------
-// This block specifies the encoding classes used by the compiler to output
-// byte streams. Encoding classes generate functions which are called by
-// Machine Instruction Nodes in order to generate the bit encoding of the
-// instruction. Operands specify their base encoding interface with the
-// interface keyword. There are currently supported four interfaces,
-// REG_INTER, CONST_INTER, MEMORY_INTER, & COND_INTER. REG_INTER causes an
-// operand to generate a function which returns its register number when
-// queried. CONST_INTER causes an operand to generate a function which
-// returns the value of the constant when queried. MEMORY_INTER causes an
-// operand to generate four functions which return the Base Register, the
-// Index Register, the Scale Value, and the Offset Value of the operand when
-// queried. COND_INTER causes an operand to generate six functions which
-// return the encoding code (ie - encoding bits for the instruction)
-// associated with each basic boolean condition for a conditional instruction.
-// Instructions specify two basic values for encoding. They use the
-// ins_encode keyword to specify their encoding class (which must be one of
-// the class names specified in the encoding block), and they use the
-// opcode keyword to specify, in order, their primary, secondary, and
-// tertiary opcode. Only the opcode sections which a particular instruction
-// needs for encoding need to be specified.
-encode %{
- // Build emit functions for each basic byte or larger field in the intel
- // encoding scheme (opcode, rm, sib, immediate), and call them from C++
- // code in the enc_class source block. Emit functions will live in the
- // main source block for now. In future, we can generalize this by
- // adding a syntax that specifies the sizes of fields in an order,
- // so that the adlc can build the emit functions automagically
-
- enc_class solaris_tlsencode (eRegP dst) %{
- Register dstReg = as_Register($dst$$reg);
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->get_thread(dstReg);
- %}
-
- enc_class solaris_breakpoint %{
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- // Really need to fix this
- masm->push(rax);
- masm->push(rcx);
- masm->push(rdx);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
- masm->pop(rdx);
- masm->pop(rcx);
- masm->pop(rax);
- %}
-
- enc_class call_epilog %{
- if( VerifyStackAtCalls ) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP,-3*VMRegImpl::slots_per_word));
- if(framesize >= 128) {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0xBC);
- emit_d8(cbuf,0x24);
- emit_d32(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- else {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0x7C);
- emit_d8(cbuf,0x24);
- emit_d8(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- // jmp EQ around INT3
- // QQQ TODO
- const int jump_around = 11; // size of call to breakpoint (and register preserve), 1 for CC
- emit_opcode(cbuf,0x74);
- emit_d8(cbuf, jump_around);
- // QQQ temporary
- emit_break(cbuf);
- // Die if stack mismatch
- // emit_opcode(cbuf,0xCC);
- }
- %}
-
-%}
-
-// INSTRUCTIONS -- Platform dependent
-
-//----------OS and Locking Instructions----------------------------------------
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(eRegP dst, eFlagsReg cr) %{
- match(Set dst (ThreadLocal));
- effect(DEF dst, KILL cr);
-
- format %{ "MOV $dst, Thread::current()" %}
- ins_encode( solaris_tlsencode(dst) );
- ins_pipe( ialu_reg_fat );
-%}
-
-instruct TLS(eRegP dst) %{
- match(Set dst (ThreadLocal));
-
- expand %{
- tlsLoadP(dst);
- %}
-%}
-
-// Die now
-instruct ShouldNotReachHere( )
-%{
- match(Halt);
-
- // Use the following format syntax
- format %{ "INT3 ; ShouldNotReachHere" %}
- // QQQ TODO for now call breakpoint
- // opcode(0xCC);
- // ins_encode(Opc);
- ins_encode(solaris_breakpoint);
- ins_pipe( pipe_slow );
-%}
-
-
-
-// Platform dependent source
-
-source %{
-
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer &cbuf) {
-
- // Debugger doesn't really catch this but best we can do so far QQQ
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
-}
-
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
- emit_break(cbuf);
-}
-
-
-uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
- return MachNode::size(ra_);
-}
-
-%}
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
index b635a82..9b0f07d 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.il
@@ -37,6 +37,12 @@
movl %gs:0, %eax
.end
+ // Get current sp
+ .inline _get_current_sp,0
+ .volatile
+ movl %esp, %eax
+ .end
+
// Get current fp
.inline _get_current_fp,0
.volatile
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad
index 32a77c5..fdce355 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -55,8 +55,7 @@ encode %{
// adding a syntax that specifies the sizes of fields in an order,
// so that the adlc can build the emit functions automagically
- enc_class Java_To_Runtime(method meth)
- %{
+ enc_class Java_To_Runtime(method meth) %{
// No relocation needed
// movq r10, <meth>
@@ -70,118 +69,24 @@ encode %{
emit_opcode(cbuf, 0xD0 | (R10_enc - 8));
%}
- enc_class solaris_breakpoint
- %{
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
- %}
-
- enc_class call_epilog
- %{
- if (VerifyStackAtCalls) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize =
- ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3*VMRegImpl::slots_per_word));
- if (framesize) {
- if (framesize < 0x80) {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0x7C);
- emit_d8(cbuf, 0x24);
- emit_d8(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- } else {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0xBC);
- emit_d8(cbuf, 0x24);
- emit_d32(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- }
- // jmp EQ around INT3
- // QQQ TODO
- const int jump_around = 5; // size of call to breakpoint, 1 for CC
- emit_opcode(cbuf, 0x74);
- emit_d8(cbuf, jump_around);
- // QQQ temporary
- emit_break(cbuf);
- // Die if stack mismatch
- // emit_opcode(cbuf,0xCC);
- }
- %}
-
enc_class post_call_verify_mxcsr %{
- MacroAssembler masm(&cbuf);
+ MacroAssembler _masm(&cbuf);
if (RestoreMXCSROnJNICalls) {
- masm.ldmxcsr(ExternalAddress(StubRoutines::amd64::mxcsr_std()));
+ __ ldmxcsr(ExternalAddress(StubRoutines::amd64::mxcsr_std()));
}
else if (CheckJNICalls) {
- masm.call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::amd64::verify_mxcsr_entry())));
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, StubRoutines::amd64::verify_mxcsr_entry())));
}
%}
%}
-// INSTRUCTIONS -- Platform dependent
-
-//----------OS and Locking Instructions----------------------------------------
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(r15_RegP dst)
-%{
- match(Set dst (ThreadLocal));
- effect(DEF dst);
-
- size(0);
- format %{ "# TLS is in R15" %}
- ins_encode( /*empty encoding*/ );
- ins_pipe(ialu_reg_reg);
-%}
-
-// Die now
-instruct ShouldNotReachHere()
-%{
- match(Halt);
-
- // Use the following format syntax
- format %{ "int3\t# ShouldNotReachHere" %}
- // QQQ TODO for now call breakpoint
- // opcode(0xCC);
- // ins_encode(Opc);
- ins_encode(solaris_breakpoint);
- ins_pipe(pipe_slow);
-%}
-
// Platform dependent source
-source
-%{
+source %{
-int MachCallRuntimeNode::ret_addr_offset()
-{
+int MachCallRuntimeNode::ret_addr_offset() {
return 13; // movq r10,#addr; callq (r10)
}
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer& cbuf)
-{
- // Debugger doesn't really catch this but best we can do so far QQQ
- MacroAssembler* masm = new MacroAssembler(&cbuf);
- masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
-}
-
-void MachBreakpointNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
-{
- emit_break(cbuf);
-}
-
-uint MachBreakpointNode::size(PhaseRegAlloc* ra_) const
-{
- // distance could be far and requires load and call through register
- return MachNode::size(ra_);
-}
-
%}
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il
index fb7946b..89809bc 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.il
@@ -30,6 +30,12 @@
movq %fs:0, %rax
.end
+ // Get current sp
+ .inline _get_current_sp,0
+ .volatile
+ movq %rsp, %rax
+ .end
+
// Get current fp
.inline _get_current_fp,0
.volatile
diff --git a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp b/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp
index 960ceab..52fe243 100644
--- a/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp
+++ b/hotspot/src/os_cpu/windows_x86/vm/os_windows_x86.cpp
@@ -370,6 +370,26 @@ frame os::get_sender_for_C_frame(frame* fr) {
return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
}
+#ifndef AMD64
+// Returns an estimate of the current stack pointer. Result must be guaranteed
+// to point into the calling threads stack, and be no lower than the current
+// stack pointer.
+address os::current_stack_pointer() {
+ int dummy;
+ address sp = (address)&dummy;
+ return sp;
+}
+#else
+// Returns the current stack pointer. Accurate value needed for
+// os::verify_stack_alignment().
+address os::current_stack_pointer() {
+ typedef address get_sp_func();
+ get_sp_func* func = CAST_TO_FN_PTR(get_sp_func*,
+ StubRoutines::x86::get_previous_sp_entry());
+ return (*func)();
+}
+#endif
+
#ifndef AMD64
intptr_t* _get_previous_fp() {
@@ -546,3 +566,11 @@ void os::setup_fpu() {
__asm fldcw fpu_cntrl_word;
#endif // !AMD64
}
+
+#ifndef PRODUCT
+void os::verify_stack_alignment() {
+#ifdef AMD64
+ assert(((intptr_t)os::current_stack_pointer() & (StackAlignmentInBytes-1)) == 0, "incorrect stack alignment");
+#endif
+}
+#endif
diff --git a/hotspot/src/os_cpu/windows_x86/vm/windows_x86_32.ad b/hotspot/src/os_cpu/windows_x86/vm/windows_x86_32.ad
index 32b7b29..27fedf2 100644
--- a/hotspot/src/os_cpu/windows_x86/vm/windows_x86_32.ad
+++ b/hotspot/src/os_cpu/windows_x86/vm/windows_x86_32.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
// 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,134 +24,3 @@
// X86 Win32 Architecture Description File
-//----------OS-DEPENDENT ENCODING BLOCK-----------------------------------------------------
-// This block specifies the encoding classes used by the compiler to output
-// byte streams. Encoding classes generate functions which are called by
-// Machine Instruction Nodes in order to generate the bit encoding of the
-// instruction. Operands specify their base encoding interface with the
-// interface keyword. There are currently supported four interfaces,
-// REG_INTER, CONST_INTER, MEMORY_INTER, & COND_INTER. REG_INTER causes an
-// operand to generate a function which returns its register number when
-// queried. CONST_INTER causes an operand to generate a function which
-// returns the value of the constant when queried. MEMORY_INTER causes an
-// operand to generate four functions which return the Base Register, the
-// Index Register, the Scale Value, and the Offset Value of the operand when
-// queried. COND_INTER causes an operand to generate six functions which
-// return the encoding code (ie - encoding bits for the instruction)
-// associated with each basic boolean condition for a conditional instruction.
-// Instructions specify two basic values for encoding. They use the
-// ins_encode keyword to specify their encoding class (which must be one of
-// the class names specified in the encoding block), and they use the
-// opcode keyword to specify, in order, their primary, secondary, and
-// tertiary opcode. Only the opcode sections which a particular instruction
-// needs for encoding need to be specified.
-encode %{
- // Build emit functions for each basic byte or larger field in the intel
- // encoding scheme (opcode, rm, sib, immediate), and call them from C++
- // code in the enc_class source block. Emit functions will live in the
- // main source block for now. In future, we can generalize this by
- // adding a syntax that specifies the sizes of fields in an order,
- // so that the adlc can build the emit functions automagically
-
- enc_class tlsencode (eRegP dst, eRegP src) %{
- emit_rm(cbuf, 0x2, $dst$$reg, $src$$reg);
- emit_d32(cbuf, ThreadLocalStorage::get_thread_ptr_offset() );
- %}
-
- enc_class call_epilog %{
- if( VerifyStackAtCalls ) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP,-3*VMRegImpl::slots_per_word));
- if(framesize >= 128) {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0xBC);
- emit_d8(cbuf,0x24);
- emit_d32(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- else {
- emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
- emit_d8(cbuf,0x7C);
- emit_d8(cbuf,0x24);
- emit_d8(cbuf,framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- // jmp EQ around INT3
- emit_opcode(cbuf,0x74);
- emit_d8(cbuf,1);
- // Die if stack mismatch
- emit_opcode(cbuf,0xCC);
- }
- %}
-
-%}
-
-// INSTRUCTIONS -- Platform dependent
-
-
-//----------OS and Locking Instructions----------------------------------------
-
-// The prefix of this name is KNOWN by the ADLC and cannot be changed.
-instruct tlsLoadP_prefixLoadP(eRegP t1) %{
- effect(DEF t1);
-
- format %{ "MOV $t1,FS:[0x00] "%}
- opcode(0x8B, 0x64);
- ins_encode(OpcS, OpcP, conmemref(t1));
- ins_pipe( ialu_reg_fat );
-%}
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-// %%% Should do this with a clause like: bottom_type(TypeRawPtr::BOTTOM);
-instruct tlsLoadP(eRegP dst, eRegP t1) %{
- effect(DEF dst, USE t1);
-
- format %{ "MOV $dst,[$t1 + TLS::thread_ptr_offset()]" %}
- opcode(0x8B);
- ins_encode(OpcP, tlsencode(dst, t1));
- ins_pipe( ialu_reg_reg_fat );
-%}
-
-instruct TLS(eRegP dst) %{
- match(Set dst (ThreadLocal));
- expand %{
- eRegP t1;
- tlsLoadP_prefixLoadP(t1);
- tlsLoadP(dst, t1);
- %}
-%}
-
-// Die now
-instruct ShouldNotReachHere( )
-%{
- match(Halt);
- // Use the following format syntax
- format %{ "INT3 ; ShouldNotReachHere" %}
- opcode(0xCC);
- ins_encode(OpcP);
- ins_pipe( pipe_slow );
-%}
-
-//
-// Platform dependent source
-//
-source %{
-
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer &cbuf) {
- cbuf.insts()->emit_int8((unsigned char) 0xcc);
-}
-
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
- emit_break(cbuf);
-}
-
-
-uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
- return 1;
-}
-
-
-%}
diff --git a/hotspot/src/os_cpu/windows_x86/vm/windows_x86_64.ad b/hotspot/src/os_cpu/windows_x86/vm/windows_x86_64.ad
index 69374f8..e251b2b 100644
--- a/hotspot/src/os_cpu/windows_x86/vm/windows_x86_64.ad
+++ b/hotspot/src/os_cpu/windows_x86/vm/windows_x86_64.ad
@@ -1,5 +1,5 @@
//
-// Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+// Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
//
// This code is free software; you can redistribute it and/or modify it
@@ -67,69 +67,6 @@ encode %{
emit_opcode(cbuf, 0xD0 | (R10_enc - 8));
%}
- enc_class call_epilog %{
- if (VerifyStackAtCalls) {
- // Check that stack depth is unchanged: find majik cookie on stack
- int framesize =
- ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3*VMRegImpl::slots_per_word));
- if (framesize) {
- if (framesize < 0x80) {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0x7C);
- emit_d8(cbuf, 0x24);
- emit_d8(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- } else {
- emit_opcode(cbuf, Assembler::REX_W);
- emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
- emit_d8(cbuf, 0xBC);
- emit_d8(cbuf, 0x24);
- emit_d32(cbuf, framesize); // Find majik cookie from ESP
- emit_d32(cbuf, 0xbadb100d);
- }
- }
- // jmp EQ around INT3
- // QQQ TODO
- const int jump_around = 5; // size of call to breakpoint, 1 for CC
- emit_opcode(cbuf, 0x74);
- emit_d8(cbuf, jump_around);
- // QQQ temporary
- emit_break(cbuf);
- // Die if stack mismatch
- // emit_opcode(cbuf,0xCC);
- }
- %}
-%}
-
-// INSTRUCTIONS -- Platform dependent
-
-
-//----------OS and Locking Instructions----------------------------------------
-
-// This name is KNOWN by the ADLC and cannot be changed.
-// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
-// for this guy.
-instruct tlsLoadP(r15_RegP dst)
-%{
- match(Set dst (ThreadLocal));
- effect(DEF dst);
-
- size(0);
- format %{ "# TLS is in R15" %}
- ins_encode( /*empty encoding*/ );
- ins_pipe(ialu_reg_reg);
-%}
-
-// Die now
-instruct ShouldNotReachHere( )
-%{
- match(Halt);
- // Use the following format syntax
- format %{ "INT3 ; ShouldNotReachHere" %}
- opcode(0xCC);
- ins_encode(OpcP);
- ins_pipe( pipe_slow );
%}
//
@@ -142,17 +79,4 @@ int MachCallRuntimeNode::ret_addr_offset()
return 13; // movq r10,#addr; callq (r10)
}
-// emit an interrupt that is caught by the debugger
-void emit_break(CodeBuffer &cbuf) {
- cbuf.insts()->emit_int8((unsigned char) 0xcc);
-}
-
-void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
- emit_break(cbuf);
-}
-
-uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
- return 1;
-}
-
%}
diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java
index 73e5956..861fe44 100644
--- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java
+++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ public class Compilation implements LogEvent {
private boolean osr;
private Method method;
private CallSite call = new CallSite();
+ private CallSite lateInlineCall = new CallSite();
private int osrBci;
private String icount;
private String bcount;
@@ -80,6 +81,13 @@ public class Compilation implements LogEvent {
sb.append(site);
sb.append("\n");
}
+ if (getLateInlineCall().getCalls() != null) {
+ sb.append("late inline:\n");
+ for (CallSite site : getLateInlineCall().getCalls()) {
+ sb.append(site);
+ sb.append("\n");
+ }
+ }
return sb.toString();
}
@@ -115,6 +123,12 @@ public class Compilation implements LogEvent {
site.print(stream, indent + 2);
}
}
+ if (printInlining && lateInlineCall.getCalls() != null) {
+ stream.println("late inline:");
+ for (CallSite site : lateInlineCall.getCalls()) {
+ site.print(stream, indent + 2);
+ }
+ }
}
}
@@ -215,7 +229,11 @@ public class Compilation implements LogEvent {
}
public void setMethod(Method method) {
- this.method = method;
+ // Don't change method if it is already set to avoid changing
+ // it by post parse inlining info.
+ if (getMethod() == null) {
+ this.method = method;
+ }
}
public CallSite getCall() {
@@ -226,6 +244,10 @@ public class Compilation implements LogEvent {
this.call = call;
}
+ public CallSite getLateInlineCall() {
+ return lateInlineCall;
+ }
+
public double getElapsedTime() {
return end - start;
}
diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
index d864db0..dc0b7ab 100644
--- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
+++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -146,6 +146,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
private CallSite site;
private Stack<Phase> phaseStack = new Stack<Phase>();
private UncommonTrapEvent currentTrap;
+ private Stack<CallSite> late_inline_scope;
long parseLong(String l) {
try {
@@ -302,6 +303,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
}
events.add(compile);
compiles.put(makeId(atts), compile);
+ site = compile.getCall();
} else if (qname.equals("type")) {
type(search(atts, "id"), search(atts, "name"));
} else if (qname.equals("bc")) {
@@ -360,12 +362,22 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
// uncommon trap inserted during parsing.
// ignore for now
}
+ } else if (qname.equals("late_inline")) {
+ late_inline_scope = new Stack<CallSite>();
+ site = new CallSite(-999, method(search(atts, "method")));
+ late_inline_scope.push(site);
} else if (qname.equals("jvms")) {
// <jvms bci='4' method='java/io/DataInputStream readChar ()C' bytes='40' count='5815' iicount='20815'/>
if (currentTrap != null) {
currentTrap.addJVMS(atts.getValue("method"), Integer.parseInt(atts.getValue("bci")));
+ } else if (late_inline_scope != null) {
+ bci = Integer.parseInt(search(atts, "bci"));
+ site = new CallSite(bci, method(search(atts, "method")));
+ late_inline_scope.push(site);
} else {
- // Ignore <eliminate_allocation type='667'> and <eliminate_lock lock='1'>
+ // Ignore <eliminate_allocation type='667'>,
+ // <eliminate_lock lock='1'>,
+ // <replace_string_concat arguments='2' string_alloc='0' multiple='0'>
}
} else if (qname.equals("nmethod")) {
String id = makeId(atts);
@@ -379,7 +391,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
Method m = method(search(atts, "method"));
if (scopes.size() == 0) {
compile.setMethod(m);
- scopes.push(compile.getCall());
+ scopes.push(site);
} else {
if (site.getMethod() == m) {
scopes.push(site);
@@ -393,7 +405,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
}
} else if (qname.equals("parse_done")) {
CallSite call = scopes.pop();
- call.setEndNodes(Integer.parseInt(search(atts, "nodes")));
+ call.setEndNodes(Integer.parseInt(search(atts, "nodes", "1")));
call.setTimeStamp(Double.parseDouble(search(atts, "stamp")));
scopes.push(call);
}
@@ -408,6 +420,43 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
scopes.pop();
} else if (qname.equals("uncommon_trap")) {
currentTrap = null;
+ } else if (qname.equals("late_inline")) {
+ // Populate late inlining info.
+
+ // late_inline scopes are specified in reverse order:
+ // compiled method should be on top of stack.
+ CallSite caller = late_inline_scope.pop();
+ Method m = compile.getMethod();
+ if (m != caller.getMethod()) {
+ System.out.println(m);
+ System.out.println(caller.getMethod() + " bci: " + bci);
+ throw new InternalError("call site and late_inline info don't match");
+ }
+
+ // late_inline contains caller+bci info, convert it
+ // to bci+callee info used by LogCompilation.
+ site = compile.getLateInlineCall();
+ do {
+ bci = caller.getBci();
+ // Next inlined call.
+ caller = late_inline_scope.pop();
+ CallSite callee = new CallSite(bci, caller.getMethod());
+ site.add(callee);
+ site = callee;
+ } while (!late_inline_scope.empty());
+
+ if (caller.getBci() != -999) {
+ System.out.println(caller.getMethod());
+ throw new InternalError("broken late_inline info");
+ }
+ if (site.getMethod() != caller.getMethod()) {
+ System.out.println(site.getMethod());
+ System.out.println(caller.getMethod());
+ throw new InternalError("call site and late_inline info don't match");
+ }
+ // late_inline is followed by parse with scopes.size() == 0,
+ // 'site' will be pushed to scopes.
+ late_inline_scope = null;
} else if (qname.equals("task")) {
types.clear();
methods.clear();
diff --git a/hotspot/src/share/tools/ProjectCreator/BuildConfig.java b/hotspot/src/share/tools/ProjectCreator/BuildConfig.java
index 82d7279..92fbf77 100644
--- a/hotspot/src/share/tools/ProjectCreator/BuildConfig.java
+++ b/hotspot/src/share/tools/ProjectCreator/BuildConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -243,6 +243,7 @@ class BuildConfig {
sysDefines.add("_WINDOWS");
sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\"");
sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\"");
+ sysDefines.add("INCLUDE_TRACE");
sysDefines.add("_JNI_IMPLEMENTATION_");
if (vars.get("PlatformName").equals("Win32")) {
sysDefines.add("HOTSPOT_LIB_ARCH=\\\"i386\\\"");
diff --git a/hotspot/src/share/tools/hsdis/hsdis.c b/hotspot/src/share/tools/hsdis/hsdis.c
index daea404..8034ac1 100644
--- a/hotspot/src/share/tools/hsdis/hsdis.c
+++ b/hotspot/src/share/tools/hsdis/hsdis.c
@@ -356,7 +356,7 @@ static void parse_caller_options(struct hsdis_app_data* app_data, const char* ca
if (plen > mach_size) plen = mach_size;
strncpy(mach_option, p, plen);
mach_option[plen] = '\0';
- } else if (plen > 6 && strncmp(p, "hsdis-", 6)) {
+ } else if (plen > 6 && strncmp(p, "hsdis-", 6) == 0) {
// do not pass these to the next level
} else {
/* just copy it; {i386,sparc}-dis.c might like to see it */
diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
index 3291fe1..c7a5198 100644
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.cpp
@@ -594,6 +594,13 @@ static bool is_true(jlong x, If::Condition cond, jlong y) {
return false;
}
+static bool is_safepoint(BlockEnd* x, BlockBegin* sux) {
+ // An Instruction with multiple successors, x, is replaced by a Goto
+ // to a single successor, sux. Is a safepoint check needed = was the
+ // instruction being replaced a safepoint and the single remaining
+ // successor a back branch?
+ return x->is_safepoint() && (sux->bci() < x->state_before()->bci());
+}
void Canonicalizer::do_If(If* x) {
// move const to right
@@ -614,7 +621,7 @@ void Canonicalizer::do_If(If* x) {
case If::geq: sux = x->sux_for(true); break;
}
// If is a safepoint then the debug information should come from the state_before of the If.
- set_canonical(new Goto(sux, x->state_before(), x->is_safepoint()));
+ set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));
return;
}
@@ -626,7 +633,7 @@ void Canonicalizer::do_If(If* x) {
x->sux_for(false));
if (sux != NULL) {
// If is a safepoint then the debug information should come from the state_before of the If.
- set_canonical(new Goto(sux, x->state_before(), x->is_safepoint()));
+ set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));
}
}
} else if (rt->as_IntConstant() != NULL) {
@@ -694,10 +701,12 @@ void Canonicalizer::do_If(If* x) {
}
} else if (rt == objectNull && (l->as_NewInstance() || l->as_NewArray())) {
if (x->cond() == Instruction::eql) {
- set_canonical(new Goto(x->fsux(), x->state_before(), x->is_safepoint()));
+ BlockBegin* sux = x->fsux();
+ set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));
} else {
assert(x->cond() == Instruction::neq, "only other valid case");
- set_canonical(new Goto(x->tsux(), x->state_before(), x->is_safepoint()));
+ BlockBegin* sux = x->tsux();
+ set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));
}
}
}
@@ -710,7 +719,7 @@ void Canonicalizer::do_TableSwitch(TableSwitch* x) {
if (v >= x->lo_key() && v <= x->hi_key()) {
sux = x->sux_at(v - x->lo_key());
}
- set_canonical(new Goto(sux, x->state_before(), x->is_safepoint()));
+ set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));
} else if (x->number_of_sux() == 1) {
// NOTE: Code permanently disabled for now since the switch statement's
// tag expression may produce side-effects in which case it must
@@ -741,7 +750,7 @@ void Canonicalizer::do_LookupSwitch(LookupSwitch* x) {
sux = x->sux_at(i);
}
}
- set_canonical(new Goto(sux, x->state_before(), x->is_safepoint()));
+ set_canonical(new Goto(sux, x->state_before(), is_safepoint(x, sux)));
} else if (x->number_of_sux() == 1) {
// NOTE: Code permanently disabled for now since the switch statement's
// tag expression may produce side-effects in which case it must
@@ -899,3 +908,4 @@ void Canonicalizer::do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) {}
void Canonicalizer::do_ProfileCall(ProfileCall* x) {}
void Canonicalizer::do_ProfileInvoke(ProfileInvoke* x) {}
void Canonicalizer::do_RuntimeCall(RuntimeCall* x) {}
+void Canonicalizer::do_MemBar(MemBar* x) {}
diff --git a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp b/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
index 571e707..8ae3a21 100644
--- a/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
+++ b/hotspot/src/share/vm/c1/c1_Canonicalizer.hpp
@@ -104,6 +104,7 @@ class Canonicalizer: InstructionVisitor {
virtual void do_ProfileCall (ProfileCall* x);
virtual void do_ProfileInvoke (ProfileInvoke* x);
virtual void do_RuntimeCall (RuntimeCall* x);
+ virtual void do_MemBar (MemBar* x);
};
#endif // SHARE_VM_C1_C1_CANONICALIZER_HPP
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index fbda48f..b4659d9 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1181,6 +1181,11 @@ void GraphBuilder::if_node(Value x, If::Condition cond, Value y, ValueStack* sta
bool is_bb = tsux->bci() < stream()->cur_bci() || fsux->bci() < stream()->cur_bci();
Instruction *i = append(new If(x, cond, false, y, tsux, fsux, is_bb ? state_before : NULL, is_bb));
+ assert(i->as_Goto() == NULL ||
+ (i->as_Goto()->sux_at(0) == tsux && i->as_Goto()->is_safepoint() == tsux->bci() < stream()->cur_bci()) ||
+ (i->as_Goto()->sux_at(0) == fsux && i->as_Goto()->is_safepoint() == fsux->bci() < stream()->cur_bci()),
+ "safepoint state of Goto returned by canonicalizer incorrect");
+
if (is_profiling()) {
If* if_node = i->as_If();
if (if_node != NULL) {
@@ -1301,9 +1306,19 @@ void GraphBuilder::table_switch() {
if (sw.dest_offset_at(i) < 0) has_bb = true;
}
// add default successor
+ if (sw.default_offset() < 0) has_bb = true;
sux->at_put(i, block_at(bci() + sw.default_offset()));
ValueStack* state_before = has_bb ? copy_state_before() : NULL;
- append(new TableSwitch(ipop(), sux, sw.low_key(), state_before, has_bb));
+ Instruction* res = append(new TableSwitch(ipop(), sux, sw.low_key(), state_before, has_bb));
+#ifdef ASSERT
+ if (res->as_Goto()) {
+ for (i = 0; i < l; i++) {
+ if (sux->at(i) == res->as_Goto()->sux_at(0)) {
+ assert(res->as_Goto()->is_safepoint() == sw.dest_offset_at(i) < 0, "safepoint state of Goto returned by canonicalizer incorrect");
+ }
+ }
+ }
+#endif
}
}
@@ -1336,9 +1351,19 @@ void GraphBuilder::lookup_switch() {
keys->at_put(i, pair.match());
}
// add default successor
+ if (sw.default_offset() < 0) has_bb = true;
sux->at_put(i, block_at(bci() + sw.default_offset()));
ValueStack* state_before = has_bb ? copy_state_before() : NULL;
- append(new LookupSwitch(ipop(), sux, keys, state_before, has_bb));
+ Instruction* res = append(new LookupSwitch(ipop(), sux, keys, state_before, has_bb));
+#ifdef ASSERT
+ if (res->as_Goto()) {
+ for (i = 0; i < l; i++) {
+ if (sux->at(i) == res->as_Goto()->sux_at(0)) {
+ assert(res->as_Goto()->is_safepoint() == sw.pair_at(i).offset() < 0, "safepoint state of Goto returned by canonicalizer incorrect");
+ }
+ }
+ }
+#endif
}
}
@@ -1395,6 +1420,12 @@ void GraphBuilder::method_return(Value x) {
call_register_finalizer();
}
+ bool need_mem_bar = false;
+ if (method()->name() == ciSymbol::object_initializer_name() &&
+ scope()->wrote_final()) {
+ need_mem_bar = true;
+ }
+
// Check to see whether we are inlining. If so, Return
// instructions become Gotos to the continuation point.
if (continuation() != NULL) {
@@ -1414,6 +1445,10 @@ void GraphBuilder::method_return(Value x) {
monitorexit(state()->lock_at(0), SynchronizationEntryBCI);
}
+ if (need_mem_bar) {
+ append(new MemBar(lir_membar_storestore));
+ }
+
// State at end of inlined method is the state of the caller
// without the method parameters on stack, including the
// return value, if any, of the inlined method on operand stack.
@@ -1433,7 +1468,6 @@ void GraphBuilder::method_return(Value x) {
// the continuation point.
append_with_bci(goto_callee, scope_data()->continuation()->bci());
incr_num_returns();
-
return;
}
@@ -1449,6 +1483,10 @@ void GraphBuilder::method_return(Value x) {
append_split(new MonitorExit(receiver, state()->unlock()));
}
+ if (need_mem_bar) {
+ append(new MemBar(lir_membar_storestore));
+ }
+
append(new Return(x));
}
@@ -1481,6 +1519,9 @@ void GraphBuilder::access_field(Bytecodes::Code code) {
}
}
+ if (field->is_final() && (code == Bytecodes::_putfield)) {
+ scope()->set_wrote_final();
+ }
const int offset = !needs_patching ? field->offset() : -1;
switch (code) {
@@ -1592,6 +1633,7 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
// this happened while running the JCK invokevirtual tests under doit. TKR
ciMethod* cha_monomorphic_target = NULL;
ciMethod* exact_target = NULL;
+ Value better_receiver = NULL;
if (UseCHA && DeoptC1 && klass->is_loaded() && target->is_loaded() &&
!target->is_method_handle_invoke()) {
Value receiver = NULL;
@@ -1653,6 +1695,18 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
ciInstanceKlass* singleton = NULL;
if (target->holder()->nof_implementors() == 1) {
singleton = target->holder()->implementor(0);
+
+ assert(holder->is_interface(), "invokeinterface to non interface?");
+ ciInstanceKlass* decl_interface = (ciInstanceKlass*)holder;
+ // the number of implementors for decl_interface is less or
+ // equal to the number of implementors for target->holder() so
+ // if number of implementors of target->holder() == 1 then
+ // number of implementors for decl_interface is 0 or 1. If
+ // it's 0 then no class implements decl_interface and there's
+ // no point in inlining.
+ if (!holder->is_loaded() || decl_interface->nof_implementors() != 1) {
+ singleton = NULL;
+ }
}
if (singleton) {
cha_monomorphic_target = target->find_monomorphic_target(calling_klass, target->holder(), singleton);
@@ -1667,7 +1721,9 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
CheckCast* c = new CheckCast(klass, receiver, copy_state_for_exception());
c->set_incompatible_class_change_check();
c->set_direct_compare(klass->is_final());
- append_split(c);
+ // pass the result of the checkcast so that the compiler has
+ // more accurate type info in the inlinee
+ better_receiver = append_split(c);
}
}
}
@@ -1709,7 +1765,7 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
}
if (!success) {
// static binding => check if callee is ok
- success = try_inline(inline_target, (cha_monomorphic_target != NULL) || (exact_target != NULL));
+ success = try_inline(inline_target, (cha_monomorphic_target != NULL) || (exact_target != NULL), better_receiver);
}
CHECK_BAILOUT();
@@ -3034,7 +3090,7 @@ int GraphBuilder::recursive_inline_level(ciMethod* cur_callee) const {
}
-bool GraphBuilder::try_inline(ciMethod* callee, bool holder_known) {
+bool GraphBuilder::try_inline(ciMethod* callee, bool holder_known, Value receiver) {
// Clear out any existing inline bailout condition
clear_inline_bailout();
@@ -3056,7 +3112,7 @@ bool GraphBuilder::try_inline(ciMethod* callee, bool holder_known) {
} else if (callee->is_abstract()) {
INLINE_BAILOUT("abstract")
} else {
- return try_inline_full(callee, holder_known);
+ return try_inline_full(callee, holder_known, NULL, receiver);
}
}
@@ -3405,7 +3461,7 @@ void GraphBuilder::fill_sync_handler(Value lock, BlockBegin* sync_handler, bool
}
-bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, BlockBegin* cont_block) {
+bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, BlockBegin* cont_block, Value receiver) {
assert(!callee->is_native(), "callee must not be native");
if (CompilationPolicy::policy()->should_not_inline(compilation()->env(), callee)) {
INLINE_BAILOUT("inlining prohibited by policy");
@@ -3541,6 +3597,9 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, BlockBeg
Value arg = caller_state->stack_at_inc(i);
// NOTE: take base() of arg->type() to avoid problems storing
// constants
+ if (receiver != NULL && par_no == 0) {
+ arg = receiver;
+ }
store_local(callee_state, arg, arg->type()->base(), par_no);
}
}
@@ -3683,56 +3742,61 @@ bool GraphBuilder::for_method_handle_inline(ciMethod* callee) {
// Get the two MethodHandle inputs from the Phi.
Value op1 = phi->operand_at(0);
Value op2 = phi->operand_at(1);
- ciMethodHandle* mh1 = op1->type()->as_ObjectType()->constant_value()->as_method_handle();
- ciMethodHandle* mh2 = op2->type()->as_ObjectType()->constant_value()->as_method_handle();
-
- // Set the callee to have access to the class and signature in
- // the MethodHandleCompiler.
- mh1->set_callee(callee);
- mh1->set_caller(method());
- mh2->set_callee(callee);
- mh2->set_caller(method());
-
- // Get adapters for the MethodHandles.
- ciMethod* mh1_adapter = mh1->get_method_handle_adapter();
- ciMethod* mh2_adapter = mh2->get_method_handle_adapter();
-
- if (mh1_adapter != NULL && mh2_adapter != NULL) {
- set_inline_cleanup_info();
-
- // Build the If guard
- BlockBegin* one = new BlockBegin(next_bci());
- BlockBegin* two = new BlockBegin(next_bci());
- BlockBegin* end = new BlockBegin(next_bci());
- Instruction* iff = append(new If(phi, If::eql, false, op1, one, two, NULL, false));
- block()->set_end(iff->as_BlockEnd());
-
- // Connect up the states
- one->merge(block()->end()->state());
- two->merge(block()->end()->state());
-
- // Save the state for the second inlinee
- ValueStack* state_before = copy_state_before();
-
- // Parse first adapter
- _last = _block = one;
- if (!try_inline_full(mh1_adapter, /*holder_known=*/ true, end)) {
- restore_inline_cleanup_info();
- block()->clear_end(); // remove appended iff
- return false;
- }
+ ObjectType* op1type = op1->type()->as_ObjectType();
+ ObjectType* op2type = op2->type()->as_ObjectType();
+
+ if (op1type->is_constant() && op2type->is_constant()) {
+ ciMethodHandle* mh1 = op1type->constant_value()->as_method_handle();
+ ciMethodHandle* mh2 = op2type->constant_value()->as_method_handle();
+
+ // Set the callee to have access to the class and signature in
+ // the MethodHandleCompiler.
+ mh1->set_callee(callee);
+ mh1->set_caller(method());
+ mh2->set_callee(callee);
+ mh2->set_caller(method());
+
+ // Get adapters for the MethodHandles.
+ ciMethod* mh1_adapter = mh1->get_method_handle_adapter();
+ ciMethod* mh2_adapter = mh2->get_method_handle_adapter();
+
+ if (mh1_adapter != NULL && mh2_adapter != NULL) {
+ set_inline_cleanup_info();
+
+ // Build the If guard
+ BlockBegin* one = new BlockBegin(next_bci());
+ BlockBegin* two = new BlockBegin(next_bci());
+ BlockBegin* end = new BlockBegin(next_bci());
+ Instruction* iff = append(new If(phi, If::eql, false, op1, one, two, NULL, false));
+ block()->set_end(iff->as_BlockEnd());
+
+ // Connect up the states
+ one->merge(block()->end()->state());
+ two->merge(block()->end()->state());
+
+ // Save the state for the second inlinee
+ ValueStack* state_before = copy_state_before();
+
+ // Parse first adapter
+ _last = _block = one;
+ if (!try_inline_full(mh1_adapter, /*holder_known=*/ true, end, NULL)) {
+ restore_inline_cleanup_info();
+ block()->clear_end(); // remove appended iff
+ return false;
+ }
- // Parse second adapter
- _last = _block = two;
- _state = state_before;
- if (!try_inline_full(mh2_adapter, /*holder_known=*/ true, end)) {
- restore_inline_cleanup_info();
- block()->clear_end(); // remove appended iff
- return false;
- }
+ // Parse second adapter
+ _last = _block = two;
+ _state = state_before;
+ if (!try_inline_full(mh2_adapter, /*holder_known=*/ true, end, NULL)) {
+ restore_inline_cleanup_info();
+ block()->clear_end(); // remove appended iff
+ return false;
+ }
- connect_to_end(end);
- return true;
+ connect_to_end(end);
+ return true;
+ }
}
}
}
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
index 8b8800e..aa8f45f 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
@@ -337,9 +337,9 @@ class GraphBuilder VALUE_OBJ_CLASS_SPEC {
void fill_sync_handler(Value lock, BlockBegin* sync_handler, bool default_handler = false);
// inliners
- bool try_inline( ciMethod* callee, bool holder_known);
+ bool try_inline( ciMethod* callee, bool holder_known, Value receiver = NULL);
bool try_inline_intrinsics(ciMethod* callee);
- bool try_inline_full( ciMethod* callee, bool holder_known, BlockBegin* cont_block = NULL);
+ bool try_inline_full( ciMethod* callee, bool holder_known, BlockBegin* cont_block, Value receiver);
bool try_inline_jsr(int jsr_dest_bci);
// JSR 292 support
diff --git a/hotspot/src/share/vm/c1/c1_IR.cpp b/hotspot/src/share/vm/c1/c1_IR.cpp
index 917fc5b..bdff560 100644
--- a/hotspot/src/share/vm/c1/c1_IR.cpp
+++ b/hotspot/src/share/vm/c1/c1_IR.cpp
@@ -141,6 +141,7 @@ IRScope::IRScope(Compilation* compilation, IRScope* caller, int caller_bci, ciMe
_xhandlers = new XHandlers(method);
_number_of_locks = 0;
_monitor_pairing_ok = method->has_balanced_monitors();
+ _wrote_final = false;
_start = NULL;
if (osr_bci == -1) {
diff --git a/hotspot/src/share/vm/c1/c1_IR.hpp b/hotspot/src/share/vm/c1/c1_IR.hpp
index 217774f..83c25d6 100644
--- a/hotspot/src/share/vm/c1/c1_IR.hpp
+++ b/hotspot/src/share/vm/c1/c1_IR.hpp
@@ -149,6 +149,7 @@ class IRScope: public CompilationResourceObj {
XHandlers* _xhandlers; // the exception handlers
int _number_of_locks; // the number of monitor lock slots needed
bool _monitor_pairing_ok; // the monitor pairing info
+ bool _wrote_final; // has written final field
BlockBegin* _start; // the start block, successsors are method entries
BitMap _requires_phi_function; // bit is set if phi functions at loop headers are necessary for a local variable
@@ -181,6 +182,8 @@ class IRScope: public CompilationResourceObj {
void set_min_number_of_locks(int n) { if (n > _number_of_locks) _number_of_locks = n; }
bool monitor_pairing_ok() const { return _monitor_pairing_ok; }
BlockBegin* start() const { return _start; }
+ void set_wrote_final() { _wrote_final = true; }
+ bool wrote_final () const { return _wrote_final; }
};
diff --git a/hotspot/src/share/vm/c1/c1_Instruction.hpp b/hotspot/src/share/vm/c1/c1_Instruction.hpp
index 9f9de6a..9cdef87 100644
--- a/hotspot/src/share/vm/c1/c1_Instruction.hpp
+++ b/hotspot/src/share/vm/c1/c1_Instruction.hpp
@@ -107,6 +107,7 @@ class UnsafePrefetchWrite;
class ProfileCall;
class ProfileInvoke;
class RuntimeCall;
+class MemBar;
// A Value is a reference to the instruction creating the value
typedef Instruction* Value;
@@ -204,6 +205,7 @@ class InstructionVisitor: public StackObj {
virtual void do_ProfileCall (ProfileCall* x) = 0;
virtual void do_ProfileInvoke (ProfileInvoke* x) = 0;
virtual void do_RuntimeCall (RuntimeCall* x) = 0;
+ virtual void do_MemBar (MemBar* x) = 0;
};
@@ -2351,6 +2353,23 @@ LEAF(ProfileInvoke, Instruction)
virtual void state_values_do(ValueVisitor*);
};
+LEAF(MemBar, Instruction)
+ private:
+ LIR_Code _code;
+
+ public:
+ MemBar(LIR_Code code)
+ : Instruction(voidType)
+ , _code(code)
+ {
+ pin();
+ }
+
+ LIR_Code code() { return _code; }
+
+ virtual void input_values_do(ValueVisitor*) {}
+};
+
class BlockPair: public CompilationResourceObj {
private:
BlockBegin* _from;
diff --git a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp b/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp
index 1db5a4d..88b0b3c 100644
--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.cpp
@@ -855,4 +855,20 @@ void InstructionPrinter::do_RuntimeCall(RuntimeCall* x) {
output()->put(')');
}
+void InstructionPrinter::do_MemBar(MemBar* x) {
+ if (os::is_MP()) {
+ LIR_Code code = x->code();
+ switch (code) {
+ case lir_membar_acquire : output()->print("membar_acquire"); break;
+ case lir_membar_release : output()->print("membar_release"); break;
+ case lir_membar : output()->print("membar"); break;
+ case lir_membar_loadload : output()->print("membar_loadload"); break;
+ case lir_membar_storestore: output()->print("membar_storestore"); break;
+ case lir_membar_loadstore : output()->print("membar_loadstore"); break;
+ case lir_membar_storeload : output()->print("membar_storeload"); break;
+ default : ShouldNotReachHere(); break;
+ }
+ }
+}
+
#endif // PRODUCT
diff --git a/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp b/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp
index 9447970..de6bff4 100644
--- a/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp
+++ b/hotspot/src/share/vm/c1/c1_InstructionPrinter.hpp
@@ -132,6 +132,7 @@ class InstructionPrinter: public InstructionVisitor {
virtual void do_ProfileCall (ProfileCall* x);
virtual void do_ProfileInvoke (ProfileInvoke* x);
virtual void do_RuntimeCall (RuntimeCall* x);
+ virtual void do_MemBar (MemBar* x);
};
#endif // PRODUCT
diff --git a/hotspot/src/share/vm/c1/c1_LIR.cpp b/hotspot/src/share/vm/c1/c1_LIR.cpp
index 629d849..776a6a3 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp
@@ -464,6 +464,10 @@ void LIR_OpVisitState::visit(LIR_Op* op) {
case lir_membar: // result and info always invalid
case lir_membar_acquire: // result and info always invalid
case lir_membar_release: // result and info always invalid
+ case lir_membar_loadload: // result and info always invalid
+ case lir_membar_storestore: // result and info always invalid
+ case lir_membar_loadstore: // result and info always invalid
+ case lir_membar_storeload: // result and info always invalid
{
assert(op->as_Op0() != NULL, "must be");
assert(op->_info == NULL, "info not used by this instruction");
@@ -1607,6 +1611,10 @@ const char * LIR_Op::name() const {
case lir_membar: s = "membar"; break;
case lir_membar_acquire: s = "membar_acquire"; break;
case lir_membar_release: s = "membar_release"; break;
+ case lir_membar_loadload: s = "membar_loadload"; break;
+ case lir_membar_storestore: s = "membar_storestore"; break;
+ case lir_membar_loadstore: s = "membar_loadstore"; break;
+ case lir_membar_storeload: s = "membar_storeload"; break;
case lir_word_align: s = "word_align"; break;
case lir_label: s = "label"; break;
case lir_nop: s = "nop"; break;
diff --git a/hotspot/src/share/vm/c1/c1_LIR.hpp b/hotspot/src/share/vm/c1/c1_LIR.hpp
index c440b71..f8589c3 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp
@@ -866,6 +866,10 @@ enum LIR_Code {
, lir_membar
, lir_membar_acquire
, lir_membar_release
+ , lir_membar_loadload
+ , lir_membar_storestore
+ , lir_membar_loadstore
+ , lir_membar_storeload
, lir_get_thread
, end_op0
, begin_op1
@@ -1354,9 +1358,10 @@ class LIR_OpBranch: public LIR_Op {
CodeStub* _stub; // if this is a branch to a stub, this is the stub
public:
- LIR_OpBranch(LIR_Condition cond, Label* lbl)
+ LIR_OpBranch(LIR_Condition cond, BasicType type, Label* lbl)
: LIR_Op(lir_branch, LIR_OprFact::illegalOpr, (CodeEmitInfo*) NULL)
, _cond(cond)
+ , _type(type)
, _label(lbl)
, _block(NULL)
, _ublock(NULL)
@@ -1917,6 +1922,10 @@ class LIR_List: public CompilationResourceObj {
void membar() { append(new LIR_Op0(lir_membar)); }
void membar_acquire() { append(new LIR_Op0(lir_membar_acquire)); }
void membar_release() { append(new LIR_Op0(lir_membar_release)); }
+ void membar_loadload() { append(new LIR_Op0(lir_membar_loadload)); }
+ void membar_storestore() { append(new LIR_Op0(lir_membar_storestore)); }
+ void membar_loadstore() { append(new LIR_Op0(lir_membar_loadstore)); }
+ void membar_storeload() { append(new LIR_Op0(lir_membar_storeload)); }
void nop() { append(new LIR_Op0(lir_nop)); }
void build_frame() { append(new LIR_Op0(lir_build_frame)); }
@@ -2053,7 +2062,7 @@ class LIR_List: public CompilationResourceObj {
void jump(CodeStub* stub) {
append(new LIR_OpBranch(lir_cond_always, T_ILLEGAL, stub));
}
- void branch(LIR_Condition cond, Label* lbl) { append(new LIR_OpBranch(cond, lbl)); }
+ void branch(LIR_Condition cond, BasicType type, Label* lbl) { append(new LIR_OpBranch(cond, type, lbl)); }
void branch(LIR_Condition cond, BasicType type, BlockBegin* block) {
assert(type != T_FLOAT && type != T_DOUBLE, "no fp comparisons");
append(new LIR_OpBranch(cond, type, block));
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
index 258fde2..528f21e 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
@@ -664,6 +664,22 @@ void LIR_Assembler::emit_op0(LIR_Op0* op) {
membar_release();
break;
+ case lir_membar_loadload:
+ membar_loadload();
+ break;
+
+ case lir_membar_storestore:
+ membar_storestore();
+ break;
+
+ case lir_membar_loadstore:
+ membar_loadstore();
+ break;
+
+ case lir_membar_storeload:
+ membar_storeload();
+ break;
+
case lir_get_thread:
get_thread(op->result_opr());
break;
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
index 14b6298..58adf59 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
@@ -241,6 +241,10 @@ class LIR_Assembler: public CompilationResourceObj {
void membar();
void membar_acquire();
void membar_release();
+ void membar_loadload();
+ void membar_storestore();
+ void membar_loadstore();
+ void membar_storeload();
void get_thread(LIR_Opr result);
void verify_oop_map(CodeEmitInfo* info);
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
index 5f3155d..3c7f305 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
@@ -2350,7 +2350,7 @@ void LIRGenerator::do_SwitchRanges(SwitchRangeArray* x, LIR_Opr value, BlockBegi
} else {
LabelObj* L = new LabelObj();
__ cmp(lir_cond_less, value, low_key);
- __ branch(lir_cond_less, L->label());
+ __ branch(lir_cond_less, T_INT, L->label());
__ cmp(lir_cond_lessEqual, value, high_key);
__ branch(lir_cond_lessEqual, T_INT, dest);
__ branch_destination(L->label());
@@ -3165,3 +3165,20 @@ LIR_Opr LIRGenerator::call_runtime(BasicTypeArray* signature, LIRItemList* args,
}
return result;
}
+
+void LIRGenerator::do_MemBar(MemBar* x) {
+ if (os::is_MP()) {
+ LIR_Code code = x->code();
+ switch(code) {
+ case lir_membar_acquire : __ membar_acquire(); break;
+ case lir_membar_release : __ membar_release(); break;
+ case lir_membar : __ membar(); break;
+ case lir_membar_loadload : __ membar_loadload(); break;
+ case lir_membar_storestore: __ membar_storestore(); break;
+ case lir_membar_loadstore : __ membar_loadstore(); break;
+ case lir_membar_storeload : __ membar_storeload(); break;
+ default : ShouldNotReachHere(); break;
+ }
+ }
+}
+
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
index 2b8fc23..56b28e4 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.hpp
@@ -525,6 +525,7 @@ class LIRGenerator: public InstructionVisitor, public BlockClosure {
virtual void do_ProfileCall (ProfileCall* x);
virtual void do_ProfileInvoke (ProfileInvoke* x);
virtual void do_RuntimeCall (RuntimeCall* x);
+ virtual void do_MemBar (MemBar* x);
};
diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
index ebb0683..fede09f 100644
--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
@@ -1884,7 +1884,7 @@ void LinearScan::resolve_exception_entry(BlockBegin* block, MoveResolver &move_r
if (move_resolver.has_mappings()) {
// insert moves after first instruction
- move_resolver.set_insert_position(block->lir(), 1);
+ move_resolver.set_insert_position(block->lir(), 0);
move_resolver.resolve_and_append_moves();
}
}
@@ -2464,12 +2464,15 @@ void LinearScan::compute_oop_map(IntervalWalker* iw, const LIR_OpVisitState &vis
// frequently used constants
-ConstantOopWriteValue LinearScan::_oop_null_scope_value = ConstantOopWriteValue(NULL);
-ConstantIntValue LinearScan::_int_m1_scope_value = ConstantIntValue(-1);
-ConstantIntValue LinearScan::_int_0_scope_value = ConstantIntValue(0);
-ConstantIntValue LinearScan::_int_1_scope_value = ConstantIntValue(1);
-ConstantIntValue LinearScan::_int_2_scope_value = ConstantIntValue(2);
-LocationValue _illegal_value = LocationValue(Location());
+// Allocate them with new so they are never destroyed (otherwise, a
+// forced exit could destroy these objects while they are still in
+// use).
+ConstantOopWriteValue* LinearScan::_oop_null_scope_value = new (ResourceObj::C_HEAP) ConstantOopWriteValue(NULL);
+ConstantIntValue* LinearScan::_int_m1_scope_value = new (ResourceObj::C_HEAP) ConstantIntValue(-1);
+ConstantIntValue* LinearScan::_int_0_scope_value = new (ResourceObj::C_HEAP) ConstantIntValue(0);
+ConstantIntValue* LinearScan::_int_1_scope_value = new (ResourceObj::C_HEAP) ConstantIntValue(1);
+ConstantIntValue* LinearScan::_int_2_scope_value = new (ResourceObj::C_HEAP) ConstantIntValue(2);
+LocationValue* _illegal_value = new (ResourceObj::C_HEAP) LocationValue(Location());
void LinearScan::init_compute_debug_info() {
// cache for frequently used scope values
@@ -2508,7 +2511,7 @@ int LinearScan::append_scope_value_for_constant(LIR_Opr opr, GrowableArray<Scope
case T_OBJECT: {
jobject value = c->as_jobject();
if (value == NULL) {
- scope_values->append(&_oop_null_scope_value);
+ scope_values->append(_oop_null_scope_value);
} else {
scope_values->append(new ConstantOopWriteValue(c->as_jobject()));
}
@@ -2519,10 +2522,10 @@ int LinearScan::append_scope_value_for_constant(LIR_Opr opr, GrowableArray<Scope
case T_FLOAT: {
int value = c->as_jint_bits();
switch (value) {
- case -1: scope_values->append(&_int_m1_scope_value); break;
- case 0: scope_values->append(&_int_0_scope_value); break;
- case 1: scope_values->append(&_int_1_scope_value); break;
- case 2: scope_values->append(&_int_2_scope_value); break;
+ case -1: scope_values->append(_int_m1_scope_value); break;
+ case 0: scope_values->append(_int_0_scope_value); break;
+ case 1: scope_values->append(_int_1_scope_value); break;
+ case 2: scope_values->append(_int_2_scope_value); break;
default: scope_values->append(new ConstantIntValue(c->as_jint_bits())); break;
}
return 1;
@@ -2531,7 +2534,7 @@ int LinearScan::append_scope_value_for_constant(LIR_Opr opr, GrowableArray<Scope
case T_LONG: // fall through
case T_DOUBLE: {
#ifdef _LP64
- scope_values->append(&_int_0_scope_value);
+ scope_values->append(_int_0_scope_value);
scope_values->append(new ConstantLongValue(c->as_jlong_bits()));
#else
if (hi_word_offset_in_bytes > lo_word_offset_in_bytes) {
@@ -2657,7 +2660,7 @@ int LinearScan::append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeV
}
// Does this reverse on x86 vs. sparc?
first = new LocationValue(loc1);
- second = &_int_0_scope_value;
+ second = _int_0_scope_value;
#else
Location loc1, loc2;
if (!frame_map()->locations_for_slot(opr->double_stack_ix(), Location::normal, &loc1, &loc2)) {
@@ -2671,7 +2674,7 @@ int LinearScan::append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeV
#ifdef _LP64
VMReg rname_first = opr->as_register_lo()->as_VMReg();
first = new LocationValue(Location::new_reg_loc(Location::lng, rname_first));
- second = &_int_0_scope_value;
+ second = _int_0_scope_value;
#else
VMReg rname_first = opr->as_register_lo()->as_VMReg();
VMReg rname_second = opr->as_register_hi()->as_VMReg();
@@ -2694,7 +2697,7 @@ int LinearScan::append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeV
VMReg rname_first = opr->as_xmm_double_reg()->as_VMReg();
# ifdef _LP64
first = new LocationValue(Location::new_reg_loc(Location::dbl, rname_first));
- second = &_int_0_scope_value;
+ second = _int_0_scope_value;
# else
first = new LocationValue(Location::new_reg_loc(Location::normal, rname_first));
// %%% This is probably a waste but we'll keep things as they were for now
@@ -2741,7 +2744,7 @@ int LinearScan::append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeV
#ifdef _LP64
first = new LocationValue(Location::new_reg_loc(Location::dbl, rname_first));
- second = &_int_0_scope_value;
+ second = _int_0_scope_value;
#else
first = new LocationValue(Location::new_reg_loc(Location::normal, rname_first));
// %%% This is probably a waste but we'll keep things as they were for now
@@ -2822,7 +2825,7 @@ int LinearScan::append_scope_value(int op_id, Value value, GrowableArray<ScopeVa
}
} else {
// append a dummy value because real value not needed
- scope_values->append(&_illegal_value);
+ scope_values->append(_illegal_value);
return 1;
}
}
@@ -2865,7 +2868,7 @@ IRScopeDebugInfo* LinearScan::compute_debug_info_for_scope(int op_id, IRScope* c
nof_locals = cur_scope->method()->max_locals();
locals = new GrowableArray<ScopeValue*>(nof_locals);
for(int i = 0; i < nof_locals; i++) {
- locals->append(&_illegal_value);
+ locals->append(_illegal_value);
}
}
diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.hpp b/hotspot/src/share/vm/c1/c1_LinearScan.hpp
index 133cc85..0c06f1b 100644
--- a/hotspot/src/share/vm/c1/c1_LinearScan.hpp
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.hpp
@@ -160,11 +160,11 @@ class LinearScan : public CompilationResourceObj {
// TODO: cached scope values for registers could be static
ScopeValueArray _scope_value_cache;
- static ConstantOopWriteValue _oop_null_scope_value;
- static ConstantIntValue _int_m1_scope_value;
- static ConstantIntValue _int_0_scope_value;
- static ConstantIntValue _int_1_scope_value;
- static ConstantIntValue _int_2_scope_value;
+ static ConstantOopWriteValue* _oop_null_scope_value;
+ static ConstantIntValue* _int_m1_scope_value;
+ static ConstantIntValue* _int_0_scope_value;
+ static ConstantIntValue* _int_1_scope_value;
+ static ConstantIntValue* _int_2_scope_value;
// accessors
IR* ir() const { return _ir; }
diff --git a/hotspot/src/share/vm/c1/c1_Optimizer.cpp b/hotspot/src/share/vm/c1/c1_Optimizer.cpp
index e1a0ef7..ff05781 100644
--- a/hotspot/src/share/vm/c1/c1_Optimizer.cpp
+++ b/hotspot/src/share/vm/c1/c1_Optimizer.cpp
@@ -509,6 +509,7 @@ public:
void do_ProfileCall (ProfileCall* x);
void do_ProfileInvoke (ProfileInvoke* x);
void do_RuntimeCall (RuntimeCall* x);
+ void do_MemBar (MemBar* x);
};
@@ -678,6 +679,7 @@ void NullCheckVisitor::do_UnsafePrefetchWrite(UnsafePrefetchWrite* x) {}
void NullCheckVisitor::do_ProfileCall (ProfileCall* x) { nce()->clear_last_explicit_null_check(); }
void NullCheckVisitor::do_ProfileInvoke (ProfileInvoke* x) {}
void NullCheckVisitor::do_RuntimeCall (RuntimeCall* x) {}
+void NullCheckVisitor::do_MemBar (MemBar* x) {}
void NullCheckEliminator::visit(Value* p) {
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
index 183be88..765dec4 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -413,8 +413,9 @@ static nmethod* counter_overflow_helper(JavaThread* THREAD, int branch_bci, meth
}
bci = branch_bci + offset;
}
-
+ assert(!HAS_PENDING_EXCEPTION, "Should not have any exceptions pending");
osr_nm = CompilationPolicy::policy()->event(enclosing_method, method, branch_bci, bci, level, nm, THREAD);
+ assert(!HAS_PENDING_EXCEPTION, "Event handler should not throw any exceptions");
return osr_nm;
}
@@ -596,7 +597,6 @@ address Runtime1::exception_handler_for_pc(JavaThread* thread) {
JRT_ENTRY(void, Runtime1::throw_range_check_exception(JavaThread* thread, int index))
NOT_PRODUCT(_throw_range_check_exception_count++;)
- Events::log("throw_range_check");
char message[jintAsStringSize];
sprintf(message, "%d", index);
SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_ArrayIndexOutOfBoundsException(), message);
@@ -605,7 +605,6 @@ JRT_END
JRT_ENTRY(void, Runtime1::throw_index_exception(JavaThread* thread, int index))
NOT_PRODUCT(_throw_index_exception_count++;)
- Events::log("throw_index");
char message[16];
sprintf(message, "%d", index);
SharedRuntime::throw_and_post_jvmti_exception(thread, vmSymbols::java_lang_IndexOutOfBoundsException(), message);
@@ -803,11 +802,7 @@ JRT_ENTRY(void, Runtime1::patch_code(JavaThread* thread, Runtime1::StubID stub_i
// Note also that in the presence of inlining it is not guaranteed
// that caller_method() == caller_code->method()
-
int bci = vfst.bci();
-
- Events::log("patch_code @ " INTPTR_FORMAT , caller_frame.pc());
-
Bytecodes::Code code = caller_method()->java_code_at(bci);
#ifndef PRODUCT
diff --git a/hotspot/src/share/vm/c1/c1_ValueMap.cpp b/hotspot/src/share/vm/c1/c1_ValueMap.cpp
index aa2bf5a..1f31520 100644
--- a/hotspot/src/share/vm/c1/c1_ValueMap.cpp
+++ b/hotspot/src/share/vm/c1/c1_ValueMap.cpp
@@ -125,6 +125,7 @@ Value ValueMap::find_insert(Value x) {
// otherwise it is possible that they are not evaluated
f->pin(Instruction::PinGlobalValueNumbering);
}
+ assert(x->type()->tag() == f->type()->tag(), "should have same type");
return f;
diff --git a/hotspot/src/share/vm/c1/c1_ValueMap.hpp b/hotspot/src/share/vm/c1/c1_ValueMap.hpp
index 248d174..4278b11 100644
--- a/hotspot/src/share/vm/c1/c1_ValueMap.hpp
+++ b/hotspot/src/share/vm/c1/c1_ValueMap.hpp
@@ -200,6 +200,7 @@ class ValueNumberingVisitor: public InstructionVisitor {
void do_ProfileCall (ProfileCall* x) { /* nothing to do */ }
void do_ProfileInvoke (ProfileInvoke* x) { /* nothing to do */ };
void do_RuntimeCall (RuntimeCall* x) { /* nothing to do */ };
+ void do_MemBar (MemBar* x) { /* nothing to do */ };
};
diff --git a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
index 630594a..2037b49 100644
--- a/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
+++ b/hotspot/src/share/vm/ci/bcEscapeAnalyzer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -359,7 +359,7 @@ void BCEscapeAnalyzer::iterate_one_block(ciBlock *blk, StateInfo &state, Growabl
case Bytecodes::_nop:
break;
case Bytecodes::_aconst_null:
- state.apush(empty_map);
+ state.apush(unknown_obj);
break;
case Bytecodes::_iconst_m1:
case Bytecodes::_iconst_0:
@@ -392,6 +392,8 @@ void BCEscapeAnalyzer::iterate_one_block(ciBlock *blk, StateInfo &state, Growabl
if (tag.is_long() || tag.is_double()) {
// Only longs and doubles use 2 stack slots.
state.lpush();
+ } else if (tag.basic_type() == T_OBJECT) {
+ state.apush(unknown_obj);
} else {
state.spush();
}
diff --git a/hotspot/src/share/vm/ci/ciEnv.hpp b/hotspot/src/share/vm/ci/ciEnv.hpp
index 12f4bb2..d00c9f7 100644
--- a/hotspot/src/share/vm/ci/ciEnv.hpp
+++ b/hotspot/src/share/vm/ci/ciEnv.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -284,6 +284,20 @@ public:
// Return state of appropriate compilability
int compilable() { return _compilable; }
+ const char* retry_message() const {
+ switch (_compilable) {
+ case ciEnv::MethodCompilable_not_at_tier:
+ return "retry at different tier";
+ case ciEnv::MethodCompilable_never:
+ return "not retryable";
+ case ciEnv::MethodCompilable:
+ return NULL;
+ default:
+ ShouldNotReachHere();
+ return NULL;
+ }
+ }
+
bool break_at_compile() { return _break_at_compile; }
void set_break_at_compile(bool z) { _break_at_compile = z; }
diff --git a/hotspot/src/share/vm/classfile/dictionary.cpp b/hotspot/src/share/vm/classfile/dictionary.cpp
index b15446c..4458f46 100644
--- a/hotspot/src/share/vm/classfile/dictionary.cpp
+++ b/hotspot/src/share/vm/classfile/dictionary.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -618,7 +618,8 @@ void Dictionary::print() {
ResourceMark rm;
HandleMark hm;
- tty->print_cr("Java system dictionary (classes=%d)", number_of_entries());
+ tty->print_cr("Java system dictionary (table_size=%d, classes=%d)",
+ table_size(), number_of_entries());
tty->print_cr("^ indicates that initiating loader is different from "
"defining loader");
diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/hotspot/src/share/vm/classfile/javaClasses.cpp
index 59db6c3..b5e887f 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp
@@ -1347,7 +1347,13 @@ class BacktraceBuilder: public StackObj {
return _backtrace();
}
- inline void push(methodOop method, short bci, TRAPS) {
+ inline void push(methodOop method, int bci, TRAPS) {
+ // Smear the -1 bci to 0 since the array only holds unsigned
+ // shorts. The later line number lookup would just smear the -1
+ // to a 0 even if it could be recorded.
+ if (bci == SynchronizationEntryBCI) bci = 0;
+ assert(bci == (jushort)bci, "doesn't fit");
+
if (_index >= trace_chunk_size) {
methodHandle mhandle(THREAD, method);
expand(CHECK);
@@ -1574,8 +1580,13 @@ void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle t
int chunk_count = 0;
for (;!st.at_end(); st.next()) {
- // add element
- bcis->ushort_at_put(chunk_count, st.bci());
+ // Add entry and smear the -1 bci to 0 since the array only holds
+ // unsigned shorts. The later line number lookup would just smear
+ // the -1 to a 0 even if it could be recorded.
+ int bci = st.bci();
+ if (bci == SynchronizationEntryBCI) bci = 0;
+ assert(bci == (jushort)bci, "doesn't fit");
+ bcis->ushort_at_put(chunk_count, bci);
methods->obj_at_put(chunk_count, st.method());
chunk_count++;
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
index 88ccc91..04bb9d9 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,9 @@ SymbolPropertyTable* SystemDictionary::_invoke_method_table = NULL;
int SystemDictionary::_number_of_modifications = 0;
+int SystemDictionary::_sdgeneration = 0;
+const int SystemDictionary::_primelist[_prime_array_size] = {1009,2017,4049,5051,10103,
+ 20201,40423,99991};
oop SystemDictionary::_system_loader_lock_obj = NULL;
@@ -1178,8 +1181,8 @@ void SystemDictionary::set_shared_dictionary(HashtableBucket* t, int length,
klassOop SystemDictionary::find_shared_class(Symbol* class_name) {
if (shared_dictionary() != NULL) {
- unsigned int d_hash = dictionary()->compute_hash(class_name, Handle());
- int d_index = dictionary()->hash_to_index(d_hash);
+ unsigned int d_hash = shared_dictionary()->compute_hash(class_name, Handle());
+ int d_index = shared_dictionary()->hash_to_index(d_hash);
return shared_dictionary()->find_shared_class(d_index, d_hash, class_name);
} else {
return NULL;
@@ -1750,7 +1753,21 @@ void SystemDictionary::placeholders_do(OopClosure* blk) {
placeholders()->oops_do(blk);
}
-
+// Calculate a "good" systemdictionary size based
+// on predicted or current loaded classes count
+int SystemDictionary::calculate_systemdictionary_size(int classcount) {
+ int newsize = _old_default_sdsize;
+ if ((classcount > 0) && !DumpSharedSpaces) {
+ int desiredsize = classcount/_average_depth_goal;
+ for (newsize = _primelist[_sdgeneration]; _sdgeneration < _prime_array_size -1;
+ newsize = _primelist[++_sdgeneration]) {
+ if (desiredsize <= newsize) {
+ break;
+ }
+ }
+ }
+ return newsize;
+}
bool SystemDictionary::do_unloading(BoolObjectClosure* is_alive) {
bool result = dictionary()->do_unloading(is_alive);
constraints()->purge_loader_constraints(is_alive);
@@ -1873,7 +1890,8 @@ void SystemDictionary::initialize(TRAPS) {
// Allocate arrays
assert(dictionary() == NULL,
"SystemDictionary should only be initialized once");
- _dictionary = new Dictionary(_nof_buckets);
+ _sdgeneration = 0;
+ _dictionary = new Dictionary(calculate_systemdictionary_size(PredictedLoadedClassCount));
_placeholders = new PlaceholderTable(_nof_buckets);
_number_of_modifications = 0;
_loader_constraints = new LoaderConstraintTable(_loader_constraint_size);
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.hpp b/hotspot/src/share/vm/classfile/systemDictionary.hpp
index 528ecaf..3abc505 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -346,6 +346,8 @@ public:
// loaders. Returns "true" iff something was unloaded.
static bool do_unloading(BoolObjectClosure* is_alive);
+ static int calculate_systemdictionary_size(int loadedclasses);
+
// Applies "f->do_oop" to all root oops in the system dictionary.
static void oops_do(OopClosure* f);
@@ -538,12 +540,20 @@ public:
_loader_constraint_size = 107, // number of entries in constraint table
_resolution_error_size = 107, // number of entries in resolution error table
_invoke_method_size = 139, // number of entries in invoke method table
- _nof_buckets = 1009 // number of buckets in hash table
+ _nof_buckets = 1009, // number of buckets in hash table for placeholders
+ _old_default_sdsize = 1009, // backward compat for system dictionary size
+ _prime_array_size = 8, // array of primes for system dictionary size
+ _average_depth_goal = 3 // goal for lookup length
};
// Static variables
+ // hashtable sizes for system dictionary to allow growth
+ // prime numbers for system dictionary size
+ static int _sdgeneration;
+ static const int _primelist[_prime_array_size];
+
// Hashtable holding loaded classes.
static Dictionary* _dictionary;
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 40f36ad..92c0634 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -284,6 +284,7 @@
template(run_method_name, "run") \
template(exit_method_name, "exit") \
template(add_method_name, "add") \
+ template(remove_method_name, "remove") \
template(parent_name, "parent") \
template(threads_name, "threads") \
template(groups_name, "groups") \
@@ -508,6 +509,9 @@
template(clear_name, "clear") \
template(trigger_method_signature, "(ILjava/lang/management/MemoryUsage;)V") \
template(startAgent_name, "startAgent") \
+ template(startRemoteAgent_name, "startRemoteManagementAgent") \
+ template(startLocalAgent_name, "startLocalManagementAgent") \
+ template(stopRemoteAgent_name, "stopRemoteManagementAgent") \
template(java_lang_management_ThreadInfo_constructor_signature, "(Ljava/lang/Thread;ILjava/lang/Object;Ljava/lang/Thread;JJJJ[Ljava/lang/StackTraceElement;)V") \
template(java_lang_management_ThreadInfo_with_locks_constructor_signature, "(Ljava/lang/Thread;ILjava/lang/Object;Ljava/lang/Thread;JJJJ[Ljava/lang/StackTraceElement;[Ljava/lang/Object;[I[Ljava/lang/Object;)V") \
template(long_long_long_long_void_signature, "(JJJJ)V") \
diff --git a/hotspot/src/share/vm/code/compiledIC.cpp b/hotspot/src/share/vm/code/compiledIC.cpp
index 3496f70..5b1172a 100644
--- a/hotspot/src/share/vm/code/compiledIC.cpp
+++ b/hotspot/src/share/vm/code/compiledIC.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -165,7 +165,6 @@ void CompiledIC::set_to_megamorphic(CallInfo* call_info, Bytecodes::Code bytecod
instruction_address(), method->print_value_string(), entry);
}
- Events::log("compiledIC " INTPTR_FORMAT " --> megamorphic " INTPTR_FORMAT, this, (address)method());
// We can't check this anymore. With lazy deopt we could have already
// cleaned this IC entry before we even return. This is possible if
// we ran out of space in the inline cache buffer trying to do the
diff --git a/hotspot/src/share/vm/code/nmethod.cpp b/hotspot/src/share/vm/code/nmethod.cpp
index 31424e1..65ee2b5 100644
--- a/hotspot/src/share/vm/code/nmethod.cpp
+++ b/hotspot/src/share/vm/code/nmethod.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -462,6 +462,7 @@ void nmethod::init_defaults() {
_speculatively_disconnected = 0;
_has_unsafe_access = 0;
_has_method_handle_invokes = 0;
+ _lazy_critical_native = 0;
_marked_for_deoptimization = 0;
_lock_count = 0;
_stack_traversal_mark = 0;
@@ -704,7 +705,6 @@ nmethod::nmethod(
xtty->tail("print_native_nmethod");
}
}
- Events::log("Create nmethod " INTPTR_FORMAT, this);
}
// For dtrace wrappers
@@ -781,7 +781,6 @@ nmethod::nmethod(
xtty->tail("print_dtrace_nmethod");
}
}
- Events::log("Create nmethod " INTPTR_FORMAT, this);
}
#endif // def HAVE_DTRACE_H
@@ -889,13 +888,6 @@ nmethod::nmethod(
if (printnmethods || PrintDebugInfo || PrintRelocations || PrintDependencies || PrintExceptionHandlers) {
print_nmethod(printnmethods);
}
-
- // Note: Do not verify in here as the CodeCache_lock is
- // taken which would conflict with the CompiledIC_lock
- // which taken during the verification of call sites.
- // (was bug - gri 10/25/99)
-
- Events::log("Create nmethod " INTPTR_FORMAT, this);
}
@@ -1386,7 +1378,7 @@ void nmethod::flush() {
assert_locked_or_safepoint(CodeCache_lock);
// completely deallocate this method
- EventMark m("flushing nmethod " INTPTR_FORMAT " %s", this, "");
+ Events::log(JavaThread::current(), "flushing nmethod " INTPTR_FORMAT, this);
if (PrintMethodFlushing) {
tty->print_cr("*flushing nmethod %3d/" INTPTR_FORMAT ". Live blobs:" UINT32_FORMAT "/Free CodeCache:" SIZE_FORMAT "Kb",
_compile_id, this, CodeCache::nof_blobs(), CodeCache::unallocated_capacity()/1024);
diff --git a/hotspot/src/share/vm/code/nmethod.hpp b/hotspot/src/share/vm/code/nmethod.hpp
index 47c5a28..cad0eed 100644
--- a/hotspot/src/share/vm/code/nmethod.hpp
+++ b/hotspot/src/share/vm/code/nmethod.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -175,6 +175,7 @@ class nmethod : public CodeBlob {
// set during construction
unsigned int _has_unsafe_access:1; // May fault due to unsafe access.
unsigned int _has_method_handle_invokes:1; // Has this method MethodHandle invokes?
+ unsigned int _lazy_critical_native:1; // Lazy JNI critical native
// Protected by Patching_lock
unsigned char _state; // {alive, not_entrant, zombie, unloaded}
@@ -430,7 +431,10 @@ class nmethod : public CodeBlob {
void set_has_method_handle_invokes(bool z) { _has_method_handle_invokes = z; }
bool is_speculatively_disconnected() const { return _speculatively_disconnected; }
- void set_speculatively_disconnected(bool z) { _speculatively_disconnected = z; }
+ void set_speculatively_disconnected(bool z) { _speculatively_disconnected = z; }
+
+ bool is_lazy_critical_native() const { return _lazy_critical_native; }
+ void set_lazy_critical_native(bool z) { _lazy_critical_native = z; }
int comp_level() const { return _comp_level; }
diff --git a/hotspot/src/share/vm/compiler/compileBroker.cpp b/hotspot/src/share/vm/compiler/compileBroker.cpp
index 4c38509..8729e05 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* 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 @@
#include "runtime/sharedRuntime.hpp"
#include "runtime/sweeper.hpp"
#include "utilities/dtrace.hpp"
+#include "utilities/events.hpp"
#ifdef COMPILER1
#include "c1/c1_Compiler.hpp"
#endif
@@ -189,6 +190,44 @@ CompileTask* CompileBroker::_task_free_list = NULL;
GrowableArray<CompilerThread*>* CompileBroker::_method_threads = NULL;
+class CompilationLog : public StringEventLog {
+ public:
+ CompilationLog() : StringEventLog("Compilation events") {
+ }
+
+ void log_compile(JavaThread* thread, CompileTask* task) {
+ StringLogMessage lm;
+ stringStream msg = lm.stream();
+ // msg.time_stamp().update_to(tty->time_stamp().ticks());
+ task->print_compilation(&msg, true);
+ log(thread, "%s", (const char*)lm);
+ }
+
+ void log_nmethod(JavaThread* thread, nmethod* nm) {
+ log(thread, "nmethod %d%s " INTPTR_FORMAT " code ["INTPTR_FORMAT ", " INTPTR_FORMAT "]",
+ nm->compile_id(), nm->is_osr_method() ? "%" : "",
+ nm, nm->code_begin(), nm->code_end());
+ }
+
+ void log_failure(JavaThread* thread, CompileTask* task, const char* reason, const char* retry_message) {
+ StringLogMessage lm;
+ lm.print("%4d COMPILE SKIPPED: %s", task->compile_id(), reason);
+ if (retry_message != NULL) {
+ lm.append(" (%s)", retry_message);
+ }
+ lm.print("\n");
+ log(thread, "%s", (const char*)lm);
+ }
+};
+
+static CompilationLog* _compilation_log = NULL;
+
+void compileBroker_init() {
+ if (LogEvents) {
+ _compilation_log = new CompilationLog();
+ }
+}
+
CompileTaskWrapper::CompileTaskWrapper(CompileTask* task) {
CompilerThread* thread = CompilerThread::current();
thread->set_task(task);
@@ -326,8 +365,12 @@ void CompileTask::print_line() {
// ------------------------------------------------------------------
// CompileTask::print_compilation_impl
-void CompileTask::print_compilation_impl(outputStream* st, methodOop method, int compile_id, int comp_level, bool is_osr_method, int osr_bci, bool is_blocking, const char* msg) {
- st->print("%7d ", (int) st->time_stamp().milliseconds()); // print timestamp
+void CompileTask::print_compilation_impl(outputStream* st, methodOop method, int compile_id, int comp_level,
+ bool is_osr_method, int osr_bci, bool is_blocking,
+ const char* msg, bool short_form) {
+ if (!short_form) {
+ st->print("%7d ", (int) st->time_stamp().milliseconds()); // print timestamp
+ }
st->print("%4d ", compile_id); // print compilation number
// For unloaded methods the transition to zombie occurs after the
@@ -370,7 +413,9 @@ void CompileTask::print_compilation_impl(outputStream* st, methodOop method, int
if (msg != NULL) {
st->print(" %s", msg);
}
- st->cr();
+ if (!short_form) {
+ st->cr();
+ }
}
// ------------------------------------------------------------------
@@ -426,12 +471,12 @@ void CompileTask::print_inline_indent(int inline_level, outputStream* st) {
// ------------------------------------------------------------------
// CompileTask::print_compilation
-void CompileTask::print_compilation(outputStream* st) {
+void CompileTask::print_compilation(outputStream* st, bool short_form) {
oop rem = JNIHandles::resolve(method_handle());
assert(rem != NULL && rem->is_method(), "must be");
methodOop method = (methodOop) rem;
bool is_osr_method = osr_bci() != InvocationEntryBci;
- print_compilation_impl(st, method, compile_id(), comp_level(), is_osr_method, osr_bci(), is_blocking());
+ print_compilation_impl(st, method, compile_id(), comp_level(), is_osr_method, osr_bci(), is_blocking(), NULL, short_form);
}
// ------------------------------------------------------------------
@@ -855,23 +900,23 @@ CompilerThread* CompileBroker::make_compiler_thread(const char* name, CompileQue
// Note that this only sets the JavaThread _priority field, which by
// definition is limited to Java priorities and not OS priorities.
// The os-priority is set in the CompilerThread startup code itself
+
java_lang_Thread::set_priority(thread_oop(), NearMaxPriority);
- // CLEANUP PRIORITIES: This -if- statement hids a bug whereby the compiler
- // threads never have their OS priority set. The assumption here is to
- // enable the Performance group to do flag tuning, figure out a suitable
- // CompilerThreadPriority, and then remove this 'if' statement (and
- // comment) and unconditionally set the priority.
-
- // Compiler Threads should be at the highest Priority
- if ( CompilerThreadPriority != -1 )
- os::set_native_priority( compiler_thread, CompilerThreadPriority );
- else
- os::set_native_priority( compiler_thread, os::java_to_os_priority[NearMaxPriority]);
-
- // Note that I cannot call os::set_priority because it expects Java
- // priorities and I am *explicitly* using OS priorities so that it's
- // possible to set the compiler thread priority higher than any Java
- // thread.
+
+ // Note that we cannot call os::set_priority because it expects Java
+ // priorities and we are *explicitly* using OS priorities so that it's
+ // possible to set the compiler thread priority higher than any Java
+ // thread.
+
+ int native_prio = CompilerThreadPriority;
+ if (native_prio == -1) {
+ if (UseCriticalCompilerThreadPriority) {
+ native_prio = os::java_to_os_priority[CriticalPriority];
+ } else {
+ native_prio = os::java_to_os_priority[NearMaxPriority];
+ }
+ }
+ os::set_native_priority(compiler_thread, native_prio);
java_lang_Thread::set_daemon(thread_oop());
@@ -879,6 +924,7 @@ CompilerThread* CompileBroker::make_compiler_thread(const char* name, CompileQue
Threads::add(compiler_thread);
Thread::start(compiler_thread);
}
+
// Let go of Threads_lock before yielding
os::yield(); // make sure that the compiler thread is started early (especially helpful on SOLARIS)
@@ -961,7 +1007,7 @@ void CompileBroker::compile_method_base(methodHandle method,
methodHandle hot_method,
int hot_count,
const char* comment,
- TRAPS) {
+ Thread* thread) {
// do nothing if compiler thread(s) is not available
if (!_initialized ) {
return;
@@ -1037,7 +1083,7 @@ void CompileBroker::compile_method_base(methodHandle method,
// Acquire our lock.
{
- MutexLocker locker(queue->lock(), THREAD);
+ MutexLocker locker(queue->lock(), thread);
// Make sure the method has not slipped into the queues since
// last we checked; note that those checks were "fast bail-outs".
@@ -1119,7 +1165,7 @@ void CompileBroker::compile_method_base(methodHandle method,
nmethod* CompileBroker::compile_method(methodHandle method, int osr_bci,
int comp_level,
methodHandle hot_method, int hot_count,
- const char* comment, TRAPS) {
+ const char* comment, Thread* THREAD) {
// make sure arguments make sense
assert(method->method_holder()->klass_part()->oop_is_instance(), "not an instance method");
assert(osr_bci == InvocationEntryBci || (0 <= osr_bci && osr_bci < method->code_size()), "bci out of range");
@@ -1173,10 +1219,10 @@ nmethod* CompileBroker::compile_method(methodHandle method, int osr_bci,
assert(!HAS_PENDING_EXCEPTION, "No exception should be present");
// some prerequisites that are compiler specific
if (compiler(comp_level)->is_c2() || compiler(comp_level)->is_shark()) {
- method->constants()->resolve_string_constants(CHECK_0);
+ method->constants()->resolve_string_constants(CHECK_AND_CLEAR_NULL);
// Resolve all classes seen in the signature of the method
// we are compiling.
- methodOopDesc::load_signature_classes(method, CHECK_0);
+ methodOopDesc::load_signature_classes(method, CHECK_AND_CLEAR_NULL);
}
// If the method is native, do the lookup in the thread requesting
@@ -1230,7 +1276,7 @@ nmethod* CompileBroker::compile_method(methodHandle method, int osr_bci,
return NULL;
}
} else {
- compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, comment, CHECK_0);
+ compile_method_base(method, osr_bci, comp_level, hot_method, hot_count, comment, THREAD);
}
// return requested nmethod
@@ -1648,6 +1694,10 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
CompilerThread* thread = CompilerThread::current();
ResourceMark rm(thread);
+ if (LogEvents) {
+ _compilation_log->log_compile(thread, task);
+ }
+
// Common flags.
uint compile_id = task->compile_id();
int osr_bci = task->osr_bci();
@@ -1716,22 +1766,30 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
ci_env.record_method_not_compilable("compile failed", !TieredCompilation);
}
+ // Copy this bit to the enclosing block:
+ compilable = ci_env.compilable();
+
if (ci_env.failing()) {
- // Copy this bit to the enclosing block:
- compilable = ci_env.compilable();
+ const char* retry_message = ci_env.retry_message();
+ if (_compilation_log != NULL) {
+ _compilation_log->log_failure(thread, task, ci_env.failure_reason(), retry_message);
+ }
if (PrintCompilation) {
- const char* reason = ci_env.failure_reason();
- if (compilable == ciEnv::MethodCompilable_not_at_tier) {
- tty->print_cr("%4d COMPILE SKIPPED: %s (retry at different tier)", compile_id, reason);
- } else if (compilable == ciEnv::MethodCompilable_never) {
- tty->print_cr("%4d COMPILE SKIPPED: %s (not retryable)", compile_id, reason);
- } else if (compilable == ciEnv::MethodCompilable) {
- tty->print_cr("%4d COMPILE SKIPPED: %s", compile_id, reason);
+ tty->print("%4d COMPILE SKIPPED: %s", compile_id, ci_env.failure_reason());
+ if (retry_message != NULL) {
+ tty->print(" (%s)", retry_message);
}
+ tty->cr();
}
} else {
task->mark_success();
task->set_num_inlined_bytecodes(ci_env.num_inlined_bytecodes());
+ if (_compilation_log != NULL) {
+ nmethod* code = task->code();
+ if (code != NULL) {
+ _compilation_log->log_nmethod(thread, code);
+ }
+ }
}
}
pop_jni_handle_block();
diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp
index 7abc37e..1ee2c54 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.hpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -98,12 +98,16 @@ class CompileTask : public CHeapObj {
void set_prev(CompileTask* prev) { _prev = prev; }
private:
- static void print_compilation_impl(outputStream* st, methodOop method, int compile_id, int comp_level, bool is_osr_method = false, int osr_bci = -1, bool is_blocking = false, const char* msg = NULL);
+ static void print_compilation_impl(outputStream* st, methodOop method, int compile_id, int comp_level,
+ bool is_osr_method = false, int osr_bci = -1, bool is_blocking = false,
+ const char* msg = NULL, bool short_form = false);
public:
- void print_compilation(outputStream* st = tty);
+ void print_compilation(outputStream* st = tty, bool short_form = false);
static void print_compilation(outputStream* st, const nmethod* nm, const char* msg = NULL) {
- print_compilation_impl(st, nm->method(), nm->compile_id(), nm->comp_level(), nm->is_osr_method(), nm->is_osr_method() ? nm->osr_entry_bci() : -1, /*is_blocking*/ false, msg);
+ print_compilation_impl(st, nm->method(), nm->compile_id(), nm->comp_level(),
+ nm->is_osr_method(), nm->is_osr_method() ? nm->osr_entry_bci() : -1, /*is_blocking*/ false,
+ msg);
}
static void print_inlining(outputStream* st, ciMethod* method, int inline_level, int bci, const char* msg = NULL);
@@ -333,7 +337,7 @@ class CompileBroker: AllStatic {
methodHandle hot_method,
int hot_count,
const char* comment,
- TRAPS);
+ Thread* thread);
static CompileQueue* compile_queue(int comp_level) {
if (is_c2_compile(comp_level)) return _c2_method_queue;
if (is_c1_compile(comp_level)) return _c1_method_queue;
@@ -363,7 +367,7 @@ class CompileBroker: AllStatic {
int comp_level,
methodHandle hot_method,
int hot_count,
- const char* comment, TRAPS);
+ const char* comment, Thread* thread);
static void compiler_thread_loop();
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index 39b5734..ac8ac93 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -5594,6 +5594,7 @@ void CMSCollector::do_remark_parallel() {
GenCollectedHeap::StrongRootsScope srs(gch);
workers->run_task(&tsk);
} else {
+ ReferenceProcessorMTDiscoveryMutator mt(ref_processor(), false);
GenCollectedHeap::StrongRootsScope srs(gch);
tsk.work(0);
}
@@ -5608,6 +5609,8 @@ void CMSCollector::do_remark_non_parallel() {
ResourceMark rm;
HandleMark hm;
GenCollectedHeap* gch = GenCollectedHeap::heap();
+ ReferenceProcessorMTDiscoveryMutator mt(ref_processor(), false);
+
MarkRefsIntoAndScanClosure
mrias_cl(_span, ref_processor(), &_markBitMap, &_modUnionTable,
&_markStack, &_revisitStack, this,
@@ -6089,7 +6092,11 @@ void CMSCollector::sweep(bool asynch) {
_inter_sweep_timer.reset();
_inter_sweep_timer.start();
- update_time_of_last_gc(os::javaTimeMillis());
+ // We need to use a monotonically non-deccreasing time in ms
+ // or we will see time-warp warnings and os::javaTimeMillis()
+ // does not guarantee monotonicity.
+ jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
+ update_time_of_last_gc(now);
// NOTE on abstract state transitions:
// Mutators allocate-live and/or mark the mod-union table dirty
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp
index 78ca0cb..93c3df0 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -75,10 +75,25 @@ ConcurrentMarkSweepThread::ConcurrentMarkSweepThread(CMSCollector* collector)
set_name("Concurrent Mark-Sweep GC Thread");
if (os::create_thread(this, os::cgc_thread)) {
- // XXX: need to set this to low priority
- // unless "agressive mode" set; priority
- // should be just less than that of VMThread.
- os::set_priority(this, NearMaxPriority);
+ // An old comment here said: "Priority should be just less
+ // than that of VMThread". Since the VMThread runs at
+ // NearMaxPriority, the old comment was inaccurate, but
+ // changing the default priority to NearMaxPriority-1
+ // could change current behavior, so the default of
+ // NearMaxPriority stays in place.
+ //
+ // Note that there's a possibility of the VMThread
+ // starving if UseCriticalCMSThreadPriority is on.
+ // That won't happen on Solaris for various reasons,
+ // but may well happen on non-Solaris platforms.
+ int native_prio;
+ if (UseCriticalCMSThreadPriority) {
+ native_prio = os::java_to_os_priority[CriticalPriority];
+ } else {
+ native_prio = os::java_to_os_priority[NearMaxPriority];
+ }
+ os::set_native_priority(this, native_prio);
+
if (!DisableStartThread) {
os::start_thread(this);
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
index 354fefb..fb587ea 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,6 +48,8 @@ void CSetChooserCache::clear() {
#ifndef PRODUCT
bool CSetChooserCache::verify() {
+ guarantee(false, "CSetChooserCache::verify(): don't call this any more");
+
int index = _first;
HeapRegion *prev = NULL;
for (int i = 0; i < _occupancy; ++i) {
@@ -75,6 +77,8 @@ bool CSetChooserCache::verify() {
#endif // PRODUCT
void CSetChooserCache::insert(HeapRegion *hr) {
+ guarantee(false, "CSetChooserCache::insert(): don't call this any more");
+
assert(!is_full(), "cache should not be empty");
hr->calc_gc_efficiency();
@@ -104,6 +108,9 @@ void CSetChooserCache::insert(HeapRegion *hr) {
}
HeapRegion *CSetChooserCache::remove_first() {
+ guarantee(false, "CSetChooserCache::remove_first(): "
+ "don't call this any more");
+
if (_occupancy > 0) {
assert(_cache[_first] != NULL, "cache should have at least one region");
HeapRegion *ret = _cache[_first];
@@ -118,16 +125,35 @@ HeapRegion *CSetChooserCache::remove_first() {
}
}
-static inline int orderRegions(HeapRegion* hr1, HeapRegion* hr2) {
+// Even though we don't use the GC efficiency in our heuristics as
+// much as we used to, we still order according to GC efficiency. This
+// will cause regions with a lot of live objects and large RSets to
+// end up at the end of the array. Given that we might skip collecting
+// the last few old regions, if after a few mixed GCs the remaining
+// have reclaimable bytes under a certain threshold, the hope is that
+// the ones we'll skip are ones with both large RSets and a lot of
+// live objects, not the ones with just a lot of live objects if we
+// ordered according to the amount of reclaimable bytes per region.
+static int orderRegions(HeapRegion* hr1, HeapRegion* hr2) {
if (hr1 == NULL) {
- if (hr2 == NULL) return 0;
- else return 1;
+ if (hr2 == NULL) {
+ return 0;
+ } else {
+ return 1;
+ }
} else if (hr2 == NULL) {
return -1;
}
- if (hr2->gc_efficiency() < hr1->gc_efficiency()) return -1;
- else if (hr1->gc_efficiency() < hr2->gc_efficiency()) return 1;
- else return 0;
+
+ double gc_eff1 = hr1->gc_efficiency();
+ double gc_eff2 = hr2->gc_efficiency();
+ if (gc_eff1 > gc_eff2) {
+ return -1;
+ } if (gc_eff1 < gc_eff2) {
+ return 1;
+ } else {
+ return 0;
+ }
}
static int orderRegions(HeapRegion** hr1p, HeapRegion** hr2p) {
@@ -151,51 +177,61 @@ CollectionSetChooser::CollectionSetChooser() :
//
_markedRegions((ResourceObj::set_allocation_type((address)&_markedRegions,
ResourceObj::C_HEAP),
- 100),
- true),
- _curMarkedIndex(0),
- _numMarkedRegions(0),
- _unmarked_age_1_returned_as_new(false),
- _first_par_unreserved_idx(0)
-{}
-
-
+ 100), true /* C_Heap */),
+ _curr_index(0), _length(0),
+ _regionLiveThresholdBytes(0), _remainingReclaimableBytes(0),
+ _first_par_unreserved_idx(0) {
+ _regionLiveThresholdBytes =
+ HeapRegion::GrainBytes * (size_t) G1OldCSetRegionLiveThresholdPercent / 100;
+}
#ifndef PRODUCT
bool CollectionSetChooser::verify() {
+ guarantee(_length >= 0, err_msg("_length: %d", _length));
+ guarantee(0 <= _curr_index && _curr_index <= _length,
+ err_msg("_curr_index: %d _length: %d", _curr_index, _length));
int index = 0;
- guarantee(_curMarkedIndex <= _numMarkedRegions,
- "_curMarkedIndex should be within bounds");
- while (index < _curMarkedIndex) {
- guarantee(_markedRegions.at(index++) == NULL,
- "all entries before _curMarkedIndex should be NULL");
+ size_t sum_of_reclaimable_bytes = 0;
+ while (index < _curr_index) {
+ guarantee(_markedRegions.at(index) == NULL,
+ "all entries before _curr_index should be NULL");
+ index += 1;
}
HeapRegion *prev = NULL;
- while (index < _numMarkedRegions) {
+ while (index < _length) {
HeapRegion *curr = _markedRegions.at(index++);
guarantee(curr != NULL, "Regions in _markedRegions array cannot be NULL");
int si = curr->sort_index();
guarantee(!curr->is_young(), "should not be young!");
+ guarantee(!curr->isHumongous(), "should not be humongous!");
guarantee(si > -1 && si == (index-1), "sort index invariant");
if (prev != NULL) {
- guarantee(orderRegions(prev, curr) != 1, "regions should be sorted");
+ guarantee(orderRegions(prev, curr) != 1,
+ err_msg("GC eff prev: %1.4f GC eff curr: %1.4f",
+ prev->gc_efficiency(), curr->gc_efficiency()));
}
+ sum_of_reclaimable_bytes += curr->reclaimable_bytes();
prev = curr;
}
- return _cache.verify();
+ guarantee(sum_of_reclaimable_bytes == _remainingReclaimableBytes,
+ err_msg("reclaimable bytes inconsistent, "
+ "remaining: "SIZE_FORMAT" sum: "SIZE_FORMAT,
+ _remainingReclaimableBytes, sum_of_reclaimable_bytes));
+ return true;
}
#endif
-void
-CollectionSetChooser::fillCache() {
- while (!_cache.is_full() && (_curMarkedIndex < _numMarkedRegions)) {
- HeapRegion* hr = _markedRegions.at(_curMarkedIndex);
+void CollectionSetChooser::fillCache() {
+ guarantee(false, "fillCache: don't call this any more");
+
+ while (!_cache.is_full() && (_curr_index < _length)) {
+ HeapRegion* hr = _markedRegions.at(_curr_index);
assert(hr != NULL,
err_msg("Unexpected NULL hr in _markedRegions at index %d",
- _curMarkedIndex));
- _curMarkedIndex += 1;
+ _curr_index));
+ _curr_index += 1;
assert(!hr->is_young(), "should not be young!");
- assert(hr->sort_index() == _curMarkedIndex-1, "sort_index invariant");
+ assert(hr->sort_index() == _curr_index-1, "sort_index invariant");
_markedRegions.at_put(hr->sort_index(), NULL);
_cache.insert(hr);
assert(!_cache.is_empty(), "cache should not be empty");
@@ -203,9 +239,7 @@ CollectionSetChooser::fillCache() {
assert(verify(), "cache should be consistent");
}
-void
-CollectionSetChooser::sortMarkedHeapRegions() {
- guarantee(_cache.is_empty(), "cache should be empty");
+void CollectionSetChooser::sortMarkedHeapRegions() {
// First trim any unused portion of the top in the parallel case.
if (_first_par_unreserved_idx > 0) {
if (G1PrintParCleanupStats) {
@@ -217,43 +251,78 @@ CollectionSetChooser::sortMarkedHeapRegions() {
_markedRegions.trunc_to(_first_par_unreserved_idx);
}
_markedRegions.sort(orderRegions);
- assert(_numMarkedRegions <= _markedRegions.length(), "Requirement");
- assert(_numMarkedRegions == 0
- || _markedRegions.at(_numMarkedRegions-1) != NULL,
- "Testing _numMarkedRegions");
- assert(_numMarkedRegions == _markedRegions.length()
- || _markedRegions.at(_numMarkedRegions) == NULL,
- "Testing _numMarkedRegions");
+ assert(_length <= _markedRegions.length(), "Requirement");
+ assert(_length == 0 || _markedRegions.at(_length - 1) != NULL,
+ "Testing _length");
+ assert(_length == _markedRegions.length() ||
+ _markedRegions.at(_length) == NULL, "Testing _length");
if (G1PrintParCleanupStats) {
- gclog_or_tty->print_cr(" Sorted %d marked regions.", _numMarkedRegions);
+ gclog_or_tty->print_cr(" Sorted %d marked regions.", _length);
}
- for (int i = 0; i < _numMarkedRegions; i++) {
+ for (int i = 0; i < _length; i++) {
assert(_markedRegions.at(i) != NULL, "Should be true by sorting!");
_markedRegions.at(i)->set_sort_index(i);
}
if (G1PrintRegionLivenessInfo) {
G1PrintRegionLivenessInfoClosure cl(gclog_or_tty, "Post-Sorting");
- for (int i = 0; i < _numMarkedRegions; ++i) {
+ for (int i = 0; i < _length; ++i) {
HeapRegion* r = _markedRegions.at(i);
cl.doHeapRegion(r);
}
}
- assert(verify(), "should now be sorted");
+ assert(verify(), "CSet chooser verification");
+}
+
+size_t CollectionSetChooser::calcMinOldCSetLength() {
+ // The min old CSet region bound is based on the maximum desired
+ // number of mixed GCs after a cycle. I.e., even if some old regions
+ // look expensive, we should add them to the CSet anyway to make
+ // sure we go through the available old regions in no more than the
+ // maximum desired number of mixed GCs.
+ //
+ // The calculation is based on the number of marked regions we added
+ // to the CSet chooser in the first place, not how many remain, so
+ // that the result is the same during all mixed GCs that follow a cycle.
+
+ const size_t region_num = (size_t) _length;
+ const size_t gc_num = (size_t) G1MaxMixedGCNum;
+ size_t result = region_num / gc_num;
+ // emulate ceiling
+ if (result * gc_num < region_num) {
+ result += 1;
+ }
+ return result;
}
-void
-CollectionSetChooser::addMarkedHeapRegion(HeapRegion* hr) {
+size_t CollectionSetChooser::calcMaxOldCSetLength() {
+ // The max old CSet region bound is based on the threshold expressed
+ // as a percentage of the heap size. I.e., it should bound the
+ // number of old regions added to the CSet irrespective of how many
+ // of them are available.
+
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+ const size_t region_num = g1h->n_regions();
+ const size_t perc = (size_t) G1OldCSetRegionThresholdPercent;
+ size_t result = region_num * perc / 100;
+ // emulate ceiling
+ if (100 * result < region_num * perc) {
+ result += 1;
+ }
+ return result;
+}
+
+void CollectionSetChooser::addMarkedHeapRegion(HeapRegion* hr) {
assert(!hr->isHumongous(),
"Humongous regions shouldn't be added to the collection set");
assert(!hr->is_young(), "should not be young!");
_markedRegions.append(hr);
- _numMarkedRegions++;
+ _length++;
+ _remainingReclaimableBytes += hr->reclaimable_bytes();
hr->calc_gc_efficiency();
}
-void
-CollectionSetChooser::
-prepareForAddMarkedHeapRegionsPar(size_t n_regions, size_t chunkSize) {
+void CollectionSetChooser::prepareForAddMarkedHeapRegionsPar(size_t n_regions,
+ size_t chunkSize) {
_first_par_unreserved_idx = 0;
int n_threads = ParallelGCThreads;
if (UseDynamicNumberOfGCThreads) {
@@ -274,8 +343,7 @@ prepareForAddMarkedHeapRegionsPar(size_t n_regions, size_t chunkSize) {
_markedRegions.at_put_grow((int)(aligned_n_regions + max_waste - 1), NULL);
}
-jint
-CollectionSetChooser::getParMarkedHeapRegionChunk(jint n_regions) {
+jint CollectionSetChooser::getParMarkedHeapRegionChunk(jint n_regions) {
// Don't do this assert because this can be called at a point
// where the loop up stream will not execute again but might
// try to claim more chunks (loop test has not been done yet).
@@ -287,83 +355,37 @@ CollectionSetChooser::getParMarkedHeapRegionChunk(jint n_regions) {
return res - n_regions;
}
-void
-CollectionSetChooser::setMarkedHeapRegion(jint index, HeapRegion* hr) {
+void CollectionSetChooser::setMarkedHeapRegion(jint index, HeapRegion* hr) {
assert(_markedRegions.at(index) == NULL, "precondition");
assert(!hr->is_young(), "should not be young!");
_markedRegions.at_put(index, hr);
hr->calc_gc_efficiency();
}
-void
-CollectionSetChooser::incNumMarkedHeapRegions(jint inc_by) {
- (void)Atomic::add(inc_by, &_numMarkedRegions);
+void CollectionSetChooser::updateTotals(jint region_num,
+ size_t reclaimable_bytes) {
+ // Only take the lock if we actually need to update the totals.
+ if (region_num > 0) {
+ assert(reclaimable_bytes > 0, "invariant");
+ // We could have just used atomics instead of taking the
+ // lock. However, we currently don't have an atomic add for size_t.
+ MutexLockerEx x(ParGCRareEvent_lock, Mutex::_no_safepoint_check_flag);
+ _length += (int) region_num;
+ _remainingReclaimableBytes += reclaimable_bytes;
+ } else {
+ assert(reclaimable_bytes == 0, "invariant");
+ }
}
-void
-CollectionSetChooser::clearMarkedHeapRegions(){
+void CollectionSetChooser::clearMarkedHeapRegions() {
for (int i = 0; i < _markedRegions.length(); i++) {
- HeapRegion* r = _markedRegions.at(i);
- if (r != NULL) r->set_sort_index(-1);
+ HeapRegion* r = _markedRegions.at(i);
+ if (r != NULL) {
+ r->set_sort_index(-1);
+ }
}
_markedRegions.clear();
- _curMarkedIndex = 0;
- _numMarkedRegions = 0;
- _cache.clear();
+ _curr_index = 0;
+ _length = 0;
+ _remainingReclaimableBytes = 0;
};
-
-void
-CollectionSetChooser::updateAfterFullCollection() {
- clearMarkedHeapRegions();
-}
-
-// if time_remaining < 0.0, then this method should try to return
-// a region, whether it fits within the remaining time or not
-HeapRegion*
-CollectionSetChooser::getNextMarkedRegion(double time_remaining,
- double avg_prediction) {
- G1CollectedHeap* g1h = G1CollectedHeap::heap();
- G1CollectorPolicy* g1p = g1h->g1_policy();
- fillCache();
- if (_cache.is_empty()) {
- assert(_curMarkedIndex == _numMarkedRegions,
- "if cache is empty, list should also be empty");
- ergo_verbose0(ErgoCSetConstruction,
- "stop adding old regions to CSet",
- ergo_format_reason("cache is empty"));
- return NULL;
- }
-
- HeapRegion *hr = _cache.get_first();
- assert(hr != NULL, "if cache not empty, first entry should be non-null");
- double predicted_time = g1h->predict_region_elapsed_time_ms(hr, false);
-
- if (g1p->adaptive_young_list_length()) {
- if (time_remaining - predicted_time < 0.0) {
- g1h->check_if_region_is_too_expensive(predicted_time);
- ergo_verbose2(ErgoCSetConstruction,
- "stop adding old regions to CSet",
- ergo_format_reason("predicted old region time higher than remaining time")
- ergo_format_ms("predicted old region time")
- ergo_format_ms("remaining time"),
- predicted_time, time_remaining);
- return NULL;
- }
- } else {
- double threshold = 2.0 * avg_prediction;
- if (predicted_time > threshold) {
- ergo_verbose2(ErgoCSetConstruction,
- "stop adding old regions to CSet",
- ergo_format_reason("predicted old region time higher than threshold")
- ergo_format_ms("predicted old region time")
- ergo_format_ms("threshold"),
- predicted_time, threshold);
- return NULL;
- }
- }
-
- HeapRegion *hr2 = _cache.remove_first();
- assert(hr == hr2, "cache contents should not have changed");
-
- return hr;
-}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
index ff4bca9..3bf90eb 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,28 +28,6 @@
#include "gc_implementation/g1/heapRegion.hpp"
#include "utilities/growableArray.hpp"
-// We need to sort heap regions by collection desirability.
-// This sorting is currently done in two "stages". An initial sort is
-// done following a cleanup pause as soon as all of the marked but
-// non-empty regions have been identified and the completely empty
-// ones reclaimed.
-// This gives us a global sort on a GC efficiency metric
-// based on predictive data available at that time. However,
-// any of these regions that are collected will only be collected
-// during a future GC pause, by which time it is possible that newer
-// data might allow us to revise and/or refine the earlier
-// pause predictions, leading to changes in expected gc efficiency
-// order. To somewhat mitigate this obsolescence, more so in the
-// case of regions towards the end of the list, which will be
-// picked later, these pre-sorted regions from the _markedRegions
-// array are not used as is, but a small prefix thereof is
-// insertion-sorted again into a small cache, based on more
-// recent remembered set information. Regions are then drawn
-// from this cache to construct the collection set at each
-// incremental GC.
-// This scheme and/or its implementation may be subject to
-// revision in the future.
-
class CSetChooserCache VALUE_OBJ_CLASS_SPEC {
private:
enum {
@@ -103,24 +81,82 @@ public:
class CollectionSetChooser: public CHeapObj {
GrowableArray<HeapRegion*> _markedRegions;
- int _curMarkedIndex;
- int _numMarkedRegions;
- CSetChooserCache _cache;
- // True iff last collection pause ran of out new "age 0" regions, and
- // returned an "age 1" region.
- bool _unmarked_age_1_returned_as_new;
+ // The index of the next candidate old region to be considered for
+ // addition to the CSet.
+ int _curr_index;
+ // The number of candidate old regions added to the CSet chooser.
+ int _length;
+
+ CSetChooserCache _cache;
jint _first_par_unreserved_idx;
+ // If a region has more live bytes than this threshold, it will not
+ // be added to the CSet chooser and will not be a candidate for
+ // collection.
+ size_t _regionLiveThresholdBytes;
+
+ // The sum of reclaimable bytes over all the regions in the CSet chooser.
+ size_t _remainingReclaimableBytes;
+
public:
- HeapRegion* getNextMarkedRegion(double time_so_far, double avg_prediction);
+ // Return the current candidate region to be considered for
+ // collection without removing it from the CSet chooser.
+ HeapRegion* peek() {
+ HeapRegion* res = NULL;
+ if (_curr_index < _length) {
+ res = _markedRegions.at(_curr_index);
+ assert(res != NULL,
+ err_msg("Unexpected NULL hr in _markedRegions at index %d",
+ _curr_index));
+ }
+ return res;
+ }
+
+ // Remove the given region from the CSet chooser and move to the
+ // next one. The given region should be the current candidate region
+ // in the CSet chooser.
+ void remove_and_move_to_next(HeapRegion* hr) {
+ assert(hr != NULL, "pre-condition");
+ assert(_curr_index < _length, "pre-condition");
+ assert(_markedRegions.at(_curr_index) == hr, "pre-condition");
+ hr->set_sort_index(-1);
+ _markedRegions.at_put(_curr_index, NULL);
+ assert(hr->reclaimable_bytes() <= _remainingReclaimableBytes,
+ err_msg("remaining reclaimable bytes inconsistent "
+ "from region: "SIZE_FORMAT" remaining: "SIZE_FORMAT,
+ hr->reclaimable_bytes(), _remainingReclaimableBytes));
+ _remainingReclaimableBytes -= hr->reclaimable_bytes();
+ _curr_index += 1;
+ }
CollectionSetChooser();
void sortMarkedHeapRegions();
void fillCache();
+
+ // Determine whether to add the given region to the CSet chooser or
+ // not. Currently, we skip humongous regions (we never add them to
+ // the CSet, we only reclaim them during cleanup) and regions whose
+ // live bytes are over the threshold.
+ bool shouldAdd(HeapRegion* hr) {
+ assert(hr->is_marked(), "pre-condition");
+ assert(!hr->is_young(), "should never consider young regions");
+ return !hr->isHumongous() &&
+ hr->live_bytes() < _regionLiveThresholdBytes;
+ }
+
+ // Calculate the minimum number of old regions we'll add to the CSet
+ // during a mixed GC.
+ size_t calcMinOldCSetLength();
+
+ // Calculate the maximum number of old regions we'll add to the CSet
+ // during a mixed GC.
+ size_t calcMaxOldCSetLength();
+
+ // Serial version.
void addMarkedHeapRegion(HeapRegion *hr);
// Must be called before calls to getParMarkedHeapRegionChunk.
@@ -133,14 +169,21 @@ public:
// Set the marked array entry at index to hr. Careful to claim the index
// first if in parallel.
void setMarkedHeapRegion(jint index, HeapRegion* hr);
- // Atomically increment the number of claimed regions by "inc_by".
- void incNumMarkedHeapRegions(jint inc_by);
+ // Atomically increment the number of added regions by region_num
+ // and the amount of reclaimable bytes by reclaimable_bytes.
+ void updateTotals(jint region_num, size_t reclaimable_bytes);
void clearMarkedHeapRegions();
- void updateAfterFullCollection();
+ // Return the number of candidate regions that remain to be collected.
+ size_t remainingRegions() { return _length - _curr_index; }
+
+ // Determine whether the CSet chooser has more candidate regions or not.
+ bool isEmpty() { return remainingRegions() == 0; }
- bool unmarked_age_1_returned_as_new() { return _unmarked_age_1_returned_as_new; }
+ // Return the reclaimable bytes that remain to be collected on
+ // all the candidate regions in the CSet chooser.
+ size_t remainingReclaimableBytes () { return _remainingReclaimableBytes; }
// Returns true if the used portion of "_markedRegions" is properly
// sorted, otherwise asserts false.
@@ -148,9 +191,17 @@ public:
bool verify(void);
bool regionProperlyOrdered(HeapRegion* r) {
int si = r->sort_index();
- return (si == -1) ||
- (si > -1 && _markedRegions.at(si) == r) ||
- (si < -1 && _cache.region_in_cache(r));
+ if (si > -1) {
+ guarantee(_curr_index <= si && si < _length,
+ err_msg("curr: %d sort index: %d: length: %d",
+ _curr_index, si, _length));
+ guarantee(_markedRegions.at(si) == r,
+ err_msg("sort index: %d at: "PTR_FORMAT" r: "PTR_FORMAT,
+ si, _markedRegions.at(si), r));
+ } else {
+ guarantee(si == -1, err_msg("sort index: %d", si));
+ }
+ return true;
}
#endif
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index 4712d80..001f94e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -42,8 +42,7 @@
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
-//
-// CMS Bit Map Wrapper
+// Concurrent marking bit map wrapper
CMBitMapRO::CMBitMapRO(ReservedSpace rs, int shifter) :
_bm((uintptr_t*)NULL,0),
@@ -53,13 +52,13 @@ CMBitMapRO::CMBitMapRO(ReservedSpace rs, int shifter) :
ReservedSpace brs(ReservedSpace::allocation_align_size_up(
(_bmWordSize >> (_shifter + LogBitsPerByte)) + 1));
- guarantee(brs.is_reserved(), "couldn't allocate CMS bit map");
+ guarantee(brs.is_reserved(), "couldn't allocate concurrent marking bit map");
// For now we'll just commit all of the bit map up fromt.
// Later on we'll try to be more parsimonious with swap.
guarantee(_virtual_space.initialize(brs, brs.size()),
- "couldn't reseve backing store for CMS bit map");
+ "couldn't reseve backing store for concurrent marking bit map");
assert(_virtual_space.committed_size() == brs.size(),
- "didn't reserve backing store for all of CMS bit map?");
+ "didn't reserve backing store for all of concurrent marking bit map?");
_bm.set_map((uintptr_t*)_virtual_space.low());
assert(_virtual_space.committed_size() << (_shifter + LogBitsPerByte) >=
_bmWordSize, "inconsistency in bit map sizing");
@@ -104,17 +103,6 @@ int CMBitMapRO::heapWordDiffToOffsetDiff(size_t diff) const {
return (int) (diff >> _shifter);
}
-bool CMBitMapRO::iterate(BitMapClosure* cl, MemRegion mr) {
- HeapWord* left = MAX2(_bmStartWord, mr.start());
- HeapWord* right = MIN2(_bmStartWord + _bmWordSize, mr.end());
- if (right > left) {
- // Right-open interval [leftOffset, rightOffset).
- return _bm.iterate(cl, heapWordToOffset(left), heapWordToOffset(right));
- } else {
- return true;
- }
-}
-
void CMBitMapRO::mostly_disjoint_range_union(BitMap* from_bitmap,
size_t from_start_index,
HeapWord* to_start_word,
@@ -431,8 +419,6 @@ bool CMMarkStack::drain(OopClosureClass* cl, CMBitMap* bm, bool yield_after) {
assert(newOop->is_oop(), "Expected an oop");
assert(bm == NULL || bm->isMarked((HeapWord*)newOop),
"only grey objects on this stack");
- // iterate over the oops in this oop, marking and pushing
- // the ones in CMS generation.
newOop->oop_iterate(cl);
if (yield_after && _cm->do_yield_check()) {
res = false;
@@ -474,6 +460,84 @@ bool ConcurrentMark::not_yet_marked(oop obj) const {
&& !nextMarkBitMap()->isMarked((HeapWord*)obj)));
}
+CMRootRegions::CMRootRegions() :
+ _young_list(NULL), _cm(NULL), _scan_in_progress(false),
+ _should_abort(false), _next_survivor(NULL) { }
+
+void CMRootRegions::init(G1CollectedHeap* g1h, ConcurrentMark* cm) {
+ _young_list = g1h->young_list();
+ _cm = cm;
+}
+
+void CMRootRegions::prepare_for_scan() {
+ assert(!scan_in_progress(), "pre-condition");
+
+ // Currently, only survivors can be root regions.
+ assert(_next_survivor == NULL, "pre-condition");
+ _next_survivor = _young_list->first_survivor_region();
+ _scan_in_progress = (_next_survivor != NULL);
+ _should_abort = false;
+}
+
+HeapRegion* CMRootRegions::claim_next() {
+ if (_should_abort) {
+ // If someone has set the should_abort flag, we return NULL to
+ // force the caller to bail out of their loop.
+ return NULL;
+ }
+
+ // Currently, only survivors can be root regions.
+ HeapRegion* res = _next_survivor;
+ if (res != NULL) {
+ MutexLockerEx x(RootRegionScan_lock, Mutex::_no_safepoint_check_flag);
+ // Read it again in case it changed while we were waiting for the lock.
+ res = _next_survivor;
+ if (res != NULL) {
+ if (res == _young_list->last_survivor_region()) {
+ // We just claimed the last survivor so store NULL to indicate
+ // that we're done.
+ _next_survivor = NULL;
+ } else {
+ _next_survivor = res->get_next_young_region();
+ }
+ } else {
+ // Someone else claimed the last survivor while we were trying
+ // to take the lock so nothing else to do.
+ }
+ }
+ assert(res == NULL || res->is_survivor(), "post-condition");
+
+ return res;
+}
+
+void CMRootRegions::scan_finished() {
+ assert(scan_in_progress(), "pre-condition");
+
+ // Currently, only survivors can be root regions.
+ if (!_should_abort) {
+ assert(_next_survivor == NULL, "we should have claimed all survivors");
+ }
+ _next_survivor = NULL;
+
+ {
+ MutexLockerEx x(RootRegionScan_lock, Mutex::_no_safepoint_check_flag);
+ _scan_in_progress = false;
+ RootRegionScan_lock->notify_all();
+ }
+}
+
+bool CMRootRegions::wait_until_scan_finished() {
+ if (!scan_in_progress()) return false;
+
+ {
+ MutexLockerEx x(RootRegionScan_lock, Mutex::_no_safepoint_check_flag);
+ while (scan_in_progress()) {
+ RootRegionScan_lock->wait(Mutex::_no_safepoint_check_flag);
+ }
+ }
+ return true;
+}
+
#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
#endif // _MSC_VER
@@ -498,6 +562,7 @@ ConcurrentMark::ConcurrentMark(ReservedSpace rs,
_card_bm((rs.size() + CardTableModRefBS::card_size - 1) >>
CardTableModRefBS::card_shift,
false /* in_resource_area*/),
+
_prevMarkBitMap(&_markBitMap1),
_nextMarkBitMap(&_markBitMap2),
_at_least_one_mark_complete(false),
@@ -526,7 +591,11 @@ ConcurrentMark::ConcurrentMark(ReservedSpace rs,
_cleanup_times(),
_total_counting_time(0.0),
_total_rs_scrub_time(0.0),
- _parallel_workers(NULL) {
+
+ _parallel_workers(NULL),
+
+ _count_card_bitmaps(NULL),
+ _count_marked_bytes(NULL) {
CMVerboseLevel verbose_level = (CMVerboseLevel) G1MarkingVerboseLevel;
if (verbose_level < no_verbose) {
verbose_level = no_verbose;
@@ -557,9 +626,16 @@ ConcurrentMark::ConcurrentMark(ReservedSpace rs,
SATBMarkQueueSet& satb_qs = JavaThread::satb_mark_queue_set();
satb_qs.set_buffer_size(G1SATBBufferSize);
+ _root_regions.init(_g1h, this);
+
_tasks = NEW_C_HEAP_ARRAY(CMTask*, _max_task_num);
_accum_task_vtime = NEW_C_HEAP_ARRAY(double, _max_task_num);
+ _count_card_bitmaps = NEW_C_HEAP_ARRAY(BitMap, _max_task_num);
+ _count_marked_bytes = NEW_C_HEAP_ARRAY(size_t*, _max_task_num);
+
+ BitMap::idx_t card_bm_size = _card_bm.size();
+
// so that the assertion in MarkingTaskQueue::task_queue doesn't fail
_active_tasks = _max_task_num;
for (int i = 0; i < (int) _max_task_num; ++i) {
@@ -567,10 +643,26 @@ ConcurrentMark::ConcurrentMark(ReservedSpace rs,
task_queue->initialize();
_task_queues->register_queue(i, task_queue);
- _tasks[i] = new CMTask(i, this, task_queue, _task_queues);
+ _count_card_bitmaps[i] = BitMap(card_bm_size, false);
+ _count_marked_bytes[i] = NEW_C_HEAP_ARRAY(size_t, max_regions);
+
+ _tasks[i] = new CMTask(i, this,
+ _count_marked_bytes[i],
+ &_count_card_bitmaps[i],
+ task_queue, _task_queues);
+
_accum_task_vtime[i] = 0.0;
}
+ // Calculate the card number for the bottom of the heap. Used
+ // in biasing indexes into the accounting card bitmaps.
+ _heap_bottom_card_num =
+ intptr_t(uintptr_t(_g1h->reserved_region().start()) >>
+ CardTableModRefBS::card_shift);
+
+ // Clear all the liveness counting data
+ clear_all_count_data();
+
if (ConcGCThreads > ParallelGCThreads) {
vm_exit_during_initialization("Can't have more ConcGCThreads "
"than ParallelGCThreads.");
@@ -750,11 +842,6 @@ ConcurrentMark::~ConcurrentMark() {
ShouldNotReachHere();
}
-// This closure is used to mark refs into the g1 generation
-// from external roots in the CMS bit map.
-// Called at the first checkpoint.
-//
-
void ConcurrentMark::clearNextBitmap() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
G1CollectorPolicy* g1p = g1h->g1_policy();
@@ -794,6 +881,9 @@ void ConcurrentMark::clearNextBitmap() {
assert(!g1h->mark_in_progress(), "invariant");
}
+ // Clear the liveness counting data
+ clear_all_count_data();
+
// Repeat the asserts from above.
guarantee(cmThread()->during_cycle(), "invariant");
guarantee(!g1h->mark_in_progress(), "invariant");
@@ -854,6 +944,8 @@ void ConcurrentMark::checkpointRootsInitialPost() {
satb_mq_set.set_active_all_threads(true, /* new active value */
false /* expected_active */);
+ _root_regions.prepare_for_scan();
+
// update_g1_committed() will be called at the end of an evac pause
// when marking is on. So, it's also called at the end of the
// initial-mark pause to update the heap end, if the heap expands
@@ -1147,6 +1239,69 @@ uint ConcurrentMark::calc_parallel_marking_threads() {
return 0;
}
+void ConcurrentMark::scanRootRegion(HeapRegion* hr, uint worker_id) {
+ // Currently, only survivors can be root regions.
+ assert(hr->next_top_at_mark_start() == hr->bottom(), "invariant");
+ G1RootRegionScanClosure cl(_g1h, this, worker_id);
+
+ const uintx interval = PrefetchScanIntervalInBytes;
+ HeapWord* curr = hr->bottom();
+ const HeapWord* end = hr->top();
+ while (curr < end) {
+ Prefetch::read(curr, interval);
+ oop obj = oop(curr);
+ int size = obj->oop_iterate(&cl);
+ assert(size == obj->size(), "sanity");
+ curr += size;
+ }
+}
+
+class CMRootRegionScanTask : public AbstractGangTask {
+private:
+ ConcurrentMark* _cm;
+
+public:
+ CMRootRegionScanTask(ConcurrentMark* cm) :
+ AbstractGangTask("Root Region Scan"), _cm(cm) { }
+
+ void work(uint worker_id) {
+ assert(Thread::current()->is_ConcurrentGC_thread(),
+ "this should only be done by a conc GC thread");
+
+ CMRootRegions* root_regions = _cm->root_regions();
+ HeapRegion* hr = root_regions->claim_next();
+ while (hr != NULL) {
+ _cm->scanRootRegion(hr, worker_id);
+ hr = root_regions->claim_next();
+ }
+ }
+};
+
+void ConcurrentMark::scanRootRegions() {
+ // scan_in_progress() will have been set to true only if there was
+ // at least one root region to scan. So, if it's false, we
+ // should not attempt to do any further work.
+ if (root_regions()->scan_in_progress()) {
+ _parallel_marking_threads = calc_parallel_marking_threads();
+ assert(parallel_marking_threads() <= max_parallel_marking_threads(),
+ "Maximum number of marking threads exceeded");
+ uint active_workers = MAX2(1U, parallel_marking_threads());
+
+ CMRootRegionScanTask task(this);
+ if (parallel_marking_threads() > 0) {
+ _parallel_workers->set_active_workers((int) active_workers);
+ _parallel_workers->run_task(&task);
+ } else {
+ task.work(0);
+ }
+
+ // It's possible that has_aborted() is true here without actually
+ // aborting the survivor scan earlier. This is OK as it's
+ // mainly used for sanity checking.
+ root_regions()->scan_finished();
+ }
+}
+
void ConcurrentMark::markFromRoots() {
// we might be tempted to assert that:
// assert(asynch == !SafepointSynchronize::is_at_safepoint(),
@@ -1225,6 +1380,10 @@ void ConcurrentMark::checkpointRootsFinal(bool clear_all_soft_refs) {
gclog_or_tty->print_cr("\nRemark led to restart for overflow.");
}
} else {
+ // Aggregate the per-task counting data that we have accumulated
+ // while marking.
+ aggregate_count_data();
+
SATBMarkQueueSet& satb_mq_set = JavaThread::satb_mark_queue_set();
// We're done with marking.
// This is the end of the marking cycle, we're expected all
@@ -1262,48 +1421,41 @@ void ConcurrentMark::checkpointRootsFinal(bool clear_all_soft_refs) {
g1p->record_concurrent_mark_remark_end();
}
-#define CARD_BM_TEST_MODE 0
-
+// Used to calculate the # live objects per region
+// for verification purposes
class CalcLiveObjectsClosure: public HeapRegionClosure {
CMBitMapRO* _bm;
ConcurrentMark* _cm;
- bool _changed;
- bool _yield;
- size_t _words_done;
+ BitMap* _region_bm;
+ BitMap* _card_bm;
+
+ // Debugging
+ size_t _tot_words_done;
size_t _tot_live;
size_t _tot_used;
- size_t _regions_done;
- double _start_vtime_sec;
- BitMap* _region_bm;
- BitMap* _card_bm;
+ size_t _region_marked_bytes;
+
intptr_t _bottom_card_num;
- bool _final;
void mark_card_num_range(intptr_t start_card_num, intptr_t last_card_num) {
- for (intptr_t i = start_card_num; i <= last_card_num; i++) {
-#if CARD_BM_TEST_MODE
- guarantee(_card_bm->at(i - _bottom_card_num), "Should already be set.");
-#else
- _card_bm->par_at_put(i - _bottom_card_num, 1);
-#endif
+ assert(start_card_num <= last_card_num, "sanity");
+ BitMap::idx_t start_idx = start_card_num - _bottom_card_num;
+ BitMap::idx_t last_idx = last_card_num - _bottom_card_num;
+
+ for (BitMap::idx_t i = start_idx; i <= last_idx; i += 1) {
+ _card_bm->par_at_put(i, 1);
}
}
public:
- CalcLiveObjectsClosure(bool final,
- CMBitMapRO *bm, ConcurrentMark *cm,
+ CalcLiveObjectsClosure(CMBitMapRO *bm, ConcurrentMark *cm,
BitMap* region_bm, BitMap* card_bm) :
- _bm(bm), _cm(cm), _changed(false), _yield(true),
- _words_done(0), _tot_live(0), _tot_used(0),
- _region_bm(region_bm), _card_bm(card_bm),_final(final),
- _regions_done(0), _start_vtime_sec(0.0)
- {
- _bottom_card_num =
- intptr_t(uintptr_t(G1CollectedHeap::heap()->reserved_region().start()) >>
- CardTableModRefBS::card_shift);
- }
+ _bm(bm), _cm(cm), _region_bm(region_bm), _card_bm(card_bm),
+ _region_marked_bytes(0), _tot_words_done(0),
+ _tot_live(0), _tot_used(0),
+ _bottom_card_num(cm->heap_bottom_card_num()) { }
// It takes a region that's not empty (i.e., it has at least one
// live object in it and sets its corresponding bit on the region
@@ -1319,29 +1471,16 @@ public:
_region_bm->par_at_put((BitMap::idx_t) index, true);
} else {
// Starts humongous case: calculate how many regions are part of
- // this humongous region and then set the bit range. It might
- // have been a bit more efficient to look at the object that
- // spans these humongous regions to calculate their number from
- // the object's size. However, it's a good idea to calculate
- // this based on the metadata itself, and not the region
- // contents, so that this code is not aware of what goes into
- // the humongous regions (in case this changes in the future).
+ // this humongous region and then set the bit range.
G1CollectedHeap* g1h = G1CollectedHeap::heap();
- size_t end_index = index + 1;
- while (end_index < g1h->n_regions()) {
- HeapRegion* chr = g1h->region_at(end_index);
- if (!chr->continuesHumongous()) break;
- end_index += 1;
- }
+ HeapRegion *last_hr = g1h->heap_region_containing_raw(hr->end() - 1);
+ size_t end_index = last_hr->hrs_index() + 1;
_region_bm->par_at_put_range((BitMap::idx_t) index,
(BitMap::idx_t) end_index, true);
}
}
bool doHeapRegion(HeapRegion* hr) {
- if (!_final && _regions_done == 0) {
- _start_vtime_sec = os::elapsedVTime();
- }
if (hr->continuesHumongous()) {
// We will ignore these here and process them when their
@@ -1355,48 +1494,41 @@ public:
}
HeapWord* nextTop = hr->next_top_at_mark_start();
- HeapWord* start = hr->top_at_conc_mark_count();
- assert(hr->bottom() <= start && start <= hr->end() &&
- hr->bottom() <= nextTop && nextTop <= hr->end() &&
- start <= nextTop,
- "Preconditions.");
- // Otherwise, record the number of word's we'll examine.
+ HeapWord* start = hr->bottom();
+
+ assert(start <= hr->end() && start <= nextTop && nextTop <= hr->end(),
+ err_msg("Preconditions not met - "
+ "start: "PTR_FORMAT", nextTop: "PTR_FORMAT", end: "PTR_FORMAT,
+ start, nextTop, hr->end()));
+
+ // Record the number of word's we'll examine.
size_t words_done = (nextTop - start);
+
// Find the first marked object at or after "start".
start = _bm->getNextMarkedWordAddress(start, nextTop);
+
size_t marked_bytes = 0;
// Below, the term "card num" means the result of shifting an address
// by the card shift -- address 0 corresponds to card number 0. One
// must subtract the card num of the bottom of the heap to obtain a
// card table index.
+
// The first card num of the sequence of live cards currently being
// constructed. -1 ==> no sequence.
intptr_t start_card_num = -1;
+
// The last card num of the sequence of live cards currently being
// constructed. -1 ==> no sequence.
intptr_t last_card_num = -1;
while (start < nextTop) {
- if (_yield && _cm->do_yield_check()) {
- // We yielded. It might be for a full collection, in which case
- // all bets are off; terminate the traversal.
- if (_cm->has_aborted()) {
- _changed = false;
- return true;
- } else {
- // Otherwise, it might be a collection pause, and the region
- // we're looking at might be in the collection set. We'll
- // abandon this region.
- return false;
- }
- }
oop obj = oop(start);
int obj_sz = obj->size();
+
// The card num of the start of the current object.
intptr_t obj_card_num =
intptr_t(uintptr_t(start) >> CardTableModRefBS::card_shift);
-
HeapWord* obj_last = start + obj_sz - 1;
intptr_t obj_last_card_num =
intptr_t(uintptr_t(obj_last) >> CardTableModRefBS::card_shift);
@@ -1414,110 +1546,404 @@ public:
start_card_num = obj_card_num;
}
}
-#if CARD_BM_TEST_MODE
- /*
- gclog_or_tty->print_cr("Setting bits from %d/%d.",
- obj_card_num - _bottom_card_num,
- obj_last_card_num - _bottom_card_num);
- */
- for (intptr_t j = obj_card_num; j <= obj_last_card_num; j++) {
- _card_bm->par_at_put(j - _bottom_card_num, 1);
- }
-#endif
}
// In any case, we set the last card num.
last_card_num = obj_last_card_num;
marked_bytes += (size_t)obj_sz * HeapWordSize;
+
// Find the next marked object after this one.
start = _bm->getNextMarkedWordAddress(start + 1, nextTop);
- _changed = true;
}
+
// Handle the last range, if any.
if (start_card_num != -1) {
mark_card_num_range(start_card_num, last_card_num);
}
- if (_final) {
- // Mark the allocated-since-marking portion...
- HeapWord* tp = hr->top();
- if (nextTop < tp) {
- start_card_num =
- intptr_t(uintptr_t(nextTop) >> CardTableModRefBS::card_shift);
- last_card_num =
- intptr_t(uintptr_t(tp) >> CardTableModRefBS::card_shift);
- mark_card_num_range(start_card_num, last_card_num);
- // This definitely means the region has live objects.
- set_bit_for_region(hr);
- }
+
+ // Mark the allocated-since-marking portion...
+ HeapWord* top = hr->top();
+ if (nextTop < top) {
+ start_card_num = intptr_t(uintptr_t(nextTop) >> CardTableModRefBS::card_shift);
+ last_card_num = intptr_t(uintptr_t(top) >> CardTableModRefBS::card_shift);
+
+ mark_card_num_range(start_card_num, last_card_num);
+
+ // This definitely means the region has live objects.
+ set_bit_for_region(hr);
}
- hr->add_to_marked_bytes(marked_bytes);
// Update the live region bitmap.
if (marked_bytes > 0) {
set_bit_for_region(hr);
}
- hr->set_top_at_conc_mark_count(nextTop);
+
+ // Set the marked bytes for the current region so that
+ // it can be queried by a calling verificiation routine
+ _region_marked_bytes = marked_bytes;
+
_tot_live += hr->next_live_bytes();
_tot_used += hr->used();
- _words_done = words_done;
+ _tot_words_done = words_done;
- if (!_final) {
- ++_regions_done;
- if (_regions_done % 10 == 0) {
- double end_vtime_sec = os::elapsedVTime();
- double elapsed_vtime_sec = end_vtime_sec - _start_vtime_sec;
- if (elapsed_vtime_sec > (10.0 / 1000.0)) {
- jlong sleep_time_ms =
- (jlong) (elapsed_vtime_sec * _cm->cleanup_sleep_factor() * 1000.0);
- os::sleep(Thread::current(), sleep_time_ms, false);
- _start_vtime_sec = end_vtime_sec;
+ return false;
+ }
+
+ size_t region_marked_bytes() const { return _region_marked_bytes; }
+
+ // Debugging
+ size_t tot_words_done() const { return _tot_words_done; }
+ size_t tot_live() const { return _tot_live; }
+ size_t tot_used() const { return _tot_used; }
+};
+
+// Heap region closure used for verifying the counting data
+// that was accumulated concurrently and aggregated during
+// the remark pause. This closure is applied to the heap
+// regions during the STW cleanup pause.
+
+class VerifyLiveObjectDataHRClosure: public HeapRegionClosure {
+ ConcurrentMark* _cm;
+ CalcLiveObjectsClosure _calc_cl;
+ BitMap* _region_bm; // Region BM to be verified
+ BitMap* _card_bm; // Card BM to be verified
+ bool _verbose; // verbose output?
+
+ BitMap* _exp_region_bm; // Expected Region BM values
+ BitMap* _exp_card_bm; // Expected card BM values
+
+ int _failures;
+
+public:
+ VerifyLiveObjectDataHRClosure(ConcurrentMark* cm,
+ BitMap* region_bm,
+ BitMap* card_bm,
+ BitMap* exp_region_bm,
+ BitMap* exp_card_bm,
+ bool verbose) :
+ _cm(cm),
+ _calc_cl(_cm->nextMarkBitMap(), _cm, exp_region_bm, exp_card_bm),
+ _region_bm(region_bm), _card_bm(card_bm), _verbose(verbose),
+ _exp_region_bm(exp_region_bm), _exp_card_bm(exp_card_bm),
+ _failures(0) { }
+
+ int failures() const { return _failures; }
+
+ bool doHeapRegion(HeapRegion* hr) {
+ if (hr->continuesHumongous()) {
+ // We will ignore these here and process them when their
+ // associated "starts humongous" region is processed (see
+ // set_bit_for_heap_region()). Note that we cannot rely on their
+ // associated "starts humongous" region to have their bit set to
+ // 1 since, due to the region chunking in the parallel region
+ // iteration, a "continues humongous" region might be visited
+ // before its associated "starts humongous".
+ return false;
+ }
+
+ int failures = 0;
+
+ // Call the CalcLiveObjectsClosure to walk the marking bitmap for
+ // this region and set the corresponding bits in the expected region
+ // and card bitmaps.
+ bool res = _calc_cl.doHeapRegion(hr);
+ assert(res == false, "should be continuing");
+
+ MutexLockerEx x((_verbose ? ParGCRareEvent_lock : NULL),
+ Mutex::_no_safepoint_check_flag);
+
+ // Verify that _top_at_conc_count == ntams
+ if (hr->top_at_conc_mark_count() != hr->next_top_at_mark_start()) {
+ if (_verbose) {
+ gclog_or_tty->print_cr("Region " SIZE_FORMAT ": top at conc count incorrect: "
+ "expected " PTR_FORMAT ", actual: " PTR_FORMAT,
+ hr->hrs_index(), hr->next_top_at_mark_start(),
+ hr->top_at_conc_mark_count());
+ }
+ failures += 1;
+ }
+
+ // Verify the marked bytes for this region.
+ size_t exp_marked_bytes = _calc_cl.region_marked_bytes();
+ size_t act_marked_bytes = hr->next_marked_bytes();
+
+ // We're not OK if expected marked bytes > actual marked bytes. It means
+ // we have missed accounting some objects during the actual marking.
+ if (exp_marked_bytes > act_marked_bytes) {
+ if (_verbose) {
+ gclog_or_tty->print_cr("Region " SIZE_FORMAT ": marked bytes mismatch: "
+ "expected: " SIZE_FORMAT ", actual: " SIZE_FORMAT,
+ hr->hrs_index(), exp_marked_bytes, act_marked_bytes);
+ }
+ failures += 1;
+ }
+
+ // Verify the bit, for this region, in the actual and expected
+ // (which was just calculated) region bit maps.
+ // We're not OK if the bit in the calculated expected region
+ // bitmap is set and the bit in the actual region bitmap is not.
+ BitMap::idx_t index = (BitMap::idx_t)hr->hrs_index();
+
+ bool expected = _exp_region_bm->at(index);
+ bool actual = _region_bm->at(index);
+ if (expected && !actual) {
+ if (_verbose) {
+ gclog_or_tty->print_cr("Region " SIZE_FORMAT ": region bitmap mismatch: "
+ "expected: %d, actual: %d",
+ hr->hrs_index(), expected, actual);
+ }
+ failures += 1;
+ }
+
+ // Verify that the card bit maps for the cards spanned by the current
+ // region match. We have an error if we have a set bit in the expected
+ // bit map and the corresponding bit in the actual bitmap is not set.
+
+ BitMap::idx_t start_idx = _cm->card_bitmap_index_for(hr->bottom());
+ BitMap::idx_t end_idx = _cm->card_bitmap_index_for(hr->top());
+
+ for (BitMap::idx_t i = start_idx; i < end_idx; i+=1) {
+ expected = _exp_card_bm->at(i);
+ actual = _card_bm->at(i);
+
+ if (expected && !actual) {
+ if (_verbose) {
+ gclog_or_tty->print_cr("Region " SIZE_FORMAT ": card bitmap mismatch at " SIZE_FORMAT ": "
+ "expected: %d, actual: %d",
+ hr->hrs_index(), i, expected, actual);
}
+ failures += 1;
}
}
+ if (failures > 0 && _verbose) {
+ gclog_or_tty->print_cr("Region " HR_FORMAT ", ntams: " PTR_FORMAT ", "
+ "marked_bytes: calc/actual " SIZE_FORMAT "/" SIZE_FORMAT,
+ HR_FORMAT_PARAMS(hr), hr->next_top_at_mark_start(),
+ _calc_cl.region_marked_bytes(), hr->next_marked_bytes());
+ }
+
+ _failures += failures;
+
+ // We could stop iteration over the heap when we
+ // find the first voilating region by returning true.
return false;
}
+};
+
- bool changed() { return _changed; }
- void reset() { _changed = false; _words_done = 0; }
- void no_yield() { _yield = false; }
- size_t words_done() { return _words_done; }
- size_t tot_live() { return _tot_live; }
- size_t tot_used() { return _tot_used; }
+class G1ParVerifyFinalCountTask: public AbstractGangTask {
+protected:
+ G1CollectedHeap* _g1h;
+ ConcurrentMark* _cm;
+ BitMap* _actual_region_bm;
+ BitMap* _actual_card_bm;
+
+ uint _n_workers;
+
+ BitMap* _expected_region_bm;
+ BitMap* _expected_card_bm;
+
+ int _failures;
+ bool _verbose;
+
+public:
+ G1ParVerifyFinalCountTask(G1CollectedHeap* g1h,
+ BitMap* region_bm, BitMap* card_bm,
+ BitMap* expected_region_bm, BitMap* expected_card_bm)
+ : AbstractGangTask("G1 verify final counting"),
+ _g1h(g1h), _cm(_g1h->concurrent_mark()),
+ _actual_region_bm(region_bm), _actual_card_bm(card_bm),
+ _expected_region_bm(expected_region_bm), _expected_card_bm(expected_card_bm),
+ _failures(0), _verbose(false),
+ _n_workers(0) {
+ assert(VerifyDuringGC, "don't call this otherwise");
+
+ // Use the value already set as the number of active threads
+ // in the call to run_task().
+ if (G1CollectedHeap::use_parallel_gc_threads()) {
+ assert( _g1h->workers()->active_workers() > 0,
+ "Should have been previously set");
+ _n_workers = _g1h->workers()->active_workers();
+ } else {
+ _n_workers = 1;
+ }
+
+ assert(_expected_card_bm->size() == _actual_card_bm->size(), "sanity");
+ assert(_expected_region_bm->size() == _actual_region_bm->size(), "sanity");
+
+ _verbose = _cm->verbose_medium();
+ }
+
+ void work(uint worker_id) {
+ assert(worker_id < _n_workers, "invariant");
+
+ VerifyLiveObjectDataHRClosure verify_cl(_cm,
+ _actual_region_bm, _actual_card_bm,
+ _expected_region_bm,
+ _expected_card_bm,
+ _verbose);
+
+ if (G1CollectedHeap::use_parallel_gc_threads()) {
+ _g1h->heap_region_par_iterate_chunked(&verify_cl,
+ worker_id,
+ _n_workers,
+ HeapRegion::VerifyCountClaimValue);
+ } else {
+ _g1h->heap_region_iterate(&verify_cl);
+ }
+
+ Atomic::add(verify_cl.failures(), &_failures);
+ }
+
+ int failures() const { return _failures; }
};
+// Final update of count data (during cleanup).
+// Adds [top_at_count, NTAMS) to the marked bytes for each
+// region. Sets the bits in the card bitmap corresponding
+// to the interval [top_at_count, top], and sets the
+// liveness bit for each region containing live data
+// in the region bitmap.
-void ConcurrentMark::calcDesiredRegions() {
- _region_bm.clear();
- _card_bm.clear();
- CalcLiveObjectsClosure calccl(false /*final*/,
- nextMarkBitMap(), this,
- &_region_bm, &_card_bm);
- G1CollectedHeap *g1h = G1CollectedHeap::heap();
- g1h->heap_region_iterate(&calccl);
+class FinalCountDataUpdateClosure: public HeapRegionClosure {
+ ConcurrentMark* _cm;
+ BitMap* _region_bm;
+ BitMap* _card_bm;
- do {
- calccl.reset();
- g1h->heap_region_iterate(&calccl);
- } while (calccl.changed());
-}
+ size_t _total_live_bytes;
+ size_t _total_used_bytes;
+ size_t _total_words_done;
+
+ void set_card_bitmap_range(BitMap::idx_t start_idx, BitMap::idx_t last_idx) {
+ assert(start_idx <= last_idx, "sanity");
+
+ // Set the inclusive bit range [start_idx, last_idx].
+ // For small ranges (up to 8 cards) use a simple loop; otherwise
+ // use par_at_put_range.
+ if ((last_idx - start_idx) <= 8) {
+ for (BitMap::idx_t i = start_idx; i <= last_idx; i += 1) {
+ _card_bm->par_set_bit(i);
+ }
+ } else {
+ assert(last_idx < _card_bm->size(), "sanity");
+ // Note BitMap::par_at_put_range() is exclusive.
+ _card_bm->par_at_put_range(start_idx, last_idx+1, true);
+ }
+ }
+
+ // It takes a region that's not empty (i.e., it has at least one
+ // live object in it and sets its corresponding bit on the region
+ // bitmap to 1. If the region is "starts humongous" it will also set
+ // to 1 the bits on the region bitmap that correspond to its
+ // associated "continues humongous" regions.
+ void set_bit_for_region(HeapRegion* hr) {
+ assert(!hr->continuesHumongous(), "should have filtered those out");
+
+ size_t index = hr->hrs_index();
+ if (!hr->startsHumongous()) {
+ // Normal (non-humongous) case: just set the bit.
+ _region_bm->par_set_bit((BitMap::idx_t) index);
+ } else {
+ // Starts humongous case: calculate how many regions are part of
+ // this humongous region and then set the bit range.
+ G1CollectedHeap* g1h = G1CollectedHeap::heap();
+ HeapRegion *last_hr = g1h->heap_region_containing_raw(hr->end() - 1);
+ size_t end_index = last_hr->hrs_index() + 1;
+ _region_bm->par_at_put_range((BitMap::idx_t) index,
+ (BitMap::idx_t) end_index, true);
+ }
+ }
+
+ public:
+ FinalCountDataUpdateClosure(ConcurrentMark* cm,
+ BitMap* region_bm,
+ BitMap* card_bm) :
+ _cm(cm), _region_bm(region_bm), _card_bm(card_bm),
+ _total_words_done(0), _total_live_bytes(0), _total_used_bytes(0) { }
+
+ bool doHeapRegion(HeapRegion* hr) {
+
+ if (hr->continuesHumongous()) {
+ // We will ignore these here and process them when their
+ // associated "starts humongous" region is processed (see
+ // set_bit_for_heap_region()). Note that we cannot rely on their
+ // associated "starts humongous" region to have their bit set to
+ // 1 since, due to the region chunking in the parallel region
+ // iteration, a "continues humongous" region might be visited
+ // before its associated "starts humongous".
+ return false;
+ }
+
+ HeapWord* start = hr->top_at_conc_mark_count();
+ HeapWord* ntams = hr->next_top_at_mark_start();
+ HeapWord* top = hr->top();
+
+ assert(hr->bottom() <= start && start <= hr->end() &&
+ hr->bottom() <= ntams && ntams <= hr->end(), "Preconditions.");
+
+ size_t words_done = ntams - hr->bottom();
+
+ if (start < ntams) {
+ // Region was changed between remark and cleanup pauses
+ // We need to add (ntams - start) to the marked bytes
+ // for this region, and set bits for the range
+ // [ card_idx(start), card_idx(ntams) ) in the card bitmap.
+ size_t live_bytes = (ntams - start) * HeapWordSize;
+ hr->add_to_marked_bytes(live_bytes);
+
+ // Record the new top at conc count
+ hr->set_top_at_conc_mark_count(ntams);
+
+ // The setting of the bits in the card bitmap takes place below
+ }
+
+ // Mark the allocated-since-marking portion...
+ if (ntams < top) {
+ // This definitely means the region has live objects.
+ set_bit_for_region(hr);
+ }
+
+ // Now set the bits for [start, top]
+ BitMap::idx_t start_idx = _cm->card_bitmap_index_for(start);
+ BitMap::idx_t last_idx = _cm->card_bitmap_index_for(top);
+ set_card_bitmap_range(start_idx, last_idx);
+
+ // Set the bit for the region if it contains live data
+ if (hr->next_marked_bytes() > 0) {
+ set_bit_for_region(hr);
+ }
+
+ _total_words_done += words_done;
+ _total_used_bytes += hr->used();
+ _total_live_bytes += hr->next_marked_bytes();
+
+ return false;
+ }
+
+ size_t total_words_done() const { return _total_words_done; }
+ size_t total_live_bytes() const { return _total_live_bytes; }
+ size_t total_used_bytes() const { return _total_used_bytes; }
+};
class G1ParFinalCountTask: public AbstractGangTask {
protected:
G1CollectedHeap* _g1h;
- CMBitMap* _bm;
+ ConcurrentMark* _cm;
+ BitMap* _actual_region_bm;
+ BitMap* _actual_card_bm;
+
uint _n_workers;
+
size_t *_live_bytes;
size_t *_used_bytes;
- BitMap* _region_bm;
- BitMap* _card_bm;
+
public:
- G1ParFinalCountTask(G1CollectedHeap* g1h, CMBitMap* bm,
- BitMap* region_bm, BitMap* card_bm)
- : AbstractGangTask("G1 final counting"), _g1h(g1h),
- _bm(bm), _region_bm(region_bm), _card_bm(card_bm),
- _n_workers(0)
- {
+ G1ParFinalCountTask(G1CollectedHeap* g1h, BitMap* region_bm, BitMap* card_bm)
+ : AbstractGangTask("G1 final counting"),
+ _g1h(g1h), _cm(_g1h->concurrent_mark()),
+ _actual_region_bm(region_bm), _actual_card_bm(card_bm),
+ _n_workers(0) {
// Use the value already set as the number of active threads
// in the call to run_task(). Needed for the allocation of
// _live_bytes and _used_bytes.
@@ -1539,29 +1965,32 @@ public:
}
void work(uint worker_id) {
- CalcLiveObjectsClosure calccl(true /*final*/,
- _bm, _g1h->concurrent_mark(),
- _region_bm, _card_bm);
- calccl.no_yield();
+ assert(worker_id < _n_workers, "invariant");
+
+ FinalCountDataUpdateClosure final_update_cl(_cm,
+ _actual_region_bm,
+ _actual_card_bm);
+
if (G1CollectedHeap::use_parallel_gc_threads()) {
- _g1h->heap_region_par_iterate_chunked(&calccl, worker_id,
- (int) _n_workers,
+ _g1h->heap_region_par_iterate_chunked(&final_update_cl,
+ worker_id,
+ _n_workers,
HeapRegion::FinalCountClaimValue);
} else {
- _g1h->heap_region_iterate(&calccl);
+ _g1h->heap_region_iterate(&final_update_cl);
}
- assert(calccl.complete(), "Shouldn't have yielded!");
- assert(worker_id < _n_workers, "invariant");
- _live_bytes[worker_id] = calccl.tot_live();
- _used_bytes[worker_id] = calccl.tot_used();
+ _live_bytes[worker_id] = final_update_cl.total_live_bytes();
+ _used_bytes[worker_id] = final_update_cl.total_used_bytes();
}
+
size_t live_bytes() {
size_t live_bytes = 0;
for (uint i = 0; i < _n_workers; ++i)
live_bytes += _live_bytes[i];
return live_bytes;
}
+
size_t used_bytes() {
size_t used_bytes = 0;
for (uint i = 0; i < _n_workers; ++i)
@@ -1724,8 +2153,7 @@ public:
G1ParScrubRemSetTask(G1CollectedHeap* g1h,
BitMap* region_bm, BitMap* card_bm) :
AbstractGangTask("G1 ScrubRS"), _g1rs(g1h->g1_rem_set()),
- _region_bm(region_bm), _card_bm(card_bm)
- {}
+ _region_bm(region_bm), _card_bm(card_bm) { }
void work(uint worker_id) {
if (G1CollectedHeap::use_parallel_gc_threads()) {
@@ -1772,11 +2200,10 @@ void ConcurrentMark::cleanup() {
uint n_workers;
// Do counting once more with the world stopped for good measure.
- G1ParFinalCountTask g1_par_count_task(g1h, nextMarkBitMap(),
- &_region_bm, &_card_bm);
+ G1ParFinalCountTask g1_par_count_task(g1h, &_region_bm, &_card_bm);
+
if (G1CollectedHeap::use_parallel_gc_threads()) {
- assert(g1h->check_heap_region_claim_values(
- HeapRegion::InitialClaimValue),
+ assert(g1h->check_heap_region_claim_values(HeapRegion::InitialClaimValue),
"sanity check");
g1h->set_par_threads();
@@ -1787,14 +2214,42 @@ void ConcurrentMark::cleanup() {
// Done with the parallel phase so reset to 0.
g1h->set_par_threads(0);
- assert(g1h->check_heap_region_claim_values(
- HeapRegion::FinalCountClaimValue),
+ assert(g1h->check_heap_region_claim_values(HeapRegion::FinalCountClaimValue),
"sanity check");
} else {
n_workers = 1;
g1_par_count_task.work(0);
}
+ if (VerifyDuringGC) {
+ // Verify that the counting data accumulated during marking matches
+ // that calculated by walking the marking bitmap.
+
+ // Bitmaps to hold expected values
+ BitMap expected_region_bm(_region_bm.size(), false);
+ BitMap expected_card_bm(_card_bm.size(), false);
+
+ G1ParVerifyFinalCountTask g1_par_verify_task(g1h,
+ &_region_bm,
+ &_card_bm,
+ &expected_region_bm,
+ &expected_card_bm);
+
+ if (G1CollectedHeap::use_parallel_gc_threads()) {
+ g1h->set_par_threads((int)n_workers);
+ g1h->workers()->run_task(&g1_par_verify_task);
+ // Done with the parallel phase so reset to 0.
+ g1h->set_par_threads(0);
+
+ assert(g1h->check_heap_region_claim_values(HeapRegion::VerifyCountClaimValue),
+ "sanity check");
+ } else {
+ g1_par_verify_task.work(0);
+ }
+
+ guarantee(g1_par_verify_task.failures() == 0, "Unexpected accounting failures");
+ }
+
size_t known_garbage_bytes =
g1_par_count_task.used_bytes() - g1_par_count_task.live_bytes();
g1p->set_known_garbage_bytes(known_garbage_bytes);
@@ -1905,6 +2360,10 @@ void ConcurrentMark::cleanup() {
// races with it goes around and waits for completeCleanup to finish.
g1h->increment_total_collections();
+ // We reclaimed old regions so we should calculate the sizes to make
+ // sure we update the old gen/space data.
+ g1h->g1mm()->update_sizes();
+
if (VerifyDuringGC) {
HandleMark hm; // handle scope
gclog_or_tty->print(" VerifyDuringGC:(after)");
@@ -1983,12 +2442,11 @@ bool G1CMIsAliveClosure::do_object_b(oop obj) {
class G1CMKeepAliveClosure: public OopClosure {
G1CollectedHeap* _g1;
ConcurrentMark* _cm;
- CMBitMap* _bitMap;
public:
- G1CMKeepAliveClosure(G1CollectedHeap* g1, ConcurrentMark* cm,
- CMBitMap* bitMap) :
- _g1(g1), _cm(cm),
- _bitMap(bitMap) {}
+ G1CMKeepAliveClosure(G1CollectedHeap* g1, ConcurrentMark* cm) :
+ _g1(g1), _cm(cm) {
+ assert(Thread::current()->is_VM_thread(), "otherwise fix worker id");
+ }
virtual void do_oop(narrowOop* p) { do_oop_work(p); }
virtual void do_oop( oop* p) { do_oop_work(p); }
@@ -2004,26 +2462,25 @@ class G1CMKeepAliveClosure: public OopClosure {
}
if (_g1->is_in_g1_reserved(addr) && _g1->is_obj_ill(obj)) {
- _bitMap->mark(addr);
+ _cm->mark_and_count(obj);
_cm->mark_stack_push(obj);
}
}
};
class G1CMDrainMarkingStackClosure: public VoidClosure {
+ ConcurrentMark* _cm;
CMMarkStack* _markStack;
- CMBitMap* _bitMap;
G1CMKeepAliveClosure* _oopClosure;
public:
- G1CMDrainMarkingStackClosure(CMBitMap* bitMap, CMMarkStack* markStack,
+ G1CMDrainMarkingStackClosure(ConcurrentMark* cm, CMMarkStack* markStack,
G1CMKeepAliveClosure* oopClosure) :
- _bitMap(bitMap),
+ _cm(cm),
_markStack(markStack),
- _oopClosure(oopClosure)
- {}
+ _oopClosure(oopClosure) { }
void do_void() {
- _markStack->drain((OopClosure*)_oopClosure, _bitMap, false);
+ _markStack->drain((OopClosure*)_oopClosure, _cm->nextMarkBitMap(), false);
}
};
@@ -2102,8 +2559,7 @@ class G1CMParDrainMarkingStackClosure: public VoidClosure {
CMTask* _task;
public:
G1CMParDrainMarkingStackClosure(ConcurrentMark* cm, CMTask* task) :
- _cm(cm), _task(task)
- {}
+ _cm(cm), _task(task) { }
void do_void() {
do {
@@ -2242,9 +2698,9 @@ void ConcurrentMark::weakRefsWork(bool clear_all_soft_refs) {
rp->setup_policy(clear_all_soft_refs);
assert(_markStack.isEmpty(), "mark stack should be empty");
- G1CMKeepAliveClosure g1_keep_alive(g1h, this, nextMarkBitMap());
+ G1CMKeepAliveClosure g1_keep_alive(g1h, this);
G1CMDrainMarkingStackClosure
- g1_drain_mark_stack(nextMarkBitMap(), &_markStack, &g1_keep_alive);
+ g1_drain_mark_stack(this, &_markStack, &g1_keep_alive);
// We use the work gang from the G1CollectedHeap and we utilize all
// the worker threads.
@@ -2616,18 +3072,6 @@ void ConcurrentMark::print_reachable(const char* str,
// during an evacuation pause). This was a late change to the code and
// is currently not being taken advantage of.
-class CMGlobalObjectClosure : public ObjectClosure {
-private:
- ConcurrentMark* _cm;
-
-public:
- void do_object(oop obj) {
- _cm->deal_with_reference(obj);
- }
-
- CMGlobalObjectClosure(ConcurrentMark* cm) : _cm(cm) { }
-};
-
void ConcurrentMark::deal_with_reference(oop obj) {
if (verbose_high()) {
gclog_or_tty->print_cr("[global] we're dealing with reference "PTR_FORMAT,
@@ -2672,6 +3116,18 @@ void ConcurrentMark::deal_with_reference(oop obj) {
}
}
+class CMGlobalObjectClosure : public ObjectClosure {
+private:
+ ConcurrentMark* _cm;
+
+public:
+ void do_object(oop obj) {
+ _cm->deal_with_reference(obj);
+ }
+
+ CMGlobalObjectClosure(ConcurrentMark* cm) : _cm(cm) { }
+};
+
void ConcurrentMark::drainAllSATBBuffers() {
guarantee(false, "drainAllSATBBuffers(): don't call this any more");
@@ -2693,15 +3149,6 @@ void ConcurrentMark::drainAllSATBBuffers() {
assert(satb_mq_set.completed_buffers_num() == 0, "invariant");
}
-void ConcurrentMark::clear(oop p) {
- assert(p != NULL && p->is_oop(), "expected an oop");
- HeapWord* addr = (HeapWord*)p;
- assert(addr >= _nextMarkBitMap->startWord() ||
- addr < _nextMarkBitMap->endWord(), "in a region");
-
- _nextMarkBitMap->clear(addr);
-}
-
void ConcurrentMark::clearRangePrevBitmap(MemRegion mr) {
// Note we are overriding the read-only view of the prev map here, via
// the cast.
@@ -3015,6 +3462,192 @@ void ConcurrentMark::clear_marking_state(bool clear_overflow) {
}
}
+// Aggregate the counting data that was constructed concurrently
+// with marking.
+class AggregateCountDataHRClosure: public HeapRegionClosure {
+ ConcurrentMark* _cm;
+ BitMap* _cm_card_bm;
+ size_t _max_task_num;
+
+ public:
+ AggregateCountDataHRClosure(ConcurrentMark *cm,
+ BitMap* cm_card_bm,
+ size_t max_task_num) :
+ _cm(cm), _cm_card_bm(cm_card_bm),
+ _max_task_num(max_task_num) { }
+
+ bool is_card_aligned(HeapWord* p) {
+ return ((uintptr_t(p) & (CardTableModRefBS::card_size - 1)) == 0);
+ }
+
+ bool doHeapRegion(HeapRegion* hr) {
+ if (hr->continuesHumongous()) {
+ // We will ignore these here and process them when their
+ // associated "starts humongous" region is processed.
+ // Note that we cannot rely on their associated
+ // "starts humongous" region to have their bit set to 1
+ // since, due to the region chunking in the parallel region
+ // iteration, a "continues humongous" region might be visited
+ // before its associated "starts humongous".
+ return false;
+ }
+
+ HeapWord* start = hr->bottom();
+ HeapWord* limit = hr->next_top_at_mark_start();
+ HeapWord* end = hr->end();
+
+ assert(start <= limit && limit <= hr->top() && hr->top() <= hr->end(),
+ err_msg("Preconditions not met - "
+ "start: "PTR_FORMAT", limit: "PTR_FORMAT", "
+ "top: "PTR_FORMAT", end: "PTR_FORMAT,
+ start, limit, hr->top(), hr->end()));
+
+ assert(hr->next_marked_bytes() == 0, "Precondition");
+
+ if (start == limit) {
+ // NTAMS of this region has not been set so nothing to do.
+ return false;
+ }
+
+ assert(is_card_aligned(start), "sanity");
+ assert(is_card_aligned(end), "sanity");
+
+ BitMap::idx_t start_idx = _cm->card_bitmap_index_for(start);
+ BitMap::idx_t limit_idx = _cm->card_bitmap_index_for(limit);
+ BitMap::idx_t end_idx = _cm->card_bitmap_index_for(end);
+
+ // If ntams is not card aligned then we bump the index for
+ // limit so that we get the card spanning ntams.
+ if (!is_card_aligned(limit)) {
+ limit_idx += 1;
+ }
+
+ assert(limit_idx <= end_idx, "or else use atomics");
+
+ // Aggregate the "stripe" in the count data associated with hr.
+ size_t hrs_index = hr->hrs_index();
+ size_t marked_bytes = 0;
+
+ for (int i = 0; (size_t)i < _max_task_num; i += 1) {
+ size_t* marked_bytes_array = _cm->count_marked_bytes_array_for(i);
+ BitMap* task_card_bm = _cm->count_card_bitmap_for(i);
+
+ // Fetch the marked_bytes in this region for task i and
+ // add it to the running total for this region.
+ marked_bytes += marked_bytes_array[hrs_index];
+
+ // Now union the bitmaps[0,max_task_num)[start_idx..limit_idx)
+ // into the global card bitmap.
+ BitMap::idx_t scan_idx = task_card_bm->get_next_one_offset(start_idx, limit_idx);
+
+ while (scan_idx < limit_idx) {
+ assert(task_card_bm->at(scan_idx) == true, "should be");
+ _cm_card_bm->set_bit(scan_idx);
+ assert(_cm_card_bm->at(scan_idx) == true, "should be");
+
+ // BitMap::get_next_one_offset() can handle the case when
+ // its left_offset parameter is greater than its right_offset
+ // parameter. If does, however, have an early exit if
+ // left_offset == right_offset. So let's limit the value
+ // passed in for left offset here.
+ BitMap::idx_t next_idx = MIN2(scan_idx + 1, limit_idx);
+ scan_idx = task_card_bm->get_next_one_offset(next_idx, limit_idx);
+ }
+ }
+
+ // Update the marked bytes for this region.
+ hr->add_to_marked_bytes(marked_bytes);
+
+ // Now set the top at count to NTAMS.
+ hr->set_top_at_conc_mark_count(limit);
+
+ // Next heap region
+ return false;
+ }
+};
+
+class G1AggregateCountDataTask: public AbstractGangTask {
+protected:
+ G1CollectedHeap* _g1h;
+ ConcurrentMark* _cm;
+ BitMap* _cm_card_bm;
+ size_t _max_task_num;
+ int _active_workers;
+
+public:
+ G1AggregateCountDataTask(G1CollectedHeap* g1h,
+ ConcurrentMark* cm,
+ BitMap* cm_card_bm,
+ size_t max_task_num,
+ int n_workers) :
+ AbstractGangTask("Count Aggregation"),
+ _g1h(g1h), _cm(cm), _cm_card_bm(cm_card_bm),
+ _max_task_num(max_task_num),
+ _active_workers(n_workers) { }
+
+ void work(uint worker_id) {
+ AggregateCountDataHRClosure cl(_cm, _cm_card_bm, _max_task_num);
+
+ if (G1CollectedHeap::use_parallel_gc_threads()) {
+ _g1h->heap_region_par_iterate_chunked(&cl, worker_id,
+ _active_workers,
+ HeapRegion::AggregateCountClaimValue);
+ } else {
+ _g1h->heap_region_iterate(&cl);
+ }
+ }
+};
+
+
+void ConcurrentMark::aggregate_count_data() {
+ int n_workers = (G1CollectedHeap::use_parallel_gc_threads() ?
+ _g1h->workers()->active_workers() :
+ 1);
+
+ G1AggregateCountDataTask g1_par_agg_task(_g1h, this, &_card_bm,
+ _max_task_num, n_workers);
+
+ if (G1CollectedHeap::use_parallel_gc_threads()) {
+ assert(_g1h->check_heap_region_claim_values(HeapRegion::InitialClaimValue),
+ "sanity check");
+ _g1h->set_par_threads(n_workers);
+ _g1h->workers()->run_task(&g1_par_agg_task);
+ _g1h->set_par_threads(0);
+
+ assert(_g1h->check_heap_region_claim_values(HeapRegion::AggregateCountClaimValue),
+ "sanity check");
+ _g1h->reset_heap_region_claim_values();
+ } else {
+ g1_par_agg_task.work(0);
+ }
+}
+
+// Clear the per-worker arrays used to store the per-region counting data
+void ConcurrentMark::clear_all_count_data() {
+ // Clear the global card bitmap - it will be filled during
+ // liveness count aggregation (during remark) and the
+ // final counting task.
+ _card_bm.clear();
+
+ // Clear the global region bitmap - it will be filled as part
+ // of the final counting task.
+ _region_bm.clear();
+
+ size_t max_regions = _g1h->max_regions();
+ assert(_max_task_num != 0, "unitialized");
+
+ for (int i = 0; (size_t) i < _max_task_num; i += 1) {
+ BitMap* task_card_bm = count_card_bitmap_for(i);
+ size_t* marked_bytes_array = count_marked_bytes_array_for(i);
+
+ assert(task_card_bm->size() == _card_bm.size(), "size mismatch");
+ assert(marked_bytes_array != NULL, "uninitialized");
+
+ memset(marked_bytes_array, 0, (max_regions * sizeof(size_t)));
+ task_card_bm->clear();
+ }
+}
+
void ConcurrentMark::print_stats() {
if (verbose_stats()) {
gclog_or_tty->print_cr("---------------------------------------------------------------------");
@@ -3350,6 +3983,8 @@ void ConcurrentMark::reset_active_task_region_fields_in_cset() {
void ConcurrentMark::abort() {
// Clear all marks to force marking thread to do nothing
_nextMarkBitMap->clearAll();
+ // Clear the liveness counting data
+ clear_all_count_data();
// Empty mark stack
clear_marking_state();
for (int i = 0; i < (int)_max_task_num; ++i) {
@@ -3402,23 +4037,15 @@ void ConcurrentMark::print_summary_info() {
(_init_times.sum() + _remark_times.sum() +
_cleanup_times.sum())/1000.0);
gclog_or_tty->print_cr(" Total concurrent time = %8.2f s "
- "(%8.2f s marking, %8.2f s counting).",
+ "(%8.2f s marking).",
cmThread()->vtime_accum(),
- cmThread()->vtime_mark_accum(),
- cmThread()->vtime_count_accum());
+ cmThread()->vtime_mark_accum());
}
void ConcurrentMark::print_worker_threads_on(outputStream* st) const {
_parallel_workers->print_worker_threads_on(st);
}
-// Closures
-// XXX: there seems to be a lot of code duplication here;
-// should refactor and consolidate the shared code.
-
-// This closure is used to mark refs into the CMS generation in
-// the CMS bit map. Called at the first checkpoint.
-
// We take a break if someone is trying to stop the world.
bool ConcurrentMark::do_yield_check(uint worker_id) {
if (should_yield()) {
@@ -4704,6 +5331,8 @@ void CMTask::do_marking_step(double time_target_ms,
CMTask::CMTask(int task_id,
ConcurrentMark* cm,
+ size_t* marked_bytes,
+ BitMap* card_bm,
CMTaskQueue* task_queue,
CMTaskQueueSet* task_queues)
: _g1h(G1CollectedHeap::heap()),
@@ -4713,7 +5342,9 @@ CMTask::CMTask(int task_id,
_task_queue(task_queue),
_task_queues(task_queues),
_cm_oop_closure(NULL),
- _aborted_region(MemRegion()) {
+ _aborted_region(MemRegion()),
+ _marked_bytes_array(marked_bytes),
+ _card_bm(card_bm) {
guarantee(task_queue != NULL, "invariant");
guarantee(task_queues != NULL, "invariant");
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
index 1a40784..e8795d6 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
@@ -84,8 +84,8 @@ class CMBitMapRO VALUE_OBJ_CLASS_SPEC {
}
// iteration
- bool iterate(BitMapClosure* cl) { return _bm.iterate(cl); }
- bool iterate(BitMapClosure* cl, MemRegion mr);
+ inline bool iterate(BitMapClosure* cl, MemRegion mr);
+ inline bool iterate(BitMapClosure* cl);
// Return the address corresponding to the next marked bit at or after
// "addr", and before "limit", if "limit" is non-NULL. If there is no
@@ -349,10 +349,62 @@ typedef enum {
high_verbose // per object verbose
} CMVerboseLevel;
+class YoungList;
+
+// Root Regions are regions that are not empty at the beginning of a
+// marking cycle and which we might collect during an evacuation pause
+// while the cycle is active. Given that, during evacuation pauses, we
+// do not copy objects that are explicitly marked, what we have to do
+// for the root regions is to scan them and mark all objects reachable
+// from them. According to the SATB assumptions, we only need to visit
+// each object once during marking. So, as long as we finish this scan
+// before the next evacuation pause, we can copy the objects from the
+// root regions without having to mark them or do anything else to them.
+//
+// Currently, we only support root region scanning once (at the start
+// of the marking cycle) and the root regions are all the survivor
+// regions populated during the initial-mark pause.
+class CMRootRegions VALUE_OBJ_CLASS_SPEC {
+private:
+ YoungList* _young_list;
+ ConcurrentMark* _cm;
+
+ volatile bool _scan_in_progress;
+ volatile bool _should_abort;
+ HeapRegion* volatile _next_survivor;
+
+public:
+ CMRootRegions();
+ // We actually do most of the initialization in this method.
+ void init(G1CollectedHeap* g1h, ConcurrentMark* cm);
+
+ // Reset the claiming / scanning of the root regions.
+ void prepare_for_scan();
+
+ // Forces get_next() to return NULL so that the iteration aborts early.
+ void abort() { _should_abort = true; }
+
+ // Return true if the CM thread are actively scanning root regions,
+ // false otherwise.
+ bool scan_in_progress() { return _scan_in_progress; }
+
+ // Claim the next root region to scan atomically, or return NULL if
+ // all have been claimed.
+ HeapRegion* claim_next();
+
+ // Flag that we're done with root region scanning and notify anyone
+ // who's waiting on it. If aborted is false, assume that all regions
+ // have been claimed.
+ void scan_finished();
+
+ // If CM threads are still scanning root regions, wait until they
+ // are done. Return true if we had to wait, false otherwise.
+ bool wait_until_scan_finished();
+};
class ConcurrentMarkThread;
-class ConcurrentMark: public CHeapObj {
+class ConcurrentMark : public CHeapObj {
friend class ConcurrentMarkThread;
friend class CMTask;
friend class CMBitMapClosure;
@@ -386,7 +438,7 @@ protected:
FreeRegionList _cleanup_list;
- // CMS marking support structures
+ // Concurrent marking support structures
CMBitMap _markBitMap1;
CMBitMap _markBitMap2;
CMBitMapRO* _prevMarkBitMap; // completed mark bitmap
@@ -400,6 +452,9 @@ protected:
HeapWord* _heap_start;
HeapWord* _heap_end;
+ // Root region tracking and claiming.
+ CMRootRegions _root_regions;
+
// For gray objects
CMMarkStack _markStack; // Grey objects behind global finger.
CMRegionStack _regionStack; // Grey regions behind global finger.
@@ -426,7 +481,6 @@ protected:
WorkGangBarrierSync _first_overflow_barrier_sync;
WorkGangBarrierSync _second_overflow_barrier_sync;
-
// this is set by any task, when an overflow on the global data
// structures is detected.
volatile bool _has_overflown;
@@ -554,9 +608,9 @@ protected:
bool has_overflown() { return _has_overflown; }
void set_has_overflown() { _has_overflown = true; }
void clear_has_overflown() { _has_overflown = false; }
+ bool restart_for_overflow() { return _restart_for_overflow; }
bool has_aborted() { return _has_aborted; }
- bool restart_for_overflow() { return _restart_for_overflow; }
// Methods to enter the two overflow sync barriers
void enter_first_sync_barrier(int task_num);
@@ -578,6 +632,27 @@ protected:
}
}
+ // Live Data Counting data structures...
+ // These data structures are initialized at the start of
+ // marking. They are written to while marking is active.
+ // They are aggregated during remark; the aggregated values
+ // are then used to populate the _region_bm, _card_bm, and
+ // the total live bytes, which are then subsequently updated
+ // during cleanup.
+
+ // An array of bitmaps (one bit map per task). Each bitmap
+ // is used to record the cards spanned by the live objects
+ // marked by that task/worker.
+ BitMap* _count_card_bitmaps;
+
+ // Used to record the number of marked live bytes
+ // (for each region, by worker thread).
+ size_t** _count_marked_bytes;
+
+ // Card index of the bottom of the G1 heap. Used for biasing indices into
+ // the card bitmaps.
+ intptr_t _heap_bottom_card_num;
+
public:
// Manipulation of the global mark stack.
// Notice that the first mark_stack_push is CAS-based, whereas the
@@ -671,6 +746,8 @@ public:
// Returns true if there are any aborted memory regions.
bool has_aborted_regions();
+ CMRootRegions* root_regions() { return &_root_regions; }
+
bool concurrent_marking_in_progress() {
return _concurrent_marking_in_progress;
}
@@ -703,6 +780,7 @@ public:
ConcurrentMark(ReservedSpace rs, int max_regions);
~ConcurrentMark();
+
ConcurrentMarkThread* cmThread() { return _cmThread; }
CMBitMapRO* prevMarkBitMap() const { return _prevMarkBitMap; }
@@ -720,8 +798,17 @@ public:
// G1CollectedHeap
// This notifies CM that a root during initial-mark needs to be
- // grayed. It is MT-safe.
- inline void grayRoot(oop obj, size_t word_size);
+ // grayed. It is MT-safe. word_size is the size of the object in
+ // words. It is passed explicitly as sometimes we cannot calculate
+ // it from the given object because it might be in an inconsistent
+ // state (e.g., in to-space and being copied). So the caller is
+ // responsible for dealing with this issue (e.g., get the size from
+ // the from-space image when the to-space image might be
+ // inconsistent) and always passing the size. hr is the region that
+ // contains the object and it's passed optionally from callers who
+ // might already have it (no point in recalculating it).
+ inline void grayRoot(oop obj, size_t word_size,
+ uint worker_id, HeapRegion* hr = NULL);
// It's used during evacuation pauses to gray a region, if
// necessary, and it's MT-safe. It assumes that the caller has
@@ -772,6 +859,13 @@ public:
void checkpointRootsInitialPre();
void checkpointRootsInitialPost();
+ // Scan all the root regions and mark everything reachable from
+ // them.
+ void scanRootRegions();
+
+ // Scan a single root region and mark everything reachable from it.
+ void scanRootRegion(HeapRegion* hr, uint worker_id);
+
// Do concurrent phase of marking, to a tentative transitive closure.
void markFromRoots();
@@ -781,15 +875,13 @@ public:
void checkpointRootsFinal(bool clear_all_soft_refs);
void checkpointRootsFinalWork();
- void calcDesiredRegions();
void cleanup();
void completeCleanup();
// Mark in the previous bitmap. NB: this is usually read-only, so use
// this carefully!
inline void markPrev(oop p);
- inline void markNext(oop p);
- void clear(oop p);
+
// Clears marks for all objects in the given range, for the prev,
// next, or both bitmaps. NB: the previous bitmap is usually
// read-only, so use this carefully!
@@ -913,6 +1005,114 @@ public:
bool verbose_high() {
return _MARKING_VERBOSE_ && _verbose_level >= high_verbose;
}
+
+ // Counting data structure accessors
+
+ // Returns the card number of the bottom of the G1 heap.
+ // Used in biasing indices into accounting card bitmaps.
+ intptr_t heap_bottom_card_num() const {
+ return _heap_bottom_card_num;
+ }
+
+ // Returns the card bitmap for a given task or worker id.
+ BitMap* count_card_bitmap_for(uint worker_id) {
+ assert(0 <= worker_id && worker_id < _max_task_num, "oob");
+ assert(_count_card_bitmaps != NULL, "uninitialized");
+ BitMap* task_card_bm = &_count_card_bitmaps[worker_id];
+ assert(task_card_bm->size() == _card_bm.size(), "size mismatch");
+ return task_card_bm;
+ }
+
+ // Returns the array containing the marked bytes for each region,
+ // for the given worker or task id.
+ size_t* count_marked_bytes_array_for(uint worker_id) {
+ assert(0 <= worker_id && worker_id < _max_task_num, "oob");
+ assert(_count_marked_bytes != NULL, "uninitialized");
+ size_t* marked_bytes_array = _count_marked_bytes[worker_id];
+ assert(marked_bytes_array != NULL, "uninitialized");
+ return marked_bytes_array;
+ }
+
+ // Returns the index in the liveness accounting card table bitmap
+ // for the given address
+ inline BitMap::idx_t card_bitmap_index_for(HeapWord* addr);
+
+ // Counts the size of the given memory region in the the given
+ // marked_bytes array slot for the given HeapRegion.
+ // Sets the bits in the given card bitmap that are associated with the
+ // cards that are spanned by the memory region.
+ inline void count_region(MemRegion mr, HeapRegion* hr,
+ size_t* marked_bytes_array,
+ BitMap* task_card_bm);
+
+ // Counts the given memory region in the task/worker counting
+ // data structures for the given worker id.
+ inline void count_region(MemRegion mr, HeapRegion* hr, uint worker_id);
+
+ // Counts the given memory region in the task/worker counting
+ // data structures for the given worker id.
+ inline void count_region(MemRegion mr, uint worker_id);
+
+ // Counts the given object in the given task/worker counting
+ // data structures.
+ inline void count_object(oop obj, HeapRegion* hr,
+ size_t* marked_bytes_array,
+ BitMap* task_card_bm);
+
+ // Counts the given object in the task/worker counting data
+ // structures for the given worker id.
+ inline void count_object(oop obj, HeapRegion* hr, uint worker_id);
+
+ // Attempts to mark the given object and, if successful, counts
+ // the object in the given task/worker counting structures.
+ inline bool par_mark_and_count(oop obj, HeapRegion* hr,
+ size_t* marked_bytes_array,
+ BitMap* task_card_bm);
+
+ // Attempts to mark the given object and, if successful, counts
+ // the object in the task/worker counting structures for the
+ // given worker id.
+ inline bool par_mark_and_count(oop obj, size_t word_size,
+ HeapRegion* hr, uint worker_id);
+
+ // Attempts to mark the given object and, if successful, counts
+ // the object in the task/worker counting structures for the
+ // given worker id.
+ inline bool par_mark_and_count(oop obj, HeapRegion* hr, uint worker_id);
+
+ // Similar to the above routine but we don't know the heap region that
+ // contains the object to be marked/counted, which this routine looks up.
+ inline bool par_mark_and_count(oop obj, uint worker_id);
+
+ // Similar to the above routine but there are times when we cannot
+ // safely calculate the size of obj due to races and we, therefore,
+ // pass the size in as a parameter. It is the caller's reponsibility
+ // to ensure that the size passed in for obj is valid.
+ inline bool par_mark_and_count(oop obj, size_t word_size, uint worker_id);
+
+ // Unconditionally mark the given object, and unconditinally count
+ // the object in the counting structures for worker id 0.
+ // Should *not* be called from parallel code.
+ inline bool mark_and_count(oop obj, HeapRegion* hr);
+
+ // Similar to the above routine but we don't know the heap region that
+ // contains the object to be marked/counted, which this routine looks up.
+ // Should *not* be called from parallel code.
+ inline bool mark_and_count(oop obj);
+
+protected:
+ // Clear all the per-task bitmaps and arrays used to store the
+ // counting data.
+ void clear_all_count_data();
+
+ // Aggregates the counting data for each worker/task
+ // that was constructed while marking. Also sets
+ // the amount of marked bytes for each region and
+ // the top at concurrent mark count.
+ void aggregate_count_data();
+
+ // Verification routine
+ void verify_count_data();
};
// A class representing a marking task.
@@ -1031,6 +1231,12 @@ private:
TruncatedSeq _marking_step_diffs_ms;
+ // Counting data structures. Embedding the task's marked_bytes_array
+ // and card bitmap into the actual task saves having to go through
+ // the ConcurrentMark object.
+ size_t* _marked_bytes_array;
+ BitMap* _card_bm;
+
// LOTS of statistics related with this task
#if _MARKING_STATS_
NumberSeq _all_clock_intervals_ms;
@@ -1196,6 +1402,7 @@ public:
}
CMTask(int task_num, ConcurrentMark *cm,
+ size_t* marked_bytes, BitMap* card_bm,
CMTaskQueue* task_queue, CMTaskQueueSet* task_queues);
// it prints statistics associated with this task
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
index d72db9e..27c3411 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp
@@ -28,6 +28,214 @@
#include "gc_implementation/g1/concurrentMark.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
+// Returns the index in the liveness accounting card bitmap
+// for the given address
+inline BitMap::idx_t ConcurrentMark::card_bitmap_index_for(HeapWord* addr) {
+ // Below, the term "card num" means the result of shifting an address
+ // by the card shift -- address 0 corresponds to card number 0. One
+ // must subtract the card num of the bottom of the heap to obtain a
+ // card table index.
+
+ intptr_t card_num = intptr_t(uintptr_t(addr) >> CardTableModRefBS::card_shift);
+ return card_num - heap_bottom_card_num();
+}
+
+// Counts the given memory region in the given task/worker
+// counting data structures.
+inline void ConcurrentMark::count_region(MemRegion mr, HeapRegion* hr,
+ size_t* marked_bytes_array,
+ BitMap* task_card_bm) {
+ G1CollectedHeap* g1h = _g1h;
+ HeapWord* start = mr.start();
+ HeapWord* last = mr.last();
+ size_t region_size_bytes = mr.byte_size();
+ size_t index = hr->hrs_index();
+
+ assert(!hr->continuesHumongous(), "should not be HC region");
+ assert(hr == g1h->heap_region_containing(start), "sanity");
+ assert(hr == g1h->heap_region_containing(mr.last()), "sanity");
+ assert(marked_bytes_array != NULL, "pre-condition");
+ assert(task_card_bm != NULL, "pre-condition");
+
+ // Add to the task local marked bytes for this region.
+ marked_bytes_array[index] += region_size_bytes;
+
+ BitMap::idx_t start_idx = card_bitmap_index_for(start);
+ BitMap::idx_t last_idx = card_bitmap_index_for(last);
+
+ // The card bitmap is task/worker specific => no need to use 'par' routines.
+ // Set bits in the inclusive bit range [start_idx, last_idx].
+ //
+ // For small ranges use a simple loop; otherwise use set_range
+ // The range are the cards that are spanned by the object/region
+ // so 8 cards will allow objects/regions up to 4K to be handled
+ // using the loop.
+ if ((last_idx - start_idx) <= 8) {
+ for (BitMap::idx_t i = start_idx; i <= last_idx; i += 1) {
+ task_card_bm->set_bit(i);
+ }
+ } else {
+ assert(last_idx < task_card_bm->size(), "sanity");
+ // Note: BitMap::set_range() is exclusive.
+ task_card_bm->set_range(start_idx, last_idx+1);
+ }
+}
+
+// Counts the given memory region in the task/worker counting
+// data structures for the given worker id.
+inline void ConcurrentMark::count_region(MemRegion mr,
+ HeapRegion* hr,
+ uint worker_id) {
+ size_t* marked_bytes_array = count_marked_bytes_array_for(worker_id);
+ BitMap* task_card_bm = count_card_bitmap_for(worker_id);
+ count_region(mr, hr, marked_bytes_array, task_card_bm);
+}
+
+// Counts the given memory region, which may be a single object, in the
+// task/worker counting data structures for the given worker id.
+inline void ConcurrentMark::count_region(MemRegion mr, uint worker_id) {
+ HeapWord* addr = mr.start();
+ HeapRegion* hr = _g1h->heap_region_containing_raw(addr);
+ count_region(mr, hr, worker_id);
+}
+
+// Counts the given object in the given task/worker counting data structures.
+inline void ConcurrentMark::count_object(oop obj,
+ HeapRegion* hr,
+ size_t* marked_bytes_array,
+ BitMap* task_card_bm) {
+ MemRegion mr((HeapWord*)obj, obj->size());
+ count_region(mr, hr, marked_bytes_array, task_card_bm);
+}
+
+// Counts the given object in the task/worker counting data
+// structures for the given worker id.
+inline void ConcurrentMark::count_object(oop obj,
+ HeapRegion* hr,
+ uint worker_id) {
+ size_t* marked_bytes_array = count_marked_bytes_array_for(worker_id);
+ BitMap* task_card_bm = count_card_bitmap_for(worker_id);
+ HeapWord* addr = (HeapWord*) obj;
+ count_object(obj, hr, marked_bytes_array, task_card_bm);
+}
+
+// Attempts to mark the given object and, if successful, counts
+// the object in the given task/worker counting structures.
+inline bool ConcurrentMark::par_mark_and_count(oop obj,
+ HeapRegion* hr,
+ size_t* marked_bytes_array,
+ BitMap* task_card_bm) {
+ HeapWord* addr = (HeapWord*)obj;
+ if (_nextMarkBitMap->parMark(addr)) {
+ // Update the task specific count data for the object.
+ count_object(obj, hr, marked_bytes_array, task_card_bm);
+ return true;
+ }
+ return false;
+}
+
+// Attempts to mark the given object and, if successful, counts
+// the object in the task/worker counting structures for the
+// given worker id.
+inline bool ConcurrentMark::par_mark_and_count(oop obj,
+ size_t word_size,
+ HeapRegion* hr,
+ uint worker_id) {
+ HeapWord* addr = (HeapWord*)obj;
+ if (_nextMarkBitMap->parMark(addr)) {
+ MemRegion mr(addr, word_size);
+ count_region(mr, hr, worker_id);
+ return true;
+ }
+ return false;
+}
+
+// Attempts to mark the given object and, if successful, counts
+// the object in the task/worker counting structures for the
+// given worker id.
+inline bool ConcurrentMark::par_mark_and_count(oop obj,
+ HeapRegion* hr,
+ uint worker_id) {
+ HeapWord* addr = (HeapWord*)obj;
+ if (_nextMarkBitMap->parMark(addr)) {
+ // Update the task specific count data for the object.
+ count_object(obj, hr, worker_id);
+ return true;
+ }
+ return false;
+}
+
+// As above - but we don't know the heap region containing the
+// object and so have to supply it.
+inline bool ConcurrentMark::par_mark_and_count(oop obj, uint worker_id) {
+ HeapWord* addr = (HeapWord*)obj;
+ HeapRegion* hr = _g1h->heap_region_containing_raw(addr);
+ return par_mark_and_count(obj, hr, worker_id);
+}
+
+// Similar to the above routine but we already know the size, in words, of
+// the object that we wish to mark/count
+inline bool ConcurrentMark::par_mark_and_count(oop obj,
+ size_t word_size,
+ uint worker_id) {
+ HeapWord* addr = (HeapWord*)obj;
+ if (_nextMarkBitMap->parMark(addr)) {
+ // Update the task specific count data for the object.
+ MemRegion mr(addr, word_size);
+ count_region(mr, worker_id);
+ return true;
+ }
+ return false;
+}
+
+// Unconditionally mark the given object, and unconditinally count
+// the object in the counting structures for worker id 0.
+// Should *not* be called from parallel code.
+inline bool ConcurrentMark::mark_and_count(oop obj, HeapRegion* hr) {
+ HeapWord* addr = (HeapWord*)obj;
+ _nextMarkBitMap->mark(addr);
+ // Update the task specific count data for the object.
+ count_object(obj, hr, 0 /* worker_id */);
+ return true;
+}
+
+// As above - but we don't have the heap region containing the
+// object, so we have to supply it.
+inline bool ConcurrentMark::mark_and_count(oop obj) {
+ HeapWord* addr = (HeapWord*)obj;
+ HeapRegion* hr = _g1h->heap_region_containing_raw(addr);
+ return mark_and_count(obj, hr);
+}
+
+inline bool CMBitMapRO::iterate(BitMapClosure* cl, MemRegion mr) {
+ HeapWord* start_addr = MAX2(startWord(), mr.start());
+ HeapWord* end_addr = MIN2(endWord(), mr.end());
+
+ if (end_addr > start_addr) {
+ // Right-open interval [start-offset, end-offset).
+ BitMap::idx_t start_offset = heapWordToOffset(start_addr);
+ BitMap::idx_t end_offset = heapWordToOffset(end_addr);
+
+ start_offset = _bm.get_next_one_offset(start_offset, end_offset);
+ while (start_offset < end_offset) {
+ HeapWord* obj_addr = offsetToHeapWord(start_offset);
+ oop obj = (oop) obj_addr;
+ if (!cl->do_bit(start_offset)) {
+ return false;
+ }
+ HeapWord* next_addr = MIN2(obj_addr + obj->size(), end_addr);
+ BitMap::idx_t next_offset = heapWordToOffset(next_addr);
+ start_offset = _bm.get_next_one_offset(next_offset, end_offset);
+ }
+ }
+ return true;
+}
+
+inline bool CMBitMapRO::iterate(BitMapClosure* cl) {
+ MemRegion mr(startWord(), sizeInWords());
+ return iterate(cl, mr);
+}
+
inline void CMTask::push(oop obj) {
HeapWord* objAddr = (HeapWord*) obj;
assert(_g1h->is_in_g1_reserved(objAddr), "invariant");
@@ -84,7 +292,7 @@ inline void CMTask::deal_with_reference(oop obj) {
HeapWord* objAddr = (HeapWord*) obj;
assert(obj->is_oop_or_null(true /* ignore mark word */), "Error");
- if (_g1h->is_in_g1_reserved(objAddr)) {
+ if (_g1h->is_in_g1_reserved(objAddr)) {
assert(obj != NULL, "null check is implicit");
if (!_nextMarkBitMap->isMarked(objAddr)) {
// Only get the containing region if the object is not marked on the
@@ -98,9 +306,9 @@ inline void CMTask::deal_with_reference(oop obj) {
}
// we need to mark it first
- if (_nextMarkBitMap->parMark(objAddr)) {
+ if (_cm->par_mark_and_count(obj, hr, _marked_bytes_array, _card_bm)) {
// No OrderAccess:store_load() is needed. It is implicit in the
- // CAS done in parMark(objAddr) above
+ // CAS done in CMBitMap::parMark() call in the routine above.
HeapWord* global_finger = _cm->finger();
#if _CHECK_BOTH_FINGERS_
@@ -160,25 +368,20 @@ inline void ConcurrentMark::markPrev(oop p) {
((CMBitMap*)_prevMarkBitMap)->mark((HeapWord*) p);
}
-inline void ConcurrentMark::markNext(oop p) {
- assert(!_nextMarkBitMap->isMarked((HeapWord*) p), "sanity");
- _nextMarkBitMap->mark((HeapWord*) p);
-}
-
-inline void ConcurrentMark::grayRoot(oop obj, size_t word_size) {
+inline void ConcurrentMark::grayRoot(oop obj, size_t word_size,
+ uint worker_id, HeapRegion* hr) {
+ assert(obj != NULL, "pre-condition");
HeapWord* addr = (HeapWord*) obj;
-
- // Currently we don't do anything with word_size but we will use it
- // in the very near future in the liveness calculation piggy-backing
- // changes.
-
-#ifdef ASSERT
- HeapRegion* hr = _g1h->heap_region_containing(addr);
+ if (hr == NULL) {
+ hr = _g1h->heap_region_containing_raw(addr);
+ } else {
+ assert(hr->is_in(addr), "pre-condition");
+ }
assert(hr != NULL, "sanity");
- assert(!hr->is_survivor(), "should not allocate survivors during IM");
- assert(addr < hr->next_top_at_mark_start(),
- err_msg("addr: "PTR_FORMAT" hr: "HR_FORMAT" NTAMS: "PTR_FORMAT,
- addr, HR_FORMAT_PARAMS(hr), hr->next_top_at_mark_start()));
+ // Given that we're looking for a region that contains an object
+ // header it's impossible to get back a HC region.
+ assert(!hr->continuesHumongous(), "sanity");
+
// We cannot assert that word_size == obj->size() given that obj
// might not be in a consistent state (another thread might be in
// the process of copying it). So the best thing we can do is to
@@ -188,10 +391,11 @@ inline void ConcurrentMark::grayRoot(oop obj, size_t word_size) {
err_msg("size: "SIZE_FORMAT" capacity: "SIZE_FORMAT" "HR_FORMAT,
word_size * HeapWordSize, hr->capacity(),
HR_FORMAT_PARAMS(hr)));
-#endif // ASSERT
- if (!_nextMarkBitMap->isMarked(addr)) {
- _nextMarkBitMap->parMark(addr);
+ if (addr < hr->next_top_at_mark_start()) {
+ if (!_nextMarkBitMap->isMarked(addr)) {
+ par_mark_and_count(obj, word_size, hr, worker_id);
+ }
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
index e6d3c70..4dce368 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,9 +44,7 @@ ConcurrentMarkThread::ConcurrentMarkThread(ConcurrentMark* cm) :
_started(false),
_in_progress(false),
_vtime_accum(0.0),
- _vtime_mark_accum(0.0),
- _vtime_count_accum(0.0)
-{
+ _vtime_mark_accum(0.0) {
create_and_start();
}
@@ -94,9 +92,36 @@ void ConcurrentMarkThread::run() {
ResourceMark rm;
HandleMark hm;
double cycle_start = os::elapsedVTime();
- double mark_start_sec = os::elapsedTime();
char verbose_str[128];
+ // We have to ensure that we finish scanning the root regions
+ // before the next GC takes place. To ensure this we have to
+ // make sure that we do not join the STS until the root regions
+ // have been scanned. If we did then it's possible that a
+ // subsequent GC could block us from joining the STS and proceed
+ // without the root regions have been scanned which would be a
+ // correctness issue.
+
+ double scan_start = os::elapsedTime();
+ if (!cm()->has_aborted()) {
+ if (PrintGC) {
+ gclog_or_tty->date_stamp(PrintGCDateStamps);
+ gclog_or_tty->stamp(PrintGCTimeStamps);
+ gclog_or_tty->print_cr("[GC concurrent-root-region-scan-start]");
+ }
+
+ _cm->scanRootRegions();
+
+ double scan_end = os::elapsedTime();
+ if (PrintGC) {
+ gclog_or_tty->date_stamp(PrintGCDateStamps);
+ gclog_or_tty->stamp(PrintGCTimeStamps);
+ gclog_or_tty->print_cr("[GC concurrent-root-region-scan-end, %1.7lf]",
+ scan_end - scan_start);
+ }
+ }
+
+ double mark_start_sec = os::elapsedTime();
if (PrintGC) {
gclog_or_tty->date_stamp(PrintGCDateStamps);
gclog_or_tty->stamp(PrintGCTimeStamps);
@@ -148,36 +173,12 @@ void ConcurrentMarkThread::run() {
}
} while (cm()->restart_for_overflow());
- double counting_start_time = os::elapsedVTime();
- if (!cm()->has_aborted()) {
- double count_start_sec = os::elapsedTime();
- if (PrintGC) {
- gclog_or_tty->date_stamp(PrintGCDateStamps);
- gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-count-start]");
- }
-
- _sts.join();
- _cm->calcDesiredRegions();
- _sts.leave();
-
- if (!cm()->has_aborted()) {
- double count_end_sec = os::elapsedTime();
- if (PrintGC) {
- gclog_or_tty->date_stamp(PrintGCDateStamps);
- gclog_or_tty->stamp(PrintGCTimeStamps);
- gclog_or_tty->print_cr("[GC concurrent-count-end, %1.7lf]",
- count_end_sec - count_start_sec);
- }
- }
- }
-
double end_time = os::elapsedVTime();
- _vtime_count_accum += (end_time - counting_start_time);
// Update the total virtual time before doing this, since it will try
// to measure it to get the vtime for this marking. We purposely
// neglect the presumably-short "completeCleanup" phase here.
_vtime_accum = (end_time - _vtime_start);
+
if (!cm()->has_aborted()) {
if (g1_policy->adaptive_young_list_length()) {
double now = os::elapsedTime();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp
index 84bdb59..5f3d9ee 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,7 +40,6 @@ class ConcurrentMarkThread: public ConcurrentGCThread {
double _vtime_accum; // Accumulated virtual time.
double _vtime_mark_accum;
- double _vtime_count_accum;
public:
virtual void run();
@@ -69,8 +68,6 @@ class ConcurrentMarkThread: public ConcurrentGCThread {
double vtime_accum();
// Marking virtual time so far
double vtime_mark_accum();
- // Counting virtual time so far.
- double vtime_count_accum() { return _vtime_count_accum; }
ConcurrentMark* cm() { return _cm; }
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index f1645f3..414d717 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -174,13 +174,10 @@ public:
}
};
-YoungList::YoungList(G1CollectedHeap* g1h)
- : _g1h(g1h), _head(NULL),
- _length(0),
- _last_sampled_rs_lengths(0),
- _survivor_head(NULL), _survivor_tail(NULL), _survivor_length(0)
-{
- guarantee( check_list_empty(false), "just making sure..." );
+YoungList::YoungList(G1CollectedHeap* g1h) :
+ _g1h(g1h), _head(NULL), _length(0), _last_sampled_rs_lengths(0),
+ _survivor_head(NULL), _survivor_tail(NULL), _survivor_length(0) {
+ guarantee(check_list_empty(false), "just making sure...");
}
void YoungList::push_region(HeapRegion *hr) {
@@ -961,7 +958,7 @@ HeapWord* G1CollectedHeap::attempt_allocation_slow(size_t word_size,
should_try_gc = false;
} else {
// Read the GC count while still holding the Heap_lock.
- gc_count_before = SharedHeap::heap()->total_collections();
+ gc_count_before = total_collections();
should_try_gc = true;
}
}
@@ -979,7 +976,7 @@ HeapWord* G1CollectedHeap::attempt_allocation_slow(size_t word_size,
// failed to allocate. No point in trying to allocate
// further. We'll just return NULL.
MutexLockerEx x(Heap_lock);
- *gc_count_before_ret = SharedHeap::heap()->total_collections();
+ *gc_count_before_ret = total_collections();
return NULL;
}
} else {
@@ -1029,6 +1026,16 @@ HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size,
assert(isHumongous(word_size), "attempt_allocation_humongous() "
"should only be called for humongous allocations");
+ // Humongous objects can exhaust the heap quickly, so we should check if we
+ // need to start a marking cycle at each humongous object allocation. We do
+ // the check before we do the actual allocation. The reason for doing it
+ // before the allocation is that we avoid having to keep track of the newly
+ // allocated memory while we do a GC.
+ if (g1_policy()->need_to_start_conc_mark("concurrent humongous allocation",
+ word_size)) {
+ collect(GCCause::_g1_humongous_allocation);
+ }
+
// We will loop until a) we manage to successfully perform the
// allocation or b) we successfully schedule a collection which
// fails to perform the allocation. b) is the only case when we'll
@@ -1053,7 +1060,7 @@ HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size,
should_try_gc = false;
} else {
// Read the GC count while still holding the Heap_lock.
- gc_count_before = SharedHeap::heap()->total_collections();
+ gc_count_before = total_collections();
should_try_gc = true;
}
}
@@ -1075,7 +1082,7 @@ HeapWord* G1CollectedHeap::attempt_allocation_humongous(size_t word_size,
// failed to allocate. No point in trying to allocate
// further. We'll just return NULL.
MutexLockerEx x(Heap_lock);
- *gc_count_before_ret = SharedHeap::heap()->total_collections();
+ *gc_count_before_ret = total_collections();
return NULL;
}
} else {
@@ -1111,7 +1118,11 @@ HeapWord* G1CollectedHeap::attempt_allocation_at_safepoint(size_t word_size,
return _mutator_alloc_region.attempt_allocation_locked(word_size,
false /* bot_updates */);
} else {
- return humongous_obj_allocate(word_size);
+ HeapWord* result = humongous_obj_allocate(word_size);
+ if (result != NULL && g1_policy()->need_to_start_conc_mark("STW humongous allocation")) {
+ g1_policy()->set_initiate_conc_mark_if_possible();
+ }
+ return result;
}
ShouldNotReachHere();
@@ -1228,9 +1239,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
SvcGCMarker sgcm(SvcGCMarker::FULL);
ResourceMark rm;
- if (PrintHeapAtGC) {
- Universe::print_heap_before_gc();
- }
+ print_heap_before_gc();
HRSPhaseSetter x(HRSPhaseFullGC);
verify_region_sets_optional();
@@ -1257,7 +1266,18 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
double start = os::elapsedTime();
g1_policy()->record_full_collection_start();
+ // Note: When we have a more flexible GC logging framework that
+ // allows us to add optional attributes to a GC log record we
+ // could consider timing and reporting how long we wait in the
+ // following two methods.
wait_while_free_regions_coming();
+ // If we start the compaction before the CM threads finish
+ // scanning the root regions we might trip them over as we'll
+ // be moving objects / updating references. So let's wait until
+ // they are done. By telling them to abort, they should complete
+ // early.
+ _cm->root_regions()->abort();
+ _cm->root_regions()->wait_until_scan_finished();
append_secondary_free_list_if_not_empty_with_lock();
gc_prologue(true);
@@ -1286,7 +1306,8 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
ref_processor_cm()->verify_no_references_recorded();
// Abandon current iterations of concurrent marking and concurrent
- // refinement, if any are in progress.
+ // refinement, if any are in progress. We have to do this before
+ // wait_until_scan_finished() below.
concurrent_mark()->abort();
// Make sure we'll choose a new allocation region afterwards.
@@ -1470,9 +1491,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
_hrs.verify_optional();
verify_region_sets_optional();
- if (PrintHeapAtGC) {
- Universe::print_heap_after_gc();
- }
+ print_heap_after_gc();
g1mm()->update_sizes();
post_full_gc_dump();
@@ -2293,9 +2312,12 @@ size_t G1CollectedHeap::unsafe_max_alloc() {
}
bool G1CollectedHeap::should_do_concurrent_full_gc(GCCause::Cause cause) {
- return
- ((cause == GCCause::_gc_locker && GCLockerInvokesConcurrent) ||
- (cause == GCCause::_java_lang_system_gc && ExplicitGCInvokesConcurrent));
+ switch (cause) {
+ case GCCause::_gc_locker: return GCLockerInvokesConcurrent;
+ case GCCause::_java_lang_system_gc: return ExplicitGCInvokesConcurrent;
+ case GCCause::_g1_humongous_allocation: return true;
+ default: return false;
+ }
}
#ifndef PRODUCT
@@ -2389,47 +2411,66 @@ void G1CollectedHeap::collect_as_vm_thread(GCCause::Cause cause) {
}
void G1CollectedHeap::collect(GCCause::Cause cause) {
- // The caller doesn't have the Heap_lock
- assert(!Heap_lock->owned_by_self(), "this thread should not own the Heap_lock");
+ assert_heap_not_locked();
unsigned int gc_count_before;
unsigned int full_gc_count_before;
- {
- MutexLocker ml(Heap_lock);
-
- // Read the GC count while holding the Heap_lock
- gc_count_before = SharedHeap::heap()->total_collections();
- full_gc_count_before = SharedHeap::heap()->total_full_collections();
- }
-
- if (should_do_concurrent_full_gc(cause)) {
- // Schedule an initial-mark evacuation pause that will start a
- // concurrent cycle. We're setting word_size to 0 which means that
- // we are not requesting a post-GC allocation.
- VM_G1IncCollectionPause op(gc_count_before,
- 0, /* word_size */
- true, /* should_initiate_conc_mark */
- g1_policy()->max_pause_time_ms(),
- cause);
- VMThread::execute(&op);
- } else {
- if (cause == GCCause::_gc_locker
- DEBUG_ONLY(|| cause == GCCause::_scavenge_alot)) {
+ bool retry_gc;
- // Schedule a standard evacuation pause. We're setting word_size
- // to 0 which means that we are not requesting a post-GC allocation.
+ do {
+ retry_gc = false;
+
+ {
+ MutexLocker ml(Heap_lock);
+
+ // Read the GC count while holding the Heap_lock
+ gc_count_before = total_collections();
+ full_gc_count_before = total_full_collections();
+ }
+
+ if (should_do_concurrent_full_gc(cause)) {
+ // Schedule an initial-mark evacuation pause that will start a
+ // concurrent cycle. We're setting word_size to 0 which means that
+ // we are not requesting a post-GC allocation.
VM_G1IncCollectionPause op(gc_count_before,
0, /* word_size */
- false, /* should_initiate_conc_mark */
+ true, /* should_initiate_conc_mark */
g1_policy()->max_pause_time_ms(),
cause);
VMThread::execute(&op);
+ if (!op.pause_succeeded()) {
+ // Another GC got scheduled and prevented us from scheduling
+ // the initial-mark GC. It's unlikely that the GC that
+ // pre-empted us was also an initial-mark GC. So, we'll retry
+ // the initial-mark GC.
+
+ if (full_gc_count_before == total_full_collections()) {
+ retry_gc = true;
+ } else {
+ // A Full GC happened while we were trying to schedule the
+ // initial-mark GC. No point in starting a new cycle given
+ // that the whole heap was collected anyway.
+ }
+ }
} else {
- // Schedule a Full GC.
- VM_G1CollectFull op(gc_count_before, full_gc_count_before, cause);
- VMThread::execute(&op);
+ if (cause == GCCause::_gc_locker
+ DEBUG_ONLY(|| cause == GCCause::_scavenge_alot)) {
+
+ // Schedule a standard evacuation pause. We're setting word_size
+ // to 0 which means that we are not requesting a post-GC allocation.
+ VM_G1IncCollectionPause op(gc_count_before,
+ 0, /* word_size */
+ false, /* should_initiate_conc_mark */
+ g1_policy()->max_pause_time_ms(),
+ cause);
+ VMThread::execute(&op);
+ } else {
+ // Schedule a Full GC.
+ VM_G1CollectFull op(gc_count_before, full_gc_count_before, cause);
+ VMThread::execute(&op);
+ }
}
- }
+ } while (retry_gc);
}
bool G1CollectedHeap::is_in(const void* p) const {
@@ -3130,12 +3171,12 @@ void G1CollectedHeap::verify(bool allow_dirty,
// We apply the relevant closures to all the oops in the
// system dictionary, the string table and the code cache.
- const int so = SharedHeap::SO_AllClasses | SharedHeap::SO_Strings | SharedHeap::SO_CodeCache;
+ const int so = SO_AllClasses | SO_Strings | SO_CodeCache;
process_strong_roots(true, // activate StrongRootsScope
true, // we set "collecting perm gen" to true,
// so we don't reset the dirty cards in the perm gen.
- SharedHeap::ScanningOption(so), // roots scanning options
+ ScanningOption(so), // roots scanning options
&rootsCl,
&blobsCl,
&rootsCl);
@@ -3406,16 +3447,6 @@ G1CollectedHeap::doConcurrentMark() {
}
}
-double G1CollectedHeap::predict_region_elapsed_time_ms(HeapRegion *hr,
- bool young) {
- return _g1_policy->predict_region_elapsed_time_ms(hr, young);
-}
-
-void G1CollectedHeap::check_if_region_is_too_expensive(double
- predicted_time_ms) {
- _g1_policy->check_if_region_is_too_expensive(predicted_time_ms);
-}
-
size_t G1CollectedHeap::pending_card_num() {
size_t extra_cards = 0;
JavaThread *curr = Threads::first();
@@ -3537,27 +3568,31 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
SvcGCMarker sgcm(SvcGCMarker::MINOR);
ResourceMark rm;
- if (PrintHeapAtGC) {
- Universe::print_heap_before_gc();
- }
+ print_heap_before_gc();
HRSPhaseSetter x(HRSPhaseEvacuation);
verify_region_sets_optional();
verify_dirty_young_regions();
- {
- // This call will decide whether this pause is an initial-mark
- // pause. If it is, during_initial_mark_pause() will return true
- // for the duration of this pause.
- g1_policy()->decide_on_conc_mark_initiation();
+ // This call will decide whether this pause is an initial-mark
+ // pause. If it is, during_initial_mark_pause() will return true
+ // for the duration of this pause.
+ g1_policy()->decide_on_conc_mark_initiation();
+
+ // We do not allow initial-mark to be piggy-backed on a mixed GC.
+ assert(!g1_policy()->during_initial_mark_pause() ||
+ g1_policy()->gcs_are_young(), "sanity");
- // We do not allow initial-mark to be piggy-backed on a mixed GC.
- assert(!g1_policy()->during_initial_mark_pause() ||
- g1_policy()->gcs_are_young(), "sanity");
+ // We also do not allow mixed GCs during marking.
+ assert(!mark_in_progress() || g1_policy()->gcs_are_young(), "sanity");
- // We also do not allow mixed GCs during marking.
- assert(!mark_in_progress() || g1_policy()->gcs_are_young(), "sanity");
+ // Record whether this pause is an initial mark. When the current
+ // thread has completed its logging output and it's safe to signal
+ // the CM thread, the flag's value in the policy has been reset.
+ bool should_start_conc_mark = g1_policy()->during_initial_mark_pause();
+ // Inner scope for scope based logging, timers, and stats collection
+ {
char verbose_str[128];
sprintf(verbose_str, "GC pause ");
if (g1_policy()->gcs_are_young()) {
@@ -3613,7 +3648,6 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
Universe::verify(/* allow dirty */ false,
/* silent */ false,
/* option */ VerifyOption_G1UsePrevMarking);
-
}
COMPILER2_PRESENT(DerivedPointerTable::clear());
@@ -3656,6 +3690,18 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
g1_policy()->record_collection_pause_start(start_time_sec,
start_used_bytes);
+ double scan_wait_start = os::elapsedTime();
+ // We have to wait until the CM threads finish scanning the
+ // root regions as it's the only way to ensure that all the
+ // objects on them have been correctly scanned before we start
+ // moving them during the GC.
+ bool waited = _cm->root_regions()->wait_until_scan_finished();
+ if (waited) {
+ double scan_wait_end = os::elapsedTime();
+ double wait_time_ms = (scan_wait_end - scan_wait_start) * 1000.0;
+ g1_policy()->record_root_region_scan_wait_time(wait_time_ms);
+ }
+
#if YOUNG_LIST_VERBOSE
gclog_or_tty->print_cr("\nAfter recording pause start.\nYoung_list:");
_young_list->print();
@@ -3672,12 +3718,12 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
g1_policy()->print_collection_set(g1_policy()->inc_cset_head(), gclog_or_tty);
#endif // YOUNG_LIST_VERBOSE
- g1_policy()->choose_collection_set(target_pause_time_ms);
+ g1_policy()->finalize_cset(target_pause_time_ms);
_cm->note_start_of_gc();
// We should not verify the per-thread SATB buffers given that
// we have not filtered them yet (we'll do so during the
- // GC). We also call this after choose_collection_set() to
+ // GC). We also call this after finalize_cset() to
// ensure that the CSet has been finalized.
_cm->verify_no_cset_oops(true /* verify_stacks */,
true /* verify_enqueued_buffers */,
@@ -3765,16 +3811,14 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
}
if (g1_policy()->during_initial_mark_pause()) {
+ // We have to do this before we notify the CM threads that
+ // they can start working to make sure that all the
+ // appropriate initialization is done on the CM object.
concurrent_mark()->checkpointRootsInitialPost();
set_marking_started();
- // CAUTION: after the doConcurrentMark() call below,
- // the concurrent marking thread(s) could be running
- // concurrently with us. Make sure that anything after
- // this point does not assume that we are the only GC thread
- // running. Note: of course, the actual marking work will
- // not start until the safepoint itself is released in
- // ConcurrentGCThread::safepoint_desynchronize().
- doConcurrentMark();
+ // Note that we don't actually trigger the CM thread at
+ // this point. We do that later when we're sure that
+ // the current thread has completed its logging output.
}
allocate_dummy_regions();
@@ -3884,15 +3928,22 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
}
}
+ // The closing of the inner scope, immediately above, will complete
+ // the PrintGC logging output. The record_collection_pause_end() call
+ // above will complete the logging output of PrintGCDetails.
+ //
+ // It is not yet to safe, however, to tell the concurrent mark to
+ // start as we have some optional output below. We don't want the
+ // output from the concurrent mark thread interfering with this
+ // logging output either.
+
_hrs.verify_optional();
verify_region_sets_optional();
TASKQUEUE_STATS_ONLY(if (ParallelGCVerbose) print_taskqueue_stats());
TASKQUEUE_STATS_ONLY(reset_taskqueue_stats());
- if (PrintHeapAtGC) {
- Universe::print_heap_after_gc();
- }
+ print_heap_after_gc();
g1mm()->update_sizes();
if (G1SummarizeRSetStats &&
@@ -3901,6 +3952,21 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
g1_rem_set()->print_summary_info();
}
+ // It should now be safe to tell the concurrent mark thread to start
+ // without its logging output interfering with the logging output
+ // that came from the pause.
+
+ if (should_start_conc_mark) {
+ // CAUTION: after the doConcurrentMark() call below,
+ // the concurrent marking thread(s) could be running
+ // concurrently with us. Make sure that anything after
+ // this point does not assume that we are the only GC thread
+ // running. Note: of course, the actual marking work will
+ // not start until the safepoint itself is released in
+ // ConcurrentGCThread::safepoint_desynchronize().
+ doConcurrentMark();
+ }
+
return true;
}
@@ -4162,7 +4228,7 @@ HeapWord* G1CollectedHeap::par_allocate_during_gc(GCAllocPurpose purpose,
G1ParGCAllocBuffer::G1ParGCAllocBuffer(size_t gclab_word_size) :
ParGCAllocBuffer(gclab_word_size), _retired(false) { }
-G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, int queue_num)
+G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num)
: _g1h(g1h),
_refs(g1h->task_queue(queue_num)),
_dcq(&g1h->dirty_card_queue_set()),
@@ -4283,6 +4349,7 @@ G1ParClosureSuper::G1ParClosureSuper(G1CollectedHeap* g1,
G1ParScanThreadState* par_scan_state) :
_g1(g1), _g1_rem(_g1->g1_rem_set()), _cm(_g1->concurrent_mark()),
_par_scan_state(par_scan_state),
+ _worker_id(par_scan_state->queue_num()),
_during_initial_mark(_g1->g1_policy()->during_initial_mark_pause()),
_mark_in_progress(_g1->mark_in_progress()) { }
@@ -4294,7 +4361,7 @@ void G1ParCopyHelper::mark_object(oop obj) {
#endif // ASSERT
// We know that the object is not moving so it's safe to read its size.
- _cm->grayRoot(obj, (size_t) obj->size());
+ _cm->grayRoot(obj, (size_t) obj->size(), _worker_id);
}
void G1ParCopyHelper::mark_forwarded_object(oop from_obj, oop to_obj) {
@@ -4316,7 +4383,7 @@ void G1ParCopyHelper::mark_forwarded_object(oop from_obj, oop to_obj) {
// worker so we cannot trust that its to-space image is
// well-formed. So we have to read its size from its from-space
// image which we know should not be changing.
- _cm->grayRoot(to_obj, (size_t) from_obj->size());
+ _cm->grayRoot(to_obj, (size_t) from_obj->size(), _worker_id);
}
oop G1ParCopyHelper::copy_to_survivor_space(oop old) {
@@ -4406,6 +4473,8 @@ void G1ParCopyClosure<do_gen_barrier, barrier, do_mark_object>
assert(barrier != G1BarrierRS || obj != NULL,
"Precondition: G1BarrierRS implies obj is non-NULL");
+ assert(_worker_id == _par_scan_state->queue_num(), "sanity");
+
// here the null check is implicit in the cset_fast_test() test
if (_g1->in_cset_fast_test(obj)) {
oop forwardee;
@@ -4424,7 +4493,7 @@ void G1ParCopyClosure<do_gen_barrier, barrier, do_mark_object>
// When scanning the RS, we only care about objs in CS.
if (barrier == G1BarrierRS) {
- _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
+ _par_scan_state->update_rs(_from, p, _worker_id);
}
} else {
// The object is not in collection set. If we're a root scanning
@@ -4436,7 +4505,7 @@ void G1ParCopyClosure<do_gen_barrier, barrier, do_mark_object>
}
if (barrier == G1BarrierEvac && obj != NULL) {
- _par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
+ _par_scan_state->update_rs(_from, p, _worker_id);
}
if (do_gen_barrier && obj != NULL) {
@@ -4677,7 +4746,7 @@ public:
void
G1CollectedHeap::
g1_process_strong_roots(bool collecting_perm_gen,
- SharedHeap::ScanningOption so,
+ ScanningOption so,
OopClosure* scan_non_heap_roots,
OopsInHeapRegionClosure* scan_rs,
OopsInGenClosure* scan_perm,
@@ -5666,16 +5735,6 @@ void G1CollectedHeap::free_collection_set(HeapRegion* cs_head) {
// And the region is empty.
assert(!used_mr.is_empty(), "Should not have empty regions in a CS.");
-
- // If marking is in progress then clear any objects marked in
- // the current region. Note mark_in_progress() returns false,
- // even during an initial mark pause, until the set_marking_started()
- // call which takes place later in the pause.
- if (mark_in_progress()) {
- assert(!g1_policy()->during_initial_mark_pause(), "sanity");
- _cm->nextMarkBitMap()->clearRange(used_mr);
- }
-
free_region(cur, &pre_used, &local_free_list, false /* par */);
} else {
cur->uninstall_surv_rate_group();
@@ -5742,8 +5801,9 @@ void G1CollectedHeap::set_free_regions_coming() {
}
void G1CollectedHeap::reset_free_regions_coming() {
+ assert(free_regions_coming(), "pre-condition");
+
{
- assert(free_regions_coming(), "pre-condition");
MutexLockerEx x(SecondaryFreeList_lock, Mutex::_no_safepoint_check_flag);
_free_regions_coming = false;
SecondaryFreeList_lock->notify_all();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
index 30b7fed..c1ccc4f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
@@ -355,6 +355,7 @@ private:
// explicitly started if:
// (a) cause == _gc_locker and +GCLockerInvokesConcurrent, or
// (b) cause == _java_lang_system_gc and +ExplicitGCInvokesConcurrent.
+ // (c) cause == _g1_humongous_allocation
bool should_do_concurrent_full_gc(GCCause::Cause cause);
// Keeps track of how many "full collections" (i.e., Full GCs or
@@ -769,7 +770,7 @@ protected:
// the "i" of the calling parallel worker thread's work(i) function.
// In the sequential case this param will be ignored.
void g1_process_strong_roots(bool collecting_perm_gen,
- SharedHeap::ScanningOption so,
+ ScanningOption so,
OopClosure* scan_non_heap_roots,
OopsInHeapRegionClosure* scan_rs,
OopsInGenClosure* scan_perm,
@@ -1172,11 +1173,21 @@ public:
_old_set.remove(hr);
}
+ size_t non_young_capacity_bytes() {
+ return _old_set.total_capacity_bytes() + _humongous_set.total_capacity_bytes();
+ }
+
void set_free_regions_coming();
void reset_free_regions_coming();
bool free_regions_coming() { return _free_regions_coming; }
void wait_while_free_regions_coming();
+ // Determine whether the given region is one that we are using as an
+ // old GC alloc region.
+ bool is_old_gc_alloc_region(HeapRegion* hr) {
+ return hr == _retained_old_gc_alloc_region;
+ }
+
// Perform a collection of the heap; intended for use in implementing
// "System.gc". This probably implies as full a collection as the
// "CollectedHeap" supports.
@@ -1657,8 +1668,6 @@ public:
public:
void stop_conc_gc_threads();
- double predict_region_elapsed_time_ms(HeapRegion* hr, bool young);
- void check_if_region_is_too_expensive(double predicted_time_ms);
size_t pending_card_num();
size_t max_pending_card_num();
size_t cards_scanned();
@@ -1904,7 +1913,7 @@ protected:
G1ParScanPartialArrayClosure* _partial_scan_cl;
int _hash_seed;
- int _queue_num;
+ uint _queue_num;
size_t _term_attempts;
@@ -1948,7 +1957,7 @@ protected:
}
public:
- G1ParScanThreadState(G1CollectedHeap* g1h, int queue_num);
+ G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num);
~G1ParScanThreadState() {
FREE_C_HEAP_ARRAY(size_t, _surviving_young_words_base);
@@ -2040,7 +2049,7 @@ public:
}
int* hash_seed() { return &_hash_seed; }
- int queue_num() { return _queue_num; }
+ uint queue_num() { return _queue_num; }
size_t term_attempts() const { return _term_attempts; }
void note_term_attempt() { _term_attempts++; }
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
index f32db16..f63d79c 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
@@ -141,6 +141,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
_cur_clear_ct_time_ms(0.0),
_mark_closure_time_ms(0.0),
+ _root_region_scan_wait_time_ms(0.0),
_cur_ref_proc_time_ms(0.0),
_cur_ref_enq_time_ms(0.0),
@@ -205,7 +206,6 @@ G1CollectorPolicy::G1CollectorPolicy() :
_initiate_conc_mark_if_possible(false),
_during_initial_mark_pause(false),
- _should_revert_to_young_gcs(false),
_last_young_gc(false),
_last_gc_was_young(false),
@@ -213,8 +213,6 @@ G1CollectorPolicy::G1CollectorPolicy() :
_survivor_bytes_before_gc(0),
_capacity_before_gc(0),
- _prev_collection_pause_used_at_end_bytes(0),
-
_eden_cset_region_length(0),
_survivor_cset_region_length(0),
_old_cset_region_length(0),
@@ -296,9 +294,6 @@ G1CollectorPolicy::G1CollectorPolicy() :
_par_last_gc_worker_times_ms = new double[_parallel_gc_threads];
_par_last_gc_worker_other_times_ms = new double[_parallel_gc_threads];
- // start conservatively
- _expensive_region_limit_ms = 0.5 * (double) MaxGCPauseMillis;
-
int index;
if (ParallelGCThreads == 0)
index = 0;
@@ -630,16 +625,9 @@ void G1CollectorPolicy::update_young_list_target_length(size_t rs_lengths) {
// possible to maximize how many old regions we can add to it.
}
} else {
- if (gcs_are_young()) {
- young_list_target_length = _young_list_fixed_length;
- } else {
- // A bit arbitrary: during mixed GCs we allocate half
- // the young regions to try to add old regions to the CSet.
- young_list_target_length = _young_list_fixed_length / 2;
- // We choose to accept that we might go under the desired min
- // length given that we intentionally ask for a smaller young gen.
- desired_min_length = absolute_min_length;
- }
+ // The user asked for a fixed young gen so we'll fix the young gen
+ // whether the next GC is young or mixed.
+ young_list_target_length = _young_list_fixed_length;
}
// Make sure we don't go over the desired max length, nor under the
@@ -873,7 +861,6 @@ void G1CollectorPolicy::record_full_collection_end() {
// transitions and make sure we start with young GCs after the Full GC.
set_gcs_are_young(true);
_last_young_gc = false;
- _should_revert_to_young_gcs = false;
clear_initiate_conc_mark_if_possible();
clear_during_initial_mark_pause();
_known_garbage_bytes = 0;
@@ -890,7 +877,7 @@ void G1CollectorPolicy::record_full_collection_end() {
// Reset survivors SurvRateGroup.
_survivor_surv_rate_group->reset();
update_young_list_target_length();
- _collectionSetChooser->updateAfterFullCollection();
+ _collectionSetChooser->clearMarkedHeapRegions();
}
void G1CollectorPolicy::record_stop_world_start() {
@@ -905,19 +892,10 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
gclog_or_tty->print(" (%s)", gcs_are_young() ? "young" : "mixed");
}
- if (!during_initial_mark_pause()) {
- // We only need to do this here as the policy will only be applied
- // to the GC we're about to start. so, no point is calculating this
- // every time we calculate / recalculate the target young length.
- update_survivors_policy();
- } else {
- // The marking phase has a "we only copy implicitly live
- // objects during marking" invariant. The easiest way to ensure it
- // holds is not to allocate any survivor regions and tenure all
- // objects. In the future we might change this and handle survivor
- // regions specially during marking.
- tenure_all_objects();
- }
+ // We only need to do this here as the policy will only be applied
+ // to the GC we're about to start. so, no point is calculating this
+ // every time we calculate / recalculate the target young length.
+ update_survivors_policy();
assert(_g1->used() == _g1->recalculate_used(),
err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
@@ -969,6 +947,9 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
// This is initialized to zero here and is set during
// the evacuation pause if marking is in progress.
_cur_satb_drain_time_ms = 0.0;
+ // This is initialized to zero here and is set during the evacuation
+ // pause if we actually waited for the root region scanning to finish.
+ _root_region_scan_wait_time_ms = 0.0;
_last_gc_was_young = false;
@@ -1007,7 +988,6 @@ void G1CollectorPolicy::record_concurrent_mark_cleanup_start() {
}
void G1CollectorPolicy::record_concurrent_mark_cleanup_completed() {
- _should_revert_to_young_gcs = false;
_last_young_gc = true;
_in_marking_window = false;
}
@@ -1140,6 +1120,50 @@ double G1CollectorPolicy::max_sum(double* data1, double* data2) {
return ret;
}
+bool G1CollectorPolicy::need_to_start_conc_mark(const char* source, size_t alloc_word_size) {
+ if (_g1->concurrent_mark()->cmThread()->during_cycle()) {
+ return false;
+ }
+
+ size_t marking_initiating_used_threshold =
+ (_g1->capacity() / 100) * InitiatingHeapOccupancyPercent;
+ size_t cur_used_bytes = _g1->non_young_capacity_bytes();
+ size_t alloc_byte_size = alloc_word_size * HeapWordSize;
+
+ if ((cur_used_bytes + alloc_byte_size) > marking_initiating_used_threshold) {
+ if (gcs_are_young()) {
+ ergo_verbose5(ErgoConcCycles,
+ "request concurrent cycle initiation",
+ ergo_format_reason("occupancy higher than threshold")
+ ergo_format_byte("occupancy")
+ ergo_format_byte("allocation request")
+ ergo_format_byte_perc("threshold")
+ ergo_format_str("source"),
+ cur_used_bytes,
+ alloc_byte_size,
+ marking_initiating_used_threshold,
+ (double) InitiatingHeapOccupancyPercent,
+ source);
+ return true;
+ } else {
+ ergo_verbose5(ErgoConcCycles,
+ "do not request concurrent cycle initiation",
+ ergo_format_reason("still doing mixed collections")
+ ergo_format_byte("occupancy")
+ ergo_format_byte("allocation request")
+ ergo_format_byte_perc("threshold")
+ ergo_format_str("source"),
+ cur_used_bytes,
+ alloc_byte_size,
+ marking_initiating_used_threshold,
+ (double) InitiatingHeapOccupancyPercent,
+ source);
+ }
+ }
+
+ return false;
+}
+
// Anything below that is considered to be zero
#define MIN_TIMER_GRANULARITY 0.0000001
@@ -1166,45 +1190,15 @@ void G1CollectorPolicy::record_collection_pause_end(int no_of_gc_threads) {
#endif // PRODUCT
last_pause_included_initial_mark = during_initial_mark_pause();
- if (last_pause_included_initial_mark)
+ if (last_pause_included_initial_mark) {
record_concurrent_mark_init_end(0.0);
-
- size_t marking_initiating_used_threshold =
- (_g1->capacity() / 100) * InitiatingHeapOccupancyPercent;
-
- if (!_g1->mark_in_progress() && !_last_young_gc) {
- assert(!last_pause_included_initial_mark, "invariant");
- if (cur_used_bytes > marking_initiating_used_threshold) {
- if (cur_used_bytes > _prev_collection_pause_used_at_end_bytes) {
- assert(!during_initial_mark_pause(), "we should not see this here");
-
- ergo_verbose3(ErgoConcCycles,
- "request concurrent cycle initiation",
- ergo_format_reason("occupancy higher than threshold")
- ergo_format_byte("occupancy")
- ergo_format_byte_perc("threshold"),
- cur_used_bytes,
- marking_initiating_used_threshold,
- (double) InitiatingHeapOccupancyPercent);
-
- // Note: this might have already been set, if during the last
- // pause we decided to start a cycle but at the beginning of
- // this pause we decided to postpone it. That's OK.
- set_initiate_conc_mark_if_possible();
- } else {
- ergo_verbose2(ErgoConcCycles,
- "do not request concurrent cycle initiation",
- ergo_format_reason("occupancy lower than previous occupancy")
- ergo_format_byte("occupancy")
- ergo_format_byte("previous occupancy"),
- cur_used_bytes,
- _prev_collection_pause_used_at_end_bytes);
- }
- }
+ } else if (!_last_young_gc && need_to_start_conc_mark("end of GC")) {
+ // Note: this might have already been set, if during the last
+ // pause we decided to start a cycle but at the beginning of
+ // this pause we decided to postpone it. That's OK.
+ set_initiate_conc_mark_if_possible();
}
- _prev_collection_pause_used_at_end_bytes = cur_used_bytes;
-
_mmu_tracker->add_pause(end_time_sec - elapsed_ms/1000.0,
end_time_sec, false);
@@ -1257,6 +1251,10 @@ void G1CollectorPolicy::record_collection_pause_end(int no_of_gc_threads) {
// is in progress.
other_time_ms -= _cur_satb_drain_time_ms;
+ // Subtract the root region scanning wait time. It's initialized to
+ // zero at the start of the pause.
+ other_time_ms -= _root_region_scan_wait_time_ms;
+
if (parallel) {
other_time_ms -= _cur_collection_par_time_ms;
} else {
@@ -1289,6 +1287,8 @@ void G1CollectorPolicy::record_collection_pause_end(int no_of_gc_threads) {
// each other. Therefore we unconditionally record the SATB drain
// time - even if it's zero.
body_summary->record_satb_drain_time_ms(_cur_satb_drain_time_ms);
+ body_summary->record_root_region_scan_wait_time_ms(
+ _root_region_scan_wait_time_ms);
body_summary->record_ext_root_scan_time_ms(ext_root_scan_time);
body_summary->record_satb_filtering_time_ms(satb_filtering_time);
@@ -1385,6 +1385,9 @@ void G1CollectorPolicy::record_collection_pause_end(int no_of_gc_threads) {
(last_pause_included_initial_mark) ? " (initial-mark)" : "",
elapsed_ms / 1000.0);
+ if (_root_region_scan_wait_time_ms > 0.0) {
+ print_stats(1, "Root Region Scan Waiting", _root_region_scan_wait_time_ms);
+ }
if (parallel) {
print_stats(1, "Parallel Time", _cur_collection_par_time_ms);
print_par_stats(2, "GC Worker Start", _par_last_gc_worker_start_times_ms);
@@ -1474,12 +1477,14 @@ void G1CollectorPolicy::record_collection_pause_end(int no_of_gc_threads) {
}
if (_last_young_gc) {
+ // This is supposed to to be the "last young GC" before we start
+ // doing mixed GCs. Here we decide whether to start mixed GCs or not.
+
if (!last_pause_included_initial_mark) {
- ergo_verbose2(ErgoMixedGCs,
- "start mixed GCs",
- ergo_format_byte_perc("known garbage"),
- _known_garbage_bytes, _known_garbage_ratio * 100.0);
- set_gcs_are_young(false);
+ if (next_gc_should_be_mixed("start mixed GCs",
+ "do not start mixed GCs")) {
+ set_gcs_are_young(false);
+ }
} else {
ergo_verbose0(ErgoMixedGCs,
"do not start mixed GCs",
@@ -1489,39 +1494,14 @@ void G1CollectorPolicy::record_collection_pause_end(int no_of_gc_threads) {
}
if (!_last_gc_was_young) {
- if (_should_revert_to_young_gcs) {
- ergo_verbose2(ErgoMixedGCs,
- "end mixed GCs",
- ergo_format_reason("mixed GCs end requested")
- ergo_format_byte_perc("known garbage"),
- _known_garbage_bytes, _known_garbage_ratio * 100.0);
- set_gcs_are_young(true);
- } else if (_known_garbage_ratio < 0.05) {
- ergo_verbose3(ErgoMixedGCs,
- "end mixed GCs",
- ergo_format_reason("known garbage percent lower than threshold")
- ergo_format_byte_perc("known garbage")
- ergo_format_perc("threshold"),
- _known_garbage_bytes, _known_garbage_ratio * 100.0,
- 0.05 * 100.0);
- set_gcs_are_young(true);
- } else if (adaptive_young_list_length() &&
- (get_gc_eff_factor() * cur_efficiency < predict_young_gc_eff())) {
- ergo_verbose5(ErgoMixedGCs,
- "end mixed GCs",
- ergo_format_reason("current GC efficiency lower than "
- "predicted young GC efficiency")
- ergo_format_double("GC efficiency factor")
- ergo_format_double("current GC efficiency")
- ergo_format_double("predicted young GC efficiency")
- ergo_format_byte_perc("known garbage"),
- get_gc_eff_factor(), cur_efficiency,
- predict_young_gc_eff(),
- _known_garbage_bytes, _known_garbage_ratio * 100.0);
+ // This is a mixed GC. Here we decide whether to continue doing
+ // mixed GCs or not.
+
+ if (!next_gc_should_be_mixed("continue mixed GCs",
+ "do not continue mixed GCs")) {
set_gcs_are_young(true);
}
}
- _should_revert_to_young_gcs = false;
if (_last_gc_was_young && !_during_marking) {
_young_gc_eff_seq->add(cur_efficiency);
@@ -1630,15 +1610,6 @@ void G1CollectorPolicy::record_collection_pause_end(int no_of_gc_threads) {
_pending_cards_seq->add((double) _pending_cards);
_rs_lengths_seq->add((double) _max_rs_lengths);
-
- double expensive_region_limit_ms =
- (double) MaxGCPauseMillis - predict_constant_other_time_ms();
- if (expensive_region_limit_ms < 0.0) {
- // this means that the other time was predicted to be longer than
- // than the max pause time
- expensive_region_limit_ms = (double) MaxGCPauseMillis;
- }
- _expensive_region_limit_ms = expensive_region_limit_ms;
}
_in_marking_window = new_in_marking_window;
@@ -1820,13 +1791,11 @@ G1CollectorPolicy::predict_bytes_to_copy(HeapRegion* hr) {
if (hr->is_marked())
bytes_to_copy = hr->max_live_bytes();
else {
- guarantee( hr->is_young() && hr->age_in_surv_rate_group() != -1,
- "invariant" );
+ assert(hr->is_young() && hr->age_in_surv_rate_group() != -1, "invariant");
int age = hr->age_in_surv_rate_group();
double yg_surv_rate = predict_yg_surv_rate(age, hr->surv_rate_group());
bytes_to_copy = (size_t) ((double) hr->used() * yg_surv_rate);
}
-
return bytes_to_copy;
}
@@ -1842,22 +1811,6 @@ void G1CollectorPolicy::set_recorded_rs_lengths(size_t rs_lengths) {
_recorded_rs_lengths = rs_lengths;
}
-void G1CollectorPolicy::check_if_region_is_too_expensive(double
- predicted_time_ms) {
- // I don't think we need to do this when in young GC mode since
- // marking will be initiated next time we hit the soft limit anyway...
- if (predicted_time_ms > _expensive_region_limit_ms) {
- ergo_verbose2(ErgoMixedGCs,
- "request mixed GCs end",
- ergo_format_reason("predicted region time higher than threshold")
- ergo_format_ms("predicted region time")
- ergo_format_ms("threshold"),
- predicted_time_ms, _expensive_region_limit_ms);
- // no point in doing another mixed GC
- _should_revert_to_young_gcs = true;
- }
-}
-
void G1CollectorPolicy::update_recent_gc_times(double end_time_sec,
double elapsed_ms) {
_recent_gc_times_ms->add(elapsed_ms);
@@ -1988,6 +1941,7 @@ void G1CollectorPolicy::print_summary(PauseSummary* summary) const {
if (summary->get_total_seq()->num() > 0) {
print_summary_sd(0, "Evacuation Pauses", summary->get_total_seq());
if (body_summary != NULL) {
+ print_summary(1, "Root Region Scan Wait", body_summary->get_root_region_scan_wait_seq());
if (parallel) {
print_summary(1, "Parallel Time", body_summary->get_parallel_seq());
print_summary(2, "Ext Root Scanning", body_summary->get_ext_root_scan_seq());
@@ -2029,15 +1983,17 @@ void G1CollectorPolicy::print_summary(PauseSummary* summary) const {
// parallel
NumberSeq* other_parts[] = {
body_summary->get_satb_drain_seq(),
+ body_summary->get_root_region_scan_wait_seq(),
body_summary->get_parallel_seq(),
body_summary->get_clear_ct_seq()
};
calc_other_times_ms = NumberSeq(summary->get_total_seq(),
- 3, other_parts);
+ 4, other_parts);
} else {
// serial
NumberSeq* other_parts[] = {
body_summary->get_satb_drain_seq(),
+ body_summary->get_root_region_scan_wait_seq(),
body_summary->get_update_rs_seq(),
body_summary->get_ext_root_scan_seq(),
body_summary->get_satb_filtering_seq(),
@@ -2045,7 +2001,7 @@ void G1CollectorPolicy::print_summary(PauseSummary* summary) const {
body_summary->get_obj_copy_seq()
};
calc_other_times_ms = NumberSeq(summary->get_total_seq(),
- 6, other_parts);
+ 7, other_parts);
}
check_other_times(1, summary->get_other_seq(), &calc_other_times_ms);
}
@@ -2253,12 +2209,12 @@ G1CollectorPolicy::decide_on_conc_mark_initiation() {
}
class KnownGarbageClosure: public HeapRegionClosure {
+ G1CollectedHeap* _g1h;
CollectionSetChooser* _hrSorted;
public:
KnownGarbageClosure(CollectionSetChooser* hrSorted) :
- _hrSorted(hrSorted)
- {}
+ _g1h(G1CollectedHeap::heap()), _hrSorted(hrSorted) { }
bool doHeapRegion(HeapRegion* r) {
// We only include humongous regions in collection
@@ -2267,11 +2223,10 @@ public:
// Do we have any marking information for this region?
if (r->is_marked()) {
- // We don't include humongous regions in collection
- // sets because we collect them immediately at the end of a marking
- // cycle. We also don't include young regions because we *must*
- // include them in the next collection pause.
- if (!r->isHumongous() && !r->is_young()) {
+ // We will skip any region that's currently used as an old GC
+ // alloc region (we should not consider those for collection
+ // before we fill them up).
+ if (_hrSorted->shouldAdd(r) && !_g1h->is_old_gc_alloc_region(r)) {
_hrSorted->addMarkedHeapRegion(r);
}
}
@@ -2280,8 +2235,10 @@ public:
};
class ParKnownGarbageHRClosure: public HeapRegionClosure {
+ G1CollectedHeap* _g1h;
CollectionSetChooser* _hrSorted;
jint _marked_regions_added;
+ size_t _reclaimable_bytes_added;
jint _chunk_size;
jint _cur_chunk_idx;
jint _cur_chunk_end; // Cur chunk [_cur_chunk_idx, _cur_chunk_end)
@@ -2299,6 +2256,7 @@ class ParKnownGarbageHRClosure: public HeapRegionClosure {
assert(_cur_chunk_idx < _cur_chunk_end, "postcondition");
_hrSorted->setMarkedHeapRegion(_cur_chunk_idx, r);
_marked_regions_added++;
+ _reclaimable_bytes_added += r->reclaimable_bytes();
_cur_chunk_idx++;
}
@@ -2306,10 +2264,10 @@ public:
ParKnownGarbageHRClosure(CollectionSetChooser* hrSorted,
jint chunk_size,
int worker) :
- _hrSorted(hrSorted), _chunk_size(chunk_size), _worker(worker),
- _marked_regions_added(0), _cur_chunk_idx(0), _cur_chunk_end(0),
- _invokes(0)
- {}
+ _g1h(G1CollectedHeap::heap()),
+ _hrSorted(hrSorted), _chunk_size(chunk_size), _worker(worker),
+ _marked_regions_added(0), _reclaimable_bytes_added(0),
+ _cur_chunk_idx(0), _cur_chunk_end(0), _invokes(0) { }
bool doHeapRegion(HeapRegion* r) {
// We only include humongous regions in collection
@@ -2319,17 +2277,17 @@ public:
// Do we have any marking information for this region?
if (r->is_marked()) {
- // We don't include humongous regions in collection
- // sets because we collect them immediately at the end of a marking
- // cycle.
- // We also do not include young regions in collection sets
- if (!r->isHumongous() && !r->is_young()) {
+ // We will skip any region that's currently used as an old GC
+ // alloc region (we should not consider those for collection
+ // before we fill them up).
+ if (_hrSorted->shouldAdd(r) && !_g1h->is_old_gc_alloc_region(r)) {
add_region(r);
}
}
return false;
}
jint marked_regions_added() { return _marked_regions_added; }
+ size_t reclaimable_bytes_added() { return _reclaimable_bytes_added; }
int invokes() { return _invokes; }
};
@@ -2341,8 +2299,7 @@ public:
ParKnownGarbageTask(CollectionSetChooser* hrSorted, jint chunk_size) :
AbstractGangTask("ParKnownGarbageTask"),
_hrSorted(hrSorted), _chunk_size(chunk_size),
- _g1(G1CollectedHeap::heap())
- {}
+ _g1(G1CollectedHeap::heap()) { }
void work(uint worker_id) {
ParKnownGarbageHRClosure parKnownGarbageCl(_hrSorted,
@@ -2353,7 +2310,9 @@ public:
_g1->workers()->active_workers(),
HeapRegion::InitialClaimValue);
jint regions_added = parKnownGarbageCl.marked_regions_added();
- _hrSorted->incNumMarkedHeapRegions(regions_added);
+ size_t reclaimable_bytes_added =
+ parKnownGarbageCl.reclaimable_bytes_added();
+ _hrSorted->updateTotals(regions_added, reclaimable_bytes_added);
if (G1PrintParCleanupStats) {
gclog_or_tty->print_cr(" Thread %d called %d times, added %d regions to list.",
worker_id, parKnownGarbageCl.invokes(), regions_added);
@@ -2637,7 +2596,43 @@ void G1CollectorPolicy::print_collection_set(HeapRegion* list_head, outputStream
}
#endif // !PRODUCT
-void G1CollectorPolicy::choose_collection_set(double target_pause_time_ms) {
+bool G1CollectorPolicy::next_gc_should_be_mixed(const char* true_action_str,
+ const char* false_action_str) {
+ CollectionSetChooser* cset_chooser = _collectionSetChooser;
+ if (cset_chooser->isEmpty()) {
+ ergo_verbose0(ErgoMixedGCs,
+ false_action_str,
+ ergo_format_reason("candidate old regions not available"));
+ return false;
+ }
+ size_t reclaimable_bytes = cset_chooser->remainingReclaimableBytes();
+ size_t capacity_bytes = _g1->capacity();
+ double perc = (double) reclaimable_bytes * 100.0 / (double) capacity_bytes;
+ double threshold = (double) G1OldReclaimableThresholdPercent;
+ if (perc < threshold) {
+ ergo_verbose4(ErgoMixedGCs,
+ false_action_str,
+ ergo_format_reason("reclaimable percentage lower than threshold")
+ ergo_format_region("candidate old regions")
+ ergo_format_byte_perc("reclaimable")
+ ergo_format_perc("threshold"),
+ cset_chooser->remainingRegions(),
+ reclaimable_bytes, perc, threshold);
+ return false;
+ }
+
+ ergo_verbose4(ErgoMixedGCs,
+ true_action_str,
+ ergo_format_reason("candidate old regions available")
+ ergo_format_region("candidate old regions")
+ ergo_format_byte_perc("reclaimable")
+ ergo_format_perc("threshold"),
+ cset_chooser->remainingRegions(),
+ reclaimable_bytes, perc, threshold);
+ return true;
+}
+
+void G1CollectorPolicy::finalize_cset(double target_pause_time_ms) {
// Set this here - in case we're not doing young collections.
double non_young_start_time_sec = os::elapsedTime();
@@ -2651,7 +2646,6 @@ void G1CollectorPolicy::choose_collection_set(double target_pause_time_ms) {
double base_time_ms = predict_base_elapsed_time_ms(_pending_cards);
double predicted_pause_time_ms = base_time_ms;
-
double time_remaining_ms = target_pause_time_ms - base_time_ms;
ergo_verbose3(ErgoCSetConstruction | ErgoHigh,
@@ -2661,22 +2655,6 @@ void G1CollectorPolicy::choose_collection_set(double target_pause_time_ms) {
ergo_format_ms("target pause time"),
base_time_ms, time_remaining_ms, target_pause_time_ms);
- // the 10% and 50% values are arbitrary...
- double threshold = 0.10 * target_pause_time_ms;
- if (time_remaining_ms < threshold) {
- double prev_time_remaining_ms = time_remaining_ms;
- time_remaining_ms = 0.50 * target_pause_time_ms;
- ergo_verbose3(ErgoCSetConstruction,
- "adjust remaining time",
- ergo_format_reason("remaining time lower than threshold")
- ergo_format_ms("remaining time")
- ergo_format_ms("threshold")
- ergo_format_ms("adjusted remaining time"),
- prev_time_remaining_ms, threshold, time_remaining_ms);
- }
-
- size_t expansion_bytes = _g1->expansion_regions() * HeapRegion::GrainBytes;
-
HeapRegion* hr;
double young_start_time_sec = os::elapsedTime();
@@ -2731,78 +2709,97 @@ void G1CollectorPolicy::choose_collection_set(double target_pause_time_ms) {
non_young_start_time_sec = young_end_time_sec;
if (!gcs_are_young()) {
- bool should_continue = true;
- NumberSeq seq;
- double avg_prediction = 100000000000000000.0; // something very large
-
- double prev_predicted_pause_time_ms = predicted_pause_time_ms;
- do {
- // Note that add_old_region_to_cset() increments the
- // _old_cset_region_length field and cset_region_length() returns the
- // sum of _eden_cset_region_length, _survivor_cset_region_length, and
- // _old_cset_region_length. So, as old regions are added to the
- // CSet, _old_cset_region_length will be incremented and
- // cset_region_length(), which is used below, will always reflect
- // the the total number of regions added up to this point to the CSet.
-
- hr = _collectionSetChooser->getNextMarkedRegion(time_remaining_ms,
- avg_prediction);
- if (hr != NULL) {
- _g1->old_set_remove(hr);
- double predicted_time_ms = predict_region_elapsed_time_ms(hr, false);
- time_remaining_ms -= predicted_time_ms;
- predicted_pause_time_ms += predicted_time_ms;
- add_old_region_to_cset(hr);
- seq.add(predicted_time_ms);
- avg_prediction = seq.avg() + seq.sd();
+ CollectionSetChooser* cset_chooser = _collectionSetChooser;
+ assert(cset_chooser->verify(), "CSet Chooser verification - pre");
+ const size_t min_old_cset_length = cset_chooser->calcMinOldCSetLength();
+ const size_t max_old_cset_length = cset_chooser->calcMaxOldCSetLength();
+
+ size_t expensive_region_num = 0;
+ bool check_time_remaining = adaptive_young_list_length();
+ HeapRegion* hr = cset_chooser->peek();
+ while (hr != NULL) {
+ if (old_cset_region_length() >= max_old_cset_length) {
+ // Added maximum number of old regions to the CSet.
+ ergo_verbose2(ErgoCSetConstruction,
+ "finish adding old regions to CSet",
+ ergo_format_reason("old CSet region num reached max")
+ ergo_format_region("old")
+ ergo_format_region("max"),
+ old_cset_region_length(), max_old_cset_length);
+ break;
}
- should_continue = true;
- if (hr == NULL) {
- // No need for an ergo verbose message here,
- // getNextMarkRegion() does this when it returns NULL.
- should_continue = false;
- } else {
- if (adaptive_young_list_length()) {
- if (time_remaining_ms < 0.0) {
- ergo_verbose1(ErgoCSetConstruction,
- "stop adding old regions to CSet",
- ergo_format_reason("remaining time is lower than 0")
- ergo_format_ms("remaining time"),
- time_remaining_ms);
- should_continue = false;
- }
- } else {
- if (cset_region_length() >= _young_list_fixed_length) {
- ergo_verbose2(ErgoCSetConstruction,
- "stop adding old regions to CSet",
- ergo_format_reason("CSet length reached target")
- ergo_format_region("CSet")
- ergo_format_region("young target"),
- cset_region_length(), _young_list_fixed_length);
- should_continue = false;
+ double predicted_time_ms = predict_region_elapsed_time_ms(hr, false);
+ if (check_time_remaining) {
+ if (predicted_time_ms > time_remaining_ms) {
+ // Too expensive for the current CSet.
+
+ if (old_cset_region_length() >= min_old_cset_length) {
+ // We have added the minimum number of old regions to the CSet,
+ // we are done with this CSet.
+ ergo_verbose4(ErgoCSetConstruction,
+ "finish adding old regions to CSet",
+ ergo_format_reason("predicted time is too high")
+ ergo_format_ms("predicted time")
+ ergo_format_ms("remaining time")
+ ergo_format_region("old")
+ ergo_format_region("min"),
+ predicted_time_ms, time_remaining_ms,
+ old_cset_region_length(), min_old_cset_length);
+ break;
}
+
+ // We'll add it anyway given that we haven't reached the
+ // minimum number of old regions.
+ expensive_region_num += 1;
+ }
+ } else {
+ if (old_cset_region_length() >= min_old_cset_length) {
+ // In the non-auto-tuning case, we'll finish adding regions
+ // to the CSet if we reach the minimum.
+ ergo_verbose2(ErgoCSetConstruction,
+ "finish adding old regions to CSet",
+ ergo_format_reason("old CSet region num reached min")
+ ergo_format_region("old")
+ ergo_format_region("min"),
+ old_cset_region_length(), min_old_cset_length);
+ break;
}
}
- } while (should_continue);
-
- if (!adaptive_young_list_length() &&
- cset_region_length() < _young_list_fixed_length) {
- ergo_verbose2(ErgoCSetConstruction,
- "request mixed GCs end",
- ergo_format_reason("CSet length lower than target")
- ergo_format_region("CSet")
- ergo_format_region("young target"),
- cset_region_length(), _young_list_fixed_length);
- _should_revert_to_young_gcs = true;
+
+ // We will add this region to the CSet.
+ time_remaining_ms -= predicted_time_ms;
+ predicted_pause_time_ms += predicted_time_ms;
+ cset_chooser->remove_and_move_to_next(hr);
+ _g1->old_set_remove(hr);
+ add_old_region_to_cset(hr);
+
+ hr = cset_chooser->peek();
+ }
+ if (hr == NULL) {
+ ergo_verbose0(ErgoCSetConstruction,
+ "finish adding old regions to CSet",
+ ergo_format_reason("candidate old regions not available"));
+ }
+
+ if (expensive_region_num > 0) {
+ // We print the information once here at the end, predicated on
+ // whether we added any apparently expensive regions or not, to
+ // avoid generating output per region.
+ ergo_verbose4(ErgoCSetConstruction,
+ "added expensive regions to CSet",
+ ergo_format_reason("old CSet region num not reached min")
+ ergo_format_region("old")
+ ergo_format_region("expensive")
+ ergo_format_region("min")
+ ergo_format_ms("remaining time"),
+ old_cset_region_length(),
+ expensive_region_num,
+ min_old_cset_length,
+ time_remaining_ms);
}
- ergo_verbose2(ErgoCSetConstruction | ErgoHigh,
- "add old regions to CSet",
- ergo_format_region("old")
- ergo_format_ms("predicted old region time"),
- old_cset_region_length(),
- predicted_pause_time_ms - prev_predicted_pause_time_ms);
+ assert(cset_chooser->verify(), "CSet Chooser verification - post");
}
stop_incremental_cset_building();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
index 90660c0..213e0aa 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
@@ -65,6 +65,7 @@ public:
class MainBodySummary: public CHeapObj {
define_num_seq(satb_drain) // optional
+ define_num_seq(root_region_scan_wait)
define_num_seq(parallel) // parallel only
define_num_seq(ext_root_scan)
define_num_seq(satb_filtering)
@@ -177,7 +178,6 @@ private:
double _cur_collection_start_sec;
size_t _cur_collection_pause_used_at_start_bytes;
size_t _cur_collection_pause_used_regions_at_start;
- size_t _prev_collection_pause_used_at_end_bytes;
double _cur_collection_par_time_ms;
double _cur_satb_drain_time_ms;
double _cur_clear_ct_time_ms;
@@ -312,16 +312,13 @@ private:
double _recorded_non_young_free_cset_time_ms;
double _sigma;
- double _expensive_region_limit_ms;
size_t _rs_lengths_prediction;
size_t _known_garbage_bytes;
double _known_garbage_ratio;
- double sigma() {
- return _sigma;
- }
+ double sigma() { return _sigma; }
// A function that prevents us putting too much stock in small sample
// sets. Returns a number between 2.0 and 1.0, depending on the number
@@ -491,8 +488,6 @@ public:
get_new_prediction(_non_young_other_cost_per_region_ms_seq);
}
- void check_if_region_is_too_expensive(double predicted_time_ms);
-
double predict_young_collection_elapsed_time_ms(size_t adjustment);
double predict_base_elapsed_time_ms(size_t pending_cards);
double predict_base_elapsed_time_ms(size_t pending_cards,
@@ -707,7 +702,6 @@ private:
// initial-mark work.
volatile bool _during_initial_mark_pause;
- bool _should_revert_to_young_gcs;
bool _last_young_gc;
// This set of variables tracks the collector efficiency, in order to
@@ -716,6 +710,7 @@ private:
double _mark_remark_start_sec;
double _mark_cleanup_start_sec;
double _mark_closure_time_ms;
+ double _root_region_scan_wait_time_ms;
// Update the young list target length either by setting it to the
// desired fixed value or by calculating it using G1's pause
@@ -800,6 +795,8 @@ public:
GenRemSet::Name rem_set_name() { return GenRemSet::CardTable; }
+ bool need_to_start_conc_mark(const char* source, size_t alloc_word_size = 0);
+
// Update the heuristic info to record a collection pause of the given
// start time, where the given number of bytes were used at the start.
// This may involve changing the desired size of a collection set.
@@ -816,6 +813,10 @@ public:
_mark_closure_time_ms = mark_closure_time_ms;
}
+ void record_root_region_scan_wait_time(double time_ms) {
+ _root_region_scan_wait_time_ms = time_ms;
+ }
+
void record_concurrent_mark_remark_start();
void record_concurrent_mark_remark_end();
@@ -939,10 +940,17 @@ public:
return _bytes_copied_during_gc;
}
+ // Determine whether the next GC should be mixed. Called to determine
+ // whether to start mixed GCs or whether to carry on doing mixed
+ // GCs. The two action strings are used in the ergo output when the
+ // method returns true or false.
+ bool next_gc_should_be_mixed(const char* true_action_str,
+ const char* false_action_str);
+
// Choose a new collection set. Marks the chosen regions as being
// "in_collection_set", and links them together. The head and number of
// the collection set are available via access methods.
- void choose_collection_set(double target_pause_time_ms);
+ void finalize_cset(double target_pause_time_ms);
// The head of the list (via "next_in_collection_set()") representing the
// current collection set.
@@ -1146,11 +1154,6 @@ public:
_survivor_surv_rate_group->stop_adding_regions();
}
- void tenure_all_objects() {
- _max_survivor_regions = 0;
- _tenuring_threshold = 0;
- }
-
void record_survivor_regions(size_t regions,
HeapRegion* head,
HeapRegion* tail) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
index b6d2a9e..1e738fd 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
@@ -131,8 +131,8 @@ public:
", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
// Generates the format string
-#define ergo_format(_action_, _extra_format_) \
- " %1.3f: [G1Ergonomics (%s) " _action_ _extra_format_ "]"
+#define ergo_format(_extra_format_) \
+ " %1.3f: [G1Ergonomics (%s) %s" _extra_format_ "]"
// Conditionally, prints an ergonomic decision record. _extra_format_
// is the format string for the optional items we'd like to print
@@ -145,20 +145,21 @@ public:
// them to the print method. For convenience, we have wrapper macros
// below which take a specific number of arguments and set the rest to
// a default value.
-#define ergo_verbose_common(_tag_, _action_, _extra_format_, \
+#define ergo_verbose_common(_tag_, _action_, _extra_format_, \
_arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_) \
- do { \
- if (G1ErgoVerbose::enabled((_tag_))) { \
- gclog_or_tty->print_cr(ergo_format(_action_, _extra_format_), \
- os::elapsedTime(), \
- G1ErgoVerbose::to_string((_tag_)), \
- (_arg0_), (_arg1_), (_arg2_), \
- (_arg3_), (_arg4_), (_arg5_)); \
- } \
+ do { \
+ if (G1ErgoVerbose::enabled((_tag_))) { \
+ gclog_or_tty->print_cr(ergo_format(_extra_format_), \
+ os::elapsedTime(), \
+ G1ErgoVerbose::to_string((_tag_)), \
+ (_action_), \
+ (_arg0_), (_arg1_), (_arg2_), \
+ (_arg3_), (_arg4_), (_arg5_)); \
+ } \
} while (0)
-#define ergo_verbose(_tag_, _action_) \
+#define ergo_verbose(_tag_, _action_) \
ergo_verbose_common(_tag_, _action_, "", 0, 0, 0, 0, 0, 0)
#define ergo_verbose0(_tag_, _action_, _extra_format_) \
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp
index 37c3043..84d9982 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp
@@ -70,16 +70,20 @@ private:
OopsInHeapRegionClosure *_update_rset_cl;
bool _during_initial_mark;
bool _during_conc_mark;
+ uint _worker_id;
+
public:
RemoveSelfForwardPtrObjClosure(G1CollectedHeap* g1, ConcurrentMark* cm,
HeapRegion* hr,
OopsInHeapRegionClosure* update_rset_cl,
bool during_initial_mark,
- bool during_conc_mark) :
+ bool during_conc_mark,
+ uint worker_id) :
_g1(g1), _cm(cm), _hr(hr), _marked_bytes(0),
_update_rset_cl(update_rset_cl),
_during_initial_mark(during_initial_mark),
- _during_conc_mark(during_conc_mark) { }
+ _during_conc_mark(during_conc_mark),
+ _worker_id(worker_id) { }
size_t marked_bytes() { return _marked_bytes; }
@@ -123,7 +127,7 @@ public:
// explicitly and all objects in the CSet are considered
// (implicitly) live. So, we won't mark them explicitly and
// we'll leave them over NTAMS.
- _cm->markNext(obj);
+ _cm->grayRoot(obj, obj_size, _worker_id, _hr);
}
_marked_bytes += (obj_size * HeapWordSize);
obj->set_mark(markOopDesc::prototype());
@@ -155,12 +159,14 @@ class RemoveSelfForwardPtrHRClosure: public HeapRegionClosure {
G1CollectedHeap* _g1h;
ConcurrentMark* _cm;
OopsInHeapRegionClosure *_update_rset_cl;
+ uint _worker_id;
public:
RemoveSelfForwardPtrHRClosure(G1CollectedHeap* g1h,
- OopsInHeapRegionClosure* update_rset_cl) :
+ OopsInHeapRegionClosure* update_rset_cl,
+ uint worker_id) :
_g1h(g1h), _update_rset_cl(update_rset_cl),
- _cm(_g1h->concurrent_mark()) { }
+ _worker_id(worker_id), _cm(_g1h->concurrent_mark()) { }
bool doHeapRegion(HeapRegion *hr) {
bool during_initial_mark = _g1h->g1_policy()->during_initial_mark_pause();
@@ -173,7 +179,8 @@ public:
if (hr->evacuation_failed()) {
RemoveSelfForwardPtrObjClosure rspc(_g1h, _cm, hr, _update_rset_cl,
during_initial_mark,
- during_conc_mark);
+ during_conc_mark,
+ _worker_id);
MemRegion mr(hr->bottom(), hr->end());
// We'll recreate the prev marking info so we'll first clear
@@ -226,7 +233,7 @@ public:
update_rset_cl = &immediate_update;
}
- RemoveSelfForwardPtrHRClosure rsfp_cl(_g1h, update_rset_cl);
+ RemoveSelfForwardPtrHRClosure rsfp_cl(_g1h, update_rset_cl, worker_id);
HeapRegion* hr = _g1h->start_cset_region_for_worker(worker_id);
_g1h->collection_set_iterate_from(hr, &rsfp_cl);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
index c12bb56..f32030b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -126,7 +126,6 @@ void G1MarkSweep::allocate_stacks() {
void G1MarkSweep::mark_sweep_phase1(bool& marked_for_unloading,
bool clear_all_softrefs) {
// Recursively traverse all live objects and mark them
- EventMark m("1 mark object");
TraceTime tm("phase 1", PrintGC && Verbose, true, gclog_or_tty);
GenMarkSweep::trace(" 1");
@@ -292,7 +291,6 @@ void G1MarkSweep::mark_sweep_phase2() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
Generation* pg = g1h->perm_gen();
- EventMark m("2 compute new addresses");
TraceTime tm("phase 2", PrintGC && Verbose, true, gclog_or_tty);
GenMarkSweep::trace("2");
@@ -337,7 +335,6 @@ void G1MarkSweep::mark_sweep_phase3() {
Generation* pg = g1h->perm_gen();
// Adjust the pointers to reflect the new locations
- EventMark m("3 adjust pointers");
TraceTime tm("phase 3", PrintGC && Verbose, true, gclog_or_tty);
GenMarkSweep::trace("3");
@@ -402,7 +399,6 @@ void G1MarkSweep::mark_sweep_phase4() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
Generation* pg = g1h->perm_gen();
- EventMark m("4 compact heap");
TraceTime tm("phase 4", PrintGC && Verbose, true, gclog_or_tty);
GenMarkSweep::trace("4");
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
index d22dc7a..3454261 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
* 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,7 +44,9 @@ G1YoungGenerationCounters::G1YoungGenerationCounters(G1MonitoringSupport* g1mm,
G1MonitoringSupport::pad_capacity(0, 3) /* min_capacity */,
G1MonitoringSupport::pad_capacity(g1mm->young_gen_max(), 3),
G1MonitoringSupport::pad_capacity(0, 3) /* curr_capacity */) {
- update_all();
+ if (UsePerfData) {
+ update_all();
+ }
}
G1OldGenerationCounters::G1OldGenerationCounters(G1MonitoringSupport* g1mm,
@@ -53,7 +55,9 @@ G1OldGenerationCounters::G1OldGenerationCounters(G1MonitoringSupport* g1mm,
G1MonitoringSupport::pad_capacity(0) /* min_capacity */,
G1MonitoringSupport::pad_capacity(g1mm->old_gen_max()),
G1MonitoringSupport::pad_capacity(0) /* curr_capacity */) {
- update_all();
+ if (UsePerfData) {
+ update_all();
+ }
}
void G1YoungGenerationCounters::update_all() {
@@ -149,10 +153,6 @@ G1MonitoringSupport::G1MonitoringSupport(G1CollectedHeap* g1h) :
pad_capacity(0) /* max_capacity */,
pad_capacity(0) /* init_capacity */,
_young_collection_counters);
- // Given that this survivor space is not used, we update it here
- // once to reflect that its used space is 0 so that we don't have to
- // worry about updating it again later.
- _from_counters->update_used(0);
// name "generation.0.space.2"
// See _old_space_counters for additional counters
@@ -160,6 +160,13 @@ G1MonitoringSupport::G1MonitoringSupport(G1CollectedHeap* g1h) :
pad_capacity(overall_reserved()) /* max_capacity */,
pad_capacity(survivor_space_committed()) /* init_capacity */,
_young_collection_counters);
+
+ if (UsePerfData) {
+ // Given that this survivor space is not used, we update it here
+ // once to reflect that its used space is 0 so that we don't have to
+ // worry about updating it again later.
+ _from_counters->update_used(0);
+ }
}
void G1MonitoringSupport::recalculate_sizes() {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
index ac2c4f0..a428b10 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp
@@ -89,16 +89,15 @@ class G1CollectedHeap;
//
// * Min Capacity
//
-// We set this to 0 for all spaces. We could consider setting the old
-// min capacity to the min capacity of the heap (see 7078465).
+// We set this to 0 for all spaces.
//
// * Max Capacity
//
// For jstat, we set the max capacity of all spaces to heap_capacity,
-// given that we don't always have a reasonably upper bound on how big
-// each space can grow. For the memory pools, we actually make the max
-// capacity undefined. We could consider setting the old max capacity
-// to the max capacity of the heap (see 7078465).
+// given that we don't always have a reasonable upper bound on how big
+// each space can grow. For the memory pools, we make the max
+// capacity undefined with the exception of the old memory pool for
+// which we make the max capacity same as the max heap capacity.
//
// If we had more accurate occupancy / capacity information per
// region set the above calculations would be greatly simplified and
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
index fc28d96..52a6c50 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
@@ -51,6 +51,7 @@ protected:
G1RemSet* _g1_rem;
ConcurrentMark* _cm;
G1ParScanThreadState* _par_scan_state;
+ uint _worker_id;
bool _during_initial_mark;
bool _mark_in_progress;
public:
@@ -219,6 +220,7 @@ public:
// Closure for iterating over object fields during concurrent marking
class G1CMOopClosure : public OopClosure {
+private:
G1CollectedHeap* _g1h;
ConcurrentMark* _cm;
CMTask* _task;
@@ -229,4 +231,92 @@ public:
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
};
+// Closure to scan the root regions during concurrent marking
+class G1RootRegionScanClosure : public OopClosure {
+private:
+ G1CollectedHeap* _g1h;
+ ConcurrentMark* _cm;
+ uint _worker_id;
+public:
+ G1RootRegionScanClosure(G1CollectedHeap* g1h, ConcurrentMark* cm,
+ uint worker_id) :
+ _g1h(g1h), _cm(cm), _worker_id(worker_id) { }
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop( oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
+};
+
+// Closure that applies the given two closures in sequence.
+// Used by the RSet refinement code (when updating RSets
+// during an evacuation pause) to record cards containing
+// pointers into the collection set.
+
+class G1Mux2Closure : public OopClosure {
+ OopClosure* _c1;
+ OopClosure* _c2;
+public:
+ G1Mux2Closure(OopClosure *c1, OopClosure *c2);
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
+};
+
+// A closure that returns true if it is actually applied
+// to a reference
+
+class G1TriggerClosure : public OopClosure {
+ bool _triggered;
+public:
+ G1TriggerClosure();
+ bool triggered() const { return _triggered; }
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
+};
+
+// A closure which uses a triggering closure to determine
+// whether to apply an oop closure.
+
+class G1InvokeIfNotTriggeredClosure: public OopClosure {
+ G1TriggerClosure* _trigger_cl;
+ OopClosure* _oop_cl;
+public:
+ G1InvokeIfNotTriggeredClosure(G1TriggerClosure* t, OopClosure* oc);
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
+};
+
+class G1UpdateRSOrPushRefOopClosure: public OopClosure {
+ G1CollectedHeap* _g1;
+ G1RemSet* _g1_rem_set;
+ HeapRegion* _from;
+ OopsInHeapRegionClosure* _push_ref_cl;
+ bool _record_refs_into_cset;
+ int _worker_i;
+
+public:
+ G1UpdateRSOrPushRefOopClosure(G1CollectedHeap* g1h,
+ G1RemSet* rs,
+ OopsInHeapRegionClosure* push_ref_cl,
+ bool record_refs_into_cset,
+ int worker_i = 0);
+
+ void set_from(HeapRegion* from) {
+ assert(from != NULL, "from region must be non-NULL");
+ _from = from;
+ }
+
+ bool self_forwarded(oop obj) {
+ bool result = (obj->is_forwarded() && (obj->forwardee()== obj));
+ return result;
+ }
+
+ bool apply_to_weak_ref_discovered_field() { return true; }
+
+ template <class T> void do_oop_nv(T* p);
+ virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
+ virtual void do_oop(oop* p) { do_oop_nv(p); }
+};
+
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
index 26b951d..18a9c02 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,8 @@
// perf-critical inner loop.
#define FILTERINTOCSCLOSURE_DOHISTOGRAMCOUNT 0
-template <class T> inline void FilterIntoCSClosure::do_oop_nv(T* p) {
+template <class T>
+inline void FilterIntoCSClosure::do_oop_nv(T* p) {
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop) &&
_g1->obj_in_cs(oopDesc::decode_heap_oop_not_null(heap_oop))) {
@@ -53,7 +54,8 @@ template <class T> inline void FilterIntoCSClosure::do_oop_nv(T* p) {
#define FILTEROUTOFREGIONCLOSURE_DOHISTOGRAMCOUNT 0
-template <class T> inline void FilterOutOfRegionClosure::do_oop_nv(T* p) {
+template <class T>
+inline void FilterOutOfRegionClosure::do_oop_nv(T* p) {
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
HeapWord* obj_hw = (HeapWord*)oopDesc::decode_heap_oop_not_null(heap_oop);
@@ -67,7 +69,8 @@ template <class T> inline void FilterOutOfRegionClosure::do_oop_nv(T* p) {
}
// This closure is applied to the fields of the objects that have just been copied.
-template <class T> inline void G1ParScanClosure::do_oop_nv(T* p) {
+template <class T>
+inline void G1ParScanClosure::do_oop_nv(T* p) {
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
@@ -96,7 +99,8 @@ template <class T> inline void G1ParScanClosure::do_oop_nv(T* p) {
}
}
-template <class T> inline void G1ParPushHeapRSClosure::do_oop_nv(T* p) {
+template <class T>
+inline void G1ParPushHeapRSClosure::do_oop_nv(T* p) {
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
@@ -111,7 +115,8 @@ template <class T> inline void G1ParPushHeapRSClosure::do_oop_nv(T* p) {
}
}
-template <class T> inline void G1CMOopClosure::do_oop_nv(T* p) {
+template <class T>
+inline void G1CMOopClosure::do_oop_nv(T* p) {
assert(_g1h->is_in_g1_reserved((HeapWord*) p), "invariant");
assert(!_g1h->is_on_master_free_list(
_g1h->heap_region_containing((HeapWord*) p)), "invariant");
@@ -125,4 +130,97 @@ template <class T> inline void G1CMOopClosure::do_oop_nv(T* p) {
_task->deal_with_reference(obj);
}
+template <class T>
+inline void G1RootRegionScanClosure::do_oop_nv(T* p) {
+ T heap_oop = oopDesc::load_heap_oop(p);
+ if (!oopDesc::is_null(heap_oop)) {
+ oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
+ HeapRegion* hr = _g1h->heap_region_containing((HeapWord*) obj);
+ if (hr != NULL) {
+ _cm->grayRoot(obj, obj->size(), _worker_id, hr);
+ }
+ }
+}
+
+template <class T>
+inline void G1Mux2Closure::do_oop_nv(T* p) {
+ // Apply first closure; then apply the second.
+ _c1->do_oop(p);
+ _c2->do_oop(p);
+}
+
+template <class T>
+inline void G1TriggerClosure::do_oop_nv(T* p) {
+ // Record that this closure was actually applied (triggered).
+ _triggered = true;
+}
+
+template <class T>
+inline void G1InvokeIfNotTriggeredClosure::do_oop_nv(T* p) {
+ if (!_trigger_cl->triggered()) {
+ _oop_cl->do_oop(p);
+ }
+}
+
+template <class T>
+inline void G1UpdateRSOrPushRefOopClosure::do_oop_nv(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
+#ifdef ASSERT
+ // can't do because of races
+ // assert(obj == NULL || obj->is_oop(), "expected an oop");
+
+ // Do the safe subset of is_oop
+ if (obj != NULL) {
+#ifdef CHECK_UNHANDLED_OOPS
+ oopDesc* o = obj.obj();
+#else
+ oopDesc* o = obj;
+#endif // CHECK_UNHANDLED_OOPS
+ assert((intptr_t)o % MinObjAlignmentInBytes == 0, "not oop aligned");
+ assert(Universe::heap()->is_in_reserved(obj), "must be in heap");
+ }
+#endif // ASSERT
+
+ assert(_from != NULL, "from region must be non-NULL");
+
+ HeapRegion* to = _g1->heap_region_containing(obj);
+ if (to != NULL && _from != to) {
+ // The _record_refs_into_cset flag is true during the RSet
+ // updating part of an evacuation pause. It is false at all
+ // other times:
+ // * rebuilding the rembered sets after a full GC
+ // * during concurrent refinement.
+ // * updating the remembered sets of regions in the collection
+ // set in the event of an evacuation failure (when deferred
+ // updates are enabled).
+
+ if (_record_refs_into_cset && to->in_collection_set()) {
+ // We are recording references that point into the collection
+ // set and this particular reference does exactly that...
+ // If the referenced object has already been forwarded
+ // to itself, we are handling an evacuation failure and
+ // we have already visited/tried to copy this object
+ // there is no need to retry.
+ if (!self_forwarded(obj)) {
+ assert(_push_ref_cl != NULL, "should not be null");
+ // Push the reference in the refs queue of the G1ParScanThreadState
+ // instance for this worker thread.
+ _push_ref_cl->do_oop(p);
+ }
+
+ // Deferred updates to the CSet are either discarded (in the normal case),
+ // or processed (if an evacuation failure occurs) at the end
+ // of the collection.
+ // See G1RemSet::cleanup_after_oops_into_collection_set_do().
+ } else {
+ // We either don't care about pushing references that point into the
+ // collection set (i.e. we're not during an evacuation pause) _or_
+ // the reference doesn't point into the collection set. Either way
+ // we add the reference directly to the RSet of the region containing
+ // the referenced object.
+ _g1_rem_set->par_write_ref(_from, p, _worker_i);
+ }
+ }
+}
+
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1OOPCLOSURES_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
index 4a98258..1f366c8 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -569,40 +569,26 @@ void G1RemSet::scrub_par(BitMap* region_bm, BitMap* card_bm,
static IntHistogram out_of_histo(50, 50);
-class TriggerClosure : public OopClosure {
- bool _trigger;
-public:
- TriggerClosure() : _trigger(false) { }
- bool value() const { return _trigger; }
- template <class T> void do_oop_nv(T* p) { _trigger = true; }
- virtual void do_oop(oop* p) { do_oop_nv(p); }
- virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
-};
-class InvokeIfNotTriggeredClosure: public OopClosure {
- TriggerClosure* _t;
- OopClosure* _oc;
-public:
- InvokeIfNotTriggeredClosure(TriggerClosure* t, OopClosure* oc):
- _t(t), _oc(oc) { }
- template <class T> void do_oop_nv(T* p) {
- if (!_t->value()) _oc->do_oop(p);
- }
- virtual void do_oop(oop* p) { do_oop_nv(p); }
- virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
-};
+G1TriggerClosure::G1TriggerClosure() :
+ _triggered(false) { }
-class Mux2Closure : public OopClosure {
- OopClosure* _c1;
- OopClosure* _c2;
-public:
- Mux2Closure(OopClosure *c1, OopClosure *c2) : _c1(c1), _c2(c2) { }
- template <class T> void do_oop_nv(T* p) {
- _c1->do_oop(p); _c2->do_oop(p);
- }
- virtual void do_oop(oop* p) { do_oop_nv(p); }
- virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
-};
+G1InvokeIfNotTriggeredClosure::G1InvokeIfNotTriggeredClosure(G1TriggerClosure* t_cl,
+ OopClosure* oop_cl) :
+ _trigger_cl(t_cl), _oop_cl(oop_cl) { }
+
+G1Mux2Closure::G1Mux2Closure(OopClosure *c1, OopClosure *c2) :
+ _c1(c1), _c2(c2) { }
+
+G1UpdateRSOrPushRefOopClosure::
+G1UpdateRSOrPushRefOopClosure(G1CollectedHeap* g1h,
+ G1RemSet* rs,
+ OopsInHeapRegionClosure* push_ref_cl,
+ bool record_refs_into_cset,
+ int worker_i) :
+ _g1(g1h), _g1_rem_set(rs), _from(NULL),
+ _record_refs_into_cset(record_refs_into_cset),
+ _push_ref_cl(push_ref_cl), _worker_i(worker_i) { }
bool G1RemSet::concurrentRefineOneCard_impl(jbyte* card_ptr, int worker_i,
bool check_for_refs_into_cset) {
@@ -629,17 +615,17 @@ bool G1RemSet::concurrentRefineOneCard_impl(jbyte* card_ptr, int worker_i,
assert((size_t)worker_i < n_workers(), "index of worker larger than _cset_rs_update_cl[].length");
oops_in_heap_closure = _cset_rs_update_cl[worker_i];
}
- UpdateRSOrPushRefOopClosure update_rs_oop_cl(_g1,
- _g1->g1_rem_set(),
- oops_in_heap_closure,
- check_for_refs_into_cset,
- worker_i);
+ G1UpdateRSOrPushRefOopClosure update_rs_oop_cl(_g1,
+ _g1->g1_rem_set(),
+ oops_in_heap_closure,
+ check_for_refs_into_cset,
+ worker_i);
update_rs_oop_cl.set_from(r);
- TriggerClosure trigger_cl;
+ G1TriggerClosure trigger_cl;
FilterIntoCSClosure into_cs_cl(NULL, _g1, &trigger_cl);
- InvokeIfNotTriggeredClosure invoke_cl(&trigger_cl, &into_cs_cl);
- Mux2Closure mux(&invoke_cl, &update_rs_oop_cl);
+ G1InvokeIfNotTriggeredClosure invoke_cl(&trigger_cl, &into_cs_cl);
+ G1Mux2Closure mux(&invoke_cl, &update_rs_oop_cl);
FilterOutOfRegionClosure filter_then_update_rs_oop_cl(r,
(check_for_refs_into_cset ?
@@ -688,7 +674,7 @@ bool G1RemSet::concurrentRefineOneCard_impl(jbyte* card_ptr, int worker_i,
_conc_refine_cards++;
}
- return trigger_cl.value();
+ return trigger_cl.triggered();
}
bool G1RemSet::concurrentRefineOneCard(jbyte* card_ptr, int worker_i,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
index 79d550e..9c86905 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -191,44 +191,5 @@ public:
virtual void do_oop( oop* p) { do_oop_work(p); }
};
-class UpdateRSOrPushRefOopClosure: public OopClosure {
- G1CollectedHeap* _g1;
- G1RemSet* _g1_rem_set;
- HeapRegion* _from;
- OopsInHeapRegionClosure* _push_ref_cl;
- bool _record_refs_into_cset;
- int _worker_i;
-
- template <class T> void do_oop_work(T* p);
-
-public:
- UpdateRSOrPushRefOopClosure(G1CollectedHeap* g1h,
- G1RemSet* rs,
- OopsInHeapRegionClosure* push_ref_cl,
- bool record_refs_into_cset,
- int worker_i = 0) :
- _g1(g1h),
- _g1_rem_set(rs),
- _from(NULL),
- _record_refs_into_cset(record_refs_into_cset),
- _push_ref_cl(push_ref_cl),
- _worker_i(worker_i) { }
-
- void set_from(HeapRegion* from) {
- assert(from != NULL, "from region must be non-NULL");
- _from = from;
- }
-
- bool self_forwarded(oop obj) {
- bool result = (obj->is_forwarded() && (obj->forwardee()== obj));
- return result;
- }
-
- virtual void do_oop(narrowOop* p) { do_oop_work(p); }
- virtual void do_oop(oop* p) { do_oop_work(p); }
-
- bool apply_to_weak_ref_discovered_field() { return true; }
-};
-
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp
index 7491e3a..79f4df9 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -85,66 +85,4 @@ inline void UpdateRSetImmediate::do_oop_work(T* p) {
}
}
-template <class T>
-inline void UpdateRSOrPushRefOopClosure::do_oop_work(T* p) {
- oop obj = oopDesc::load_decode_heap_oop(p);
-#ifdef ASSERT
- // can't do because of races
- // assert(obj == NULL || obj->is_oop(), "expected an oop");
-
- // Do the safe subset of is_oop
- if (obj != NULL) {
-#ifdef CHECK_UNHANDLED_OOPS
- oopDesc* o = obj.obj();
-#else
- oopDesc* o = obj;
-#endif // CHECK_UNHANDLED_OOPS
- assert((intptr_t)o % MinObjAlignmentInBytes == 0, "not oop aligned");
- assert(Universe::heap()->is_in_reserved(obj), "must be in heap");
- }
-#endif // ASSERT
-
- assert(_from != NULL, "from region must be non-NULL");
-
- HeapRegion* to = _g1->heap_region_containing(obj);
- if (to != NULL && _from != to) {
- // The _record_refs_into_cset flag is true during the RSet
- // updating part of an evacuation pause. It is false at all
- // other times:
- // * rebuilding the rembered sets after a full GC
- // * during concurrent refinement.
- // * updating the remembered sets of regions in the collection
- // set in the event of an evacuation failure (when deferred
- // updates are enabled).
-
- if (_record_refs_into_cset && to->in_collection_set()) {
- // We are recording references that point into the collection
- // set and this particular reference does exactly that...
- // If the referenced object has already been forwarded
- // to itself, we are handling an evacuation failure and
- // we have already visited/tried to copy this object
- // there is no need to retry.
- if (!self_forwarded(obj)) {
- assert(_push_ref_cl != NULL, "should not be null");
- // Push the reference in the refs queue of the G1ParScanThreadState
- // instance for this worker thread.
- _push_ref_cl->do_oop(p);
- }
-
- // Deferred updates to the CSet are either discarded (in the normal case),
- // or processed (if an evacuation failure occurs) at the end
- // of the collection.
- // See G1RemSet::cleanup_after_oops_into_collection_set_do().
- } else {
- // We either don't care about pushing references that point into the
- // collection set (i.e. we're not during an evacuation pause) _or_
- // the reference doesn't point into the collection set. Either way
- // we add the reference directly to the RSet of the region containing
- // the referenced object.
- _g1_rem_set->par_write_ref(_from, p, _worker_i);
- }
- }
-}
-
-
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
index d126458..137e8df 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -297,7 +297,23 @@
\
develop(uintx, G1DefaultMaxNewGenPercent, 80, \
"Percentage (0-100) of the heap size to use as maximum " \
- "young gen size.")
+ "young gen size.") \
+ \
+ develop(uintx, G1OldCSetRegionLiveThresholdPercent, 95, \
+ "Threshold for regions to be added to the collection set. " \
+ "Regions with more live bytes that this will not be collected.") \
+ \
+ develop(uintx, G1OldReclaimableThresholdPercent, 1, \
+ "Threshold for the remaining old reclaimable bytes, expressed " \
+ "as a percentage of the heap size. If the old reclaimable bytes " \
+ "are under this we will not collect them with more mixed GCs.") \
+ \
+ develop(uintx, G1MaxMixedGCNum, 4, \
+ "The maximum desired number of mixed GCs after a marking cycle.") \
+ \
+ develop(uintx, G1OldCSetRegionThresholdPercent, 10, \
+ "An upper bound for the number of old CSet regions expressed " \
+ "as a percentage of the heap size.")
G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG)
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
index fea3e07..910cc6d 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,12 +32,14 @@
// Forward declarations.
enum G1Barrier {
- G1BarrierNone, G1BarrierRS, G1BarrierEvac
+ G1BarrierNone,
+ G1BarrierRS,
+ G1BarrierEvac
};
-template<bool do_gen_barrier, G1Barrier barrier,
- bool do_mark_object>
+template<bool do_gen_barrier, G1Barrier barrier, bool do_mark_object>
class G1ParCopyClosure;
+
class G1ParScanClosure;
class G1ParPushHeapRSClosure;
@@ -46,6 +48,13 @@ typedef G1ParCopyClosure<false, G1BarrierEvac, false> G1ParScanHeapEvacClosure;
class FilterIntoCSClosure;
class FilterOutOfRegionClosure;
class G1CMOopClosure;
+class G1RootRegionScanClosure;
+
+// Specialized oop closures from g1RemSet.cpp
+class G1Mux2Closure;
+class G1TriggerClosure;
+class G1InvokeIfNotTriggeredClosure;
+class G1UpdateRSOrPushRefOopClosure;
#ifdef FURTHER_SPECIALIZED_OOP_OOP_ITERATE_CLOSURES
#error "FURTHER_SPECIALIZED_OOP_OOP_ITERATE_CLOSURES already defined."
@@ -57,7 +66,12 @@ class G1CMOopClosure;
f(G1ParPushHeapRSClosure,_nv) \
f(FilterIntoCSClosure,_nv) \
f(FilterOutOfRegionClosure,_nv) \
- f(G1CMOopClosure,_nv)
+ f(G1CMOopClosure,_nv) \
+ f(G1RootRegionScanClosure,_nv) \
+ f(G1Mux2Closure,_nv) \
+ f(G1TriggerClosure,_nv) \
+ f(G1InvokeIfNotTriggeredClosure,_nv) \
+ f(G1UpdateRSOrPushRefOopClosure,_nv)
#ifdef FURTHER_SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES
#error "FURTHER_SPECIALIZED_SINCE_SAVE_MARKS_CLOSURES already defined."
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
index 336e4ca..0fc499e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
@@ -387,13 +387,12 @@ void HeapRegion::par_clear() {
ct_bs->clear(MemRegion(bottom(), end()));
}
-// <PREDICTION>
void HeapRegion::calc_gc_efficiency() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
- _gc_efficiency = (double) garbage_bytes() /
- g1h->predict_region_elapsed_time_ms(this, false);
+ G1CollectorPolicy* g1p = g1h->g1_policy();
+ _gc_efficiency = (double) reclaimable_bytes() /
+ g1p->predict_region_elapsed_time_ms(this, false);
}
-// </PREDICTION>
void HeapRegion::set_startsHumongous(HeapWord* new_top, HeapWord* new_end) {
assert(!isHumongous(), "sanity / pre-condition");
@@ -659,7 +658,7 @@ oops_on_card_seq_iterate_careful(MemRegion mr,
// If we're within a stop-world GC, then we might look at a card in a
// GC alloc region that extends onto a GC LAB, which may not be
// parseable. Stop such at the "saved_mark" of the region.
- if (G1CollectedHeap::heap()->is_gc_active()) {
+ if (g1h->is_gc_active()) {
mr = mr.intersection(used_region_at_save_marks());
} else {
mr = mr.intersection(used_region());
@@ -688,53 +687,63 @@ oops_on_card_seq_iterate_careful(MemRegion mr,
OrderAccess::storeload();
}
+ // Cache the boundaries of the memory region in some const locals
+ HeapWord* const start = mr.start();
+ HeapWord* const end = mr.end();
+
// We used to use "block_start_careful" here. But we're actually happy
// to update the BOT while we do this...
- HeapWord* cur = block_start(mr.start());
- assert(cur <= mr.start(), "Postcondition");
+ HeapWord* cur = block_start(start);
+ assert(cur <= start, "Postcondition");
- while (cur <= mr.start()) {
- if (oop(cur)->klass_or_null() == NULL) {
+ oop obj;
+
+ HeapWord* next = cur;
+ while (next <= start) {
+ cur = next;
+ obj = oop(cur);
+ if (obj->klass_or_null() == NULL) {
// Ran into an unparseable point.
return cur;
}
// Otherwise...
- int sz = oop(cur)->size();
- if (cur + sz > mr.start()) break;
- // Otherwise, go on.
- cur = cur + sz;
+ next = (cur + obj->size());
}
- oop obj;
- obj = oop(cur);
- // If we finish this loop...
- assert(cur <= mr.start()
- && obj->klass_or_null() != NULL
- && cur + obj->size() > mr.start(),
+
+ // If we finish the above loop...We have a parseable object that
+ // begins on or before the start of the memory region, and ends
+ // inside or spans the entire region.
+
+ assert(obj == oop(cur), "sanity");
+ assert(cur <= start &&
+ obj->klass_or_null() != NULL &&
+ (cur + obj->size()) > start,
"Loop postcondition");
+
if (!g1h->is_obj_dead(obj)) {
obj->oop_iterate(cl, mr);
}
- HeapWord* next;
- while (cur < mr.end()) {
+ while (cur < end) {
obj = oop(cur);
if (obj->klass_or_null() == NULL) {
// Ran into an unparseable point.
return cur;
};
+
// Otherwise:
next = (cur + obj->size());
+
if (!g1h->is_obj_dead(obj)) {
- if (next < mr.end()) {
+ if (next < end || !obj->is_objArray()) {
+ // This object either does not span the MemRegion
+ // boundary, or if it does it's not an array.
+ // Apply closure to whole object.
obj->oop_iterate(cl);
} else {
- // this obj spans the boundary. If it's an array, stop at the
- // boundary.
- if (obj->is_objArray()) {
- obj->oop_iterate(cl, mr);
- } else {
- obj->oop_iterate(cl);
- }
+ // This obj is an array that spans the boundary.
+ // Stop at the boundary.
+ obj->oop_iterate(cl, mr);
}
}
cur = next;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
index ad1599c..76843a0 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
@@ -374,7 +374,9 @@ class HeapRegion: public G1OffsetTableContigSpace {
ParVerifyClaimValue = 4,
RebuildRSClaimValue = 5,
CompleteMarkCSetClaimValue = 6,
- ParEvacFailureClaimValue = 7
+ ParEvacFailureClaimValue = 7,
+ AggregateCountClaimValue = 8,
+ VerifyCountClaimValue = 9
};
inline HeapWord* par_allocate_no_bot_updates(size_t word_size) {
@@ -413,6 +415,16 @@ class HeapRegion: public G1OffsetTableContigSpace {
return used_at_mark_start_bytes - marked_bytes();
}
+ // Return the amount of bytes we'll reclaim if we collect this
+ // region. This includes not only the known garbage bytes in the
+ // region but also any unallocated space in it, i.e., [top, end),
+ // since it will also be reclaimed if we collect the region.
+ size_t reclaimable_bytes() {
+ size_t known_live_bytes = live_bytes();
+ assert(known_live_bytes <= capacity(), "sanity");
+ return capacity() - known_live_bytes;
+ }
+
// An upper bound on the number of live bytes in the region.
size_t max_live_bytes() { return used() - garbage_bytes(); }
@@ -646,10 +658,8 @@ class HeapRegion: public G1OffsetTableContigSpace {
init_top_at_mark_start();
}
- // <PREDICTION>
void calc_gc_efficiency(void);
double gc_efficiency() { return _gc_efficiency;}
- // </PREDICTION>
bool is_young() const { return _young_type != NotYoung; }
bool is_survivor() const { return _young_type == Survivor; }
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
index 55d05d9..1498b94 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp
@@ -72,10 +72,11 @@ inline void HeapRegion::note_end_of_marking() {
}
inline void HeapRegion::note_start_of_copying(bool during_initial_mark) {
- if (during_initial_mark) {
- if (is_survivor()) {
- assert(false, "should not allocate survivors during IM");
- } else {
+ if (is_survivor()) {
+ // This is how we always allocate survivors.
+ assert(_next_top_at_mark_start == bottom(), "invariant");
+ } else {
+ if (during_initial_mark) {
// During initial-mark we'll explicitly mark any objects on old
// regions that are pointed to by roots. Given that explicit
// marks only make sense under NTAMS it'd be nice if we could
@@ -84,11 +85,6 @@ inline void HeapRegion::note_start_of_copying(bool during_initial_mark) {
// NTAMS to the end of the region so all marks will be below
// NTAMS. We'll set it to the actual top when we retire this region.
_next_top_at_mark_start = end();
- }
- } else {
- if (is_survivor()) {
- // This is how we always allocate survivors.
- assert(_next_top_at_mark_start == bottom(), "invariant");
} else {
// We could have re-used this old region as to-space over a
// couple of GCs since the start of the concurrent marking
@@ -101,19 +97,15 @@ inline void HeapRegion::note_start_of_copying(bool during_initial_mark) {
}
inline void HeapRegion::note_end_of_copying(bool during_initial_mark) {
- if (during_initial_mark) {
- if (is_survivor()) {
- assert(false, "should not allocate survivors during IM");
- } else {
+ if (is_survivor()) {
+ // This is how we always allocate survivors.
+ assert(_next_top_at_mark_start == bottom(), "invariant");
+ } else {
+ if (during_initial_mark) {
// See the comment for note_start_of_copying() for the details
// on this.
assert(_next_top_at_mark_start == end(), "pre-condition");
_next_top_at_mark_start = top();
- }
- } else {
- if (is_survivor()) {
- // This is how we always allocate survivors.
- assert(_next_top_at_mark_start == bottom(), "invariant");
} else {
// See the comment for note_start_of_copying() for the details
// on this.
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
index 9e862b4..8231c77 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionSet.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,6 +59,7 @@ class HRSPhaseSetter;
class HeapRegionSetBase VALUE_OBJ_CLASS_SPEC {
friend class hrs_ext_msg;
friend class HRSPhaseSetter;
+ friend class VMStructs;
protected:
static size_t calculate_region_num(HeapRegion* hr);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp b/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp
index a3bbb69..ec44c8e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/survRateGroup.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -38,33 +38,36 @@ SurvRateGroup::SurvRateGroup(G1CollectorPolicy* g1p,
_summary_surv_rates(NULL),
_surv_rate(NULL),
_accum_surv_rate_pred(NULL),
- _surv_rate_pred(NULL)
-{
+ _surv_rate_pred(NULL),
+ _stats_arrays_length(0) {
reset();
if (summary_surv_rates_len > 0) {
size_t length = summary_surv_rates_len;
- _summary_surv_rates = NEW_C_HEAP_ARRAY(NumberSeq*, length);
- if (_summary_surv_rates == NULL) {
- vm_exit_out_of_memory(sizeof(NumberSeq*) * length,
- "Not enough space for surv rate summary");
- }
- for (size_t i = 0; i < length; ++i)
+ _summary_surv_rates = NEW_C_HEAP_ARRAY(NumberSeq*, length);
+ for (size_t i = 0; i < length; ++i) {
_summary_surv_rates[i] = new NumberSeq();
+ }
}
start_adding_regions();
}
-
-void SurvRateGroup::reset()
-{
+void SurvRateGroup::reset() {
_all_regions_allocated = 0;
_setup_seq_num = 0;
- _stats_arrays_length = 0;
_accum_surv_rate = 0.0;
_last_pred = 0.0;
// the following will set up the arrays with length 1
_region_num = 1;
+
+ // The call to stop_adding_regions() will use "new" to refill
+ // the _surv_rate_pred array, so we need to make sure to call
+ // "delete".
+ for (size_t i = 0; i < _stats_arrays_length; ++i) {
+ delete _surv_rate_pred[i];
+ }
+ _stats_arrays_length = 0;
+
stop_adding_regions();
guarantee( _stats_arrays_length == 1, "invariant" );
guarantee( _surv_rate_pred[0] != NULL, "invariant" );
@@ -73,72 +76,47 @@ void SurvRateGroup::reset()
_region_num = 0;
}
-
void
SurvRateGroup::start_adding_regions() {
_setup_seq_num = _stats_arrays_length;
_region_num = 0;
_accum_surv_rate = 0.0;
-
-#if 0
- gclog_or_tty->print_cr("[%s] start adding regions, seq num %d, length %d",
- _name, _setup_seq_num, _region_num);
-#endif // 0
}
void
SurvRateGroup::stop_adding_regions() {
-
-#if 0
- gclog_or_tty->print_cr("[%s] stop adding regions, length %d", _name, _region_num);
-#endif // 0
-
if (_region_num > _stats_arrays_length) {
double* old_surv_rate = _surv_rate;
double* old_accum_surv_rate_pred = _accum_surv_rate_pred;
TruncatedSeq** old_surv_rate_pred = _surv_rate_pred;
_surv_rate = NEW_C_HEAP_ARRAY(double, _region_num);
- if (_surv_rate == NULL) {
- vm_exit_out_of_memory(sizeof(double) * _region_num,
- "Not enough space for surv rate array.");
- }
_accum_surv_rate_pred = NEW_C_HEAP_ARRAY(double, _region_num);
- if (_accum_surv_rate_pred == NULL) {
- vm_exit_out_of_memory(sizeof(double) * _region_num,
- "Not enough space for accum surv rate pred array.");
- }
_surv_rate_pred = NEW_C_HEAP_ARRAY(TruncatedSeq*, _region_num);
- if (_surv_rate == NULL) {
- vm_exit_out_of_memory(sizeof(TruncatedSeq*) * _region_num,
- "Not enough space for surv rate pred array.");
- }
- for (size_t i = 0; i < _stats_arrays_length; ++i)
+ for (size_t i = 0; i < _stats_arrays_length; ++i) {
_surv_rate_pred[i] = old_surv_rate_pred[i];
-
-#if 0
- gclog_or_tty->print_cr("[%s] stop adding regions, new seqs %d to %d",
- _name, _array_length, _region_num - 1);
-#endif // 0
-
+ }
for (size_t i = _stats_arrays_length; i < _region_num; ++i) {
_surv_rate_pred[i] = new TruncatedSeq(10);
- // _surv_rate_pred[i]->add(last_pred);
}
_stats_arrays_length = _region_num;
- if (old_surv_rate != NULL)
+ if (old_surv_rate != NULL) {
FREE_C_HEAP_ARRAY(double, old_surv_rate);
- if (old_accum_surv_rate_pred != NULL)
+ }
+ if (old_accum_surv_rate_pred != NULL) {
FREE_C_HEAP_ARRAY(double, old_accum_surv_rate_pred);
- if (old_surv_rate_pred != NULL)
- FREE_C_HEAP_ARRAY(NumberSeq*, old_surv_rate_pred);
+ }
+ if (old_surv_rate_pred != NULL) {
+ FREE_C_HEAP_ARRAY(TruncatedSeq*, old_surv_rate_pred);
+ }
}
- for (size_t i = 0; i < _stats_arrays_length; ++i)
+ for (size_t i = 0; i < _stats_arrays_length; ++i) {
_surv_rate[i] = 0.0;
+ }
}
double
@@ -187,12 +165,6 @@ void
SurvRateGroup::all_surviving_words_recorded(bool propagate) {
if (propagate && _region_num > 0) { // conservative
double surv_rate = _surv_rate_pred[_region_num-1]->last();
-
-#if 0
- gclog_or_tty->print_cr("propagating %1.2lf from %d to %d",
- surv_rate, _curr_length, _array_length - 1);
-#endif // 0
-
for (size_t i = _region_num; i < _stats_arrays_length; ++i) {
guarantee( _surv_rate[i] <= 0.00001,
"the slot should not have been updated" );
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp b/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
index 63c0e94..a646b48 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/vmStructs_g1.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,8 @@
nonstatic_field(G1CollectedHeap, _g1_committed, MemRegion) \
nonstatic_field(G1CollectedHeap, _summary_bytes_used, size_t) \
nonstatic_field(G1CollectedHeap, _g1mm, G1MonitoringSupport*) \
+ nonstatic_field(G1CollectedHeap, _old_set, HeapRegionSetBase) \
+ nonstatic_field(G1CollectedHeap, _humongous_set, HeapRegionSetBase) \
\
nonstatic_field(G1MonitoringSupport, _eden_committed, size_t) \
nonstatic_field(G1MonitoringSupport, _eden_used, size_t) \
@@ -47,6 +49,10 @@
nonstatic_field(G1MonitoringSupport, _survivor_used, size_t) \
nonstatic_field(G1MonitoringSupport, _old_committed, size_t) \
nonstatic_field(G1MonitoringSupport, _old_used, size_t) \
+ \
+ nonstatic_field(HeapRegionSetBase, _length, size_t) \
+ nonstatic_field(HeapRegionSetBase, _region_num, size_t) \
+ nonstatic_field(HeapRegionSetBase, _total_used_bytes, size_t) \
#define VM_TYPES_G1(declare_type, declare_toplevel_type) \
@@ -55,6 +61,7 @@
\
declare_type(HeapRegion, ContiguousSpace) \
declare_toplevel_type(HeapRegionSeq) \
+ declare_toplevel_type(HeapRegionSetBase) \
declare_toplevel_type(G1MonitoringSupport) \
\
declare_toplevel_type(G1CollectedHeap*) \
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
index befacd6..594faf6 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -74,8 +74,9 @@ void VM_G1IncCollectionPause::doit() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
assert(!_should_initiate_conc_mark ||
((_gc_cause == GCCause::_gc_locker && GCLockerInvokesConcurrent) ||
- (_gc_cause == GCCause::_java_lang_system_gc && ExplicitGCInvokesConcurrent)),
- "only a GC locker or a System.gc() induced GC should start a cycle");
+ (_gc_cause == GCCause::_java_lang_system_gc && ExplicitGCInvokesConcurrent) ||
+ _gc_cause == GCCause::_g1_humongous_allocation),
+ "only a GC locker, a System.gc() or a hum allocation induced GC should start a cycle");
if (_word_size > 0) {
// An allocation has been requested. So, try to do that first.
diff --git a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
index 9144594..4f64dff 100644
--- a/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1042,7 +1042,11 @@ void ParNewGeneration::collect(bool full,
size_policy->avg_survived()->sample(from()->used());
}
- update_time_of_last_gc(os::javaTimeMillis());
+ // We need to use a monotonically non-deccreasing time in ms
+ // or we will see time-warp warnings and os::javaTimeMillis()
+ // does not guarantee monotonicity.
+ jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
+ update_time_of_last_gc(now);
SpecializationStats::print();
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
index 04d2c72..8fef37e 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -418,25 +418,17 @@ HeapWord* ParallelScavengeHeap::mem_allocate(
gc_count = Universe::heap()->total_collections();
result = young_gen()->allocate(size);
-
- // (1) If the requested object is too large to easily fit in the
- // young_gen, or
- // (2) If GC is locked out via GCLocker, young gen is full and
- // the need for a GC already signalled to GCLocker (done
- // at a safepoint),
- // ... then, rather than force a safepoint and (a potentially futile)
- // collection (attempt) for each allocation, try allocation directly
- // in old_gen. For case (2) above, we may in the future allow
- // TLAB allocation directly in the old gen.
if (result != NULL) {
return result;
}
- if (size >= (young_gen()->eden_space()->capacity_in_words(Thread::current()) / 2)) {
- result = old_gen()->allocate(size);
- if (result != NULL) {
- return result;
- }
+
+ // If certain conditions hold, try allocating from the old gen.
+ result = mem_allocate_old_gen(size);
+ if (result != NULL) {
+ return result;
}
+
+ // Failed to allocate without a gc.
if (GC_locker::is_active_and_needs_gc()) {
// If this thread is not in a jni critical section, we stall
// the requestor until the critical section has cleared and
@@ -460,7 +452,6 @@ HeapWord* ParallelScavengeHeap::mem_allocate(
}
if (result == NULL) {
-
// Generate a VM operation
VM_ParallelGCFailedAllocation op(size, gc_count);
VMThread::execute(&op);
@@ -523,6 +514,42 @@ HeapWord* ParallelScavengeHeap::mem_allocate(
return result;
}
+// A "death march" is a series of ultra-slow allocations in which a full gc is
+// done before each allocation, and after the full gc the allocation still
+// cannot be satisfied from the young gen. This routine detects that condition;
+// it should be called after a full gc has been done and the allocation
+// attempted from the young gen. The parameter 'addr' should be the result of
+// that young gen allocation attempt.
+void
+ParallelScavengeHeap::death_march_check(HeapWord* const addr, size_t size) {
+ if (addr != NULL) {
+ _death_march_count = 0; // death march has ended
+ } else if (_death_march_count == 0) {
+ if (should_alloc_in_eden(size)) {
+ _death_march_count = 1; // death march has started
+ }
+ }
+}
+
+HeapWord* ParallelScavengeHeap::mem_allocate_old_gen(size_t size) {
+ if (!should_alloc_in_eden(size) || GC_locker::is_active_and_needs_gc()) {
+ // Size is too big for eden, or gc is locked out.
+ return old_gen()->allocate(size);
+ }
+
+ // If a "death march" is in progress, allocate from the old gen a limited
+ // number of times before doing a GC.
+ if (_death_march_count > 0) {
+ if (_death_march_count < 64) {
+ ++_death_march_count;
+ return old_gen()->allocate(size);
+ } else {
+ _death_march_count = 0;
+ }
+ }
+ return NULL;
+}
+
// Failed allocation policy. Must be called from the VM thread, and
// only at a safepoint! Note that this method has policy for allocation
// flow, and NOT collection policy. So we do not check for gc collection
@@ -535,27 +562,22 @@ HeapWord* ParallelScavengeHeap::failed_mem_allocate(size_t size) {
assert(!Universe::heap()->is_gc_active(), "not reentrant");
assert(!Heap_lock->owned_by_self(), "this thread should not own the Heap_lock");
- size_t mark_sweep_invocation_count = total_invocations();
-
- // We assume (and assert!) that an allocation at this point will fail
- // unless we collect.
+ // We assume that allocation in eden will fail unless we collect.
// First level allocation failure, scavenge and allocate in young gen.
GCCauseSetter gccs(this, GCCause::_allocation_failure);
- PSScavenge::invoke();
+ const bool invoked_full_gc = PSScavenge::invoke();
HeapWord* result = young_gen()->allocate(size);
// Second level allocation failure.
// Mark sweep and allocate in young generation.
- if (result == NULL) {
- // There is some chance the scavenge method decided to invoke mark_sweep.
- // Don't mark sweep twice if so.
- if (mark_sweep_invocation_count == total_invocations()) {
- invoke_full_gc(false);
- result = young_gen()->allocate(size);
- }
+ if (result == NULL && !invoked_full_gc) {
+ invoke_full_gc(false);
+ result = young_gen()->allocate(size);
}
+ death_march_check(result, size);
+
// Third level allocation failure.
// After mark sweep and young generation allocation failure,
// allocate in old generation.
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
index f9ff996..5934cdf 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ class ParallelScavengeHeap : public CollectedHeap {
// Collection of generations that are adjacent in the
// space reserved for the heap.
AdjoiningGenerations* _gens;
+ unsigned int _death_march_count;
static GCTaskManager* _gc_task_manager; // The task manager.
@@ -71,8 +72,13 @@ class ParallelScavengeHeap : public CollectedHeap {
static inline size_t total_invocations();
HeapWord* allocate_new_tlab(size_t size);
+ inline bool should_alloc_in_eden(size_t size) const;
+ inline void death_march_check(HeapWord* const result, size_t size);
+ HeapWord* mem_allocate_old_gen(size_t size);
+
public:
ParallelScavengeHeap() : CollectedHeap() {
+ _death_march_count = 0;
set_alignment(_perm_gen_alignment, intra_heap_alignment());
set_alignment(_young_gen_alignment, intra_heap_alignment());
set_alignment(_old_gen_alignment, intra_heap_alignment());
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp
index 7244c72..99c7ff5 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,12 @@ inline size_t ParallelScavengeHeap::total_invocations()
PSMarkSweep::total_invocations();
}
+inline bool ParallelScavengeHeap::should_alloc_in_eden(const size_t size) const
+{
+ const size_t eden_size = young_gen()->eden_space()->capacity_in_words();
+ return size < eden_size / 2;
+}
+
inline void ParallelScavengeHeap::invoke_scavenge()
{
PSScavenge::invoke();
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
index 01fb659..ad599ae 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -100,12 +100,12 @@ void PSMarkSweep::invoke(bool maximum_heap_compaction) {
// This method contains no policy. You should probably
// be calling invoke() instead.
-void PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) {
+bool PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) {
assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
assert(ref_processor() != NULL, "Sanity");
if (GC_locker::check_active_before_gc()) {
- return;
+ return false;
}
ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
@@ -132,9 +132,7 @@ void PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) {
AdaptiveSizePolicyOutput(size_policy, heap->total_collections());
- if (PrintHeapAtGC) {
- Universe::print_heap_before_gc();
- }
+ heap->print_heap_before_gc();
// Fill in TLABs
heap->accumulate_statistics_all_tlabs();
@@ -377,15 +375,15 @@ void PSMarkSweep::invoke_no_policy(bool clear_all_softrefs) {
NOT_PRODUCT(ref_processor()->verify_no_references_recorded());
- if (PrintHeapAtGC) {
- Universe::print_heap_after_gc();
- }
+ heap->print_heap_after_gc();
heap->post_full_gc_dump();
#ifdef TRACESPINNING
ParallelTaskTerminator::print_termination_counts();
#endif
+
+ return true;
}
bool PSMarkSweep::absorb_live_data_from_eden(PSAdaptiveSizePolicy* size_policy,
@@ -504,7 +502,6 @@ void PSMarkSweep::deallocate_stacks() {
void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
// Recursively traverse all live objects and mark them
- EventMark m("1 mark object");
TraceTime tm("phase 1", PrintGCDetails && Verbose, true, gclog_or_tty);
trace(" 1");
@@ -563,7 +560,6 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
void PSMarkSweep::mark_sweep_phase2() {
- EventMark m("2 compute new addresses");
TraceTime tm("phase 2", PrintGCDetails && Verbose, true, gclog_or_tty);
trace("2");
@@ -608,7 +604,6 @@ static PSAlwaysTrueClosure always_true;
void PSMarkSweep::mark_sweep_phase3() {
// Adjust the pointers to reflect the new locations
- EventMark m("3 adjust pointers");
TraceTime tm("phase 3", PrintGCDetails && Verbose, true, gclog_or_tty);
trace("3");
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp
index 832b167..56b0e7d 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -78,7 +78,7 @@ class PSMarkSweep : public MarkSweep {
public:
static void invoke(bool clear_all_softrefs);
- static void invoke_no_policy(bool clear_all_softrefs);
+ static bool invoke_no_policy(bool clear_all_softrefs);
static void initialize();
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
index c221528..354b3d0 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -983,9 +983,7 @@ void PSParallelCompact::pre_compact(PreGCValues* pre_gc_values)
// We need to track unique mark sweep invocations as well.
_total_invocations++;
- if (PrintHeapAtGC) {
- Universe::print_heap_before_gc();
- }
+ heap->print_heap_before_gc();
// Fill in TLABs
heap->accumulate_statistics_all_tlabs();
@@ -1838,7 +1836,6 @@ void PSParallelCompact::summary_phase_msg(SpaceId dst_space_id,
void PSParallelCompact::summary_phase(ParCompactionManager* cm,
bool maximum_compaction)
{
- EventMark m("2 summarize");
TraceTime tm("summary phase", print_phases(), true, gclog_or_tty);
// trace("2");
@@ -1996,12 +1993,12 @@ bool ParallelCompactData::region_contains(size_t region_index, HeapWord* addr) {
// This method contains no policy. You should probably
// be calling invoke() instead.
-void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
+bool PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
assert(SafepointSynchronize::is_at_safepoint(), "must be at a safepoint");
assert(ref_processor() != NULL, "Sanity");
if (GC_locker::check_active_before_gc()) {
- return;
+ return false;
}
TimeStamp marking_start;
@@ -2237,9 +2234,7 @@ void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
collection_exit.update();
- if (PrintHeapAtGC) {
- Universe::print_heap_after_gc();
- }
+ heap->print_heap_after_gc();
if (PrintGCTaskTimeStamps) {
gclog_or_tty->print_cr("VM-Thread " INT64_FORMAT " " INT64_FORMAT " "
INT64_FORMAT,
@@ -2253,6 +2248,8 @@ void PSParallelCompact::invoke_no_policy(bool maximum_heap_compaction) {
#ifdef TRACESPINNING
ParallelTaskTerminator::print_termination_counts();
#endif
+
+ return true;
}
bool PSParallelCompact::absorb_live_data_from_eden(PSAdaptiveSizePolicy* size_policy,
@@ -2352,7 +2349,6 @@ GCTaskManager* const PSParallelCompact::gc_task_manager() {
void PSParallelCompact::marking_phase(ParCompactionManager* cm,
bool maximum_heap_compaction) {
// Recursively traverse all live objects and mark them
- EventMark m("1 mark object");
TraceTime tm("marking phase", print_phases(), true, gclog_or_tty);
ParallelScavengeHeap* heap = gc_heap();
@@ -2438,7 +2434,6 @@ static PSAlwaysTrueClosure always_true;
void PSParallelCompact::adjust_roots() {
// Adjust the pointers to reflect the new locations
- EventMark m("3 adjust roots");
TraceTime tm("adjust roots", print_phases(), true, gclog_or_tty);
// General strong roots.
@@ -2469,7 +2464,6 @@ void PSParallelCompact::adjust_roots() {
}
void PSParallelCompact::compact_perm(ParCompactionManager* cm) {
- EventMark m("4 compact perm");
TraceTime tm("compact perm gen", print_phases(), true, gclog_or_tty);
// trace("4");
@@ -2647,7 +2641,6 @@ void PSParallelCompact::enqueue_region_stealing_tasks(
}
void PSParallelCompact::compact() {
- EventMark m("5 compact");
// trace("5");
TraceTime tm("compaction phase", print_phases(), true, gclog_or_tty);
@@ -3502,4 +3495,3 @@ void PSParallelCompact::compact_prologue() {
_updated_int_array_klass_obj = (klassOop)
summary_data().calc_new_pointer(Universe::intArrayKlassObj());
}
-
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
index 1e4fd90..15332e1 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1057,7 +1057,7 @@ class PSParallelCompact : AllStatic {
}
static void invoke(bool maximum_heap_compaction);
- static void invoke_no_policy(bool maximum_heap_compaction);
+ static bool invoke_no_policy(bool maximum_heap_compaction);
static void post_initialize();
// Perform initialization for PSParallelCompact that requires
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
index 255bb8e..f724969 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -247,167 +247,6 @@ void PSPromotionManager::flush_labs() {
}
}
-//
-// This method is pretty bulky. It would be nice to split it up
-// into smaller submethods, but we need to be careful not to hurt
-// performance.
-//
-
-oop PSPromotionManager::copy_to_survivor_space(oop o) {
- assert(PSScavenge::should_scavenge(&o), "Sanity");
-
- oop new_obj = NULL;
-
- // NOTE! We must be very careful with any methods that access the mark
- // in o. There may be multiple threads racing on it, and it may be forwarded
- // at any time. Do not use oop methods for accessing the mark!
- markOop test_mark = o->mark();
-
- // The same test as "o->is_forwarded()"
- if (!test_mark->is_marked()) {
- bool new_obj_is_tenured = false;
- size_t new_obj_size = o->size();
-
- // Find the objects age, MT safe.
- int age = (test_mark->has_displaced_mark_helper() /* o->has_displaced_mark() */) ?
- test_mark->displaced_mark_helper()->age() : test_mark->age();
-
- // Try allocating obj in to-space (unless too old)
- if (age < PSScavenge::tenuring_threshold()) {
- new_obj = (oop) _young_lab.allocate(new_obj_size);
- if (new_obj == NULL && !_young_gen_is_full) {
- // Do we allocate directly, or flush and refill?
- if (new_obj_size > (YoungPLABSize / 2)) {
- // Allocate this object directly
- new_obj = (oop)young_space()->cas_allocate(new_obj_size);
- } else {
- // Flush and fill
- _young_lab.flush();
-
- HeapWord* lab_base = young_space()->cas_allocate(YoungPLABSize);
- if (lab_base != NULL) {
- _young_lab.initialize(MemRegion(lab_base, YoungPLABSize));
- // Try the young lab allocation again.
- new_obj = (oop) _young_lab.allocate(new_obj_size);
- } else {
- _young_gen_is_full = true;
- }
- }
- }
- }
-
- // Otherwise try allocating obj tenured
- if (new_obj == NULL) {
-#ifndef PRODUCT
- if (Universe::heap()->promotion_should_fail()) {
- return oop_promotion_failed(o, test_mark);
- }
-#endif // #ifndef PRODUCT
-
- new_obj = (oop) _old_lab.allocate(new_obj_size);
- new_obj_is_tenured = true;
-
- if (new_obj == NULL) {
- if (!_old_gen_is_full) {
- // Do we allocate directly, or flush and refill?
- if (new_obj_size > (OldPLABSize / 2)) {
- // Allocate this object directly
- new_obj = (oop)old_gen()->cas_allocate(new_obj_size);
- } else {
- // Flush and fill
- _old_lab.flush();
-
- HeapWord* lab_base = old_gen()->cas_allocate(OldPLABSize);
- if(lab_base != NULL) {
- _old_lab.initialize(MemRegion(lab_base, OldPLABSize));
- // Try the old lab allocation again.
- new_obj = (oop) _old_lab.allocate(new_obj_size);
- }
- }
- }
-
- // This is the promotion failed test, and code handling.
- // The code belongs here for two reasons. It is slightly
- // different thatn the code below, and cannot share the
- // CAS testing code. Keeping the code here also minimizes
- // the impact on the common case fast path code.
-
- if (new_obj == NULL) {
- _old_gen_is_full = true;
- return oop_promotion_failed(o, test_mark);
- }
- }
- }
-
- assert(new_obj != NULL, "allocation should have succeeded");
-
- // Copy obj
- Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size);
-
- // Now we have to CAS in the header.
- if (o->cas_forward_to(new_obj, test_mark)) {
- // We won any races, we "own" this object.
- assert(new_obj == o->forwardee(), "Sanity");
-
- // Increment age if obj still in new generation. Now that
- // we're dealing with a markOop that cannot change, it is
- // okay to use the non mt safe oop methods.
- if (!new_obj_is_tenured) {
- new_obj->incr_age();
- assert(young_space()->contains(new_obj), "Attempt to push non-promoted obj");
- }
-
- // Do the size comparison first with new_obj_size, which we
- // already have. Hopefully, only a few objects are larger than
- // _min_array_size_for_chunking, and most of them will be arrays.
- // So, the is->objArray() test would be very infrequent.
- if (new_obj_size > _min_array_size_for_chunking &&
- new_obj->is_objArray() &&
- PSChunkLargeArrays) {
- // we'll chunk it
- oop* const masked_o = mask_chunked_array_oop(o);
- push_depth(masked_o);
- TASKQUEUE_STATS_ONLY(++_arrays_chunked; ++_masked_pushes);
- } else {
- // we'll just push its contents
- new_obj->push_contents(this);
- }
- } else {
- // We lost, someone else "owns" this object
- guarantee(o->is_forwarded(), "Object must be forwarded if the cas failed.");
-
- // Try to deallocate the space. If it was directly allocated we cannot
- // deallocate it, so we have to test. If the deallocation fails,
- // overwrite with a filler object.
- if (new_obj_is_tenured) {
- if (!_old_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
- CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
- }
- } else if (!_young_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
- CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
- }
-
- // don't update this before the unallocation!
- new_obj = o->forwardee();
- }
- } else {
- assert(o->is_forwarded(), "Sanity");
- new_obj = o->forwardee();
- }
-
-#ifdef DEBUG
- // This code must come after the CAS test, or it will print incorrect
- // information.
- if (TraceScavenge) {
- gclog_or_tty->print_cr("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (" SIZE_FORMAT ")}",
- PSScavenge::should_scavenge(&new_obj) ? "copying" : "tenuring",
- new_obj->blueprint()->internal_name(), o, new_obj, new_obj->size());
- }
-#endif
-
- return new_obj;
-}
-
template <class T> void PSPromotionManager::process_array_chunk_work(
oop obj,
int start, int end) {
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp
index 80c09d9..360640e 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -171,7 +171,7 @@ class PSPromotionManager : public CHeapObj {
void set_old_gen_is_full(bool state) { _old_gen_is_full = state; }
// Promotion methods
- oop copy_to_survivor_space(oop o);
+ template<bool promote_immediately> oop copy_to_survivor_space(oop o);
oop oop_promotion_failed(oop obj, markOop obj_mark);
void reset();
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
index eae7ead..6c5da30 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,170 @@ inline void PSPromotionManager::claim_or_forward_depth(T* p) {
claim_or_forward_internal_depth(p);
}
+//
+// This method is pretty bulky. It would be nice to split it up
+// into smaller submethods, but we need to be careful not to hurt
+// performance.
+//
+template<bool promote_immediately>
+oop PSPromotionManager::copy_to_survivor_space(oop o) {
+ assert(PSScavenge::should_scavenge(&o), "Sanity");
+
+ oop new_obj = NULL;
+
+ // NOTE! We must be very careful with any methods that access the mark
+ // in o. There may be multiple threads racing on it, and it may be forwarded
+ // at any time. Do not use oop methods for accessing the mark!
+ markOop test_mark = o->mark();
+
+ // The same test as "o->is_forwarded()"
+ if (!test_mark->is_marked()) {
+ bool new_obj_is_tenured = false;
+ size_t new_obj_size = o->size();
+
+ if (!promote_immediately) {
+ // Find the objects age, MT safe.
+ int age = (test_mark->has_displaced_mark_helper() /* o->has_displaced_mark() */) ?
+ test_mark->displaced_mark_helper()->age() : test_mark->age();
+
+ // Try allocating obj in to-space (unless too old)
+ if (age < PSScavenge::tenuring_threshold()) {
+ new_obj = (oop) _young_lab.allocate(new_obj_size);
+ if (new_obj == NULL && !_young_gen_is_full) {
+ // Do we allocate directly, or flush and refill?
+ if (new_obj_size > (YoungPLABSize / 2)) {
+ // Allocate this object directly
+ new_obj = (oop)young_space()->cas_allocate(new_obj_size);
+ } else {
+ // Flush and fill
+ _young_lab.flush();
+
+ HeapWord* lab_base = young_space()->cas_allocate(YoungPLABSize);
+ if (lab_base != NULL) {
+ _young_lab.initialize(MemRegion(lab_base, YoungPLABSize));
+ // Try the young lab allocation again.
+ new_obj = (oop) _young_lab.allocate(new_obj_size);
+ } else {
+ _young_gen_is_full = true;
+ }
+ }
+ }
+ }
+ }
+
+ // Otherwise try allocating obj tenured
+ if (new_obj == NULL) {
+#ifndef PRODUCT
+ if (Universe::heap()->promotion_should_fail()) {
+ return oop_promotion_failed(o, test_mark);
+ }
+#endif // #ifndef PRODUCT
+
+ new_obj = (oop) _old_lab.allocate(new_obj_size);
+ new_obj_is_tenured = true;
+
+ if (new_obj == NULL) {
+ if (!_old_gen_is_full) {
+ // Do we allocate directly, or flush and refill?
+ if (new_obj_size > (OldPLABSize / 2)) {
+ // Allocate this object directly
+ new_obj = (oop)old_gen()->cas_allocate(new_obj_size);
+ } else {
+ // Flush and fill
+ _old_lab.flush();
+
+ HeapWord* lab_base = old_gen()->cas_allocate(OldPLABSize);
+ if(lab_base != NULL) {
+ _old_lab.initialize(MemRegion(lab_base, OldPLABSize));
+ // Try the old lab allocation again.
+ new_obj = (oop) _old_lab.allocate(new_obj_size);
+ }
+ }
+ }
+
+ // This is the promotion failed test, and code handling.
+ // The code belongs here for two reasons. It is slightly
+ // different thatn the code below, and cannot share the
+ // CAS testing code. Keeping the code here also minimizes
+ // the impact on the common case fast path code.
+
+ if (new_obj == NULL) {
+ _old_gen_is_full = true;
+ return oop_promotion_failed(o, test_mark);
+ }
+ }
+ }
+
+ assert(new_obj != NULL, "allocation should have succeeded");
+
+ // Copy obj
+ Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)new_obj, new_obj_size);
+
+ // Now we have to CAS in the header.
+ if (o->cas_forward_to(new_obj, test_mark)) {
+ // We won any races, we "own" this object.
+ assert(new_obj == o->forwardee(), "Sanity");
+
+ // Increment age if obj still in new generation. Now that
+ // we're dealing with a markOop that cannot change, it is
+ // okay to use the non mt safe oop methods.
+ if (!new_obj_is_tenured) {
+ new_obj->incr_age();
+ assert(young_space()->contains(new_obj), "Attempt to push non-promoted obj");
+ }
+
+ // Do the size comparison first with new_obj_size, which we
+ // already have. Hopefully, only a few objects are larger than
+ // _min_array_size_for_chunking, and most of them will be arrays.
+ // So, the is->objArray() test would be very infrequent.
+ if (new_obj_size > _min_array_size_for_chunking &&
+ new_obj->is_objArray() &&
+ PSChunkLargeArrays) {
+ // we'll chunk it
+ oop* const masked_o = mask_chunked_array_oop(o);
+ push_depth(masked_o);
+ TASKQUEUE_STATS_ONLY(++_arrays_chunked; ++_masked_pushes);
+ } else {
+ // we'll just push its contents
+ new_obj->push_contents(this);
+ }
+ } else {
+ // We lost, someone else "owns" this object
+ guarantee(o->is_forwarded(), "Object must be forwarded if the cas failed.");
+
+ // Try to deallocate the space. If it was directly allocated we cannot
+ // deallocate it, so we have to test. If the deallocation fails,
+ // overwrite with a filler object.
+ if (new_obj_is_tenured) {
+ if (!_old_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
+ CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
+ }
+ } else if (!_young_lab.unallocate_object((HeapWord*) new_obj, new_obj_size)) {
+ CollectedHeap::fill_with_object((HeapWord*) new_obj, new_obj_size);
+ }
+
+ // don't update this before the unallocation!
+ new_obj = o->forwardee();
+ }
+ } else {
+ assert(o->is_forwarded(), "Sanity");
+ new_obj = o->forwardee();
+ }
+
+#ifdef DEBUG
+ // This code must come after the CAS test, or it will print incorrect
+ // information.
+ if (TraceScavenge) {
+ gclog_or_tty->print_cr("{%s %s " PTR_FORMAT " -> " PTR_FORMAT " (" SIZE_FORMAT ")}",
+ PSScavenge::should_scavenge(&new_obj) ? "copying" : "tenuring",
+ new_obj->blueprint()->internal_name(), o, new_obj, new_obj->size());
+ }
+#endif
+
+ return new_obj;
+}
+
+
inline void PSPromotionManager::process_popped_location_depth(StarTask p) {
if (is_oop_masked(p)) {
assert(PSChunkLargeArrays, "invariant");
@@ -69,9 +233,9 @@ inline void PSPromotionManager::process_popped_location_depth(StarTask p) {
} else {
if (p.is_narrow()) {
assert(UseCompressedOops, "Error");
- PSScavenge::copy_and_push_safe_barrier(this, (narrowOop*)p);
+ PSScavenge::copy_and_push_safe_barrier<narrowOop, /*promote_immediately=*/false>(this, p);
} else {
- PSScavenge::copy_and_push_safe_barrier(this, (oop*)p);
+ PSScavenge::copy_and_push_safe_barrier<oop, /*promote_immediately=*/false>(this, p);
}
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
index 0cf826e..984b1a4 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "classfile/symbolTable.hpp"
+#include "code/codeCache.hpp"
#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
#include "gc_implementation/parallelScavenge/gcTaskManager.hpp"
#include "gc_implementation/parallelScavenge/generationSizer.hpp"
@@ -100,7 +101,7 @@ public:
// Weak refs may be visited more than once.
if (PSScavenge::should_scavenge(p, _to_space)) {
- PSScavenge::copy_and_push_safe_barrier(_promotion_manager, p);
+ PSScavenge::copy_and_push_safe_barrier<T, /*promote_immediately=*/false>(_promotion_manager, p);
}
}
virtual void do_oop(oop* p) { PSKeepAliveClosure::do_oop_work(p); }
@@ -214,36 +215,41 @@ void PSRefProcTaskExecutor::execute(EnqueueTask& task)
//
// Note that this method should only be called from the vm_thread while
// at a safepoint!
-void PSScavenge::invoke() {
+bool PSScavenge::invoke() {
assert(SafepointSynchronize::is_at_safepoint(), "should be at safepoint");
assert(Thread::current() == (Thread*)VMThread::vm_thread(), "should be in vm thread");
assert(!Universe::heap()->is_gc_active(), "not reentrant");
- ParallelScavengeHeap* heap = (ParallelScavengeHeap*)Universe::heap();
+ ParallelScavengeHeap* const heap = (ParallelScavengeHeap*)Universe::heap();
assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity");
PSAdaptiveSizePolicy* policy = heap->size_policy();
IsGCActiveMark mark;
- bool scavenge_was_done = PSScavenge::invoke_no_policy();
+ const bool scavenge_done = PSScavenge::invoke_no_policy();
+ const bool need_full_gc = !scavenge_done ||
+ policy->should_full_GC(heap->old_gen()->free_in_bytes());
+ bool full_gc_done = false;
- PSGCAdaptivePolicyCounters* counters = heap->gc_policy_counters();
- if (UsePerfData)
- counters->update_full_follows_scavenge(0);
- if (!scavenge_was_done ||
- policy->should_full_GC(heap->old_gen()->free_in_bytes())) {
- if (UsePerfData)
- counters->update_full_follows_scavenge(full_follows_scavenge);
+ if (UsePerfData) {
+ PSGCAdaptivePolicyCounters* const counters = heap->gc_policy_counters();
+ const int ffs_val = need_full_gc ? full_follows_scavenge : not_skipped;
+ counters->update_full_follows_scavenge(ffs_val);
+ }
+
+ if (need_full_gc) {
GCCauseSetter gccs(heap, GCCause::_adaptive_size_policy);
CollectorPolicy* cp = heap->collector_policy();
const bool clear_all_softrefs = cp->should_clear_all_soft_refs();
if (UseParallelOldGC) {
- PSParallelCompact::invoke_no_policy(clear_all_softrefs);
+ full_gc_done = PSParallelCompact::invoke_no_policy(clear_all_softrefs);
} else {
- PSMarkSweep::invoke_no_policy(clear_all_softrefs);
+ full_gc_done = PSMarkSweep::invoke_no_policy(clear_all_softrefs);
}
}
+
+ return full_gc_done;
}
// This method contains no policy. You should probably
@@ -295,9 +301,7 @@ bool PSScavenge::invoke_no_policy() {
heap->record_gen_tops_before_GC();
}
- if (PrintHeapAtGC) {
- Universe::print_heap_before_gc();
- }
+ heap->print_heap_before_gc();
assert(!NeverTenure || _tenuring_threshold == markOopDesc::max_age + 1, "Sanity");
assert(!AlwaysTenure || _tenuring_threshold == 0, "Sanity");
@@ -604,6 +608,8 @@ bool PSScavenge::invoke_no_policy() {
NOT_PRODUCT(reference_processor()->verify_no_references_recorded());
+ CodeCache::prune_scavenge_root_nmethods();
+
// Re-verify object start arrays
if (VerifyObjectStartArray &&
VerifyAfterGC) {
@@ -643,9 +649,7 @@ bool PSScavenge::invoke_no_policy() {
Universe::verify(false);
}
- if (PrintHeapAtGC) {
- Universe::print_heap_after_gc();
- }
+ heap->print_heap_after_gc();
if (ZapUnusedHeapArea) {
young_gen->eden_space()->check_mangled_unused_area_complete();
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp
index f3e65a1..2ff201e 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -117,10 +117,9 @@ class PSScavenge: AllStatic {
// Called by parallelScavengeHeap to init the tenuring threshold
static void initialize();
- // Scavenge entry point
- static void invoke();
- // Return true is a collection was done. Return
- // false if the collection was skipped.
+ // Scavenge entry point. This may invoke a full gc; return true if so.
+ static bool invoke();
+ // Return true if a collection was done; false otherwise.
static bool invoke_no_policy();
// If an attempt to promote fails, this method is invoked
@@ -135,7 +134,8 @@ class PSScavenge: AllStatic {
template <class T> static inline bool should_scavenge(T* p, MutableSpace* to_space);
template <class T> static inline bool should_scavenge(T* p, bool check_to_space);
- template <class T> inline static void copy_and_push_safe_barrier(PSPromotionManager* pm, T* p);
+ template <class T, bool promote_immediately>
+ inline static void copy_and_push_safe_barrier(PSPromotionManager* pm, T* p);
// Is an object in the young generation
// This assumes that the HeapWord argument is in the heap,
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp
index 880f067..8497dd1 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* 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 @@
#include "gc_implementation/parallelScavenge/cardTableExtension.hpp"
#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.hpp"
+#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
inline void PSScavenge::save_to_space_top_before_gc() {
@@ -65,7 +66,7 @@ inline bool PSScavenge::should_scavenge(T* p, bool check_to_space) {
// Attempt to "claim" oop at p via CAS, push the new obj if successful
// This version tests the oop* to make sure it is within the heap before
// attempting marking.
-template <class T>
+template <class T, bool promote_immediately>
inline void PSScavenge::copy_and_push_safe_barrier(PSPromotionManager* pm,
T* p) {
assert(should_scavenge(p, true), "revisiting object?");
@@ -73,7 +74,7 @@ inline void PSScavenge::copy_and_push_safe_barrier(PSPromotionManager* pm,
oop o = oopDesc::load_decode_heap_oop_not_null(p);
oop new_obj = o->is_forwarded()
? o->forwardee()
- : pm->copy_to_survivor_space(o);
+ : pm->copy_to_survivor_space<promote_immediately>(o);
oopDesc::encode_store_heap_oop_not_null(p, new_obj);
// We cannot mark without test, as some code passes us pointers
@@ -86,7 +87,8 @@ inline void PSScavenge::copy_and_push_safe_barrier(PSPromotionManager* pm,
}
}
-class PSScavengeRootsClosure: public OopClosure {
+template<bool promote_immediately>
+class PSRootsClosure: public OopClosure {
private:
PSPromotionManager* _promotion_manager;
@@ -94,13 +96,16 @@ class PSScavengeRootsClosure: public OopClosure {
template <class T> void do_oop_work(T *p) {
if (PSScavenge::should_scavenge(p)) {
// We never card mark roots, maybe call a func without test?
- PSScavenge::copy_and_push_safe_barrier(_promotion_manager, p);
+ PSScavenge::copy_and_push_safe_barrier<T, promote_immediately>(_promotion_manager, p);
}
}
public:
- PSScavengeRootsClosure(PSPromotionManager* pm) : _promotion_manager(pm) { }
- void do_oop(oop* p) { PSScavengeRootsClosure::do_oop_work(p); }
- void do_oop(narrowOop* p) { PSScavengeRootsClosure::do_oop_work(p); }
+ PSRootsClosure(PSPromotionManager* pm) : _promotion_manager(pm) { }
+ void do_oop(oop* p) { PSRootsClosure::do_oop_work(p); }
+ void do_oop(narrowOop* p) { PSRootsClosure::do_oop_work(p); }
};
+typedef PSRootsClosure</*promote_immediately=*/false> PSScavengeRootsClosure;
+typedef PSRootsClosure</*promote_immediately=*/true> PSPromoteRootsClosure;
+
#endif // SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSSCAVENGE_INLINE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
index 0800681..db28f24 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,7 @@ void ScavengeRootsTask::do_it(GCTaskManager* manager, uint which) {
PSPromotionManager* pm = PSPromotionManager::gc_thread_promotion_manager(which);
PSScavengeRootsClosure roots_closure(pm);
+ PSPromoteRootsClosure roots_to_old_closure(pm);
switch (_root_type) {
case universe:
@@ -91,7 +92,7 @@ void ScavengeRootsTask::do_it(GCTaskManager* manager, uint which) {
case code_cache:
{
- CodeBlobToOopClosure each_scavengable_code_blob(&roots_closure, /*do_marking=*/ true);
+ CodeBlobToOopClosure each_scavengable_code_blob(&roots_to_old_closure, /*do_marking=*/ true);
CodeCache::scavenge_root_nmethods_do(&each_scavengable_code_blob);
}
break;
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
index 413248c..9c86998 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,31 @@ int CollectedHeap::_fire_out_of_memory_count = 0;
size_t CollectedHeap::_filler_array_max_size = 0;
+template <>
+void EventLogBase<GCMessage>::print(outputStream* st, GCMessage& m) {
+ st->print_cr("GC heap %s", m.is_before ? "before" : "after");
+ st->print_raw(m);
+}
+
+void GCHeapLog::log_heap(bool before) {
+ if (!should_log()) {
+ return;
+ }
+
+ double timestamp = fetch_timestamp();
+ MutexLockerEx ml(&_mutex, Mutex::_no_safepoint_check_flag);
+ int index = compute_log_index();
+ _records[index].thread = NULL; // Its the GC thread so it's not that interesting.
+ _records[index].timestamp = timestamp;
+ _records[index].data.is_before = before;
+ stringStream st(_records[index].data.buffer(), _records[index].data.size());
+ if (before) {
+ Universe::print_heap_before_gc(&st, true);
+ } else {
+ Universe::print_heap_after_gc(&st, true);
+ }
+}
+
// Memory state functions.
@@ -81,6 +106,12 @@ CollectedHeap::CollectedHeap() : _n_par_threads(0)
80, GCCause::to_string(_gc_lastcause), CHECK);
}
_defer_initial_card_mark = false; // strengthened by subclass in pre_initialize() below.
+ // Create the ring log
+ if (LogEvents) {
+ _gc_heap_log = new GCHeapLog();
+ } else {
+ _gc_heap_log = NULL;
+ }
}
void CollectedHeap::pre_initialize() {
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
index c54dbbf..5f1b284 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* 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 @@
#include "runtime/handles.hpp"
#include "runtime/perfData.hpp"
#include "runtime/safepoint.hpp"
+#include "utilities/events.hpp"
// A "CollectedHeap" is an implementation of a java heap for HotSpot. This
// is an abstract class: there may be many different kinds of heaps. This
@@ -43,6 +44,29 @@ class AdaptiveSizePolicy;
class Thread;
class CollectorPolicy;
+class GCMessage : public FormatBuffer<1024> {
+ public:
+ bool is_before;
+
+ public:
+ GCMessage() {}
+};
+
+class GCHeapLog : public EventLogBase<GCMessage> {
+ private:
+ void log_heap(bool before);
+
+ public:
+ GCHeapLog() : EventLogBase<GCMessage>("GC Heap History") {}
+
+ void log_heap_before() {
+ log_heap(true);
+ }
+ void log_heap_after() {
+ log_heap(false);
+ }
+};
+
//
// CollectedHeap
// SharedHeap
@@ -62,6 +86,8 @@ class CollectedHeap : public CHeapObj {
// Used for filler objects (static, but initialized in ctor).
static size_t _filler_array_max_size;
+ GCHeapLog* _gc_heap_log;
+
// Used in support of ReduceInitialCardMarks; only consulted if COMPILER2 is being used
bool _defer_initial_card_mark;
@@ -618,6 +644,27 @@ class CollectedHeap : public CHeapObj {
// Default implementation does nothing.
virtual void print_tracing_info() const = 0;
+ // If PrintHeapAtGC is set call the appropriate routi
+ void print_heap_before_gc() {
+ if (PrintHeapAtGC) {
+ Universe::print_heap_before_gc();
+ }
+ if (_gc_heap_log != NULL) {
+ _gc_heap_log->log_heap_before();
+ }
+ }
+ void print_heap_after_gc() {
+ if (PrintHeapAtGC) {
+ Universe::print_heap_after_gc();
+ }
+ if (_gc_heap_log != NULL) {
+ _gc_heap_log->log_heap_after();
+ }
+ }
+
+ // Allocate GCHeapLog during VM startup
+ static void initialize_heap_log();
+
// Heap verification
virtual void verify(bool allow_dirty, bool silent, VerifyOption option) = 0;
diff --git a/hotspot/src/share/vm/gc_interface/gcCause.cpp b/hotspot/src/share/vm/gc_interface/gcCause.cpp
index c4abd12..5797ef8 100644
--- a/hotspot/src/share/vm/gc_interface/gcCause.cpp
+++ b/hotspot/src/share/vm/gc_interface/gcCause.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -84,6 +84,9 @@ const char* GCCause::to_string(GCCause::Cause cause) {
case _g1_inc_collection_pause:
return "G1 Evacuation Pause";
+ case _g1_humongous_allocation:
+ return "G1 Humongous Allocation";
+
case _last_ditch_collection:
return "Last ditch collection";
diff --git a/hotspot/src/share/vm/gc_interface/gcCause.hpp b/hotspot/src/share/vm/gc_interface/gcCause.hpp
index fc49e30..ae14115 100644
--- a/hotspot/src/share/vm/gc_interface/gcCause.hpp
+++ b/hotspot/src/share/vm/gc_interface/gcCause.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -66,6 +66,7 @@ class GCCause : public AllStatic {
_adaptive_size_policy,
_g1_inc_collection_pause,
+ _g1_humongous_allocation,
_last_ditch_collection,
_last_gc_cause
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index c3eb879..e1c1665 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -859,7 +859,9 @@ IRT_ENTRY(nmethod*,
const int branch_bci = branch_bcp != NULL ? method->bci_from(branch_bcp) : InvocationEntryBci;
const int bci = branch_bcp != NULL ? method->bci_from(fr.interpreter_frame_bcp()) : InvocationEntryBci;
+ assert(!HAS_PENDING_EXCEPTION, "Should not have any exceptions pending");
nmethod* osr_nm = CompilationPolicy::policy()->event(method, method, branch_bci, bci, CompLevel_none, NULL, thread);
+ assert(!HAS_PENDING_EXCEPTION, "Event handler should not throw any exceptions");
if (osr_nm != NULL) {
// We may need to do on-stack replacement which requires that no
diff --git a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
index 2d14f4c..e65d034 100644
--- a/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
+++ b/hotspot/src/share/vm/memory/cardTableModRefBS.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,6 +72,9 @@ class CardTableModRefBS: public ModRefBarrierSet {
CT_MR_BS_last_reserved = 16
};
+ // a word's worth (row) of clean card values
+ static const intptr_t clean_card_row = (intptr_t)(-1);
+
// dirty and precleaned are equivalent wrt younger_refs_iter.
static bool card_is_dirty_wrt_gen_iter(jbyte cv) {
return cv == dirty_card || cv == precleaned_card;
diff --git a/hotspot/src/share/vm/memory/cardTableRS.cpp b/hotspot/src/share/vm/memory/cardTableRS.cpp
index c152d6c..539f706 100644
--- a/hotspot/src/share/vm/memory/cardTableRS.cpp
+++ b/hotspot/src/share/vm/memory/cardTableRS.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -173,6 +173,10 @@ ClearNoncleanCardWrapper::ClearNoncleanCardWrapper(
SharedHeap::heap()->workers()->active_workers()), "Mismatch");
}
+bool ClearNoncleanCardWrapper::is_word_aligned(jbyte* entry) {
+ return (((intptr_t)entry) & (BytesPerWord-1)) == 0;
+}
+
void ClearNoncleanCardWrapper::do_MemRegion(MemRegion mr) {
assert(mr.word_size() > 0, "Error");
assert(_ct->is_aligned(mr.start()), "mr.start() should be card aligned");
@@ -194,6 +198,17 @@ void ClearNoncleanCardWrapper::do_MemRegion(MemRegion mr) {
const MemRegion mrd(start_of_non_clean, end_of_non_clean);
_dirty_card_closure->do_MemRegion(mrd);
}
+
+ // fast forward through potential continuous whole-word range of clean cards beginning at a word-boundary
+ if (is_word_aligned(cur_entry)) {
+ jbyte* cur_row = cur_entry - BytesPerWord;
+ while (cur_row >= limit && *((intptr_t*)cur_row) == CardTableRS::clean_card_row()) {
+ cur_row -= BytesPerWord;
+ }
+ cur_entry = cur_row + BytesPerWord;
+ cur_hw = _ct->addr_for(cur_entry);
+ }
+
// Reset the dirty window, while continuing to look
// for the next dirty card that will start a
// new dirty window.
diff --git a/hotspot/src/share/vm/memory/cardTableRS.hpp b/hotspot/src/share/vm/memory/cardTableRS.hpp
index a15b85f..1b155a3 100644
--- a/hotspot/src/share/vm/memory/cardTableRS.hpp
+++ b/hotspot/src/share/vm/memory/cardTableRS.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,6 +45,10 @@ class CardTableRS: public GenRemSet {
return CardTableModRefBS::clean_card;
}
+ static intptr_t clean_card_row() {
+ return CardTableModRefBS::clean_card_row;
+ }
+
static bool
card_is_dirty_wrt_gen_iter(jbyte cv) {
return CardTableModRefBS::card_is_dirty_wrt_gen_iter(cv);
@@ -176,6 +180,8 @@ private:
// Work methods called by the clear_card()
inline bool clear_card_serial(jbyte* entry);
inline bool clear_card_parallel(jbyte* entry);
+ // check alignment of pointer
+ bool is_word_aligned(jbyte* entry);
public:
ClearNoncleanCardWrapper(DirtyCardToOopClosure* dirty_card_closure, CardTableRS* ct);
diff --git a/hotspot/src/share/vm/memory/compactingPermGenGen.cpp b/hotspot/src/share/vm/memory/compactingPermGenGen.cpp
index 3754628..c903bf4 100644
--- a/hotspot/src/share/vm/memory/compactingPermGenGen.cpp
+++ b/hotspot/src/share/vm/memory/compactingPermGenGen.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -240,9 +240,6 @@ CompactingPermGenGen::CompactingPermGenGen(ReservedSpace rs,
if (_ro_space == NULL || _rw_space == NULL)
vm_exit_during_initialization("Could not allocate a shared space");
- // Cover both shared spaces entirely with cards.
- _rs->resize_covered_region(MemRegion(readonly_bottom, readwrite_end));
-
if (UseSharedSpaces) {
// Map in the regions in the shared file.
@@ -279,10 +276,14 @@ CompactingPermGenGen::CompactingPermGenGen(ReservedSpace rs,
delete _rw_space;
_rw_space = NULL;
shared_end = (HeapWord*)(rs.base() + rs.size());
- _rs->resize_covered_region(MemRegion(shared_bottom, shared_bottom));
}
}
+ if (spec()->enable_shared_spaces()) {
+ // Cover both shared spaces entirely with cards.
+ _rs->resize_covered_region(MemRegion(readonly_bottom, readwrite_end));
+ }
+
// Reserved region includes shared spaces for oop.is_in_reserved().
_reserved.set_end(shared_end);
diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/memory/defNewGeneration.cpp
index 5913b2c..69ae362 100644
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -655,7 +655,12 @@ void DefNewGeneration::collect(bool full,
from()->set_concurrent_iteration_safe_limit(from()->top());
to()->set_concurrent_iteration_safe_limit(to()->top());
SpecializationStats::print();
- update_time_of_last_gc(os::javaTimeMillis());
+
+ // We need to use a monotonically non-deccreasing time in ms
+ // or we will see time-warp warnings and os::javaTimeMillis()
+ // does not guarantee monotonicity.
+ jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
+ update_time_of_last_gc(now);
}
class RemoveForwardPointerClosure: public ObjectClosure {
diff --git a/hotspot/src/share/vm/memory/gcLocker.cpp b/hotspot/src/share/vm/memory/gcLocker.cpp
index db0a79d..eda728b 100644
--- a/hotspot/src/share/vm/memory/gcLocker.cpp
+++ b/hotspot/src/share/vm/memory/gcLocker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,37 +32,90 @@ volatile jint GC_locker::_lock_count = 0;
volatile bool GC_locker::_needs_gc = false;
volatile bool GC_locker::_doing_gc = false;
+#ifdef ASSERT
+volatile jint GC_locker::_debug_jni_lock_count = 0;
+#endif
+
+
+#ifdef ASSERT
+void GC_locker::verify_critical_count() {
+ if (SafepointSynchronize::is_at_safepoint()) {
+ assert(!needs_gc() || _debug_jni_lock_count == _jni_lock_count, "must agree");
+ int count = 0;
+ // Count the number of threads with critical operations in progress
+ for (JavaThread* thr = Threads::first(); thr; thr = thr->next()) {
+ if (thr->in_critical()) {
+ count++;
+ }
+ }
+ if (_jni_lock_count != count) {
+ tty->print_cr("critical counts don't match: %d != %d", _jni_lock_count, count);
+ for (JavaThread* thr = Threads::first(); thr; thr = thr->next()) {
+ if (thr->in_critical()) {
+ tty->print_cr(INTPTR_FORMAT " in_critical %d", thr, thr->in_critical());
+ }
+ }
+ }
+ assert(_jni_lock_count == count, "must be equal");
+ }
+}
+#endif
+
+bool GC_locker::check_active_before_gc() {
+ assert(SafepointSynchronize::is_at_safepoint(), "only read at safepoint");
+ if (is_active() && !_needs_gc) {
+ verify_critical_count();
+ _needs_gc = true;
+ if (PrintJNIGCStalls && PrintGCDetails) {
+ ResourceMark rm; // JavaThread::name() allocates to convert to UTF8
+ gclog_or_tty->print_cr("%.3f: Setting _needs_gc. Thread \"%s\" %d locked.",
+ gclog_or_tty->time_stamp().seconds(), Thread::current()->name(), _jni_lock_count);
+ }
+
+ }
+ return is_active();
+}
+
void GC_locker::stall_until_clear() {
assert(!JavaThread::current()->in_critical(), "Would deadlock");
- if (PrintJNIGCStalls && PrintGCDetails) {
- ResourceMark rm; // JavaThread::name() allocates to convert to UTF8
- gclog_or_tty->print_cr(
- "Allocation failed. Thread \"%s\" is stalled by JNI critical section.",
- JavaThread::current()->name());
- }
MutexLocker ml(JNICritical_lock);
+
+ if (needs_gc()) {
+ if (PrintJNIGCStalls && PrintGCDetails) {
+ ResourceMark rm; // JavaThread::name() allocates to convert to UTF8
+ gclog_or_tty->print_cr("%.3f: Allocation failed. Thread \"%s\" is stalled by JNI critical section, %d locked.",
+ gclog_or_tty->time_stamp().seconds(), Thread::current()->name(), _jni_lock_count);
+ }
+ }
+
// Wait for _needs_gc to be cleared
- while (GC_locker::needs_gc()) {
+ while (needs_gc()) {
JNICritical_lock->wait();
}
}
-void GC_locker::jni_lock_slow() {
+void GC_locker::jni_lock(JavaThread* thread) {
+ assert(!thread->in_critical(), "shouldn't currently be in a critical region");
MutexLocker mu(JNICritical_lock);
// Block entering threads if we know at least one thread is in a
// JNI critical region and we need a GC.
// We check that at least one thread is in a critical region before
// blocking because blocked threads are woken up by a thread exiting
// a JNI critical region.
- while ((is_jni_active() && needs_gc()) || _doing_gc) {
+ while ((needs_gc() && is_jni_active()) || _doing_gc) {
JNICritical_lock->wait();
}
- jni_lock();
+ thread->enter_critical();
+ _jni_lock_count++;
+ increment_debug_jni_lock_count();
}
-void GC_locker::jni_unlock_slow() {
+void GC_locker::jni_unlock(JavaThread* thread) {
+ assert(thread->in_last_critical(), "should be exiting critical region");
MutexLocker mu(JNICritical_lock);
- jni_unlock();
+ _jni_lock_count--;
+ decrement_debug_jni_lock_count();
+ thread->exit_critical();
if (needs_gc() && !is_jni_active()) {
// We're the last thread out. Cause a GC to occur.
// GC will also check is_active, so this check is not
@@ -74,11 +127,17 @@ void GC_locker::jni_unlock_slow() {
{
// Must give up the lock while at a safepoint
MutexUnlocker munlock(JNICritical_lock);
+ if (PrintJNIGCStalls && PrintGCDetails) {
+ ResourceMark rm; // JavaThread::name() allocates to convert to UTF8
+ gclog_or_tty->print_cr("%.3f: Thread \"%s\" is performing GC after exiting critical section, %d locked",
+ gclog_or_tty->time_stamp().seconds(), Thread::current()->name(), _jni_lock_count);
+ }
Universe::heap()->collect(GCCause::_gc_locker);
}
_doing_gc = false;
}
- clear_needs_gc();
+
+ _needs_gc = false;
JNICritical_lock->notify_all();
}
}
diff --git a/hotspot/src/share/vm/memory/gcLocker.hpp b/hotspot/src/share/vm/memory/gcLocker.hpp
index c9d913a..f8ce732 100644
--- a/hotspot/src/share/vm/memory/gcLocker.hpp
+++ b/hotspot/src/share/vm/memory/gcLocker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,53 +51,80 @@
class GC_locker: public AllStatic {
private:
- static volatile jint _jni_lock_count; // number of jni active instances
+ // The _jni_lock_count keeps track of the number of threads that are
+ // currently in a critical region. It's only kept up to date when
+ // _needs_gc is true. The current value is computed during
+ // safepointing and decremented during the slow path of GC_locker
+ // unlocking.
+ static volatile jint _jni_lock_count; // number of jni active instances.
+
static volatile jint _lock_count; // number of other active instances
static volatile bool _needs_gc; // heap is filling, we need a GC
// note: bool is typedef'd as jint
static volatile bool _doing_gc; // unlock_critical() is doing a GC
+#ifdef ASSERT
+ // This lock count is updated for all operations and is used to
+ // validate the jni_lock_count that is computed during safepoints.
+ static volatile jint _debug_jni_lock_count;
+#endif
+
// Accessors
static bool is_jni_active() {
+ assert(_needs_gc, "only valid when _needs_gc is set");
return _jni_lock_count > 0;
}
- static void set_needs_gc() {
- assert(SafepointSynchronize::is_at_safepoint(),
- "needs_gc is only set at a safepoint");
- _needs_gc = true;
- }
+ // At a safepoint, visit all threads and count the number of active
+ // critical sections. This is used to ensure that all active
+ // critical sections are exited before a new one is started.
+ static void verify_critical_count() NOT_DEBUG_RETURN;
- static void clear_needs_gc() {
- assert_lock_strong(JNICritical_lock);
- _needs_gc = false;
- }
+ static void jni_lock(JavaThread* thread);
+ static void jni_unlock(JavaThread* thread);
- static void jni_lock() {
- Atomic::inc(&_jni_lock_count);
- CHECK_UNHANDLED_OOPS_ONLY(
- if (CheckUnhandledOops) { Thread::current()->_gc_locked_out_count++; })
- assert(Universe::heap() == NULL || !Universe::heap()->is_gc_active(),
- "locking failed");
+ static bool is_active_internal() {
+ verify_critical_count();
+ return _lock_count > 0 || _jni_lock_count > 0;
}
- static void jni_unlock() {
- Atomic::dec(&_jni_lock_count);
- CHECK_UNHANDLED_OOPS_ONLY(
- if (CheckUnhandledOops) { Thread::current()->_gc_locked_out_count--; })
- }
-
- static void jni_lock_slow();
- static void jni_unlock_slow();
-
public:
// Accessors
- static bool is_active();
+ static bool is_active() {
+ assert(_needs_gc || SafepointSynchronize::is_at_safepoint(), "only read at safepoint");
+ return is_active_internal();
+ }
static bool needs_gc() { return _needs_gc; }
+
// Shorthand
- static bool is_active_and_needs_gc() { return is_active() && needs_gc();}
+ static bool is_active_and_needs_gc() {
+ // Use is_active_internal since _needs_gc can change from true to
+ // false outside of a safepoint, triggering the assert in
+ // is_active.
+ return needs_gc() && is_active_internal();
+ }
- // Calls set_needs_gc() if is_active() is true. Returns is_active().
+ // In debug mode track the locking state at all times
+ static void increment_debug_jni_lock_count() {
+#ifdef ASSERT
+ assert(_debug_jni_lock_count >= 0, "bad value");
+ Atomic::inc(&_debug_jni_lock_count);
+#endif
+ }
+ static void decrement_debug_jni_lock_count() {
+#ifdef ASSERT
+ assert(_debug_jni_lock_count > 0, "bad value");
+ Atomic::dec(&_debug_jni_lock_count);
+#endif
+ }
+
+ // Set the current lock count
+ static void set_jni_lock_count(int count) {
+ _jni_lock_count = count;
+ verify_critical_count();
+ }
+
+ // Sets _needs_gc if is_active() is true. Returns is_active().
static bool check_active_before_gc();
// Stalls the caller (who should not be in a jni critical section)
@@ -131,22 +158,24 @@ class GC_locker: public AllStatic {
// JNI critical regions are the only participants in this scheme
// because they are, by spec, well bounded while in a critical region.
//
- // Each of the following two method is split into a fast path and a slow
- // path. JNICritical_lock is only grabbed in the slow path.
+ // Each of the following two method is split into a fast path and a
+ // slow path. JNICritical_lock is only grabbed in the slow path.
// _needs_gc is initially false and every java thread will go
- // through the fast path (which does the same thing as the slow path
- // when _needs_gc is false). When GC happens at a safepoint,
- // GC_locker::is_active() is checked. Since there is no safepoint in the
- // fast path of lock_critical() and unlock_critical(), there is no race
- // condition between the fast path and GC. After _needs_gc is set at a
- // safepoint, every thread will go through the slow path after the safepoint.
- // Since after a safepoint, each of the following two methods is either
- // entered from the method entry and falls into the slow path, or is
- // resumed from the safepoints in the method, which only exist in the slow
- // path. So when _needs_gc is set, the slow path is always taken, till
- // _needs_gc is cleared.
+ // through the fast path, which simply increments or decrements the
+ // current thread's critical count. When GC happens at a safepoint,
+ // GC_locker::is_active() is checked. Since there is no safepoint in
+ // the fast path of lock_critical() and unlock_critical(), there is
+ // no race condition between the fast path and GC. After _needs_gc
+ // is set at a safepoint, every thread will go through the slow path
+ // after the safepoint. Since after a safepoint, each of the
+ // following two methods is either entered from the method entry and
+ // falls into the slow path, or is resumed from the safepoints in
+ // the method, which only exist in the slow path. So when _needs_gc
+ // is set, the slow path is always taken, till _needs_gc is cleared.
static void lock_critical(JavaThread* thread);
static void unlock_critical(JavaThread* thread);
+
+ static address needs_gc_address() { return (address) &_needs_gc; }
};
diff --git a/hotspot/src/share/vm/memory/gcLocker.inline.hpp b/hotspot/src/share/vm/memory/gcLocker.inline.hpp
index 5c63e07..37b4231 100644
--- a/hotspot/src/share/vm/memory/gcLocker.inline.hpp
+++ b/hotspot/src/share/vm/memory/gcLocker.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,17 +27,6 @@
#include "memory/gcLocker.hpp"
-inline bool GC_locker::is_active() {
- return _lock_count > 0 || _jni_lock_count > 0;
-}
-
-inline bool GC_locker::check_active_before_gc() {
- if (is_active()) {
- set_needs_gc();
- }
- return is_active();
-}
-
inline void GC_locker::lock() {
// cast away volatile
Atomic::inc(&_lock_count);
@@ -56,24 +45,28 @@ inline void GC_locker::unlock() {
inline void GC_locker::lock_critical(JavaThread* thread) {
if (!thread->in_critical()) {
- if (!needs_gc()) {
- jni_lock();
- } else {
- jni_lock_slow();
+ if (needs_gc()) {
+ // jni_lock call calls enter_critical under the lock so that the
+ // global lock count and per thread count are in agreement.
+ jni_lock(thread);
+ return;
}
+ increment_debug_jni_lock_count();
}
thread->enter_critical();
}
inline void GC_locker::unlock_critical(JavaThread* thread) {
- thread->exit_critical();
- if (!thread->in_critical()) {
- if (!needs_gc()) {
- jni_unlock();
- } else {
- jni_unlock_slow();
+ if (thread->in_last_critical()) {
+ if (needs_gc()) {
+ // jni_unlock call calls exit_critical under the lock so that
+ // the global lock count and per thread count are in agreement.
+ jni_unlock(thread);
+ return;
}
+ decrement_debug_jni_lock_count();
}
+ thread->exit_critical();
}
#endif // SHARE_VM_MEMORY_GCLOCKER_INLINE_HPP
diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.cpp b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
index b4de7f1..3cd791d 100644
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -479,11 +479,9 @@ void GenCollectedHeap::do_collection(bool full,
const size_t perm_prev_used = perm_gen()->used();
- if (PrintHeapAtGC) {
- Universe::print_heap_before_gc();
- if (Verbose) {
- gclog_or_tty->print_cr("GC Cause: %s", GCCause::to_string(gc_cause()));
- }
+ print_heap_before_gc();
+ if (Verbose) {
+ gclog_or_tty->print_cr("GC Cause: %s", GCCause::to_string(gc_cause()));
}
{
@@ -685,9 +683,7 @@ void GenCollectedHeap::do_collection(bool full,
AdaptiveSizePolicy* sp = gen_policy()->size_policy();
AdaptiveSizePolicyOutput(sp, total_collections());
- if (PrintHeapAtGC) {
- Universe::print_heap_after_gc();
- }
+ print_heap_after_gc();
#ifdef TRACESPINNING
ParallelTaskTerminator::print_termination_counts();
diff --git a/hotspot/src/share/vm/memory/genMarkSweep.cpp b/hotspot/src/share/vm/memory/genMarkSweep.cpp
index 94a73dd..d5cf4dc 100644
--- a/hotspot/src/share/vm/memory/genMarkSweep.cpp
+++ b/hotspot/src/share/vm/memory/genMarkSweep.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -176,7 +176,11 @@ void GenMarkSweep::invoke_at_safepoint(int level, ReferenceProcessor* rp,
// Update time of last gc for all generations we collected
// (which curently is all the generations in the heap).
- gch->update_time_of_last_gc(os::javaTimeMillis());
+ // We need to use a monotonically non-deccreasing time in ms
+ // or we will see time-warp warnings and os::javaTimeMillis()
+ // does not guarantee monotonicity.
+ jlong now = os::javaTimeNanos() / NANOSECS_PER_MILLISEC;
+ gch->update_time_of_last_gc(now);
}
void GenMarkSweep::allocate_stacks() {
@@ -254,7 +258,6 @@ void GenMarkSweep::deallocate_stacks() {
void GenMarkSweep::mark_sweep_phase1(int level,
bool clear_all_softrefs) {
// Recursively traverse all live objects and mark them
- EventMark m("1 mark object");
TraceTime tm("phase 1", PrintGC && Verbose, true, gclog_or_tty);
trace(" 1");
@@ -325,7 +328,6 @@ void GenMarkSweep::mark_sweep_phase2() {
GenCollectedHeap* gch = GenCollectedHeap::heap();
Generation* pg = gch->perm_gen();
- EventMark m("2 compute new addresses");
TraceTime tm("phase 2", PrintGC && Verbose, true, gclog_or_tty);
trace("2");
@@ -350,7 +352,6 @@ void GenMarkSweep::mark_sweep_phase3(int level) {
Generation* pg = gch->perm_gen();
// Adjust the pointers to reflect the new locations
- EventMark m("3 adjust pointers");
TraceTime tm("phase 3", PrintGC && Verbose, true, gclog_or_tty);
trace("3");
@@ -411,7 +412,6 @@ void GenMarkSweep::mark_sweep_phase4() {
GenCollectedHeap* gch = GenCollectedHeap::heap();
Generation* pg = gch->perm_gen();
- EventMark m("4 compact heap");
TraceTime tm("phase 4", PrintGC && Verbose, true, gclog_or_tty);
trace("4");
diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index 22f5bb9..2651f4d 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -1303,22 +1303,22 @@ void Universe::print_heap_at_SIGBREAK() {
}
}
-void Universe::print_heap_before_gc(outputStream* st) {
+void Universe::print_heap_before_gc(outputStream* st, bool ignore_extended) {
st->print_cr("{Heap before GC invocations=%u (full %u):",
heap()->total_collections(),
heap()->total_full_collections());
- if (!PrintHeapAtGCExtended) {
+ if (!PrintHeapAtGCExtended || ignore_extended) {
heap()->print_on(st);
} else {
heap()->print_extended_on(st);
}
}
-void Universe::print_heap_after_gc(outputStream* st) {
+void Universe::print_heap_after_gc(outputStream* st, bool ignore_extended) {
st->print_cr("Heap after GC invocations=%u (full %u):",
heap()->total_collections(),
heap()->total_full_collections());
- if (!PrintHeapAtGCExtended) {
+ if (!PrintHeapAtGCExtended || ignore_extended) {
heap()->print_on(st);
} else {
heap()->print_extended_on(st);
diff --git a/hotspot/src/share/vm/memory/universe.hpp b/hotspot/src/share/vm/memory/universe.hpp
index 24c793f..5c1587e 100644
--- a/hotspot/src/share/vm/memory/universe.hpp
+++ b/hotspot/src/share/vm/memory/universe.hpp
@@ -424,8 +424,8 @@ class Universe: AllStatic {
static void print_heap_at_SIGBREAK();
static void print_heap_before_gc() { print_heap_before_gc(gclog_or_tty); }
static void print_heap_after_gc() { print_heap_after_gc(gclog_or_tty); }
- static void print_heap_before_gc(outputStream* st);
- static void print_heap_after_gc(outputStream* st);
+ static void print_heap_before_gc(outputStream* st, bool ignore_extended = false);
+ static void print_heap_after_gc(outputStream* st, bool ignore_extended = false);
// Change the number of dummy objects kept reachable by the full gc dummy
// array; this should trigger relocation in a sliding compaction collector.
diff --git a/hotspot/src/share/vm/oops/arrayKlass.cpp b/hotspot/src/share/vm/oops/arrayKlass.cpp
index 5693f8e..4aa1155 100644
--- a/hotspot/src/share/vm/oops/arrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/arrayKlass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -153,6 +153,7 @@ objArrayOop arrayKlass::allocate_arrayArray(int n, int length, TRAPS) {
}
if (length > arrayOopDesc::max_array_length(T_ARRAY)) {
report_java_out_of_memory("Requested array size exceeds VM limit");
+ JvmtiExport::post_array_size_exhausted();
THROW_OOP_0(Universe::out_of_memory_error_array_size());
}
int size = objArrayOopDesc::object_size(length);
diff --git a/hotspot/src/share/vm/oops/arrayOop.cpp b/hotspot/src/share/vm/oops/arrayOop.cpp
index c8239c3..ee94c91 100644
--- a/hotspot/src/share/vm/oops/arrayOop.cpp
+++ b/hotspot/src/share/vm/oops/arrayOop.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
#ifndef PRODUCT
#include "oops/arrayOop.hpp"
+#include "oops/oop.inline.hpp"
#include "utilities/globalDefinitions.hpp"
bool arrayOopDesc::check_max_length_overflow(BasicType type) {
diff --git a/hotspot/src/share/vm/oops/constantPoolOop.cpp b/hotspot/src/share/vm/oops/constantPoolOop.cpp
index 87280c6..493249d 100644
--- a/hotspot/src/share/vm/oops/constantPoolOop.cpp
+++ b/hotspot/src/share/vm/oops/constantPoolOop.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -269,7 +269,7 @@ klassOop constantPoolOopDesc::klass_ref_at_if_loaded_check(constantPoolHandle th
methodOop constantPoolOopDesc::method_at_if_loaded(constantPoolHandle cpool,
int which, Bytecodes::Code invoke_code) {
assert(!constantPoolCacheOopDesc::is_secondary_index(which), "no indy instruction here");
- if (cpool->cache() == NULL) return false; // nothing to load yet
+ if (cpool->cache() == NULL) return NULL; // nothing to load yet
int cache_index = which - CPCACHE_INDEX_TAG;
if (!(cache_index >= 0 && cache_index < cpool->cache()->length())) {
if (PrintMiscellaneous && (Verbose||WizardMode)) {
diff --git a/hotspot/src/share/vm/oops/cpCacheOop.cpp b/hotspot/src/share/vm/oops/cpCacheOop.cpp
index 678bc13..8ebc996 100644
--- a/hotspot/src/share/vm/oops/cpCacheOop.cpp
+++ b/hotspot/src/share/vm/oops/cpCacheOop.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -504,17 +504,17 @@ bool ConstantPoolCacheEntry::is_interesting_method_entry(klassOop k) {
void ConstantPoolCacheEntry::print(outputStream* st, int index) const {
// print separator
- if (index == 0) tty->print_cr(" -------------");
+ if (index == 0) st->print_cr(" -------------");
// print entry
- tty->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
+ st->print("%3d ("PTR_FORMAT") ", index, (intptr_t)this);
if (is_secondary_entry())
- tty->print_cr("[%5d|secondary]", main_entry_index());
+ st->print_cr("[%5d|secondary]", main_entry_index());
else
- tty->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), constant_pool_index());
- tty->print_cr(" [ "PTR_FORMAT"]", (intptr_t)(oop)_f1);
- tty->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
- tty->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
- tty->print_cr(" -------------");
+ st->print_cr("[%02x|%02x|%5d]", bytecode_2(), bytecode_1(), constant_pool_index());
+ st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)(oop)_f1);
+ st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_f2);
+ st->print_cr(" [ "PTR_FORMAT"]", (intptr_t)_flags);
+ st->print_cr(" -------------");
}
void ConstantPoolCacheEntry::verify(outputStream* st) const {
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index e20a6ed..eec2e23 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -669,6 +669,7 @@ objArrayOop instanceKlass::allocate_objArray(int n, int length, TRAPS) {
if (length < 0) THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
if (length > arrayOopDesc::max_array_length(T_OBJECT)) {
report_java_out_of_memory("Requested array size exceeds VM limit");
+ JvmtiExport::post_array_size_exhausted();
THROW_OOP_0(Universe::out_of_memory_error_array_size());
}
int size = objArrayOopDesc::object_size(length);
diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp
index f07f82f..e981cde 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp
@@ -240,7 +240,6 @@ class instanceKlass: public Klass {
Thread* _init_thread; // Pointer to current thread doing initialization (to handle recusive initialization)
int _vtable_len; // length of Java vtable (in words)
int _itable_len; // length of Java itable (in words)
- ReferenceType _reference_type; // reference type
OopMapCache* volatile _oop_map_cache; // OopMapCache for all methods in the klass (allocated lazily)
JNIid* _jni_ids; // First JNI identifier for static fields in this class
jmethodID* _methods_jmethod_ids; // jmethodIDs corresponding to method_idnum, or NULL if none
@@ -265,6 +264,8 @@ class instanceKlass: public Klass {
// _idnum_allocated_count.
u1 _init_state; // state of class
+ u1 _reference_type; // reference type
+
// embedded Java vtable follows here
// embedded Java itables follows here
// embedded static fields follows here
@@ -407,8 +408,11 @@ class instanceKlass: public Klass {
void eager_initialize(Thread *thread);
// reference type
- ReferenceType reference_type() const { return _reference_type; }
- void set_reference_type(ReferenceType t) { _reference_type = t; }
+ ReferenceType reference_type() const { return (ReferenceType)_reference_type; }
+ void set_reference_type(ReferenceType t) {
+ assert(t == (u1)t, "overflow");
+ _reference_type = (u1)t;
+ }
static ByteSize reference_type_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(instanceKlass, _reference_type)); }
@@ -570,9 +574,9 @@ class instanceKlass: public Klass {
void set_method_annotations_of(int idnum, typeArrayOop anno)
{ set_methods_annotations_of(idnum, anno, &_methods_annotations); }
void set_method_parameter_annotations_of(int idnum, typeArrayOop anno)
- { set_methods_annotations_of(idnum, anno, &_methods_annotations); }
+ { set_methods_annotations_of(idnum, anno, &_methods_parameter_annotations); }
void set_method_default_annotations_of(int idnum, typeArrayOop anno)
- { set_methods_annotations_of(idnum, anno, &_methods_annotations); }
+ { set_methods_annotations_of(idnum, anno, &_methods_default_annotations); }
// allocation
DEFINE_ALLOCATE_PERMANENT(instanceKlass);
diff --git a/hotspot/src/share/vm/oops/klass.cpp b/hotspot/src/share/vm/oops/klass.cpp
index e2997ea..345d0b2 100644
--- a/hotspot/src/share/vm/oops/klass.cpp
+++ b/hotspot/src/share/vm/oops/klass.cpp
@@ -158,9 +158,7 @@ klassOop Klass::base_create_klass_oop(KlassHandle& klass, int size,
kl->set_next_sibling(NULL);
kl->set_alloc_count(0);
kl->set_alloc_size(0);
-#ifdef TRACE_SET_KLASS_TRACE_ID
TRACE_SET_KLASS_TRACE_ID(kl, 0);
-#endif
kl->set_prototype_header(markOopDesc::prototype());
kl->set_biased_lock_revocation_count(0);
diff --git a/hotspot/src/share/vm/oops/klass.hpp b/hotspot/src/share/vm/oops/klass.hpp
index d4f5d50..035f44c 100644
--- a/hotspot/src/share/vm/oops/klass.hpp
+++ b/hotspot/src/share/vm/oops/klass.hpp
@@ -265,9 +265,7 @@ class Klass : public Klass_vtbl {
markOop _prototype_header; // Used when biased locking is both enabled and disabled for this type
jint _biased_lock_revocation_count;
-#ifdef TRACE_DEFINE_KLASS_TRACE_ID
TRACE_DEFINE_KLASS_TRACE_ID;
-#endif
public:
// returns the enclosing klassOop
@@ -688,9 +686,7 @@ class Klass : public Klass_vtbl {
jlong last_biased_lock_bulk_revocation_time() { return _last_biased_lock_bulk_revocation_time; }
void set_last_biased_lock_bulk_revocation_time(jlong cur_time) { _last_biased_lock_bulk_revocation_time = cur_time; }
-#ifdef TRACE_DEFINE_KLASS_METHODS
TRACE_DEFINE_KLASS_METHODS;
-#endif
// garbage collection support
virtual void follow_weak_klass_links(
diff --git a/hotspot/src/share/vm/oops/methodOop.cpp b/hotspot/src/share/vm/oops/methodOop.cpp
index 879ec01..6decdd7 100644
--- a/hotspot/src/share/vm/oops/methodOop.cpp
+++ b/hotspot/src/share/vm/oops/methodOop.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -596,6 +596,11 @@ void methodOopDesc::clear_native_function() {
clear_code();
}
+address methodOopDesc::critical_native_function() {
+ methodHandle mh(this);
+ return NativeLookup::lookup_critical_entry(mh);
+}
+
void methodOopDesc::set_signature_handler(address handler) {
address* signature_handler = signature_handler_addr();
diff --git a/hotspot/src/share/vm/oops/methodOop.hpp b/hotspot/src/share/vm/oops/methodOop.hpp
index cc9520a..60bb34b 100644
--- a/hotspot/src/share/vm/oops/methodOop.hpp
+++ b/hotspot/src/share/vm/oops/methodOop.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -403,6 +403,8 @@ class methodOopDesc : public oopDesc {
native_bind_event_is_interesting = true
};
address native_function() const { return *(native_function_addr()); }
+ address critical_native_function();
+
// Must specify a real function (not NULL).
// Use clear_native_function() to unregister.
void set_native_function(address function, bool post_event_flag);
diff --git a/hotspot/src/share/vm/oops/objArrayKlass.cpp b/hotspot/src/share/vm/oops/objArrayKlass.cpp
index da9667d..79b1df2 100644
--- a/hotspot/src/share/vm/oops/objArrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/objArrayKlass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -68,6 +68,7 @@ objArrayOop objArrayKlass::allocate(int length, TRAPS) {
return a;
} else {
report_java_out_of_memory("Requested array size exceeds VM limit");
+ JvmtiExport::post_array_size_exhausted();
THROW_OOP_0(Universe::out_of_memory_error_array_size());
}
} else {
diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.cpp b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
index a3c58cd..70aed0d 100644
--- a/hotspot/src/share/vm/oops/typeArrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 @@ typeArrayOop typeArrayKlass::allocate_common(int length, bool do_zero, TRAPS) {
return t;
} else {
report_java_out_of_memory("Requested array size exceeds VM limit");
+ JvmtiExport::post_array_size_exhausted();
THROW_OOP_0(Universe::out_of_memory_error_array_size());
}
} else {
diff --git a/hotspot/src/share/vm/opto/block.hpp b/hotspot/src/share/vm/opto/block.hpp
index ef5c8d6..e3d8d3e 100644
--- a/hotspot/src/share/vm/opto/block.hpp
+++ b/hotspot/src/share/vm/opto/block.hpp
@@ -284,13 +284,13 @@ class Block : public CFGElement {
// helper function that adds caller save registers to MachProjNode
void add_call_kills(MachProjNode *proj, RegMask& regs, const char* save_policy, bool exclude_soe);
// Schedule a call next in the block
- uint sched_call(Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_List &worklist, int *ready_cnt, MachCallNode *mcall, VectorSet &next_call);
+ uint sched_call(Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_List &worklist, GrowableArray<int> &ready_cnt, MachCallNode *mcall, VectorSet &next_call);
// Perform basic-block local scheduling
- Node *select(PhaseCFG *cfg, Node_List &worklist, int *ready_cnt, VectorSet &next_call, uint sched_slot);
+ Node *select(PhaseCFG *cfg, Node_List &worklist, GrowableArray<int> &ready_cnt, VectorSet &next_call, uint sched_slot);
void set_next_call( Node *n, VectorSet &next_call, Block_Array &bbs );
void needed_for_next_call(Node *this_call, VectorSet &next_call, Block_Array &bbs);
- bool schedule_local(PhaseCFG *cfg, Matcher &m, int *ready_cnt, VectorSet &next_call);
+ bool schedule_local(PhaseCFG *cfg, Matcher &m, GrowableArray<int> &ready_cnt, VectorSet &next_call);
// Cleanup if any code lands between a Call and his Catch
void call_catch_cleanup(Block_Array &bbs);
// Detect implicit-null-check opportunities. Basically, find NULL checks
diff --git a/hotspot/src/share/vm/opto/bytecodeInfo.cpp b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
index 7175427..a8e95fc 100644
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
@@ -257,6 +257,18 @@ const char* InlineTree::should_not_inline(ciMethod *callee_method, ciMethod* cal
return "exception method";
}
+ if (callee_method->should_not_inline()) {
+ return "disallowed by CompilerOracle";
+ }
+
+ if (UseStringCache) {
+ // Do not inline StringCache::profile() method used only at the beginning.
+ if (callee_method->name() == ciSymbol::profile_name() &&
+ callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) {
+ return "profiling method";
+ }
+ }
+
// use frequency-based objections only for non-trivial methods
if (callee_method->code_size_for_inlining() <= MaxTrivialSize) return NULL;
@@ -278,18 +290,6 @@ const char* InlineTree::should_not_inline(ciMethod *callee_method, ciMethod* cal
}
}
- if (callee_method->should_not_inline()) {
- return "disallowed by CompilerOracle";
- }
-
- if (UseStringCache) {
- // Do not inline StringCache::profile() method used only at the beginning.
- if (callee_method->name() == ciSymbol::profile_name() &&
- callee_method->holder()->name() == ciSymbol::java_lang_StringCache()) {
- return "profiling method";
- }
- }
-
return NULL;
}
diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index f73dcbd..4d5424d 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -465,6 +465,9 @@
notproduct(bool, PrintOptimizePtrCompare, false, \
"Print information about optimized pointers compare") \
\
+ notproduct(bool, VerifyConnectionGraph , true, \
+ "Verify Connection Graph construction in Escape Analysis") \
+ \
product(bool, UseOptoBiasInlining, true, \
"Generate biased locking code in C2 ideal graph") \
\
diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/hotspot/src/share/vm/opto/callnode.cpp
index 2811264..154cc1a 100644
--- a/hotspot/src/share/vm/opto/callnode.cpp
+++ b/hotspot/src/share/vm/opto/callnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1538,10 +1538,7 @@ Node *LockNode::Ideal(PhaseGVN *phase, bool can_reshape) {
// If we are locking an unescaped object, the lock/unlock is unnecessary
//
ConnectionGraph *cgr = phase->C->congraph();
- PointsToNode::EscapeState es = PointsToNode::GlobalEscape;
- if (cgr != NULL)
- es = cgr->escape_state(obj_node());
- if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
+ if (cgr != NULL && cgr->not_global_escape(obj_node())) {
assert(!is_eliminated() || is_coarsened(), "sanity");
// The lock could be marked eliminated by lock coarsening
// code during first IGVN before EA. Replace coarsened flag
@@ -1680,10 +1677,7 @@ Node *UnlockNode::Ideal(PhaseGVN *phase, bool can_reshape) {
// If we are unlocking an unescaped object, the lock/unlock is unnecessary.
//
ConnectionGraph *cgr = phase->C->congraph();
- PointsToNode::EscapeState es = PointsToNode::GlobalEscape;
- if (cgr != NULL)
- es = cgr->escape_state(obj_node());
- if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
+ if (cgr != NULL && cgr->not_global_escape(obj_node())) {
assert(!is_eliminated() || is_coarsened(), "sanity");
// The lock could be marked eliminated by lock coarsening
// code during first IGVN before EA. Replace coarsened flag
diff --git a/hotspot/src/share/vm/opto/callnode.hpp b/hotspot/src/share/vm/opto/callnode.hpp
index fa9af0c..d9108ce 100644
--- a/hotspot/src/share/vm/opto/callnode.hpp
+++ b/hotspot/src/share/vm/opto/callnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -546,6 +546,12 @@ public:
// or result projection is there are several CheckCastPP
// or returns NULL if there is no one.
Node *result_cast();
+ // Does this node returns pointer?
+ bool returns_pointer() const {
+ const TypeTuple *r = tf()->range();
+ return (r->cnt() > TypeFunc::Parms &&
+ r->field_at(TypeFunc::Parms)->isa_ptr());
+ }
// Collect all the interesting edges from a call for use in
// replacing the call by something else. Used by macro expansion
diff --git a/hotspot/src/share/vm/opto/chaitin.cpp b/hotspot/src/share/vm/opto/chaitin.cpp
index 21b4716..a74114a 100644
--- a/hotspot/src/share/vm/opto/chaitin.cpp
+++ b/hotspot/src/share/vm/opto/chaitin.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1946,18 +1946,29 @@ void PhaseChaitin::dump_frame() const {
reg2offset_unchecked(OptoReg::add(_matcher._old_SP,-1)) - reg2offset_unchecked(_matcher._new_SP)+jintSize);
// Preserve area dump
+ int fixed_slots = C->fixed_slots();
+ OptoReg::Name begin_in_preserve = OptoReg::add(_matcher._old_SP, -(int)C->in_preserve_stack_slots());
+ OptoReg::Name return_addr = _matcher.return_addr();
+
reg = OptoReg::add(reg, -1);
- while( OptoReg::is_stack(reg)) {
+ while (OptoReg::is_stack(reg)) {
tty->print("#r%3.3d %s+%2d: ",reg,fp,reg2offset_unchecked(reg));
- if( _matcher.return_addr() == reg )
+ if (return_addr == reg) {
tty->print_cr("return address");
- else if( _matcher.return_addr() == OptoReg::add(reg,1) &&
- VerifyStackAtCalls )
- tty->print_cr("0xBADB100D +VerifyStackAtCalls");
- else if ((int)OptoReg::reg2stack(reg) < C->fixed_slots())
+ } else if (reg >= begin_in_preserve) {
+ // Preserved slots are present on x86
+ if (return_addr == OptoReg::add(reg, VMRegImpl::slots_per_word))
+ tty->print_cr("saved fp register");
+ else if (return_addr == OptoReg::add(reg, 2*VMRegImpl::slots_per_word) &&
+ VerifyStackAtCalls)
+ tty->print_cr("0xBADB100D +VerifyStackAtCalls");
+ else
+ tty->print_cr("in_preserve");
+ } else if ((int)OptoReg::reg2stack(reg) < fixed_slots) {
tty->print_cr("Fixed slot %d", OptoReg::reg2stack(reg));
- else
- tty->print_cr("pad2, in_preserve");
+ } else {
+ tty->print_cr("pad2, stack alignment");
+ }
reg = OptoReg::add(reg, -1);
}
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 2b9051c..0a374d7 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1707,7 +1707,6 @@ void Compile::Optimize() {
if (major_progress()) print_method("PhaseIdealLoop before EA", 2);
if (failing()) return;
}
- TracePhase t2("escapeAnalysis", &_t_escapeAnalysis, true);
ConnectionGraph::do_analysis(this, &igvn);
if (failing()) return;
@@ -1719,6 +1718,7 @@ void Compile::Optimize() {
if (failing()) return;
if (congraph() != NULL && macro_count() > 0) {
+ NOT_PRODUCT( TracePhase t2("macroEliminate", &_t_macroEliminate, TimeCompiler); )
PhaseMacroExpand mexp(igvn);
mexp.eliminate_macro_nodes();
igvn.set_delay_transform(false);
@@ -1875,10 +1875,10 @@ void Compile::Code_Gen() {
cfg.Estimate_Block_Frequency();
cfg.GlobalCodeMotion(m,unique(),proj_list);
+ if (failing()) return;
print_method("Global code motion", 2);
- if (failing()) return;
NOT_PRODUCT( verify_graph_edges(); )
debug_only( cfg.verify(); )
diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp
index 8254aab..5e85802 100644
--- a/hotspot/src/share/vm/opto/compile.hpp
+++ b/hotspot/src/share/vm/opto/compile.hpp
@@ -631,7 +631,7 @@ class Compile : public Phase {
// Decide how to build a call.
// The profile factor is a discount to apply to this site's interp. profile.
- CallGenerator* call_generator(ciMethod* call_method, int vtable_index, bool call_is_virtual, JVMState* jvms, bool allow_inline, float profile_factor);
+ CallGenerator* call_generator(ciMethod* call_method, int vtable_index, bool call_is_virtual, JVMState* jvms, bool allow_inline, float profile_factor, bool allow_intrinsics = true);
bool should_delay_inlining(ciMethod* call_method, JVMState* jvms);
// Report if there were too many traps at a current method and bci.
diff --git a/hotspot/src/share/vm/opto/connode.cpp b/hotspot/src/share/vm/opto/connode.cpp
index 9a3b650..7e072ff 100644
--- a/hotspot/src/share/vm/opto/connode.cpp
+++ b/hotspot/src/share/vm/opto/connode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1051,6 +1051,7 @@ Node *ConvL2INode::Ideal(PhaseGVN *phase, bool can_reshape) {
//------------------------------Value------------------------------------------
const Type *CastX2PNode::Value( PhaseTransform *phase ) const {
const Type* t = phase->type(in(1));
+ if (t == Type::TOP) return Type::TOP;
if (t->base() == Type_X && t->singleton()) {
uintptr_t bits = (uintptr_t) t->is_intptr_t()->get_con();
if (bits == 0) return TypePtr::NULL_PTR;
@@ -1121,6 +1122,7 @@ Node *CastX2PNode::Identity( PhaseTransform *phase ) {
//------------------------------Value------------------------------------------
const Type *CastP2XNode::Value( PhaseTransform *phase ) const {
const Type* t = phase->type(in(1));
+ if (t == Type::TOP) return Type::TOP;
if (t->base() == Type::RawPtr && t->singleton()) {
uintptr_t bits = (uintptr_t) t->is_rawptr()->get_con();
return TypeX::make(bits);
diff --git a/hotspot/src/share/vm/opto/doCall.cpp b/hotspot/src/share/vm/opto/doCall.cpp
index 9ff9a89..fdbbc10 100644
--- a/hotspot/src/share/vm/opto/doCall.cpp
+++ b/hotspot/src/share/vm/opto/doCall.cpp
@@ -61,7 +61,7 @@ void trace_type_profile(ciMethod *method, int depth, int bci, ciMethod *prof_met
CallGenerator* Compile::call_generator(ciMethod* call_method, int vtable_index, bool call_is_virtual,
JVMState* jvms, bool allow_inline,
- float prof_factor) {
+ float prof_factor, bool allow_intrinsics) {
ciMethod* caller = jvms->method();
int bci = jvms->bci();
Bytecodes::Code bytecode = caller->java_code_at_bci(bci);
@@ -108,7 +108,7 @@ CallGenerator* Compile::call_generator(ciMethod* call_method, int vtable_index,
// then we return it as the inlined version of the call.
// We do this before the strict f.p. check below because the
// intrinsics handle strict f.p. correctly.
- if (allow_inline) {
+ if (allow_inline && allow_intrinsics) {
CallGenerator* cg = find_intrinsic(call_method, call_is_virtual);
if (cg != NULL) return cg;
}
@@ -455,21 +455,12 @@ void Parse::do_call() {
// cg->generate(), we are committed. If it fails, the whole
// compilation task is compromised.
if (failing()) return;
-#ifndef PRODUCT
- if (PrintOpto || PrintOptoInlining || PrintInlining) {
- // Only one fall-back, so if an intrinsic fails, ignore any bytecodes.
- if (cg->is_intrinsic() && call_method->code_size() > 0) {
- tty->print("Bailed out of intrinsic, will not inline: ");
- call_method->print_name(); tty->cr();
- }
- }
-#endif
+
// This can happen if a library intrinsic is available, but refuses
// the call site, perhaps because it did not match a pattern the
- // intrinsic was expecting to optimize. The fallback position is
- // to call out-of-line.
- try_inline = false; // Inline tactic bailed out.
- cg = C->call_generator(call_method, vtable_index, call_is_virtual, jvms, try_inline, prof_factor());
+ // intrinsic was expecting to optimize. Should always be possible to
+ // get a normal java call that may inline in that case
+ cg = C->call_generator(call_method, vtable_index, call_is_virtual, jvms, try_inline, prof_factor(), /* allow_intrinsics= */ false);
if ((new_jvms = cg->generate(jvms)) == NULL) {
guarantee(failing(), "call failed to generate: calls should work");
return;
diff --git a/hotspot/src/share/vm/opto/escape.cpp b/hotspot/src/share/vm/opto/escape.cpp
index 514a7ac..faf463c 100644
--- a/hotspot/src/share/vm/opto/escape.cpp
+++ b/hotspot/src/share/vm/opto/escape.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "ci/bcEscapeAnalyzer.hpp"
+#include "compiler/compileLog.hpp"
#include "libadt/vectset.hpp"
#include "memory/allocation.hpp"
#include "opto/c2compiler.hpp"
@@ -34,3119 +35,3097 @@
#include "opto/phaseX.hpp"
#include "opto/rootnode.hpp"
-void PointsToNode::add_edge(uint targIdx, PointsToNode::EdgeType et) {
- uint v = (targIdx << EdgeShift) + ((uint) et);
- if (_edges == NULL) {
- Arena *a = Compile::current()->comp_arena();
- _edges = new(a) GrowableArray<uint>(a, INITIAL_EDGE_COUNT, 0, 0);
- }
- _edges->append_if_missing(v);
-}
-
-void PointsToNode::remove_edge(uint targIdx, PointsToNode::EdgeType et) {
- uint v = (targIdx << EdgeShift) + ((uint) et);
-
- _edges->remove(v);
-}
-
-#ifndef PRODUCT
-static const char *node_type_names[] = {
- "UnknownType",
- "JavaObject",
- "LocalVar",
- "Field"
-};
-
-static const char *esc_names[] = {
- "UnknownEscape",
- "NoEscape",
- "ArgEscape",
- "GlobalEscape"
-};
-
-static const char *edge_type_suffix[] = {
- "?", // UnknownEdge
- "P", // PointsToEdge
- "D", // DeferredEdge
- "F" // FieldEdge
-};
-
-void PointsToNode::dump(bool print_state) const {
- NodeType nt = node_type();
- tty->print("%s ", node_type_names[(int) nt]);
- if (print_state) {
- EscapeState es = escape_state();
- tty->print("%s %s ", esc_names[(int) es], _scalar_replaceable ? "":"NSR");
- }
- tty->print("[[");
- for (uint i = 0; i < edge_count(); i++) {
- tty->print(" %d%s", edge_target(i), edge_type_suffix[(int) edge_type(i)]);
- }
- tty->print("]] ");
- if (_node == NULL)
- tty->print_cr("<null>");
- else
- _node->dump();
-}
-#endif
-
ConnectionGraph::ConnectionGraph(Compile * C, PhaseIterGVN *igvn) :
- _nodes(C->comp_arena(), C->unique(), C->unique(), PointsToNode()),
- _processed(C->comp_arena()),
- pt_ptset(C->comp_arena()),
- pt_visited(C->comp_arena()),
- pt_worklist(C->comp_arena(), 4, 0, 0),
+ _nodes(C->comp_arena(), C->unique(), C->unique(), NULL),
_collecting(true),
- _progress(false),
+ _verify(false),
_compile(C),
_igvn(igvn),
_node_map(C->comp_arena()) {
-
- _phantom_object = C->top()->_idx,
- add_node(C->top(), PointsToNode::JavaObject, PointsToNode::GlobalEscape,true);
-
+ // Add unknown java object.
+ add_java_object(C->top(), PointsToNode::GlobalEscape);
+ phantom_obj = ptnode_adr(C->top()->_idx)->as_JavaObject();
// Add ConP(#NULL) and ConN(#NULL) nodes.
Node* oop_null = igvn->zerocon(T_OBJECT);
- _oop_null = oop_null->_idx;
- assert(_oop_null < nodes_size(), "should be created already");
- add_node(oop_null, PointsToNode::JavaObject, PointsToNode::NoEscape, true);
-
+ assert(oop_null->_idx < nodes_size(), "should be created already");
+ add_java_object(oop_null, PointsToNode::NoEscape);
+ null_obj = ptnode_adr(oop_null->_idx)->as_JavaObject();
if (UseCompressedOops) {
Node* noop_null = igvn->zerocon(T_NARROWOOP);
- _noop_null = noop_null->_idx;
- assert(_noop_null < nodes_size(), "should be created already");
- add_node(noop_null, PointsToNode::JavaObject, PointsToNode::NoEscape, true);
- } else {
- _noop_null = _oop_null; // Should be initialized
+ assert(noop_null->_idx < nodes_size(), "should be created already");
+ map_ideal_node(noop_null, null_obj);
}
_pcmp_neq = NULL; // Should be initialized
_pcmp_eq = NULL;
}
-void ConnectionGraph::add_pointsto_edge(uint from_i, uint to_i) {
- PointsToNode *f = ptnode_adr(from_i);
- PointsToNode *t = ptnode_adr(to_i);
-
- assert(f->node_type() != PointsToNode::UnknownType && t->node_type() != PointsToNode::UnknownType, "node types must be set");
- assert(f->node_type() == PointsToNode::LocalVar || f->node_type() == PointsToNode::Field, "invalid source of PointsTo edge");
- assert(t->node_type() == PointsToNode::JavaObject, "invalid destination of PointsTo edge");
- if (to_i == _phantom_object) { // Quick test for most common object
- if (f->has_unknown_ptr()) {
- return;
- } else {
- f->set_has_unknown_ptr();
+bool ConnectionGraph::has_candidates(Compile *C) {
+ // EA brings benefits only when the code has allocations and/or locks which
+ // are represented by ideal Macro nodes.
+ int cnt = C->macro_count();
+ for( int i=0; i < cnt; i++ ) {
+ Node *n = C->macro_node(i);
+ if ( n->is_Allocate() )
+ return true;
+ if( n->is_Lock() ) {
+ Node* obj = n->as_Lock()->obj_node()->uncast();
+ if( !(obj->is_Parm() || obj->is_Con()) )
+ return true;
}
}
- add_edge(f, to_i, PointsToNode::PointsToEdge);
+ return false;
}
-void ConnectionGraph::add_deferred_edge(uint from_i, uint to_i) {
- PointsToNode *f = ptnode_adr(from_i);
- PointsToNode *t = ptnode_adr(to_i);
-
- assert(f->node_type() != PointsToNode::UnknownType && t->node_type() != PointsToNode::UnknownType, "node types must be set");
- assert(f->node_type() == PointsToNode::LocalVar || f->node_type() == PointsToNode::Field, "invalid source of Deferred edge");
- assert(t->node_type() == PointsToNode::LocalVar || t->node_type() == PointsToNode::Field, "invalid destination of Deferred edge");
- // don't add a self-referential edge, this can occur during removal of
- // deferred edges
- if (from_i != to_i)
- add_edge(f, to_i, PointsToNode::DeferredEdge);
-}
+void ConnectionGraph::do_analysis(Compile *C, PhaseIterGVN *igvn) {
+ Compile::TracePhase t2("escapeAnalysis", &Phase::_t_escapeAnalysis, true);
+ ResourceMark rm;
-int ConnectionGraph::address_offset(Node* adr, PhaseTransform *phase) {
- const Type *adr_type = phase->type(adr);
- if (adr->is_AddP() && adr_type->isa_oopptr() == NULL &&
- adr->in(AddPNode::Address)->is_Proj() &&
- adr->in(AddPNode::Address)->in(0)->is_Allocate()) {
- // We are computing a raw address for a store captured by an Initialize
- // compute an appropriate address type. AddP cases #3 and #5 (see below).
- int offs = (int)phase->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot);
- assert(offs != Type::OffsetBot ||
- adr->in(AddPNode::Address)->in(0)->is_AllocateArray(),
- "offset must be a constant or it is initialization of array");
- return offs;
+ // Add ConP#NULL and ConN#NULL nodes before ConnectionGraph construction
+ // to create space for them in ConnectionGraph::_nodes[].
+ Node* oop_null = igvn->zerocon(T_OBJECT);
+ Node* noop_null = igvn->zerocon(T_NARROWOOP);
+ ConnectionGraph* congraph = new(C->comp_arena()) ConnectionGraph(C, igvn);
+ // Perform escape analysis
+ if (congraph->compute_escape()) {
+ // There are non escaping objects.
+ C->set_congraph(congraph);
}
- const TypePtr *t_ptr = adr_type->isa_ptr();
- assert(t_ptr != NULL, "must be a pointer type");
- return t_ptr->offset();
-}
-
-void ConnectionGraph::add_field_edge(uint from_i, uint to_i, int offset) {
- // Don't add fields to NULL pointer.
- if (is_null_ptr(from_i))
- return;
- PointsToNode *f = ptnode_adr(from_i);
- PointsToNode *t = ptnode_adr(to_i);
-
- assert(f->node_type() != PointsToNode::UnknownType && t->node_type() != PointsToNode::UnknownType, "node types must be set");
- assert(f->node_type() == PointsToNode::JavaObject, "invalid destination of Field edge");
- assert(t->node_type() == PointsToNode::Field, "invalid destination of Field edge");
- assert (t->offset() == -1 || t->offset() == offset, "conflicting field offsets");
- t->set_offset(offset);
-
- add_edge(f, to_i, PointsToNode::FieldEdge);
-}
-
-void ConnectionGraph::set_escape_state(uint ni, PointsToNode::EscapeState es) {
- // Don't change non-escaping state of NULL pointer.
- if (is_null_ptr(ni))
- return;
- PointsToNode *npt = ptnode_adr(ni);
- PointsToNode::EscapeState old_es = npt->escape_state();
- if (es > old_es)
- npt->set_escape_state(es);
-}
-
-void ConnectionGraph::add_node(Node *n, PointsToNode::NodeType nt,
- PointsToNode::EscapeState es, bool done) {
- PointsToNode* ptadr = ptnode_adr(n->_idx);
- ptadr->_node = n;
- ptadr->set_node_type(nt);
-
- // inline set_escape_state(idx, es);
- PointsToNode::EscapeState old_es = ptadr->escape_state();
- if (es > old_es)
- ptadr->set_escape_state(es);
-
- if (done)
- _processed.set(n->_idx);
-}
-
-PointsToNode::EscapeState ConnectionGraph::escape_state(Node *n) {
- uint idx = n->_idx;
- PointsToNode::EscapeState es;
-
- // If we are still collecting or there were no non-escaping allocations
- // we don't know the answer yet
- if (_collecting)
- return PointsToNode::UnknownEscape;
-
- // if the node was created after the escape computation, return
- // UnknownEscape
- if (idx >= nodes_size())
- return PointsToNode::UnknownEscape;
-
- es = ptnode_adr(idx)->escape_state();
-
- // if we have already computed a value, return it
- if (es != PointsToNode::UnknownEscape &&
- ptnode_adr(idx)->node_type() == PointsToNode::JavaObject)
- return es;
-
- // PointsTo() calls n->uncast() which can return a new ideal node.
- if (n->uncast()->_idx >= nodes_size())
- return PointsToNode::UnknownEscape;
-
- PointsToNode::EscapeState orig_es = es;
-
- // compute max escape state of anything this node could point to
- for(VectorSetI i(PointsTo(n)); i.test() && es != PointsToNode::GlobalEscape; ++i) {
- uint pt = i.elem;
- PointsToNode::EscapeState pes = ptnode_adr(pt)->escape_state();
- if (pes > es)
- es = pes;
- }
- if (orig_es != es) {
- // cache the computed escape state
- assert(es > orig_es, "should have computed an escape state");
- set_escape_state(idx, es);
- } // orig_es could be PointsToNode::UnknownEscape
- return es;
+ // Cleanup.
+ if (oop_null->outcnt() == 0)
+ igvn->hash_delete(oop_null);
+ if (noop_null->outcnt() == 0)
+ igvn->hash_delete(noop_null);
}
-VectorSet* ConnectionGraph::PointsTo(Node * n) {
- pt_ptset.Reset();
- pt_visited.Reset();
- pt_worklist.clear();
+bool ConnectionGraph::compute_escape() {
+ Compile* C = _compile;
+ PhaseGVN* igvn = _igvn;
-#ifdef ASSERT
- Node *orig_n = n;
-#endif
+ // Worklists used by EA.
+ Unique_Node_List delayed_worklist;
+ GrowableArray<Node*> alloc_worklist;
+ GrowableArray<Node*> ptr_cmp_worklist;
+ GrowableArray<Node*> storestore_worklist;
+ GrowableArray<PointsToNode*> ptnodes_worklist;
+ GrowableArray<JavaObjectNode*> java_objects_worklist;
+ GrowableArray<JavaObjectNode*> non_escaped_worklist;
+ GrowableArray<FieldNode*> oop_fields_worklist;
+ DEBUG_ONLY( GrowableArray<Node*> addp_worklist; )
- n = n->uncast();
- PointsToNode* npt = ptnode_adr(n->_idx);
+ { Compile::TracePhase t3("connectionGraph", &Phase::_t_connectionGraph, true);
- // If we have a JavaObject, return just that object
- if (npt->node_type() == PointsToNode::JavaObject) {
- pt_ptset.set(n->_idx);
- return &pt_ptset;
+ // 1. Populate Connection Graph (CG) with PointsTo nodes.
+ ideal_nodes.map(C->unique(), NULL); // preallocate space
+ // Initialize worklist
+ if (C->root() != NULL) {
+ ideal_nodes.push(C->root());
}
+ for( uint next = 0; next < ideal_nodes.size(); ++next ) {
+ Node* n = ideal_nodes.at(next);
+ // Create PointsTo nodes and add them to Connection Graph. Called
+ // only once per ideal node since ideal_nodes is Unique_Node list.
+ add_node_to_connection_graph(n, &delayed_worklist);
+ PointsToNode* ptn = ptnode_adr(n->_idx);
+ if (ptn != NULL) {
+ ptnodes_worklist.append(ptn);
+ if (ptn->is_JavaObject()) {
+ java_objects_worklist.append(ptn->as_JavaObject());
+ if ((n->is_Allocate() || n->is_CallStaticJava()) &&
+ (ptn->escape_state() < PointsToNode::GlobalEscape)) {
+ // Only allocations and java static calls results are interesting.
+ non_escaped_worklist.append(ptn->as_JavaObject());
+ }
+ } else if (ptn->is_Field() && ptn->as_Field()->is_oop()) {
+ oop_fields_worklist.append(ptn->as_Field());
+ }
+ }
+ if (n->is_MergeMem()) {
+ // Collect all MergeMem nodes to add memory slices for
+ // scalar replaceable objects in split_unique_types().
+ _mergemem_worklist.append(n->as_MergeMem());
+ } else if (OptimizePtrCompare && n->is_Cmp() &&
+ (n->Opcode() == Op_CmpP || n->Opcode() == Op_CmpN)) {
+ // Collect compare pointers nodes.
+ ptr_cmp_worklist.append(n);
+ } else if (n->is_MemBarStoreStore()) {
+ // Collect all MemBarStoreStore nodes so that depending on the
+ // escape status of the associated Allocate node some of them
+ // may be eliminated.
+ storestore_worklist.append(n);
#ifdef ASSERT
- if (npt->_node == NULL) {
- if (orig_n != n)
- orig_n->dump();
- n->dump();
- assert(npt->_node != NULL, "unregistered node");
- }
+ } else if(n->is_AddP()) {
+ // Collect address nodes for graph verification.
+ addp_worklist.append(n);
#endif
- pt_worklist.push(n->_idx);
- while(pt_worklist.length() > 0) {
- int ni = pt_worklist.pop();
- if (pt_visited.test_set(ni))
- continue;
-
- PointsToNode* pn = ptnode_adr(ni);
- // ensure that all inputs of a Phi have been processed
- assert(!_collecting || !pn->_node->is_Phi() || _processed.test(ni),"");
-
- int edges_processed = 0;
- uint e_cnt = pn->edge_count();
- for (uint e = 0; e < e_cnt; e++) {
- uint etgt = pn->edge_target(e);
- PointsToNode::EdgeType et = pn->edge_type(e);
- if (et == PointsToNode::PointsToEdge) {
- pt_ptset.set(etgt);
- edges_processed++;
- } else if (et == PointsToNode::DeferredEdge) {
- pt_worklist.push(etgt);
- edges_processed++;
- } else {
- assert(false,"neither PointsToEdge or DeferredEdge");
- }
}
- if (edges_processed == 0) {
- // no deferred or pointsto edges found. Assume the value was set
- // outside this method. Add the phantom object to the pointsto set.
- pt_ptset.set(_phantom_object);
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node* m = n->fast_out(i); // Get user
+ ideal_nodes.push(m);
}
}
- return &pt_ptset;
-}
+ if (non_escaped_worklist.length() == 0) {
+ _collecting = false;
+ return false; // Nothing to do.
+ }
+ // Add final simple edges to graph.
+ while(delayed_worklist.size() > 0) {
+ Node* n = delayed_worklist.pop();
+ add_final_edges(n);
+ }
+ int ptnodes_length = ptnodes_worklist.length();
-void ConnectionGraph::remove_deferred(uint ni, GrowableArray<uint>* deferred_edges, VectorSet* visited) {
- // This method is most expensive during ConnectionGraph construction.
- // Reuse vectorSet and an additional growable array for deferred edges.
- deferred_edges->clear();
- visited->Reset();
-
- visited->set(ni);
- PointsToNode *ptn = ptnode_adr(ni);
- assert(ptn->node_type() == PointsToNode::LocalVar ||
- ptn->node_type() == PointsToNode::Field, "sanity");
- assert(ptn->edge_count() != 0, "should have at least phantom_object");
-
- // Mark current edges as visited and move deferred edges to separate array.
- for (uint i = 0; i < ptn->edge_count(); ) {
- uint t = ptn->edge_target(i);
#ifdef ASSERT
- assert(!visited->test_set(t), "expecting no duplications");
-#else
- visited->set(t);
-#endif
- if (ptn->edge_type(i) == PointsToNode::DeferredEdge) {
- ptn->remove_edge(t, PointsToNode::DeferredEdge);
- deferred_edges->append(t);
- } else {
- i++;
+ if (VerifyConnectionGraph) {
+ // Verify that no new simple edges could be created and all
+ // local vars has edges.
+ _verify = true;
+ for (int next = 0; next < ptnodes_length; ++next) {
+ PointsToNode* ptn = ptnodes_worklist.at(next);
+ add_final_edges(ptn->ideal_node());
+ if (ptn->is_LocalVar() && ptn->edge_count() == 0) {
+ ptn->dump();
+ assert(ptn->as_LocalVar()->edge_count() > 0, "sanity");
+ }
}
+ _verify = false;
}
- for (int next = 0; next < deferred_edges->length(); ++next) {
- uint t = deferred_edges->at(next);
- PointsToNode *ptt = ptnode_adr(t);
- uint e_cnt = ptt->edge_count();
- assert(e_cnt != 0, "should have at least phantom_object");
- for (uint e = 0; e < e_cnt; e++) {
- uint etgt = ptt->edge_target(e);
- if (visited->test_set(etgt))
- continue;
+#endif
- PointsToNode::EdgeType et = ptt->edge_type(e);
- if (et == PointsToNode::PointsToEdge) {
- add_pointsto_edge(ni, etgt);
- } else if (et == PointsToNode::DeferredEdge) {
- deferred_edges->append(etgt);
- } else {
- assert(false,"invalid connection graph");
+ // 2. Finish Graph construction by propagating references to all
+ // java objects through graph.
+ if (!complete_connection_graph(ptnodes_worklist, non_escaped_worklist,
+ java_objects_worklist, oop_fields_worklist)) {
+ // All objects escaped or hit time or iterations limits.
+ _collecting = false;
+ return false;
+ }
+
+ // 3. Adjust scalar_replaceable state of nonescaping objects and push
+ // scalar replaceable allocations on alloc_worklist for processing
+ // in split_unique_types().
+ int non_escaped_length = non_escaped_worklist.length();
+ for (int next = 0; next < non_escaped_length; next++) {
+ JavaObjectNode* ptn = non_escaped_worklist.at(next);
+ if (ptn->escape_state() == PointsToNode::NoEscape &&
+ ptn->scalar_replaceable()) {
+ adjust_scalar_replaceable_state(ptn);
+ if (ptn->scalar_replaceable()) {
+ alloc_worklist.append(ptn->ideal_node());
}
}
}
- if (ptn->edge_count() == 0) {
- // No pointsto edges found after deferred edges are removed.
- // For example, in the next case where call is replaced
- // with uncommon trap and as result array's load references
- // itself through deferred edges:
- //
- // A a = b[i];
- // if (c!=null) a = c.foo();
- // b[i] = a;
- //
- // Assume the value was set outside this method and
- // add edge to phantom object.
- add_pointsto_edge(ni, _phantom_object);
- }
-}
+#ifdef ASSERT
+ if (VerifyConnectionGraph) {
+ // Verify that graph is complete - no new edges could be added or needed.
+ verify_connection_graph(ptnodes_worklist, non_escaped_worklist,
+ java_objects_worklist, addp_worklist);
+ }
+ assert(C->unique() == nodes_size(), "no new ideal nodes should be added during ConnectionGraph build");
+ assert(null_obj->escape_state() == PointsToNode::NoEscape &&
+ null_obj->edge_count() == 0 &&
+ !null_obj->arraycopy_src() &&
+ !null_obj->arraycopy_dst(), "sanity");
+#endif
-// Add an edge to node given by "to_i" from any field of adr_i whose offset
-// matches "offset" A deferred edge is added if to_i is a LocalVar, and
-// a pointsto edge is added if it is a JavaObject
+ _collecting = false;
-void ConnectionGraph::add_edge_from_fields(uint adr_i, uint to_i, int offs) {
- // No fields for NULL pointer.
- if (is_null_ptr(adr_i)) {
- return;
- }
- PointsToNode* an = ptnode_adr(adr_i);
- PointsToNode* to = ptnode_adr(to_i);
- bool deferred = (to->node_type() == PointsToNode::LocalVar);
- bool escaped = (to_i == _phantom_object) && (offs == Type::OffsetTop);
- if (escaped) {
- // Values in fields escaped during call.
- assert(an->escape_state() >= PointsToNode::ArgEscape, "sanity");
- offs = Type::OffsetBot;
- }
- for (uint fe = 0; fe < an->edge_count(); fe++) {
- assert(an->edge_type(fe) == PointsToNode::FieldEdge, "expecting a field edge");
- int fi = an->edge_target(fe);
- if (escaped) {
- set_escape_state(fi, PointsToNode::GlobalEscape);
- }
- PointsToNode* pf = ptnode_adr(fi);
- int po = pf->offset();
- if (po == offs || po == Type::OffsetBot || offs == Type::OffsetBot) {
- if (deferred)
- add_deferred_edge(fi, to_i);
- else
- add_pointsto_edge(fi, to_i);
- }
- }
-}
+ } // TracePhase t3("connectionGraph")
-// Add a deferred edge from node given by "from_i" to any field of adr_i
-// whose offset matches "offset".
-void ConnectionGraph::add_deferred_edge_to_fields(uint from_i, uint adr_i, int offs) {
- // No fields for NULL pointer.
- if (is_null_ptr(adr_i)) {
- return;
- }
- if (adr_i == _phantom_object) {
- // Add only one edge for unknown object.
- add_pointsto_edge(from_i, _phantom_object);
- return;
+ // 4. Optimize ideal graph based on EA information.
+ bool has_non_escaping_obj = (non_escaped_worklist.length() > 0);
+ if (has_non_escaping_obj) {
+ optimize_ideal_graph(ptr_cmp_worklist, storestore_worklist);
}
- PointsToNode* an = ptnode_adr(adr_i);
- bool is_alloc = an->_node->is_Allocate();
- for (uint fe = 0; fe < an->edge_count(); fe++) {
- assert(an->edge_type(fe) == PointsToNode::FieldEdge, "expecting a field edge");
- int fi = an->edge_target(fe);
- PointsToNode* pf = ptnode_adr(fi);
- int offset = pf->offset();
- if (!is_alloc) {
- // Assume the field was set outside this method if it is not Allocation
- add_pointsto_edge(fi, _phantom_object);
- }
- if (offset == offs || offset == Type::OffsetBot || offs == Type::OffsetBot) {
- add_deferred_edge(from_i, fi);
- }
- }
- // Some fields references (AddP) may still be missing
- // until Connection Graph construction is complete.
- // For example, loads from RAW pointers with offset 0
- // which don't have AddP.
- // A reference to phantom_object will be added if
- // a field reference is still missing after completing
- // Connection Graph (see remove_deferred()).
-}
-// Helper functions
+#ifndef PRODUCT
+ if (PrintEscapeAnalysis) {
+ dump(ptnodes_worklist); // Dump ConnectionGraph
+ }
+#endif
-static Node* get_addp_base(Node *addp) {
- assert(addp->is_AddP(), "must be AddP");
- //
- // AddP cases for Base and Address inputs:
- // case #1. Direct object's field reference:
- // Allocate
- // |
- // Proj #5 ( oop result )
- // |
- // CheckCastPP (cast to instance type)
- // | |
- // AddP ( base == address )
- //
- // case #2. Indirect object's field reference:
- // Phi
- // |
- // CastPP (cast to instance type)
- // | |
- // AddP ( base == address )
- //
- // case #3. Raw object's field reference for Initialize node:
- // Allocate
- // |
- // Proj #5 ( oop result )
- // top |
- // \ |
- // AddP ( base == top )
- //
- // case #4. Array's element reference:
- // {CheckCastPP | CastPP}
- // | | |
- // | AddP ( array's element offset )
- // | |
- // AddP ( array's offset )
- //
- // case #5. Raw object's field reference for arraycopy stub call:
- // The inline_native_clone() case when the arraycopy stub is called
- // after the allocation before Initialize and CheckCastPP nodes.
- // Allocate
- // |
- // Proj #5 ( oop result )
- // | |
- // AddP ( base == address )
- //
- // case #6. Constant Pool, ThreadLocal, CastX2P or
- // Raw object's field reference:
- // {ConP, ThreadLocal, CastX2P, raw Load}
- // top |
- // \ |
- // AddP ( base == top )
- //
- // case #7. Klass's field reference.
- // LoadKlass
- // | |
- // AddP ( base == address )
- //
- // case #8. narrow Klass's field reference.
- // LoadNKlass
- // |
- // DecodeN
- // | |
- // AddP ( base == address )
- //
- Node *base = addp->in(AddPNode::Base)->uncast();
- if (base->is_top()) { // The AddP case #3 and #6.
- base = addp->in(AddPNode::Address)->uncast();
- while (base->is_AddP()) {
- // Case #6 (unsafe access) may have several chained AddP nodes.
- assert(base->in(AddPNode::Base)->is_top(), "expected unsafe access address only");
- base = base->in(AddPNode::Address)->uncast();
+ bool has_scalar_replaceable_candidates = (alloc_worklist.length() > 0);
+#ifdef ASSERT
+ if (VerifyConnectionGraph) {
+ int alloc_length = alloc_worklist.length();
+ for (int next = 0; next < alloc_length; ++next) {
+ Node* n = alloc_worklist.at(next);
+ PointsToNode* ptn = ptnode_adr(n->_idx);
+ assert(ptn->escape_state() == PointsToNode::NoEscape && ptn->scalar_replaceable(), "sanity");
}
- assert(base->Opcode() == Op_ConP || base->Opcode() == Op_ThreadLocal ||
- base->Opcode() == Op_CastX2P || base->is_DecodeN() ||
- (base->is_Mem() && base->bottom_type() == TypeRawPtr::NOTNULL) ||
- (base->is_Proj() && base->in(0)->is_Allocate()), "sanity");
}
- return base;
-}
-
-static Node* find_second_addp(Node* addp, Node* n) {
- assert(addp->is_AddP() && addp->outcnt() > 0, "Don't process dead nodes");
+#endif
- Node* addp2 = addp->raw_out(0);
- if (addp->outcnt() == 1 && addp2->is_AddP() &&
- addp2->in(AddPNode::Base) == n &&
- addp2->in(AddPNode::Address) == addp) {
+ // 5. Separate memory graph for scalar replaceable allcations.
+ if (has_scalar_replaceable_candidates &&
+ C->AliasLevel() >= 3 && EliminateAllocations) {
+ // Now use the escape information to create unique types for
+ // scalar replaceable objects.
+ split_unique_types(alloc_worklist);
+ if (C->failing()) return false;
+ C->print_method("After Escape Analysis", 2);
- assert(addp->in(AddPNode::Base) == n, "expecting the same base");
- //
- // Find array's offset to push it on worklist first and
- // as result process an array's element offset first (pushed second)
- // to avoid CastPP for the array's offset.
- // Otherwise the inserted CastPP (LocalVar) will point to what
- // the AddP (Field) points to. Which would be wrong since
- // the algorithm expects the CastPP has the same point as
- // as AddP's base CheckCastPP (LocalVar).
- //
- // ArrayAllocation
- // |
- // CheckCastPP
- // |
- // memProj (from ArrayAllocation CheckCastPP)
- // | ||
- // | || Int (element index)
- // | || | ConI (log(element size))
- // | || | /
- // | || LShift
- // | || /
- // | AddP (array's element offset)
- // | |
- // | | ConI (array's offset: #12(32-bits) or #24(64-bits))
- // | / /
- // AddP (array's offset)
- // |
- // Load/Store (memory operation on array's element)
- //
- return addp2;
+#ifdef ASSERT
+ } else if (Verbose && (PrintEscapeAnalysis || PrintEliminateAllocations)) {
+ tty->print("=== No allocations eliminated for ");
+ C->method()->print_short_name();
+ if(!EliminateAllocations) {
+ tty->print(" since EliminateAllocations is off ===");
+ } else if(!has_scalar_replaceable_candidates) {
+ tty->print(" since there are no scalar replaceable candidates ===");
+ } else if(C->AliasLevel() < 3) {
+ tty->print(" since AliasLevel < 3 ===");
+ }
+ tty->cr();
+#endif
}
- return NULL;
+ return has_non_escaping_obj;
}
-//
-// Adjust the type and inputs of an AddP which computes the
-// address of a field of an instance
-//
-bool ConnectionGraph::split_AddP(Node *addp, Node *base, PhaseGVN *igvn) {
- const TypeOopPtr *base_t = igvn->type(base)->isa_oopptr();
- assert(base_t != NULL && base_t->is_known_instance(), "expecting instance oopptr");
- const TypeOopPtr *t = igvn->type(addp)->isa_oopptr();
- if (t == NULL) {
- // We are computing a raw address for a store captured by an Initialize
- // compute an appropriate address type (cases #3 and #5).
- assert(igvn->type(addp) == TypeRawPtr::NOTNULL, "must be raw pointer");
- assert(addp->in(AddPNode::Address)->is_Proj(), "base of raw address must be result projection from allocation");
- intptr_t offs = (int)igvn->find_intptr_t_con(addp->in(AddPNode::Offset), Type::OffsetBot);
- assert(offs != Type::OffsetBot, "offset must be a constant");
- t = base_t->add_offset(offs)->is_oopptr();
- }
- int inst_id = base_t->instance_id();
- assert(!t->is_known_instance() || t->instance_id() == inst_id,
- "old type must be non-instance or match new type");
+// Populate Connection Graph with PointsTo nodes and create simple
+// connection graph edges.
+void ConnectionGraph::add_node_to_connection_graph(Node *n, Unique_Node_List *delayed_worklist) {
+ assert(!_verify, "this method sould not be called for verification");
+ PhaseGVN* igvn = _igvn;
+ uint n_idx = n->_idx;
+ PointsToNode* n_ptn = ptnode_adr(n_idx);
+ if (n_ptn != NULL)
+ return; // No need to redefine PointsTo node during first iteration.
- // The type 't' could be subclass of 'base_t'.
- // As result t->offset() could be large then base_t's size and it will
- // cause the failure in add_offset() with narrow oops since TypeOopPtr()
- // constructor verifies correctness of the offset.
- //
- // It could happened on subclass's branch (from the type profiling
- // inlining) which was not eliminated during parsing since the exactness
- // of the allocation type was not propagated to the subclass type check.
- //
- // Or the type 't' could be not related to 'base_t' at all.
- // It could happened when CHA type is different from MDO type on a dead path
- // (for example, from instanceof check) which is not collapsed during parsing.
- //
- // Do nothing for such AddP node and don't process its users since
- // this code branch will go away.
- //
- if (!t->is_known_instance() &&
- !base_t->klass()->is_subtype_of(t->klass())) {
- return false; // bail out
+ if (n->is_Call()) {
+ // Arguments to allocation and locking don't escape.
+ if (n->is_AbstractLock()) {
+ // Put Lock and Unlock nodes on IGVN worklist to process them during
+ // first IGVN optimization when escape information is still available.
+ record_for_optimizer(n);
+ } else if (n->is_Allocate()) {
+ add_call_node(n->as_Call());
+ record_for_optimizer(n);
+ } else {
+ if (n->is_CallStaticJava()) {
+ const char* name = n->as_CallStaticJava()->_name;
+ if (name != NULL && strcmp(name, "uncommon_trap") == 0)
+ return; // Skip uncommon traps
+ }
+ // Don't mark as processed since call's arguments have to be processed.
+ delayed_worklist->push(n);
+ // Check if a call returns an object.
+ if (n->as_Call()->returns_pointer() &&
+ n->as_Call()->proj_out(TypeFunc::Parms) != NULL) {
+ add_call_node(n->as_Call());
+ }
+ }
+ return;
}
-
- const TypeOopPtr *tinst = base_t->add_offset(t->offset())->is_oopptr();
- // Do NOT remove the next line: ensure a new alias index is allocated
- // for the instance type. Note: C++ will not remove it since the call
- // has side effect.
- int alias_idx = _compile->get_alias_index(tinst);
- igvn->set_type(addp, tinst);
- // record the allocation in the node map
- assert(ptnode_adr(addp->_idx)->_node != NULL, "should be registered");
- set_map(addp->_idx, get_map(base->_idx));
-
- // Set addp's Base and Address to 'base'.
- Node *abase = addp->in(AddPNode::Base);
- Node *adr = addp->in(AddPNode::Address);
- if (adr->is_Proj() && adr->in(0)->is_Allocate() &&
- adr->in(0)->_idx == (uint)inst_id) {
- // Skip AddP cases #3 and #5.
- } else {
- assert(!abase->is_top(), "sanity"); // AddP case #3
- if (abase != base) {
- igvn->hash_delete(addp);
- addp->set_req(AddPNode::Base, base);
- if (abase == adr) {
- addp->set_req(AddPNode::Address, base);
+ // Put this check here to process call arguments since some call nodes
+ // point to phantom_obj.
+ if (n_ptn == phantom_obj || n_ptn == null_obj)
+ return; // Skip predefined nodes.
+
+ int opcode = n->Opcode();
+ switch (opcode) {
+ case Op_AddP: {
+ Node* base = get_addp_base(n);
+ PointsToNode* ptn_base = ptnode_adr(base->_idx);
+ // Field nodes are created for all field types. They are used in
+ // adjust_scalar_replaceable_state() and split_unique_types().
+ // Note, non-oop fields will have only base edges in Connection
+ // Graph because such fields are not used for oop loads and stores.
+ int offset = address_offset(n, igvn);
+ add_field(n, PointsToNode::NoEscape, offset);
+ if (ptn_base == NULL) {
+ delayed_worklist->push(n); // Process it later.
} else {
- // AddP case #4 (adr is array's element offset AddP node)
+ n_ptn = ptnode_adr(n_idx);
+ add_base(n_ptn->as_Field(), ptn_base);
+ }
+ break;
+ }
+ case Op_CastX2P: {
+ map_ideal_node(n, phantom_obj);
+ break;
+ }
+ case Op_CastPP:
+ case Op_CheckCastPP:
+ case Op_EncodeP:
+ case Op_DecodeN: {
+ add_local_var_and_edge(n, PointsToNode::NoEscape,
+ n->in(1), delayed_worklist);
+ break;
+ }
+ case Op_CMoveP: {
+ add_local_var(n, PointsToNode::NoEscape);
+ // Do not add edges during first iteration because some could be
+ // not defined yet.
+ delayed_worklist->push(n);
+ break;
+ }
+ case Op_ConP:
+ case Op_ConN: {
+ // assume all oop constants globally escape except for null
+ PointsToNode::EscapeState es;
+ if (igvn->type(n) == TypePtr::NULL_PTR ||
+ igvn->type(n) == TypeNarrowOop::NULL_PTR) {
+ es = PointsToNode::NoEscape;
+ } else {
+ es = PointsToNode::GlobalEscape;
+ }
+ add_java_object(n, es);
+ break;
+ }
+ case Op_CreateEx: {
+ // assume that all exception objects globally escape
+ add_java_object(n, PointsToNode::GlobalEscape);
+ break;
+ }
+ case Op_LoadKlass:
+ case Op_LoadNKlass: {
+ // Unknown class is loaded
+ map_ideal_node(n, phantom_obj);
+ break;
+ }
+ case Op_LoadP:
+ case Op_LoadN:
+ case Op_LoadPLocked: {
+ // Using isa_ptr() instead of isa_oopptr() for LoadP and Phi because
+ // ThreadLocal has RawPrt type.
+ const Type* t = igvn->type(n);
+ if (t->make_ptr() != NULL) {
+ Node* adr = n->in(MemNode::Address);
#ifdef ASSERT
- const TypeOopPtr *atype = igvn->type(adr)->isa_oopptr();
- assert(adr->is_AddP() && atype != NULL &&
- atype->instance_id() == inst_id, "array's element offset should be processed first");
+ if (!adr->is_AddP()) {
+ assert(igvn->type(adr)->isa_rawptr(), "sanity");
+ } else {
+ assert((ptnode_adr(adr->_idx) == NULL ||
+ ptnode_adr(adr->_idx)->as_Field()->is_oop()), "sanity");
+ }
#endif
+ add_local_var_and_edge(n, PointsToNode::NoEscape,
+ adr, delayed_worklist);
}
- igvn->hash_insert(addp);
+ break;
}
- }
- // Put on IGVN worklist since at least addp's type was changed above.
- record_for_optimizer(addp);
- return true;
-}
-
-//
-// Create a new version of orig_phi if necessary. Returns either the newly
-// created phi or an existing phi. Sets create_new to indicate whether a new
-// phi was created. Cache the last newly created phi in the node map.
-//
-PhiNode *ConnectionGraph::create_split_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, PhaseGVN *igvn, bool &new_created) {
- Compile *C = _compile;
- new_created = false;
- int phi_alias_idx = C->get_alias_index(orig_phi->adr_type());
- // nothing to do if orig_phi is bottom memory or matches alias_idx
- if (phi_alias_idx == alias_idx) {
- return orig_phi;
- }
- // Have we recently created a Phi for this alias index?
- PhiNode *result = get_map_phi(orig_phi->_idx);
- if (result != NULL && C->get_alias_index(result->adr_type()) == alias_idx) {
- return result;
- }
- // Previous check may fail when the same wide memory Phi was split into Phis
- // for different memory slices. Search all Phis for this region.
- if (result != NULL) {
- Node* region = orig_phi->in(0);
- for (DUIterator_Fast imax, i = region->fast_outs(imax); i < imax; i++) {
- Node* phi = region->fast_out(i);
- if (phi->is_Phi() &&
- C->get_alias_index(phi->as_Phi()->adr_type()) == alias_idx) {
- assert(phi->_idx >= nodes_size(), "only new Phi per instance memory slice");
- return phi->as_Phi();
+ case Op_Parm: {
+ map_ideal_node(n, phantom_obj);
+ break;
+ }
+ case Op_PartialSubtypeCheck: {
+ // Produces Null or notNull and is used in only in CmpP so
+ // phantom_obj could be used.
+ map_ideal_node(n, phantom_obj); // Result is unknown
+ break;
+ }
+ case Op_Phi: {
+ // Using isa_ptr() instead of isa_oopptr() for LoadP and Phi because
+ // ThreadLocal has RawPrt type.
+ const Type* t = n->as_Phi()->type();
+ if (t->make_ptr() != NULL) {
+ add_local_var(n, PointsToNode::NoEscape);
+ // Do not add edges during first iteration because some could be
+ // not defined yet.
+ delayed_worklist->push(n);
}
+ break;
}
- }
- if ((int)C->unique() + 2*NodeLimitFudgeFactor > MaxNodeLimit) {
- if (C->do_escape_analysis() == true && !C->failing()) {
- // Retry compilation without escape analysis.
- // If this is the first failure, the sentinel string will "stick"
- // to the Compile object, and the C2Compiler will see it and retry.
- C->record_failure(C2Compiler::retry_no_escape_analysis());
+ case Op_Proj: {
+ // we are only interested in the oop result projection from a call
+ if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() &&
+ n->in(0)->as_Call()->returns_pointer()) {
+ add_local_var_and_edge(n, PointsToNode::NoEscape,
+ n->in(0), delayed_worklist);
+ }
+ break;
}
- return NULL;
+ case Op_Rethrow: // Exception object escapes
+ case Op_Return: {
+ if (n->req() > TypeFunc::Parms &&
+ igvn->type(n->in(TypeFunc::Parms))->isa_oopptr()) {
+ // Treat Return value as LocalVar with GlobalEscape escape state.
+ add_local_var_and_edge(n, PointsToNode::GlobalEscape,
+ n->in(TypeFunc::Parms), delayed_worklist);
+ }
+ break;
+ }
+ case Op_StoreP:
+ case Op_StoreN:
+ case Op_StorePConditional:
+ case Op_CompareAndSwapP:
+ case Op_CompareAndSwapN: {
+ Node* adr = n->in(MemNode::Address);
+ const Type *adr_type = igvn->type(adr);
+ adr_type = adr_type->make_ptr();
+ if (adr_type->isa_oopptr() ||
+ (opcode == Op_StoreP || opcode == Op_StoreN) &&
+ (adr_type == TypeRawPtr::NOTNULL &&
+ adr->in(AddPNode::Address)->is_Proj() &&
+ adr->in(AddPNode::Address)->in(0)->is_Allocate())) {
+ delayed_worklist->push(n); // Process it later.
+#ifdef ASSERT
+ assert(adr->is_AddP(), "expecting an AddP");
+ if (adr_type == TypeRawPtr::NOTNULL) {
+ // Verify a raw address for a store captured by Initialize node.
+ int offs = (int)igvn->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot);
+ assert(offs != Type::OffsetBot, "offset must be a constant");
+ }
+#endif
+ } else {
+ // Ignore copy the displaced header to the BoxNode (OSR compilation).
+ if (adr->is_BoxLock())
+ break;
+ // Stored value escapes in unsafe access.
+ if ((opcode == Op_StoreP) && (adr_type == TypeRawPtr::BOTTOM)) {
+ // Pointer stores in G1 barriers looks like unsafe access.
+ // Ignore such stores to be able scalar replace non-escaping
+ // allocations.
+ if (UseG1GC && adr->is_AddP()) {
+ Node* base = get_addp_base(adr);
+ if (base->Opcode() == Op_LoadP &&
+ base->in(MemNode::Address)->is_AddP()) {
+ adr = base->in(MemNode::Address);
+ Node* tls = get_addp_base(adr);
+ if (tls->Opcode() == Op_ThreadLocal) {
+ int offs = (int)igvn->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot);
+ if (offs == in_bytes(JavaThread::satb_mark_queue_offset() +
+ PtrQueue::byte_offset_of_buf())) {
+ break; // G1 pre barier previous oop value store.
+ }
+ if (offs == in_bytes(JavaThread::dirty_card_queue_offset() +
+ PtrQueue::byte_offset_of_buf())) {
+ break; // G1 post barier card address store.
+ }
+ }
+ }
+ }
+ delayed_worklist->push(n); // Process unsafe access later.
+ break;
+ }
+#ifdef ASSERT
+ n->dump(1);
+ assert(false, "not unsafe or G1 barrier raw StoreP");
+#endif
+ }
+ break;
+ }
+ case Op_AryEq:
+ case Op_StrComp:
+ case Op_StrEquals:
+ case Op_StrIndexOf: {
+ add_local_var(n, PointsToNode::ArgEscape);
+ delayed_worklist->push(n); // Process it later.
+ break;
+ }
+ case Op_ThreadLocal: {
+ add_java_object(n, PointsToNode::ArgEscape);
+ break;
+ }
+ default:
+ ; // Do nothing for nodes not related to EA.
}
- orig_phi_worklist.append_if_missing(orig_phi);
- const TypePtr *atype = C->get_adr_type(alias_idx);
- result = PhiNode::make(orig_phi->in(0), NULL, Type::MEMORY, atype);
- C->copy_node_notes_to(result, orig_phi);
- igvn->set_type(result, result->bottom_type());
- record_for_optimizer(result);
+ return;
+}
- debug_only(Node* pn = ptnode_adr(orig_phi->_idx)->_node;)
- assert(pn == NULL || pn == orig_phi, "wrong node");
- set_map(orig_phi->_idx, result);
- ptnode_adr(orig_phi->_idx)->_node = orig_phi;
+#ifdef ASSERT
+#define ELSE_FAIL(name) \
+ /* Should not be called for not pointer type. */ \
+ n->dump(1); \
+ assert(false, name); \
+ break;
+#else
+#define ELSE_FAIL(name) \
+ break;
+#endif
- new_created = true;
- return result;
-}
+// Add final simple edges to graph.
+void ConnectionGraph::add_final_edges(Node *n) {
+ PointsToNode* n_ptn = ptnode_adr(n->_idx);
+#ifdef ASSERT
+ if (_verify && n_ptn->is_JavaObject())
+ return; // This method does not change graph for JavaObject.
+#endif
-//
-// Return a new version of Memory Phi "orig_phi" with the inputs having the
-// specified alias index.
-//
-PhiNode *ConnectionGraph::split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, PhaseGVN *igvn) {
-
- assert(alias_idx != Compile::AliasIdxBot, "can't split out bottom memory");
- Compile *C = _compile;
- bool new_phi_created;
- PhiNode *result = create_split_phi(orig_phi, alias_idx, orig_phi_worklist, igvn, new_phi_created);
- if (!new_phi_created) {
- return result;
+ if (n->is_Call()) {
+ process_call_arguments(n->as_Call());
+ return;
}
-
- GrowableArray<PhiNode *> phi_list;
- GrowableArray<uint> cur_input;
-
- PhiNode *phi = orig_phi;
- uint idx = 1;
- bool finished = false;
- while(!finished) {
- while (idx < phi->req()) {
- Node *mem = find_inst_mem(phi->in(idx), alias_idx, orig_phi_worklist, igvn);
- if (mem != NULL && mem->is_Phi()) {
- PhiNode *newphi = create_split_phi(mem->as_Phi(), alias_idx, orig_phi_worklist, igvn, new_phi_created);
- if (new_phi_created) {
- // found an phi for which we created a new split, push current one on worklist and begin
- // processing new one
- phi_list.push(phi);
- cur_input.push(idx);
- phi = mem->as_Phi();
- result = newphi;
- idx = 1;
- continue;
- } else {
- mem = newphi;
+ assert(n->is_Store() || n->is_LoadStore() ||
+ (n_ptn != NULL) && (n_ptn->ideal_node() != NULL),
+ "node should be registered already");
+ int opcode = n->Opcode();
+ switch (opcode) {
+ case Op_AddP: {
+ Node* base = get_addp_base(n);
+ PointsToNode* ptn_base = ptnode_adr(base->_idx);
+ assert(ptn_base != NULL, "field's base should be registered");
+ add_base(n_ptn->as_Field(), ptn_base);
+ break;
+ }
+ case Op_CastPP:
+ case Op_CheckCastPP:
+ case Op_EncodeP:
+ case Op_DecodeN: {
+ add_local_var_and_edge(n, PointsToNode::NoEscape,
+ n->in(1), NULL);
+ break;
+ }
+ case Op_CMoveP: {
+ for (uint i = CMoveNode::IfFalse; i < n->req(); i++) {
+ Node* in = n->in(i);
+ if (in == NULL)
+ continue; // ignore NULL
+ Node* uncast_in = in->uncast();
+ if (uncast_in->is_top() || uncast_in == n)
+ continue; // ignore top or inputs which go back this node
+ PointsToNode* ptn = ptnode_adr(in->_idx);
+ assert(ptn != NULL, "node should be registered");
+ add_edge(n_ptn, ptn);
+ }
+ break;
+ }
+ case Op_LoadP:
+ case Op_LoadN:
+ case Op_LoadPLocked: {
+ // Using isa_ptr() instead of isa_oopptr() for LoadP and Phi because
+ // ThreadLocal has RawPrt type.
+ const Type* t = _igvn->type(n);
+ if (t->make_ptr() != NULL) {
+ Node* adr = n->in(MemNode::Address);
+ add_local_var_and_edge(n, PointsToNode::NoEscape, adr, NULL);
+ break;
+ }
+ ELSE_FAIL("Op_LoadP");
+ }
+ case Op_Phi: {
+ // Using isa_ptr() instead of isa_oopptr() for LoadP and Phi because
+ // ThreadLocal has RawPrt type.
+ const Type* t = n->as_Phi()->type();
+ if (t->make_ptr() != NULL) {
+ for (uint i = 1; i < n->req(); i++) {
+ Node* in = n->in(i);
+ if (in == NULL)
+ continue; // ignore NULL
+ Node* uncast_in = in->uncast();
+ if (uncast_in->is_top() || uncast_in == n)
+ continue; // ignore top or inputs which go back this node
+ PointsToNode* ptn = ptnode_adr(in->_idx);
+ assert(ptn != NULL, "node should be registered");
+ add_edge(n_ptn, ptn);
}
+ break;
}
- if (C->failing()) {
- return NULL;
+ ELSE_FAIL("Op_Phi");
+ }
+ case Op_Proj: {
+ // we are only interested in the oop result projection from a call
+ if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() &&
+ n->in(0)->as_Call()->returns_pointer()) {
+ add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(0), NULL);
+ break;
}
- result->set_req(idx++, mem);
+ ELSE_FAIL("Op_Proj");
+ }
+ case Op_Rethrow: // Exception object escapes
+ case Op_Return: {
+ if (n->req() > TypeFunc::Parms &&
+ _igvn->type(n->in(TypeFunc::Parms))->isa_oopptr()) {
+ // Treat Return value as LocalVar with GlobalEscape escape state.
+ add_local_var_and_edge(n, PointsToNode::GlobalEscape,
+ n->in(TypeFunc::Parms), NULL);
+ break;
+ }
+ ELSE_FAIL("Op_Return");
+ }
+ case Op_StoreP:
+ case Op_StoreN:
+ case Op_StorePConditional:
+ case Op_CompareAndSwapP:
+ case Op_CompareAndSwapN: {
+ Node* adr = n->in(MemNode::Address);
+ const Type *adr_type = _igvn->type(adr);
+ adr_type = adr_type->make_ptr();
+ if (adr_type->isa_oopptr() ||
+ (opcode == Op_StoreP || opcode == Op_StoreN) &&
+ (adr_type == TypeRawPtr::NOTNULL &&
+ adr->in(AddPNode::Address)->is_Proj() &&
+ adr->in(AddPNode::Address)->in(0)->is_Allocate())) {
+ // Point Address to Value
+ PointsToNode* adr_ptn = ptnode_adr(adr->_idx);
+ assert(adr_ptn != NULL &&
+ adr_ptn->as_Field()->is_oop(), "node should be registered");
+ Node *val = n->in(MemNode::ValueIn);
+ PointsToNode* ptn = ptnode_adr(val->_idx);
+ assert(ptn != NULL, "node should be registered");
+ add_edge(adr_ptn, ptn);
+ break;
+ } else if ((opcode == Op_StoreP) && (adr_type == TypeRawPtr::BOTTOM)) {
+ // Stored value escapes in unsafe access.
+ Node *val = n->in(MemNode::ValueIn);
+ PointsToNode* ptn = ptnode_adr(val->_idx);
+ assert(ptn != NULL, "node should be registered");
+ ptn->set_escape_state(PointsToNode::GlobalEscape);
+ // Add edge to object for unsafe access with offset.
+ PointsToNode* adr_ptn = ptnode_adr(adr->_idx);
+ assert(adr_ptn != NULL, "node should be registered");
+ if (adr_ptn->is_Field()) {
+ assert(adr_ptn->as_Field()->is_oop(), "should be oop field");
+ add_edge(adr_ptn, ptn);
+ }
+ break;
+ }
+ ELSE_FAIL("Op_StoreP");
+ }
+ case Op_AryEq:
+ case Op_StrComp:
+ case Op_StrEquals:
+ case Op_StrIndexOf: {
+ // char[] arrays passed to string intrinsic do not escape but
+ // they are not scalar replaceable. Adjust escape state for them.
+ // Start from in(2) edge since in(1) is memory edge.
+ for (uint i = 2; i < n->req(); i++) {
+ Node* adr = n->in(i);
+ const Type* at = _igvn->type(adr);
+ if (!adr->is_top() && at->isa_ptr()) {
+ assert(at == Type::TOP || at == TypePtr::NULL_PTR ||
+ at->isa_ptr() != NULL, "expecting a pointer");
+ if (adr->is_AddP()) {
+ adr = get_addp_base(adr);
+ }
+ PointsToNode* ptn = ptnode_adr(adr->_idx);
+ assert(ptn != NULL, "node should be registered");
+ add_edge(n_ptn, ptn);
+ }
+ }
+ break;
}
+ default: {
+ // This method should be called only for EA specific nodes which may
+ // miss some edges when they were created.
#ifdef ASSERT
- // verify that the new Phi has an input for each input of the original
- assert( phi->req() == result->req(), "must have same number of inputs.");
- assert( result->in(0) != NULL && result->in(0) == phi->in(0), "regions must match");
+ n->dump(1);
#endif
- // Check if all new phi's inputs have specified alias index.
- // Otherwise use old phi.
- for (uint i = 1; i < phi->req(); i++) {
- Node* in = result->in(i);
- assert((phi->in(i) == NULL) == (in == NULL), "inputs must correspond.");
+ guarantee(false, "unknown node");
}
- // we have finished processing a Phi, see if there are any more to do
- finished = (phi_list.length() == 0 );
- if (!finished) {
- phi = phi_list.pop();
- idx = cur_input.pop();
- PhiNode *prev_result = get_map_phi(phi->_idx);
- prev_result->set_req(idx++, result);
- result = prev_result;
- }
- }
- return result;
-}
-
-
-//
-// The next methods are derived from methods in MemNode.
-//
-static Node *step_through_mergemem(MergeMemNode *mmem, int alias_idx, const TypeOopPtr *toop) {
- Node *mem = mmem;
- // TypeOopPtr::NOTNULL+any is an OOP with unknown offset - generally
- // means an array I have not precisely typed yet. Do not do any
- // alias stuff with it any time soon.
- if( toop->base() != Type::AnyPtr &&
- !(toop->klass() != NULL &&
- toop->klass()->is_java_lang_Object() &&
- toop->offset() == Type::OffsetBot) ) {
- mem = mmem->memory_at(alias_idx);
- // Update input if it is progress over what we have now
}
- return mem;
+ return;
}
-//
-// Move memory users to their memory slices.
-//
-void ConnectionGraph::move_inst_mem(Node* n, GrowableArray<PhiNode *> &orig_phis, PhaseGVN *igvn) {
- Compile* C = _compile;
-
- const TypePtr* tp = igvn->type(n->in(MemNode::Address))->isa_ptr();
- assert(tp != NULL, "ptr type");
- int alias_idx = C->get_alias_index(tp);
- int general_idx = C->get_general_index(alias_idx);
-
- // Move users first
- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- Node* use = n->fast_out(i);
- if (use->is_MergeMem()) {
- MergeMemNode* mmem = use->as_MergeMem();
- assert(n == mmem->memory_at(alias_idx), "should be on instance memory slice");
- if (n != mmem->memory_at(general_idx) || alias_idx == general_idx) {
- continue; // Nothing to do
- }
- // Replace previous general reference to mem node.
- uint orig_uniq = C->unique();
- Node* m = find_inst_mem(n, general_idx, orig_phis, igvn);
- assert(orig_uniq == C->unique(), "no new nodes");
- mmem->set_memory_at(general_idx, m);
- --imax;
- --i;
- } else if (use->is_MemBar()) {
- assert(!use->is_Initialize(), "initializing stores should not be moved");
- if (use->req() > MemBarNode::Precedent &&
- use->in(MemBarNode::Precedent) == n) {
- // Don't move related membars.
- record_for_optimizer(use);
- continue;
- }
- tp = use->as_MemBar()->adr_type()->isa_ptr();
- if (tp != NULL && C->get_alias_index(tp) == alias_idx ||
- alias_idx == general_idx) {
- continue; // Nothing to do
+void ConnectionGraph::add_call_node(CallNode* call) {
+ assert(call->returns_pointer(), "only for call which returns pointer");
+ uint call_idx = call->_idx;
+ if (call->is_Allocate()) {
+ Node* k = call->in(AllocateNode::KlassNode);
+ const TypeKlassPtr* kt = k->bottom_type()->isa_klassptr();
+ assert(kt != NULL, "TypeKlassPtr required.");
+ ciKlass* cik = kt->klass();
+ PointsToNode::EscapeState es = PointsToNode::NoEscape;
+ bool scalar_replaceable = true;
+ if (call->is_AllocateArray()) {
+ if (!cik->is_array_klass()) { // StressReflectiveCode
+ es = PointsToNode::GlobalEscape;
+ } else {
+ int length = call->in(AllocateNode::ALength)->find_int_con(-1);
+ if (length < 0 || length > EliminateAllocationArraySizeLimit) {
+ // Not scalar replaceable if the length is not constant or too big.
+ scalar_replaceable = false;
+ }
}
- // Move to general memory slice.
- uint orig_uniq = C->unique();
- Node* m = find_inst_mem(n, general_idx, orig_phis, igvn);
- assert(orig_uniq == C->unique(), "no new nodes");
- igvn->hash_delete(use);
- imax -= use->replace_edge(n, m);
- igvn->hash_insert(use);
- record_for_optimizer(use);
- --i;
-#ifdef ASSERT
- } else if (use->is_Mem()) {
- if (use->Opcode() == Op_StoreCM && use->in(MemNode::OopStore) == n) {
- // Don't move related cardmark.
- continue;
+ } else { // Allocate instance
+ if (cik->is_subclass_of(_compile->env()->Thread_klass()) ||
+ !cik->is_instance_klass() || // StressReflectiveCode
+ cik->as_instance_klass()->has_finalizer()) {
+ es = PointsToNode::GlobalEscape;
}
- // Memory nodes should have new memory input.
- tp = igvn->type(use->in(MemNode::Address))->isa_ptr();
- assert(tp != NULL, "ptr type");
- int idx = C->get_alias_index(tp);
- assert(get_map(use->_idx) != NULL || idx == alias_idx,
- "Following memory nodes should have new memory input or be on the same memory slice");
- } else if (use->is_Phi()) {
- // Phi nodes should be split and moved already.
- tp = use->as_Phi()->adr_type()->isa_ptr();
- assert(tp != NULL, "ptr type");
- int idx = C->get_alias_index(tp);
- assert(idx == alias_idx, "Following Phi nodes should be on the same memory slice");
+ }
+ add_java_object(call, es);
+ PointsToNode* ptn = ptnode_adr(call_idx);
+ if (!scalar_replaceable && ptn->scalar_replaceable()) {
+ ptn->set_scalar_replaceable(false);
+ }
+ } else if (call->is_CallStaticJava()) {
+ // Call nodes could be different types:
+ //
+ // 1. CallDynamicJavaNode (what happened during call is unknown):
+ //
+ // - mapped to GlobalEscape JavaObject node if oop is returned;
+ //
+ // - all oop arguments are escaping globally;
+ //
+ // 2. CallStaticJavaNode (execute bytecode analysis if possible):
+ //
+ // - the same as CallDynamicJavaNode if can't do bytecode analysis;
+ //
+ // - mapped to GlobalEscape JavaObject node if unknown oop is returned;
+ // - mapped to NoEscape JavaObject node if non-escaping object allocated
+ // during call is returned;
+ // - mapped to ArgEscape LocalVar node pointed to object arguments
+ // which are returned and does not escape during call;
+ //
+ // - oop arguments escaping status is defined by bytecode analysis;
+ //
+ // For a static call, we know exactly what method is being called.
+ // Use bytecode estimator to record whether the call's return value escapes.
+ ciMethod* meth = call->as_CallJava()->method();
+ if (meth == NULL) {
+ const char* name = call->as_CallStaticJava()->_name;
+ assert(strncmp(name, "_multianewarray", 15) == 0, "TODO: add failed case check");
+ // Returns a newly allocated unescaped object.
+ add_java_object(call, PointsToNode::NoEscape);
+ ptnode_adr(call_idx)->set_scalar_replaceable(false);
} else {
- use->dump();
- assert(false, "should not be here");
-#endif
+ BCEscapeAnalyzer* call_analyzer = meth->get_bcea();
+ call_analyzer->copy_dependencies(_compile->dependencies());
+ if (call_analyzer->is_return_allocated()) {
+ // Returns a newly allocated unescaped object, simply
+ // update dependency information.
+ // Mark it as NoEscape so that objects referenced by
+ // it's fields will be marked as NoEscape at least.
+ add_java_object(call, PointsToNode::NoEscape);
+ ptnode_adr(call_idx)->set_scalar_replaceable(false);
+ } else {
+ // Determine whether any arguments are returned.
+ const TypeTuple* d = call->tf()->domain();
+ bool ret_arg = false;
+ for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
+ if (d->field_at(i)->isa_ptr() != NULL &&
+ call_analyzer->is_arg_returned(i - TypeFunc::Parms)) {
+ ret_arg = true;
+ break;
+ }
+ }
+ if (ret_arg) {
+ add_local_var(call, PointsToNode::ArgEscape);
+ } else {
+ // Returns unknown object.
+ map_ideal_node(call, phantom_obj);
+ }
+ }
}
+ } else {
+ // An other type of call, assume the worst case:
+ // returned value is unknown and globally escapes.
+ assert(call->Opcode() == Op_CallDynamicJava, "add failed case check");
+ map_ideal_node(call, phantom_obj);
}
}
-//
-// Search memory chain of "mem" to find a MemNode whose address
-// is the specified alias index.
-//
-Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArray<PhiNode *> &orig_phis, PhaseGVN *phase) {
- if (orig_mem == NULL)
- return orig_mem;
- Compile* C = phase->C;
- const TypeOopPtr *toop = C->get_adr_type(alias_idx)->isa_oopptr();
- bool is_instance = (toop != NULL) && toop->is_known_instance();
- Node *start_mem = C->start()->proj_out(TypeFunc::Memory);
- Node *prev = NULL;
- Node *result = orig_mem;
- while (prev != result) {
- prev = result;
- if (result == start_mem)
- break; // hit one of our sentinels
- if (result->is_Mem()) {
- const Type *at = phase->type(result->in(MemNode::Address));
- if (at == Type::TOP)
- break; // Dead
- assert (at->isa_ptr() != NULL, "pointer type required.");
- int idx = C->get_alias_index(at->is_ptr());
- if (idx == alias_idx)
- break; // Found
- if (!is_instance && (at->isa_oopptr() == NULL ||
- !at->is_oopptr()->is_known_instance())) {
- break; // Do not skip store to general memory slice.
- }
- result = result->in(MemNode::Memory);
- }
- if (!is_instance)
- continue; // don't search further for non-instance types
- // skip over a call which does not affect this memory slice
- if (result->is_Proj() && result->as_Proj()->_con == TypeFunc::Memory) {
- Node *proj_in = result->in(0);
- if (proj_in->is_Allocate() && proj_in->_idx == (uint)toop->instance_id()) {
- break; // hit one of our sentinels
- } else if (proj_in->is_Call()) {
- CallNode *call = proj_in->as_Call();
- if (!call->may_modify(toop, phase)) {
- result = call->in(TypeFunc::Memory);
+void ConnectionGraph::process_call_arguments(CallNode *call) {
+ bool is_arraycopy = false;
+ switch (call->Opcode()) {
+#ifdef ASSERT
+ case Op_Allocate:
+ case Op_AllocateArray:
+ case Op_Lock:
+ case Op_Unlock:
+ assert(false, "should be done already");
+ break;
+#endif
+ case Op_CallLeafNoFP:
+ is_arraycopy = (call->as_CallLeaf()->_name != NULL &&
+ strstr(call->as_CallLeaf()->_name, "arraycopy") != 0);
+ // fall through
+ case Op_CallLeaf: {
+ // Stub calls, objects do not escape but they are not scale replaceable.
+ // Adjust escape state for outgoing arguments.
+ const TypeTuple * d = call->tf()->domain();
+ bool src_has_oops = false;
+ for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
+ const Type* at = d->field_at(i);
+ Node *arg = call->in(i);
+ const Type *aat = _igvn->type(arg);
+ if (arg->is_top() || !at->isa_ptr() || !aat->isa_ptr())
+ continue;
+ if (arg->is_AddP()) {
+ //
+ // The inline_native_clone() case when the arraycopy stub is called
+ // after the allocation before Initialize and CheckCastPP nodes.
+ // Or normal arraycopy for object arrays case.
+ //
+ // Set AddP's base (Allocate) as not scalar replaceable since
+ // pointer to the base (with offset) is passed as argument.
+ //
+ arg = get_addp_base(arg);
}
- } else if (proj_in->is_Initialize()) {
- AllocateNode* alloc = proj_in->as_Initialize()->allocation();
- // Stop if this is the initialization for the object instance which
- // which contains this memory slice, otherwise skip over it.
- if (alloc == NULL || alloc->_idx != (uint)toop->instance_id()) {
- result = proj_in->in(TypeFunc::Memory);
+ PointsToNode* arg_ptn = ptnode_adr(arg->_idx);
+ assert(arg_ptn != NULL, "should be registered");
+ PointsToNode::EscapeState arg_esc = arg_ptn->escape_state();
+ if (is_arraycopy || arg_esc < PointsToNode::ArgEscape) {
+ assert(aat == Type::TOP || aat == TypePtr::NULL_PTR ||
+ aat->isa_ptr() != NULL, "expecting an Ptr");
+ bool arg_has_oops = aat->isa_oopptr() &&
+ (aat->isa_oopptr()->klass() == NULL || aat->isa_instptr() ||
+ (aat->isa_aryptr() && aat->isa_aryptr()->klass()->is_obj_array_klass()));
+ if (i == TypeFunc::Parms) {
+ src_has_oops = arg_has_oops;
+ }
+ //
+ // src or dst could be j.l.Object when other is basic type array:
+ //
+ // arraycopy(char[],0,Object*,0,size);
+ // arraycopy(Object*,0,char[],0,size);
+ //
+ // Don't add edges in such cases.
+ //
+ bool arg_is_arraycopy_dest = src_has_oops && is_arraycopy &&
+ arg_has_oops && (i > TypeFunc::Parms);
+#ifdef ASSERT
+ if (!(is_arraycopy ||
+ call->as_CallLeaf()->_name != NULL &&
+ (strcmp(call->as_CallLeaf()->_name, "g1_wb_pre") == 0 ||
+ strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 ))
+ ) {
+ call->dump();
+ assert(false, "EA: unexpected CallLeaf");
+ }
+#endif
+ // Always process arraycopy's destination object since
+ // we need to add all possible edges to references in
+ // source object.
+ if (arg_esc >= PointsToNode::ArgEscape &&
+ !arg_is_arraycopy_dest) {
+ continue;
+ }
+ set_escape_state(arg_ptn, PointsToNode::ArgEscape);
+ if (arg_is_arraycopy_dest) {
+ Node* src = call->in(TypeFunc::Parms);
+ if (src->is_AddP()) {
+ src = get_addp_base(src);
+ }
+ PointsToNode* src_ptn = ptnode_adr(src->_idx);
+ assert(src_ptn != NULL, "should be registered");
+ if (arg_ptn != src_ptn) {
+ // Special arraycopy edge:
+ // A destination object's field can't have the source object
+ // as base since objects escape states are not related.
+ // Only escape state of destination object's fields affects
+ // escape state of fields in source object.
+ add_arraycopy(call, PointsToNode::ArgEscape, src_ptn, arg_ptn);
+ }
+ }
}
- } else if (proj_in->is_MemBar()) {
- result = proj_in->in(TypeFunc::Memory);
}
- } else if (result->is_MergeMem()) {
- MergeMemNode *mmem = result->as_MergeMem();
- result = step_through_mergemem(mmem, alias_idx, toop);
- if (result == mmem->base_memory()) {
- // Didn't find instance memory, search through general slice recursively.
- result = mmem->memory_at(C->get_general_index(alias_idx));
- result = find_inst_mem(result, alias_idx, orig_phis, phase);
- if (C->failing()) {
- return NULL;
+ break;
+ }
+ case Op_CallStaticJava: {
+ // For a static call, we know exactly what method is being called.
+ // Use bytecode estimator to record the call's escape affects
+#ifdef ASSERT
+ const char* name = call->as_CallStaticJava()->_name;
+ assert((name == NULL || strcmp(name, "uncommon_trap") != 0), "normal calls only");
+#endif
+ ciMethod* meth = call->as_CallJava()->method();
+ BCEscapeAnalyzer* call_analyzer = (meth !=NULL) ? meth->get_bcea() : NULL;
+ // fall-through if not a Java method or no analyzer information
+ if (call_analyzer != NULL) {
+ PointsToNode* call_ptn = ptnode_adr(call->_idx);
+ const TypeTuple* d = call->tf()->domain();
+ for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
+ const Type* at = d->field_at(i);
+ int k = i - TypeFunc::Parms;
+ Node* arg = call->in(i);
+ PointsToNode* arg_ptn = ptnode_adr(arg->_idx);
+ if (at->isa_ptr() != NULL &&
+ call_analyzer->is_arg_returned(k)) {
+ // The call returns arguments.
+ if (call_ptn != NULL) { // Is call's result used?
+ assert(call_ptn->is_LocalVar(), "node should be registered");
+ assert(arg_ptn != NULL, "node should be registered");
+ add_edge(call_ptn, arg_ptn);
+ }
+ }
+ if (at->isa_oopptr() != NULL &&
+ arg_ptn->escape_state() < PointsToNode::GlobalEscape) {
+ if (!call_analyzer->is_arg_stack(k)) {
+ // The argument global escapes
+ set_escape_state(arg_ptn, PointsToNode::GlobalEscape);
+ } else {
+ set_escape_state(arg_ptn, PointsToNode::ArgEscape);
+ if (!call_analyzer->is_arg_local(k)) {
+ // The argument itself doesn't escape, but any fields might
+ set_fields_escape_state(arg_ptn, PointsToNode::GlobalEscape);
+ }
+ }
+ }
+ }
+ if (call_ptn != NULL && call_ptn->is_LocalVar()) {
+ // The call returns arguments.
+ assert(call_ptn->edge_count() > 0, "sanity");
+ if (!call_analyzer->is_return_local()) {
+ // Returns also unknown object.
+ add_edge(call_ptn, phantom_obj);
+ }
}
- mmem->set_memory_at(alias_idx, result);
- }
- } else if (result->is_Phi() &&
- C->get_alias_index(result->as_Phi()->adr_type()) != alias_idx) {
- Node *un = result->as_Phi()->unique_input(phase);
- if (un != NULL) {
- orig_phis.append_if_missing(result->as_Phi());
- result = un;
- } else {
- break;
- }
- } else if (result->is_ClearArray()) {
- if (!ClearArrayNode::step_through(&result, (uint)toop->instance_id(), phase)) {
- // Can not bypass initialization of the instance
- // we are looking for.
- break;
- }
- // Otherwise skip it (the call updated 'result' value).
- } else if (result->Opcode() == Op_SCMemProj) {
- assert(result->in(0)->is_LoadStore(), "sanity");
- const Type *at = phase->type(result->in(0)->in(MemNode::Address));
- if (at != Type::TOP) {
- assert (at->isa_ptr() != NULL, "pointer type required.");
- int idx = C->get_alias_index(at->is_ptr());
- assert(idx != alias_idx, "Object is not scalar replaceable if a LoadStore node access its field");
break;
}
- result = result->in(0)->in(MemNode::Memory);
}
- }
- if (result->is_Phi()) {
- PhiNode *mphi = result->as_Phi();
- assert(mphi->bottom_type() == Type::MEMORY, "memory phi required");
- const TypePtr *t = mphi->adr_type();
- if (!is_instance) {
- // Push all non-instance Phis on the orig_phis worklist to update inputs
- // during Phase 4 if needed.
- orig_phis.append_if_missing(mphi);
- } else if (C->get_alias_index(t) != alias_idx) {
- // Create a new Phi with the specified alias index type.
- result = split_memory_phi(mphi, alias_idx, orig_phis, phase);
+ default: {
+ // Fall-through here if not a Java method or no analyzer information
+ // or some other type of call, assume the worst case: all arguments
+ // globally escape.
+ const TypeTuple* d = call->tf()->domain();
+ for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
+ const Type* at = d->field_at(i);
+ if (at->isa_oopptr() != NULL) {
+ Node* arg = call->in(i);
+ if (arg->is_AddP()) {
+ arg = get_addp_base(arg);
+ }
+ assert(ptnode_adr(arg->_idx) != NULL, "should be defined already");
+ set_escape_state(ptnode_adr(arg->_idx), PointsToNode::GlobalEscape);
+ }
+ }
}
}
- // the result is either MemNode, PhiNode, InitializeNode.
- return result;
}
-//
-// Convert the types of unescaped object to instance types where possible,
-// propagate the new type information through the graph, and update memory
-// edges and MergeMem inputs to reflect the new type.
-//
-// We start with allocations (and calls which may be allocations) on alloc_worklist.
-// The processing is done in 4 phases:
-//
-// Phase 1: Process possible allocations from alloc_worklist. Create instance
-// types for the CheckCastPP for allocations where possible.
-// Propagate the the new types through users as follows:
-// casts and Phi: push users on alloc_worklist
-// AddP: cast Base and Address inputs to the instance type
-// push any AddP users on alloc_worklist and push any memnode
-// users onto memnode_worklist.
-// Phase 2: Process MemNode's from memnode_worklist. compute new address type and
-// search the Memory chain for a store with the appropriate type
-// address type. If a Phi is found, create a new version with
-// the appropriate memory slices from each of the Phi inputs.
-// For stores, process the users as follows:
-// MemNode: push on memnode_worklist
-// MergeMem: push on mergemem_worklist
-// Phase 3: Process MergeMem nodes from mergemem_worklist. Walk each memory slice
-// moving the first node encountered of each instance type to the
-// the input corresponding to its alias index.
-// appropriate memory slice.
-// Phase 4: Update the inputs of non-instance memory Phis and the Memory input of memnodes.
-//
-// In the following example, the CheckCastPP nodes are the cast of allocation
-// results and the allocation of node 29 is unescaped and eligible to be an
-// instance type.
-//
-// We start with:
-//
-// 7 Parm #memory
-// 10 ConI "12"
-// 19 CheckCastPP "Foo"
-// 20 AddP _ 19 19 10 Foo+12 alias_index=4
-// 29 CheckCastPP "Foo"
-// 30 AddP _ 29 29 10 Foo+12 alias_index=4
-//
-// 40 StoreP 25 7 20 ... alias_index=4
-// 50 StoreP 35 40 30 ... alias_index=4
-// 60 StoreP 45 50 20 ... alias_index=4
-// 70 LoadP _ 60 30 ... alias_index=4
-// 80 Phi 75 50 60 Memory alias_index=4
-// 90 LoadP _ 80 30 ... alias_index=4
-// 100 LoadP _ 80 20 ... alias_index=4
-//
-//
-// Phase 1 creates an instance type for node 29 assigning it an instance id of 24
-// and creating a new alias index for node 30. This gives:
-//
-// 7 Parm #memory
-// 10 ConI "12"
-// 19 CheckCastPP "Foo"
-// 20 AddP _ 19 19 10 Foo+12 alias_index=4
-// 29 CheckCastPP "Foo" iid=24
-// 30 AddP _ 29 29 10 Foo+12 alias_index=6 iid=24
-//
-// 40 StoreP 25 7 20 ... alias_index=4
-// 50 StoreP 35 40 30 ... alias_index=6
-// 60 StoreP 45 50 20 ... alias_index=4
-// 70 LoadP _ 60 30 ... alias_index=6
-// 80 Phi 75 50 60 Memory alias_index=4
-// 90 LoadP _ 80 30 ... alias_index=6
-// 100 LoadP _ 80 20 ... alias_index=4
-//
-// In phase 2, new memory inputs are computed for the loads and stores,
-// And a new version of the phi is created. In phase 4, the inputs to
-// node 80 are updated and then the memory nodes are updated with the
-// values computed in phase 2. This results in:
-//
-// 7 Parm #memory
-// 10 ConI "12"
-// 19 CheckCastPP "Foo"
-// 20 AddP _ 19 19 10 Foo+12 alias_index=4
-// 29 CheckCastPP "Foo" iid=24
-// 30 AddP _ 29 29 10 Foo+12 alias_index=6 iid=24
-//
-// 40 StoreP 25 7 20 ... alias_index=4
-// 50 StoreP 35 7 30 ... alias_index=6
-// 60 StoreP 45 40 20 ... alias_index=4
-// 70 LoadP _ 50 30 ... alias_index=6
-// 80 Phi 75 40 60 Memory alias_index=4
-// 120 Phi 75 50 50 Memory alias_index=6
-// 90 LoadP _ 120 30 ... alias_index=6
-// 100 LoadP _ 80 20 ... alias_index=4
-//
-void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist) {
- GrowableArray<Node *> memnode_worklist;
- GrowableArray<PhiNode *> orig_phis;
-
- PhaseIterGVN *igvn = _igvn;
- uint new_index_start = (uint) _compile->num_alias_types();
- Arena* arena = Thread::current()->resource_area();
- VectorSet visited(arena);
-
- // Phase 1: Process possible allocations from alloc_worklist.
- // Create instance types for the CheckCastPP for allocations where possible.
- //
- // (Note: don't forget to change the order of the second AddP node on
- // the alloc_worklist if the order of the worklist processing is changed,
- // see the comment in find_second_addp().)
- //
- while (alloc_worklist.length() != 0) {
- Node *n = alloc_worklist.pop();
- uint ni = n->_idx;
- const TypeOopPtr* tinst = NULL;
- if (n->is_Call()) {
- CallNode *alloc = n->as_Call();
- // copy escape information to call node
- PointsToNode* ptn = ptnode_adr(alloc->_idx);
- PointsToNode::EscapeState es = escape_state(alloc);
- // We have an allocation or call which returns a Java object,
- // see if it is unescaped.
- if (es != PointsToNode::NoEscape || !ptn->scalar_replaceable())
- continue;
+// Finish Graph construction.
+bool ConnectionGraph::complete_connection_graph(
+ GrowableArray<PointsToNode*>& ptnodes_worklist,
+ GrowableArray<JavaObjectNode*>& non_escaped_worklist,
+ GrowableArray<JavaObjectNode*>& java_objects_worklist,
+ GrowableArray<FieldNode*>& oop_fields_worklist) {
+ // Normally only 1-3 passes needed to build Connection Graph depending
+ // on graph complexity. Observed 8 passes in jvm2008 compiler.compiler.
+ // Set limit to 20 to catch situation when something did go wrong and
+ // bailout Escape Analysis.
+ // Also limit build time to 30 sec (60 in debug VM).
+#define CG_BUILD_ITER_LIMIT 20
+#ifdef ASSERT
+#define CG_BUILD_TIME_LIMIT 60.0
+#else
+#define CG_BUILD_TIME_LIMIT 30.0
+#endif
- // Find CheckCastPP for the allocate or for the return value of a call
- n = alloc->result_cast();
- if (n == NULL) { // No uses except Initialize node
- if (alloc->is_Allocate()) {
- // Set the scalar_replaceable flag for allocation
- // so it could be eliminated if it has no uses.
- alloc->as_Allocate()->_is_scalar_replaceable = true;
+ // Propagate GlobalEscape and ArgEscape escape states and check that
+ // we still have non-escaping objects. The method pushs on _worklist
+ // Field nodes which reference phantom_object.
+ if (!find_non_escaped_objects(ptnodes_worklist, non_escaped_worklist)) {
+ return false; // Nothing to do.
+ }
+ // Now propagate references to all JavaObject nodes.
+ int java_objects_length = java_objects_worklist.length();
+ elapsedTimer time;
+ int new_edges = 1;
+ int iterations = 0;
+ do {
+ while ((new_edges > 0) &&
+ (iterations++ < CG_BUILD_ITER_LIMIT) &&
+ (time.seconds() < CG_BUILD_TIME_LIMIT)) {
+ time.start();
+ new_edges = 0;
+ // Propagate references to phantom_object for nodes pushed on _worklist
+ // by find_non_escaped_objects() and find_field_value().
+ new_edges += add_java_object_edges(phantom_obj, false);
+ for (int next = 0; next < java_objects_length; ++next) {
+ JavaObjectNode* ptn = java_objects_worklist.at(next);
+ new_edges += add_java_object_edges(ptn, true);
+ }
+ if (new_edges > 0) {
+ // Update escape states on each iteration if graph was updated.
+ if (!find_non_escaped_objects(ptnodes_worklist, non_escaped_worklist)) {
+ return false; // Nothing to do.
}
- continue;
}
- if (!n->is_CheckCastPP()) { // not unique CheckCastPP.
- assert(!alloc->is_Allocate(), "allocation should have unique type");
- continue;
+ time.stop();
+ }
+ if ((iterations < CG_BUILD_ITER_LIMIT) &&
+ (time.seconds() < CG_BUILD_TIME_LIMIT)) {
+ time.start();
+ // Find fields which have unknown value.
+ int fields_length = oop_fields_worklist.length();
+ for (int next = 0; next < fields_length; next++) {
+ FieldNode* field = oop_fields_worklist.at(next);
+ if (field->edge_count() == 0) {
+ new_edges += find_field_value(field);
+ // This code may added new edges to phantom_object.
+ // Need an other cycle to propagate references to phantom_object.
+ }
}
+ time.stop();
+ } else {
+ new_edges = 0; // Bailout
+ }
+ } while (new_edges > 0);
- // The inline code for Object.clone() casts the allocation result to
- // java.lang.Object and then to the actual type of the allocated
- // object. Detect this case and use the second cast.
- // Also detect j.l.reflect.Array.newInstance(jobject, jint) case when
- // the allocation result is cast to java.lang.Object and then
- // to the actual Array type.
- if (alloc->is_Allocate() && n->as_Type()->type() == TypeInstPtr::NOTNULL
- && (alloc->is_AllocateArray() ||
- igvn->type(alloc->in(AllocateNode::KlassNode)) != TypeKlassPtr::OBJECT)) {
- Node *cast2 = NULL;
- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- Node *use = n->fast_out(i);
- if (use->is_CheckCastPP()) {
- cast2 = use;
- break;
- }
+ // Bailout if passed limits.
+ if ((iterations >= CG_BUILD_ITER_LIMIT) ||
+ (time.seconds() >= CG_BUILD_TIME_LIMIT)) {
+ Compile* C = _compile;
+ if (C->log() != NULL) {
+ C->log()->begin_elem("connectionGraph_bailout reason='reached ");
+ C->log()->text("%s", (iterations >= CG_BUILD_ITER_LIMIT) ? "iterations" : "time");
+ C->log()->end_elem(" limit'");
+ }
+ assert(false, err_msg("infinite EA connection graph build (%f sec, %d iterations) with %d nodes and worklist size %d",
+ time.seconds(), iterations, nodes_size(), ptnodes_worklist.length()));
+ // Possible infinite build_connection_graph loop,
+ // bailout (no changes to ideal graph were made).
+ return false;
+ }
+#ifdef ASSERT
+ if (Verbose && PrintEscapeAnalysis) {
+ tty->print_cr("EA: %d iterations to build connection graph with %d nodes and worklist size %d",
+ iterations, nodes_size(), ptnodes_worklist.length());
+ }
+#endif
+
+#undef CG_BUILD_ITER_LIMIT
+#undef CG_BUILD_TIME_LIMIT
+
+ // Find fields initialized by NULL for non-escaping Allocations.
+ int non_escaped_length = non_escaped_worklist.length();
+ for (int next = 0; next < non_escaped_length; next++) {
+ JavaObjectNode* ptn = non_escaped_worklist.at(next);
+ PointsToNode::EscapeState es = ptn->escape_state();
+ assert(es <= PointsToNode::ArgEscape, "sanity");
+ if (es == PointsToNode::NoEscape) {
+ if (find_init_values(ptn, null_obj, _igvn) > 0) {
+ // Adding references to NULL object does not change escape states
+ // since it does not escape. Also no fields are added to NULL object.
+ add_java_object_edges(null_obj, false);
+ }
+ }
+ Node* n = ptn->ideal_node();
+ if (n->is_Allocate()) {
+ // The object allocated by this Allocate node will never be
+ // seen by an other thread. Mark it so that when it is
+ // expanded no MemBarStoreStore is added.
+ InitializeNode* ini = n->as_Allocate()->initialization();
+ if (ini != NULL)
+ ini->set_does_not_escape();
+ }
+ }
+ return true; // Finished graph construction.
+}
+
+// Propagate GlobalEscape and ArgEscape escape states to all nodes
+// and check that we still have non-escaping java objects.
+bool ConnectionGraph::find_non_escaped_objects(GrowableArray<PointsToNode*>& ptnodes_worklist,
+ GrowableArray<JavaObjectNode*>& non_escaped_worklist) {
+ GrowableArray<PointsToNode*> escape_worklist;
+ // First, put all nodes with GlobalEscape and ArgEscape states on worklist.
+ int ptnodes_length = ptnodes_worklist.length();
+ for (int next = 0; next < ptnodes_length; ++next) {
+ PointsToNode* ptn = ptnodes_worklist.at(next);
+ if (ptn->escape_state() >= PointsToNode::ArgEscape ||
+ ptn->fields_escape_state() >= PointsToNode::ArgEscape) {
+ escape_worklist.push(ptn);
+ }
+ }
+ // Set escape states to referenced nodes (edges list).
+ while (escape_worklist.length() > 0) {
+ PointsToNode* ptn = escape_worklist.pop();
+ PointsToNode::EscapeState es = ptn->escape_state();
+ PointsToNode::EscapeState field_es = ptn->fields_escape_state();
+ if (ptn->is_Field() && ptn->as_Field()->is_oop() &&
+ es >= PointsToNode::ArgEscape) {
+ // GlobalEscape or ArgEscape state of field means it has unknown value.
+ if (add_edge(ptn, phantom_obj)) {
+ // New edge was added
+ add_field_uses_to_worklist(ptn->as_Field());
+ }
+ }
+ for (EdgeIterator i(ptn); i.has_next(); i.next()) {
+ PointsToNode* e = i.get();
+ if (e->is_Arraycopy()) {
+ assert(ptn->arraycopy_dst(), "sanity");
+ // Propagate only fields escape state through arraycopy edge.
+ if (e->fields_escape_state() < field_es) {
+ set_fields_escape_state(e, field_es);
+ escape_worklist.push(e);
}
- if (cast2 != NULL) {
- n = cast2;
- } else {
- // Non-scalar replaceable if the allocation type is unknown statically
- // (reflection allocation), the object can't be restored during
- // deoptimization without precise type.
- continue;
+ } else if (es >= field_es) {
+ // fields_escape_state is also set to 'es' if it is less than 'es'.
+ if (e->escape_state() < es) {
+ set_escape_state(e, es);
+ escape_worklist.push(e);
+ }
+ } else {
+ // Propagate field escape state.
+ bool es_changed = false;
+ if (e->fields_escape_state() < field_es) {
+ set_fields_escape_state(e, field_es);
+ es_changed = true;
+ }
+ if ((e->escape_state() < field_es) &&
+ e->is_Field() && ptn->is_JavaObject() &&
+ e->as_Field()->is_oop()) {
+ // Change escape state of referenced fileds.
+ set_escape_state(e, field_es);
+ es_changed = true;;
+ } else if (e->escape_state() < es) {
+ set_escape_state(e, es);
+ es_changed = true;;
+ }
+ if (es_changed) {
+ escape_worklist.push(e);
}
}
- if (alloc->is_Allocate()) {
- // Set the scalar_replaceable flag for allocation
- // so it could be eliminated.
- alloc->as_Allocate()->_is_scalar_replaceable = true;
- }
- set_escape_state(n->_idx, es); // CheckCastPP escape state
- // in order for an object to be scalar-replaceable, it must be:
- // - a direct allocation (not a call returning an object)
- // - non-escaping
- // - eligible to be a unique type
- // - not determined to be ineligible by escape analysis
- assert(ptnode_adr(alloc->_idx)->_node != NULL &&
- ptnode_adr(n->_idx)->_node != NULL, "should be registered");
- set_map(alloc->_idx, n);
- set_map(n->_idx, alloc);
- const TypeOopPtr *t = igvn->type(n)->isa_oopptr();
- if (t == NULL)
- continue; // not a TypeOopPtr
- tinst = t->cast_to_exactness(true)->is_oopptr()->cast_to_instance_id(ni);
- igvn->hash_delete(n);
- igvn->set_type(n, tinst);
- n->raise_bottom_type(tinst);
- igvn->hash_insert(n);
- record_for_optimizer(n);
- if (alloc->is_Allocate() && (t->isa_instptr() || t->isa_aryptr())) {
+ }
+ }
+ // Remove escaped objects from non_escaped list.
+ for (int next = non_escaped_worklist.length()-1; next >= 0 ; --next) {
+ JavaObjectNode* ptn = non_escaped_worklist.at(next);
+ if (ptn->escape_state() >= PointsToNode::GlobalEscape) {
+ non_escaped_worklist.delete_at(next);
+ }
+ if (ptn->escape_state() == PointsToNode::NoEscape) {
+ // Find fields in non-escaped allocations which have unknown value.
+ find_init_values(ptn, phantom_obj, NULL);
+ }
+ }
+ return (non_escaped_worklist.length() > 0);
+}
- // First, put on the worklist all Field edges from Connection Graph
- // which is more accurate then putting immediate users from Ideal Graph.
- for (uint e = 0; e < ptn->edge_count(); e++) {
- Node *use = ptnode_adr(ptn->edge_target(e))->_node;
- assert(ptn->edge_type(e) == PointsToNode::FieldEdge && use->is_AddP(),
- "only AddP nodes are Field edges in CG");
- if (use->outcnt() > 0) { // Don't process dead nodes
- Node* addp2 = find_second_addp(use, use->in(AddPNode::Base));
- if (addp2 != NULL) {
- assert(alloc->is_AllocateArray(),"array allocation was expected");
- alloc_worklist.append_if_missing(addp2);
+// Add all references to JavaObject node by walking over all uses.
+int ConnectionGraph::add_java_object_edges(JavaObjectNode* jobj, bool populate_worklist) {
+ int new_edges = 0;
+ if (populate_worklist) {
+ // Populate _worklist by uses of jobj's uses.
+ for (UseIterator i(jobj); i.has_next(); i.next()) {
+ PointsToNode* use = i.get();
+ if (use->is_Arraycopy())
+ continue;
+ add_uses_to_worklist(use);
+ if (use->is_Field() && use->as_Field()->is_oop()) {
+ // Put on worklist all field's uses (loads) and
+ // related field nodes (same base and offset).
+ add_field_uses_to_worklist(use->as_Field());
+ }
+ }
+ }
+ while(_worklist.length() > 0) {
+ PointsToNode* use = _worklist.pop();
+ if (PointsToNode::is_base_use(use)) {
+ // Add reference from jobj to field and from field to jobj (field's base).
+ use = PointsToNode::get_use_node(use)->as_Field();
+ if (add_base(use->as_Field(), jobj)) {
+ new_edges++;
+ }
+ continue;
+ }
+ assert(!use->is_JavaObject(), "sanity");
+ if (use->is_Arraycopy()) {
+ if (jobj == null_obj) // NULL object does not have field edges
+ continue;
+ // Added edge from Arraycopy node to arraycopy's source java object
+ if (add_edge(use, jobj)) {
+ jobj->set_arraycopy_src();
+ new_edges++;
+ }
+ // and stop here.
+ continue;
+ }
+ if (!add_edge(use, jobj))
+ continue; // No new edge added, there was such edge already.
+ new_edges++;
+ if (use->is_LocalVar()) {
+ add_uses_to_worklist(use);
+ if (use->arraycopy_dst()) {
+ for (EdgeIterator i(use); i.has_next(); i.next()) {
+ PointsToNode* e = i.get();
+ if (e->is_Arraycopy()) {
+ if (jobj == null_obj) // NULL object does not have field edges
+ continue;
+ // Add edge from arraycopy's destination java object to Arraycopy node.
+ if (add_edge(jobj, e)) {
+ new_edges++;
+ jobj->set_arraycopy_dst();
}
- alloc_worklist.append_if_missing(use);
}
}
+ }
+ } else {
+ // Added new edge to stored in field values.
+ // Put on worklist all field's uses (loads) and
+ // related field nodes (same base and offset).
+ add_field_uses_to_worklist(use->as_Field());
+ }
+ }
+ return new_edges;
+}
- // An allocation may have an Initialize which has raw stores. Scan
- // the users of the raw allocation result and push AddP users
- // on alloc_worklist.
- Node *raw_result = alloc->proj_out(TypeFunc::Parms);
- assert (raw_result != NULL, "must have an allocation result");
- for (DUIterator_Fast imax, i = raw_result->fast_outs(imax); i < imax; i++) {
- Node *use = raw_result->fast_out(i);
- if (use->is_AddP() && use->outcnt() > 0) { // Don't process dead nodes
- Node* addp2 = find_second_addp(use, raw_result);
- if (addp2 != NULL) {
- assert(alloc->is_AllocateArray(),"array allocation was expected");
- alloc_worklist.append_if_missing(addp2);
+// Put on worklist all related field nodes.
+void ConnectionGraph::add_field_uses_to_worklist(FieldNode* field) {
+ assert(field->is_oop(), "sanity");
+ int offset = field->offset();
+ add_uses_to_worklist(field);
+ // Loop over all bases of this field and push on worklist Field nodes
+ // with the same offset and base (since they may reference the same field).
+ for (BaseIterator i(field); i.has_next(); i.next()) {
+ PointsToNode* base = i.get();
+ add_fields_to_worklist(field, base);
+ // Check if the base was source object of arraycopy and go over arraycopy's
+ // destination objects since values stored to a field of source object are
+ // accessable by uses (loads) of fields of destination objects.
+ if (base->arraycopy_src()) {
+ for (UseIterator j(base); j.has_next(); j.next()) {
+ PointsToNode* arycp = j.get();
+ if (arycp->is_Arraycopy()) {
+ for (UseIterator k(arycp); k.has_next(); k.next()) {
+ PointsToNode* abase = k.get();
+ if (abase->arraycopy_dst() && abase != base) {
+ // Look for the same arracopy reference.
+ add_fields_to_worklist(field, abase);
}
- alloc_worklist.append_if_missing(use);
- } else if (use->is_MemBar()) {
- memnode_worklist.append_if_missing(use);
}
}
}
- } else if (n->is_AddP()) {
- VectorSet* ptset = PointsTo(get_addp_base(n));
- assert(ptset->Size() == 1, "AddP address is unique");
- uint elem = ptset->getelem(); // Allocation node's index
- if (elem == _phantom_object) {
- assert(false, "escaped allocation");
- continue; // Assume the value was set outside this method.
- }
- Node *base = get_map(elem); // CheckCastPP node
- if (!split_AddP(n, base, igvn)) continue; // wrong type from dead path
- tinst = igvn->type(base)->isa_oopptr();
- } else if (n->is_Phi() ||
- n->is_CheckCastPP() ||
- n->is_EncodeP() ||
- n->is_DecodeN() ||
- (n->is_ConstraintCast() && n->Opcode() == Op_CastPP)) {
- if (visited.test_set(n->_idx)) {
- assert(n->is_Phi(), "loops only through Phi's");
- continue; // already processed
+ }
+ }
+}
+
+// Put on worklist all related field nodes.
+void ConnectionGraph::add_fields_to_worklist(FieldNode* field, PointsToNode* base) {
+ int offset = field->offset();
+ if (base->is_LocalVar()) {
+ for (UseIterator j(base); j.has_next(); j.next()) {
+ PointsToNode* f = j.get();
+ if (PointsToNode::is_base_use(f)) { // Field
+ f = PointsToNode::get_use_node(f);
+ if (f == field || !f->as_Field()->is_oop())
+ continue;
+ int offs = f->as_Field()->offset();
+ if (offs == offset || offset == Type::OffsetBot || offs == Type::OffsetBot) {
+ add_to_worklist(f);
+ }
}
- VectorSet* ptset = PointsTo(n);
- if (ptset->Size() == 1) {
- uint elem = ptset->getelem(); // Allocation node's index
- if (elem == _phantom_object) {
- assert(false, "escaped allocation");
- continue; // Assume the value was set outside this method.
+ }
+ } else {
+ assert(base->is_JavaObject(), "sanity");
+ if (// Skip phantom_object since it is only used to indicate that
+ // this field's content globally escapes.
+ (base != phantom_obj) &&
+ // NULL object node does not have fields.
+ (base != null_obj)) {
+ for (EdgeIterator i(base); i.has_next(); i.next()) {
+ PointsToNode* f = i.get();
+ // Skip arraycopy edge since store to destination object field
+ // does not update value in source object field.
+ if (f->is_Arraycopy()) {
+ assert(base->arraycopy_dst(), "sanity");
+ continue;
}
- Node *val = get_map(elem); // CheckCastPP node
- TypeNode *tn = n->as_Type();
- tinst = igvn->type(val)->isa_oopptr();
- assert(tinst != NULL && tinst->is_known_instance() &&
- (uint)tinst->instance_id() == elem , "instance type expected.");
-
- const Type *tn_type = igvn->type(tn);
- const TypeOopPtr *tn_t;
- if (tn_type->isa_narrowoop()) {
- tn_t = tn_type->make_ptr()->isa_oopptr();
- } else {
- tn_t = tn_type->isa_oopptr();
+ if (f == field || !f->as_Field()->is_oop())
+ continue;
+ int offs = f->as_Field()->offset();
+ if (offs == offset || offset == Type::OffsetBot || offs == Type::OffsetBot) {
+ add_to_worklist(f);
}
+ }
+ }
+ }
+}
- if (tn_t != NULL && tinst->klass()->is_subtype_of(tn_t->klass())) {
- if (tn_type->isa_narrowoop()) {
- tn_type = tinst->make_narrowoop();
- } else {
- tn_type = tinst;
- }
- igvn->hash_delete(tn);
- igvn->set_type(tn, tn_type);
- tn->set_type(tn_type);
- igvn->hash_insert(tn);
- record_for_optimizer(n);
- } else {
- assert(tn_type == TypePtr::NULL_PTR ||
- tn_t != NULL && !tinst->klass()->is_subtype_of(tn_t->klass()),
- "unexpected type");
- continue; // Skip dead path with different type
+// Find fields which have unknown value.
+int ConnectionGraph::find_field_value(FieldNode* field) {
+ // Escaped fields should have init value already.
+ assert(field->escape_state() == PointsToNode::NoEscape, "sanity");
+ int new_edges = 0;
+ for (BaseIterator i(field); i.has_next(); i.next()) {
+ PointsToNode* base = i.get();
+ if (base->is_JavaObject()) {
+ // Skip Allocate's fields which will be processed later.
+ if (base->ideal_node()->is_Allocate())
+ return 0;
+ assert(base == null_obj, "only NULL ptr base expected here");
+ }
+ }
+ if (add_edge(field, phantom_obj)) {
+ // New edge was added
+ new_edges++;
+ add_field_uses_to_worklist(field);
+ }
+ return new_edges;
+}
+
+// Find fields initializing values for allocations.
+int ConnectionGraph::find_init_values(JavaObjectNode* pta, PointsToNode* init_val, PhaseTransform* phase) {
+ assert(pta->escape_state() == PointsToNode::NoEscape, "Not escaped Allocate nodes only");
+ int new_edges = 0;
+ Node* alloc = pta->ideal_node();
+ if (init_val == phantom_obj) {
+ // Do nothing for Allocate nodes since its fields values are "known".
+ if (alloc->is_Allocate())
+ return 0;
+ assert(alloc->as_CallStaticJava(), "sanity");
+#ifdef ASSERT
+ if (alloc->as_CallStaticJava()->method() == NULL) {
+ const char* name = alloc->as_CallStaticJava()->_name;
+ assert(strncmp(name, "_multianewarray", 15) == 0, "sanity");
+ }
+#endif
+ // Non-escaped allocation returned from Java or runtime call have
+ // unknown values in fields.
+ for (EdgeIterator i(pta); i.has_next(); i.next()) {
+ PointsToNode* ptn = i.get();
+ if (ptn->is_Field() && ptn->as_Field()->is_oop()) {
+ if (add_edge(ptn, phantom_obj)) {
+ // New edge was added
+ new_edges++;
+ add_field_uses_to_worklist(ptn->as_Field());
}
}
- } else {
- debug_only(n->dump();)
- assert(false, "EA: unexpected node");
- continue;
}
- // push allocation's users on appropriate worklist
- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- Node *use = n->fast_out(i);
- if(use->is_Mem() && use->in(MemNode::Address) == n) {
- // Load/store to instance's field
- memnode_worklist.append_if_missing(use);
- } else if (use->is_MemBar()) {
- memnode_worklist.append_if_missing(use);
- } else if (use->is_AddP() && use->outcnt() > 0) { // No dead nodes
- Node* addp2 = find_second_addp(use, n);
- if (addp2 != NULL) {
- alloc_worklist.append_if_missing(addp2);
+ return new_edges;
+ }
+ assert(init_val == null_obj, "sanity");
+ // Do nothing for Call nodes since its fields values are unknown.
+ if (!alloc->is_Allocate())
+ return 0;
+
+ InitializeNode* ini = alloc->as_Allocate()->initialization();
+ Compile* C = _compile;
+ bool visited_bottom_offset = false;
+ GrowableArray<int> offsets_worklist;
+
+ // Check if an oop field's initializing value is recorded and add
+ // a corresponding NULL if field's value if it is not recorded.
+ // Connection Graph does not record a default initialization by NULL
+ // captured by Initialize node.
+ //
+ for (EdgeIterator i(pta); i.has_next(); i.next()) {
+ PointsToNode* ptn = i.get(); // Field (AddP)
+ if (!ptn->is_Field() || !ptn->as_Field()->is_oop())
+ continue; // Not oop field
+ int offset = ptn->as_Field()->offset();
+ if (offset == Type::OffsetBot) {
+ if (!visited_bottom_offset) {
+ // OffsetBot is used to reference array's element,
+ // always add reference to NULL to all Field nodes since we don't
+ // known which element is referenced.
+ if (add_edge(ptn, null_obj)) {
+ // New edge was added
+ new_edges++;
+ add_field_uses_to_worklist(ptn->as_Field());
+ visited_bottom_offset = true;
}
- alloc_worklist.append_if_missing(use);
- } else if (use->is_Phi() ||
- use->is_CheckCastPP() ||
- use->is_EncodeP() ||
- use->is_DecodeN() ||
- (use->is_ConstraintCast() && use->Opcode() == Op_CastPP)) {
- alloc_worklist.append_if_missing(use);
+ }
+ } else {
+ // Check only oop fields.
+ const Type* adr_type = ptn->ideal_node()->as_AddP()->bottom_type();
+ if (adr_type->isa_rawptr()) {
#ifdef ASSERT
- } else if (use->is_Mem()) {
- assert(use->in(MemNode::Address) != n, "EA: missing allocation reference path");
- } else if (use->is_MergeMem()) {
- assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist");
- } else if (use->is_SafePoint()) {
- // Look for MergeMem nodes for calls which reference unique allocation
- // (through CheckCastPP nodes) even for debug info.
- Node* m = use->in(TypeFunc::Memory);
- if (m->is_MergeMem()) {
- assert(_mergemem_worklist.contains(m->as_MergeMem()), "EA: missing MergeMem node in the worklist");
+ // Raw pointers are used for initializing stores so skip it
+ // since it should be recorded already
+ Node* base = get_addp_base(ptn->ideal_node());
+ assert(adr_type->isa_rawptr() && base->is_Proj() &&
+ (base->in(0) == alloc),"unexpected pointer type");
+#endif
+ continue;
+ }
+ if (!offsets_worklist.contains(offset)) {
+ offsets_worklist.append(offset);
+ Node* value = NULL;
+ if (ini != NULL) {
+ BasicType ft = UseCompressedOops ? T_NARROWOOP : T_OBJECT;
+ Node* store = ini->find_captured_store(offset, type2aelembytes(ft), phase);
+ if (store != NULL && store->is_Store()) {
+ value = store->in(MemNode::ValueIn);
+ } else {
+ // There could be initializing stores which follow allocation.
+ // For example, a volatile field store is not collected
+ // by Initialize node.
+ //
+ // Need to check for dependent loads to separate such stores from
+ // stores which follow loads. For now, add initial value NULL so
+ // that compare pointers optimization works correctly.
+ }
}
- } else {
- uint op = use->Opcode();
- if (!(op == Op_CmpP || op == Op_Conv2B ||
- op == Op_CastP2X || op == Op_StoreCM ||
- op == Op_FastLock || op == Op_AryEq || op == Op_StrComp ||
- op == Op_StrEquals || op == Op_StrIndexOf)) {
- n->dump();
- use->dump();
- assert(false, "EA: missing allocation reference path");
+ if (value == NULL) {
+ // A field's initializing value was not recorded. Add NULL.
+ if (add_edge(ptn, null_obj)) {
+ // New edge was added
+ new_edges++;
+ add_field_uses_to_worklist(ptn->as_Field());
+ }
}
-#endif
}
}
-
}
- // New alias types were created in split_AddP().
- uint new_index_end = (uint) _compile->num_alias_types();
+ return new_edges;
+}
- // Phase 2: Process MemNode's from memnode_worklist. compute new address type and
- // compute new values for Memory inputs (the Memory inputs are not
- // actually updated until phase 4.)
- if (memnode_worklist.length() == 0)
- return; // nothing to do
+// Adjust scalar_replaceable state after Connection Graph is built.
+void ConnectionGraph::adjust_scalar_replaceable_state(JavaObjectNode* jobj) {
+ // Search for non-escaping objects which are not scalar replaceable
+ // and mark them to propagate the state to referenced objects.
- while (memnode_worklist.length() != 0) {
- Node *n = memnode_worklist.pop();
- if (visited.test_set(n->_idx))
- continue;
- if (n->is_Phi() || n->is_ClearArray()) {
- // we don't need to do anything, but the users must be pushed
- } else if (n->is_MemBar()) { // Initialize, MemBar nodes
- // we don't need to do anything, but the users must be pushed
- n = n->as_MemBar()->proj_out(TypeFunc::Memory);
- if (n == NULL)
- continue;
- } else {
- assert(n->is_Mem(), "memory node required.");
- Node *addr = n->in(MemNode::Address);
- const Type *addr_t = igvn->type(addr);
- if (addr_t == Type::TOP)
- continue;
- assert (addr_t->isa_ptr() != NULL, "pointer type required.");
- int alias_idx = _compile->get_alias_index(addr_t->is_ptr());
- assert ((uint)alias_idx < new_index_end, "wrong alias index");
- Node *mem = find_inst_mem(n->in(MemNode::Memory), alias_idx, orig_phis, igvn);
- if (_compile->failing()) {
+ // 1. An object is not scalar replaceable if the field into which it is
+ // stored has unknown offset (stored into unknown element of an array).
+ //
+ for (UseIterator i(jobj); i.has_next(); i.next()) {
+ PointsToNode* use = i.get();
+ assert(!use->is_Arraycopy(), "sanity");
+ if (use->is_Field()) {
+ FieldNode* field = use->as_Field();
+ assert(field->is_oop() && field->scalar_replaceable() &&
+ field->fields_escape_state() == PointsToNode::NoEscape, "sanity");
+ if (field->offset() == Type::OffsetBot) {
+ jobj->set_scalar_replaceable(false);
return;
}
- if (mem != n->in(MemNode::Memory)) {
- // We delay the memory edge update since we need old one in
- // MergeMem code below when instances memory slices are separated.
- debug_only(Node* pn = ptnode_adr(n->_idx)->_node;)
- assert(pn == NULL || pn == n, "wrong node");
- set_map(n->_idx, mem);
- ptnode_adr(n->_idx)->_node = n;
- }
- if (n->is_Load()) {
- continue; // don't push users
- } else if (n->is_LoadStore()) {
- // get the memory projection
- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- Node *use = n->fast_out(i);
- if (use->Opcode() == Op_SCMemProj) {
- n = use;
- break;
- }
- }
- assert(n->Opcode() == Op_SCMemProj, "memory projection required");
+ }
+ assert(use->is_Field() || use->is_LocalVar(), "sanity");
+ // 2. An object is not scalar replaceable if it is merged with other objects.
+ for (EdgeIterator j(use); j.has_next(); j.next()) {
+ PointsToNode* ptn = j.get();
+ if (ptn->is_JavaObject() && ptn != jobj) {
+ // Mark all objects.
+ jobj->set_scalar_replaceable(false);
+ ptn->set_scalar_replaceable(false);
}
}
- // push user on appropriate worklist
+ if (!jobj->scalar_replaceable()) {
+ return;
+ }
+ }
+
+ for (EdgeIterator j(jobj); j.has_next(); j.next()) {
+ // Non-escaping object node should point only to field nodes.
+ FieldNode* field = j.get()->as_Field();
+ int offset = field->as_Field()->offset();
+
+ // 3. An object is not scalar replaceable if it has a field with unknown
+ // offset (array's element is accessed in loop).
+ if (offset == Type::OffsetBot) {
+ jobj->set_scalar_replaceable(false);
+ return;
+ }
+ // 4. Currently an object is not scalar replaceable if a LoadStore node
+ // access its field since the field value is unknown after it.
+ //
+ Node* n = field->ideal_node();
for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- Node *use = n->fast_out(i);
- if (use->is_Phi() || use->is_ClearArray()) {
- memnode_worklist.append_if_missing(use);
- } else if(use->is_Mem() && use->in(MemNode::Memory) == n) {
- if (use->Opcode() == Op_StoreCM) // Ignore cardmark stores
- continue;
- memnode_worklist.append_if_missing(use);
- } else if (use->is_MemBar()) {
- memnode_worklist.append_if_missing(use);
-#ifdef ASSERT
- } else if(use->is_Mem()) {
- assert(use->in(MemNode::Memory) != n, "EA: missing memory path");
- } else if (use->is_MergeMem()) {
- assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist");
- } else {
- uint op = use->Opcode();
- if (!(op == Op_StoreCM ||
- (op == Op_CallLeaf && use->as_CallLeaf()->_name != NULL &&
- strcmp(use->as_CallLeaf()->_name, "g1_wb_pre") == 0) ||
- op == Op_AryEq || op == Op_StrComp ||
- op == Op_StrEquals || op == Op_StrIndexOf)) {
- n->dump();
- use->dump();
- assert(false, "EA: missing memory path");
+ if (n->fast_out(i)->is_LoadStore()) {
+ jobj->set_scalar_replaceable(false);
+ return;
+ }
+ }
+
+ // 5. Or the address may point to more then one object. This may produce
+ // the false positive result (set not scalar replaceable)
+ // since the flow-insensitive escape analysis can't separate
+ // the case when stores overwrite the field's value from the case
+ // when stores happened on different control branches.
+ //
+ // Note: it will disable scalar replacement in some cases:
+ //
+ // Point p[] = new Point[1];
+ // p[0] = new Point(); // Will be not scalar replaced
+ //
+ // but it will save us from incorrect optimizations in next cases:
+ //
+ // Point p[] = new Point[1];
+ // if ( x ) p[0] = new Point(); // Will be not scalar replaced
+ //
+ if (field->base_count() > 1) {
+ for (BaseIterator i(field); i.has_next(); i.next()) {
+ PointsToNode* base = i.get();
+ // Don't take into account LocalVar nodes which
+ // may point to only one object which should be also
+ // this field's base by now.
+ if (base->is_JavaObject() && base != jobj) {
+ // Mark all bases.
+ jobj->set_scalar_replaceable(false);
+ base->set_scalar_replaceable(false);
}
-#endif
}
}
}
+}
- // Phase 3: Process MergeMem nodes from mergemem_worklist.
- // Walk each memory slice moving the first node encountered of each
- // instance type to the the input corresponding to its alias index.
- uint length = _mergemem_worklist.length();
- for( uint next = 0; next < length; ++next ) {
- MergeMemNode* nmm = _mergemem_worklist.at(next);
- assert(!visited.test_set(nmm->_idx), "should not be visited before");
- // Note: we don't want to use MergeMemStream here because we only want to
- // scan inputs which exist at the start, not ones we add during processing.
- // Note 2: MergeMem may already contains instance memory slices added
- // during find_inst_mem() call when memory nodes were processed above.
- igvn->hash_delete(nmm);
- uint nslices = nmm->req();
- for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) {
- Node* mem = nmm->in(i);
- Node* cur = NULL;
- if (mem == NULL || mem->is_top())
- continue;
- // First, update mergemem by moving memory nodes to corresponding slices
- // if their type became more precise since this mergemem was created.
- while (mem->is_Mem()) {
- const Type *at = igvn->type(mem->in(MemNode::Address));
- if (at != Type::TOP) {
- assert (at->isa_ptr() != NULL, "pointer type required.");
- uint idx = (uint)_compile->get_alias_index(at->is_ptr());
- if (idx == i) {
- if (cur == NULL)
- cur = mem;
- } else {
- if (idx >= nmm->req() || nmm->is_empty_memory(nmm->in(idx))) {
- nmm->set_memory_at(idx, mem);
- }
+#ifdef ASSERT
+void ConnectionGraph::verify_connection_graph(
+ GrowableArray<PointsToNode*>& ptnodes_worklist,
+ GrowableArray<JavaObjectNode*>& non_escaped_worklist,
+ GrowableArray<JavaObjectNode*>& java_objects_worklist,
+ GrowableArray<Node*>& addp_worklist) {
+ // Verify that graph is complete - no new edges could be added.
+ int java_objects_length = java_objects_worklist.length();
+ int non_escaped_length = non_escaped_worklist.length();
+ int new_edges = 0;
+ for (int next = 0; next < java_objects_length; ++next) {
+ JavaObjectNode* ptn = java_objects_worklist.at(next);
+ new_edges += add_java_object_edges(ptn, true);
+ }
+ assert(new_edges == 0, "graph was not complete");
+ // Verify that escape state is final.
+ int length = non_escaped_worklist.length();
+ find_non_escaped_objects(ptnodes_worklist, non_escaped_worklist);
+ assert((non_escaped_length == non_escaped_worklist.length()) &&
+ (non_escaped_length == length) &&
+ (_worklist.length() == 0), "escape state was not final");
+
+ // Verify fields information.
+ int addp_length = addp_worklist.length();
+ for (int next = 0; next < addp_length; ++next ) {
+ Node* n = addp_worklist.at(next);
+ FieldNode* field = ptnode_adr(n->_idx)->as_Field();
+ if (field->is_oop()) {
+ // Verify that field has all bases
+ Node* base = get_addp_base(n);
+ PointsToNode* ptn = ptnode_adr(base->_idx);
+ if (ptn->is_JavaObject()) {
+ assert(field->has_base(ptn->as_JavaObject()), "sanity");
+ } else {
+ assert(ptn->is_LocalVar(), "sanity");
+ for (EdgeIterator i(ptn); i.has_next(); i.next()) {
+ PointsToNode* e = i.get();
+ if (e->is_JavaObject()) {
+ assert(field->has_base(e->as_JavaObject()), "sanity");
}
}
- mem = mem->in(MemNode::Memory);
}
- nmm->set_memory_at(i, (cur != NULL) ? cur : mem);
- // Find any instance of the current type if we haven't encountered
- // already a memory slice of the instance along the memory chain.
- for (uint ni = new_index_start; ni < new_index_end; ni++) {
- if((uint)_compile->get_general_index(ni) == i) {
- Node *m = (ni >= nmm->req()) ? nmm->empty_memory() : nmm->in(ni);
- if (nmm->is_empty_memory(m)) {
- Node* result = find_inst_mem(mem, ni, orig_phis, igvn);
- if (_compile->failing()) {
- return;
- }
- nmm->set_memory_at(ni, result);
+ // Verify that all fields have initializing values.
+ if (field->edge_count() == 0) {
+ field->dump();
+ assert(field->edge_count() > 0, "sanity");
+ }
+ }
+ }
+}
+#endif
+
+// Optimize ideal graph.
+void ConnectionGraph::optimize_ideal_graph(GrowableArray<Node*>& ptr_cmp_worklist,
+ GrowableArray<Node*>& storestore_worklist) {
+ Compile* C = _compile;
+ PhaseIterGVN* igvn = _igvn;
+ if (EliminateLocks) {
+ // Mark locks before changing ideal graph.
+ int cnt = C->macro_count();
+ for( int i=0; i < cnt; i++ ) {
+ Node *n = C->macro_node(i);
+ if (n->is_AbstractLock()) { // Lock and Unlock nodes
+ AbstractLockNode* alock = n->as_AbstractLock();
+ if (!alock->is_non_esc_obj()) {
+ if (not_global_escape(alock->obj_node())) {
+ assert(!alock->is_eliminated() || alock->is_coarsened(), "sanity");
+ // The lock could be marked eliminated by lock coarsening
+ // code during first IGVN before EA. Replace coarsened flag
+ // to eliminate all associated locks/unlocks.
+ alock->set_non_esc_obj();
}
}
}
}
- // Find the rest of instances values
- for (uint ni = new_index_start; ni < new_index_end; ni++) {
- const TypeOopPtr *tinst = _compile->get_adr_type(ni)->isa_oopptr();
- Node* result = step_through_mergemem(nmm, ni, tinst);
- if (result == nmm->base_memory()) {
- // Didn't find instance memory, search through general slice recursively.
- result = nmm->memory_at(_compile->get_general_index(ni));
- result = find_inst_mem(result, ni, orig_phis, igvn);
- if (_compile->failing()) {
- return;
+ }
+
+ if (OptimizePtrCompare) {
+ // Add ConI(#CC_GT) and ConI(#CC_EQ).
+ _pcmp_neq = igvn->makecon(TypeInt::CC_GT);
+ _pcmp_eq = igvn->makecon(TypeInt::CC_EQ);
+ // Optimize objects compare.
+ while (ptr_cmp_worklist.length() != 0) {
+ Node *n = ptr_cmp_worklist.pop();
+ Node *res = optimize_ptr_compare(n);
+ if (res != NULL) {
+#ifndef PRODUCT
+ if (PrintOptimizePtrCompare) {
+ tty->print_cr("++++ Replaced: %d %s(%d,%d) --> %s", n->_idx, (n->Opcode() == Op_CmpP ? "CmpP" : "CmpN"), n->in(1)->_idx, n->in(2)->_idx, (res == _pcmp_eq ? "EQ" : "NotEQ"));
+ if (Verbose) {
+ n->dump(1);
+ }
}
- nmm->set_memory_at(ni, result);
+#endif
+ igvn->replace_node(n, res);
}
}
- igvn->hash_insert(nmm);
- record_for_optimizer(nmm);
+ // cleanup
+ if (_pcmp_neq->outcnt() == 0)
+ igvn->hash_delete(_pcmp_neq);
+ if (_pcmp_eq->outcnt() == 0)
+ igvn->hash_delete(_pcmp_eq);
}
- // Phase 4: Update the inputs of non-instance memory Phis and
- // the Memory input of memnodes
- // First update the inputs of any non-instance Phi's from
- // which we split out an instance Phi. Note we don't have
- // to recursively process Phi's encounted on the input memory
- // chains as is done in split_memory_phi() since they will
- // also be processed here.
- for (int j = 0; j < orig_phis.length(); j++) {
- PhiNode *phi = orig_phis.at(j);
- int alias_idx = _compile->get_alias_index(phi->adr_type());
- igvn->hash_delete(phi);
- for (uint i = 1; i < phi->req(); i++) {
- Node *mem = phi->in(i);
- Node *new_mem = find_inst_mem(mem, alias_idx, orig_phis, igvn);
- if (_compile->failing()) {
- return;
+ // For MemBarStoreStore nodes added in library_call.cpp, check
+ // escape status of associated AllocateNode and optimize out
+ // MemBarStoreStore node if the allocated object never escapes.
+ while (storestore_worklist.length() != 0) {
+ Node *n = storestore_worklist.pop();
+ MemBarStoreStoreNode *storestore = n ->as_MemBarStoreStore();
+ Node *alloc = storestore->in(MemBarNode::Precedent)->in(0);
+ assert (alloc->is_Allocate(), "storestore should point to AllocateNode");
+ if (not_global_escape(alloc)) {
+ MemBarNode* mb = MemBarNode::make(C, Op_MemBarCPUOrder, Compile::AliasIdxBot);
+ mb->init_req(TypeFunc::Memory, storestore->in(TypeFunc::Memory));
+ mb->init_req(TypeFunc::Control, storestore->in(TypeFunc::Control));
+ igvn->register_new_node_with_optimizer(mb);
+ igvn->replace_node(storestore, mb);
+ }
+ }
+}
+
+// Optimize objects compare.
+Node* ConnectionGraph::optimize_ptr_compare(Node* n) {
+ assert(OptimizePtrCompare, "sanity");
+ PointsToNode* ptn1 = ptnode_adr(n->in(1)->_idx);
+ PointsToNode* ptn2 = ptnode_adr(n->in(2)->_idx);
+ JavaObjectNode* jobj1 = unique_java_object(n->in(1));
+ JavaObjectNode* jobj2 = unique_java_object(n->in(2));
+ assert(ptn1->is_JavaObject() || ptn1->is_LocalVar(), "sanity");
+ assert(ptn2->is_JavaObject() || ptn2->is_LocalVar(), "sanity");
+
+ // Check simple cases first.
+ if (jobj1 != NULL) {
+ if (jobj1->escape_state() == PointsToNode::NoEscape) {
+ if (jobj1 == jobj2) {
+ // Comparing the same not escaping object.
+ return _pcmp_eq;
}
- if (mem != new_mem) {
- phi->set_req(i, new_mem);
+ Node* obj = jobj1->ideal_node();
+ // Comparing not escaping allocation.
+ if ((obj->is_Allocate() || obj->is_CallStaticJava()) &&
+ !ptn2->points_to(jobj1)) {
+ return _pcmp_neq; // This includes nullness check.
}
}
- igvn->hash_insert(phi);
- record_for_optimizer(phi);
+ }
+ if (jobj2 != NULL) {
+ if (jobj2->escape_state() == PointsToNode::NoEscape) {
+ Node* obj = jobj2->ideal_node();
+ // Comparing not escaping allocation.
+ if ((obj->is_Allocate() || obj->is_CallStaticJava()) &&
+ !ptn1->points_to(jobj2)) {
+ return _pcmp_neq; // This includes nullness check.
+ }
+ }
+ }
+ if (jobj1 != NULL && jobj1 != phantom_obj &&
+ jobj2 != NULL && jobj2 != phantom_obj &&
+ jobj1->ideal_node()->is_Con() &&
+ jobj2->ideal_node()->is_Con()) {
+ // Klass or String constants compare. Need to be careful with
+ // compressed pointers - compare types of ConN and ConP instead of nodes.
+ const Type* t1 = jobj1->ideal_node()->bottom_type()->make_ptr();
+ const Type* t2 = jobj2->ideal_node()->bottom_type()->make_ptr();
+ assert(t1 != NULL && t2 != NULL, "sanity");
+ if (t1->make_ptr() == t2->make_ptr()) {
+ return _pcmp_eq;
+ } else {
+ return _pcmp_neq;
+ }
+ }
+ if (ptn1->meet(ptn2)) {
+ return NULL; // Sets are not disjoint
}
- // Update the memory inputs of MemNodes with the value we computed
- // in Phase 2 and move stores memory users to corresponding memory slices.
+ // Sets are disjoint.
+ bool set1_has_unknown_ptr = ptn1->points_to(phantom_obj);
+ bool set2_has_unknown_ptr = ptn2->points_to(phantom_obj);
+ bool set1_has_null_ptr = ptn1->points_to(null_obj);
+ bool set2_has_null_ptr = ptn2->points_to(null_obj);
+ if (set1_has_unknown_ptr && set2_has_null_ptr ||
+ set2_has_unknown_ptr && set1_has_null_ptr) {
+ // Check nullness of unknown object.
+ return NULL;
+ }
- // Disable memory split verification code until the fix for 6984348.
- // Currently it produces false negative results since it does not cover all cases.
-#if 0 // ifdef ASSERT
- visited.Reset();
- Node_Stack old_mems(arena, _compile->unique() >> 2);
-#endif
- for (uint i = 0; i < nodes_size(); i++) {
- Node *nmem = get_map(i);
- if (nmem != NULL) {
- Node *n = ptnode_adr(i)->_node;
- assert(n != NULL, "sanity");
- if (n->is_Mem()) {
-#if 0 // ifdef ASSERT
- Node* old_mem = n->in(MemNode::Memory);
- if (!visited.test_set(old_mem->_idx)) {
- old_mems.push(old_mem, old_mem->outcnt());
- }
-#endif
- assert(n->in(MemNode::Memory) != nmem, "sanity");
- if (!n->is_Load()) {
- // Move memory users of a store first.
- move_inst_mem(n, orig_phis, igvn);
- }
- // Now update memory input
- igvn->hash_delete(n);
- n->set_req(MemNode::Memory, nmem);
- igvn->hash_insert(n);
- record_for_optimizer(n);
+ // Disjointness by itself is not sufficient since
+ // alias analysis is not complete for escaped objects.
+ // Disjoint sets are definitely unrelated only when
+ // at least one set has only not escaping allocations.
+ if (!set1_has_unknown_ptr && !set1_has_null_ptr) {
+ if (ptn1->non_escaping_allocation()) {
+ return _pcmp_neq;
+ }
+ }
+ if (!set2_has_unknown_ptr && !set2_has_null_ptr) {
+ if (ptn2->non_escaping_allocation()) {
+ return _pcmp_neq;
+ }
+ }
+ return NULL;
+}
+
+// Connection Graph constuction functions.
+
+void ConnectionGraph::add_local_var(Node *n, PointsToNode::EscapeState es) {
+ PointsToNode* ptadr = _nodes.at(n->_idx);
+ if (ptadr != NULL) {
+ assert(ptadr->is_LocalVar() && ptadr->ideal_node() == n, "sanity");
+ return;
+ }
+ Compile* C = _compile;
+ ptadr = new (C->comp_arena()) LocalVarNode(C, n, es);
+ _nodes.at_put(n->_idx, ptadr);
+}
+
+void ConnectionGraph::add_java_object(Node *n, PointsToNode::EscapeState es) {
+ PointsToNode* ptadr = _nodes.at(n->_idx);
+ if (ptadr != NULL) {
+ assert(ptadr->is_JavaObject() && ptadr->ideal_node() == n, "sanity");
+ return;
+ }
+ Compile* C = _compile;
+ ptadr = new (C->comp_arena()) JavaObjectNode(C, n, es);
+ _nodes.at_put(n->_idx, ptadr);
+}
+
+void ConnectionGraph::add_field(Node *n, PointsToNode::EscapeState es, int offset) {
+ PointsToNode* ptadr = _nodes.at(n->_idx);
+ if (ptadr != NULL) {
+ assert(ptadr->is_Field() && ptadr->ideal_node() == n, "sanity");
+ return;
+ }
+ Compile* C = _compile;
+ bool is_oop = is_oop_field(n, offset);
+ FieldNode* field = new (C->comp_arena()) FieldNode(C, n, es, offset, is_oop);
+ _nodes.at_put(n->_idx, field);
+}
+
+void ConnectionGraph::add_arraycopy(Node *n, PointsToNode::EscapeState es,
+ PointsToNode* src, PointsToNode* dst) {
+ assert(!src->is_Field() && !dst->is_Field(), "only for JavaObject and LocalVar");
+ assert((src != null_obj) && (dst != null_obj), "not for ConP NULL");
+ PointsToNode* ptadr = _nodes.at(n->_idx);
+ if (ptadr != NULL) {
+ assert(ptadr->is_Arraycopy() && ptadr->ideal_node() == n, "sanity");
+ return;
+ }
+ Compile* C = _compile;
+ ptadr = new (C->comp_arena()) ArraycopyNode(C, n, es);
+ _nodes.at_put(n->_idx, ptadr);
+ // Add edge from arraycopy node to source object.
+ (void)add_edge(ptadr, src);
+ src->set_arraycopy_src();
+ // Add edge from destination object to arraycopy node.
+ (void)add_edge(dst, ptadr);
+ dst->set_arraycopy_dst();
+}
+
+bool ConnectionGraph::is_oop_field(Node* n, int offset) {
+ const Type* adr_type = n->as_AddP()->bottom_type();
+ BasicType bt = T_INT;
+ if (offset == Type::OffsetBot) {
+ // Check only oop fields.
+ if (!adr_type->isa_aryptr() ||
+ (adr_type->isa_aryptr()->klass() == NULL) ||
+ adr_type->isa_aryptr()->klass()->is_obj_array_klass()) {
+ // OffsetBot is used to reference array's element. Ignore first AddP.
+ if (find_second_addp(n, n->in(AddPNode::Base)) == NULL) {
+ bt = T_OBJECT;
+ }
+ }
+ } else if (offset != oopDesc::klass_offset_in_bytes()) {
+ if (adr_type->isa_instptr()) {
+ ciField* field = _compile->alias_type(adr_type->isa_instptr())->field();
+ if (field != NULL) {
+ bt = field->layout_type();
+ } else {
+ // Ignore non field load (for example, klass load)
+ }
+ } else if (adr_type->isa_aryptr()) {
+ if (offset == arrayOopDesc::length_offset_in_bytes()) {
+ // Ignore array length load.
+ } else if (find_second_addp(n, n->in(AddPNode::Base)) != NULL) {
+ // Ignore first AddP.
} else {
- assert(n->is_Allocate() || n->is_CheckCastPP() ||
- n->is_AddP() || n->is_Phi(), "unknown node used for set_map()");
+ const Type* elemtype = adr_type->isa_aryptr()->elem();
+ bt = elemtype->array_element_basic_type();
+ }
+ } else if (adr_type->isa_rawptr() || adr_type->isa_klassptr()) {
+ // Allocation initialization, ThreadLocal field access, unsafe access
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ int opcode = n->fast_out(i)->Opcode();
+ if (opcode == Op_StoreP || opcode == Op_LoadP ||
+ opcode == Op_StoreN || opcode == Op_LoadN) {
+ bt = T_OBJECT;
+ }
}
}
}
-#if 0 // ifdef ASSERT
- // Verify that memory was split correctly
- while (old_mems.is_nonempty()) {
- Node* old_mem = old_mems.node();
- uint old_cnt = old_mems.index();
- old_mems.pop();
- assert(old_cnt == old_mem->outcnt(), "old mem could be lost");
+ return (bt == T_OBJECT || bt == T_NARROWOOP || bt == T_ARRAY);
+}
+
+// Returns unique pointed java object or NULL.
+JavaObjectNode* ConnectionGraph::unique_java_object(Node *n) {
+ assert(!_collecting, "should not call when contructed graph");
+ // If the node was created after the escape computation we can't answer.
+ uint idx = n->_idx;
+ if (idx >= nodes_size()) {
+ return NULL;
}
-#endif
+ PointsToNode* ptn = ptnode_adr(idx);
+ if (ptn->is_JavaObject()) {
+ return ptn->as_JavaObject();
+ }
+ assert(ptn->is_LocalVar(), "sanity");
+ // Check all java objects it points to.
+ JavaObjectNode* jobj = NULL;
+ for (EdgeIterator i(ptn); i.has_next(); i.next()) {
+ PointsToNode* e = i.get();
+ if (e->is_JavaObject()) {
+ if (jobj == NULL) {
+ jobj = e->as_JavaObject();
+ } else if (jobj != e) {
+ return NULL;
+ }
+ }
+ }
+ return jobj;
}
-bool ConnectionGraph::has_candidates(Compile *C) {
- // EA brings benefits only when the code has allocations and/or locks which
- // are represented by ideal Macro nodes.
- int cnt = C->macro_count();
- for( int i=0; i < cnt; i++ ) {
- Node *n = C->macro_node(i);
- if ( n->is_Allocate() )
+// Return true if this node points only to non-escaping allocations.
+bool PointsToNode::non_escaping_allocation() {
+ if (is_JavaObject()) {
+ Node* n = ideal_node();
+ if (n->is_Allocate() || n->is_CallStaticJava()) {
+ return (escape_state() == PointsToNode::NoEscape);
+ } else {
+ return false;
+ }
+ }
+ assert(is_LocalVar(), "sanity");
+ // Check all java objects it points to.
+ for (EdgeIterator i(this); i.has_next(); i.next()) {
+ PointsToNode* e = i.get();
+ if (e->is_JavaObject()) {
+ Node* n = e->ideal_node();
+ if ((e->escape_state() != PointsToNode::NoEscape) ||
+ !(n->is_Allocate() || n->is_CallStaticJava())) {
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+// Return true if we know the node does not escape globally.
+bool ConnectionGraph::not_global_escape(Node *n) {
+ assert(!_collecting, "should not call during graph construction");
+ // If the node was created after the escape computation we can't answer.
+ uint idx = n->_idx;
+ if (idx >= nodes_size()) {
+ return false;
+ }
+ PointsToNode* ptn = ptnode_adr(idx);
+ PointsToNode::EscapeState es = ptn->escape_state();
+ // If we have already computed a value, return it.
+ if (es >= PointsToNode::GlobalEscape)
+ return false;
+ if (ptn->is_JavaObject()) {
+ return true; // (es < PointsToNode::GlobalEscape);
+ }
+ assert(ptn->is_LocalVar(), "sanity");
+ // Check all java objects it points to.
+ for (EdgeIterator i(ptn); i.has_next(); i.next()) {
+ if (i.get()->escape_state() >= PointsToNode::GlobalEscape)
+ return false;
+ }
+ return true;
+}
+
+
+// Helper functions
+
+// Return true if this node points to specified node or nodes it points to.
+bool PointsToNode::points_to(JavaObjectNode* ptn) const {
+ if (is_JavaObject()) {
+ return (this == ptn);
+ }
+ assert(is_LocalVar(), "sanity");
+ for (EdgeIterator i(this); i.has_next(); i.next()) {
+ if (i.get() == ptn)
return true;
- if( n->is_Lock() ) {
- Node* obj = n->as_Lock()->obj_node()->uncast();
- if( !(obj->is_Parm() || obj->is_Con()) )
+ }
+ return false;
+}
+
+// Return true if one node points to an other.
+bool PointsToNode::meet(PointsToNode* ptn) {
+ if (this == ptn) {
+ return true;
+ } else if (ptn->is_JavaObject()) {
+ return this->points_to(ptn->as_JavaObject());
+ } else if (this->is_JavaObject()) {
+ return ptn->points_to(this->as_JavaObject());
+ }
+ assert(this->is_LocalVar() && ptn->is_LocalVar(), "sanity");
+ int ptn_count = ptn->edge_count();
+ for (EdgeIterator i(this); i.has_next(); i.next()) {
+ PointsToNode* this_e = i.get();
+ for (int j = 0; j < ptn_count; j++) {
+ if (this_e == ptn->edge(j))
return true;
}
}
return false;
}
-void ConnectionGraph::do_analysis(Compile *C, PhaseIterGVN *igvn) {
- // Add ConP#NULL and ConN#NULL nodes before ConnectionGraph construction
- // to create space for them in ConnectionGraph::_nodes[].
- Node* oop_null = igvn->zerocon(T_OBJECT);
- Node* noop_null = igvn->zerocon(T_NARROWOOP);
-
- ConnectionGraph* congraph = new(C->comp_arena()) ConnectionGraph(C, igvn);
- // Perform escape analysis
- if (congraph->compute_escape()) {
- // There are non escaping objects.
- C->set_congraph(congraph);
+#ifdef ASSERT
+// Return true if bases point to this java object.
+bool FieldNode::has_base(JavaObjectNode* jobj) const {
+ for (BaseIterator i(this); i.has_next(); i.next()) {
+ if (i.get() == jobj)
+ return true;
}
-
- // Cleanup.
- if (oop_null->outcnt() == 0)
- igvn->hash_delete(oop_null);
- if (noop_null->outcnt() == 0)
- igvn->hash_delete(noop_null);
+ return false;
}
+#endif
-bool ConnectionGraph::compute_escape() {
- Compile* C = _compile;
-
- // 1. Populate Connection Graph (CG) with Ideal nodes.
-
- Unique_Node_List worklist_init;
- worklist_init.map(C->unique(), NULL); // preallocate space
-
- // Initialize worklist
- if (C->root() != NULL) {
- worklist_init.push(C->root());
+int ConnectionGraph::address_offset(Node* adr, PhaseTransform *phase) {
+ const Type *adr_type = phase->type(adr);
+ if (adr->is_AddP() && adr_type->isa_oopptr() == NULL &&
+ adr->in(AddPNode::Address)->is_Proj() &&
+ adr->in(AddPNode::Address)->in(0)->is_Allocate()) {
+ // We are computing a raw address for a store captured by an Initialize
+ // compute an appropriate address type. AddP cases #3 and #5 (see below).
+ int offs = (int)phase->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot);
+ assert(offs != Type::OffsetBot ||
+ adr->in(AddPNode::Address)->in(0)->is_AllocateArray(),
+ "offset must be a constant or it is initialization of array");
+ return offs;
}
+ const TypePtr *t_ptr = adr_type->isa_ptr();
+ assert(t_ptr != NULL, "must be a pointer type");
+ return t_ptr->offset();
+}
- GrowableArray<Node*> alloc_worklist;
- GrowableArray<Node*> addp_worklist;
- GrowableArray<Node*> ptr_cmp_worklist;
- GrowableArray<Node*> storestore_worklist;
- PhaseGVN* igvn = _igvn;
-
- // Push all useful nodes onto CG list and set their type.
- for( uint next = 0; next < worklist_init.size(); ++next ) {
- Node* n = worklist_init.at(next);
- record_for_escape_analysis(n, igvn);
- // Only allocations and java static calls results are checked
- // for an escape status. See process_call_result() below.
- if (n->is_Allocate() || n->is_CallStaticJava() &&
- ptnode_adr(n->_idx)->node_type() == PointsToNode::JavaObject) {
- alloc_worklist.append(n);
- } else if(n->is_AddP()) {
- // Collect address nodes. Use them during stage 3 below
- // to build initial connection graph field edges.
- addp_worklist.append(n);
- } else if (n->is_MergeMem()) {
- // Collect all MergeMem nodes to add memory slices for
- // scalar replaceable objects in split_unique_types().
- _mergemem_worklist.append(n->as_MergeMem());
- } else if (OptimizePtrCompare && n->is_Cmp() &&
- (n->Opcode() == Op_CmpP || n->Opcode() == Op_CmpN)) {
- // Compare pointers nodes
- ptr_cmp_worklist.append(n);
- } else if (n->is_MemBarStoreStore()) {
- // Collect all MemBarStoreStore nodes so that depending on the
- // escape status of the associated Allocate node some of them
- // may be eliminated.
- storestore_worklist.append(n);
- }
- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- Node* m = n->fast_out(i); // Get user
- worklist_init.push(m);
+Node* ConnectionGraph::get_addp_base(Node *addp) {
+ assert(addp->is_AddP(), "must be AddP");
+ //
+ // AddP cases for Base and Address inputs:
+ // case #1. Direct object's field reference:
+ // Allocate
+ // |
+ // Proj #5 ( oop result )
+ // |
+ // CheckCastPP (cast to instance type)
+ // | |
+ // AddP ( base == address )
+ //
+ // case #2. Indirect object's field reference:
+ // Phi
+ // |
+ // CastPP (cast to instance type)
+ // | |
+ // AddP ( base == address )
+ //
+ // case #3. Raw object's field reference for Initialize node:
+ // Allocate
+ // |
+ // Proj #5 ( oop result )
+ // top |
+ // \ |
+ // AddP ( base == top )
+ //
+ // case #4. Array's element reference:
+ // {CheckCastPP | CastPP}
+ // | | |
+ // | AddP ( array's element offset )
+ // | |
+ // AddP ( array's offset )
+ //
+ // case #5. Raw object's field reference for arraycopy stub call:
+ // The inline_native_clone() case when the arraycopy stub is called
+ // after the allocation before Initialize and CheckCastPP nodes.
+ // Allocate
+ // |
+ // Proj #5 ( oop result )
+ // | |
+ // AddP ( base == address )
+ //
+ // case #6. Constant Pool, ThreadLocal, CastX2P or
+ // Raw object's field reference:
+ // {ConP, ThreadLocal, CastX2P, raw Load}
+ // top |
+ // \ |
+ // AddP ( base == top )
+ //
+ // case #7. Klass's field reference.
+ // LoadKlass
+ // | |
+ // AddP ( base == address )
+ //
+ // case #8. narrow Klass's field reference.
+ // LoadNKlass
+ // |
+ // DecodeN
+ // | |
+ // AddP ( base == address )
+ //
+ Node *base = addp->in(AddPNode::Base);
+ if (base->uncast()->is_top()) { // The AddP case #3 and #6.
+ base = addp->in(AddPNode::Address);
+ while (base->is_AddP()) {
+ // Case #6 (unsafe access) may have several chained AddP nodes.
+ assert(base->in(AddPNode::Base)->uncast()->is_top(), "expected unsafe access address only");
+ base = base->in(AddPNode::Address);
}
+ Node* uncast_base = base->uncast();
+ int opcode = uncast_base->Opcode();
+ assert(opcode == Op_ConP || opcode == Op_ThreadLocal ||
+ opcode == Op_CastX2P || uncast_base->is_DecodeN() ||
+ (uncast_base->is_Mem() && uncast_base->bottom_type() == TypeRawPtr::NOTNULL) ||
+ (uncast_base->is_Proj() && uncast_base->in(0)->is_Allocate()), "sanity");
}
+ return base;
+}
- if (alloc_worklist.length() == 0) {
- _collecting = false;
- return false; // Nothing to do.
+Node* ConnectionGraph::find_second_addp(Node* addp, Node* n) {
+ assert(addp->is_AddP() && addp->outcnt() > 0, "Don't process dead nodes");
+ Node* addp2 = addp->raw_out(0);
+ if (addp->outcnt() == 1 && addp2->is_AddP() &&
+ addp2->in(AddPNode::Base) == n &&
+ addp2->in(AddPNode::Address) == addp) {
+ assert(addp->in(AddPNode::Base) == n, "expecting the same base");
+ //
+ // Find array's offset to push it on worklist first and
+ // as result process an array's element offset first (pushed second)
+ // to avoid CastPP for the array's offset.
+ // Otherwise the inserted CastPP (LocalVar) will point to what
+ // the AddP (Field) points to. Which would be wrong since
+ // the algorithm expects the CastPP has the same point as
+ // as AddP's base CheckCastPP (LocalVar).
+ //
+ // ArrayAllocation
+ // |
+ // CheckCastPP
+ // |
+ // memProj (from ArrayAllocation CheckCastPP)
+ // | ||
+ // | || Int (element index)
+ // | || | ConI (log(element size))
+ // | || | /
+ // | || LShift
+ // | || /
+ // | AddP (array's element offset)
+ // | |
+ // | | ConI (array's offset: #12(32-bits) or #24(64-bits))
+ // | / /
+ // AddP (array's offset)
+ // |
+ // Load/Store (memory operation on array's element)
+ //
+ return addp2;
}
+ return NULL;
+}
- // 2. First pass to create simple CG edges (doesn't require to walk CG).
- uint delayed_size = _delayed_worklist.size();
- for( uint next = 0; next < delayed_size; ++next ) {
- Node* n = _delayed_worklist.at(next);
- build_connection_graph(n, igvn);
+//
+// Adjust the type and inputs of an AddP which computes the
+// address of a field of an instance
+//
+bool ConnectionGraph::split_AddP(Node *addp, Node *base) {
+ PhaseGVN* igvn = _igvn;
+ const TypeOopPtr *base_t = igvn->type(base)->isa_oopptr();
+ assert(base_t != NULL && base_t->is_known_instance(), "expecting instance oopptr");
+ const TypeOopPtr *t = igvn->type(addp)->isa_oopptr();
+ if (t == NULL) {
+ // We are computing a raw address for a store captured by an Initialize
+ // compute an appropriate address type (cases #3 and #5).
+ assert(igvn->type(addp) == TypeRawPtr::NOTNULL, "must be raw pointer");
+ assert(addp->in(AddPNode::Address)->is_Proj(), "base of raw address must be result projection from allocation");
+ intptr_t offs = (int)igvn->find_intptr_t_con(addp->in(AddPNode::Offset), Type::OffsetBot);
+ assert(offs != Type::OffsetBot, "offset must be a constant");
+ t = base_t->add_offset(offs)->is_oopptr();
}
+ int inst_id = base_t->instance_id();
+ assert(!t->is_known_instance() || t->instance_id() == inst_id,
+ "old type must be non-instance or match new type");
- // 3. Pass to create initial fields edges (JavaObject -F-> AddP)
- // to reduce number of iterations during stage 4 below.
- uint addp_length = addp_worklist.length();
- for( uint next = 0; next < addp_length; ++next ) {
- Node* n = addp_worklist.at(next);
- Node* base = get_addp_base(n);
- if (base->is_Proj() && base->in(0)->is_Call())
- base = base->in(0);
- PointsToNode::NodeType nt = ptnode_adr(base->_idx)->node_type();
- if (nt == PointsToNode::JavaObject) {
- build_connection_graph(n, igvn);
- }
- }
-
- GrowableArray<int> cg_worklist;
- cg_worklist.append(_phantom_object);
- GrowableArray<uint> worklist;
-
- // 4. Build Connection Graph which need
- // to walk the connection graph.
- _progress = false;
- for (uint ni = 0; ni < nodes_size(); ni++) {
- PointsToNode* ptn = ptnode_adr(ni);
- Node *n = ptn->_node;
- if (n != NULL) { // Call, AddP, LoadP, StoreP
- build_connection_graph(n, igvn);
- if (ptn->node_type() != PointsToNode::UnknownType)
- cg_worklist.append(n->_idx); // Collect CG nodes
- if (!_processed.test(n->_idx))
- worklist.append(n->_idx); // Collect C/A/L/S nodes
- }
- }
-
- // After IGVN user nodes may have smaller _idx than
- // their inputs so they will be processed first in
- // previous loop. Because of that not all Graph
- // edges will be created. Walk over interesting
- // nodes again until no new edges are created.
+ // The type 't' could be subclass of 'base_t'.
+ // As result t->offset() could be large then base_t's size and it will
+ // cause the failure in add_offset() with narrow oops since TypeOopPtr()
+ // constructor verifies correctness of the offset.
//
- // Normally only 1-3 passes needed to build
- // Connection Graph depending on graph complexity.
- // Observed 8 passes in jvm2008 compiler.compiler.
- // Set limit to 20 to catch situation when something
- // did go wrong and recompile the method without EA.
-
-#define CG_BUILD_ITER_LIMIT 20
-
- uint length = worklist.length();
- int iterations = 0;
- while(_progress && (iterations++ < CG_BUILD_ITER_LIMIT)) {
- _progress = false;
- for( uint next = 0; next < length; ++next ) {
- int ni = worklist.at(next);
- PointsToNode* ptn = ptnode_adr(ni);
- Node* n = ptn->_node;
- assert(n != NULL, "should be known node");
- build_connection_graph(n, igvn);
- }
- }
- if (iterations >= CG_BUILD_ITER_LIMIT) {
- assert(iterations < CG_BUILD_ITER_LIMIT,
- err_msg("infinite EA connection graph build with %d nodes and worklist size %d",
- nodes_size(), length));
- // Possible infinite build_connection_graph loop,
- // retry compilation without escape analysis.
- C->record_failure(C2Compiler::retry_no_escape_analysis());
- _collecting = false;
- return false;
+ // It could happened on subclass's branch (from the type profiling
+ // inlining) which was not eliminated during parsing since the exactness
+ // of the allocation type was not propagated to the subclass type check.
+ //
+ // Or the type 't' could be not related to 'base_t' at all.
+ // It could happened when CHA type is different from MDO type on a dead path
+ // (for example, from instanceof check) which is not collapsed during parsing.
+ //
+ // Do nothing for such AddP node and don't process its users since
+ // this code branch will go away.
+ //
+ if (!t->is_known_instance() &&
+ !base_t->klass()->is_subtype_of(t->klass())) {
+ return false; // bail out
}
-#undef CG_BUILD_ITER_LIMIT
-
- // 5. Propagate escaped states.
- worklist.clear();
-
- // mark all nodes reachable from GlobalEscape nodes
- (void)propagate_escape_state(&cg_worklist, &worklist, PointsToNode::GlobalEscape);
-
- // mark all nodes reachable from ArgEscape nodes
- bool has_non_escaping_obj = propagate_escape_state(&cg_worklist, &worklist, PointsToNode::ArgEscape);
-
- Arena* arena = Thread::current()->resource_area();
- VectorSet visited(arena);
-
- // 6. Find fields initializing values for not escaped allocations
- uint alloc_length = alloc_worklist.length();
- for (uint next = 0; next < alloc_length; ++next) {
- Node* n = alloc_worklist.at(next);
- PointsToNode::EscapeState es = ptnode_adr(n->_idx)->escape_state();
- if (es == PointsToNode::NoEscape) {
- has_non_escaping_obj = true;
- if (n->is_Allocate()) {
- find_init_values(n, &visited, igvn);
- // The object allocated by this Allocate node will never be
- // seen by an other thread. Mark it so that when it is
- // expanded no MemBarStoreStore is added.
- n->as_Allocate()->initialization()->set_does_not_escape();
- }
- } else if ((es == PointsToNode::ArgEscape) && n->is_Allocate()) {
- // Same as above. Mark this Allocate node so that when it is
- // expanded no MemBarStoreStore is added.
- n->as_Allocate()->initialization()->set_does_not_escape();
+ const TypeOopPtr *tinst = base_t->add_offset(t->offset())->is_oopptr();
+ // Do NOT remove the next line: ensure a new alias index is allocated
+ // for the instance type. Note: C++ will not remove it since the call
+ // has side effect.
+ int alias_idx = _compile->get_alias_index(tinst);
+ igvn->set_type(addp, tinst);
+ // record the allocation in the node map
+ set_map(addp, get_map(base->_idx));
+ // Set addp's Base and Address to 'base'.
+ Node *abase = addp->in(AddPNode::Base);
+ Node *adr = addp->in(AddPNode::Address);
+ if (adr->is_Proj() && adr->in(0)->is_Allocate() &&
+ adr->in(0)->_idx == (uint)inst_id) {
+ // Skip AddP cases #3 and #5.
+ } else {
+ assert(!abase->is_top(), "sanity"); // AddP case #3
+ if (abase != base) {
+ igvn->hash_delete(addp);
+ addp->set_req(AddPNode::Base, base);
+ if (abase == adr) {
+ addp->set_req(AddPNode::Address, base);
+ } else {
+ // AddP case #4 (adr is array's element offset AddP node)
+#ifdef ASSERT
+ const TypeOopPtr *atype = igvn->type(adr)->isa_oopptr();
+ assert(adr->is_AddP() && atype != NULL &&
+ atype->instance_id() == inst_id, "array's element offset should be processed first");
+#endif
+ }
+ igvn->hash_insert(addp);
}
}
+ // Put on IGVN worklist since at least addp's type was changed above.
+ record_for_optimizer(addp);
+ return true;
+}
- uint cg_length = cg_worklist.length();
-
- // Skip the rest of code if all objects escaped.
- if (!has_non_escaping_obj) {
- cg_length = 0;
- addp_length = 0;
+//
+// Create a new version of orig_phi if necessary. Returns either the newly
+// created phi or an existing phi. Sets create_new to indicate whether a new
+// phi was created. Cache the last newly created phi in the node map.
+//
+PhiNode *ConnectionGraph::create_split_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, bool &new_created) {
+ Compile *C = _compile;
+ PhaseGVN* igvn = _igvn;
+ new_created = false;
+ int phi_alias_idx = C->get_alias_index(orig_phi->adr_type());
+ // nothing to do if orig_phi is bottom memory or matches alias_idx
+ if (phi_alias_idx == alias_idx) {
+ return orig_phi;
}
-
- for (uint next = 0; next < cg_length; ++next) {
- int ni = cg_worklist.at(next);
- PointsToNode* ptn = ptnode_adr(ni);
- PointsToNode::NodeType nt = ptn->node_type();
- if (nt == PointsToNode::LocalVar || nt == PointsToNode::Field) {
- if (ptn->edge_count() == 0) {
- // No values were found. Assume the value was set
- // outside this method - add edge to phantom object.
- add_pointsto_edge(ni, _phantom_object);
- }
- }
+ // Have we recently created a Phi for this alias index?
+ PhiNode *result = get_map_phi(orig_phi->_idx);
+ if (result != NULL && C->get_alias_index(result->adr_type()) == alias_idx) {
+ return result;
}
-
- // 7. Remove deferred edges from the graph.
- for (uint next = 0; next < cg_length; ++next) {
- int ni = cg_worklist.at(next);
- PointsToNode* ptn = ptnode_adr(ni);
- PointsToNode::NodeType nt = ptn->node_type();
- if (nt == PointsToNode::LocalVar || nt == PointsToNode::Field) {
- remove_deferred(ni, &worklist, &visited);
+ // Previous check may fail when the same wide memory Phi was split into Phis
+ // for different memory slices. Search all Phis for this region.
+ if (result != NULL) {
+ Node* region = orig_phi->in(0);
+ for (DUIterator_Fast imax, i = region->fast_outs(imax); i < imax; i++) {
+ Node* phi = region->fast_out(i);
+ if (phi->is_Phi() &&
+ C->get_alias_index(phi->as_Phi()->adr_type()) == alias_idx) {
+ assert(phi->_idx >= nodes_size(), "only new Phi per instance memory slice");
+ return phi->as_Phi();
+ }
}
}
-
- // 8. Adjust escape state of nonescaping objects.
- for (uint next = 0; next < addp_length; ++next) {
- Node* n = addp_worklist.at(next);
- adjust_escape_state(n);
- }
-
- // push all NoEscape nodes on the worklist
- worklist.clear();
- for( uint next = 0; next < cg_length; ++next ) {
- int nk = cg_worklist.at(next);
- if (ptnode_adr(nk)->escape_state() == PointsToNode::NoEscape &&
- !is_null_ptr(nk))
- worklist.push(nk);
- }
-
- alloc_worklist.clear();
- // Propagate scalar_replaceable value.
- while(worklist.length() > 0) {
- uint nk = worklist.pop();
- PointsToNode* ptn = ptnode_adr(nk);
- Node* n = ptn->_node;
- bool scalar_replaceable = ptn->scalar_replaceable();
- if (n->is_Allocate() && scalar_replaceable) {
- // Push scalar replaceable allocations on alloc_worklist
- // for processing in split_unique_types(). Note,
- // following code may change scalar_replaceable value.
- alloc_worklist.append(n);
- }
- uint e_cnt = ptn->edge_count();
- for (uint ei = 0; ei < e_cnt; ei++) {
- uint npi = ptn->edge_target(ei);
- if (is_null_ptr(npi))
- continue;
- PointsToNode *np = ptnode_adr(npi);
- if (np->escape_state() < PointsToNode::NoEscape) {
- set_escape_state(npi, PointsToNode::NoEscape);
- if (!scalar_replaceable) {
- np->set_scalar_replaceable(false);
- }
- worklist.push(npi);
- } else if (np->scalar_replaceable() && !scalar_replaceable) {
- np->set_scalar_replaceable(false);
- worklist.push(npi);
- }
+ if ((int)C->unique() + 2*NodeLimitFudgeFactor > MaxNodeLimit) {
+ if (C->do_escape_analysis() == true && !C->failing()) {
+ // Retry compilation without escape analysis.
+ // If this is the first failure, the sentinel string will "stick"
+ // to the Compile object, and the C2Compiler will see it and retry.
+ C->record_failure(C2Compiler::retry_no_escape_analysis());
}
+ return NULL;
}
+ orig_phi_worklist.append_if_missing(orig_phi);
+ const TypePtr *atype = C->get_adr_type(alias_idx);
+ result = PhiNode::make(orig_phi->in(0), NULL, Type::MEMORY, atype);
+ C->copy_node_notes_to(result, orig_phi);
+ igvn->set_type(result, result->bottom_type());
+ record_for_optimizer(result);
+ set_map(orig_phi, result);
+ new_created = true;
+ return result;
+}
- _collecting = false;
- assert(C->unique() == nodes_size(), "there should be no new ideal nodes during ConnectionGraph build");
-
- assert(ptnode_adr(_oop_null)->escape_state() == PointsToNode::NoEscape &&
- ptnode_adr(_oop_null)->edge_count() == 0, "sanity");
- if (UseCompressedOops) {
- assert(ptnode_adr(_noop_null)->escape_state() == PointsToNode::NoEscape &&
- ptnode_adr(_noop_null)->edge_count() == 0, "sanity");
+//
+// Return a new version of Memory Phi "orig_phi" with the inputs having the
+// specified alias index.
+//
+PhiNode *ConnectionGraph::split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist) {
+ assert(alias_idx != Compile::AliasIdxBot, "can't split out bottom memory");
+ Compile *C = _compile;
+ PhaseGVN* igvn = _igvn;
+ bool new_phi_created;
+ PhiNode *result = create_split_phi(orig_phi, alias_idx, orig_phi_worklist, new_phi_created);
+ if (!new_phi_created) {
+ return result;
}
-
- if (EliminateLocks && has_non_escaping_obj) {
- // Mark locks before changing ideal graph.
- int cnt = C->macro_count();
- for( int i=0; i < cnt; i++ ) {
- Node *n = C->macro_node(i);
- if (n->is_AbstractLock()) { // Lock and Unlock nodes
- AbstractLockNode* alock = n->as_AbstractLock();
- if (!alock->is_non_esc_obj()) {
- PointsToNode::EscapeState es = escape_state(alock->obj_node());
- assert(es != PointsToNode::UnknownEscape, "should know");
- if (es != PointsToNode::UnknownEscape && es != PointsToNode::GlobalEscape) {
- assert(!alock->is_eliminated() || alock->is_coarsened(), "sanity");
- // The lock could be marked eliminated by lock coarsening
- // code during first IGVN before EA. Replace coarsened flag
- // to eliminate all associated locks/unlocks.
- alock->set_non_esc_obj();
- }
+ GrowableArray<PhiNode *> phi_list;
+ GrowableArray<uint> cur_input;
+ PhiNode *phi = orig_phi;
+ uint idx = 1;
+ bool finished = false;
+ while(!finished) {
+ while (idx < phi->req()) {
+ Node *mem = find_inst_mem(phi->in(idx), alias_idx, orig_phi_worklist);
+ if (mem != NULL && mem->is_Phi()) {
+ PhiNode *newphi = create_split_phi(mem->as_Phi(), alias_idx, orig_phi_worklist, new_phi_created);
+ if (new_phi_created) {
+ // found an phi for which we created a new split, push current one on worklist and begin
+ // processing new one
+ phi_list.push(phi);
+ cur_input.push(idx);
+ phi = mem->as_Phi();
+ result = newphi;
+ idx = 1;
+ continue;
+ } else {
+ mem = newphi;
}
}
+ if (C->failing()) {
+ return NULL;
+ }
+ result->set_req(idx++, mem);
}
- }
-
- if (OptimizePtrCompare && has_non_escaping_obj) {
- // Add ConI(#CC_GT) and ConI(#CC_EQ).
- _pcmp_neq = igvn->makecon(TypeInt::CC_GT);
- _pcmp_eq = igvn->makecon(TypeInt::CC_EQ);
- // Optimize objects compare.
- while (ptr_cmp_worklist.length() != 0) {
- Node *n = ptr_cmp_worklist.pop();
- Node *res = optimize_ptr_compare(n);
- if (res != NULL) {
-#ifndef PRODUCT
- if (PrintOptimizePtrCompare) {
- tty->print_cr("++++ Replaced: %d %s(%d,%d) --> %s", n->_idx, (n->Opcode() == Op_CmpP ? "CmpP" : "CmpN"), n->in(1)->_idx, n->in(2)->_idx, (res == _pcmp_eq ? "EQ" : "NotEQ"));
- if (Verbose) {
- n->dump(1);
- }
- }
+#ifdef ASSERT
+ // verify that the new Phi has an input for each input of the original
+ assert( phi->req() == result->req(), "must have same number of inputs.");
+ assert( result->in(0) != NULL && result->in(0) == phi->in(0), "regions must match");
#endif
- _igvn->replace_node(n, res);
- }
+ // Check if all new phi's inputs have specified alias index.
+ // Otherwise use old phi.
+ for (uint i = 1; i < phi->req(); i++) {
+ Node* in = result->in(i);
+ assert((phi->in(i) == NULL) == (in == NULL), "inputs must correspond.");
}
- // cleanup
- if (_pcmp_neq->outcnt() == 0)
- igvn->hash_delete(_pcmp_neq);
- if (_pcmp_eq->outcnt() == 0)
- igvn->hash_delete(_pcmp_eq);
- }
-
- // For MemBarStoreStore nodes added in library_call.cpp, check
- // escape status of associated AllocateNode and optimize out
- // MemBarStoreStore node if the allocated object never escapes.
- while (storestore_worklist.length() != 0) {
- Node *n = storestore_worklist.pop();
- MemBarStoreStoreNode *storestore = n ->as_MemBarStoreStore();
- Node *alloc = storestore->in(MemBarNode::Precedent)->in(0);
- assert (alloc->is_Allocate(), "storestore should point to AllocateNode");
- PointsToNode::EscapeState es = ptnode_adr(alloc->_idx)->escape_state();
- if (es == PointsToNode::NoEscape || es == PointsToNode::ArgEscape) {
- MemBarNode* mb = MemBarNode::make(C, Op_MemBarCPUOrder, Compile::AliasIdxBot);
- mb->init_req(TypeFunc::Memory, storestore->in(TypeFunc::Memory));
- mb->init_req(TypeFunc::Control, storestore->in(TypeFunc::Control));
-
- _igvn->register_new_node_with_optimizer(mb);
- _igvn->replace_node(storestore, mb);
+ // we have finished processing a Phi, see if there are any more to do
+ finished = (phi_list.length() == 0 );
+ if (!finished) {
+ phi = phi_list.pop();
+ idx = cur_input.pop();
+ PhiNode *prev_result = get_map_phi(phi->_idx);
+ prev_result->set_req(idx++, result);
+ result = prev_result;
}
}
+ return result;
+}
-#ifndef PRODUCT
- if (PrintEscapeAnalysis) {
- dump(); // Dump ConnectionGraph
- }
-#endif
-
- bool has_scalar_replaceable_candidates = false;
- alloc_length = alloc_worklist.length();
- for (uint next = 0; next < alloc_length; ++next) {
- Node* n = alloc_worklist.at(next);
- PointsToNode* ptn = ptnode_adr(n->_idx);
- assert(ptn->escape_state() == PointsToNode::NoEscape, "sanity");
- if (ptn->scalar_replaceable()) {
- has_scalar_replaceable_candidates = true;
- break;
- }
+//
+// The next methods are derived from methods in MemNode.
+//
+Node* ConnectionGraph::step_through_mergemem(MergeMemNode *mmem, int alias_idx, const TypeOopPtr *toop) {
+ Node *mem = mmem;
+ // TypeOopPtr::NOTNULL+any is an OOP with unknown offset - generally
+ // means an array I have not precisely typed yet. Do not do any
+ // alias stuff with it any time soon.
+ if (toop->base() != Type::AnyPtr &&
+ !(toop->klass() != NULL &&
+ toop->klass()->is_java_lang_Object() &&
+ toop->offset() == Type::OffsetBot)) {
+ mem = mmem->memory_at(alias_idx);
+ // Update input if it is progress over what we have now
}
+ return mem;
+}
- if ( has_scalar_replaceable_candidates &&
- C->AliasLevel() >= 3 && EliminateAllocations ) {
-
- // Now use the escape information to create unique types for
- // scalar replaceable objects.
- split_unique_types(alloc_worklist);
-
- if (C->failing()) return false;
-
- C->print_method("After Escape Analysis", 2);
+//
+// Move memory users to their memory slices.
+//
+void ConnectionGraph::move_inst_mem(Node* n, GrowableArray<PhiNode *> &orig_phis) {
+ Compile* C = _compile;
+ PhaseGVN* igvn = _igvn;
+ const TypePtr* tp = igvn->type(n->in(MemNode::Address))->isa_ptr();
+ assert(tp != NULL, "ptr type");
+ int alias_idx = C->get_alias_index(tp);
+ int general_idx = C->get_general_index(alias_idx);
-#ifdef ASSERT
- } else if (Verbose && (PrintEscapeAnalysis || PrintEliminateAllocations)) {
- tty->print("=== No allocations eliminated for ");
- C->method()->print_short_name();
- if(!EliminateAllocations) {
- tty->print(" since EliminateAllocations is off ===");
- } else if(!has_scalar_replaceable_candidates) {
- tty->print(" since there are no scalar replaceable candidates ===");
- } else if(C->AliasLevel() < 3) {
- tty->print(" since AliasLevel < 3 ===");
- }
- tty->cr();
+ // Move users first
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node* use = n->fast_out(i);
+ if (use->is_MergeMem()) {
+ MergeMemNode* mmem = use->as_MergeMem();
+ assert(n == mmem->memory_at(alias_idx), "should be on instance memory slice");
+ if (n != mmem->memory_at(general_idx) || alias_idx == general_idx) {
+ continue; // Nothing to do
+ }
+ // Replace previous general reference to mem node.
+ uint orig_uniq = C->unique();
+ Node* m = find_inst_mem(n, general_idx, orig_phis);
+ assert(orig_uniq == C->unique(), "no new nodes");
+ mmem->set_memory_at(general_idx, m);
+ --imax;
+ --i;
+ } else if (use->is_MemBar()) {
+ assert(!use->is_Initialize(), "initializing stores should not be moved");
+ if (use->req() > MemBarNode::Precedent &&
+ use->in(MemBarNode::Precedent) == n) {
+ // Don't move related membars.
+ record_for_optimizer(use);
+ continue;
+ }
+ tp = use->as_MemBar()->adr_type()->isa_ptr();
+ if (tp != NULL && C->get_alias_index(tp) == alias_idx ||
+ alias_idx == general_idx) {
+ continue; // Nothing to do
+ }
+ // Move to general memory slice.
+ uint orig_uniq = C->unique();
+ Node* m = find_inst_mem(n, general_idx, orig_phis);
+ assert(orig_uniq == C->unique(), "no new nodes");
+ igvn->hash_delete(use);
+ imax -= use->replace_edge(n, m);
+ igvn->hash_insert(use);
+ record_for_optimizer(use);
+ --i;
+#ifdef ASSERT
+ } else if (use->is_Mem()) {
+ if (use->Opcode() == Op_StoreCM && use->in(MemNode::OopStore) == n) {
+ // Don't move related cardmark.
+ continue;
+ }
+ // Memory nodes should have new memory input.
+ tp = igvn->type(use->in(MemNode::Address))->isa_ptr();
+ assert(tp != NULL, "ptr type");
+ int idx = C->get_alias_index(tp);
+ assert(get_map(use->_idx) != NULL || idx == alias_idx,
+ "Following memory nodes should have new memory input or be on the same memory slice");
+ } else if (use->is_Phi()) {
+ // Phi nodes should be split and moved already.
+ tp = use->as_Phi()->adr_type()->isa_ptr();
+ assert(tp != NULL, "ptr type");
+ int idx = C->get_alias_index(tp);
+ assert(idx == alias_idx, "Following Phi nodes should be on the same memory slice");
+ } else {
+ use->dump();
+ assert(false, "should not be here");
#endif
+ }
}
- return has_non_escaping_obj;
}
-// Find fields initializing values for allocations.
-void ConnectionGraph::find_init_values(Node* alloc, VectorSet* visited, PhaseTransform* phase) {
- assert(alloc->is_Allocate(), "Should be called for Allocate nodes only");
- PointsToNode* pta = ptnode_adr(alloc->_idx);
- assert(pta->escape_state() == PointsToNode::NoEscape, "Not escaped Allocate nodes only");
- InitializeNode* ini = alloc->as_Allocate()->initialization();
-
+//
+// Search memory chain of "mem" to find a MemNode whose address
+// is the specified alias index.
+//
+Node* ConnectionGraph::find_inst_mem(Node *orig_mem, int alias_idx, GrowableArray<PhiNode *> &orig_phis) {
+ if (orig_mem == NULL)
+ return orig_mem;
Compile* C = _compile;
- visited->Reset();
- // Check if a oop field's initializing value is recorded and add
- // a corresponding NULL field's value if it is not recorded.
- // Connection Graph does not record a default initialization by NULL
- // captured by Initialize node.
- //
- uint null_idx = UseCompressedOops ? _noop_null : _oop_null;
- uint ae_cnt = pta->edge_count();
- bool visited_bottom_offset = false;
- for (uint ei = 0; ei < ae_cnt; ei++) {
- uint nidx = pta->edge_target(ei); // Field (AddP)
- PointsToNode* ptn = ptnode_adr(nidx);
- assert(ptn->_node->is_AddP(), "Should be AddP nodes only");
- int offset = ptn->offset();
- if (offset == Type::OffsetBot) {
- if (!visited_bottom_offset) {
- visited_bottom_offset = true;
- // Check only oop fields.
- const Type* adr_type = ptn->_node->as_AddP()->bottom_type();
- if (!adr_type->isa_aryptr() ||
- (adr_type->isa_aryptr()->klass() == NULL) ||
- adr_type->isa_aryptr()->klass()->is_obj_array_klass()) {
- // OffsetBot is used to reference array's element,
- // always add reference to NULL since we don't
- // known which element is referenced.
- add_edge_from_fields(alloc->_idx, null_idx, offset);
- }
+ PhaseGVN* igvn = _igvn;
+ const TypeOopPtr *toop = C->get_adr_type(alias_idx)->isa_oopptr();
+ bool is_instance = (toop != NULL) && toop->is_known_instance();
+ Node *start_mem = C->start()->proj_out(TypeFunc::Memory);
+ Node *prev = NULL;
+ Node *result = orig_mem;
+ while (prev != result) {
+ prev = result;
+ if (result == start_mem)
+ break; // hit one of our sentinels
+ if (result->is_Mem()) {
+ const Type *at = igvn->type(result->in(MemNode::Address));
+ if (at == Type::TOP)
+ break; // Dead
+ assert (at->isa_ptr() != NULL, "pointer type required.");
+ int idx = C->get_alias_index(at->is_ptr());
+ if (idx == alias_idx)
+ break; // Found
+ if (!is_instance && (at->isa_oopptr() == NULL ||
+ !at->is_oopptr()->is_known_instance())) {
+ break; // Do not skip store to general memory slice.
}
- } else if (offset != oopDesc::klass_offset_in_bytes() &&
- !visited->test_set(offset)) {
-
- // Check only oop fields.
- const Type* adr_type = ptn->_node->as_AddP()->bottom_type();
- BasicType basic_field_type = T_INT;
- if (adr_type->isa_instptr()) {
- ciField* field = C->alias_type(adr_type->isa_instptr())->field();
- if (field != NULL) {
- basic_field_type = field->layout_type();
- } else {
- // Ignore non field load (for example, klass load)
+ result = result->in(MemNode::Memory);
+ }
+ if (!is_instance)
+ continue; // don't search further for non-instance types
+ // skip over a call which does not affect this memory slice
+ if (result->is_Proj() && result->as_Proj()->_con == TypeFunc::Memory) {
+ Node *proj_in = result->in(0);
+ if (proj_in->is_Allocate() && proj_in->_idx == (uint)toop->instance_id()) {
+ break; // hit one of our sentinels
+ } else if (proj_in->is_Call()) {
+ CallNode *call = proj_in->as_Call();
+ if (!call->may_modify(toop, igvn)) {
+ result = call->in(TypeFunc::Memory);
}
- } else if (adr_type->isa_aryptr()) {
- if (offset != arrayOopDesc::length_offset_in_bytes()) {
- const Type* elemtype = adr_type->isa_aryptr()->elem();
- basic_field_type = elemtype->array_element_basic_type();
- } else {
- // Ignore array length load
+ } else if (proj_in->is_Initialize()) {
+ AllocateNode* alloc = proj_in->as_Initialize()->allocation();
+ // Stop if this is the initialization for the object instance which
+ // which contains this memory slice, otherwise skip over it.
+ if (alloc == NULL || alloc->_idx != (uint)toop->instance_id()) {
+ result = proj_in->in(TypeFunc::Memory);
}
-#ifdef ASSERT
- } else {
- // Raw pointers are used for initializing stores so skip it
- // since it should be recorded already
- Node* base = get_addp_base(ptn->_node);
- assert(adr_type->isa_rawptr() && base->is_Proj() &&
- (base->in(0) == alloc),"unexpected pointer type");
-#endif
+ } else if (proj_in->is_MemBar()) {
+ result = proj_in->in(TypeFunc::Memory);
}
- if (basic_field_type == T_OBJECT ||
- basic_field_type == T_NARROWOOP ||
- basic_field_type == T_ARRAY) {
- Node* value = NULL;
- if (ini != NULL) {
- BasicType ft = UseCompressedOops ? T_NARROWOOP : T_OBJECT;
- Node* store = ini->find_captured_store(offset, type2aelembytes(ft), phase);
- if (store != NULL && store->is_Store()) {
- value = store->in(MemNode::ValueIn);
- } else if (ptn->edge_count() > 0) { // Are there oop stores?
- // Check for a store which follows allocation without branches.
- // For example, a volatile field store is not collected
- // by Initialize node. TODO: it would be nice to use idom() here.
- //
- // Search all references to the same field which use different
- // AddP nodes, for example, in the next case:
- //
- // Point p[] = new Point[1];
- // if ( x ) { p[0] = new Point(); p[0].x = x; }
- // if ( p[0] != null ) { y = p[0].x; } // has CastPP
- //
- for (uint next = ei; (next < ae_cnt) && (value == NULL); next++) {
- uint fpi = pta->edge_target(next); // Field (AddP)
- PointsToNode *ptf = ptnode_adr(fpi);
- if (ptf->offset() == offset) {
- Node* nf = ptf->_node;
- for (DUIterator_Fast imax, i = nf->fast_outs(imax); i < imax; i++) {
- store = nf->fast_out(i);
- if (store->is_Store() && store->in(0) != NULL) {
- Node* ctrl = store->in(0);
- while(!(ctrl == ini || ctrl == alloc || ctrl == NULL ||
- ctrl == C->root() || ctrl == C->top() || ctrl->is_Region() ||
- ctrl->is_IfTrue() || ctrl->is_IfFalse())) {
- ctrl = ctrl->in(0);
- }
- if (ctrl == ini || ctrl == alloc) {
- value = store->in(MemNode::ValueIn);
- break;
- }
- }
- }
- }
- }
- }
- }
- if (value == NULL || value != ptnode_adr(value->_idx)->_node) {
- // A field's initializing value was not recorded. Add NULL.
- add_edge_from_fields(alloc->_idx, null_idx, offset);
+ } else if (result->is_MergeMem()) {
+ MergeMemNode *mmem = result->as_MergeMem();
+ result = step_through_mergemem(mmem, alias_idx, toop);
+ if (result == mmem->base_memory()) {
+ // Didn't find instance memory, search through general slice recursively.
+ result = mmem->memory_at(C->get_general_index(alias_idx));
+ result = find_inst_mem(result, alias_idx, orig_phis);
+ if (C->failing()) {
+ return NULL;
}
+ mmem->set_memory_at(alias_idx, result);
+ }
+ } else if (result->is_Phi() &&
+ C->get_alias_index(result->as_Phi()->adr_type()) != alias_idx) {
+ Node *un = result->as_Phi()->unique_input(igvn);
+ if (un != NULL) {
+ orig_phis.append_if_missing(result->as_Phi());
+ result = un;
+ } else {
+ break;
+ }
+ } else if (result->is_ClearArray()) {
+ if (!ClearArrayNode::step_through(&result, (uint)toop->instance_id(), igvn)) {
+ // Can not bypass initialization of the instance
+ // we are looking for.
+ break;
+ }
+ // Otherwise skip it (the call updated 'result' value).
+ } else if (result->Opcode() == Op_SCMemProj) {
+ assert(result->in(0)->is_LoadStore(), "sanity");
+ const Type *at = igvn->type(result->in(0)->in(MemNode::Address));
+ if (at != Type::TOP) {
+ assert (at->isa_ptr() != NULL, "pointer type required.");
+ int idx = C->get_alias_index(at->is_ptr());
+ assert(idx != alias_idx, "Object is not scalar replaceable if a LoadStore node access its field");
+ break;
}
+ result = result->in(0)->in(MemNode::Memory);
}
}
-}
-
-// Adjust escape state after Connection Graph is built.
-void ConnectionGraph::adjust_escape_state(Node* n) {
- PointsToNode* ptn = ptnode_adr(n->_idx);
- assert(n->is_AddP(), "Should be called for AddP nodes only");
- // Search for objects which are not scalar replaceable
- // and mark them to propagate the state to referenced objects.
- //
-
- int offset = ptn->offset();
- Node* base = get_addp_base(n);
- VectorSet* ptset = PointsTo(base);
- int ptset_size = ptset->Size();
-
- // An object is not scalar replaceable if the field which may point
- // to it has unknown offset (unknown element of an array of objects).
- //
-
- if (offset == Type::OffsetBot) {
- uint e_cnt = ptn->edge_count();
- for (uint ei = 0; ei < e_cnt; ei++) {
- uint npi = ptn->edge_target(ei);
- ptnode_adr(npi)->set_scalar_replaceable(false);
+ if (result->is_Phi()) {
+ PhiNode *mphi = result->as_Phi();
+ assert(mphi->bottom_type() == Type::MEMORY, "memory phi required");
+ const TypePtr *t = mphi->adr_type();
+ if (!is_instance) {
+ // Push all non-instance Phis on the orig_phis worklist to update inputs
+ // during Phase 4 if needed.
+ orig_phis.append_if_missing(mphi);
+ } else if (C->get_alias_index(t) != alias_idx) {
+ // Create a new Phi with the specified alias index type.
+ result = split_memory_phi(mphi, alias_idx, orig_phis);
}
}
+ // the result is either MemNode, PhiNode, InitializeNode.
+ return result;
+}
+
+//
+// Convert the types of unescaped object to instance types where possible,
+// propagate the new type information through the graph, and update memory
+// edges and MergeMem inputs to reflect the new type.
+//
+// We start with allocations (and calls which may be allocations) on alloc_worklist.
+// The processing is done in 4 phases:
+//
+// Phase 1: Process possible allocations from alloc_worklist. Create instance
+// types for the CheckCastPP for allocations where possible.
+// Propagate the the new types through users as follows:
+// casts and Phi: push users on alloc_worklist
+// AddP: cast Base and Address inputs to the instance type
+// push any AddP users on alloc_worklist and push any memnode
+// users onto memnode_worklist.
+// Phase 2: Process MemNode's from memnode_worklist. compute new address type and
+// search the Memory chain for a store with the appropriate type
+// address type. If a Phi is found, create a new version with
+// the appropriate memory slices from each of the Phi inputs.
+// For stores, process the users as follows:
+// MemNode: push on memnode_worklist
+// MergeMem: push on mergemem_worklist
+// Phase 3: Process MergeMem nodes from mergemem_worklist. Walk each memory slice
+// moving the first node encountered of each instance type to the
+// the input corresponding to its alias index.
+// appropriate memory slice.
+// Phase 4: Update the inputs of non-instance memory Phis and the Memory input of memnodes.
+//
+// In the following example, the CheckCastPP nodes are the cast of allocation
+// results and the allocation of node 29 is unescaped and eligible to be an
+// instance type.
+//
+// We start with:
+//
+// 7 Parm #memory
+// 10 ConI "12"
+// 19 CheckCastPP "Foo"
+// 20 AddP _ 19 19 10 Foo+12 alias_index=4
+// 29 CheckCastPP "Foo"
+// 30 AddP _ 29 29 10 Foo+12 alias_index=4
+//
+// 40 StoreP 25 7 20 ... alias_index=4
+// 50 StoreP 35 40 30 ... alias_index=4
+// 60 StoreP 45 50 20 ... alias_index=4
+// 70 LoadP _ 60 30 ... alias_index=4
+// 80 Phi 75 50 60 Memory alias_index=4
+// 90 LoadP _ 80 30 ... alias_index=4
+// 100 LoadP _ 80 20 ... alias_index=4
+//
+//
+// Phase 1 creates an instance type for node 29 assigning it an instance id of 24
+// and creating a new alias index for node 30. This gives:
+//
+// 7 Parm #memory
+// 10 ConI "12"
+// 19 CheckCastPP "Foo"
+// 20 AddP _ 19 19 10 Foo+12 alias_index=4
+// 29 CheckCastPP "Foo" iid=24
+// 30 AddP _ 29 29 10 Foo+12 alias_index=6 iid=24
+//
+// 40 StoreP 25 7 20 ... alias_index=4
+// 50 StoreP 35 40 30 ... alias_index=6
+// 60 StoreP 45 50 20 ... alias_index=4
+// 70 LoadP _ 60 30 ... alias_index=6
+// 80 Phi 75 50 60 Memory alias_index=4
+// 90 LoadP _ 80 30 ... alias_index=6
+// 100 LoadP _ 80 20 ... alias_index=4
+//
+// In phase 2, new memory inputs are computed for the loads and stores,
+// And a new version of the phi is created. In phase 4, the inputs to
+// node 80 are updated and then the memory nodes are updated with the
+// values computed in phase 2. This results in:
+//
+// 7 Parm #memory
+// 10 ConI "12"
+// 19 CheckCastPP "Foo"
+// 20 AddP _ 19 19 10 Foo+12 alias_index=4
+// 29 CheckCastPP "Foo" iid=24
+// 30 AddP _ 29 29 10 Foo+12 alias_index=6 iid=24
+//
+// 40 StoreP 25 7 20 ... alias_index=4
+// 50 StoreP 35 7 30 ... alias_index=6
+// 60 StoreP 45 40 20 ... alias_index=4
+// 70 LoadP _ 50 30 ... alias_index=6
+// 80 Phi 75 40 60 Memory alias_index=4
+// 120 Phi 75 50 50 Memory alias_index=6
+// 90 LoadP _ 120 30 ... alias_index=6
+// 100 LoadP _ 80 20 ... alias_index=4
+//
+void ConnectionGraph::split_unique_types(GrowableArray<Node *> &alloc_worklist) {
+ GrowableArray<Node *> memnode_worklist;
+ GrowableArray<PhiNode *> orig_phis;
+ PhaseIterGVN *igvn = _igvn;
+ uint new_index_start = (uint) _compile->num_alias_types();
+ Arena* arena = Thread::current()->resource_area();
+ VectorSet visited(arena);
+ ideal_nodes.clear(); // Reset for use with set_map/get_map.
+ uint unique_old = _compile->unique();
- // Currently an object is not scalar replaceable if a LoadStore node
- // access its field since the field value is unknown after it.
- //
- bool has_LoadStore = false;
- for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
- Node *use = n->fast_out(i);
- if (use->is_LoadStore()) {
- has_LoadStore = true;
- break;
- }
- }
- // An object is not scalar replaceable if the address points
- // to unknown field (unknown element for arrays, offset is OffsetBot).
- //
- // Or the address may point to more then one object. This may produce
- // the false positive result (set not scalar replaceable)
- // since the flow-insensitive escape analysis can't separate
- // the case when stores overwrite the field's value from the case
- // when stores happened on different control branches.
- //
- // Note: it will disable scalar replacement in some cases:
- //
- // Point p[] = new Point[1];
- // p[0] = new Point(); // Will be not scalar replaced
- //
- // but it will save us from incorrect optimizations in next cases:
+ // Phase 1: Process possible allocations from alloc_worklist.
+ // Create instance types for the CheckCastPP for allocations where possible.
//
- // Point p[] = new Point[1];
- // if ( x ) p[0] = new Point(); // Will be not scalar replaced
+ // (Note: don't forget to change the order of the second AddP node on
+ // the alloc_worklist if the order of the worklist processing is changed,
+ // see the comment in find_second_addp().)
//
- if (ptset_size > 1 || ptset_size != 0 &&
- (has_LoadStore || offset == Type::OffsetBot)) {
- for( VectorSetI j(ptset); j.test(); ++j ) {
- ptnode_adr(j.elem)->set_scalar_replaceable(false);
- }
- }
-}
-
-// Propagate escape states to referenced nodes.
-bool ConnectionGraph::propagate_escape_state(GrowableArray<int>* cg_worklist,
- GrowableArray<uint>* worklist,
- PointsToNode::EscapeState esc_state) {
- bool has_java_obj = false;
-
- // push all nodes with the same escape state on the worklist
- uint cg_length = cg_worklist->length();
- for (uint next = 0; next < cg_length; ++next) {
- int nk = cg_worklist->at(next);
- if (ptnode_adr(nk)->escape_state() == esc_state)
- worklist->push(nk);
- }
- // mark all reachable nodes
- while (worklist->length() > 0) {
- int pt = worklist->pop();
- PointsToNode* ptn = ptnode_adr(pt);
- if (ptn->node_type() == PointsToNode::JavaObject &&
- !is_null_ptr(pt)) {
- has_java_obj = true;
- if (esc_state > PointsToNode::NoEscape) {
- // fields values are unknown if object escapes
- add_edge_from_fields(pt, _phantom_object, Type::OffsetBot);
- }
- }
- uint e_cnt = ptn->edge_count();
- for (uint ei = 0; ei < e_cnt; ei++) {
- uint npi = ptn->edge_target(ei);
- if (is_null_ptr(npi))
+ while (alloc_worklist.length() != 0) {
+ Node *n = alloc_worklist.pop();
+ uint ni = n->_idx;
+ if (n->is_Call()) {
+ CallNode *alloc = n->as_Call();
+ // copy escape information to call node
+ PointsToNode* ptn = ptnode_adr(alloc->_idx);
+ PointsToNode::EscapeState es = ptn->escape_state();
+ // We have an allocation or call which returns a Java object,
+ // see if it is unescaped.
+ if (es != PointsToNode::NoEscape || !ptn->scalar_replaceable())
+ continue;
+ // Find CheckCastPP for the allocate or for the return value of a call
+ n = alloc->result_cast();
+ if (n == NULL) { // No uses except Initialize node
+ if (alloc->is_Allocate()) {
+ // Set the scalar_replaceable flag for allocation
+ // so it could be eliminated if it has no uses.
+ alloc->as_Allocate()->_is_scalar_replaceable = true;
+ }
continue;
- PointsToNode *np = ptnode_adr(npi);
- if (np->escape_state() < esc_state) {
- set_escape_state(npi, esc_state);
- worklist->push(npi);
- }
- }
- }
- // Has not escaping java objects
- return has_java_obj && (esc_state < PointsToNode::GlobalEscape);
-}
-
-// Optimize objects compare.
-Node* ConnectionGraph::optimize_ptr_compare(Node* n) {
- assert(OptimizePtrCompare, "sanity");
- // Clone returned Set since PointsTo() returns pointer
- // to the same structure ConnectionGraph.pt_ptset.
- VectorSet ptset1 = *PointsTo(n->in(1));
- VectorSet ptset2 = *PointsTo(n->in(2));
-
- // Check simple cases first.
- if (ptset1.Size() == 1) {
- uint pt1 = ptset1.getelem();
- PointsToNode* ptn1 = ptnode_adr(pt1);
- if (ptn1->escape_state() == PointsToNode::NoEscape) {
- if (ptset2.Size() == 1 && ptset2.getelem() == pt1) {
- // Comparing the same not escaping object.
- return _pcmp_eq;
- }
- Node* obj = ptn1->_node;
- // Comparing not escaping allocation.
- if ((obj->is_Allocate() || obj->is_CallStaticJava()) &&
- !ptset2.test(pt1)) {
- return _pcmp_neq; // This includes nullness check.
- }
- }
- } else if (ptset2.Size() == 1) {
- uint pt2 = ptset2.getelem();
- PointsToNode* ptn2 = ptnode_adr(pt2);
- if (ptn2->escape_state() == PointsToNode::NoEscape) {
- Node* obj = ptn2->_node;
- // Comparing not escaping allocation.
- if ((obj->is_Allocate() || obj->is_CallStaticJava()) &&
- !ptset1.test(pt2)) {
- return _pcmp_neq; // This includes nullness check.
- }
- }
- }
-
- if (!ptset1.disjoint(ptset2)) {
- return NULL; // Sets are not disjoint
- }
-
- // Sets are disjoint.
- bool set1_has_unknown_ptr = ptset1.test(_phantom_object) != 0;
- bool set2_has_unknown_ptr = ptset2.test(_phantom_object) != 0;
- bool set1_has_null_ptr = (ptset1.test(_oop_null) | ptset1.test(_noop_null)) != 0;
- bool set2_has_null_ptr = (ptset2.test(_oop_null) | ptset2.test(_noop_null)) != 0;
-
- if (set1_has_unknown_ptr && set2_has_null_ptr ||
- set2_has_unknown_ptr && set1_has_null_ptr) {
- // Check nullness of unknown object.
- return NULL;
- }
-
- // Disjointness by itself is not sufficient since
- // alias analysis is not complete for escaped objects.
- // Disjoint sets are definitely unrelated only when
- // at least one set has only not escaping objects.
- if (!set1_has_unknown_ptr && !set1_has_null_ptr) {
- bool has_only_non_escaping_alloc = true;
- for (VectorSetI i(&ptset1); i.test(); ++i) {
- uint pt = i.elem;
- PointsToNode* ptn = ptnode_adr(pt);
- Node* obj = ptn->_node;
- if (ptn->escape_state() != PointsToNode::NoEscape ||
- !(obj->is_Allocate() || obj->is_CallStaticJava())) {
- has_only_non_escaping_alloc = false;
- break;
}
- }
- if (has_only_non_escaping_alloc) {
- return _pcmp_neq;
- }
- }
- if (!set2_has_unknown_ptr && !set2_has_null_ptr) {
- bool has_only_non_escaping_alloc = true;
- for (VectorSetI i(&ptset2); i.test(); ++i) {
- uint pt = i.elem;
- PointsToNode* ptn = ptnode_adr(pt);
- Node* obj = ptn->_node;
- if (ptn->escape_state() != PointsToNode::NoEscape ||
- !(obj->is_Allocate() || obj->is_CallStaticJava())) {
- has_only_non_escaping_alloc = false;
- break;
+ if (!n->is_CheckCastPP()) { // not unique CheckCastPP.
+ assert(!alloc->is_Allocate(), "allocation should have unique type");
+ continue;
}
- }
- if (has_only_non_escaping_alloc) {
- return _pcmp_neq;
- }
- }
- return NULL;
-}
-void ConnectionGraph::process_call_arguments(CallNode *call, PhaseTransform *phase) {
- bool is_arraycopy = false;
- switch (call->Opcode()) {
-#ifdef ASSERT
- case Op_Allocate:
- case Op_AllocateArray:
- case Op_Lock:
- case Op_Unlock:
- assert(false, "should be done already");
- break;
-#endif
- case Op_CallLeafNoFP:
- is_arraycopy = (call->as_CallLeaf()->_name != NULL &&
- strstr(call->as_CallLeaf()->_name, "arraycopy") != 0);
- // fall through
- case Op_CallLeaf:
- {
- // Stub calls, objects do not escape but they are not scale replaceable.
- // Adjust escape state for outgoing arguments.
- const TypeTuple * d = call->tf()->domain();
- bool src_has_oops = false;
- for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
- const Type* at = d->field_at(i);
- Node *arg = call->in(i)->uncast();
- const Type *aat = phase->type(arg);
- PointsToNode::EscapeState arg_esc = ptnode_adr(arg->_idx)->escape_state();
- if (!arg->is_top() && at->isa_ptr() && aat->isa_ptr() &&
- (is_arraycopy || arg_esc < PointsToNode::ArgEscape)) {
-
- assert(aat == Type::TOP || aat == TypePtr::NULL_PTR ||
- aat->isa_ptr() != NULL, "expecting an Ptr");
- bool arg_has_oops = aat->isa_oopptr() &&
- (aat->isa_oopptr()->klass() == NULL || aat->isa_instptr() ||
- (aat->isa_aryptr() && aat->isa_aryptr()->klass()->is_obj_array_klass()));
- if (i == TypeFunc::Parms) {
- src_has_oops = arg_has_oops;
- }
- //
- // src or dst could be j.l.Object when other is basic type array:
- //
- // arraycopy(char[],0,Object*,0,size);
- // arraycopy(Object*,0,char[],0,size);
- //
- // Don't add edges from dst's fields in such cases.
- //
- bool arg_is_arraycopy_dest = src_has_oops && is_arraycopy &&
- arg_has_oops && (i > TypeFunc::Parms);
-#ifdef ASSERT
- if (!(is_arraycopy ||
- call->as_CallLeaf()->_name != NULL &&
- (strcmp(call->as_CallLeaf()->_name, "g1_wb_pre") == 0 ||
- strcmp(call->as_CallLeaf()->_name, "g1_wb_post") == 0 ))
- ) {
- call->dump();
- assert(false, "EA: unexpected CallLeaf");
- }
-#endif
- // Always process arraycopy's destination object since
- // we need to add all possible edges to references in
- // source object.
- if (arg_esc >= PointsToNode::ArgEscape &&
- !arg_is_arraycopy_dest) {
- continue;
- }
- set_escape_state(arg->_idx, PointsToNode::ArgEscape);
- Node* arg_base = arg;
- if (arg->is_AddP()) {
- //
- // The inline_native_clone() case when the arraycopy stub is called
- // after the allocation before Initialize and CheckCastPP nodes.
- // Or normal arraycopy for object arrays case.
- //
- // Set AddP's base (Allocate) as not scalar replaceable since
- // pointer to the base (with offset) is passed as argument.
- //
- arg_base = get_addp_base(arg);
- }
- VectorSet argset = *PointsTo(arg_base); // Clone set
- for( VectorSetI j(&argset); j.test(); ++j ) {
- uint pd = j.elem; // Destination object
- set_escape_state(pd, PointsToNode::ArgEscape);
-
- if (arg_is_arraycopy_dest) {
- PointsToNode* ptd = ptnode_adr(pd);
- // Conservatively reference an unknown object since
- // not all source's fields/elements may be known.
- add_edge_from_fields(pd, _phantom_object, Type::OffsetBot);
-
- Node *src = call->in(TypeFunc::Parms)->uncast();
- Node* src_base = src;
- if (src->is_AddP()) {
- src_base = get_addp_base(src);
- }
- // Create edges from destination's fields to
- // everything known source's fields could point to.
- for( VectorSetI s(PointsTo(src_base)); s.test(); ++s ) {
- uint ps = s.elem;
- bool has_bottom_offset = false;
- for (uint fd = 0; fd < ptd->edge_count(); fd++) {
- assert(ptd->edge_type(fd) == PointsToNode::FieldEdge, "expecting a field edge");
- int fdi = ptd->edge_target(fd);
- PointsToNode* pfd = ptnode_adr(fdi);
- int offset = pfd->offset();
- if (offset == Type::OffsetBot)
- has_bottom_offset = true;
- assert(offset != -1, "offset should be set");
- add_deferred_edge_to_fields(fdi, ps, offset);
- }
- // Destination object may not have access (no field edge)
- // to fields which are accessed in source object.
- // As result no edges will be created to those source's
- // fields and escape state of destination object will
- // not be propagated to those fields.
- //
- // Mark source object as global escape except in
- // the case with Type::OffsetBot field (which is
- // common case for array elements access) when
- // edges are created to all source's fields.
- if (!has_bottom_offset) {
- set_escape_state(ps, PointsToNode::GlobalEscape);
- }
- }
- }
+ // The inline code for Object.clone() casts the allocation result to
+ // java.lang.Object and then to the actual type of the allocated
+ // object. Detect this case and use the second cast.
+ // Also detect j.l.reflect.Array.newInstance(jobject, jint) case when
+ // the allocation result is cast to java.lang.Object and then
+ // to the actual Array type.
+ if (alloc->is_Allocate() && n->as_Type()->type() == TypeInstPtr::NOTNULL
+ && (alloc->is_AllocateArray() ||
+ igvn->type(alloc->in(AllocateNode::KlassNode)) != TypeKlassPtr::OBJECT)) {
+ Node *cast2 = NULL;
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node *use = n->fast_out(i);
+ if (use->is_CheckCastPP()) {
+ cast2 = use;
+ break;
}
}
+ if (cast2 != NULL) {
+ n = cast2;
+ } else {
+ // Non-scalar replaceable if the allocation type is unknown statically
+ // (reflection allocation), the object can't be restored during
+ // deoptimization without precise type.
+ continue;
+ }
}
- break;
- }
-
- case Op_CallStaticJava:
- // For a static call, we know exactly what method is being called.
- // Use bytecode estimator to record the call's escape affects
- {
- ciMethod *meth = call->as_CallJava()->method();
- BCEscapeAnalyzer *call_analyzer = (meth !=NULL) ? meth->get_bcea() : NULL;
- // fall-through if not a Java method or no analyzer information
- if (call_analyzer != NULL) {
- const TypeTuple * d = call->tf()->domain();
- bool copy_dependencies = false;
- for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
- const Type* at = d->field_at(i);
- int k = i - TypeFunc::Parms;
- Node *arg = call->in(i)->uncast();
-
- if (at->isa_oopptr() != NULL &&
- ptnode_adr(arg->_idx)->escape_state() < PointsToNode::GlobalEscape) {
-
- bool global_escapes = false;
- bool fields_escapes = false;
- if (!call_analyzer->is_arg_stack(k)) {
- // The argument global escapes, mark everything it could point to
- set_escape_state(arg->_idx, PointsToNode::GlobalEscape);
- global_escapes = true;
- } else {
- if (!call_analyzer->is_arg_local(k)) {
- // The argument itself doesn't escape, but any fields might
- fields_escapes = true;
- }
- set_escape_state(arg->_idx, PointsToNode::ArgEscape);
- copy_dependencies = true;
- }
+ if (alloc->is_Allocate()) {
+ // Set the scalar_replaceable flag for allocation
+ // so it could be eliminated.
+ alloc->as_Allocate()->_is_scalar_replaceable = true;
+ }
+ set_escape_state(ptnode_adr(n->_idx), es); // CheckCastPP escape state
+ // in order for an object to be scalar-replaceable, it must be:
+ // - a direct allocation (not a call returning an object)
+ // - non-escaping
+ // - eligible to be a unique type
+ // - not determined to be ineligible by escape analysis
+ set_map(alloc, n);
+ set_map(n, alloc);
+ const TypeOopPtr *t = igvn->type(n)->isa_oopptr();
+ if (t == NULL)
+ continue; // not a TypeOopPtr
+ const TypeOopPtr* tinst = t->cast_to_exactness(true)->is_oopptr()->cast_to_instance_id(ni);
+ igvn->hash_delete(n);
+ igvn->set_type(n, tinst);
+ n->raise_bottom_type(tinst);
+ igvn->hash_insert(n);
+ record_for_optimizer(n);
+ if (alloc->is_Allocate() && (t->isa_instptr() || t->isa_aryptr())) {
- for( VectorSetI j(PointsTo(arg)); j.test(); ++j ) {
- uint pt = j.elem;
- if (global_escapes) {
- // The argument global escapes, mark everything it could point to
- set_escape_state(pt, PointsToNode::GlobalEscape);
- add_edge_from_fields(pt, _phantom_object, Type::OffsetBot);
- } else {
- set_escape_state(pt, PointsToNode::ArgEscape);
- if (fields_escapes) {
- // The argument itself doesn't escape, but any fields might.
- // Use OffsetTop to indicate such case.
- add_edge_from_fields(pt, _phantom_object, Type::OffsetTop);
- }
- }
+ // First, put on the worklist all Field edges from Connection Graph
+ // which is more accurate then putting immediate users from Ideal Graph.
+ for (EdgeIterator e(ptn); e.has_next(); e.next()) {
+ PointsToNode* tgt = e.get();
+ Node* use = tgt->ideal_node();
+ assert(tgt->is_Field() && use->is_AddP(),
+ "only AddP nodes are Field edges in CG");
+ if (use->outcnt() > 0) { // Don't process dead nodes
+ Node* addp2 = find_second_addp(use, use->in(AddPNode::Base));
+ if (addp2 != NULL) {
+ assert(alloc->is_AllocateArray(),"array allocation was expected");
+ alloc_worklist.append_if_missing(addp2);
}
+ alloc_worklist.append_if_missing(use);
}
}
- if (copy_dependencies)
- call_analyzer->copy_dependencies(_compile->dependencies());
- break;
- }
- }
- default:
- // Fall-through here if not a Java method or no analyzer information
- // or some other type of call, assume the worst case: all arguments
- // globally escape.
- {
- // adjust escape state for outgoing arguments
- const TypeTuple * d = call->tf()->domain();
- for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
- const Type* at = d->field_at(i);
- if (at->isa_oopptr() != NULL) {
- Node *arg = call->in(i)->uncast();
- set_escape_state(arg->_idx, PointsToNode::GlobalEscape);
- for( VectorSetI j(PointsTo(arg)); j.test(); ++j ) {
- uint pt = j.elem;
- set_escape_state(pt, PointsToNode::GlobalEscape);
- add_edge_from_fields(pt, _phantom_object, Type::OffsetBot);
+ // An allocation may have an Initialize which has raw stores. Scan
+ // the users of the raw allocation result and push AddP users
+ // on alloc_worklist.
+ Node *raw_result = alloc->proj_out(TypeFunc::Parms);
+ assert (raw_result != NULL, "must have an allocation result");
+ for (DUIterator_Fast imax, i = raw_result->fast_outs(imax); i < imax; i++) {
+ Node *use = raw_result->fast_out(i);
+ if (use->is_AddP() && use->outcnt() > 0) { // Don't process dead nodes
+ Node* addp2 = find_second_addp(use, raw_result);
+ if (addp2 != NULL) {
+ assert(alloc->is_AllocateArray(),"array allocation was expected");
+ alloc_worklist.append_if_missing(addp2);
+ }
+ alloc_worklist.append_if_missing(use);
+ } else if (use->is_MemBar()) {
+ memnode_worklist.append_if_missing(use);
}
}
}
- }
- }
-}
-void ConnectionGraph::process_call_result(ProjNode *resproj, PhaseTransform *phase) {
- CallNode *call = resproj->in(0)->as_Call();
- uint call_idx = call->_idx;
- uint resproj_idx = resproj->_idx;
-
- switch (call->Opcode()) {
- case Op_Allocate:
- {
- Node *k = call->in(AllocateNode::KlassNode);
- const TypeKlassPtr *kt = k->bottom_type()->isa_klassptr();
- assert(kt != NULL, "TypeKlassPtr required.");
- ciKlass* cik = kt->klass();
-
- PointsToNode::EscapeState es;
- uint edge_to;
- if (cik->is_subclass_of(_compile->env()->Thread_klass()) ||
- !cik->is_instance_klass() || // StressReflectiveCode
- cik->as_instance_klass()->has_finalizer()) {
- es = PointsToNode::GlobalEscape;
- edge_to = _phantom_object; // Could not be worse
- } else {
- es = PointsToNode::NoEscape;
- edge_to = call_idx;
- assert(ptnode_adr(call_idx)->scalar_replaceable(), "sanity");
+ } else if (n->is_AddP()) {
+ JavaObjectNode* jobj = unique_java_object(get_addp_base(n));
+ if (jobj == NULL || jobj == phantom_obj) {
+#ifdef ASSERT
+ ptnode_adr(get_addp_base(n)->_idx)->dump();
+ ptnode_adr(n->_idx)->dump();
+ assert(jobj != NULL && jobj != phantom_obj, "escaped allocation");
+#endif
+ _compile->record_failure(C2Compiler::retry_no_escape_analysis());
+ return;
}
- set_escape_state(call_idx, es);
- add_pointsto_edge(resproj_idx, edge_to);
- _processed.set(resproj_idx);
- break;
- }
-
- case Op_AllocateArray:
- {
-
- Node *k = call->in(AllocateNode::KlassNode);
- const TypeKlassPtr *kt = k->bottom_type()->isa_klassptr();
- assert(kt != NULL, "TypeKlassPtr required.");
- ciKlass* cik = kt->klass();
-
- PointsToNode::EscapeState es;
- uint edge_to;
- if (!cik->is_array_klass()) { // StressReflectiveCode
- es = PointsToNode::GlobalEscape;
- edge_to = _phantom_object;
- } else {
- es = PointsToNode::NoEscape;
- edge_to = call_idx;
- assert(ptnode_adr(call_idx)->scalar_replaceable(), "sanity");
- int length = call->in(AllocateNode::ALength)->find_int_con(-1);
- if (length < 0 || length > EliminateAllocationArraySizeLimit) {
- // Not scalar replaceable if the length is not constant or too big.
- ptnode_adr(call_idx)->set_scalar_replaceable(false);
- }
+ Node *base = get_map(jobj->idx()); // CheckCastPP node
+ if (!split_AddP(n, base)) continue; // wrong type from dead path
+ } else if (n->is_Phi() ||
+ n->is_CheckCastPP() ||
+ n->is_EncodeP() ||
+ n->is_DecodeN() ||
+ (n->is_ConstraintCast() && n->Opcode() == Op_CastPP)) {
+ if (visited.test_set(n->_idx)) {
+ assert(n->is_Phi(), "loops only through Phi's");
+ continue; // already processed
}
- set_escape_state(call_idx, es);
- add_pointsto_edge(resproj_idx, edge_to);
- _processed.set(resproj_idx);
- break;
- }
-
- case Op_CallStaticJava:
- // For a static call, we know exactly what method is being called.
- // Use bytecode estimator to record whether the call's return value escapes
- {
- bool done = true;
- const TypeTuple *r = call->tf()->range();
- const Type* ret_type = NULL;
-
- if (r->cnt() > TypeFunc::Parms)
- ret_type = r->field_at(TypeFunc::Parms);
-
- // Note: we use isa_ptr() instead of isa_oopptr() here because the
- // _multianewarray functions return a TypeRawPtr.
- if (ret_type == NULL || ret_type->isa_ptr() == NULL) {
- _processed.set(resproj_idx);
- break; // doesn't return a pointer type
- }
- ciMethod *meth = call->as_CallJava()->method();
- const TypeTuple * d = call->tf()->domain();
- if (meth == NULL) {
- // not a Java method, assume global escape
- set_escape_state(call_idx, PointsToNode::GlobalEscape);
- add_pointsto_edge(resproj_idx, _phantom_object);
+ JavaObjectNode* jobj = unique_java_object(n);
+ if (jobj == NULL || jobj == phantom_obj) {
+#ifdef ASSERT
+ ptnode_adr(n->_idx)->dump();
+ assert(jobj != NULL && jobj != phantom_obj, "escaped allocation");
+#endif
+ _compile->record_failure(C2Compiler::retry_no_escape_analysis());
+ return;
} else {
- BCEscapeAnalyzer *call_analyzer = meth->get_bcea();
- bool copy_dependencies = false;
-
- if (call_analyzer->is_return_allocated()) {
- // Returns a newly allocated unescaped object, simply
- // update dependency information.
- // Mark it as NoEscape so that objects referenced by
- // it's fields will be marked as NoEscape at least.
- set_escape_state(call_idx, PointsToNode::NoEscape);
- ptnode_adr(call_idx)->set_scalar_replaceable(false);
- // Fields values are unknown
- add_edge_from_fields(call_idx, _phantom_object, Type::OffsetBot);
- add_pointsto_edge(resproj_idx, call_idx);
- copy_dependencies = true;
+ Node *val = get_map(jobj->idx()); // CheckCastPP node
+ TypeNode *tn = n->as_Type();
+ const TypeOopPtr* tinst = igvn->type(val)->isa_oopptr();
+ assert(tinst != NULL && tinst->is_known_instance() &&
+ tinst->instance_id() == jobj->idx() , "instance type expected.");
+
+ const Type *tn_type = igvn->type(tn);
+ const TypeOopPtr *tn_t;
+ if (tn_type->isa_narrowoop()) {
+ tn_t = tn_type->make_ptr()->isa_oopptr();
} else {
- // determine whether any arguments are returned
- set_escape_state(call_idx, PointsToNode::ArgEscape);
- bool ret_arg = false;
- for (uint i = TypeFunc::Parms; i < d->cnt(); i++) {
- const Type* at = d->field_at(i);
- if (at->isa_oopptr() != NULL) {
- Node *arg = call->in(i)->uncast();
-
- if (call_analyzer->is_arg_returned(i - TypeFunc::Parms)) {
- ret_arg = true;
- PointsToNode *arg_esp = ptnode_adr(arg->_idx);
- if (arg_esp->node_type() == PointsToNode::UnknownType)
- done = false;
- else if (arg_esp->node_type() == PointsToNode::JavaObject)
- add_pointsto_edge(resproj_idx, arg->_idx);
- else
- add_deferred_edge(resproj_idx, arg->_idx);
- }
- }
- }
- if (done) {
- copy_dependencies = true;
- // is_return_local() is true when only arguments are returned.
- if (!ret_arg || !call_analyzer->is_return_local()) {
- // Returns unknown object.
- add_pointsto_edge(resproj_idx, _phantom_object);
- }
+ tn_t = tn_type->isa_oopptr();
+ }
+ if (tn_t != NULL && tinst->klass()->is_subtype_of(tn_t->klass())) {
+ if (tn_type->isa_narrowoop()) {
+ tn_type = tinst->make_narrowoop();
+ } else {
+ tn_type = tinst;
}
+ igvn->hash_delete(tn);
+ igvn->set_type(tn, tn_type);
+ tn->set_type(tn_type);
+ igvn->hash_insert(tn);
+ record_for_optimizer(n);
+ } else {
+ assert(tn_type == TypePtr::NULL_PTR ||
+ tn_t != NULL && !tinst->klass()->is_subtype_of(tn_t->klass()),
+ "unexpected type");
+ continue; // Skip dead path with different type
}
- if (copy_dependencies)
- call_analyzer->copy_dependencies(_compile->dependencies());
}
- if (done)
- _processed.set(resproj_idx);
- break;
+ } else {
+ debug_only(n->dump();)
+ assert(false, "EA: unexpected node");
+ continue;
}
-
- default:
- // Some other type of call, assume the worst case that the
- // returned value, if any, globally escapes.
- {
- const TypeTuple *r = call->tf()->range();
- if (r->cnt() > TypeFunc::Parms) {
- const Type* ret_type = r->field_at(TypeFunc::Parms);
-
- // Note: we use isa_ptr() instead of isa_oopptr() here because the
- // _multianewarray functions return a TypeRawPtr.
- if (ret_type->isa_ptr() != NULL) {
- set_escape_state(call_idx, PointsToNode::GlobalEscape);
- add_pointsto_edge(resproj_idx, _phantom_object);
+ // push allocation's users on appropriate worklist
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node *use = n->fast_out(i);
+ if(use->is_Mem() && use->in(MemNode::Address) == n) {
+ // Load/store to instance's field
+ memnode_worklist.append_if_missing(use);
+ } else if (use->is_MemBar()) {
+ memnode_worklist.append_if_missing(use);
+ } else if (use->is_AddP() && use->outcnt() > 0) { // No dead nodes
+ Node* addp2 = find_second_addp(use, n);
+ if (addp2 != NULL) {
+ alloc_worklist.append_if_missing(addp2);
}
- }
- _processed.set(resproj_idx);
- }
- }
-}
-
-// Populate Connection Graph with Ideal nodes and create simple
-// connection graph edges (do not need to check the node_type of inputs
-// or to call PointsTo() to walk the connection graph).
-void ConnectionGraph::record_for_escape_analysis(Node *n, PhaseTransform *phase) {
- if (_processed.test(n->_idx))
- return; // No need to redefine node's state.
-
- if (n->is_Call()) {
- // Arguments to allocation and locking don't escape.
- if (n->is_Allocate()) {
- add_node(n, PointsToNode::JavaObject, PointsToNode::UnknownEscape, true);
- record_for_optimizer(n);
- } else if (n->is_Lock() || n->is_Unlock()) {
- // Put Lock and Unlock nodes on IGVN worklist to process them during
- // the first IGVN optimization when escape information is still available.
- record_for_optimizer(n);
- _processed.set(n->_idx);
- } else {
- // Don't mark as processed since call's arguments have to be processed.
- PointsToNode::NodeType nt = PointsToNode::UnknownType;
- PointsToNode::EscapeState es = PointsToNode::UnknownEscape;
-
- // Check if a call returns an object.
- const TypeTuple *r = n->as_Call()->tf()->range();
- if (r->cnt() > TypeFunc::Parms &&
- r->field_at(TypeFunc::Parms)->isa_ptr() &&
- n->as_Call()->proj_out(TypeFunc::Parms) != NULL) {
- nt = PointsToNode::JavaObject;
- if (!n->is_CallStaticJava()) {
- // Since the called mathod is statically unknown assume
- // the worst case that the returned value globally escapes.
- es = PointsToNode::GlobalEscape;
+ alloc_worklist.append_if_missing(use);
+ } else if (use->is_Phi() ||
+ use->is_CheckCastPP() ||
+ use->is_EncodeP() ||
+ use->is_DecodeN() ||
+ (use->is_ConstraintCast() && use->Opcode() == Op_CastPP)) {
+ alloc_worklist.append_if_missing(use);
+#ifdef ASSERT
+ } else if (use->is_Mem()) {
+ assert(use->in(MemNode::Address) != n, "EA: missing allocation reference path");
+ } else if (use->is_MergeMem()) {
+ assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist");
+ } else if (use->is_SafePoint()) {
+ // Look for MergeMem nodes for calls which reference unique allocation
+ // (through CheckCastPP nodes) even for debug info.
+ Node* m = use->in(TypeFunc::Memory);
+ if (m->is_MergeMem()) {
+ assert(_mergemem_worklist.contains(m->as_MergeMem()), "EA: missing MergeMem node in the worklist");
}
- }
- add_node(n, nt, es, false);
- }
- return;
- }
-
- // Using isa_ptr() instead of isa_oopptr() for LoadP and Phi because
- // ThreadLocal has RawPrt type.
- switch (n->Opcode()) {
- case Op_AddP:
- {
- add_node(n, PointsToNode::Field, PointsToNode::UnknownEscape, false);
- break;
- }
- case Op_CastX2P:
- { // "Unsafe" memory access.
- add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, true);
- break;
- }
- case Op_CastPP:
- case Op_CheckCastPP:
- case Op_EncodeP:
- case Op_DecodeN:
- {
- add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false);
- int ti = n->in(1)->_idx;
- PointsToNode::NodeType nt = ptnode_adr(ti)->node_type();
- if (nt == PointsToNode::UnknownType) {
- _delayed_worklist.push(n); // Process it later.
- break;
- } else if (nt == PointsToNode::JavaObject) {
- add_pointsto_edge(n->_idx, ti);
} else {
- add_deferred_edge(n->_idx, ti);
+ uint op = use->Opcode();
+ if (!(op == Op_CmpP || op == Op_Conv2B ||
+ op == Op_CastP2X || op == Op_StoreCM ||
+ op == Op_FastLock || op == Op_AryEq || op == Op_StrComp ||
+ op == Op_StrEquals || op == Op_StrIndexOf)) {
+ n->dump();
+ use->dump();
+ assert(false, "EA: missing allocation reference path");
+ }
+#endif
}
- _processed.set(n->_idx);
- break;
}
- case Op_ConP:
- {
- // assume all pointer constants globally escape except for null
- PointsToNode::EscapeState es;
- if (phase->type(n) == TypePtr::NULL_PTR)
- es = PointsToNode::NoEscape;
- else
- es = PointsToNode::GlobalEscape;
- add_node(n, PointsToNode::JavaObject, es, true);
- break;
- }
- case Op_ConN:
- {
- // assume all narrow oop constants globally escape except for null
- PointsToNode::EscapeState es;
- if (phase->type(n) == TypeNarrowOop::NULL_PTR)
- es = PointsToNode::NoEscape;
- else
- es = PointsToNode::GlobalEscape;
+ }
+ // New alias types were created in split_AddP().
+ uint new_index_end = (uint) _compile->num_alias_types();
+ assert(unique_old == _compile->unique(), "there should be no new ideal nodes after Phase 1");
- add_node(n, PointsToNode::JavaObject, es, true);
- break;
- }
- case Op_CreateEx:
- {
- // assume that all exception objects globally escape
- add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, true);
- break;
- }
- case Op_LoadKlass:
- case Op_LoadNKlass:
- {
- add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, true);
- break;
- }
- case Op_LoadP:
- case Op_LoadN:
- {
- const Type *t = phase->type(n);
- if (t->make_ptr() == NULL) {
- _processed.set(n->_idx);
+ // Phase 2: Process MemNode's from memnode_worklist. compute new address type and
+ // compute new values for Memory inputs (the Memory inputs are not
+ // actually updated until phase 4.)
+ if (memnode_worklist.length() == 0)
+ return; // nothing to do
+ while (memnode_worklist.length() != 0) {
+ Node *n = memnode_worklist.pop();
+ if (visited.test_set(n->_idx))
+ continue;
+ if (n->is_Phi() || n->is_ClearArray()) {
+ // we don't need to do anything, but the users must be pushed
+ } else if (n->is_MemBar()) { // Initialize, MemBar nodes
+ // we don't need to do anything, but the users must be pushed
+ n = n->as_MemBar()->proj_out(TypeFunc::Memory);
+ if (n == NULL)
+ continue;
+ } else {
+ assert(n->is_Mem(), "memory node required.");
+ Node *addr = n->in(MemNode::Address);
+ const Type *addr_t = igvn->type(addr);
+ if (addr_t == Type::TOP)
+ continue;
+ assert (addr_t->isa_ptr() != NULL, "pointer type required.");
+ int alias_idx = _compile->get_alias_index(addr_t->is_ptr());
+ assert ((uint)alias_idx < new_index_end, "wrong alias index");
+ Node *mem = find_inst_mem(n->in(MemNode::Memory), alias_idx, orig_phis);
+ if (_compile->failing()) {
return;
}
- add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false);
- break;
- }
- case Op_Parm:
- {
- _processed.set(n->_idx); // No need to redefine it state.
- uint con = n->as_Proj()->_con;
- if (con < TypeFunc::Parms)
- return;
- const Type *t = n->in(0)->as_Start()->_domain->field_at(con);
- if (t->isa_ptr() == NULL)
- return;
- // We have to assume all input parameters globally escape
- // (Note: passing 'false' since _processed is already set).
- add_node(n, PointsToNode::JavaObject, PointsToNode::GlobalEscape, false);
- break;
- }
- case Op_PartialSubtypeCheck:
- { // Produces Null or notNull and is used in CmpP.
- add_node(n, PointsToNode::JavaObject, PointsToNode::ArgEscape, true);
- break;
- }
- case Op_Phi:
- {
- const Type *t = n->as_Phi()->type();
- if (t->make_ptr() == NULL) {
- // nothing to do if not an oop or narrow oop
- _processed.set(n->_idx);
- return;
+ if (mem != n->in(MemNode::Memory)) {
+ // We delay the memory edge update since we need old one in
+ // MergeMem code below when instances memory slices are separated.
+ set_map(n, mem);
}
- add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false);
- uint i;
- for (i = 1; i < n->req() ; i++) {
- Node* in = n->in(i);
- if (in == NULL)
- continue; // ignore NULL
- in = in->uncast();
- if (in->is_top() || in == n)
- continue; // ignore top or inputs which go back this node
- int ti = in->_idx;
- PointsToNode::NodeType nt = ptnode_adr(ti)->node_type();
- if (nt == PointsToNode::UnknownType) {
- break;
- } else if (nt == PointsToNode::JavaObject) {
- add_pointsto_edge(n->_idx, ti);
- } else {
- add_deferred_edge(n->_idx, ti);
+ if (n->is_Load()) {
+ continue; // don't push users
+ } else if (n->is_LoadStore()) {
+ // get the memory projection
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node *use = n->fast_out(i);
+ if (use->Opcode() == Op_SCMemProj) {
+ n = use;
+ break;
+ }
+ }
+ assert(n->Opcode() == Op_SCMemProj, "memory projection required");
+ }
+ }
+ // push user on appropriate worklist
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node *use = n->fast_out(i);
+ if (use->is_Phi() || use->is_ClearArray()) {
+ memnode_worklist.append_if_missing(use);
+ } else if(use->is_Mem() && use->in(MemNode::Memory) == n) {
+ if (use->Opcode() == Op_StoreCM) // Ignore cardmark stores
+ continue;
+ memnode_worklist.append_if_missing(use);
+ } else if (use->is_MemBar()) {
+ memnode_worklist.append_if_missing(use);
+#ifdef ASSERT
+ } else if(use->is_Mem()) {
+ assert(use->in(MemNode::Memory) != n, "EA: missing memory path");
+ } else if (use->is_MergeMem()) {
+ assert(_mergemem_worklist.contains(use->as_MergeMem()), "EA: missing MergeMem node in the worklist");
+ } else {
+ uint op = use->Opcode();
+ if (!(op == Op_StoreCM ||
+ (op == Op_CallLeaf && use->as_CallLeaf()->_name != NULL &&
+ strcmp(use->as_CallLeaf()->_name, "g1_wb_pre") == 0) ||
+ op == Op_AryEq || op == Op_StrComp ||
+ op == Op_StrEquals || op == Op_StrIndexOf)) {
+ n->dump();
+ use->dump();
+ assert(false, "EA: missing memory path");
}
+#endif
}
- if (i >= n->req())
- _processed.set(n->_idx);
- else
- _delayed_worklist.push(n);
- break;
}
- case Op_Proj:
- {
- // we are only interested in the oop result projection from a call
- if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() ) {
- const TypeTuple *r = n->in(0)->as_Call()->tf()->range();
- assert(r->cnt() > TypeFunc::Parms, "sanity");
- if (r->field_at(TypeFunc::Parms)->isa_ptr() != NULL) {
- add_node(n, PointsToNode::LocalVar, PointsToNode::UnknownEscape, false);
- int ti = n->in(0)->_idx;
- // The call may not be registered yet (since not all its inputs are registered)
- // if this is the projection from backbranch edge of Phi.
- if (ptnode_adr(ti)->node_type() != PointsToNode::UnknownType) {
- process_call_result(n->as_Proj(), phase);
- }
- if (!_processed.test(n->_idx)) {
- // The call's result may need to be processed later if the call
- // returns it's argument and the argument is not processed yet.
- _delayed_worklist.push(n);
+ }
+
+ // Phase 3: Process MergeMem nodes from mergemem_worklist.
+ // Walk each memory slice moving the first node encountered of each
+ // instance type to the the input corresponding to its alias index.
+ uint length = _mergemem_worklist.length();
+ for( uint next = 0; next < length; ++next ) {
+ MergeMemNode* nmm = _mergemem_worklist.at(next);
+ assert(!visited.test_set(nmm->_idx), "should not be visited before");
+ // Note: we don't want to use MergeMemStream here because we only want to
+ // scan inputs which exist at the start, not ones we add during processing.
+ // Note 2: MergeMem may already contains instance memory slices added
+ // during find_inst_mem() call when memory nodes were processed above.
+ igvn->hash_delete(nmm);
+ uint nslices = nmm->req();
+ for (uint i = Compile::AliasIdxRaw+1; i < nslices; i++) {
+ Node* mem = nmm->in(i);
+ Node* cur = NULL;
+ if (mem == NULL || mem->is_top())
+ continue;
+ // First, update mergemem by moving memory nodes to corresponding slices
+ // if their type became more precise since this mergemem was created.
+ while (mem->is_Mem()) {
+ const Type *at = igvn->type(mem->in(MemNode::Address));
+ if (at != Type::TOP) {
+ assert (at->isa_ptr() != NULL, "pointer type required.");
+ uint idx = (uint)_compile->get_alias_index(at->is_ptr());
+ if (idx == i) {
+ if (cur == NULL)
+ cur = mem;
+ } else {
+ if (idx >= nmm->req() || nmm->is_empty_memory(nmm->in(idx))) {
+ nmm->set_memory_at(idx, mem);
+ }
}
- break;
}
+ mem = mem->in(MemNode::Memory);
}
- _processed.set(n->_idx);
- break;
- }
- case Op_Return:
- {
- if( n->req() > TypeFunc::Parms &&
- phase->type(n->in(TypeFunc::Parms))->isa_oopptr() ) {
- // Treat Return value as LocalVar with GlobalEscape escape state.
- add_node(n, PointsToNode::LocalVar, PointsToNode::GlobalEscape, false);
- int ti = n->in(TypeFunc::Parms)->_idx;
- PointsToNode::NodeType nt = ptnode_adr(ti)->node_type();
- if (nt == PointsToNode::UnknownType) {
- _delayed_worklist.push(n); // Process it later.
- break;
- } else if (nt == PointsToNode::JavaObject) {
- add_pointsto_edge(n->_idx, ti);
- } else {
- add_deferred_edge(n->_idx, ti);
+ nmm->set_memory_at(i, (cur != NULL) ? cur : mem);
+ // Find any instance of the current type if we haven't encountered
+ // already a memory slice of the instance along the memory chain.
+ for (uint ni = new_index_start; ni < new_index_end; ni++) {
+ if((uint)_compile->get_general_index(ni) == i) {
+ Node *m = (ni >= nmm->req()) ? nmm->empty_memory() : nmm->in(ni);
+ if (nmm->is_empty_memory(m)) {
+ Node* result = find_inst_mem(mem, ni, orig_phis);
+ if (_compile->failing()) {
+ return;
+ }
+ nmm->set_memory_at(ni, result);
+ }
}
}
- _processed.set(n->_idx);
- break;
}
- case Op_StoreP:
- case Op_StoreN:
- {
- const Type *adr_type = phase->type(n->in(MemNode::Address));
- adr_type = adr_type->make_ptr();
- if (adr_type->isa_oopptr()) {
- add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false);
- } else {
- Node* adr = n->in(MemNode::Address);
- if (adr->is_AddP() && phase->type(adr) == TypeRawPtr::NOTNULL &&
- adr->in(AddPNode::Address)->is_Proj() &&
- adr->in(AddPNode::Address)->in(0)->is_Allocate()) {
- add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false);
- // We are computing a raw address for a store captured
- // by an Initialize compute an appropriate address type.
- int offs = (int)phase->find_intptr_t_con(adr->in(AddPNode::Offset), Type::OffsetBot);
- assert(offs != Type::OffsetBot, "offset must be a constant");
- } else {
- _processed.set(n->_idx);
+ // Find the rest of instances values
+ for (uint ni = new_index_start; ni < new_index_end; ni++) {
+ const TypeOopPtr *tinst = _compile->get_adr_type(ni)->isa_oopptr();
+ Node* result = step_through_mergemem(nmm, ni, tinst);
+ if (result == nmm->base_memory()) {
+ // Didn't find instance memory, search through general slice recursively.
+ result = nmm->memory_at(_compile->get_general_index(ni));
+ result = find_inst_mem(result, ni, orig_phis);
+ if (_compile->failing()) {
return;
}
+ nmm->set_memory_at(ni, result);
}
- break;
- }
- case Op_StorePConditional:
- case Op_CompareAndSwapP:
- case Op_CompareAndSwapN:
- {
- const Type *adr_type = phase->type(n->in(MemNode::Address));
- adr_type = adr_type->make_ptr();
- if (adr_type->isa_oopptr()) {
- add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false);
- } else {
- _processed.set(n->_idx);
- return;
- }
- break;
- }
- case Op_AryEq:
- case Op_StrComp:
- case Op_StrEquals:
- case Op_StrIndexOf:
- {
- // char[] arrays passed to string intrinsics are not scalar replaceable.
- add_node(n, PointsToNode::UnknownType, PointsToNode::UnknownEscape, false);
- break;
}
- case Op_ThreadLocal:
- {
- add_node(n, PointsToNode::JavaObject, PointsToNode::ArgEscape, true);
- break;
- }
- default:
- ;
- // nothing to do
- }
- return;
-}
-
-void ConnectionGraph::build_connection_graph(Node *n, PhaseTransform *phase) {
- uint n_idx = n->_idx;
- assert(ptnode_adr(n_idx)->_node != NULL, "node should be registered");
-
- // Don't set processed bit for AddP, LoadP, StoreP since
- // they may need more then one pass to process.
- // Also don't mark as processed Call nodes since their
- // arguments may need more then one pass to process.
- if (_processed.test(n_idx))
- return; // No need to redefine node's state.
-
- if (n->is_Call()) {
- CallNode *call = n->as_Call();
- process_call_arguments(call, phase);
- return;
+ igvn->hash_insert(nmm);
+ record_for_optimizer(nmm);
}
- switch (n->Opcode()) {
- case Op_AddP:
- {
- Node *base = get_addp_base(n);
- int offset = address_offset(n, phase);
- // Create a field edge to this node from everything base could point to.
- for( VectorSetI i(PointsTo(base)); i.test(); ++i ) {
- uint pt = i.elem;
- add_field_edge(pt, n_idx, offset);
+ // Phase 4: Update the inputs of non-instance memory Phis and
+ // the Memory input of memnodes
+ // First update the inputs of any non-instance Phi's from
+ // which we split out an instance Phi. Note we don't have
+ // to recursively process Phi's encounted on the input memory
+ // chains as is done in split_memory_phi() since they will
+ // also be processed here.
+ for (int j = 0; j < orig_phis.length(); j++) {
+ PhiNode *phi = orig_phis.at(j);
+ int alias_idx = _compile->get_alias_index(phi->adr_type());
+ igvn->hash_delete(phi);
+ for (uint i = 1; i < phi->req(); i++) {
+ Node *mem = phi->in(i);
+ Node *new_mem = find_inst_mem(mem, alias_idx, orig_phis);
+ if (_compile->failing()) {
+ return;
}
- break;
- }
- case Op_CastX2P:
- {
- assert(false, "Op_CastX2P");
- break;
- }
- case Op_CastPP:
- case Op_CheckCastPP:
- case Op_EncodeP:
- case Op_DecodeN:
- {
- int ti = n->in(1)->_idx;
- assert(ptnode_adr(ti)->node_type() != PointsToNode::UnknownType, "all nodes should be registered");
- if (ptnode_adr(ti)->node_type() == PointsToNode::JavaObject) {
- add_pointsto_edge(n_idx, ti);
- } else {
- add_deferred_edge(n_idx, ti);
+ if (mem != new_mem) {
+ phi->set_req(i, new_mem);
}
- _processed.set(n_idx);
- break;
- }
- case Op_ConP:
- {
- assert(false, "Op_ConP");
- break;
- }
- case Op_ConN:
- {
- assert(false, "Op_ConN");
- break;
- }
- case Op_CreateEx:
- {
- assert(false, "Op_CreateEx");
- break;
- }
- case Op_LoadKlass:
- case Op_LoadNKlass:
- {
- assert(false, "Op_LoadKlass");
- break;
}
- case Op_LoadP:
- case Op_LoadN:
- {
- const Type *t = phase->type(n);
-#ifdef ASSERT
- if (t->make_ptr() == NULL)
- assert(false, "Op_LoadP");
-#endif
-
- Node* adr = n->in(MemNode::Address)->uncast();
- Node* adr_base;
- if (adr->is_AddP()) {
- adr_base = get_addp_base(adr);
- } else {
- adr_base = adr;
- }
+ igvn->hash_insert(phi);
+ record_for_optimizer(phi);
+ }
- // For everything "adr_base" could point to, create a deferred edge from
- // this node to each field with the same offset.
- int offset = address_offset(adr, phase);
- for( VectorSetI i(PointsTo(adr_base)); i.test(); ++i ) {
- uint pt = i.elem;
- if (adr->is_AddP()) {
- // Add field edge if it is missing.
- add_field_edge(pt, adr->_idx, offset);
- }
- add_deferred_edge_to_fields(n_idx, pt, offset);
- }
- break;
- }
- case Op_Parm:
- {
- assert(false, "Op_Parm");
- break;
- }
- case Op_PartialSubtypeCheck:
- {
- assert(false, "Op_PartialSubtypeCheck");
- break;
- }
- case Op_Phi:
- {
-#ifdef ASSERT
- const Type *t = n->as_Phi()->type();
- if (t->make_ptr() == NULL)
- assert(false, "Op_Phi");
-#endif
- for (uint i = 1; i < n->req() ; i++) {
- Node* in = n->in(i);
- if (in == NULL)
- continue; // ignore NULL
- in = in->uncast();
- if (in->is_top() || in == n)
- continue; // ignore top or inputs which go back this node
- int ti = in->_idx;
- PointsToNode::NodeType nt = ptnode_adr(ti)->node_type();
- assert(nt != PointsToNode::UnknownType, "all nodes should be known");
- if (nt == PointsToNode::JavaObject) {
- add_pointsto_edge(n_idx, ti);
- } else {
- add_deferred_edge(n_idx, ti);
- }
- }
- _processed.set(n_idx);
- break;
- }
- case Op_Proj:
- {
- // we are only interested in the oop result projection from a call
- if (n->as_Proj()->_con == TypeFunc::Parms && n->in(0)->is_Call() ) {
- assert(ptnode_adr(n->in(0)->_idx)->node_type() != PointsToNode::UnknownType,
- "all nodes should be registered");
- const TypeTuple *r = n->in(0)->as_Call()->tf()->range();
- assert(r->cnt() > TypeFunc::Parms, "sanity");
- if (r->field_at(TypeFunc::Parms)->isa_ptr() != NULL) {
- process_call_result(n->as_Proj(), phase);
- assert(_processed.test(n_idx), "all call results should be processed");
- break;
- }
- }
- assert(false, "Op_Proj");
- break;
- }
- case Op_Return:
- {
-#ifdef ASSERT
- if( n->req() <= TypeFunc::Parms ||
- !phase->type(n->in(TypeFunc::Parms))->isa_oopptr() ) {
- assert(false, "Op_Return");
- }
+ // Update the memory inputs of MemNodes with the value we computed
+ // in Phase 2 and move stores memory users to corresponding memory slices.
+ // Disable memory split verification code until the fix for 6984348.
+ // Currently it produces false negative results since it does not cover all cases.
+#if 0 // ifdef ASSERT
+ visited.Reset();
+ Node_Stack old_mems(arena, _compile->unique() >> 2);
#endif
- int ti = n->in(TypeFunc::Parms)->_idx;
- assert(ptnode_adr(ti)->node_type() != PointsToNode::UnknownType, "node should be registered");
- if (ptnode_adr(ti)->node_type() == PointsToNode::JavaObject) {
- add_pointsto_edge(n_idx, ti);
- } else {
- add_deferred_edge(n_idx, ti);
+ for (uint i = 0; i < ideal_nodes.size(); i++) {
+ Node* n = ideal_nodes.at(i);
+ Node* nmem = get_map(n->_idx);
+ assert(nmem != NULL, "sanity");
+ if (n->is_Mem()) {
+#if 0 // ifdef ASSERT
+ Node* old_mem = n->in(MemNode::Memory);
+ if (!visited.test_set(old_mem->_idx)) {
+ old_mems.push(old_mem, old_mem->outcnt());
}
- _processed.set(n_idx);
- break;
- }
- case Op_StoreP:
- case Op_StoreN:
- case Op_StorePConditional:
- case Op_CompareAndSwapP:
- case Op_CompareAndSwapN:
- {
- Node *adr = n->in(MemNode::Address);
- const Type *adr_type = phase->type(adr)->make_ptr();
-#ifdef ASSERT
- if (!adr_type->isa_oopptr())
- assert(phase->type(adr) == TypeRawPtr::NOTNULL, "Op_StoreP");
#endif
-
- assert(adr->is_AddP(), "expecting an AddP");
- Node *adr_base = get_addp_base(adr);
- Node *val = n->in(MemNode::ValueIn)->uncast();
- int offset = address_offset(adr, phase);
- // For everything "adr_base" could point to, create a deferred edge
- // to "val" from each field with the same offset.
- for( VectorSetI i(PointsTo(adr_base)); i.test(); ++i ) {
- uint pt = i.elem;
- // Add field edge if it is missing.
- add_field_edge(pt, adr->_idx, offset);
- add_edge_from_fields(pt, val->_idx, offset);
- }
- break;
- }
- case Op_AryEq:
- case Op_StrComp:
- case Op_StrEquals:
- case Op_StrIndexOf:
- {
- // char[] arrays passed to string intrinsic do not escape but
- // they are not scalar replaceable. Adjust escape state for them.
- // Start from in(2) edge since in(1) is memory edge.
- for (uint i = 2; i < n->req(); i++) {
- Node* adr = n->in(i)->uncast();
- const Type *at = phase->type(adr);
- if (!adr->is_top() && at->isa_ptr()) {
- assert(at == Type::TOP || at == TypePtr::NULL_PTR ||
- at->isa_ptr() != NULL, "expecting an Ptr");
- if (adr->is_AddP()) {
- adr = get_addp_base(adr);
- }
- // Mark as ArgEscape everything "adr" could point to.
- set_escape_state(adr->_idx, PointsToNode::ArgEscape);
- }
+ assert(n->in(MemNode::Memory) != nmem, "sanity");
+ if (!n->is_Load()) {
+ // Move memory users of a store first.
+ move_inst_mem(n, orig_phis);
}
- _processed.set(n_idx);
- break;
- }
- case Op_ThreadLocal:
- {
- assert(false, "Op_ThreadLocal");
- break;
+ // Now update memory input
+ igvn->hash_delete(n);
+ n->set_req(MemNode::Memory, nmem);
+ igvn->hash_insert(n);
+ record_for_optimizer(n);
+ } else {
+ assert(n->is_Allocate() || n->is_CheckCastPP() ||
+ n->is_AddP() || n->is_Phi(), "unknown node used for set_map()");
}
- default:
- // This method should be called only for EA specific nodes.
- ShouldNotReachHere();
}
+#if 0 // ifdef ASSERT
+ // Verify that memory was split correctly
+ while (old_mems.is_nonempty()) {
+ Node* old_mem = old_mems.node();
+ uint old_cnt = old_mems.index();
+ old_mems.pop();
+ assert(old_cnt == old_mem->outcnt(), "old mem could be lost");
+ }
+#endif
}
#ifndef PRODUCT
-void ConnectionGraph::dump() {
- bool first = true;
+static const char *node_type_names[] = {
+ "UnknownType",
+ "JavaObject",
+ "LocalVar",
+ "Field",
+ "Arraycopy"
+};
+
+static const char *esc_names[] = {
+ "UnknownEscape",
+ "NoEscape",
+ "ArgEscape",
+ "GlobalEscape"
+};
- uint size = nodes_size();
- for (uint ni = 0; ni < size; ni++) {
- PointsToNode *ptn = ptnode_adr(ni);
- PointsToNode::NodeType ptn_type = ptn->node_type();
+void PointsToNode::dump(bool print_state) const {
+ NodeType nt = node_type();
+ tty->print("%s ", node_type_names[(int) nt]);
+ if (print_state) {
+ EscapeState es = escape_state();
+ EscapeState fields_es = fields_escape_state();
+ tty->print("%s(%s) ", esc_names[(int)es], esc_names[(int)fields_es]);
+ if (nt == PointsToNode::JavaObject && !this->scalar_replaceable())
+ tty->print("NSR");
+ }
+ if (is_Field()) {
+ FieldNode* f = (FieldNode*)this;
+ tty->print("(");
+ for (BaseIterator i(f); i.has_next(); i.next()) {
+ PointsToNode* b = i.get();
+ tty->print(" %d%s", b->idx(),(b->is_JavaObject() ? "P" : ""));
+ }
+ tty->print(" )");
+ }
+ tty->print("[");
+ for (EdgeIterator i(this); i.has_next(); i.next()) {
+ PointsToNode* e = i.get();
+ tty->print(" %d%s%s", e->idx(),(e->is_JavaObject() ? "P" : (e->is_Field() ? "F" : "")), e->is_Arraycopy() ? "cp" : "");
+ }
+ tty->print(" [");
+ for (UseIterator i(this); i.has_next(); i.next()) {
+ PointsToNode* u = i.get();
+ bool is_base = false;
+ if (PointsToNode::is_base_use(u)) {
+ is_base = true;
+ u = PointsToNode::get_use_node(u)->as_Field();
+ }
+ tty->print(" %d%s%s", u->idx(), is_base ? "b" : "", u->is_Arraycopy() ? "cp" : "");
+ }
+ tty->print(" ]] ");
+ if (_node == NULL)
+ tty->print_cr("<null>");
+ else
+ _node->dump();
+}
- if (ptn_type != PointsToNode::JavaObject || ptn->_node == NULL)
+void ConnectionGraph::dump(GrowableArray<PointsToNode*>& ptnodes_worklist) {
+ bool first = true;
+ int ptnodes_length = ptnodes_worklist.length();
+ for (int i = 0; i < ptnodes_length; i++) {
+ PointsToNode *ptn = ptnodes_worklist.at(i);
+ if (ptn == NULL || !ptn->is_JavaObject())
continue;
- PointsToNode::EscapeState es = escape_state(ptn->_node);
- if (ptn->_node->is_Allocate() && (es == PointsToNode::NoEscape || Verbose)) {
+ PointsToNode::EscapeState es = ptn->escape_state();
+ if (ptn->ideal_node()->is_Allocate() && (es == PointsToNode::NoEscape || Verbose)) {
if (first) {
tty->cr();
tty->print("======== Connection graph for ");
@@ -3154,22 +3133,14 @@ void ConnectionGraph::dump() {
tty->cr();
first = false;
}
- tty->print("%6d ", ni);
ptn->dump();
- // Print all locals which reference this allocation
- for (uint li = ni; li < size; li++) {
- PointsToNode *ptn_loc = ptnode_adr(li);
- PointsToNode::NodeType ptn_loc_type = ptn_loc->node_type();
- if ( ptn_loc_type == PointsToNode::LocalVar && ptn_loc->_node != NULL &&
- ptn_loc->edge_count() == 1 && ptn_loc->edge_target(0) == ni ) {
- ptnode_adr(li)->dump(false);
- }
- }
- if (Verbose) {
- // Print all fields which reference this allocation
- for (uint i = 0; i < ptn->edge_count(); i++) {
- uint ei = ptn->edge_target(i);
- ptnode_adr(ei)->dump(false);
+ // Print all locals and fields which reference this allocation
+ for (UseIterator j(ptn); j.has_next(); j.next()) {
+ PointsToNode* use = j.get();
+ if (use->is_LocalVar()) {
+ use->dump(Verbose);
+ } else if (Verbose) {
+ use->dump();
}
}
tty->cr();
diff --git a/hotspot/src/share/vm/opto/escape.hpp b/hotspot/src/share/vm/opto/escape.hpp
index 2d66529..218dbf4 100644
--- a/hotspot/src/share/vm/opto/escape.hpp
+++ b/hotspot/src/share/vm/opto/escape.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -115,18 +115,36 @@ class Node;
class CallNode;
class PhiNode;
class PhaseTransform;
+class PointsToNode;
class Type;
class TypePtr;
class VectorSet;
-class PointsToNode {
-friend class ConnectionGraph;
+class JavaObjectNode;
+class LocalVarNode;
+class FieldNode;
+class ArraycopyNode;
+
+// ConnectionGraph nodes
+class PointsToNode : public ResourceObj {
+ GrowableArray<PointsToNode*> _edges; // List of nodes this node points to
+ GrowableArray<PointsToNode*> _uses; // List of nodes which point to this node
+
+ const u1 _type; // NodeType
+ u1 _flags; // NodeFlags
+ u1 _escape; // EscapeState of object
+ u1 _fields_escape; // EscapeState of object's fields
+
+ Node* const _node; // Ideal node corresponding to this PointsTo node.
+ const int _idx; // Cached ideal node's _idx
+
public:
typedef enum {
UnknownType = 0,
JavaObject = 1,
LocalVar = 2,
- Field = 3
+ Field = 3,
+ Arraycopy = 4
} NodeType;
typedef enum {
@@ -140,178 +158,387 @@ public:
} EscapeState;
typedef enum {
- UnknownEdge = 0,
- PointsToEdge = 1,
- DeferredEdge = 2,
- FieldEdge = 3
- } EdgeType;
+ ScalarReplaceable = 1, // Not escaped object could be replaced with scalar
+ PointsToUnknown = 2, // Has edge to phantom_object
+ ArraycopySrc = 4, // Has edge from Arraycopy node
+ ArraycopyDst = 8 // Has edge to Arraycopy node
+ } NodeFlags;
+
+
+ PointsToNode(Compile *C, Node* n, EscapeState es, NodeType type):
+ _edges(C->comp_arena(), 2, 0, NULL),
+ _uses (C->comp_arena(), 2, 0, NULL),
+ _node(n),
+ _idx(n->_idx),
+ _type((u1)type),
+ _escape((u1)es),
+ _fields_escape((u1)es),
+ _flags(ScalarReplaceable) {
+ assert(n != NULL && es != UnknownEscape, "sanity");
+ }
-private:
- enum {
- EdgeMask = 3,
- EdgeShift = 2,
+ Node* ideal_node() const { return _node; }
+ int idx() const { return _idx; }
- INITIAL_EDGE_COUNT = 4
- };
+ bool is_JavaObject() const { return _type == (u1)JavaObject; }
+ bool is_LocalVar() const { return _type == (u1)LocalVar; }
+ bool is_Field() const { return _type == (u1)Field; }
+ bool is_Arraycopy() const { return _type == (u1)Arraycopy; }
- NodeType _type;
- EscapeState _escape;
- GrowableArray<uint>* _edges; // outgoing edges
- Node* _node; // Ideal node corresponding to this PointsTo node.
- int _offset; // Object fields offsets.
- bool _scalar_replaceable; // Not escaped object could be replaced with scalar
- bool _has_unknown_ptr; // Has edge to phantom_object
+ JavaObjectNode* as_JavaObject() { assert(is_JavaObject(),""); return (JavaObjectNode*)this; }
+ LocalVarNode* as_LocalVar() { assert(is_LocalVar(),""); return (LocalVarNode*)this; }
+ FieldNode* as_Field() { assert(is_Field(),""); return (FieldNode*)this; }
+ ArraycopyNode* as_Arraycopy() { assert(is_Arraycopy(),""); return (ArraycopyNode*)this; }
-public:
- PointsToNode():
- _type(UnknownType),
- _escape(UnknownEscape),
- _edges(NULL),
- _node(NULL),
- _offset(-1),
- _has_unknown_ptr(false),
- _scalar_replaceable(true) {}
-
-
- EscapeState escape_state() const { return _escape; }
- NodeType node_type() const { return _type;}
- int offset() { return _offset;}
- bool scalar_replaceable() { return _scalar_replaceable;}
- bool has_unknown_ptr() { return _has_unknown_ptr;}
-
- void set_offset(int offs) { _offset = offs;}
- void set_escape_state(EscapeState state) { _escape = state; }
- void set_node_type(NodeType ntype) {
- assert(_type == UnknownType || _type == ntype, "Can't change node type");
- _type = ntype;
- }
- void set_scalar_replaceable(bool v) { _scalar_replaceable = v; }
- void set_has_unknown_ptr() { _has_unknown_ptr = true; }
+ EscapeState escape_state() const { return (EscapeState)_escape; }
+ void set_escape_state(EscapeState state) { _escape = (u1)state; }
- // count of outgoing edges
- uint edge_count() const { return (_edges == NULL) ? 0 : _edges->length(); }
+ EscapeState fields_escape_state() const { return (EscapeState)_fields_escape; }
+ void set_fields_escape_state(EscapeState state) { _fields_escape = (u1)state; }
- // node index of target of outgoing edge "e"
- uint edge_target(uint e) const {
- assert(_edges != NULL, "valid edge index");
- return (_edges->at(e) >> EdgeShift);
- }
- // type of outgoing edge "e"
- EdgeType edge_type(uint e) const {
- assert(_edges != NULL, "valid edge index");
- return (EdgeType) (_edges->at(e) & EdgeMask);
+ bool has_unknown_ptr() const { return (_flags & PointsToUnknown) != 0; }
+ void set_has_unknown_ptr() { _flags |= PointsToUnknown; }
+
+ bool arraycopy_src() const { return (_flags & ArraycopySrc) != 0; }
+ void set_arraycopy_src() { _flags |= ArraycopySrc; }
+ bool arraycopy_dst() const { return (_flags & ArraycopyDst) != 0; }
+ void set_arraycopy_dst() { _flags |= ArraycopyDst; }
+
+ bool scalar_replaceable() const { return (_flags & ScalarReplaceable) != 0;}
+ void set_scalar_replaceable(bool v) {
+ if (v)
+ _flags |= ScalarReplaceable;
+ else
+ _flags &= ~ScalarReplaceable;
}
- // add a edge of the specified type pointing to the specified target
- void add_edge(uint targIdx, EdgeType et);
+ int edge_count() const { return _edges.length(); }
+ PointsToNode* edge(int e) const { return _edges.at(e); }
+ bool add_edge(PointsToNode* edge) { return _edges.append_if_missing(edge); }
+
+ int use_count() const { return _uses.length(); }
+ PointsToNode* use(int e) const { return _uses.at(e); }
+ bool add_use(PointsToNode* use) { return _uses.append_if_missing(use); }
- // remove an edge of the specified type pointing to the specified target
- void remove_edge(uint targIdx, EdgeType et);
+ // Mark base edge use to distinguish from stored value edge.
+ bool add_base_use(FieldNode* use) { return _uses.append_if_missing((PointsToNode*)((intptr_t)use + 1)); }
+ static bool is_base_use(PointsToNode* use) { return (((intptr_t)use) & 1); }
+ static PointsToNode* get_use_node(PointsToNode* use) { return (PointsToNode*)(((intptr_t)use) & ~1); }
+
+ // Return true if this node points to specified node or nodes it points to.
+ bool points_to(JavaObjectNode* ptn) const;
+
+ // Return true if this node points only to non-escaping allocations.
+ bool non_escaping_allocation();
+
+ // Return true if one node points to an other.
+ bool meet(PointsToNode* ptn);
#ifndef PRODUCT
+ NodeType node_type() const { return (NodeType)_type;}
void dump(bool print_state=true) const;
#endif
};
+class LocalVarNode: public PointsToNode {
+public:
+ LocalVarNode(Compile *C, Node* n, EscapeState es):
+ PointsToNode(C, n, es, LocalVar) {}
+};
+
+class JavaObjectNode: public PointsToNode {
+public:
+ JavaObjectNode(Compile *C, Node* n, EscapeState es):
+ PointsToNode(C, n, es, JavaObject) {
+ if (es > NoEscape)
+ set_scalar_replaceable(false);
+ }
+};
+
+class FieldNode: public PointsToNode {
+ GrowableArray<PointsToNode*> _bases; // List of JavaObject nodes which point to this node
+ const int _offset; // Field's offset.
+ const bool _is_oop; // Field points to object
+ bool _has_unknown_base; // Has phantom_object base
+public:
+ FieldNode(Compile *C, Node* n, EscapeState es, int offs, bool is_oop):
+ PointsToNode(C, n, es, Field),
+ _offset(offs), _is_oop(is_oop),
+ _has_unknown_base(false) {}
+
+ int offset() const { return _offset;}
+ bool is_oop() const { return _is_oop;}
+ bool has_unknown_base() const { return _has_unknown_base; }
+ void set_has_unknown_base() { _has_unknown_base = true; }
+
+ int base_count() const { return _bases.length(); }
+ PointsToNode* base(int e) const { return _bases.at(e); }
+ bool add_base(PointsToNode* base) { return _bases.append_if_missing(base); }
+#ifdef ASSERT
+ // Return true if bases points to this java object.
+ bool has_base(JavaObjectNode* ptn) const;
+#endif
+
+};
+
+class ArraycopyNode: public PointsToNode {
+public:
+ ArraycopyNode(Compile *C, Node* n, EscapeState es):
+ PointsToNode(C, n, es, Arraycopy) {}
+};
+
+// Iterators for PointsTo node's edges:
+// for (EdgeIterator i(n); i.has_next(); i.next()) {
+// PointsToNode* u = i.get();
+class PointsToIterator: public StackObj {
+protected:
+ const PointsToNode* node;
+ const int cnt;
+ int i;
+public:
+ inline PointsToIterator(const PointsToNode* n, int cnt) : node(n), cnt(cnt), i(0) { }
+ inline bool has_next() const { return i < cnt; }
+ inline void next() { i++; }
+ PointsToNode* get() const { ShouldNotCallThis(); return NULL; }
+};
+
+class EdgeIterator: public PointsToIterator {
+public:
+ inline EdgeIterator(const PointsToNode* n) : PointsToIterator(n, n->edge_count()) { }
+ inline PointsToNode* get() const { return node->edge(i); }
+};
+
+class UseIterator: public PointsToIterator {
+public:
+ inline UseIterator(const PointsToNode* n) : PointsToIterator(n, n->use_count()) { }
+ inline PointsToNode* get() const { return node->use(i); }
+};
+
+class BaseIterator: public PointsToIterator {
+public:
+ inline BaseIterator(const FieldNode* n) : PointsToIterator(n, n->base_count()) { }
+ inline PointsToNode* get() const { return ((PointsToNode*)node)->as_Field()->base(i); }
+};
+
+
class ConnectionGraph: public ResourceObj {
private:
- GrowableArray<PointsToNode> _nodes; // Connection graph nodes indexed
- // by ideal node index.
+ GrowableArray<PointsToNode*> _nodes; // Map from ideal nodes to
+ // ConnectionGraph nodes.
- Unique_Node_List _delayed_worklist; // Nodes to be processed before
- // the call build_connection_graph().
+ GrowableArray<PointsToNode*> _worklist; // Nodes to be processed
- GrowableArray<MergeMemNode *> _mergemem_worklist; // List of all MergeMem nodes
+ bool _collecting; // Indicates whether escape information
+ // is still being collected. If false,
+ // no new nodes will be processed.
- VectorSet _processed; // Records which nodes have been
- // processed.
+ bool _verify; // verify graph
- bool _collecting; // Indicates whether escape information
- // is still being collected. If false,
- // no new nodes will be processed.
+ JavaObjectNode* phantom_obj; // Unknown object
+ JavaObjectNode* null_obj;
+ Node* _pcmp_neq; // ConI(#CC_GT)
+ Node* _pcmp_eq; // ConI(#CC_EQ)
- bool _progress; // Indicates whether new Graph's edges
- // were created.
+ Compile* _compile; // Compile object for current compilation
+ PhaseIterGVN* _igvn; // Value numbering
- uint _phantom_object; // Index of globally escaping object
- // that pointer values loaded from
- // a field which has not been set
- // are assumed to point to.
- uint _oop_null; // ConP(#NULL)->_idx
- uint _noop_null; // ConN(#NULL)->_idx
- Node* _pcmp_neq; // ConI(#CC_GT)
- Node* _pcmp_eq; // ConI(#CC_EQ)
-
- Compile * _compile; // Compile object for current compilation
- PhaseIterGVN * _igvn; // Value numbering
+ Unique_Node_List ideal_nodes; // Used by CG construction and types splitting.
// Address of an element in _nodes. Used when the element is to be modified
- PointsToNode *ptnode_adr(uint idx) const {
+ PointsToNode* ptnode_adr(int idx) const {
// There should be no new ideal nodes during ConnectionGraph build,
- // growableArray::adr_at() will throw assert otherwise.
- return _nodes.adr_at(idx);
+ // growableArray::at() will throw assert otherwise.
+ return _nodes.at(idx);
}
uint nodes_size() const { return _nodes.length(); }
- bool is_null_ptr(uint idx) const { return (idx == _noop_null || idx == _oop_null); }
+ // Add nodes to ConnectionGraph.
+ void add_local_var(Node* n, PointsToNode::EscapeState es);
+ void add_java_object(Node* n, PointsToNode::EscapeState es);
+ void add_field(Node* n, PointsToNode::EscapeState es, int offset);
+ void add_arraycopy(Node* n, PointsToNode::EscapeState es, PointsToNode* src, PointsToNode* dst);
- // Add node to ConnectionGraph.
- void add_node(Node *n, PointsToNode::NodeType nt, PointsToNode::EscapeState es, bool done);
+ // Compute the escape state for arguments to a call.
+ void process_call_arguments(CallNode *call);
- // offset of a field reference
- int address_offset(Node* adr, PhaseTransform *phase);
+ // Add PointsToNode node corresponding to a call
+ void add_call_node(CallNode* call);
- // compute the escape state for arguments to a call
- void process_call_arguments(CallNode *call, PhaseTransform *phase);
+ // Map ideal node to existing PointsTo node (usually phantom_object).
+ void map_ideal_node(Node *n, PointsToNode* ptn) {
+ assert(ptn != NULL, "only existing PointsTo node");
+ _nodes.at_put(n->_idx, ptn);
+ }
- // compute the escape state for the return value of a call
- void process_call_result(ProjNode *resproj, PhaseTransform *phase);
+ // Create PointsToNode node and add it to Connection Graph.
+ void add_node_to_connection_graph(Node *n, Unique_Node_List *delayed_worklist);
- // Populate Connection Graph with Ideal nodes.
- void record_for_escape_analysis(Node *n, PhaseTransform *phase);
+ // Add final simple edges to graph.
+ void add_final_edges(Node *n);
- // Build Connection Graph and set nodes escape state.
- void build_connection_graph(Node *n, PhaseTransform *phase);
+ // Finish Graph construction.
+ bool complete_connection_graph(GrowableArray<PointsToNode*>& ptnodes_worklist,
+ GrowableArray<JavaObjectNode*>& non_escaped_worklist,
+ GrowableArray<JavaObjectNode*>& java_objects_worklist,
+ GrowableArray<FieldNode*>& oop_fields_worklist);
- // walk the connection graph starting at the node corresponding to "n" and
- // add the index of everything it could point to, to "ptset". This may cause
- // Phi's encountered to get (re)processed (which requires "phase".)
- VectorSet* PointsTo(Node * n);
+#ifdef ASSERT
+ void verify_connection_graph(GrowableArray<PointsToNode*>& ptnodes_worklist,
+ GrowableArray<JavaObjectNode*>& non_escaped_worklist,
+ GrowableArray<JavaObjectNode*>& java_objects_worklist,
+ GrowableArray<Node*>& addp_worklist);
+#endif
- // Reused structures for PointsTo().
- VectorSet pt_ptset;
- VectorSet pt_visited;
- GrowableArray<uint> pt_worklist;
+ // Add all references to this JavaObject node.
+ int add_java_object_edges(JavaObjectNode* jobj, bool populate_worklist);
- // Edge manipulation. The "from_i" and "to_i" arguments are the
- // node indices of the source and destination of the edge
- void add_pointsto_edge(uint from_i, uint to_i);
- void add_deferred_edge(uint from_i, uint to_i);
- void add_field_edge(uint from_i, uint to_i, int offs);
+ // Put node on worklist if it is (or was) not there.
+ void add_to_worklist(PointsToNode* pt) {
+ _worklist.push(pt);
+ return;
+ }
+
+ // Put on worklist all uses of this node.
+ void add_uses_to_worklist(PointsToNode* pt) {
+ for (UseIterator i(pt); i.has_next(); i.next())
+ _worklist.push(i.get());
+ }
+
+ // Put on worklist all field's uses and related field nodes.
+ void add_field_uses_to_worklist(FieldNode* field);
+
+ // Put on worklist all related field nodes.
+ void add_fields_to_worklist(FieldNode* field, PointsToNode* base);
+
+ // Find fields which have unknown value.
+ int find_field_value(FieldNode* field);
+
+ // Find fields initializing values for allocations.
+ int find_init_values(JavaObjectNode* ptn, PointsToNode* init_val, PhaseTransform* phase);
+
+ // Set the escape state of an object and its fields.
+ void set_escape_state(PointsToNode* ptn, PointsToNode::EscapeState esc) {
+ // Don't change non-escaping state of NULL pointer.
+ if (ptn != null_obj) {
+ if (ptn->escape_state() < esc)
+ ptn->set_escape_state(esc);
+ if (ptn->fields_escape_state() < esc)
+ ptn->set_fields_escape_state(esc);
+ }
+ }
+ void set_fields_escape_state(PointsToNode* ptn, PointsToNode::EscapeState esc) {
+ // Don't change non-escaping state of NULL pointer.
+ if (ptn != null_obj) {
+ if (ptn->fields_escape_state() < esc)
+ ptn->set_fields_escape_state(esc);
+ }
+ }
+
+ // Propagate GlobalEscape and ArgEscape escape states to all nodes
+ // and check that we still have non-escaping java objects.
+ bool find_non_escaped_objects(GrowableArray<PointsToNode*>& ptnodes_worklist,
+ GrowableArray<JavaObjectNode*>& non_escaped_worklist);
+
+ // Adjust scalar_replaceable state after Connection Graph is built.
+ void adjust_scalar_replaceable_state(JavaObjectNode* jobj);
+
+ // Optimize ideal graph.
+ void optimize_ideal_graph(GrowableArray<Node*>& ptr_cmp_worklist,
+ GrowableArray<Node*>& storestore_worklist);
+ // Optimize objects compare.
+ Node* optimize_ptr_compare(Node* n);
+
+ // Returns unique corresponding java object or NULL.
+ JavaObjectNode* unique_java_object(Node *n);
// Add an edge of the specified type pointing to the specified target.
- // Set _progress if new edge is added.
- void add_edge(PointsToNode *f, uint to_i, PointsToNode::EdgeType et) {
- uint e_cnt = f->edge_count();
- f->add_edge(to_i, et);
- _progress |= (f->edge_count() != e_cnt);
+ bool add_edge(PointsToNode* from, PointsToNode* to) {
+ assert(!from->is_Field() || from->as_Field()->is_oop(), "sanity");
+
+ if (to == phantom_obj) {
+ if (from->has_unknown_ptr()) {
+ return false; // already points to phantom_obj
+ }
+ from->set_has_unknown_ptr();
+ }
+
+ bool is_new = from->add_edge(to);
+ assert(to != phantom_obj || is_new, "sanity");
+ if (is_new) { // New edge?
+ assert(!_verify, "graph is incomplete");
+ is_new = to->add_use(from);
+ assert(is_new, "use should be also new");
+ }
+ return is_new;
+ }
+
+ // Add an edge from Field node to its base and back.
+ bool add_base(FieldNode* from, PointsToNode* to) {
+ assert(!to->is_Arraycopy(), "sanity");
+ if (to == phantom_obj) {
+ if (from->has_unknown_base()) {
+ return false; // already has phantom_obj base
+ }
+ from->set_has_unknown_base();
+ }
+ bool is_new = from->add_base(to);
+ assert(to != phantom_obj || is_new, "sanity");
+ if (is_new) { // New edge?
+ assert(!_verify, "graph is incomplete");
+ if (to == null_obj)
+ return is_new; // Don't add fields to NULL pointer.
+ if (to->is_JavaObject()) {
+ is_new = to->add_edge(from);
+ } else {
+ is_new = to->add_base_use(from);
+ }
+ assert(is_new, "use should be also new");
+ }
+ return is_new;
}
- // Add an edge to node given by "to_i" from any field of adr_i whose offset
- // matches "offset" A deferred edge is added if to_i is a LocalVar, and
- // a pointsto edge is added if it is a JavaObject
- void add_edge_from_fields(uint adr, uint to_i, int offs);
+ // Add LocalVar node and edge if possible
+ void add_local_var_and_edge(Node* n, PointsToNode::EscapeState es, Node* to,
+ Unique_Node_List *delayed_worklist) {
+ PointsToNode* ptn = ptnode_adr(to->_idx);
+ if (delayed_worklist != NULL) { // First iteration of CG construction
+ add_local_var(n, es);
+ if (ptn == NULL) {
+ delayed_worklist->push(n);
+ return; // Process it later.
+ }
+ } else {
+ assert(ptn != NULL, "node should be registered");
+ }
+ add_edge(ptnode_adr(n->_idx), ptn);
+ }
+
+ // Helper functions
+ bool is_oop_field(Node* n, int offset);
+ static Node* get_addp_base(Node *addp);
+ static Node* find_second_addp(Node* addp, Node* n);
+
+ // offset of a field reference
+ int address_offset(Node* adr, PhaseTransform *phase);
+
+
+ // Propagate unique types created for unescaped allocated objects
+ // through the graph
+ void split_unique_types(GrowableArray<Node *> &alloc_worklist);
+
+ // Helper methods for unique types split.
+ bool split_AddP(Node *addp, Node *base);
- // Add a deferred edge from node given by "from_i" to any field
- // of adr_i whose offset matches "offset"
- void add_deferred_edge_to_fields(uint from_i, uint adr, int offs);
+ PhiNode *create_split_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, bool &new_created);
+ PhiNode *split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist);
+ void move_inst_mem(Node* n, GrowableArray<PhiNode *> &orig_phis);
+ Node* find_inst_mem(Node* mem, int alias_idx,GrowableArray<PhiNode *> &orig_phi_worklist);
+ Node* step_through_mergemem(MergeMemNode *mmem, int alias_idx, const TypeOopPtr *toop);
- // Remove outgoing deferred edges from the node referenced by "ni".
- // Any outgoing edges from the target of the deferred edge are copied
- // to "ni".
- void remove_deferred(uint ni, GrowableArray<uint>* deferred_edges, VectorSet* visited);
+
+ GrowableArray<MergeMemNode*> _mergemem_worklist; // List of all MergeMem nodes
Node_Array _node_map; // used for bookeeping during type splitting
// Used for the following purposes:
@@ -320,21 +547,18 @@ private:
// MemNode - new memory input for this node
// ChecCastPP - allocation that this is a cast of
// allocation - CheckCastPP of the allocation
- bool split_AddP(Node *addp, Node *base, PhaseGVN *igvn);
- PhiNode *create_split_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, PhaseGVN *igvn, bool &new_created);
- PhiNode *split_memory_phi(PhiNode *orig_phi, int alias_idx, GrowableArray<PhiNode *> &orig_phi_worklist, PhaseGVN *igvn);
- void move_inst_mem(Node* n, GrowableArray<PhiNode *> &orig_phis, PhaseGVN *igvn);
- Node *find_inst_mem(Node *mem, int alias_idx,GrowableArray<PhiNode *> &orig_phi_worklist, PhaseGVN *igvn);
-
- // Propagate unique types created for unescaped allocated objects
- // through the graph
- void split_unique_types(GrowableArray<Node *> &alloc_worklist);
// manage entries in _node_map
- void set_map(int idx, Node *n) { _node_map.map(idx, n); }
- Node *get_map(int idx) { return _node_map[idx]; }
- PhiNode *get_map_phi(int idx) {
- Node *phi = _node_map[idx];
+
+ void set_map(Node* from, Node* to) {
+ ideal_nodes.push(from);
+ _node_map.map(from->_idx, to);
+ }
+
+ Node* get_map(int idx) { return _node_map[idx]; }
+
+ PhiNode* get_map_phi(int idx) {
+ Node* phi = _node_map[idx];
return (phi == NULL) ? NULL : phi->as_Phi();
}
@@ -344,23 +568,6 @@ private:
_igvn->add_users_to_worklist(n);
}
- // Set the escape state of a node
- void set_escape_state(uint ni, PointsToNode::EscapeState es);
-
- // Find fields initializing values for allocations.
- void find_init_values(Node* n, VectorSet* visited, PhaseTransform* phase);
-
- // Adjust escape state after Connection Graph is built.
- void adjust_escape_state(Node* n);
-
- // Propagate escape states to referenced nodes.
- bool propagate_escape_state(GrowableArray<int>* cg_worklist,
- GrowableArray<uint>* worklist,
- PointsToNode::EscapeState esc_state);
-
- // Optimize objects compare.
- Node* optimize_ptr_compare(Node* n);
-
// Compute the escape information
bool compute_escape();
@@ -373,11 +580,10 @@ public:
// Perform escape analysis
static void do_analysis(Compile *C, PhaseIterGVN *igvn);
- // escape state of a node
- PointsToNode::EscapeState escape_state(Node *n);
+ bool not_global_escape(Node *n);
#ifndef PRODUCT
- void dump();
+ void dump(GrowableArray<PointsToNode*>& ptnodes_worklist);
#endif
};
diff --git a/hotspot/src/share/vm/opto/gcm.cpp b/hotspot/src/share/vm/opto/gcm.cpp
index be6850e..8b8f311 100644
--- a/hotspot/src/share/vm/opto/gcm.cpp
+++ b/hotspot/src/share/vm/opto/gcm.cpp
@@ -1344,8 +1344,8 @@ void PhaseCFG::GlobalCodeMotion( Matcher &matcher, uint unique, Node_List &proj_
// Schedule locally. Right now a simple topological sort.
// Later, do a real latency aware scheduler.
- int *ready_cnt = NEW_RESOURCE_ARRAY(int,C->unique());
- memset( ready_cnt, -1, C->unique() * sizeof(int) );
+ uint max_idx = C->unique();
+ GrowableArray<int> ready_cnt(max_idx, max_idx, -1);
visited.Clear();
for (i = 0; i < _num_blocks; i++) {
if (!_blocks[i]->schedule_local(this, matcher, ready_cnt, visited)) {
diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp
index 5658960..61d9227 100644
--- a/hotspot/src/share/vm/opto/graphKit.cpp
+++ b/hotspot/src/share/vm/opto/graphKit.cpp
@@ -1522,6 +1522,11 @@ Node* GraphKit::store_oop(Node* ctl,
const TypeOopPtr* val_type,
BasicType bt,
bool use_precise) {
+ // Transformation of a value which could be NULL pointer (CastPP #NULL)
+ // could be delayed during Parse (for example, in adjust_map_after_if()).
+ // Execute transformation here to avoid barrier generation in such case.
+ if (_gvn.type(val) == TypePtr::NULL_PTR)
+ val = _gvn.makecon(TypePtr::NULL_PTR);
set_control(ctl);
if (stopped()) return top(); // Dead path ?
diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/hotspot/src/share/vm/opto/lcm.cpp
index 287b6ed..1ad9f0b 100644
--- a/hotspot/src/share/vm/opto/lcm.cpp
+++ b/hotspot/src/share/vm/opto/lcm.cpp
@@ -404,7 +404,7 @@ void Block::implicit_null_check(PhaseCFG *cfg, Node *proj, Node *val, int allowe
// remaining cases (most), choose the instruction with the greatest latency
// (that is, the most number of pseudo-cycles required to the end of the
// routine). If there is a tie, choose the instruction with the most inputs.
-Node *Block::select(PhaseCFG *cfg, Node_List &worklist, int *ready_cnt, VectorSet &next_call, uint sched_slot) {
+Node *Block::select(PhaseCFG *cfg, Node_List &worklist, GrowableArray<int> &ready_cnt, VectorSet &next_call, uint sched_slot) {
// If only a single entry on the stack, use it
uint cnt = worklist.size();
@@ -465,7 +465,7 @@ Node *Block::select(PhaseCFG *cfg, Node_List &worklist, int *ready_cnt, VectorSe
// More than this instruction pending for successor to be ready,
// don't choose this if other opportunities are ready
- if (ready_cnt[use->_idx] > 1)
+ if (ready_cnt.at(use->_idx) > 1)
n_choice = 1;
}
@@ -565,7 +565,7 @@ void Block::add_call_kills(MachProjNode *proj, RegMask& regs, const char* save_p
//------------------------------sched_call-------------------------------------
-uint Block::sched_call( Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_List &worklist, int *ready_cnt, MachCallNode *mcall, VectorSet &next_call ) {
+uint Block::sched_call( Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_List &worklist, GrowableArray<int> &ready_cnt, MachCallNode *mcall, VectorSet &next_call ) {
RegMask regs;
// Schedule all the users of the call right now. All the users are
@@ -574,8 +574,9 @@ uint Block::sched_call( Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_
for (DUIterator_Fast imax, i = mcall->fast_outs(imax); i < imax; i++) {
Node* n = mcall->fast_out(i);
assert( n->is_MachProj(), "" );
- --ready_cnt[n->_idx];
- assert( !ready_cnt[n->_idx], "" );
+ int n_cnt = ready_cnt.at(n->_idx)-1;
+ ready_cnt.at_put(n->_idx, n_cnt);
+ assert( n_cnt == 0, "" );
// Schedule next to call
_nodes.map(node_cnt++, n);
// Collect defined registers
@@ -590,7 +591,9 @@ uint Block::sched_call( Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_
Node* m = n->fast_out(j); // Get user
if( bbs[m->_idx] != this ) continue;
if( m->is_Phi() ) continue;
- if( !--ready_cnt[m->_idx] )
+ int m_cnt = ready_cnt.at(m->_idx)-1;
+ ready_cnt.at_put(m->_idx, m_cnt);
+ if( m_cnt == 0 )
worklist.push(m);
}
@@ -655,7 +658,7 @@ uint Block::sched_call( Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_
//------------------------------schedule_local---------------------------------
// Topological sort within a block. Someday become a real scheduler.
-bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, int *ready_cnt, VectorSet &next_call) {
+bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, GrowableArray<int> &ready_cnt, VectorSet &next_call) {
// Already "sorted" are the block start Node (as the first entry), and
// the block-ending Node and any trailing control projections. We leave
// these alone. PhiNodes and ParmNodes are made to follow the block start
@@ -695,7 +698,7 @@ bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, int *ready_cnt, Vect
if( m && cfg->_bbs[m->_idx] == this && !m->is_top() )
local++; // One more block-local input
}
- ready_cnt[n->_idx] = local; // Count em up
+ ready_cnt.at_put(n->_idx, local); // Count em up
#ifdef ASSERT
if( UseConcMarkSweepGC || UseG1GC ) {
@@ -729,7 +732,7 @@ bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, int *ready_cnt, Vect
}
}
for(uint i2=i; i2<_nodes.size(); i2++ ) // Trailing guys get zapped count
- ready_cnt[_nodes[i2]->_idx] = 0;
+ ready_cnt.at_put(_nodes[i2]->_idx, 0);
// All the prescheduled guys do not hold back internal nodes
uint i3;
@@ -737,8 +740,10 @@ bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, int *ready_cnt, Vect
Node *n = _nodes[i3]; // Get pre-scheduled
for (DUIterator_Fast jmax, j = n->fast_outs(jmax); j < jmax; j++) {
Node* m = n->fast_out(j);
- if( cfg->_bbs[m->_idx] ==this ) // Local-block user
- ready_cnt[m->_idx]--; // Fix ready count
+ if( cfg->_bbs[m->_idx] ==this ) { // Local-block user
+ int m_cnt = ready_cnt.at(m->_idx)-1;
+ ready_cnt.at_put(m->_idx, m_cnt); // Fix ready count
+ }
}
}
@@ -747,7 +752,7 @@ bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, int *ready_cnt, Vect
Node_List worklist;
for(uint i4=i3; i4<node_cnt; i4++ ) { // Put ready guys on worklist
Node *m = _nodes[i4];
- if( !ready_cnt[m->_idx] ) { // Zero ready count?
+ if( !ready_cnt.at(m->_idx) ) { // Zero ready count?
if (m->is_iteratively_computed()) {
// Push induction variable increments last to allow other uses
// of the phi to be scheduled first. The select() method breaks
@@ -775,14 +780,14 @@ bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, int *ready_cnt, Vect
for (uint j=0; j<_nodes.size(); j++) {
Node *n = _nodes[j];
int idx = n->_idx;
- tty->print("# ready cnt:%3d ", ready_cnt[idx]);
+ tty->print("# ready cnt:%3d ", ready_cnt.at(idx));
tty->print("latency:%3d ", cfg->_node_latency->at_grow(idx));
tty->print("%4d: %s\n", idx, n->Name());
}
}
#endif
- uint max_idx = matcher.C->unique();
+ uint max_idx = (uint)ready_cnt.length();
// Pull from worklist and schedule
while( worklist.size() ) { // Worklist is not ready
@@ -840,11 +845,13 @@ bool Block::schedule_local(PhaseCFG *cfg, Matcher &matcher, int *ready_cnt, Vect
Node* m = n->fast_out(i5); // Get user
if( cfg->_bbs[m->_idx] != this ) continue;
if( m->is_Phi() ) continue;
- if (m->_idx > max_idx) { // new node, skip it
+ if (m->_idx >= max_idx) { // new node, skip it
assert(m->is_MachProj() && n->is_Mach() && n->as_Mach()->has_call(), "unexpected node types");
continue;
}
- if( !--ready_cnt[m->_idx] )
+ int m_cnt = ready_cnt.at(m->_idx)-1;
+ ready_cnt.at_put(m->_idx, m_cnt);
+ if( m_cnt == 0 )
worklist.push(m);
}
}
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index ebc3a2d..1a38fb6 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -338,8 +338,27 @@ CallGenerator* Compile::make_vm_intrinsic(ciMethod* m, bool is_virtual) {
break;
case vmIntrinsics::_bitCount_i:
+ if (!Matcher::match_rule_supported(Op_PopCountI)) return NULL;
+ break;
+
case vmIntrinsics::_bitCount_l:
- if (!UsePopCountInstruction) return NULL;
+ if (!Matcher::match_rule_supported(Op_PopCountL)) return NULL;
+ break;
+
+ case vmIntrinsics::_numberOfLeadingZeros_i:
+ if (!Matcher::match_rule_supported(Op_CountLeadingZerosI)) return NULL;
+ break;
+
+ case vmIntrinsics::_numberOfLeadingZeros_l:
+ if (!Matcher::match_rule_supported(Op_CountLeadingZerosL)) return NULL;
+ break;
+
+ case vmIntrinsics::_numberOfTrailingZeros_i:
+ if (!Matcher::match_rule_supported(Op_CountTrailingZerosI)) return NULL;
+ break;
+
+ case vmIntrinsics::_numberOfTrailingZeros_l:
+ if (!Matcher::match_rule_supported(Op_CountTrailingZerosL)) return NULL;
break;
case vmIntrinsics::_Reference_get:
@@ -416,14 +435,12 @@ JVMState* LibraryIntrinsic::generate(JVMState* jvms) {
return kit.transfer_exceptions_into_jvms();
}
- if (PrintIntrinsics) {
+ // The intrinsic bailed out
+ if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
if (jvms->has_method()) {
// Not a root compile.
- tty->print("Did not inline intrinsic %s%s at bci:%d in",
- vmIntrinsics::name_at(intrinsic_id()),
- (is_virtual() ? " (virtual)" : ""), kit.bci());
- kit.caller()->print_short_name(tty);
- tty->print_cr(" (%d bytes)", kit.caller()->code_size());
+ const char* msg = is_virtual() ? "failed to inline (intrinsic, virtual)" : "failed to inline (intrinsic)";
+ CompileTask::print_inlining(kit.callee(), jvms->depth() - 1, kit.bci(), msg);
} else {
// Root compile
tty->print("Did not generate intrinsic %s%s at bci:%d in",
@@ -2153,7 +2170,7 @@ void LibraryCallKit::insert_g1_pre_barrier(Node* base_oop, Node* offset, Node* p
//
// if (offset == java_lang_ref_Reference::_reference_offset) {
// if (base != null) {
- // if (klass(base)->reference_type() != REF_NONE)) {
+ // if (instance_of(base, java.lang.ref.Reference)) {
// pre_barrier(_, pre_val, ...);
// }
// }
@@ -2165,8 +2182,6 @@ void LibraryCallKit::insert_g1_pre_barrier(Node* base_oop, Node* offset, Node* p
IdealKit ideal(this);
#define __ ideal.
- const int reference_type_offset = in_bytes(instanceKlass::reference_type_offset());
-
Node* referent_off = __ ConX(java_lang_ref_Reference::referent_offset);
__ if_then(offset, BoolTest::eq, referent_off, unlikely); {
@@ -2678,7 +2693,13 @@ bool LibraryCallKit::inline_unsafe_CAS(BasicType type) {
cas = _gvn.transform(new (C, 5) CompareAndSwapLNode(control(), mem, adr, newval, oldval));
break;
case T_OBJECT:
- // reference stores need a store barrier.
+ // Transformation of a value which could be NULL pointer (CastPP #NULL)
+ // could be delayed during Parse (for example, in adjust_map_after_if()).
+ // Execute transformation here to avoid barrier generation in such case.
+ if (_gvn.type(newval) == TypePtr::NULL_PTR)
+ newval = _gvn.makecon(TypePtr::NULL_PTR);
+
+ // Reference stores need a store barrier.
// (They don't if CAS fails, but it isn't worth checking.)
pre_barrier(true /* do_load*/,
control(), base, adr, alias_idx, newval, value_type->make_oopptr(),
@@ -5449,4 +5470,3 @@ bool LibraryCallKit::inline_reference_get() {
push(result);
return true;
}
-
diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp
index 6c7b8ed..2d045e4 100644
--- a/hotspot/src/share/vm/opto/loopnode.cpp
+++ b/hotspot/src/share/vm/opto/loopnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -898,7 +898,7 @@ Node *LoopLimitNode::Identity( PhaseTransform *phase ) {
Node* CountedLoopNode::match_incr_with_optional_truncation(
Node* expr, Node** trunc1, Node** trunc2, const TypeInt** trunc_type) {
// Quick cutouts:
- if (expr == NULL || expr->req() != 3) return false;
+ if (expr == NULL || expr->req() != 3) return NULL;
Node *t1 = NULL;
Node *t2 = NULL;
diff --git a/hotspot/src/share/vm/opto/macro.cpp b/hotspot/src/share/vm/opto/macro.cpp
index adcf8e4..11416ac 100644
--- a/hotspot/src/share/vm/opto/macro.cpp
+++ b/hotspot/src/share/vm/opto/macro.cpp
@@ -234,11 +234,20 @@ void PhaseMacroExpand::eliminate_card_mark(Node* p2x) {
}
} else {
// G1 pre/post barriers
- assert(p2x->outcnt() == 2, "expects 2 users: Xor and URShift nodes");
+ assert(p2x->outcnt() <= 2, "expects 1 or 2 users: Xor and URShift nodes");
// It could be only one user, URShift node, in Object.clone() instrinsic
// but the new allocation is passed to arraycopy stub and it could not
// be scalar replaced. So we don't check the case.
+ // An other case of only one user (Xor) is when the value check for NULL
+ // in G1 post barrier is folded after CCP so the code which used URShift
+ // is removed.
+
+ // Take Region node before eliminating post barrier since it also
+ // eliminates CastP2X node when it has only one user.
+ Node* this_region = p2x->in(0);
+ assert(this_region != NULL, "");
+
// Remove G1 post barrier.
// Search for CastP2X->Xor->URShift->Cmp path which
@@ -263,8 +272,6 @@ void PhaseMacroExpand::eliminate_card_mark(Node* p2x) {
// Remove G1 pre barrier.
// Search "if (marking != 0)" check and set it to "false".
- Node* this_region = p2x->in(0);
- assert(this_region != NULL, "");
// There is no G1 pre barrier if previous stored value is NULL
// (for example, after initialization).
if (this_region->is_Region() && this_region->req() == 3) {
@@ -292,7 +299,7 @@ void PhaseMacroExpand::eliminate_card_mark(Node* p2x) {
}
// Now CastP2X can be removed since it is used only on dead path
// which currently still alive until igvn optimize it.
- assert(p2x->unique_out()->Opcode() == Op_URShiftX, "");
+ assert(p2x->outcnt() == 0 || p2x->unique_out()->Opcode() == Op_URShiftX, "");
_igvn.replace_node(p2x, top());
}
}
diff --git a/hotspot/src/share/vm/opto/memnode.cpp b/hotspot/src/share/vm/opto/memnode.cpp
index bd14475..8c40e9c 100644
--- a/hotspot/src/share/vm/opto/memnode.cpp
+++ b/hotspot/src/share/vm/opto/memnode.cpp
@@ -1718,8 +1718,10 @@ const Type *LoadNode::Value( PhaseTransform *phase ) const {
bool is_instance = (tinst != NULL) && tinst->is_known_instance_field();
if (ReduceFieldZeroing || is_instance) {
Node* value = can_see_stored_value(mem,phase);
- if (value != NULL && value->is_Con())
+ if (value != NULL && value->is_Con()) {
+ assert(value->bottom_type()->higher_equal(_type),"sanity");
return value->bottom_type();
+ }
}
if (is_instance) {
@@ -1759,6 +1761,20 @@ Node *LoadBNode::Ideal(PhaseGVN *phase, bool can_reshape) {
return LoadNode::Ideal(phase, can_reshape);
}
+const Type* LoadBNode::Value(PhaseTransform *phase) const {
+ Node* mem = in(MemNode::Memory);
+ Node* value = can_see_stored_value(mem,phase);
+ if (value != NULL && value->is_Con() &&
+ !value->bottom_type()->higher_equal(_type)) {
+ // If the input to the store does not fit with the load's result type,
+ // it must be truncated. We can't delay until Ideal call since
+ // a singleton Value is needed for split_thru_phi optimization.
+ int con = value->get_int();
+ return TypeInt::make((con << 24) >> 24);
+ }
+ return LoadNode::Value(phase);
+}
+
//--------------------------LoadUBNode::Ideal-------------------------------------
//
// If the previous store is to the same address as this load,
@@ -1775,6 +1791,20 @@ Node* LoadUBNode::Ideal(PhaseGVN* phase, bool can_reshape) {
return LoadNode::Ideal(phase, can_reshape);
}
+const Type* LoadUBNode::Value(PhaseTransform *phase) const {
+ Node* mem = in(MemNode::Memory);
+ Node* value = can_see_stored_value(mem,phase);
+ if (value != NULL && value->is_Con() &&
+ !value->bottom_type()->higher_equal(_type)) {
+ // If the input to the store does not fit with the load's result type,
+ // it must be truncated. We can't delay until Ideal call since
+ // a singleton Value is needed for split_thru_phi optimization.
+ int con = value->get_int();
+ return TypeInt::make(con & 0xFF);
+ }
+ return LoadNode::Value(phase);
+}
+
//--------------------------LoadUSNode::Ideal-------------------------------------
//
// If the previous store is to the same address as this load,
@@ -1791,6 +1821,20 @@ Node *LoadUSNode::Ideal(PhaseGVN *phase, bool can_reshape) {
return LoadNode::Ideal(phase, can_reshape);
}
+const Type* LoadUSNode::Value(PhaseTransform *phase) const {
+ Node* mem = in(MemNode::Memory);
+ Node* value = can_see_stored_value(mem,phase);
+ if (value != NULL && value->is_Con() &&
+ !value->bottom_type()->higher_equal(_type)) {
+ // If the input to the store does not fit with the load's result type,
+ // it must be truncated. We can't delay until Ideal call since
+ // a singleton Value is needed for split_thru_phi optimization.
+ int con = value->get_int();
+ return TypeInt::make(con & 0xFFFF);
+ }
+ return LoadNode::Value(phase);
+}
+
//--------------------------LoadSNode::Ideal--------------------------------------
//
// If the previous store is to the same address as this load,
@@ -1809,6 +1853,20 @@ Node *LoadSNode::Ideal(PhaseGVN *phase, bool can_reshape) {
return LoadNode::Ideal(phase, can_reshape);
}
+const Type* LoadSNode::Value(PhaseTransform *phase) const {
+ Node* mem = in(MemNode::Memory);
+ Node* value = can_see_stored_value(mem,phase);
+ if (value != NULL && value->is_Con() &&
+ !value->bottom_type()->higher_equal(_type)) {
+ // If the input to the store does not fit with the load's result type,
+ // it must be truncated. We can't delay until Ideal call since
+ // a singleton Value is needed for split_thru_phi optimization.
+ int con = value->get_int();
+ return TypeInt::make((con << 16) >> 16);
+ }
+ return LoadNode::Value(phase);
+}
+
//=============================================================================
//----------------------------LoadKlassNode::make------------------------------
// Polymorphic factory method:
diff --git a/hotspot/src/share/vm/opto/memnode.hpp b/hotspot/src/share/vm/opto/memnode.hpp
index f15d498..36623a8 100644
--- a/hotspot/src/share/vm/opto/memnode.hpp
+++ b/hotspot/src/share/vm/opto/memnode.hpp
@@ -215,6 +215,7 @@ public:
virtual int Opcode() const;
virtual uint ideal_reg() const { return Op_RegI; }
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual const Type *Value(PhaseTransform *phase) const;
virtual int store_Opcode() const { return Op_StoreB; }
virtual BasicType memory_type() const { return T_BYTE; }
};
@@ -228,6 +229,7 @@ public:
virtual int Opcode() const;
virtual uint ideal_reg() const { return Op_RegI; }
virtual Node* Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual const Type *Value(PhaseTransform *phase) const;
virtual int store_Opcode() const { return Op_StoreB; }
virtual BasicType memory_type() const { return T_BYTE; }
};
@@ -241,10 +243,25 @@ public:
virtual int Opcode() const;
virtual uint ideal_reg() const { return Op_RegI; }
virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual const Type *Value(PhaseTransform *phase) const;
virtual int store_Opcode() const { return Op_StoreC; }
virtual BasicType memory_type() const { return T_CHAR; }
};
+//------------------------------LoadSNode--------------------------------------
+// Load a short (16bits signed) from memory
+class LoadSNode : public LoadNode {
+public:
+ LoadSNode( Node *c, Node *mem, Node *adr, const TypePtr* at, const TypeInt *ti = TypeInt::SHORT )
+ : LoadNode(c,mem,adr,at,ti) {}
+ virtual int Opcode() const;
+ virtual uint ideal_reg() const { return Op_RegI; }
+ virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
+ virtual const Type *Value(PhaseTransform *phase) const;
+ virtual int store_Opcode() const { return Op_StoreC; }
+ virtual BasicType memory_type() const { return T_SHORT; }
+};
+
//------------------------------LoadINode--------------------------------------
// Load an integer from memory
class LoadINode : public LoadNode {
@@ -433,19 +450,6 @@ public:
};
-//------------------------------LoadSNode--------------------------------------
-// Load a short (16bits signed) from memory
-class LoadSNode : public LoadNode {
-public:
- LoadSNode( Node *c, Node *mem, Node *adr, const TypePtr* at, const TypeInt *ti = TypeInt::SHORT )
- : LoadNode(c,mem,adr,at,ti) {}
- virtual int Opcode() const;
- virtual uint ideal_reg() const { return Op_RegI; }
- virtual Node *Ideal(PhaseGVN *phase, bool can_reshape);
- virtual int store_Opcode() const { return Op_StoreC; }
- virtual BasicType memory_type() const { return T_SHORT; }
-};
-
//------------------------------StoreNode--------------------------------------
// Store value; requires Store, Address and Value
class StoreNode : public MemNode {
diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp
index f365353..e32a185 100644
--- a/hotspot/src/share/vm/opto/output.cpp
+++ b/hotspot/src/share/vm/opto/output.cpp
@@ -167,7 +167,7 @@ bool Compile::need_stack_bang(int frame_size_in_bytes) const {
// Determine if we need to generate a stack overflow check.
// Do it if the method is not a stub function and
// has java calls or has frame size > vm_page_size/8.
- return (stub_function() == NULL &&
+ return (UseStackBanging && stub_function() == NULL &&
(has_java_calls() || frame_size_in_bytes > os::vm_page_size()>>3));
}
diff --git a/hotspot/src/share/vm/opto/parseHelper.cpp b/hotspot/src/share/vm/opto/parseHelper.cpp
index 9ebc716..26a146f 100644
--- a/hotspot/src/share/vm/opto/parseHelper.cpp
+++ b/hotspot/src/share/vm/opto/parseHelper.cpp
@@ -71,14 +71,14 @@ void Parse::do_checkcast() {
// Throw uncommon trap if class is not loaded or the value we are casting
// _from_ is not loaded, and value is not null. If the value _is_ NULL,
// then the checkcast does nothing.
- const TypeInstPtr *tp = _gvn.type(obj)->isa_instptr();
- if (!will_link || (tp && !tp->is_loaded())) {
+ const TypeOopPtr *tp = _gvn.type(obj)->isa_oopptr();
+ if (!will_link || (tp && tp->klass() && !tp->klass()->is_loaded())) {
if (C->log() != NULL) {
if (!will_link) {
C->log()->elem("assert_null reason='checkcast' klass='%d'",
C->log()->identify(klass));
}
- if (tp && !tp->is_loaded()) {
+ if (tp && tp->klass() && !tp->klass()->is_loaded()) {
// %%% Cannot happen?
C->log()->elem("assert_null reason='checkcast source' klass='%d'",
C->log()->identify(tp->klass()));
diff --git a/hotspot/src/share/vm/opto/phase.cpp b/hotspot/src/share/vm/opto/phase.cpp
index ae79a55..0b88996 100644
--- a/hotspot/src/share/vm/opto/phase.cpp
+++ b/hotspot/src/share/vm/opto/phase.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,8 +39,9 @@ elapsedTimer Phase::_t_stubCompilation;
// The next timers used for LogCompilation
elapsedTimer Phase::_t_parser;
-elapsedTimer Phase::_t_escapeAnalysis;
elapsedTimer Phase::_t_optimizer;
+elapsedTimer Phase::_t_escapeAnalysis;
+elapsedTimer Phase::_t_connectionGraph;
elapsedTimer Phase::_t_idealLoop;
elapsedTimer Phase::_t_ccp;
elapsedTimer Phase::_t_matcher;
@@ -51,6 +52,7 @@ elapsedTimer Phase::_t_output;
elapsedTimer Phase::_t_graphReshaping;
elapsedTimer Phase::_t_scheduler;
elapsedTimer Phase::_t_blockOrdering;
+elapsedTimer Phase::_t_macroEliminate;
elapsedTimer Phase::_t_macroExpand;
elapsedTimer Phase::_t_peephole;
elapsedTimer Phase::_t_codeGeneration;
@@ -104,6 +106,8 @@ void Phase::print_timers() {
if (DoEscapeAnalysis) {
// EA is part of Optimizer.
tty->print_cr (" escape analysis: %3.3f sec", Phase::_t_escapeAnalysis.seconds());
+ tty->print_cr (" connection graph: %3.3f sec", Phase::_t_connectionGraph.seconds());
+ tty->print_cr (" macroEliminate : %3.3f sec", Phase::_t_macroEliminate.seconds());
}
tty->print_cr (" iterGVN : %3.3f sec", Phase::_t_iterGVN.seconds());
tty->print_cr (" idealLoop : %3.3f sec", Phase::_t_idealLoop.seconds());
@@ -112,9 +116,10 @@ void Phase::print_timers() {
tty->print_cr (" iterGVN2 : %3.3f sec", Phase::_t_iterGVN2.seconds());
tty->print_cr (" macroExpand : %3.3f sec", Phase::_t_macroExpand.seconds());
tty->print_cr (" graphReshape : %3.3f sec", Phase::_t_graphReshaping.seconds());
- double optimizer_subtotal = Phase::_t_iterGVN.seconds() +
+ double optimizer_subtotal = Phase::_t_iterGVN.seconds() + Phase::_t_iterGVN2.seconds() +
+ Phase::_t_escapeAnalysis.seconds() + Phase::_t_macroEliminate.seconds() +
Phase::_t_idealLoop.seconds() + Phase::_t_ccp.seconds() +
- Phase::_t_graphReshaping.seconds();
+ Phase::_t_macroExpand.seconds() + Phase::_t_graphReshaping.seconds();
double percent_of_optimizer = ((optimizer_subtotal == 0.0) ? 0.0 : (optimizer_subtotal / Phase::_t_optimizer.seconds() * 100.0));
tty->print_cr (" subtotal : %3.3f sec, %3.2f %%", optimizer_subtotal, percent_of_optimizer);
}
diff --git a/hotspot/src/share/vm/opto/phase.hpp b/hotspot/src/share/vm/opto/phase.hpp
index c52fda3..9faabf5 100644
--- a/hotspot/src/share/vm/opto/phase.hpp
+++ b/hotspot/src/share/vm/opto/phase.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,8 +72,12 @@ protected:
// The next timers used for LogCompilation
static elapsedTimer _t_parser;
- static elapsedTimer _t_escapeAnalysis;
static elapsedTimer _t_optimizer;
+public:
+ // ConnectionGraph can't be Phase since it is used after EA done.
+ static elapsedTimer _t_escapeAnalysis;
+ static elapsedTimer _t_connectionGraph;
+protected:
static elapsedTimer _t_idealLoop;
static elapsedTimer _t_ccp;
static elapsedTimer _t_matcher;
@@ -84,6 +88,7 @@ protected:
static elapsedTimer _t_graphReshaping;
static elapsedTimer _t_scheduler;
static elapsedTimer _t_blockOrdering;
+ static elapsedTimer _t_macroEliminate;
static elapsedTimer _t_macroExpand;
static elapsedTimer _t_peephole;
static elapsedTimer _t_codeGeneration;
diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
index 6bddc22..0f07c32 100644
--- a/hotspot/src/share/vm/prims/jvm.cpp
+++ b/hotspot/src/share/vm/prims/jvm.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2727,7 +2727,9 @@ JVM_ENTRY(void, JVM_StopThread(JNIEnv* env, jobject jthread, jobject throwable))
}
oop java_thread = JNIHandles::resolve_non_null(jthread);
JavaThread* receiver = java_lang_Thread::thread(java_thread);
- Events::log("JVM_StopThread thread JavaThread " INTPTR_FORMAT " as oop " INTPTR_FORMAT " [exception " INTPTR_FORMAT "]", receiver, (address)java_thread, throwable);
+ Events::log_exception(JavaThread::current(),
+ "JVM_StopThread thread JavaThread " INTPTR_FORMAT " as oop " INTPTR_FORMAT " [exception " INTPTR_FORMAT "]",
+ receiver, (address)java_thread, throwable);
// First check if thread is alive
if (receiver != NULL) {
// Check if exception is getting thrown at self (use oop equality, since the
diff --git a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
index 7e2a327..af576eb 100644
--- a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -727,8 +727,11 @@ void JvmtiClassFileReconstituter::copy_bytecodes(methodHandle mh,
case Bytecodes::_invokestatic : // fall through
case Bytecodes::_invokedynamic : // fall through
case Bytecodes::_invokeinterface :
- assert(len == 3 || (code == Bytecodes::_invokeinterface && len ==5),
+ assert(len == 3 ||
+ (code == Bytecodes::_invokeinterface && len == 5) ||
+ (code == Bytecodes::_invokedynamic && len == 5),
"sanity check");
+
int cpci = Bytes::get_native_u2(bcp+1);
bool is_invokedynamic = (EnableInvokeDynamic && code == Bytecodes::_invokedynamic);
if (is_invokedynamic)
diff --git a/hotspot/src/share/vm/prims/jvmtiExport.hpp b/hotspot/src/share/vm/prims/jvmtiExport.hpp
index 1bfefa0..31ee1ec 100644
--- a/hotspot/src/share/vm/prims/jvmtiExport.hpp
+++ b/hotspot/src/share/vm/prims/jvmtiExport.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -324,6 +324,12 @@ class JvmtiExport : public AllStatic {
record_vm_internal_object_allocation(object);
}
}
+ inline static void post_array_size_exhausted() {
+ if (should_post_resource_exhausted()) {
+ post_resource_exhausted(JVMTI_RESOURCE_EXHAUSTED_OOM_ERROR,
+ "Requested array size exceeds VM limit");
+ }
+ }
static void cleanup_thread (JavaThread* thread) KERNEL_RETURN;
diff --git a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
index 650db65..a425430 100644
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -2999,7 +2999,8 @@ inline bool VM_HeapWalkOperation::iterate_over_object(oop o) {
char type = field->field_type();
if (!is_primitive_field_type(type)) {
oop fld_o = o->obj_field(field->field_offset());
- if (fld_o != NULL) {
+ // ignore any objects that aren't visible to profiler
+ if (fld_o != NULL && ServiceUtil::visible_oop(fld_o)) {
// reflection code may have a reference to a klassOop.
// - see sun.reflect.UnsafeStaticFieldAccessorImpl and sun.misc.Unsafe
if (fld_o->is_klass()) {
diff --git a/hotspot/src/share/vm/prims/jvmtiThreadState.cpp b/hotspot/src/share/vm/prims/jvmtiThreadState.cpp
index faf9de7..398043b 100644
--- a/hotspot/src/share/vm/prims/jvmtiThreadState.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiThreadState.cpp
@@ -319,6 +319,15 @@ void JvmtiThreadState::process_pending_step_for_popframe() {
// clearing the flag indicates we are done with the PopFrame() dance
clr_pending_step_for_popframe();
+ // If exception was thrown in this frame, need to reset jvmti thread state.
+ // Single stepping may not get enabled correctly by the agent since
+ // exception state is passed in MethodExit event which may be sent at some
+ // time in the future. JDWP agent ignores MethodExit events if caused by
+ // an exception.
+ //
+ if (is_exception_detected()) {
+ clear_exception_detected();
+ }
// If step is pending for popframe then it may not be
// a repeat step. The new_bci and method_id is same as current_bci
// and current method_id after pop and step for recursive calls.
@@ -385,6 +394,15 @@ void JvmtiThreadState::process_pending_step_for_earlyret() {
// the ForceEarlyReturn() dance
clr_pending_step_for_earlyret();
+ // If exception was thrown in this frame, need to reset jvmti thread state.
+ // Single stepping may not get enabled correctly by the agent since
+ // exception state is passed in MethodExit event which may be sent at some
+ // time in the future. JDWP agent ignores MethodExit events if caused by
+ // an exception.
+ //
+ if (is_exception_detected()) {
+ clear_exception_detected();
+ }
// If step is pending for earlyret then it may not be a repeat step.
// The new_bci and method_id is same as current_bci and current
// method_id after earlyret and step for recursive calls.
diff --git a/hotspot/src/share/vm/prims/jvmtiThreadState.hpp b/hotspot/src/share/vm/prims/jvmtiThreadState.hpp
index 669420a..87d2f0b 100644
--- a/hotspot/src/share/vm/prims/jvmtiThreadState.hpp
+++ b/hotspot/src/share/vm/prims/jvmtiThreadState.hpp
@@ -165,6 +165,10 @@ class JvmtiThreadState : public CHeapObj {
inline bool is_exception_caught() { return _exception_caught; }
inline void set_exception_detected() { _exception_detected = true;
_exception_caught = false; }
+ inline void clear_exception_detected() {
+ _exception_detected = false;
+ assert(_exception_caught == false, "_exception_caught is out of phase");
+ }
inline void set_exception_caught() { _exception_caught = true;
_exception_detected = false; }
diff --git a/hotspot/src/share/vm/prims/nativeLookup.cpp b/hotspot/src/share/vm/prims/nativeLookup.cpp
index 874c54d..41fc42d 100644
--- a/hotspot/src/share/vm/prims/nativeLookup.cpp
+++ b/hotspot/src/share/vm/prims/nativeLookup.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,19 @@ char* NativeLookup::pure_jni_name(methodHandle method) {
}
+char* NativeLookup::critical_jni_name(methodHandle method) {
+ stringStream st;
+ // Prefix
+ st.print("JavaCritical_");
+ // Klass name
+ mangle_name_on(&st, method->klass_name());
+ st.print("_");
+ // Method name
+ mangle_name_on(&st, method->name());
+ return st.as_string();
+}
+
+
char* NativeLookup::long_jni_name(methodHandle method) {
// Signature ignore the wrapping parenteses and the trailing return type
stringStream st;
@@ -108,6 +121,7 @@ extern "C" {
void JNICALL JVM_RegisterUnsafeMethods(JNIEnv *env, jclass unsafecls);
void JNICALL JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass unsafecls);
void JNICALL JVM_RegisterPerfMethods(JNIEnv *env, jclass perfclass);
+ void JNICALL JVM_RegisterWhiteBoxMethods(JNIEnv *env, jclass wbclass);
}
#define CC (char*) /* cast a literal from (const char*) */
@@ -120,7 +134,8 @@ static JNINativeMethod lookup_special_native_methods[] = {
{ CC"Java_sun_misc_Unsafe_registerNatives", NULL, FN_PTR(JVM_RegisterUnsafeMethods) },
{ CC"Java_java_lang_invoke_MethodHandleNatives_registerNatives", NULL, FN_PTR(JVM_RegisterMethodHandleMethods) },
- { CC"Java_sun_misc_Perf_registerNatives", NULL, FN_PTR(JVM_RegisterPerfMethods) }
+ { CC"Java_sun_misc_Perf_registerNatives", NULL, FN_PTR(JVM_RegisterPerfMethods) },
+ { CC"Java_sun_hotspot_WhiteBox_registerNatives", NULL, FN_PTR(JVM_RegisterWhiteBoxMethods) },
};
static address lookup_special_native(char* jni_name) {
@@ -193,6 +208,34 @@ address NativeLookup::lookup_style(methodHandle method, char* pure_name, const c
}
+address NativeLookup::lookup_critical_style(methodHandle method, char* pure_name, const char* long_name, int args_size, bool os_style) {
+ if (!method->has_native_function()) {
+ return NULL;
+ }
+
+ address current_entry = method->native_function();
+
+ char dll_name[JVM_MAXPATHLEN];
+ int offset;
+ if (os::dll_address_to_library_name(current_entry, dll_name, sizeof(dll_name), &offset)) {
+ char ebuf[32];
+ void* dll = os::dll_load(dll_name, ebuf, sizeof(ebuf));
+ if (dll != NULL) {
+ // Compute complete JNI name for style
+ stringStream st;
+ if (os_style) os::print_jni_name_prefix_on(&st, args_size);
+ st.print_raw(pure_name);
+ st.print_raw(long_name);
+ if (os_style) os::print_jni_name_suffix_on(&st, args_size);
+ char* jni_name = st.as_string();
+ return (address)os::dll_lookup(dll, jni_name);
+ }
+ }
+
+ return NULL;
+}
+
+
// Check all the formats of native implementation name to see if there is one
// for the specified method.
address NativeLookup::lookup_entry(methodHandle method, bool& in_base_library, TRAPS) {
@@ -228,6 +271,58 @@ address NativeLookup::lookup_entry(methodHandle method, bool& in_base_library, T
return entry; // NULL indicates not found
}
+// Check all the formats of native implementation name to see if there is one
+// for the specified method.
+address NativeLookup::lookup_critical_entry(methodHandle method) {
+ if (!CriticalJNINatives) return NULL;
+
+ if (method->is_synchronized() ||
+ !method->is_static()) {
+ // Only static non-synchronized methods are allowed
+ return NULL;
+ }
+
+ ResourceMark rm;
+ address entry = NULL;
+
+ Symbol* signature = method->signature();
+ for (int end = 0; end < signature->utf8_length(); end++) {
+ if (signature->byte_at(end) == 'L') {
+ // Don't allow object types
+ return NULL;
+ }
+ }
+
+ // Compute critical name
+ char* critical_name = critical_jni_name(method);
+
+ // Compute argument size
+ int args_size = 1 // JNIEnv
+ + (method->is_static() ? 1 : 0) // class for static methods
+ + method->size_of_parameters(); // actual parameters
+
+
+ // 1) Try JNI short style
+ entry = lookup_critical_style(method, critical_name, "", args_size, true);
+ if (entry != NULL) return entry;
+
+ // Compute long name
+ char* long_name = long_jni_name(method);
+
+ // 2) Try JNI long style
+ entry = lookup_critical_style(method, critical_name, long_name, args_size, true);
+ if (entry != NULL) return entry;
+
+ // 3) Try JNI short style without os prefix/suffix
+ entry = lookup_critical_style(method, critical_name, "", args_size, false);
+ if (entry != NULL) return entry;
+
+ // 4) Try JNI long style without os prefix/suffix
+ entry = lookup_critical_style(method, critical_name, long_name, args_size, false);
+
+ return entry; // NULL indicates not found
+}
+
// Check if there are any JVM TI prefixes which have been applied to the native method name.
// If any are found, remove them before attemping the look up of the
// native implementation again.
diff --git a/hotspot/src/share/vm/prims/nativeLookup.hpp b/hotspot/src/share/vm/prims/nativeLookup.hpp
index bf2dab8..c7ffeb3 100644
--- a/hotspot/src/share/vm/prims/nativeLookup.hpp
+++ b/hotspot/src/share/vm/prims/nativeLookup.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,15 +36,18 @@ class NativeLookup : AllStatic {
// JNI name computation
static char* pure_jni_name(methodHandle method);
static char* long_jni_name(methodHandle method);
+ static char* critical_jni_name(methodHandle method);
// Style specific lookup
static address lookup_style(methodHandle method, char* pure_name, const char* long_name, int args_size, bool os_style, bool& in_base_library, TRAPS);
+ static address lookup_critical_style(methodHandle method, char* pure_name, const char* long_name, int args_size, bool os_style);
static address lookup_base (methodHandle method, bool& in_base_library, TRAPS);
static address lookup_entry(methodHandle method, bool& in_base_library, TRAPS);
static address lookup_entry_prefixed(methodHandle method, bool& in_base_library, TRAPS);
public:
// Lookup native function. May throw UnsatisfiedLinkError.
static address lookup(methodHandle method, bool& in_base_library, TRAPS);
+ static address lookup_critical_entry(methodHandle method);
// Lookup native functions in base library.
static address base_library_lookup(const char* class_name, const char* method_name, const char* signature);
diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
index a7dab0b..29453b8 100644
--- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
@@ -271,13 +271,10 @@ bool AdvancedThresholdPolicy::should_not_inline(ciEnv* env, ciMethod* callee) {
}
// Create MDO if necessary.
-void AdvancedThresholdPolicy::create_mdo(methodHandle mh, TRAPS) {
+void AdvancedThresholdPolicy::create_mdo(methodHandle mh, JavaThread* THREAD) {
if (mh->is_native() || mh->is_abstract() || mh->is_accessor()) return;
if (mh->method_data() == NULL) {
- methodOopDesc::build_interpreter_method_data(mh, THREAD);
- if (HAS_PENDING_EXCEPTION) {
- CLEAR_PENDING_EXCEPTION;
- }
+ methodOopDesc::build_interpreter_method_data(mh, CHECK_AND_CLEAR);
}
}
@@ -426,22 +423,22 @@ CompLevel AdvancedThresholdPolicy::loop_event(methodOop method, CompLevel cur_le
}
// Update the rate and submit compile
-void AdvancedThresholdPolicy::submit_compile(methodHandle mh, int bci, CompLevel level, TRAPS) {
+void AdvancedThresholdPolicy::submit_compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread) {
int hot_count = (bci == InvocationEntryBci) ? mh->invocation_count() : mh->backedge_count();
update_rate(os::javaTimeMillis(), mh());
- CompileBroker::compile_method(mh, bci, level, mh, hot_count, "tiered", THREAD);
+ CompileBroker::compile_method(mh, bci, level, mh, hot_count, "tiered", thread);
}
// Handle the invocation event.
void AdvancedThresholdPolicy::method_invocation_event(methodHandle mh, methodHandle imh,
- CompLevel level, nmethod* nm, TRAPS) {
+ CompLevel level, nmethod* nm, JavaThread* thread) {
if (should_create_mdo(mh(), level)) {
- create_mdo(mh, THREAD);
+ create_mdo(mh, thread);
}
if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh, InvocationEntryBci)) {
CompLevel next_level = call_event(mh(), level);
if (next_level != level) {
- compile(mh, InvocationEntryBci, next_level, THREAD);
+ compile(mh, InvocationEntryBci, next_level, thread);
}
}
}
@@ -449,13 +446,13 @@ void AdvancedThresholdPolicy::method_invocation_event(methodHandle mh, methodHan
// Handle the back branch event. Notice that we can compile the method
// with a regular entry from here.
void AdvancedThresholdPolicy::method_back_branch_event(methodHandle mh, methodHandle imh,
- int bci, CompLevel level, nmethod* nm, TRAPS) {
+ int bci, CompLevel level, nmethod* nm, JavaThread* thread) {
if (should_create_mdo(mh(), level)) {
- create_mdo(mh, THREAD);
+ create_mdo(mh, thread);
}
// Check if MDO should be created for the inlined method
if (should_create_mdo(imh(), level)) {
- create_mdo(imh, THREAD);
+ create_mdo(imh, thread);
}
if (is_compilation_enabled()) {
@@ -463,7 +460,7 @@ void AdvancedThresholdPolicy::method_back_branch_event(methodHandle mh, methodHa
CompLevel max_osr_level = (CompLevel)imh->highest_osr_comp_level();
// At the very least compile the OSR version
if (!CompileBroker::compilation_is_in_queue(imh, bci) && next_osr_level != level) {
- compile(imh, bci, next_osr_level, THREAD);
+ compile(imh, bci, next_osr_level, thread);
}
// Use loop event as an opportunity to also check if there's been
@@ -502,14 +499,14 @@ void AdvancedThresholdPolicy::method_back_branch_event(methodHandle mh, methodHa
next_level = CompLevel_full_profile;
}
if (cur_level != next_level) {
- compile(mh, InvocationEntryBci, next_level, THREAD);
+ compile(mh, InvocationEntryBci, next_level, thread);
}
}
} else {
cur_level = comp_level(imh());
next_level = call_event(imh(), cur_level);
if (!CompileBroker::compilation_is_in_queue(imh, bci) && next_level != cur_level) {
- compile(imh, InvocationEntryBci, next_level, THREAD);
+ compile(imh, InvocationEntryBci, next_level, thread);
}
}
}
diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
index 58be8b2..7126877 100644
--- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
@@ -197,7 +197,7 @@ class AdvancedThresholdPolicy : public SimpleThresholdPolicy {
// determines whether we should do that.
inline bool should_create_mdo(methodOop method, CompLevel cur_level);
// Create MDO if necessary.
- void create_mdo(methodHandle mh, TRAPS);
+ void create_mdo(methodHandle mh, JavaThread* thread);
// Is method profiled enough?
bool is_method_profiled(methodOop method);
@@ -208,12 +208,12 @@ protected:
jlong start_time() const { return _start_time; }
// Submit a given method for compilation (and update the rate).
- virtual void submit_compile(methodHandle mh, int bci, CompLevel level, TRAPS);
+ virtual void submit_compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread);
// event() from SimpleThresholdPolicy would call these.
virtual void method_invocation_event(methodHandle method, methodHandle inlinee,
- CompLevel level, nmethod* nm, TRAPS);
+ CompLevel level, nmethod* nm, JavaThread* thread);
virtual void method_back_branch_event(methodHandle method, methodHandle inlinee,
- int bci, CompLevel level, nmethod* nm, TRAPS);
+ int bci, CompLevel level, nmethod* nm, JavaThread* thread);
public:
AdvancedThresholdPolicy() : _start_time(0) { }
// Select task is called by CompileBroker. We should return a task or NULL.
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index 9fd5522..b4d2eb4 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -105,8 +105,6 @@ SystemProperty *Arguments::_sun_boot_class_path = NULL;
char* Arguments::_meta_index_path = NULL;
char* Arguments::_meta_index_dir = NULL;
-static bool force_client_mode = false;
-
// Check if head of 'option' matches 'name', and sets 'tail' remaining part of option string
static bool match_option(const JavaVMOption *option, const char* name,
@@ -829,8 +827,21 @@ bool Arguments::process_argument(const char* arg,
return true;
}
- jio_fprintf(defaultStream::error_stream(),
- "Unrecognized VM option '%s'\n", argname);
+ // For locked flags, report a custom error message if available.
+ // Otherwise, report the standard unrecognized VM option.
+
+ Flag* locked_flag = Flag::find_flag((char*)argname, strlen(argname), true);
+ if (locked_flag != NULL) {
+ char locked_message_buf[BUFLEN];
+ locked_flag->get_locked_message(locked_message_buf, BUFLEN);
+ if (strlen(locked_message_buf) == 0) {
+ jio_fprintf(defaultStream::error_stream(),
+ "Unrecognized VM option '%s'\n", argname);
+ } else {
+ jio_fprintf(defaultStream::error_stream(), "%s", locked_message_buf);
+ }
+ }
+
// allow for commandline "commenting out" options like -XX:#+Verbose
return arg[0] == '#';
}
@@ -1064,6 +1075,16 @@ void Arguments::set_tiered_flags() {
}
#ifndef KERNEL
+static void disable_adaptive_size_policy(const char* collector_name) {
+ if (UseAdaptiveSizePolicy) {
+ if (FLAG_IS_CMDLINE(UseAdaptiveSizePolicy)) {
+ warning("disabling UseAdaptiveSizePolicy; it is incompatible with %s.",
+ collector_name);
+ }
+ FLAG_SET_DEFAULT(UseAdaptiveSizePolicy, false);
+ }
+}
+
// If the user has chosen ParallelGCThreads > 0, we set UseParNewGC
// if it's not explictly set or unset. If the user has chosen
// UseParNewGC and not explicitly set ParallelGCThreads we
@@ -1073,11 +1094,8 @@ void Arguments::set_parnew_gc_flags() {
"control point invariant");
assert(UseParNewGC, "Error");
- // Turn off AdaptiveSizePolicy by default for parnew until it is
- // complete.
- if (FLAG_IS_DEFAULT(UseAdaptiveSizePolicy)) {
- FLAG_SET_DEFAULT(UseAdaptiveSizePolicy, false);
- }
+ // Turn off AdaptiveSizePolicy for parnew until it is complete.
+ disable_adaptive_size_policy("UseParNewGC");
if (ParallelGCThreads == 0) {
FLAG_SET_DEFAULT(ParallelGCThreads,
@@ -1134,11 +1152,8 @@ void Arguments::set_cms_and_parnew_gc_flags() {
FLAG_SET_ERGO(bool, UseParNewGC, true);
}
- // Turn off AdaptiveSizePolicy by default for cms until it is
- // complete.
- if (FLAG_IS_DEFAULT(UseAdaptiveSizePolicy)) {
- FLAG_SET_DEFAULT(UseAdaptiveSizePolicy, false);
- }
+ // Turn off AdaptiveSizePolicy for CMS until it is complete.
+ disable_adaptive_size_policy("UseConcMarkSweepGC");
// In either case, adjust ParallelGCThreads and/or UseParNewGC
// as needed.
@@ -1365,7 +1380,7 @@ void Arguments::set_ergonomics_flags() {
return;
}
- if (os::is_server_class_machine() && !force_client_mode ) {
+ if (os::is_server_class_machine()) {
// If no other collector is requested explicitly,
// let the VM select the collector based on
// machine class and automatic selection policy.
@@ -1390,12 +1405,9 @@ void Arguments::set_ergonomics_flags() {
// by ergonomics.
if (MaxHeapSize <= max_heap_for_compressed_oops()) {
#if !defined(COMPILER1) || defined(TIERED)
-// disable UseCompressedOops by default on MacOS X until 7118647 is fixed
-#ifndef __APPLE__
if (FLAG_IS_DEFAULT(UseCompressedOops)) {
FLAG_SET_ERGO(bool, UseCompressedOops, true);
}
-#endif // !__APPLE__
#endif
#ifdef _WIN64
if (UseLargePages && UseCompressedOops) {
@@ -1420,10 +1432,11 @@ void Arguments::set_ergonomics_flags() {
void Arguments::set_parallel_gc_flags() {
assert(UseParallelGC || UseParallelOldGC, "Error");
- // If parallel old was requested, automatically enable parallel scavenge.
- if (UseParallelOldGC && !UseParallelGC && FLAG_IS_DEFAULT(UseParallelGC)) {
- FLAG_SET_DEFAULT(UseParallelGC, true);
+ // Enable ParallelOld unless it was explicitly disabled (cmd line or rc file).
+ if (FLAG_IS_DEFAULT(UseParallelOldGC)) {
+ FLAG_SET_DEFAULT(UseParallelOldGC, true);
}
+ FLAG_SET_DEFAULT(UseParallelGC, true);
// If no heap maximum was requested explicitly, use some reasonable fraction
// of the physical memory, up to a maximum of 1GB.
@@ -2074,6 +2087,19 @@ jint Arguments::parse_vm_init_args(const JavaVMInitArgs* args) {
FREE_C_HEAP_ARRAY(char, altclasses_path);
}
+ if (WhiteBoxAPI) {
+ // Append wb.jar to bootclasspath if enabled
+ const char* wb_jar = "wb.jar";
+ size_t wb_path_len = strlen(get_meta_index_dir()) + 1 +
+ strlen(wb_jar);
+ char* wb_path = NEW_C_HEAP_ARRAY(char, wb_path_len);
+ strcpy(wb_path, get_meta_index_dir());
+ strcat(wb_path, wb_jar);
+ scp.add_suffix(wb_path);
+ scp_assembly_required = true;
+ FREE_C_HEAP_ARRAY(char, wb_path);
+ }
+
// Parse _JAVA_OPTIONS environment variable (if present) (mimics classic VM)
result = parse_java_options_environment_variable(&scp, &scp_assembly_required);
if (result != JNI_OK) {
@@ -2553,15 +2579,6 @@ jint Arguments::parse_each_vm_init_arg(const JavaVMInitArgs* args,
// was arrived at by experimenting with specjbb.
FLAG_SET_CMDLINE(uintx, OldPLABSize, 8*K); // Note: this is in words
- // CompilationPolicyChoice=0 causes the server compiler to adopt
- // a more conservative which-method-do-I-compile policy when one
- // of the counters maintained by the interpreter trips. The
- // result is reduced startup time and improved specjbb and
- // alacrity performance. Zero is the default, but we set it
- // explicitly here in case the default changes.
- // See runtime/compilationPolicy.*.
- FLAG_SET_CMDLINE(intx, CompilationPolicyChoice, 0);
-
// Enable parallel GC and adaptive generation sizing
FLAG_SET_CMDLINE(bool, UseParallelGC, true);
FLAG_SET_DEFAULT(ParallelGCThreads,
@@ -2978,11 +2995,6 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
// Construct the path to the archive
char jvm_path[JVM_MAXPATHLEN];
os::jvm_path(jvm_path, sizeof(jvm_path));
-#ifdef TIERED
- if (strstr(jvm_path, "client") != NULL) {
- force_client_mode = true;
- }
-#endif // TIERED
char *end = strrchr(jvm_path, *os::file_separator());
if (end != NULL) *end = '\0';
char *shared_archive_path = NEW_C_HEAP_ARRAY(char, strlen(jvm_path) +
diff --git a/hotspot/src/share/vm/runtime/compilationPolicy.cpp b/hotspot/src/share/vm/runtime/compilationPolicy.cpp
index 61f1130..dadfb1e 100644
--- a/hotspot/src/share/vm/runtime/compilationPolicy.cpp
+++ b/hotspot/src/share/vm/runtime/compilationPolicy.cpp
@@ -306,29 +306,27 @@ bool NonTieredCompPolicy::is_mature(methodOop method) {
return (current >= initial + target);
}
-nmethod* NonTieredCompPolicy::event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS) {
+nmethod* NonTieredCompPolicy::event(methodHandle method, methodHandle inlinee, int branch_bci,
+ int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread) {
assert(comp_level == CompLevel_none, "This should be only called from the interpreter");
NOT_PRODUCT(trace_frequency_counter_overflow(method, branch_bci, bci));
- if (JvmtiExport::can_post_interpreter_events()) {
- assert(THREAD->is_Java_thread(), "Wrong type of thread");
- if (((JavaThread*)THREAD)->is_interp_only_mode()) {
- // If certain JVMTI events (e.g. frame pop event) are requested then the
- // thread is forced to remain in interpreted code. This is
- // implemented partly by a check in the run_compiled_code
- // section of the interpreter whether we should skip running
- // compiled code, and partly by skipping OSR compiles for
- // interpreted-only threads.
- if (bci != InvocationEntryBci) {
- reset_counter_for_back_branch_event(method);
- return NULL;
- }
+ if (JvmtiExport::can_post_interpreter_events() && thread->is_interp_only_mode()) {
+ // If certain JVMTI events (e.g. frame pop event) are requested then the
+ // thread is forced to remain in interpreted code. This is
+ // implemented partly by a check in the run_compiled_code
+ // section of the interpreter whether we should skip running
+ // compiled code, and partly by skipping OSR compiles for
+ // interpreted-only threads.
+ if (bci != InvocationEntryBci) {
+ reset_counter_for_back_branch_event(method);
+ return NULL;
}
}
if (bci == InvocationEntryBci) {
// when code cache is full, compilation gets switched off, UseCompiler
// is set to false
if (!method->has_compiled_code() && UseCompiler) {
- method_invocation_event(method, CHECK_NULL);
+ method_invocation_event(method, thread);
} else {
// Force counter overflow on method entry, even if no compilation
// happened. (The method_invocation_event call does this also.)
@@ -344,7 +342,7 @@ nmethod* NonTieredCompPolicy::event(methodHandle method, methodHandle inlinee, i
NOT_PRODUCT(trace_osr_request(method, osr_nm, bci));
// when code cache is full, we should not compile any more...
if (osr_nm == NULL && UseCompiler) {
- method_back_branch_event(method, bci, CHECK_NULL);
+ method_back_branch_event(method, bci, thread);
osr_nm = method->lookup_osr_nmethod_for(bci, CompLevel_highest_tier, true);
}
if (osr_nm == NULL) {
@@ -395,7 +393,7 @@ void NonTieredCompPolicy::trace_osr_request(methodHandle method, nmethod* osr, i
// SimpleCompPolicy - compile current method
-void SimpleCompPolicy::method_invocation_event( methodHandle m, TRAPS) {
+void SimpleCompPolicy::method_invocation_event(methodHandle m, JavaThread* thread) {
int hot_count = m->invocation_count();
reset_counter_for_invocation_event(m);
const char* comment = "count";
@@ -405,18 +403,18 @@ void SimpleCompPolicy::method_invocation_event( methodHandle m, TRAPS) {
if (nm == NULL ) {
const char* comment = "count";
CompileBroker::compile_method(m, InvocationEntryBci, CompLevel_highest_tier,
- m, hot_count, comment, CHECK);
+ m, hot_count, comment, thread);
}
}
}
-void SimpleCompPolicy::method_back_branch_event(methodHandle m, int bci, TRAPS) {
+void SimpleCompPolicy::method_back_branch_event(methodHandle m, int bci, JavaThread* thread) {
int hot_count = m->backedge_count();
const char* comment = "backedge_count";
if (is_compilation_enabled() && !m->is_not_osr_compilable() && can_be_compiled(m)) {
CompileBroker::compile_method(m, bci, CompLevel_highest_tier,
- m, hot_count, comment, CHECK);
+ m, hot_count, comment, thread);
NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, CompLevel_highest_tier, true));)
}
}
@@ -427,14 +425,13 @@ const char* StackWalkCompPolicy::_msg = NULL;
// Consider m for compilation
-void StackWalkCompPolicy::method_invocation_event(methodHandle m, TRAPS) {
+void StackWalkCompPolicy::method_invocation_event(methodHandle m, JavaThread* thread) {
int hot_count = m->invocation_count();
reset_counter_for_invocation_event(m);
const char* comment = "count";
if (is_compilation_enabled() && m->code() == NULL && can_be_compiled(m)) {
- ResourceMark rm(THREAD);
- JavaThread *thread = (JavaThread*)THREAD;
+ ResourceMark rm(thread);
frame fr = thread->last_frame();
assert(fr.is_interpreted_frame(), "must be interpreted");
assert(fr.interpreter_frame_method() == m(), "bad method");
@@ -461,17 +458,17 @@ void StackWalkCompPolicy::method_invocation_event(methodHandle m, TRAPS) {
assert(top != NULL, "findTopInlinableFrame returned null");
if (TraceCompilationPolicy) top->print();
CompileBroker::compile_method(top->top_method(), InvocationEntryBci, CompLevel_highest_tier,
- m, hot_count, comment, CHECK);
+ m, hot_count, comment, thread);
}
}
}
-void StackWalkCompPolicy::method_back_branch_event(methodHandle m, int bci, TRAPS) {
+void StackWalkCompPolicy::method_back_branch_event(methodHandle m, int bci, JavaThread* thread) {
int hot_count = m->backedge_count();
const char* comment = "backedge_count";
if (is_compilation_enabled() && !m->is_not_osr_compilable() && can_be_compiled(m)) {
- CompileBroker::compile_method(m, bci, CompLevel_highest_tier, m, hot_count, comment, CHECK);
+ CompileBroker::compile_method(m, bci, CompLevel_highest_tier, m, hot_count, comment, thread);
NOT_PRODUCT(trace_osr_completion(m->lookup_osr_nmethod_for(bci, CompLevel_highest_tier, true));)
}
diff --git a/hotspot/src/share/vm/runtime/compilationPolicy.hpp b/hotspot/src/share/vm/runtime/compilationPolicy.hpp
index b9d7066..1d8427c 100644
--- a/hotspot/src/share/vm/runtime/compilationPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/compilationPolicy.hpp
@@ -64,7 +64,7 @@ public:
virtual int compiler_count(CompLevel comp_level) = 0;
// main notification entry, return a pointer to an nmethod if the OSR is required,
// returns NULL otherwise.
- virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS) = 0;
+ virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread) = 0;
// safepoint() is called at the end of the safepoint
virtual void do_safepoint_work() = 0;
// reprofile request
@@ -105,15 +105,15 @@ public:
virtual bool is_mature(methodOop method);
virtual void initialize();
virtual CompileTask* select_task(CompileQueue* compile_queue);
- virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS);
- virtual void method_invocation_event(methodHandle m, TRAPS) = 0;
- virtual void method_back_branch_event(methodHandle m, int bci, TRAPS) = 0;
+ virtual nmethod* event(methodHandle method, methodHandle inlinee, int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread);
+ virtual void method_invocation_event(methodHandle m, JavaThread* thread) = 0;
+ virtual void method_back_branch_event(methodHandle m, int bci, JavaThread* thread) = 0;
};
class SimpleCompPolicy : public NonTieredCompPolicy {
public:
- virtual void method_invocation_event(methodHandle m, TRAPS);
- virtual void method_back_branch_event(methodHandle m, int bci, TRAPS);
+ virtual void method_invocation_event(methodHandle m, JavaThread* thread);
+ virtual void method_back_branch_event(methodHandle m, int bci, JavaThread* thread);
};
// StackWalkCompPolicy - existing C2 policy
@@ -121,8 +121,8 @@ class SimpleCompPolicy : public NonTieredCompPolicy {
#ifdef COMPILER2
class StackWalkCompPolicy : public NonTieredCompPolicy {
public:
- virtual void method_invocation_event(methodHandle m, TRAPS);
- virtual void method_back_branch_event(methodHandle m, int bci, TRAPS);
+ virtual void method_invocation_event(methodHandle m, JavaThread* thread);
+ virtual void method_back_branch_event(methodHandle m, int bci, JavaThread* thread);
private:
RFrame* findTopInlinableFrame(GrowableArray<RFrame*>* stack);
diff --git a/hotspot/src/share/vm/runtime/deoptimization.cpp b/hotspot/src/share/vm/runtime/deoptimization.cpp
index 44eeee8..0e2a983 100644
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -339,7 +339,6 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
#ifdef ASSERT
assert(cb->is_deoptimization_stub() || cb->is_uncommon_trap_stub(), "just checking");
- Events::log("fetch unroll sp " INTPTR_FORMAT, unpack_sp);
#endif
#else
intptr_t* unpack_sp = stub_frame.sender(&dummy_map).unextended_sp();
@@ -577,6 +576,8 @@ JRT_LEAF(BasicType, Deoptimization::unpack_frames(JavaThread* thread, int exec_m
tty->print_cr("DEOPT UNPACKING thread " INTPTR_FORMAT " vframeArray " INTPTR_FORMAT " mode %d", thread, array, exec_mode);
}
#endif
+ Events::log(thread, "DEOPT UNPACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT " mode %d",
+ stub_frame.pc(), stub_frame.sp(), exec_mode);
UnrollBlock* info = array->unroll_block();
@@ -981,6 +982,7 @@ void Deoptimization::print_objects(GrowableArray<ScopeValue*>* objects) {
#endif // COMPILER2
vframeArray* Deoptimization::create_vframeArray(JavaThread* thread, frame fr, RegisterMap *reg_map, GrowableArray<compiledVFrame*>* chunk) {
+ Events::log(thread, "DEOPT PACKING pc=" INTPTR_FORMAT " sp=" INTPTR_FORMAT, fr.pc(), fr.sp());
#ifndef PRODUCT
if (TraceDeoptimization) {
@@ -1026,7 +1028,6 @@ vframeArray* Deoptimization::create_vframeArray(JavaThread* thread, frame fr, Re
// Compare the vframeArray to the collected vframes
assert(array->structural_compare(thread, chunk), "just checking");
- Events::log("# vframes = %d", (intptr_t)chunk->length());
#ifndef PRODUCT
if (TraceDeoptimization) {
@@ -1124,8 +1125,6 @@ void Deoptimization::deoptimize_single_frame(JavaThread* thread, frame fr) {
gather_statistics(Reason_constraint, Action_none, Bytecodes::_illegal);
- EventMark m("Deoptimization (pc=" INTPTR_FORMAT ", sp=" INTPTR_FORMAT ")", fr.pc(), fr.id());
-
// Patch the nmethod so that when execution returns to it we will
// deopt the execution state and return to the interpreter.
fr.deoptimize(thread);
@@ -1239,6 +1238,10 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* thread, jint tra
// before we are done with it.
nmethodLocker nl(fr.pc());
+ // Log a message
+ Events::log_deopt_message(thread, "Uncommon trap %d fr.pc " INTPTR_FORMAT,
+ trap_request, fr.pc());
+
{
ResourceMark rm;
@@ -1249,7 +1252,6 @@ JRT_ENTRY(void, Deoptimization::uncommon_trap_inner(JavaThread* thread, jint tra
DeoptAction action = trap_request_action(trap_request);
jint unloaded_class_index = trap_request_index(trap_request); // CP idx or -1
- Events::log("Uncommon trap occurred @" INTPTR_FORMAT " unloaded_class_index = %d", fr.pc(), (int) trap_request);
vframe* vf = vframe::new_vframe(&fr, ®_map, thread);
compiledVFrame* cvf = compiledVFrame::cast(vf);
diff --git a/hotspot/src/share/vm/runtime/dtraceJSDT.cpp b/hotspot/src/share/vm/runtime/dtraceJSDT.cpp
index 23bfeb6..67b18ea 100644
--- a/hotspot/src/share/vm/runtime/dtraceJSDT.cpp
+++ b/hotspot/src/share/vm/runtime/dtraceJSDT.cpp
@@ -82,7 +82,7 @@ jlong DTraceJSDT::activate(
int handle = pd_activate((void*)probes,
module_name, providers_count, providers);
- if (handle <= 0) {
+ if (handle < 0) {
delete probes;
THROW_MSG_0(vmSymbols::java_lang_RuntimeException(),
"Unable to register DTrace probes (internal error).");
diff --git a/hotspot/src/share/vm/runtime/frame.cpp b/hotspot/src/share/vm/runtime/frame.cpp
index 7f4a2ac..7ae9aa8 100644
--- a/hotspot/src/share/vm/runtime/frame.cpp
+++ b/hotspot/src/share/vm/runtime/frame.cpp
@@ -570,7 +570,7 @@ void frame::print_value_on(outputStream* st, JavaThread *thread) const {
InterpreterCodelet* desc = Interpreter::codelet_containing(pc());
if (desc != NULL) {
st->print("~");
- desc->print();
+ desc->print_on(st);
NOT_PRODUCT(begin = desc->code_begin(); end = desc->code_end();)
} else {
st->print("~interpreter");
@@ -1315,7 +1315,6 @@ bool frame::verify_return_pc(address x) {
}
#endif
-
#ifdef ASSERT
void frame::interpreter_frame_verify_monitor(BasicObjectLock* value) const {
assert(is_interpreted_frame(), "Not an interpreted frame");
@@ -1331,24 +1330,35 @@ void frame::interpreter_frame_verify_monitor(BasicObjectLock* value) const {
guarantee((current - low_mark) % monitor_size == 0 , "Misaligned bottom of BasicObjectLock*");
guarantee( current >= low_mark , "Current BasicObjectLock* below than low_mark");
}
+#endif
-
+#ifndef PRODUCT
void frame::describe(FrameValues& values, int frame_no) {
- intptr_t* frame_pointer = real_fp();
+ // boundaries: sp and the 'real' frame pointer
+ values.describe(-1, sp(), err_msg("sp for #%d", frame_no), 1);
+ intptr_t* frame_pointer = real_fp(); // Note: may differ from fp()
+
+ // print frame info at the highest boundary
+ intptr_t* info_address = MAX2(sp(), frame_pointer);
+
+ if (info_address != frame_pointer) {
+ // print frame_pointer explicitly if not marked by the frame info
+ values.describe(-1, frame_pointer, err_msg("frame pointer for #%d", frame_no), 1);
+ }
+
if (is_entry_frame() || is_compiled_frame() || is_interpreted_frame() || is_native_frame()) {
// Label values common to most frames
values.describe(-1, unextended_sp(), err_msg("unextended_sp for #%d", frame_no));
- values.describe(-1, sp(), err_msg("sp for #%d", frame_no));
- values.describe(-1, frame_pointer, err_msg("frame pointer for #%d", frame_no));
}
+
if (is_interpreted_frame()) {
methodOop m = interpreter_frame_method();
int bci = interpreter_frame_bci();
// Label the method and current bci
- values.describe(-1, MAX2(sp(), frame_pointer),
+ values.describe(-1, info_address,
FormatBuffer<1024>("#%d method %s @ %d", frame_no, m->name_and_sig_as_C_string(), bci), 2);
- values.describe(-1, MAX2(sp(), frame_pointer),
+ values.describe(-1, info_address,
err_msg("- %d locals %d max stack", m->max_locals(), m->max_stack()), 1);
if (m->max_locals() > 0) {
intptr_t* l0 = interpreter_frame_local_at(0);
@@ -1380,21 +1390,36 @@ void frame::describe(FrameValues& values, int frame_no) {
}
} else if (is_entry_frame()) {
// For now just label the frame
- values.describe(-1, MAX2(sp(), frame_pointer), err_msg("#%d entry frame", frame_no), 2);
+ values.describe(-1, info_address, err_msg("#%d entry frame", frame_no), 2);
} else if (is_compiled_frame()) {
// For now just label the frame
nmethod* nm = cb()->as_nmethod_or_null();
- values.describe(-1, MAX2(sp(), frame_pointer),
+ values.describe(-1, info_address,
FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for method %s%s", frame_no,
nm, nm->method()->name_and_sig_as_C_string(),
- is_deoptimized_frame() ? " (deoptimized" : ""), 2);
+ (_deopt_state == is_deoptimized) ?
+ " (deoptimized)" :
+ ((_deopt_state == unknown) ? " (state unknown)" : "")),
+ 2);
} else if (is_native_frame()) {
// For now just label the frame
nmethod* nm = cb()->as_nmethod_or_null();
- values.describe(-1, MAX2(sp(), frame_pointer),
+ values.describe(-1, info_address,
FormatBuffer<1024>("#%d nmethod " INTPTR_FORMAT " for native method %s", frame_no,
nm, nm->method()->name_and_sig_as_C_string()), 2);
+ } else if (is_ricochet_frame()) {
+ values.describe(-1, info_address, err_msg("#%d ricochet frame", frame_no), 2);
+ } else {
+ // provide default info if not handled before
+ char *info = (char *) "special frame";
+ if ((_cb != NULL) &&
+ (_cb->name() != NULL)) {
+ info = (char *)_cb->name();
+ }
+ values.describe(-1, info_address, err_msg("#%d <%s>", frame_no, info), 2);
}
+
+ // platform dependent additional data
describe_pd(values, frame_no);
}
@@ -1411,7 +1436,7 @@ StackFrameStream::StackFrameStream(JavaThread *thread, bool update) : _reg_map(t
}
-#ifdef ASSERT
+#ifndef PRODUCT
void FrameValues::describe(int owner, intptr_t* location, const char* description, int priority) {
FrameValue fv;
@@ -1424,6 +1449,7 @@ void FrameValues::describe(int owner, intptr_t* location, const char* descriptio
}
+#ifdef ASSERT
void FrameValues::validate() {
_values.sort(compare);
bool error = false;
@@ -1449,7 +1475,7 @@ void FrameValues::validate() {
}
assert(!error, "invalid layout");
}
-
+#endif // ASSERT
void FrameValues::print(JavaThread* thread) {
_values.sort(compare);
@@ -1498,4 +1524,4 @@ void FrameValues::print(JavaThread* thread) {
}
}
-#endif
+#endif // ndef PRODUCT
diff --git a/hotspot/src/share/vm/runtime/frame.hpp b/hotspot/src/share/vm/runtime/frame.hpp
index 02e06d1..c55380e 100644
--- a/hotspot/src/share/vm/runtime/frame.hpp
+++ b/hotspot/src/share/vm/runtime/frame.hpp
@@ -494,7 +494,7 @@ class frame VALUE_OBJ_CLASS_SPEC {
};
-#ifdef ASSERT
+#ifndef PRODUCT
// A simple class to describe a location on the stack
class FrameValue VALUE_OBJ_CLASS_SPEC {
public:
@@ -524,7 +524,9 @@ class FrameValues {
// Used by frame functions to describe locations.
void describe(int owner, intptr_t* location, const char* description, int priority = 0);
+#ifdef ASSERT
void validate();
+#endif
void print(JavaThread* thread);
};
diff --git a/hotspot/src/share/vm/runtime/globals.cpp b/hotspot/src/share/vm/runtime/globals.cpp
index 13ce54f..02d1057 100644
--- a/hotspot/src/share/vm/runtime/globals.cpp
+++ b/hotspot/src/share/vm/runtime/globals.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -81,6 +81,12 @@ bool Flag::is_unlocked() const {
}
}
+// Get custom message for this locked flag, or return NULL if
+// none is available.
+void Flag::get_locked_message(char* buf, int buflen) const {
+ get_locked_message_ext(buf, buflen);
+}
+
bool Flag::is_writeable() const {
return strcmp(kind, "{manageable}") == 0 ||
strcmp(kind, "{product rw}") == 0 ||
@@ -260,17 +266,22 @@ inline bool str_equal(const char* s, char* q, size_t len) {
return strncmp(s, q, len) == 0;
}
-Flag* Flag::find_flag(char* name, size_t length) {
- for (Flag* current = &flagTable[0]; current->name; current++) {
+// Search the flag table for a named flag
+Flag* Flag::find_flag(char* name, size_t length, bool allow_locked) {
+ for (Flag* current = &flagTable[0]; current->name != NULL; current++) {
if (str_equal(current->name, name, length)) {
+ // Found a matching entry. Report locked flags only if allowed.
if (!(current->is_unlocked() || current->is_unlocker())) {
- // disable use of diagnostic or experimental flags until they
- // are explicitly unlocked
- return NULL;
+ if (!allow_locked) {
+ // disable use of locked flags, e.g. diagnostic, experimental,
+ // commercial... until they are explicitly unlocked
+ return NULL;
+ }
}
return current;
}
}
+ // Flag name is not in the flag table
return NULL;
}
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index 88e5938..5476b72 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,17 @@
#define SHARE_VM_RUNTIME_GLOBALS_HPP
#include "utilities/debug.hpp"
+
+// use this for flags that are true per default in the tiered build
+// but false in non-tiered builds, and vice versa
+#ifdef TIERED
+#define trueInTiered true
+#define falseInTiered false
+#else
+#define trueInTiered false
+#define falseInTiered true
+#endif
+
#ifdef TARGET_ARCH_x86
# include "globals_x86.hpp"
#endif
@@ -211,7 +222,7 @@ struct Flag {
// number of flags
static size_t numFlags;
- static Flag* find_flag(char* name, size_t length);
+ static Flag* find_flag(char* name, size_t length, bool allow_locked = false);
bool is_bool() const { return strcmp(type, "bool") == 0; }
bool get_bool() const { return *((bool*) addr); }
@@ -248,6 +259,9 @@ struct Flag {
bool is_writeable_ext() const;
bool is_external_ext() const;
+ void get_locked_message(char*, int) const;
+ void get_locked_message_ext(char*, int) const;
+
void print_on(outputStream* st, bool withComments = false );
void print_as_flag(outputStream* st);
};
@@ -353,16 +367,6 @@ class CommandLineFlags {
#define falseInProduct true
#endif
-// use this for flags that are true per default in the tiered build
-// but false in non-tiered builds, and vice versa
-#ifdef TIERED
-#define trueInTiered true
-#define falseInTiered false
-#else
-#define trueInTiered false
-#define falseInTiered true
-#endif
-
#ifdef JAVASE_EMBEDDED
#define falseInEmbedded false
#else
@@ -658,6 +662,12 @@ class CommandLineFlags {
develop(bool, SpecialArraysEquals, true, \
"special version of Arrays.equals(char[],char[])") \
\
+ product(bool, CriticalJNINatives, true, \
+ "check for critical JNI entry points") \
+ \
+ notproduct(bool, StressCriticalJNINatives, false, \
+ "Exercise register saving code in critical natives") \
+ \
product(bool, UseSSE42Intrinsics, false, \
"SSE4.2 versions of intrinsics") \
\
@@ -735,8 +745,11 @@ class CommandLineFlags {
product(bool, MaxFDLimit, true, \
"Bump the number of file descriptors to max in solaris.") \
\
- notproduct(bool, LogEvents, trueInDebug, \
- "Enable Event log") \
+ diagnostic(bool, LogEvents, true, \
+ "Enable the various ring buffer event logs") \
+ \
+ diagnostic(intx, LogEventsBufferEntries, 10, \
+ "Enable the various ring buffer event logs") \
\
product(bool, BytecodeVerificationRemote, true, \
"Enables the Java bytecode verifier for remote classes") \
@@ -1042,6 +1055,9 @@ class CommandLineFlags {
notproduct(bool, PrintSystemDictionaryAtExit, false, \
"Prints the system dictionary at exit") \
\
+ experimental(intx, PredictedLoadedClassCount, 0, \
+ "Experimental: Tune loaded class cache starting size.") \
+ \
diagnostic(bool, UnsyncloadClass, false, \
"Unstable: VM calls loadClass unsynchronized. Custom " \
"class loader must call VM synchronized for findClass " \
@@ -3000,7 +3016,7 @@ class CommandLineFlags {
product(intx, SafepointTimeoutDelay, 10000, \
"Delay in milliseconds for option SafepointTimeout") \
\
- product(intx, NmethodSweepFraction, 4, \
+ product(intx, NmethodSweepFraction, 16, \
"Number of invocations of sweeper to cover all nmethods") \
\
product(intx, NmethodSweepCheckInterval, 5, \
@@ -3477,16 +3493,19 @@ class CommandLineFlags {
" Linux this policy requires root privilege.") \
\
product(bool, ThreadPriorityVerbose, false, \
- "print priority changes") \
+ "Print priority changes") \
\
product(intx, DefaultThreadPriority, -1, \
- "what native priority threads run at if not specified elsewhere (-1 means no change)") \
+ "The native priority at which threads run if not elsewhere " \
+ "specified (-1 means no change)") \
\
product(intx, CompilerThreadPriority, -1, \
- "what priority should compiler threads run at (-1 means no change)") \
+ "The native priority at which compiler threads should run " \
+ "(-1 means no change)") \
\
product(intx, VMThreadPriority, -1, \
- "what priority should VM threads run at (-1 means no change)") \
+ "The native priority at which the VM thread should run " \
+ "(-1 means no change)") \
\
product(bool, CompilerThreadHintNoPreempt, true, \
"(Solaris only) Give compiler threads an extra quanta") \
@@ -3505,6 +3524,15 @@ class CommandLineFlags {
product(intx, JavaPriority9_To_OSPriority, -1, "Map Java priorities to OS priorities") \
product(intx, JavaPriority10_To_OSPriority,-1, "Map Java priorities to OS priorities") \
\
+ experimental(bool, UseCriticalJavaThreadPriority, false, \
+ "Java thread priority 10 maps to critical scheduling priority") \
+ \
+ experimental(bool, UseCriticalCompilerThreadPriority, false, \
+ "Compiler thread(s) run at critical scheduling priority") \
+ \
+ experimental(bool, UseCriticalCMSThreadPriority, false, \
+ "ConcurrentMarkSweep thread runs at critical scheduling priority")\
+ \
/* compiler debugging */ \
notproduct(intx, CompileTheWorldStartAt, 1, \
"First class to consider when using +CompileTheWorld") \
@@ -3574,7 +3602,7 @@ class CommandLineFlags {
"Threshold at which tier 3 compilation is invoked (invocation " \
"minimum must be satisfied.") \
\
- product(intx, Tier3BackEdgeThreshold, 7000, \
+ product(intx, Tier3BackEdgeThreshold, 60000, \
"Back edge threshold at which tier 3 OSR compilation is invoked") \
\
product(intx, Tier4InvocationThreshold, 5000, \
@@ -3871,7 +3899,10 @@ class CommandLineFlags {
product(bool, UseVMInterruptibleIO, false, \
"(Unstable, Solaris-specific) Thread interrupt before or with " \
"EINTR for I/O operations results in OS_INTRPT. The default value"\
- " of this flag is true for JDK 6 and earliers")
+ " of this flag is true for JDK 6 and earlier") \
+ \
+ diagnostic(bool, WhiteBoxAPI, false, \
+ "Enable internal testing APIs")
/*
* Macros for factoring of globals
diff --git a/hotspot/src/share/vm/runtime/globals_ext.hpp b/hotspot/src/share/vm/runtime/globals_ext.hpp
index 15191df..7642fa9 100644
--- a/hotspot/src/share/vm/runtime/globals_ext.hpp
+++ b/hotspot/src/share/vm/runtime/globals_ext.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,4 +61,9 @@ inline bool Flag::is_external_ext() const {
return false;
}
+inline void Flag::get_locked_message_ext(char* buf, int buflen) const {
+ assert(buf != NULL, "Buffer cannot be NULL");
+ buf[0] = '\0';
+}
+
#endif // SHARE_VM_RUNTIME_GLOBALS_EXT_HPP
diff --git a/hotspot/src/share/vm/runtime/init.cpp b/hotspot/src/share/vm/runtime/init.cpp
index 4176cd8..c0e870e 100644
--- a/hotspot/src/share/vm/runtime/init.cpp
+++ b/hotspot/src/share/vm/runtime/init.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ void vtableStubs_init();
void InlineCacheBuffer_init();
void compilerOracle_init();
void compilationPolicy_init();
-
+void compileBroker_init();
// Initialization after compiler initialization
bool universe_post_init(); // must happen after compiler_init
@@ -120,6 +120,7 @@ jint init_globals() {
InlineCacheBuffer_init();
compilerOracle_init();
compilationPolicy_init();
+ compileBroker_init();
VMRegImpl::set_regName();
if (!universe_post_init()) {
diff --git a/hotspot/src/share/vm/runtime/interfaceSupport.hpp b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
index e1001ee..2875ee0 100644
--- a/hotspot/src/share/vm/runtime/interfaceSupport.hpp
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
@@ -436,6 +436,7 @@ class RuntimeHistogramElement : public HistogramElement {
#define VM_LEAF_BASE(result_type, header) \
TRACE_CALL(result_type, header) \
debug_only(NoHandleMark __hm;) \
+ os::verify_stack_alignment(); \
/* begin of body */
@@ -445,6 +446,7 @@ class RuntimeHistogramElement : public HistogramElement {
TRACE_CALL(result_type, header) \
HandleMarkCleaner __hm(thread); \
Thread* THREAD = thread; \
+ os::verify_stack_alignment(); \
/* begin of body */
@@ -454,6 +456,7 @@ class RuntimeHistogramElement : public HistogramElement {
TRACE_CALL(result_type, header) \
debug_only(NoHandleMark __hm;) \
Thread* THREAD = thread; \
+ os::verify_stack_alignment(); \
/* begin of body */
diff --git a/hotspot/src/share/vm/runtime/mutex.cpp b/hotspot/src/share/vm/runtime/mutex.cpp
index dddd27c..9fc1560 100644
--- a/hotspot/src/share/vm/runtime/mutex.cpp
+++ b/hotspot/src/share/vm/runtime/mutex.cpp
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1296,10 +1296,6 @@ void Monitor::set_owner_implementation(Thread *new_owner) {
assert(this->rank() >= 0, "bad lock rank");
- if (LogMultipleMutexLocking && locks != NULL) {
- Events::log("thread " INTPTR_FORMAT " locks %s, already owns %s", new_owner, name(), locks->name());
- }
-
// Deadlock avoidance rules require us to acquire Mutexes only in
// a global total order. For example m1 is the lowest ranked mutex
// that the thread holds and m2 is the mutex the thread is trying
@@ -1343,10 +1339,6 @@ void Monitor::set_owner_implementation(Thread *new_owner) {
#ifdef ASSERT
Monitor *locks = old_owner->owned_locks();
- if (LogMultipleMutexLocking && locks != this) {
- Events::log("thread " INTPTR_FORMAT " unlocks %s, still owns %s", old_owner, this->name(), locks->name());
- }
-
// remove "this" from the owned locks list
Monitor *prev = NULL;
diff --git a/hotspot/src/share/vm/runtime/mutexLocker.cpp b/hotspot/src/share/vm/runtime/mutexLocker.cpp
index 0a2d879..f1911ea 100644
--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp
+++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -126,6 +126,7 @@ Mutex* OopMapCacheAlloc_lock = NULL;
Mutex* FreeList_lock = NULL;
Monitor* SecondaryFreeList_lock = NULL;
Mutex* OldSets_lock = NULL;
+Monitor* RootRegionScan_lock = NULL;
Mutex* MMUTracker_lock = NULL;
Mutex* HotCardCache_lock = NULL;
@@ -199,6 +200,7 @@ void mutex_init() {
def(FreeList_lock , Mutex, leaf , true );
def(SecondaryFreeList_lock , Monitor, leaf , true );
def(OldSets_lock , Mutex , leaf , true );
+ def(RootRegionScan_lock , Monitor, leaf , true );
def(MMUTracker_lock , Mutex , leaf , true );
def(HotCardCache_lock , Mutex , special , true );
def(EvacFailureStack_lock , Mutex , nonleaf , true );
diff --git a/hotspot/src/share/vm/runtime/mutexLocker.hpp b/hotspot/src/share/vm/runtime/mutexLocker.hpp
index 2a6bf36..846b2d4 100644
--- a/hotspot/src/share/vm/runtime/mutexLocker.hpp
+++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -115,7 +115,7 @@ extern Mutex* OsrList_lock; // a lock used to serialize acc
#ifndef PRODUCT
extern Mutex* FullGCALot_lock; // a lock to make FullGCALot MT safe
-#endif
+#endif // PRODUCT
extern Mutex* Debug1_lock; // A bunch of pre-allocated locks that can be used for tracing
extern Mutex* Debug2_lock; // down synchronization related bugs!
extern Mutex* Debug3_lock;
@@ -129,6 +129,7 @@ extern Mutex* OopMapCacheAlloc_lock; // protects allocation of oop_m
extern Mutex* FreeList_lock; // protects the free region list during safepoints
extern Monitor* SecondaryFreeList_lock; // protects the secondary free region list
extern Mutex* OldSets_lock; // protects the old region sets
+extern Monitor* RootRegionScan_lock; // used to notify that the CM threads have finished scanning the IM snapshot regions
extern Mutex* MMUTracker_lock; // protects the MMU
// tracker data structures
extern Mutex* HotCardCache_lock; // protects the hot card cache
diff --git a/hotspot/src/share/vm/runtime/os.hpp b/hotspot/src/share/vm/runtime/os.hpp
index 85a85a3..dd163e9 100644
--- a/hotspot/src/share/vm/runtime/os.hpp
+++ b/hotspot/src/share/vm/runtime/os.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -73,8 +73,9 @@ enum ThreadPriority { // JLS 20.20.1-3
MinPriority = 1, // Minimum priority
NormPriority = 5, // Normal (non-daemon) priority
NearMaxPriority = 9, // High priority, used for VMThread
- MaxPriority = 10 // Highest priority, used for WatcherThread
+ MaxPriority = 10, // Highest priority, used for WatcherThread
// ensures that VMThread doesn't starve profiler
+ CriticalPriority = 11 // Critical thread priority
};
// Typedef for structured exception handling support
@@ -403,6 +404,8 @@ class os: AllStatic {
static address current_stack_base();
static size_t current_stack_size();
+ static void verify_stack_alignment() PRODUCT_RETURN;
+
static int message_box(const char* title, const char* message);
static char* do_you_want_to_debug(const char* message);
@@ -733,7 +736,7 @@ class os: AllStatic {
// Thread priority helpers (implemented in OS-specific part)
static OSReturn set_native_priority(Thread* thread, int native_prio);
static OSReturn get_native_priority(const Thread* const thread, int* priority_ptr);
- static int java_to_os_priority[MaxPriority + 1];
+ static int java_to_os_priority[CriticalPriority + 1];
// Hint to the underlying OS that a task switch would not be good.
// Void return because it's a hint and can fail.
static void hint_no_preempt();
diff --git a/hotspot/src/share/vm/runtime/safepoint.cpp b/hotspot/src/share/vm/runtime/safepoint.cpp
index d338931..514e7c9 100644
--- a/hotspot/src/share/vm/runtime/safepoint.cpp
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -95,6 +95,7 @@
SafepointSynchronize::SynchronizeState volatile SafepointSynchronize::_state = SafepointSynchronize::_not_synchronized;
volatile int SafepointSynchronize::_waiting_to_block = 0;
volatile int SafepointSynchronize::_safepoint_counter = 0;
+int SafepointSynchronize::_current_jni_active_count = 0;
long SafepointSynchronize::_end_of_last_safepoint = 0;
static volatile int PageArmed = 0 ; // safepoint polling page is RO|RW vs PROT_NONE
static volatile int TryingToBlock = 0 ; // proximate value -- for advisory use only
@@ -135,9 +136,11 @@ void SafepointSynchronize::begin() {
RuntimeService::record_safepoint_begin();
- {
MutexLocker mu(Safepoint_lock);
+ // Reset the count of active JNI critical threads
+ _current_jni_active_count = 0;
+
// Set number of threads to wait for, before we initiate the callbacks
_waiting_to_block = nof_threads;
TryingToBlock = 0 ;
@@ -216,6 +219,8 @@ void SafepointSynchronize::begin() {
#ifdef ASSERT
for (JavaThread *cur = Threads::first(); cur != NULL; cur = cur->next()) {
assert(cur->safepoint_state()->is_running(), "Illegal initial state");
+ // Clear the visited flag to ensure that the critical counts are collected properly.
+ cur->set_visited_for_critical_count(false);
}
#endif // ASSERT
@@ -375,6 +380,16 @@ void SafepointSynchronize::begin() {
OrderAccess::fence();
+#ifdef ASSERT
+ for (JavaThread *cur = Threads::first(); cur != NULL; cur = cur->next()) {
+ // make sure all the threads were visited
+ assert(cur->was_visited_for_critical_count(), "missed a thread");
+ }
+#endif // ASSERT
+
+ // Update the count of active JNI critical regions
+ GC_locker::set_jni_lock_count(_current_jni_active_count);
+
if (TraceSafepoint) {
VM_Operation *op = VMThread::vm_operation();
tty->print_cr("Entering safepoint region: %s", (op != NULL) ? op->name() : "no vm operation");
@@ -392,7 +407,6 @@ void SafepointSynchronize::begin() {
// Record how much time spend on the above cleanup tasks
update_statistics_on_cleanup_end(os::javaTimeNanos());
}
- }
}
// Wake up all threads, so they are ready to resume execution after the safepoint
@@ -539,6 +553,42 @@ bool SafepointSynchronize::safepoint_safe(JavaThread *thread, JavaThreadState st
}
+// See if the thread is running inside a lazy critical native and
+// update the thread critical count if so. Also set a suspend flag to
+// cause the native wrapper to return into the JVM to do the unlock
+// once the native finishes.
+void SafepointSynchronize::check_for_lazy_critical_native(JavaThread *thread, JavaThreadState state) {
+ if (state == _thread_in_native &&
+ thread->has_last_Java_frame() &&
+ thread->frame_anchor()->walkable()) {
+ // This thread might be in a critical native nmethod so look at
+ // the top of the stack and increment the critical count if it
+ // is.
+ frame wrapper_frame = thread->last_frame();
+ CodeBlob* stub_cb = wrapper_frame.cb();
+ if (stub_cb != NULL &&
+ stub_cb->is_nmethod() &&
+ stub_cb->as_nmethod_or_null()->is_lazy_critical_native()) {
+ // A thread could potentially be in a critical native across
+ // more than one safepoint, so only update the critical state on
+ // the first one. When it returns it will perform the unlock.
+ if (!thread->do_critical_native_unlock()) {
+#ifdef ASSERT
+ if (!thread->in_critical()) {
+ GC_locker::increment_debug_jni_lock_count();
+ }
+#endif
+ thread->enter_critical();
+ // Make sure the native wrapper calls back on return to
+ // perform the needed critical unlock.
+ thread->set_critical_native_unlock();
+ }
+ }
+ }
+}
+
+
+
// -------------------------------------------------------------------------------------------------------
// Implementation of Safepoint callback point
@@ -585,6 +635,12 @@ void SafepointSynchronize::block(JavaThread *thread) {
_waiting_to_block--;
thread->safepoint_state()->set_has_called_back(true);
+ DEBUG_ONLY(thread->set_visited_for_critical_count(true));
+ if (thread->in_critical()) {
+ // Notice that this thread is in a critical section
+ increment_jni_active_count();
+ }
+
// Consider (_waiting_to_block < 2) to pipeline the wakeup of the VM thread
if (_waiting_to_block == 0) {
Safepoint_lock->notify_all();
@@ -861,8 +917,9 @@ void ThreadSafepointState::examine_state_of_thread() {
// running, but are actually at a safepoint. We will happily
// agree and update the safepoint state here.
if (SafepointSynchronize::safepoint_safe(_thread, state)) {
- roll_forward(_at_safepoint);
- return;
+ SafepointSynchronize::check_for_lazy_critical_native(_thread, state);
+ roll_forward(_at_safepoint);
+ return;
}
if (state == _thread_in_vm) {
@@ -886,6 +943,11 @@ void ThreadSafepointState::roll_forward(suspend_type type) {
switch(_type) {
case _at_safepoint:
SafepointSynchronize::signal_thread_at_safepoint();
+ DEBUG_ONLY(_thread->set_visited_for_critical_count(true));
+ if (_thread->in_critical()) {
+ // Notice that this thread is in a critical section
+ SafepointSynchronize::increment_jni_active_count();
+ }
break;
case _call_back:
diff --git a/hotspot/src/share/vm/runtime/safepoint.hpp b/hotspot/src/share/vm/runtime/safepoint.hpp
index 5507155..71255a2 100644
--- a/hotspot/src/share/vm/runtime/safepoint.hpp
+++ b/hotspot/src/share/vm/runtime/safepoint.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@
#include "code/nmethod.hpp"
#include "memory/allocation.hpp"
#include "runtime/extendedPC.hpp"
+#include "runtime/mutexLocker.hpp"
#include "runtime/os.hpp"
#include "utilities/ostream.hpp"
@@ -92,6 +93,7 @@ class SafepointSynchronize : AllStatic {
private:
static volatile SynchronizeState _state; // Threads might read this flag directly, without acquireing the Threads_lock
static volatile int _waiting_to_block; // number of threads we are waiting for to block
+ static int _current_jni_active_count; // Counts the number of active critical natives during the safepoint
// This counter is used for fast versions of jni_Get<Primitive>Field.
// An even value means there is no ongoing safepoint operations.
@@ -138,6 +140,8 @@ public:
static bool safepoint_safe(JavaThread *thread, JavaThreadState state);
+ static void check_for_lazy_critical_native(JavaThread *thread, JavaThreadState state);
+
// Query
inline static bool is_at_safepoint() { return _state == _synchronized; }
inline static bool is_synchronizing() { return _state == _synchronizing; }
@@ -146,6 +150,11 @@ public:
return (_state != _not_synchronized);
}
+ inline static void increment_jni_active_count() {
+ assert_locked_or_safepoint(Safepoint_lock);
+ _current_jni_active_count++;
+ }
+
// Called when a thread volantary blocks
static void block(JavaThread *thread);
static void signal_thread_at_safepoint() { _waiting_to_block--; }
diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
index bea5e6b..503ad07 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -804,6 +804,7 @@ address SharedRuntime::continuation_for_implicit_exception(JavaThread* thread,
if (thread->deopt_mark() != NULL) {
Deoptimization::cleanup_deopt_info(thread, NULL);
}
+ Events::log_exception(thread, "StackOverflowError at " INTPTR_FORMAT, pc);
return StubRoutines::throw_StackOverflowError_entry();
}
@@ -820,8 +821,10 @@ address SharedRuntime::continuation_for_implicit_exception(JavaThread* thread,
if (vt_stub->is_abstract_method_error(pc)) {
assert(!vt_stub->is_vtable_stub(), "should never see AbstractMethodErrors from vtable-type VtableStubs");
+ Events::log_exception(thread, "AbstractMethodError at " INTPTR_FORMAT, pc);
return StubRoutines::throw_AbstractMethodError_entry();
} else {
+ Events::log_exception(thread, "NullPointerException at vtable entry " INTPTR_FORMAT, pc);
return StubRoutines::throw_NullPointerException_at_call_entry();
}
} else {
@@ -838,6 +841,7 @@ address SharedRuntime::continuation_for_implicit_exception(JavaThread* thread,
if (!cb->is_nmethod()) {
guarantee(cb->is_adapter_blob() || cb->is_method_handles_adapter_blob(),
"exception happened outside interpreter, nmethods and vtable stubs (1)");
+ Events::log_exception(thread, "NullPointerException in code blob at " INTPTR_FORMAT, pc);
// There is no handler here, so we will simply unwind.
return StubRoutines::throw_NullPointerException_at_call_entry();
}
@@ -849,6 +853,7 @@ address SharedRuntime::continuation_for_implicit_exception(JavaThread* thread,
// => the nmethod is not yet active (i.e., the frame
// is not set up yet) => use return address pushed by
// caller => don't push another return address
+ Events::log_exception(thread, "NullPointerException in IC check " INTPTR_FORMAT, pc);
return StubRoutines::throw_NullPointerException_at_call_entry();
}
@@ -886,9 +891,9 @@ address SharedRuntime::continuation_for_implicit_exception(JavaThread* thread,
// for AbortVMOnException flag
NOT_PRODUCT(Exceptions::debug_check_abort("java.lang.NullPointerException"));
if (exception_kind == IMPLICIT_NULL) {
- Events::log("Implicit null exception at " INTPTR_FORMAT " to " INTPTR_FORMAT, pc, target_pc);
+ Events::log_exception(thread, "Implicit null exception at " INTPTR_FORMAT " to " INTPTR_FORMAT, pc, target_pc);
} else {
- Events::log("Implicit division by zero exception at " INTPTR_FORMAT " to " INTPTR_FORMAT, pc, target_pc);
+ Events::log_exception(thread, "Implicit division by zero exception at " INTPTR_FORMAT " to " INTPTR_FORMAT, pc, target_pc);
}
return target_pc;
}
@@ -1541,7 +1546,6 @@ methodHandle SharedRuntime::reresolve_call_site(JavaThread *thread, TRAPS) {
if (caller.is_compiled_frame() && !caller.is_deoptimized_frame()) {
address pc = caller.pc();
- Events::log("update call-site at pc " INTPTR_FORMAT, pc);
// Default call_addr is the location of the "basic" call.
// Determine the address of the call we a reresolving. With
@@ -2679,6 +2683,20 @@ nmethod *AdapterHandlerLibrary::create_native_wrapper(methodHandle method, int c
return nm;
}
+JRT_ENTRY_NO_ASYNC(void, SharedRuntime::block_for_jni_critical(JavaThread* thread))
+ assert(thread == JavaThread::current(), "must be");
+ // The code is about to enter a JNI lazy critical native method and
+ // _needs_gc is true, so if this thread is already in a critical
+ // section then just return, otherwise this thread should block
+ // until needs_gc has been cleared.
+ if (thread->in_critical()) {
+ return;
+ }
+ // Lock and unlock a critical section to give the system a chance to block
+ GC_locker::lock_critical(thread);
+ GC_locker::unlock_critical(thread);
+JRT_END
+
#ifdef HAVE_DTRACE_H
// Create a dtrace nmethod for this method. The wrapper converts the
// java compiled calling convention to the native convention, makes a dummy call
diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.hpp b/hotspot/src/share/vm/runtime/sharedRuntime.hpp
index 145dacd..9650c6e 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntime.hpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -462,6 +462,9 @@ class SharedRuntime: AllStatic {
VMRegPair *regs,
BasicType ret_type );
+ // Block before entering a JNI critical method
+ static void block_for_jni_critical(JavaThread* thread);
+
#ifdef HAVE_DTRACE_H
// Generate a dtrace wrapper for a given method. The method takes arguments
// in the Java compiled code convention, marshals them to the native
diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
index 232da70..0ebc560 100644
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
@@ -177,13 +177,11 @@ void SimpleThresholdPolicy::reprofile(ScopeDesc* trap_scope, bool is_osr) {
}
nmethod* SimpleThresholdPolicy::event(methodHandle method, methodHandle inlinee,
- int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS) {
+ int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread) {
if (comp_level == CompLevel_none &&
- JvmtiExport::can_post_interpreter_events()) {
- assert(THREAD->is_Java_thread(), "Should be java thread");
- if (((JavaThread*)THREAD)->is_interp_only_mode()) {
- return NULL;
- }
+ JvmtiExport::can_post_interpreter_events() &&
+ thread->is_interp_only_mode()) {
+ return NULL;
}
nmethod *osr_nm = NULL;
@@ -197,9 +195,9 @@ nmethod* SimpleThresholdPolicy::event(methodHandle method, methodHandle inlinee,
}
if (bci == InvocationEntryBci) {
- method_invocation_event(method, inlinee, comp_level, nm, THREAD);
+ method_invocation_event(method, inlinee, comp_level, nm, thread);
} else {
- method_back_branch_event(method, inlinee, bci, comp_level, nm, THREAD);
+ method_back_branch_event(method, inlinee, bci, comp_level, nm, thread);
// method == inlinee if the event originated in the main method
int highest_level = inlinee->highest_osr_comp_level();
if (highest_level > comp_level) {
@@ -210,7 +208,7 @@ nmethod* SimpleThresholdPolicy::event(methodHandle method, methodHandle inlinee,
}
// Check if the method can be compiled, change level if necessary
-void SimpleThresholdPolicy::compile(methodHandle mh, int bci, CompLevel level, TRAPS) {
+void SimpleThresholdPolicy::compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread) {
assert(level <= TieredStopAtLevel, "Invalid compilation level");
if (level == CompLevel_none) {
return;
@@ -221,7 +219,7 @@ void SimpleThresholdPolicy::compile(methodHandle mh, int bci, CompLevel level, T
// pure C1.
if (!can_be_compiled(mh, level)) {
if (level == CompLevel_full_optimization && can_be_compiled(mh, CompLevel_simple)) {
- compile(mh, bci, CompLevel_simple, THREAD);
+ compile(mh, bci, CompLevel_simple, thread);
}
return;
}
@@ -232,14 +230,14 @@ void SimpleThresholdPolicy::compile(methodHandle mh, int bci, CompLevel level, T
if (PrintTieredEvents) {
print_event(COMPILE, mh, mh, bci, level);
}
- submit_compile(mh, bci, level, THREAD);
+ submit_compile(mh, bci, level, thread);
}
}
// Tell the broker to compile the method
-void SimpleThresholdPolicy::submit_compile(methodHandle mh, int bci, CompLevel level, TRAPS) {
+void SimpleThresholdPolicy::submit_compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread) {
int hot_count = (bci == InvocationEntryBci) ? mh->invocation_count() : mh->backedge_count();
- CompileBroker::compile_method(mh, bci, level, mh, hot_count, "tiered", THREAD);
+ CompileBroker::compile_method(mh, bci, level, mh, hot_count, "tiered", thread);
}
// Call and loop predicates determine whether a transition to a higher
@@ -366,11 +364,11 @@ CompLevel SimpleThresholdPolicy::loop_event(methodOop method, CompLevel cur_leve
// Handle the invocation event.
void SimpleThresholdPolicy::method_invocation_event(methodHandle mh, methodHandle imh,
- CompLevel level, nmethod* nm, TRAPS) {
+ CompLevel level, nmethod* nm, JavaThread* thread) {
if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh, InvocationEntryBci)) {
CompLevel next_level = call_event(mh(), level);
if (next_level != level) {
- compile(mh, InvocationEntryBci, next_level, THREAD);
+ compile(mh, InvocationEntryBci, next_level, thread);
}
}
}
@@ -378,7 +376,7 @@ void SimpleThresholdPolicy::method_invocation_event(methodHandle mh, methodHandl
// Handle the back branch event. Notice that we can compile the method
// with a regular entry from here.
void SimpleThresholdPolicy::method_back_branch_event(methodHandle mh, methodHandle imh,
- int bci, CompLevel level, nmethod* nm, TRAPS) {
+ int bci, CompLevel level, nmethod* nm, JavaThread* thread) {
// If the method is already compiling, quickly bail out.
if (is_compilation_enabled() && !CompileBroker::compilation_is_in_queue(mh, bci)) {
// Use loop event as an opportinity to also check there's been
@@ -391,13 +389,13 @@ void SimpleThresholdPolicy::method_back_branch_event(methodHandle mh, methodHand
next_osr_level < CompLevel_full_optimization ? next_osr_level : cur_level);
bool is_compiling = false;
if (next_level != cur_level) {
- compile(mh, InvocationEntryBci, next_level, THREAD);
+ compile(mh, InvocationEntryBci, next_level, thread);
is_compiling = true;
}
// Do the OSR version
if (!is_compiling && next_osr_level != level) {
- compile(mh, bci, next_osr_level, THREAD);
+ compile(mh, bci, next_osr_level, thread);
}
}
}
diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
index 1cff0c6..e228198 100644
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
@@ -67,9 +67,9 @@ protected:
// Print policy-specific information if necessary
virtual void print_specific(EventType type, methodHandle mh, methodHandle imh, int bci, CompLevel level) { }
// Check if the method can be compiled, change level if necessary
- void compile(methodHandle mh, int bci, CompLevel level, TRAPS);
+ void compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread);
// Submit a given method for compilation
- virtual void submit_compile(methodHandle mh, int bci, CompLevel level, TRAPS);
+ virtual void submit_compile(methodHandle mh, int bci, CompLevel level, JavaThread* thread);
// Simple methods are as good being compiled with C1 as C2.
// This function tells if it's such a function.
inline bool is_trivial(methodOop method);
@@ -88,9 +88,9 @@ protected:
return CompLevel_none;
}
virtual void method_invocation_event(methodHandle method, methodHandle inlinee,
- CompLevel level, nmethod* nm, TRAPS);
+ CompLevel level, nmethod* nm, JavaThread* thread);
virtual void method_back_branch_event(methodHandle method, methodHandle inlinee,
- int bci, CompLevel level, nmethod* nm, TRAPS);
+ int bci, CompLevel level, nmethod* nm, JavaThread* thread);
public:
SimpleThresholdPolicy() : _c1_count(0), _c2_count(0) { }
virtual int compiler_count(CompLevel comp_level) {
@@ -104,7 +104,7 @@ public:
virtual void disable_compilation(methodOop method) { }
virtual void reprofile(ScopeDesc* trap_scope, bool is_osr);
virtual nmethod* event(methodHandle method, methodHandle inlinee,
- int branch_bci, int bci, CompLevel comp_level, nmethod* nm, TRAPS);
+ int branch_bci, int bci, CompLevel comp_level, nmethod* nm, JavaThread* thread);
// Select task is called by CompileBroker. We should return a task or NULL.
virtual CompileTask* select_task(CompileQueue* compile_queue);
// Tell the runtime if we think a given method is adequately profiled.
diff --git a/hotspot/src/share/vm/runtime/sweeper.cpp b/hotspot/src/share/vm/runtime/sweeper.cpp
index f9ad79e..7f8561b 100644
--- a/hotspot/src/share/vm/runtime/sweeper.cpp
+++ b/hotspot/src/share/vm/runtime/sweeper.cpp
@@ -266,7 +266,17 @@ void NMethodSweeper::sweep_code_cache() {
// The last invocation iterates until there are no more nmethods
for (int i = 0; (i < todo || _invocations == 1) && _current != NULL; i++) {
+ if (SafepointSynchronize::is_synchronizing()) { // Safepoint request
+ if (PrintMethodFlushing && Verbose) {
+ tty->print_cr("### Sweep at %d out of %d, invocation: %d, yielding to safepoint", _seen, CodeCache::nof_nmethods(), _invocations);
+ }
+ MutexUnlockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ assert(Thread::current()->is_Java_thread(), "should be java thread");
+ JavaThread* thread = (JavaThread*)Thread::current();
+ ThreadBlockInVM tbivm(thread);
+ thread->java_suspend_self();
+ }
// Since we will give up the CodeCache_lock, always skip ahead
// to the next nmethod. Other blobs can be deleted by other
// threads but nmethods are only reclaimed by the sweeper.
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index 18c04a9..7676682 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
#include "interpreter/linkResolver.hpp"
#include "interpreter/oopMapCache.hpp"
#include "jvmtifiles/jvmtiEnv.hpp"
+#include "memory/gcLocker.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
#include "oops/instanceKlass.hpp"
@@ -246,6 +247,10 @@ Thread::Thread() {
omInUseList = NULL ;
omInUseCount = 0 ;
+#ifdef ASSERT
+ _visited_for_critical_count = false;
+#endif
+
_SR_lock = new Monitor(Mutex::suspend_resume, "SR_lock", true);
_suspend_flags = 0;
@@ -1600,8 +1605,6 @@ void JavaThread::exit(bool destroy_vm, ExitType exit_type) {
// java.lang.Thread.dispatchUncaughtException
if (uncaught_exception.not_null()) {
Handle group(this, java_lang_Thread::threadGroup(threadObj()));
- Events::log("uncaught exception INTPTR_FORMAT " " INTPTR_FORMAT " " INTPTR_FORMAT",
- (address)uncaught_exception(), (address)threadObj(), (address)group());
{
EXCEPTION_MARK;
// Check if the method Thread.dispatchUncaughtException() exists. If so
@@ -2280,6 +2283,26 @@ void JavaThread::check_special_condition_for_native_trans(JavaThread *thread) {
}
}
+// This is a variant of the normal
+// check_special_condition_for_native_trans with slightly different
+// semantics for use by critical native wrappers. It does all the
+// normal checks but also performs the transition back into
+// thread_in_Java state. This is required so that critical natives
+// can potentially block and perform a GC if they are the last thread
+// exiting the GC_locker.
+void JavaThread::check_special_condition_for_native_trans_and_transition(JavaThread *thread) {
+ check_special_condition_for_native_trans(thread);
+
+ // Finish the transition
+ thread->set_thread_state(_thread_in_Java);
+
+ if (thread->do_critical_native_unlock()) {
+ ThreadInVMfromJavaNoAsyncException tiv(thread);
+ GC_locker::unlock_critical(thread);
+ thread->clear_critical_native_unlock();
+ }
+}
+
// We need to guarantee the Threads_lock here, since resumes are not
// allowed during safepoint synchronization
// Can only resume from an external suspension
@@ -3201,11 +3224,6 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
return status;
}
- // Must be run after init_ft which initializes ft_enabled
- if (TRACE_INITIALIZE() != JNI_OK) {
- vm_exit_during_initialization("Failed to initialize tracing backend");
- }
-
// Should be done after the heap is fully created
main_thread->cache_global_variables();
@@ -3347,6 +3365,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
initialize_class(vmSymbols::java_lang_ArithmeticException(), CHECK_0);
initialize_class(vmSymbols::java_lang_StackOverflowError(), CHECK_0);
initialize_class(vmSymbols::java_lang_IllegalMonitorStateException(), CHECK_0);
+ initialize_class(vmSymbols::java_lang_IllegalArgumentException(), CHECK_0);
} else {
warning("java.lang.OutOfMemoryError has not been initialized");
warning("java.lang.NullPointerException has not been initialized");
@@ -3354,6 +3373,7 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
warning("java.lang.ArrayStoreException has not been initialized");
warning("java.lang.ArithmeticException has not been initialized");
warning("java.lang.StackOverflowError has not been initialized");
+ warning("java.lang.IllegalArgumentException has not been initialized");
}
}
@@ -3383,6 +3403,11 @@ jint Threads::create_vm(JavaVMInitArgs* args, bool* canTryAgain) {
quicken_jni_functions();
+ // Must be run after init_ft which initializes ft_enabled
+ if (TRACE_INITIALIZE() != JNI_OK) {
+ vm_exit_during_initialization("Failed to initialize tracing backend");
+ }
+
// Set flag that basic initialization has completed. Used by exceptions and various
// debug stuff, that does not work until all basic classes have been initialized.
set_init_completed();
@@ -3885,7 +3910,7 @@ void Threads::add(JavaThread* p, bool force_daemon) {
ThreadService::add_thread(p, daemon);
// Possible GC point.
- Events::log("Thread added: " INTPTR_FORMAT, p);
+ Events::log(p, "Thread added: " INTPTR_FORMAT, p);
}
void Threads::remove(JavaThread* p) {
@@ -3930,7 +3955,7 @@ void Threads::remove(JavaThread* p) {
} // unlock Threads_lock
// Since Events::log uses a lock, we grab it outside the Threads_lock
- Events::log("Thread exited: " INTPTR_FORMAT, p);
+ Events::log(p, "Thread exited: " INTPTR_FORMAT, p);
}
// Threads_lock must be held when this is called (or must be called during a safepoint)
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index 37bbf29..7846cc0 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -182,7 +182,8 @@ class Thread: public ThreadShadow {
_ext_suspended = 0x40000000U, // thread has self-suspended
_deopt_suspend = 0x10000000U, // thread needs to self suspend for deopt
- _has_async_exception = 0x00000001U // there is a pending async exception
+ _has_async_exception = 0x00000001U, // there is a pending async exception
+ _critical_native_unlock = 0x00000002U // Must call back to unlock JNI critical lock
};
// various suspension related flags - atomically updated
@@ -267,6 +268,15 @@ class Thread: public ThreadShadow {
ObjectMonitor* omInUseList; // SLL to track monitors in circulation
int omInUseCount; // length of omInUseList
+#ifdef ASSERT
+ private:
+ bool _visited_for_critical_count;
+
+ public:
+ void set_visited_for_critical_count(bool z) { _visited_for_critical_count = z; }
+ bool was_visited_for_critical_count() const { return _visited_for_critical_count; }
+#endif
+
public:
enum {
is_definitely_current_thread = true
@@ -350,6 +360,15 @@ class Thread: public ThreadShadow {
clear_suspend_flag(_has_async_exception);
}
+ bool do_critical_native_unlock() const { return (_suspend_flags & _critical_native_unlock) != 0; }
+
+ void set_critical_native_unlock() {
+ set_suspend_flag(_critical_native_unlock);
+ }
+ void clear_critical_native_unlock() {
+ clear_suspend_flag(_critical_native_unlock);
+ }
+
// Support for Unhandled Oop detection
#ifdef CHECK_UNHANDLED_OOPS
private:
@@ -1038,6 +1057,11 @@ class JavaThread: public Thread {
// Check for async exception in addition to safepoint and suspend request.
static void check_special_condition_for_native_trans(JavaThread *thread);
+ // Same as check_special_condition_for_native_trans but finishes the
+ // transition into thread_in_Java mode so that it can potentially
+ // block.
+ static void check_special_condition_for_native_trans_and_transition(JavaThread *thread);
+
bool is_ext_suspend_completed(bool called_by_wait, int delay, uint32_t *bits);
bool is_ext_suspend_completed_with_lock(uint32_t *bits) {
MutexLockerEx ml(SR_lock(), Mutex::_no_safepoint_check_flag);
@@ -1310,8 +1334,10 @@ class JavaThread: public Thread {
// JNI critical regions. These can nest.
bool in_critical() { return _jni_active_critical > 0; }
- void enter_critical() { assert(Thread::current() == this,
- "this must be current thread");
+ bool in_last_critical() { return _jni_active_critical == 1; }
+ void enter_critical() { assert(Thread::current() == this ||
+ Thread::current()->is_VM_thread() && SafepointSynchronize::is_synchronizing(),
+ "this must be current thread or synchronizing");
_jni_active_critical++; }
void exit_critical() { assert(Thread::current() == this,
"this must be current thread");
diff --git a/hotspot/src/share/vm/runtime/virtualspace.cpp b/hotspot/src/share/vm/runtime/virtualspace.cpp
index 5eeb1ee..c7e6bf8 100644
--- a/hotspot/src/share/vm/runtime/virtualspace.cpp
+++ b/hotspot/src/share/vm/runtime/virtualspace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -455,7 +455,7 @@ void ReservedSpace::release() {
void ReservedSpace::protect_noaccess_prefix(const size_t size) {
assert( (_noaccess_prefix != 0) == (UseCompressedOops && _base != NULL &&
- (size_t(_base + _size) > OopEncodingHeapMax) &&
+ (Universe::narrow_oop_base() != NULL) &&
Universe::narrow_oop_use_implicit_null_checks()),
"noaccess_prefix should be used only with non zero based compressed oops");
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index eb765f0..924cde1 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -314,7 +314,7 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(instanceKlass, _init_thread, Thread*) \
nonstatic_field(instanceKlass, _vtable_len, int) \
nonstatic_field(instanceKlass, _itable_len, int) \
- nonstatic_field(instanceKlass, _reference_type, ReferenceType) \
+ nonstatic_field(instanceKlass, _reference_type, u1) \
volatile_nonstatic_field(instanceKlass, _oop_map_cache, OopMapCache*) \
nonstatic_field(instanceKlass, _jni_ids, JNIid*) \
nonstatic_field(instanceKlass, _osr_nmethods_head, nmethod*) \
@@ -2261,13 +2261,6 @@ static inline uint64_t cast_uint64_t(size_t x)
\
declare_constant(SymbolTable::symbol_table_size) \
\
- /********************/ \
- /* SystemDictionary */ \
- /********************/ \
- \
- declare_constant(SystemDictionary::_loader_constraint_size) \
- declare_constant(SystemDictionary::_nof_buckets) \
- \
/***********************************/ \
/* LoaderConstraintTable constants */ \
/***********************************/ \
diff --git a/hotspot/src/share/vm/runtime/vm_version.cpp b/hotspot/src/share/vm/runtime/vm_version.cpp
index eb55014..2d51b67 100644
--- a/hotspot/src/share/vm/runtime/vm_version.cpp
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp
@@ -165,6 +165,13 @@ const char* Abstract_VM_Version::vm_release() {
return VM_RELEASE;
}
+// NOTE: do *not* use stringStream. this function is called by
+// fatal error handlers. if the crash is in native thread,
+// stringStream cannot get resource allocated and will SEGV.
+const char* Abstract_VM_Version::jre_release_version() {
+ return JRE_RELEASE_VERSION;
+}
+
#define OS LINUX_ONLY("linux") \
WINDOWS_ONLY("windows") \
SOLARIS_ONLY("solaris") \
diff --git a/hotspot/src/share/vm/runtime/vm_version.hpp b/hotspot/src/share/vm/runtime/vm_version.hpp
index 60e7142..0d35522 100644
--- a/hotspot/src/share/vm/runtime/vm_version.hpp
+++ b/hotspot/src/share/vm/runtime/vm_version.hpp
@@ -71,6 +71,7 @@ class Abstract_VM_Version: AllStatic {
// Internal version providing additional build information
static const char* internal_vm_info_string();
+ static const char* jre_release_version();
// does HW support an 8-byte compare-exchange operation?
static bool supports_cx8() {return _supports_cx8;}
diff --git a/hotspot/src/share/vm/services/diagnosticArgument.cpp b/hotspot/src/share/vm/services/diagnosticArgument.cpp
index 0821c9a..a3a6982 100644
--- a/hotspot/src/share/vm/services/diagnosticArgument.cpp
+++ b/hotspot/src/share/vm/services/diagnosticArgument.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
* 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,9 +28,16 @@
#include "services/diagnosticArgument.hpp"
void GenDCmdArgument::read_value(const char* str, size_t len, TRAPS) {
- if (is_set()) {
+ /* NOTE:Some argument types doesn't require a value,
+ * for instance boolean arguments: "enableFeatureX". is
+ * equivalent to "enableFeatureX=true". In these cases,
+ * str will be null. This is perfectly valid.
+ * All argument types must perform null checks on str.
+ */
+
+ if (is_set() && !allow_multiple()) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
- "Duplicates in diagnostic command arguments");
+ "Duplicates in diagnostic command arguments\n");
}
parse_value(str, len, CHECK);
set_is_set(true);
@@ -38,9 +45,9 @@ void GenDCmdArgument::read_value(const char* str, size_t len, TRAPS) {
template <> void DCmdArgument<jlong>::parse_value(const char* str,
size_t len, TRAPS) {
- if (sscanf(str, INT64_FORMAT, &_value) != 1) {
+ if (str == NULL || sscanf(str, INT64_FORMAT, &_value) != 1) {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
- "Integer parsing error in diagnostic command arguments");
+ "Integer parsing error in diagnostic command arguments\n");
}
}
@@ -59,12 +66,13 @@ template <> void DCmdArgument<jlong>::destroy_value() { }
template <> void DCmdArgument<bool>::parse_value(const char* str,
size_t len, TRAPS) {
+ // len is the length of the current token starting at str
if (len == 0) {
set_value(true);
} else {
- if (strcasecmp(str, "true") == 0) {
+ if (len == strlen("true") && strncasecmp(str, "true", len) == 0) {
set_value(true);
- } else if (strcasecmp(str, "false") == 0) {
+ } else if (len == strlen("false") && strncasecmp(str, "false", len) == 0) {
set_value(false);
} else {
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
@@ -88,16 +96,20 @@ template <> void DCmdArgument<bool>::destroy_value() { }
template <> void DCmdArgument<char*>::parse_value(const char* str,
size_t len, TRAPS) {
- _value = NEW_C_HEAP_ARRAY(char, len+1);
- strncpy(_value, str, len);
- _value[len] = 0;
+ if (str == NULL) {
+ _value = NULL;
+ } else {
+ _value = NEW_C_HEAP_ARRAY(char, len+1);
+ strncpy(_value, str, len);
+ _value[len] = 0;
+ }
}
template <> void DCmdArgument<char*>::init_value(TRAPS) {
- if (has_default()) {
+ if (has_default() && _default_string != NULL) {
this->parse_value(_default_string, strlen(_default_string), THREAD);
if (HAS_PENDING_EXCEPTION) {
- fatal("Default string must be parsable");
+ fatal("Default string must be parsable");
}
} else {
set_value(NULL);
@@ -110,3 +122,153 @@ template <> void DCmdArgument<char*>::destroy_value() {
set_value(NULL);
}
}
+
+template <> void DCmdArgument<NanoTimeArgument>::parse_value(const char* str,
+ size_t len, TRAPS) {
+ if (str == NULL) {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Integer parsing error nanotime value: syntax error");
+ }
+
+ int argc = sscanf(str, INT64_FORMAT , &_value._time);
+ if (argc != 1) {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Integer parsing error nanotime value: syntax error");
+ }
+ size_t idx = 0;
+ while(idx < len && isdigit(str[idx])) {
+ idx++;
+ }
+ if (idx == len) {
+ // only accept missing unit if the value is 0
+ if (_value._time != 0) {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Integer parsing error nanotime value: unit required");
+ } else {
+ _value._nanotime = 0;
+ strcpy(_value._unit, "ns");
+ return;
+ }
+ } else if(len - idx > 2) {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Integer parsing error nanotime value: illegal unit");
+ } else {
+ strncpy(_value._unit, &str[idx], len - idx);
+ /*Write an extra null termination. This is safe because _value._unit
+ * is declared as char[3], and length is checked to be not larger than
+ * two above. Also, this is necessary, since length might be 1, and the
+ * default value already in the string is ns, which is two chars.
+ */
+ _value._unit[len-idx] = '\0';
+ }
+
+ if (strcmp(_value._unit, "ns") == 0) {
+ _value._nanotime = _value._time;
+ } else if (strcmp(_value._unit, "us") == 0) {
+ _value._nanotime = _value._time * 1000;
+ } else if (strcmp(_value._unit, "ms") == 0) {
+ _value._nanotime = _value._time * 1000 * 1000;
+ } else if (strcmp(_value._unit, "s") == 0) {
+ _value._nanotime = _value._time * 1000 * 1000 * 1000;
+ } else if (strcmp(_value._unit, "m") == 0) {
+ _value._nanotime = _value._time * 60 * 1000 * 1000 * 1000;
+ } else if (strcmp(_value._unit, "h") == 0) {
+ _value._nanotime = _value._time * 60 * 60 * 1000 * 1000 * 1000;
+ } else if (strcmp(_value._unit, "d") == 0) {
+ _value._nanotime = _value._time * 24 * 60 * 60 * 1000 * 1000 * 1000;
+ } else {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Integer parsing error nanotime value: illegal unit");
+ }
+}
+
+template <> void DCmdArgument<NanoTimeArgument>::init_value(TRAPS) {
+ if (has_default()) {
+ this->parse_value(_default_string, strlen(_default_string), THREAD);
+ if (HAS_PENDING_EXCEPTION) {
+ fatal("Default string must be parsable");
+ }
+ } else {
+ _value._time = 0;
+ _value._nanotime = 0;
+ strcmp(_value._unit, "ns");
+ }
+}
+
+template <> void DCmdArgument<NanoTimeArgument>::destroy_value() { }
+
+// WARNING StringArrayArgument can only be used as an option, it cannot be
+// used as an argument with the DCmdParser
+
+template <> void DCmdArgument<StringArrayArgument*>::parse_value(const char* str,
+ size_t len, TRAPS) {
+ _value->add(str,len);
+}
+
+template <> void DCmdArgument<StringArrayArgument*>::init_value(TRAPS) {
+ _value = new StringArrayArgument();
+ _allow_multiple = true;
+ if (has_default()) {
+ fatal("StringArrayArgument cannot have default value");
+ }
+}
+
+template <> void DCmdArgument<StringArrayArgument*>::destroy_value() {
+ if (_value != NULL) {
+ delete _value;
+ set_value(NULL);
+ }
+}
+
+template <> void DCmdArgument<MemorySizeArgument>::parse_value(const char* str,
+ size_t len, TRAPS) {
+ if (str == NULL) {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Integer parsing error nanotime value: syntax error");
+ }
+
+ if (*str == '-') {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Parsing error memory size value: negative values not allowed");
+ }
+ int res = sscanf(str, UINT64_FORMAT "%c", &_value._val, &_value._multiplier);
+ if (res == 2) {
+ switch (_value._multiplier) {
+ case 'k': case 'K':
+ _value._size = _value._val * 1024;
+ break;
+ case 'm': case 'M':
+ _value._size = _value._val * 1024 * 1024;
+ break;
+ case 'g': case 'G':
+ _value._size = _value._val * 1024 * 1024 * 1024;
+ break;
+ default:
+ _value._size = _value._val;
+ _value._multiplier = ' ';
+ //default case should be to break with no error, since user
+ //can write size in bytes, or might have a delimiter and next arg
+ break;
+ }
+ } else if (res == 1) {
+ _value._size = _value._val;
+ } else {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Parsing error memory size value: invalid value");
+ }
+}
+
+template <> void DCmdArgument<MemorySizeArgument>::init_value(TRAPS) {
+ if (has_default()) {
+ this->parse_value(_default_string, strlen(_default_string), THREAD);
+ if (HAS_PENDING_EXCEPTION) {
+ fatal("Default string must be parsable");
+ }
+ } else {
+ _value._size = 0;
+ _value._val = 0;
+ _value._multiplier = ' ';
+ }
+}
+
+template <> void DCmdArgument<MemorySizeArgument>::destroy_value() { }
diff --git a/hotspot/src/share/vm/services/diagnosticArgument.hpp b/hotspot/src/share/vm/services/diagnosticArgument.hpp
index 17b8ffe..380f7eb 100644
--- a/hotspot/src/share/vm/services/diagnosticArgument.hpp
+++ b/hotspot/src/share/vm/services/diagnosticArgument.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* 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,49 @@
#include "runtime/thread.hpp"
#include "utilities/exceptions.hpp"
+class StringArrayArgument : public CHeapObj {
+private:
+ GrowableArray<char*>* _array;
+public:
+ StringArrayArgument() {
+ _array = new(ResourceObj::C_HEAP)GrowableArray<char *>(32, true);
+ assert(_array != NULL, "Sanity check");
+ }
+ void add(const char* str, size_t len) {
+ if (str != NULL) {
+ char* ptr = NEW_C_HEAP_ARRAY(char, len+1);
+ strncpy(ptr, str, len);
+ ptr[len] = 0;
+ _array->append(ptr);
+ }
+ }
+ GrowableArray<char*>* array() {
+ return _array;
+ }
+ ~StringArrayArgument() {
+ for (int i=0; i<_array->length(); i++) {
+ if(_array->at(i) != NULL) { // Safety check
+ FREE_C_HEAP_ARRAY(char, _array->at(i));
+ }
+ }
+ delete _array;
+ }
+};
+
+class NanoTimeArgument {
+public:
+ jlong _nanotime;
+ jlong _time;
+ char _unit[3];
+};
+
+class MemorySizeArgument {
+public:
+ u8 _size;
+ u8 _val;
+ char _multiplier;
+};
+
class GenDCmdArgument : public ResourceObj {
protected:
GenDCmdArgument* _next;
@@ -40,6 +83,7 @@ protected:
const char* _default_string;
bool _is_set;
bool _is_mandatory;
+ bool _allow_multiple;
GenDCmdArgument(const char* name, const char* description, const char* type,
const char* default_string, bool mandatory) {
_name = name;
@@ -48,6 +92,7 @@ protected:
_default_string = default_string;
_is_mandatory = mandatory;
_is_set = false;
+ _allow_multiple = false;
};
public:
const char* name() { return _name; }
@@ -56,6 +101,7 @@ public:
const char* default_string() { return _default_string; }
bool is_set() { return _is_set; }
void set_is_set(bool b) { _is_set = b; }
+ bool allow_multiple() { return _allow_multiple; }
bool is_mandatory() { return _is_mandatory; }
bool has_value() { return _is_set || _default_string != NULL; }
bool has_default() { return _default_string != NULL; }
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/hotspot/src/share/vm/services/diagnosticCommand.cpp
index 39c7ce2..107b1ab 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,38 @@
#include "services/heapDumper.hpp"
#include "services/management.hpp"
+void DCmdRegistrant::register_dcmds(){
+ // Registration of the diagnostic commands
+ // First boolean argument specifies if the command is enabled
+ // Second boolean argument specifies if the command is hidden
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HelpDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VersionDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CommandLineDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintSystemPropertiesDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintVMFlagsDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(true, false));
+#ifndef SERVICES_KERNEL // Heap dumping not supported
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(true, false));
+#endif // SERVICES_KERNEL
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(true, false));
+
+ //Enhanced JMX Agent Support
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartRemoteDCmd>(true,false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStartLocalDCmd>(true,false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JMXStopRemoteDCmd>(true,false));
+
+}
+
+#ifndef HAVE_EXTRA_DCMD
+void DCmdRegistrant::register_dcmds_ext(){
+ // Do nothing here
+}
+#endif
+
+
HelpDCmd::HelpDCmd(outputStream* output, bool heap) : DCmdWithParser(output, heap),
_all("-all", "Show help for all commands", "BOOLEAN", false, "false"),
_cmd("command name", "The name of the command for which we want help",
@@ -317,3 +349,185 @@ int ThreadDumpDCmd::num_arguments() {
return 0;
}
}
+
+// Enhanced JMX Agent support
+
+JMXStartRemoteDCmd::JMXStartRemoteDCmd(outputStream *output, bool heap_allocated) :
+
+ DCmdWithParser(output, heap_allocated),
+
+ _config_file
+ ("config.file",
+ "set com.sun.management.config.file", "STRING", false),
+
+ _jmxremote_port
+ ("jmxremote.port",
+ "set com.sun.management.jmxremote.port", "STRING", false),
+
+ _jmxremote_rmi_port
+ ("jmxremote.rmi.port",
+ "set com.sun.management.jmxremote.rmi.port", "STRING", false),
+
+ _jmxremote_ssl
+ ("jmxremote.ssl",
+ "set com.sun.management.jmxremote.ssl", "STRING", false),
+
+ _jmxremote_registry_ssl
+ ("jmxremote.registry.ssl",
+ "set com.sun.management.jmxremote.registry.ssl", "STRING", false),
+
+ _jmxremote_authenticate
+ ("jmxremote.authenticate",
+ "set com.sun.management.jmxremote.authenticate", "STRING", false),
+
+ _jmxremote_password_file
+ ("jmxremote.password.file",
+ "set com.sun.management.jmxremote.password.file", "STRING", false),
+
+ _jmxremote_access_file
+ ("jmxremote.access.file",
+ "set com.sun.management.jmxremote.access.file", "STRING", false),
+
+ _jmxremote_login_config
+ ("jmxremote.login.config",
+ "set com.sun.management.jmxremote.login.config", "STRING", false),
+
+ _jmxremote_ssl_enabled_cipher_suites
+ ("jmxremote.ssl.enabled.cipher.suites",
+ "set com.sun.management.jmxremote.ssl.enabled.cipher.suite", "STRING", false),
+
+ _jmxremote_ssl_enabled_protocols
+ ("jmxremote.ssl.enabled.protocols",
+ "set com.sun.management.jmxremote.ssl.enabled.protocols", "STRING", false),
+
+ _jmxremote_ssl_need_client_auth
+ ("jmxremote.ssl.need.client.auth",
+ "set com.sun.management.jmxremote.need.client.auth", "STRING", false),
+
+ _jmxremote_ssl_config_file
+ ("jmxremote.ssl.config.file",
+ "set com.sun.management.jmxremote.ssl_config_file", "STRING", false)
+
+ {
+ _dcmdparser.add_dcmd_option(&_config_file);
+ _dcmdparser.add_dcmd_option(&_jmxremote_port);
+ _dcmdparser.add_dcmd_option(&_jmxremote_rmi_port);
+ _dcmdparser.add_dcmd_option(&_jmxremote_ssl);
+ _dcmdparser.add_dcmd_option(&_jmxremote_registry_ssl);
+ _dcmdparser.add_dcmd_option(&_jmxremote_authenticate);
+ _dcmdparser.add_dcmd_option(&_jmxremote_password_file);
+ _dcmdparser.add_dcmd_option(&_jmxremote_access_file);
+ _dcmdparser.add_dcmd_option(&_jmxremote_login_config);
+ _dcmdparser.add_dcmd_option(&_jmxremote_ssl_enabled_cipher_suites);
+ _dcmdparser.add_dcmd_option(&_jmxremote_ssl_enabled_protocols);
+ _dcmdparser.add_dcmd_option(&_jmxremote_ssl_need_client_auth);
+ _dcmdparser.add_dcmd_option(&_jmxremote_ssl_config_file);
+}
+
+
+int JMXStartRemoteDCmd::num_arguments() {
+ ResourceMark rm;
+ JMXStartRemoteDCmd* dcmd = new JMXStartRemoteDCmd(NULL, false);
+ if (dcmd != NULL) {
+ DCmdMark mark(dcmd);
+ return dcmd->_dcmdparser.num_arguments();
+ } else {
+ return 0;
+ }
+}
+
+
+void JMXStartRemoteDCmd::execute(TRAPS) {
+ ResourceMark rm(THREAD);
+ HandleMark hm(THREAD);
+
+ // Load and initialize the sun.management.Agent class
+ // invoke startRemoteManagementAgent(string) method to start
+ // the remote management server.
+ // throw java.lang.NoSuchMethodError if the method doesn't exist
+
+ Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::sun_management_Agent(), loader, Handle(), true, CHECK);
+ instanceKlassHandle ik (THREAD, k);
+
+ JavaValue result(T_VOID);
+
+ // Pass all command line arguments to java as key=value,...
+ // All checks are done on java side
+
+ int len = 0;
+ stringStream options;
+ char comma[2] = {0,0};
+
+ // Leave default values on Agent.class side and pass only
+ // agruments explicitly set by user. All arguments passed
+ // to jcmd override properties with the same name set by
+ // command line with -D or by managmenent.properties
+ // file.
+#define PUT_OPTION(a) \
+ if ( (a).is_set() ){ \
+ options.print("%scom.sun.management.%s=%s", comma, (a).name(), (a).value()); \
+ comma[0] = ','; \
+ }
+
+ PUT_OPTION(_config_file);
+ PUT_OPTION(_jmxremote_port);
+ PUT_OPTION(_jmxremote_rmi_port);
+ PUT_OPTION(_jmxremote_ssl);
+ PUT_OPTION(_jmxremote_registry_ssl);
+ PUT_OPTION(_jmxremote_authenticate);
+ PUT_OPTION(_jmxremote_password_file);
+ PUT_OPTION(_jmxremote_access_file);
+ PUT_OPTION(_jmxremote_login_config);
+ PUT_OPTION(_jmxremote_ssl_enabled_cipher_suites);
+ PUT_OPTION(_jmxremote_ssl_enabled_protocols);
+ PUT_OPTION(_jmxremote_ssl_need_client_auth);
+ PUT_OPTION(_jmxremote_ssl_config_file);
+
+#undef PUT_OPTION
+
+ Handle str = java_lang_String::create_from_str(options.as_string(), CHECK);
+ JavaCalls::call_static(&result, ik, vmSymbols::startRemoteAgent_name(), vmSymbols::string_void_signature(), str, CHECK);
+}
+
+JMXStartLocalDCmd::JMXStartLocalDCmd(outputStream *output, bool heap_allocated) :
+ DCmd(output, heap_allocated)
+{
+ // do nothing
+}
+
+void JMXStartLocalDCmd::execute(TRAPS) {
+ ResourceMark rm(THREAD);
+ HandleMark hm(THREAD);
+
+ // Load and initialize the sun.management.Agent class
+ // invoke startLocalManagementAgent(void) method to start
+ // the local management server
+ // throw java.lang.NoSuchMethodError if method doesn't exist
+
+ Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::sun_management_Agent(), loader, Handle(), true, CHECK);
+ instanceKlassHandle ik (THREAD, k);
+
+ JavaValue result(T_VOID);
+ JavaCalls::call_static(&result, ik, vmSymbols::startLocalAgent_name(), vmSymbols::void_method_signature(), CHECK);
+}
+
+
+void JMXStopRemoteDCmd::execute(TRAPS) {
+ ResourceMark rm(THREAD);
+ HandleMark hm(THREAD);
+
+ // Load and initialize the sun.management.Agent class
+ // invoke stopRemoteManagementAgent method to stop the
+ // management server
+ // throw java.lang.NoSuchMethodError if method doesn't exist
+
+ Handle loader = Handle(THREAD, SystemDictionary::java_system_loader());
+ klassOop k = SystemDictionary::resolve_or_fail(vmSymbols::sun_management_Agent(), loader, Handle(), true, CHECK);
+ instanceKlassHandle ik (THREAD, k);
+
+ JavaValue result(T_VOID);
+ JavaCalls::call_static(&result, ik, vmSymbols::stopRemoteAgent_name(), vmSymbols::void_method_signature(), CHECK);
+}
+
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.hpp b/hotspot/src/share/vm/services/diagnosticCommand.hpp
index 436664a..d5c5cd1 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.hpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,7 @@
#include "services/diagnosticArgument.hpp"
#include "services/diagnosticCommand.hpp"
#include "services/diagnosticFramework.hpp"
+#include "services/diagnosticCommand_ext.hpp"
class HelpDCmd : public DCmdWithParser {
protected:
@@ -213,4 +214,82 @@ public:
virtual void execute(TRAPS);
};
+// Enhanced JMX Agent support
+
+class JMXStartRemoteDCmd : public DCmdWithParser {
+
+ // Explicitly list all properties that could be
+ // passed to Agent.startRemoteManagementAgent()
+ // com.sun.management is omitted
+
+ DCmdArgument<char *> _config_file;
+ DCmdArgument<char *> _jmxremote_port;
+ DCmdArgument<char *> _jmxremote_rmi_port;
+ DCmdArgument<char *> _jmxremote_ssl;
+ DCmdArgument<char *> _jmxremote_registry_ssl;
+ DCmdArgument<char *> _jmxremote_authenticate;
+ DCmdArgument<char *> _jmxremote_password_file;
+ DCmdArgument<char *> _jmxremote_access_file;
+ DCmdArgument<char *> _jmxremote_login_config;
+ DCmdArgument<char *> _jmxremote_ssl_enabled_cipher_suites;
+ DCmdArgument<char *> _jmxremote_ssl_enabled_protocols;
+ DCmdArgument<char *> _jmxremote_ssl_need_client_auth;
+ DCmdArgument<char *> _jmxremote_ssl_config_file;
+
+public:
+ JMXStartRemoteDCmd(outputStream *output, bool heap_allocated);
+
+ static const char *name() {
+ return "ManagementAgent.start";
+ }
+
+ static const char *description() {
+ return "Start remote management agent.";
+ }
+
+ static int num_arguments();
+
+ virtual void execute(TRAPS);
+
+};
+
+class JMXStartLocalDCmd : public DCmd {
+
+ // Explicitly request start of local agent,
+ // it will not be started by start dcmd
+
+
+public:
+ JMXStartLocalDCmd(outputStream *output, bool heap_allocated);
+
+ static const char *name() {
+ return "ManagementAgent.start_local";
+ }
+
+ static const char *description() {
+ return "Start local management agent.";
+ }
+
+ virtual void execute(TRAPS);
+
+};
+
+class JMXStopRemoteDCmd : public DCmd {
+public:
+ JMXStopRemoteDCmd(outputStream *output, bool heap_allocated) :
+ DCmd(output, heap_allocated) {
+ // Do Nothing
+ }
+
+ static const char *name() {
+ return "ManagementAgent.stop";
+ }
+
+ static const char *description() {
+ return "Stop remote management agent.";
+ }
+
+ virtual void execute(TRAPS);
+};
+
#endif // SHARE_VM_SERVICES_DIAGNOSTICCOMMAND_HPP
diff --git a/hotspot/src/share/vm/services/diagnosticFramework.cpp b/hotspot/src/share/vm/services/diagnosticFramework.cpp
index 2de9f81..73e9bdc 100644
--- a/hotspot/src/share/vm/services/diagnosticFramework.cpp
+++ b/hotspot/src/share/vm/services/diagnosticFramework.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -61,7 +61,7 @@ CmdLine::CmdLine(const char* line, size_t len, bool no_command_name) {
bool DCmdArgIter::next(TRAPS) {
if (_len == 0) return false;
// skipping spaces
- while (_cursor < _len - 1 && isspace(_buffer[_cursor])) {
+ while (_cursor < _len - 1 && _buffer[_cursor] == _delim) {
_cursor++;
}
// handling end of command line
diff --git a/hotspot/src/share/vm/services/diagnosticFramework.hpp b/hotspot/src/share/vm/services/diagnosticFramework.hpp
index e3b78bb..f9ea562 100644
--- a/hotspot/src/share/vm/services/diagnosticFramework.hpp
+++ b/hotspot/src/share/vm/services/diagnosticFramework.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -195,6 +195,7 @@ public:
DCmdParser() {
_options = NULL;
_arguments_list = NULL;
+ _delim = ' ';
}
void add_dcmd_option(GenDCmdArgument* arg);
void add_dcmd_argument(GenDCmdArgument* arg);
@@ -387,4 +388,17 @@ public:
}
};
+// This class provides a convenient way to register Dcmds, without a need to change
+// management.cpp every time. Body of these two methods resides in
+// diagnosticCommand.cpp
+
+class DCmdRegistrant : public AllStatic {
+
+private:
+ static void register_dcmds();
+ static void register_dcmds_ext();
+
+ friend class Management;
+};
+
#endif // SHARE_VM_SERVICES_DIAGNOSTICFRAMEWORK_HPP
diff --git a/hotspot/src/share/vm/services/g1MemoryPool.cpp b/hotspot/src/share/vm/services/g1MemoryPool.cpp
index c621ecc..af86237 100644
--- a/hotspot/src/share/vm/services/g1MemoryPool.cpp
+++ b/hotspot/src/share/vm/services/g1MemoryPool.cpp
@@ -78,7 +78,7 @@ G1OldGenPool::G1OldGenPool(G1CollectedHeap* g1h) :
G1MemoryPoolSuper(g1h,
"G1 Old Gen",
g1h->g1mm()->old_space_committed(), /* init_size */
- _undefined_max,
+ g1h->g1mm()->old_gen_max(),
true /* support_usage_threshold */) { }
MemoryUsage G1OldGenPool::get_memory_usage() {
diff --git a/hotspot/src/share/vm/services/g1MemoryPool.hpp b/hotspot/src/share/vm/services/g1MemoryPool.hpp
index ce93d0e..912e747 100644
--- a/hotspot/src/share/vm/services/g1MemoryPool.hpp
+++ b/hotspot/src/share/vm/services/g1MemoryPool.hpp
@@ -101,7 +101,7 @@ public:
return _g1mm->old_space_used();
}
size_t max_size() const {
- return _undefined_max;
+ return _g1mm->old_gen_max();
}
MemoryUsage get_memory_usage();
};
diff --git a/hotspot/src/share/vm/services/gcNotifier.cpp b/hotspot/src/share/vm/services/gcNotifier.cpp
index f746920..1670242 100644
--- a/hotspot/src/share/vm/services/gcNotifier.cpp
+++ b/hotspot/src/share/vm/services/gcNotifier.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +44,8 @@ void GCNotifier::pushNotification(GCMemoryManager *mgr, const char *action, cons
// Make a copy of the last GC statistics
// GC may occur between now and the creation of the notification
int num_pools = MemoryService::num_memory_pools();
- GCStatInfo* stat = new GCStatInfo(num_pools);
+ // stat is deallocated inside GCNotificationRequest
+ GCStatInfo* stat = new(ResourceObj::C_HEAP) GCStatInfo(num_pools);
mgr->get_last_gc_stat(stat);
GCNotificationRequest *request = new GCNotificationRequest(os::javaTimeMillis(),mgr,action,cause,stat);
addRequest(request);
@@ -179,17 +180,43 @@ static Handle createGcInfo(GCMemoryManager *gcManager, GCStatInfo *gcStatInfo,TR
}
void GCNotifier::sendNotification(TRAPS) {
+ GCNotifier::sendNotificationInternal(THREAD);
+ // Clearing pending exception to avoid premature termination of
+ // the service thread
+ if (HAS_PENDING_EXCEPTION) {
+ CLEAR_PENDING_EXCEPTION;
+ }
+}
+
+class NotificationMark : public StackObj {
+ // This class is used in GCNotifier::sendNotificationInternal to ensure that
+ // the GCNotificationRequest object is properly cleaned up, whatever path
+ // is used to exit the method.
+ GCNotificationRequest* _request;
+public:
+ NotificationMark(GCNotificationRequest* r) {
+ _request = r;
+ }
+ ~NotificationMark() {
+ assert(_request != NULL, "Sanity check");
+ delete _request;
+ }
+};
+
+void GCNotifier::sendNotificationInternal(TRAPS) {
ResourceMark rm(THREAD);
+ HandleMark hm(THREAD);
GCNotificationRequest *request = getRequest();
- if(request != NULL) {
- Handle objGcInfo = createGcInfo(request->gcManager,request->gcStatInfo,THREAD);
+ if (request != NULL) {
+ NotificationMark nm(request);
+ Handle objGcInfo = createGcInfo(request->gcManager, request->gcStatInfo, THREAD);
Handle objName = java_lang_String::create_from_platform_dependent_str(request->gcManager->name(), CHECK);
Handle objAction = java_lang_String::create_from_platform_dependent_str(request->gcAction, CHECK);
Handle objCause = java_lang_String::create_from_platform_dependent_str(request->gcCause, CHECK);
klassOop k = Management::sun_management_GarbageCollectorImpl_klass(CHECK);
- instanceKlassHandle gc_mbean_klass (THREAD, k);
+ instanceKlassHandle gc_mbean_klass(THREAD, k);
instanceOop gc_mbean = request->gcManager->get_memory_manager_instance(THREAD);
instanceHandle gc_mbean_h(THREAD, gc_mbean);
@@ -212,11 +239,6 @@ void GCNotifier::sendNotification(TRAPS) {
vmSymbols::createGCNotification_signature(),
&args,
CHECK);
- if (HAS_PENDING_EXCEPTION) {
- CLEAR_PENDING_EXCEPTION;
- }
-
- delete request;
}
}
diff --git a/hotspot/src/share/vm/services/gcNotifier.hpp b/hotspot/src/share/vm/services/gcNotifier.hpp
index 7e0d846..c26765e 100644
--- a/hotspot/src/share/vm/services/gcNotifier.hpp
+++ b/hotspot/src/share/vm/services/gcNotifier.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,6 +60,7 @@ private:
static GCNotificationRequest *last_request;
static void addRequest(GCNotificationRequest *request);
static GCNotificationRequest *getRequest();
+ static void sendNotificationInternal(TRAPS);
public:
static void pushNotification(GCMemoryManager *manager, const char *action, const char *cause);
static bool has_event();
diff --git a/hotspot/src/share/vm/services/management.cpp b/hotspot/src/share/vm/services/management.cpp
index 680c5d3..48a5b6a 100644
--- a/hotspot/src/share/vm/services/management.cpp
+++ b/hotspot/src/share/vm/services/management.cpp
@@ -119,21 +119,8 @@ void Management::init() {
_optional_support.isThreadAllocatedMemorySupported = 1;
// Registration of the diagnostic commands
- // First boolean argument specifies if the command is enabled
- // Second boolean argument specifies if the command is hidden
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HelpDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VersionDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<CommandLineDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintSystemPropertiesDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintVMFlagsDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(true, false));
-#ifndef SERVICES_KERNEL // Heap dumping not supported
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(true, false));
-#endif // SERVICES_KERNEL
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(true, false));
- DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(true, false));
+ DCmdRegistrant::register_dcmds();
+ DCmdRegistrant::register_dcmds_ext();
}
void Management::initialize(TRAPS) {
@@ -2047,15 +2034,15 @@ JVM_ENTRY(void, jmm_GetLastGCStat(JNIEnv *env, jobject obj, jmmGCStat *gc_stat))
// Make a copy of the last GC statistics
// GC may occur while constructing the last GC information
int num_pools = MemoryService::num_memory_pools();
- GCStatInfo* stat = new GCStatInfo(num_pools);
- if (mgr->get_last_gc_stat(stat) == 0) {
+ GCStatInfo stat(num_pools);
+ if (mgr->get_last_gc_stat(&stat) == 0) {
gc_stat->gc_index = 0;
return;
}
- gc_stat->gc_index = stat->gc_index();
- gc_stat->start_time = Management::ticks_to_ms(stat->start_time());
- gc_stat->end_time = Management::ticks_to_ms(stat->end_time());
+ gc_stat->gc_index = stat.gc_index();
+ gc_stat->start_time = Management::ticks_to_ms(stat.start_time());
+ gc_stat->end_time = Management::ticks_to_ms(stat.end_time());
// Current implementation does not have GC extension attributes
gc_stat->num_gc_ext_attributes = 0;
@@ -2073,17 +2060,17 @@ JVM_ENTRY(void, jmm_GetLastGCStat(JNIEnv *env, jobject obj, jmmGCStat *gc_stat))
objArrayHandle usage_after_gc_ah(THREAD, au);
for (int i = 0; i < num_pools; i++) {
- Handle before_usage = MemoryService::create_MemoryUsage_obj(stat->before_gc_usage_for_pool(i), CHECK);
+ Handle before_usage = MemoryService::create_MemoryUsage_obj(stat.before_gc_usage_for_pool(i), CHECK);
Handle after_usage;
- MemoryUsage u = stat->after_gc_usage_for_pool(i);
+ MemoryUsage u = stat.after_gc_usage_for_pool(i);
if (u.max_size() == 0 && u.used() > 0) {
// If max size == 0, this pool is a survivor space.
// Set max size = -1 since the pools will be swapped after GC.
MemoryUsage usage(u.init_size(), u.used(), u.committed(), (size_t)-1);
after_usage = MemoryService::create_MemoryUsage_obj(usage, CHECK);
} else {
- after_usage = MemoryService::create_MemoryUsage_obj(stat->after_gc_usage_for_pool(i), CHECK);
+ after_usage = MemoryService::create_MemoryUsage_obj(stat.after_gc_usage_for_pool(i), CHECK);
}
usage_before_gc_ah->obj_at_put(i, before_usage());
usage_after_gc_ah->obj_at_put(i, after_usage());
diff --git a/hotspot/src/share/vm/services/memoryManager.cpp b/hotspot/src/share/vm/services/memoryManager.cpp
index 4187164..0666223 100644
--- a/hotspot/src/share/vm/services/memoryManager.cpp
+++ b/hotspot/src/share/vm/services/memoryManager.cpp
@@ -214,8 +214,8 @@ GCMemoryManager::~GCMemoryManager() {
void GCMemoryManager::initialize_gc_stat_info() {
assert(MemoryService::num_memory_pools() > 0, "should have one or more memory pools");
- _last_gc_stat = new GCStatInfo(MemoryService::num_memory_pools());
- _current_gc_stat = new GCStatInfo(MemoryService::num_memory_pools());
+ _last_gc_stat = new(ResourceObj::C_HEAP) GCStatInfo(MemoryService::num_memory_pools());
+ _current_gc_stat = new(ResourceObj::C_HEAP) GCStatInfo(MemoryService::num_memory_pools());
// tracking concurrent collections we need two objects: one to update, and one to
// hold the publicly available "last (completed) gc" information.
}
diff --git a/hotspot/src/share/vm/services/memoryManager.hpp b/hotspot/src/share/vm/services/memoryManager.hpp
index cd4d953..eb0d969 100644
--- a/hotspot/src/share/vm/services/memoryManager.hpp
+++ b/hotspot/src/share/vm/services/memoryManager.hpp
@@ -108,7 +108,7 @@ public:
const char* name() { return "CodeCacheManager"; }
};
-class GCStatInfo : public CHeapObj {
+class GCStatInfo : public ResourceObj {
private:
size_t _index;
jlong _start_time;
diff --git a/hotspot/src/share/vm/trace/traceMacros.hpp b/hotspot/src/share/vm/trace/traceMacros.hpp
index e925935..221f4d0 100644
--- a/hotspot/src/share/vm/trace/traceMacros.hpp
+++ b/hotspot/src/share/vm/trace/traceMacros.hpp
@@ -40,4 +40,8 @@
#define TRACE_START() true
#define TRACE_INITIALIZE() 0
+#define TRACE_SET_KLASS_TRACE_ID(x1, x2) do { } while (0)
+#define TRACE_DEFINE_KLASS_METHODS typedef int ___IGNORED_hs_trace_type1
+#define TRACE_DEFINE_KLASS_TRACE_ID typedef int ___IGNORED_hs_trace_type2
+
#endif
diff --git a/hotspot/src/share/vm/utilities/bitMap.inline.hpp b/hotspot/src/share/vm/utilities/bitMap.inline.hpp
index a25fa0a..7bb2447 100644
--- a/hotspot/src/share/vm/utilities/bitMap.inline.hpp
+++ b/hotspot/src/share/vm/utilities/bitMap.inline.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -178,8 +178,30 @@ BitMap::get_next_one_offset_inline(idx_t l_offset, idx_t r_offset) const {
for (; !(res & 1); res_offset++) {
res = res >> 1;
}
- assert(res_offset >= l_offset &&
- res_offset < r_offset, "just checking");
+
+#ifdef ASSERT
+ // In the following assert, if r_offset is not bitamp word aligned,
+ // checking that res_offset is strictly less than r_offset is too
+ // strong and will trip the assert.
+ //
+ // Consider the case where l_offset is bit 15 and r_offset is bit 17
+ // of the same map word, and where bits [15:16:17:18] == [00:00:00:01].
+ // All the bits in the range [l_offset:r_offset) are 0.
+ // The loop that calculates res_offset, above, would yield the offset
+ // of bit 18 because it's in the same map word as l_offset and there
+ // is a set bit in that map word above l_offset (i.e. res != NoBits).
+ //
+ // In this case, however, we can assert is that res_offset is strictly
+ // less than size() since we know that there is at least one set bit
+ // at an offset above, but in the same map word as, r_offset.
+ // Otherwise, if r_offset is word aligned then it will not be in the
+ // same map word as l_offset (unless it equals l_offset). So either
+ // there won't be a set bit between l_offset and the end of it's map
+ // word (i.e. res == NoBits), or res_offset will be less than r_offset.
+
+ idx_t limit = is_word_aligned(r_offset) ? r_offset : size();
+ assert(res_offset >= l_offset && res_offset < limit, "just checking");
+#endif // ASSERT
return MIN2(res_offset, r_offset);
}
// skip over all word length 0-bit runs
diff --git a/hotspot/src/share/vm/utilities/debug.cpp b/hotspot/src/share/vm/utilities/debug.cpp
index b96e5bd..b7e7a27 100644
--- a/hotspot/src/share/vm/utilities/debug.cpp
+++ b/hotspot/src/share/vm/utilities/debug.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -600,19 +600,11 @@ extern "C" void flush() {
tty->flush();
}
-
extern "C" void events() {
Command c("events");
- Events::print_last(tty, 50);
-}
-
-
-extern "C" void nevents(int n) {
- Command c("events");
- Events::print_last(tty, n);
+ Events::print();
}
-
// Given a heap address that was valid before the most recent GC, if
// the oop that used to contain it is still live, prints the new
// location of the oop and the address. Useful for tracking down
@@ -771,7 +763,7 @@ void help() {
tty->print_cr("misc.");
tty->print_cr(" flush() - flushes the log file");
- tty->print_cr(" events() - dump last 50 events");
+ tty->print_cr(" events() - dump events from ring buffers");
tty->print_cr("compiler debugging");
diff --git a/hotspot/src/share/vm/utilities/debug.hpp b/hotspot/src/share/vm/utilities/debug.hpp
index 63c69e6..0ba6442 100644
--- a/hotspot/src/share/vm/utilities/debug.hpp
+++ b/hotspot/src/share/vm/utilities/debug.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,16 +33,23 @@
// Simple class to format the ctor arguments into a fixed-sized buffer.
template <size_t bufsz = 256>
class FormatBuffer {
-public:
+ public:
inline FormatBuffer(const char * format, ...);
inline void append(const char* format, ...);
+ inline void print(const char* format, ...);
+ inline void printv(const char* format, va_list ap);
operator const char *() const { return _buf; }
-private:
+ char* buffer() { return _buf; }
+ int size() { return bufsz; }
+
+ private:
FormatBuffer(const FormatBuffer &); // prevent copies
-private:
+ protected:
char _buf[bufsz];
+
+ inline FormatBuffer();
};
template <size_t bufsz>
@@ -54,6 +61,24 @@ FormatBuffer<bufsz>::FormatBuffer(const char * format, ...) {
}
template <size_t bufsz>
+FormatBuffer<bufsz>::FormatBuffer() {
+ _buf[0] = '\0';
+}
+
+template <size_t bufsz>
+void FormatBuffer<bufsz>::print(const char * format, ...) {
+ va_list argp;
+ va_start(argp, format);
+ jio_vsnprintf(_buf, bufsz, format, argp);
+ va_end(argp);
+}
+
+template <size_t bufsz>
+void FormatBuffer<bufsz>::printv(const char * format, va_list argp) {
+ jio_vsnprintf(_buf, bufsz, format, argp);
+}
+
+template <size_t bufsz>
void FormatBuffer<bufsz>::append(const char* format, ...) {
// Given that the constructor does a vsnprintf we can assume that
// _buf is already initialized.
diff --git a/hotspot/src/share/vm/utilities/decoder.cpp b/hotspot/src/share/vm/utilities/decoder.cpp
index 712c54c..cf7be32 100644
--- a/hotspot/src/share/vm/utilities/decoder.cpp
+++ b/hotspot/src/share/vm/utilities/decoder.cpp
@@ -25,7 +25,9 @@
#include "precompiled.hpp"
#include "prims/jvm.h"
#include "runtime/mutexLocker.hpp"
+#include "runtime/os.hpp"
#include "utilities/decoder.hpp"
+#include "utilities/vmError.hpp"
#if defined(_WINDOWS)
#include "decoder_windows.hpp"
@@ -35,74 +37,94 @@
#include "decoder_elf.hpp"
#endif
-NullDecoder* Decoder::_decoder = NULL;
-NullDecoder Decoder::_do_nothing_decoder;
-Mutex* Decoder::_decoder_lock = new Mutex(Mutex::safepoint,
- "DecoderLock");
+AbstractDecoder* Decoder::_shared_decoder = NULL;
+AbstractDecoder* Decoder::_error_handler_decoder = NULL;
+NullDecoder Decoder::_do_nothing_decoder;
+Mutex* Decoder::_shared_decoder_lock = new Mutex(Mutex::native,
+ "SharedDecoderLock");
-// _decoder_lock should already acquired before enter this method
-NullDecoder* Decoder::get_decoder() {
- assert(_decoder_lock != NULL && _decoder_lock->owned_by_self(),
+AbstractDecoder* Decoder::get_shared_instance() {
+ assert(_shared_decoder_lock != NULL && _shared_decoder_lock->owned_by_self(),
"Require DecoderLock to enter");
- if (_decoder != NULL) {
- return _decoder;
+ if (_shared_decoder == NULL) {
+ _shared_decoder = create_decoder();
}
+ return _shared_decoder;
+}
+
+AbstractDecoder* Decoder::get_error_handler_instance() {
+ if (_error_handler_decoder == NULL) {
+ _error_handler_decoder = create_decoder();
+ }
+ return _error_handler_decoder;
+}
- // Decoder is a secondary service. Although, it is good to have,
- // but we can live without it.
+
+AbstractDecoder* Decoder::create_decoder() {
+ AbstractDecoder* decoder;
#if defined(_WINDOWS)
- _decoder = new (std::nothrow) WindowsDecoder();
+ decoder = new (std::nothrow) WindowsDecoder();
#elif defined (__APPLE__)
- _decoder = new (std::nothrow)MachODecoder();
+ decoder = new (std::nothrow)MachODecoder();
#else
- _decoder = new (std::nothrow)ElfDecoder();
+ decoder = new (std::nothrow)ElfDecoder();
#endif
- if (_decoder == NULL || _decoder->has_error()) {
- if (_decoder != NULL) {
- delete _decoder;
+ if (decoder == NULL || decoder->has_error()) {
+ if (decoder != NULL) {
+ delete decoder;
}
- _decoder = &_do_nothing_decoder;
+ decoder = &_do_nothing_decoder;
}
- return _decoder;
+ return decoder;
}
bool Decoder::decode(address addr, char* buf, int buflen, int* offset, const char* modulepath) {
- assert(_decoder_lock != NULL, "Just check");
- MutexLockerEx locker(_decoder_lock, true);
- NullDecoder* decoder = get_decoder();
+ assert(_shared_decoder_lock != NULL, "Just check");
+ bool error_handling_thread = os::current_thread_id() == VMError::first_error_tid;
+ MutexLockerEx locker(error_handling_thread ? NULL : _shared_decoder_lock, true);
+ AbstractDecoder* decoder = error_handling_thread ?
+ get_error_handler_instance(): get_shared_instance();
assert(decoder != NULL, "null decoder");
return decoder->decode(addr, buf, buflen, offset, modulepath);
}
bool Decoder::demangle(const char* symbol, char* buf, int buflen) {
- assert(_decoder_lock != NULL, "Just check");
- MutexLockerEx locker(_decoder_lock, true);
- NullDecoder* decoder = get_decoder();
+ assert(_shared_decoder_lock != NULL, "Just check");
+ bool error_handling_thread = os::current_thread_id() == VMError::first_error_tid;
+ MutexLockerEx locker(error_handling_thread ? NULL : _shared_decoder_lock, true);
+ AbstractDecoder* decoder = error_handling_thread ?
+ get_error_handler_instance(): get_shared_instance();
assert(decoder != NULL, "null decoder");
return decoder->demangle(symbol, buf, buflen);
}
bool Decoder::can_decode_C_frame_in_vm() {
- assert(_decoder_lock != NULL, "Just check");
- MutexLockerEx locker(_decoder_lock, true);
- NullDecoder* decoder = get_decoder();
+ assert(_shared_decoder_lock != NULL, "Just check");
+ bool error_handling_thread = os::current_thread_id() == VMError::first_error_tid;
+ MutexLockerEx locker(error_handling_thread ? NULL : _shared_decoder_lock, true);
+ AbstractDecoder* decoder = error_handling_thread ?
+ get_error_handler_instance(): get_shared_instance();
assert(decoder != NULL, "null decoder");
return decoder->can_decode_C_frame_in_vm();
}
-// shutdown real decoder and replace it with
-// _do_nothing_decoder
+/*
+ * Shutdown shared decoder and replace it with
+ * _do_nothing_decoder. Do nothing with error handler
+ * instance, since the JVM is going down.
+ */
void Decoder::shutdown() {
- assert(_decoder_lock != NULL, "Just check");
- MutexLockerEx locker(_decoder_lock, true);
+ assert(_shared_decoder_lock != NULL, "Just check");
+ MutexLockerEx locker(_shared_decoder_lock, true);
- if (_decoder != NULL && _decoder != &_do_nothing_decoder) {
- delete _decoder;
+ if (_shared_decoder != NULL &&
+ _shared_decoder != &_do_nothing_decoder) {
+ delete _shared_decoder;
}
- _decoder = &_do_nothing_decoder;
+ _shared_decoder = &_do_nothing_decoder;
}
diff --git a/hotspot/src/share/vm/utilities/decoder.hpp b/hotspot/src/share/vm/utilities/decoder.hpp
index 82179a6..56ff919 100644
--- a/hotspot/src/share/vm/utilities/decoder.hpp
+++ b/hotspot/src/share/vm/utilities/decoder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
#include "memory/allocation.hpp"
#include "runtime/mutex.hpp"
-class NullDecoder: public CHeapObj {
+class AbstractDecoder : public CHeapObj {
public:
// status code for decoding native C frame
enum decoder_status {
@@ -43,6 +43,34 @@ public:
helper_init_error // SymInitialize failed (Windows only)
};
+ // decode an pc address to corresponding function name and an offset from the beginning of
+ // the function
+ virtual bool decode(address pc, char* buf, int buflen, int* offset,
+ const char* modulepath = NULL) = 0;
+ // demangle a C++ symbol
+ virtual bool demangle(const char* symbol, char* buf, int buflen) = 0;
+ // if the decoder can decode symbols in vm
+ virtual bool can_decode_C_frame_in_vm() const = 0;
+
+ virtual decoder_status status() const {
+ return _decoder_status;
+ }
+
+ virtual bool has_error() const {
+ return is_error(_decoder_status);
+ }
+
+ static bool is_error(decoder_status status) {
+ return (status > 0);
+ }
+
+protected:
+ decoder_status _decoder_status;
+};
+
+// Do nothing decoder
+class NullDecoder : public AbstractDecoder {
+public:
NullDecoder() {
_decoder_status = not_available;
}
@@ -61,40 +89,34 @@ public:
virtual bool can_decode_C_frame_in_vm() const {
return false;
}
-
- virtual decoder_status status() const {
- return _decoder_status;
- }
-
- virtual bool has_error() const {
- return is_error(_decoder_status);
- }
-
- static bool is_error(decoder_status status) {
- return (status > 0);
- }
-
-protected:
- decoder_status _decoder_status;
};
-class Decoder: AllStatic {
+class Decoder : AllStatic {
public:
static bool decode(address pc, char* buf, int buflen, int* offset, const char* modulepath = NULL);
static bool demangle(const char* symbol, char* buf, int buflen);
static bool can_decode_C_frame_in_vm();
+ // shutdown shared instance
static void shutdown();
protected:
- static NullDecoder* get_decoder();
-
+ // shared decoder instance, _shared_instance_lock is needed
+ static AbstractDecoder* get_shared_instance();
+ // a private instance for error handler. Error handler can be
+ // triggered almost everywhere, including signal handler, where
+ // no lock can be taken. So the shared decoder can not be used
+ // in this scenario.
+ static AbstractDecoder* get_error_handler_instance();
+
+ static AbstractDecoder* create_decoder();
private:
- static NullDecoder* _decoder;
- static NullDecoder _do_nothing_decoder;
+ static AbstractDecoder* _shared_decoder;
+ static AbstractDecoder* _error_handler_decoder;
+ static NullDecoder _do_nothing_decoder;
protected:
- static Mutex* _decoder_lock;
+ static Mutex* _shared_decoder_lock;
};
#endif // SHARE_VM_UTILITIES_DECODER_HPP
diff --git a/hotspot/src/share/vm/utilities/decoder_elf.hpp b/hotspot/src/share/vm/utilities/decoder_elf.hpp
index f0dff75..971cd3c 100644
--- a/hotspot/src/share/vm/utilities/decoder_elf.hpp
+++ b/hotspot/src/share/vm/utilities/decoder_elf.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
#include "utilities/decoder.hpp"
#include "utilities/elfFile.hpp"
-class ElfDecoder: public NullDecoder {
+class ElfDecoder : public AbstractDecoder {
public:
ElfDecoder() {
diff --git a/hotspot/src/share/vm/utilities/events.cpp b/hotspot/src/share/vm/utilities/events.cpp
index 6234119..b2f292f 100644
--- a/hotspot/src/share/vm/utilities/events.cpp
+++ b/hotspot/src/share/vm/utilities/events.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
#include "memory/allocation.inline.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/osThread.hpp"
+#include "runtime/threadCritical.hpp"
#include "runtime/threadLocalStorage.hpp"
#include "runtime/timer.hpp"
#include "utilities/events.hpp"
@@ -43,184 +44,44 @@
#endif
-#ifndef PRODUCT
+EventLog* Events::_logs = NULL;
+StringEventLog* Events::_messages = NULL;
+StringEventLog* Events::_exceptions = NULL;
+StringEventLog* Events::_deopt_messages = NULL;
-////////////////////////////////////////////////////////////////////////////
-// Event
-
-typedef u4 EventID;
-
-class Event VALUE_OBJ_CLASS_SPEC {
- private:
- jlong _time_tick;
- intx _thread_id;
- const char* _format;
- int _indent;
- intptr_t _arg_1;
- intptr_t _arg_2;
- intptr_t _arg_3;
-
- // only EventBuffer::add_event() can assign event id
- friend class EventBuffer;
- EventID _id;
-
- public:
-
- void clear() { _format = NULL; }
-
- EventID id() const { return _id; }
-
- void fill(int indent, const char* format, intptr_t arg_1, intptr_t arg_2, intptr_t arg_3) {
- _format = format;
- _arg_1 = arg_1;
- _arg_2 = arg_2;
- _arg_3 = arg_3;
-
- _indent = indent;
-
- _thread_id = os::current_thread_id();
- _time_tick = os::elapsed_counter();
- }
-
- void print_on(outputStream *st) {
- if (_format == NULL) return;
- st->print(" %d", _thread_id);
- st->print(" %3.2g ", (double)_time_tick / os::elapsed_frequency());
- st->fill_to(20);
- for (int index = 0; index < _indent; index++) {
- st->print("| ");
- }
- st->print_cr(_format, _arg_1, _arg_2, _arg_3);
- }
-};
-
-////////////////////////////////////////////////////////////////////////////
-// EventBuffer
-//
-// Simple lock-free event queue. Every event has a unique 32-bit id.
-// It's fine if two threads add events at the same time, because they
-// will get different event id, and then write to different buffer location.
-// However, it is assumed that add_event() is quick enough (or buffer size
-// is big enough), so when one thread is adding event, there can't be more
-// than "size" events created by other threads; otherwise we'll end up having
-// two threads writing to the same location.
-
-class EventBuffer : AllStatic {
- private:
- static Event* buffer;
- static int size;
- static jint indent;
- static volatile EventID _current_event_id;
-
- static EventID get_next_event_id() {
- return (EventID)Atomic::add(1, (jint*)&_current_event_id);
- }
-
- public:
- static void inc_indent() { Atomic::inc(&indent); }
- static void dec_indent() { Atomic::dec(&indent); }
-
- static bool get_event(EventID id, Event* event) {
- int index = (int)(id % size);
- if (buffer[index].id() == id) {
- memcpy(event, &buffer[index], sizeof(Event));
- // check id again; if buffer[index] is being updated by another thread,
- // event->id() will contain different value.
- return (event->id() == id);
- } else {
- // id does not match - id is invalid, or event is overwritten
- return false;
- }
- }
-
- // add a new event to the queue; if EventBuffer is full, this call will
- // overwrite the oldest event in the queue
- static EventID add_event(const char* format,
- intptr_t arg_1, intptr_t arg_2, intptr_t arg_3) {
- // assign a unique id
- EventID id = get_next_event_id();
-
- // event will be copied to buffer[index]
- int index = (int)(id % size);
-
- // first, invalidate id, buffer[index] can't have event with id = index + 2
- buffer[index]._id = index + 2;
-
- // make sure everyone has seen that buffer[index] is invalid
- OrderAccess::fence();
-
- // ... before updating its value
- buffer[index].fill(indent, format, arg_1, arg_2, arg_3);
-
- // finally, set up real event id, now buffer[index] contains valid event
- OrderAccess::release_store(&(buffer[index]._id), id);
-
- return id;
- }
-
- static void print_last(outputStream *st, int number) {
- st->print_cr("[Last %d events in the event buffer]", number);
- st->print_cr("-<thd>-<elapsed sec>-<description>---------------------");
-
- int count = 0;
- EventID id = _current_event_id;
- while (count < number) {
- Event event;
- if (get_event(id, &event)) {
- event.print_on(st);
- }
- id--;
- count++;
- }
- }
-
- static void print_all(outputStream* st) {
- print_last(st, size);
- }
-
- static void init() {
- // Allocate the event buffer
- size = EventLogLength;
- buffer = NEW_C_HEAP_ARRAY(Event, size);
-
- _current_event_id = 0;
+EventLog::EventLog() {
+ // This normally done during bootstrap when we're only single
+ // threaded but use a ThreadCritical to ensure inclusion in case
+ // some are created slightly late.
+ ThreadCritical tc;
+ _next = Events::_logs;
+ Events::_logs = this;
+}
- // Clear the event buffer
- for (int index = 0; index < size; index++) {
- buffer[index]._id = index + 1; // index + 1 is invalid id
- buffer[index].clear();
- }
+// For each registered event logger, print out the current contents of
+// the buffer. This is normally called when the JVM is crashing.
+void Events::print_all(outputStream* out) {
+ EventLog* log = _logs;
+ while (log != NULL) {
+ log->print_log_on(out);
+ log = log->next();
}
-};
-
-Event* EventBuffer::buffer;
-int EventBuffer::size;
-volatile EventID EventBuffer::_current_event_id;
-int EventBuffer::indent;
+}
-////////////////////////////////////////////////////////////////////////////
-// Events
+void Events::print() {
+ print_all(tty);
+}
-// Events::log() is safe for signal handlers
-void Events::log(const char* format, ...) {
+void Events::init() {
if (LogEvents) {
- va_list ap;
- va_start(ap, format);
- intptr_t arg_1 = va_arg(ap, intptr_t);
- intptr_t arg_2 = va_arg(ap, intptr_t);
- intptr_t arg_3 = va_arg(ap, intptr_t);
- va_end(ap);
-
- EventBuffer::add_event(format, arg_1, arg_2, arg_3);
+ _messages = new StringEventLog("Events");
+ _exceptions = new StringEventLog("Internal exceptions");
+ _deopt_messages = new StringEventLog("Deoptimization events");
}
}
-void Events::print_all(outputStream *st) {
- EventBuffer::print_all(st);
-}
-
-void Events::print_last(outputStream *st, int number) {
- EventBuffer::print_last(st, number);
+void eventlog_init() {
+ Events::init();
}
///////////////////////////////////////////////////////////////////////////
@@ -230,37 +91,17 @@ EventMark::EventMark(const char* format, ...) {
if (LogEvents) {
va_list ap;
va_start(ap, format);
- intptr_t arg_1 = va_arg(ap, intptr_t);
- intptr_t arg_2 = va_arg(ap, intptr_t);
- intptr_t arg_3 = va_arg(ap, intptr_t);
+ // Save a copy of begin message and log it.
+ _buffer.printv(format, ap);
+ Events::log(NULL, _buffer);
va_end(ap);
-
- EventBuffer::add_event(format, arg_1, arg_2, arg_3);
- EventBuffer::inc_indent();
}
}
EventMark::~EventMark() {
if (LogEvents) {
- EventBuffer::dec_indent();
- EventBuffer::add_event("done", 0, 0, 0);
+ // Append " done" to the begin message and log it
+ _buffer.append(" done");
+ Events::log(NULL, _buffer);
}
}
-
-///////////////////////////////////////////////////////////////////////////
-
-void eventlog_init() {
- EventBuffer::init();
-}
-
-int print_all_events(outputStream *st) {
- EventBuffer::print_all(st);
- return 1;
-}
-
-#else
-
-void eventlog_init() {}
-int print_all_events(outputStream *st) { return 0; }
-
-#endif // PRODUCT
diff --git a/hotspot/src/share/vm/utilities/events.hpp b/hotspot/src/share/vm/utilities/events.hpp
index 6a50643..5b64e0c 100644
--- a/hotspot/src/share/vm/utilities/events.hpp
+++ b/hotspot/src/share/vm/utilities/events.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,47 +26,266 @@
#define SHARE_VM_UTILITIES_EVENTS_HPP
#include "memory/allocation.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/thread.hpp"
#include "utilities/top.hpp"
+#include "utilities/vmError.hpp"
// Events and EventMark provide interfaces to log events taking place in the vm.
// This facility is extremly useful for post-mortem debugging. The eventlog
// often provides crucial information about events leading up to the crash.
//
-// All arguments past the format string must be passed as an intptr_t.
-//
-// To log a single event use:
-// Events::log("New nmethod has been created " INTPTR_FORMAT, nm);
-//
-// To log a block of events use:
-// EventMark m("GarbageCollecting %d", (intptr_t)gc_number);
-//
-// The constructor to eventlog indents the eventlog until the
-// destructor has been executed.
-//
-// IMPLEMENTATION RESTRICTION:
-// Max 3 arguments are saved for each logged event.
-//
+// Abstractly the logs can record whatever they way but normally they
+// would record at least a timestamp and the current Thread, along
+// with whatever data they need in a ring buffer. Commonly fixed
+// length text messages are recorded for simplicity but other
+// strategies could be used. Several logs are provided by default but
+// new instances can be created as needed.
+
+// The base event log dumping class that is registered for dumping at
+// crash time. This is a very generic interface that is mainly here
+// for completeness. Normally the templated EventLogBase would be
+// subclassed to provide different log types.
+class EventLog : public CHeapObj {
+ friend class Events;
+
+ private:
+ EventLog* _next;
+
+ EventLog* next() const { return _next; }
+
+ public:
+ // Automatically registers the log so that it will be printed during
+ // crashes.
+ EventLog();
+
+ virtual void print_log_on(outputStream* out) = 0;
+};
+
+
+// A templated subclass of EventLog that provides basic ring buffer
+// functionality. Most event loggers should subclass this, possibly
+// providing a more featureful log function if the existing copy
+// semantics aren't appropriate. The name is used as the label of the
+// log when it is dumped during a crash.
+template <class T> class EventLogBase : public EventLog {
+ template <class X> class EventRecord {
+ public:
+ double timestamp;
+ Thread* thread;
+ X data;
+ };
+
+ protected:
+ Mutex _mutex;
+ const char* _name;
+ int _length;
+ int _index;
+ int _count;
+ EventRecord<T>* _records;
+
+ public:
+ EventLogBase<T>(const char* name, int length = LogEventsBufferEntries):
+ _name(name),
+ _length(length),
+ _count(0),
+ _index(0),
+ _mutex(Mutex::event, name) {
+ _records = new EventRecord<T>[length];
+ }
+
+ double fetch_timestamp() {
+ return os::elapsedTime();
+ }
+
+ // move the ring buffer to next open slot and return the index of
+ // the slot to use for the current message. Should only be called
+ // while mutex is held.
+ int compute_log_index() {
+ int index = _index;
+ if (_count < _length) _count++;
+ _index++;
+ if (_index >= _length) _index = 0;
+ return index;
+ }
+
+ bool should_log() {
+ // Don't bother adding new entries when we're crashing. This also
+ // avoids mutating the ring buffer when printing the log.
+ return !VMError::fatal_error_in_progress();
+ }
+
+ // Print the contents of the log
+ void print_log_on(outputStream* out);
+
+ private:
+ void print_log_impl(outputStream* out);
+
+ // Print a single element. A templated implementation might need to
+ // be declared by subclasses.
+ void print(outputStream* out, T& e);
+
+ void print(outputStream* out, EventRecord<T>& e) {
+ out->print("Event: %.3f ", e.timestamp);
+ if (e.thread != NULL) {
+ out->print("Thread " INTPTR_FORMAT " ", e.thread);
+ }
+ print(out, e.data);
+ }
+};
+
+// A simple wrapper class for fixed size text messages.
+class StringLogMessage : public FormatBuffer<132> {
+ public:
+ // Wrap this buffer in a stringStream.
+ stringStream stream() {
+ return stringStream(_buf, sizeof(_buf));
+ }
+};
+
+// A simple ring buffer of fixed size text messages.
+class StringEventLog : public EventLogBase<StringLogMessage> {
+ public:
+ StringEventLog(const char* name, int count = LogEventsBufferEntries) : EventLogBase<StringLogMessage>(name, count) {}
+
+ void logv(Thread* thread, const char* format, va_list ap) {
+ if (!should_log()) return;
+
+ double timestamp = fetch_timestamp();
+ MutexLockerEx ml(&_mutex, Mutex::_no_safepoint_check_flag);
+ int index = compute_log_index();
+ _records[index].thread = thread;
+ _records[index].timestamp = timestamp;
+ _records[index].data.printv(format, ap);
+ }
+
+ void log(Thread* thread, const char* format, ...) {
+ va_list ap;
+ va_start(ap, format);
+ logv(thread, format, ap);
+ va_end(ap);
+ }
+
+};
+
+
class Events : AllStatic {
+ friend class EventLog;
+
+ private:
+ static EventLog* _logs;
+
+ // A log for generic messages that aren't well categorized.
+ static StringEventLog* _messages;
+
+ // A log for internal exception related messages, like internal
+ // throws and implicit exceptions.
+ static StringEventLog* _exceptions;
+
+ // Deoptization related messages
+ static StringEventLog* _deopt_messages;
+
public:
- // Logs an event, format as printf
- static void log(const char* format, ...) PRODUCT_RETURN;
+ static void print_all(outputStream* out);
- // Prints all events in the buffer
- static void print_all(outputStream* st) PRODUCT_RETURN;
+ // Dump all events to the tty
+ static void print();
- // Prints last number events from the event buffer
- static void print_last(outputStream *st, int number) PRODUCT_RETURN;
+ // Logs a generic message with timestamp and format as printf.
+ static void log(Thread* thread, const char* format, ...);
+
+ // Log exception related message
+ static void log_exception(Thread* thread, const char* format, ...);
+
+ static void log_deopt_message(Thread* thread, const char* format, ...);
+
+ // Register default loggers
+ static void init();
};
+
+inline void Events::log(Thread* thread, const char* format, ...) {
+ if (LogEvents) {
+ va_list ap;
+ va_start(ap, format);
+ _messages->logv(thread, format, ap);
+ va_end(ap);
+ }
+}
+
+inline void Events::log_exception(Thread* thread, const char* format, ...) {
+ if (LogEvents) {
+ va_list ap;
+ va_start(ap, format);
+ _exceptions->logv(thread, format, ap);
+ va_end(ap);
+ }
+}
+
+inline void Events::log_deopt_message(Thread* thread, const char* format, ...) {
+ if (LogEvents) {
+ va_list ap;
+ va_start(ap, format);
+ _deopt_messages->logv(thread, format, ap);
+ va_end(ap);
+ }
+}
+
+
+template <class T>
+inline void EventLogBase<T>::print_log_on(outputStream* out) {
+ if (ThreadLocalStorage::get_thread_slow() == NULL) {
+ // Not a regular Java thread so don't bother locking
+ print_log_impl(out);
+ } else {
+ MutexLockerEx ml(&_mutex, Mutex::_no_safepoint_check_flag);
+ print_log_impl(out);
+ }
+}
+
+// Dump the ring buffer entries that current have entries.
+template <class T>
+inline void EventLogBase<T>::print_log_impl(outputStream* out) {
+ out->print_cr("%s (%d events):", _name, _count);
+ if (_count == 0) {
+ out->print_cr("No events");
+ out->cr();
+ return;
+ }
+
+ if (_count < _length) {
+ for (int i = 0; i < _count; i++) {
+ print(out, _records[i]);
+ }
+ } else {
+ for (int i = _index; i < _length; i++) {
+ print(out, _records[i]);
+ }
+ for (int i = 0; i < _index; i++) {
+ print(out, _records[i]);
+ }
+ }
+ out->cr();
+}
+
+// Implement a printing routine for the StringLogMessage
+template <>
+inline void EventLogBase<StringLogMessage>::print(outputStream* out, StringLogMessage& lm) {
+ out->print_raw(lm);
+ out->cr();
+}
+
+// Place markers for the beginning and end up of a set of events.
+// These end up in the default log.
class EventMark : public StackObj {
+ StringLogMessage _buffer;
+
public:
// log a begin event, format as printf
- EventMark(const char* format, ...) PRODUCT_RETURN;
+ EventMark(const char* format, ...);
// log an end event
- ~EventMark() PRODUCT_RETURN;
+ ~EventMark();
};
-int print_all_events(outputStream *st);
-
#endif // SHARE_VM_UTILITIES_EVENTS_HPP
diff --git a/hotspot/src/share/vm/utilities/exceptions.cpp b/hotspot/src/share/vm/utilities/exceptions.cpp
index 9196027..874d8e5 100644
--- a/hotspot/src/share/vm/utilities/exceptions.cpp
+++ b/hotspot/src/share/vm/utilities/exceptions.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -160,7 +160,7 @@ void Exceptions::_throw(Thread* thread, const char* file, int line, Handle h_exc
thread->set_pending_exception(h_exception(), file, line);
// vm log
- Events::log("throw_exception " INTPTR_FORMAT, (address)h_exception());
+ Events::log_exception(thread, "Threw " INTPTR_FORMAT " at %s:%d", (address)h_exception(), file, line);
}
diff --git a/hotspot/src/share/vm/utilities/exceptions.hpp b/hotspot/src/share/vm/utilities/exceptions.hpp
index f4ad5dd..f7fece1 100644
--- a/hotspot/src/share/vm/utilities/exceptions.hpp
+++ b/hotspot/src/share/vm/utilities/exceptions.hpp
@@ -189,6 +189,13 @@ class Exceptions {
#define CHECK_NULL CHECK_(NULL)
#define CHECK_false CHECK_(false)
+#define CHECK_AND_CLEAR THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_EXCEPTION; return; } (0
+#define CHECK_AND_CLEAR_(result) THREAD); if (HAS_PENDING_EXCEPTION) { CLEAR_PENDING_EXCEPTION; return result; } (0
+#define CHECK_AND_CLEAR_0 CHECK_AND_CLEAR_(0)
+#define CHECK_AND_CLEAR_NH CHECK_AND_CLEAR_(Handle())
+#define CHECK_AND_CLEAR_NULL CHECK_AND_CLEAR_(NULL)
+#define CHECK_AND_CLEAR_false CHECK_AND_CLEAR_(false)
+
// The THROW... macros should be used to throw an exception. They require a THREAD variable to be
// visible within the scope containing the THROW. Usually this is achieved by declaring the function
// with a TRAPS argument.
@@ -258,7 +265,6 @@ class Exceptions {
ShouldNotReachHere(); \
} (0
-
// ExceptionMark is a stack-allocated helper class for local exception handling.
// It is used with the EXCEPTION_MARK macro.
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
index 45b5e8f..e103816 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -87,14 +87,7 @@
#endif
#ifdef __APPLE__
#include <AvailabilityMacros.h>
- #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
- // Mac OS X 10.4 defines EFL_AC and EFL_ID,
- // which conflict with hotspot variable names.
- //
- // This has been fixed in Mac OS X 10.5.
- #undef EFL_AC
- #undef EFL_ID
- #endif
+ #include <mach/mach.h>
#endif
#include <sys/time.h>
#endif // LINUX || _ALLBSD_SOURCE
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
index ba54d22..60ebb11 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
@@ -130,6 +130,9 @@ inline jdouble jdouble_cast(jlong x) { return *(jdouble*)&x; }
//----------------------------------------------------------------------------------------------------
// Non-standard stdlib-like stuff:
inline int strcasecmp(const char *s1, const char *s2) { return _stricmp(s1,s2); }
+inline int strncasecmp(const char *s1, const char *s2, size_t n) {
+ return _strnicmp(s1,s2,n);
+}
//----------------------------------------------------------------------------------------------------
diff --git a/hotspot/src/share/vm/utilities/growableArray.hpp b/hotspot/src/share/vm/utilities/growableArray.hpp
index 34972be..f7379fc 100644
--- a/hotspot/src/share/vm/utilities/growableArray.hpp
+++ b/hotspot/src/share/vm/utilities/growableArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -198,8 +198,11 @@ template<class E> class GrowableArray : public GenericGrowableArray {
return idx;
}
- void append_if_missing(const E& elem) {
- if (!contains(elem)) append(elem);
+ bool append_if_missing(const E& elem) {
+ // Returns TRUE if elem is added.
+ bool missed = !contains(elem);
+ if (missed) append(elem);
+ return missed;
}
E at(int i) const {
@@ -292,12 +295,22 @@ template<class E> class GrowableArray : public GenericGrowableArray {
ShouldNotReachHere();
}
+ // The order is preserved.
void remove_at(int index) {
assert(0 <= index && index < _len, "illegal index");
for (int j = index + 1; j < _len; j++) _data[j-1] = _data[j];
_len--;
}
+ // The order is changed.
+ void delete_at(int index) {
+ assert(0 <= index && index < _len, "illegal index");
+ if (index < --_len) {
+ // Replace removed element with last one.
+ _data[index] = _data[_len];
+ }
+ }
+
// inserts the given element before the element at index i
void insert_before(const int idx, const E& elem) {
check_nesting();
diff --git a/hotspot/src/share/vm/utilities/hashtable.hpp b/hotspot/src/share/vm/utilities/hashtable.hpp
index a4f0e90..5274709 100644
--- a/hotspot/src/share/vm/utilities/hashtable.hpp
+++ b/hotspot/src/share/vm/utilities/hashtable.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -183,7 +183,6 @@ protected:
// Accessor
int entry_size() const { return _entry_size; }
- int table_size() { return _table_size; }
// The following method is MT-safe and may be used with caution.
BasicHashtableEntry* bucket(int i);
@@ -195,6 +194,7 @@ protected:
BasicHashtableEntry* new_entry(unsigned int hashValue);
public:
+ int table_size() { return _table_size; }
void set_entry(int index, BasicHashtableEntry* entry);
void add_entry(int index, BasicHashtableEntry* entry);
diff --git a/hotspot/src/share/vm/utilities/numberSeq.cpp b/hotspot/src/share/vm/utilities/numberSeq.cpp
index 8758016..2cc4185 100644
--- a/hotspot/src/share/vm/utilities/numberSeq.cpp
+++ b/hotspot/src/share/vm/utilities/numberSeq.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -156,6 +156,10 @@ TruncatedSeq::TruncatedSeq(int length, double alpha):
_sequence[i] = 0.0;
}
+TruncatedSeq::~TruncatedSeq() {
+ FREE_C_HEAP_ARRAY(double, _sequence);
+}
+
void TruncatedSeq::add(double val) {
AbsSeq::add(val);
diff --git a/hotspot/src/share/vm/utilities/numberSeq.hpp b/hotspot/src/share/vm/utilities/numberSeq.hpp
index fb45fa9..358448e 100644
--- a/hotspot/src/share/vm/utilities/numberSeq.hpp
+++ b/hotspot/src/share/vm/utilities/numberSeq.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -118,6 +118,7 @@ public:
// accepts a value for L
TruncatedSeq(int length = DefaultSeqLength,
double alpha = DEFAULT_ALPHA_VALUE);
+ ~TruncatedSeq();
virtual void add(double val);
virtual double maximum() const;
virtual double last() const; // the last value added to the sequence
diff --git a/hotspot/src/share/vm/utilities/preserveException.cpp b/hotspot/src/share/vm/utilities/preserveException.cpp
index ea9ff30..0248eed 100644
--- a/hotspot/src/share/vm/utilities/preserveException.cpp
+++ b/hotspot/src/share/vm/utilities/preserveException.cpp
@@ -32,9 +32,9 @@ PreserveExceptionMark::PreserveExceptionMark(Thread*& thread) {
thread = Thread::current();
_thread = thread;
_preserved_exception_oop = Handle(thread, _thread->pending_exception());
- _thread->clear_pending_exception(); // Needed to avoid infinite recursion
_preserved_exception_line = _thread->exception_line();
_preserved_exception_file = _thread->exception_file();
+ _thread->clear_pending_exception(); // Needed to avoid infinite recursion
}
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index a212f76..3c6e1ca 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "compiler/compileBroker.hpp"
#include "gc_interface/collectedHeap.hpp"
+#include "prims/whitebox.hpp"
#include "runtime/arguments.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/init.hpp"
@@ -36,6 +37,7 @@
#include "utilities/decoder.hpp"
#include "utilities/defaultStream.hpp"
#include "utilities/errorReporter.hpp"
+#include "utilities/events.hpp"
#include "utilities/top.hpp"
#include "utilities/vmError.hpp"
@@ -693,7 +695,14 @@ void VMError::report(outputStream* st) {
st->cr();
}
- STEP(200, "(printing dynamic libraries)" )
+ STEP(200, "(printing ring buffers)" )
+
+ if (_verbose) {
+ Events::print_all(st);
+ st->cr();
+ }
+
+ STEP(205, "(printing dynamic libraries)" )
if (_verbose) {
// dynamic libraries, or memory map
@@ -709,6 +718,13 @@ void VMError::report(outputStream* st) {
st->cr();
}
+ STEP(215, "(printing warning if internal testing API used)" )
+
+ if (WhiteBox::used()) {
+ st->print_cr("Unsupported internal testing APIs have been used.");
+ st->cr();
+ }
+
STEP(220, "(printing environment variables)" )
if (_verbose) {
diff --git a/hotspot/src/share/vm/utilities/vmError.hpp b/hotspot/src/share/vm/utilities/vmError.hpp
index 28f4869..6d84e14 100644
--- a/hotspot/src/share/vm/utilities/vmError.hpp
+++ b/hotspot/src/share/vm/utilities/vmError.hpp
@@ -27,11 +27,12 @@
#include "utilities/globalDefinitions.hpp"
-
+class Decoder;
class VM_ReportJavaOutOfMemory;
class VMError : public StackObj {
friend class VM_ReportJavaOutOfMemory;
+ friend class Decoder;
enum ErrorType {
internal_error = 0xe0000000,
diff --git a/hotspot/src/share/vm/utilities/xmlstream.cpp b/hotspot/src/share/vm/utilities/xmlstream.cpp
index c82010c..8646c30 100644
--- a/hotspot/src/share/vm/utilities/xmlstream.cpp
+++ b/hotspot/src/share/vm/utilities/xmlstream.cpp
@@ -192,8 +192,11 @@ void xmlStream::pop_tag(const char* tag) {
_element_close_stack_ptr = cur_tag + strlen(cur_tag) + 1;
_element_depth -= 1;
}
- if (bad_tag && !VMThread::should_terminate() && !is_error_reported())
+ if (bad_tag && !VMThread::should_terminate() && !VM_Exit::vm_exited() &&
+ !is_error_reported())
+ {
assert(false, "bad tag in log");
+ }
}
#endif
diff --git a/hotspot/test/Makefile b/hotspot/test/Makefile
index f536592..b50de91 100644
--- a/hotspot/test/Makefile
+++ b/hotspot/test/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -228,6 +228,24 @@ PHONY_LIST += internalvmtests
################################################################
+# wbapitest (make sure the whitebox testing api classes work
+
+wbapitest: prep $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
+ $(JTREG) -a -v:fail,error \
+ $(JTREG_KEY_OPTION) \
+ $(EXTRA_JTREG_OPTIONS) \
+ -r:$(ABS_TEST_OUTPUT_DIR)/JTreport \
+ -w:$(ABS_TEST_OUTPUT_DIR)/JTwork \
+ -jdk:$(PRODUCT_HOME) \
+ $(JAVA_OPTIONS:%=-vmoption:%) \
+ $(TEST_ROOT)/sanity \
+ || $(BUNDLE_UP_FAILED)
+ $(BUNDLE_UP)
+
+PHONY_LIST += wbapitest
+
+################################################################
+
# packtest
# Expect JPRT to set JPRT_PACKTEST_HOME.
diff --git a/jaxp/.hg/cache/branchheads b/jaxp/.hg/cache/branchheads
index 6b4d82b..60d9257 100644
--- a/jaxp/.hg/cache/branchheads
+++ b/jaxp/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-8539c5fcf83429b6144abe378ceddf894cc9c469 300
-8539c5fcf83429b6144abe378ceddf894cc9c469 default
+68688f8573c0e22723e682c037c86e6e97100657 314
+68688f8573c0e22723e682c037c86e6e97100657 default
diff --git a/jaxp/.hg/dirstate b/jaxp/.hg/dirstate
index f88de23..c985c2c 100644
Binary files a/jaxp/.hg/dirstate and b/jaxp/.hg/dirstate differ
diff --git a/jaxp/.hg/store/00changelog.i b/jaxp/.hg/store/00changelog.i
index 6946ac7..8355303 100644
Binary files a/jaxp/.hg/store/00changelog.i and b/jaxp/.hg/store/00changelog.i differ
diff --git a/jaxp/.hg/store/00manifest.i b/jaxp/.hg/store/00manifest.i
index 53c7dec..afb1920 100644
Binary files a/jaxp/.hg/store/00manifest.i and b/jaxp/.hg/store/00manifest.i differ
diff --git a/jaxp/.hg/store/data/_r_e_a_d_m_e.i b/jaxp/.hg/store/data/_r_e_a_d_m_e.i
index fa588c0..9d494bd 100644
Binary files a/jaxp/.hg/store/data/_r_e_a_d_m_e.i and b/jaxp/.hg/store/data/_r_e_a_d_m_e.i differ
diff --git a/jaxp/.hg/store/data/build.properties.i b/jaxp/.hg/store/data/build.properties.i
index bd7e83b..ee4845f 100644
Binary files a/jaxp/.hg/store/data/build.properties.i and b/jaxp/.hg/store/data/build.properties.i differ
diff --git a/jaxp/.hg/store/data/build.xml.i b/jaxp/.hg/store/data/build.xml.i
index 8011e4e..7ad0085 100644
Binary files a/jaxp/.hg/store/data/build.xml.i and b/jaxp/.hg/store/data/build.xml.i differ
diff --git a/jaxp/.hg/store/data/make/_makefile.i b/jaxp/.hg/store/data/make/_makefile.i
index 1c5198e..c4cf00f 100644
Binary files a/jaxp/.hg/store/data/make/_makefile.i and b/jaxp/.hg/store/data/make/_makefile.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_scanner.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_scanner.java.i
index d54f45f..681f5ff 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_scanner.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_scanner.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_symbol.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_symbol.java.i
index 3b42805..f3804d8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_symbol.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/_symbol.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/lr__parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/lr__parser.java.i
index b8c1549..3b8cace 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/lr__parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/lr__parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/virtual__parse__stack.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/virtual__parse__stack.java.i
index e327daf..2dd549f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/virtual__parse__stack.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/java__cup/internal/runtime/virtual__parse__stack.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/_utility.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/_utility.java.i
index 7eb7920..a9d532f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/_utility.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/_utility.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/generic/_array_type.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/generic/_array_type.java.i
index 490c352..59f903e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/generic/_array_type.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/bcel/internal/generic/_array_type.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/_version.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/_version.java.i
index a6c2e90..5c06e53 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/_version.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/_version.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/lib/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/lib/_object_factory.java.i
index 5a73867..9e92024 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/lib/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/lib/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources.java.i
index 3ac39ec..dc51a79 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__de.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__de.java.i
index cd6bce1..21d21ec 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__de.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__de.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__es.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__es.java.i
index d0a9556..d2a3248 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__es.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__es.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__fr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__fr.java.i
index db7fbc6..36a58e8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__fr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__fr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__it.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__it.java.i
index cb9901b..6c12245 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__it.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__it.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ja.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ja.java.i
index ccd75df..e86de88 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ja.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ja.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ko.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ko.java.i
index 4e4a0f1..bfee243 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ko.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__ko.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__sv.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__sv.java.i
index 58fe430..70039b0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__sv.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__sv.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___c_n.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___c_n.java.i
index a4eb2ba..afcbe4a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___c_n.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___c_n.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___t_w.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___t_w.java.i
index 8e0132f..4f309bb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___t_w.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/res/_x_s_l_t_error_resources__zh___t_w.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_environment_check.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_environment_check.java.i
index cafe3b8..c027a39 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_environment_check.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_environment_check.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_object_factory.java.i
index ffcdd0f..1c689e4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/_translet_exception.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/_translet_exception.java.i
index 66445c1..a4e095e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/_translet_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/_translet_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_compile.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_compile.java.i
index 5904e9a..a949de3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_compile.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_compile.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_object_factory.java.i
index 99f0a97..f2502b0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_call_template.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_call_template.java.i
index 77f23e0..5f78967 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_call_template.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_call_template.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_filter_expr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_filter_expr.java.i
index c6c6788..1c35be5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_filter_expr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_filter_expr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_import.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_import.java.i
index 0bff6a1..4236cd0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_import.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_import.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_include.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_include.java.i
index 7d8ca3c..d81f0ce 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_include.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_include.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_literal_element.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_literal_element.java.i
index 2a26626..6ce8206 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_literal_element.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_literal_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_object_factory.java.i
index e70469c..08764cd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_parent_location_path.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_parent_location_path.java.i
index ceba794..ca36f72 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_parent_location_path.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_parent_location_path.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_q_name.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_q_name.java.i
index b3f1ef9..a948c96 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_q_name.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_q_name.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_step.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_step.java.i
index fab5f3e..6f4a236 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_step.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_step.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_x_path_lexer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_x_path_lexer.java.i
index cf044af..a18e296 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_x_path_lexer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/_x_path_lexer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages.java.i
index 3cd9dfb..b18c699 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ca.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ca.java.i
index 09480b0..e2c5488 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ca.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ca.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__cs.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__cs.java.i
index af09427..43cc6c1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__cs.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__cs.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__de.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__de.java.i
index 6c8f4c9..fd7233f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__de.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__de.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__es.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__es.java.i
index 8c1a89c..5a2084b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__es.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__es.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__fr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__fr.java.i
index 7ded0fd..6afb000 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__fr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__fr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__it.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__it.java.i
index b774a0d..4917039 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__it.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__it.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ja.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ja.java.i
index 9435c40..e211641 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ja.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ja.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ko.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ko.java.i
index 82d1de9..d3e1be5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ko.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__ko.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__sk.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__sk.java.i
index d18b7af..5d62dc2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__sk.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__sk.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___c_n.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___c_n.java.i
index 67bc272..a05fb7d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___c_n.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___c_n.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___t_w.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___t_w.java.i
index d856dd2..d68d4f7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___t_w.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_messages__zh___t_w.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_msg.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_msg.java.i
index 4f7ce34..b280e3d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_msg.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_error_msg.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_object_factory.java.i
index c788e3c..b5570f5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_type.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_type.java.i
index 6754372..c38b326 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_type.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/_type.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup.i
index e173200..684a07a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex.i
index c0f974a..a284fcd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_adaptive_result_tree_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_adaptive_result_tree_impl.java.i
index 4a8845f..30101b1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_adaptive_result_tree_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_adaptive_result_tree_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_node_counter.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_node_counter.java.i
index ea642d4..790c819 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_node_counter.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_node_counter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_object_factory.java.i
index d8bc895..a8b61a8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_abstract_translet.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_abstract_translet.java.i
index 1ce370f..d61f9a7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_abstract_translet.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_abstract_translet.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_basis_library.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_basis_library.java.i
index 2359eb5..4b95c98 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_basis_library.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_basis_library.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages.java.i
index b140d53..8526945 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ca.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ca.java.i
index 36cc368..29bc47e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ca.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ca.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__cs.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__cs.java.i
index df13949..73ab0ac 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__cs.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__cs.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__de.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__de.java.i
index 2bbf17d..d7fa70b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__de.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__de.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__es.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__es.java.i
index a95e3fa..59ac14e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__es.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__es.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__fr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__fr.java.i
index 7efafe7..0dc1bcd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__fr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__fr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__it.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__it.java.i
index 84e1ee9..ed278f2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__it.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__it.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ja.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ja.java.i
index 4082bdf..371ec28 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ja.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ja.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ko.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ko.java.i
index 3950598..e68a371 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ko.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__ko.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__sk.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__sk.java.i
index 37c0082..0341f65 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__sk.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__sk.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___c_n.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___c_n.java.i
index 9e6c258..5f9c822 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___c_n.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___c_n.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___t_w.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___t_w.java.i
index a4e1f3c..7c4c16b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___t_w.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_error_messages__zh___t_w.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_object_factory.java.i
index f799dd3..09a573d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_string_value_handler.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_string_value_handler.java.i
index 551dd70..621dc1a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_string_value_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/_string_value_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_object_factory.java.i
index 17d2461..a5125a4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_d_o_m.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_d_o_m.java.i
index 4237a2b..908b65b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_d_o_m.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_d_o_m.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_base_writer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_base_writer.java.i
index de94631..6ed1a80 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_base_writer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_base_writer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_event_writer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_event_writer.java.i
index 69eef93..f059e3e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_event_writer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_event_writer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_stream_writer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_stream_writer.java.i
index 12c5ef1..925dd49 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_stream_writer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_s_a_x2_st_a_x_stream_writer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_event2_s_a_x.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_event2_s_a_x.java.i
index 43e9266..0fd9d07 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_event2_s_a_x.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_event2_s_a_x.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_stream2_s_a_x.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_stream2_s_a_x.java.i
index f8ccbfa..1b593ea 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_stream2_s_a_x.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_st_a_x_stream2_s_a_x.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_templates_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_templates_impl.java.i
index 08703c5..24f8937 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_templates_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_templates_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_factory_impl.java.i
index a7184a8..bbb9c86 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_impl.java.i
index 591f72e..d6d6079 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/_transformer_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_impl.java.i
index 71cd544..b606e21 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_n_s_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_n_s_impl.java.i
index c928d22..58858aa 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_n_s_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attr_n_s_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attribute_map.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attribute_map.java.i
index df1fe91..7f61e58 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attribute_map.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_attribute_map.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_core_document_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_core_document_impl.java.i
index f5cca23..25e01dc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_core_document_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_core_document_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_configuration_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_configuration_impl.java.i
index 75c1ac3..79c881a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_configuration_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_configuration_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_normalizer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_normalizer.java.i
index 9b14a9b..884834e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_normalizer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_d_o_m_normalizer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_document_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_document_impl.java.i
index 71c64ea..9dea4fc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_document_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_document_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_element_n_s_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_element_n_s_impl.java.i
index b4867b7..9df7cb1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_element_n_s_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_deferred_element_n_s_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_document_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_document_impl.java.i
index 4e8b19b..b556ad7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_document_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_document_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_element_n_s_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_element_n_s_impl.java.i
index 9220881..2e96653 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_element_n_s_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_element_n_s_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_entity_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_entity_impl.java.i
index b575041..e34b305 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_entity_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_entity_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_named_node_map_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_named_node_map_impl.java.i
index 632f5fe..66d2fa8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_named_node_map_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_named_node_map_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_node_list_cache.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_node_list_cache.java.i
index ad1f935..c894548 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_node_list_cache.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_node_list_cache.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_p_s_v_i_element_n_s_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_p_s_v_i_element_n_s_impl.java.i
index a96040b..3b7d289 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_p_s_v_i_element_n_s_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_p_s_v_i_element_n_s_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_parent_node.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_parent_node.java.i
index d6a942c..d2ec658 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_parent_node.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/dom/_parent_node.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_constants.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_constants.java.i
index 1a2a6a1..816f685 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_constants.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_constants.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_property_manager.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_property_manager.java.i
index 29fa6ed..fbaa8e0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_property_manager.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_property_manager.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_version.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_version.java.i
index 8213ce1..00dfc1f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_version.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_version.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l11_document_scanner_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l11_document_scanner_impl.java.i
index 433e405..da9b701 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l11_document_scanner_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l11_document_scanner_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_d_t_d_scanner_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_d_t_d_scanner_impl.java.i
index 48cc356..728cf50 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_d_t_d_scanner_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_d_t_d_scanner_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_fragment_scanner_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_fragment_scanner_impl.java.i
index 4c55d86..18156af 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_fragment_scanner_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_fragment_scanner_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_scanner_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_scanner_impl.java.i
index a80d1e2..16f0f92 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_scanner_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_document_scanner_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_manager.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_manager.java.i
index ebc9478..19c8fb3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_manager.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_manager.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_scanner.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_scanner.java.i
index 1c41f23..11fe626 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_scanner.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_entity_scanner.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_error_reporter.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_error_reporter.java.i
index 1c58f4b..21697fd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_error_reporter.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_error_reporter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_n_s_document_scanner_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_n_s_document_scanner_impl.java.i
index 0ae2724..01db808 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_n_s_document_scanner_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_n_s_document_scanner_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_namespace_binder.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_namespace_binder.java.i
index 068320d..a8c4cd4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_namespace_binder.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_namespace_binder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_scanner.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_scanner.java.i
index 14a30fd..c43c1db 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_scanner.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_scanner.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_filter_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_filter_impl.java.i
index 9186baa..7c0a6cf 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_filter_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_filter_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_reader_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_reader_impl.java.i
index dfc4b5a..8c9acc6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_reader_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/_x_m_l_stream_reader_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_d_t_d_grammar.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_d_t_d_grammar.java.i
index 24ebe50..eb103d2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_d_t_d_grammar.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_d_t_d_grammar.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l11_d_t_d_processor.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l11_d_t_d_processor.java.i
index 37f2696..93bd601 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l11_d_t_d_processor.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l11_d_t_d_processor.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_description.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_description.java.i
index d71af2a..48c6715 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_description.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_description.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_loader.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_loader.java.i
index 9681449..80465e4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_loader.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_loader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_processor.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_processor.java.i
index 1fd0c0d..0e53d78 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_processor.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_processor.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_validator.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_validator.java.i
index 9478a5a..ea45c74 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_validator.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/_x_m_l_d_t_d_validator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/_d_f_a_content_model.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/_d_f_a_content_model.java.i
index aeef031..7887700 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/_d_f_a_content_model.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/_d_f_a_content_model.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/_validation_context.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/_validation_context.java.i
index 3514b28..d557648 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/_validation_context.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/_validation_context.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/_byte_list_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/_byte_list_impl.java.i
index 4baa7b1..839005a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/_byte_list_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/_byte_list_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_abstract_date_time_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_abstract_date_time_d_v.java.i
index b5d1387..50cb898 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_abstract_date_time_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_abstract_date_time_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base64_binary_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base64_binary_d_v.java.i
index f7950cf..a8ecbc6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base64_binary_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base64_binary_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base_d_v_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base_d_v_factory.java.i
index e4712d6..37789a3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base_d_v_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_base_d_v_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_d_v.java.i
index 29fad60..5f16f63 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_time_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_time_d_v.java.i
index 6787d2d..0eb6806 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_time_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_date_time_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_d_v.java.i
index 4df122d..5e36297 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_time_duration_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_time_duration_d_v.java.i
index b9c8561..58d9b9e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_time_duration_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_day_time_duration_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_double_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_double_d_v.java.i
index bc562a9..5472025 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_double_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_double_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_duration_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_duration_d_v.java.i
index 248b51a..0fde013 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_duration_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_duration_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_float_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_float_d_v.java.i
index e701d1c..c8573dd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_float_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_float_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_hex_binary_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_hex_binary_d_v.java.i
index 12bb9ed..c0bdffe 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_hex_binary_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_hex_binary_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_list_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_list_d_v.java.i
index d3c6e62..e4490af 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_list_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_list_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_d_v.java.i
index 0b9bcf2..c994dd2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_day_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_day_d_v.java.i
index ad924cc..85deb29 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_day_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_month_day_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_schema_d_v_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_schema_d_v_factory_impl.java.i
index dd4a979..aba9e80 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_schema_d_v_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_schema_d_v_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_time_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_time_d_v.java.i
index a6dd071..73d01c1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_time_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_time_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_x_s_simple_type_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_x_s_simple_type_decl.java.i
index 945d1de..88b9b04 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_x_s_simple_type_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_x_s_simple_type_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_d_v.java.i
index fefeddf..532717b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_d_v.java.i
index 9e837ed..17c4e20 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_duration_d_v.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_duration_d_v.java.i
index cd9cd8e..92573b9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_duration_d_v.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/_year_month_duration_d_v.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_d_o_m_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_d_o_m_messages.properties.i
index 283c071..18b938f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_d_o_m_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_d_o_m_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_datatype_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_datatype_messages.properties.i
index c58e8c8..5203fae 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_datatype_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_datatype_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_j_a_x_p_validation_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_j_a_x_p_validation_messages.properties.i
index bfbab11..e82f870 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_j_a_x_p_validation_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_j_a_x_p_validation_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_s_a_x_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_s_a_x_messages.properties.i
index 70a2560..858b0ca 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_s_a_x_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_s_a_x_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_include_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_include_messages.properties.i
index 2302185..6b9e22e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_include_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_include_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_message_formatter.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_message_formatter.java.i
index cad7eb8..a2e895a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_message_formatter.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_message_formatter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_messages.properties.i
index 93b50a0..37eb7c2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_schema_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_schema_messages.properties.i
index ea1a192..34a249c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_schema_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_schema_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_serializer_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_serializer_messages.properties.i
index 8ca7843..4269cf3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_serializer_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_m_l_serializer_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_pointer_messages.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_pointer_messages.properties.i
index 63b2ffc..ce24f40 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_pointer_messages.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/_x_pointer_messages.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/validation/_validation_state.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/validation/_validation_state.java.i
index c176e33..1dbb947 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/validation/_validation_state.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/validation/_validation_state.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_parser_for_x_m_l_schema.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_parser_for_x_m_l_schema.java.i
index a742228..9bef68f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_parser_for_x_m_l_schema.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_parser_for_x_m_l_schema.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regex_parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regex_parser.java.i
index 90fe6ad..6a7c37c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regex_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regex_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regular_expression.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regular_expression.java.i
index 203b4f3..97d5665 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regular_expression.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_regular_expression.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_token.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_token.java.i
index e5a3007..1a903f8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_token.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/_token.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties.i
index d066883..d9958c7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_schema_grammar.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_schema_grammar.java.i
index 9e8477d..4cf7764 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_schema_grammar.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_schema_grammar.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_substitution_group_handler.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_substitution_group_handler.java.i
index 9e80e9f..0c59be8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_substitution_group_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_substitution_group_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_loader.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_loader.java.i
index f4606ce..eedf968 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_loader.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_loader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_validator.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_validator.java.i
index 259d5b7..2121dca 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_validator.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_m_l_schema_validator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_annotation_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_annotation_impl.java.i
index 9dcc978..a2d6561 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_annotation_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_annotation_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_decl.java.i
index e7ba05a..c4d1d75 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_group_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_group_decl.java.i
index 37af207..9edca27 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_group_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_group_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_use_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_use_impl.java.i
index c7f7a3d..087f522 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_use_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_attribute_use_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_complex_type_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_complex_type_decl.java.i
index f8d4520..0d7ea64 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_complex_type_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_complex_type_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_constraints.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_constraints.java.i
index 2c1b937..b2d8942 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_constraints.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_constraints.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_declaration_pool.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_declaration_pool.java.i
index c6c090e..4a86545 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_declaration_pool.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_declaration_pool.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_element_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_element_decl.java.i
index 95d7974..7685d8c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_element_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_element_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_grammar_bucket.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_grammar_bucket.java.i
index 0ae7613..282d689 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_grammar_bucket.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_grammar_bucket.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_group_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_group_decl.java.i
index 4864195..595723f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_group_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_group_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_loader_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_loader_impl.java.i
index a83ae4f..15a13ba 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_loader_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_loader_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_group_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_group_impl.java.i
index 5ef231b..9301137 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_group_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_group_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_impl.java.i
index d2052e9..9cac18d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_model_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_notation_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_notation_decl.java.i
index d39b08f..4fbbcf2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_notation_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_notation_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_particle_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_particle_decl.java.i
index 52f27a9..cf3a4e5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_particle_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_particle_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_wildcard_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_wildcard_decl.java.i
index e90d760..839d24f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_wildcard_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/_x_s_wildcard_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/_selector.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/_selector.java.i
index 6f09647..f9e3361 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/_selector.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/_selector.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_builder.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_builder.java.i
index 7c663dc..3e33847 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_builder.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_builder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_node_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_node_factory.java.i
index 21dc752..303b8d1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_node_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_c_m_node_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_all_c_m.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_all_c_m.java.i
index 5d6e335..d018490 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_all_c_m.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_all_c_m.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_uni_op.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_uni_op.java.i
index bba3392..fd683fd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_uni_op.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_uni_op.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_validator.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_validator.java.i
index 914cd48..2aaf13a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_validator.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_c_m_validator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_d_f_a_c_m.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_d_f_a_c_m.java.i
index 7f3b879..f54d28b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_d_f_a_c_m.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_d_f_a_c_m.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_empty_c_m.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_empty_c_m.java.i
index fb67fec..4b83e92 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_empty_c_m.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/_x_s_empty_c_m.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_attr_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_attr_impl.java.i
index d2ce68a..fefae1c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_attr_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_attr_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_element_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_element_impl.java.i
index bd7f244..f234a8a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_element_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_element_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m.java.i
index 553a4e7..b6ee45f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m_parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m_parser.java.i
index a1fde1f..f9a9ed5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_d_o_m_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_parsing_config.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_parsing_config.java.i
index a6a91b2..e7d687e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_parsing_config.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/_schema_parsing_config.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_attribute_checker.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_attribute_checker.java.i
index 263db4b..96e3e6e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_attribute_checker.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_attribute_checker.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_particle_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_particle_traverser.java.i
index 6185b69..5760eb6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_particle_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_particle_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_traverser.java.i
index d5ea548..604ca63 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_abstract_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_group_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_group_traverser.java.i
index 468905a..b93a2ae 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_group_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_group_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_traverser.java.i
index c58a04a..d0b9014 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_attribute_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_complex_type_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_complex_type_traverser.java.i
index f64363a..212c780 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_complex_type_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_complex_type_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_element_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_element_traverser.java.i
index 561370d..d9583b2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_element_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_element_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_group_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_group_traverser.java.i
index e24f51c..dd02984 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_group_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_group_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_handler.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_handler.java.i
index b451bbe..537bb43 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_keyref_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_keyref_traverser.java.i
index 0fd0147..d839e83 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_keyref_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_keyref_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_notation_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_notation_traverser.java.i
index 1a5be27..e8d992a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_notation_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_notation_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_simple_type_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_simple_type_traverser.java.i
index c2849fe..443aa90 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_simple_type_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_simple_type_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_unique_or_key_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_unique_or_key_traverser.java.i
index 7bedd48..1ed726f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_unique_or_key_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_unique_or_key_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_wildcard_traverser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_wildcard_traverser.java.i
index 7316387..3dba53c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_wildcard_traverser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_d_wildcard_traverser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_document_info.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_document_info.java.i
index bf4d9c6..03a29b6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_document_info.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/_x_s_document_info.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_short_list_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_short_list_impl.java.i
index 89e6347..a375080 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_short_list_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_short_list_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_string_list_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_string_list_impl.java.i
index 1a066b8..51b1351 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_string_list_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_string_list_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_grammar_pool.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_grammar_pool.java.i
index e7d32f0..ea677c5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_grammar_pool.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_grammar_pool.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map4_types.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map4_types.java.i
index 45b9ac8..d78586e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map4_types.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map4_types.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map_impl.java.i
index 4b5b412..f17b458 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_named_map_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_object_list_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_object_list_impl.java.i
index 7a36796..d3dd4b6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_object_list_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/_x_s_object_list_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_factory_impl.java.i
index 18cf07c..31b0a6f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_impl.java.i
index f1746c7..90327ae 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_document_builder_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_factory_impl.java.i
index aafab5f..86b4e82 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_impl.java.i
index d08257a..c3b20a3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_s_a_x_parser_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_schema_validator_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_schema_validator_configuration.java.i
index de58a48..118ce0f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_schema_validator_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_schema_validator_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_unparsed_entity_handler.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_unparsed_entity_handler.java.i
index 6962090..1b1cc97 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_unparsed_entity_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/_unparsed_entity_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_datatype_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_datatype_factory_impl.java.i
index a496548..6af98d1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_datatype_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_datatype_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_duration_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_duration_impl.java.i
index 8823b41..58f2535 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_duration_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_duration_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_x_m_l_gregorian_calendar_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_x_m_l_gregorian_calendar_impl.java.i
index af92ee6..64c1358 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_x_m_l_gregorian_calendar_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/_x_m_l_gregorian_calendar_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_abstract_x_m_l_schema.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_abstract_x_m_l_schema.java.i
index a5d0a30..b628750 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_abstract_x_m_l_schema.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_abstract_x_m_l_schema.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_d_o_m_validator_helper.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_d_o_m_validator_helper.java.i
index be61cc9..296f8f6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_d_o_m_validator_helper.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_d_o_m_validator_helper.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_empty_x_m_l_schema.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_empty_x_m_l_schema.java.i
index 2c44b4b..81fb669 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_empty_x_m_l_schema.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_empty_x_m_l_schema.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_st_a_x_validator_helper.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_st_a_x_validator_helper.java.i
index 2e194fd..4dd67bc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_st_a_x_validator_helper.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_st_a_x_validator_helper.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_stream_validator_helper.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_stream_validator_helper.java.i
index 87643e4..f122f19 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_stream_validator_helper.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_stream_validator_helper.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_handler_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_handler_impl.java.i
index 74e1945..aa293e5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_handler_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_handler_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_impl.java.i
index 34f8337..741cde8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_validator_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_m_l_schema_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_m_l_schema_factory.java.i
index af6a5b4..65d8ef7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_m_l_schema_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_m_l_schema_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_s_grammar_pool_container.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_s_grammar_pool_container.java.i
index f2ae045..bd21c4b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_s_grammar_pool_container.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/_x_s_grammar_pool_container.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_d_o_m_parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_d_o_m_parser.java.i
index 606cce7..92e40bd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_d_o_m_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_d_o_m_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_s_a_x_parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_s_a_x_parser.java.i
index 1d923eb..b14b855 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_s_a_x_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_abstract_s_a_x_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_basic_parser_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_basic_parser_configuration.java.i
index ed94d80..89a9383 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_basic_parser_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_basic_parser_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser.java.i
index a91f91b..82aa423 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser_impl.java.i
index 30a1afe..ff8ede9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_o_m_parser_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_t_d_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_t_d_configuration.java.i
index 77338b1..a3fcaa7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_t_d_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_d_t_d_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_non_validating_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_non_validating_configuration.java.i
index dcef5d2..7f18ddd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_non_validating_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_non_validating_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_s_a_x_parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_s_a_x_parser.java.i
index 9572420..19cf350 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_s_a_x_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_s_a_x_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_standard_parser_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_standard_parser_configuration.java.i
index f6b885d..4c17f2c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_standard_parser_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_standard_parser_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_include_aware_parser_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_include_aware_parser_configuration.java.i
index c805d7d..092c1f1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_include_aware_parser_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_include_aware_parser_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_configuration.java.i
index 77969f3..93dc81f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_d_t_d_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_d_t_d_configuration.java.i
index 2d36859..eb822b2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_d_t_d_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_d_t_d_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_non_validating_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_non_validating_configuration.java.i
index 1518994..b4ab086 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_non_validating_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l11_non_validating_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_caching_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_caching_configuration.java.i
index 4926442..cbcd19d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_caching_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_caching_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_preparser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_preparser.java.i
index 4320e32..45b796b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_preparser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_grammar_preparser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_parser.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_parser.java.i
index 2bcfaa7..365f268 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/_x_m_l_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_d_o_m_util.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_d_o_m_util.java.i
index 5205ff9..ad286dd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_d_o_m_util.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_d_o_m_util.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_namespace_context_wrapper.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_namespace_context_wrapper.java.i
index ff945ce..5a213be 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_namespace_context_wrapper.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_namespace_context_wrapper.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_parser_configuration_settings.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_parser_configuration_settings.java.i
index af82ec3..d4a3ee0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_parser_configuration_settings.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_parser_configuration_settings.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_hash.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_hash.java.i
index 708607f..0d3ceac 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_hash.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_hash.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_table.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_table.java.i
index b797c21..aaa6ead 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_table.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_symbol_table.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l11_char.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l11_char.java.i
index 914a767..9cb9890 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l11_char.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l11_char.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_impl.java.i
index 8b35302..f3f8501 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_iterator_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_iterator_impl.java.i
index 09a7aca..ff4ba30 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_iterator_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_attributes_iterator_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_char.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_char.java.i
index 9eaf9ae..0992bf5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_char.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/util/_x_m_l_char.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/_x_include_handler.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/_x_include_handler.java.i
index d062c0e..2e98ffd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/_x_include_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/_x_include_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_q_name.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_q_name.java.i
index 6e87da1..27c9b79 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_q_name.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_q_name.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_x_n_i_exception.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_x_n_i_exception.java.i
index ac046b8..b76a6fb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_x_n_i_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/_x_n_i_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_component_manager.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_component_manager.java.i
index 473330e..209af49 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_component_manager.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_component_manager.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_configuration_exception.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_configuration_exception.java.i
index a549c91..c2b698c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_configuration_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/_x_m_l_configuration_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/_element_scheme_pointer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/_element_scheme_pointer.java.i
index 35ee6ea..5d4e275 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/_element_scheme_pointer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/_element_scheme_pointer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_l_s_input_list.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_l_s_input_list.java.i
index 308405c..3786624 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_l_s_input_list.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_l_s_input_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_short_list.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_short_list.java.i
index 34480eb..b13c50a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_short_list.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_short_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_string_list.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_string_list.java.i
index 34d071e..dc45f7b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_string_list.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_string_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_declaration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_declaration.java.i
index ce1e48e..442bffc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_declaration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_declaration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_group_definition.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_group_definition.java.i
index 29a8553..645cb6e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_group_definition.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_group_definition.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_use.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_use.java.i
index 8eb97a2..fbf7c37 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_use.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_attribute_use.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_complex_type_definition.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_complex_type_definition.java.i
index 8ef84d6..573f3ff 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_complex_type_definition.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_complex_type_definition.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_element_declaration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_element_declaration.java.i
index 7d40238..f60bf99 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_element_declaration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_element_declaration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_facet.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_facet.java.i
index 3c19423..f15d44f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_facet.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_facet.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_i_d_c_definition.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_i_d_c_definition.java.i
index 63a6d25..eeb3ed2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_i_d_c_definition.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_i_d_c_definition.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_loader.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_loader.java.i
index d9dd2a1..78dd654 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_loader.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_loader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model.java.i
index 49f2def..bb695ac 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group.java.i
index 553341d..3ed0805 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group_definition.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group_definition.java.i
index 7f6ab2e..8bdf352 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group_definition.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_model_group_definition.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_multi_value_facet.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_multi_value_facet.java.i
index 1991869..fb3e945 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_multi_value_facet.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_multi_value_facet.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_named_map.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_named_map.java.i
index c0fee89..2ddae9d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_named_map.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_named_map.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_namespace_item_list.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_namespace_item_list.java.i
index 474e396..5453958 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_namespace_item_list.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_namespace_item_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_notation_declaration.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_notation_declaration.java.i
index 09ca6a6..3a60a50 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_notation_declaration.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_notation_declaration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_object_list.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_object_list.java.i
index 2fdd2e0..9b8e64c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_object_list.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_object_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_particle.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_particle.java.i
index ffdf9d9..a1e477a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_particle.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_particle.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_simple_type_definition.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_simple_type_definition.java.i
index dafa42d..699b989 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_simple_type_definition.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_simple_type_definition.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_wildcard.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_wildcard.java.i
index 90b8151..48d4f08 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_wildcard.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/_x_s_wildcard.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_byte_list.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_byte_list.java.i
index 00bb7ff..863ca93 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_byte_list.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_byte_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_object_list.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_object_list.java.i
index 7df24f4..4209f7e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_object_list.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/_object_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/_object_factory.java.i
index 3df9b45..6f0b531 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_d_t_m_default_base_iterators.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_d_t_m_default_base_iterators.java.i
index f214b31..a500bf7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_d_t_m_default_base_iterators.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_d_t_m_default_base_iterators.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_object_factory.java.i
index e48a6b8..8fb3440 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources.java.i
index 4b249c2..a0487c4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ca.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ca.java.i
index d5f3199..0adc434 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ca.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ca.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__cs.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__cs.java.i
index 348e723..ff16643 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__cs.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__cs.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__de.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__de.java.i
index ec4537d..492fea3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__de.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__de.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__es.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__es.java.i
index 33d28f6..6825a57 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__es.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__es.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__fr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__fr.java.i
index cde28be..2c3bcdd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__fr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__fr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__it.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__it.java.i
index 03f46dd..4b0809c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__it.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__it.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ja.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ja.java.i
index 889b22d..5af51bd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ja.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ja.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ko.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ko.java.i
index abf8818..fdc5ce3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ko.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__ko.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sk.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sk.java.i
index d94e457..6b70f68 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sk.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sk.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sv.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sv.java.i
index 7a56687..fc3db92 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sv.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__sv.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__tr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__tr.java.i
index d89fca5..8f21114 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__tr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__tr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___c_n.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___c_n.java.i
index 4688567..5ab6bc0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___c_n.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___c_n.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___t_w.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___t_w.java.i
index b459798..7da3cda 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___t_w.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/res/_x_m_l_error_resources__zh___t_w.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/_catalog.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/_catalog.java.i
index 106d3e2..87605d7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/_catalog.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/_catalog.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/_file_u_r_l.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/_file_u_r_l.java.i
index 204f6a1..6680909 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/_file_u_r_l.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/_file_u_r_l.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_d_o_m_serializer_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_d_o_m_serializer_impl.java.i
index a5e9244..5a7d37e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_d_o_m_serializer_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_d_o_m_serializer_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_encoding_info.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_encoding_info.java.i
index 136f778..53a6e14 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_encoding_info.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serialize/_encoding_info.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_char_info.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_char_info.java.i
index e9d7ee1..309cbc9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_char_info.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_char_info.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encoding_info.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encoding_info.java.i
index 2372690..133cf5b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encoding_info.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encoding_info.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.java.i
index e623d96..3517c0b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.properties.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.properties.i
index ce3651d..2fbaabc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.properties.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_encodings.properties.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_namespace_mappings.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_namespace_mappings.java.i
index 7053f3a..7c4a6ea 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_namespace_mappings.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_namespace_mappings.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_object_factory.java.i
index b44412c..ec2df7a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/serializer/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_object_factory.java.i
index ebac5ae..6681e47 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_thread_controller_wrapper.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_thread_controller_wrapper.java.i
index 406cca2..87b28bf 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_thread_controller_wrapper.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_thread_controller_wrapper.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_x_m_l_reader_manager.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_x_m_l_reader_manager.java.i
index 2b80b6c..a105a95 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_x_m_l_reader_manager.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/_x_m_l_reader_manager.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__de.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__de.java.i
index 76e6bba..a39c049 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__de.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__de.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__en.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__en.java.i
index a57aaab..a23f9fa 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__en.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__en.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__es.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__es.java.i
index c2f498c..a272ca0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__es.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__es.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__fr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__fr.java.i
index fe75524..0fb9f6d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__fr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__fr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__it.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__it.java.i
index 41e53f3..cf0821a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__it.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__it.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___a.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___a.java.i
index 980f51a..536451d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___a.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___a.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_a.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_a.java.i
index 190ac75..8039d64 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_a.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_a.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_i.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_i.java.i
index 76c8d2b..b4a003c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_i.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___h_i.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___i.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___i.java.i
index 2f8d54e..0c11ff5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___i.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ja___j_p___i.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ko.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ko.java.i
index 06db658..d381127 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ko.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__ko.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__sv.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__sv.java.i
index bd45984..d51d30d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__sv.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__sv.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___c_n.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___c_n.java.i
index 02b8f56..75bf65e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___c_n.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___c_n.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___t_w.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___t_w.java.i
index 398c8a6..743eb64 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___t_w.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/_x_resources__zh___t_w.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/axes/_node_sequence.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/axes/_node_sequence.java.i
index 1225f10..878e244 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/axes/_node_sequence.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/axes/_node_sequence.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/_object_factory.java.i
index 86b918d..1cbb210 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/_x_path_stylesheet_d_o_m3_exception.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/_x_path_stylesheet_d_o_m3_exception.java.i
index c12195b..d3ab27b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/_x_path_stylesheet_d_o_m3_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/_x_path_stylesheet_d_o_m3_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/functions/_object_factory.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/functions/_object_factory.java.i
index cdb35a2..1e4cca3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/functions/_object_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/functions/_object_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/_x_path_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/_x_path_factory_impl.java.i
index 922788f..a98c36d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/_x_path_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/_x_path_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_boolean.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_boolean.java.i
index 92512c5..0ccd213 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_boolean.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_boolean.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set.java.i
index 717664b..6954ff9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set_for_d_o_m.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set_for_d_o_m.java.i
index a91e2f2..0e9035d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set_for_d_o_m.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_node_set_for_d_o_m.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_number.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_number.java.i
index 6e7308b..b7f9849 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_number.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_number.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_object.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_object.java.i
index 80a5a43..58494ad 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_object.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_object.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_r_tree_frag.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_r_tree_frag.java.i
index 73f11b1..659a589 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_r_tree_frag.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/objects/_x_r_tree_frag.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources.java.i
index 5b7d9c1..15e7976 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__de.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__de.java.i
index a18d1e5..e9defe8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__de.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__de.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__es.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__es.java.i
index 98ec58c..7f09ab5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__es.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__es.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__fr.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__fr.java.i
index b47ccce..2ec1c25 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__fr.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__fr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__it.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__it.java.i
index dec2908..d4f2649 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__it.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__it.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ja.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ja.java.i
index 83b5a2d..ccc1ab1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ja.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ja.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ko.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ko.java.i
index dd03cf9..0e0b434 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ko.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__ko.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__sv.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__sv.java.i
index dceb91f..19ff571 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__sv.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__sv.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___c_n.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___c_n.java.i
index e8866ff..eaf20a2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___c_n.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___c_n.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___t_w.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___t_w.java.i
index f8c1613..28f4960 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___t_w.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/org/apache/xpath/internal/res/_x_p_a_t_h_error_resources__zh___t_w.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_entity.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_entity.java.i
index 1b250b9..63bcea0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_entity.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_entity.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_event_filter_support.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_event_filter_support.java.i
index 21b0867..296d280 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_event_filter_support.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_event_filter_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_entity_resolver_wrapper.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_entity_resolver_wrapper.java.i
index 9c6d264..36ce9c7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_entity_resolver_wrapper.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_entity_resolver_wrapper.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_error_reporter.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_error_reporter.java.i
index 54875f3..cd459b9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_error_reporter.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_error_reporter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_x_m_l_input_source.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_x_m_l_input_source.java.i
index 27320fa..0a1835f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_x_m_l_input_source.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_stax_x_m_l_input_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_buffer_listener.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_buffer_listener.java.i
index c713e0f..9f2cf7c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_buffer_listener.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_buffer_listener.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_reader.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_reader.java.i
index 959d921..2c3600e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_reader.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_reader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_storage.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_storage.java.i
index cf33116..cf7f750 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_storage.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_entity_storage.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_event_reader_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_event_reader_impl.java.i
index d2146ab..72fe78d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_event_reader_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_event_reader_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_input_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_input_factory_impl.java.i
index 8322cea..90766fa 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_input_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_input_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_output_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_output_factory_impl.java.i
index dd87379..5b4b90f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_output_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/_x_m_l_output_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/_d_t_d_grammar_util.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/_d_t_d_grammar_util.java.i
index b528d4b..428e8f8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/_d_t_d_grammar_util.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/_d_t_d_grammar_util.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_d_t_d_grammar.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_d_t_d_grammar.java.i
index 4900f80..2fc61ec 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_d_t_d_grammar.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_d_t_d_grammar.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_attribute_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_attribute_decl.java.i
index 0d98671..e2ce2ca 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_attribute_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_attribute_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_element_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_element_decl.java.i
index 78ed765..d57718e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_element_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_element_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_notation_decl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_notation_decl.java.i
index a8d941a..14772a8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_notation_decl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_notation_decl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_simple_type.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_simple_type.java.i
index 21c7948..7e6dff2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_simple_type.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/_x_m_l_simple_type.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_attribute_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_attribute_impl.java.i
index 91c4870..62daf36 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_attribute_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_attribute_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_character_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_character_event.java.i
index 9f63029..5d8bb26 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_character_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_character_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_comment_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_comment_event.java.i
index 2e6498a..2a36b58 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_comment_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_comment_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_d_t_d_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_d_t_d_event.java.i
index 7dac881..ca5400a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_d_t_d_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_d_t_d_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_dummy_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_dummy_event.java.i
index fa4fb98..ea7bc9a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_dummy_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_dummy_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_document_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_document_event.java.i
index a24a603..79d543a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_document_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_document_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_element_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_element_event.java.i
index 6123ace..109c499 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_element_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_end_element_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_declaration_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_declaration_impl.java.i
index 996393b..27b751f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_declaration_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_declaration_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_reference_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_reference_event.java.i
index fbb3b74..b6db413 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_reference_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_entity_reference_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_location_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_location_impl.java.i
index 7771383..8078fdc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_location_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_location_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_named_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_named_event.java.i
index 88a48d8..d111112 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_named_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_named_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_namespace_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_namespace_impl.java.i
index 52ad8de..4d4067b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_namespace_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_namespace_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_notation_declaration_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_notation_declaration_impl.java.i
index 40bc06b..e9fdc87 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_notation_declaration_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_notation_declaration_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_processing_instruction_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_processing_instruction_event.java.i
index d69f4de..5b9fad1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_processing_instruction_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_processing_instruction_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_document_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_document_event.java.i
index 2a2b1ec..739b32e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_document_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_document_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_element_event.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_element_event.java.i
index 4d556b4..67e1612 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_element_event.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_start_element_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_allocator_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_allocator_impl.java.i
index f86a3b8..7e3d53d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_allocator_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_allocator_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_factory_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_factory_impl.java.i
index 3c562a7..14c47c2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_factory_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/events/_x_m_l_event_factory_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_buffer_allocator.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_buffer_allocator.java.i
index 55c1c7a..1c2fa7a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_buffer_allocator.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_buffer_allocator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_read_only_iterator.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_read_only_iterator.java.i
index 2daf0dd..7ca6300 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_read_only_iterator.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_read_only_iterator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_thread_local_buffer_allocator.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_thread_local_buffer_allocator.java.i
index ac346ae..8a76689 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_thread_local_buffer_allocator.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/util/_thread_local_buffer_allocator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_u_t_f8_output_stream_writer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_u_t_f8_output_stream_writer.java.i
index 0e61cbf..b813693 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_u_t_f8_output_stream_writer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_u_t_f8_output_stream_writer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_writer_utility.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_writer_utility.java.i
index 09d4579..5988883 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_writer_utility.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_writer_utility.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_d_o_m_writer_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_d_o_m_writer_impl.java.i
index 6ecf74f..6d4cd04 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_d_o_m_writer_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_d_o_m_writer_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_event_writer_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_event_writer_impl.java.i
index f4799f8..1ebf96c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_event_writer_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_event_writer_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_output_source.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_output_source.java.i
index 01851ce..717760e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_output_source.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_output_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_stream_writer_impl.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_stream_writer_impl.java.i
index 133cd85..6eb06de 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_stream_writer_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_stream_writer_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_writer.java.i b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_writer.java.i
index ee7373e..6cea253 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_writer.java.i and b/jaxp/.hg/store/data/src/share/classes/com/sun/xml/internal/stream/writers/_x_m_l_writer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/_x_m_l_constants.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/_x_m_l_constants.java.i
index f68dc6e..a5d8e86 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/_x_m_l_constants.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/_x_m_l_constants.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_configuration_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_configuration_exception.java.i
index 5324cda..323598d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_configuration_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_configuration_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_constants.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_constants.java.i
index 48ac1c7..0471df8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_constants.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_constants.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_factory.java.i
index c7c8fc8..f06a1f6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_datatype_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_duration.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_duration.java.i
index f709895..aa8223a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_duration.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_duration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_factory_finder.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_factory_finder.java.i
index 3879736..3ff5063 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_factory_finder.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_factory_finder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_security_support.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_security_support.java.i
index fc0b594..fb1b515 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_security_support.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_security_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_x_m_l_gregorian_calendar.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_x_m_l_gregorian_calendar.java.i
index b78c710..e9b1b98 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_x_m_l_gregorian_calendar.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/_x_m_l_gregorian_calendar.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/package.html.i
index 1216e44..e256ab6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/datatype/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_namespace_context.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_namespace_context.java.i
index 450c3d8..8fdd672 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_namespace_context.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_namespace_context.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_q_name.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_q_name.java.i
index 5f2e451..71f95c2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_q_name.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/_q_name.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/package.html.i
index 03b02e6..b70fdee 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/namespace/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder.java.i
index 685cb35..c295c90 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder_factory.java.i
index 2154352..72535e0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_document_builder_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_configuration_error.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_configuration_error.java.i
index f0247e7..bda7255 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_configuration_error.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_configuration_error.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_finder.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_finder.java.i
index f1ba157..09e0f96 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_finder.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_factory_finder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_parser_configuration_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_parser_configuration_exception.java.i
index 13504e2..11df997 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_parser_configuration_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_parser_configuration_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser.java.i
index f5f027b..a863d6e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser_factory.java.i
index 4811dd4..3fa19f2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_s_a_x_parser_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_security_support.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_security_support.java.i
index 6a57e95..629ab0c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_security_support.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/_security_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/package.html.i
index 18b8257..93e62f3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/parsers/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_event_filter.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_event_filter.java.i
index d3dd0a4..9c3666a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_event_filter.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_event_filter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_configuration_error.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_configuration_error.java.i
index 239f020..cae7031 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_configuration_error.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_configuration_error.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_finder.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_finder.java.i
index d70a71f..112d560 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_finder.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_factory_finder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_location.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_location.java.i
index ddb26dd..37968cd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_location.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_location.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_security_support.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_security_support.java.i
index 7af8f12..ebfcf08 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_security_support.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_security_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_stream_filter.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_stream_filter.java.i
index 4997f06..4ce18a9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_stream_filter.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_stream_filter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_factory.java.i
index 41fefe8..0a77440 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_reader.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_reader.java.i
index 9438857..b1270e8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_reader.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_reader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_writer.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_writer.java.i
index 548ad47..d87cf2b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_writer.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_event_writer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_input_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_input_factory.java.i
index 7a13f5b..8c80039 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_input_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_input_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_output_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_output_factory.java.i
index d01a634..485aac1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_output_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_output_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_reporter.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_reporter.java.i
index e4e77d8..426c506 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_reporter.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_reporter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_resolver.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_resolver.java.i
index 7843b0e..6646f63 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_resolver.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_resolver.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_constants.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_constants.java.i
index 2ee54b7..330b434 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_constants.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_constants.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_exception.java.i
index 8e60080..b9bd538 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_reader.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_reader.java.i
index 1936999..312be2a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_reader.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_reader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_writer.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_writer.java.i
index be49629..f8c2a23 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_writer.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/_x_m_l_stream_writer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_attribute.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_attribute.java.i
index 9343d8f..e7b0f1a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_attribute.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_attribute.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_characters.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_characters.java.i
index c93ab9f..b95c56f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_characters.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_characters.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_comment.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_comment.java.i
index 2881284..f0cbeca 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_comment.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_comment.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_d_t_d.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_d_t_d.java.i
index a21eca8..182216c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_d_t_d.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_d_t_d.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_document.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_document.java.i
index 56da947..59f8fe3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_document.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_document.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_element.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_element.java.i
index 84318cb..bec2fff 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_element.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_end_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_declaration.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_declaration.java.i
index 73177c3..0b591ec 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_declaration.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_declaration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_reference.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_reference.java.i
index c102d79..9b2fef1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_reference.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_entity_reference.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_namespace.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_namespace.java.i
index dd06700..9773149 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_namespace.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_namespace.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_notation_declaration.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_notation_declaration.java.i
index cd9871d..81f4686 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_notation_declaration.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_notation_declaration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_processing_instruction.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_processing_instruction.java.i
index d91017d..eb758a7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_processing_instruction.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_processing_instruction.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_document.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_document.java.i
index 56c1c82..d113fba 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_document.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_document.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_element.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_element.java.i
index 6c4c134..bce38ec 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_element.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_start_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_x_m_l_event.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_x_m_l_event.java.i
index 8d13417..854e1c2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_x_m_l_event.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/events/_x_m_l_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_event_reader_delegate.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_event_reader_delegate.java.i
index 64c988e..d6693bc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_event_reader_delegate.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_event_reader_delegate.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_stream_reader_delegate.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_stream_reader_delegate.java.i
index ab7e79f..4a18b1e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_stream_reader_delegate.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_stream_reader_delegate.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_allocator.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_allocator.java.i
index 55fb5d6..2be8372 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_allocator.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_allocator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_consumer.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_consumer.java.i
index 269d645..58b9f8a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_consumer.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/stream/util/_x_m_l_event_consumer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_error_listener.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_error_listener.java.i
index b15beb3..67aca12 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_error_listener.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_error_listener.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_factory_finder.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_factory_finder.java.i
index 7f8d101..26f86c3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_factory_finder.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_factory_finder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_output_keys.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_output_keys.java.i
index 755afa7..02db342 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_output_keys.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_output_keys.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_result.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_result.java.i
index 1f5e772..1835dce 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_result.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_result.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_security_support.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_security_support.java.i
index 09eae46..b187e6c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_security_support.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_security_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source.java.i
index 885c168..d47daaf 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source_locator.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source_locator.java.i
index 9284f95..4ae647f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source_locator.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_source_locator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_templates.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_templates.java.i
index 8d813fc..8f20756 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_templates.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_templates.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer.java.i
index 9d6c82c..1cf1655 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_configuration_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_configuration_exception.java.i
index 0062a3e..3b3dc3f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_configuration_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_configuration_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_exception.java.i
index b5b8bf3..6d990e6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory.java.i
index ebf74d2..dcc12e3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory_configuration_error.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory_configuration_error.java.i
index 2fe81d7..30bbb77 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory_configuration_error.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_transformer_factory_configuration_error.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_u_r_i_resolver.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_u_r_i_resolver.java.i
index 158bcf2..8bb981d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_u_r_i_resolver.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/_u_r_i_resolver.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_locator.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_locator.java.i
index 3349789..a085c8d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_locator.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_locator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_result.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_result.java.i
index 081f290..1a2b67b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_result.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_result.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_source.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_source.java.i
index 4d7938a..a2bfc58 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_source.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/_d_o_m_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/package.html.i
index c8732bf..0095369 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/dom/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/overview.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/overview.html.i
index 30b87b9..9fb6306 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/overview.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/overview.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/package.html.i
index 64eac15..909ee3d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_result.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_result.java.i
index 9091a94..0fe2a43 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_result.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_result.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_source.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_source.java.i
index 8361a86..4ea2d14 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_source.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_transformer_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_transformer_factory.java.i
index dd8d9a1..83d7a74 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_transformer_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_s_a_x_transformer_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_templates_handler.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_templates_handler.java.i
index 5759e5a..a9408c3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_templates_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_templates_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_transformer_handler.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_transformer_handler.java.i
index 282bf98..ffc8fda 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_transformer_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/_transformer_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/package.html.i
index ba81c24..819f635 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/sax/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_result.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_result.java.i
index 1d80811..bf16ec6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_result.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_result.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_source.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_source.java.i
index c7bdb2c..3c487ce 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_source.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/_st_a_x_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/package.html.i
index faa410d..2e70433 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stax/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_result.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_result.java.i
index ad73f16..137c14e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_result.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_result.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_source.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_source.java.i
index d71559e..79d6081 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_source.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/_stream_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/package.html.i
index eca696b..e1d230c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/transform/stream/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema.java.i
index 26844b0..810f068 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory.java.i
index 840df17..9c4d1b4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_finder.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_finder.java.i
index 5d7825d..3fbe63e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_finder.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_finder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_loader.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_loader.java.i
index 7f489f4..61db342 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_loader.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_schema_factory_loader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_security_support.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_security_support.java.i
index af65b52..1380814 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_security_support.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_security_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_type_info_provider.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_type_info_provider.java.i
index 9e0d8c3..1c89cce 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_type_info_provider.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_type_info_provider.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator.java.i
index b58e87a..a709d95 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator_handler.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator_handler.java.i
index e8d38e0..b73cc11 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/_validator_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/package.html.i
index 6f36ddf..76b9ca5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/validation/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_security_support.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_security_support.java.i
index ab6e2f5..84c0552 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_security_support.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_security_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path.java.i
index d2d87e0..f2850f2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_constants.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_constants.java.i
index 6752fa6..f653409 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_constants.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_constants.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_exception.java.i
index 5e5a147..a954b7e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression.java.i
index 8d87662..bb6cf0c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression_exception.java.i
index 764b0f6..2fb8972 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_expression_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory.java.i
index de7fc16..04e5662 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_configuration_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_configuration_exception.java.i
index a73bd76..cfe9a14 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_configuration_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_configuration_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_finder.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_finder.java.i
index 6ce2fec..c9106a5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_finder.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_factory_finder.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function.java.i
index 1a2ba56..2593409 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_exception.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_exception.java.i
index 5f45f49..08cbb6e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_resolver.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_resolver.java.i
index c991bb2..a828200 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_resolver.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_function_resolver.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_variable_resolver.java.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_variable_resolver.java.i
index 70376fd..b8980ca 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_variable_resolver.java.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/_x_path_variable_resolver.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/package.html.i b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/package.html.i
index af5eb6d..3b86234 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/package.html.i and b/jaxp/.hg/store/data/src/share/classes/javax/xml/xpath/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_attr.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_attr.java.i
index 90e9fbe..9f80f6d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_attr.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_attr.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_c_d_a_t_a_section.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_c_d_a_t_a_section.java.i
index 373d653..d6f41a9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_c_d_a_t_a_section.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_c_d_a_t_a_section.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_character_data.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_character_data.java.i
index 642eed5..ba43749 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_character_data.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_character_data.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_comment.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_comment.java.i
index e01fac2..cba68a1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_comment.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_comment.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_configuration.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_configuration.java.i
index 1299220..a295594 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_configuration.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_configuration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error.java.i
index 0e995a5..6a1dbd5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error_handler.java.i
index d36e728..2d8d327 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_error_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_exception.java.i
index fecba0a..815bffa 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation.java.i
index 970d579..7a64ed0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_list.java.i
index ff2e8f7..b304576 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_source.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_source.java.i
index 129d775..5ec7e04 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_source.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_implementation_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_locator.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_locator.java.i
index 6b78aa4..c5bd724 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_locator.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_locator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_string_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_string_list.java.i
index 5c975e3..9c7d12e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_string_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_d_o_m_string_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document.java.i
index 0e5e813..14c6277 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_fragment.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_fragment.java.i
index 76897cc..86cc037 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_fragment.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_fragment.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_type.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_type.java.i
index f1fa0b8..2639b69 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_type.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_document_type.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_element.java.i
index ba8829f..8f6eb0f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity.java.i
index c3f324b..d828f8c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity_reference.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity_reference.java.i
index 4a278d8..86798b5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity_reference.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_entity_reference.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_name_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_name_list.java.i
index 5a837d7..692131d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_name_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_name_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_named_node_map.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_named_node_map.java.i
index 6e35b41..89051d0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_named_node_map.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_named_node_map.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node.java.i
index 58b42f9..486e8a5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node_list.java.i
index 34179ed..40af807 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_node_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_notation.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_notation.java.i
index 9039c31..81ee134 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_notation.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_notation.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_processing_instruction.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_processing_instruction.java.i
index 32021b7..baea18b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_processing_instruction.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_processing_instruction.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_text.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_text.java.i
index 5e22fab..99de2b5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_text.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_text.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_type_info.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_type_info.java.i
index 52e4248..b845b6e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_type_info.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_type_info.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_user_data_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_user_data_handler.java.i
index c24647b..98e1848 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_user_data_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/_user_data_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/bootstrap/_d_o_m_implementation_registry.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/bootstrap/_d_o_m_implementation_registry.java.i
index fbf88d1..a1e1a61 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/bootstrap/_d_o_m_implementation_registry.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/bootstrap/_d_o_m_implementation_registry.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s2_properties.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s2_properties.java.i
index 92761f6..1adaf5c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s2_properties.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s2_properties.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_charset_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_charset_rule.java.i
index 4404cb9..73fc00f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_charset_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_charset_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_font_face_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_font_face_rule.java.i
index 379d8fa..e837f55 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_font_face_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_font_face_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_import_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_import_rule.java.i
index d170e3d..f8da04f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_import_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_import_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_media_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_media_rule.java.i
index bf1b8e2..54ca726 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_media_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_media_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_page_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_page_rule.java.i
index b08046a..eb720ca 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_page_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_page_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_primitive_value.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_primitive_value.java.i
index 4ea3362..06c6df6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_primitive_value.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_primitive_value.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule.java.i
index 2df5e37..c9c8a4b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule_list.java.i
index 8ca3d59..066f83b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_rule_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_declaration.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_declaration.java.i
index 89cc1cf..57064e0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_declaration.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_declaration.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_rule.java.i
index 9a3bf01..03fe2a2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_sheet.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_sheet.java.i
index 3524d34..d5b0b84 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_sheet.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_style_sheet.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_unknown_rule.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_unknown_rule.java.i
index 8fce0e0..1670ab2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_unknown_rule.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_unknown_rule.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value.java.i
index 582bcd9..b1c377d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value_list.java.i
index 1d6164d..90f706b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_c_s_s_value_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_counter.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_counter.java.i
index 3114666..4858ddc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_counter.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_counter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_d_o_m_implementation_c_s_s.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_d_o_m_implementation_c_s_s.java.i
index 4cb4980..60b2d3b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_d_o_m_implementation_c_s_s.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_d_o_m_implementation_c_s_s.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_document_c_s_s.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_document_c_s_s.java.i
index e48b9a5..e087abb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_document_c_s_s.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_document_c_s_s.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_element_c_s_s_inline_style.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_element_c_s_s_inline_style.java.i
index 0ecdd71..72cbdca 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_element_c_s_s_inline_style.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_element_c_s_s_inline_style.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_r_g_b_color.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_r_g_b_color.java.i
index 4b4e310..342ae4f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_r_g_b_color.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_r_g_b_color.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_rect.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_rect.java.i
index 162918f..0d24da0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_rect.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_rect.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_view_c_s_s.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_view_c_s_s.java.i
index 31cbd95..d8eee65 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_view_c_s_s.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/css/_view_c_s_s.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_document_event.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_document_event.java.i
index 6f2611f..1c0890b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_document_event.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_document_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event.java.i
index c85bd33..395da79 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_exception.java.i
index dae95c0..a14e140 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_listener.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_listener.java.i
index bceee8c..1562c21 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_listener.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_listener.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_target.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_target.java.i
index 84f6dcb..3d9a889 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_target.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_event_target.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mouse_event.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mouse_event.java.i
index b1c97f9..1bb7de7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mouse_event.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mouse_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mutation_event.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mutation_event.java.i
index f57369d..10ef5a0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mutation_event.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_mutation_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_u_i_event.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_u_i_event.java.i
index 7b7eec0..c1dc2a3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_u_i_event.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/events/_u_i_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_anchor_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_anchor_element.java.i
index b67e5bb..b34cab4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_anchor_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_anchor_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_applet_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_applet_element.java.i
index 700a99d..9b75d74 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_applet_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_applet_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_area_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_area_element.java.i
index 3777167..3297974 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_area_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_area_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_b_r_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_b_r_element.java.i
index 2be762d..cf5d4c5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_b_r_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_b_r_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_element.java.i
index 496ff33..9798dd2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_font_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_font_element.java.i
index 478ff0e..f06de43 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_font_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_base_font_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_body_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_body_element.java.i
index f11d45d..cac2ba0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_body_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_body_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_button_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_button_element.java.i
index 4cbc6ab..850651e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_button_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_button_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_collection.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_collection.java.i
index 1c19922..5a4efcb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_collection.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_collection.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_list_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_list_element.java.i
index a8cde3d..eb31977 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_list_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_list_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_o_m_implementation.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_o_m_implementation.java.i
index 835f74a..3082c5e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_o_m_implementation.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_d_o_m_implementation.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_directory_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_directory_element.java.i
index 17629f0..9139f81 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_directory_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_directory_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_div_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_div_element.java.i
index 1ec4287..176401f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_div_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_div_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_document.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_document.java.i
index 042a73e..500d772 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_document.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_document.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_element.java.i
index c155ec1..eb84ee4 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_field_set_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_field_set_element.java.i
index 162b6c1..29fbaee 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_field_set_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_field_set_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_font_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_font_element.java.i
index b3429a9..8d597cb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_font_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_font_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_form_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_form_element.java.i
index 93bdf0b..ee09adb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_form_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_form_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_element.java.i
index e3a483d..82e1cda 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_set_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_set_element.java.i
index 74b63d1..c79105d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_set_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_frame_set_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_h_r_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_h_r_element.java.i
index 5c0a4af..de72cd6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_h_r_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_h_r_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_head_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_head_element.java.i
index 2b7675a..165b9db 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_head_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_head_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_heading_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_heading_element.java.i
index f62e7b3..a09e8a6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_heading_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_heading_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_html_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_html_element.java.i
index 1bc2c94..79a26c5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_html_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_html_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_i_frame_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_i_frame_element.java.i
index 8716650..e2b9452 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_i_frame_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_i_frame_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_image_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_image_element.java.i
index 4529d15..3b05da7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_image_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_image_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_input_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_input_element.java.i
index e821aef..b1c3040 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_input_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_input_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_is_index_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_is_index_element.java.i
index b3d3c03..e340ce3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_is_index_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_is_index_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_l_i_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_l_i_element.java.i
index 7c65786..3bf4e91 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_l_i_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_l_i_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_label_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_label_element.java.i
index 7fa0118..babdbd2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_label_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_label_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_legend_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_legend_element.java.i
index 41eedde..007ef75 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_legend_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_legend_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_link_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_link_element.java.i
index a37c7b8..28217c7 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_link_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_link_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_map_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_map_element.java.i
index 5c7542c..16e949d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_map_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_map_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_menu_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_menu_element.java.i
index f9b786b..f4393eb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_menu_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_menu_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_meta_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_meta_element.java.i
index 765b89b..f5f439c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_meta_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_meta_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_mod_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_mod_element.java.i
index f252a70..fa3133c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_mod_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_mod_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_o_list_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_o_list_element.java.i
index fc7f81d..f0b8ef9 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_o_list_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_o_list_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_object_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_object_element.java.i
index 9370195..d20f17d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_object_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_object_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_opt_group_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_opt_group_element.java.i
index 0f9cb3c..77290c0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_opt_group_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_opt_group_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_option_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_option_element.java.i
index 8a95ed2..a10aee8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_option_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_option_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_paragraph_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_paragraph_element.java.i
index 2131569..4796a06 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_paragraph_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_paragraph_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_param_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_param_element.java.i
index 7c23697..0070fa0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_param_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_param_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_pre_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_pre_element.java.i
index c0c3224..44a7edb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_pre_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_pre_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_quote_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_quote_element.java.i
index 822413a..abb6b50 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_quote_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_quote_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_script_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_script_element.java.i
index e36cccc..be87ae0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_script_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_script_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_select_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_select_element.java.i
index 83b4aea..07e8daf 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_select_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_select_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_style_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_style_element.java.i
index 8aceac0..88c9eb6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_style_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_style_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_caption_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_caption_element.java.i
index b136be2..a767e1d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_caption_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_caption_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_cell_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_cell_element.java.i
index eede3f2..905c794 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_cell_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_cell_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_col_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_col_element.java.i
index 64553d8..9e70b53 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_col_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_col_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_element.java.i
index 0af665d..1a0dc16 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_row_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_row_element.java.i
index b747cde..324775e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_row_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_row_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_section_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_section_element.java.i
index 33ec968..c64e691 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_section_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_table_section_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_text_area_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_text_area_element.java.i
index 7bd2528..2e903a5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_text_area_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_text_area_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_title_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_title_element.java.i
index b19ded8..82bbbfb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_title_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_title_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_u_list_element.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_u_list_element.java.i
index 5ce955a..f577e58 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_u_list_element.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/html/_h_t_m_l_u_list_element.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_d_o_m_implementation_l_s.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_d_o_m_implementation_l_s.java.i
index c8dd7ca..9486627 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_d_o_m_implementation_l_s.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_d_o_m_implementation_l_s.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_exception.java.i
index 2a60889..b22ca6e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_input.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_input.java.i
index dad5ce1..6054b2a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_input.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_input.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_load_event.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_load_event.java.i
index 97aef6c..7d96adb 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_load_event.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_load_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_output.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_output.java.i
index 43020e8..075d9ea 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_output.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_output.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser.java.i
index 8cf0e4d..fce15f6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser_filter.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser_filter.java.i
index 5962fb4..2569f1b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser_filter.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_parser_filter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_progress_event.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_progress_event.java.i
index 4e0455f..c7dce2d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_progress_event.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_progress_event.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_resource_resolver.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_resource_resolver.java.i
index 3607cb2..c4cdf41 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_resource_resolver.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_resource_resolver.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer.java.i
index fa31806..bdfa32d 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer_filter.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer_filter.java.i
index b2a04b6..434da2e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer_filter.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ls/_l_s_serializer_filter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_document_range.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_document_range.java.i
index d3af7f9..ebff723 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_document_range.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_document_range.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range.java.i
index 9be2506..d7c4623 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range_exception.java.i
index 8c427d0..bccb73e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/ranges/_range_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_document_style.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_document_style.java.i
index 50ef9f4..b24515a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_document_style.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_document_style.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_link_style.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_link_style.java.i
index 1f3a444..e02c16f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_link_style.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_link_style.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_media_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_media_list.java.i
index b7290a7..b0030fd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_media_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_media_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet.java.i
index 85a089c..5ed4e39 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet_list.java.i
index 04a29cd..8c95faf 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/stylesheets/_style_sheet_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_document_traversal.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_document_traversal.java.i
index 2eabd0a..65daec6 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_document_traversal.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_document_traversal.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_filter.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_filter.java.i
index 701391b..0d6a0af 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_filter.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_filter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_iterator.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_iterator.java.i
index 7ce4881..b33571c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_iterator.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_node_iterator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_tree_walker.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_tree_walker.java.i
index 1c0e115..6b695d3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_tree_walker.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/traversal/_tree_walker.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_abstract_view.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_abstract_view.java.i
index 3feba8d..d7ee8a8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_abstract_view.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_abstract_view.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_document_view.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_document_view.java.i
index a73743b..0d01936 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_document_view.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/views/_document_view.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_evaluator.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_evaluator.java.i
index bcd0eb5..65455a8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_evaluator.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_evaluator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_exception.java.i
index 876237a..0fcf5c3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_expression.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_expression.java.i
index 7fbdec9..fbf50a3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_expression.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_expression.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_n_s_resolver.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_n_s_resolver.java.i
index de4ba2f..0180428 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_n_s_resolver.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_n_s_resolver.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_namespace.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_namespace.java.i
index 917ba2c..4a575d0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_namespace.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_namespace.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_result.java.i b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_result.java.i
index 20d84a5..79f07b1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_result.java.i and b/jaxp/.hg/store/data/src/share/classes/org/w3c/dom/xpath/_x_path_result.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attribute_list.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attribute_list.java.i
index c2d7924..d6df8b1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attribute_list.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attribute_list.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attributes.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attributes.java.i
index 0bd0b07..a0f4f1c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attributes.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_attributes.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_content_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_content_handler.java.i
index aa4afda..39ca38f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_content_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_content_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_d_t_d_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_d_t_d_handler.java.i
index 8cf7c6d..9034379 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_d_t_d_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_d_t_d_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_document_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_document_handler.java.i
index 9bea14f..43915ee 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_document_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_document_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_entity_resolver.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_entity_resolver.java.i
index 1080879..937c7f0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_entity_resolver.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_entity_resolver.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_error_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_error_handler.java.i
index 0c64b57..b9c0966 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_error_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_error_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_handler_base.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_handler_base.java.i
index 278596e..176e686 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_handler_base.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_handler_base.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_input_source.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_input_source.java.i
index 3e59a64..70dbdbc 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_input_source.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_input_source.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_locator.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_locator.java.i
index 4d437ee..d3a3d4e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_locator.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_locator.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_parser.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_parser.java.i
index 4b8c56d..4d8646c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_parser.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_parser.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_exception.java.i
index e99bcde..66afe0f 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_recognized_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_recognized_exception.java.i
index 803dffb..bed1715 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_recognized_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_recognized_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_supported_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_supported_exception.java.i
index 7ad2452..e3e29b1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_supported_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_not_supported_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_parse_exception.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_parse_exception.java.i
index a805225..a0f5862 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_parse_exception.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_s_a_x_parse_exception.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_filter.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_filter.java.i
index 98f7928..5d80ded 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_filter.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_filter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_reader.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_reader.java.i
index f5d5469..ab955f2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_reader.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/_x_m_l_reader.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2.java.i
index bc57148..33367a0 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2_impl.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2_impl.java.i
index 7350ce5..da417f1 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_attributes2_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_decl_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_decl_handler.java.i
index 637f8c7..a2c8fae 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_decl_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_decl_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_default_handler2.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_default_handler2.java.i
index 20f286c..4ae4b09 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_default_handler2.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_default_handler2.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_entity_resolver2.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_entity_resolver2.java.i
index 05ecfb4..29a42f3 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_entity_resolver2.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_entity_resolver2.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_lexical_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_lexical_handler.java.i
index e7b8adc..decb7ae 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_lexical_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_lexical_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2.java.i
index a1a98d7..fd90929 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2_impl.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2_impl.java.i
index bccfabb..96fe0fd 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/_locator2_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/package.html.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/package.html.i
index 29e8872..34e3f64 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/package.html.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/ext/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attribute_list_impl.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attribute_list_impl.java.i
index 109b2cc..5b9a9ac 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attribute_list_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attribute_list_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attributes_impl.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attributes_impl.java.i
index b9ca8a2..49aed87 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attributes_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_attributes_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_default_handler.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_default_handler.java.i
index 2895be5..7143c06 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_default_handler.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_default_handler.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_locator_impl.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_locator_impl.java.i
index 4f84a6f..dda3ab2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_locator_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_locator_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_namespace_support.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_namespace_support.java.i
index 7c391d1..6984ea5 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_namespace_support.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_namespace_support.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_new_instance.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_new_instance.java.i
index abc15b8..18c3318 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_new_instance.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_new_instance.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_adapter.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_adapter.java.i
index eefacfc..fe15612 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_adapter.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_adapter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_factory.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_factory.java.i
index ee51503..b2639c8 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_parser_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_filter_impl.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_filter_impl.java.i
index 863a7d3..f3df37c 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_filter_impl.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_filter_impl.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_adapter.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_adapter.java.i
index c5cb15b..cb8265b 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_adapter.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_adapter.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_factory.java.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_factory.java.i
index eaf5ed0..a6c9b6e 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_factory.java.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/_x_m_l_reader_factory.java.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/package.html.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/package.html.i
index caa99b0..9b5a99a 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/package.html.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/helpers/package.html.i differ
diff --git a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/package.html.i b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/package.html.i
index 034defd..e0d53c2 100644
Binary files a/jaxp/.hg/store/data/src/share/classes/org/xml/sax/package.html.i and b/jaxp/.hg/store/data/src/share/classes/org/xml/sax/package.html.i differ
diff --git a/jaxp/.hg/store/data/~2ehgtags.i b/jaxp/.hg/store/data/~2ehgtags.i
index b561d74..db87bd9 100644
Binary files a/jaxp/.hg/store/data/~2ehgtags.i and b/jaxp/.hg/store/data/~2ehgtags.i differ
diff --git a/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/xsdabstractidce4298eb8016be78c9fbba7553e574ec016cd5aeb.i b/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/xsdabstractidce4298eb8016be78c9fbba7553e574ec016cd5aeb.i
index a7da133..556b82f 100644
Binary files a/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/xsdabstractidce4298eb8016be78c9fbba7553e574ec016cd5aeb.i and b/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/xsdabstractidce4298eb8016be78c9fbba7553e574ec016cd5aeb.i differ
diff --git a/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validati/xmlschem0d646826aaa92ee79ebcb4a150c4e8484b85e00d.i b/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validati/xmlschem0d646826aaa92ee79ebcb4a150c4e8484b85e00d.i
index d62ba43..ba4bbfd 100644
Binary files a/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validati/xmlschem0d646826aaa92ee79ebcb4a150c4e8484b85e00d.i and b/jaxp/.hg/store/dh/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validati/xmlschem0d646826aaa92ee79ebcb4a150c4e8484b85e00d.i differ
diff --git a/jaxp/.hg/store/fncache b/jaxp/.hg/store/fncache
index 47d5f96..5a88552 100644
--- a/jaxp/.hg/store/fncache
+++ b/jaxp/.hg/store/fncache
@@ -7,21 +7,23 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/util/HTTPInputSource.j
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java.i
data/src/share/classes/org/w3c/dom/html/HTMLBRElement.java.i
-data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/BasicType.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java.i
data/src/share/classes/org/w3c/dom/html/HTMLMenuElement.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/BCELifier.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/L2D.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncBoolean.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java.i
data/nbproject/findbugs.settings.i
data/src/share/classes/org/w3c/dom/html/HTMLIFrameElement.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/Function.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_es.java.i
@@ -37,30 +39,29 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralE
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionHandle.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java.i
+data/src/share/classes/org/w3c/dom/xpath/XPathExpression.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/AttrImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java.i
data/src/share/classes/com/sun/xml/internal/stream/writers/XMLEventWriterImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/ConstantHTML.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/SAXInputSource.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java.i
data/src/share/classes/javax/xml/stream/XMLInputFactory.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMException.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/EncodingInfo.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java.i
data/src/share/classes/javax/xml/xpath/XPathFunctionResolver.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java.i
data/src/share/classes/org/xml/sax/ext/package.html.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java.i
@@ -69,8 +70,8 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IASTORE.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/RTFIterator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundle.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_en.java.i
@@ -79,16 +80,18 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SourceLo
data/src/share/classes/javax/xml/stream/events/EntityReference.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Field.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java.i
data/src/share/classes/javax/xml/datatype/SecuritySupport.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/SecuritySupport12.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java.i
data/src/share/classes/org/w3c/dom/html/HTMLTableRowElement.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/PUTSTATIC.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java.i
data/src/share/classes/javax/xml/stream/events/EndElement.java.i
@@ -100,7 +103,9 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.j
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java.i
data/src/share/classes/org/w3c/dom/bootstrap/DOMImplementationRegistry.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/XPathException.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/StAXInputSource.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java.i
@@ -111,13 +116,16 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Err
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSum.java.i
data/src/share/classes/com/sun/xml/internal/stream/writers/XMLOutputSource.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/DOMHelper.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java.i
data/src/share/classes/org/xml/sax/AttributeList.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java.i
data/src/share/classes/org/xml/sax/ErrorHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties.i
data/src/share/classes/org/w3c/dom/stylesheets/LinkStyle.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO.java.i
data/src/share/classes/org/w3c/dom/css/DocumentCSS.java.i
data/src/share/classes/org/w3c/dom/html/HTMLInputElement.java.i
@@ -137,6 +145,7 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DRETURN.java.i
data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties.i
data/src/share/classes/org/w3c/dom/DOMErrorHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java.i
data/src/share/classes/com/sun/xml/internal/stream/events/CommentEvent.java.i
@@ -147,17 +156,17 @@ data/src/share/classes/org/w3c/dom/html/HTMLLegendElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IfInstruction.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/FunctionPattern.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java.i
data/src/share/classes/javax/xml/stream/events/Characters.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java.i
data/src/share/classes/com/sun/org/apache/xalan/META-INF/services/javax.xml.xpath.XPathFactory.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IFGE.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/ChildNode.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java.i
@@ -170,21 +179,21 @@ data/src/share/classes/javax/xml/datatype/Duration.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/Base64.java.i
data/build-drop-template.xml.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/package.html.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java.i
+data/src/share/classes/javax/xml/transform/dom/DOMLocator.java.i
data/src/share/classes/org/w3c/dom/html/HTMLDirectoryElement.java.i
data/src/share/classes/javax/xml/parsers/SAXParser.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Template.java.i
-data/src/share/classes/org/w3c/dom/Notation.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/ElemDesc.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/client/XSLTProcessorApplet.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/NodeSet.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java.i
@@ -194,24 +203,23 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/dom/NodeImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LADD.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/AttributeReader.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java.i
-data/src/share/classes/org/w3c/dom/ls/LSOutput.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/GOTO_W.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java.i
+data/src/share/classes/org/xml/sax/Parser.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XNodeSet.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Plus.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java.i
-data/src/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java.i
data/src/share/classes/org/w3c/dom/TypeInfo.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/util/ClassVector.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/SecuritySupport12.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport12.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Message.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/LCount.java.i
@@ -222,25 +230,25 @@ data/src/share/classes/com/sun/org/apache/xml/internal/utils/WrappedRuntimeExcep
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/CompoundInstruction.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java.i
-data/src/share/classes/org/w3c/dom/events/MouseEvent.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/TABLESWITCH.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/RETURN.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/MONITOREXIT.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/ObjectFactory.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/SourceTreeManager.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDParser.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/BIPUSH.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/DOMOrder.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceSupport.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/StringToIntTable.java.i
@@ -249,29 +257,31 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP1.java.i
data/src/share/classes/javax/xml/stream/Location.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/ElementNSImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionList.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Signature.java.i
-data/src/share/classes/org/w3c/dom/css/CSSStyleRule.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/D2F.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLang.java.i
-data/src/share/classes/org/w3c/dom/xpath/XPathExpression.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java.i
-data/src/share/classes/org/w3c/dom/xpath/XPathException.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java.i
data/src/share/classes/org/w3c/dom/html/HTMLFieldSetElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStringLength.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/TextImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Gte.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ToTextStream.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java.i
@@ -283,13 +293,15 @@ data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java.
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ReferenceType.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Utils.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java.i
+data/src/share/classes/org/w3c/dom/events/MouseEvent.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FieldGen.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionTargeter.java.i
data/src/share/classes/javax/xml/validation/package.html.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/events/EventImpl.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/SecuritySupport12.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IADD.java.i
@@ -307,18 +319,20 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.jav
data/src/share/classes/org/w3c/dom/html/HTMLTableCaptionElement.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LCONST.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java.i
+data/src/share/classes/org/w3c/dom/css/CSSRule.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java.i
data/src/share/classes/javax/xml/stream/util/EventReaderDelegate.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/Visitor.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java.i
+data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/PropertyState.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/Resolver.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/axes/BasicTestIterator.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunction.java.i
data/src/share/classes/com/sun/xml/internal/stream/events/CharacterEvent.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java.i
@@ -327,21 +341,20 @@ data/src/share/classes/com/sun/org/apache/regexp/internal/CharacterArrayCharacte
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java.i
-data/src/share/classes/org/xml/sax/COPYING.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_de.java.i
data/src/share/classes/org/w3c/dom/html/HTMLOptionElement.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/SecuritySupport12.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java.i
data/make/build.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java.i
-data/src/share/classes/org/xml/sax/SAXNotSupportedException.java.i
+data/src/share/classes/org/w3c/dom/DOMLocator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/PUTFIELD.java.i
data/src/share/classes/com/sun/xml/internal/stream/StaxXMLInputSource.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantInteger.java.i
@@ -349,12 +362,13 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SubstitutionGr
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Visitor.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTM.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/PMGClass.java.i
data/src/share/classes/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantObject.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnInstruction.java.i
@@ -362,20 +376,23 @@ data/src/share/classes/com/sun/org/apache/regexp/internal/StringCharacterIterato
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java.i
data/src/share/classes/javax/xml/stream/util/StreamReaderDelegate.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FieldOrMethod.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport12.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java.i
+data/src/share/classes/com/sun/org/apache/regexp/internal/CharacterIterator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java.i
data/src/share/classes/org/w3c/dom/CharacterData.java.i
data/src/share/classes/org/w3c/dom/css/RGBColor.java.i
data/src/share/classes/org/xml/sax/ext/EntityResolver2.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java.i
-data/src/share/classes/org/xml/sax/ContentHandler.java.i
-data/src/share/classes/org/xml/sax/ext/Locator2.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java.i
data/src/share/classes/javax/xml/datatype/FactoryFinder.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java.i
@@ -384,22 +401,29 @@ data/src/share/classes/com/sun/org/apache/xml/internal/serializer/NamespaceMappi
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLBodyElement.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java.i
data/src/share/classes/org/w3c/dom/Comment.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties.i
data/src/share/classes/com/sun/org/apache/regexp/internal/RECompiler.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLLinkElement.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/Expression.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCount.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java.i
data/src/share/classes/javax/xml/stream/events/XMLEvent.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Constant.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java.i
@@ -412,50 +436,52 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11NonValida
data/src/share/classes/javax/xml/stream/events/StartDocument.java.i
data/src/share/classes/javax/xml/transform/stax/package.html.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport12.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Number.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncCurrent.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java.i
+data/src/share/classes/javax/xml/stream/XMLEventReader.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java.i
+data/src/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/F2I.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroup.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java.i
-data/src/share/classes/org/w3c/dom/DocumentType.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LNEG.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/NotEquals.java.i
data/src/share/classes/javax/xml/transform/sax/SAXSource.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java.i
+data/src/share/classes/javax/xml/stream/events/Namespace.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LSUB.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/D2L.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/XPath.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/SAXSourceLocator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumber.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/XPathContext.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties.i
+data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Lte.java.i
-data/src/share/classes/org/xml/sax/ext/Locator2Impl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/WalkerFactory.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/package.html.i
data/src/share/classes/org/xml/sax/helpers/NewInstance.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java.i
@@ -469,29 +495,36 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/util/TypeInfoImpl.java
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X2.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/SecuritySupport.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X2.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties.i
data/src/share/classes/org/xml/sax/DocumentHandler.java.i
data/src/share/classes/com/sun/xml/internal/stream/events/EndDocumentEvent.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties.i
+data/src/share/classes/org/w3c/dom/html/HTMLHtmlElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/ObjectPool.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/JavaClass.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IOR.java.i
data/src/share/classes/javax/xml/parsers/ParserConfigurationException.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IFNONNULL.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredNode.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/SourceTree.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncPosition.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/XPathAPI.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java.i
data/make/Makefile.i
@@ -508,9 +541,8 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java.i
data/src/share/classes/org/w3c/dom/DOMConfiguration.java.i
data/.hgtags.i
-data/src/share/classes/org/w3c/dom/events/DocumentEvent.java.i
+data/src/share/classes/org/w3c/dom/html/HTMLLinkElement.java.i
data/src/share/classes/org/xml/sax/XMLReader.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/axes/package.html.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LoadInstruction.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java.i
@@ -524,31 +556,32 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/operations/UnaryOperati
data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/UnionPattern.java.i
data/.jcheck/conf.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/WriterChain.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/CALOAD.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/DescendantIterator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java.i
data/src/share/classes/javax/xml/stream/events/EntityDeclaration.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/SecuritySupport.java.i
data/src/share/classes/org/w3c/dom/stylesheets/StyleSheetList.java.i
data/src/share/classes/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/lib/SecuritySupport.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java.i
data/src/share/classes/com/sun/java_cup/internal/runtime/Symbol.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java.i
data/src/share/classes/com/sun/xml/internal/stream/StaxErrorReporter.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionOneArg.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java.i
data/src/share/classes/org/xml/sax/Locator.java.i
data/src/share/classes/org/w3c/dom/events/UIEvent.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Method.java.i
@@ -557,11 +590,10 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LAND.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMWSFilter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport12.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java.i
-data/src/share/classes/org/w3c/dom/DocumentFragment.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/SecuritySupport12.java.i
-data/src/share/classes/javax/xml/parsers/DocumentBuilder.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassParser.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java.i
@@ -569,12 +601,12 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.ja
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSWildcard.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncContains.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/NamedAndTyped.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/SystemIDResolver.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties.i
data/patches/jaxp_src/README.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LUSHR.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/DOMUtil.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/RangeImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java.i
@@ -588,7 +620,7 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/functions/ObjectFactory
data/build.xml.i
data/src/share/classes/org/w3c/dom/views/AbstractView.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SecuritySupport12.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java.i
data/src/share/classes/org/xml/sax/DTDHandler.java.i
data/src/share/classes/javax/xml/transform/ErrorListener.java.i
@@ -598,7 +630,6 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/InnerClass.jav
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Param.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java.i
data/src/share/classes/org/w3c/dom/html/HTMLSelectElement.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java.i
data/src/share/classes/org/w3c/dom/html/HTMLDivElement.java.i
data/src/share/classes/org/w3c/dom/css/DOMImplementationCSS.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerPart.java.i
@@ -606,7 +637,7 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTem
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java.i
data/src/share/classes/javax/xml/transform/TransformerException.java.i
-data/src/share/classes/javax/xml/stream/XMLEventReader.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/ByteSequence.java.i
data/src/share/classes/org/w3c/dom/stylesheets/StyleSheet.java.i
@@ -629,11 +660,11 @@ data/src/share/classes/javax/xml/validation/SchemaFactoryFinder.java.i
data/src/share/classes/javax/xml/transform/overview.html.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/validation/EntityState.java.i
data/src/share/classes/com/sun/org/apache/regexp/internal/StreamCharacterIterator.java.i
-data/src/share/classes/org/xml/sax/helpers/XMLReaderAdapter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapType.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPathException.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java.i
@@ -645,15 +676,17 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPG.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLSerializer.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/JSR_W.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/GotoInstruction.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/CPInstruction.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/SecuritySupport.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2_X1.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHMessages.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java.i
@@ -662,11 +695,13 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeC
data/src/share/classes/com/sun/org/apache/xpath/internal/XPathVisitable.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ILOAD.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTranslate.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SerializationHandler.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ASTORE.java.i
data/src/share/classes/org/xml/sax/helpers/LocatorImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/BranchHandle.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/Encodings.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties.i
data/src/share/classes/org/w3c/dom/css/Counter.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/templates/package.html.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Debug.java.i
@@ -680,6 +715,7 @@ data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/BoolStac
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMap.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Number.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java.i
@@ -687,15 +723,18 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLStringBuffer.j
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/URI.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Equals.java.i
+data/src/share/classes/org/w3c/dom/css/CSSStyleRule.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java.i
data/src/share/classes/com/sun/xml/internal/stream/XMLEntityStorage.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMap.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/CachedXPathAPI.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/package.html.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/UnionPathIterator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/PropertyManager.java.i
@@ -710,25 +749,26 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncConcat.ja
data/src/share/classes/javax/xml/datatype/XMLGregorianCalendar.java.i
data/src/share/classes/javax/xml/stream/util/XMLEventConsumer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/Utils.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java.i
data/make/jprt.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ISTORE.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IXOR.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/CharKey.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ReturnaddressType.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/HTMLEntities.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java.i
-data/src/share/classes/org/w3c/dom/ls/LSException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/IntStack.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11Configurable.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java.i
data/src/share/classes/javax/xml/xpath/SecuritySupport.java.i
data/src/share/classes/javax/xml/xpath/package.html.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/Hashtree2Node.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/I2D.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LLOAD.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java.i
data/src/share/classes/javax/xml/stream/XMLStreamException.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/package.html.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/Constants.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java.i
data/src/share/classes/javax/xml/stream/SecuritySupport.java.i
@@ -737,7 +777,7 @@ data/src/share/classes/com/sun/org/apache/xml/internal/utils/RawCharacterHandler
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java.i
data/src/share/classes/org/w3c/dom/html/HTMLTableColElement.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringDefault.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java.i
data/src/share/classes/org/w3c/dom/html/HTMLHeadingElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSException.java.i
@@ -754,45 +794,48 @@ data/src/share/classes/org/w3c/dom/ls/LSResourceResolver.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/DOMInputSource.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/extensions/package.html.i
data/build-defs.xml.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LDC.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionComparator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/I2F.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/PopInstruction.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/JavaWrapper.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SecuritySupport.java.i
-data/src/share/classes/javax/xml/stream/events/Namespace.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/BASTORE.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/QName.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/XSFacets.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/NodeSetDTM.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLChar.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java.i
data/src/share/classes/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Neg.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/LocaleUtility.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/SecuritySupport.java.i
@@ -801,8 +844,9 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/I2B.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/package.html.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Synthetic.java.i
data/src/share/classes/org/xml/sax/SAXNotRecognizedException.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DREM.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/AttrNSImpl.java.i
@@ -831,30 +875,32 @@ data/src/share/classes/com/sun/xml/internal/stream/events/StartElementEvent.java
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java.i
data/src/share/classes/org/w3c/dom/css/CSSPageRule.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/StoreInstruction.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/EmptySerializer.java.i
data/src/share/classes/org/w3c/dom/css/CSSFontFaceRule.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/Select.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java.i
data/src/share/classes/org/w3c/dom/css/CSSRuleList.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ExceptionTable.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/CASTORE.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/MethodObserver.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/SecurityManager.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogManager.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java.i
+data/src/share/classes/javax/xml/stream/events/EndDocument.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprWalker.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java.i
+data/src/share/classes/org/w3c/dom/html/HTMLMetaElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FASTORE.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XMLLocator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java.i
-data/src/share/classes/org/xml/sax/package.html.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java.i
data/src/share/classes/javax/xml/validation/ValidatorHandler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/CharInfo.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/NodeIterator.java.i
@@ -867,7 +913,6 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLErrorHan
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Unknown.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/Version.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java.i
-data/src/share/classes/org/w3c/dom/css/CSSRule.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java.i
data/src/share/classes/org/w3c/dom/html/HTMLFrameSetElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java.i
@@ -875,22 +920,26 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/util/DatatypeMessageFo
data/src/share/classes/org/w3c/dom/xpath/XPathNSResolver.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Node.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java.i
+data/src/share/classes/javax/xml/datatype/package.html.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties.i
data/build.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLEntities.res.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/StackConsumer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/Method.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ATHROW.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/LineNumberTable.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java.i
-data/src/share/classes/javax/xml/namespace/QName.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java.i
data/src/share/classes/javax/xml/transform/URIResolver.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java.i
data/src/share/classes/org/xml/sax/helpers/XMLFilterImpl.java.i
@@ -905,24 +954,26 @@ data/src/share/classes/com/sun/org/apache/xml/internal/utils/ListingErrorHandler
data/src/share/classes/com/sun/xml/internal/stream/EventFilterSupport.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOM.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltCommon.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java.i
data/TRADEMARK.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java.i
-data/src/share/classes/org/w3c/dom/xpath/XPathNamespace.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/StepPattern.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/EncodingMap.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncString.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/SyntheticRepository.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLStyleElement.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties.i
data/src/share/classes/com/sun/xml/internal/stream/events/StartDocumentEvent.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/package.html.i
data/src/share/classes/com/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory.i
@@ -934,12 +985,16 @@ data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.j
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java.i
data/jaxp.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ToStream.java.i
data/src/share/classes/org/w3c/dom/html/HTMLScriptElement.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/XPathVisitor.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncRound.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serialize/XML11Serializer.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LRETURN.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/URI.java.i
@@ -947,12 +1002,12 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/Valida
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/XML11Char.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/LSInputList.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java.i
data/src/share/classes/javax/xml/stream/XMLStreamWriter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LSTORE.java.i
@@ -963,33 +1018,41 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IFEQ.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/MsgKey.java.i
data/nbproject/sqe.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java.i
data/src/share/classes/org/w3c/dom/html/HTMLDListElement.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/package.html.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java.i
+data/src/share/classes/javax/xml/xpath/XPathVariableResolver.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Attribute.java.i
data/src/share/classes/org/w3c/dom/html/HTMLTableElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionConstants.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLString.java.i
data/src/share/classes/javax/xml/stream/XMLResolver.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java.i
data/src/share/classes/com/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/package.html.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/AttributeIterator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/StringList.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_en.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/XMLSerializer.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DMUL.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/INSTANCEOF.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/SymbolHash.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java.i
data/nbproject/project.xml.i
data/src/share/classes/org/w3c/dom/html/HTMLBaseFontElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/BCELFactory.java.i
@@ -1008,19 +1071,20 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ElementA
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFloor.java.i
data/src/share/classes/com/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java.i
+data/src/share/classes/org/w3c/dom/Notation.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/functions/Function3Args.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/INEG.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ObjectType.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/Constants.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/util/URI.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantLong.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltMath.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/Method.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/ElementPSVI.java.i
@@ -1038,21 +1102,20 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/util/AttributeHTML.java.
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java.i
data/src/share/classes/org/w3c/dom/ranges/DocumentRange.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java.i
-data/src/share/classes/com/sun/org/apache/regexp/internal/CharacterIterator.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XMLAttributes.java.i
+data/src/share/classes/org/xml/sax/ext/Locator2.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Key.java.i
data/src/share/classes/org/w3c/dom/DOMImplementationList.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltDatetime.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTableVector.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex.i
-data/src/share/classes/org/w3c/dom/html/HTMLFormElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantValue.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java.i
data/src/share/classes/org/w3c/dom/html/HTMLElement.java.i
data/src/share/classes/org/w3c/dom/html/HTMLOptGroupElement.java.i
data/src/share/classes/javax/xml/xpath/XPathFunctionException.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/PrefixResolver.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/OpMapVector.java.i
data/src/share/classes/javax/xml/xpath/XPathFactoryFinder.java.i
@@ -1061,7 +1124,7 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerH
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Or.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ISHR.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java.i
+data/src/share/classes/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java.i
data/src/share/classes/org/w3c/dom/EntityReference.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java.i
@@ -1070,6 +1133,7 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ISUB.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties.i
data/make/tools/StripProperties/StripProperties.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantString.java.i
@@ -1080,20 +1144,21 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.ja
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/NOP.java.i
data/src/share/classes/javax/xml/transform/dom/DOMSource.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties.i
data/src/share/classes/javax/xml/stream/events/Attribute.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantDouble.java.i
data/src/share/classes/org/w3c/dom/css/CSS2Properties.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IFLT.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ISHL.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XNIException.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPL.java.i
data/src/share/classes/org/w3c/dom/views/DocumentView.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java.i
data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java.i
@@ -1103,7 +1168,7 @@ data/src/share/classes/javax/xml/stream/FactoryConfigurationError.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java.i
data/src/share/classes/com/sun/org/apache/regexp/internal/RETest.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/PSVIProvider.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xslt/Process.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java.i
@@ -1111,49 +1176,51 @@ data/src/share/classes/org/w3c/dom/html/HTMLTextAreaElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/InstructionFactory.java.i
data/src/share/classes/javax/xml/transform/sax/TemplatesHandler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/UnImplNode.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/axes/AxesWalker.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/Trie.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IRETURN.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/SecuritySupport12.java.i
data/src/share/classes/com/sun/xml/internal/stream/XMLBufferListener.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java.i
-data/src/share/classes/javax/xml/transform/dom/DOMLocator.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ExceptionThrower.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/OpCodes.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/InstructionFinder.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactory.java.i
data/src/share/classes/javax/xml/transform/stax/StAXSource.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/client/package.html.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/MethodGen.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerBase.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/RET.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/StackMapEntry.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Variable.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLMetaElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Utility.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/SALOAD.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java.i
+data/src/share/classes/com/sun/org/apache/regexp/internal/recompile.java.i
data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/NEWARRAY.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/CHECKCAST.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/FastStringBuffer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerFactory.java.i
data/src/share/classes/org/w3c/dom/css/CSSMediaRule.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMIterator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java.i
data/src/share/classes/org/w3c/dom/css/CSSStyleSheet.java.i
-data/src/share/classes/javax/xml/xpath/XPathVariableResolver.java.i
+data/src/share/classes/org/w3c/dom/events/DocumentEvent.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/package.html.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/IntVector.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Text.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java.i
data/src/share/classes/org/xml/sax/ext/DefaultHandler2.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java.i
@@ -1161,9 +1228,8 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FDIV.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Mult.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/ElementState.java.i
data/src/share/classes/org/xml/sax/helpers/package.html.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java.i
-data/src/share/classes/org/w3c/dom/ls/LSInput.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTInfo.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/output_unknown.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java.i
@@ -1176,6 +1242,7 @@ data/src/share/classes/org/w3c/dom/Document.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/RevalidationHandler.java.i
data/src/share/classes/javax/xml/validation/Validator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java.i
@@ -1184,41 +1251,43 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathEvaluatorIm
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/SourceFile.java.i
data/src/share/classes/org/w3c/dom/html/HTMLAreaElement.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java.i
+data/src/share/classes/org/w3c/dom/DocumentType.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ACONST_NULL.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/Messages.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java.i
+data/src/share/classes/javax/xml/stream/XMLStreamConstants.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java.i
-data/src/share/classes/javax/xml/stream/StreamFilter.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/NotationImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java.i
data/src/share/classes/org/w3c/dom/css/CSSCharsetRule.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/NSInfo.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/String.java.i
data/src/share/classes/javax/xml/xpath/XPathFactory.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/SAX2XNI.java.i
data/src/share/classes/com/sun/xml/internal/stream/XMLEventReaderImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/L2I.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/SymbolTable.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_de.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/LineSeparator.java.i
@@ -1232,29 +1301,32 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/xni/QName.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DCONST.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantClass.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLModElement.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/StackInstruction.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncTrue.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java.i
data/src/share/classes/com/sun/org/apache/regexp/internal/RESyntaxException.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IndexedInstruction.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java.i
data/src/share/classes/javax/xml/validation/SchemaFactory.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncStartsWith.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/MessageFormatter.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FCMPL.java.i
data/src/share/classes/javax/xml/xpath/XPathFunction.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java.i
data/src/share/classes/javax/xml/validation/SchemaFactoryLoader.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLast.java.i
@@ -1262,14 +1334,16 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XPointerParser
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java.i
data/src/share/classes/org/w3c/dom/css/ViewCSS.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMInputImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java.i
-data/src/share/classes/javax/xml/stream/FactoryFinder.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/JsrInstruction.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LOR.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java.i
-data/src/share/classes/javax/xml/datatype/package.html.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/XPathProcessorException.java.i
data/src/share/classes/javax/xml/transform/sax/SAXResult.java.i
@@ -1278,14 +1352,16 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.
data/src/share/classes/com/sun/xml/internal/stream/XMLEntityReader.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/TargetLostException.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncQname.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DUP2.java.i
-data/src/share/classes/javax/xml/transform/sax/package.html.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IINC.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/CodeException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java.i
@@ -1296,8 +1372,9 @@ data/src/share/classes/org/w3c/dom/traversal/TreeWalker.java.i
data/src/share/classes/javax/xml/stream/events/ProcessingInstruction.java.i
data/src/share/classes/javax/xml/validation/SecuritySupport.java.i
data/src/share/classes/org/w3c/dom/html/HTMLAnchorElement.java.i
-data/src/share/classes/org/xml/sax/Parser.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/ObjectStack.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/LocatorWrapper.java.i
@@ -1306,10 +1383,12 @@ data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_it.j
data/src/share/classes/org/w3c/dom/UserDataHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/SecuritySupport12.java.i
+data/src/share/classes/javax/xml/XMLConstants.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DLOAD.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java.i
data/.hgignore.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java.i
data/src/share/classes/org/xml/sax/InputSource.java.i
@@ -1317,21 +1396,23 @@ data/src/share/classes/javax/xml/stream/XMLStreamReader.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Operation.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java.i
data/src/share/classes/javax/xml/stream/events/StartElement.java.i
-data/src/share/classes/javax/xml/stream/XMLStreamConstants.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/Grammar.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/Filter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties.i
data/src/share/classes/org/w3c/dom/events/EventException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ElemDesc.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/Compiler.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLMessages.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serializer/DOMSerializer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/TreeWalker.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/TypedInstruction.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/Type.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java.i
@@ -1346,12 +1427,16 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNot.java.
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java.i
data/src/share/classes/org/w3c/dom/html/HTMLDocument.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/FeatureState.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties.i
+data/make/scripts/update_src.sh.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/AttributePSVI.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/StackProducer.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSObject.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java.i
data/src/share/classes/org/w3c/dom/ls/LSSerializerFilter.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java.i
data/src/share/classes/com/sun/org/apache/xalan/META-INF/services/javax.xml.transform.TransformerFactory.i
data/src/share/classes/org/w3c/dom/html/HTMLLabelElement.java.i
data/src/share/classes/com/sun/xml/internal/stream/util/ReadOnlyIterator.java.i
@@ -1359,16 +1444,16 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSModel.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Div.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/Lexer.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/LocalVariable.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/Keywords.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/GETSTATIC.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DCMPG.java.i
data/src/share/classes/org/w3c/dom/html/HTMLLIElement.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/DOMCache.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/MONITORENTER.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/ExpressionNode.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/XML11Char.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java.i
+data/src/share/classes/org/xml/sax/ContentHandler.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java.i
data/src/share/classes/com/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java.i
@@ -1378,14 +1463,14 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Regex
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_it.java.i
data/ASSEMBLY_EXCEPTION.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport12.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serialize/IndentPrinter.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IMPDEP2.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LALOAD.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LoadClass.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLHtmlElement.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serializer/output_xml.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/helpers/PublicId.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java.i
data/src/share/classes/javax/xml/parsers/DocumentBuilderFactory.java.i
@@ -1398,22 +1483,23 @@ data/src/share/classes/com/sun/xml/internal/stream/events/DummyEvent.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java.i
data/src/share/classes/javax/xml/datatype/DatatypeFactory.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java.i
+data/src/share/classes/org/w3c/dom/html/HTMLDOMImplementation.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties.i
data/src/share/classes/org/w3c/dom/traversal/NodeIterator.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/ContextNodeList.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SecuritySupport.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/functions/Function2Args.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java.i
data/src/share/classes/org/xml/sax/helpers/DefaultHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeUse.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSLoader.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java.i
data/src/share/classes/javax/xml/xpath/XPath.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XNull.java.i
@@ -1422,10 +1508,11 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIteratorFor
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/StringComparable.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java.i
data/src/share/classes/org/w3c/dom/xpath/XPathEvaluator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/utils/WrongParserException.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java.i
+data/src/share/classes/org/w3c/dom/ls/LSException.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/CachingParserPool.java.i
@@ -1435,10 +1522,10 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/dom/NodeListCache.java
data/src/share/classes/org/w3c/dom/css/ElementCSSInlineStyle.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathDumper.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XObject.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/POP2.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncNamespace.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/DOMBuilder.java.i
@@ -1447,11 +1534,12 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/F2L.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/XPathFactory.java.i
data/src/share/classes/javax/xml/transform/sax/SAXTransformerFactory.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/package.html.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/AttributeMap.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java.i
-data/src/share/classes/javax/xml/stream/events/EndDocument.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java.i
+data/src/share/classes/org/w3c/dom/ls/LSOutput.java.i
+data/src/share/classes/org/xml/sax/package.html.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SecuritySupport12.java.i
data/src/share/classes/org/w3c/dom/DOMImplementationSource.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FieldInstruction.java.i
@@ -1459,6 +1547,7 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/util/ClassStack.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java.i
data/src/share/classes/org/w3c/dom/html/HTMLButtonElement.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java.i
data/src/share/classes/com/sun/org/apache/regexp/internal/ReaderCharacterIterator.java.i
@@ -1466,18 +1555,21 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/util/IntStack.java.i
data/src/share/classes/javax/xml/parsers/FactoryConfigurationError.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/AASTORE.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/package.html.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Bool.java.i
+data/src/share/classes/org/w3c/dom/html/HTMLStyleElement.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/extensions/ExpressionContext.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogEntry.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/AttList.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java.i
data/src/share/classes/com/sun/xml/internal/stream/events/LocationImpl.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LSHL.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLSymbols.java.i
data/src/share/classes/javax/xml/stream/XMLReporter.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/XPathParser.java.i
@@ -1485,7 +1577,7 @@ data/src/share/classes/com/sun/org/apache/xml/internal/serialize/SecuritySupport
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayInstruction.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/DOM2Helper.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/ElemContext.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/utils/StringToStringTable.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/If.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/IteratorPool.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java.i
@@ -1497,39 +1589,41 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaExcep
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/TransletException.java.i
data/src/share/classes/org/xml/sax/helpers/ParserAdapter.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DUP.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/ExpressionOwner.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/LocatorProxy.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java.i
-data/src/share/classes/com/sun/org/apache/regexp/internal/recompile.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/Status.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XBoolean.java.i
data/src/share/classes/org/xml/sax/Attributes.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IAND.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ClassGenException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/Encodings.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java.i
+data/src/share/classes/org/w3c/dom/ls/LSInput.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/TransformStateSetter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/ObjectVector.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ANEWARRAY.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java.i
data/src/share/classes/org/xml/sax/helpers/NamespaceSupport.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/NodeSequence.java.i
data/src/share/classes/org/xml/sax/ext/DeclHandler.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstring.java.i
+data/src/share/classes/javax/xml/transform/sax/package.html.i
data/src/share/classes/javax/xml/stream/events/NotationDeclaration.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/Instruction.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java.i
@@ -1540,7 +1634,7 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XMLParser.java
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/Serializer.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/output_html.properties.i
data/src/share/classes/org/w3c/dom/css/CSSValueList.java.i
@@ -1551,31 +1645,35 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DeferredEntityImpl
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java.i
data/src/share/classes/javax/xml/transform/stream/StreamSource.java.i
data/src/share/classes/javax/xml/xpath/XPathExpressionException.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/SIPUSH.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMDOMException.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java.i
data/src/share/classes/org/w3c/dom/stylesheets/MediaList.java.i
data/src/share/classes/org/xml/sax/ext/LexicalHandler.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncGenerateId.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java.i
-data/src/share/classes/org/w3c/dom/ls/DOMImplementationLS.java.i
+data/src/share/classes/javax/xml/xpath/XPathConstants.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/util/ClassPath.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XNumber.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/SubContextList.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMManager.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/BranchInstruction.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties.i
data/src/share/classes/com/sun/xml/internal/stream/events/AttributeImpl.java.i
data/src/share/classes/javax/xml/namespace/NamespaceContext.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSAnnotation.java.i
data/src/share/classes/org/w3c/dom/NodeList.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LREM.java.i
-data/src/share/classes/javax/xml/xpath/XPathConstants.java.i
+data/src/share/classes/org/w3c/dom/ls/DOMImplementationLS.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java.i
+data/README.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DUP_X1.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties.i
data/src/share/classes/org/w3c/dom/html/HTMLIsIndexElement.java.i
data/src/share/classes/org/w3c/dom/ranges/Range.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/FuncLoader.java.i
@@ -1588,11 +1686,14 @@ data/src/share/classes/com/sun/org/apache/xml/internal/dtm/DTMFilter.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java.i
data/src/share/classes/com/sun/org/apache/regexp/internal/REUtil.java.i
data/src/share/classes/org/w3c/dom/NameList.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_es.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java.i
data/src/share/classes/javax/xml/datatype/DatatypeConstants.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java.i
data/src/share/classes/javax/xml/transform/Result.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java.i
@@ -1600,7 +1701,7 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/dom/CommentImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java.i
data/src/share/classes/org/xml/sax/SAXException.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java.i
+data/src/share/classes/com/sun/java_cup/internal/runtime/Scanner.java.i
data/src/share/classes/org/w3c/dom/css/Rect.java.i
data/src/share/classes/javax/xml/stream/events/Comment.java.i
data/src/share/classes/javax/xml/transform/Source.java.i
@@ -1611,6 +1712,7 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSParticle.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IFNE.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LCMP.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java.i
@@ -1624,10 +1726,11 @@ data/src/share/classes/org/w3c/dom/html/HTMLTableCellElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java.i
data/src/share/classes/org/w3c/dom/stylesheets/DocumentStyle.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/POP.java.i
-data/make/tools/StripProperties/StripPropertiesTask.java.i
+data/src/share/classes/org/xml/sax/COPYING.i
data/THIRD_PARTY_README.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/HTMLdtd.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java.i
+data/src/share/classes/javax/xml/parsers/DocumentBuilder.java.i
data/src/share/classes/org/w3c/dom/package.html.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java.i
data/src/share/classes/org/w3c/dom/html/HTMLImageElement.java.i
@@ -1646,20 +1749,24 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/Il
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DALOAD.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/Catalog.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java.i
-data/src/share/classes/org/w3c/dom/html/HTMLTitleElement.java.i
+data/src/share/classes/org/w3c/dom/events/EventListener.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/XInt.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/AttributesProxy.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ArrayType.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/package.html.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java.i
@@ -1674,20 +1781,22 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Absolute
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/sym.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/SecuritySupport12.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/util/ClassVector.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java.i
data/src/share/classes/org/w3c/dom/css/CSSPrimitiveValue.java.i
+data/src/share/classes/javax/xml/stream/FactoryFinder.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncLocalPart.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties.i
data/src/share/classes/com/sun/xml/internal/stream/events/DTDEvent.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncId.java.i
+data/src/share/classes/org/w3c/dom/xpath/XPathException.java.i
data/src/share/classes/org/w3c/dom/events/EventTarget.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FSTORE.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ClassObserver.java.i
data/src/share/classes/org/w3c/dom/css/CSSImportRule.java.i
@@ -1703,29 +1812,31 @@ data/src/share/classes/com/sun/org/apache/xml/internal/resolver/CatalogException
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamedMap.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLStringFactory.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java.i
-data/src/share/classes/org/w3c/dom/DOMLocator.java.i
-data/src/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java.i
+data/src/share/classes/org/xml/sax/SAXNotSupportedException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IREM.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/util/NSItemListImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/SecuritySupport12.java.i
data/src/share/classes/javax/xml/xpath/XPathException.java.i
data/src/share/classes/javax/xml/stream/XMLEventFactory.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties.i
+data/src/share/classes/org/w3c/dom/html/HTMLBodyElement.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/OneStepIterator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Lt.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/lib/NodeInfo.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ClassFormatException.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/FilterExprIterator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/Repository.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/Version.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java.i
+data/src/share/classes/org/xml/sax/ext/Locator2Impl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/StringVector.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSConstants.java.i
@@ -1736,7 +1847,7 @@ data/src/share/classes/com/sun/org/apache/xml/internal/serializer/SerializerTrac
data/src/share/classes/com/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/package.html.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/ObjectFactory.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java.i
+data/src/share/classes/org/w3c/dom/html/HTMLFormElement.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java.i
data/src/share/classes/org/w3c/dom/html/HTMLQuoteElement.java.i
data/src/share/classes/javax/xml/transform/stream/StreamResult.java.i
@@ -1744,18 +1855,20 @@ data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/StepPatt
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FLOAD.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java.i
data/src/share/classes/org/w3c/dom/html/HTMLFontElement.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/SecuritySupport.java.i
-data/src/share/classes/com/sun/org/apache/xpath/internal/axes/ChildIterator.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DSUB.java.i
+data/src/share/classes/org/w3c/dom/DocumentFragment.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/axes/package.html.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/AccessFlags.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java.i
data/src/share/classes/org/w3c/dom/html/HTMLBaseElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/WriterToASCI.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java.i
@@ -1776,21 +1889,25 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/FunctionTable.
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/UnionChildIterator.java.i
data/src/share/classes/javax/xml/transform/TransformerFactory.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java.i
data/src/share/classes/javax/xml/stream/events/DTD.java.i
data/src/share/classes/org/w3c/dom/ranges/RangeException.java.i
data/src/share/classes/org/xml/sax/ext/Attributes2Impl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/ConstantCP.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties.i
+data/src/share/classes/javax/xml/namespace/QName.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/ShortList.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java.i
@@ -1812,19 +1929,21 @@ data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LocalVariableGen
data/src/share/classes/org/xml/sax/helpers/AttributesImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/NameSpace.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java.i
-data/src/share/classes/com/sun/org/apache/bcel/internal/generic/DASTORE.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/util/URI.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FSUB.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java.i
data/src/share/classes/org/w3c/dom/Text.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/F2D.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/TreeWalker.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties.i
data/src/share/classes/com/sun/xml/internal/stream/events/EntityReferenceEvent.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties.i
data/src/share/classes/org/w3c/dom/CDATASection.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/StopParseException.java.i
data/src/share/classes/org/w3c/dom/Node.java.i
@@ -1834,8 +1953,8 @@ data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_ja_J
data/src/share/classes/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java.i
data/src/share/classes/org/w3c/dom/events/MutationEvent.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/objects/XStringForFSB.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java.i
@@ -1848,14 +1967,15 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/XSModelGroupIm
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java.i
-data/src/share/classes/javax/xml/XMLConstants.java.i
+data/src/share/classes/javax/xml/stream/StreamFilter.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java.i
data/src/share/classes/org/w3c/dom/Element.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/compiler/PsuedoNames.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/runtime/Node.java.i
+data/src/share/classes/org/w3c/dom/html/HTMLModElement.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/TextSerializer.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serialize/Serializer.java.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/OutputFormat.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java.i
@@ -1867,7 +1987,7 @@ data/src/share/classes/com/sun/org/apache/regexp/internal/RE.java.i
data/src/share/classes/javax/xml/validation/Schema.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/serialize/Printer.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/axes/WalkingIterator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java.i
data/src/share/classes/org/xml/sax/SAXParseException.java.i
@@ -1878,7 +1998,7 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/FoundIndex.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FieldObserver.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java.i
data/src/share/classes/org/w3c/dom/html/HTMLPreElement.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java.i
data/src/share/classes/javax/xml/stream/util/XMLEventAllocator.java.i
@@ -1886,6 +2006,7 @@ data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncFalse.jav
data/src/share/classes/org/w3c/dom/events/Event.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FADD.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Gt.java.i
data/src/share/classes/org/w3c/dom/html/HTMLMapElement.java.i
data/src/share/classes/com/sun/xml/internal/stream/Entity.java.i
@@ -1903,24 +2024,27 @@ data/src/share/classes/com/sun/xml/internal/stream/dtd/DTDGrammarUtil.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/util/XMLChar.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java.i
+data/make/tools/StripProperties/StripPropertiesTask.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/operations/Mod.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/package.html.i
data/src/share/classes/com/sun/org/apache/xalan/META-INF/services/org.apache.xml.dtm.DTMManager.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/Translet.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LASTORE.java.i
data/src/share/classes/javax/xml/datatype/DatatypeConfigurationException.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LDC_W.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LDC2_W.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java.i
-data/README.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java.i
data/src/share/classes/javax/xml/parsers/SecuritySupport.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java.i
-data/src/share/classes/com/sun/java_cup/internal/runtime/Scanner.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java.i
+data/src/share/classes/com/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/When.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java.i
@@ -1929,14 +2053,16 @@ data/src/share/classes/com/sun/xml/internal/stream/javax.xml.stream.XMLInputFact
data/src/share/classes/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/Version.java.i
-data/src/share/classes/org/w3c/dom/events/EventListener.java.i
+data/src/share/classes/org/w3c/dom/html/HTMLTitleElement.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/classfile/Deprecated.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/dom/ElementImpl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/LSHR.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java.i
+data/src/share/classes/javax/xml/xpath/XPathFactoryConfigurationException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/StringBufferPool.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java.i
@@ -1955,17 +2081,17 @@ data/src/share/classes/com/sun/org/apache/xerces/internal/util/AugmentationsImpl
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java.i
data/src/share/classes/javax/xml/validation/TypeInfoProvider.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/xs/XSObjectList.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java.i
+data/src/share/classes/org/w3c/dom/xpath/XPathNamespace.java.i
data/src/share/classes/com/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java.i
data/src/share/classes/org/w3c/dom/html/HTMLAppletElement.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/SASTORE.java.i
-data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/compiler/Output.java.i
+data/src/share/classes/com/sun/org/apache/bcel/internal/generic/FMUL.java.i
data/src/share/classes/com/sun/org/apache/bcel/internal/generic/PushInstruction.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java.i
data/src/share/classes/com/sun/org/apache/xalan/internal/lib/Extensions.java.i
@@ -1973,7 +2099,8 @@ data/src/share/classes/javax/xml/stream/XMLOutputFactory.java.i
data/src/share/classes/org/w3c/dom/css/CSSValue.java.i
data/src/share/classes/org/w3c/dom/traversal/NodeFilter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/utils/res/XResources_fr.java.i
-data/src/share/classes/com/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java.i
+data/src/share/classes/com/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties.i
+data/src/share/classes/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/SAXParser.java.i
data/src/share/classes/com/sun/org/apache/xerces/internal/parsers/DOMParser.java.i
diff --git a/jaxp/.hg/store/undo b/jaxp/.hg/store/undo
index d0db201..ed210e3 100644
Binary files a/jaxp/.hg/store/undo and b/jaxp/.hg/store/undo differ
diff --git a/jaxp/.hg/undo.desc b/jaxp/.hg/undo.desc
index bbf2709..07c204f 100644
--- a/jaxp/.hg/undo.desc
+++ b/jaxp/.hg/undo.desc
@@ -1,3 +1,3 @@
-284
+301
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jaxp
diff --git a/jaxp/.hg/undo.dirstate b/jaxp/.hg/undo.dirstate
index a4dd829..f88de23 100644
Binary files a/jaxp/.hg/undo.dirstate and b/jaxp/.hg/undo.dirstate differ
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 3e4a174..7f39c76 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -151,3 +151,11 @@ f052abb8f37444ba77858913887d0d92795dd6b8 jdk8-b20
d41eeadf5c1344b88c5051a997aec9e1ad7ce1db jdk8-b21
cf9d6ec44f891236ad18451021d6dcd57dc82f7b jdk8-b22
95102fd334183d15dc98a95dd0d749527b6c7300 jdk8-b23
+7836655e2495646c462f13de73dcc3ada197b64f jdk8-b24
+bb694c151fc7b5c8f9edc8af6a80738530feacaf jdk8-b25
+dbb7283c197b27da1fc12ae8a83785c851b68c12 jdk8-b26
+80c47eb83d24fdd64bbb48f288bd6d4f03e0ec88 jdk8-b27
+f3244c1f04864d35c41fa8d13669faf4f65b81e2 jdk8-b28
+25099a745e1a43579b6af86b3e052b2e50958753 jdk8-b29
+3be30c25a8255803652b5c466336055d36e2ba21 jdk8-b30
+94aabe098916440ae7911866311c9617d8481a36 jdk8-b31
diff --git a/jaxp/README b/jaxp/README
index f546265..4d65125 100644
--- a/jaxp/README
+++ b/jaxp/README
@@ -17,9 +17,3 @@ Simple Build Instructions:
"dist" directory.
Help information is available by running "ant -projecthelp" or "make help".
-Drop Repository:
- This repository builds sources from a created "drop" source directory.
- These files will normally be copied from a shared directory area or
- downloaded from a public website.
- See the ant build script (build.xml) for more details.
-
diff --git a/jaxp/build-defs.xml b/jaxp/build-defs.xml
deleted file mode 100644
index 7b83ad5..0000000
--- a/jaxp/build-defs.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- 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.
--->
-
-<project name="jaxp_defs" default="all" basedir=".">
-
- <!-- Specific build properties. -->
- <property file="jaxp.properties"/>
-
- <!-- Where generated xml files will stay. -->
- <property name="xml.gen.dir" value="${build.dir}/xml_generated"/>
- <property name="xml.template" value="build-drop-template.xml"/>
-
- <!-- ############### -->
- <!-- Begin Macrodefs -->
-
- <!-- Copies template file, replaces @DROP@ pattern, and imports it. -->
- <macrodef name="drop-import">
- <attribute name="name"/>
- <sequential>
- <property name="xml.gen.@{name}" value="${xml.gen.dir}/build-drop-@{name}.xml"/>
- <mkdir dir="${xml.gen.dir}"/>
- <copy file="${xml.template}" tofile="${xml.gen.@{name}}"/>
- <replace file="${xml.gen.@{name}}" token="@DROP@" value="@{name}"/>
- <import file="${xml.gen.@{name}}"/>
- </sequential>
- </macrodef>
-
- <!-- End of Macrodefs -->
- <!-- ############### -->
-
- <!-- Create xml file and import it for these drops. -->
- <drop-import name="jaxp_src"/>
- <!-- <drop-import name="jaxp_tests"/> -->
-
- <!-- Fail and print helpful messages if source does not exist. -->
- <target name="-src-help">
- <fail message="${failed.url.src.message}">
- <condition>
- <and>
- <not>
- <available file="${jaxp_src.src.dir}" type="dir"/>
- </not>
- <istrue value="${allow.downloads}"/>
- </and>
- </condition>
- </fail>
- <fail message="${failed.nourl.src.message}">
- <condition>
- <not>
- <available file="${jaxp_src.src.dir}" type="dir"/>
- </not>
- </condition>
- </fail>
- </target>
-
- <!-- Special build area setup. -->
- <target name="-drop-build-setup" depends="init, -init-src-dirs">
- <mkdir dir="${build.classes.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${primary.src.dir}"
- includes="**/*.properties"/>
- </copy>
- <replaceregexp match="#(.*)$" replace="#" flags="gm">
- <fileset dir="${build.classes.dir}" includes="**/*.properties"/>
- </replaceregexp>
- </target>
-
- <!-- Try to get drop sources. -->
- <target name="-set-props"
- depends="init,
- jaxp_src-update">
- </target>
-
- <!-- Set up source to use drop.dir. -->
- <target name="-use-drop" depends="-set-props">
- <property name="primary.src.dir" value="${jaxp_src.src.dir}"/>
- <path id="src.dir.id">
- <pathelement path="${primary.src.dir}"/>
- </path>
- </target>
-
- <!-- Source directory selection. -->
- <target name="-init-src-dirs"
- depends="init, -use-drop,-src-help">
- <echo message="Using primary.src.dir=${primary.src.dir}"/>
- <pathconvert property="src.list.id" refid="src.dir.id"/>
- <echo message="Using src.dir.id=${src.list.id}"/>
- </target>
-
- <!-- Create drop src.zip. -->
- <target name="-drop-src-zip" depends="init, -set-props">
- <zip file="${dist.src.zip}" basedir="${primary.src.dir}"/>
- </target>
-
- <!-- Create src.zip. -->
- <target name="-dist-src-zip" depends="init, -drop-src-zip">
- </target>
-
-</project>
diff --git a/jaxp/build-drop-template.xml b/jaxp/build-drop-template.xml
deleted file mode 100644
index a593b42..0000000
--- a/jaxp/build-drop-template.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- 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.
--->
-
-<project name="@DROP at -drop" default="all" basedir=".">
-
- <!-- Locations of master drop bundles. -->
- <property name="@DROP at .master.bundle.copy"
- value="${@DROP at .master.bundle.dir}/${@DROP at .bundle.name}"/>
- <property name="@DROP at .master.bundle.url"
- value="${@DROP at .master.bundle.url.base}/${@DROP at .bundle.name}"/>
-
- <!-- Location where the copied bundle lands. -->
- <property name="@DROP at .bundle.copy"
- value="${drop.expanded.dir}/bundles/${@DROP at .bundle.name}"/>
-
- <!-- Root of exploded area. -->
- <property name="@DROP at .root.dir" value="${drop.dir}/@DROP@"/>
- <property name="@DROP at .src.dir" value="${@DROP at .root.dir}/src"/>
-
- <!-- To see if the drop areas are ready. (ignoring bundles) -->
- <target name="- at DROP@-ready">
- <condition property="@DROP at .ready">
- <or>
- <available file="${drop.included.dir}" type="dir"/>
- <and>
- <available file="${@DROP at .root.dir}" type="dir"/>
- <available file="${@DROP at .root.dir}/PATCHED" type="file"/>
- </and>
- </or>
- </condition>
- </target>
-
- <!-- Copy over bundles from some shared master area. -->
- <condition property="@DROP at .master.bundle.copy.exists">
- <available file="${@DROP at .master.bundle.copy}" type="file"/>
- </condition>
- <target name="- at DROP@-copy-bundle"
- depends="init, - at DROP@-ready"
- if="@DROP at .master.bundle.copy.exists"
- unless="@DROP at .ready">
- <echo message="Copying from ${@DROP at .master.bundle.copy}"/>
- <dirname property="@DROP at .bundle.dirname" file="${@DROP at .bundle.copy}"/>
- <mkdir dir="${@DROP at .bundle.dirname}"/>
- <delete file="${@DROP at .bundle.copy}.temp"/>
- <delete file="${@DROP at .bundle.copy}"/>
- <copy file="${@DROP at .master.bundle.copy}" tofile="${@DROP at .bundle.copy}.temp"/>
- <move file="${@DROP at .bundle.copy}.temp" tofile="${@DROP at .bundle.copy}"/>
- <property name="@DROP at .master.bundle.found" value="true"/>
- </target>
-
- <!-- Determine if the master url download should be used. -->
- <target name="- at DROP@-url-should-be-used" unless="@DROP at .url.should.be.used">
- <condition property="@DROP at .url.should.be.used">
- <and>
- <istrue value="${allow.downloads}"/>
- <not>
- <isset property="@DROP at .master.bundle.copy.exists"/>
- </not>
- </and>
- </condition>
- </target>
-
- <!-- Download bundles from a url. -->
- <target name="- at DROP@-url-bundle"
- depends="init, - at DROP@-ready, - at DROP@-url-should-be-used"
- if="@DROP at .url.should.be.used"
- unless="@DROP at .ready">
- <echo message="Downloading from ${@DROP at .master.bundle.url}"/>
- <dirname property="@DROP at .bundle.dirname" file="${@DROP at .bundle.copy}"/>
- <mkdir dir="${@DROP at .bundle.dirname}"/>
- <delete file="${@DROP at .bundle.copy}.temp"/>
- <delete file="${@DROP at .bundle.copy}"/>
- <get src="${@DROP at .master.bundle.url}" dest="${@DROP at .bundle.copy}.temp"/>
- <move file="${@DROP at .bundle.copy}.temp" tofile="${@DROP at .bundle.copy}"/>
- <property name="@DROP at .master.bundle.found" value="true"/>
- </target>
-
- <!-- Fill in the drop zones, but just when needed. -->
- <target name="@DROP at -update"
- depends="init,
- - at DROP@-copy-bundle,
- - at DROP@-url-bundle,
- - at DROP@-ready"
- if="@DROP at .master.bundle.found"
- unless="@DROP at .ready">
- <delete dir="${@DROP at .root.dir}"/>
- <delete dir="${@DROP at .root.dir}-temp"/>
- <mkdir dir="${@DROP at .root.dir}-temp"/>
- <checksum file="${@DROP at .bundle.copy}"
- property="@DROP at .bundle.md5.checksum.is"/>
- <condition property="@DROP at .bundle.md5.checksum.good">
- <equals arg1="${@DROP at .bundle.md5.checksum}"
- arg2="${@DROP at .bundle.md5.checksum.is}"/>
- </condition>
- <fail unless="@DROP at .bundle.md5.checksum.good">
- Checksum on file ${@DROP at .bundle.copy} is
- ${@DROP at .bundle.md5.checksum.is}, not ${@DROP at .bundle.md5.checksum}
- </fail>
- <unzip src="${@DROP at .bundle.copy}" dest="${@DROP at .root.dir}-temp"/>
- <move file="${@DROP at .root.dir}-temp" tofile="${@DROP at .root.dir}"/>
- <touch>
- <fileset dir="${@DROP at .root.dir}"/>
- </touch>
- <condition property="patch.utility" value="gpatch" else="patch">
- <os name="SunOS"/>
- </condition>
- <apply executable="${patch.utility}"
- dir="${@DROP at .root.dir}"
- parallel="false"
- failonerror="true"
- verbose="true">
- <arg value="-l"/>
- <arg value="-p0"/>
- <arg value="-i"/>
- <filelist dir="${patches.dir}/@DROP@" files="${@DROP at .patch.list}"/>
- </apply>
- <echo file="${@DROP at .root.dir}/PATCHED"
- message="Patches have been applied."/>
- </target>
-
-</project>
diff --git a/jaxp/build.properties b/jaxp/build.properties
index a468f81..9240acc 100644
--- a/jaxp/build.properties
+++ b/jaxp/build.properties
@@ -23,10 +23,6 @@
# questions.
#
-# Base locations where bundles are located
-slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk8-drops
-
# This is the JDK used to build and run the bootstrap version of javac.
# The bootstrap javac is used to compile both boostrap versions of the
# other tools, and product versions of all the tools.
@@ -68,15 +64,6 @@ dist.lib.dir=${dist.dir}/lib
dist.classes.jar=${dist.lib.dir}/classes.jar
dist.src.zip=${dist.lib.dir}/src.zip
-# Where all drop sources get placed when downloaded and unzipped
-drop.expanded.dir=${output.dir}/drop
-
-# Location if the sources were included already
-drop.included.dir=./drop_included
-
-# Where patches to drop bundle sources live
-patches.dir=patches
-
# Sanity information
sanity.info= Sanity Settings:${line.separator}\
ant.home=${ant.home}${line.separator}\
@@ -100,28 +87,6 @@ sanity.info= Sanity Settings:${line.separator}\
output.dir=${output.dir}${line.separator}\
build.dir=${build.dir}${line.separator}\
dist.dir=${dist.dir}${line.separator}\
- drop.dir=${drop.dir}${line.separator}\
- drops.dir=${drops.dir}${line.separator}\
-${line.separator}
-
-# Failure messages when source cannot be found on the file system
-failed.nourl.src.message=\
-ERROR: Cannot find source for project ${ant.project.name}.\
-${line.separator}${line.separator}\
-HINT: Try setting drops.dir to indicate where the bundles can be found, \
-or try setting the ant property allow.downloads=true to download the bundle from the URL.\
-${line.separator}\
-e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \
-${line.separator}
-
-# Failure message when source cannot be downloaded
-failed.url.src.message=\
-ERROR: Cannot find source for project ${ant.project.name}.\
-${line.separator}${line.separator}\
-HINT: Try setting drops.dir to indicate where the bundles can be found, \
-or try checking the URL with your browser.\
-${line.separator}\
-e.g. ant -Ddrops.dir=some_directory \
${line.separator}
#------------------------------------------------------------
diff --git a/jaxp/build.xml b/jaxp/build.xml
index 9a5897b..437ad0f 100644
--- a/jaxp/build.xml
+++ b/jaxp/build.xml
@@ -36,9 +36,6 @@
javac.debug - true or false for debug classfiles
javac.target - classfile version target
javac.source - source version
- drops.dir - directory that holds source drop bundles
- allow.download - permit downloads from public url (default is false)
- (used if bundles not found in drops.dir)
Run 'make help' for help using the Makefile.
</description>
@@ -46,15 +43,11 @@
<!-- Project build properties. -->
<property file="build.properties"/>
- <!-- See if drop sources were included. -->
- <condition property="drop.dir"
- value="${drop.included.dir}"
- else="${drop.expanded.dir}">
- <available file="${drop.included.dir}" type="dir"/>
- </condition>
-
- <!-- Get shared targets. -->
- <import file="build-defs.xml"/>
+ <!-- Source dir def -->
+ <property name="jaxp.src.dir" value="src/share/classes"/>
+ <path id="src.dir.id">
+ <pathelement path="${jaxp.src.dir}"/>
+ </path>
<!-- Initialization of directories needed for build. -->
<target name="init">
@@ -82,11 +75,11 @@
<!-- Creation of distribution files to jdk build process. -->
<target name="dist"
- depends="init, -init-src-dirs, build, -dist-classes-jar, -dist-src-zip"
+ depends="init, build, -dist-classes-jar, -dist-src-zip"
description="Create all built distribution files.">
</target>
<target name="-dist-classes-jar-uptodate"
- depends="init, -init-src-dirs">
+ depends="init">
<condition property="dist.classes.jar.uptodate">
<and>
<available file="${dist.classes.jar}" type="file"/>
@@ -97,22 +90,35 @@
</condition>
</target>
<target name="-dist-classes-jar"
- depends="init, -init-src-dirs, -dist-classes-jar-uptodate"
+ depends="init, -dist-classes-jar-uptodate"
unless="dist.classes.jar.uptodate">
<delete file="${dist.classes.jar}"/>
<jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/>
</target>
- <target name="-build-setup"
- depends="init, -init-src-dirs, -drop-build-setup">
+ <!-- Special build area setup. -->
+ <target name="-build-setup" depends="init">
+ <mkdir dir="${build.classes.dir}"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${jaxp.src.dir}"
+ includes="**/*.properties"/>
+ </copy>
+ <replaceregexp match="#(.*)$" replace="#" flags="gm">
+ <fileset dir="${build.classes.dir}" includes="**/*.properties"/>
+ </replaceregexp>
</target>
+ <!-- Create src.zip. -->
+ <target name="-dist-src-zip" depends="init">
+ <zip file="${dist.src.zip}" basedir="${jaxp.src.dir}"/>
+ </target>
+
<!-- Build (compilation) of sources to class files. -->
<target name="build"
depends="compile, -build-setup">
</target>
<target name="compile"
- depends="init, -init-src-dirs">
+ depends="init">
<mkdir dir="${build.classes.dir}"/>
<javac
includeAntRuntime="false"
@@ -132,24 +138,14 @@
<!-- Test. (FIXME: Need to know how to run tests.) -->
<target name="test"
- depends="init, -init-src-dirs, dist">
+ depends="init, dist">
<echo message="FIXME: How do you run the tests"/>
</target>
<!-- Populate source area if needed. -->
<target name="source"
- depends="init, -init-src-dirs"
- description="Populate all source file directories">
- </target>
-
- <!-- Populate drop_included area. -->
- <target name="drop_included"
- depends="clobber"
+ depends="init"
description="Populate all source file directories">
- <delete dir="${drop.included.dir}"/>
- <antcall target="source"/>
- <move file="${drop.expanded.dir}" tofile="${drop.included.dir}"/>
- <delete dir="${drop.included.dir}/bundles"/>
</target>
<!-- Clean up compiled files. -->
@@ -163,7 +159,6 @@
<target name="clobber"
depends="clean"
description="Delete all generated files, including imported sources">
- <delete dir="${drop.expanded.dir}"/>
</target>
<target name="-banner">
diff --git a/jaxp/jaxp.properties b/jaxp/jaxp.properties
deleted file mode 100644
index 6693fd3..0000000
--- a/jaxp/jaxp.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-drops.master.copy.base=${drops.dir}
-
-jaxp_src.bundle.name=jaxp145_01.zip
-jaxp_src.bundle.md5.checksum=32394c780c8fb5e29775f623525993c0
-jaxp_src.master.bundle.dir=${drops.master.copy.base}
-jaxp_src.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
-
-jaxp_tests.bundle.name=jaxp-1_4_5-unittests.zip
-jaxp_tests.bundle.md5.checksum=fda9b9ad17c459880c077df6ecc7df80
-jaxp_tests.master.bundle.dir=${drops.master.copy.base}
-jaxp_tests.master.bundle.url.base=http://download.java.net/jaxp/1.4.5
-
diff --git a/jaxp/make/Makefile b/jaxp/make/Makefile
index b2574d7..12f1328 100644
--- a/jaxp/make/Makefile
+++ b/jaxp/make/Makefile
@@ -91,23 +91,6 @@ else
endif
endif
-# Do we have the drops already downloaded?
-# Check ALT_DROPS_DIR for a full path first,
-# before trying to use the devtools path,
-# either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
-ifdef ALT_DROPS_DIR
- DROPS_DIR = $(ALT_DROPS_DIR)
-else
- ifdef ALT_JDK_DEVTOOLS_DIR
- DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
- else
- DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
- endif
-endif
-
-# Add in path to drops already downloaded
-ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
-
ifdef ALT_OUTPUTDIR
OUTPUTDIR = $(ALT_OUTPUTDIR)
ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
@@ -144,13 +127,17 @@ endif
default: all
# All ant targets of interest
-ANT_TARGETS = all source drop_included build dist clobber clean sanity
+ANT_TARGETS = all build dist clobber clean sanity
# Create a make target for each
$(ANT_TARGETS):
cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
+# Just for compat reasons, delete in future.
+drop_included:
+source:
+
# Help target
define helpenvline
@echo " $1";echo " $2"
@@ -164,8 +151,6 @@ help:
@echo " $(ANT_TARGETS)"
@echo " "
@echo " Environment or command line variables (all optional):"
- $(call helpenvline, ALT_DROPS_DIR,\
- "Directory that contains the drop source bundles i.e. drops.dir")
$(call helpenvline, ALT_BOOTDIR,\
"JAVA_HOME to use when running ant")
$(call helpenvline, ALT_LANGTOOLS_DIST,\
diff --git a/jaxp/patches/jaxp_src/README b/jaxp/patches/jaxp_src/README
deleted file mode 100644
index 644dff0..0000000
--- a/jaxp/patches/jaxp_src/README
+++ /dev/null
@@ -1,5 +0,0 @@
-
-This directory will hold any patches that need to be applied to the drop files.
-
-The patch order is defined in the ant build script properties.
-
diff --git a/jaxws/.hg/cache/branchheads b/jaxws/.hg/cache/branchheads
index 9cf4913..c2f6d0c 100644
--- a/jaxws/.hg/cache/branchheads
+++ b/jaxws/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-00b537933ea2af483fdcac5a1b00f92b9f8f3185 299
-00b537933ea2af483fdcac5a1b00f92b9f8f3185 default
+3344b8d3a1a01d454f77efba6a2bc45380ed9ca4 324
+3344b8d3a1a01d454f77efba6a2bc45380ed9ca4 default
diff --git a/jaxws/.hg/dirstate b/jaxws/.hg/dirstate
index 560adef..5d7e34f 100644
Binary files a/jaxws/.hg/dirstate and b/jaxws/.hg/dirstate differ
diff --git a/jaxws/.hg/store/00changelog.d b/jaxws/.hg/store/00changelog.d
index d4bb269..a6edfe8 100644
Binary files a/jaxws/.hg/store/00changelog.d and b/jaxws/.hg/store/00changelog.d differ
diff --git a/jaxws/.hg/store/00changelog.i b/jaxws/.hg/store/00changelog.i
index c0f3d2d..8f54aa1 100644
Binary files a/jaxws/.hg/store/00changelog.i and b/jaxws/.hg/store/00changelog.i differ
diff --git a/jaxws/.hg/store/00manifest.d b/jaxws/.hg/store/00manifest.d
index e461dd8..e1488a2 100644
Binary files a/jaxws/.hg/store/00manifest.d and b/jaxws/.hg/store/00manifest.d differ
diff --git a/jaxws/.hg/store/00manifest.i b/jaxws/.hg/store/00manifest.i
index f544a5c..fdad527 100644
Binary files a/jaxws/.hg/store/00manifest.i and b/jaxws/.hg/store/00manifest.i differ
diff --git a/jaxws/.hg/store/data/_r_e_a_d_m_e.i b/jaxws/.hg/store/data/_r_e_a_d_m_e.i
index 6388549..15d8e5e 100644
Binary files a/jaxws/.hg/store/data/_r_e_a_d_m_e.i and b/jaxws/.hg/store/data/_r_e_a_d_m_e.i differ
diff --git a/jaxws/.hg/store/data/build-defs.xml.i b/jaxws/.hg/store/data/build-defs.xml.i
index d7fdf40..3d38815 100644
Binary files a/jaxws/.hg/store/data/build-defs.xml.i and b/jaxws/.hg/store/data/build-defs.xml.i differ
diff --git a/jaxws/.hg/store/data/build.properties.i b/jaxws/.hg/store/data/build.properties.i
index e03890d..c4deec9 100644
Binary files a/jaxws/.hg/store/data/build.properties.i and b/jaxws/.hg/store/data/build.properties.i differ
diff --git a/jaxws/.hg/store/data/build.xml.i b/jaxws/.hg/store/data/build.xml.i
index 5047504..9073419 100644
Binary files a/jaxws/.hg/store/data/build.xml.i and b/jaxws/.hg/store/data/build.xml.i differ
diff --git a/jaxws/.hg/store/data/jaxws.properties.i b/jaxws/.hg/store/data/jaxws.properties.i
index a0a0c9b..6338d7e 100644
Binary files a/jaxws/.hg/store/data/jaxws.properties.i and b/jaxws/.hg/store/data/jaxws.properties.i differ
diff --git a/jaxws/.hg/store/data/make/_makefile.i b/jaxws/.hg/store/data/make/_makefile.i
index dfcf851..5a6cb82 100644
Binary files a/jaxws/.hg/store/data/make/_makefile.i and b/jaxws/.hg/store/data/make/_makefile.i differ
diff --git a/jaxws/.hg/store/data/make/jprt.properties.i b/jaxws/.hg/store/data/make/jprt.properties.i
index 0e5dbac..bc3db21 100644
Binary files a/jaxws/.hg/store/data/make/jprt.properties.i and b/jaxws/.hg/store/data/make/jprt.properties.i differ
diff --git a/jaxws/.hg/store/data/~2ehgignore.i b/jaxws/.hg/store/data/~2ehgignore.i
index a6733fa..77db878 100644
Binary files a/jaxws/.hg/store/data/~2ehgignore.i and b/jaxws/.hg/store/data/~2ehgignore.i differ
diff --git a/jaxws/.hg/store/data/~2ehgtags.i b/jaxws/.hg/store/data/~2ehgtags.i
index d0b3917..9ed7550 100644
Binary files a/jaxws/.hg/store/data/~2ehgtags.i and b/jaxws/.hg/store/data/~2ehgtags.i differ
diff --git a/jaxws/.hg/store/fncache b/jaxws/.hg/store/fncache
index 61a0e85..350106a 100644
--- a/jaxws/.hg/store/fncache
+++ b/jaxws/.hg/store/fncache
@@ -1,3003 +1,5996 @@
data/src/share/classes/javax/xml/ws/handler/PortInfo.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaEntity.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/Populatable.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java.i
data/src/share/classes/com/sun/tools/internal/txw2/XmlSchemaLoader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java.i
data/src/share/classes/com/sun/istack/internal/XMLStreamException2.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java.i
-data/src/share/classes/com/sun/istack/internal/package-info.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlAnyElement.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAP12FaultInfo.java.i
-data/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MessageContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/IDResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DataWriter.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultSubcode.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java.i
-data/nbproject/findbugs.settings.i
data/src/share/classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java.i
data/src/share/classes/javax/xml/bind/MarshalException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java.i
data/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java.i
data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java.i
-data/src/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java.i
-data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXResult.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManager.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/Resolver.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/fault/TextType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java.i
-data/make/jprt.config.i
-data/src/share/classes/META-INF/mimetypes.default.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/ModelInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLEncoder.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ID.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java.i
-data/src/share/classes/com/sun/codemodel/internal/JLabel.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java.i
data/src/share/classes/com/sun/tools/internal/ws/resources/UtilMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/binding/http/HTTPBindingImpl.java.i
-data/src/share/classes/javax/xml/ws/WebServiceContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java.i
data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/Options.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java.i
data/src/share/classes/javax/xml/soap/package.html.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java.i
+data/src/share/jaxws_classes/javax/xml/bind/MarshalException.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/XMLStreamReaderToContentHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java.i
data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Name.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderModel.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/pacakge-info.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java.i
data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.jj.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java.i
-data/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java.i
-data/src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/WriterNode.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandlerBase.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/annotation/package.html.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java.i
data/src/share/classes/javax/xml/ws/Binding.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlElementDecl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSContentType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Tube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLParserExtension.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersionMBean.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java.i
data/src/share/classes/com/sun/xml/internal/txw2/output/TXWSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/util/GeneratedFileInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/WSDLContext.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSTerm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRef.java.i
data/src/share/classes/com/sun/tools/internal/ws/WsGen.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java.i
-data/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/PortTypeOperation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/ept/EPTFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java.i
data/src/share/classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/Processor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/package.html.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.i
-data/src/share/classes/javax/activation/CommandMap.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/ContainerElement.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java.i
-data/src/share/classes/com/sun/codemodel/internal/JMethod.java.i
-data/src/share/classes/javax/jws/WebMethod.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/util/MS1252Encoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/Attributes.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedClientAssertion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/StringHeader.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/InternalMessage.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java.i
-data/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/version.properties.i
data/src/share/classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPFaultInfo.java.i
-data/src/share/classes/javax/xml/ws/Holder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java.i
+data/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java.i
-data/src/share/classes/com/sun/istack/internal/localization/Localizable.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java.i
-data/src/share/classes/javax/xml/bind/UnmarshalException.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/JAXWSUtils.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfoList.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/Plugin.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/AttachmentBlock.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/SOAPUtil.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java.i
data/src/share/classes/com/sun/xml/internal/bind/api/JAXBRIContext.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/SwACodec.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/SimpleToBoxedUtil.java.i
-data/src/share/classes/com/sun/codemodel/internal/JFieldVar.java.i
-data/src/share/classes/javax/activation/MimeTypeParameterList.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/util/FilterIterator.java.i
-data/src/share/classes/javax/jws/soap/InitParam.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/sender.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java.i
+data/src/share/classes/javax/xml/bind/ValidationEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/ServerRtException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocument.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java.i
-data/src/share/classes/javax/xml/ws/ProtocolException.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSXPath.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLDecoder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java.i
+data/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java.i
+data/src/share/jaxws_classes/javax/jws/WebResult.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java.i
data/src/share/classes/com/sun/xml/internal/ws/resources/AddressingMessages.java.i
-data/build-drop-template.xml.i
data/src/share/classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Util.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Binding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextWrapper.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/JAXWSAttachmentMarshaller.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/XJC.java.i
data/src/share/classes/com/sun/istack/internal/FragmentContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java.i
-data/src/share/classes/javax/xml/ws/Provider.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/ServerEncoderDecoder.java.i
-data/src/share/classes/javax/xml/ws/Action.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/package.html.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetterBase.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/RpcLitPayloadSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/Stateful.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/soap.properties.i
data/src/share/classes/com/sun/tools/internal/xjc/api/Mapping.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/HandlerChainInfo.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java.i
data/src/share/classes/com/sun/xml/internal/xsom/parser/XMLParser.java.i
data/src/share/classes/com/sun/tools/internal/xjc/api/JAXBModel.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java.i
+data/src/share/classes/com/sun/activation/registries/MailcapFile.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/Driver.java.i
data/src/share/classes/com/sun/tools/internal/xjc/api/XJC.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java.i
data/src/share/classes/com/sun/tools/internal/jxc/gen/config/Schema.java.i
data/src/share/classes/javax/xml/soap/SAAJMetaFactory.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Packet.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/EndTag.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingModeFeature.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java.i
data/src/share/classes/com/sun/xml/internal/xsom/XmlString.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java.i
+data/src/share/jaxws_classes/javax/xml/bind/JAXBException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/policy.properties.i
data/src/share/classes/com/sun/tools/internal/ws/util/xml/NullEntityResolver.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/version.properties.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListImpl.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/util/SingleByteEncoder.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerResolverImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/util/ClientProcessorEnvironment.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java.i
-data/src/share/classes/com/sun/codemodel/internal/JFieldRef.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/util.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java.i
data/src/share/classes/com/sun/xml/internal/txw2/output/DumpSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java.i
-data/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java.i
data/src/share/classes/com/sun/xml/internal/bind/api/impl/NameUtil.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/Content.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/RpcLitPayload.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSVariety.java.i
data/src/share/classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLOutputResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/util/ClassNameComparator.java.i
data/src/share/classes/javax/xml/ws/soap/SOAPFaultException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java.i
-data/src/share/classes/javax/xml/bind/Binder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCFacade.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/localization/Localizable.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/DefaultPolicyResolver.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.i
data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java.i
+data/src/share/classes/javax/xml/soap/SOAPBody.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/sei/ActionBasedDispatcher.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java.i
-data/src/share/classes/javax/activation/CommandInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Port.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java.i
+data/src/share/jaxws_classes/javax/xml/bind/util/JAXBSource.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java.i
data/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java.i
data/src/share/classes/com/sun/xml/internal/xsom/XSSimpleType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java.i
-data/src/share/classes/javax/xml/bind/TypeConstraintException.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerEndpointScope.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/config/ConfigurationException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCElement.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java.i
-data/src/share/classes/com/sun/istack/internal/Builder.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/SchemaBuilderImpl.java.i
-data/src/share/classes/com/sun/istack/internal/ws/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java.i
-data/src/share/classes/javax/xml/ws/handler/package.html.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java.i
-data/src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/ept/MessageInfo.java.i
-data/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaWriter.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java.i
-data/src/share/classes/javax/jws/soap/SOAPMessageHandlers.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java.i
+data/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java.i
data/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/XmlSchemaBuilder.java.i
-data/src/share/classes/javax/activation/ActivationDataFlavor.java.i
data/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java.i
-data/src/share/classes/javax/xml/bind/JAXBException.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/sei/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java.i
-data/src/share/classes/javax/xml/ws/wsaddressing/package.html.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java.i
data/src/share/classes/com/sun/xml/internal/bind/IDResolver.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java.i
-data/src/share/classes/com/sun/codemodel/internal/JClass.java.i
-data/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/javacompiler.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ReasonType.java.i
+data/src/share/classes/javax/xml/bind/PropertyException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/StatefulInstanceResolver.java.i
-data/src/share/classes/javax/xml/bind/JAXB.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java.i
data/src/share/classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java.i
data/src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java.i
data/src/share/classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventReceiver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/AttachmentBlock.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java.i
-data/src/share/classes/javax/xml/ws/WebServiceException.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java.i
-data/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/runtime/package.html.i
+data/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorActionVersion.java.i
-data/make/build.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/Parameter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/ContentType.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JMod.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAP12XMLEncoder.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAPXMLEncoder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java.i
+data/src/share/jaxws_classes/javax/annotation/Generated.java.i
+data/src/share/jaxws_classes/javax/xml/bind/ParseConversionEvent.java.i
data/src/share/classes/javax/xml/bind/annotation/XmlNs.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/JAXWSBindingInfoParser.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/ParserUtil.java.i
data/src/share/classes/javax/xml/bind/Element.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java.i
-data/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WSConnection.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java.i
-data/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/package.html.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java.i
-data/src/share/classes/com/sun/codemodel/internal/JFormatter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java.i
-data/src/share/classes/com/sun/codemodel/internal/JGenerable.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/WSFuture.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/ServiceContext.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSSchema.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPVersion.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java.i
-data/src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/ToolBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/Util.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerContext.java.i
-data/src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java.i
+data/src/share/jaxws_classes/javax/xml/bind/UnmarshalException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/Comment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/EndpointCreationAttributes.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/ept/MessageInfo.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java.i
data/src/share/classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java.i
-data/src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java.i
-data/src/share/classes/javax/xml/ws/Service.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java.i
+data/src/share/classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SecureLoader.java.i
data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/ClientTransportFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/package.html.i
-data/src/share/classes/javax/xml/ws/spi/FactoryFinder.java.i
-data/src/share/classes/javax/xml/bind/Validator.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/util/Surrogate.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/RfcDateParser.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java.i
-data/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java.i
-data/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Element.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModel.java.i
data/src/share/classes/com/sun/tools/internal/ws/util/xml/NodeListIterator.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlMixed.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSComponent.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBeanNOPImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/TxwException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java.i
-data/src/share/classes/javax/xml/ws/WebServiceRef.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java.i
+data/src/share/jaxws_classes/javax/xml/bind/Messages.properties.i
data/src/share/classes/com/sun/xml/internal/ws/util/XMLConnectionUtil.java.i
-data/src/share/classes/javax/xml/bind/annotation/adapters/package.html.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java.i
+data/src/share/jaxws_classes/javax/xml/bind/Validator.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java.i
-data/src/share/classes/javax/xml/ws/Endpoint.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/ConsoleErrorReporter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StringUtils.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CValuePropertyInfo.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java.i
-data/src/share/classes/com/sun/codemodel/internal/JPackage.java.i
data/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreator.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java.i
data/src/share/classes/com/sun/xml/internal/bind/CycleRecoverable.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlID.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/ClientEncoderDecoder.java.i
-data/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/CookieJar.java.i
+data/src/share/jaf_classes/com/sun/activation/registries/MailcapParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NullNameClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyFeatureConfigurator.java.i
data/src/share/classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java.i
-data/src/share/classes/javax/activation/FileDataSource.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotatable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties.i
data/src/share/classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java.i
-data/src/share/classes/javax/xml/bind/NotIdentifiableEvent.java.i
-data/src/share/classes/javax/xml/soap/AttachmentPart.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java.i
data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Features.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/exporter/ExternalObject.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java.i
-data/src/share/classes/com/sun/istack/internal/tools/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Outline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java.i
data/src/share/classes/javax/xml/bind/annotation/XmlElement.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/ParseConversionEventImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ValuePattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderPeptTie.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java.i
data/src/share/classes/com/sun/xml/internal/ws/resources/SenderMessages.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerUtils.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java.i
-data/src/share/classes/com/sun/xml/internal/ws/modeler/RuntimeModeler.java.i
+data/src/share/jaxws_classes/javax/xml/bind/Binder.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java.i
data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/InternalSoapEncoder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java.i
-data/src/share/classes/javax/xml/bind/DatatypeConverterInterface.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/client.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java.i
data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/RELAXNGLoader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Reference.java.i
data/src/share/classes/com/sun/activation/registries/LogSupport.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/Document.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java.i
-data/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/MessageBlock.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java.i
data/src/share/classes/com/sun/xml/internal/rngom/util/Utf16.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java.i
-data/src/share/classes/javax/jws/WebService.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/PortType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/JavaCompilerHelper.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/Module.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubeCloner.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java.i
-data/make/Makefile.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlElements.java.i
-data/.hgtags.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java.i
-data/src/share/classes/javax/xml/bind/util/ValidationEventCollector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/SourceModel.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessOrder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Injector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Version.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Container.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/Aspect.java.i
data/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/PortType.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/Uri.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/config/Configuration.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java.i
-data/src/share/classes/javax/xml/bind/JAXBContext.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java.i
-data/src/share/classes/javax/xml/soap/SOAPFaultElement.java.i
-data/.jcheck/conf.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/nav/package.html.i
data/src/share/classes/javax/xml/ws/soap/AddressingFeature.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/encoding/Decoder.java.i
-data/src/share/classes/javax/xml/ws/spi/Provider.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/activation/registries/MailcapTokenizer.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JCodeModel.java.i
+data/src/share/jaxws_classes/javax/xml/ws/EndpointContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptorFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/ManagedEndpointFactory.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties.i
-data/src/share/classes/javax/xml/soap/SOAPPart.java.i
-data/src/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java.i
data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java.i
data/src/share/classes/javax/xml/soap/SOAPConnection.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java.i
data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Cancelable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java.i
data/src/share/classes/com/sun/tools/internal/ws/version.properties.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/local/client/LocalClientTransport.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java.i
+data/src/share/jaf_classes/javax/activation/DataSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/OldBridge.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/DeserializationException.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java.i
-data/src/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/util/package.html.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ClassResolver.java.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java.i
-data/src/share/classes/com/sun/istack/internal/Nullable.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java.i
-data/src/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java.i
-data/src/share/classes/com/sun/codemodel/internal/JResourceFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/package.html.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ParameterList.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClass.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/JavaCallInfo.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/RuntimeEndpointInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/protocol/MessageDispatcherHelper.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/Pool.java.i
data/src/share/classes/com/sun/xml/internal/ws/pept/presentation/Tie.java.i
data/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory.i
-data/src/share/classes/javax/xml/bind/package.html.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java.i
-data/src/share/classes/javax/xml/ws/RespectBinding.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java.i
-data/src/share/classes/javax/activation/DataHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java.i
+data/src/share/classes/javax/xml/bind/Validator.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java.i
-data/src/share/classes/javax/xml/bind/DataBindingException.java.i
-data/src/share/classes/javax/xml/bind/helpers/package.html.i
-data/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java.i
+data/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModeler.java.i
data/src/share/classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java.i
data/src/share/classes/com/sun/xml/internal/bind/Locatable.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/Container.java.i
data/src/share/classes/com/sun/xml/internal/rngom/nc/NullNameClass.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/package.html.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java.i
data/build.xml.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Leaf.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionFacade.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/Version.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/ContextFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/CompileTool.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java.i
-data/src/share/classes/org/relaxng/datatype/ValidationContext.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLDocument.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/Mode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/client/Stub.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironment.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/Injector.java.i
-data/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/package.html.i
data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlElementRef.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DPattern.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/Base64Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java.i
+data/src/share/jaf_classes/com/sun/activation/registries/MimeTypeFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/SunStAXReflection.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/RuntimeEndpointInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/CookieJar.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/Constants.java.i
-data/src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/SchemaBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorAction.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java.i
data/src/share/classes/javax/xml/bind/annotation/XmlType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java.i
-data/src/share/classes/javax/xml/soap/SOAPBodyElement.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java.i
data/src/share/classes/javax/activation/DataContentHandlerFactory.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DispatchImpl.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java.i
-data/src/share/classes/com/sun/xml/internal/ws/Closeable.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/EPTFactoryBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPolicyValidator.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WriterContext.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/VersionMismatchException.java.i
-data/src/share/classes/javax/xml/soap/SOAPHeaderElement.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/GroupPattern.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/NameValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java.i
data/src/share/classes/com/sun/xml/internal/ws/message/FaultMessage.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/ActionConstants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/PortInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java.i
-data/src/share/classes/com/sun/codemodel/internal/JForLoop.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/EncoderDecoder.java.i
-data/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/sei/SOAPActionBasedDispatcher.java.i
data/src/share/classes/com/sun/xml/internal/xsom/XSNotation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java.i
data/src/share/classes/com/sun/tools/internal/xjc/SchemaCache.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java.i
-data/src/share/classes/com/sun/codemodel/internal/package-info.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java.i
-data/src/share/classes/javax/xml/bind/ValidationEventHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/ByteArrayOutputStreamEx.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java.i
data/src/share/classes/com/sun/codemodel/internal/JThrow.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java.i
data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java.i
data/src/share/classes/javax/xml/bind/helpers/ParseConversionEventImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ASCIIUtility.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAssignment.java.i
data/src/share/classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/SHDSOAPMessageContext.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Grammar.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAtom.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UName.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderEndpointModel.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/xml/util/Naming.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java.i
data/src/share/classes/com/sun/tools/internal/ws/wscompile/AbortException.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java.i
data/src/share/classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlWriter.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/HandlerResolver.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd.i
-data/src/share/classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/CheckedException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/pacakge-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapter.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/ClassModelParser.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SystemIdResolver.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/annotations/Reset.java.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java.i
-data/src/share/classes/com/sun/activation/registries/MimeTypeEntry.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ContentType.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/WSDLModelInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java.i
-data/make/jprt.properties.i
-data/src/share/classes/javax/xml/ws/Response.java.i
-data/src/share/classes/com/sun/codemodel/internal/JCodeModel.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties.i
-data/src/share/classes/javax/xml/soap/MimeHeaders.java.i
-data/src/share/classes/javax/xml/ws/WebFault.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/NamespaceSupport.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/localization/Localizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcher.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java.i
data/src/share/classes/com/sun/istack/internal/Pool.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ErrorHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLEPTFactory.java.i
data/src/share/classes/com/sun/codemodel/internal/JArrayCompRef.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java.i
-data/src/share/classes/com/sun/tools/internal/ws/spi/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedNameClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/Model.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Restriction.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Util.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/CustomizationParser.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java.i
data/src/share/classes/com/sun/xml/internal/xsom/XSDeclaration.java.i
-data/build-defs.xml.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/util/Uri.java.i
-data/src/share/classes/javax/xml/bind/PrintConversionEvent.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng.i
-data/src/share/classes/javax/xml/ws/WebServiceFeature.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extension.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBBridgeInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/UtilMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.xml.internal.ws.spi.db.BindingContextFactory.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MappingInfo.java.i
data/src/share/classes/com/sun/activation/registries/MimeTypeFile.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/ElementDecl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/GroupKind.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/fault/ExceptionBean.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/Service.java.i
data/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/CClass.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGenExtnContext.java.i
-data/src/share/classes/javax/xml/bind/util/JAXBResult.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ElementDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HasEncoding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java.i
+data/src/share/jaxws_classes/javax/xml/ws/LogicalMessage.java.i
data/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java.i
data/src/share/classes/com/sun/xml/internal/ws/resources/encoding.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java.i
+data/src/share/jaxws_classes/javax/xml/bind/ValidationException.java.i
+data/src/share/jaf_classes/javax/activation/MailcapCommandMap.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/api/AccessorException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/TargetFinderImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java.i
-data/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.rng.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java.i
-data/src/share/classes/javax/xml/bind/UnmarshallerHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/TimeStatistic.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Types.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFBase.java.i
-data/src/share/classes/com/sun/tools/internal/ws/WsImport.java.i
data/src/share/classes/com/sun/xml/internal/ws/fault/SOAP11Fault.java.i
data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java.i
-data/src/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/localization/NullLocalizable.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/WSConnectionImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java.i
-data/src/share/classes/com/sun/istack/internal/SAXParseException2.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/client/XMLMessageDispatcher.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/package-info.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java.i
-data/src/share/classes/javax/jws/soap/SOAPMessageHandler.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EmptyIterator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/Headers.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java.i
data/src/share/classes/com/sun/xml/internal/rngom/binary/package.html.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLPropertyBag.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/ResponseImpl.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/Comment.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/RuntimeContext.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java.i
data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java.i
data/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java.i
-data/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultReason.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldGetter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Term.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/tools/SecureLoader.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/Message.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/StringUtils.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java.i
-data/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/NamespaceContextEx.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapUtil.java.i
data/src/share/classes/com/sun/xml/internal/bind/AnyTypeAdapter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java.i
-data/src/share/classes/javax/xml/soap/SOAPElementFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java.i
-data/src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/CountStatisticImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/SymbolSpace.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementDecl.java.i
data/build.properties.i
-data/src/share/classes/javax/xml/ws/WebServiceProvider.java.i
-data/src/share/classes/javax/xml/ws/RequestWrapper.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBBeanInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java.i
data/src/share/classes/com/sun/tools/internal/xjc/util/Util.java.i
data/src/share/classes/com/sun/xml/internal/ws/resources/ClientMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Binding.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/Reader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransportFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Bridge.java.i
data/src/share/classes/javax/xml/bind/Marshaller.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/package.html.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/api/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchContext.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java.i
data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlIDREF.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/ClientTransportFactoryTypes.java.i
-data/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/ParameterBinding.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/DelegateBase.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html.i
-data/src/share/classes/javax/xml/soap/SOAPEnvelope.java.i
-data/src/share/classes/com/sun/codemodel/internal/JCase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/MEP.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JDocCommentable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java.i
data/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java.i
data/src/share/classes/com/sun/xml/internal/bind/api/BridgeContext.java.i
-data/src/share/classes/javax/xml/ws/AsyncHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/DispatchException.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/HandlerInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/StringStatistic.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFContext.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java.i
-data/src/share/classes/javax/xml/ws/WebEndpoint.java.i
-data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/IncludeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWSerializer.java.i
data/TRADEMARK.i
data/src/share/classes/javax/xml/bind/ContextFinder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/simpletype/EncoderUtils.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSDLGenResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/NotationImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/Const.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java.i
data/src/share/classes/javax/xml/ws/http/HTTPException.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/LocalizationMessages.java.i
data/src/share/classes/com/sun/xml/internal/ws/fault/DetailType.java.i
-data/src/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointMOMProxy.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Part.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties.i
-data/src/share/classes/javax/xml/soap/SOAPConstants.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java.i
-data/jaxws.patch.d
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java.i
-data/jaxws.patch.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java.i
-data/src/share/classes/javax/activation/MailcapCommandMap.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java.i
-data/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Model.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLServiceImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatsImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ServerMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/NameGetter.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAnnotation.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAP.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java.i
data/src/share/classes/javax/xml/bind/annotation/XmlMimeType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java.i
data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementMappingImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationArrayMember.java.i
data/src/share/classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java.i
-data/src/share/classes/javax/xml/ws/RespectBindingFeature.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java.i
data/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java.i
-data/src/share/classes/javax/xml/soap/Detail.java.i
data/src/share/classes/com/sun/codemodel/internal/JNarrowedClass.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfoSet.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlAccessType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/server.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Tie.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAP12XMLEncoder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/message/Header.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/ept/Acceptor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/ProviderSED.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SystemHandlerDelegate.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComplexType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java.i
data/nbproject/sqe.properties.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java.i
data/src/share/classes/com/sun/codemodel/internal/util/Surrogate.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPRuntimeModel.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPVersionMismatchException.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/package.html.i
-data/src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultCodeEnum.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTypeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/DatabindingConfig.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Const.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java.i
data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java.i
-data/src/share/classes/javax/xml/bind/JAXBIntrospector.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java.i
data/src/share/classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java.i
-data/src/share/classes/javax/xml/soap/SOAPHeader.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/package.html.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/package.html.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java.i
+data/src/share/classes/javax/xml/bind/JAXBException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServiceFeature.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java.i
data/src/share/classes/javax/xml/ws/soap/Addressing.java.i
-data/src/share/classes/javax/xml/ws/spi/ServiceDelegate.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd.i
+data/src/share/jaf_classes/javax/activation/MimeTypeParseException.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codec.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/AbortException.java.i
data/src/share/classes/com/sun/xml/internal/rngom/util/Localizer.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSParticle.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Text.java.i
-data/src/share/classes/com/sun/codemodel/internal/JCommentPart.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java.i
-data/src/share/classes/javax/xml/bind/ValidationEvent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy12ExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties.i
-data/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java.i
-data/nbproject/project.xml.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/Language.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/EncoderDecoderBase.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/Serialization.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java.i
-data/src/share/classes/javax/jws/soap/SOAPBinding.java.i
-data/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java.i
-data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Features.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/util/Uri.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ConfigReader.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/JAXBTypeGenerator.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/MemberSubmissionAddressingWSDLParserExtension.java.i
-data/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java.i
+data/src/share/jaxws_classes/javax/xml/bind/PropertyException.java.i
data/src/share/classes/javax/xml/bind/DatatypeConverter.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java.i
-data/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/SEIModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/package.html.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/InternalBindingProvider.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd.i
-data/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/local/server/LocalWSContextImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElementRef.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java.i
-data/src/share/classes/javax/xml/soap/Text.java.i
-data/src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Engine.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java.i
data/src/share/classes/com/sun/tools/internal/txw2/model/prop/AttributeProp.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/Model.java.i
-data/src/share/classes/javax/xml/ws/WebServicePermission.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DivImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java.i
data/src/share/classes/javax/annotation/Resources.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/StringHeader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElements.java.i
data/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlElementRefs.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Service.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RootElementSniffer.java.i
data/src/share/classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java.i
-data/src/share/classes/javax/annotation/PostConstruct.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorNotificationListener.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/TXWContentHandler.java.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java.i
-data/src/share/classes/javax/annotation/Resource.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Value.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java.i
-data/src/share/classes/com/sun/activation/registries/MailcapParseException.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/XJCListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldVar.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WSDLLocation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ServiceContextBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttributes.java.i
data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/JavaCharStream.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java.i
-data/make/tools/StripProperties/StripProperties.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java.i
data/src/share/classes/com/sun/codemodel/internal/JDocComment.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java.i
-data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Policy15ExtensionHandler.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironmentBase.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlReader.java.i
data/src/share/classes/javax/xml/ws/handler/soap/SOAPMessageContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/InputParser.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/util/package.html.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java.i
data/src/share/classes/com/sun/tools/internal/ws/resources/ModelMessages.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlEnumValue.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java.i
+data/src/share/jaxws_classes/javax/xml/ws/BindingProvider.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/JavaMethod.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java.i
-data/src/share/classes/javax/xml/bind/util/Messages.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java.i
-data/src/share/classes/javax/xml/ws/ServiceMode.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java.i
-data/src/share/classes/javax/activation/MimeType.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java.i
data/src/share/classes/com/sun/istack/internal/tools/APTTypeVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java.i
data/src/share/classes/com/sun/xml/internal/txw2/StartTag.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorExtension.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/package.html.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLEPTFactory.java.i
+data/src/share/classes/javax/xml/ws/WebServiceFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/AttributePropertyInfo.java.i
-data/src/share/classes/com/sun/codemodel/internal/JNullType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java.i
-data/src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/TxwTask.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServiceProvider.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java.i
+data/src/share/classes/javax/xml/bind/JAXBIntrospector.java.i
data/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties.i
-data/src/share/classes/com/sun/tools/internal/txw2/Main.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/pept/presentation/Stub.java.i
data/src/share/classes/com/sun/codemodel/internal/JArrayClass.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/prop/XmlItemProp.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Binding.java.i
data/src/share/classes/com/sun/codemodel/internal/JBreak.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/BodyBlock.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListIteratorBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java.i
-data/src/share/classes/javax/xml/bind/ValidationException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java.i
-data/src/share/classes/javax/xml/soap/SOAPException.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/SOAPConnectionUtil.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DUnaryPattern.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenExtension.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaWriter.java.i
data/src/share/classes/com/sun/xml/internal/ws/message/DOMHeader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.vsd.i
data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/WSService.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/encoding/Encoder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java.i
-data/src/share/classes/com/sun/codemodel/internal/JExpr.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/xml/StAXSource.java.i
-data/src/share/classes/com/sun/xml/internal/ws/modeler/RuntimeModelerException.java.i
-data/src/share/classes/org/relaxng/datatype/Datatype.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MessageBundle.properties.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/Response.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/MimeHelper.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Schema.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java.i
-data/src/share/classes/javax/xml/bind/ParseConversionEvent.java.i
data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java.i
data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DatatypeFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlTransient.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java.i
-data/src/share/classes/javax/xml/soap/Node.java.i
data/src/share/classes/com/sun/codemodel/internal/TypedAnnotationWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java.i
-data/src/share/classes/javax/xml/bind/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java.i
-data/src/share/classes/com/sun/istack/internal/NotNull.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java.i
+data/src/share/jaxws_classes/javax/jws/soap/SOAPBinding.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DataPatternBuilderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointEntityResolver.java.i
data/src/share/classes/com/sun/tools/internal/xjc/api/Property.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java.i
-data/src/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayIntMap.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/prop/LeafElementProp.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java.i
+data/src/share/jaxws_classes/javax/xml/ws/soap/AddressingFeature.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StatisticImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Long.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java.i
-data/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPEncoder.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/TODO.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java.i
-data/src/share/classes/javax/xml/ws/spi/package.html.i
-data/src/share/classes/com/sun/codemodel/internal/CodeWriter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DListPattern.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArray.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java.i
-data/src/share/classes/javax/xml/ws/EndpointReference.java.i
-data/src/share/classes/javax/xml/ws/http/package.html.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java.i
-data/src/share/classes/javax/xml/soap/DetailEntry.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java.i
-data/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java.i
+data/src/share/jaxws_classes/javax/xml/bind/Marshaller.java.i
+data/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/XmlAccessorFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPConnectionFactory.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JAXMStreamSource.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/CodeType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Package.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java.i
data/src/share/classes/com/sun/xml/internal/ws/resources/soap.properties.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/CommentList.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventLocatorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ByteVector.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java.i
data/src/share/classes/com/sun/tools/internal/jxc/apt/ErrorReceiverImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java.i
-data/patch.out.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Message.java.i
data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Invoker.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/CycleIterator.java.i
-data/src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java.i
data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java.i
data/src/share/classes/com/sun/xml/internal/txw2/EndDocument.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointDocInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/ContextMap.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java.i
data/src/share/classes/com/sun/tools/internal/txw2/model/Define.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java.i
-data/src/share/classes/javax/xml/soap/MessageFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFInvocationHandler.java.i
-data/src/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAdapter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/HeaderBlock.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java.i
-data/src/share/classes/javax/xml/ws/handler/LogicalHandler.java.i
-data/src/share/classes/com/sun/tools/internal/ws/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/List.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SEIPortInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/package.html.i
data/src/share/classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java.i
data/src/share/classes/com/sun/xml/internal/ws/handler/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java.i
-data/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java.i
-data/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/ServiceDelegate.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/JAXPParser.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Block.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerRtException.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/ClientContainer.java.i
data/src/share/classes/com/sun/xml/internal/bind/api/Bridge.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java.i
-data/src/share/classes/javax/xml/soap/SAAJResult.java.i
-data/src/share/classes/com/sun/codemodel/internal/ClassType.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaDocument.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java.i
-data/src/share/classes/javax/activation/MimeTypeParseException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/ValuePattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/BadCommandLineException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/AbstractServerAsyncTransport.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java.i
data/src/share/classes/com/sun/xml/internal/xsom/XSAttributeDecl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties.i
-data/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java.i
-data/src/share/classes/javax/xml/bind/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/encoding/DispatchSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingMetadataConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java.i
data/src/share/classes/com/sun/xml/internal/txw2/Pcdata.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java.i
-data/src/share/classes/javax/xml/ws/wsaddressing/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Ref.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties.i
-data/src/share/classes/META-INF/mailcap.default.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Term.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java.i
data/src/share/classes/javax/xml/bind/annotation/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java.i
data/src/share/classes/com/sun/xml/internal/rngom/parse/host/AnnotationsHost.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Classes.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/PortInfoBase.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java.i
data/src/share/classes/com/sun/xml/internal/txw2/TypedXmlWriter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/MapBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlList.java.i
-data/src/share/classes/com/sun/codemodel/internal/JTryBlock.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/EncodingMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Data.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java.i
data/src/share/classes/com/sun/codemodel/internal/JAnonymousClass.java.i
-data/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/Base64.java.i
data/src/share/classes/com/sun/istack/internal/localization/LocalizableMessage.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/ExceptionType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java.i
-data/src/share/classes/com/sun/xml/internal/bind/util/Which.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/TextType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTransientQuick.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/Encoder.java.i
data/.hgignore.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java.i
-data/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java.i
-data/src/share/classes/com/sun/xml/internal/ws/fault/CodeType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlInlineBinaryData.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/Language.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/WSDLGenInfo.java.i
data/src/share/classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/XMLEPTFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java.i
-data/src/share/classes/com/sun/codemodel/internal/JExpression.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/Base64.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Element.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/addressing/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java.i
-data/src/share/classes/javax/jws/WebResult.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/FastInfosetConnector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/RawAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlRootElement.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSNotation.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java.i
-data/src/share/classes/com/sun/xml/internal/bind/marshaller/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java.i
-data/LICENSE.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/DispatchDelegate.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointResponseMessageBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/AttGroupDeclImpl.java.i
-data/src/share/classes/javax/xml/soap/SOAPFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchBase.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/server/ProviderXMLMD.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java.i
-data/src/share/classes/com/sun/activation/registries/MailcapFile.java.i
-data/src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/DoubleEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java.i
data/src/share/classes/com/sun/codemodel/internal/JInvocation.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/package-info.java.i
data/src/share/classes/com/sun/tools/internal/txw2/NameUtil.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoBase.java.i
-data/src/share/classes/javax/xml/ws/handler/HandlerResolver.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/prop/ValueProp.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgCreateException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Features.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/server/XMLMessageDispatcher.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/Attribute.java.i
data/src/share/classes/com/sun/xml/internal/stream/buffer/FragmentedArray.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/Util.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SOAPMessageContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/LocalNameQualifiedNamesMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SCAnnotations.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/Cdata.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java.i
-data/src/share/classes/javax/xml/bind/annotation/DomHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Element.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/TextImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java.i
data/src/share/classes/javax/xml/ws/handler/MessageContext.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlAttribute.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WebServiceContextImpl.java.i
-data/src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/RfcDateParser.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java.i
-data/src/share/classes/javax/xml/ws/handler/soap/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java.i
data/src/share/classes/com/sun/istack/internal/ByteArrayDataSource.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java.i
-data/ASSEMBLY_EXCEPTION.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibraryFactory.java.i
data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/SOAP12NotUnderstoodHeaderBlock.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/EnumConstant.java.i
-data/patches/jaxws_src/README.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/BindingOperation.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java.i
-data/src/share/classes/javax/xml/ws/soap/MTOM.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/UtilException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java.i
+data/src/share/classes/javax/xml/soap/SOAPElementFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoSetImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java.i
-data/src/share/classes/com/sun/codemodel/internal/JSwitch.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetCodec.java.i
+data/src/share/classes/com/sun/xml/internal/ws/modeler/RuntimeModeler.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java.i
-data/src/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/local/LocalMessage.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/JAXWSClassFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitor.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Float.java.i
-data/src/share/classes/com/sun/xml/internal/ws/package-info.java.i
-data/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/Naming.java.i
+data/src/share/jaxws_classes/javax/xml/bind/JAXB.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaExtensionHandler.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java.i
data/src/share/classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java.i
-data/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PrivateObjectFactoryGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java.i
-data/src/share/classes/javax/xml/ws/BindingType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java.i
-data/src/share/classes/com/sun/codemodel/internal/JStatement.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/FieldSignature.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementFactory.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java.i
-data/src/share/classes/javax/xml/ws/handler/LogicalMessageContext.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlRootElement.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/presentation/MessageStruct.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JExpression.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Div.java.i
data/src/share/classes/com/sun/tools/internal/ws/util/xml/PrettyPrintingXmlWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/client.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/localization/Localizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/ContentType.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/generator/Names.java.i
data/src/share/classes/com/sun/xml/internal/xsom/ForeignAttributes.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/Ring.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlSchema.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java.i
-data/src/share/classes/com/sun/codemodel/internal/JMod.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultCode.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/DistributedPropertySet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java.i
data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java.i
data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/client/SOAPMessageDispatcher.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java.i
+data/src/share/jaxws_classes/javax/xml/bind/WhiteSpaceProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/MessageBundle.properties.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DGrammarPattern.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/WSBinding.java.i
-data/src/share/classes/com/sun/codemodel/internal/JDeclaration.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/ErrorListener.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java.i
-data/src/share/classes/javax/xml/ws/ResponseWrapper.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/protocol/Interceptors.java.i
-data/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultReasonText.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java.i
data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java.i
data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/MessagePart.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorOptions.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java.i
-data/src/share/classes/com/sun/codemodel/internal/JEnumConstant.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaElement.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java.i
data/src/share/classes/javax/jws/HandlerChain.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java.i
data/src/share/classes/com/sun/xml/internal/txw2/Text.java.i
-data/src/share/classes/javax/xml/soap/SOAPElement.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/TxwOptions.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java.i
-data/src/share/classes/javax/xml/ws/handler/Handler.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Value.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSFacet.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Service.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/ValidationEventImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AbortException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/FieldSetter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchemaSet.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaAttribute.java.i
-data/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationFinder.java.i
data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpCookie.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WebServiceContext.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/DeferedCollection.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ArrayField.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java.i
data/src/share/classes/com/sun/xml/internal/ws/handler/XMLLogicalMessageImpl.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java.i
-data/src/share/classes/com/sun/codemodel/internal/JExpressionImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java.i
-data/src/share/classes/javax/annotation/Generated.java.i
-data/src/share/classes/com/sun/codemodel/internal/JContinue.java.i
-data/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java.i
-data/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/encoding/Encoder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/LazyMOMProvider.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Description.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/ChunkInputStream.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/DispatchContactInfoList.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAPXMLEncoder.java.i
data/src/share/classes/javax/xml/bind/annotation/XmlNsForm.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties.i
data/src/share/classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAPXMLDecoder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java.i
-data/make/build.xml.i
-data/src/share/classes/com/sun/codemodel/internal/JJavaName.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java.i
-data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java.i
+data/src/share/jaxws_classes/javax/jws/soap/SOAPMessageHandlers.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelException.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/MIMEPartStreamingDataHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/MessageContext.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/EPTFactoryFactoryBase.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Schema.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java.i
data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java.i
-data/src/share/classes/javax/xml/bind/WhiteSpaceProcessor.java.i
-data/src/share/classes/javax/xml/bind/attachment/package.html.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Empty.java.i
data/src/share/classes/com/sun/xml/internal/ws/binding/soap/SOAPBindingImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java.i
data/src/share/classes/com/sun/codemodel/internal/fmt/JTextFile.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Step.java.i
-data/src/share/classes/javax/activation/CommandObject.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeSet.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DElementPattern.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/handler.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/TXW.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/AppMsgContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Port.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/AsyncHandlerService.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Attribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/AnnotationsImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/MBeanListener.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java.i
data/src/share/classes/com/sun/codemodel/internal/JAnnotationArrayMember.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/xml/NodeListIterator.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/local/client/LocalClientTransportFactory.java.i
-data/src/share/classes/javax/xml/bind/helpers/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java.i
-data/src/share/classes/com/sun/codemodel/internal/JArray.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSVariety.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingImpl.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java.i
-data/src/share/classes/javax/xml/ws/WebServiceRefs.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java.i
-data/src/share/classes/javax/xml/soap/Name.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/AnnotationsImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureMember.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java.i
+data/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaParser.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAnnotation.java.i
data/src/share/classes/com/sun/xml/internal/ws/util/xml/StAXResult.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/config/ClassModelInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java.i
data/src/share/classes/com/sun/xml/internal/ws/message/RelatesToHeader.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/Delegate.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelException.java.i
data/src/share/classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java.i
-data/src/share/classes/javax/xml/soap/SOAPMessage.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java.i
data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLFetcher.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java.i
data/src/share/classes/com/sun/xml/internal/dtdparser/InternalEntity.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/FeatureConstructor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Property.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java.i
-data/src/share/classes/javax/xml/bind/util/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPDecoder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java.i
-data/src/share/classes/javax/xml/soap/SOAPConnectionFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java.i
data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTube.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/presentation/TargetFinder.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/CommentListImpl.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java.i
data/src/share/classes/com/sun/xml/internal/ws/pept/protocol/MessageDispatcher.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java.i
-data/src/share/classes/javax/xml/ws/package.html.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/BuiltInTypes.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java.i
data/src/share/classes/javax/jws/Oneway.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java.i
-data/src/share/classes/com/sun/tools/internal/ws/Invoker.java.i
-data/src/share/classes/javax/xml/soap/MimeHeader.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/DocInfo.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java.i
+data/src/share/jaxws_classes/javax/xml/soap/Name.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java.i
data/src/share/classes/javax/xml/bind/annotation/XmlAnyAttribute.java.i
-data/src/share/classes/com/sun/tools/internal/ws/ToolVersion.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java.i
-data/make/README.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAPXMLDecoder.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchBase.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java.i
-data/make/tools/StripProperties/StripPropertiesTask.java.i
-data/THIRD_PARTY_README.i
-data/src/share/classes/javax/xml/ws/http/HTTPBinding.java.i
-data/src/share/classes/javax/xml/bind/SchemaOutputResolver.java.i
-data/src/share/classes/javax/activation/FileTypeMap.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/ErrorListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyle.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/PortType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java.i
data/src/share/classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/StartDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/QualifiedName.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlEnum.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/parser/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java.i
-data/src/share/classes/com/sun/istack/internal/Interned.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java.i
-data/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/AverageRangeStatisticImpl.java.i
data/src/share/classes/javax/xml/soap/SOAPFault.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java.i
-data/src/share/classes/javax/jws/WebParam.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/fault/SubcodeType.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/simpletype/SimpleTypeConstants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayDataSource.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBType.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MtomCallback.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java.i
-data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/api/ErrorListener.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/Request.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/VocabularyApplicationData.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java.i
data/src/share/classes/com/sun/xml/internal/bind/api/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java.i
data/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfigurator.java.i
-data/src/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java.i
data/src/share/classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java.i
-data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/model.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/MessageContextUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeClassInfoImpl.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java.i
data/src/share/classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/soap/Style.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java.i
data/src/share/classes/com/sun/codemodel/internal/JType.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/PropertySet.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java.i
-data/src/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java.i
-data/jaxws.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfoListIterator.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/TagInfoset.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/version.properties.i
data/src/share/classes/javax/xml/ws/soap/MTOMFeature.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/encoding/DispatchUtil.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/readme.txt.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java.i
-data/src/share/classes/javax/xml/ws/Dispatch.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgFactoryCreateException.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAP12XMLDecoder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ResponseBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java.i
+data/src/share/jaxws_classes/javax/xml/ws/Dispatch.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java.i
-data/src/share/classes/javax/xml/soap/SOAPBody.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaClientTube.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/AbstractType.java.i
data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/ElementAnnotationBuilderImpl.java.i
-data/src/share/classes/javax/xml/bind/helpers/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java.i
data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerTube.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SerializationFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaActionUtil.java.i
data/src/share/classes/com/sun/tools/internal/ws/util/WSToolsObjectFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java.i
data/src/share/classes/com/sun/tools/internal/xjc/Driver.java.i
-data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java.i
-data/src/share/classes/javax/xml/bind/DatatypeConverterImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java.i
data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ScopeHost.java.i
-data/src/share/classes/com/sun/codemodel/internal/JForEach.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java.i
data/src/share/classes/com/sun/codemodel/internal/JGenerifiable.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderFactory.java.i
-data/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlRegistry.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/NodeSet.java.i
-data/src/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/Mode.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ConnectedComponent.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizations.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/SenderException.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java.i
-data/src/share/classes/com/sun/codemodel/internal/JBlock.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java.i
-data/src/share/classes/javax/activation/SecuritySupport.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java.i
-data/src/share/classes/javax/activation/URLDataSource.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java.i
+data/src/share/jaxws_classes/javax/xml/bind/ValidationEventLocator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java.i
data/src/share/classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementDeclWriter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties.i
-data/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/server/Invoker.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/Main.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPolicyValidator.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/StubAsyncHandler.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java.i
-data/src/share/classes/javax/xml/ws/LogicalMessage.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAP12XMLDecoder.java.i
data/src/share/classes/com/sun/codemodel/internal/JConditional.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java.i
-data/src/share/classes/javax/activation/UnsupportedDataTypeException.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/internal/InternalEncoder.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/server/SOAPMessageDispatcher.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/Util.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/SCD.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ClientConfigurationException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapters.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/NextAction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages_ja.properties.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/LocationHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/PayloadElementSniffer.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/TreeException.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ClassNameInfo.java.i
data/src/share/classes/javax/activation/DataSource.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/ASCIIUtility.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/Schema.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java.i
-data/src/share/classes/javax/xml/ws/soap/SOAPBinding.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java.i
data/src/share/classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java.i
data/src/share/classes/javax/xml/ws/soap/package.html.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java.i
-data/src/share/classes/javax/xml/bind/JAXBElement.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/UName.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JNullType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/Block.java.i
-data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/StubBase.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/server/ProviderSOAPMD.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java.i
data/src/share/classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JDirectClass.java.i
data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SystemHandlerDelegateFactory.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/XmlNode.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainCaller.java.i
-data/src/share/classes/com/sun/codemodel/internal/fmt/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/NullIterator.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/AbortException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java.i
-data/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extensible.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java.i
-data/src/share/classes/javax/activation/MimetypesFileTypeMap.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/TypeCast.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/ServerSideException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/SaxSerializer.java.i
data/src/share/classes/com/sun/xml/internal/ws/server/Tie.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java.i
-data/src/share/classes/com/sun/istack/internal/localization/Localizer.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Options.java.i
data/src/share/classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java.i
data/src/share/classes/com/sun/tools/internal/xjc/util/DOMUtils.java.i
-data/src/share/classes/com/sun/codemodel/internal/JCast.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java.i
-data/src/share/classes/javax/xml/ws/WebServiceClient.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerContext.java.i
-data/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/WSDLBoundFaultContainer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StreamSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JForEach.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd.i
data/src/share/classes/com/sun/xml/internal/xsom/XSComplexType.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java.i
data/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/package.html.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSet.java.i
data/src/share/classes/javax/xml/bind/util/Messages.properties.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java.i
data/src/share/classes/com/sun/xml/internal/xsom/XSElementDecl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java.i
data/src/share/classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypeWriter.java.i
-data/src/share/classes/com/sun/codemodel/internal/JClassContainer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/apt/package.html.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Message.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalSignatureException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/server/XMLMessageDispatcher.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleReferenceNodeProperty.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPBinding.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/JAXWSAttachmentUnmarshaller.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlTransient.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java.i
data/src/share/classes/com/sun/codemodel/internal/JTypeVar.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java.i
-data/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeContextImpl.java.i
data/src/share/classes/com/sun/xml/internal/xsom/impl/XPathImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java.i
-data/src/share/classes/javax/annotation/PreDestroy.java.i
data/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternFunction.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java.i
data/src/share/classes/com/sun/xml/internal/ws/handler/XMLLogicalMessageContextImpl.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java.i
-data/src/share/classes/com/sun/codemodel/internal/JMods.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java.i
data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.properties.i
data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceReferenceCollector.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java.i
-data/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java.i
+data/make/README.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/PayloadQNameBasedOperationFinder.java.i
data/src/share/classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java.i
-data/src/share/classes/javax/xml/bind/Unmarshaller.java.i
-data/src/share/classes/javax/activation/DataContentHandler.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/soap/Use.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/AsyncOperation.java.i
data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java.i
data/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java.i
-data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java.i
-data/src/share/classes/javax/xml/ws/BindingProvider.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/PrintTable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/DetailType.java.i
data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBTypeSerializer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBinding.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java.i
-data/src/share/classes/javax/xml/bind/util/JAXBSource.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarSectionImpl.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MessageBundle.properties.i
data/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.xsd.i
data/src/share/classes/com/sun/xml/internal/ws/transport/local/server/LocalConnectionImpl.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java.i
-data/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/TypeSet.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/Node.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java.i
data/src/share/classes/com/sun/codemodel/internal/JDirectClass.java.i
-data/src/share/classes/com/sun/codemodel/internal/JReturn.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java.i
data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java.i
-data/src/share/classes/com/sun/codemodel/internal/JOp.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodSetter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SDDocumentResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndDocumentEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java.i
data/src/share/classes/com/sun/istack/internal/FinalArrayList.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java.i
data/src/share/classes/javax/xml/bind/GetPropertyAction.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlType.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaInterface.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java.i
-data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java.i
-data/src/share/classes/com/sun/istack/internal/SAXException2.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPRuntimeModel.java.i
data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Block.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java.i
-data/src/share/classes/javax/xml/bind/ValidationEventLocator.java.i
-data/README.i
-data/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/LineInputStream.java.i
data/src/share/classes/javax/xml/soap/FactoryFinder.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/prop/Prop.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/MessageInfoUtil.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java.i
-data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java.i
-data/src/share/classes/com/sun/xml/internal/rngom/parse/Context.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/AbstractAxisImpl.java.i
+data/src/share/classes/javax/xml/soap/SOAPFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/ExternalEntity.java.i
data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/TxwException.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java.i
-data/src/share/classes/javax/xml/bind/annotation/W3CDomHandler.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java.i
+data/src/share/classes/javax/xml/bind/SchemaOutputResolver.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/package.html.i
data/src/share/classes/com/sun/xml/internal/ws/api/BindingID.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOM4JLocator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterFactory.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html.i
-data/src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/util/Pool.java.i
-data/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java.i
-data/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java.i
-data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractObjectImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.png.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/Stub.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingPrefixMapper.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfoListIterator.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java.i
-data/src/share/classes/com/sun/codemodel/internal/JVar.java.i
-data/src/share/classes/javax/xml/bind/annotation/XmlSchemaType.java.i
-data/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java.i
-data/src/share/classes/javax/xml/ws/FaultAction.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/MessageInfoBase.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/EnvelopeStyleFeature.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/DatatypeLibrary.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgFactoryCreateException.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataExceptPattern.java.i
data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java.i
data/src/share/classes/com/sun/tools/internal/xjc/util/NullStream.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java.i
-data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/model/MEP.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java.i
-data/src/share/classes/com/sun/tools/internal/ws/resources/util.properties.i
-data/src/share/classes/com/sun/xml/internal/ws/developer/package-info.java.i
-data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPEPTFactory.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java.i
-data/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java.i
-data/src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java.i
-data/src/share/classes/com/sun/tools/internal/txw2/model/prop/ElementProp.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java.i
-data/src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/NotationImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java.i
-data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java.i
-data/src/share/classes/com/sun/xml/internal/xsom/impl/util/ConcatIterator.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/PeptTie.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/resources/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java.i
+data/src/share/jaxws_classes/javax/xml/ws/Endpoint.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ServiceSharedFeatureMarker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Const.java.i
data/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorBase.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java.i
-data/src/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java.i
-data/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java.i
-data/src/share/classes/com/sun/codemodel/internal/JDoLoop.java.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/NamespaceContextImplementation.java.i
data/src/share/classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java.i
-data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java.i
-data/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOM4JLocator.java.i
data/src/share/classes/com/sun/tools/internal/jxc/ConfigReader.java.i
-data/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java.i
-data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java.i
data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/package.html.i
-data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java.i
-data/src/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java.i
-data/src/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java.i
-data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java.i
-data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java.i
-data/src/share/classes/javax/xml/bind/PropertyException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXPluginCustomization.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/ErrorReceiverImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java.i
+data/src/share/classes/com/sun/codemodel/internal/JClass.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamAttachment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterPipeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/generator.properties.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Documentation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/MetadataUtil.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MessageContext.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnumValue.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Byte.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java.i
+data/nbproject/findbugs.settings.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Options.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JPropertyFile.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/Resolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package.html.i
+data/src/share/jaxws_classes/com/sun/istack/internal/SAXException2.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/ModelInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLEncoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/PatcherManager.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/QualifiedName.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Element.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EndOfInputException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/XMLStreamReaderToContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/ParserContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java.i
+data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGCompiler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/annotation/package.html.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXFilteredEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/package.html.i
+data/src/share/classes/javax/xml/ws/spi/Provider.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlElementDecl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSContentType.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ContentHandlerAdaptor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/ForeignAttributes.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/InfosetScanner.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/BindingProviderProperties.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorActionVersion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerDouble.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Notation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPMessageContext.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/SEIModel.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/CountStatistic.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAP12XMLEncoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/Vocabulary.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/package-info.java.i
+data/src/share/classes/javax/jws/WebMethod.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPFaultInfo.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/parser/XSOMParser.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java.i
+data/src/share/classes/com/sun/istack/internal/localization/Localizable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Fault.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/Plugin.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPFault.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DTextPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePullMultipart.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractMultiInstanceResolver.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/SimpleToBoxedUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementAssertionCreator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TextLoader.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java.i
+data/src/share/classes/javax/xml/bind/util/ValidationEventCollector.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DXMLPrinter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/DomHandlerEx.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBindingImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParsingException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/InvalidAddressingHeaderException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ExtensionBindingChecker.java.i
+data/src/share/jaf_classes/javax/activation/DataHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Operation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/GetterSetterPropertySeed.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JDoLoop.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/PropertyFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/fault/CodeType.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/BootAMXMBean.java.i
+data/src/share/classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/SafePolicyReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAPMsgCreateException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/MessageBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Klass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Main.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/util/ClientProcessorEnvironment.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MessageCreationException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/StatefulWebServiceManager.java.i
+data/src/share/classes/com/sun/codemodel/internal/JFieldRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetadataResolverFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/wsservlet.properties.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Scope.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUDecoderStream.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/XMLDeclarationParser.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/AttachmentMarshallerImpl.java.i
+data/src/share/classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JEnumConstant.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JReturn.java.i
+data/src/share/classes/javax/xml/bind/attachment/package.html.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Handler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/SecureLoader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumValueWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/MessageContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DDataPattern.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/SHDSOAPMessageContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/encoding/DispatchUtil.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultReason.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/EPRRecipe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java.i
+data/src/share/classes/javax/activation/CommandInfo.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlRegistry.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingMode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/Headers.java.i
+data/src/share/classes/javax/xml/ws/handler/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JDefinedClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/TXWResult.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Fiber.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/Names.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/DataBindingException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/util/ConcatIterator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java.i
+data/src/share/classes/com/sun/xml/internal/bind/api/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java.i
+data/src/share/classes/javax/xml/bind/JAXB.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingProvider.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeParam.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/DTDParser.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/Messages.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/runtime/package.html.i
+data/src/share/jaxws_classes/javax/xml/ws/WebEndpoint.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/Reconfigurable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/SDDocument.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/Parameter.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/package.html.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAP12ExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlEncoded.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAPXMLEncoder.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/JAXWSBindingInfoParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressingFeature.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassRef.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssemblerFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeRef.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/InternetHeaders.java.i
+data/src/share/classes/com/sun/codemodel/internal/JGenerable.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElementRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPattern.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/Nullable.java.i
+data/src/share/classes/com/sun/tools/internal/ws/util/ToolBase.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/Util.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Port.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP11Codec.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/configuration.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/ClassNameCollector.java.i
+data/src/share/classes/javax/xml/bind/helpers/ValidationEventImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/util/FilterIterator.java.i
+data/src/share/classes/javax/xml/ws/spi/FactoryFinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTubeHelper.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElementInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlMixed.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java.i
+data/src/share/jaf_classes/javax/activation/FileTypeMap.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/Content.java.i
+data/src/share/jaxws_classes/javax/xml/ws/AsyncHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/LogicalMessageContext.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/ContentModelBinder.java.i
+data/src/share/classes/javax/xml/ws/Endpoint.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java.i
+data/src/share/classes/javax/xml/bind/JAXBContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java.i
+data/src/share/jaxws_classes/javax/xml/ws/http/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/CallbackMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/StreamingMessages.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/ConsoleErrorReporter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/AttributePattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Fault.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimePartDataSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/TXWResult.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/SOAPActionBasedOperationFinder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Pool.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java.i
+data/src/share/classes/javax/xml/soap/AttachmentPart.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Service.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/CompatibilityDatatypeLibrary.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CElement.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CNonElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/SOAPVersion.java.i
+data/src/share/classes/com/sun/istack/internal/tools/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/EndpointMessageContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/PatternParseable.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlValueQuick.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/Locatable.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java.i
+data/src/share/classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/FacetImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JJavaName.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/FreshComplexTypeBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/LogicalHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/JAXWSUtils.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/IllegalSignatureException.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/CycleRecoverable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java.i
+data/make/Makefile.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentEx.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/EncodingMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/EndpointAddress.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointReferenceExtensionContributor.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameClass.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferProcessor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLConstants.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/package-info.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Header.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/DataPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/streaming.properties.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java.i
+data/.jcheck/conf.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefWriter.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/FieldAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientTransportException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RestrictionViolationException.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamReaderToContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/ElementPattern.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/Constants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Scope.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/TypedAnnotationWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Detail1_2Impl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java.i
+data/src/share/classes/com/sun/istack/internal/Nullable.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationParserFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WhitespaceStripper.java.i
+data/src/share/classes/com/sun/codemodel/internal/JResourceFile.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BooleanEncodingAlgorithm.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Byte.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/protocol/MessageDispatcherHelper.java.i
+data/src/share/jaxws_classes/javax/xml/ws/Provider.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java.i
+data/src/share/classes/javax/xml/bind/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Parameter.java.i
+data/src/share/classes/javax/activation/DataHandler.java.i
+data/src/share/classes/javax/xml/bind/helpers/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MexEntityResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/Container.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ReadIterator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/IndentingWriter.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Character.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package.html.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIElement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/CompileTool.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/wsdlmodel.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementInfo.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/ErrorListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerTube.java.i
+data/src/share/jaf_classes/javax/activation/CommandInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/NameClassBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/AnnotationParser.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/util/ProcessorEnvironment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/Injector.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/xsd/package.html.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardMode.java.i
+data/src/share/jaxws_classes/javax/xml/bind/NotIdentifiableEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/ResourceEntityResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ContentType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InternalEntity.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/fastinfoset/FastInfosetFeature.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Stubs.java.i
+data/src/share/classes/javax/xml/soap/SOAPBodyElement.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeMultipartParser.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Data.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/RequestContext.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/StreamSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/ActionConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java.i
+data/src/share/classes/com/sun/codemodel/internal/JForLoop.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/WSDLContext.java.i
+data/src/share/jaxws_classes/javax/xml/bind/package.html.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/SchemaWriter.java.i
+data/src/share/jaxws_classes/javax/xml/bind/JAXBElement.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSXPath.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindGreen.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAtom.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementAdapter.java.i
+data/src/share/jaf_classes/javax/activation/URLDataSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Context.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java.i
+data/src/share/classes/com/sun/tools/internal/ws/util/xml/XmlWriter.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/StringPattern.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointFactory.java.i
+data/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JWhileLoop.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StartDocumentEvent.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java.i
+data/src/share/classes/com/sun/activation/registries/MimeTypeEntry.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/ValueGetter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/EndpointCallBridge.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/package.html.i
+data/src/share/classes/javax/xml/bind/annotation/XmlAccessorOrder.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/DefaultWithLexicalHandler.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/redefine.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Name.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/PackageOutline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/package.html.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Constants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/ExternalEntity.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactParseable.java.i
+data/src/share/jaxws_classes/javax/jws/WebParam.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/Options.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ForkContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/config.xsd.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ValueProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/Pcdata.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/CodeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPFactoryDynamicImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/WSDLModelInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRootElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/Attribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/StringPattern.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmAttributes.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JDefinedClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SwaRefAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/spi/PolicyMapConfigurator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/ResponseImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java.i
+data/src/share/classes/javax/xml/bind/NotIdentifiableEvent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRendererFactory.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSIdentityConstraint.java.i
+data/src/share/classes/javax/xml/bind/UnmarshallerHandler.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/EncodingAlgorithmContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceResolver.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Stats.java.i
+data/src/share/jaxws_classes/javax/xml/bind/attachment/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Axis.java.i
+data/src/share/jaxws_classes/javax/xml/bind/JAXBContext.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementRefs.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAPCodec.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/Messages.java.i
+data/src/share/jaxws_classes/javax/xml/bind/JAXBIntrospector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ManagementMessages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Pipe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractTubeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayReferenceNodeProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ContentNegotiation.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/Headers.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Definitions.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLStreamWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFeaturedObject.java.i
+data/src/share/jaf_classes/javax/activation/DataContentHandlerFactory.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/SimpleTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DValuePattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/PrimitiveTypeContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/DatabindingProviderImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DTDExtensionBindingChecker.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/util/EncoderFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/StringUtils.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/IncludeSubclass.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMetadata.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/UName.java.i
+data/src/share/classes/javax/xml/ws/RequestWrapper.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JLabel.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/annotation/XmlLocation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/MessageBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_DOM_Or_XML_DOM_SAX_SAXEvent.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/HexadecimalEncodingAlgorithm.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/SchemaCompilerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderRecyclable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSComponent.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/DelegateBase.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/DuplicateAttributeDetector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseInputStream.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JVar.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/ErrorReceiver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableHttpHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/NextAction.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelElement.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/Decoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/TypeInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/WildcardLoader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/TidyXMLStreamReader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/CompletedFuture.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/configuration.properties.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarSectionImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractWrapperBeanGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/NullLocalizable.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/AntErrorListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/PropertyInfo.java.i
+data/jaxws.patch.d
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/group.java.i
+data/jaxws.patch.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/SCDBasedBindingSet.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPMessageContextImpl.java.i
+data/src/share/classes/javax/xml/ws/RespectBindingFeature.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLFaultImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/OneOrMorePattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java.i
+data/src/share/jaxws_classes/javax/jws/Oneway.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DataWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/VersionUtil.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/Databinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ImpliesWebServiceFeature.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/util/QNameMap.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/SystemHandlerDelegate.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WscompileMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/PipeAdapter.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServiceException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ClassFactory.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/DispatchMessages.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java.i
+data/src/share/classes/javax/xml/soap/SOAPHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/util/StAXFilteredParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/util/FlattenIterator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportListener.java.i
+data/src/share/classes/javax/xml/bind/helpers/PrintConversionEventImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/util/EditDistance.java.i
+data/src/share/classes/javax/xml/ws/spi/ServiceDelegate.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/EndOfInputException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/org/apache/xerces/util/XMLChar.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/modeler.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CCustomizable.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/PatternInterner.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java.i
+data/src/share/classes/com/sun/codemodel/internal/JCommentPart.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/episode/package-info.java.i
+data/src/share/jaxws_classes/javax/xml/bind/util/ValidationEventCollector.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlElement.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/Language.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSTerm.java.i
+data/src/share/jaxws_classes/javax/jws/WebService.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/EncoderDecoderBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlLocation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/LeafInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/AuthInfo.java.i
+data/src/share/classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java.i
+data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/bindingApi.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorRootService.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/Constructor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/Component.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/InternalBindingProvider.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xs.xsd.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListFieldRenderer.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ContentModelContainer.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAssignmentTarget.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/Model.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DivImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Scope.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/addressing.properties.i
+data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLOperation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingContextFactory.java.i
+data/src/share/classes/javax/annotation/PostConstruct.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParseException.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java.i
+data/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/PacketDispatch.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JwsImplGenerator.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/UniqueValue.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java.i
+data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/util/GenericConstructor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/BodyElement1_2Impl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/JAXWSAttachmentMarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DInterleavePattern.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/package.html.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Import.java.i
+data/src/share/jaxws_classes/javax/xml/ws/soap/Addressing.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Patcher.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java.i
+data/src/share/classes/javax/activation/MimeType.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AfterPattern.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMMessage.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Constants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/util/Uri.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAnnotationStringValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DTextPattern.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlElement.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Ring.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/SOAPVersion.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorTypeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/localization/NullLocalizable.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StructureLoader.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DDefine.java.i
+data/src/share/classes/javax/xml/soap/SOAPFaultElement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/WebserviceapMessages.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/webserviceap.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/Util.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/writer/WSDLGeneratorExtension.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/SOAPConnectionUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/modeler.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/OverlapDetector.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/InheritedAttribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/Cdata.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/Operation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferCreator.java.i
+data/src/share/classes/com/sun/codemodel/internal/JExpr.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/PortAddressResolver.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/MIMEConstants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OneWayFeature.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JSwitch.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java.i
+data/src/share/classes/org/relaxng/datatype/ValidationContext.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/AnnotationProcessorFactoryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Fault.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java.i
+data/src/share/classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java.i
+data/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ClassOutline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFinder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypePatternBinder.java.i
+data/src/share/classes/com/sun/codemodel/internal/CodeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/HandlerMessages.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/SimpleNameClass.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/HeaderFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/EditDistance.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AbstractType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Element.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/EnvelopeImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointDocInfo.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/ForkEntityResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AbstractInstanceResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/ByteArrayOutputStreamEx.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlNames.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/NameGetter.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Port.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java.i
+data/src/share/jaxws_classes/javax/xml/ws/soap/SOAPBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientLogicalHandlerTube.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedTransducedAccessorFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/particle.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensibilityHelper.java.i
+data/src/share/classes/com/sun/codemodel/internal/fmt/JPropertyFile.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/StartWithExtensionsType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeUse.java.i
+data/src/share/classes/javax/xml/soap/SAAJResult.java.i
+data/src/share/classes/com/sun/codemodel/internal/ClassType.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXClient.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java.i
+data/src/share/classes/javax/activation/MimeTypeParseException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAPXMLDecoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSService.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ApClassLoader.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JStatement.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GloballyKnown.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/ProviderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Adapter.java.i
+data/src/share/classes/javax/xml/ws/wsaddressing/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundPortType.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/ModelBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/IdentityConstraintImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Frame.java.i
+data/src/share/classes/javax/activation/DataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Adapter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/StaxSerializer.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/PortInfoBase.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/util/MapBase.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeValuePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNs.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/SelectOptimalEncodingFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java.i
+data/src/share/classes/javax/xml/soap/MessageFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Include.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java.i
+data/src/share/classes/javax/xml/ws/BindingType.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/RefPattern.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesEx.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMLocator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/pacakge-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/MimeCodec.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Abstractifier.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ReadAllStream.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/ExtendedModelVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/XMLHTTPBindingCodec.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityAction.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/http/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/WsImport.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentRegistry.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Headers.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/DispatchDelegate.java.i
+data/src/share/classes/javax/xml/ws/BindingProvider.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ValueListBeanInfoImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/XmlJavaTypeAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/server/ProviderXMLMD.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/Provider.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBBridgeSource.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WebModule.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/generator.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Output.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Encoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/HaInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAP12Fault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyWSDLGeneratorExtension.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/TypeAndAnnotation.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/OptimizedAccessorFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlLocationWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/EndpointAwareTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPExtensionHandler.java.i
+data/ASSEMBLY_EXCEPTION.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/package.html.i
+data/src/share/jaxws_classes/com/sun/istack/internal/Interned.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/ConsoleErrorReporter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPluginCustomization.java.i
+data/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReferenceBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedAccessor.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/FilerCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerable.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_StAX_SAX_Or_XML_SAX_SAXEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java.i
+data/src/share/jaxws_classes/javax/xml/ws/ProtocolException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/DispatchException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/MetadataUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ResponseContext.java.i
+data/src/share/classes/com/sun/xml/internal/bind/marshaller/DataWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/SoapBodyStyle.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDefine.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/MessageCatalog.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLEventWriterOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_SAXEvent.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/addon/episode/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/Adapter.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Identifiable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerServiceScope.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NamespaceSupport.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCRuntime.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/presentation/MessageStruct.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameList.java.i
+data/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassWalker.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/WsservletMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/StAXSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlSchemaTypes.java.i
+data/src/share/jaxws_classes/javax/xml/bind/util/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/TypedXmlWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java.i
+data/src/share/classes/com/sun/codemodel/internal/JDeclaration.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JContinue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertySetter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Import.java.i
+data/src/share/jaxws_classes/javax/xml/bind/util/Messages.properties.i
+data/src/share/classes/javax/xml/ws/ResponseWrapper.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/protocol/Interceptors.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java.i
+data/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentMarshaller.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/AccessorFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JCase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderUtil.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/XmlChars.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaPropertyBag.java.i
+data/src/share/classes/javax/xml/soap/SOAPElement.java.i
+data/src/share/classes/javax/activation/URLDataSource.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/List.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java.i
+data/src/share/jaxws_classes/javax/xml/bind/util/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/subject/BindingSubject.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/WildcardImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/SOAPBindingCodec.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Documentation.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/TxwOptions.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ResponseImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpCookie.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WebServiceContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/Envelope.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/RuntimeEndpointInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/DataSourceSource.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JConditional.java.i
+data/src/share/classes/com/sun/codemodel/internal/JContinue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractFeaturedObjectImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/annotation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/RuntimeEndpointInfo.java.i
+data/src/share/jaxws_classes/javax/jws/HandlerChain.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/ServerLogicalHandlerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/TypeInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ErrorReceiverFilter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlList.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMixed.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeGroupDecl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CTypeInfo.java.i
+data/src/share/classes/javax/xml/bind/WhiteSpaceProcessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingMetadataWSDLGeneratorExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java.i
+data/src/share/classes/javax/activation/CommandObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/attributeUses.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/TXW.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLConstants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Codecs.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAttributePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/ValidationEventLocatorEx.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/client.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/SOAPBindingCodec.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/JMXAgent.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Attribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Double.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SecureLoader.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/MethodWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java.i
+data/src/share/jaxws_classes/javax/xml/soap/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntax.jj.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEContent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamReaderFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/NamespaceResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/Text.java.i
+data/README.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JThrow.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/AttributesImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java.i
+data/src/share/classes/com/sun/xml/internal/bind/api/CompositeStructure.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/ToolVersion.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageUpdatableContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/ri/OverrideAnnotationOfWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/OptionalPropertyMode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/BinaryPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Header1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Const.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttachmentRefWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndDocument.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/CommentListImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/Context.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CClassRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EndElementEvent.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtensible.java.i
+data/src/share/jaxws_classes/javax/xml/ws/soap/SOAPFaultException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/ErrorListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/FaultElement1_2Impl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/FaultDetailHeader.java.i
+data/THIRD_PARTY_README.i
+data/src/share/classes/javax/xml/ws/http/HTTPBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/FaultMessage.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOperation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/ByteArrayAttachment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/package.html.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/StartDocument.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JForLoop.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ClientTransportException.java.i
+data/src/share/classes/com/sun/istack/internal/Interned.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/CleanUpExecutorFactory.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventSource.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/DataPatternBuilderHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindBlue.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XmlVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/util/WSDLParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/PseudoSchemaBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementNodeProperty.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java.i
+data/src/share/classes/com/sun/tools/internal/ws/util/ClassNameInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/MessageContextUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlElementWrapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/WSEndpointImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MemberSubmissionAddressingExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Constructor.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RegistryInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/StAXPostInitAction.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentType.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java.i
+data/src/share/classes/javax/xml/ws/ServiceMode.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIFactoryMethod.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/readme.txt.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java.i
+data/src/share/classes/javax/xml/ws/Dispatch.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPEncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSDeclaration.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/StringArray.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Boolean.java.i
+data/src/share/classes/com/sun/xml/internal/bind/unmarshaller/DOMScanner.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SAAJMetaFactory.java.i
+data/src/share/classes/javax/xml/bind/DatatypeConverterImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JForEach.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/BeanMappingImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSchema.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/package.html.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/NameClassBuilderImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaQuick.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/FastInfosetFeatureConfigurator.java.i
+data/src/share/jaxws_classes/javax/xml/ws/EndpointReference.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/VocabularyGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/ServiceDefinition.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JPackage.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/WebModule.java.i
+data/src/share/classes/com/sun/codemodel/internal/fmt/JBinaryFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ElementPattern.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/includeDecl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBModel.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyLoader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/RuntimeWSDLParser.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/server/SOAPMessageDispatcher.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AbstractCTypeInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Binding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManager.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JFormatter.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderInfo.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaKinds.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SAAJMetaFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/DecoderStateTables.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/ChoiceNameClass.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/QNameMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java.i
+data/src/share/classes/com/sun/codemodel/internal/JOp.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/StubBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/PrefixFactory.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Parameter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributesHolder.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JCommentPart.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CClassInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/AsyncOperationType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/SoapMessages.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlValue.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Appinfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaType.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CommentEvent.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermFunctionWithParam.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SinkNode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Operation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaBuilderImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/GrammarBuilderImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/wscompile.properties.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortProperties.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/Aspect.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameList.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/xsd/Import.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java.i
+data/src/share/jaf_classes/javax/activation/FileDataSource.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AbstractDeclarationImpl.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlSchema.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleDerivation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/bytecode/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeWildcard.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/soap/Use.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttGroupDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetMIMETypes.java.i
+data/src/share/classes/com/sun/codemodel/internal/JExpression.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/ExceptionHasMessage.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/soap/SOAPBinding.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java.i
+data/src/share/classes/javax/xml/bind/util/JAXBSource.java.i
+data/src/share/classes/javax/xml/bind/annotation/adapters/XmlAdapter.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpExchange.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/InvokerSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/KeyIntMap.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/TextPattern.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlSeeAlso.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModeler.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardFunction.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/AbstractExtensibleImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/package.html.i
+data/src/share/classes/com/sun/xml/internal/txw2/NamespaceDecl.java.i
+data/src/share/classes/com/sun/istack/internal/SAXException2.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Types.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/SingleField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/ContentTypeImpl.java.i
+data/src/share/jaxws_classes/javax/xml/ws/wsaddressing/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/util/MessageInfoUtil.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/ersSet.java.i
+data/src/share/classes/javax/xml/bind/annotation/W3CDomHandler.java.i
+data/src/share/jaxws_classes/javax/xml/ws/soap/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CBuiltinLeafInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/package.html.i
+data/src/share/classes/com/sun/xml/internal/bind/api/TypeReference.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/ServerPipelineHook.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/DomPostInitAction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/SenderException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerCharacter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Data.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/ContainerResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/api/package-info.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ParticleBinder.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/LeafInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/prop/ElementProp.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Element.java.i
+data/src/share/jaxws_classes/javax/xml/ws/soap/MTOM.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/MonitorRootClient.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/ServerSchemaValidationTube.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Init.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Util.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Base64Data.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerFloat.java.i
+data/src/share/classes/com/sun/xml/internal/bind/util/Which.java.i
+data/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/Parameter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/MEP.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenTool.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetterFactory.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/EncodingAlgorithmAttributesImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/AccessorInjector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLDirectProperties.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlAnyElement.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/DistributedPropertySet.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/SOAP12FaultInfo.java.i
+data/src/share/classes/com/sun/codemodel/internal/JCatchBlock.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/package.html.i
+data/src/share/jaf_classes/javax/activation/ActivationDataFlavor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/ServiceFinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/util/TypeCast.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java.i
+data/src/share/classes/javax/xml/ws/handler/LogicalHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyMapConfigurator.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/Annotation.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaStructureType.java.i
+data/src/share/classes/javax/xml/bind/util/Messages.java.i
+data/src/share/classes/javax/xml/ws/handler/soap/SOAPHandler.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/WsdlMessages.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultClassBinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/ResourceLoader.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/fault/TextType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPOperation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetReader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLOutputResolver.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Detail1_1Impl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JLabel.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/StringCutter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ResponseContextReceiver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/binding/http/HTTPBindingImpl.java.i
+data/src/share/classes/javax/xml/ws/WebServiceContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/TypeVisitor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/Options.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/Localizable.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AttributeAccessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/handler.properties.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/wsdl.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Entity.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/server/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/NamespaceSupport.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractPipeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientTubeAssemblerContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties.i
+data/src/share/classes/com/sun/tools/internal/ws/util/JavaCompilerHelper.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeAndAnnotation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Body.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPPart1_2Impl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Properties.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Attachment.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/SenderException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Ref.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/Token.java.i
+data/src/share/classes/com/sun/xml/internal/bind/api/ClassResolver.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/FragmentContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/PolicyWSDLParserExtension.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ID.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Injector.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/RawAccessorWrapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/JavaMethod.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/ContainerElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Attribute.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBBridgeInfo.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMX.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/ASCIIUtility.java.i
+data/src/share/classes/com/sun/xml/internal/ws/binding/BindingImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Token.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSTerm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Grammar.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java.i
+data/src/share/classes/javax/xml/ws/Holder.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnectionFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/HeaderList.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/FastInfosetDataContentHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java.i
+data/LICENSE.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/tools/MaskingClassLoader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/TeeInputStream.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfoList.java.i
+data/src/share/classes/javax/xml/bind/helpers/AbstractMarshallerImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/SOAPUtil.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/CTBuilder.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java.i
+data/src/share/classes/com/sun/codemodel/internal/JFieldVar.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/xpath.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPVersion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Codecs.java.i
+data/src/share/classes/javax/jws/soap/InitParam.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCInterleaveFilter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/PortInfo.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Message.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXBContextFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java.i
+data/src/share/jaxws_classes/javax/xml/ws/Service.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java.i
+data/build-drop-template.xml.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/EmptyMessageImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/StatefulFeature.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/SourceReaderFactory.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java.i
+data/src/share/jaxws_classes/javax/xml/bind/ContextFinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JavaCompiler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartDescriptorImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ConsoleErrorReporter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SOAPConstants.java.i
+data/src/share/classes/javax/xml/ws/Provider.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/DeploymentDescriptorParser.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/Stateful.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SchemaParser.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/ListPattern.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/MIMEExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserTokenManager.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Body1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/Vocabulary.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/PolicyMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java.i
+data/src/share/classes/javax/xml/ws/handler/HandlerResolver.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/version.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/Schema.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/DatatypeWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ClassNameAllocatorImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/PayloadQNameBasedDispatcher.java.i
+data/src/share/jaxws_classes/javax/xml/bind/JAXBPermission.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleTypeHost.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/util.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPMessageFactory1_1Impl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/DowngradingErrorHandler.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/MessageBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_Union.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/Fault.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/WSWebServiceContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorKey.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Input.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/Content.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/writer/FileCodeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/ProcessingInstructionEvent.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Choice.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/NonAnonymousResponseProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/DatabindingException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutput.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/Axis.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/Invoker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemAction.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DefaultFieldRenderer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/FieldVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NamespaceContextAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XMLWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/BodyElement1_1Impl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSRestrictionSimpleType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/OperationDispatcher.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Header.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/dispatch.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeAnnotationReader.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyElementImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java.i
+data/src/share/classes/com/sun/istack/internal/Builder.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/SchemaBuilderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSElementDecl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeaderFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java.i
+data/src/share/classes/javax/jws/soap/SOAPMessageHandlers.java.i
+data/src/share/jaxws_classes/javax/xml/bind/util/JAXBResult.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassBinderFilter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedPattern.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOutputImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java.i
+data/src/share/classes/javax/xml/ws/wsaddressing/package.html.i
+data/src/share/classes/javax/xml/ws/FaultAction.java.i
+data/src/share/jaxws_classes/javax/xml/bind/PrintConversionEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalElement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsimportOptions.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/WrapperComposite.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/ParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/FoolProofResolver.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/JavaMethod.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorConstants.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/MetadataFinder.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedPatternHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java.i
+data/src/share/classes/javax/xml/ws/WebServiceException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Location.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Messages.java.i
+data/make/build.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/AnyTypeAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/AfterPattern.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlEnumQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/ParserUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/AccessorFactoryImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/BuiltinLeafInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/WSFuture.java.i
+data/src/share/jaxws_classes/javax/xml/soap/Node.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Const.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JClassAlreadyExistsException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java.i
+data/src/share/classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/xml/util/WellKnownNamespaces.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/client/ServiceInterceptorFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/CustomName.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnum.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIGlobalBinding.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java.i
+data/src/share/classes/javax/xml/bind/annotation/adapters/package.html.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JClassContainer.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/AbstractUnmarshallerImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/util/UnicodeEscapeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/ept/ContactInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLReaderException.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/util/AttributesImpl.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebFault.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/ClassLoaderBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/package-info.java.i
+data/src/share/classes/javax/xml/bind/DatatypeConverterInterface.java.i
+data/src/share/classes/javax/xml/ws/WebServiceRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/util/EncodingMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitMember.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaMethod.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/ErrorReceiverFilter.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ErrorHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/ClientEncoderDecoder.java.i
+data/src/share/classes/com/sun/codemodel/internal/writer/PrologCodeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthTester.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/BindingTypeFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/alphabet/BuiltInRestrictedAlphabets.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/MultiMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagedServiceAssertion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/SharedInputStream.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RawTypeSetBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueGetter.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamReaderEx.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/Util.java.i
+data/src/share/jaxws_classes/javax/xml/ws/ServiceMode.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServicePermission.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/MarshallerBridge.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyMapBuilder.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/NotNull.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAttachmentRef.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/istack/internal/XMLStreamException2.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/management.properties.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/JAXBBeanInfo.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAnnotatable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Config.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundPortTypeImpl.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/RELAXNGLoader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlRootElementQuick.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CPropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/ValidationContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumLeafInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/UtilMessages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/stream/PayloadStreamReaderMessage.java.i
+data/src/share/classes/com/sun/codemodel/internal/JStringLiteral.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/UUEncoderStream.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/package.html.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlID.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XmlString.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Port.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ArrayInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementNodeProperty.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/NsNameExceptNameClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/ContextFactory.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/XMLStreamWriterEx.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceValidator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/SCD.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderArgumentsBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/ElementAnnotationBuilderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/SAXEventSerializer.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JInvocation.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType_complexContent_body.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Operation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/addressing/EPRHeader.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/InternalAccessorFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExplicitGroup.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ContentNegotiation.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/util/package.html.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/client/WSPortInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/CompletedFuture.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/ExceptionType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ServerSOAPFaultException.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java.i
+data/src/share/jaxws_classes/javax/xml/bind/ValidationEventHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceAp.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/ResourceInjector.java.i
+data/src/share/classes/javax/xml/ws/WebEndpoint.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataHandlerDataSource.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/ParseException.java.i
+data/src/share/classes/javax/xml/ws/RespectBinding.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPMessageFactory1_2Impl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java.i
+data/src/share/classes/javax/xml/bind/DataBindingException.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/SchemaGeneratorFacade.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDParser.java.i
+data/src/share/classes/com/sun/xml/internal/bind/api/impl/NameConverter.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/util/SchemaTreeTraverser.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlNsWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/ProblemAction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DDataPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractWebServiceContext.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/QualifiedNameArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/TODO.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Operation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeArrayInfo.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/EndpointFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/GenericFieldRenderer.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/InternalizationLogic.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Double.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java.i
+data/src/share/jaxws_classes/javax/xml/bind/Element.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlElementRef.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXExConnector.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchema.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/EntityResolverWrapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContainerElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/Ref.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeReferencePropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/Base64Util.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/BodyBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Short.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/CollectionTypeAttribute.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/StreamingDataHandler.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Fault1_2Impl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/util/ExistingBlockReference.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractFieldWithVar.java.i
+data/src/share/classes/com/sun/xml/internal/ws/Closeable.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/EPTFactoryBase.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/WriterContext.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java.i
+data/src/share/jaf_classes/javax/activation/SecuritySupport.java.i
+data/src/share/classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/FaultElementImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java.i
+data/src/share/classes/com/sun/codemodel/internal/writer/ProgressCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedOperation.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/SchemaBuilderHost.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlRegistry.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPUse.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JMods.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/util/CollisionCheckStack.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/BodyType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/WSHTTPConnection.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElement.java.i
+data/src/share/jaf_classes/javax/activation/CommandObject.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/RuntimeVersion.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlListWriter.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/NameGetter.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/StreamBasedMessage.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/IncorrectNamespaceURIChecker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CPropertyVisitor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/TagAndType.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/Token.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartTag.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/foreignAttributes.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/ParsedNameClassHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/DOMHeader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/ServiceConfigurationError.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Fault1_1Impl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/MessageBundle.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundaryStatistic.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java.i
+data/make/jprt.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.java.i
+data/src/share/jaxws_classes/javax/xml/bind/DatatypeConverter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentFilter.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/DivHost.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/ConfigurationMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/JavaCallInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/package.html.i
+data/src/share/jaxws_classes/javax/xml/ws/BindingType.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ParticleImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/ProtocolSourceMessage.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/DefaultAuthenticator.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/GrammarImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/Resolver.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementSingleAdapter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPBinding.java.i
+data/src/share/classes/com/sun/tools/internal/ws/spi/package-info.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/Packet.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/SAX2StAXWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/Version.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JBreak.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/group.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLModelImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.rng.i
+data/src/share/classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementLeafProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DEmptyPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/RangeStatistic.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LogDomainConstants.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Populatable.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java.i
+data/src/share/jaf_classes/javax/activation/CommandMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/ExternalVocabulary.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/Parseable.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java.i
+data/src/share/jaf_classes/javax/activation/MimeType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/MetadataReader.java.i
+data/src/share/classes/javax/xml/bind/util/JAXBResult.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Message.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/FixedEntryStringIntMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/PolicyUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServiceClient.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/TargetFinderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/DetailEntry1_2Impl.java.i
+data/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Coordinator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/SchemaDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Patcher.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/RelatesToHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/AttributesExImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/FaultType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64DecoderStream.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/WSConnectionImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Boolean.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Binding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/accessors/PluginImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/XMLProviderArgumentBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/InputEntity.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationReader.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLObject.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/InlineAnnotationReaderImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/MessageBundle.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/util/FilerCodeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/ResourceLoader.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeBindingMode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java.i
+data/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLProperties.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WSCodeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/CDATA.java.i
+data/src/share/classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Locatable.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/ModelGroup.java.i
+data/src/share/classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlValue.java.i
+data/src/share/classes/javax/xml/ws/http/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/SAAJUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AnnotationSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AttributePropertyInfoImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/STDerivedComplexTypeBuilder.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/PortInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLInternalizationLogic.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentParser.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Integer.java.i
+data/src/share/classes/javax/xml/ws/WebServiceProvider.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/IncludeHost.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/soap/package.html.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JResourceFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/MtomStreamWriter.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/parser/Reader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Redefinable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/bind/api/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DispatchContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/package.html.i
+data/src/share/classes/com/sun/istack/internal/ws/AnnotationProcessorFactoryImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/Reference.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ReadOnlyPropertyException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/SchemaCache.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/ParameterBinding.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/DispatchException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/modelGroupBody.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceSupport.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ParameterImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDEventListener.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/simpletype/EncoderUtils.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/WscompileMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlSchemaTypeQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentSet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/TransformInputOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/DivHost.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/attributeDeclBody.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/TextPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointData.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLMessage.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionWsaServerTube.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/JavaCompilerHelper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/episode/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderInvokerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPrefixMapper.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSAnnotation.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIClass.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ParameterizedTypeImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/server.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/NoExtendedContentField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DelegatingXMLStreamWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/TXW.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MapPropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContentHandlerNamespacePrefixAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerException.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JArray.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAP12XMLEncoder.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEParser.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlTransientWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/ept/Acceptor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UntypedListField.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/util.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BindInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/LocatableAnnotation.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPAddress.java.i
+data/src/share/classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/CustomExceptionGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultCodeEnum.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/SingleElementLeafProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DZeroOrMorePattern.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/OneOrMore.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/ClassFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundaryStatisticImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/Attachment.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Edge.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Occurence.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/TagName.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/Options.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JNarrowedClass.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSParticle.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CDefaultValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperParameter.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Text.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/Properties.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/WSFeatureList.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMixedWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_SAX_FI.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlValue.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/VersionChecker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/qualification.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerContainer.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXSubstitutable.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Elemental.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/FastInfosetReflection.java.i
+data/nbproject/project.xml.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/Element.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/ElementWrapper.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/DocumentAddressResolver.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/SEIInvokerTube.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java.i
+data/src/share/classes/com/sun/xml/internal/bind/annotation/OverrideAnnotationOf.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/JAXBTypeGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/SelectOptimalEncodingFeatureConfigurator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/WsaTubeHelperImpl.java.i
+data/src/share/classes/com/sun/istack/internal/tools/MaskingClassLoader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/InvokerTube.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/SchemaGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/local/server/LocalWSContextImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BindingComponent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/xmlschema-for-jaxb.rng.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentSetImpl.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java.i
+data/src/share/classes/javax/xml/ws/WebServicePermission.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISchemaBinding.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/StringHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Documented.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlElementRefs.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/RegistryInfo.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/config/management/policy/ManagementPrefixMapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/WSDLParserExtensionContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSWildcard.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AnnotationImpl.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MessagingException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumConstantImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/W3CAddressingConstants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/SDDocumentSource.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAnnotationUse.java.i
+data/src/share/classes/com/sun/activation/registries/MailcapParseException.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DAnnotation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpMetadataPublisher.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MultiWildcardComplexTypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Header1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DOptionalPattern.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JavaCompilerImpl.java.i
+data/src/share/classes/javax/xml/soap/SOAPPart.java.i
+data/make/tools/StripProperties/StripProperties.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DOMPrinter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Wildcard.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DGroupPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointArgumentsBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/AnnotationParserFactoryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/MessageImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/Schema.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeClonerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/Base.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/LSInputSAXWrapper.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/resources/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/MessageContextFactory.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EscapeSyntaxException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/model/InvalidMapException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/BodyType.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CElementInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Multiplicity.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlEnum.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeFunction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/FoolProofParserExtension.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundFaultImpl.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/TxwTask.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/ElementOutline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/prop/XmlItemProp.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/WhiteSpaceProcessor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ErrorReporter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java.i
+data/src/share/classes/javax/xml/bind/attachment/AttachmentMarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListIteratorBase.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/TagInfoset.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/ModelerException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/writer/SignatureWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/BadCommandLineException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/AsyncResponseImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindPurple.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlElements.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Address.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/DummyLocation.java.i
+data/src/share/classes/javax/xml/soap/Node.java.i
+data/src/share/classes/javax/xml/bind/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSAttributeUse.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SingletonResolver.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ColorBinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/EndpointEntityResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DelayedRef.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/DataPatternBuilderImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedExtendedComplexTypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensible.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/prop/LeafElementProp.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Intercepter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPEncoder.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/parser/JAXPParser.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignmentTarget.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/Block.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToContentHandler.java.i
+data/src/share/jaxws_classes/javax/xml/bind/Unmarshaller.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/AsyncProviderInvokerTube.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/Form.java.i
+data/src/share/classes/javax/xml/ws/EndpointReference.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIEnumMember.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/IllegalAnnotationsException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/exception/JAXWSExceptionBase.java.i
+data/src/share/classes/com/sun/codemodel/internal/fmt/JSerializedObject.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/config/management/policy/ManagementAssertion.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JExpr.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBinding.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/PortInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SOAPProviderArgumentBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/HeaderFault.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/StreamingAttachment.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/Body.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/ReadOnlyAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/CommentListHost.java.i
+data/src/share/classes/com/sun/tools/internal/ws/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/occurs.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java.i
+data/src/share/jaf_classes/com/sun/activation/registries/MimeTypeEntry.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/ResultFactory.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAccessorOrderWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/BuiltInTypes.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/IllegalSchemaException.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferSource.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/UtilException.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/util/StAXParserWrapper.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindYellow.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Encoded.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ParsedElementAnnotationHost.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/StructureLoaderBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeArrayInfoImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/api/TJavaGeneratorExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLBoundOperationImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java.i
+data/src/share/jaxws_classes/javax/xml/ws/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelUnmarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCInterleaveFilter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java.i
+data/src/share/classes/META-INF/mailcap.default.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/WeakDataFile.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MessageBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ClientConfigurationException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPartDescriptor.java.i
+data/src/share/classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/exception/LocatableWebServiceException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Float.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/Closeable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QDecoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/OctetBufferListener.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/XMLBridge.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/RuntimeModel.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetField.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/DataHandlerAttachment.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexContent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java.i
+data/src/share/classes/com/sun/codemodel/internal/JTryBlock.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIUserConversion.java.i
+data/src/share/jaxws_classes/javax/annotation/PreDestroy.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ComponentImpl.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/DTDEventListener.java.i
+data/src/share/classes/com/sun/xml/internal/bind/api/RawAccessor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/spi/WSToolsObjectFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/ExceptionType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ResponseContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/package-info.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/EntityReferenceAction.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/server/XMLEPTFactoryImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingInput.java.i
+data/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValuePropertyLoader.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Message1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferCreator.java.i
+data/src/share/classes/javax/jws/WebResult.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Form.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerInteger.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/Model.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamWriterFilter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ValidatingUnmarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/ReflectAnnotationReader.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/SymbolSpace.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SOAPEntityReferenceValidator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDumpMBean.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClass.java.i
+data/src/share/classes/com/sun/xml/internal/bind/AccessorFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/XmlDataContentHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CNonElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/transform/EfficientStreamingTransformer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/source/SourceUtils.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/Alphabet.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerMgr.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPartImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/ContentVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteOutputStream.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Long.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/HeaderFault.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeMapPropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultIDResolver.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlAttribute.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/WebServiceContextImpl.java.i
+data/src/share/classes/javax/xml/bind/helpers/NotIdentifiableEventImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/InternalizationLogic.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ClassInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/JAXBWrapperAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FactoryFinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEMultipartRelated.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ExceptionType.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/BeanGenerator.java.i
+data/src/share/jaxws_classes/javax/xml/ws/Holder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ElementOutlineImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/stream/StreamHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/HandlerTube.java.i
+data/src/share/jaxws_classes/javax/xml/ws/RequestWrapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/VersionUtil.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyAttribute.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithmIndexes.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java.i
+data/src/share/classes/javax/xml/bind/JAXBElement.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/CollisionInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/ExceptionBean.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/ComponentNameFunction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeLeafInfo.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPIOException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/HttpConfigFeature.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/util/DirectoryUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Iterators.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/JAXBAttachment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArrayString.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSContentTypeVisitor.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlIDREF.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/TieHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/InterningXmlVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/message/PropertySet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java.i
+data/src/share/classes/com/sun/codemodel/internal/JMod.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ValuePropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/ArrayBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/handler/MessageHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/client/SOAPMessageDispatcher.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CArrayInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/RefPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/BuildException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/ModelVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/ProblemActionHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ValidationErrorHandler.java.i
+data/src/share/classes/com/sun/codemodel/internal/JPrimitiveType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/W3CWsaClientTube.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java.i
+data/src/share/classes/com/sun/codemodel/internal/JEnumConstant.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/FieldOutline.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ProviderApiMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/CharacterEscapeHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPAddress.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/SchemaImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/ClientSOAPHandlerTube.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/FinalArrayList.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/http/Binding.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/GrammarSection.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ListElementProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/Annotations.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/RestrictedAlphabet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSFacet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/SchemaSetImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Boolean.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/Location.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/EndpointAddress.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/XmlmessageMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/FilterTransducer.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Service.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSParticle.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java.i
+data/src/share/classes/com/sun/codemodel/internal/JTypeWildcard.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/DispatchContactInfoList.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/NullStream.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSTermVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Loader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/WsdlmodelMessages.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForest.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/EncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/CDATAImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/S2JJAXBModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader11.java.i
+data/src/share/jaxws_classes/javax/xml/ws/RespectBindingFeature.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Empty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/StartDocument.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/Cdata.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/Headers.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamHeader12.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/JAXBRIContextFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternInterner.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/NamespaceContextIterator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/VersionChecker.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSchemaTypesWriter.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPConstants.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/AsyncHandlerService.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/JAXWSBindingsConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/Pcdata.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/StringDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EndpointReferenceUtil.java.i
+data/src/share/classes/javax/xml/soap/SOAPHeaderElement.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/WsdlMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/W3CAddressingJavaGeneratorExtension.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/ServerConnectionImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/HandlerMessages.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Float.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Token.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/AppMsgContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Import.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/WSDLParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSDLLocator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/HandlerAnnotationInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Double.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/JAXBModelBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/WSDLResolver.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/package.html.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/ClassModelInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/visitor/XSFunction.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Include.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/Port.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/DummyPropertyInfo.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/SourceNode.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CSingleTypePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameConverter.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBElementMember.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/tools/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/PollingMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LifecycleMethods.java.i
+data/src/share/classes/javax/xml/ws/AsyncHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPDecoder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallingContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaClientTube.java.i
+data/src/share/classes/javax/xml/soap/SOAPConnectionFactory.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/TypeUtil.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/GeneratorMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/EPRSDDocumentFilter.java.i
+data/src/share/classes/javax/xml/ws/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLInput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlList.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElementWrapper.java.i
+data/src/share/classes/com/sun/tools/internal/ws/Invoker.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/DocInfo.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/CharacterEscapeHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/ParserUtil.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ClassOutlineImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GWildcardElement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayCompRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingAttachmentFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/LocalAttribute.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/DatatypeException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/JavaMethod.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/parser/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/providerApi.properties.i
+data/src/share/classes/com/sun/codemodel/internal/util/EncoderFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundOperation.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/DOMStreamReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/WildcardTypeInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/MtomCallback.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JArrayClass.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/Delegate.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ValidationException.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/Message.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetter.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAnonymousClass.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/BindStyle.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlAccessOrder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SubcodeType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/UnsupportedMediaException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/EPRRecipe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/Header.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/soap/Style.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/ModelLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/PropertySet.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CCustomizations.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataHead.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Annotated.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/AbstractExtensionHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIAttribute.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAP12XMLDecoder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ExternalEntityReference.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CAdapter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/ModelerMessages.java.i
+data/src/share/classes/javax/xml/bind/helpers/Messages.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/ClassNameAllocator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/xmlmessage.properties.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSWildcardVisitor.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ErrorPattern.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/CompositeStructure.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/httpserver.properties.i
+data/src/share/classes/com/sun/codemodel/internal/JGenerifiableImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeModeler.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/ChoicePattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/package-info.java.i
+data/src/share/jaxws_classes/javax/xml/ws/http/HTTPException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Ref.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayERProperty.java.i
+data/src/share/classes/com/sun/codemodel/internal/JBlock.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/XMLReaderCreator.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeDefParticle.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/ProbeProvider.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlAccessorType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiTypeLoader.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlEnumWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/Plugin.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/PatternBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSSimpleTypeVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/TypeInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/AnnotationContext.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAssignment.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/MessageBundle.properties.i
+data/src/share/jaxws_classes/javax/annotation/PostConstruct.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JTextFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/nc/NameClassVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/JAXBModelImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/SCD.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DMixedPattern.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ServerSideException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXOutputFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/AbstractMappingImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/StringStatisticImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InternalBridge.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/AccessorElement.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/locator/SourceLocationAddOn.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/util/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEConfig.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/SecureLoader.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Short.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/DOMUtil.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/ServiceGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAPCodec.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/XmlSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderElementImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/server/ProviderSOAPMD.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamReaderException.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/HeaderElement1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/AttachmentEx.java.i
+data/src/share/classes/com/sun/codemodel/internal/fmt/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPOperation.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/AbortException.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Extensible.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBProperty.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAnyElement.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/PortType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/NamespaceDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/WSHttpHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java.i
+data/src/share/classes/javax/xml/ws/WebServiceClient.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/AsyncMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/CharArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/sender.properties.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/package.html.i
+data/src/share/jaxws_classes/javax/xml/ws/Action.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PublicObjectFactoryGenerator.java.i
+data/src/share/jaxws_classes/javax/xml/soap/Text.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeRef.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/SchemaBindings.java.i
+data/src/share/classes/com/sun/codemodel/internal/JClassContainer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/NoCloseOutputStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/LeafBeanInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/JAXWSAttachmentUnmarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/client/ClientPipelineHook.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/Options.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/PipeCloner.java.i
+data/src/share/classes/javax/annotation/PreDestroy.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPFactory1_1Impl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JMods.java.i
+data/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterInterface.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/importDecl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MimeTypedTransducer.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/BadCommandLineException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/TWSDLParserContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/SchemaPatternBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/NameCalculator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstFieldRenderer.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/WrapperParameter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/ToolsJarNotFoundException.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializerWithPrefixMapping.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/package-info.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/PrintConversionEventImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/util/Which.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/ElementOutline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/Messages.java.i
+data/src/share/classes/com/sun/codemodel/internal/util/ClassNameComparator.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/SOAPPartImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringIntMap.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CAttributePropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/GenericArrayTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/HttpEndpoint.java.i
+data/src/share/classes/javax/xml/ws/spi/WebServiceFeatureAnnotation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPart.java.i
+data/make/tools/StripProperties/StripPropertiesTask.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/FinalArrayList.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiable.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/ri/XmlIsSetWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/addressing/OutboundReferenceParameterHeader.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaSimpleType.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerProcessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/SimpleTypeSet.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/WildcardNameClassBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/ServerSOAPHandlerTube.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/TxwException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorEx.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/EnumMemberMode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/BindingOperationType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/Invoker.java.i
+data/src/share/jaxws_classes/javax/xml/ws/Binding.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/Config.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/HeaderTokenizer.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.png.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JDocComment.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/MessageInfoBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/HeaderElement1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClass.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/javacompiler.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/BaseContentRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSContentType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLGeneratorExtensionFacade.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/util.properties.i
+data/src/share/jaxws_classes/javax/xml/ws/http/HTTPBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/resources/Messages_en.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Type.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/BodyImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlSeeAlsoWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/AlternativeSelector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/TypeClosure.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelObject.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Ref.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/CheckedException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/PeptTie.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertyInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/WsGen.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLBoundFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java.i
+data/src/share/classes/com/sun/codemodel/internal/writer/FileCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/DataFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/StaxSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/NameImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/util/MimeTypeRange.java.i
+data/src/share/jaxws_classes/javax/xml/ws/RespectBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPBody.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AttachmentUnmarshallerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DElementPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/resources/ResourceBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/client/AsyncInvoker.java.i
+data/src/share/classes/com/sun/istack/internal/package-info.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAPXMLDecoder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/util/Messages.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/annotations/Probe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/FactoryFinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/FieldPropertySeed.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XmlOutputAbstractImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/ParameterList.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/XSFinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Item.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtension.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java.i
+data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/CDATA.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/WSDLParserExtensionContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/om/ParsedElementAnnotation.java.i
+data/make/jprt.config.i
+data/src/share/classes/META-INF/mimetypes.default.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/package.html.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/Impact.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/SuppressAutomaticWSARequestHeadersFeature.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizer.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAP12Constants.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Utf16.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/ImageDataContentHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/BGMBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Response.java.i
+data/src/share/jaxws_classes/javax/xml/bind/Messages.java.i
+data/src/share/jaf_classes/com/sun/activation/registries/MailcapFile.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderModel.java.i
+data/src/share/classes/javax/xml/soap/SOAPMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/providerApi.properties.i
+data/src/share/classes/com/sun/xml/internal/txw2/Document.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocument.java.i
+data/src/share/jaxws_classes/javax/xml/bind/UnmarshallerHandler.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSFeatureList.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/BindingApiMessages.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/WriterNode.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DataPatternBuilderImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandlerBase.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementDeclQuick.java.i
+data/src/share/jaxws_classes/javax/annotation/Resource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/SerializerConstants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/ContentHandlerToXMLStreamWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/InvokerTube.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/MessageDispatch.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/DatatypeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttributeDecl.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/EventLocation.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/XJCFacade.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/util/GeneratedFileInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/xjc.xsd.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/AbstractReferenceFinderImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/TypeUtil.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/Message.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/DelegatingParserExtension.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSFunction.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/PortTypeOperation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Character.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProviderManagerDelegate.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/ept/EPTFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/SyncStartForAsyncFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/dt/CachedDatatypeLibraryFactory.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSTermFunction.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/RootOnlyCodec.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/SCAnnotations.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/Processor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolver.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/StatsProvider.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/MixedComplexTypeBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/Bean.java.i
+data/src/share/classes/javax/activation/CommandMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArrayResourceException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerTubeAssemblerContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/SEIPortInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/Tree.java.i
+data/src/share/classes/com/sun/codemodel/internal/JMethod.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/BASE64EncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/SOAPFactory1_2Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLFault.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingWSDLParserExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/notation.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMoniker.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyElementWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/Opcodes.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/Base.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractField.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/AnnotationProcessorContext.java.i
+data/src/share/classes/javax/xml/bind/UnmarshalException.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/DtdContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/ClientTransportFactoryTypes.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXManager.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/BindRed.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/ClassNameAllocatorWrapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/ModelChecker.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/xml/sax/XmlBaseHandler.java.i
+data/src/share/classes/javax/activation/MimeTypeParameterList.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRootElementWriter.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/sender.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUse.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JCase.java.i
+data/src/share/jaxws_classes/javax/jws/soap/InitParam.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Invoker.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/xml/XMLDecoder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/ServiceDescriptor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/LazyBlockReference.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SyncMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/TokenMgrError.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QEncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/MemberSubmissionAddressingConstants.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/W3CAddressingMetadataExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/ServerEncoderDecoder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/message/FaultReasonText.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/impl/encoding/DispatchSerializer.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/Messages.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/W3CDomHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/AutoClassNameAllocator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/EndTag.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/HandlerChainInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Body1_1Impl.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/IllegalAnnotationException.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/MarshallerBridge.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/BuiltinLeafInfoImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Part.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/WSDLWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/InputStreamMessage.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/EntityDecl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ContactInfoListImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/ClientMessageHandlerTube.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerResolverImpl.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/model/MissingAddressingHeaderException.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/FacetImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DPatternWalker.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/DefaultParticleBinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Byte.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/ParserListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/dynamic/SOAPMessageFactoryDynamicImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/SimpleHashtable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerMessageScope.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSWildcard.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefsQuick.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/XJCListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/LocalizableImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPAddress.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/AttributesHolder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIEnumeration.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/Mapping.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/util/Messages.properties.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Output.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.i
+data/src/share/jaxws_classes/javax/xml/soap/Detail.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/TypeUseBinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/MutableXMLStreamBuffer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ClientMessages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/jaxb/RpcLitPayload.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/Defining.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentSerializer.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JClass.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JBinaryFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBMessage.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ERPropertyInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/StreamWriterBufferProcessor.java.i
+data/src/share/classes/javax/xml/bind/Binder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/NamedNodeMapIterator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/localization/Localizable.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/AttributeBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/InterleavePattern.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/MimeAttachmentSet.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/EndpointMethodDispatcherGetter.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/UnparsedEntity.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/AverageRangeStatistic.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeValuePropertyInfo.java.i
+data/src/share/classes/javax/xml/bind/TypeConstraintException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/DualObjectFactoryGenerator.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JPrimitiveType.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/MultiplicityCounter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/DOMUtil.java.i
+data/src/share/classes/com/sun/istack/internal/ws/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/NullIterator.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/PropertyKind.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64Data.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Message.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Envelope1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/MessageCatalog.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLOperationImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/JAXBModelImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/PortType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/CodeModelClassFactory.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSource.java.i
+data/src/share/classes/javax/activation/ActivationDataFlavor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPort.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Port.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEPart.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/SimpleType_List.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/Notation.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/JpegDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java.i
+data/src/share/jaf_classes/META-INF/mimetypes.default.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGeneratorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementRefQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/EncodingConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportPipeFactory.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpAdapterList.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestScanner.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/RuntimeInlineAnnotationReader.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DListPattern.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wscompile.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingPolicyValidator.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/MimeHeadersUtil.java.i
+data/src/share/classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/Parseable.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexExtension.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/WSConnection.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java.i
+data/src/share/classes/javax/xml/bind/helpers/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/BoundEndpoint.java.i
+data/src/share/classes/com/sun/codemodel/internal/JFormatter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/qname.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/BridgeWrapper.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/NamespaceContextImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ClassInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/UsesJAXBContextFeature.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConversion.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIMethodHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransport.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSSchema.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/DefaultResourceInjector.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlValue.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/visitor/XSContentTypeFunction.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/MessageBundle.properties.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/MTOMDecorator.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Integer.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java.i
+data/src/share/classes/javax/xml/bind/helpers/DefaultValidationEventHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/Const.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestriction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSAttContainer.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/helper/package-info.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/RangeStatisticImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlTypeQuick.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/DumbEscapeHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WSEPRExtension.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/tools/ParallelWorldClassLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NestedParticle.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/plugin/at_generated/PluginImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RawTypeSetBuilder.java.i
+data/src/share/classes/com/sun/codemodel/internal/util/JavadocEscapeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/package.html.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferMark.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSComponent.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/dt/CascadingDatatypeLibraryFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleRestrictionModel.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/model/MapRequiredException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/staxex/Base64EncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/MethodVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/SOAPSEIModel.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_XML.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/DuplicateEntityException.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DomLoader.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOutput.java.i
+data/src/share/jaf_classes/com/sun/activation/registries/MailcapTokenizer.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/DataWriter.java.i
+data/src/share/jaf_classes/javax/activation/UnsupportedDataTypeException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/LocalScoping.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/SOAPConstants.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/EndpointComponent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/policy/AddressingFeatureConfigurator.java.i
+data/src/share/classes/com/sun/codemodel/internal/JPackage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/StringArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Pattern.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/ChildElementFinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/CheckedExceptionImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/SAX2DOMEx.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetUtil.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ReferencePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BEncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/StreamUtils.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/SerializerVocabulary.java.i
+data/src/share/classes/javax/activation/FileDataSource.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/writer/ZipCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlAttribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StartElementEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SubstGroupBaseTypeRef.java.i
+data/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBStructuredType.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/Util.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/Datatype.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/NamespacePrefixMapper.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/addon/sync/SynchronizedMethodAddOn.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CArrayInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssemblerFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPStyle.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/FatalAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/ProviderPeptTie.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/server.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/api/addressing/WSEndpointReference.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/SAXParseException2.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Definitions.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/SubtreeCutter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Localizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/ServerPropertyConstants.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEXml.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Alphabet.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CElementPropertyInfo.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WrapperInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/WSDLPatcher.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModelerException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCEventReceiver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/unmarshaller/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/message/DOMMessage.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlMimeType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/FeatureListUtil.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/JavaSimpleTypeCreator.java.i
+data/src/share/classes/javax/jws/WebService.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/OperationStyle.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/Module.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/XmlSchemaGenerator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSFacet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/package.html.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NamespaceContext2.java.i
+data/.hgtags.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/UTF8XmlOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/StAXDocumentSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DRefPattern.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Tube.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/NGCCHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/ClassOutline.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BinderImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/binding/SOAPBindingImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLInputImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Ref.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/InstanceResolverAnnotation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ha/StickyFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/RestrictedAlphabetContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/util/WSDLParseException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/C14nXmlOutput.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/encoding/Decoder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaArrayType.java.i
+data/src/share/classes/com/sun/activation/registries/MailcapTokenizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/RuntimeUtil.java.i
+data/src/share/classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JCast.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/erSet.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/EnumOutline.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/FI_SAX_Or_XML_SAX_DOM_SAX_SAXEvent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/AbstractExtensionBindingChecker.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlMimeTypeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/local/client/LocalClientTransport.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLOutput.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SerializationException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/RefererFinder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/Messages.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.rng.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EventBase.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/Parameter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/FastInfosetReflection.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLDescriptorKind.java.i
+data/src/share/jaxws_classes/javax/annotation/Resources.java.i
+data/src/share/classes/javax/xml/bind/annotation/adapters/HexBinaryAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/PipelineAssembler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/PackageOutline.java.i
+data/src/share/classes/com/sun/tools/internal/ws/ToolVersion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/builder/IncludedGrammar.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/AsyncInvoker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ClientPipeAssemblerContext.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/InternetHeaders.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterUtil.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/NGCCRuntimeEx.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Integer.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/JavacompilerMessages.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/package.html.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/QPDecoderStream.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/TypeUseFactory.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxConstants.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIContent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlJavaTypeAdapterWriter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/JAXBDispatch.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ChoiceContentComplexTypeBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java.i
+data/src/share/jaxws_classes/javax/xml/ws/wsaddressing/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/SchemaTypeTransducer.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionImpl.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/package.html.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/ProcessorMessages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/source/SourceUtils.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DNotAllowedPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XSOMParser.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/AddressingMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDom.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/package.html.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/WsgenProtocol.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/UtilMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ValidationProcessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Stubs.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAP12Binding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSModelGroup.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLDocument.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/StreamingMessages.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ParameterNames.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIConversion.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/DataPatternBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/QNameMap.java.i
+data/src/share/classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlID.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/SchemaBuilder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/ProcessorException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithmState.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/client/SOAP12XMLDecoder.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListIterator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java.i
+data/src/share/classes/javax/activation/UnsupportedDataTypeException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/RejectDoctypeSaxFilter.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/SchemaBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/FilterMessageImpl.java.i
+data/src/share/jaf_classes/META-INF/mailcap.default.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/HttpDump.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamBufferCreator.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/ModelLoader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/streaming.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/fastinfoset/FastInfosetStreamSOAP12Codec.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/ListTransducedAccessorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/QNameMap.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/bytecode/ClassTailor.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ComplexTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/SingletonResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetResult.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/GmbalMBean.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/XMLConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/BuiltInEncodingAlgorithm.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/MessageHandlerContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/util/LocatorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/ClientCallBridge.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPDocumentFragment.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Receiver.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java.i
+data/src/share/classes/com/sun/codemodel/internal/package-info.java.i
+data/src/share/classes/javax/xml/bind/ValidationEventHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/InlineBinaryTransducer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/util/DraconianErrorHandler.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/HeaderImpl.java.i
+data/src/share/classes/javax/xml/ws/ProtocolException.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/processor.properties.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/TimeStatisticImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAssignment.java.i
+data/src/share/jaf_classes/com/sun/activation/registries/LogSupport.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Grammar.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/Engine.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/EndTag.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationUse.java.i
+data/src/share/classes/com/sun/xml/internal/bind/util/AttributesImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/gen/config/config.rng.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/v200408/ProblemAction.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_field_Boolean.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ProxyLoader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/LogicalMessageContextImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/package.html.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Messages.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlAttributeQuick.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/EncodingConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/databinding/Databinding.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParserPool.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/OpenAtts.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/LocatorTable.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/AbstractHeaderImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JCodeModel.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/modeler.properties.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/BoundedRangeStatistic.java.i
+data/src/share/classes/javax/xml/soap/MimeHeaders.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/Ref.java.i
+data/src/share/classes/javax/xml/ws/WebFault.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Particle.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Message.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/stax/NamespaceContexHelper.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServiceRefs.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/util/ValidationEventLocatorExImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/Builder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlCDATA.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ExtensionType.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerShort.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServiceContext.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/ElementAnnotationBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/ws/databinding/DatabindingFactory.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/XMLSchemaInternalizationLogic.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/wsservlet.properties.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JTryBlock.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLService.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/Annotation.java.i
+data/src/share/jaf_classes/javax/activation/DataContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Union.java.i
+data/src/share/jaxws_classes/javax/xml/ws/soap/MTOMFeature.java.i
+data/build-defs.xml.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/FieldSignature.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/Stub.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/NamespaceContextImpl.java.i
+data/src/share/classes/javax/xml/bind/PrintConversionEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntData.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/xmlmessage.properties.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSModelGroupDecl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/SinglePrimitiveAccessField.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/FaultElement1_1Impl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPAddress.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/Kinds.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/InlineAnnotationReaderImpl.java.i
+data/src/share/jaxws_classes/javax/xml/bind/ValidationEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/xml/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLParserContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/WSBindingProvider.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/SingleTypePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ValueArray.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorOrder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/AbstractSEIModelImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/wsdl/parser/MetaDataResolver.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/Const.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/CheckedException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/MessageContextFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Binding.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/dom/DOMDocumentSerializer.java.i
+data/src/share/classes/com/sun/codemodel/internal/writer/SingleStreamCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/datatypes.xsd.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/config.rng.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SoapMessages.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/ModelProperties.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/AdaptedLister.java.i
+data/src/share/classes/com/sun/tools/internal/ws/WsImport.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/SeiGenerator.java.i
+data/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementRefsWriter.java.i
+data/src/share/classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractCreatorProcessor.java.i
+data/src/share/classes/com/sun/istack/internal/SAXParseException2.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JSerializedObject.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/CompositeStructureBeanInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderFilter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NClassByJClass.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/ErrorReceiver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/DataSourceStreamingDataHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/InputEntity.java.i
+data/src/share/classes/javax/jws/soap/SOAPMessageHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttributeType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/api/BindingIDFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/StAXExStreamWriterOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FinalArrayList.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JBlock.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSListSimpleType.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessage.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/client/p2p/HttpSOAPConnection.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/Comment.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DeferedCollection.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ServiceContextBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SchemaTop.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/SpecVersion.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/stream/StreamMessage.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/episode/Bindings.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferException.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/AMXMBeanInterface.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/EndpointAwareCodec.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DAttributePattern.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/ServiceDefinitionImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ComplexTypeFieldBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/client/XMLMessageDispatcher.java.i
+data/src/share/jaxws_classes/javax/xml/ws/ResponseWrapper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Binding.java.i
+data/src/share/classes/javax/xml/soap/SOAPConstants.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/RawTypeSet.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXUtil.java.i
+data/src/share/classes/com/sun/xml/internal/bind/XmlAccessorFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DSchemaBuilderImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/ModelerConstants.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/EnumConstantOutline.java.i
+data/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/IntArrayData.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/client/HttpClientTransportFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpResponseProperties.java.i
+data/src/share/classes/javax/xml/ws/Service.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/BodyBlock.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ModelGroupDeclImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/util/StackRecorder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Long.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/RESTSourceDispatch.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DChoicePattern.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/UtilException.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JOp.java.i
+data/src/share/classes/com/sun/codemodel/internal/JSwitch.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/ElementImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/at_generated/PluginImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtensionHandler.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/config/HandlerInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/localization/LocalizableMessage.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/Header.java.i
+data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/RootElementSniffer.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/JAXBModel.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Import.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/CommonResourceBundle.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParser.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/Const.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/NonElement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ParserContext.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/ByteArrayDataSource.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LocatorExWrapper.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/internalizer/DOMForestParser.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JTypeVar.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/xml/sax/AbstractLexicalHandler.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/NamespaceBase.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/DummyListField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/FastInfosetSerializer.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CEnumConstant.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/XmlNames.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/NGCCHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/package.html.i
+data/src/share/classes/javax/activation/MailcapCommandMap.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/Util.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/ImplStructureStrategy.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/Document.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/EmptyPattern.java.i
+data/src/share/classes/javax/xml/soap/Detail.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/WhitespaceNormalizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/provider/SyncProviderInvokerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlAccessType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ExpressionParticleBinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/spi/runtime/Tie.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/Plugin.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/HandlerConfiguration.java.i
+data/src/share/jaxws_classes/javax/xml/bind/GetPropertyAction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomPolicyMapConfigurator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/ProviderSED.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/DuplicateAttributeVerifier.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/ClientSchemaValidationTube.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/Localization.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BISerializable.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/wsdl/WSDLMessageImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/Kind.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/NameClassBuilderHost.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIInterface.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/Patch.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeBuiltinLeafInfo.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/api/client/ServiceInterceptor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAnnotationValue.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/relaxng/DefineFinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/Util.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibraryFactory.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/package.html.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/MultipartDataSource.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/localization/Localizable.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlSchemaType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/ContentVisitor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlRegistryWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventReader.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JDeclaration.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/TransportBackChannel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/Properties.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MessageFactoryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/helpers/FastInfosetDefaultHandler.java.i
+data/src/share/jaxws_classes/javax/xml/bind/helpers/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/dt/DoNothingDatatypeLibraryFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/ModelTranslator.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/PatternParseable.java.i
+data/src/share/jaxws_classes/javax/xml/ws/spi/http/HttpHandler.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/Element.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/FixedOrDefault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/Localizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/BindingHelper.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Taxonomy.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/saaj/SAAJFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/NamespaceContextImpl.java.i
+data/src/share/classes/javax/jws/soap/SOAPBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/AnnotationVisitor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/util/Uri.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerBoolean.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/DispatchMessages.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/adapters/CollapsedStringAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/Decoder.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/arc/Stability.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/EntityDecl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CDefaultValue.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/xjc.xsd.i
+data/src/share/classes/com/sun/tools/internal/ws/api/WsgenProtocol.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/SchemaCompiler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEPart.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/soap/SOAPOperation.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/mimepull/Header.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerNOPImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/DocumentLocationResolver.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/ValueSetterFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/processor.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSVariety.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfo.java.i
+data/src/share/jaxws_classes/javax/jws/WebMethod.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/JavaMethodImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/UUIDEncodingAlgorithm.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/soap/SOAPOperation.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/provider/MessageProviderArgumentBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAP12NamespaceConstants.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/wildcardBody.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/PropertySeed.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/SAXOutput.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorNotificationListener.java.i
+data/src/share/classes/javax/annotation/Resource.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/impl/NameUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/db/glassfish/WrapperBridge.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/om/Location.java.i
+data/src/share/jaxws_classes/com/sun/istack/internal/localization/LocalizableMessageFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/XMLReaderImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/AbstractDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXInputFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/parser/XMLParser.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/jaxb/RpcLitStructure.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/addressing/AddressingVersion.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/builder/relaxng/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/ExtensionVisitorBase.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/ContiguousCharArrayArray.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEEvent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/Pattern.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AnyTypeBeanInfo.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/SchemaDocumentImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/events/EntityDeclarationImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/MtomCodec.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CReferencePropertyInfo.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_DOM_FI.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorException.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/identityConstraint.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/AbstractListField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/EmptyImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JNullType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/UCode_UCodeESC_CharStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/ServiceFinder.java.i
+data/src/share/classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/BuiltinDatatypeLibrary.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/CTypeRef.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/util.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/CustomizationContextChecker.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Fault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/BridgeAdapter.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/DraconianValidationErrorHandler.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/Main.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/XmlDataContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLExtension.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSchemaTypes.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/UnmarshallerImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/IsSetFieldRenderer.java.i
+data/src/share/classes/javax/xml/bind/ValidationException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/StreamSOAPCodec.java.i
+data/src/share/classes/javax/xml/soap/SOAPException.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/Classes.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWriter.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAnnotationStringValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/ActionBasedOperationSignature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/MethodLocatable.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/v200408/ProblemHeaderQName.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/Property.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/doc-files/packages.vsd.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSModelGroup.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandalonePipeAssembler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CWildcardTypeInfo.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/AttributesHolder.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JMethod.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/XmlSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/Module.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/TypeRefImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/BridgeContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/modeler/RuntimeModelerException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/XPathImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/StreamSOAP12Codec.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlAttachmentRef.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/DescriptorFields.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/pipe/FiberContextSwitchInterceptor.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/ElementCollectionAdapter.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlInlineBinaryData.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlEnumValue.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/AccessorException.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/LowLevelFastInfosetStreamWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/sax/SAXBufferCreator.java.i
+data/src/share/classes/com/sun/istack/internal/NotNull.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/MessageFiller.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/stax/factory/StAXEventFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/Types.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/PortableConnectionImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeRefImpl.java.i
+data/src/share/classes/com/sun/xml/internal/dtdparser/XmlReader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/PropertyGetterBase.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BindInfo.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexRestriction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/CommentListImpl.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/util/CharArrayArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/IntegerEncodingAlgorithm.java.i
+data/src/share/classes/javax/xml/ws/spi/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/AbstractInlineAnnotationReaderImpl.java.i
+data/src/share/jaf_classes/javax/activation/MimeTypeParameterList.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBMapping.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaTube.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/name/LocalStrings.properties.i
+data/src/share/classes/javax/xml/soap/DetailEntry.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/FastInfosetWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DRefPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/ListSimpleTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IntEncodingAlgorithm.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SCDParserConstants.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/SchemaGenerator.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedAttribute.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/RestrictedComplexTypeBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DomSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/ValuePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/HTTPBindingImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/Util.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeMapPropertyInfoImpl.java.i
+data/src/share/classes/javax/xml/bind/annotation/DomHandler.java.i
+data/patch.out.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/CycleIterator.java.i
+data/src/share/classes/com/sun/xml/internal/bind/marshaller/NioEscapeHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/sei/SEIStub.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/NullSafeAccessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProvider.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/util/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/util/PrefixArray.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/XSFunctionFilter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/webserviceap.properties.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/SaxSerializer.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForestScanner.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/client/EndpointIFInvocationHandler.java.i
+data/src/share/classes/javax/xml/bind/annotation/adapters/NormalizedStringAdapter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/ObjectFactoryGenerator.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSSchemaSet.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/util/APTClassLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/EndpointValueSetter.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/List.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/localization/LocalizableMessageFactory.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/AssociationMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/SAXParserFactoryAdaptor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/ServerPipeAssemblerContext.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/SOAPFactoryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/NameClass.java.i
+data/src/share/classes/com/sun/codemodel/internal/util/SingleByteEncoder.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlSeeAlso.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJHeader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/ParameterBinding.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/GElementImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/WebServiceFeatureList.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ConstField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/vocab/ParserVocabulary.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CClassInfoParent.java.i
+data/src/share/classes/javax/xml/bind/Messages.properties.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Expression.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementPropertyInfoImpl.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIXDom.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorException.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Ref.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSXPath.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/gbind/Graph.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/AbstractCElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/parser/InaccessibleWSDLException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ContentDisposition.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/util/CheckingSchemaBuilder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/WsaServerTube.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/xml/SAXParseable.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/amx/AMXGlassfish.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/ForkingFilter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/s2j/TypeAndAnnotationImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceConstants.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/wsdl.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/ContentListField.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPSourceDispatch.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlIDREFWriter.java.i
+data/src/share/classes/javax/xml/soap/SOAPEnvelope.java.i
+data/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/FastInfosetStreamWriterOutput.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Discarder.java.i
+data/src/share/classes/com/sun/codemodel/internal/JAnnotationWriter.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/mime/MIMEConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/model/soap/SOAPBinding.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/WebServiceContextDelegate.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/nav/NParameterizedType.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/DTDEvent.java.i
+data/src/share/classes/com/sun/tools/internal/ws/api/WsgenExtension.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/Service.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/DatatypeLib.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/EnumLeafInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Element.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/scd/SimpleCharStream.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAttributeWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeRef.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/http/server/HttpEndpoint.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/Ref.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/impl/s2j/PropertyImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/modeler.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/AttributeProperty.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_2/Envelope1_2Impl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSAttContainer.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/util/TypeClosure.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/digested/DOneOrMorePattern.java.i
+data/make/scripts/update_src.sh.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/java/JavaParameter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/ErrorReceiver.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/util/xml/XmlUtil.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/prop/ValueProp.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/Attributes.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/policy/MtomFeatureConfigurator.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/CharactersEvent.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/resources/model.properties.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXConnector.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/Attribute.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/compact/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/SOAPMessageDispatch.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedObjectManagerFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/FileData.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/stream/OutboundStreamHeader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/wsdl/WSDLPortType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/model/Parameter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/field/UnboxedField.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/AbstractMessageImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/source/PayloadSourceMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/model/ActionNotSupportedException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/AbstractXMLStreamWriterExImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/JAXBAttachment.java.i
+data/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/AttrDecls.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/NotAllowedPattern.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/ProgressCodeWriter.java.i
+data/src/share/classes/javax/xml/ws/handler/soap/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Pipe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/Quick.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/internal/SOAP12NotUnderstoodHeaderBlock.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/WSDLConstants.java.i
+data/patches/jaxws_src/README.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/BindingOperation.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleExtension.java.i
+data/src/share/classes/javax/xml/ws/soap/MTOM.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DContainerPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingID.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSSimpleType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/addressing.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/generator/GeneratorUtil.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/local/LocalMessage.java.i
+data/src/share/classes/com/sun/tools/internal/ws/util/JAXWSClassFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/package-info.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/PrefixFactoryImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/MarshallerImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Byte.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementWrapperWriter.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Any.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ElementInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/gmbal/ManagedData.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/ModelerMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/RuntimeVersion.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeNonElement.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/package.html.i
+data/src/share/classes/com/sun/codemodel/internal/JStatement.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/outline/Outline.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/TDTDReader.java.i
+data/src/share/classes/javax/xml/ws/handler/LogicalMessageContext.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIDeclaration.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/DOMUtils.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/impl/j2s/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/dispatch/DataSourceDispatch.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/CheckedException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeReferencePropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeEnumLeafInfo.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/HttpserverMessages.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/addon/code_injector/PluginImpl.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/ws/fault/ReasonType.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/IEEE754FloatingPointEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/jaxb/JAXBDispatchMessage.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/FloatEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/wsdl/parser/XMLEntityResolver.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/XMLSerializer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/server/ServerAdapterList.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ContentTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIInlineBinaryData.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/FaultInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlElementsWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ParseUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/jaxws/BuilderHandlerOperationScope.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/ProcessorOptions.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/handler/MessageHandlerContext.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaElement.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimePropertyInfo.java.i
+data/src/share/jaxws_classes/javax/xml/bind/TypeConstraintException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CTypeInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/message/saaj/SAAJMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementPropertyInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/api/WSBinding.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/JavaCompiler.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/TypeUse.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/StringDataContentHandler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/UnmarshallerChain.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JExpressionImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/DefaultTransducedAccessor.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/MTOMXmlOutput.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/writer/document/ParamType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/SwACodec.java.i
+data/src/share/classes/javax/xml/soap/Text.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/ResultFactory.java.i
+data/src/share/classes/javax/xml/ws/handler/Handler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/DefaultValueLoaderDecorator.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/Service.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/EnumOutline.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeUseImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/annotation/XmlIsSet.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ClassSelector.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeClassInfo.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMBuilder.java.i
+data/src/share/jaxws_classes/javax/xml/ws/FaultAction.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/XMLStreamBufferResult.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/handler/SOAPHandlerProcessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/SecureLoader.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/DOMOutput.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/MemberInfo.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/ForeignAttributesImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XMLStreamReaderToXMLStreamWriter.java.i
+data/src/share/classes/com/sun/codemodel/internal/JExpressionImpl.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/EOFException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/StreamSOAP11Codec.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/NoFixedFacet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/AttributePattern.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlNsForm.java.i
+data/src/share/classes/javax/annotation/Generated.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/ClientContainer.java.i
+data/src/share/classes/com/sun/codemodel/internal/writer/FilterCodeWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/DumbEscapeHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/server/WSEndpoint.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/dt/builtin/Messages.properties.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerLong.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/package.html.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/server/SOAPXMLEncoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Short.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/DeferredTransportPipe.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/MethodGetter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/ExtendedComplexTypeBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/Multiplicity.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/MultipartDataContentHandler.java.i
+data/make/build.xml.i
+data/src/share/classes/com/sun/codemodel/internal/JJavaName.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCRuntime.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/binding.xsd.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/runtime/ZeroOneBooleanAdapter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/Patch.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_FI.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/SenderMessages.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/java/JavaException.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/package-info.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/util/BlockReference.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/field/FieldRenderer.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/handler.properties.i
+data/src/share/classes/com/sun/xml/internal/ws/server/sei/MessageFiller.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/jaxb/JAXBHeader.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/MakeSafeTypeVisitor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/Messages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/WsservletMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/BIConstructor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/W3CAddressingWSDLGeneratorExtension.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java.i
+data/src/share/classes/com/sun/xml/internal/ws/api/message/Messages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/addon/code_injector/Const.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/impl/EnumLeafInfoImpl.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/Message1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/xml/XMLCodec.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/DeclarationImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/transport/local/client/LocalClientTransportFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/Chunk.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Long.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlInlineBinaryDataWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/Messages.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeBodyPart.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/SpecVersion.java.i
+data/src/share/classes/javax/xml/ws/WebServiceRefs.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/XMLWriter.java.i
+data/src/share/classes/javax/xml/soap/Name.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WebServiceFeatureFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/CompactSyntaxTokenManager.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TopLevelAttribute.java.i
+data/src/share/classes/javax/xml/bind/ParseConversionEvent.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/ExtensionHandler.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/DomHandler.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/SchemaParser.java.i
+data/src/share/classes/javax/activation/MimetypesFileTypeMap.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/ModelerMessages.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/framework/QNameAction.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/LeafPropertyXsiLoader.java.i
+data/src/share/classes/javax/xml/ws/Action.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/outline/FieldOutline.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/UnusedCustomizationChecker.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/WsaTubeHelperImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/ListPattern.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/XSListSimpleType.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/FieldAccessor_Float.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/XmlChars.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DXmlTokenPattern.java.i
+data/src/share/classes/javax/xml/ws/Response.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/BASE64EncoderStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/ChildLoader.java.i
+data/src/share/classes/javax/xml/bind/util/package.html.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/Fiber.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java.i
+data/src/share/classes/com/sun/xml/internal/ws/pept/presentation/TargetFinder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/MinimumEscapeHandler.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/staxex/Base64Encoder.java.i
+data/src/share/classes/javax/xml/ws/soap/SOAPBinding.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/AbstractProcessor.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/package-info.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/util/OutputUtil.java.i
+data/src/share/classes/javax/xml/soap/MimeHeader.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/StAXEventAllocatorBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/DetailEntry1_1Impl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/wsdl/ModelerUtils.java.i
+data/src/share/classes/com/sun/xml/internal/ws/model/ParameterImpl.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/AttributesImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/ModelerMessages.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/jaxws/Exception.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/ClassVisitor.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/gen/config/NGCCEventSource.java.i
+data/src/share/classes/javax/activation/FileTypeMap.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/protocol/soap/ServerMUTube.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/ForkXmlOutput.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/stax/events/EntityReferenceEvent.java.i
+data/src/share/classes/javax/xml/bind/annotation/XmlEnum.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/BIProperty.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/Modeler.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/core/ElementPropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/annotation/XmlNamespace.java.i
+data/src/share/classes/javax/jws/WebParam.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/ByteArrayBuffer.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/TypeMonikerFactory.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/ByteInputStream.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/AsyncProviderCallback.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/util/CharReader.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/BindingOperation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/elementDeclBody.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Leaf.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/marshaller/XMLWriter.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/WSDLDocumentVisitorBase.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/SAXConnector.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/Request.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/transport/http/client/HttpTransportPipe.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JAtom.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/NoSuchEntityException.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/document/http/HTTPUrlReplacement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/resources/model.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/TypeHost.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/sax/SAXDocumentParser.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/GroupPattern.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/UsingAddressing.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/encoding.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/sei/Invoker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Transducer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/IndentingUTF8XmlOutput.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlTransient.java.i
+data/jaxws.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Operation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/ReferencePropertyInfo.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/generator/JavaGeneratorExtensionFacade.java.i
+data/src/share/classes/com/sun/xml/internal/ws/org/objectweb/asm/Label.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/IndentingXMLFilter.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/Statistic.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlAnyAttributeWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/api/J2SJAXBModel.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/nc/AnyNameExceptNameClass.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TransportTubeFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/WSBinding.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/MetadataDocument.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeElementPropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/Sequence.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/DOMUtil.java.i
+data/src/share/classes/com/sun/xml/internal/ws/wsdl/parser/W3CAddressingMetadataWSDLParserExtension.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/SchemaConstants.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/ClassType.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlAccessorType.java.i
+data/src/share/jaxws_classes/javax/xml/bind/SchemaOutputResolver.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JStringLiteral.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/policy/PolicyResolverFactory.java.i
+data/src/share/jaxws_classes/javax/xml/bind/attachment/AttachmentUnmarshaller.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/core/MaybeElement.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ResourceLoader.java.i
+data/src/share/classes/com/sun/xml/internal/ws/addressing/W3CWsaServerTube.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/NodeSet.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/Handler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/StreamingDataHandler.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumLeafInfoImpl.java.i
+data/src/share/jaxws_classes/javax/xml/ws/Response.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/PropertySet.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/NGCCRuntimeEx.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionAddressing.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/XmlElementQuick.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/sax/Features.java.i
+data/src/share/classes/javax/activation/SecuritySupport.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeEnumConstantImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/Input.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/ast/builder/Div.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/httpserver.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/WSDLOperationFinder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/annotation/spec/XmlValueWriter.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/dtd/bindinfo/bindingfile.xsd.i
+data/src/share/classes/javax/xml/ws/LogicalMessage.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/util/StringCutter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/DumpTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/client/RequestContext.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/XMLHandlerProcessor.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/HeaderList.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/internal/InternalEncoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/helper/AbstractFilterTubeImpl.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/ErrorListener.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/AttributeDeclImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/AbstractSchemaValidationTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/soap/streaming/SOAPNamespaceConstants.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/sax/ExtendedContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/message/Util.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JGenerifiableImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/ServerMessageHandlerTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/BMMimeMultipart.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/document/schema/Schema.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NClass.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java.i
+data/src/share/jaxws_classes/javax/xml/ws/WebServiceRef.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/parse/compact/TokenMgrError.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeAttributePropertyInfo.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/BindingIDFactory.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wscompile/WsgenOptions.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/NameBuilder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/JaxBeanInfo.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/Block.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/runtime/JAXBContextFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/pipe/TubelineAssembler.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/XmlNode.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainCaller.java.i
+data/src/share/classes/com/sun/xml/internal/ws/handler/HandlerChainsModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/HeaderTokenizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MIMEMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/message/stream/XMLStreamReaderMessage.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/AnyTypeImpl.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/api/package.html.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayElementProperty.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/xml/sax/JAXPXMLReaderCreator.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/DatatypeBuilder.java.i
+data/src/share/classes/com/sun/istack/internal/localization/Localizer.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/FeatureConstructor.java.i
+data/src/share/classes/com/sun/codemodel/internal/JCast.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MonitorBase.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeUtility.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/XML_SAX_StAX_FI.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/PrimitiveArrayListerByte.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/wsdl/WSDLModelerBase.java.i
+data/src/share/classes/com/sun/codemodel/internal/fmt/JStaticJavaFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/scd/Step.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/reader/xmlschema/parser/MessageBundle.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/GifDataContentHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/resources/ServerMessages.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/SchemaValidationFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/model/annotation/ClassLocatable.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java.i
+data/src/share/classes/com/sun/tools/internal/jxc/apt/package.html.i
+data/src/share/classes/org/relaxng/datatype/Datatype.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/WhitespaceStripper.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/complexType.java.i
+data/src/share/classes/com/sun/xml/internal/ws/streaming/XMLStreamWriterFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/RestrictionSimpleTypeImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/fmt/JStaticFile.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ClassBeanInfoImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/UnionSimpleTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/xsom/impl/parser/state/simpleType.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlElement.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceReferenceCollector.java.i
+data/src/share/classes/com/sun/codemodel/internal/util/MS1252Encoder.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/resources/dispatch.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/util/ForkEntityResolver.java.i
+data/src/share/jaxws_classes/javax/xml/ws/handler/soap/SOAPHandler.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/MUTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MtomCodec.java.i
+data/src/share/classes/javax/xml/bind/Unmarshaller.java.i
+data/src/share/jaxws_classes/org/relaxng/datatype/DatatypeStreamingValidator.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/annotation/FieldLocatable.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/dtdparser/DTDHandlerBase.java.i
+data/src/share/classes/com/sun/tools/internal/ws/processor/model/jaxb/JAXBTypeVisitor.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/CEnumConstant.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset/algorithm/LongEncodingAlgorithm.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/soap/ClientMUTube.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/SOAPExceptionImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/DefaultAnnotationParser.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java.i
+data/src/share/classes/com/sun/tools/internal/xjc/generator/bean/PackageOutlineImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/txw2/output/DumpSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/algorithm/ShortEncodingAlgorithm.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/util/pipe/StandaloneTubeAssembler.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/GrammarSectionHost.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/output/InPlaceDOMOutput.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/wsdl/writer/document/soap12/SOAPFault.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/addressing/ProblemHeaderQName.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/runtime/Location.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/DOMForest.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/Node.java.i
+data/src/share/classes/com/sun/codemodel/internal/JReturn.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/Messages.properties.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/api/ComponentFeature.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/XSUnionSimpleType.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/relaxng/RELAXNGInternalizationLogic.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/Constants.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/MethodAccessor_Double.java.i
+data/src/share/classes/com/sun/xml/internal/rngom/binary/visitor/PatternWalker.java.i
+data/src/share/classes/com/sun/tools/internal/ws/api/wsdl/TWSDLExtension.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/MimeMultipart.java.i
+data/src/share/classes/com/sun/xml/internal/messaging/saaj/soap/LocalStrings.properties.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/gbind/ElementSets.java.i
+data/src/share/classes/javax/xml/bind/ValidationEventLocator.java.i
+data/src/share/classes/com/sun/codemodel/internal/JWhileLoop.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/binary/DataPattern.java.i
+data/src/share/classes/com/sun/tools/internal/txw2/model/prop/Prop.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/JaxmURI.java.i
+data/src/share/classes/com/sun/xml/internal/stream/buffer/sax/Properties.java.i
+data/src/share/jaxws_classes/com/sun/org/glassfish/external/probe/provider/PluginPoint.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/ModelChecker.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/parse/host/ElementAnnotationBuilderHost.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeHost.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/DetailEntryImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/util/Pool.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/rngom/digested/DValuePattern.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JCatchBlock.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/MapPropertyInfoImpl.java.i
+data/src/share/classes/com/sun/codemodel/internal/JVar.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/impl/CommentImpl.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/parser/HTTPExtensionHandler.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/AbstractReferenceFinderImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Integer.java.i
+data/src/share/classes/com/sun/xml/internal/txw2/output/DomSerializer.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/WSDLPatcher.java.i
+data/src/share/classes/com/sun/xml/internal/ws/server/SDDocumentImpl.java.i
+data/src/share/classes/com/sun/xml/internal/ws/developer/SchemaValidation.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/Occurs.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/JAXWSProperties.java.i
+data/src/share/classes/com/sun/xml/internal/ws/protocol/xml/XMLMessageException.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/stax/StreamReaderBufferProcessor.java.i
+data/src/share/classes/com/sun/xml/internal/ws/encoding/soap/SOAPEPTFactory.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/packaging/mime/internet/ParameterList.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/xsom/impl/parser/state/facet.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/opt/TransducedAccessor_method_Short.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/model/wsdl/WSDLPortImpl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/util/CharWriter.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/ComplexTypeModel.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ver1_1/SOAPPart1_1Impl.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/WellKnownNamespace.java.i
+data/src/share/classes/com/sun/xml/internal/bind/v2/schemagen/xmlschema/SimpleContent.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/WildcardTypeImpl.java.i
+data/src/share/classes/com/sun/xml/internal/fastinfoset/tools/StAX2SAXReader.java.i
+data/src/share/jaxws_classes/javax/xml/bind/annotation/XmlIDREF.java.i
+data/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java.i
+data/src/share/classes/com/sun/codemodel/internal/JDoLoop.java.i
+data/src/share/jaxws_classes/com/sun/codemodel/internal/JFieldRef.java.i
+data/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/model/Request.java.i
+data/src/share/classes/com/sun/tools/internal/ws/wsdl/framework/GlobalEntity.java.i
+data/src/share/classes/com/sun/xml/internal/org/jvnet/fastinfoset/stax/FastInfosetStreamReader.java.i
diff --git a/jaxws/.hg/store/undo b/jaxws/.hg/store/undo
index 7226784..da050ff 100644
Binary files a/jaxws/.hg/store/undo and b/jaxws/.hg/store/undo differ
diff --git a/jaxws/.hg/undo.desc b/jaxws/.hg/undo.desc
index bc313aa..7454d0d 100644
--- a/jaxws/.hg/undo.desc
+++ b/jaxws/.hg/undo.desc
@@ -1,3 +1,3 @@
-281
+300
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jaxws
diff --git a/jaxws/.hg/undo.dirstate b/jaxws/.hg/undo.dirstate
index c2a405a..560adef 100644
Binary files a/jaxws/.hg/undo.dirstate and b/jaxws/.hg/undo.dirstate differ
diff --git a/jaxws/.hgignore b/jaxws/.hgignore
index 970fc82..36b21b1 100644
--- a/jaxws/.hgignore
+++ b/jaxws/.hgignore
@@ -5,3 +5,4 @@
^webrev/
/nbproject/private/
^.hgtip
+.DS_Store
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 0e44950..2c7409d 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -151,3 +151,11 @@ b73b733214aa43648d69a2da51e6b48fda902a2d jdk8-b19
c266cab0e3fff05f2048c23046c14d60f7102175 jdk8-b21
8d3df89b0f2d3c603b2edb0f5e24af1245397cc6 jdk8-b22
25ce7a0004874273f6aeda14e7c3538cba34bdf1 jdk8-b23
+e0d90803439b174fe0b0033e09d50444ba12498f jdk8-b24
+b376d901e006cd9e0c59733c84e190aace23eec6 jdk8-b25
+3518639eab6ce5c7b482bdb0a60342c392ab97a8 jdk8-b26
+38c037af4127289de12efc67f45d19bb67abff69 jdk8-b27
+88b85470e72ce48515c802d2158f61cad198b935 jdk8-b28
+4897d9d2d04838e3479745efa238a99bacd939c9 jdk8-b29
+6882b10e85d6f6ba110dbb50926d6fe2222cc7ad jdk8-b30
+4c41c6d0e15de3b56919a5ba0a0f248a2d07f2b2 jdk8-b31
diff --git a/jaxws/README b/jaxws/README
index f546265..4d65125 100644
--- a/jaxws/README
+++ b/jaxws/README
@@ -17,9 +17,3 @@ Simple Build Instructions:
"dist" directory.
Help information is available by running "ant -projecthelp" or "make help".
-Drop Repository:
- This repository builds sources from a created "drop" source directory.
- These files will normally be copied from a shared directory area or
- downloaded from a public website.
- See the ant build script (build.xml) for more details.
-
diff --git a/jaxws/build-defs.xml b/jaxws/build-defs.xml
deleted file mode 100644
index 27bf721..0000000
--- a/jaxws/build-defs.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- 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.
--->
-
-<project name="jaxws_defs" default="all" basedir=".">
-
- <!-- Specific build properties. -->
- <property file="jaxws.properties"/>
-
- <!-- Where generated xml files will stay. -->
- <property name="xml.gen.dir" value="${build.dir}/xml_generated"/>
- <property name="xml.template" value="build-drop-template.xml"/>
-
- <!-- ############### -->
- <!-- Begin Macrodefs -->
-
- <!-- Copies template file, replaces @DROP@ pattern, and imports it. -->
- <macrodef name="drop-import">
- <attribute name="name"/>
- <sequential>
- <property name="xml.gen.@{name}" value="${xml.gen.dir}/build-drop-@{name}.xml"/>
- <mkdir dir="${xml.gen.dir}"/>
- <copy file="${xml.template}" tofile="${xml.gen.@{name}}"/>
- <replace file="${xml.gen.@{name}}" token="@DROP@" value="@{name}"/>
- <import file="${xml.gen.@{name}}"/>
- </sequential>
- </macrodef>
-
- <!-- End of Macrodefs -->
- <!-- ############### -->
-
- <!-- Create xml file and import it for these drops. -->
- <drop-import name="jaxws_src"/>
- <drop-import name="jaf_src"/>
- <!-- <drop-import name="jaxws_tests"/> -->
-
- <!-- Fail and print helpful messages if source does not exist. -->
- <target name="-src-help">
- <fail message="${failed.url.src.message}">
- <condition>
- <and>
- <not>
- <and>
- <available file="${jaxws_src.src.dir}" type="dir"/>
- <available file="${jaf_src.src.dir}" type="dir"/>
- </and>
- </not>
- <istrue value="${allow.downloads}"/>
- </and>
- </condition>
- </fail>
- <fail message="${failed.nourl.src.message}">
- <condition>
- <not>
- <and>
- <available file="${jaxws_src.src.dir}" type="dir"/>
- <available file="${jaf_src.src.dir}" type="dir"/>
- </and>
- </not>
- </condition>
- </fail>
- </target>
-
- <!-- Special build area setup. -->
- <target name="-drop-build-setup" depends="init, -init-src-dirs">
- <mkdir dir="${build.classes.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${primary.src.dir}"
- includes="**/*.xsd, **/*.default, **/*.properties"
- excludes="**/*.java, **/*.package.html"/>
- </copy>
- <replaceregexp match="#(.*)$" replace="#" flags="gm">
- <fileset dir="${build.classes.dir}" includes="**/*.properties"/>
- </replaceregexp>
-
- <mkdir dir="${build.classes.dir}/META-INF/services"/>
- <copy todir="${build.classes.dir}/META-INF"
- file="${secondary.src.dir}/META-INF/mailcap.default"/>
- <copy todir="${build.classes.dir}/META-INF"
- file="${secondary.src.dir}/META-INF/mimetypes.default"/>
- <copy todir="${build.classes.dir}/META-INF/services"
- file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory"/>
- <copy todir="${build.classes.dir}/META-INF/services"
- file="${primary.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/>
- <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/>
- <copy todir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime">
- <fileset dir="${primary.src.dir}/com/sun/tools/internal/xjc/runtime"
- includes="**/*.java"
- excludes="**/*.package.html"/>
- </copy>
- </target>
-
- <!-- Try to get drop sources. -->
- <target name="-set-props"
- depends="init,
- jaxws_src-update,
- jaf_src-update">
- </target>
-
- <!-- Set up source to use drop.dir. -->
- <target name="-use-drop" depends="-set-props">
- <property name="primary.src.dir" value="${jaxws_src.src.dir}"/>
- <property name="secondary.src.dir" value="${jaf_src.src.dir}"/>
- <path id="src.dir.id">
- <pathelement path="${primary.src.dir}"/>
- <pathelement path="${jaf_src.src.dir}"/>
- </path>
- </target>
-
- <!-- Source directory selection. -->
- <target name="-init-src-dirs"
- depends="init, -use-drop,-src-help">
- <echo message="Using primary.src.dir=${primary.src.dir}"/>
- <pathconvert property="src.list.id" refid="src.dir.id"/>
- <echo message="Using src.dir.id=${src.list.id}"/>
- </target>
-
- <!-- Create drop src.zip. -->
- <target name="-drop-src-zip" depends="init, -set-props">
- <zip file="${dist.src.zip}" basedir="${primary.src.dir}"/>
- <zip file="${dist.src.zip}" basedir="${jaf_src.src.dir}" update="true"/>
- </target>
-
- <!-- Create src.zip. -->
- <target name="-dist-src-zip" depends="init, -drop-src-zip">
- </target>
-
-</project>
diff --git a/jaxws/build-drop-template.xml b/jaxws/build-drop-template.xml
deleted file mode 100644
index a593b42..0000000
--- a/jaxws/build-drop-template.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- 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.
--->
-
-<project name="@DROP at -drop" default="all" basedir=".">
-
- <!-- Locations of master drop bundles. -->
- <property name="@DROP at .master.bundle.copy"
- value="${@DROP at .master.bundle.dir}/${@DROP at .bundle.name}"/>
- <property name="@DROP at .master.bundle.url"
- value="${@DROP at .master.bundle.url.base}/${@DROP at .bundle.name}"/>
-
- <!-- Location where the copied bundle lands. -->
- <property name="@DROP at .bundle.copy"
- value="${drop.expanded.dir}/bundles/${@DROP at .bundle.name}"/>
-
- <!-- Root of exploded area. -->
- <property name="@DROP at .root.dir" value="${drop.dir}/@DROP@"/>
- <property name="@DROP at .src.dir" value="${@DROP at .root.dir}/src"/>
-
- <!-- To see if the drop areas are ready. (ignoring bundles) -->
- <target name="- at DROP@-ready">
- <condition property="@DROP at .ready">
- <or>
- <available file="${drop.included.dir}" type="dir"/>
- <and>
- <available file="${@DROP at .root.dir}" type="dir"/>
- <available file="${@DROP at .root.dir}/PATCHED" type="file"/>
- </and>
- </or>
- </condition>
- </target>
-
- <!-- Copy over bundles from some shared master area. -->
- <condition property="@DROP at .master.bundle.copy.exists">
- <available file="${@DROP at .master.bundle.copy}" type="file"/>
- </condition>
- <target name="- at DROP@-copy-bundle"
- depends="init, - at DROP@-ready"
- if="@DROP at .master.bundle.copy.exists"
- unless="@DROP at .ready">
- <echo message="Copying from ${@DROP at .master.bundle.copy}"/>
- <dirname property="@DROP at .bundle.dirname" file="${@DROP at .bundle.copy}"/>
- <mkdir dir="${@DROP at .bundle.dirname}"/>
- <delete file="${@DROP at .bundle.copy}.temp"/>
- <delete file="${@DROP at .bundle.copy}"/>
- <copy file="${@DROP at .master.bundle.copy}" tofile="${@DROP at .bundle.copy}.temp"/>
- <move file="${@DROP at .bundle.copy}.temp" tofile="${@DROP at .bundle.copy}"/>
- <property name="@DROP at .master.bundle.found" value="true"/>
- </target>
-
- <!-- Determine if the master url download should be used. -->
- <target name="- at DROP@-url-should-be-used" unless="@DROP at .url.should.be.used">
- <condition property="@DROP at .url.should.be.used">
- <and>
- <istrue value="${allow.downloads}"/>
- <not>
- <isset property="@DROP at .master.bundle.copy.exists"/>
- </not>
- </and>
- </condition>
- </target>
-
- <!-- Download bundles from a url. -->
- <target name="- at DROP@-url-bundle"
- depends="init, - at DROP@-ready, - at DROP@-url-should-be-used"
- if="@DROP at .url.should.be.used"
- unless="@DROP at .ready">
- <echo message="Downloading from ${@DROP at .master.bundle.url}"/>
- <dirname property="@DROP at .bundle.dirname" file="${@DROP at .bundle.copy}"/>
- <mkdir dir="${@DROP at .bundle.dirname}"/>
- <delete file="${@DROP at .bundle.copy}.temp"/>
- <delete file="${@DROP at .bundle.copy}"/>
- <get src="${@DROP at .master.bundle.url}" dest="${@DROP at .bundle.copy}.temp"/>
- <move file="${@DROP at .bundle.copy}.temp" tofile="${@DROP at .bundle.copy}"/>
- <property name="@DROP at .master.bundle.found" value="true"/>
- </target>
-
- <!-- Fill in the drop zones, but just when needed. -->
- <target name="@DROP at -update"
- depends="init,
- - at DROP@-copy-bundle,
- - at DROP@-url-bundle,
- - at DROP@-ready"
- if="@DROP at .master.bundle.found"
- unless="@DROP at .ready">
- <delete dir="${@DROP at .root.dir}"/>
- <delete dir="${@DROP at .root.dir}-temp"/>
- <mkdir dir="${@DROP at .root.dir}-temp"/>
- <checksum file="${@DROP at .bundle.copy}"
- property="@DROP at .bundle.md5.checksum.is"/>
- <condition property="@DROP at .bundle.md5.checksum.good">
- <equals arg1="${@DROP at .bundle.md5.checksum}"
- arg2="${@DROP at .bundle.md5.checksum.is}"/>
- </condition>
- <fail unless="@DROP at .bundle.md5.checksum.good">
- Checksum on file ${@DROP at .bundle.copy} is
- ${@DROP at .bundle.md5.checksum.is}, not ${@DROP at .bundle.md5.checksum}
- </fail>
- <unzip src="${@DROP at .bundle.copy}" dest="${@DROP at .root.dir}-temp"/>
- <move file="${@DROP at .root.dir}-temp" tofile="${@DROP at .root.dir}"/>
- <touch>
- <fileset dir="${@DROP at .root.dir}"/>
- </touch>
- <condition property="patch.utility" value="gpatch" else="patch">
- <os name="SunOS"/>
- </condition>
- <apply executable="${patch.utility}"
- dir="${@DROP at .root.dir}"
- parallel="false"
- failonerror="true"
- verbose="true">
- <arg value="-l"/>
- <arg value="-p0"/>
- <arg value="-i"/>
- <filelist dir="${patches.dir}/@DROP@" files="${@DROP at .patch.list}"/>
- </apply>
- <echo file="${@DROP at .root.dir}/PATCHED"
- message="Patches have been applied."/>
- </target>
-
-</project>
diff --git a/jaxws/build.properties b/jaxws/build.properties
index a468f81..9240acc 100644
--- a/jaxws/build.properties
+++ b/jaxws/build.properties
@@ -23,10 +23,6 @@
# questions.
#
-# Base locations where bundles are located
-slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk8-drops
-
# This is the JDK used to build and run the bootstrap version of javac.
# The bootstrap javac is used to compile both boostrap versions of the
# other tools, and product versions of all the tools.
@@ -68,15 +64,6 @@ dist.lib.dir=${dist.dir}/lib
dist.classes.jar=${dist.lib.dir}/classes.jar
dist.src.zip=${dist.lib.dir}/src.zip
-# Where all drop sources get placed when downloaded and unzipped
-drop.expanded.dir=${output.dir}/drop
-
-# Location if the sources were included already
-drop.included.dir=./drop_included
-
-# Where patches to drop bundle sources live
-patches.dir=patches
-
# Sanity information
sanity.info= Sanity Settings:${line.separator}\
ant.home=${ant.home}${line.separator}\
@@ -100,28 +87,6 @@ sanity.info= Sanity Settings:${line.separator}\
output.dir=${output.dir}${line.separator}\
build.dir=${build.dir}${line.separator}\
dist.dir=${dist.dir}${line.separator}\
- drop.dir=${drop.dir}${line.separator}\
- drops.dir=${drops.dir}${line.separator}\
-${line.separator}
-
-# Failure messages when source cannot be found on the file system
-failed.nourl.src.message=\
-ERROR: Cannot find source for project ${ant.project.name}.\
-${line.separator}${line.separator}\
-HINT: Try setting drops.dir to indicate where the bundles can be found, \
-or try setting the ant property allow.downloads=true to download the bundle from the URL.\
-${line.separator}\
-e.g. ant -Dallow.downloads=true -OR- ant -Ddrops.dir=some_directory \
-${line.separator}
-
-# Failure message when source cannot be downloaded
-failed.url.src.message=\
-ERROR: Cannot find source for project ${ant.project.name}.\
-${line.separator}${line.separator}\
-HINT: Try setting drops.dir to indicate where the bundles can be found, \
-or try checking the URL with your browser.\
-${line.separator}\
-e.g. ant -Ddrops.dir=some_directory \
${line.separator}
#------------------------------------------------------------
diff --git a/jaxws/build.xml b/jaxws/build.xml
index 818c939..afea552 100644
--- a/jaxws/build.xml
+++ b/jaxws/build.xml
@@ -36,9 +36,6 @@
javac.debug - true or false for debug classfiles
javac.target - classfile version target
javac.source - source version
- drops.dir - directory that holds source drop bundles
- allow.download - permit downloads from public url (default is false)
- (used if bundles not found in drops.dir)
Run 'make help' for help using the Makefile.
</description>
@@ -46,15 +43,12 @@
<!-- Project build properties. -->
<property file="build.properties"/>
- <!-- See if drop sources were included. -->
- <condition property="drop.dir"
- value="${drop.included.dir}"
- else="${drop.expanded.dir}">
- <available file="${drop.included.dir}" type="dir"/>
- </condition>
-
- <!-- Get shared targets. -->
- <import file="build-defs.xml"/>
+ <property name="jaxws.src.dir" value="src/share/jaxws_classes"/>
+ <property name="jaf.src.dir" value="src/share/jaf_classes"/>
+ <path id="src.dir.id">
+ <pathelement path="${jaxws.src.dir}"/>
+ <pathelement path="${jaf.src.dir}"/>
+ </path>
<!-- Initialization of directories needed for build. -->
<target name="init">
@@ -79,14 +73,20 @@
unless="javac.jar.exists">
<echo message="WARNING: Cannot find ${javac.jar}"/>
</target>
+
+ <!-- Create src.zip. -->
+ <target name="-dist-src-zip" depends="init">
+ <zip file="${dist.src.zip}" basedir="${jaxws.src.dir}"/>
+ <zip file="${dist.src.zip}" basedir="${jaf.src.dir}" update="true"/>
+ </target>
<!-- Creation of distribution files to jdk build process. -->
<target name="dist"
- depends="init, -init-src-dirs, build, -dist-classes-jar, -dist-src-zip"
+ depends="init, build, -dist-classes-jar, -dist-src-zip"
description="Create all built distribution files.">
</target>
<target name="-dist-classes-jar-uptodate"
- depends="init, -init-src-dirs">
+ depends="init">
<condition property="dist.classes.jar.uptodate">
<and>
<available file="${dist.classes.jar}" type="file"/>
@@ -97,14 +97,39 @@
</condition>
</target>
<target name="-dist-classes-jar"
- depends="init, -init-src-dirs, -dist-classes-jar-uptodate"
+ depends="init, -dist-classes-jar-uptodate"
unless="dist.classes.jar.uptodate">
<delete file="${dist.classes.jar}"/>
<jar file="${dist.classes.jar}" basedir="${build.classes.dir}"/>
</target>
- <target name="-build-setup"
- depends="init, -init-src-dirs, -drop-build-setup">
+ <!-- Special build area setup. -->
+ <target name="-build-setup" depends="init">
+ <mkdir dir="${build.classes.dir}"/>
+ <copy todir="${build.classes.dir}">
+ <fileset dir="${jaxws.src.dir}"
+ includes="**/*.xsd, **/*.default, **/*.properties"
+ excludes="**/*.java, **/*.package.html"/>
+ </copy>
+ <replaceregexp match="#(.*)$" replace="#" flags="gm">
+ <fileset dir="${build.classes.dir}" includes="**/*.properties"/>
+ </replaceregexp>
+
+ <mkdir dir="${build.classes.dir}/META-INF/services"/>
+ <copy todir="${build.classes.dir}/META-INF"
+ file="${jaf.src.dir}/META-INF/mailcap.default"/>
+ <copy todir="${build.classes.dir}/META-INF"
+ file="${jaf.src.dir}/META-INF/mimetypes.default"/>
+ <copy todir="${build.classes.dir}/META-INF/services"
+ file="${jaxws.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin"/>
+ <copy todir="${build.classes.dir}/META-INF/services"
+ file="${jaxws.src.dir}/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin"/>
+ <mkdir dir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime"/>
+ <copy todir="${build.classes.dir}/com/sun/tools/internal/xjc/runtime">
+ <fileset dir="${jaxws.src.dir}/com/sun/tools/internal/xjc/runtime"
+ includes="**/*.java"
+ excludes="**/*.package.html"/>
+ </copy>
</target>
<!-- Build (compilation) of sources to class files. -->
@@ -112,7 +137,7 @@
depends="compile, -build-setup">
</target>
<target name="compile"
- depends="init, -init-src-dirs">
+ depends="init">
<mkdir dir="${build.classes.dir}"/>
<javac
includeAntRuntime="false"
@@ -132,24 +157,14 @@
<!-- Test. (FIXME: Need to know how to run tests.) -->
<target name="test"
- depends="init, -init-src-dirs, dist">
+ depends="init, dist">
<echo message="FIXME: How do you run the tests"/>
</target>
<!-- Populate source area if needed. -->
<target name="source"
- depends="init, -init-src-dirs"
- description="Populate all source file directories">
- </target>
-
- <!-- Populate drop_included area. -->
- <target name="drop_included"
- depends="clobber"
+ depends="init"
description="Populate all source file directories">
- <delete dir="${drop.included.dir}"/>
- <antcall target="source"/>
- <move file="${drop.expanded.dir}" tofile="${drop.included.dir}"/>
- <delete dir="${drop.included.dir}/bundles"/>
</target>
<!-- Clean up compiled files. -->
@@ -163,7 +178,6 @@
<target name="clobber"
depends="clean"
description="Delete all generated files, including imported sources">
- <delete dir="${drop.expanded.dir}"/>
</target>
<target name="-banner">
diff --git a/jaxws/jaxws.properties b/jaxws/jaxws.properties
deleted file mode 100644
index f3952bb..0000000
--- a/jaxws/jaxws.properties
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-drops.master.copy.base=${drops.dir}
-
-jaxws_src.bundle.name=jdk8-jaxws2_2_4-b01-2011_07_22.zip
-jaxws_src.bundle.md5.checksum=f64bedd3c512e6b1ca265fda2feb0905
-jaxws_src.master.bundle.dir=${drops.master.copy.base}
-jaxws_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
-
-jaf_src.bundle.name=jdk8-jaf-2011_07_22.zip
-jaf_src.bundle.md5.checksum=18d15dfd71117daadb332af003d08212
-jaf_src.master.bundle.dir=${drops.master.copy.base}
-jaf_src.master.bundle.url.base=http://download.java.net/glassfish/components/jax-ws/openjdk/jdk8
-
-#jaxws_tests.bundle.name=jdk7-jaxws-tests-2009_08_28.zip
-#jaxws_tests.master.bundle.dir=${drops.master.copy.base}
-#jaxws_tests.master.bundle.url.base=https://java.net/downloads/jax-ws/JDK7
-
diff --git a/jaxws/make/Makefile b/jaxws/make/Makefile
index b2574d7..12f1328 100644
--- a/jaxws/make/Makefile
+++ b/jaxws/make/Makefile
@@ -91,23 +91,6 @@ else
endif
endif
-# Do we have the drops already downloaded?
-# Check ALT_DROPS_DIR for a full path first,
-# before trying to use the devtools path,
-# either via ALT_JDK_DEVTOOLS_DIR or /java/devtools.
-ifdef ALT_DROPS_DIR
- DROPS_DIR = $(ALT_DROPS_DIR)
-else
- ifdef ALT_JDK_DEVTOOLS_DIR
- DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
- else
- DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
- endif
-endif
-
-# Add in path to drops already downloaded
-ANT_OPTIONS += -Ddrops.dir=$(DROPS_DIR)
-
ifdef ALT_OUTPUTDIR
OUTPUTDIR = $(ALT_OUTPUTDIR)
ANT_OPTIONS += -Doutput.dir=$(ALT_OUTPUTDIR)
@@ -144,13 +127,17 @@ endif
default: all
# All ant targets of interest
-ANT_TARGETS = all source drop_included build dist clobber clean sanity
+ANT_TARGETS = all build dist clobber clean sanity
# Create a make target for each
$(ANT_TARGETS):
cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) -version
cd .. && $(ANT_JAVA_HOME) $(ANT) $(ANT_OPTIONS) $@
+# Just for compat reasons, delete in future.
+drop_included:
+source:
+
# Help target
define helpenvline
@echo " $1";echo " $2"
@@ -164,8 +151,6 @@ help:
@echo " $(ANT_TARGETS)"
@echo " "
@echo " Environment or command line variables (all optional):"
- $(call helpenvline, ALT_DROPS_DIR,\
- "Directory that contains the drop source bundles i.e. drops.dir")
$(call helpenvline, ALT_BOOTDIR,\
"JAVA_HOME to use when running ant")
$(call helpenvline, ALT_LANGTOOLS_DIST,\
diff --git a/jaxws/make/jprt.properties b/jaxws/make/jprt.properties
index 360b6b2..9106433 100644
--- a/jaxws/make/jprt.properties
+++ b/jaxws/make/jprt.properties
@@ -39,6 +39,7 @@ jprt.build.targets= \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
+ macosx_x64_10.7-{product|fastdebug}, \
windows_i586_5.1-{product|fastdebug}, \
windows_x64_5.2-{product|fastdebug}
diff --git a/jaxws/patches/jaxws_src/README b/jaxws/patches/jaxws_src/README
deleted file mode 100644
index 644dff0..0000000
--- a/jaxws/patches/jaxws_src/README
+++ /dev/null
@@ -1,5 +0,0 @@
-
-This directory will hold any patches that need to be applied to the drop files.
-
-The patch order is defined in the ant build script properties.
-
diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 0966fe4..44b677a 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-55c21bd558ac3fdf6b419c2ac558242d7921cf6a 5230
-55c21bd558ac3fdf6b419c2ac558242d7921cf6a default
+d4ceb90566cdf71859dbe8d2d403bb6242b783ef 5475
+d4ceb90566cdf71859dbe8d2d403bb6242b783ef default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index 80455cc..45a8650 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 0a16ee5..ece7332 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index c27d189..2492cc3 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index 610e45f..3341be9 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index 50efbde..e70ae51 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i differ
diff --git a/jdk/.hg/store/data/make/_makefile.i b/jdk/.hg/store/data/make/_makefile.i
index 0579062..9001485 100644
Binary files a/jdk/.hg/store/data/make/_makefile.i and b/jdk/.hg/store/data/make/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/_makefile.i b/jdk/.hg/store/data/make/com/_makefile.i
index e07d30f..96b0cda 100644
Binary files a/jdk/.hg/store/data/make/com/_makefile.i and b/jdk/.hg/store/data/make/com/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/oracle/_makefile.i b/jdk/.hg/store/data/make/com/oracle/_makefile.i
index b14b6e1..ce1f1be 100644
Binary files a/jdk/.hg/store/data/make/com/oracle/_makefile.i and b/jdk/.hg/store/data/make/com/oracle/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/_makefile.i b/jdk/.hg/store/data/make/com/sun/_makefile.i
index dd17952..5e1565e 100644
Binary files a/jdk/.hg/store/data/make/com/sun/_makefile.i and b/jdk/.hg/store/data/make/com/sun/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/java/pack/_makefile.i b/jdk/.hg/store/data/make/com/sun/java/pack/_makefile.i
index 3a63748..4f7781c 100644
Binary files a/jdk/.hg/store/data/make/com/sun/java/pack/_makefile.i and b/jdk/.hg/store/data/make/com/sun/java/pack/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/nio/_makefile.i b/jdk/.hg/store/data/make/com/sun/nio/_makefile.i
index 9f3a22e..bc5c305 100644
Binary files a/jdk/.hg/store/data/make/com/sun/nio/_makefile.i and b/jdk/.hg/store/data/make/com/sun/nio/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/nio/sctp/_exportedfiles.gmk.i b/jdk/.hg/store/data/make/com/sun/nio/sctp/_exportedfiles.gmk.i
index 0f8259c..ad96575 100644
Binary files a/jdk/.hg/store/data/make/com/sun/nio/sctp/_exportedfiles.gmk.i and b/jdk/.hg/store/data/make/com/sun/nio/sctp/_exportedfiles.gmk.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/nio/sctp/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/com/sun/nio/sctp/_f_i_l_e_s__java.gmk.i
index 607ae7d..81154a3 100644
Binary files a/jdk/.hg/store/data/make/com/sun/nio/sctp/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/com/sun/nio/sctp/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/nio/sctp/_makefile.i b/jdk/.hg/store/data/make/com/sun/nio/sctp/_makefile.i
index b8a344a..46f9ffa 100644
Binary files a/jdk/.hg/store/data/make/com/sun/nio/sctp/_makefile.i and b/jdk/.hg/store/data/make/com/sun/nio/sctp/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/nio/sctp/mapfile-vers.i b/jdk/.hg/store/data/make/com/sun/nio/sctp/mapfile-vers.i
index c906eb3..ce8b07c 100644
Binary files a/jdk/.hg/store/data/make/com/sun/nio/sctp/mapfile-vers.i and b/jdk/.hg/store/data/make/com/sun/nio/sctp/mapfile-vers.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i b/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i
index 9e3a6d1..6368d0d 100644
Binary files a/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i and b/jdk/.hg/store/data/make/com/sun/security/auth/module/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/tools/attach/_exportedfiles.gmk.i b/jdk/.hg/store/data/make/com/sun/tools/attach/_exportedfiles.gmk.i
index bf8c85f..0a82412 100644
Binary files a/jdk/.hg/store/data/make/com/sun/tools/attach/_exportedfiles.gmk.i and b/jdk/.hg/store/data/make/com/sun/tools/attach/_exportedfiles.gmk.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__c.gmk.i b/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__c.gmk.i
index daef0aa..2f25ecd 100644
Binary files a/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__c.gmk.i and b/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__c.gmk.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__java.gmk.i
index 7b5ee91..209cb49 100644
Binary files a/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/com/sun/tools/attach/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/tools/attach/_makefile.i b/jdk/.hg/store/data/make/com/sun/tools/attach/_makefile.i
index 90ce780..40e68c5 100644
Binary files a/jdk/.hg/store/data/make/com/sun/tools/attach/_makefile.i and b/jdk/.hg/store/data/make/com/sun/tools/attach/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-linux.gmk.i b/jdk/.hg/store/data/make/common/_defs-linux.gmk.i
index b8b5634..51a164a 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-linux.gmk.i and b/jdk/.hg/store/data/make/common/_defs-linux.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i b/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i
index 4bba868..77ff2ef 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i and b/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs.gmk.i b/jdk/.hg/store/data/make/common/_defs.gmk.i
index 9807737..89479b5 100644
Binary files a/jdk/.hg/store/data/make/common/_defs.gmk.i and b/jdk/.hg/store/data/make/common/_defs.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_library.gmk.i b/jdk/.hg/store/data/make/common/_library.gmk.i
index 0503fcf..3c62b4a 100644
Binary files a/jdk/.hg/store/data/make/common/_library.gmk.i and b/jdk/.hg/store/data/make/common/_library.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_program.gmk.i b/jdk/.hg/store/data/make/common/_program.gmk.i
index 251ee81..bf06d75 100644
Binary files a/jdk/.hg/store/data/make/common/_program.gmk.i and b/jdk/.hg/store/data/make/common/_program.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_release-embedded.gmk.i b/jdk/.hg/store/data/make/common/_release-embedded.gmk.i
index 70f8004..5a93141 100644
Binary files a/jdk/.hg/store/data/make/common/_release-embedded.gmk.i and b/jdk/.hg/store/data/make/common/_release-embedded.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_release.gmk.i b/jdk/.hg/store/data/make/common/_release.gmk.i
index 26f1f0f..c47bb45 100644
Binary files a/jdk/.hg/store/data/make/common/_release.gmk.i and b/jdk/.hg/store/data/make/common/_release.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_rules.gmk.i b/jdk/.hg/store/data/make/common/_rules.gmk.i
index f246a7b..3ac6745 100644
Binary files a/jdk/.hg/store/data/make/common/_rules.gmk.i and b/jdk/.hg/store/data/make/common/_rules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/internal/_defs-jaxws.gmk.i b/jdk/.hg/store/data/make/common/internal/_defs-jaxws.gmk.i
index 413d09b..de3d6d0 100644
Binary files a/jdk/.hg/store/data/make/common/internal/_defs-jaxws.gmk.i and b/jdk/.hg/store/data/make/common/internal/_defs-jaxws.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i b/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i
index 85a5791..929ce96 100644
Binary files a/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i and b/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/internal/_native_compile_rules.gmk.i b/jdk/.hg/store/data/make/common/internal/_native_compile_rules.gmk.i
index 09894ad..4c3d506 100644
Binary files a/jdk/.hg/store/data/make/common/internal/_native_compile_rules.gmk.i and b/jdk/.hg/store/data/make/common/internal/_native_compile_rules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_compiler-gcc.gmk.i b/jdk/.hg/store/data/make/common/shared/_compiler-gcc.gmk.i
index 8115155..7272b8c 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_compiler-gcc.gmk.i and b/jdk/.hg/store/data/make/common/shared/_compiler-gcc.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_defs-java.gmk.i b/jdk/.hg/store/data/make/common/shared/_defs-java.gmk.i
index 38f3a82..21a83a1 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_defs-java.gmk.i and b/jdk/.hg/store/data/make/common/shared/_defs-java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_defs-utils.gmk.i b/jdk/.hg/store/data/make/common/shared/_defs-utils.gmk.i
index c3dd73a..e7f3143 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_defs-utils.gmk.i and b/jdk/.hg/store/data/make/common/shared/_defs-utils.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_defs-versions.gmk.i b/jdk/.hg/store/data/make/common/shared/_defs-versions.gmk.i
index 0c5cd3f..92ad4c3 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_defs-versions.gmk.i and b/jdk/.hg/store/data/make/common/shared/_defs-versions.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_defs.gmk.i b/jdk/.hg/store/data/make/common/shared/_defs.gmk.i
index 02abd6e..e4eba10 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_defs.gmk.i and b/jdk/.hg/store/data/make/common/shared/_defs.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_platform.gmk.i b/jdk/.hg/store/data/make/common/shared/_platform.gmk.i
index 5884483..d6c2749 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_platform.gmk.i and b/jdk/.hg/store/data/make/common/shared/_platform.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_sanity-_settings.gmk.i b/jdk/.hg/store/data/make/common/shared/_sanity-_settings.gmk.i
index 4939e24..31654bc 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_sanity-_settings.gmk.i and b/jdk/.hg/store/data/make/common/shared/_sanity-_settings.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_sanity.gmk.i b/jdk/.hg/store/data/make/common/shared/_sanity.gmk.i
index d333096..9ed6f03 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_sanity.gmk.i and b/jdk/.hg/store/data/make/common/shared/_sanity.gmk.i differ
diff --git a/jdk/.hg/store/data/make/docs/_c_o_r_e___p_k_g_s.gmk.i b/jdk/.hg/store/data/make/docs/_c_o_r_e___p_k_g_s.gmk.i
index 89871cb..f3ec67b 100644
Binary files a/jdk/.hg/store/data/make/docs/_c_o_r_e___p_k_g_s.gmk.i and b/jdk/.hg/store/data/make/docs/_c_o_r_e___p_k_g_s.gmk.i differ
diff --git a/jdk/.hg/store/data/make/docs/_makefile.i b/jdk/.hg/store/data/make/docs/_makefile.i
index e800ee7..9571319 100644
Binary files a/jdk/.hg/store/data/make/docs/_makefile.i and b/jdk/.hg/store/data/make/docs/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/docs/_n_o_n___c_o_r_e___p_k_g_s.gmk.i b/jdk/.hg/store/data/make/docs/_n_o_n___c_o_r_e___p_k_g_s.gmk.i
index ab81975..f65329f 100644
Binary files a/jdk/.hg/store/data/make/docs/_n_o_n___c_o_r_e___p_k_g_s.gmk.i and b/jdk/.hg/store/data/make/docs/_n_o_n___c_o_r_e___p_k_g_s.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/_makefile.i b/jdk/.hg/store/data/make/java/_makefile.i
index b642739..e0bb824 100644
Binary files a/jdk/.hg/store/data/make/java/_makefile.i and b/jdk/.hg/store/data/make/java/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/fdlibm/_makefile.i b/jdk/.hg/store/data/make/java/fdlibm/_makefile.i
index 1538f8f..e24a97e 100644
Binary files a/jdk/.hg/store/data/make/java/fdlibm/_makefile.i and b/jdk/.hg/store/data/make/java/fdlibm/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/instrument/_makefile.i b/jdk/.hg/store/data/make/java/instrument/_makefile.i
index ba70c9a..49b5723 100644
Binary files a/jdk/.hg/store/data/make/java/instrument/_makefile.i and b/jdk/.hg/store/data/make/java/instrument/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i
index c5c61cd..bed28f2 100644
Binary files a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/java/_makefile.i b/jdk/.hg/store/data/make/java/java/_makefile.i
index 2ad4312..46452c5 100644
Binary files a/jdk/.hg/store/data/make/java/java/_makefile.i and b/jdk/.hg/store/data/make/java/java/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/java/genlocales.gmk.i b/jdk/.hg/store/data/make/java/java/genlocales.gmk.i
index 8810294..612a095 100644
Binary files a/jdk/.hg/store/data/make/java/java/genlocales.gmk.i and b/jdk/.hg/store/data/make/java/java/genlocales.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/java/localegen.sh.i b/jdk/.hg/store/data/make/java/java/localegen.sh.i
index 833c5de..0e88319 100644
Binary files a/jdk/.hg/store/data/make/java/java/localegen.sh.i and b/jdk/.hg/store/data/make/java/java/localegen.sh.i differ
diff --git a/jdk/.hg/store/data/make/java/java__hprof__demo/_makefile.i b/jdk/.hg/store/data/make/java/java__hprof__demo/_makefile.i
index 1c28c77..3cb4342 100644
Binary files a/jdk/.hg/store/data/make/java/java__hprof__demo/_makefile.i and b/jdk/.hg/store/data/make/java/java__hprof__demo/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/jli/_makefile.i b/jdk/.hg/store/data/make/java/jli/_makefile.i
index cda38b0..428b4d7 100644
Binary files a/jdk/.hg/store/data/make/java/jli/_makefile.i and b/jdk/.hg/store/data/make/java/jli/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/jvm/_makefile.i b/jdk/.hg/store/data/make/java/jvm/_makefile.i
index 3b84946..3cee2cb 100644
Binary files a/jdk/.hg/store/data/make/java/jvm/_makefile.i and b/jdk/.hg/store/data/make/java/jvm/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/management/_makefile.i b/jdk/.hg/store/data/make/java/management/_makefile.i
index f2bc217..41a06fa 100644
Binary files a/jdk/.hg/store/data/make/java/management/_makefile.i and b/jdk/.hg/store/data/make/java/management/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/management/mapfile-vers.i b/jdk/.hg/store/data/make/java/management/mapfile-vers.i
index 97749a6..af6f588 100644
Binary files a/jdk/.hg/store/data/make/java/management/mapfile-vers.i and b/jdk/.hg/store/data/make/java/management/mapfile-vers.i differ
diff --git a/jdk/.hg/store/data/make/java/net/_f_i_l_e_s__c.gmk.i b/jdk/.hg/store/data/make/java/net/_f_i_l_e_s__c.gmk.i
index d0ce772..0d4eeba 100644
Binary files a/jdk/.hg/store/data/make/java/net/_f_i_l_e_s__c.gmk.i and b/jdk/.hg/store/data/make/java/net/_f_i_l_e_s__c.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/net/_makefile.i b/jdk/.hg/store/data/make/java/net/_makefile.i
index 445cd75..8e0e654 100644
Binary files a/jdk/.hg/store/data/make/java/net/_makefile.i and b/jdk/.hg/store/data/make/java/net/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/nio/_makefile.i b/jdk/.hg/store/data/make/java/nio/_makefile.i
index 1e78eb3..1fea6a3 100644
Binary files a/jdk/.hg/store/data/make/java/nio/_makefile.i and b/jdk/.hg/store/data/make/java/nio/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/npt/_makefile.i b/jdk/.hg/store/data/make/java/npt/_makefile.i
index 8f08230..6839f2c 100644
Binary files a/jdk/.hg/store/data/make/java/npt/_makefile.i and b/jdk/.hg/store/data/make/java/npt/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/redist/_makefile.i b/jdk/.hg/store/data/make/java/redist/_makefile.i
index acc487f..4494b51 100644
Binary files a/jdk/.hg/store/data/make/java/redist/_makefile.i and b/jdk/.hg/store/data/make/java/redist/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i b/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i
index d656487..98cda0a 100644
Binary files a/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i and b/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/security/_makefile.i b/jdk/.hg/store/data/make/java/security/_makefile.i
index d31ffa9..35abe46 100644
Binary files a/jdk/.hg/store/data/make/java/security/_makefile.i and b/jdk/.hg/store/data/make/java/security/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/zip/_f_i_l_e_s__c.gmk.i b/jdk/.hg/store/data/make/java/zip/_f_i_l_e_s__c.gmk.i
index ffc3715..2884fbf 100644
Binary files a/jdk/.hg/store/data/make/java/zip/_f_i_l_e_s__c.gmk.i and b/jdk/.hg/store/data/make/java/zip/_f_i_l_e_s__c.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/zip/_makefile.i b/jdk/.hg/store/data/make/java/zip/_makefile.i
index 5632229..44537b3 100644
Binary files a/jdk/.hg/store/data/make/java/zip/_makefile.i and b/jdk/.hg/store/data/make/java/zip/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/javax/sound/_f_i_l_e_s__c.gmk.i b/jdk/.hg/store/data/make/javax/sound/_f_i_l_e_s__c.gmk.i
index 75abdcd..402624d 100644
Binary files a/jdk/.hg/store/data/make/javax/sound/_f_i_l_e_s__c.gmk.i and b/jdk/.hg/store/data/make/javax/sound/_f_i_l_e_s__c.gmk.i differ
diff --git a/jdk/.hg/store/data/make/javax/sound/_makefile.i b/jdk/.hg/store/data/make/javax/sound/_makefile.i
index b571d5f..181adbf 100644
Binary files a/jdk/.hg/store/data/make/javax/sound/_makefile.i and b/jdk/.hg/store/data/make/javax/sound/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/javax/sound/_sound_defs.gmk.i b/jdk/.hg/store/data/make/javax/sound/_sound_defs.gmk.i
index 3bd6726..e840f48 100644
Binary files a/jdk/.hg/store/data/make/javax/sound/_sound_defs.gmk.i and b/jdk/.hg/store/data/make/javax/sound/_sound_defs.gmk.i differ
diff --git a/jdk/.hg/store/data/make/jpda/back/_makefile.i b/jdk/.hg/store/data/make/jpda/back/_makefile.i
index b07d2dc..59a266a 100644
Binary files a/jdk/.hg/store/data/make/jpda/back/_makefile.i and b/jdk/.hg/store/data/make/jpda/back/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/jpda/transport/socket/_makefile.i b/jdk/.hg/store/data/make/jpda/transport/socket/_makefile.i
index 6b056c4..1c1504d 100644
Binary files a/jdk/.hg/store/data/make/jpda/transport/socket/_makefile.i and b/jdk/.hg/store/data/make/jpda/transport/socket/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/jprt.properties.i b/jdk/.hg/store/data/make/jprt.properties.i
index 902b9b1..83d1eec 100644
Binary files a/jdk/.hg/store/data/make/jprt.properties.i and b/jdk/.hg/store/data/make/jprt.properties.i differ
diff --git a/jdk/.hg/store/data/make/launchers/_makefile.i b/jdk/.hg/store/data/make/launchers/_makefile.i
index 0e9c6eb..87f47c2 100644
Binary files a/jdk/.hg/store/data/make/launchers/_makefile.i and b/jdk/.hg/store/data/make/launchers/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/launchers/_makefile.launcher.i b/jdk/.hg/store/data/make/launchers/_makefile.launcher.i
index 39071ea..0b6fa9f 100644
Binary files a/jdk/.hg/store/data/make/launchers/_makefile.launcher.i and b/jdk/.hg/store/data/make/launchers/_makefile.launcher.i differ
diff --git a/jdk/.hg/store/data/make/mkdemo/jvmti/hprof/_makefile.i b/jdk/.hg/store/data/make/mkdemo/jvmti/hprof/_makefile.i
index 8706c51..7924b2d 100644
Binary files a/jdk/.hg/store/data/make/mkdemo/jvmti/hprof/_makefile.i and b/jdk/.hg/store/data/make/mkdemo/jvmti/hprof/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/mksample/_makefile.i b/jdk/.hg/store/data/make/mksample/_makefile.i
index d461a18..923bf76 100644
Binary files a/jdk/.hg/store/data/make/mksample/_makefile.i and b/jdk/.hg/store/data/make/mksample/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.config.i b/jdk/.hg/store/data/make/modules/modules.config.i
index fe620ef..7724771 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.config.i and b/jdk/.hg/store/data/make/modules/modules.config.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.group.i b/jdk/.hg/store/data/make/modules/modules.group.i
index 9431be2..31502d1 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.group.i and b/jdk/.hg/store/data/make/modules/modules.group.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.properties.i b/jdk/.hg/store/data/make/modules/modules.properties.i
index 425247a..0d86a1c 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.properties.i and b/jdk/.hg/store/data/make/modules/modules.properties.i differ
diff --git a/jdk/.hg/store/data/make/sun/_makefile.i b/jdk/.hg/store/data/make/sun/_makefile.i
index 4421e31..4c09205 100644
Binary files a/jdk/.hg/store/data/make/sun/_makefile.i and b/jdk/.hg/store/data/make/sun/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/awt/_makefile.i b/jdk/.hg/store/data/make/sun/awt/_makefile.i
index 8a7723c..9d78f26 100644
Binary files a/jdk/.hg/store/data/make/sun/awt/_makefile.i and b/jdk/.hg/store/data/make/sun/awt/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/awt/mawt.gmk.i b/jdk/.hg/store/data/make/sun/awt/mawt.gmk.i
index 4d21cdc..3310d79 100644
Binary files a/jdk/.hg/store/data/make/sun/awt/mawt.gmk.i and b/jdk/.hg/store/data/make/sun/awt/mawt.gmk.i differ
diff --git a/jdk/.hg/store/data/make/sun/cmm/lcms/_makefile.i b/jdk/.hg/store/data/make/sun/cmm/lcms/_makefile.i
index 3fd0258..b60c3c0 100644
Binary files a/jdk/.hg/store/data/make/sun/cmm/lcms/_makefile.i and b/jdk/.hg/store/data/make/sun/cmm/lcms/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/font/_makefile.i b/jdk/.hg/store/data/make/sun/font/_makefile.i
index 7c20646..7f81602 100644
Binary files a/jdk/.hg/store/data/make/sun/font/_makefile.i and b/jdk/.hg/store/data/make/sun/font/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/font/t2k/_makefile.i b/jdk/.hg/store/data/make/sun/font/t2k/_makefile.i
index 860877f..36d9f79 100644
Binary files a/jdk/.hg/store/data/make/sun/font/t2k/_makefile.i and b/jdk/.hg/store/data/make/sun/font/t2k/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/headless/_makefile.i b/jdk/.hg/store/data/make/sun/headless/_makefile.i
index 4518e14..2aac385 100644
Binary files a/jdk/.hg/store/data/make/sun/headless/_makefile.i and b/jdk/.hg/store/data/make/sun/headless/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/image/generic/_makefile.i b/jdk/.hg/store/data/make/sun/image/generic/_makefile.i
index f93fb42..2dc4b79 100644
Binary files a/jdk/.hg/store/data/make/sun/image/generic/_makefile.i and b/jdk/.hg/store/data/make/sun/image/generic/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/image/vis/_makefile.i b/jdk/.hg/store/data/make/sun/image/vis/_makefile.i
index 1bc178f..0464d0f 100644
Binary files a/jdk/.hg/store/data/make/sun/image/vis/_makefile.i and b/jdk/.hg/store/data/make/sun/image/vis/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/jawt/_makefile.i b/jdk/.hg/store/data/make/sun/jawt/_makefile.i
index 5138a52..0169290 100644
Binary files a/jdk/.hg/store/data/make/sun/jawt/_makefile.i and b/jdk/.hg/store/data/make/sun/jawt/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/jdga/_makefile.i b/jdk/.hg/store/data/make/sun/jdga/_makefile.i
index ccb6bb8..b16abd5 100644
Binary files a/jdk/.hg/store/data/make/sun/jdga/_makefile.i and b/jdk/.hg/store/data/make/sun/jdga/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/rmi/cgi/_makefile.i b/jdk/.hg/store/data/make/sun/rmi/cgi/_makefile.i
index 471ff94..1623814 100644
Binary files a/jdk/.hg/store/data/make/sun/rmi/cgi/_makefile.i and b/jdk/.hg/store/data/make/sun/rmi/cgi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/rmi/registry/_makefile.i b/jdk/.hg/store/data/make/sun/rmi/registry/_makefile.i
index a11daea..23cdb77 100644
Binary files a/jdk/.hg/store/data/make/sun/rmi/registry/_makefile.i and b/jdk/.hg/store/data/make/sun/rmi/registry/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i b/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i
index 2ace872..e579054 100644
Binary files a/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i and b/jdk/.hg/store/data/make/sun/rmi/rmi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/rmi/rmi/mapfile-vers.i b/jdk/.hg/store/data/make/sun/rmi/rmi/mapfile-vers.i
index 73b6dea..271c731 100644
Binary files a/jdk/.hg/store/data/make/sun/rmi/rmi/mapfile-vers.i and b/jdk/.hg/store/data/make/sun/rmi/rmi/mapfile-vers.i differ
diff --git a/jdk/.hg/store/data/make/sun/rmi/rmid/_makefile.i b/jdk/.hg/store/data/make/sun/rmi/rmid/_makefile.i
index 5079caa..c3104f7 100644
Binary files a/jdk/.hg/store/data/make/sun/rmi/rmid/_makefile.i and b/jdk/.hg/store/data/make/sun/rmi/rmid/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/_makefile.i b/jdk/.hg/store/data/make/sun/security/_makefile.i
index 1fff08b..56c8b37 100644
Binary files a/jdk/.hg/store/data/make/sun/security/_makefile.i and b/jdk/.hg/store/data/make/sun/security/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/ec/_makefile.i b/jdk/.hg/store/data/make/sun/security/ec/_makefile.i
index 8dfb982..bf58169 100644
Binary files a/jdk/.hg/store/data/make/sun/security/ec/_makefile.i and b/jdk/.hg/store/data/make/sun/security/ec/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i b/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i
index 926b073..2ac3f05 100644
Binary files a/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i and b/jdk/.hg/store/data/make/sun/security/jgss/wrapper/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i b/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i
index 6e09158..814e715 100644
Binary files a/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i and b/jdk/.hg/store/data/make/sun/security/krb5/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i b/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i
index 3c5bc3a..b029bb0 100644
Binary files a/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i and b/jdk/.hg/store/data/make/sun/security/mscapi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i b/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i
index c0c6f82..6121870 100644
Binary files a/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i and b/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i b/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i
index 37db8b1..6ec06f1 100644
Binary files a/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i and b/jdk/.hg/store/data/make/sun/security/smartcardio/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/splashscreen/_f_i_l_e_s__c.gmk.i b/jdk/.hg/store/data/make/sun/splashscreen/_f_i_l_e_s__c.gmk.i
index 943caa1..00dff8a 100644
Binary files a/jdk/.hg/store/data/make/sun/splashscreen/_f_i_l_e_s__c.gmk.i and b/jdk/.hg/store/data/make/sun/splashscreen/_f_i_l_e_s__c.gmk.i differ
diff --git a/jdk/.hg/store/data/make/sun/splashscreen/_makefile.i b/jdk/.hg/store/data/make/sun/splashscreen/_makefile.i
index 97a16bd..e301605 100644
Binary files a/jdk/.hg/store/data/make/sun/splashscreen/_makefile.i and b/jdk/.hg/store/data/make/sun/splashscreen/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/tracing/dtrace/_makefile.i b/jdk/.hg/store/data/make/sun/tracing/dtrace/_makefile.i
index 74f8ec0..c6a4120 100644
Binary files a/jdk/.hg/store/data/make/sun/tracing/dtrace/_makefile.i and b/jdk/.hg/store/data/make/sun/tracing/dtrace/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/xawt/_makefile.i b/jdk/.hg/store/data/make/sun/xawt/_makefile.i
index 4c3c178..89be2d5 100644
Binary files a/jdk/.hg/store/data/make/sun/xawt/_makefile.i and b/jdk/.hg/store/data/make/sun/xawt/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/classanalyzer.html.i b/jdk/.hg/store/data/make/tools/classanalyzer/classanalyzer.html.i
index 99b750f..ad9dfaa 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/classanalyzer.html.i and b/jdk/.hg/store/data/make/tools/classanalyzer/classanalyzer.html.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i
index 97caa2c..07ff4ca 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_jigsaw_module_builder.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i
index 7969ae7..db4f12f 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i
index 4034db0..8488abe 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i
index afd0d40..3c5df4c 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_show_deps.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_show_deps.java.i
index ac62033..edd426f 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_show_deps.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_show_deps.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/freetypecheck/_makefile.i b/jdk/.hg/store/data/make/tools/freetypecheck/_makefile.i
index 4b3d6bf..302450a 100644
Binary files a/jdk/.hg/store/data/make/tools/freetypecheck/_makefile.i and b/jdk/.hg/store/data/make/tools/freetypecheck/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/tools/reorder/_makefile.i b/jdk/.hg/store/data/make/tools/reorder/_makefile.i
index 5b718cf..805b397 100644
Binary files a/jdk/.hg/store/data/make/tools/reorder/_makefile.i and b/jdk/.hg/store/data/make/tools/reorder/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i b/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i
index 5064094..bd8a77c 100644
Binary files a/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i and b/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i differ
diff --git a/jdk/.hg/store/data/src/share/back/common_ref.c.i b/jdk/.hg/store/data/src/share/back/common_ref.c.i
index 0736510..723bc28 100644
Binary files a/jdk/.hg/store/data/src/share/back/common_ref.c.i and b/jdk/.hg/store/data/src/share/back/common_ref.c.i differ
diff --git a/jdk/.hg/store/data/src/share/bin/emessages.h.i b/jdk/.hg/store/data/src/share/bin/emessages.h.i
index 1ef5e20..4264e0b 100644
Binary files a/jdk/.hg/store/data/src/share/bin/emessages.h.i and b/jdk/.hg/store/data/src/share/bin/emessages.h.i differ
diff --git a/jdk/.hg/store/data/src/share/bin/java.c.i b/jdk/.hg/store/data/src/share/bin/java.c.i
index 658364d..8af446e 100644
Binary files a/jdk/.hg/store/data/src/share/bin/java.c.i and b/jdk/.hg/store/data/src/share/bin/java.c.i differ
diff --git a/jdk/.hg/store/data/src/share/bin/java.h.i b/jdk/.hg/store/data/src/share/bin/java.h.i
index 91724b8..eee0dc8 100644
Binary files a/jdk/.hg/store/data/src/share/bin/java.h.i and b/jdk/.hg/store/data/src/share/bin/java.h.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_agreement.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_agreement.java.i
index 66acc11..310a70c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_agreement.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_agreement.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i
index 476e9fd..b943fab 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_k_c_s12_p_b_e_cipher_core.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_k_c_s12_p_b_e_cipher_core.java.i
index 6965140..7298f4e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_k_c_s12_p_b_e_cipher_core.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_k_c_s12_p_b_e_cipher_core.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/gtk/_metacity.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/gtk/_metacity.java.i
index d1c1831..485748f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/gtk/_metacity.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/gtk/_metacity.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i
index 62f04d0..afe8757 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_progress_bar_u_i.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_progress_bar_u_i.java.i
index c275ad4..5c38f13 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_progress_bar_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_progress_bar_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_radio_button_u_i.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_radio_button_u_i.java.i
index 260db8f..9fca2fb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_radio_button_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_radio_button_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i
index 3856be5..1c27d0b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_url_util.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_url_util.java.i
index 72ec095..961f28b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_url_util.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_url_util.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/management/_hot_spot_diagnostic_m_x_bean.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/management/_hot_spot_diagnostic_m_x_bean.java.i
index e566ec7..836be02 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/management/_hot_spot_diagnostic_m_x_bean.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/management/_hot_spot_diagnostic_m_x_bean.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_direct_audio_device.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_direct_audio_device.java.i
index 72a0376..05072a0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_direct_audio_device.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_direct_audio_device.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_soft_mixing_source_data_line.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_soft_mixing_source_data_line.java.i
index 4d7dc3c..941f3a2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_soft_mixing_source_data_line.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/media/sound/_soft_mixing_source_data_line.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i
index eb41ac5..ef497be 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_message_info.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_message_info.java.i
index 37d8c39..5ae35fd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_message_info.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_message_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_channel.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_channel.java.i
index c666783..4257bcd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_channel.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_channel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_multi_channel.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_multi_channel.java.i
index 427d748..04069ea 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_multi_channel.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_multi_channel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_server_channel.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_server_channel.java.i
index b0add88..ef0b57c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_server_channel.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_server_channel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_standard_socket_options.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_standard_socket_options.java.i
index 927ce5f..423d447 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_standard_socket_options.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/nio/sctp/_sctp_standard_socket_options.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_option_permission.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_option_permission.java.i
index e7d1d7a..6cd6431 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_option_permission.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_option_permission.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_permission.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_permission.java.i
index 6f0b571..9bf67b9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_permission.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/rmi/rmid/_exec_permission.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/rowset/_cached_row_set_impl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/rowset/_cached_row_set_impl.java.i
index 8d35a52..19e10e0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/rowset/_cached_row_set_impl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/rowset/_cached_row_set_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_base_row.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_base_row.java.i
index e4586d2..2c04ce6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_base_row.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_base_row.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_web_row_set_xml_writer.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_web_row_set_xml_writer.java.i
index b88379f..59aac6f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_web_row_set_xml_writer.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/rowset/internal/_web_row_set_xml_writer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i
index 560f5b6..6f93661 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i
index 8c773e0..484a066 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_graphics_environment.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_graphics_environment.java.i
index eafb371..17043eb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_graphics_environment.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_graphics_environment.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_keyboard_focus_manager.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_keyboard_focus_manager.java.i
index 43d6a36..293de32 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_keyboard_focus_manager.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_keyboard_focus_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_list.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_list.java.i
index df9a72b..9908240 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_list.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_list.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_window.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_window.java.i
index f5cc926..491ad66 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_window.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_window.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/color/_i_c_c___profile.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/color/_i_c_c___profile.java.i
index b09bcb9..775b0f4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/color/_i_c_c___profile.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/color/_i_c_c___profile.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/datatransfer/_mime_type.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/datatransfer/_mime_type.java.i
index 22f7743..2bb2044 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/datatransfer/_mime_type.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/datatransfer/_mime_type.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/event/_input_event.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/event/_input_event.java.i
index 3596ce3..da0ac88 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/event/_input_event.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/event/_input_event.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/event/_mouse_event.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/event/_mouse_event.java.i
index c3ad495..40191a4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/event/_mouse_event.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/event/_mouse_event.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/beans/_bean_info.java.i b/jdk/.hg/store/data/src/share/classes/java/beans/_bean_info.java.i
index bfd407a..5d374a9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/beans/_bean_info.java.i and b/jdk/.hg/store/data/src/share/classes/java/beans/_bean_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/beans/_change_listener_map.java.i b/jdk/.hg/store/data/src/share/classes/java/beans/_change_listener_map.java.i
index 6031c27..20853a2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/beans/_change_listener_map.java.i and b/jdk/.hg/store/data/src/share/classes/java/beans/_change_listener_map.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/beans/_introspector.java.i b/jdk/.hg/store/data/src/share/classes/java/beans/_introspector.java.i
index 605cf26..580f2ca 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/beans/_introspector.java.i and b/jdk/.hg/store/data/src/share/classes/java/beans/_introspector.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/beans/_property_change_support.java.i b/jdk/.hg/store/data/src/share/classes/java/beans/_property_change_support.java.i
index 30ae4f6..5c96793 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/beans/_property_change_support.java.i and b/jdk/.hg/store/data/src/share/classes/java/beans/_property_change_support.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/beans/_property_descriptor.java.i b/jdk/.hg/store/data/src/share/classes/java/beans/_property_descriptor.java.i
index 6241cdd..c5169c7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/beans/_property_descriptor.java.i and b/jdk/.hg/store/data/src/share/classes/java/beans/_property_descriptor.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/beans/_vetoable_change_support.java.i b/jdk/.hg/store/data/src/share/classes/java/beans/_vetoable_change_support.java.i
index f149ba1..6988467 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/beans/_vetoable_change_support.java.i and b/jdk/.hg/store/data/src/share/classes/java/beans/_vetoable_change_support.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_data_input.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_data_input.java.i
index 94d42bb..6d09c31 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_data_input.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_data_input.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_file.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_file.java.i
index 6a2f9d2..3d80c1c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_file.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_line_number_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_line_number_input_stream.java.i
index a4cdff4..41e2fb7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_line_number_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_line_number_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i
index 998e1ea..7827b38 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i
index 2101499..e231497 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_stream_tokenizer.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_stream_tokenizer.java.i
index 58ec5d8..341eb74 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_stream_tokenizer.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_stream_tokenizer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_abstract_string_builder.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_abstract_string_builder.java.i
index d4c4ae3..b51183d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_abstract_string_builder.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_abstract_string_builder.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_byte.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_byte.java.i
index 5edb08a..1c0b32f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_byte.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_byte.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_double.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_double.java.i
index 8531415..381b817 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_double.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_double.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_float.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_float.java.i
index a9779d5..3a1fc2e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_float.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_float.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_integer.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_integer.java.i
index 27c7753..cc46abf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_integer.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_integer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_long.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_long.java.i
index 19fe608..167532b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_long.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_long.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_math.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_math.java.i
index 56aeb81..def7312 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_math.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_math.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_short.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_short.java.i
index cff96e8..27419ad 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_short.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_short.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_strict_math.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_strict_math.java.i
index 6efe43d..7bdbbfa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_strict_math.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_strict_math.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_string.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_string.java.i
index b760d1e..5e3a068 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_string.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_string.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_system.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_system.java.i
index b7e195f..3f77cc1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_system.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_system.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_thread.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_thread.java.i
index bc349db..1534736 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_thread.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/_thread.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_factory.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_factory.java.i
index c7e9348..56e90a1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_factory.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_permission.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_permission.java.i
index b8cb7f6..ae35302 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_permission.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/management/_management_permission.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_executable.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_executable.java.i
index 39e046b..4fb53b3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_executable.java.i and b/jdk/.hg/store/data/src/share/classes/java/lang/reflect/_executable.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i
index bbea013..362feeb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_abstract_plain_datagram_socket_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i
index 73be5aa..57243ee 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_datagram_socket.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i
index a1038e2..6ca4961 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_in_memory_cookie_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_multicast_socket.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_multicast_socket.java.i
index 3c24f2b..b3268de 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_multicast_socket.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_multicast_socket.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/net/_network_interface.java.i b/jdk/.hg/store/data/src/share/classes/java/net/_network_interface.java.i
index 4a80852..1545f16 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/net/_network_interface.java.i and b/jdk/.hg/store/data/src/share/classes/java/net/_network_interface.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/text/_simple_date_format.java.i b/jdk/.hg/store/data/src/share/classes/java/text/_simple_date_format.java.i
index 8952301..339d943 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/text/_simple_date_format.java.i and b/jdk/.hg/store/data/src/share/classes/java/text/_simple_date_format.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_calendar.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_calendar.java.i
index 3bcb9e0..4ce8c63 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_calendar.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_calendar.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i
index ea84e64..1bf57d7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_collections.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_currency.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_currency.java.i
index 79bab5a..2d11cd7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_currency.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_currency.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i b/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i
index 22745b9..728771d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i and b/jdk/.hg/store/data/src/share/classes/java/util/_currency_data.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_enum_map.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_enum_map.java.i
index 7be5e53..4da691b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_enum_map.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_enum_map.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_locale_i_s_o_data.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_locale_i_s_o_data.java.i
index 164713d..af466bb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_locale_i_s_o_data.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_locale_i_s_o_data.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_properties.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_properties.java.i
index 73df711..9f8f6b7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_properties.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_properties.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/_time_zone.java.i b/jdk/.hg/store/data/src/share/classes/java/util/_time_zone.java.i
index 1b76dba..50ce02d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/_time_zone.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/_time_zone.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/concurrent/_future_task.java.i b/jdk/.hg/store/data/src/share/classes/java/util/concurrent/_future_task.java.i
index c284405..d161a53 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/concurrent/_future_task.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/concurrent/_future_task.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/concurrent/atomic/_atomic_reference_array.java.i b/jdk/.hg/store/data/src/share/classes/java/util/concurrent/atomic/_atomic_reference_array.java.i
index 62bf793..e02e283 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/concurrent/atomic/_atomic_reference_array.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/concurrent/atomic/_atomic_reference_array.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/jar/_attributes.java.i b/jdk/.hg/store/data/src/share/classes/java/util/jar/_attributes.java.i
index 6faa302..d19c6d3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/jar/_attributes.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/jar/_attributes.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_output_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_output_stream.java.i
index 1ef3a49..bfdd139 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_output_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_output_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_verifier.java.i b/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_verifier.java.i
index 08b40ab..4d99980 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_verifier.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/jar/_jar_verifier.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/jar/_manifest.java.i b/jdk/.hg/store/data/src/share/classes/java/util/jar/_manifest.java.i
index 76b8853..b08df47 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/jar/_manifest.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/jar/_manifest.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/prefs/_preferences.java.i b/jdk/.hg/store/data/src/share/classes/java/util/prefs/_preferences.java.i
index 09880cc..2f54d01 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/prefs/_preferences.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/prefs/_preferences.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/zip/_inflater_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/util/zip/_inflater_input_stream.java.i
index cf0ba97..b92322b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/zip/_inflater_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/zip/_inflater_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/util/zip/_zip_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/util/zip/_zip_input_stream.java.i
index 2964cdd..9201ae4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/util/zip/_zip_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/util/zip/_zip_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/accessibility/_accessible_context.java.i b/jdk/.hg/store/data/src/share/classes/javax/accessibility/_accessible_context.java.i
index 66f37a3..46881b1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/accessibility/_accessible_context.java.i and b/jdk/.hg/store/data/src/share/classes/javax/accessibility/_accessible_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher.java.i b/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher.java.i
index c60e965..4db6c5d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher.java.i and b/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher_spi.java.i b/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher_spi.java.i
index 9e5c83d..7fc0313 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher_spi.java.i and b/jdk/.hg/store/data/src/share/classes/javax/crypto/_cipher_spi.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_extended_s_s_l_session.java.i b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_extended_s_s_l_session.java.i
index 82487fe..576c57c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_extended_s_s_l_session.java.i and b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_extended_s_s_l_session.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_parameters.java.i b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_parameters.java.i
index 00f4e93..6809a00 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/javax/net/ssl/_s_s_l_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_printer_state_reasons.java.i b/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_printer_state_reasons.java.i
index 0bb0657..1ca33ad 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_printer_state_reasons.java.i and b/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_printer_state_reasons.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_reference_uri_schemes_supported.java.i b/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_reference_uri_schemes_supported.java.i
index b99e3e6..075926a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_reference_uri_schemes_supported.java.i and b/jdk/.hg/store/data/src/share/classes/javax/print/attribute/standard/_reference_uri_schemes_supported.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/script/_script_engine_manager.java.i b/jdk/.hg/store/data/src/share/classes/javax/script/_script_engine_manager.java.i
index cdace54..f593dbd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/script/_script_engine_manager.java.i and b/jdk/.hg/store/data/src/share/classes/javax/script/_script_engine_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i
index e44d80d..808b3d0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/_x500_principal.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/package.html.i b/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/package.html.i
index ffb41b9..e2b8cee 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/package.html.i and b/jdk/.hg/store/data/src/share/classes/javax/security/auth/x500/package.html.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_input_impl.java.i b/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_input_impl.java.i
index 24f286e..5c2f829 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_input_impl.java.i and b/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_input_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_output_impl.java.i b/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_output_impl.java.i
index e618ae2..08be901 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_output_impl.java.i and b/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_s_q_l_output_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_serial_struct.java.i b/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_serial_struct.java.i
index 6b378e4..e637f98 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_serial_struct.java.i and b/jdk/.hg/store/data/src/share/classes/javax/sql/rowset/serial/_serial_struct.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_default_list_selection_model.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_default_list_selection_model.java.i
index 05eda06..8fbf627 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_default_list_selection_model.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_default_list_selection_model.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_option_pane.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_option_pane.java.i
index 1698080..c6b1285 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_option_pane.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_option_pane.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_viewport.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_viewport.java.i
index 94d119b..db1fdba 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_j_viewport.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_j_viewport.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_swing_utilities.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_swing_utilities.java.i
index 9e20659..ee33d24 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_swing_utilities.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_swing_utilities.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/_u_i_manager.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/_u_i_manager.java.i
index e931855..56b01ee 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/_u_i_manager.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/_u_i_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_button_listener.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_button_listener.java.i
index 8ded5ca..ee3d373 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_button_listener.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_button_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_label_u_i.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_label_u_i.java.i
index df3a820..a6e5e9d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_label_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_label_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_look_and_feel.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_look_and_feel.java.i
index b57de09..6e3df49 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_look_and_feel.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_look_and_feel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_option_pane_u_i.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_option_pane_u_i.java.i
index 57065ba..0f00d2c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_option_pane_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_option_pane_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_tabbed_pane_u_i.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_tabbed_pane_u_i.java.i
index c072c77..a75a1da 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_tabbed_pane_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_tabbed_pane_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_text_u_i.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_text_u_i.java.i
index 9cb4402..008cbd2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_text_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/basic/_basic_text_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_combo_box_u_i.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_combo_box_u_i.java.i
index 3935038..dddaee8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_combo_box_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_combo_box_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_tree_u_i.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_tree_u_i.java.i
index 99b5c99..430d213 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_tree_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/plaf/synth/_synth_tree_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/javax/swing/tree/_default_tree_cell_renderer.java.i b/jdk/.hg/store/data/src/share/classes/javax/swing/tree/_default_tree_cell_renderer.java.i
index 6b22727..5ef88b9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/javax/swing/tree/_default_tree_cell_renderer.java.i and b/jdk/.hg/store/data/src/share/classes/javax/swing/tree/_default_tree_cell_renderer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i
index d82e057..1cd6c33 100644
Binary files a/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i and b/jdk/.hg/store/data/src/share/classes/org/openjdk/jigsaw/_simple_library.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/awt/_a_w_t_accessor.java.i b/jdk/.hg/store/data/src/share/classes/sun/awt/_a_w_t_accessor.java.i
index 3b408e7..95e19b0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/awt/_a_w_t_accessor.java.i and b/jdk/.hg/store/data/src/share/classes/sun/awt/_a_w_t_accessor.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/awt/_app_context.java.i b/jdk/.hg/store/data/src/share/classes/sun/awt/_app_context.java.i
index d56111d..f14db8c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/awt/_app_context.java.i and b/jdk/.hg/store/data/src/share/classes/sun/awt/_app_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/awt/_o_s_info.java.i b/jdk/.hg/store/data/src/share/classes/sun/awt/_o_s_info.java.i
index e3c4a96..2e607a8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/awt/_o_s_info.java.i and b/jdk/.hg/store/data/src/share/classes/sun/awt/_o_s_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/awt/_sun_toolkit.java.i b/jdk/.hg/store/data/src/share/classes/sun/awt/_sun_toolkit.java.i
index 423f151..32700d3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/awt/_sun_toolkit.java.i and b/jdk/.hg/store/data/src/share/classes/sun/awt/_sun_toolkit.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/awt/image/_buf_img_surface_data.java.i b/jdk/.hg/store/data/src/share/classes/sun/awt/image/_buf_img_surface_data.java.i
index abb7ea0..26843d4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/awt/image/_buf_img_surface_data.java.i and b/jdk/.hg/store/data/src/share/classes/sun/awt/image/_buf_img_surface_data.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i b/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i
index c2d665d..7e0f184 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i and b/jdk/.hg/store/data/src/share/classes/sun/awt/image/_off_screen_image_source.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/beans/infos/_component_bean_info.java.i b/jdk/.hg/store/data/src/share/classes/sun/beans/infos/_component_bean_info.java.i
index 0e1beb8..63444b5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/beans/infos/_component_bean_info.java.i and b/jdk/.hg/store/data/src/share/classes/sun/beans/infos/_component_bean_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/font/_file_font.java.i b/jdk/.hg/store/data/src/share/classes/sun/font/_file_font.java.i
index b1ef874..f6acff1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/font/_file_font.java.i and b/jdk/.hg/store/data/src/share/classes/sun/font/_file_font.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/font/_font_manager_factory.java.i b/jdk/.hg/store/data/src/share/classes/sun/font/_font_manager_factory.java.i
index a9581bb..c515713 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/font/_font_manager_factory.java.i and b/jdk/.hg/store/data/src/share/classes/sun/font/_font_manager_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/font/_font_utilities.java.i b/jdk/.hg/store/data/src/share/classes/sun/font/_font_utilities.java.i
index 80a5a5f..c6f3a0f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/font/_font_utilities.java.i and b/jdk/.hg/store/data/src/share/classes/sun/font/_font_utilities.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/font/_standard_glyph_vector.java.i b/jdk/.hg/store/data/src/share/classes/sun/font/_standard_glyph_vector.java.i
index 826c6f0..a450743 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/font/_standard_glyph_vector.java.i and b/jdk/.hg/store/data/src/share/classes/sun/font/_standard_glyph_vector.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/font/_sun_font_manager.java.i b/jdk/.hg/store/data/src/share/classes/sun/font/_sun_font_manager.java.i
index e0f3992..80ecda5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/font/_sun_font_manager.java.i and b/jdk/.hg/store/data/src/share/classes/sun/font/_sun_font_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/font/_true_type_font.java.i b/jdk/.hg/store/data/src/share/classes/sun/font/_true_type_font.java.i
index 780d65b..299e886 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/font/_true_type_font.java.i and b/jdk/.hg/store/data/src/share/classes/sun/font/_true_type_font.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/java2d/_sun_graphics2_d.java.i b/jdk/.hg/store/data/src/share/classes/sun/java2d/_sun_graphics2_d.java.i
index 1f77b0a..cf34f3d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/java2d/_sun_graphics2_d.java.i and b/jdk/.hg/store/data/src/share/classes/sun/java2d/_sun_graphics2_d.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_blit_loops.java.i b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_blit_loops.java.i
index 3b7e61b..12c076b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_blit_loops.java.i and b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_blit_loops.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_render_queue.java.i b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_render_queue.java.i
index 0c44bb0..bfe3837 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_render_queue.java.i and b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_render_queue.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_renderer.java.i b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_renderer.java.i
index a383328..7a56bc8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_renderer.java.i and b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_renderer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_surface_data.java.i b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_surface_data.java.i
index 54699c8..023e9be 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_surface_data.java.i and b/jdk/.hg/store/data/src/share/classes/sun/java2d/opengl/_o_g_l_surface_data.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/java2d/pipe/_buffered_context.java.i b/jdk/.hg/store/data/src/share/classes/sun/java2d/pipe/_buffered_context.java.i
index a83b470..9fe33b3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/java2d/pipe/_buffered_context.java.i and b/jdk/.hg/store/data/src/share/classes/sun/java2d/pipe/_buffered_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/launcher/_launcher_helper.java.i b/jdk/.hg/store/data/src/share/classes/sun/launcher/_launcher_helper.java.i
index b905e0b..220828b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/launcher/_launcher_helper.java.i and b/jdk/.hg/store/data/src/share/classes/sun/launcher/_launcher_helper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/launcher/resources/launcher.properties.i b/jdk/.hg/store/data/src/share/classes/sun/launcher/resources/launcher.properties.i
index 6a43539..95852fa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/launcher/resources/launcher.properties.i and b/jdk/.hg/store/data/src/share/classes/sun/launcher/resources/launcher.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/management/_agent.java.i b/jdk/.hg/store/data/src/share/classes/sun/management/_agent.java.i
index bd62e07..71108eb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/management/_agent.java.i and b/jdk/.hg/store/data/src/share/classes/sun/management/_agent.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/management/_agent_configuration_error.java.i b/jdk/.hg/store/data/src/share/classes/sun/management/_agent_configuration_error.java.i
index c8e4b0a..a451943 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/management/_agent_configuration_error.java.i and b/jdk/.hg/store/data/src/share/classes/sun/management/_agent_configuration_error.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/management/_hot_spot_diagnostic.java.i b/jdk/.hg/store/data/src/share/classes/sun/management/_hot_spot_diagnostic.java.i
index e28abc1..d15c87b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/management/_hot_spot_diagnostic.java.i and b/jdk/.hg/store/data/src/share/classes/sun/management/_hot_spot_diagnostic.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/management/jmxremote/_connector_bootstrap.java.i b/jdk/.hg/store/data/src/share/classes/sun/management/jmxremote/_connector_bootstrap.java.i
index 539aa70..cd5e70d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/management/jmxremote/_connector_bootstrap.java.i and b/jdk/.hg/store/data/src/share/classes/sun/management/jmxremote/_connector_bootstrap.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/management/resources/agent.properties.i b/jdk/.hg/store/data/src/share/classes/sun/management/resources/agent.properties.i
index 696ae4e..48cd616 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/management/resources/agent.properties.i and b/jdk/.hg/store/data/src/share/classes/sun/management/resources/agent.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/misc/_shared_secrets.java.i b/jdk/.hg/store/data/src/share/classes/sun/misc/_shared_secrets.java.i
index de7e82d..9cb4ad9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/misc/_shared_secrets.java.i and b/jdk/.hg/store/data/src/share/classes/sun/misc/_shared_secrets.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_request.java.i b/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_request.java.i
index 81fddee..54e0405 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_request.java.i and b/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_request.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_server_config.java.i b/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_server_config.java.i
index 5e79d20..09a96bd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_server_config.java.i and b/jdk/.hg/store/data/src/share/classes/sun/net/httpserver/_server_config.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/net/spi/_default_proxy_selector.java.i b/jdk/.hg/store/data/src/share/classes/sun/net/spi/_default_proxy_selector.java.i
index 1f6388f..559f17d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/net/spi/_default_proxy_selector.java.i and b/jdk/.hg/store/data/src/share/classes/sun/net/spi/_default_proxy_selector.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i b/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i
index 682dee4..d2d271c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i and b/jdk/.hg/store/data/src/share/classes/sun/net/www/protocol/http/_http_u_r_l_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_array_wrapper.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_array_wrapper.java.i
index a71a8d1..99e594c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_array_wrapper.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_array_wrapper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_selector_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_selector_impl.java.i
index 21e55ef..bf2360d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_selector_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_abstract_poll_selector_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_datagram_channel_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_datagram_channel_impl.java.i
index 141731c..208844b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_datagram_channel_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_datagram_channel_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_status.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_status.java.i
index aacc6ec..986980a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_status.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_status.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_util.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_util.java.i
index cb10400..f19e12c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_util.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_i_o_util.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_native_thread_set.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_native_thread_set.java.i
index 67f0a4f..4d1b15d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_native_thread_set.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_native_thread_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_net.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_net.java.i
index e50bce0..e0cc8aa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_net.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_net.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_sel_ch_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_sel_ch_impl.java.i
index 40c2a5b..148ec94 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_sel_ch_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_sel_ch_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selection_key_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selection_key_impl.java.i
index f11806e..b81606f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selection_key_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selection_key_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selector_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selector_impl.java.i
index 3b6a989..2606d81 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selector_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_selector_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i
index f04beab..02bcb0a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/ch/_util.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/nio/cs/ext/_extended_charsets.java.i b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/ext/_extended_charsets.java.i
index 2cd4d11..c934ce3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/nio/cs/ext/_extended_charsets.java.i and b/jdk/.hg/store/data/src/share/classes/sun/nio/cs/ext/_extended_charsets.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i b/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i
index 1be423d..b78e256 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i and b/jdk/.hg/store/data/src/share/classes/sun/print/_p_s_printer_job.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/print/_raster_printer_job.java.i b/jdk/.hg/store/data/src/share/classes/sun/print/_raster_printer_job.java.i
index 35becb4..c4d4889 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/print/_raster_printer_job.java.i and b/jdk/.hg/store/data/src/share/classes/sun/print/_raster_printer_job.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/log/_reliable_log.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/log/_reliable_log.java.i
index 69d3eba..646161c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/log/_reliable_log.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/log/_reliable_log.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i
index 77a5d02..d6ace9f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/registry/_registry_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_batch_environment.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_batch_environment.java.i
index f9b6d7f..9b2652b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_batch_environment.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_batch_environment.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_main.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_main.java.i
index 1091ed2..b30f1eb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_main.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_main.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_r_m_i_generator.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_r_m_i_generator.java.i
index 6ddd7a9..f62b2d5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_r_m_i_generator.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/_r_m_i_generator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_main.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_main.java.i
index b73689f..1cf4964 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_main.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_main.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_resources.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_resources.java.i
index da7f17b..fff9671 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_resources.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/rmic/newrmic/_resources.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activatable_ref.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activatable_ref.java.i
index e6cfa4b..8c548a5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activatable_ref.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activatable_ref.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation.java.i
index 3b13931..74c14f4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation_group_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation_group_impl.java.i
index 3fe7993..4656faf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation_group_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_activation_group_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i
index 72a8ea0..be61fe8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_loader_handler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i
index 25fdfd0..9fae7da 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_marshal_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref.java.i
index 34f6a5e..386a295 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref2.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref2.java.i
index b895f9a..a029433 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref2.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_ref2.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i
index 25a99cc..17d955a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_unicast_server_ref.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_util.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_util.java.i
index 7a2de53..4042eac 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_util.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_util.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_weak_class_hash_map.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_weak_class_hash_map.java.i
index 4b3ba90..c5fdaf6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_weak_class_hash_map.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/server/_weak_class_hash_map.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_connection_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_connection_input_stream.java.i
index 08c3b37..b4547a2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_connection_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_connection_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_ack_handler.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_ack_handler.java.i
index c8f7fd0..98101e9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_ack_handler.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_ack_handler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_client.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_client.java.i
index e76ea40..494bd5d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_client.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_impl.java.i
index 3a0222c..9283a6c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_d_g_c_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_object_table.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_object_table.java.i
index 630b4b8..9dd9c5f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_object_table.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_object_table.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_stream_remote_call.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_stream_remote_call.java.i
index ffa08ec..25d7ac9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_stream_remote_call.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_stream_remote_call.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_target.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_target.java.i
index 33b5b0a..f2655c4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_target.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_target.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_transport.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_transport.java.i
index 0e9ea9f..465f780 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_transport.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_transport.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_weak_ref.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_weak_ref.java.i
index e4b1206..d9ebe4b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_weak_ref.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/_weak_ref.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_c_g_i_handler.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_c_g_i_handler.java.i
index abc922e..e2286ac 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_c_g_i_handler.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_c_g_i_handler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_input_stream.java.i
index 3ebbca1..2ff062e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_send_socket.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_send_socket.java.i
index 07bc1fd..cee5f16 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_send_socket.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_http_send_socket.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_r_m_i_master_socket_factory.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_r_m_i_master_socket_factory.java.i
index 7d2c234..73f4f82 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_r_m_i_master_socket_factory.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/proxy/_r_m_i_master_socket_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_connection_multiplexer.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_connection_multiplexer.java.i
index ed9b1db..3ffb7b2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_connection_multiplexer.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_connection_multiplexer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_channel.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_channel.java.i
index bfc50f4..dd063a5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_channel.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_channel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_endpoint.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_endpoint.java.i
index 9d09852..4b6dcbf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_endpoint.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_endpoint.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_transport.java.i b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_transport.java.i
index fe46364..803ff51 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_transport.java.i and b/jdk/.hg/store/data/src/share/classes/sun/rmi/transport/tcp/_t_c_p_transport.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/wrapper/_sun_native_provider.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/wrapper/_sun_native_provider.java.i
index b4226e0..db67c4a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/jgss/wrapper/_sun_native_provider.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/jgss/wrapper/_sun_native_provider.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_config.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_config.java.i
index 52f3c9a..54e74d4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_config.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_config.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_credentials.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_credentials.java.i
index c513052..969b1df 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_credentials.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/_credentials.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/internal/ktab/_key_tab.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/internal/ktab/_key_tab.java.i
index 2f6722c..52f549e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/krb5/internal/ktab/_key_tab.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/krb5/internal/ktab/_key_tab.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i
index 99ee401..7ac45df 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs/_p_k_c_s7.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i
index 9706048..ad78b9f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_config.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key_agreement.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key_agreement.java.i
index 19e0575..95468f6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key_agreement.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_p11_key_agreement.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i
index 808071b..15b5651 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs11/_sun_p_k_c_s11.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs12/_p_k_c_s12_key_store.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs12/_p_k_c_s12_key_store.java.i
index cff32ed..00f8b06 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/pkcs12/_p_k_c_s12_key_store.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/pkcs12/_p_k_c_s12_key_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/_policy_file.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/_policy_file.java.i
index 3d13bbd..a19bc1c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/_policy_file.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/_policy_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_builder.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_builder.java.i
index 227e386..51d5caa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_builder.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_builder.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_state.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_state.java.i
index 45b0384..eb1c990 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_state.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_forward_state.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_p_k_i_x_cert_path_validator.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_p_k_i_x_cert_path_validator.java.i
index f131cbb..6a41435 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_p_k_i_x_cert_path_validator.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_p_k_i_x_cert_path_validator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_builder.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_builder.java.i
index 60d0c6c..d2f5f36 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_builder.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_builder.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_state.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_state.java.i
index c8822ac..5a19dce 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_state.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_reverse_state.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_sun_cert_path_builder.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_sun_cert_path_builder.java.i
index d8a57a0..912cbdd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_sun_cert_path_builder.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/provider/certpath/_sun_cert_path_builder.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/smartcardio/_terminal_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/smartcardio/_terminal_impl.java.i
index 4c4848e..30e46b8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/smartcardio/_terminal_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/smartcardio/_terminal_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i
index f6c4959..a4dd685 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_cipher_suite.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_args.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_args.java.i
index 057c488..5512105 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_args.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_engine_args.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i
index 40e1305..c4f87b3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/ssl/_s_s_l_engine_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i
index f7aa877..990d121 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_jar_signer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i
index fbb242e..b700e5f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/tools/_key_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/util/_resources.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/util/_resources.java.i
index 1cacce0..ed4dafd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/util/_resources.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/util/_resources.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i
index 84a3e11..47d2c9f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_simple_validator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_validator_exception.java.i b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_validator_exception.java.i
index a1d13bb..93bbea9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/security/validator/_validator_exception.java.i and b/jdk/.hg/store/data/src/share/classes/sun/security/validator/_validator_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/tools/attach/_m_e_t_a-_i_n_f/services/com.sun.tools.attach.spi._attach_provider.i b/jdk/.hg/store/data/src/share/classes/sun/tools/attach/_m_e_t_a-_i_n_f/services/com.sun.tools.attach.spi._attach_provider.i
index 33a6b3a..afc3ba9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/tools/attach/_m_e_t_a-_i_n_f/services/com.sun.tools.attach.spi._attach_provider.i and b/jdk/.hg/store/data/src/share/classes/sun/tools/attach/_m_e_t_a-_i_n_f/services/com.sun.tools.attach.spi._attach_provider.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_command_line.java.i b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_command_line.java.i
index b26bf85..d3d10a8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_command_line.java.i and b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_command_line.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_manifest.java.i b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_manifest.java.i
index b84be1b..dec3875 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_manifest.java.i and b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_manifest.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_signature_file.java.i b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_signature_file.java.i
index fc96ba4..3675a22 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_signature_file.java.i and b/jdk/.hg/store/data/src/share/classes/sun/tools/jar/_signature_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info.java.i
index c77c3e3..4d34190 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info_file.java.i b/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info_file.java.i
index 3d3e801..289367b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info_file.java.i and b/jdk/.hg/store/data/src/share/classes/sun/util/calendar/_zone_info_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_currency_names.properties.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_currency_names.properties.i
index 3113f7b..d02b279 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_currency_names.properties.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_currency_names.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_locale_names.properties.i b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_locale_names.properties.i
index 1399574..299e858 100644
Binary files a/jdk/.hg/store/data/src/share/classes/sun/util/resources/_locale_names.properties.i and b/jdk/.hg/store/data/src/share/classes/sun/util/resources/_locale_names.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/transparentruler/_ruler.java.i b/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/transparentruler/_ruler.java.i
index 3251211..a2040bd 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/transparentruler/_ruler.java.i and b/jdk/.hg/store/data/src/share/demo/jfc/_transparent_ruler/transparentruler/_ruler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/compiled_method_load/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/compiled_method_load/sample.makefile.txt.i
index f2dba70..eef932e 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/compiled_method_load/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/compiled_method_load/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/gctest/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/gctest/sample.makefile.txt.i
index 6dfc82e..dfad8a0 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/gctest/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/gctest/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/heap_tracker/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/heap_tracker/sample.makefile.txt.i
index a0d1873..be08aba 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/heap_tracker/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/heap_tracker/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/heap_viewer/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/heap_viewer/sample.makefile.txt.i
index 9e78dc7..9897a73 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/heap_viewer/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/heap_viewer/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/hprof/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/hprof/sample.makefile.txt.i
index 96193a1..8ce1ddb 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/hprof/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/hprof/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/index.html.i b/jdk/.hg/store/data/src/share/demo/jvmti/index.html.i
index fbae278..34c3599 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/index.html.i and b/jdk/.hg/store/data/src/share/demo/jvmti/index.html.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/java__crw__demo/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/java__crw__demo/sample.makefile.txt.i
index f46ff14..00d2fb8 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/java__crw__demo/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/java__crw__demo/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/minst/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/minst/sample.makefile.txt.i
index 8243f3a..ff8a9c8 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/minst/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/minst/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/mtrace/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/mtrace/sample.makefile.txt.i
index 5d4bd7a..7791a34 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/mtrace/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/mtrace/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/version_check/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/version_check/sample.makefile.txt.i
index 78c2a02..26c399b 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/version_check/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/version_check/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/jvmti/waiters/sample.makefile.txt.i b/jdk/.hg/store/data/src/share/demo/jvmti/waiters/sample.makefile.txt.i
index 52ec7fa..1e92c80 100644
Binary files a/jdk/.hg/store/data/src/share/demo/jvmti/waiters/sample.makefile.txt.i and b/jdk/.hg/store/data/src/share/demo/jvmti/waiters/sample.makefile.txt.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/management/_memory_monitor/_memory_monitor.java.i b/jdk/.hg/store/data/src/share/demo/management/_memory_monitor/_memory_monitor.java.i
index 9ea4e32..fcc6c59 100644
Binary files a/jdk/.hg/store/data/src/share/demo/management/_memory_monitor/_memory_monitor.java.i and b/jdk/.hg/store/data/src/share/demo/management/_memory_monitor/_memory_monitor.java.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_constants.java.i b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_constants.java.i
index da19576..400b215 100644
Binary files a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_constants.java.i and b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_constants.java.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_store.java.i b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_store.java.i
index 262a69d..66aec8f 100644
Binary files a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_store.java.i and b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system.java.i b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system.java.i
index 1296771..4a54846 100644
Binary files a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system.java.i and b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system.java.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system_provider.java.i b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system_provider.java.i
index 06c7af9..62d86d8 100644
Binary files a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system_provider.java.i and b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_file_system_provider.java.i differ
diff --git a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_info.java.i b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_info.java.i
index 8deee67..bbd7708 100644
Binary files a/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_info.java.i and b/jdk/.hg/store/data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/_zip_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/javavm/export/jawt.h.i b/jdk/.hg/store/data/src/share/javavm/export/jawt.h.i
index c8ca901..ed3ea1b 100644
Binary files a/jdk/.hg/store/data/src/share/javavm/export/jawt.h.i and b/jdk/.hg/store/data/src/share/javavm/export/jawt.h.i differ
diff --git a/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i b/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i
index c0747ea..5566ef3 100644
Binary files a/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i and b/jdk/.hg/store/data/src/share/javavm/export/jvm.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/defines.h.i b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/defines.h.i
index 406b2dc..5e4e460 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/defines.h.i and b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/defines.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/main.cpp.i b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/main.cpp.i
index 72cdf5f..b214ae9 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/main.cpp.i and b/jdk/.hg/store/data/src/share/native/com/sun/java/util/jar/pack/main.cpp.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_direct_audio_device.c.i b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_direct_audio_device.c.i
index 061f0bd..0f948b8 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_direct_audio_device.c.i and b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_direct_audio_device.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform.c.i b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform.c.i
index ecc5dc9..0f47a34 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform.c.i and b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform_midi.h.i b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform_midi.h.i
index d398fc6..d55f0ff 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform_midi.h.i and b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_platform_midi.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_sound_defs.h.i b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_sound_defs.h.i
index 4a0aa3b..964a054 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_sound_defs.h.i and b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_sound_defs.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_utilities.h.i b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_utilities.h.i
index 5d7346f..50abb01 100644
Binary files a/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_utilities.h.i and b/jdk/.hg/store/data/src/share/native/com/sun/media/sound/_utilities.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/common/check__code.c.i b/jdk/.hg/store/data/src/share/native/common/check__code.c.i
index 706b840..102fc7e 100644
Binary files a/jdk/.hg/store/data/src/share/native/common/check__code.c.i and b/jdk/.hg/store/data/src/share/native/common/check__code.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/io/io__util.h.i b/jdk/.hg/store/data/src/share/native/java/io/io__util.h.i
index ce7f58b..169ba84 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/io/io__util.h.i and b/jdk/.hg/store/data/src/share/native/java/io/io__util.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/lang/_system.c.i b/jdk/.hg/store/data/src/share/native/java/lang/_system.c.i
index 1d55954..415693c 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/lang/_system.c.i and b/jdk/.hg/store/data/src/share/native/java/lang/_system.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/lang/_thread.c.i b/jdk/.hg/store/data/src/share/native/java/lang/_thread.c.i
index d9d1e8e..149ab10 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/lang/_thread.c.i and b/jdk/.hg/store/data/src/share/native/java/lang/_thread.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/fdlibm.h.i b/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/fdlibm.h.i
index ca8eaed..53fb064 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/fdlibm.h.i and b/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/fdlibm.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/jfdlibm.h.i b/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/jfdlibm.h.i
index c78e3cf..c257a92 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/jfdlibm.h.i and b/jdk/.hg/store/data/src/share/native/java/lang/fdlibm/include/jfdlibm.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/lang/java__props.h.i b/jdk/.hg/store/data/src/share/native/java/lang/java__props.h.i
index 849adfc..6c5676c 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/lang/java__props.h.i and b/jdk/.hg/store/data/src/share/native/java/lang/java__props.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/java/util/zip/zip__util.c.i b/jdk/.hg/store/data/src/share/native/java/util/zip/zip__util.c.i
index 25b3a27..b65e5fb 100644
Binary files a/jdk/.hg/store/data/src/share/native/java/util/zip/zip__util.c.i and b/jdk/.hg/store/data/src/share/native/java/util/zip/zip__util.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/debug/debug__util.h.i b/jdk/.hg/store/data/src/share/native/sun/awt/debug/debug__util.h.i
index a34b2d5..4272072 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/debug/debug__util.h.i and b/jdk/.hg/store/data/src/share/native/sun/awt/debug/debug__util.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/image/_buf_img_surface_data.c.i b/jdk/.hg/store/data/src/share/native/sun/awt/image/_buf_img_surface_data.c.i
index 0770679..0908c80 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/image/_buf_img_surface_data.c.i and b/jdk/.hg/store/data/src/share/native/sun/awt/image/_buf_img_surface_data.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/image/_data_buffer_native.c.i b/jdk/.hg/store/data/src/share/native/sun/awt/image/_data_buffer_native.c.i
index 3631606..6decc57 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/image/_data_buffer_native.c.i and b/jdk/.hg/store/data/src/share/native/sun/awt/image/_data_buffer_native.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib___image_affine.h.i b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib___image_affine.h.i
index 72dd655..b2795f8 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib___image_affine.h.i and b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib___image_affine.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__image.h.i b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__image.h.i
index db6110e..8ad6980 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__image.h.i and b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__image.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__sys.c.i b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__sys.c.i
index 95a1849..103bfa9 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__sys.c.i and b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__sys.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__types.h.i b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__types.h.i
index fb49a69..79b150d 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__types.h.i and b/jdk/.hg/store/data/src/share/native/sun/awt/medialib/mlib__types.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/awt/splashscreen/splashscreen__impl.h.i b/jdk/.hg/store/data/src/share/native/sun/awt/splashscreen/splashscreen__impl.h.i
index 25300a6..b3f99d9 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/awt/splashscreen/splashscreen__impl.h.i and b/jdk/.hg/store/data/src/share/native/sun/awt/splashscreen/splashscreen__impl.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/font/_accel_glyph_cache.c.i b/jdk/.hg/store/data/src/share/native/sun/font/_accel_glyph_cache.c.i
index 2dd9e40..02fbf1b 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/font/_accel_glyph_cache.c.i and b/jdk/.hg/store/data/src/share/native/sun/font/_accel_glyph_cache.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/font/_draw_glyph_list.c.i b/jdk/.hg/store/data/src/share/native/sun/font/_draw_glyph_list.c.i
index 9fe2eef..0d24232 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/font/_draw_glyph_list.c.i and b/jdk/.hg/store/data/src/share/native/sun/font/_draw_glyph_list.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/font/sun_font.c.i b/jdk/.hg/store/data/src/share/native/sun/font/sun_font.c.i
index 8d67a58..0d0e934 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/font/sun_font.c.i and b/jdk/.hg/store/data/src/share/native/sun/font/sun_font.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/_surface_data.c.i b/jdk/.hg/store/data/src/share/native/sun/java2d/_surface_data.c.i
index f520702..d5e9a0c 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/_surface_data.c.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/_surface_data.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_blit_loops.c.i b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_blit_loops.c.i
index a17a79e..fa2935d 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_blit_loops.c.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_blit_loops.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_funcs.h.i b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_funcs.h.i
index 8e22377..c9fe9a3 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_funcs.h.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_funcs.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_render_queue.c.i b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_render_queue.c.i
index 3e5a225..b919f3d 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_render_queue.c.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_render_queue.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.c.i b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.c.i
index e5b7eb9..17add69 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.c.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.h.i b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.h.i
index 5160239..a860c07 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.h.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_surface_data.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_text_renderer.c.i b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_text_renderer.c.i
index 0f4f965..c3fcae3 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_text_renderer.c.i and b/jdk/.hg/store/data/src/share/native/sun/java2d/opengl/_o_g_l_text_renderer.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/management/_hot_spot_diagnostic.c.i b/jdk/.hg/store/data/src/share/native/sun/management/_hot_spot_diagnostic.c.i
index 989d052..aca8807 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/management/_hot_spot_diagnostic.c.i and b/jdk/.hg/store/data/src/share/native/sun/management/_hot_spot_diagnostic.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/nio/ch/gen_socket_option_registry.c.i b/jdk/.hg/store/data/src/share/native/sun/nio/ch/gen_socket_option_registry.c.i
index 055acbd..219a43e 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/nio/ch/gen_socket_option_registry.c.i and b/jdk/.hg/store/data/src/share/native/sun/nio/ch/gen_socket_option_registry.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecc__impl.h.i b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecc__impl.h.i
index fa00745..f764c05 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecc__impl.h.i and b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecc__impl.h.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecdecode.c.i b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecdecode.c.i
index 9d07777..3bc6ced 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecdecode.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/ecdecode.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/oid.c.i b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/oid.c.i
index 5410d07..45175c0 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/oid.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/oid.c.i differ
diff --git a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/secitem.c.i b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/secitem.c.i
index 4373f3b..bb19b30 100644
Binary files a/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/secitem.c.i and b/jdk/.hg/store/data/src/share/native/sun/security/ec/impl/secitem.c.i differ
diff --git a/jdk/.hg/store/data/src/share/transport/socket/socket_transport.c.i b/jdk/.hg/store/data/src/share/transport/socket/socket_transport.c.i
index 8614eac..6b24b31 100644
Binary files a/jdk/.hg/store/data/src/share/transport/socket/socket_transport.c.i and b/jdk/.hg/store/data/src/share/transport/socket/socket_transport.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/back/exec__md.c.i b/jdk/.hg/store/data/src/solaris/back/exec__md.c.i
index 60f4e05..a08ea5c 100644
Binary files a/jdk/.hg/store/data/src/solaris/back/exec__md.c.i and b/jdk/.hg/store/data/src/solaris/back/exec__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/back/linker__md.c.i b/jdk/.hg/store/data/src/solaris/back/linker__md.c.i
index 1ad136f..4157b9e 100644
Binary files a/jdk/.hg/store/data/src/solaris/back/linker__md.c.i and b/jdk/.hg/store/data/src/solaris/back/linker__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/back/util__md.h.i b/jdk/.hg/store/data/src/solaris/back/util__md.h.i
index 239492f..9103976 100644
Binary files a/jdk/.hg/store/data/src/solaris/back/util__md.h.i and b/jdk/.hg/store/data/src/solaris/back/util__md.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/bin/java__md.h.i b/jdk/.hg/store/data/src/solaris/bin/java__md.h.i
index a35881d..fddd9be 100644
Binary files a/jdk/.hg/store/data/src/solaris/bin/java__md.h.i and b/jdk/.hg/store/data/src/solaris/bin/java__md.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_area_peer.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_area_peer.java.i
index 3a948b0..a0c8e8a 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_area_peer.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_area_peer.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_field_peer.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_field_peer.java.i
index ab779ae..5119dd4 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_field_peer.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_text_field_peer.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_w_m.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_w_m.java.i
index 9082d4d..0faac7a 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_w_m.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_w_m.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_window_peer.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_window_peer.java.i
index 8da0c3e..93e597c 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_window_peer.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/awt/_x11/_x_window_peer.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_default_asynchronous_channel_provider.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_default_asynchronous_channel_provider.java.i
index e691809..8763f79 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_default_asynchronous_channel_provider.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_default_asynchronous_channel_provider.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_dev_poll_selector_impl.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_dev_poll_selector_impl.java.i
index 8009ff7..4c504af 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_dev_poll_selector_impl.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_dev_poll_selector_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_e_poll_selector_impl.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_e_poll_selector_impl.java.i
index c965fd4..cb6a120 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_e_poll_selector_impl.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_e_poll_selector_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_native_thread.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_native_thread.java.i
index 86b9dfd..4b9f13f 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_native_thread.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_native_thread.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_poll_array_wrapper.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_poll_array_wrapper.java.i
index c7ad795..584c059 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_poll_array_wrapper.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/nio/ch/_poll_array_wrapper.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/nio/fs/_default_file_system_provider.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/nio/fs/_default_file_system_provider.java.i
index 09bdfeb..3b7c281 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/nio/fs/_default_file_system_provider.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/nio/fs/_default_file_system_provider.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i
index d140cfd..fbe9a49 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/print/_unix_print_service_lookup.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/security/smartcardio/_platform_p_c_s_c.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/security/smartcardio/_platform_p_c_s_c.java.i
index 8a08881..c5de5e7 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/security/smartcardio/_platform_p_c_s_c.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/security/smartcardio/_platform_p_c_s_c.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_linux_virtual_machine.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_linux_virtual_machine.java.i
index 3590b12..16de158 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_linux_virtual_machine.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_linux_virtual_machine.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_solaris_virtual_machine.java.i b/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_solaris_virtual_machine.java.i
index 831daa9..5ec1bde 100644
Binary files a/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_solaris_virtual_machine.java.i and b/jdk/.hg/store/data/src/solaris/classes/sun/tools/attach/_solaris_virtual_machine.java.i differ
diff --git a/jdk/.hg/store/data/src/solaris/demo/jvmti/hprof/hprof__md.c.i b/jdk/.hg/store/data/src/solaris/demo/jvmti/hprof/hprof__md.c.i
index 86389f9..9440bdc 100644
Binary files a/jdk/.hg/store/data/src/solaris/demo/jvmti/hprof/hprof__md.c.i and b/jdk/.hg/store/data/src/solaris/demo/jvmti/hprof/hprof__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/javavm/export/jvm__md.h.i b/jdk/.hg/store/data/src/solaris/javavm/export/jvm__md.h.i
index e10fdad..74dc581 100644
Binary files a/jdk/.hg/store/data/src/solaris/javavm/export/jvm__md.h.i and b/jdk/.hg/store/data/src/solaris/javavm/export/jvm__md.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/com/sun/management/_unix_operating_system__md.c.i b/jdk/.hg/store/data/src/solaris/native/com/sun/management/_unix_operating_system__md.c.i
index 9dc5249..d2c670e 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/com/sun/management/_unix_operating_system__md.c.i and b/jdk/.hg/store/data/src/solaris/native/com/sun/management/_unix_operating_system__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/io/_unix_file_system__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/io/_unix_file_system__md.c.i
index f5c89b8..478deaa 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/io/_unix_file_system__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/io/_unix_file_system__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/io/canonicalize__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/io/canonicalize__md.c.i
index e8a3ac0..e9e7fd2 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/io/canonicalize__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/io/canonicalize__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/io/io__util__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/io/io__util__md.c.i
index 2fd1c9a..52fe257 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/io/io__util__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/io/io__util__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/lang/_process_environment__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/lang/_process_environment__md.c.i
index 0e087a0..7bbc70d 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/lang/_process_environment__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/lang/_process_environment__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/lang/_u_n_i_x_process__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/lang/_u_n_i_x_process__md.c.i
index f88a014..7a2e8f7 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/lang/_u_n_i_x_process__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/lang/_u_n_i_x_process__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/lang/java__props__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/lang/java__props__md.c.i
index 58c1909..8de8956 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/lang/java__props__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/lang/java__props__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/net/_inet4_address_impl.c.i b/jdk/.hg/store/data/src/solaris/native/java/net/_inet4_address_impl.c.i
index 126c514..dcd24ec 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/net/_inet4_address_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/java/net/_inet4_address_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/net/_inet6_address_impl.c.i b/jdk/.hg/store/data/src/solaris/native/java/net/_inet6_address_impl.c.i
index 7a7cc27..1679827 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/net/_inet6_address_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/java/net/_inet6_address_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/net/_network_interface.c.i b/jdk/.hg/store/data/src/solaris/native/java/net/_network_interface.c.i
index a34c50c..0811929 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/net/_network_interface.c.i and b/jdk/.hg/store/data/src/solaris/native/java/net/_network_interface.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/net/_plain_datagram_socket_impl.c.i b/jdk/.hg/store/data/src/solaris/native/java/net/_plain_datagram_socket_impl.c.i
index faa4110..24539d9 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/net/_plain_datagram_socket_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/java/net/_plain_datagram_socket_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/net/_plain_socket_impl.c.i b/jdk/.hg/store/data/src/solaris/native/java/net/_plain_socket_impl.c.i
index e91a51b..38dad9e 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/net/_plain_socket_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/java/net/_plain_socket_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.c.i
index fc4ced7..d47856c 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.h.i b/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.h.i
index 0224600..98e7af4 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.h.i and b/jdk/.hg/store/data/src/solaris/native/java/net/net__util__md.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/util/_file_system_preferences.c.i b/jdk/.hg/store/data/src/solaris/native/java/util/_file_system_preferences.c.i
index fb0ca12..acf2c20 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/util/_file_system_preferences.c.i and b/jdk/.hg/store/data/src/solaris/native/java/util/_file_system_preferences.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i b/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i
index 52ddcd9..fcea246 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i and b/jdk/.hg/store/data/src/solaris/native/java/util/_time_zone__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/_c_u_p_sfuncs.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/_c_u_p_sfuncs.c.i
index 84c8d12..f9590be 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/_c_u_p_sfuncs.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/_c_u_p_sfuncs.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/_v_drawing_area.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/_v_drawing_area.c.i
index a43eec6..1bb4250 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/_v_drawing_area.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/_v_drawing_area.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/_x11_color.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/_x11_color.c.i
index 3ea0a20..43c30fc 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/_x11_color.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/_x11_color.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___font.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___font.c.i
index fefb4d1..47496ce 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___font.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___font.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___graphics_env.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___graphics_env.c.i
index e63d72f..21e13bc 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___graphics_env.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___graphics_env.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___input_method.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___input_method.c.i
index 2505a4d..e3d72be 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___input_method.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___input_method.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___load_library.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___load_library.c.i
index f60754e..78bccc6 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___load_library.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___load_library.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___mlib.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___mlib.c.i
index 9c132cb..b5ab7aa 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___mlib.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___mlib.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___robot.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___robot.c.i
index 46c4a42..5ff9597 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___robot.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/awt___robot.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/extutil.h.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/extutil.h.i
index 20ab10b..e7c67d0 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/extutil.h.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/extutil.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/fontpath.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/fontpath.c.i
index c1eacc2..6b41789 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/fontpath.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/fontpath.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/gtk2__interface.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/gtk2__interface.c.i
index 61b15c9..e300cf2 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/gtk2__interface.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/gtk2__interface.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/jawt.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/jawt.c.i
index 5d86792..0736008 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/jawt.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/jawt.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/list.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/list.c.i
index 3a13a95..786620e 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/list.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/list.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/robot__common.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/robot__common.c.i
index bd7b324..4fc7ebb 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/robot__common.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/robot__common.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/awt/sun__awt___x11___gtk_file_dialog_peer.c.i b/jdk/.hg/store/data/src/solaris/native/sun/awt/sun__awt___x11___gtk_file_dialog_peer.c.i
index d56bc95..42bf9d9 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/awt/sun__awt___x11___gtk_file_dialog_peer.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/awt/sun__awt___x11___gtk_file_dialog_peer.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_font_scaler.c.i b/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_font_scaler.c.i
index e7f8356..4e65488 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_font_scaler.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_font_scaler.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_text_renderer.c.i b/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_text_renderer.c.i
index ff06ec2..ea93bdb 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_text_renderer.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/font/_x11_text_renderer.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/java2d/j2d__md.h.i b/jdk/.hg/store/data/src/solaris/native/sun/java2d/j2d__md.h.i
index 60dba10..ddad897 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/java2d/j2d__md.h.i and b/jdk/.hg/store/data/src/solaris/native/sun/java2d/j2d__md.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/mlib___image_zoom___n_n.c.i b/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/mlib___image_zoom___n_n.c.i
index f47def1..1b2fc12 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/mlib___image_zoom___n_n.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/mlib___image_zoom___n_n.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/vis___func_array.c.i b/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/vis___func_array.c.i
index ad221d2..82d4a06 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/vis___func_array.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/java2d/loops/vis___func_array.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_g_l_x_surface_data.c.i b/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_g_l_x_surface_data.c.i
index d11ac47..39a3abe 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_g_l_x_surface_data.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_g_l_x_surface_data.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_o_g_l_funcs__md.h.i b/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_o_g_l_funcs__md.h.i
index 0f5198e..30277de 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_o_g_l_funcs__md.h.i and b/jdk/.hg/store/data/src/solaris/native/sun/java2d/opengl/_o_g_l_funcs__md.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x11_surface_data.c.i b/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x11_surface_data.c.i
index 8bbcbd8..ba796ea 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x11_surface_data.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x11_surface_data.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x_r_surface_data.c.i b/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x_r_surface_data.c.i
index e0d8480..b82e9f1 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x_r_surface_data.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/java2d/x11/_x_r_surface_data.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/jdga/dgalock.c.i b/jdk/.hg/store/data/src/solaris/native/sun/jdga/dgalock.c.i
index 6601658..d5de2cf 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/jdga/dgalock.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/jdga/dgalock.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/management/_file_system_impl.c.i b/jdk/.hg/store/data/src/solaris/native/sun/management/_file_system_impl.c.i
index bdf4d82..bd244fb 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/management/_file_system_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/management/_file_system_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/net/dns/_resolver_configuration_impl.c.i b/jdk/.hg/store/data/src/solaris/native/sun/net/dns/_resolver_configuration_impl.c.i
index 11a5f63..310ebcc 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/net/dns/_resolver_configuration_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/net/dns/_resolver_configuration_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/net/spi/_default_proxy_selector.c.i b/jdk/.hg/store/data/src/solaris/native/sun/net/spi/_default_proxy_selector.c.i
index ecb5116..1572c00 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/net/spi/_default_proxy_selector.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/net/spi/_default_proxy_selector.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_channel_impl.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_channel_impl.c.i
index 67bc2f4..ce936f7 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_channel_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_channel_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_dispatcher.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_dispatcher.c.i
index 75f74dc..bfc71cc 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_dispatcher.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_datagram_dispatcher.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_channel_impl.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_channel_impl.c.i
index 5886c1a..9119a4f 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_channel_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_channel_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_dispatcher_impl.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_dispatcher_impl.c.i
index a75bb59..354a746 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_dispatcher_impl.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_dispatcher_impl.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_key.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_key.c.i
index cfb3294..53fb435 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_key.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_file_key.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_net.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_net.c.i
index 85082bf..02f64e6 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_net.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/ch/_net.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_gnome_file_type_detector.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_gnome_file_type_detector.c.i
index 37cfe50..f790a36 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_gnome_file_type_detector.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_gnome_file_type_detector.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_unix_native_dispatcher.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_unix_native_dispatcher.c.i
index f708b2c..9429599 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_unix_native_dispatcher.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/_unix_native_dispatcher.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i
index a2aab46..a17746e 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/nio/fs/gen_unix_constants.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/security/jgss/wrapper/_native_func.c.i b/jdk/.hg/store/data/src/solaris/native/sun/security/jgss/wrapper/_native_func.c.i
index 0e51ce8..2ad124f 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/security/jgss/wrapper/_native_func.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/security/jgss/wrapper/_native_func.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i b/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i
index 31ec2ad..0dcb085 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/j2secmod__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/wrapper/p11__md.c.i b/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/wrapper/p11__md.c.i
index 006e72c..65b8026 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/wrapper/p11__md.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/security/pkcs11/wrapper/p11__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i b/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i
index 86510ae..ad72b8a 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/security/smartcardio/pcsc__md.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/xawt/_x_window.c.i b/jdk/.hg/store/data/src/solaris/native/sun/xawt/_x_window.c.i
index c3f5117..48fdc90 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/xawt/_x_window.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/xawt/_x_window.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/native/sun/xawt/awt___desktop.c.i b/jdk/.hg/store/data/src/solaris/native/sun/xawt/awt___desktop.c.i
index 42aa292..a23bbe0 100644
Binary files a/jdk/.hg/store/data/src/solaris/native/sun/xawt/awt___desktop.c.i and b/jdk/.hg/store/data/src/solaris/native/sun/xawt/awt___desktop.c.i differ
diff --git a/jdk/.hg/store/data/src/solaris/npt/npt__md.h.i b/jdk/.hg/store/data/src/solaris/npt/npt__md.h.i
index 7170b0f..85e125b 100644
Binary files a/jdk/.hg/store/data/src/solaris/npt/npt__md.h.i and b/jdk/.hg/store/data/src/solaris/npt/npt__md.h.i differ
diff --git a/jdk/.hg/store/data/src/solaris/transport/socket/socket__md.c.i b/jdk/.hg/store/data/src/solaris/transport/socket/socket__md.c.i
index 10373b4..50b3786 100644
Binary files a/jdk/.hg/store/data/src/solaris/transport/socket/socket__md.c.i and b/jdk/.hg/store/data/src/solaris/transport/socket/socket__md.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/bin/java__md.c.i b/jdk/.hg/store/data/src/windows/bin/java__md.c.i
index d017fa8..11eba47 100644
Binary files a/jdk/.hg/store/data/src/windows/bin/java__md.c.i and b/jdk/.hg/store/data/src/windows/bin/java__md.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_renderer.java.i b/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_renderer.java.i
index ca574d9..6de4d79 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_renderer.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/java2d/d3d/_d3_d_renderer.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/java2d/windows/_g_d_i_renderer.java.i b/jdk/.hg/store/data/src/windows/classes/sun/java2d/windows/_g_d_i_renderer.java.i
index c6afd54..cba171f 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/java2d/windows/_g_d_i_renderer.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/java2d/windows/_g_d_i_renderer.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_native_thread.java.i b/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_native_thread.java.i
index dc26e0e..12b695b 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_native_thread.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_native_thread.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_socket_dispatcher.java.i b/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_socket_dispatcher.java.i
index 41b8694..2755fea 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_socket_dispatcher.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_socket_dispatcher.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_windows_selector_impl.java.i b/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_windows_selector_impl.java.i
index 910658a..87a1998 100644
Binary files a/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_windows_selector_impl.java.i and b/jdk/.hg/store/data/src/windows/classes/sun/nio/ch/_windows_selector_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/java/lang/java__props__md.c.i b/jdk/.hg/store/data/src/windows/native/java/lang/java__props__md.c.i
index 85e9eff..00c011e 100644
Binary files a/jdk/.hg/store/data/src/windows/native/java/lang/java__props__md.c.i and b/jdk/.hg/store/data/src/windows/native/java/lang/java__props__md.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/font/fontpath.c.i b/jdk/.hg/store/data/src/windows/native/sun/font/fontpath.c.i
index a0ba16e..807db71 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/font/fontpath.c.i and b/jdk/.hg/store/data/src/windows/native/sun/font/fontpath.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/java2d/opengl/_w_g_l_surface_data.c.i b/jdk/.hg/store/data/src/windows/native/sun/java2d/opengl/_w_g_l_surface_data.c.i
index f8b380c..b4ad2a8 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/java2d/opengl/_w_g_l_surface_data.c.i and b/jdk/.hg/store/data/src/windows/native/sun/java2d/opengl/_w_g_l_surface_data.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/java2d/windows/_g_d_i_renderer.cpp.i b/jdk/.hg/store/data/src/windows/native/sun/java2d/windows/_g_d_i_renderer.cpp.i
index 128a415..f865481 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/java2d/windows/_g_d_i_renderer.cpp.i and b/jdk/.hg/store/data/src/windows/native/sun/java2d/windows/_g_d_i_renderer.cpp.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/nio/ch/_socket_dispatcher.c.i b/jdk/.hg/store/data/src/windows/native/sun/nio/ch/_socket_dispatcher.c.i
index f2b6e36..1fd52ca 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/nio/ch/_socket_dispatcher.c.i and b/jdk/.hg/store/data/src/windows/native/sun/nio/ch/_socket_dispatcher.c.i differ
diff --git a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i
index 67fc188..86002e2 100644
Binary files a/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i and b/jdk/.hg/store/data/src/windows/native/sun/windows/awt___component.cpp.i differ
diff --git a/jdk/.hg/store/data/test/_makefile.i b/jdk/.hg/store/data/test/_makefile.i
index d140bca..29a056e 100644
Binary files a/jdk/.hg/store/data/test/_makefile.i and b/jdk/.hg/store/data/test/_makefile.i differ
diff --git a/jdk/.hg/store/data/test/_problem_list.txt.i b/jdk/.hg/store/data/test/_problem_list.txt.i
index 8cbd78b..8527409 100644
Binary files a/jdk/.hg/store/data/test/_problem_list.txt.i and b/jdk/.hg/store/data/test/_problem_list.txt.i differ
diff --git a/jdk/.hg/store/data/test/_t_e_s_t._r_o_o_t.i b/jdk/.hg/store/data/test/_t_e_s_t._r_o_o_t.i
index 6d9f61f..a307ab3 100644
Binary files a/jdk/.hg/store/data/test/_t_e_s_t._r_o_o_t.i and b/jdk/.hg/store/data/test/_t_e_s_t._r_o_o_t.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/crypto/provider/_key_agreement/_d_h_key_agreement2.java.i b/jdk/.hg/store/data/test/com/sun/crypto/provider/_key_agreement/_d_h_key_agreement2.java.i
index 3ea32ab..285c625 100644
Binary files a/jdk/.hg/store/data/test/com/sun/crypto/provider/_key_agreement/_d_h_key_agreement2.java.i and b/jdk/.hg/store/data/test/com/sun/crypto/provider/_key_agreement/_d_h_key_agreement2.java.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_early_return_test.java.i b/jdk/.hg/store/data/test/com/sun/jdi/_early_return_test.java.i
index 006ee35..c4b496d 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_early_return_test.java.i and b/jdk/.hg/store/data/test/com/sun/jdi/_early_return_test.java.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_immutable_resource_test.sh.i b/jdk/.hg/store/data/test/com/sun/jdi/_immutable_resource_test.sh.i
index a27feae..1d4d4aa 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_immutable_resource_test.sh.i and b/jdk/.hg/store/data/test/com/sun/jdi/_immutable_resource_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_j_i_t_debug.sh.i b/jdk/.hg/store/data/test/com/sun/jdi/_j_i_t_debug.sh.i
index f9e8b5a..a8015e9 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_j_i_t_debug.sh.i and b/jdk/.hg/store/data/test/com/sun/jdi/_j_i_t_debug.sh.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_method_entry_exit_events.java.i b/jdk/.hg/store/data/test/com/sun/jdi/_method_entry_exit_events.java.i
index ba29ac3..f8e8765 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_method_entry_exit_events.java.i and b/jdk/.hg/store/data/test/com/sun/jdi/_method_entry_exit_events.java.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_method_exit_return_values_test.java.i b/jdk/.hg/store/data/test/com/sun/jdi/_method_exit_return_values_test.java.i
index 8a9ff47..c318e28 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_method_exit_return_values_test.java.i and b/jdk/.hg/store/data/test/com/sun/jdi/_method_exit_return_values_test.java.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_private_transport_test.sh.i b/jdk/.hg/store/data/test/com/sun/jdi/_private_transport_test.sh.i
index 0bfc94e..4764bfe 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_private_transport_test.sh.i and b/jdk/.hg/store/data/test/com/sun/jdi/_private_transport_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_shell_scaffold.sh.i b/jdk/.hg/store/data/test/com/sun/jdi/_shell_scaffold.sh.i
index 1ad4cd2..9949809 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_shell_scaffold.sh.i and b/jdk/.hg/store/data/test/com/sun/jdi/_shell_scaffold.sh.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/_solaris32_and_solaris64_test.sh.i b/jdk/.hg/store/data/test/com/sun/jdi/_solaris32_and_solaris64_test.sh.i
index f639573..4338ea6 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/_solaris32_and_solaris64_test.sh.i and b/jdk/.hg/store/data/test/com/sun/jdi/_solaris32_and_solaris64_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/jdi/connect/spi/_jdi_loaded_by_custom_loader.sh.i b/jdk/.hg/store/data/test/com/sun/jdi/connect/spi/_jdi_loaded_by_custom_loader.sh.i
index 9f02e04..6fc920d 100644
Binary files a/jdk/.hg/store/data/test/com/sun/jdi/connect/spi/_jdi_loaded_by_custom_loader.sh.i and b/jdk/.hg/store/data/test/com/sun/jdi/connect/spi/_jdi_loaded_by_custom_loader.sh.i differ
diff --git a/jdk/.hg/store/data/test/com/sun/tools/attach/_common_setup.sh.i b/jdk/.hg/store/data/test/com/sun/tools/attach/_common_setup.sh.i
index 1c43b97..7a10108 100644
Binary files a/jdk/.hg/store/data/test/com/sun/tools/attach/_common_setup.sh.i and b/jdk/.hg/store/data/test/com/sun/tools/attach/_common_setup.sh.i differ
diff --git a/jdk/.hg/store/data/test/demo/jvmti/_demo_run.java.i b/jdk/.hg/store/data/test/demo/jvmti/_demo_run.java.i
index d6602ca..3cbb824 100644
Binary files a/jdk/.hg/store/data/test/demo/jvmti/_demo_run.java.i and b/jdk/.hg/store/data/test/demo/jvmti/_demo_run.java.i differ
diff --git a/jdk/.hg/store/data/test/java/awt/_choice/_choice_mouse_wheel_test/_choice_mouse_wheel_test.java.i b/jdk/.hg/store/data/test/java/awt/_choice/_choice_mouse_wheel_test/_choice_mouse_wheel_test.java.i
index 6ac97f2..c958ead 100644
Binary files a/jdk/.hg/store/data/test/java/awt/_choice/_choice_mouse_wheel_test/_choice_mouse_wheel_test.java.i and b/jdk/.hg/store/data/test/java/awt/_choice/_choice_mouse_wheel_test/_choice_mouse_wheel_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/awt/print/_paint_set_enabled_deadlock/_paint_set_enabled_deadlock.java.i b/jdk/.hg/store/data/test/java/awt/print/_paint_set_enabled_deadlock/_paint_set_enabled_deadlock.java.i
index 133626c..c5e7b4d 100644
Binary files a/jdk/.hg/store/data/test/java/awt/print/_paint_set_enabled_deadlock/_paint_set_enabled_deadlock.java.i and b/jdk/.hg/store/data/test/java/awt/print/_paint_set_enabled_deadlock/_paint_set_enabled_deadlock.java.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_file/_get_x_space.java.i b/jdk/.hg/store/data/test/java/io/_file/_get_x_space.java.i
index ab704b2..694a8f5 100644
Binary files a/jdk/.hg/store/data/test/java/io/_file/_get_x_space.java.i and b/jdk/.hg/store/data/test/java/io/_file/_get_x_space.java.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/bad_subst_by_replace/_bad_subst_by_replace.java.i b/jdk/.hg/store/data/test/java/io/_serializable/bad_subst_by_replace/_bad_subst_by_replace.java.i
index e2dc3cc..8da995e 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/bad_subst_by_replace/_bad_subst_by_replace.java.i and b/jdk/.hg/store/data/test/java/io/_serializable/bad_subst_by_replace/_bad_subst_by_replace.java.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/evolution/_rename_package/run.sh.i b/jdk/.hg/store/data/test/java/io/_serializable/evolution/_rename_package/run.sh.i
index 3f8fc81..32f0571 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/evolution/_rename_package/run.sh.i and b/jdk/.hg/store/data/test/java/io/_serializable/evolution/_rename_package/run.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/expected_stack_trace/_expected_stack_trace.java.i b/jdk/.hg/store/data/test/java/io/_serializable/expected_stack_trace/_expected_stack_trace.java.i
index 8408ac3..ebaa41d 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/expected_stack_trace/_expected_stack_trace.java.i and b/jdk/.hg/store/data/test/java/io/_serializable/expected_stack_trace/_expected_stack_trace.java.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/replace_string_array/_replace_string_array.java.i b/jdk/.hg/store/data/test/java/io/_serializable/replace_string_array/_replace_string_array.java.i
index 3d1b7f3..2a81149 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/replace_string_array/_replace_string_array.java.i and b/jdk/.hg/store/data/test/java/io/_serializable/replace_string_array/_replace_string_array.java.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/replace_with_null/_replace_with_null.java.i b/jdk/.hg/store/data/test/java/io/_serializable/replace_with_null/_replace_with_null.java.i
index 69e7527..3ce56e1 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/replace_with_null/_replace_with_null.java.i and b/jdk/.hg/store/data/test/java/io/_serializable/replace_with_null/_replace_with_null.java.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/serialver/classpath/run.sh.i b/jdk/.hg/store/data/test/java/io/_serializable/serialver/classpath/run.sh.i
index a5e6d79..405e38b 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/serialver/classpath/run.sh.i and b/jdk/.hg/store/data/test/java/io/_serializable/serialver/classpath/run.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/serialver/nested/run.sh.i b/jdk/.hg/store/data/test/java/io/_serializable/serialver/nested/run.sh.i
index 79860d2..9bfc3b2 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/serialver/nested/run.sh.i and b/jdk/.hg/store/data/test/java/io/_serializable/serialver/nested/run.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/io/_serializable/verify_dynamic_obj_handle_table/_verify_dynamic_obj_handle_table.java.i b/jdk/.hg/store/data/test/java/io/_serializable/verify_dynamic_obj_handle_table/_verify_dynamic_obj_handle_table.java.i
index 72ec71c..539b76d 100644
Binary files a/jdk/.hg/store/data/test/java/io/_serializable/verify_dynamic_obj_handle_table/_verify_dynamic_obj_handle_table.java.i and b/jdk/.hg/store/data/test/java/io/_serializable/verify_dynamic_obj_handle_table/_verify_dynamic_obj_handle_table.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_cross_delegate.sh.i b/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_cross_delegate.sh.i
index 5ad2bd1..a130693 100644
Binary files a/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_cross_delegate.sh.i and b/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_cross_delegate.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_one_way_delegate.sh.i b/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_one_way_delegate.sh.i
index f2f627a..3342d38 100644
Binary files a/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_one_way_delegate.sh.i and b/jdk/.hg/store/data/test/java/lang/_class_loader/deadlock/_test_one_way_delegate.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/_process_builder/_basic.java.i b/jdk/.hg/store/data/test/java/lang/_process_builder/_basic.java.i
index 0832895..7810a7d 100644
Binary files a/jdk/.hg/store/data/test/java/lang/_process_builder/_basic.java.i and b/jdk/.hg/store/data/test/java/lang/_process_builder/_basic.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/_process_builder/_zombies.java.i b/jdk/.hg/store/data/test/java/lang/_process_builder/_zombies.java.i
index 79b9f53..6aaf693 100644
Binary files a/jdk/.hg/store/data/test/java/lang/_process_builder/_zombies.java.i and b/jdk/.hg/store/data/test/java/lang/_process_builder/_zombies.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/_string_coding/_check_encodings.sh.i b/jdk/.hg/store/data/test/java/lang/_string_coding/_check_encodings.sh.i
index 875e4b8..74e627f 100644
Binary files a/jdk/.hg/store/data/test/java/lang/_string_coding/_check_encodings.sh.i and b/jdk/.hg/store/data/test/java/lang/_string_coding/_check_encodings.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/annotation/loader_leak/_loader_leak.sh.i b/jdk/.hg/store/data/test/java/lang/annotation/loader_leak/_loader_leak.sh.i
index 139ba0a..b012cb2 100644
Binary files a/jdk/.hg/store/data/test/java/lang/annotation/loader_leak/_loader_leak.sh.i and b/jdk/.hg/store/data/test/java/lang/annotation/loader_leak/_loader_leak.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/instrument/_manifest_test.sh.i b/jdk/.hg/store/data/test/java/lang/instrument/_manifest_test.sh.i
index de5c8f7..008be0e 100644
Binary files a/jdk/.hg/store/data/test/java/lang/instrument/_manifest_test.sh.i and b/jdk/.hg/store/data/test/java/lang/instrument/_manifest_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/instrument/append_to_class_loader_search/_common_setup.sh.i b/jdk/.hg/store/data/test/java/lang/instrument/append_to_class_loader_search/_common_setup.sh.i
index 3f4bd71..1096826 100644
Binary files a/jdk/.hg/store/data/test/java/lang/instrument/append_to_class_loader_search/_common_setup.sh.i and b/jdk/.hg/store/data/test/java/lang/instrument/append_to_class_loader_search/_common_setup.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_get_system_load_average.java.i b/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_get_system_load_average.java.i
index 38d565d..0aa0eea 100644
Binary files a/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_get_system_load_average.java.i and b/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_get_system_load_average.java.i differ
diff --git a/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_test_system_load_avg.sh.i b/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_test_system_load_avg.sh.i
index d3dffef..d8c1b8d 100644
Binary files a/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_test_system_load_avg.sh.i and b/jdk/.hg/store/data/test/java/lang/management/_operating_system_m_x_bean/_test_system_load_avg.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_authenticator/_b4933582.sh.i b/jdk/.hg/store/data/test/java/net/_authenticator/_b4933582.sh.i
index 12047b3..8b26f8c 100644
Binary files a/jdk/.hg/store/data/test/java/net/_authenticator/_b4933582.sh.i and b/jdk/.hg/store/data/test/java/net/_authenticator/_b4933582.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_cookie_handler/_null_uri_cookie_test.java.i b/jdk/.hg/store/data/test/java/net/_cookie_handler/_null_uri_cookie_test.java.i
index 74038de..8ba9ea6 100644
Binary files a/jdk/.hg/store/data/test/java/net/_cookie_handler/_null_uri_cookie_test.java.i and b/jdk/.hg/store/data/test/java/net/_cookie_handler/_null_uri_cookie_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_datagram_socket/_send12k.java.i b/jdk/.hg/store/data/test/java/net/_datagram_socket/_send12k.java.i
index 47e377b..fea0f3f 100644
Binary files a/jdk/.hg/store/data/test/java/net/_datagram_socket/_send12k.java.i and b/jdk/.hg/store/data/test/java/net/_datagram_socket/_send12k.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_datagram_socket/_send_datagram_to_bad_address.java.i b/jdk/.hg/store/data/test/java/net/_datagram_socket/_send_datagram_to_bad_address.java.i
index 2247cb6..f459d50 100644
Binary files a/jdk/.hg/store/data/test/java/net/_datagram_socket/_send_datagram_to_bad_address.java.i and b/jdk/.hg/store/data/test/java/net/_datagram_socket/_send_datagram_to_bad_address.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_datagram_socket/_set_datagram_socket_impl_factory/_a_datagram_socket.sh.i b/jdk/.hg/store/data/test/java/net/_datagram_socket/_set_datagram_socket_impl_factory/_a_datagram_socket.sh.i
index 50cc98d..314d735 100644
Binary files a/jdk/.hg/store/data/test/java/net/_datagram_socket/_set_datagram_socket_impl_factory/_a_datagram_socket.sh.i and b/jdk/.hg/store/data/test/java/net/_datagram_socket/_set_datagram_socket_impl_factory/_a_datagram_socket.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_socket/_old_socket_impl.sh.i b/jdk/.hg/store/data/test/java/net/_socket/_old_socket_impl.sh.i
index eecb54c..0d07b5e 100644
Binary files a/jdk/.hg/store/data/test/java/net/_socket/_old_socket_impl.sh.i and b/jdk/.hg/store/data/test/java/net/_socket/_old_socket_impl.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_socks/_socks_server.java.i b/jdk/.hg/store/data/test/java/net/_socks/_socks_server.java.i
index 5d6ded2..5e3ae9e 100644
Binary files a/jdk/.hg/store/data/test/java/net/_socks/_socks_server.java.i and b/jdk/.hg/store/data/test/java/net/_socks/_socks_server.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_socks/_socks_v4_test.java.i b/jdk/.hg/store/data/test/java/net/_socks/_socks_v4_test.java.i
index a7de58a..bb42a8f 100644
Binary files a/jdk/.hg/store/data/test/java/net/_socks/_socks_v4_test.java.i and b/jdk/.hg/store/data/test/java/net/_socks/_socks_v4_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l/_b5086147.sh.i b/jdk/.hg/store/data/test/java/net/_u_r_l/_b5086147.sh.i
index 3627622..f325b1c 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l/_b5086147.sh.i and b/jdk/.hg/store/data/test/java/net/_u_r_l/_b5086147.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l/_open_stream.java.i b/jdk/.hg/store/data/test/java/net/_u_r_l/_open_stream.java.i
index 57a94ed..e1735e5 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l/_open_stream.java.i and b/jdk/.hg/store/data/test/java/net/_u_r_l/_open_stream.java.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l/runconstructor.sh.i b/jdk/.hg/store/data/test/java/net/_u_r_l/runconstructor.sh.i
index 945bfd9..e118897 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l/runconstructor.sh.i and b/jdk/.hg/store/data/test/java/net/_u_r_l/runconstructor.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/_b5077773.sh.i b/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/_b5077773.sh.i
index e13859c..010ff52 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/_b5077773.sh.i and b/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/_b5077773.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/sealing/checksealed.sh.i b/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/sealing/checksealed.sh.i
index f73dddf..341fcb9 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/sealing/checksealed.sh.i and b/jdk/.hg/store/data/test/java/net/_u_r_l_class_loader/sealing/checksealed.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/net/_u_r_l_connection/6212146/test.sh.i b/jdk/.hg/store/data/test/java/net/_u_r_l_connection/6212146/test.sh.i
index 5f6ca92..c5cb91f 100644
Binary files a/jdk/.hg/store/data/test/java/net/_u_r_l_connection/6212146/test.sh.i and b/jdk/.hg/store/data/test/java/net/_u_r_l_connection/6212146/test.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/channels/_datagram_channel/_refused.java.i b/jdk/.hg/store/data/test/java/nio/channels/_datagram_channel/_refused.java.i
index 6996737..02ee674 100644
Binary files a/jdk/.hg/store/data/test/java/nio/channels/_datagram_channel/_refused.java.i and b/jdk/.hg/store/data/test/java/nio/channels/_datagram_channel/_refused.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_size.java.i b/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_size.java.i
index 90dee53..b9f3df3 100644
Binary files a/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_size.java.i and b/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_size.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_transfer.java.i b/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_transfer.java.i
index 1f259b7..6642d85 100644
Binary files a/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_transfer.java.i and b/jdk/.hg/store/data/test/java/nio/channels/_file_channel/_transfer.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/charset/coders/_check_s_j_i_s_mapping_prop.sh.i b/jdk/.hg/store/data/test/java/nio/charset/coders/_check_s_j_i_s_mapping_prop.sh.i
index b3079c5..4c1d4e6 100644
Binary files a/jdk/.hg/store/data/test/java/nio/charset/coders/_check_s_j_i_s_mapping_prop.sh.i and b/jdk/.hg/store/data/test/java/nio/charset/coders/_check_s_j_i_s_mapping_prop.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/charset/spi/basic.sh.i b/jdk/.hg/store/data/test/java/nio/charset/spi/basic.sh.i
index ad9d867..cfa8315 100644
Binary files a/jdk/.hg/store/data/test/java/nio/charset/spi/basic.sh.i and b/jdk/.hg/store/data/test/java/nio/charset/spi/basic.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/file/_file_system/_basic.java.i b/jdk/.hg/store/data/test/java/nio/file/_file_system/_basic.java.i
index edd7cd1..0889fef 100644
Binary files a/jdk/.hg/store/data/test/java/nio/file/_file_system/_basic.java.i and b/jdk/.hg/store/data/test/java/nio/file/_file_system/_basic.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/file/_files/_copy_and_move.java.i b/jdk/.hg/store/data/test/java/nio/file/_files/_copy_and_move.java.i
index a9ca908..97c8209 100644
Binary files a/jdk/.hg/store/data/test/java/nio/file/_files/_copy_and_move.java.i and b/jdk/.hg/store/data/test/java/nio/file/_files/_copy_and_move.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/file/_files/_custom_options.java.i b/jdk/.hg/store/data/test/java/nio/file/_files/_custom_options.java.i
index 1e91a44..7131aec 100644
Binary files a/jdk/.hg/store/data/test/java/nio/file/_files/_custom_options.java.i and b/jdk/.hg/store/data/test/java/nio/file/_files/_custom_options.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/file/_path/_path_ops.java.i b/jdk/.hg/store/data/test/java/nio/file/_path/_path_ops.java.i
index 797a8c4..aaae525 100644
Binary files a/jdk/.hg/store/data/test/java/nio/file/_path/_path_ops.java.i and b/jdk/.hg/store/data/test/java/nio/file/_path/_path_ops.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/file/_watch_service/_basic.java.i b/jdk/.hg/store/data/test/java/nio/file/_watch_service/_basic.java.i
index 15144d8..776d995 100644
Binary files a/jdk/.hg/store/data/test/java/nio/file/_watch_service/_basic.java.i and b/jdk/.hg/store/data/test/java/nio/file/_watch_service/_basic.java.i differ
diff --git a/jdk/.hg/store/data/test/java/nio/file/_watch_service/_sensitivity_modifier.java.i b/jdk/.hg/store/data/test/java/nio/file/_watch_service/_sensitivity_modifier.java.i
index 5c153c8..6dd46af 100644
Binary files a/jdk/.hg/store/data/test/java/nio/file/_watch_service/_sensitivity_modifier.java.i and b/jdk/.hg/store/data/test/java/nio/file/_watch_service/_sensitivity_modifier.java.i differ
diff --git a/jdk/.hg/store/data/test/java/rmi/registry/read_test/read_test.sh.i b/jdk/.hg/store/data/test/java/rmi/registry/read_test/read_test.sh.i
index 01dc7d9..b42375f 100644
Binary files a/jdk/.hg/store/data/test/java/rmi/registry/read_test/read_test.sh.i and b/jdk/.hg/store/data/test/java/rmi/registry/read_test/read_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_class_loader_deadlock.sh.i b/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_class_loader_deadlock.sh.i
index 6d1f857..77e7e02 100644
Binary files a/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_class_loader_deadlock.sh.i and b/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_class_loader_deadlock.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock.sh.i b/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock.sh.i
index 2ed7d96..17b1d04 100644
Binary files a/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock.sh.i and b/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock2.sh.i b/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock2.sh.i
index d2d9dee..ddbb74a 100644
Binary files a/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock2.sh.i and b/jdk/.hg/store/data/test/java/security/_security/_class_loader_deadlock/_deadlock2.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/security/_security/signedfirst/_dyn.sh.i b/jdk/.hg/store/data/test/java/security/_security/signedfirst/_dyn.sh.i
index 995d058..d213752 100644
Binary files a/jdk/.hg/store/data/test/java/security/_security/signedfirst/_dyn.sh.i and b/jdk/.hg/store/data/test/java/security/_security/signedfirst/_dyn.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/security/_security/signedfirst/_static.sh.i b/jdk/.hg/store/data/test/java/security/_security/signedfirst/_static.sh.i
index 189392e..a403ef1 100644
Binary files a/jdk/.hg/store/data/test/java/security/_security/signedfirst/_static.sh.i and b/jdk/.hg/store/data/test/java/security/_security/signedfirst/_static.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/text/_bidi/_bug6850113.java.i b/jdk/.hg/store/data/test/java/text/_bidi/_bug6850113.java.i
index b2600b2..5800f2b 100644
Binary files a/jdk/.hg/store/data/test/java/text/_bidi/_bug6850113.java.i and b/jdk/.hg/store/data/test/java/text/_bidi/_bug6850113.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_currency/_properties_test.sh.i b/jdk/.hg/store/data/test/java/util/_currency/_properties_test.sh.i
index 5007565..be34aa9 100644
Binary files a/jdk/.hg/store/data/test/java/util/_currency/_properties_test.sh.i and b/jdk/.hg/store/data/test/java/util/_currency/_properties_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i b/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i
index 4d8a398..31f856d 100644
Binary files a/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i and b/jdk/.hg/store/data/test/java/util/_currency/tablea1.txt.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_locale/_locale_category.sh.i b/jdk/.hg/store/data/test/java/util/_locale/_locale_category.sh.i
index 35fb447..552324e 100644
Binary files a/jdk/.hg/store/data/test/java/util/_locale/_locale_category.sh.i and b/jdk/.hg/store/data/test/java/util/_locale/_locale_category.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_locale/_locale_test.java.i b/jdk/.hg/store/data/test/java/util/_locale/_locale_test.java.i
index c6b2290..23194d9 100644
Binary files a/jdk/.hg/store/data/test/java/util/_locale/_locale_test.java.i and b/jdk/.hg/store/data/test/java/util/_locale/_locale_test.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_pluggable_locale/_exec_test.sh.i b/jdk/.hg/store/data/test/java/util/_pluggable_locale/_exec_test.sh.i
index 8ad6ebb..872570d 100644
Binary files a/jdk/.hg/store/data/test/java/util/_pluggable_locale/_exec_test.sh.i and b/jdk/.hg/store/data/test/java/util/_pluggable_locale/_exec_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_resource_bundle/_bug6299235_test.sh.i b/jdk/.hg/store/data/test/java/util/_resource_bundle/_bug6299235_test.sh.i
index 3ef7262..f551aa2 100644
Binary files a/jdk/.hg/store/data/test/java/util/_resource_bundle/_bug6299235_test.sh.i and b/jdk/.hg/store/data/test/java/util/_resource_bundle/_bug6299235_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_resource_bundle/_control/_bug6530694.java.i b/jdk/.hg/store/data/test/java/util/_resource_bundle/_control/_bug6530694.java.i
index 0913ef3..4aaa5c9 100644
Binary files a/jdk/.hg/store/data/test/java/util/_resource_bundle/_control/_bug6530694.java.i and b/jdk/.hg/store/data/test/java/util/_resource_bundle/_control/_bug6530694.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/_service_loader/basic.sh.i b/jdk/.hg/store/data/test/java/util/_service_loader/basic.sh.i
index 339358b..f55fcec 100644
Binary files a/jdk/.hg/store/data/test/java/util/_service_loader/basic.sh.i and b/jdk/.hg/store/data/test/java/util/_service_loader/basic.sh.i differ
diff --git a/jdk/.hg/store/data/test/java/util/concurrent/_future_task/_blocking_task_executor.java.i b/jdk/.hg/store/data/test/java/util/concurrent/_future_task/_blocking_task_executor.java.i
index be6bbbd..93c057f 100644
Binary files a/jdk/.hg/store/data/test/java/util/concurrent/_future_task/_blocking_task_executor.java.i and b/jdk/.hg/store/data/test/java/util/concurrent/_future_task/_blocking_task_executor.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/concurrent/_thread_pool_executor/_custom.java.i b/jdk/.hg/store/data/test/java/util/concurrent/_thread_pool_executor/_custom.java.i
index 53b10c8..caecf73 100644
Binary files a/jdk/.hg/store/data/test/java/util/concurrent/_thread_pool_executor/_custom.java.i and b/jdk/.hg/store/data/test/java/util/concurrent/_thread_pool_executor/_custom.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_flaky_mutex.java.i b/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_flaky_mutex.java.i
index 43422ef..bd00b34 100644
Binary files a/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_flaky_mutex.java.i and b/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_flaky_mutex.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_timed_acquire_leak.java.i b/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_timed_acquire_leak.java.i
index 12e4305..5e88a2e 100644
Binary files a/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_timed_acquire_leak.java.i and b/jdk/.hg/store/data/test/java/util/concurrent/locks/_lock/_timed_acquire_leak.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/logging/_logging_deadlock4.java.i b/jdk/.hg/store/data/test/java/util/logging/_logging_deadlock4.java.i
index 551ab61..a84f5f7 100644
Binary files a/jdk/.hg/store/data/test/java/util/logging/_logging_deadlock4.java.i and b/jdk/.hg/store/data/test/java/util/logging/_logging_deadlock4.java.i differ
diff --git a/jdk/.hg/store/data/test/java/util/zip/_zip_file/_many_zip_files.java.i b/jdk/.hg/store/data/test/java/util/zip/_zip_file/_many_zip_files.java.i
index b0c0ae3..a42ec7a 100644
Binary files a/jdk/.hg/store/data/test/java/util/zip/_zip_file/_many_zip_files.java.i and b/jdk/.hg/store/data/test/java/util/zip/_zip_file/_many_zip_files.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/crypto/_secret_key_factory/_fail_over_test.sh.i b/jdk/.hg/store/data/test/javax/crypto/_secret_key_factory/_fail_over_test.sh.i
index 541fe67..2da4f88 100644
Binary files a/jdk/.hg/store/data/test/javax/crypto/_secret_key_factory/_fail_over_test.sh.i and b/jdk/.hg/store/data/test/javax/crypto/_secret_key_factory/_fail_over_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/javax/imageio/stream/_stream_closer_leak/run__test.sh.i b/jdk/.hg/store/data/test/javax/imageio/stream/_stream_closer_leak/run__test.sh.i
index da41980..c746f12 100644
Binary files a/jdk/.hg/store/data/test/javax/imageio/stream/_stream_closer_leak/run__test.sh.i and b/jdk/.hg/store/data/test/javax/imageio/stream/_stream_closer_leak/run__test.sh.i differ
diff --git a/jdk/.hg/store/data/test/javax/naming/spi/_directory_manager/_get_cont_dir_ctx.java.i b/jdk/.hg/store/data/test/javax/naming/spi/_directory_manager/_get_cont_dir_ctx.java.i
index 024fb12..e50b4bc 100644
Binary files a/jdk/.hg/store/data/test/javax/naming/spi/_directory_manager/_get_cont_dir_ctx.java.i and b/jdk/.hg/store/data/test/javax/naming/spi/_directory_manager/_get_cont_dir_ctx.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/script/_common_setup.sh.i b/jdk/.hg/store/data/test/javax/script/_common_setup.sh.i
index 294b0ad..e8a3dfe 100644
Binary files a/jdk/.hg/store/data/test/javax/script/_common_setup.sh.i and b/jdk/.hg/store/data/test/javax/script/_common_setup.sh.i differ
diff --git a/jdk/.hg/store/data/test/javax/security/auth/_subject/do_as/_test.sh.i b/jdk/.hg/store/data/test/javax/security/auth/_subject/do_as/_test.sh.i
index aa4f610..8d5b071 100644
Binary files a/jdk/.hg/store/data/test/javax/security/auth/_subject/do_as/_test.sh.i and b/jdk/.hg/store/data/test/javax/security/auth/_subject/do_as/_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/javax/security/auth/x500/_x500_principal/_parse.java.i b/jdk/.hg/store/data/test/javax/security/auth/x500/_x500_principal/_parse.java.i
index 780cefe..1eafcf8 100644
Binary files a/jdk/.hg/store/data/test/javax/security/auth/x500/_x500_principal/_parse.java.i and b/jdk/.hg/store/data/test/javax/security/auth/x500/_x500_principal/_parse.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/swing/_j_file_chooser/6396844/_twenty_thousand_test.java.i b/jdk/.hg/store/data/test/javax/swing/_j_file_chooser/6396844/_twenty_thousand_test.java.i
index 1a0ee7e..cc31d31 100644
Binary files a/jdk/.hg/store/data/test/javax/swing/_j_file_chooser/6396844/_twenty_thousand_test.java.i and b/jdk/.hg/store/data/test/javax/swing/_j_file_chooser/6396844/_twenty_thousand_test.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_key_selectors.java.i b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_key_selectors.java.i
index d93cae6..c835b4e 100644
Binary files a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_key_selectors.java.i and b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_key_selectors.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_validation_tests.java.i b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_validation_tests.java.i
index 7f964d9..b485cbd 100644
Binary files a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_validation_tests.java.i and b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_validation_tests.java.i differ
diff --git a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_x509_key_selector.java.i b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_x509_key_selector.java.i
index 766c393..716eb0b 100644
Binary files a/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_x509_key_selector.java.i and b/jdk/.hg/store/data/test/javax/xml/crypto/dsig/_x509_key_selector.java.i differ
diff --git a/jdk/.hg/store/data/test/lib/security/java.policy/_ext___all_policy.sh.i b/jdk/.hg/store/data/test/lib/security/java.policy/_ext___all_policy.sh.i
index a77f540..08dfff2 100644
Binary files a/jdk/.hg/store/data/test/lib/security/java.policy/_ext___all_policy.sh.i and b/jdk/.hg/store/data/test/lib/security/java.policy/_ext___all_policy.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i
index f6651d2..f628ea1 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/___library.java.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i
index f608865..56e4ae2 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/hello-native.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i
index 02225e9..6649eb6 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/library.sh.i differ
diff --git a/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i b/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i
index ac3c5a3..d6dcebb 100644
Binary files a/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i and b/jdk/.hg/store/data/test/org/openjdk/jigsaw/tester.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/management/_agent_check_test.java.i b/jdk/.hg/store/data/test/sun/management/_agent_check_test.java.i
index 8ca6793..1ef6a4c 100644
Binary files a/jdk/.hg/store/data/test/sun/management/_agent_check_test.java.i and b/jdk/.hg/store/data/test/sun/management/_agent_check_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/management/_hotspot_class_loading_m_bean/_get_class_loading_time.java.i b/jdk/.hg/store/data/test/sun/management/_hotspot_class_loading_m_bean/_get_class_loading_time.java.i
index 48c08d7..06b62eb 100644
Binary files a/jdk/.hg/store/data/test/sun/management/_hotspot_class_loading_m_bean/_get_class_loading_time.java.i and b/jdk/.hg/store/data/test/sun/management/_hotspot_class_loading_m_bean/_get_class_loading_time.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/management/jmxremote/bootstrap/_generate_property_password.sh.i b/jdk/.hg/store/data/test/sun/management/jmxremote/bootstrap/_generate_property_password.sh.i
index d765e93..3381d63 100644
Binary files a/jdk/.hg/store/data/test/sun/management/jmxremote/bootstrap/_generate_property_password.sh.i and b/jdk/.hg/store/data/test/sun/management/jmxremote/bootstrap/_generate_property_password.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/misc/_cleaner/exit_on_throw.sh.i b/jdk/.hg/store/data/test/sun/misc/_cleaner/exit_on_throw.sh.i
index c92b6ab..48188c2 100644
Binary files a/jdk/.hg/store/data/test/sun/misc/_cleaner/exit_on_throw.sh.i and b/jdk/.hg/store/data/test/sun/misc/_cleaner/exit_on_throw.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/misc/_u_r_l_class_path/_classname_char_test.sh.i b/jdk/.hg/store/data/test/sun/misc/_u_r_l_class_path/_classname_char_test.sh.i
index 2975290..027eb67 100644
Binary files a/jdk/.hg/store/data/test/sun/misc/_u_r_l_class_path/_classname_char_test.sh.i and b/jdk/.hg/store/data/test/sun/misc/_u_r_l_class_path/_classname_char_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/net/www/_mark_reset_test.sh.i b/jdk/.hg/store/data/test/sun/net/www/_mark_reset_test.sh.i
index 1163889..bc5e123 100644
Binary files a/jdk/.hg/store/data/test/sun/net/www/_mark_reset_test.sh.i and b/jdk/.hg/store/data/test/sun/net/www/_mark_reset_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/net/www/http/_http_client/_retry_post.sh.i b/jdk/.hg/store/data/test/sun/net/www/http/_http_client/_retry_post.sh.i
index 1fe5925..7e6dfd8 100644
Binary files a/jdk/.hg/store/data/test/sun/net/www/http/_http_client/_retry_post.sh.i and b/jdk/.hg/store/data/test/sun/net/www/http/_http_client/_retry_post.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/net/www/protocol/jar/_b5105410.sh.i b/jdk/.hg/store/data/test/sun/net/www/protocol/jar/_b5105410.sh.i
index 9a6b34a..3314e98 100644
Binary files a/jdk/.hg/store/data/test/sun/net/www/protocol/jar/_b5105410.sh.i and b/jdk/.hg/store/data/test/sun/net/www/protocol/jar/_b5105410.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/net/www/protocol/jar/jarbug/run.sh.i b/jdk/.hg/store/data/test/sun/net/www/protocol/jar/jarbug/run.sh.i
index 001a491..1d82145 100644
Binary files a/jdk/.hg/store/data/test/sun/net/www/protocol/jar/jarbug/run.sh.i and b/jdk/.hg/store/data/test/sun/net/www/protocol/jar/jarbug/run.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/nio/ch/_sel_provider.java.i b/jdk/.hg/store/data/test/sun/nio/ch/_sel_provider.java.i
index 6ec7285..a4558e0 100644
Binary files a/jdk/.hg/store/data/test/sun/nio/ch/_sel_provider.java.i and b/jdk/.hg/store/data/test/sun/nio/ch/_sel_provider.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/nio/cs/_o_l_d/_test_i_b_m_d_b.java.i b/jdk/.hg/store/data/test/sun/nio/cs/_o_l_d/_test_i_b_m_d_b.java.i
index 35c6442..b499ed9 100644
Binary files a/jdk/.hg/store/data/test/sun/nio/cs/_o_l_d/_test_i_b_m_d_b.java.i and b/jdk/.hg/store/data/test/sun/nio/cs/_o_l_d/_test_i_b_m_d_b.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i b/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i
index 5e8c59d..0d390d5 100644
Binary files a/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i and b/jdk/.hg/store/data/test/sun/security/krb5/auto/_context.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/krb5/auto/_k_d_c.java.i b/jdk/.hg/store/data/test/sun/security/krb5/auto/_k_d_c.java.i
index fb98d00..8570fed 100644
Binary files a/jdk/.hg/store/data/test/sun/security/krb5/auto/_k_d_c.java.i and b/jdk/.hg/store/data/test/sun/security/krb5/auto/_k_d_c.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/krb5/run_name_equals.sh.i b/jdk/.hg/store/data/test/sun/security/krb5/run_name_equals.sh.i
index 4401940..ee48807 100644
Binary files a/jdk/.hg/store/data/test/sun/security/krb5/run_name_equals.sh.i and b/jdk/.hg/store/data/test/sun/security/krb5/run_name_equals.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/_key_agreement/_test_short.java.i b/jdk/.hg/store/data/test/sun/security/pkcs11/_key_agreement/_test_short.java.i
index cf8e8a2..101dc7b 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/_key_agreement/_test_short.java.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/_key_agreement/_test_short.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/_key_store/_secret_keys_basic.sh.i b/jdk/.hg/store/data/test/sun/security/pkcs11/_key_store/_secret_keys_basic.sh.i
index e3f7d7c..52d4da1 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/_key_store/_secret_keys_basic.sh.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/_key_store/_secret_keys_basic.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/_p_k_c_s11_test.java.i b/jdk/.hg/store/data/test/sun/security/pkcs11/_p_k_c_s11_test.java.i
index 1b906dd..68538df 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/_p_k_c_s11_test.java.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/_p_k_c_s11_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_config_quoted_string.sh.i b/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_config_quoted_string.sh.i
index 2d2eeab..25db1f9 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_config_quoted_string.sh.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_config_quoted_string.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_login.sh.i b/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_login.sh.i
index 9f05de5..b32b851 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_login.sh.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/_provider/_login.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i
index c2869ee..77b4c91 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll.i b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll.i
index 509b27d..c6e1861 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i
index 9d8ac4e..1c64689 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.d b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.d
index a323c12..9d1769f 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.d and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.d differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i
index 40f8051..c7f842f 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i
index 08da655..e8c2e97 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.d b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.d
index 84dc5d1..81a1f23 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.d and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.d differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.i b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.i
index f3e8cc7..5b0e861 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/p11-nss.txt.i b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/p11-nss.txt.i
index 902e0ea..9506ea4 100644
Binary files a/jdk/.hg/store/data/test/sun/security/pkcs11/nss/p11-nss.txt.i and b/jdk/.hg/store/data/test/sun/security/pkcs11/nss/p11-nss.txt.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/provider/_policy_file/getinstance/getinstance.sh.i b/jdk/.hg/store/data/test/sun/security/provider/_policy_file/getinstance/getinstance.sh.i
index 896dd6b..db5b386 100644
Binary files a/jdk/.hg/store/data/test/sun/security/provider/_policy_file/getinstance/getinstance.sh.i and b/jdk/.hg/store/data/test/sun/security/provider/_policy_file/getinstance/getinstance.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/_s_s_l_security/_provider_test.java.i b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/_s_s_l_security/_provider_test.java.i
index 3b4e8d4..2b77c49 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/_s_s_l_security/_provider_test.java.i and b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/_s_s_l_security/_provider_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_s_s_l_socket_impl/_notify_handshake_test.sh.i b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_s_s_l_socket_impl/_notify_handshake_test.sh.i
index df24ade..d87fe45 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_s_s_l_socket_impl/_notify_handshake_test.sh.i and b/jdk/.hg/store/data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/_s_s_l_socket_impl/_notify_handshake_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_cookie_https_client_test.java.i b/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_cookie_https_client_test.java.i
index eb25845..16ed931 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_cookie_https_client_test.java.i and b/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_cookie_https_client_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy.sh.i b/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy.sh.i
index 9411493..86bfc57 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy.sh.i and b/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy_with_auth.sh.i b/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy_with_auth.sh.i
index a2ba465..7afa8db 100644
Binary files a/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy_with_auth.sh.i and b/jdk/.hg/store/data/test/sun/security/ssl/sun/net/www/protocol/https/_https_u_r_l_connection/_post_thru_proxy_with_auth.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_alg_options.sh.i b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_alg_options.sh.i
index 0b73ce3..1c57536 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_alg_options.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_alg_options.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_percent_sign.sh.i b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_percent_sign.sh.i
index 92beb77..e603280 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_percent_sign.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/_percent_sign.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/diffend.sh.i b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/diffend.sh.i
index 621694d..9ee8eb0 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/diffend.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/diffend.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/ec.sh.i b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/ec.sh.i
index ef461a5..69a7b38 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/ec.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/ec.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/oldsig.sh.i b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/oldsig.sh.i
index 69166c4..f60a643 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/jarsigner/oldsig.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/jarsigner/oldsig.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/_alt_provider_path.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/_alt_provider_path.sh.i
index 26aa567..b054ee9 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/_alt_provider_path.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/_alt_provider_path.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/_clone_key_ask_password.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/_clone_key_ask_password.sh.i
index 4cdb2ba..a330eff 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/_clone_key_ask_password.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/_clone_key_ask_password.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/_no_ext_n_p_e.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/_no_ext_n_p_e.sh.i
index b82ae80..cb0a3c9 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/_no_ext_n_p_e.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/_no_ext_n_p_e.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/_secret_key_k_s.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/_secret_key_k_s.sh.i
index 07a1792..7ea15a9 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/_secret_key_k_s.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/_secret_key_k_s.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/_standard_alg_name.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/_standard_alg_name.sh.i
index fcc5774..c7cb4df 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/_standard_alg_name.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/_standard_alg_name.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/autotest.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/autotest.sh.i
index 58025d9..f7f89c4 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/autotest.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/autotest.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/printssl.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/printssl.sh.i
index 24e243f..aa9943e 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/printssl.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/printssl.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/resource.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/resource.sh.i
index ed6e90a..98f50da 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/resource.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/resource.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/keytool/standard.sh.i b/jdk/.hg/store/data/test/sun/security/tools/keytool/standard.sh.i
index a54bc65..d5f60cb 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/keytool/standard.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/keytool/standard.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/policytool/_alias.sh.i b/jdk/.hg/store/data/test/sun/security/tools/policytool/_alias.sh.i
index 2b290fd..684dcb0 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/policytool/_alias.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/policytool/_alias.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/policytool/_change_u_i.sh.i b/jdk/.hg/store/data/test/sun/security/tools/policytool/_change_u_i.sh.i
index c246ac4..ab2d516 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/policytool/_change_u_i.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/policytool/_change_u_i.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/policytool/_open_policy.sh.i b/jdk/.hg/store/data/test/sun/security/tools/policytool/_open_policy.sh.i
index 45e78f2..5bc2825 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/policytool/_open_policy.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/policytool/_open_policy.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/policytool/_save_as.sh.i b/jdk/.hg/store/data/test/sun/security/tools/policytool/_save_as.sh.i
index ffe0a4b..5b3b6b2 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/policytool/_save_as.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/policytool/_save_as.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/policytool/_update_permissions.sh.i b/jdk/.hg/store/data/test/sun/security/tools/policytool/_update_permissions.sh.i
index e91297b..930897b 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/policytool/_update_permissions.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/policytool/_update_permissions.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/policytool/_use_policy.sh.i b/jdk/.hg/store/data/test/sun/security/tools/policytool/_use_policy.sh.i
index 39ba445..45dfe2f 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/policytool/_use_policy.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/policytool/_use_policy.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/security/tools/policytool/i18n.sh.i b/jdk/.hg/store/data/test/sun/security/tools/policytool/i18n.sh.i
index f78eb2b..5c9214c 100644
Binary files a/jdk/.hg/store/data/test/sun/security/tools/policytool/i18n.sh.i and b/jdk/.hg/store/data/test/sun/security/tools/policytool/i18n.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i b/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i
index ef84fda..653bf54 100644
Binary files a/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i and b/jdk/.hg/store/data/test/sun/text/resources/_locale_data.i differ
diff --git a/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i b/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i
index c464af4..b1f56fb 100644
Binary files a/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i and b/jdk/.hg/store/data/test/sun/text/resources/_locale_data_test.java.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/common/_common_setup.sh.i b/jdk/.hg/store/data/test/sun/tools/common/_common_setup.sh.i
index d5e28a6..2c61974 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/common/_common_setup.sh.i and b/jdk/.hg/store/data/test/sun/tools/common/_common_setup.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-_defaults.sh.i b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-_defaults.sh.i
index 70d3665..5c51ca5 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-_defaults.sh.i and b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-_defaults.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-f.sh.i b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-f.sh.i
index eff4729..5c5dc77 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-f.sh.i and b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-f.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help-help.sh.i b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help-help.sh.i
index 7321b24..b2e826a 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help-help.sh.i and b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help-help.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help.sh.i b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help.sh.i
index 81d5a36..982dd62 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help.sh.i and b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-help.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-pid.sh.i b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-pid.sh.i
index cf80fba..3932ddb 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-pid.sh.i and b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd-pid.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd___output1.awk.i b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd___output1.awk.i
index 2e0d5b5..ff3c255 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd___output1.awk.i and b/jdk/.hg/store/data/test/sun/tools/jcmd/jcmd___output1.awk.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jconsole/_immutable_resource_test.sh.i b/jdk/.hg/store/data/test/sun/tools/jconsole/_immutable_resource_test.sh.i
index a86c34e..fd71523 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jconsole/_immutable_resource_test.sh.i and b/jdk/.hg/store/data/test/sun/tools/jconsole/_immutable_resource_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i b/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i
index dbd7b19..22f6956 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i and b/jdk/.hg/store/data/test/sun/tools/jinfo/_basic.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jps/jps-l___output1.awk.i b/jdk/.hg/store/data/test/sun/tools/jps/jps-l___output1.awk.i
index 06ac432..d0c8dba 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jps/jps-l___output1.awk.i and b/jdk/.hg/store/data/test/sun/tools/jps/jps-l___output1.awk.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jps/jps___output1.awk.i b/jdk/.hg/store/data/test/sun/tools/jps/jps___output1.awk.i
index 0b85f28..8b75c88 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jps/jps___output1.awk.i and b/jdk/.hg/store/data/test/sun/tools/jps/jps___output1.awk.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jrunscript/common.sh.i b/jdk/.hg/store/data/test/sun/tools/jrunscript/common.sh.i
index a007cea..58845c4 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jrunscript/common.sh.i and b/jdk/.hg/store/data/test/sun/tools/jrunscript/common.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-args_test.sh.i b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-args_test.sh.i
index bb0141b..0b2ec2b 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-args_test.sh.i and b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-args_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-e_test.sh.i b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-e_test.sh.i
index d95eff3..1678d25 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-e_test.sh.i and b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-e_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-f_test.sh.i b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-f_test.sh.i
index a9d3d73..bebb02e 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-f_test.sh.i and b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript-f_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript_test.sh.i b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript_test.sh.i
index 93edacb..6b892b5 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript_test.sh.i and b/jdk/.hg/store/data/test/sun/tools/jrunscript/jrunscript_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_class_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_class_output1.sh.i
index aa3b8d8..9c594ba 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_class_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_class_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_classload_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_classload_output1.sh.i
index 411a95a..d862ffa 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_classload_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_classload_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_compiler_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_compiler_output1.sh.i
index aefbd56..6a9cec7 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_compiler_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_compiler_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_file_u_r_i_test1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_file_u_r_i_test1.sh.i
index 0a20b6c..1b12a2f 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_file_u_r_i_test1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_file_u_r_i_test1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_capacity_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_capacity_output1.sh.i
index 295442e..b6325f3 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_capacity_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_capacity_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_cause_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_cause_output1.sh.i
index cee4bb1..5ca1b9b 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_cause_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_cause_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_capacity_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_capacity_output1.sh.i
index 9432606..aa6b669 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_capacity_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_capacity_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_output1.sh.i
index c220031..2c149d2 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_new_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_capacity_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_capacity_output1.sh.i
index 9db8162..a484327 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_capacity_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_capacity_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_output1.sh.i
index 482bf7a..39d5977 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_old_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_output1.sh.i
index ef77086..a11a22b 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_perm_capacity_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_perm_capacity_output1.sh.i
index d02626a..ca6a2a8 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_perm_capacity_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_gc_perm_capacity_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts1.sh.i
index 7c12fec..f097375 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts2.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts2.sh.i
index 0ec3f86..acda3de 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts2.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts2.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts3.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts3.sh.i
index 5af3ea8..0758fd3 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts3.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts3.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts4.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts4.sh.i
index 304f388..51f34b8 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts4.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_line_counts4.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_options1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_options1.sh.i
index 43ec21b..67962cf 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_options1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_options1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_print_compilation_output1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_print_compilation_output1.sh.i
index ea82275..33c73ea 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_print_compilation_output1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_print_compilation_output1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap1.sh.i
index 0491c7a..d6423e1 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap2.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap2.sh.i
index 8fde407..8a75ab3 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap2.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_snap2.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_time_stamp1.sh.i b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_time_stamp1.sh.i
index 41d2a4d..49ea8f8 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstat/jstat_time_stamp1.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstat/jstat_time_stamp1.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstatd/jps_output1.awk.i b/jdk/.hg/store/data/test/sun/tools/jstatd/jps_output1.awk.i
index e2a4e0c..74973c0 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstatd/jps_output1.awk.i and b/jdk/.hg/store/data/test/sun/tools/jstatd/jps_output1.awk.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_defaults.sh.i b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_defaults.sh.i
index b3e3501..9fb3196 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_defaults.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_defaults.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i
index e29693c..65e4877 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_external_registry.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_port.sh.i b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_port.sh.i
index 8d1caa3..5190bba 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_port.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_port.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_server_name.sh.i b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_server_name.sh.i
index dc15303..83a54ce 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_server_name.sh.i and b/jdk/.hg/store/data/test/sun/tools/jstatd/jstatd_server_name.sh.i differ
diff --git a/jdk/.hg/store/data/test/sun/tools/native2ascii/resources/_immutable_resource_test.sh.i b/jdk/.hg/store/data/test/sun/tools/native2ascii/resources/_immutable_resource_test.sh.i
index a27feae..1d4d4aa 100644
Binary files a/jdk/.hg/store/data/test/sun/tools/native2ascii/resources/_immutable_resource_test.sh.i and b/jdk/.hg/store/data/test/sun/tools/native2ascii/resources/_immutable_resource_test.sh.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_arrrghs.java.i b/jdk/.hg/store/data/test/tools/launcher/_arrrghs.java.i
index b3eda4c..520e213 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_arrrghs.java.i and b/jdk/.hg/store/data/test/tools/launcher/_arrrghs.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_default_locale_test_run.java.i b/jdk/.hg/store/data/test/tools/launcher/_default_locale_test_run.java.i
index 89a3e5f..5d1884b 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_default_locale_test_run.java.i and b/jdk/.hg/store/data/test/tools/launcher/_default_locale_test_run.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_execution_environment.java.i b/jdk/.hg/store/data/test/tools/launcher/_execution_environment.java.i
index bdbcc61..051b019 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_execution_environment.java.i and b/jdk/.hg/store/data/test/tools/launcher/_execution_environment.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_i18_n_jar_test.java.i b/jdk/.hg/store/data/test/tools/launcher/_i18_n_jar_test.java.i
index ca74772..e1fe19a 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_i18_n_jar_test.java.i and b/jdk/.hg/store/data/test/tools/launcher/_i18_n_jar_test.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_misc_tests.java.i b/jdk/.hg/store/data/test/tools/launcher/_misc_tests.java.i
index 00dbb35..84f72ff 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_misc_tests.java.i and b/jdk/.hg/store/data/test/tools/launcher/_misc_tests.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_settings.java.i b/jdk/.hg/store/data/test/tools/launcher/_settings.java.i
index fde5058..c4b9453 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_settings.java.i and b/jdk/.hg/store/data/test/tools/launcher/_settings.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_test7029048.java.i b/jdk/.hg/store/data/test/tools/launcher/_test7029048.java.i
index 286e176..6c389c2 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_test7029048.java.i and b/jdk/.hg/store/data/test/tools/launcher/_test7029048.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_test_helper.java.i b/jdk/.hg/store/data/test/tools/launcher/_test_helper.java.i
index b249eab..16a87f9 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_test_helper.java.i and b/jdk/.hg/store/data/test/tools/launcher/_test_helper.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_unicode_test.java.i b/jdk/.hg/store/data/test/tools/launcher/_unicode_test.java.i
index 3fcb647..7197945 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_unicode_test.java.i and b/jdk/.hg/store/data/test/tools/launcher/_unicode_test.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/launcher/_unresolved_exceptions.java.i b/jdk/.hg/store/data/test/tools/launcher/_unresolved_exceptions.java.i
index 8f7ae5f..175a85b 100644
Binary files a/jdk/.hg/store/data/test/tools/launcher/_unresolved_exceptions.java.i and b/jdk/.hg/store/data/test/tools/launcher/_unresolved_exceptions.java.i differ
diff --git a/jdk/.hg/store/data/test/tools/pack200/_pack200_test.java.i b/jdk/.hg/store/data/test/tools/pack200/_pack200_test.java.i
index c659ee7..e605780 100644
Binary files a/jdk/.hg/store/data/test/tools/pack200/_pack200_test.java.i and b/jdk/.hg/store/data/test/tools/pack200/_pack200_test.java.i differ
diff --git a/jdk/.hg/store/data/~2ehgignore.i b/jdk/.hg/store/data/~2ehgignore.i
index 1cf910d..8e177ac 100644
Binary files a/jdk/.hg/store/data/~2ehgignore.i and b/jdk/.hg/store/data/~2ehgignore.i differ
diff --git a/jdk/.hg/store/data/~2ehgtags.i b/jdk/.hg/store/data/~2ehgtags.i
index 16b280f..4a42400 100644
Binary files a/jdk/.hg/store/data/~2ehgtags.i and b/jdk/.hg/store/data/~2ehgtags.i differ
diff --git a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i
index ca9e770..d3ccdc9 100644
Binary files a/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i and b/jdk/.hg/store/dh/src/share/classes/com/sun/org/apache/xml/internal/security/transfor/transfoe0549a04f669eb784380172c5a561cfe4a333524.i differ
diff --git a/jdk/.hg/store/fncache b/jdk/.hg/store/fncache
index 141d5ed..f22cc76 100644
--- a/jdk/.hg/store/fncache
+++ b/jdk/.hg/store/fncache
@@ -1,29 +1,30 @@
data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully_Stub.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_cs_CZ.properties.i
data/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableServerImpl.java.i
-data/test/java/nio/channels/FileChannel/Position.java.i
+data/test/java/lang/instrument/AInstrumentationTestCase.java.i
data/src/share/classes/com/sun/tools/jdi/StratumLineInfo.java.i
data/test/java/util/logging/LoggingNIOChange.java.i
data/src/share/classes/sun/nio/cs/KOI8_U.java.i
data/test/java/awt/FontClass/X11FontPathCrashTest.java.i
data/src/share/classes/sun/nio/fs/Util.java.i
data/test/javax/management/remote/mandatory/notif/NotSerializableNotifTest.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthBorder.java.i
+data/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java.i
data/src/share/native/common/verify_stub.c.i
data/src/solaris/doc/sun/man/man1/tnameserv.1.i
data/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java.i
data/src/windows/classes/sun/nio/fs/WindowsUriSupport.java.i
data/src/share/classes/java/nio/file/FileSystemAlreadyExistsException.java.i
data/test/java/util/TimeZone/DaylightTimeTest.java.i
-data/test/sun/security/pkcs11/Provider/ConfigShortPath.java.i
+data/make/com/sun/java/browser/Makefile.i
data/test/javax/script/E4XErrorTest.java.i
+data/src/share/classes/java/util/TreeMap.java.i
data/src/share/classes/sun/misc/Launcher.java.i
+data/make/tools/CharsetMapping/IBM870.c2b.i
data/src/share/classes/java/lang/module/ServiceDependence.java.i
+data/src/share/classes/sun/reflect/generics/tree/IntSignature.java.i
data/test/java/rmi/transport/readTimeout/TestImpl.java.i
-data/test/sun/net/www/ftptest/FtpServer.java.i
-data/test/sun/security/tools/policytool/UsePolicy.sh.i
-data/src/share/classes/sun/management/manifest.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ro_RO.properties.i
+data/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java.i
data/test/java/beans/Statement/Test4530962.java.i
data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/OutputSink.java.i
@@ -31,7 +32,7 @@ data/src/share/sample/vm/clr-jvm/invoked.java.i
data/src/share/classes/sun/tools/tree/AssignShiftRightExpression.java.i
data/src/share/classes/java/security/Permission.java.i
data/make/javax/swing/beaninfo/FILES.gmk.i
-data/src/solaris/native/sun/awt/awt_motif21.c.i
+data/src/share/instrument/JarFacade.c.i
data/test/sun/security/tools/keytool/SecretKeyKS.jks.i
data/test/java/rmi/server/RemoteObject/unrecognizedRefType/UnrecognizedRefType.java.i
data/test/com/sun/jdi/Solaris32AndSolaris64Test.sh.i
@@ -43,31 +44,31 @@ data/src/share/classes/sun/io/CharToByteCp775.java.i
data/src/share/classes/sun/text/resources/FormatData_pt.java.i
data/make/sun/tracing/Makefile.i
data/make/tools/addjsum/Makefile.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/TypeToJType.java.i
data/test/java/lang/Long/BitTwiddle.java.i
data/src/share/classes/java/io/OutputStream.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_es.properties.i
data/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.sh.i
-data/test/java/rmi/registry/readTest/readTest.sh.i
data/src/share/classes/java/rmi/Naming.java.i
data/make/java/nio/genCharsetProvider.sh.i
+data/src/share/classes/com/sun/media/sound/ModelStandardTransform.java.i
data/test/sun/net/InetAddress/nameservice/dns/cname.sh.i
data/test/java/io/pathNames/win32/bug6344646.java.i
-data/src/share/native/java/util/zip/zlib-1.2.5/trees.h.i
+data/src/share/native/sun/java2d/opengl/OGLBufImgOps.c.i
data/test/javax/swing/MultiUIDefaults/4331767/bug4331767.java.i
data/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java.i
data/src/share/classes/com/sun/tools/jdi/LockObject.java.i
data/src/share/native/sun/font/layout/ThaiShaping.h.i
data/test/com/sun/jdi/LocalVariableEqual.java.i
data/test/com/sun/jdi/GetLocalVariables2Test.java.i
-data/src/share/classes/sun/net/www/protocol/http/InMemoryCookieStore.java.i
+data/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java.i
data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java.i
data/test/tools/launcher/lib/i386/lib32/liblibrary.so.i
data/src/share/classes/com/sun/tools/example/debug/gui/GUI.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so.i
data/test/java/util/regex/POSIX_ASCII.java.i
data/src/share/classes/javax/swing/text/LabelView.java.i
-data/src/share/classes/java/io/ObjectInput.java.i
-data/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h.i
data/src/share/classes/sun/tools/tree/BinaryEqualityExpression.java.i
data/test/javax/swing/regtesthelpers/Util.java.i
data/src/share/sample/jmx/jmx-scandir/src/etc/management.properties.i
@@ -80,17 +81,20 @@ data/src/share/classes/org/relaxng/datatype/DatatypeStreamingValidator.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ArgCheck.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sv_SE.properties.i
data/src/share/classes/sun/io/CharToByteCp1253.java.i
+data/src/share/classes/sun/text/resources/unorm.icu.i
data/make/netbeans/world/build.xml.i
+data/src/share/classes/org/openjdk/jigsaw/BaseContext.java.i
data/make/java/logging/Makefile.i
data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdSerialGC.sh.i
-data/test/java/beans/VetoableChangeSupport/1.6.0.ser.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java.i
data/src/share/classes/sun/awt/EventQueueItem.java.i
data/test/org/openjdk/jigsaw/cli/tsa-cert.pem.i
data/src/share/classes/sun/java2d/loops/MaskFill.java.i
-data/src/share/classes/sun/tools/javac/resources/javac.properties.i
+data/test/java/util/Collections/CheckedListBash.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionElementProxy.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java.i
-data/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java.i
+data/src/share/classes/sun/text/resources/CollationData_cs.java.i
+data/src/share/classes/sun/management/Util.java.i
data/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java.i
data/src/share/classes/java/lang/doc-files/iota.gif.i
data/src/share/classes/java/util/Collections.java.i
@@ -100,44 +104,46 @@ data/src/share/classes/javax/swing/text/html/HiddenTagView.java.i
data/src/share/classes/sun/nio/ch/FileChannelImpl.java.i
data/src/share/classes/javax/net/package.html.i
data/make/tools/CharsetMapping/HKSCS_XP.map.i
-data/src/share/classes/sun/security/rsa/RSACore.java.i
+data/src/share/classes/sun/io/ByteToCharCp1147.java.i
data/src/share/classes/sun/net/www/protocol/gopher/Handler.java.i
data/test/java/net/URLClassLoader/HttpTest.java.i
+data/test/java/io/InputStreamReader/GrowAfterEOF.java.i
data/test/demo/jvmti/hprof/HeapSitesTest.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/package.html.i
data/test/sun/net/www/protocol/file/FileURLTest.java.i
data/src/share/classes/java/security/InvalidAlgorithmParameterException.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java.i
+data/src/solaris/bin/ergo_i586.c.i
data/src/share/classes/sun/tools/jstat/OutputFormatter.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java.i
data/src/share/classes/java/awt/event/AdjustmentEvent.java.i
data/src/share/sample/nio/server/DispatcherN.java.i
-data/src/share/native/sun/java2d/loops/FillParallelogram.c.i
data/src/share/classes/sun/print/PrinterGraphicsConfig.java.i
+data/test/com/sun/security/auth/callback/DialogCallbackHandler/Default.java.i
data/src/share/classes/com/sun/security/ntlm/Server.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c.i
data/src/share/classes/sun/io/CharToByteCp1254.java.i
data/src/windows/native/sun/awt_common/awt_makecube.cpp.i
data/make/tools/reorder/tools/util-sparcv9.il.i
+data/src/share/classes/sun/reflect/ConstructorAccessor.java.i
data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java.i
-data/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java.i
data/src/share/classes/java/awt/doc-files/Button-1.gif.i
data/src/solaris/instrument/EncodingSupport_md.c.i
data/src/solaris/doc/sun/man/man1/ja/javap.1.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CopiedFile.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.c.i
-data/src/windows/classes/sun/awt/windows/WTrayIconPeer.java.i
+data/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.properties.i
data/test/java/util/logging/LoggingMXBeanTest.java.i
data/test/java/io/Serializable/nestedReplace/NestedReplace.java.i
data/src/share/classes/com/sun/tracing/ProviderName.java.i
data/src/share/classes/javax/sql/RowSetInternal.java.i
-data/src/share/classes/sun/text/resources/FormatData_hr_HR.java.i
+data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass.i
data/test/java/security/KeyRep/DESede.pre.1.5.key.i
data/test/java/lang/module/module-info.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/EllipseShape.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicStampedReference.java.i
-data/src/share/classes/sun/tools/asm/StringExpressionConstantData.java.i
-data/test/java/nio/channels/DatagramChannel/ChangingAddress.java.i
+data/src/share/classes/com/sun/jdi/Mirror.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
data/src/share/classes/com/sun/tracing/dtrace/FunctionName.java.i
data/test/java/io/FileOutputStream/ManyFiles.java.i
data/src/share/classes/java/awt/GradientPaint.java.i
@@ -147,41 +153,51 @@ data/src/share/classes/java/util/Observer.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthViewportUI.java.i
data/src/share/native/sun/security/ec/ec2_aff.c.i
data/test/sun/security/tools/keytool/StandardAlgName.sh.i
+data/src/macosx/classes/sun/lwawt/LWRepaintArea.java.i
data/src/share/classes/com/sun/media/sound/MidiDeviceTransmitterEnvelope.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/GetPropertyAction.java.i
data/test/sun/tools/jps/jps-q_Output1.awk.i
data/src/solaris/classes/sun/print/IPPPrintService.java.i
-data/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif.i
-data/test/java/net/URLClassLoader/closetest/CloseTest.java.i
+data/src/share/native/sun/java2d/loops/ByteBinary4Bit.c.i
+data/src/share/classes/javax/sql/rowset/Joinable.java.i
+data/src/share/classes/java/net/Socket.java.i
data/src/share/classes/sun/io/ByteToCharCp858.java.i
data/src/share/classes/sun/awt/shell/DefaultShellFolder.java.i
data/src/share/classes/javax/swing/text/html/CSS.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/DefaultsGenerator.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ShortArrays.java.i
data/src/share/classes/java/lang/instrument/Instrumentation.java.i
-data/src/share/classes/java/awt/print/PrinterGraphics.java.i
+data/src/share/classes/sun/io/CharToByteCp964.java.i
data/test/javax/management/namespace/JMXNamespacesTest.java.i
+data/src/share/classes/java/util/prefs/NodeChangeEvent.java.i
+data/src/share/transport/shmem/shmemBase.h.i
+data/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java.i
data/src/share/classes/java/lang/Package.java.i
data/make/tools/src/build/tools/fontchecker/FontChecker.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java.i
data/test/javax/management/descriptor/DescriptorTest.java.i
+data/src/bsd/doc/man/ja/javah.1.i
data/src/share/classes/com/sun/media/sound/InvalidDataException.java.i
data/src/share/demo/jvmti/hprof/hprof_listener.c.i
data/src/share/classes/sun/security/provider/certpath/OCSP.java.i
data/src/share/classes/javax/xml/crypto/XMLCryptoContext.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIColor.java.i
data/src/share/classes/sun/security/ssl/krb5/Krb5ProxyImpl.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Opaque.java.i
data/src/share/demo/jvmti/versionCheck/README.txt.i
data/src/share/classes/sun/text/bidi/BidiBase.java.i
data/src/share/classes/java/util/zip/InflaterOutputStream.java.i
+data/make/mkdemo/applets/SimpleGraph/Makefile.i
data/src/share/classes/java/awt/PaintContext.java.i
data/src/share/classes/java/awt/GridBagLayoutInfo.java.i
+data/src/share/classes/java/nio/Direct-X-Buffer.java.i
data/src/share/classes/sun/rmi/rmic/Util.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp.i
data/test/com/sun/jdi/JITDebug.sh.i
data/src/share/classes/javax/sql/rowset/spi/package.html.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java.i
+data/src/share/classes/sun/awt/image/BytePackedRaster.java.i
+data/src/share/back/ClassLoaderReferenceImpl.h.i
data/src/share/classes/java/net/ProtocolException.java.i
+data/src/macosx/native/com/apple/eio/CFileManager.m.i
data/test/java/awt/Mixing/OpaqueTest.java.i
data/src/share/classes/javax/swing/text/html/Option.java.i
data/src/share/classes/com/sun/tools/attach/AgentLoadException.java.i
@@ -192,37 +208,31 @@ data/src/share/classes/java/lang/invoke/MemberName.java.i
data/src/share/classes/com/sun/rowset/internal/Row.java.i
data/src/share/classes/java/beans/PropertyChangeListenerProxy.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.java.i
-data/test/com/sun/jndi/ldap/ReadTimeoutTest.java.i
data/src/share/classes/com/sun/management/ThreadMXBean.java.i
+data/test/java/io/Serializable/ClassCastExceptionDetail/Read.java.i
data/src/share/native/sun/java2d/loops/IntRgbx.h.i
data/make/tools/swing-beans/beaninfo/images/JSplitPaneMono16.gif.i
data/make/javax/crypto/policy/unlimited/UNLIMITED.i
data/src/share/classes/java/util/concurrent/atomic/AtomicMarkableReference.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_es.java.i
data/test/java/lang/invoke/PermuteArgsTest.java.i
-data/test/com/sun/crypto/provider/TLS/prfdata.txt.i
data/src/share/classes/sun/nio/fs/NativeBuffer.java.i
-data/src/share/classes/sun/swing/plaf/synth/SynthUI.java.i
+data/src/share/native/sun/security/ec/mpprime.h.i
data/src/solaris/classes/sun/awt/motif/MListPeer.java.i
data/make/tools/winver/Makefile.i
-data/src/share/classes/sun/security/action/GetBooleanAction.java.i
-data/test/java/lang/instrument/ExampleForClassPath.java.i
-data/test/java/io/Serializable/proxy/replace/ReadResolve.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java.i
+data/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java.i
data/test/java/util/jar/JarInputStream/signed.jar.i
data/test/java/util/BitSet/ImportExport.java.i
data/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java.i
data/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.sh.i
data/src/share/native/com/sun/java/util/jar/pack/bands.h.i
-data/test/java/nio/channels/Selector/ConnectWrite.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c.i
+data/test/java/lang/Boolean/Factory.java.i
data/src/share/classes/sun/tools/jstat/HeaderClosure.java.i
-data/src/share/classes/java/io/LineNumberReader.java.i
data/src/share/classes/sun/util/resources/CalendarData_ru.properties.i
-data/test/java/io/Serializable/superclassDataLoss/run.sh.i
data/test/java/security/Signature/SignWithOutputBuffer.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/SubMenuShowTest/SubMenuShowTest.html.i
data/make/tools/CharsetMapping/IBM037.map.i
-data/test/com/sun/net/httpserver/bugs/B6744329.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java.i
data/make/tools/hasher_classes/Makefile.i
data/make/jpda/back/Makefile.i
@@ -248,30 +258,31 @@ data/test/java/io/File/ListSpace.java.i
data/test/javax/management/relation/RelationNotificationSeqNoTest.java.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono16.gif.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingSubSystem.java.i
-data/src/share/classes/javax/sound/midi/Patch.java.i
+data/test/sun/net/idn/TestData.java.i
data/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh.i
data/test/javax/swing/text/JTextComponent/5074573/bug5074573.java.i
data/src/solaris/native/sun/awt/awt_List.c.i
data/test/javax/management/proxy/NotificationEmitterProxy.java.i
-data/src/share/classes/sun/text/resources/FormatData_ja_JP_JP.java.i
+data/src/share/classes/sun/rmi/transport/Transport.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupWindow.java.i
data/src/solaris/native/sun/awt/canvas.c.i
data/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java.i
data/src/share/sample/vm/jvm-clr/invokerExp.h.i
-data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java.i
-data/src/share/classes/java/lang/Float.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java.i
data/make/sun/headless/reorder-sparc.i
-data/make/sun/awt/mapfile-mawt-vers.i
+data/src/share/native/sun/font/layout/TibetanLayoutEngine.h.i
data/src/share/classes/sun/security/krb5/KrbApReq.java.i
data/test/java/nio/file/etc/Exceptions.java.i
data/test/sun/nio/cs/OLD/IBM939_OLD.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java.i
data/test/sun/security/krb5/auto/KDC.java.i
data/make/templates/bsd-header.i
data/src/share/classes/com/sun/jdi/Locatable.java.i
data/test/sun/security/provider/PolicyFile/SomeExtensionClass.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java.i
+data/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h.i
+data/src/share/classes/sun/tools/jconsole/manifest.i
data/src/share/classes/javax/swing/GroupLayout.java.i
data/src/share/classes/sun/security/internal/spec/TlsPrfParameterSpec.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonUI.java.i
@@ -280,13 +291,16 @@ data/make/tools/src/build/tools/jdwpgen/ArrayTypeNode.java.i
data/src/share/classes/sun/nio/ch/IOStatus.java.i
data/test/java/nio/channels/FileChannel/Args.java.i
data/src/share/classes/com/sun/security/auth/SolarisNumericUserPrincipal.java.i
+data/src/windows/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java.i
data/make/javax/sound/mapfile-vers.i
+data/src/macosx/native/apple/applescript/AppleScriptEngine.m.i
data/src/share/classes/java/lang/annotation/Inherited.java.i
+data/test/java/lang/Class/forName/classes/3.class.i
data/test/javax/management/loading/ArrayClassTest.java.i
-data/test/sun/rmi/runtime/Log/6409194/logging.properties.i
+data/src/share/classes/javax/management/MXBean.java.i
data/make/com/sun/org/apache/xml/Makefile.i
data/src/share/classes/java/lang/reflect/ReflectAccess.java.i
-data/test/java/security/Provider/SupportsParameter.java.i
+data/make/tools/CharsetMapping/IBM970.map.i
data/src/share/classes/java/security/SecureRandom.java.i
data/test/com/sun/jdi/EvalArgs.sh.i
data/test/java/io/etc/FailingFlushAndClose.java.i
@@ -294,34 +308,34 @@ data/test/java/security/cert/CertificateFactory/openssl/pem.i
data/src/share/classes/sun/security/validator/SimpleValidator.java.i
data/make/com/oracle/nio/Makefile.i
data/src/share/native/sun/security/ec/secitem.c.i
-data/src/share/classes/java/util/concurrent/ForkJoinTask.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy33.i
data/src/share/classes/javax/management/timer/TimerNotification.java.i
data/src/share/classes/sun/text/resources/FormatData_es_BO.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_MA.properties.i
data/make/javax/crypto/policy/limited/default_local.policy.i
data/src/share/native/java/lang/ResourceBundle.c.i
+data/test/sun/java2d/pisces/Test7036754.java.i
data/src/share/classes/javax/print/attribute/AttributeSet.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/SignerOutputStream.java.i
-data/src/share/native/sun/awt/medialib/mlib.h.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java.i
+data/test/com/sun/jdi/NoLocInfoTest.java.i
data/src/share/classes/sun/text/resources/CollationData_it.java.i
data/src/share/classes/java/lang/invoke/MethodHandleNatives.java.i
data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub_Stub.java.i
+data/test/javax/script/Test5.js.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java.i
+data/test/demo/jvmti/hprof/HeapDumpTest.java.i
data/src/share/classes/sun/misc/resources/Messages_pt_BR.java.i
data/src/share/classes/javax/crypto/interfaces/package.html.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk.i
-data/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java.i
+data/src/share/classes/java/sql/DataTruncation.java.i
+data/src/share/classes/javax/management/NotificationFilterSupport.java.i
data/src/share/classes/sun/text/ComposedCharIter.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_ImageCopy.h.i
-data/test/java/net/Socket/AccurateTimeout.java.i
data/test/java/net/ipv6tests/B6521014.java.i
-data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java.i
data/src/share/classes/sun/launcher/resources/launcher_es.properties.i
+data/src/macosx/classes/com/apple/laf/AquaPopupMenuUI.java.i
data/test/java/awt/keyboard/EqualKeyCode/EqualKeyCode.java.i
data/src/share/classes/sun/security/jca/ProviderList.java.i
-data/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java.i
-data/test/java/util/AbstractMap/SimpleEntries.java.i
+data/src/share/classes/java/lang/TypeNotPresentException.java.i
data/test/org/openjdk/jigsaw/hello-native.sh.i
data/test/sun/security/provider/PolicyParser/ExtDirs2.policy.i
data/test/java/util/ResourceBundle/Bug4168625Getter.java.i
@@ -335,6 +349,7 @@ data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResour
data/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java.i
data/src/share/classes/java/util/concurrent/locks/AbstractOwnableSynchronizer.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_hi_IN.properties.i
+data/test/javax/swing/JTabbedPane/6670274/bug6670274.java.i
data/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java.i
data/make/com/sun/security/auth/module/FILES_java.gmk.i
data/test/java/net/ipv6tests/ScopeTests.java.i
@@ -349,18 +364,17 @@ data/src/windows/native/java/io/FileInputStream_md.c.i
data/test/com/sun/jndi/ldap/InvalidLdapFilters.java.i
data/make/tools/src/build/tools/generatebreakiteratordata/SupplementaryCharacterData.java.i
data/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java.i
-data/test/javax/xml/crypto/dsig/data/signature.xml.i
+data/src/share/classes/sun/tools/tree/PreIncExpression.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/InputListener.java.i
data/test/java/lang/invoke/6998541/Test6998541.java.i
-data/src/share/native/sun/awt/image/jpeg/jdhuff.h.i
+data/src/share/classes/javax/print/attribute/standard/Sides.java.i
data/test/java/lang/StringCoding/locales.txt.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadZeroBytes.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AppleUser.java.i
-data/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingMetaImpl.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplds4.so.i
data/src/share/classes/sun/tools/jar/JarVerifierStream.java.i
+data/src/solaris/instrument/FileSystemSupport_md.c.i
data/src/share/sample/scripting/scriptpad/build.properties.i
data/src/share/classes/javax/imageio/stream/FileImageInputStream.java.i
data/src/share/lib/cmm/lcms/PYCC.pf.i
@@ -372,77 +386,81 @@ data/make/mkdemo/jni/Poller/Makefile.i
data/src/share/native/sun/awt/image/jpeg/jerror.h.i
data/src/share/classes/sun/tools/tree/MethodExpression.java.i
data/test/java/io/PipedWriter/WriteAfterReaderClose.java.i
+data/test/java/nio/charset/spi/charsetProvider.sp.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Encoder.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java.i
data/src/share/classes/com/sun/tools/jdi/ClassObjectReferenceImpl.java.i
-data/test/java/util/ResourceBundle/Control/BadControlsTest.java.i
data/src/share/classes/sun/font/FontManagerForSGE.java.i
data/src/share/classes/overview-core.html.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java.i
data/test/javax/imageio/plugins/jpeg/ReadingInterruptionTest.java.i
-data/test/javax/management/ObjectInstance/MBeanInfoFailTest.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java.i
+data/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java.i
data/test/sun/security/x509/GeneralName/Encode.java.i
data/test/java/beans/Introspector/4168475/infos/ComponentBeanInfo.java.i
data/test/java/rmi/MarshalledObject/compare/makeAnnotatedRef.i
data/src/share/native/sun/awt/image/dither.h.i
data/src/share/classes/com/sun/tools/hat/internal/util/Misc.java.i
-data/test/sun/net/www/httptest/AbstractCallback.java.i
+data/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif.i
+data/src/windows/native/sun/jkernel/DownloadHelper.h.i
data/make/com/sun/security/auth/module/mapfile-vers.i
-data/src/share/classes/sun/java2d/pipe/Region.java.i
-data/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java.i
+data/make/tools/swing-beans/beaninfo/SwingBeanInfoBase.java.i
data/src/share/classes/java/sql/SQLException.java.i
data/src/windows/native/sun/windows/awt_Palette.h.i
-data/test/com/sun/jndi/cosnaming/CNNameParser.java.i
+data/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java.i
data/src/share/classes/javax/naming/directory/Attributes.java.i
data/test/com/sun/jdi/NativeInstanceFilter.java.i
data/test/java/io/Serializable/enum/missingConstant/Write.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.dll.i
data/src/share/classes/java/lang/management/OperatingSystemMXBean.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.h.i
data/src/share/native/sun/java2d/SurfaceData.c.i
data/test/sun/management/jmxremote/bootstrap/ssl/truststore.i
data/src/share/classes/javax/xml/crypto/dsig/XMLObject.java.i
-data/test/com/sun/jdi/FieldWatchpoints.java.i
+data/src/solaris/classes/sun/awt/X11GraphicsConfig.java.i
data/src/linux/doc/man/ja/java.1.i
+data/src/share/classes/sun/nio/cs/ISO_8859_13.java.i
data/src/share/back/outStream.h.i
data/test/java/rmi/activation/Activatable/inactiveGroup/group.security.policy.i
data/src/share/classes/javax/swing/plaf/basic/icons/image-failed.png.i
data/src/share/classes/com/sun/jdi/FloatValue.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirsA.java.i
+data/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java.i
data/test/java/nio/channels/Channels/ReadByte.java.i
data/src/share/classes/sun/net/www/http/ChunkedOutputStream.java.i
data/make/sun/image/vis/Makefile.i
-data/src/share/classes/sun/nio/cs/ext/IBM1148.java.i
data/src/share/classes/java/security/interfaces/RSAPrivateKey.java.i
data/src/share/classes/java/rmi/activation/ActivationMonitor.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthConstants.java.i
+data/src/share/classes/java/math/BigDecimal.java.i
data/src/share/classes/org/relaxng/datatype/helpers/StreamingValidatorImpl.java.i
data/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java.i
data/src/share/native/java/lang/fdlibm/src/e_remainder.c.i
data/src/share/classes/javax/print/attribute/standard/Destination.java.i
-data/make/tools/CharsetMapping/IBM933.map.i
data/src/share/classes/sun/nio/fs/PollingWatchService.java.i
data/src/share/native/sun/awt/libpng/pngwrite.c.i
+data/test/javax/xml/crypto/dsig/data/certs/lugh.crt.i
data/src/share/classes/javax/management/ManagedOperation.java.i
-data/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java.i
-data/test/java/util/ServiceLoader/FooService.java.i
+data/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java.i
data/src/share/classes/sun/security/x509/X509CRLImpl.java.i
data/src/share/demo/jfc/TransparentRuler/README.txt.i
data/src/share/classes/sun/audio/AudioStreamSequence.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_EG.java.i
data/test/java/lang/StringBuffer/Substring.java.i
data/src/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/access.properties.i
-data/src/share/classes/sun/io/ByteToCharMacCyrillic.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/package.html.i
+data/src/share/classes/java/util/AbstractSet.java.i
+data/src/share/native/sun/java2d/loops/DrawParallelogram.c.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIFont.java.i
data/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher.i
data/src/share/back/StackFrameImpl.c.i
data/src/share/classes/java/util/concurrent/BlockingQueue.java.i
data/src/share/doc/stub/java/rmi/activation/ActivationGroup_Stub.java.i
data/src/share/classes/sun/tools/jstat/DescendingMonitorComparator.java.i
-data/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java.i
data/src/linux/doc/man/ja/rmid.1.i
data/test/com/sun/crypto/provider/Cipher/PBE/PBEKeyTest.java.i
data/src/solaris/native/sun/awt/awt_Event.c.i
data/test/javax/imageio/plugins/gif/EncodeSubImageTest.java.i
+data/test/java/rmi/testlibrary/ActivationLibrary.java.i
data/src/share/classes/sun/rmi/server/InactiveGroupException.java.i
data/src/share/classes/javax/imageio/IIOImage.java.i
data/src/share/classes/sun/nio/ch/DevPollSelectorProvider.java.i
@@ -451,7 +469,7 @@ data/src/share/classes/sun/tools/asm/TryData.java.i
data/make/modules/tools/src/com/sun/classanalyzer/DependencyConfig.java.i
data/src/share/classes/javax/swing/AbstractButton.java.i
data/test/java/util/zip/ZipFile/LargeZipFile.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_fr_CA.properties.i
+data/test/java/io/Reader/OpsAfterClose.java.i
data/test/java/lang/management/ManagementFactory/GetPlatformMXBeans.java.i
data/src/share/classes/sun/java2d/loops/BlitBg.java.i
data/test/java/awt/Mixing/HWDisappear.java.i
@@ -459,28 +477,29 @@ data/src/share/classes/sun/util/resources/LocaleNames_tr.properties.i
data/src/share/classes/java/awt/image/BufferedImageFilter.java.i
data/src/share/classes/java/net/CacheResponse.java.i
data/src/share/classes/sun/text/resources/CollationData_ar.java.i
-data/test/java/util/BitSet/StickySize.java.i
+data/src/share/classes/sun/tools/tree/Statement.java.i
data/test/javax/swing/JFileChooser/6713352/bug6713352.java.i
data/src/solaris/classes/sun/awt/X11/XIconWindow.java.i
-data/src/share/sample/jmx/jmx-scandir/build.xml.i
+data/src/share/classes/java/net/Inet4Address.java.i
data/src/share/classes/com/sun/tools/jdi/EventQueueImpl.java.i
data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.html.i
-data/test/tools/launcher/ChangeDataModel.sh.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_PCM.cpp.i
+data/src/solaris/native/sun/awt/awt_Plugin.h.i
+data/src/share/classes/sun/util/locale/LocaleObjectCache.java.i
data/make/tools/swing-beans/beaninfo/images/JDialogMono16.gif.i
-data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html.i
+data/src/share/instrument/PathCharsValidator.c.i
data/src/share/classes/sun/misc/resources/Messages_ko.java.i
+data/make/netbeans/README.i
data/src/share/classes/javax/swing/ActionMap.java.i
data/src/solaris/classes/sun/awt/X11/XButtonPeer.java.i
data/src/share/classes/javax/management/Notification.java.i
data/src/share/native/sun/security/ec/ecp_jm.c.i
-data/make/sun/font/reorder-sparc.i
+data/test/java/util/ServiceLoader/FooProvider3.java.i
data/src/share/classes/sun/java2d/loops/DrawPolygons.java.i
data/src/share/classes/sun/security/krb5/KrbAsRep.java.i
data/src/share/classes/com/sun/rowset/internal/WebRowSetXmlReader.java.i
-data/test/java/text/Format/DateFormat/Bug6683975.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html.i
data/src/solaris/native/java/io/FileOutputStream_md.c.i
-data/test/java/awt/Graphics2D/DrawString/RotTransText.java.i
-data/test/javax/script/RhinoExceptionTest.java.i
data/src/share/classes/javax/imageio/IIOParamController.java.i
data/src/share/classes/java/lang/InheritableThreadLocal.java.i
data/src/share/classes/javax/security/auth/Subject.java.i
@@ -493,10 +512,9 @@ data/src/share/classes/sun/reflect/generics/scope/ConstructorScope.java.i
data/src/share/classes/javax/management/relation/RelationTypeNotFoundException.java.i
data/make/sun/tracing/dtrace/Makefile.i
data/src/share/classes/sun/reflect/UnsafeShortFieldAccessorImpl.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java.i
+data/make/mkdemo/jvmti/mtrace/Makefile.i
data/src/share/classes/sun/io/ByteToCharMacHebrew.java.i
-data/src/windows/native/sun/windows/awt_DataTransferer.cpp.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c.i
+data/src/solaris/classes/sun/awt/X11/XKeySymConstants.java.i
data/src/share/native/sun/java2d/loops/FourByteAbgrPre.c.i
data/src/share/classes/sun/security/krb5/internal/Ticket.java.i
data/src/solaris/native/sun/awt/wsutils.h.i
@@ -507,20 +525,22 @@ data/src/share/native/sun/awt/utility/rect.c.i
data/test/java/io/InputStreamReader/ReadOffset.java.i
data/src/share/classes/java/dyn/SwitchPoint.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c.i
-data/src/share/classes/sun/tools/jconsole/Plotter.java.i
+data/src/share/classes/sun/print/CustomMediaTray.java.i
data/src/share/classes/java/awt/FontMetrics.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Inform.gif.i
data/src/share/classes/com/sun/crypto/provider/CipherWithWrappingSpi.java.i
-data/src/share/classes/sun/text/resources/FormatData_en.java.i
-data/test/java/security/KeyRep/SerialDSAPubKey.policy.i
-data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java.i
+data/test/java/security/cert/CertPath/Serialize.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/upFolder.gif.i
+data/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java.i
+data/src/macosx/classes/com/apple/laf/AquaTabbedPaneCopyFromBasicUI.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMBean.java.i
+data/test/java/lang/management/ManagementFactory/GetPlatformManagementInterfaces.java.i
data/src/share/classes/sun/management/HotspotMemory.java.i
data/test/javax/management/remote/mandatory/connectorServer/ForwarderChainTest.java.i
data/src/share/classes/sun/tools/tree/NotEqualExpression.java.i
data/src/share/classes/java/util/zip/Checksum.java.i
data/test/java/lang/Class/asSubclass/BasicUnit.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.dll.i
data/src/share/classes/sun/security/x509/CertParseError.java.i
data/src/windows/classes/sun/awt/windows/WCheckboxMenuItemPeer.java.i
data/src/share/classes/javax/swing/JMenu.java.i
@@ -529,29 +549,30 @@ data/src/share/classes/javax/swing/JTable.java.i
data/src/share/demo/jfc/Metalworks/ContrastMetalTheme.java.i
data/src/windows/hpi/include/threads_md.h.i
data/src/share/classes/sun/io/CharToByteISO8859_13.java.i
-data/src/share/classes/com/sun/crypto/provider/DESedeKey.java.i
+data/src/share/classes/com/sun/media/sound/AuFileWriter.java.i
data/src/share/classes/com/sun/beans/decoder/TrueElementHandler.java.i
data/src/share/classes/sun/io/CharToByteCp1098.java.i
-data/test/sun/tools/jstat/gcOldCapacityOutput1.awk.i
+data/src/solaris/classes/sun/nio/fs/SolarisFileStore.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_SoftBevelBorder.java.i
-data/src/share/native/java/util/zip/zlib-1.2.5/zutil.h.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java.i
data/test/sun/rmi/rmic/minimizeWrapperInstances/Test.java.i
data/test/java/io/Serializable/subclass/AbstractObjectInputStream.java.i
data/src/share/classes/sun/io/CharToByteASCII.java.i
data/test/java/lang/Class/getMethod/Exceptions.java.i
data/test/java/dyn/JavaDocExamples.java.i
-data/src/share/native/sun/awt/medialib/mlib_image.h.i
data/src/share/classes/sun/text/normalizer/CharTrie.java.i
data/make/tools/swing-beans/beaninfo/images/JTableColor16.gif.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/Dependence.java.i
+data/src/macosx/native/sun/awt/CMenu.m.i
data/src/share/classes/java/security/cert/CertPathBuilderResult.java.i
-data/src/share/classes/sun/io/CharToByteCp1381.java.i
+data/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES.i
data/src/share/classes/javax/imageio/stream/MemoryCacheImageOutputStream.java.i
data/src/share/classes/sun/util/resources/LocaleData.java.i
-data/src/share/classes/sun/rmi/log/ReliableLog.java.i
data/test/tools/pack200/pack200-verifier/data/golden.jar.d
data/src/share/classes/javax/swing/text/InternationalFormatter.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java.i
+data/src/share/native/sun/awt/libpng/pngwtran.c.i
+data/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java.i
+data/src/bsd/doc/man/ja/schemagen.1.i
+data/src/bsd/doc/man/jdb.1.i
data/test/javax/management/remote/mandatory/connection/GetConnectionTest.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_it.properties.i
data/test/sun/misc/Hello.class.i
@@ -562,16 +583,17 @@ data/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.java.i
data/test/java/nio/file/Path/Misc.java.i
data/src/windows/classes/sun/java2d/windows/GDIBlitLoops.java.i
data/src/share/native/com/sun/java/util/jar/pack/constants.h.i
-data/test/java/net/Socket/asyncClose/DatagramSocket_receive.java.i
+data/src/windows/native/sun/windows/awt_Cursor.cpp.i
data/test/sun/java2d/GdiRendering/InsetClipping.java.i
data/make/sun/javazic/tzdata/northamerica.i
data/src/share/classes/javax/sound/sampled/LineUnavailableException.java.i
data/test/java/util/PriorityQueue/PriorityQueueSort.java.i
data/src/share/native/sun/awt/image/jpeg/jdinput.c.i
+data/src/macosx/classes/sun/awt/FullScreenCapable.java.i
data/src/share/classes/java/security/Security.java.i
data/src/share/classes/sun/nio/cs/ext/DBCS_ONLY_IBM_EBCDIC_Decoder.java.i
-data/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java.i
-data/test/com/sun/jdi/StepTest.java.i
+data/make/tools/README.txt.i
+data/src/share/native/sun/java2d/loops/AnyInt.c.i
data/src/share/classes/sun/text/resources/FormatData_in.java.i
data/test/java/rmi/server/UnicastRemoteObject/unexportObject/Ping.java.i
data/src/share/classes/sun/security/jgss/spnego/SpNegoMechFactory.java.i
@@ -585,16 +607,14 @@ data/src/share/classes/sun/awt/WindowAccessor.java.i
data/src/share/classes/sun/rmi/transport/proxy/RMIDirectSocketFactory.java.i
data/src/share/classes/sun/font/FontManagerNativeLibrary.java.i
data/src/share/classes/com/sun/security/auth/login/ConfigFile.java.i
-data/src/solaris/native/sun/awt/awt_Label.c.i
data/src/share/classes/java/nio/Bits.java.i
data/src/share/classes/sun/dyn/empty/Empty.java.i
-data/test/sun/nio/cs/LatinCharReplacementTWTest.java.i
+data/src/share/classes/sun/security/krb5/KrbKdcReq.java.i
data/src/share/classes/javax/swing/text/SegmentCache.java.i
data/test/java/lang/Runtime/exec/LotsOfDestroys.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy.i
data/make/java/nio/genBuffer.sh.i
data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java.i
-data/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java.i
+data/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java.i
data/src/windows/native/java/net/NetworkInterface_winXP.c.i
data/test/java/nio/file/Files/TemporaryFiles.java.i
data/src/share/classes/java/rmi/registry/package.html.i
@@ -602,19 +622,21 @@ data/src/share/demo/applets/MoleculeViewer/Matrix3D.java.i
data/src/share/classes/sun/tools/tree/Vset.java.i
data/test/java/util/concurrent/locks/ReentrantLock/SimpleReentrantLockLoops.java.i
data/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c.i
+data/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java.i
+data/src/share/native/sun/awt/libpng/pnginfo.h.i
data/src/share/classes/sun/java2d/loops/XORComposite.java.i
data/src/share/classes/javax/swing/DefaultBoundedRangeModel.java.i
data/test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java.i
data/test/javax/management/monitor/RuntimeExceptionTest.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sk_SK.properties.i
-data/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java.i
+data/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/CheckDeps.java.i
+data/src/share/classes/sun/text/resources/CollationData_bg.java.i
data/test/sun/security/krb5/ktab/KeyString.java.i
data/src/share/classes/javax/crypto/Cipher.java.i
-data/test/java/nio/channels/FileChannel/Transfer.java.i
+data/src/bsd/doc/man/ja/rmic.1.i
data/src/share/classes/sun/net/ConnectionResetException.java.i
data/src/solaris/native/sun/awt/awt_MenuBar.h.i
data/src/share/classes/sun/tools/java/ScannerInputReader.java.i
-data/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png.i
data/src/windows/native/sun/windows/awt_AWTEvent.cpp.i
data/src/share/classes/sun/swing/StringUIClientPropertyKey.java.i
data/src/share/classes/javax/swing/plaf/nimbus/AbstractRegionPainter.java.i
@@ -623,40 +645,41 @@ data/src/share/classes/java/lang/doc-files/capupsil.gif.i
data/src/share/native/sun/security/ec/impl/oid.c.i
data/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java.i
data/src/share/bin/wildcard.h.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java.i
data/src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider.i
+data/src/macosx/classes/sun/lwawt/macosx/NSPrintInfo.java.i
data/src/share/classes/java/rmi/RemoteException.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java.i
data/src/share/native/sun/awt/image/jpeg/jmemnobs.c.i
data/test/sun/util/resources/TimeZone/Bug4938846.java.i
data/make/java/java_hprof_demo/mapfile-vers.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapInterestedHost.java.i
+data/src/solaris/doc/sun/man/man1/extcheck.1.i
data/src/share/classes/com/sun/jdi/VMOutOfMemoryException.java.i
data/test/com/sun/jdi/TwoThreadsTest.java.i
data/test/java/net/Authenticator/AuthNPETest.java.i
data/src/share/classes/java/awt/WaitDispatchSupport.java.i
-data/src/share/classes/sun/text/resources/FormatData_mk_MK.java.i
+data/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt.i
data/src/share/classes/javax/net/ssl/X509ExtendedTrustManager.java.i
-data/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java.i
+data/test/sun/net/www/protocol/http/WebGet.java.i
data/src/solaris/classes/sun/awt/X11/WindowDimensions.java.i
-data/src/share/classes/com/sun/tools/script/shell/Main.java.i
+data/src/share/classes/javax/accessibility/Accessible.java.i
data/test/java/util/zip/LargeZip.java.i
+data/make/tools/src/build/tools/generatecharacter/CharacterScript.java.i
data/test/java/io/Reader/SkipInput.txt.i
data/make/tools/CharsetMapping/MS950.nr.i
+data/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/Inform.gif.i
-data/test/java/rmi/reliability/juicer/OrangeEchoImpl.java.i
+data/src/macosx/bundle/JavaAppLauncher/src/JavaAppLauncher_Prefix.pch.i
data/src/share/classes/javax/xml/crypto/dsig/SignatureProperty.java.i
data/src/solaris/sample/dtrace/hotspot/gc_time_stat.d.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java.i
data/test/java/io/Serializable/PutField/Read.java.i
data/src/share/classes/sun/awt/FontDescriptor.java.i
-data/test/javax/crypto/Cipher/ByteBuffers.java.i
data/src/share/native/sun/awt/libpng/pnggccrd.c.i
data/src/solaris/native/sun/java2d/loops/mlib_ImageZoom.h.i
data/src/solaris/classes/sun/awt/X11/XIconInfo.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0001.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Aes128.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java.i
+data/src/windows/native/sun/jkernel/graphics/bullet.bmp.i
data/test/sun/tools/native2ascii/N2A_4636448.i
data/src/share/native/java/lang/fdlibm/src/e_fmod.c.i
data/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh.i
@@ -665,63 +688,68 @@ data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT.java.i
data/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java.i
data/src/share/classes/java/awt/event/TextListener.java.i
data/src/share/classes/com/sun/media/sound/MidiInDevice.java.i
+data/src/macosx/classes/com/apple/laf/AquaKeyBindings.java.i
data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Decoder.java.i
-data/test/javax/swing/GroupLayout/6613904/bug6613904.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM875.java.i
data/src/share/classes/sun/security/pkcs/PKCS10Attributes.java.i
data/src/share/demo/jfc/Metalworks/README.txt.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassAnalyzer.java.i
+data/src/share/native/sun/awt/image/gif/gifdecoder.c.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestRender1.java.i
data/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c.i
data/test/javax/swing/JTextArea/6940863/bug6940863.java.i
data/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletMono32.gif.i
data/src/linux/doc/man/ja/javap.1.i
-data/src/share/classes/sun/misc/resources/Messages_it.java.i
+data/src/share/classes/sun/misc/Cache.java.i
data/test/com/sun/net/httpserver/LogFilter.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CRobot.java.i
data/src/share/demo/jfc/Metalworks/MetalworksInBox.java.i
data/src/share/classes/sun/instrument/TransformerManager.java.i
-data/src/share/classes/javax/swing/JComponent.java.i
+data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif.i
data/src/share/classes/java/text/Normalizer.java.i
+data/src/share/classes/sun/misc/resources/Messages_fr.java.i
data/test/sun/java2d/SunGraphics2D/PolyVertTest.java.i
data/src/share/native/sun/java2d/cmm/lcms/LCMS.c.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsEditorPaneUI.java.i
data/src/share/classes/javax/script/AbstractScriptEngine.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_fi.properties.i
data/test/javax/management/ObjectName/ApplyWildcardTest.java.i
data/src/share/classes/javax/swing/tree/ExpandVetoException.java.i
data/test/java/lang/Thread/MainThreadTest.java.i
data/src/share/demo/jfc/Notepad/ElementTreePanel.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java.i
data/src/share/classes/sun/nio/cs/ext/IBM860.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so.i
data/src/share/demo/jvmti/hprof/hprof_table.c.i
data/src/share/classes/com/sun/jmx/event/EventConnection.java.i
data/src/share/back/outStream.c.i
data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/JavaxHostnameVerifier.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java.i
data/test/javax/management/Introspector/FeatureOrderTest.java.i
data/test/java/util/concurrent/TimeUnit/Basic.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png.i
data/src/share/classes/sun/security/pkcs11/P11Digest.java.i
data/src/share/classes/java/sql/Time.java.i
-data/test/java/nio/channels/FileChannel/Transfers.java.i
+data/test/java/io/Serializable/defaulted/GetFieldWrite.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java.i
data/src/solaris/classes/sun/awt/motif/X11FontMetrics.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/truststore.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/security.policy.i
data/src/share/classes/sun/rmi/rmic/Constants.java.i
-data/src/windows/native/sun/jkernel/DownloadDialog.h.i
+data/src/share/classes/sun/text/resources/FormatData_es_NI.java.i
+data/src/share/classes/org/openjdk/jigsaw/Hi.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/jobjc/SuperClassExtractor.java.i
data/make/sun/jpeg/Makefile.i
-data/src/share/classes/sun/security/pkcs11/wrapper/Constants.java.i
-data/test/javax/management/loading/DocumentRootTest.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java.i
data/src/share/classes/sun/nio/ch/NativeThreadSet.java.i
data/src/share/classes/java/util/zip/ZipConstants.java.i
data/src/share/classes/javax/swing/plaf/nimbus/StateImpl.template.i
-data/test/sun/net/www/protocol/jar/getcontenttype.sh.i
+data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/I18N.java.i
data/test/org/openjdk/jigsaw/cli/ModuleFileTest.java.i
data/test/java/net/URLClassLoader/closetest/README.i
-data/test/javax/management/namespace/SourceNamespaceTest.java.i
+data/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java.i
data/test/sun/security/pkcs11/ec/certs/sunlabscerts.pem.i
data/src/solaris/native/sun/awt/awt_DataTransferer.c.i
data/src/share/native/sun/font/layout/IndicLayoutEngine.h.i
@@ -730,61 +758,61 @@ data/src/share/classes/java/nio/file/StandardWatchEventKind.java.i
data/test/java/security/cert/X509Certificate/EmptySubject.java.i
data/src/share/classes/javax/swing/event/MouseInputAdapter.java.i
data/src/share/classes/java/nio/file/attribute/GroupPrincipal.java.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTestConcMarkSweepGC.sh.i
+data/src/share/classes/com/sun/media/sound/FastSysexMessage.java.i
data/test/java/beans/XMLEncoder/java_util_JumboEnumSet.java.i
data/make/tools/CharsetMapping/IBM875.nr.i
-data/src/share/classes/sun/beans/editors/FloatEditor.java.i
+data/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMeta.java.i
data/src/share/classes/javax/swing/DefaultCellEditor.java.i
data/src/share/classes/javax/management/MBeanParameterInfo.java.i
data/src/share/classes/javax/crypto/AEADBadTagException.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/ModifiableClassLoaderRepository.java.i
data/src/share/classes/javax/print/PrintServiceLookup.java.i
-data/src/share/classes/javax/swing/event/AncestorListener.java.i
data/src/share/classes/sun/net/www/content/audio/basic.java.i
-data/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java.i
data/make/sun/image/generic/mapfile-vers.i
-data/test/sun/management/windows/revokeall.c.i
+data/src/share/classes/sun/awt/TracedEventQueue.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmscam97.c.i
data/src/share/classes/sun/text/resources/FormatData_ar_LY.java.i
data/src/share/classes/javax/swing/plaf/ActionMapUIResource.java.i
data/src/share/classes/java/util/regex/Pattern.java.i
-data/test/java/util/prefs/PrefsSpi.sh.i
data/src/share/classes/org/jcp/xml/dsig/internal/DigesterOutputStream.java.i
data/src/share/classes/com/sun/crypto/provider/RC2Cipher.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormat.java.i
data/src/share/classes/sun/util/calendar/BaseCalendar.java.i
-data/test/sun/text/resources/Format/Bug4807540.java.i
data/test/sun/net/www/http/HttpClient/IsKeepingAlive.policy.i
data/src/solaris/native/sun/java2d/loops/mlib_ImageLogic_proto.h.i
-data/test/java/nio/channels/ServerSocketChannel/Basic.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java.i
data/src/share/classes/javax/security/sasl/SaslClientFactory.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java.i
data/src/share/classes/com/sun/jdi/request/ExceptionRequest.java.i
data/test/sun/security/util/DerInputBuffer/Allow.policy.i
-data/src/share/native/sun/awt/libpng/pngtest.c.i
+data/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java.i
+data/src/share/classes/sun/security/x509/DNSName.java.i
data/test/java/util/ResourceBundle/Control/StressOut_ja.properties.i
data/make/common/Classes.gmk.i
+data/test/java/net/URL/OpenStream.java.i
+data/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java.i
data/src/share/native/sun/security/ec/ecp_224.c.i
-data/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties.i
+data/src/share/classes/java/security/CryptoPrimitive.java.i
data/src/share/classes/javax/imageio/stream/FileImageOutputStream.java.i
data/src/solaris/native/sun/java2d/loops/vis_ByteGray_Mask.c.i
data/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java.i
-data/test/java/nio/channels/Selector/LotsOfUpdates.java.i
data/test/java/rmi/activation/CommandEnvironment/Doctor.java.i
data/test/java/util/PluggableLocale/LocaleNameProviderTest.java.i
+data/src/share/classes/java/awt/peer/MenuItemPeer.java.i
data/src/share/classes/java/awt/image/ImageFilter.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/DropShadowEffect.java.i
data/src/share/classes/java/net/SocketOutputStream.java.i
+data/src/share/classes/com/sun/jdi/Value.java.i
data/test/java/util/ResourceBundle/Test4318520RB_de.properties.i
data/src/share/classes/sun/print/PSPrinterJob.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy.i
-data/test/tools/pack200/Utils.java.i
-data/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh.i
-data/test/java/lang/Class/IsSynthetic.java.i
+data/src/bsd/doc/man/rmic.1.i
+data/test/sun/net/www/ftptest/FtpServer.java.i
+data/test/java/lang/ThreadLocal/TLRemoveTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c.i
+data/test/java/beans/Statement/Test6788531.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java.i
data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedEvent.java.i
+data/test/java/awt/TrayIcon/CtorTest/CtorTest.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpReceiveSocket.java.i
data/src/share/classes/com/sun/jmx/event/EventBuffer.java.i
data/src/share/classes/com/sun/media/sound/MidiDeviceReceiver.java.i
@@ -799,16 +827,18 @@ data/src/share/classes/java/lang/StringCoding.java.i
data/src/share/classes/sun/security/util/Resources.java.i
data/make/org/openjdk/jigsaw/Makefile.i
data/src/share/classes/java/sql/SQLRecoverableException.java.i
+data/src/share/classes/sun/audio/AudioData.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c.i
data/test/java/awt/Frame/DynamicLayout/DynamicLayout.java.i
data/src/share/classes/sun/security/acl/AclImpl.java.i
-data/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java.i
+data/src/share/classes/java/awt/datatransfer/FlavorEvent.java.i
+data/src/share/classes/javax/crypto/CryptoPermissions.java.i
+data/src/solaris/classes/sun/nio/fs/BsdFileStore.java.i
data/src/share/sample/jmx/jmx-scandir/src/etc/testconfig.xml.i
-data/src/share/native/sun/font/layout/GDEFMarkFilter.cpp.i
+data/src/share/native/sun/java2d/loops/IntArgbPre.c.i
data/src/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java.i
data/src/share/classes/java/net/NetPermission.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java.i
-data/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java.i
+data/test/java/beans/EventHandler/Test6277246.java.i
data/src/share/native/sun/security/ec/mplogic.c.i
data/src/share/classes/java/lang/Math.java.i
data/src/share/classes/java/net/StandardSocketOptions.java.i
@@ -817,53 +847,54 @@ data/src/share/classes/com/sun/security/ntlm/Version.java.i
data/test/javax/management/Introspector/ClassLeakTest.java.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor16.gif.i
data/src/share/classes/javax/imageio/package.html.i
+data/test/sun/security/pkcs11/rsa/TestCACerts.java.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.h.i
data/src/windows/classes/sun/nio/fs/WindowsConstants.java.i
data/src/share/classes/java/awt/Menu.java.i
data/src/share/classes/javax/print/attribute/standard/CopiesSupported.java.i
data/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplc4.so.i
data/src/share/classes/javax/sql/PooledConnection.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java.i
+data/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml.i
data/make/tools/CharsetMapping/MacIceland.map.i
-data/src/share/classes/javax/swing/text/TabSet.java.i
+data/src/share/classes/javax/swing/event/RowSorterEvent.java.i
data/src/share/classes/sun/io/CharToByteCp1250.java.i
+data/test/java/net/Authenticator/BasicTest4.java.i
+data/src/bsd/doc/man/ja/keytool.1.i
data/test/java/net/MulticastSocket/NoLoopbackPackets.java.i
-data/test/java/awt/Modal/LWModalTest/LWModalTest.java.i
-data/test/org/openjdk/jigsaw/cli/TimestampTest.java.i
+data/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html.i
+data/src/share/classes/javax/net/ssl/TrustManagerFactory.java.i
+data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.cpp.i
data/src/share/classes/java/nio/Direct-X-Buffer.java.template.i
-data/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java.i
+data/src/share/classes/sun/print/resources/orientRevLandscape.png.i
data/test/javax/swing/JInternalFrame/6647340/bug6647340.java.i
-data/make/sun/font/reorder-i586.i
+data/src/share/classes/com/sun/security/auth/LdapPrincipal.java.i
data/src/share/classes/javax/naming/ldap/ExtendedResponse.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h.i
data/src/share/classes/java/awt/GridBagLayout.java.i
+data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h.i
data/src/share/native/sun/java2d/opengl/J2D_GL/gl.h.i
data/src/share/classes/java/util/ComparableTimSort.java.i
data/src/share/classes/sun/security/util/Resources_zh_CN.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java.i
-data/src/share/classes/javax/swing/Painter.java.i
+data/src/share/classes/sun/tools/jstat/ExpressionResolver.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstruments.java.i
data/src/share/demo/jfc/Font2DTest/FontPanel.java.i
+data/test/java/nio/channels/SocketChannel/UnboundSocketTests.java.i
data/src/share/classes/com/sun/security/auth/NTSid.java.i
-data/src/share/demo/jvmti/hprof/hprof_event.c.i
+data/make/sun/image/vis/FILES_c.gmk.i
data/src/share/native/sun/awt/libpng/pngvcrd.c.i
-data/test/java/nio/charset/spi/FooProvider.java.i
data/test/java/nio/file/Path/PathOps.java.i
-data/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java.i
-data/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java.i
-data/test/java/io/Serializable/subclass/Test.java.i
+data/test/java/util/Locale/data/deflocale.sol10.i
+data/src/solaris/native/java/lang/UNIXProcess_md.c.i
+data/src/windows/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java.i
+data/src/macosx/native/sun/awt/JavaTextAccessibility.m.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmJITCompilerTimeMonitoring.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/inffast.c.i
-data/src/share/classes/sun/security/acl/PermissionImpl.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy32.i
-data/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java.i
-data/src/share/classes/sun/security/jgss/krb5/MicToken.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy16.i
data/test/sun/management/jmxremote/bootstrap/TestManager.java.i
-data/src/share/classes/javax/swing/table/TableColumnModel.java.i
data/src/share/classes/java/util/XMLUtils.java.i
data/src/share/classes/java/net/SocksSocketImpl.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DContext.java.i
data/src/share/classes/java/util/zip/InflaterInputStream.java.i
data/src/share/classes/javax/imageio/plugins/bmp/package.html.i
data/src/share/classes/sun/management/counter/perf/PerfStringCounter.java.i
@@ -883,7 +914,7 @@ data/make/tools/CharsetMapping/TIS_620.map.i
data/src/share/native/sun/font/layout/DefaultCharMapper.h.i
data/src/share/classes/sun/security/pkcs11/P11Key.java.i
data/src/share/classes/sun/text/resources/FormatData_el_CY.java.i
-data/src/share/classes/sun/text/normalizer/UCharacterProperty.java.i
+data/src/share/classes/javax/security/auth/callback/CallbackHandler.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/RepeatObjs.java.i
data/src/share/classes/com/sun/media/sound/Platform.java.i
data/src/share/classes/sun/misc/MetaIndex.java.i
@@ -894,6 +925,7 @@ data/src/share/classes/com/sun/beans/finder/PropertyEditorFinder.java.i
data/src/share/classes/java/net/InterfaceAddress.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HomeFolder.gif.i
data/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationTest.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNames.java.i
data/src/share/classes/sun/security/jgss/GSSExceptionImpl.java.i
data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/jdk.xml.i
data/test/sun/nio/cs/ISO2022JP.trailEsc.i
@@ -902,14 +934,13 @@ data/src/share/classes/sun/io/CharToByteCp33722.java.i
data/src/share/demo/jvmti/hprof/hprof_tls.h.i
data/src/share/classes/java/awt/geom/CubicIterator.java.i
data/make/mksample/jmx/jmx-scandir/Makefile.i
-data/test/java/util/AbstractList/CheckForComodification.java.i
+data/src/share/classes/sun/io/CharToByteCp1047.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/AsyncSSLSocketClose.java.i
-data/src/share/native/sun/security/ec/mp_gf2m-priv.h.i
-data/test/sun/jvmstat/testlibrary/utils.sh.i
-data/test/tools/pack200/TimeStamp.java.i
+data/src/share/classes/java/lang/ClassCircularityError.java.i
data/src/share/classes/javax/swing/event/TreeSelectionEvent.java.i
data/make/tools/CharsetMapping/SingleByte-X.java.template.i
data/src/share/classes/javax/swing/event/ListDataEvent.java.i
+data/src/share/classes/javax/swing/plaf/FileChooserUI.java.i
data/src/share/classes/sun/text/normalizer/Replaceable.java.i
data/test/java/nio/file/Files/CustomOptions.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTokenManager.java.i
@@ -918,11 +949,15 @@ data/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeImpl.java.i
data/src/share/classes/java/awt/CheckboxMenuItem.java.i
data/src/share/demo/nbproject/management/MemoryMonitor/build.properties.i
data/test/java/beans/PropertyEditor/TestLongTypeJava.java.i
+data/test/java/lang/Math/WorstCaseTests.java.i
+data/src/macosx/classes/com/apple/laf/AquaSplitPaneDividerUI.java.i
+data/test/java/net/SocketInputStream/SocketClosedException.java.i
data/make/netbeans/swing/README.i
-data/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so.i
+data/test/java/lang/ThreadGroup/NullThreadName.java.i
data/make/tools/swing-beans/beaninfo/images/JSpinnerMono16.gif.i
data/test/javax/management/Introspector/IdenticalMBeanInfoTest.java.i
-data/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java.i
+data/src/windows/native/common/jlong_md.h.i
+data/src/share/classes/sun/net/www/ApplicationLaunchException.java.i
data/test/tools/launcher/libraryCaller.c.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_pt_BR.properties.i
data/make/java/npt/Makefile.i
@@ -932,6 +967,7 @@ data/src/share/classes/java/awt/font/LayoutPath.java.i
data/test/com/sun/management/OperatingSystemMXBean/GetFreeSwapSpaceSize.java.i
data/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java.i
data/test/java/beans/XMLEncoder/Test4935607.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java.i
data/src/share/classes/sun/net/www/protocol/http/AuthCacheValue.java.i
data/src/share/native/sun/java2d/loops/ByteBinary2Bit.h.i
data/src/solaris/classes/sun/java2d/jules/IdleTileCache.java.i
@@ -945,26 +981,25 @@ data/test/javax/swing/JTable/6788484/bug6788484.java.i
data/test/java/net/Socket/CloseAvailable.java.i
data/src/share/classes/com/sun/tracing/dtrace/ArgsAttributes.java.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/steve2tom.cer.i
+data/src/share/classes/javax/crypto/BadPaddingException.java.i
data/test/java/io/Serializable/subclass/XObjectOutputStream.java.i
data/src/share/classes/sun/util/resources/LocaleNames_iw.properties.i
data/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java.i
data/src/share/classes/com/sun/java/browser/dom/DOMServiceProvider.java.i
data/src/solaris/classes/sun/java2d/xr/GrowableRectArray.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11RuntimeException.java.i
data/test/sun/nio/cs/EucJpLinuxDecoderRecoveryTest.java.i
data/src/share/classes/sun/nio/ch/FileDispatcher.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaThing.java.i
data/src/share/classes/sun/nio/cs/ext/MacDingbat.java.i
-data/src/share/classes/sun/java2d/loops/FillRect.java.i
data/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java.i
data/src/share/classes/sun/security/krb5/internal/ASReq.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/deflate.c.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Reference.java.i
+data/make/netbeans/common/share-sources.ent.i
data/make/tools/sharing/README.txt.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java.i
+data/src/share/classes/java/lang/annotation/package-info.java.i
data/src/share/classes/javax/naming/ldap/Rfc2253Parser.java.i
data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetDescription.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java.i
@@ -977,14 +1012,14 @@ data/make/tools/CharsetMapping/IBM1112.nr.i
data/test/com/sun/servicetag/JavaServiceTagTest.java.i
data/make/modules/tools/build.xml.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties.i
-data/src/share/classes/sun/beans/editors/FontEditor.java.i
+data/src/share/classes/java/io/PushbackReader.java.i
data/src/windows/native/sun/windows/awt_Canvas.cpp.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif.i
-data/test/java/net/URLDecoder/B6463990.java.i
+data/test/java/net/DatagramSocket/ChangingAddress.java.i
data/src/share/classes/sun/security/util/Length.java.i
data/test/sun/misc/URLClassPath/FileLoaderTest.java.i
data/make/tools/CharsetMapping/IBM857.map.i
data/src/share/classes/java/awt/event/AWTEventListener.java.i
+data/make/javax/imageio/Makefile.i
data/test/java/io/File/IsAbsolute.java.i
data/src/share/classes/com/sun/jmx/snmp/EnumRowStatus.java.i
data/src/share/classes/sun/management/resources/agent_pt_BR.properties.i
@@ -995,34 +1030,38 @@ data/src/share/classes/com/sun/jmx/snmp/SnmpStringFixed.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java.i
data/src/share/classes/java/io/Console.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgbBm.c.i
+data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java.i
+data/src/macosx/classes/sun/nio/ch/KQueueArrayWrapper.java.i
data/test/java/io/RandomAccessFile/SetLength.java.i
data/src/share/classes/org/openjdk/jigsaw/PathContext.java.i
+data/src/macosx/native/apple/launcher/JavaAppLauncher.m.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/Base64DecodingException.java.i
data/test/java/util/ResourceBundle/TestResource_fr.java.i
data/src/share/classes/sun/text/resources/CollationData_ja.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/README.i
data/src/share/native/sun/font/layout/CoverageTables.cpp.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java.i
data/src/share/classes/com/sun/crypto/provider/AESConstants.java.i
+data/src/share/classes/sun/instrument/InstrumentationImpl.java.i
+data/src/windows/native/sun/java2d/windows/ddrawUtils.h.i
+data/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java.i
data/test/java/beans/XMLEncoder/AbstractTest.java.i
data/src/solaris/sample/dtrace/helpers/dtrace_helper.d.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html.i
data/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java.i
-data/src/solaris/back/proc_md.h.i
data/src/share/classes/javax/swing/plaf/synth/SynthUI.java.i
+data/src/macosx/classes/com/apple/eawt/ApplicationEvent.java.i
data/test/javax/management/modelmbean/RequiredModelMBeanSetAttributeTest.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java.i
data/make/mkdemo/applets/GraphLayout/Makefile.i
data/make/tools/swing-beans/beaninfo/images/JFileChooserColor32.gif.i
data/test/java/awt/print/PrinterJob/PageRanges.java.i
data/make/tools/CharsetMapping/IBM1122.map.i
data/src/share/classes/java/rmi/dgc/package.html.i
data/src/share/classes/java/util/logging/PlatformLoggingMXBean.java.i
-data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ByteArrays.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuItemMono32.gif.i
data/src/share/classes/sun/security/ec/ECKeyFactory.java.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java.i
+data/test/java/io/Serializable/class/run.sh.i
+data/src/share/classes/javax/swing/table/TableModel.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/font/Typeface.java.i
data/test/java/net/URLConnection/olympus.jpg.i
data/src/share/classes/java/security/cert/X509CRLSelector.java.i
@@ -1031,29 +1070,34 @@ data/src/share/demo/nbproject/jfc/FileChooserDemo/build.properties.i
data/src/share/classes/com/sun/beans/finder/InstanceFinder.java.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyFrom.java.i
data/src/share/classes/sun/io/ByteToCharGB18030.java.i
-data/src/share/classes/sun/security/ssl/Krb5Proxy.java.i
+data/src/share/classes/com/sun/media/sound/Printer.java.i
+data/make/sun/rmi/rmi/mapfile-vers.i
+data/src/share/classes/sun/rmi/rmic/newrmic/Resources.java.i
data/src/share/classes/sun/io/CharToByteJIS0208.java.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java.i
data/make/sun/splashscreen/FILES_c.gmk.i
data/src/solaris/native/sun/jdga/jdgadevice.h.i
data/test/java/util/Locale/LocaleTest.java.i
+data/src/macosx/native/sun/osxapp/NSApplicationAWT.m.i
data/test/javax/security/auth/login/LoginContext/ModuleSubjectModule.java.i
data/src/share/classes/com/sun/jndi/dns/NameNode.java.i
-data/test/java/io/PipedReader/Ready.java.i
data/src/share/classes/javax/naming/NameNotFoundException.java.i
data/src/share/classes/com/sun/beans/finder/FieldFinder.java.i
data/src/share/classes/com/sun/tools/jdi/ObsoleteMethodImpl.java.i
data/src/share/classes/java/awt/datatransfer/FlavorListener.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PathShape.java.i
+data/test/sun/management/jmxremote/startstop/JMXStartStopTest.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/Env.java.i
data/src/share/classes/org/openjdk/jigsaw/Configurator.java.i
data/src/share/native/sun/java2d/loops/Ushort555Rgbx.h.i
data/make/tools/CharsetMapping/IBM285.nr.i
data/src/windows/native/sun/nio/ch/DatagramChannelImpl.c.i
data/make/jpda/transport/shmem/Makefile.i
+data/src/share/demo/jvmti/hprof/hprof_init.h.i
data/src/share/classes/sun/util/locale/UnicodeLocaleExtension.java.i
data/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java.i
data/make/sun/javazic/tzdata/backward.i
-data/make/sun/security/smartcardio/mapfile-vers.i
+data/src/share/classes/javax/swing/plaf/RootPaneUI.java.i
data/src/solaris/classes/sun/tools/attach/SolarisAttachProvider.java.i
data/src/share/classes/java/lang/Throwable.java.i
data/test/sun/tools/jstatd/all.policy.i
@@ -1063,12 +1107,12 @@ data/src/share/classes/java/nio/file/TempFileHelper.java.i
data/src/share/classes/javax/management/openmbean/package.html.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ObjectContainer.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/memmonitor.js.i
-data/test/javax/script/VersionTest.java.i
data/src/share/classes/sun/awt/im/InputMethodLocator.java.i
-data/src/windows/classes/sun/nio/ch/DatagramDispatcher.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java.i
+data/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java.i
data/src/share/classes/sun/text/resources/FormatData_da_DK.java.i
data/src/share/classes/java/awt/dnd/InvalidDnDOperationException.java.i
+data/test/java/security/cert/PolicyNode/speech2eve.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java.i
data/src/solaris/native/sun/awt/awt_GraphicsEnv.h.i
data/test/java/util/zip/3GBZipFiles.sh.i
@@ -1077,9 +1121,9 @@ data/test/sun/security/ssl/javax/net/ssl/NewAPIs/KeyManagerTrustManager.java.i
data/src/share/classes/javax/sound/sampled/Control.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor32.gif.i
data/test/javax/sound/midi/Gervill/SoftLanczosResampler/Interpolate.java.i
-data/test/sun/security/ec/keystore.i
data/src/share/classes/javax/xml/crypto/AlgorithmMethod.java.i
data/src/windows/native/sun/windows/awt_DnDDS.cpp.i
+data/src/share/classes/sun/net/www/protocol/http/NegotiatorImpl.java.i
data/test/sun/rmi/rmic/RMIGenerator/packagedir/RmicMeInterface.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHost.java.i
data/src/windows/native/sun/security/krb5/NativeCreds.c.i
@@ -1090,17 +1134,15 @@ data/src/share/classes/sun/io/CharacterEncoding.java.i
data/src/share/classes/javax/swing/JList.java.i
data/test/java/security/Security/ClassLoaderDeadlock/provider/HashProvider.java.i
data/src/share/classes/sun/reflect/generics/visitor/Reifier.java.i
-data/src/solaris/classes/sun/awt/motif/MRobotPeer.java.i
+data/src/share/classes/java/awt/ScrollPane.java.i
data/make/tools/swing-beans/beaninfo/images/JProgressBarMono32.gif.i
data/test/java/lang/instrument/ManifestTest.sh.i
data/src/share/classes/java/util/Iterator.java.i
-data/src/share/classes/javax/naming/ldap/StartTlsRequest.java.i
-data/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java.i
-data/src/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java.i
+data/make/java/java/reorder-i586.i
data/src/share/classes/java/rmi/registry/Registry.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServer.java.i
data/src/share/classes/com/sun/imageio/plugins/common/StandardMetadataFormat.java.i
-data/test/java/security/spec/ECCBasic.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java.i
data/src/share/classes/java/net/InMemoryCookieStore.java.i
data/src/share/classes/sun/print/resources/serviceui_sv.properties.i
data/src/share/classes/javax/swing/event/TableColumnModelEvent.java.i
@@ -1111,8 +1153,8 @@ data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetDirection.java.i
data/make/tools/CharsetMapping/IBM1146.map.i
data/src/solaris/native/sun/awt/awt_Mlib.c.i
data/src/windows/native/sun/java2d/d3d/D3DPipelineManager.h.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java.i
+data/src/share/classes/sun/security/provider/certpath/OCSPResponse.java.i
+data/src/share/classes/com/sun/beans/finder/ConstructorFinder.java.i
data/src/share/native/java/lang/fdlibm/src/s_isnan.c.i
data/test/java/lang/Class/getEnclosingClass/make_src.sh.i
data/src/share/classes/javax/swing/plaf/multi/MultiLabelUI.java.i
@@ -1121,7 +1163,8 @@ data/make/java/redist/sajdi/Makefile.i
data/src/share/classes/javax/xml/crypto/dsig/TransformService.java.i
data/src/share/classes/java/lang/reflect/AccessibleObject.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_no_NO.properties.i
-data/test/java/io/PushbackInputStream/Available.java.i
+data/src/share/classes/sun/io/ByteToCharHKSCS_2001.java.i
+data/make/tools/GenerateCharacter/CharacterData02.java.template.i
data/test/javax/crypto/KeyGenerator/TestGetInstance.java.i
data/test/com/sun/crypto/provider/TLS/Utils.java.i
data/src/share/classes/sun/security/krb5/internal/PAData.java.i
@@ -1137,14 +1180,15 @@ data/src/solaris/native/sun/awt/multi_font.h.i
data/test/java/util/ResourceBundle/Control/StressOut.properties.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIconRegion.java.i
data/test/java/util/Arrays/FloatDoubleOrder.java.i
-data/test/java/nio/file/attribute/BasicFileAttributeView/Basic.java.i
data/src/share/classes/javax/sql/RowSetEvent.java.i
data/src/share/classes/sun/awt/UngrabEvent.java.i
-data/src/share/classes/sun/io/CharToByteCp930.java.i
+data/src/share/classes/javax/script/Invocable.java.i
data/src/share/classes/sun/reflect/ByteVector.java.i
+data/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif.i
data/src/share/classes/java/sql/SQLXML.java.i
data/test/com/sun/management/OperatingSystemMXBean/GetSystemCpuLoad.java.i
-data/test/java/util/jar/JarInputStream/EmptyJar.java.i
+data/make/tools/CharsetMapping/MS1250.map.i
+data/src/macosx/bundle/JavaAppLauncher/src/JavaAppLauncher.h.i
data/test/java/io/PipedOutputStream/ClosedWrite.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-bw24.png.i
data/src/share/classes/sun/util/resources/CalendarData_ko.properties.i
@@ -1155,41 +1199,48 @@ data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntInt.java
data/src/share/classes/java/beans/beancontext/BeanContext.java.i
data/make/tools/swing-beans/beaninfo/images/JFrameColor16.gif.i
data/src/linux/doc/man/jdb.1.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt.i
+data/test/java/security/UnresolvedPermission/DebugPermissionBad.java.i
data/src/solaris/native/sun/java2d/loops/vis_Interp.c.i
data/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java.i
data/test/java/lang/instrument/FromShutdownHook.java.i
data/src/share/classes/javax/sql/rowset/RowSetWarning.java.i
+data/src/share/classes/org/openjdk/jigsaw/ModuleFileFormat.java.i
data/test/java/util/PluggableLocale/providersrc/BreakIteratorProviderImpl.java.i
data/make/javax/swing/plaf/nimbus/Makefile.i
-data/test/sun/nio/cs/TestIBMBugs.java.i
+data/src/share/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz.i
data/src/share/classes/sun/nio/cs/ISO_8859_1.java.i
data/src/share/demo/management/VerboseGC/VerboseGC.java.i
-data/test/com/sun/jdi/sde/MangleTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_CO.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionParserState.java.i
data/test/java/beans/XMLEncoder/java_awt_Cursor.java.i
-data/src/share/classes/java/awt/print/Paper.java.i
+data/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java.i
data/make/tools/swing-beans/GenDocletBeanInfo.java.i
data/test/sun/security/tools/jarsigner/passtype.sh.i
data/src/share/classes/sun/management/HotspotRuntimeMBean.java.i
data/src/share/classes/sun/net/www/protocol/https/DelegateHttpsURLConnection.java.i
data/test/sun/security/tools/policytool/Alias.sh.i
-data/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.i
+data/src/macosx/classes/com/apple/eawt/event/GestureUtilities.java.i
+data/src/macosx/classes/com/apple/laf/AquaInternalFrameBorder.java.i
+data/make/common/internal/Defs-corba.gmk.i
data/test/sun/security/krb5/auto/KerberosHashEqualsTest.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanInfo.java.i
data/src/solaris/native/sun/awt/awt_Font.h.i
+data/test/java/beans/XMLDecoder/spec/TestClass.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/CIF.java.i
+data/src/share/classes/javax/security/sasl/RealmChoiceCallback.java.i
data/make/tools/src/build/tools/jarreorder/JarReorder.java.i
+data/src/share/classes/java/lang/StringBuffer.java.i
data/src/share/classes/org/openjdk/jigsaw/cli/Command.java.i
data/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java.i
data/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java.i
data/test/tools/launcher/6842838/CreateBadJar.java.i
-data/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java.i
+data/src/share/classes/sun/security/rsa/SunRsaSign.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_de.properties.i
data/test/java/nio/channels/DatagramChannel/ConnectedSend.java.i
data/src/share/classes/java/io/PushbackInputStream.java.i
-data/test/java/io/File/WinMaxPath.java.i
+data/test/javax/management/mxbean/GenericTypeTest.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/MixedPrimitiveCoderClassFile.java.i
data/src/share/classes/java/security/acl/NotOwnerException.java.i
data/src/share/classes/com/sun/tracing/dtrace/StabilityLevel.java.i
data/src/share/classes/sun/io/CharToByteMacCyrillic.java.i
@@ -1197,63 +1248,59 @@ data/src/share/classes/javax/swing/RootPaneContainer.java.i
data/test/javax/management/mxbean/OverloadTest.java.i
data/src/share/classes/java/awt/MenuShortcut.java.i
data/make/java/java/Makefile.i
-data/test/java/net/BindException/Test.java.i
data/src/share/native/sun/java2d/loops/AnyShort.c.i
-data/src/share/classes/sun/text/resources/FormatData_mt.java.i
data/src/share/classes/sun/rmi/server/UnicastRef2.java.i
data/src/share/classes/javax/swing/colorchooser/ColorChooserPanel.java.i
+data/src/macosx/native/sun/awt/JavaAccessibilityAction.h.i
data/src/share/classes/sun/awt/image/ShortBandedRaster.java.i
-data/src/share/native/sun/font/layout/LEGlyphStorage.cpp.i
+data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp.i
data/src/windows/native/sun/windows/WPrinterJob.cpp.i
-data/src/share/classes/sun/util/resources/LocaleNames_no_NO_NY.properties.i
+data/src/share/classes/sun/text/resources/FormatData_ar_KW.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadTSProvider.java.i
data/src/share/classes/com/sun/jdi/event/AccessWatchpointEvent.java.i
data/make/tools/src/build/tools/generatebreakiteratordata/CharacterCategory.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyName.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Decoder.java.i
data/src/share/classes/javax/management/loading/PrivateMLet.java.i
data/src/share/classes/javax/swing/InternalFrameFocusTraversalPolicy.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/PerfDataBuffer.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ShortCalls.java.i
data/src/share/native/sun/awt/image/jpeg/jcprepct.c.i
-data/test/java/rmi/registry/interfaceHash/InterfaceHash.java.i
+data/src/share/classes/javax/security/auth/login/Configuration.java.i
data/test/com/sun/jdi/JITDebug.java.i
-data/test/java/util/logging/ParentLoggersTest.java.i
+data/src/windows/native/sun/windows/awt_PrintJob.cpp.i
data/src/share/classes/javax/management/AttributeNotFoundException.java.i
data/make/tools/src/build/tools/jdwpgen/InterfaceTypeNode.java.i
-data/src/share/classes/javax/print/CancelablePrintJob.java.i
+data/src/share/classes/java/lang/management/MemoryPoolMXBean.java.i
data/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java.i
-data/test/java/beans/Introspector/Test4634390.java.i
-data/test/java/beans/Beans/6669869/TestDesignTime.java.i
-data/src/share/classes/sun/tools/tree/PreDecExpression.java.i
+data/src/share/classes/javax/swing/event/MenuEvent.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/VarArgsTest.java.i
data/src/share/native/sun/java2d/loops/DrawPolygons.c.i
-data/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java.i
data/src/share/classes/javax/sql/rowset/webrowset.xsd.i
-data/test/sun/nio/cs/OLD/GBK_OLD.java.i
+data/test/java/lang/management/MemoryMXBean/Pending.java.i
data/src/share/classes/java/awt/color/ICC_ProfileGray.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c.i
data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.java.i
data/test/javax/management/Introspector/ExceptionsDescriptorTest.java.i
data/src/share/classes/java/security/cert/CertPathBuilderSpi.java.i
data/src/share/classes/javax/print/attribute/standard/DateTimeAtProcessing.java.i
-data/src/share/classes/sun/text/resources/CollationData_en.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedLongFieldAccessorImpl.java.i
data/test/sun/security/pkcs11/Secmod/anchor.cer.i
data/src/share/classes/sun/util/resources/CalendarData_bg.properties.i
-data/src/solaris/classes/sun/awt/X11/XWarningWindow.java.i
+data/src/macosx/native/sun/font/CGGlyphOutlines.m.i
+data/src/macosx/classes/com/apple/laf/AquaComboBoxRenderer.java.i
data/test/sun/tools/jstat/jstatSnap1.sh.i
data/src/share/classes/sun/text/normalizer/UBiDiProps.java.i
data/src/share/native/com/sun/java/util/jar/pack/bytes.h.i
-data/src/share/classes/sun/text/normalizer/Trie.java.i
data/src/share/classes/java/awt/dnd/DragGestureEvent.java.i
data/src/share/instrument/JPLISAssert.h.i
data/test/sun/security/pkcs11/Secmod/JksSetPrivateKey.java.i
data/src/share/classes/java/awt/image/LookupTable.java.i
-data/test/java/beans/XMLEncoder/Test5023559.java.i
-data/test/java/util/logging/SimpleFormatterFormat.java.i
+data/src/share/classes/sun/io/CharToByteMacTurkish.java.i
+data/src/share/classes/javax/management/StandardEmitterMBean.java.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedRandomAccessList.java.i
data/test/sun/tools/jcmd/jcmd-help-help.sh.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java.i
data/src/share/classes/java/awt/font/CharArrayIterator.java.i
data/src/windows/native/sun/windows/awt_Container.h.i
data/test/javax/xml/crypto/dsig/data/signature-x509-crt-crl.xml.i
@@ -1261,7 +1308,10 @@ data/test/sun/security/provider/PolicyFile/AliasExpansion.policy.i
data/test/java/nio/channels/SocketChannel/VectorParams.java.i
data/src/share/classes/sun/nio/cs/ext/IBM937.java.d
data/src/share/classes/com/sun/tools/jdi/ThreadAction.java.i
+data/test/java/security/Security/signedfirst/Dyn.sh.i
+data/test/java/util/PluggableLocale/CollatorProviderTest.sh.i
data/src/share/classes/sun/net/httpserver/AuthFilter.java.i
+data/src/solaris/classes/sun/nio/ch/Port.java.i
data/test/java/util/Currency/CurrencyTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_et_EE.properties.i
data/test/java/net/URL/normal_http_urls.i
@@ -1272,56 +1322,59 @@ data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_fr.prop
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/UtfHelpper.java.i
data/src/share/classes/java/lang/ref/Finalizer.java.i
data/src/share/native/com/sun/media/sound/Utilities.c.i
+data/src/share/classes/sun/security/ssl/ServerHandshaker.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java.i
data/make/tools/src/build/tools/compilefontconfig/CompileFontConfig.java.i
-data/make/common/shared/Defs-java.gmk.i
+data/src/windows/classes/java/lang/Terminator.java.i
data/test/sun/security/krb5/runNameEquals.sh.i
-data/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties.i
data/make/tools/CharsetMapping/KOI8_U.map.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Protocol.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassMapper.java.i
data/src/windows/native/sun/windows/awt_DCHolder.h.i
data/src/share/classes/sun/io/ByteToCharCp863.java.i
-data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif.i
data/test/javax/sound/midi/Gervill/SoftCubicResampler/Interpolate.java.i
data/make/java/fdlibm/FILES_c.gmk.i
-data/src/share/classes/sun/security/util/DerOutputStream.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png.i
data/src/share/classes/sun/security/x509/InhibitAnyPolicyExtension.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java.i
data/src/share/classes/java/util/concurrent/ConcurrentMap.java.i
data/src/share/classes/sun/security/pkcs11/SunPKCS11.java.i
data/test/sun/nio/cs/ZeroedByteArrayEUCTWTest.java.i
-data/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java.i
+data/test/java/io/Serializable/proxy/replace/ReadResolve.java.i
data/test/sun/security/provider/SeedGenerator/SeedGeneratorChoice.java.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/Foo.java.i
+data/src/share/classes/sun/io/ByteToCharISO8859_5.java.i
data/src/share/native/sun/java2d/loops/GlyphImageRef.h.i
data/test/java/lang/Thread/ThreadStateTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKConstants.java.i
data/src/share/classes/com/sun/tools/jdi/LinkedHashMap.java.i
+data/src/share/classes/java/sql/SQLPermission.java.i
data/src/share/classes/com/sun/jdi/event/StepEvent.java.i
data/src/share/demo/jfc/Metalworks/DemoMetalTheme.java.i
data/src/share/classes/java/util/concurrent/RunnableFuture.java.i
-data/src/share/classes/java/lang/IndexOutOfBoundsException.java.i
+data/src/macosx/native/jobjc/runjava.i
data/src/share/classes/sun/beans/editors/StringEditor.java.i
data/src/windows/native/sun/windows/awt_Clipboard.cpp.i
data/test/sun/tools/jstatd/jstatdExternalRegistry.sh.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh.i
data/test/javax/management/remote/mandatory/notif/AddRemoveTest.java.i
data/src/share/classes/javax/management/event/FetchingEventRelay.java.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/AbsoluteComponentCenterCalculator.java.i
data/src/share/classes/com/sun/tools/example/trace/Trace.java.i
data/src/share/classes/javax/print/attribute/standard/NumberUp.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/security.policy.i
data/src/share/classes/sun/java2d/loops/SurfaceType.java.i
data/src/share/classes/javax/management/MBeanServerPermission.java.i
-data/src/share/native/sun/security/ec/impl/ecp.h.i
+data/src/macosx/classes/com/apple/laf/AquaButtonCheckBoxUI.java.i
data/src/share/classes/sun/nio/ch/CompletedFuture.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/BasicTest.java.i
data/src/share/classes/java/io/Externalizable.java.i
+data/test/java/awt/print/Dialog/DialogType.java.i
data/src/share/classes/com/sun/jndi/ldap/DefaultResponseControlFactory.java.i
+data/src/bsd/doc/man/ja/javaws.1.i
data/src/share/classes/sun/awt/ComponentFactory.java.i
-data/test/java/nio/channels/SocketChannel/OutOfBand.java.i
-data/test/java/util/zip/Bounds.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/Question.gif.i
data/test/java/nio/channels/Selector/HelperSlowToDie.java.i
data/src/share/classes/sun/awt/dnd/SunDropTargetContextPeer.java.i
data/src/share/native/java/lang/fdlibm/src/w_gamma_r.c.i
@@ -1333,39 +1386,39 @@ data/test/javax/xml/crypto/dsig/data/signature-x509-is.xml.i
data/make/mkdemo/applets/JumpingBox/Makefile.i
data/src/share/native/sun/awt/image/cvutils/img_ordgray.h.i
data/src/share/native/sun/java2d/loops/Ushort555Rgb.c.i
-data/src/share/classes/sun/io/ByteToCharCp949C.java.i
data/make/LICENSE.i
-data/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java.i
data/src/share/classes/java/util/zip/CheckedInputStream.java.i
data/src/solaris/doc/sun/man/man1/jinfo.1.i
data/src/share/classes/java/lang/Double.java.i
data/src/share/classes/com/sun/jdi/IntegerValue.java.i
data/src/share/classes/sun/misc/IOUtils.java.i
data/test/java/security/Security/SynchronizedAccess.java.i
-data/src/share/classes/javax/swing/text/JTextComponent.java.i
-data/test/sun/security/pkcs11/ec/TestECDH.java.i
+data/src/share/classes/java/text/RuleBasedCollator.java.i
+data/src/bsd/doc/man/ja/wsgen.1.i
+data/test/java/rmi/server/useCustomRef/UseCustomRef.java.i
+data/src/macosx/native/sun/awt/CDataTransferer.h.i
data/test/javax/security/auth/login/Configuration/GetInstanceProvider.java.i
data/src/share/classes/javax/sql/rowset/package.html.i
data/test/java/util/zip/StreamConstructor.java.i
data/src/share/classes/java/nio/Direct-X-Buffer-bin.java.template.i
data/test/java/util/Locale/serialized/java6locale_ja_JP_JP.i
-data/test/java/lang/Boolean/Factory.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c.i
data/src/share/classes/sun/management/counter/Counter.java.i
data/src/share/classes/com/sun/java/swing/plaf/nimbus/AbstractRegionPainter.java.i
data/test/sun/management/jmxremote/bootstrap/JvmstatCountersTest.java.i
data/test/java/lang/annotation/loaderLeak/Main.java.i
+data/src/macosx/native/jobjc/src/core/PrimitiveCoder.hs.i
data/test/javax/management/remote/mandatory/notif/DiffHBTest.java.i
data/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipDirectoryStream.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c.i
+data/src/share/classes/java/awt/dnd/DropTargetDragEvent.java.i
data/test/java/beans/PropertyEditor/TestDoubleClassJava.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java.i
data/src/share/classes/com/sun/jndi/cosnaming/OrbReuseTracker.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java.i
-data/make/mkdemo/jvmti/gctest/Makefile.i
data/make/mkdemo/jvmti/Makefile.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor16.gif.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java.i
+data/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg.i
data/src/share/classes/com/sun/media/sound/EmergencySoundbank.java.i
data/src/share/classes/sun/io/ByteToCharCp1124.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SocketCreation/SocketCreation.java.i
@@ -1378,17 +1431,19 @@ data/src/share/classes/javax/sql/CommonDataSource.java.i
data/src/share/classes/javax/net/ssl/SSLKeyException.java.i
data/src/linux/doc/man/ja/tnameserv.1.i
data/test/javax/naming/Name/j2se13-name.ser.i
-data/test/java/rmi/server/RMIClassLoader/spi/security.policy.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS.i
data/src/share/classes/javax/sound/sampled/CompoundControl.java.i
data/make/tools/swing-beans/beaninfo/images/JEditorPaneMono32.gif.i
data/test/java/beans/PropertyEditor/TestBooleanTypeJava.java.i
+data/src/share/classes/javax/swing/JRadioButtonMenuItem.java.i
data/src/share/classes/java/net/ConnectException.java.i
+data/src/share/classes/java/util/UUID.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility.properties.i
data/src/windows/native/sun/windows/CmdIDList.h.i
-data/test/sun/security/pkcs11/SecureRandom/Basic.java.i
+data/src/share/classes/com/sun/media/sound/SoftPointResampler.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java.i
data/src/share/classes/java/security/cert/CRLSelector.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_8.java.i
+data/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java.i
data/src/share/classes/java/lang/StrictMath.java.i
data/src/share/sample/jmx/jmx-scandir/manifest.mf.i
data/test/java/security/Provider/RemoveProvider.java.i
@@ -1397,41 +1452,40 @@ data/src/share/classes/java/nio/charset/spi/CharsetProvider.java.i
data/src/share/classes/sun/util/resources/CalendarData_uk.properties.i
data/src/share/classes/javax/sql/rowset/spi/SyncProvider.java.i
data/src/share/classes/javax/naming/ContextNotEmptyException.java.i
+data/src/share/classes/java/nio/file/WatchKey.java.i
data/src/solaris/classes/sun/java2d/xr/XRBackendNative.java.i
data/test/com/sun/nio/sctp/SctpServerChannel/Util.java.i
data/src/share/classes/javax/swing/plaf/synth/DefaultSynthStyleFactory.java.i
-data/test/sun/tools/jstat/jstatLineCounts3.sh.i
data/test/sun/security/tools/policytool/UpdatePermissions.html.i
data/src/share/classes/sun/font/GraphicComponent.java.i
data/test/java/lang/Class/getEnclosingClass/EnclosingClassTest.java.i
-data/test/javax/management/remote/mandatory/loading/SingleClassLoader.java.i
-data/test/javax/security/auth/login/LoginContext/ResetConfigModule.java.i
+data/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java.i
data/test/java/nio/channels/SocketChannel/SocketInheritance.java.i
data/test/java/rmi/registry/emptyName/EmptyName.java.i
data/src/share/classes/javax/naming/directory/InvalidAttributeIdentifierException.java.i
data/test/javax/xml/crypto/dsig/data/xml-stylesheet.i
+data/src/share/classes/com/sun/crypto/provider/JarVerifier.java.i
data/src/share/classes/javax/crypto/package.html.i
data/src/share/classes/com/sun/jdi/event/MethodEntryEvent.java.i
data/src/windows/bin/ia64/jvm.cfg.i
data/src/share/classes/java/util/TimSort.java.i
+data/make/tools/CharsetMapping/IBM939.c2b.i
data/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java.i
data/src/share/classes/sun/awt/SunDisplayChanger.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/Node.java.i
data/src/share/classes/com/sun/tools/jconsole/JConsolePlugin.java.i
-data/src/share/back/eventHandler.h.i
+data/src/share/classes/sun/nio/cs/UTF_16BE.java.i
data/src/solaris/demo/jni/Poller/README.txt.i
data/test/com/sun/nio/sctp/MessageInfoTests.java.i
data/src/share/native/com/sun/media/sound/MidiInDeviceProvider.c.i
data/src/share/native/sun/awt/image/cvutils/img_colors.c.i
data/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4361044.java.i
-data/test/java/lang/management/ThreadMXBean/ThreadExecutionSynchronizer.java.i
-data/make/altclasses/Makefile.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserTreeConstants.java.i
data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1.xml.i
data/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java.i
data/src/share/classes/java/util/concurrent/ConcurrentLinkedDeque.java.i
data/src/share/classes/java/awt/doc-files/modal-example4.gif.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_TN.properties.i
data/src/share/classes/sun/io/CharToByteCp1046.java.i
data/src/share/classes/java/nio/file/attribute/package-info.java.i
data/src/share/native/sun/awt/image/jpeg/jcomapi.c.i
@@ -1440,11 +1494,12 @@ data/src/share/native/sun/awt/image/cvutils/img_ordclrsgn.h.i
data/src/share/classes/com/sun/jdi/event/MonitorWaitEvent.java.i
data/test/java/util/Formatter/BasicShortObject.java.i
data/test/java/io/BufferedInputStream/CountUpdate.java.i
+data/src/macosx/classes/com/apple/laf/AquaTextFieldFormattedUI.java.i
+data/test/java/util/Timer/DelayOverflow.java.i
data/test/org/openjdk/jigsaw/optional-reexport.sh.i
-data/src/solaris/native/sun/awt/awt_Button.c.i
-data/src/share/classes/sun/text/resources/FormatData_ko_KR.java.i
-data/src/share/classes/java/awt/GraphicsEnvironment.java.i
-data/src/share/classes/sun/jkernel/Mutex.java.i
+data/src/share/classes/sun/font/SunFontManager.java.i
+data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java.i
+data/src/linux/doc/man/ja/javadoc.1.d
data/src/share/classes/sun/security/provider/certpath/OCSPChecker.java.i
data/src/solaris/native/sun/awt/X11Color.c.i
data/src/share/classes/java/util/logging/MemoryHandler.java.i
@@ -1453,14 +1508,16 @@ data/test/javax/management/modelmbean/ModelMBeanInfoSupport/policy.i
data/src/share/classes/sun/security/util/AuthResources_zh_CN.java.i
data/test/java/util/Formatter/Basic-X.java.template.i
data/src/share/classes/sun/util/resources/LocaleNames_es_US.properties.i
-data/make/netbeans/common/closed-share-view.ent.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties.i
-data/src/share/classes/sun/util/resources/LocaleNames_in.properties.i
+data/src/linux/doc/man/ja/javadoc.1.i
+data/test/java/io/StreamTokenizer/input.txt.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c.i
data/make/tools/swing-beans/beaninfo/images/BoxMono32.gif.i
+data/src/share/classes/javax/imageio/metadata/package.html.i
data/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java.i
data/src/share/classes/sun/misc/ExtensionDependency.java.i
data/src/share/classes/com/sun/jndi/ldap/sasl/SaslInputStream.java.i
+data/src/share/demo/applets/MoleculeViewer/XYZApp.java.i
data/make/tools/swing-beans/beaninfo/images/JScrollBarMono16.gif.i
data/test/java/util/TimeZone/TimeZoneDatePermissionCheck.sh.i
data/src/windows/native/sun/windows/DllUtil.cpp.i
@@ -1476,53 +1533,61 @@ data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so.d
data/src/share/classes/sun/invoke/WrapperInstance.java.i
data/src/share/demo/jvmti/versionCheck/sample.makefile.txt.i
data/test/java/io/File/ListRoots.java.i
-data/test/sun/tools/jps/jps-l_Output1.awk.i
-data/test/java/lang/instrument/RedefineMethodAddInvokeAgent.java.i
-data/src/share/classes/sun/security/util/BigInt.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c.i
+data/src/share/classes/java/util/MissingResourceException.java.i
+data/src/macosx/classes/com/apple/concurrent/LibDispatchMainQueue.java.i
+data/src/share/classes/sun/applet/AppletPanel.java.i
+data/src/macosx/classes/com/apple/laf/AquaNativeResources.java.i
data/test/javax/management/loading/LibraryLoader/LibraryLoaderTest.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/infback.c.i
data/src/share/classes/java/lang/management/ThreadMXBean.java.i
data/src/share/classes/sun/tools/asm/CatchData.java.i
data/test/java/util/Collection/BiggernYours.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.xml.i
+data/src/share/classes/sun/java2d/FontSupport.java.i
data/src/share/classes/javax/swing/SpinnerModel.java.i
data/src/share/classes/com/sun/jmx/snmp/Enumerated.java.i
+data/src/share/classes/sun/swing/text/CountingPrintable.java.i
data/test/sun/security/krb5/auto/PrincipalNameEquals.java.i
data/test/java/security/Security/signedfirst/keystore.jks.i
data/src/share/classes/sun/rmi/rmic/Generator.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapClient.java.i
data/src/share/classes/java/io/ObjectOutputStream.java.i
-data/src/share/classes/javax/swing/text/AsyncBoxView.java.i
+data/src/share/classes/javax/swing/border/EtchedBorder.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java.i
data/src/share/demo/applets/WireFrame/example1.html.i
data/make/sunw/Makefile.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargePacket.java.i
data/test/javax/management/namespace/NamespaceController.java.i
+data/src/macosx/native/jobjc/src/core/native/NativeBuffer.h.i
data/make/mkdemo/jfc/FileChooserDemo/Makefile.i
-data/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy.i
+data/src/share/classes/sun/util/resources/TimeZoneNames_de.java.i
data/src/share/classes/java/text/StringCharacterIterator.java.i
data/src/share/classes/sun/util/resources/CalendarData_da.properties.i
+data/test/sun/security/provider/certpath/X509CertPath/ReverseBuildCompromised.java.i
data/test/java/lang/StringBuffer/SBBasher.java.i
data/src/share/classes/sun/misc/UCDecoder.java.i
data/src/share/classes/sun/io/CharToByteISO2022JP.java.i
data/test/java/security/cert/CertPathValidator/nameConstraints/generate.sh.i
data/src/share/classes/java/io/FileNotFoundException.java.i
-data/test/sun/security/jgss/CtorTests2.java.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties.i
data/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java.i
data/src/solaris/demo/jni/Poller/SimpleServer.java.i
+data/src/share/native/sun/font/layout/LookupTables.h.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignContext.java.i
data/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLibMBean.java.i
+data/src/solaris/bin/sparcv9/jvm.cfg.i
+data/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java.i
data/src/share/classes/sun/swing/plaf/synth/DefaultSynthStyle.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/A.2.i
data/test/java/rmi/server/Unreferenced/leaseCheckInterval/SelfTerminator.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecBuilder.java.i
+data/src/share/classes/sun/text/normalizer/ICUBinary.java.i
data/src/share/classes/com/sun/media/sound/EventDispatcher.java.i
-data/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.i
data/src/windows/native/sun/jkernel/kernel.h.i
data/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java.i
data/test/java/security/Security/NoInstalledProviders.java.i
data/test/java/io/charStreams/IntGenerator.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Matte.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java.i
data/test/java/beans/XMLEncoder/java_util_EnumMap.java.i
data/make/tools/CharsetMapping/IBM273.nr.i
data/src/share/classes/javax/imageio/spi/ImageWriterSpi.java.i
@@ -1533,7 +1598,7 @@ data/src/share/classes/com/sun/jmx/snmp/SnmpPduRequestType.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormatResources.java.i
data/src/share/classes/sun/util/resources/LocaleNames_cs.properties.i
data/src/share/classes/javax/security/auth/kerberos/package.html.i
-data/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java.i
+data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java.i
data/src/share/classes/sun/invoke/util/BytecodeName.java.i
data/src/share/classes/java/security/UnresolvedPermission.java.i
@@ -1543,23 +1608,22 @@ data/src/windows/classes/sun/nio/fs/WindowsPathParser.java.i
data/make/common/internal/Defs-langtools.gmk.i
data/test/sun/security/tools/keytool/importreadall.sh.i
data/make/tools/swing-beans/beaninfo/images/JSplitPaneColor32.gif.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java.i
data/make/tools/freetypecheck/freetypecheck.c.i
-data/test/java/net/URLConnection/HandleContentTypeWithAttrs.java.i
-data/make/java/util/FILES_properties.gmk.i
-data/test/java/security/KeyPairGenerator/SolarisShortDSA.java.i
+data/src/share/classes/com/sun/jdi/event/ExceptionEvent.java.i
data/make/java/nio/reorder-i586.i
-data/make/tools/CharsetMapping/SingleByte-X.java.i
+data/test/java/util/TreeMap/NullPermissiveComparator.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Canvas.java.i
data/test/java/util/PluggableLocale/providersrc/NumberFormatProviderImpl.java.i
data/test/sun/security/provider/PolicyFile/getinstance/NoArgPermission.java.i
data/make/mkdemo/Makefile.i
-data/src/solaris/native/sun/awt/awt_Insets.h.i
+data/src/macosx/native/com/apple/concurrent/Dispatch.m.i
data/test/java/beans/XMLEncoder/4741757/TestFieldAccess.java.i
+data/src/share/classes/sun/security/jgss/ProviderList.java.i
data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/security.policy.i
+data/src/macosx/classes/com/apple/laf/AquaToolBarUI.java.i
data/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java.i
data/test/javax/management/eventService/SharingThreadTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_el.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaInt.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/CodeAttributeParser.java.i
data/test/java/beans/PropertyEditor/TestLongClassValue.java.i
@@ -1569,43 +1633,43 @@ data/test/java/rmi/activation/CommandEnvironment/rmid.security.policy.i
data/test/java/lang/instrument/BootClassPath/AgentSupport.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_de.properties.i
data/src/share/classes/com/sun/media/sound/SF2Region.java.i
-data/test/sun/tools/jstat/lineCounts4.awk.i
data/test/java/security/cert/CertPath/cert_file.i
data/src/share/classes/sun/awt/DesktopBrowse.java.i
data/test/java/io/PipedReader/Constructors.java.i
data/src/share/native/sun/security/ec/secoidt.h.i
data/src/share/sample/nio/chatserver/MessageReader.java.i
-data/test/java/security/CodeSigner/Serialize.java.i
-data/src/share/classes/sun/misc/CRC16.java.i
+data/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java.i
data/src/share/back/eventFilterRestricted.h.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java.i
data/src/share/classes/sun/nio/ch/Util.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libnssckbi.so.i
-data/test/java/util/Collections/Ser.java.i
+data/src/share/classes/sun/text/resources/FormatData_zh_SG.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUIAccessor.java.i
data/test/java/security/UnresolvedPermission/Debug.policy.i
data/src/windows/classes/sun/awt/windows/WScrollbarPeer.java.i
data/src/share/classes/sun/io/CharToByteCp277.java.i
data/src/share/classes/java/rmi/server/SkeletonMismatchException.java.i
data/src/share/classes/javax/management/MBeanFeatureInfo.java.i
-data/src/share/native/sun/java2d/loops/Ushort555Rgb.h.i
+data/src/share/classes/javax/management/relation/RoleStatus.java.i
data/src/windows/native/sun/java2d/windows/WindowsFlags.cpp.i
-data/test/java/nio/channels/Selector/KeysReady.java.i
+data/src/share/classes/javax/swing/table/AbstractTableModel.java.i
data/src/share/classes/java/security/KeyPairGeneratorSpi.java.i
-data/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.lib.i
data/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java.i
data/src/share/classes/java/rmi/UnmarshalException.java.i
-data/src/share/classes/java/awt/image/DataBufferByte.java.i
data/src/share/classes/javax/management/PersistentMBean.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ArrayQueue.java.i
data/src/share/classes/com/sun/beans/decoder/ObjectElementHandler.java.i
+data/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java.i
data/test/java/io/PrintStream/ClearErrorStream.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/ClassConverter.java.i
+data/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png.i
data/src/share/classes/sun/io/CharToByteISO2022CN_CNS.java.i
+data/src/solaris/classes/sun/awt/X11/XCustomCursor.java.i
data/src/share/native/sun/security/pkcs11/j2secmod.c.i
+data/test/javax/management/remote/mandatory/subjectDelegation/jmxremote.password.i
data/test/java/math/BigDecimal/IntegralDivisionTests.java.i
-data/src/share/native/sun/font/layout/Lookups.cpp.i
-data/src/share/classes/sun/security/action/PutAllAction.java.i
+data/src/share/classes/sun/tools/tree/PreDecExpression.java.i
data/src/windows/native/sun/windows/awt_Panel.cpp.i
data/src/share/classes/java/lang/Enum.java.i
data/src/share/classes/java/text/NumberFormat.java.i
@@ -1613,24 +1677,23 @@ data/test/java/text/Bidi/BidiSurrogateTest.java.i
data/make/com/sun/nio/sctp/Makefile.i
data/src/share/classes/javax/swing/text/html/parser/TagStack.java.i
data/test/java/net/DatagramSocket/PortUnreachable.java.i
-data/test/com/sun/net/httpserver/Test13.java.i
-data/test/java/util/EnumSet/EnumSetBash.java.i
+data/src/share/classes/java/awt/peer/TrayIconPeer.java.i
data/test/org/openjdk/jigsaw/hello-jar.sh.i
data/src/solaris/doc/sun/man/man1/javaws.1.i
data/test/java/lang/Class/TypeCheckMicroBenchmark.java.i
-data/test/sun/misc/Cleaner/ExitOnThrow.java.i
+data/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/src/share/classes/sun/io/ByteToCharCp852.java.i
+data/src/solaris/native/java/net/linux_close.c.i
data/src/share/classes/sun/io/ByteToCharISO8859_4.java.i
data/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java.i
-data/make/sun/security/jgss/Makefile.i
data/src/share/native/sun/java2d/Disposer.c.i
-data/src/share/classes/sun/security/x509/CertificateValidity.java.i
+data/src/macosx/native/sun/awt/CDragSource.m.i
data/src/share/classes/com/sun/net/httpserver/HttpsServer.java.i
data/src/share/classes/java/nio/file/attribute/AttributeView.java.i
data/test/java/net/URLConnection/Responses.java.i
-data/src/share/classes/sun/security/x509/CertException.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiViewportUI.java.i
-data/test/com/sun/servicetag/FindServiceTags.java.i
+data/src/solaris/classes/sun/java2d/xr/XRBackend.java.i
data/src/share/bin/main.c.i
data/make/tools/CharsetMapping/IBM930.map.i
data/src/share/classes/java/awt/SequencedEvent.java.i
@@ -1639,7 +1702,7 @@ data/src/share/classes/sun/tools/java/ParserActions.java.i
data/test/javax/management/Introspector/AnnotationSecurityTest.java.i
data/test/java/io/BufferedReader/SkipNegative.java.i
data/src/share/classes/java/awt/RadialGradientPaintContext.java.i
-data/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector.i
+data/src/share/classes/java/util/concurrent/atomic/AtomicLong.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load9.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileAttributes.java.i
data/src/share/classes/sun/security/krb5/internal/EncTGSRepPart.java.i
@@ -1648,27 +1711,30 @@ data/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java.i
data/src/share/classes/sun/reflect/generics/tree/ShortSignature.java.i
data/src/share/classes/com/sun/media/sound/DLSModulator.java.i
data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.login.i
-data/src/share/classes/sun/security/krb5/internal/LastReq.java.i
-data/src/share/classes/javax/swing/InputVerifier.java.i
+data/test/tools/jar/ChangeDir.java.i
+data/src/share/classes/java/util/concurrent/FutureTask.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTabbedPaneUI.java.i
data/src/share/classes/java/security/KeyRep.java.i
data/test/java/lang/Runtime/exec/BadEnvp.java.i
data/src/share/classes/javax/swing/SpinnerNumberModel.java.i
+data/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Commands.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ClassFileParser.java.i
data/src/share/classes/com/sun/pept/Delegate.java.i
data/src/share/classes/javax/swing/plaf/basic/LazyActionMap.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/ActivateMe.java.i
-data/src/share/classes/sun/security/tools/KeyStoreUtil.java.i
+data/src/share/classes/javax/print/FlavorException.java.i
data/src/share/classes/sun/security/action/OpenFileInputStreamAction.java.i
data/test/sun/security/tools/keytool/CloneKeyAskPassword.jks.i
data/src/share/classes/java/awt/PrintGraphics.java.i
data/test/java/util/concurrent/Phaser/FickleRegister.java.i
data/test/java/net/URLConnection/contentHandler/UserContentHandler.java.i
+data/test/lib/security/cacerts/VerifyCACerts.java.i
data/test/java/io/LineNumberReader/Read.java.i
data/src/share/classes/sun/tools/tree/AssignRemainderExpression.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java.i
-data/test/java/lang/Runtime/exec/setcwd.sh.i
+data/src/macosx/native/jobjc/src/core/native/Coder.m.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java.i
+data/src/macosx/native/jobjc/src/core/native/CIF.m.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedKey.java.i
data/src/windows/classes/sun/security/mscapi/RSACipher.java.i
data/src/share/classes/com/sun/net/ssl/SSLContext.java.i
@@ -1679,11 +1745,13 @@ data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSo
data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/security.policy.i
data/src/share/classes/java/lang/invoke/MethodHandles.java.i
data/src/share/sample/jmx/jmx-scandir/nbproject/project.xml.i
-data/src/share/classes/javax/swing/event/DocumentListener.java.i
+data/src/share/instrument/Reentrancy.h.i
data/src/share/classes/javax/swing/text/html/AccessibleHTML.java.i
+data/src/bsd/doc/man/ja/java.1.i
data/src/share/classes/javax/swing/text/StyledDocument.java.i
data/src/share/classes/javax/swing/text/GapContent.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpSendInputStream.java.i
+data/src/share/classes/java/awt/JobAttributes.java.i
data/src/share/classes/javax/crypto/spec/PSource.java.i
data/src/share/classes/java/beans/ChangeListenerMap.java.i
data/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure_Stub.java.i
@@ -1691,38 +1759,38 @@ data/src/share/classes/com/sun/jarsigner/ContentSignerParameters.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java.i
data/make/com/sun/tools/Makefile.i
data/test/java/io/Serializable/unshared/Write.java.i
-data/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy.i
+data/test/java/net/URLClassLoader/getresourceasstream/test.sh.i
data/test/java/awt/Component/Revalidate/Revalidate.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh.i
-data/src/solaris/classes/sun/nio/ch/SctpSendFailed.java.i
+data/src/share/classes/sun/security/x509/CertificateSerialNumber.java.i
data/src/linux/doc/man/jmap.1.i
-data/test/sun/java2d/XRenderBlitsTest.java.i
+data/src/share/classes/sun/tools/jar/JarException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithm.java.i
+data/src/macosx/classes/com/apple/laf/AquaScrollPaneUI.java.i
data/test/java/net/Authenticator/BasicTest3.java.i
data/src/share/classes/sun/text/resources/CollationData_hi.java.i
data/src/share/classes/java/awt/dnd/DropTargetDropEvent.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Subclassing.java.i
+data/src/solaris/native/sun/nio/fs/genUnixConstants.c.i
+data/src/macosx/native/sun/awt/CDesktopPeer.m.i
data/src/share/classes/sun/text/resources/FormatData_en_ZA.java.i
data/test/javax/swing/JSlider/6923305/bug6923305.java.i
data/src/windows/native/sun/windows/Devices.cpp.i
-data/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java.i
data/src/share/classes/sun/util/calendar/LocalGregorianCalendar.java.i
data/make/tools/src/build/tools/jdwpgen/ThreadGroupObjectTypeNode.java.i
-data/test/sun/net/www/protocol/jar/jarbug/src/test/RunAllTests.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c.i
data/test/sun/nio/cs/SurrogateGB18030Test.java.i
data/src/share/classes/java/util/spi/CurrencyNameProvider.java.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c.i
data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgr.c.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.java.i
data/src/solaris/classes/sun/awt/motif/MPopupMenuPeer.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c.i
-data/test/javax/security/auth/Subject/Serial.java.i
+data/src/linux/doc/man/jsadebugd.1.i
data/src/share/classes/javax/swing/JTextPane.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_HN.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java.i
data/src/share/classes/javax/security/auth/AuthPermission.java.i
-data/src/share/classes/java/lang/InstantiationException.java.i
-data/src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java.i
+data/make/netbeans/common/windows-sources.ent.i
data/src/share/classes/sun/io/ByteToCharKOI8_R.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java.i
+data/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java.i
data/test/java/lang/reflect/DefaultAccessibility.java.i
data/src/share/classes/java/rmi/RMISecurityManager.java.i
data/test/java/awt/regtesthelpers/AbstractPolicyTest.java.i
@@ -1732,96 +1800,106 @@ data/src/share/classes/sun/awt/image/VSyncedBSManager.java.i
data/test/java/nio/channels/SocketChannel/LocalAddress.java.i
data/src/share/native/sun/awt/image/awt_parseImage.h.i
data/test/java/nio/channels/Selector/LotsOfChannels.java.i
-data/test/sun/text/resources/Collator/Bug4848897.java.i
+data/src/share/classes/java/io/InputStreamReader.java.i
+data/src/share/classes/sun/tools/javac/CompilerMember.java.i
data/src/share/classes/sun/nio/fs/AbstractPoller.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java.i
+data/test/javax/print/LookupServices.java.i
data/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh.i
+data/src/share/classes/javax/management/event/EventConsumer.java.i
data/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java.i
data/src/share/classes/sun/misc/SoftCache.java.i
data/src/share/classes/sun/security/pkcs11/P11DSAKeyFactory.java.i
-data/src/share/classes/sun/awt/image/OffScreenImageSource.java.i
+data/src/share/classes/java/nio/file/CopyMoveHelper.java.i
+data/src/share/classes/javax/management/event/EventRelay.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/IndentingWriter.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Transforms.java.i
data/test/java/io/FileOutputStream/FileOpenNeg.java.i
data/src/share/classes/java/awt/dnd/DragSource.java.i
data/test/sun/nio/cs/FindOneCharEncoderBugs.java.i
+data/src/macosx/classes/sun/lwawt/LWWindowPeer.java.i
data/src/share/classes/sun/tools/tree/CompoundStatement.java.i
data/src/share/classes/java/security/acl/AclEntry.java.i
-data/test/com/sun/jdi/ClassesByName2Test.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ru.properties.i
+data/src/share/classes/java/awt/event/MouseMotionAdapter.java.i
data/make/org/ietf/jgss/Makefile.i
data/src/share/classes/com/sun/jmx/mbeanserver/Repository.java.i
data/make/javax/sql/Makefile.i
data/src/windows/native/sun/jkernel/kernel_zh.rc.i
data/src/share/native/sun/font/layout/SegmentArrayProcessor.h.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_DZ.properties.i
-data/src/share/native/sun/awt/image/cvutils/img_output8.h.i
-data/src/share/classes/sun/net/www/protocol/http/AuthScheme.java.i
+data/src/macosx/native/sun/awt/DnDUtilities.h.i
+data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java.i
data/src/share/classes/java/util/concurrent/RecursiveTask.java.i
data/test/com/sun/java/swing/plaf/gtk/Test6963870.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.xsd.i
-data/src/share/classes/sun/security/krb5/internal/SeqNumber.java.i
data/test/java/awt/Focus/RequestFocusAndHideTest/RequestFocusAndHideTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1142.java.i
data/src/share/classes/javax/swing/colorchooser/ValueFormatter.java.i
data/test/sun/security/pkcs11/Secmod/cert8.db.i
+data/src/macosx/classes/com/apple/laf/AquaTextFieldUI.java.i
+data/src/solaris/native/sun/nio/ch/KQueuePort.c.i
data/src/solaris/classes/sun/awt/X11/XDragAndDropProtocols.java.i
data/src/share/native/sun/font/bidi/jbidi.h.i
data/src/share/native/java/lang/fdlibm/src/w_log.c.i
data/src/share/classes/sun/swing/DefaultLookup.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderResources.java.i
-data/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c.i
+data/src/macosx/native/sun/awt/CWrapper.h.i
data/src/share/classes/java/net/URLEncoder.java.i
data/test/java/lang/Runtime/exec/LotsOfOutput.java.i
-data/test/java/lang/instrument/RedefineClassWithNativeMethod.sh.i
+data/src/share/native/sun/java2d/loops/AnyByte.c.i
+data/src/macosx/native/sun/awt/CWrapper.m.i
+data/src/share/classes/javax/xml/crypto/KeySelector.java.i
data/src/share/classes/sun/awt/im/InputMethodJFrame.java.i
data/test/com/sun/security/auth/callback/TextCallbackHandler/Password.java.i
data/src/solaris/native/sun/java2d/opengl/J2D_GL/glxext.h.i
-data/src/share/classes/java/awt/geom/IllegalPathStateException.java.i
data/src/share/classes/java/security/cert/CertificateParsingException.java.i
-data/test/java/util/ResourceBundle/RestrictedBundleTest.html.i
data/test/java/util/concurrent/BlockingQueue/SingleProducerMultipleConsumerLoops.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/IsSoundbankSupported.java.i
data/src/share/classes/javax/accessibility/AccessibleAction.java.i
-data/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java.i
data/make/tools/src/build/tools/javazic/Time.java.i
data/src/share/classes/sun/io/ByteToCharCp861.java.i
data/src/share/classes/sun/tools/tree/DoubleExpression.java.i
-data/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java.i
data/test/java/net/InetAddress/ptr/Lookup.java.i
data/src/share/native/sun/security/ec/ecl-curve.h.i
-data/test/sun/nio/cs/TestEUC_TW.java.i
+data/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java.i
+data/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java.i
data/make/sun/javazic/tzdata/southamerica.i
-data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.sh.i
-data/test/org/openjdk/jigsaw/services/services-jar.sh.i
+data/src/share/classes/java/security/spec/ECParameterSpec.java.i
+data/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties.i
data/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c.i
data/src/share/classes/java/lang/annotation/AnnotationFormatError.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SSLSocketImplThrowsWrongExceptions.java.i
data/test/com/sun/jdi/JdbArgTest.sh.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties.i
data/src/share/classes/sun/nio/cs/IBM858.java.i
data/test/sun/tools/common/SleeperApplication.java.i
+data/src/share/classes/sun/tools/java/IdentifierToken.java.i
+data/src/macosx/classes/com/apple/laf/AquaInternalFrameUI.java.i
data/make/tools/CharsetMapping/IBM280.c2b.i
data/src/share/classes/org/openjdk/jigsaw/Resolution.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java.i
data/test/java/util/TreeMap/SubMapClear.java.i
data/src/share/classes/java/io/SyncFailedException.java.i
-data/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java.i
+data/src/share/classes/sun/management/resources/agent_it.properties.i
data/src/share/demo/nbproject/management/JTop/nbproject/netbeans-targets.xml.i
data/src/share/classes/sun/awt/image/BufImgSurfaceManager.java.i
data/test/java/net/URLClassLoader/sealing/manifest.i
data/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java.i
-data/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CAccessibility.java.i
+data/test/java/net/URLConnection/ResendPostBody.java.i
data/src/windows/classes/sun/nio/fs/WindowsUserPrincipals.java.i
data/src/share/classes/sun/text/resources/FormatData_fr_CH.java.i
data/src/share/classes/java/security/acl/package.html.i
data/src/solaris/classes/sun/awt/motif/MScrollbarPeer.java.i
data/make/sun/serialver/Makefile.i
data/test/tools/launcher/ClassPathWildCard.sh.i
+data/src/share/test/pack200/pack.conf.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.rng.i
data/test/javax/management/interop/MBeanExceptionInteropTest.java.i
data/test/java/awt/Window/GrabSequence/GrabSequence.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js.i
+data/src/share/classes/javax/management/openmbean/TabularType.java.i
data/src/share/classes/java/awt/TrayIcon.java.i
data/src/share/classes/com/sun/crypto/provider/CipherFeedback.java.i
data/test/java/net/URLEncoder/DecodeNonEncoded.java.i
@@ -1834,12 +1912,12 @@ data/src/share/classes/sun/awt/shell/ShellFolderColumnInfo.java.i
data/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java.i
data/make/sun/native2ascii/Makefile.i
data/src/solaris/hpi/native_threads/src/mutex_md.c.i
+data/src/share/classes/sun/util/resources/CurrencyNames_de.properties.i
data/src/share/classes/javax/swing/text/Highlighter.java.i
data/test/java/io/Serializable/oldTests/ValidateClass.java.i
data/test/java/io/Serializable/resolveClass/consTest/run.sh.i
data/src/windows/classes/sun/awt/windows/WPrintDialog.java.i
-data/src/share/classes/sun/text/normalizer/Utility.java.i
-data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java.i
+data/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html.i
data/src/share/classes/java/util/concurrent/LinkedBlockingQueue.java.i
data/src/share/classes/java/net/URLDecoder.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c.i
@@ -1848,6 +1926,7 @@ data/test/java/util/concurrent/ScheduledThreadPoolExecutor/BasicCancelTest.java.
data/test/java/nio/channels/Selector/SelectAndCancel.java.i
data/src/share/classes/sun/util/resources/LocaleNames_is.properties.i
data/src/share/classes/java/lang/Error.java.i
+data/make/sun/security/smartcardio/Makefile.i
data/src/share/classes/java/rmi/server/RemoteObject.java.i
data/src/share/classes/javax/swing/plaf/basic/DesktopIconMover.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so.d
@@ -1855,17 +1934,21 @@ data/src/share/classes/sun/beans/infos/ComponentBeanInfo.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.so.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLoadedInstruments2.java.i
data/src/share/classes/java/util/FormattableFlags.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM949C.java.i
+data/src/macosx/lib/Info-cmdline.plist.i
data/test/java/nio/file/attribute/AclEntry/EmptySet.java.i
data/src/windows/native/sun/windows/awt_Pen.cpp.i
data/src/share/classes/sun/security/x509/NameConstraintsExtension.java.i
+data/make/tools/CharsetMapping/IBM942.c2b.i
+data/src/share/classes/java/security/spec/ECField.java.i
data/test/java/io/Serializable/evolution/AddedExternField/run.sh.i
+data/src/share/classes/sun/io/ByteToCharCp33722.java.i
data/src/share/native/sun/java2d/loops/FillPath.c.i
data/src/share/classes/com/sun/jndi/url/iiop/iiopURLContext.java.i
data/src/share/lib/colorname.properties.i
data/src/share/classes/sun/tools/jconsole/Resources.java.i
data/src/share/classes/java/lang/LinkageError.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/security.policy.i
+data/src/share/classes/com/sun/jndi/dns/DnsNameParser.java.i
data/src/share/classes/java/nio/channels/spi/AbstractSelector.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/ClientHandler.java.i
data/src/share/native/sun/font/bidi/cmemory.h.i
@@ -1875,81 +1958,84 @@ data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuUI.java.i
data/test/javax/swing/SwingWorker/6880336/NestedWorkers.java.i
data/src/share/classes/com/sun/java/util/jar/pack/intrinsic.properties.i
data/src/share/classes/javax/swing/tree/package.html.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java.i
+data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.i
data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface1.java.i
data/make/tools/swing-beans/beaninfo/images/JProgressBarColor32.gif.i
data/test/java/net/URLConnection/jars/test.jar.i
-data/src/share/classes/javax/naming/LinkRef.java.i
+data/test/sun/security/mscapi/AccessKeyStore.sh.i
data/test/javax/management/namespace/WombatMBean.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalBumps.java.i
data/make/netbeans/common/sample-sources.ent.i
data/src/share/classes/javax/swing/LookAndFeel.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath.java.i
-data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java.i
+data/test/sun/security/pkcs11/Provider/Login.java.i
data/src/share/classes/sun/beans/editors/EnumEditor.java.i
-data/test/java/beans/Beans/Test4080522.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h.i
data/test/com/sun/net/httpserver/Test7.java.i
data/make/tools/CharsetMapping/IBM277.map.i
+data/src/linux/doc/man/ja/javaws.1.i
data/test/java/net/InetAddress/BadDottedIPAddress.java.i
-data/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java.i
+data/src/share/classes/java/security/AlgorithmParametersSpi.java.i
data/make/sun/pisces/Makefile.i
data/test/sun/nio/cs/OLD/MS949_OLD.java.i
data/test/com/sun/nio/sctp/SctpChannel/SocketOptionTests.java.i
data/src/share/classes/sun/misc/ASCIICaseInsensitiveComparator.java.i
data/src/share/classes/java/security/BasicPermission.java.i
-data/src/share/classes/sun/print/RasterPrinterJob.java.i
data/test/java/security/KeyStore/EntryMethods.java.i
-data/test/java/util/concurrent/FutureTask/Customized.java.i
+data/test/java/io/Serializable/oldTests/ArrayFields.java.i
data/src/share/classes/sun/font/ExtendedTextSourceLabel.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java.i
data/test/java/util/logging/LoggerSubclass.java.i
-data/src/share/classes/org/openjdk/jigsaw/LibraryPool.java.i
+data/src/linux/doc/man/policytool.1.i
data/make/tools/CharsetMapping/IBM1383.nr.i
data/src/share/classes/sun/misc/resources/Messages_de.java.i
data/src/share/native/sun/font/layout/ArabicShaping.h.i
-data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java.i
data/src/share/classes/sun/management/counter/perf/LongArrayCounterSnapshot.java.i
data/src/share/classes/javax/security/auth/Destroyable.java.i
-data/test/sun/net/www/http/ChunkedInputStream/test.txt.d
+data/src/share/classes/javax/swing/AbstractCellEditor.java.i
data/src/share/classes/com/sun/jmx/namespace/JMXNamespaceUtils.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicPanelUI.java.i
data/src/share/classes/sun/dyn/util/BytecodeName.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_GT.java.i
+data/src/macosx/native/sun/awt/AWTWindow.h.i
data/src/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java.i
data/src/share/classes/javax/print/attribute/standard/NumberUpSupported.java.i
+data/src/solaris/hpi/native_threads/include/condvar_md.h.i
+data/src/macosx/classes/com/apple/laf/ClientPropertyApplicator.java.i
data/src/share/classes/java/beans/MethodDescriptor.java.i
data/src/share/classes/sun/nio/cs/ext/MS932_0213.java.i
-data/test/java/nio/channels/FileChannel/TransferToNonWritable.java.i
+data/make/sun/lwawt/FILES_export_macosx.gmk.i
+data/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java.i
+data/src/macosx/native/sun/awt/CDropTarget.h.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java.i
data/test/java/io/Serializable/checkModifiers/CheckModifiers.java.i
data/test/java/lang/reflect/TypeVariable/TestAnnotatedElement.java.i
data/src/share/classes/sun/security/x509/UniqueIdentity.java.i
-data/src/share/classes/java/lang/StringBuilder.java.i
data/src/share/classes/java/awt/doc-files/Label-1.gif.i
data/src/share/classes/sun/security/util/Resources_pt_BR.java.i
-data/test/java/lang/instrument/BootClassPath/Setup.java.i
+data/src/macosx/native/sun/awt/ImageSurfaceData.h.i
+data/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java.i
data/test/javax/security/auth/x500/X500Principal/InvalidConstructorInput.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceivers.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclassJava.java.i
+data/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java.i
data/src/share/classes/sun/nio/cs/ext/IBM863.java.i
data/src/share/classes/sun/dyn/anon/ConstantPoolParser.java.i
-data/src/share/classes/com/sun/jdi/CharValue.java.i
data/make/tools/CharsetMapping/IBM1147.c2b.i
data/src/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java.i
+data/make/tools/src/build/tools/charsetmapping/GenerateMapping.java.i
data/src/share/classes/java/lang/ExceptionInInitializerError.java.i
data/src/share/classes/com/sun/crypto/provider/TlsPrfGenerator.java.i
data/src/share/classes/sun/security/provider/DSA.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Close.java.i
-data/src/share/native/sun/font/layout/MorphStateTables.h.i
+data/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java.i
data/test/java/awt/Toolkit/RealSync/RealSyncOnEDT.java.i
data/src/share/classes/sun/nio/ch/ChannelInputStream.java.i
-data/src/share/classes/sun/nio/cs/SingleByteDecoder.java.i
+data/src/share/classes/sun/io/CharToByteCp285.java.i
data/test/java/lang/Throwable/StackTraceSerialization.java.i
-data/test/javax/management/eventService/EventClientExecutorTest.java.i
data/test/java/beans/PropertyEditor/TestBooleanType.java.i
data/test/java/nio/channels/FileChannel/ClosedByInterrupt.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/BenchServerImpl.java.i
data/src/solaris/hpi/native_threads/src/interrupt_md.c.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java.i
+data/test/java/nio/charset/Charset/EmptyCharsetName.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineBadBufferArrayAccess.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthPainter.java.i
data/test/java/nio/file/DirectoryStream/DriveLetter.java.i
@@ -1957,12 +2043,10 @@ data/test/java/lang/instrument/PremainClass/InheritAgent1101.java.i
data/src/share/native/sun/font/layout/ArabicShaping.cpp.i
data/test/javax/management/Introspector/ObjectNameTemplateTest.java.i
data/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java.i
-data/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties.i
-data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy.i
-data/test/java/rmi/reliability/juicer/Apple.java.i
+data/src/share/classes/com/sun/java/browser/dom/DOMService.java.i
+data/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java.i
data/test/java/util/prefs/RemoveUnregedListener.java.i
-data/test/com/sun/jdi/redefine/RedefineSubTarg.java.i
-data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template.i
+data/src/share/demo/jfc/CodePointIM/CodePointInputMethod.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlSubSystem.java.i
data/test/java/awt/Mixing/LWComboBox.java.i
data/src/share/classes/java/security/cert/X509Extension.java.i
@@ -1971,11 +2055,12 @@ data/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java.i
data/make/modules/modules.group.i
data/make/jpda/jdwp/Makefile.i
data/src/share/classes/java/security/cert/CertPathValidatorException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif.i
data/src/share/classes/java/lang/instrument/ClassDefinition.java.i
+data/src/macosx/classes/com/apple/laf/AquaButtonUI.java.i
data/src/share/classes/com/sun/media/sound/ModelTransform.java.i
data/src/share/native/sun/font/bidi/utypes.h.i
-data/src/share/instrument/JPLISAgent.h.i
-data/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.chk.i
data/test/java/lang/instrument/SingleTransformerTest.java.i
data/test/java/io/Serializable/serialver/classpath/run.sh.i
data/src/share/classes/java/security/spec/ECPublicKeySpec.java.i
@@ -1987,8 +2072,10 @@ data/test/java/awt/PrintJob/Security/policy.i
data/make/tools/src/build/tools/jdwpgen/MethodTypeNode.java.i
data/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java.i
data/src/share/classes/sun/security/x509/KeyUsageExtension.java.i
-data/src/share/classes/sun/tools/jconsole/resources/mbean.gif.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.lib.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c.i
data/test/java/awt/Focus/ShowFrameCheckForegroundTest/ShowFrameCheckForegroundTest.java.i
+data/src/macosx/native/sun/awt/CPopupMenu.h.i
data/src/share/classes/sun/tools/java/Imports.java.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain8.txt.i
data/src/share/classes/java/net/NetworkInterface.java.i
@@ -1997,12 +2084,14 @@ data/test/com/sun/jdi/ThreadGroupTest.java.i
data/src/share/classes/java/util/jar/JarException.java.i
data/src/share/classes/sun/misc/BootClassLoaderHook.java.i
data/test/java/beans/XMLEncoder/6777487/TestEnumSet.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java.i
data/src/share/classes/javax/management/remote/SubjectDelegationPermission.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/GeneratorUtils.java.i
data/src/share/classes/sun/reflect/UnsafeObjectFieldAccessorImpl.java.i
data/test/sun/tools/jps/jps_Output1.awk.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/ChangeLog_java.i
-data/make/tools/CharsetMapping/IBM297.nr.i
+data/src/share/native/sun/java2d/loops/IntArgbBm.c.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java.i
data/test/com/sun/servicetag/UpdateServiceTagTest.java.i
data/src/share/classes/java/awt/LinearGradientPaint.java.i
data/src/share/classes/com/sun/media/sound/ModelInstrument.java.i
@@ -2012,52 +2101,50 @@ data/src/share/classes/sun/io/CharToByteMS950.java.i
data/src/share/classes/sun/tools/jconsole/resources/expand-winlf.png.i
data/src/share/classes/javax/xml/crypto/dsig/DigestMethod.java.i
data/src/share/classes/sun/tools/tree/AssignShiftLeftExpression.java.i
-data/test/java/util/ArrayList/AddAll.java.i
+data/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java.i
data/src/share/classes/java/text/AttributedString.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.so.i
data/test/sun/nio/cs/TestMS5022X.java.i
data/test/java/rmi/activation/Activatable/unregisterInactive/ActivateMe.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/batch.sh.i
data/src/windows/native/sun/java2d/windows/dxInit.h.i
data/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java.i
data/src/share/classes/javax/swing/table/DefaultTableModel.java.i
data/src/share/classes/java/lang/invoke/MethodTypeForm.java.i
-data/test/java/net/Socket/InheritTimeout.java.i
+data/test/javax/imageio/EmptyFileTest.java.i
+data/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java.i
data/test/java/io/File/DeleteOnExitLong.java.i
data/make/sun/jconsole/Makefile.i
data/src/share/classes/com/sun/net/httpserver/HttpPrincipal.java.i
data/src/share/classes/sun/java2d/pipe/DrawImage.java.i
data/src/solaris/native/sun/awt/awt_TopLevel.c.i
-data/src/solaris/doc/sun/man/man1/ja/jdb.1.i
+data/src/share/classes/sun/awt/GlobalCursorManager.java.i
data/src/share/classes/sun/security/timestamp/Timestamper.java.i
-data/src/windows/native/sun/java2d/d3d/D3DResourceManager.h.i
+data/src/bsd/doc/man/ja/orbd.1.i
data/test/java/io/readBytes/ReadBytesBounds.java.i
-data/src/share/classes/javax/sound/midi/spi/package.html.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/RWMap.java.i
data/test/javax/security/auth/kerberos/KerberosHashEqualsTest.java.i
data/src/share/classes/sun/tools/asm/ConstantPoolData.java.i
data/src/share/classes/com/sun/jndi/cosnaming/jndiprovider.properties.i
-data/src/share/classes/java/nio/channels/ScatteringByteChannel.java.i
+data/src/share/classes/javax/swing/text/html/HRuleView.java.i
data/src/share/classes/com/sun/jndi/ldap/jndiprovider.properties.i
data/src/share/classes/java/nio/file/ProviderNotFoundException.java.i
data/src/share/classes/java/awt/image/BufferStrategy.java.i
-data/test/java/security/BasicPermission/EqualsImplies.java.i
data/src/share/classes/java/lang/management/ClassLoadingMXBean.java.i
-data/test/java/io/BufferedReader/Ready.java.i
+data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java.i
data/src/share/classes/com/sun/jmx/namespace/HandlerInterceptor.java.i
data/test/tools/launcher/UnicodeTest.sh.i
-data/make/jpda/jdwp/jdwp.spec.i
+data/src/share/classes/javax/swing/FocusManager.java.i
data/src/share/classes/javax/swing/plaf/nimbus/Defaults.template.i
data/src/share/classes/com/sun/crypto/provider/SslMacCore.java.i
data/test/java/io/Serializable/skipWriteObject/Read.java.i
-data/src/share/classes/javax/management/remote/JMXConnectorFactory.java.i
+data/src/share/lib/audio/soundbank.gm.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java.i
-data/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java.i
data/src/share/classes/java/applet/AudioClip.java.i
-data/src/solaris/classes/sun/nio/ch/PipeImpl.java.i
+data/src/share/classes/sun/awt/CausedFocusEvent.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/SnmpAcl.java.i
data/test/java/io/DataInputStream/OpsAfterClose.java.i
-data/test/java/lang/instrument/PremainClass/InheritAgent0101.java.i
+data/src/share/classes/sun/io/ByteToCharSJIS.java.i
data/src/share/demo/nbproject/management/VerboseGC/nbproject/project.xml.i
data/test/java/net/URLDecoder/URLDecoderArgs.java.i
data/src/share/classes/java/awt/datatransfer/MimeTypeParameterList.java.i
@@ -2066,47 +2153,53 @@ data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIBor
data/src/solaris/classes/sun/awt/X11/XEmbedServerTester.java.i
data/src/share/classes/sun/reflect/generics/factory/GenericsFactory.java.i
data/src/share/classes/sun/tools/tree/IntegerExpression.java.i
+data/src/macosx/classes/sun/java2d/CompositeCRenderer.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMHMACSignatureMethod.java.i
data/src/windows/native/java/net/TwoStacksPlainSocketImpl.c.i
data/src/share/classes/sun/text/resources/FormatData_ja_JP.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c.i
+data/src/share/classes/javax/naming/ldap/ControlFactory.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ProxyInputStream.java.i
-data/test/java/nio/channels/DatagramChannel/EmptyBuffer.java.i
data/src/share/classes/java/beans/Transient.java.i
+data/test/javax/management/mxbean/PreRegisterNameTest.java.i
data/src/share/classes/java/io/FilterReader.java.i
data/test/java/awt/image/mlib/mlib.security.policy.i
data/src/share/classes/java/security/AlgorithmParameters.java.i
data/test/sun/security/ec/TestEC.java.i
-data/test/javax/xml/crypto/dsig/data/certs/crl.i
+data/src/solaris/doc/sun/man/man1/jdb.1.i
+data/test/javax/swing/JSlider/4987336/box.gif.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/libnspr4.dll.i
data/test/sun/text/resources/Format/Bug4810032.java.i
data/src/share/demo/jfc/CodePointIM/README.html.i
-data/make/tools/GenerateCharacter/CharacterDataLatin1.java.template.i
+data/src/macosx/classes/com/apple/laf/AquaHighlighter.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java.i
data/src/share/classes/java/security/cert/Certificate.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/PrivilegedThreadFactory.java.i
data/test/javax/swing/JColorChooser/Test4759306.java.i
data/test/sun/java2d/cmm/ColorConvertOp/MTSafetyTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_no_NO_NY.java.i
+data/src/share/classes/sun/security/smartcardio/PCSC.java.i
data/test/java/rmi/registry/readTest/testPkg/Hello.java.i
data/src/share/classes/java/lang/NoSuchMethodError.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java.i
data/src/share/demo/applets/BarChart/BarChart.java.i
data/src/share/bin/manifest_info.h.i
-data/test/java/io/FileInputStream/OpsAfterClose.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpCachedData.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.lib.i
data/test/sun/security/mscapi/RSAEncryptDecrypt.java.i
data/test/javax/management/namespace/NullDomainObjectNameTest.java.i
data/test/java/util/prefs/ExportNode.java.i
data/src/share/classes/java/awt/event/ContainerListener.java.i
+data/src/share/demo/applets/WireFrame/Matrix3D.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java.i
data/src/solaris/classes/sun/awt/X11/XCanvasPeer.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java.i
data/test/com/sun/jdi/DataModelTest.java.i
-data/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java.i
+data/src/share/classes/sun/nio/cs/ext/MS932DB.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ProxyTunnelServer.java.i
-data/test/java/rmi/reliability/benchmark/bench/Benchmark.java.i
data/test/java/net/InetAddress/B6246242.java.i
data/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp.i
-data/test/java/awt/font/NumericShaper/EqualsTest.java.i
-data/src/share/classes/sun/nio/cs/ext/HKSCS_2001.java.i
-data/test/java/security/BasicPermission/Homogeneity.java.i
+data/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java.i
+data/src/share/native/sun/management/MemoryManagerImpl.c.i
data/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java.i
data/src/share/classes/sun/security/internal/spec/TlsKeyMaterialParameterSpec.java.i
data/src/solaris/doc/sun/man/man1/servertool.1.i
@@ -2118,18 +2211,18 @@ data/test/java/beans/Introspector/Test4619792.java.i
data/src/share/classes/sun/management/LockDataConverter.java.i
data/test/java/net/InetAddress/IsHostReachableBug.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBoolean.java.i
+data/src/share/native/sun/font/layout/HanLayoutEngine.cpp.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy12.i
data/src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c.i
data/make/tools/swing-beans/beaninfo/images/JTextPaneColor16.gif.i
data/test/tools/launcher/lib/sparc/lib64/liblibrary.so.i
-data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh.i
-data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java.i
data/src/share/classes/java/util/ListResourceBundle.java.i
data/src/share/classes/javax/naming/spi/ObjectFactoryBuilder.java.i
data/src/share/classes/java/awt/ImageCapabilities.java.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/NextFramePositionCalculator.java.i
data/src/share/classes/javax/swing/plaf/ScrollPaneUI.java.i
-data/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java.i
+data/src/share/classes/javax/management/relation/RelationType.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiSeparatorUI.java.i
data/src/share/transport/shmem/shmemBase.c.i
data/test/javax/management/eventService/EventDelegateSecurityTest.java.i
@@ -2140,20 +2233,21 @@ data/src/share/classes/sun/text/resources/FormatData_tr_TR.java.i
data/make/tools/CharsetMapping/MS950.map.i
data/src/solaris/classes/sun/awt/X11/XlibUtil.java.i
data/src/share/classes/java/lang/CharacterName.java.i
-data/src/share/native/sun/font/layout/LEStandalone.h.i
-data/src/share/classes/com/sun/media/sound/DLSRegion.java.i
+data/make/sun/cmm/lcms/mapfile-vers.i
+data/test/sun/security/validator/certreplace.sh.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopManager.java.i
data/src/share/classes/com/sun/tracing/Probe.java.i
-data/src/share/classes/java/net/JarURLConnection.java.i
+data/make/launchers/Makefile.launcher.i
data/src/share/classes/sun/jvmstat/monitor/AbstractMonitor.java.i
data/src/share/classes/com/sun/crypto/provider/DHPublicKey.java.i
data/src/share/classes/java/net/ContentHandlerFactory.java.i
+data/test/java/util/concurrent/BlockingQueue/Interrupt.java.i
data/src/share/classes/javax/management/relation/InvalidRelationServiceException.java.i
+data/src/share/classes/com/sun/jmx/event/EventParams.java.i
data/src/share/demo/applets/Clock/Clock.java.i
data/src/share/classes/java/awt/image/LookupOp.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java.i
+data/make/com/sun/org/Makefile.i
data/src/share/classes/java/awt/Color.java.i
-data/src/share/classes/sun/io/ByteToCharCp970.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java.i
data/src/share/demo/applets/MoleculeViewer/example3.html.i
data/test/java/net/CookieHandler/B6277794.java.i
@@ -2161,7 +2255,7 @@ data/test/javax/swing/border/Test4856008.java.i
data/test/java/net/MulticastSocket/Reuse.java.i
data/src/share/classes/sun/io/CharToByteCp855.java.i
data/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestination.java.i
-data/src/share/classes/javax/swing/DebugGraphics.java.i
+data/src/share/classes/javax/print/attribute/standard/MediaSize.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultHSBChooserPanel.java.i
data/make/tools/CharsetMapping/IBM939.map.i
data/src/share/classes/sunw/util/EventObject.java.i
@@ -2170,13 +2264,14 @@ data/src/share/classes/javax/sql/rowset/RowSetProvider.java.i
data/test/java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java.i
data/src/share/classes/java/nio/file/NoSuchFileException.java.i
data/src/share/classes/sun/java2d/opengl/OGLMaskFill.java.i
-data/src/share/classes/javax/swing/ListCellRenderer.java.i
+data/make/jdk_generic_profile.sh.i
+data/src/share/classes/javax/print/ServiceUI.java.i
data/src/share/classes/java/nio/file/StandardOpenOption.java.i
data/test/com/sun/security/sasl/gsskerb/gsseg_jaas.conf.i
data/src/share/classes/com/sun/media/sound/DLSSampleLoop.java.i
data/src/share/native/java/lang/fdlibm/src/e_log10.c.i
data/src/share/classes/javax/management/ServiceNotFoundException.java.i
-data/test/java/lang/ThreadGroup/Suspend.java.i
+data/test/javax/management/MBeanServer/PostRegisterDeadlockTest.java.i
data/test/java/util/Formatter/BasicInt.java.i
data/src/windows/back/path_md.h.i
data/test/java/security/testlibrary/ProvidersSnapshot.java.i
@@ -2184,6 +2279,7 @@ data/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.ja
data/src/share/demo/java2d/J2DBench/src/j2dbench/Modifier.java.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/CanCreateStubs.java.i
data/test/javax/swing/JMenuItem/6883341/bug6883341.java.i
+data/src/share/classes/sun/io/ByteToCharCp1258.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XTreeRenderer.java.i
data/make/tools/swing-beans/beaninfo/images/JSliderColor16.gif.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/TrustTrustedCert.java.i
@@ -2191,45 +2287,44 @@ data/src/solaris/classes/java/lang/Terminator.java.i
data/test/sun/net/www/protocol/http/6550798/test.java.i
data/test/java/lang/StrictMath/CubeRootTests.java.i
data/src/share/native/sun/java2d/cmm/lcms/lcms.h.i
+data/test/javax/swing/JPopupMenu/6827786/bug6827786.java.i
data/src/share/native/sun/misc/NativeSignalHandler.c.i
data/test/java/beans/XMLEncoder/javax_swing_border_CompoundBorder.java.i
data/src/solaris/native/sun/awt/awt_Component.c.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav.i
-data/test/sun/nio/cs/FindDecoderBugs.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java.i
data/test/java/lang/instrument/IsModifiableClassAgent.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/MultiSocketFactory.java.i
data/src/share/classes/sun/print/PeekMetrics.java.i
data/src/share/classes/com/sun/security/sasl/CramMD5Base.java.i
data/src/share/classes/sun/security/ssl/krb5/KerberosPreMasterSecret.java.i
+data/src/solaris/native/sun/nio/ch/KQueue.c.i
data/test/javax/management/ObjectName/NullEmptyKeyValueTest.java.i
data/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java.i
data/src/share/classes/com/sun/jndi/ldap/NameClassPairWithControls.java.i
data/src/share/classes/sun/io/ByteToCharTIS620.java.i
-data/src/share/classes/sun/net/httpserver/ServerImpl.java.i
-data/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2.i
+data/src/share/classes/java/nio/Buffer.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/trees.c.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateMe.java.i
+data/src/share/classes/sun/font/TextLabelFactory.java.i
data/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java.i
-data/make/tools/src/build/tools/jdwpgen/TypeNode.java.i
+data/test/java/rmi/activation/Activatable/restartService/RestartService.java.i
+data/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/META-INF/services/java.nio.channels.spi.AsynchronousChannelProvider.i
-data/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java.i
-data/src/share/back/util.c.i
-data/test/java/security/cert/pkix/policyChanges/ca.cer.i
-data/test/java/nio/charset/spi/Test.java.i
+data/src/share/classes/javax/management/relation/RelationNotification.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.chk.i
data/src/share/classes/com/sun/jmx/mbeanserver/ObjectInputStreamWithLoader.java.i
data/make/mkdemo/jfc/SwingSet2/Makefile.i
data/test/sun/security/tools/keytool/p11-nss.txt.i
data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthDesktopPaneUI.java.i
-data/src/solaris/native/sun/awt/awt_ScrollPane.c.i
+data/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java.i
+data/src/share/classes/java/awt/color/ICC_ColorSpace.java.i
data/src/share/classes/java/nio/file/attribute/Attributes.java.i
-data/src/share/classes/sun/net/www/content/text/plain.java.i
data/src/share/classes/sun/management/snmp/util/SnmpTableCache.java.i
data/src/share/classes/javax/naming/spi/DirStateFactory.java.i
-data/src/share/classes/sun/security/krb5/internal/TGSRep.java.i
data/src/share/classes/javax/net/ssl/KeyManager.java.i
-data/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java.i
+data/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java.i
data/src/share/classes/sun/io/ByteToCharCp930.java.i
data/src/share/classes/sun/misc/FpUtils.java.i
data/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider.i
@@ -2240,103 +2335,113 @@ data/test/sun/nio/cs/FindCanEncodeBugs.java.i
data/test/sun/security/pkcs11/Secmod/nsscrypto.cfg.i
data/test/javax/swing/Security/6657138/ComponentTest.java.i
data/test/com/sun/crypto/provider/KeyGenerator/Test4628062.java.i
-data/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java.i
+data/src/bsd/doc/man/jconsole.1.i
data/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.java.i
data/src/share/classes/java/dyn/CallSite.java.i
data/src/share/classes/com/sun/security/auth/SolarisNumericGroupPrincipal.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/PGPData.java.i
data/src/share/classes/sun/text/resources/FormatData_sv_SE.java.i
data/src/share/classes/javax/swing/plaf/nimbus/TableScrollPaneCorner.java.i
-data/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java.i
+data/src/macosx/classes/com/apple/laf/ScreenMenuBarProvider.java.i
data/make/tools/src/build/tools/jdwpgen/FieldTypeNode.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServerMBean.java.i
-data/test/java/awt/regtesthelpers/Sysout.java.i
-data/test/java/beans/Introspector/Test6311051.java.i
+data/test/java/dyn/ClassValueTest.java.i
data/make/javax/others/Makefile.i
data/src/share/classes/com/sun/script/javascript/META-INF/services/javax.script.ScriptEngineFactory.i
data/make/modules/image.boot.ls.i
+data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html.i
data/test/javax/management/remote/mandatory/connection/FailedConnectionTest.java.i
data/src/share/classes/sun/security/util/ResourcesMgr.java.i
data/test/sun/security/tools/jarsigner/concise_jarsigner.sh.i
data/test/java/beans/PropertyEditor/TestShortClassNull.java.i
+data/src/share/classes/java/awt/image/CropImageFilter.java.i
data/src/share/classes/javax/naming/directory/InvalidAttributesException.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif.i
+data/test/java/lang/ClassLoader/findSystemClass/Loadee.java.i
data/make/sun/jconsole/FILES.gmk.i
data/test/java/nio/file/Files/META-INF/services/java.nio.file.spi.FileTypeDetector.i
data/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java.i
data/src/share/classes/java/beans/PropertyVetoException.java.i
-data/test/java/io/LineNumberReader/SkipInput.txt.i
data/src/share/classes/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java.i
data/src/solaris/doc/sun/man/man1/ja/rmid.1.i
data/src/share/classes/sun/applet/AppletViewerPanel.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmClassLoadingImpl.java.i
data/src/share/classes/java/awt/SentEvent.java.i
+data/src/share/classes/com/sun/net/httpserver/spi/package-info.java.i
data/src/share/native/sun/awt/image/cvutils/img_nodither.h.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk2.cert.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Klass.java.i
data/test/sun/nio/cs/OLD/DoubleByteEncoder.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java.i
data/src/share/classes/java/awt/AWTException.java.i
data/test/java/lang/Class/getMethods/NonPublicStaticInitializer.java.i
-data/src/solaris/back/util_md.h.i
+data/src/share/classes/java/security/cert/CertStoreParameters.java.i
data/src/share/classes/sun/print/resources/orientPortrait.png.i
-data/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java.i
+data/src/solaris/native/sun/awt/cursor.c.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java.i
data/src/share/classes/com/sun/jmx/interceptor/SingleMBeanForwarder.java.i
data/src/share/classes/sun/print/SunPrinterJobService.java.i
data/src/share/sample/nio/chatserver/ClientReader.java.i
data/src/share/back/error_messages.c.i
-data/src/share/classes/javax/swing/DefaultListModel.java.i
+data/make/modules/jdk.boot.ls.i
+data/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java.i
+data/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java.i
+data/src/share/classes/sun/security/ec/ECDSASignature.java.i
data/src/share/classes/javax/xml/crypto/dom/DOMURIReference.java.i
data/src/share/classes/com/sun/pept/presentation/Stub.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Arrays.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/UpFolder.gif.i
data/src/share/classes/java/nio/file/ClosedDirectoryStreamException.java.i
data/make/tools/reorder/tests/Sleep.java.i
-data/src/share/demo/management/VerboseGC/README.txt.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java.i
data/src/share/classes/sun/tools/util/ModifierFilter.java.i
data/src/share/classes/javax/swing/table/package.html.i
data/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java.i
data/src/share/classes/java/util/prefs/BackingStoreException.java.i
+data/test/javax/swing/JTree/6263446/bug6263446.java.i
+data/src/share/classes/com/sun/jmx/interceptor/DispatchInterceptor.java.i
data/test/java/util/Timer/NameConstructors.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/java.awt.im.spi.InputMethodDescriptor.i
+data/src/macosx/classes/com/apple/eawt/FullScreenHandler.java.i
data/test/sun/security/tools/policytool/UsePolicy.java.i
data/src/share/native/sun/font/layout/ArabicLayoutEngine.h.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarUI.java.i
-data/make/tools/src/build/tools/javazic/Gen.java.i
+data/src/windows/classes/sun/nio/ch/PipeImpl.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif.i
data/src/share/classes/com/sun/tools/jdi/MonitorInfoImpl.java.i
data/test/java/awt/dnd/ImageDecoratedDnD/DnDSource.java.i
data/src/windows/native/sun/windows/awt_MMStub.cpp.i
-data/test/java/rmi/testlibrary/TestFailedException.java.i
+data/test/java/io/PrintStream/FailingConstructors.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java.i
data/src/share/classes/sun/text/resources/FormatData_es_EC.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/CFType.java.i
data/test/java/beans/PropertyEditor/TestFontClassJava.java.i
data/test/sun/java2d/pipe/MutableColorTest/MutableColorTest.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/mail.js.i
data/src/share/classes/sun/text/resources/FormatData_be_BY.java.i
data/src/share/classes/org/relaxng/datatype/helpers/DatatypeLibraryLoader.java.i
-data/test/java/lang/Character/PropertyValueAliases.txt.i
-data/src/share/classes/com/sun/security/auth/NTUserPrincipal.java.i
+data/src/share/classes/java/beans/DesignMode.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/package.html.i
-data/src/solaris/native/common/jlong_md.h.i
data/src/share/classes/javax/sound/sampled/TargetDataLine.java.i
data/src/share/classes/sun/security/krb5/internal/EncTicketPart.java.i
-data/test/sun/security/pkcs11/fips/ImportKeyStore.java.i
+data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif.i
data/test/java/util/ResourceBundle/Bug4257318.java.i
+data/test/sun/security/krb5/ktab/FileKeyTab.java.i
data/test/sun/net/www/protocol/http/B6296310.java.i
-data/src/share/classes/sun/text/resources/FormatData_uk.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java.i
data/src/share/instrument/EncodingSupport.h.i
data/src/share/classes/org/openjdk/jigsaw/JigsawVersion.java.i
data/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
data/src/share/classes/com/sun/java/util/jar/pack/Histogram.java.i
-data/test/javax/crypto/NullCipher/TestWithoutInit.java.i
-data/test/sun/tools/jconsole/ImmutableResourceTest.sh.i
data/test/java/io/Serializable/evolution/AddedField/WriteAddedField.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ColCvtAlpha.java.i
data/make/tools/CharsetMapping/Big5.nr.i
data/src/share/classes/com/sun/jndi/ldap/LdapReferralContext.java.i
+data/src/share/classes/sun/util/resources/CalendarData_hr.properties.i
+data/src/windows/native/sun/windows/awt_Label.cpp.i
data/src/windows/native/sun/java2d/windows/Win32SurfaceData.cpp.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/security.policy.i
data/src/share/back/ArrayTypeImpl.h.i
+data/src/share/classes/sun/io/ByteToCharCp1143.java.i
data/src/share/native/sun/java2d/loops/ByteGray.h.i
data/make/tools/CharsetMapping/IBM852.map.i
data/src/share/classes/java/io/Flushable.java.i
@@ -2351,9 +2456,13 @@ data/src/share/classes/javax/management/ListenerNotFoundException.java.i
data/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c.i
data/src/share/classes/sun/util/resources/CalendarData_fr_CA.properties.i
data/src/share/demo/jvmti/waiters/Thread.hpp.i
+data/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java.i
data/test/java/beans/XMLEncoder/6380849/TestPersistenceDelegate.java.i
+data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java.i
data/make/netbeans/common/architectures/arch-sparc.properties.i
-data/src/share/classes/java/awt/package.html.i
+data/src/solaris/native/sun/awt/awt_InputMethod.c.i
+data/make/templates/gpl-cp-header.i
+data/src/solaris/classes/sun/awt/X11/XWINProtocol.java.i
data/test/java/nio/charset/coders/CheckSJISMappingProp.sh.i
data/make/mkdemo/management/VerboseGC/Makefile.i
data/make/netbeans/common/demo-view.ent.i
@@ -2363,16 +2472,15 @@ data/test/java/io/ByteArrayOutputStream/WriteBounds.java.i
data/src/share/classes/com/sun/tools/jdi/ByteValueImpl.java.i
data/test/java/lang/module/ModuleAnnotationTest.java.i
data/make/sun/javazic/tzdata_jdk/jdk11_full_backward.i
+data/src/solaris/native/sun/nio/ch/sctp/SctpServerChannelImpl.c.i
+data/src/macosx/classes/sun/java2d/DataBufferNIOInt.java.i
data/src/share/classes/java/awt/geom/Path2D.java.i
data/src/share/classes/com/sun/crypto/provider/DESedeParameters.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif.i
data/src/solaris/classes/com/sun/security/auth/module/README.i
data/src/share/classes/sun/print/ServiceNotifier.java.i
-data/src/share/classes/sun/util/resources/OpenListResourceBundle.java.i
data/test/javax/swing/JLayer/SerializationTest/SerializationTest.java.i
data/make/sun/jpeg/reorder-sparcv9.i
data/test/com/sun/net/httpserver/bugs/B6526158.java.i
-data/src/share/classes/sun/text/resources/FormatData_et_EE.java.i
data/src/solaris/native/java/net/NetworkInterface.c.i
data/src/share/classes/sun/rmi/transport/DGCClient.java.i
data/src/share/classes/javax/swing/text/SimpleAttributeSet.java.i
@@ -2380,44 +2488,43 @@ data/src/share/back/transport.c.i
data/src/share/classes/javax/swing/text/WrappedPlainView.java.i
data/test/java/util/concurrent/Phaser/PhaseOverflow.java.i
data/src/windows/classes/sun/font/NativeStrike.java.i
+data/test/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI/7089914/bug7089914.java.i
data/src/share/classes/javax/naming/AuthenticationException.java.i
data/src/share/classes/javax/crypto/JarVerifier.java.i
data/test/demo/jvmti/mtrace/TraceJFrame.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/memory.sh.i
data/make/tools/src/build/tools/jdwpgen/ReplyNode.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java.i
data/test/java/net/Inet6Address/serialize/serial-bge0.ser.i
data/test/javax/sound/midi/Gervill/SoftReceiver/GetMidiDevice.java.i
data/make/tools/src/build/tools/hasher/Hasher.java.i
data/src/share/classes/com/sun/net/ssl/internal/ssl/Provider.java.i
+data/src/share/classes/javax/management/openmbean/InvalidKeyException.java.i
data/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java.i
data/src/share/classes/sun/awt/im/InputMethodWindow.java.i
data/src/share/classes/javax/security/auth/login/package.html.i
data/test/sun/rmi/rmic/newrmic/equivalence/Callback.java.i
data/src/share/classes/com/sun/crypto/provider/ISO10126Padding.java.i
-data/test/java/lang/Runtime/exec/Space.java.i
+data/src/share/classes/java/security/cert/X509CertSelector.java.i
+data/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java.i
data/test/java/lang/ClassLoader/Assert.sh.i
data/test/sun/security/krb5/MicroTime.java.i
data/src/share/classes/sun/net/www/content/image/gif.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/RetryHttps.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedSet.java.i
data/make/mkdemo/applets/Fractal/Makefile.i
data/src/share/classes/java/lang/reflect/Field.java.i
data/src/share/classes/java/security/spec/InvalidParameterSpecException.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt.i
+data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SubjectName.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp.i
-data/src/share/native/sun/awt/image/jpeg/jmemsys.h.i
+data/make/tools/src/build/tools/charsetmapping/Utils.java.i
data/test/java/rmi/activation/Activatable/restartService/ActivateMe.java.i
data/src/share/classes/java/rmi/ServerException.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskCache.cpp.i
-data/test/com/sun/jdi/JdbMissStep.sh.i
data/src/share/classes/sun/java2d/pipe/AlphaColorPipe.java.i
+data/src/share/classes/sun/text/resources/CollationData_is.java.i
data/src/share/native/com/sun/media/sound/Platform.c.i
data/test/java/lang/Runtime/exec/SetCwd.java.i
data/src/share/classes/java/util/IdentityHashMap.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties.i
-data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java.i
data/src/share/classes/sun/security/pkcs11/SessionManager.java.i
data/src/share/native/sun/tracing/dtrace/jvm_symbols.h.i
data/src/windows/native/sun/nio/ch/DatagramDispatcher.c.i
@@ -2427,19 +2534,17 @@ data/src/share/classes/com/sun/tools/example/debug/gui/ContextListener.java.i
data/src/share/classes/java/security/cert/CertPathValidatorResult.java.i
data/src/share/classes/javax/swing/text/GlyphPainter1.java.i
data/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java.i
-data/test/com/sun/security/sasl/digest/Privacy.java.i
+data/src/share/classes/com/sun/security/ntlm/Client.java.i
data/test/javax/script/JavaScriptScopeTest.java.i
data/make/com/sun/security/auth/module/FILES_c_windows.gmk.i
data/test/java/rmi/activation/Activatable/restartCrashedService/rmid.security.policy.i
data/test/sun/security/pkcs11/SampleTest.java.i
-data/src/share/classes/sun/java2d/Spans.java.i
-data/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java.i
+data/src/macosx/native/apple/applescript/AS_NS_ConversionUtils.h.i
data/src/share/classes/sun/security/x509/OtherName.java.i
data/make/java/hpi/native/mapfile-vers.i
-data/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java.i
data/test/java/net/URLConnection/6212146/Test.java.i
data/test/java/beans/XMLEncoder/java_lang_Class.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java.i
+data/src/share/classes/com/sun/tools/jdi/SocketTransportService.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java.i
data/src/share/classes/sun/jvmstat/monitor/event/HostListener.java.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB.png.i
@@ -2447,8 +2552,7 @@ data/src/share/classes/java/lang/management/LockInfo.java.i
data/src/share/classes/com/sun/tools/jdi/EventRequestManagerImpl.java.i
data/test/java/io/Serializable/clearHandleTable/ClearHandleTable.java.i
data/test/javax/security/auth/PrivateCredentialPermission/CanonError.java.i
-data/src/windows/bin/i586/jvm.cfg.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/ClassGenerator.java.i
data/src/share/native/sun/security/ec/impl/ecl.h.i
data/src/share/classes/sun/font/PhysicalFont.java.i
data/src/share/classes/sun/java2d/pipe/BufferedMaskFill.java.i
@@ -2456,7 +2560,6 @@ data/src/share/sample/scripting/scriptpad/src/scripts/insertfile.js.i
data/test/java/lang/Runtime/exec/Duped.java.i
data/src/share/demo/applets/SortDemo/SortAlgorithm.java.i
data/test/java/util/PluggableLocale/providersrc/java.text.spi.DateFormatSymbolsProvider.i
-data/src/solaris/classes/sun/font/NativeGlyphMapper.java.i
data/src/share/classes/sun/util/resources/LocaleNames_en_PH.properties.i
data/test/java/awt/Frame/ShownOnPack/ShownOnPack.java.i
data/make/mkdemo/applets/Makefile.i
@@ -2475,15 +2578,12 @@ data/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java.i
data/test/java/nio/file/Files/SBC.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/MultipleArgumentsForOptionException.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneUI.java.i
-data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java.i
+data/test/java/util/ResourceBundle/Control/StressOut_ko.properties.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java.i
-data/src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignature.java.i
data/make/mkdemo/applets/SortDemo/Makefile.i
-data/src/windows/native/sun/windows/awt_Frame.h.i
data/src/share/classes/java/util/jar/JarFile.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1142.java.i
-data/make/tools/swing-beans/beaninfo/images/JInternalFrameColor32.gif.i
data/src/linux/doc/man/ja/javah.1.i
data/src/share/classes/javax/xml/crypto/dsig/package.html.i
data/src/share/classes/javax/crypto/spec/GCMParameterSpec.java.i
@@ -2492,27 +2592,28 @@ data/src/share/classes/java/util/prefs/Base64.java.i
data/test/java/io/Serializable/oldTests/ArraysOfArrays.java.i
data/test/java/net/Socket/LingerTest.java.i
data/make/java/instrument/mapfile-vers.i
-data/src/share/demo/applets/SpreadSheet/SpreadSheet.java.i
data/test/java/lang/HashCode.java.i
data/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOption.java.i
data/src/share/classes/javax/management/package.html.i
data/src/share/classes/sun/security/krb5/KrbAppMessage.java.i
data/src/share/classes/java/net/Inet6AddressImpl.java.i
+data/test/java/util/Locale/Bug4184873_yi.i
data/test/javax/sound/midi/Gervill/SoftLowFrequencyOscillator/TestProcessControlLogic.java.i
data/src/share/classes/sun/util/calendar/JulianCalendar.java.i
-data/test/com/sun/crypto/provider/TLS/TestPremaster.java.i
data/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java.i
data/src/share/classes/javax/imageio/event/package.html.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/NativeEnum.java.i
data/src/share/classes/java/nio/channels/SelectableChannel.java.i
+data/src/share/classes/javax/print/attribute/DocAttribute.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuItemColor16.gif.i
data/test/org/openjdk/jigsaw/resolver.sh.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_es.properties.i
data/test/java/awt/List/SetBackgroundTest/SetBackgroundTest.java.i
data/src/share/classes/com/sun/imageio/stream/CloseableDisposerRecord.java.i
-data/test/java/io/pathNames/win32/SJIS.java.i
+data/src/share/classes/sun/io/ByteToCharCp933.java.i
data/test/java/io/Serializable/skippedObjCNFException/Read.java.i
-data/src/solaris/native/sun/awt/awt_Window.h.i
+data/src/share/classes/javax/management/remote/rmi/RMIConnection.java.i
data/src/solaris/native/sun/awt/awt_p.h.i
data/src/windows/native/sun/java2d/windows/DDRenderer.cpp.i
data/src/share/classes/sun/util/logging/resources/logging_zh_CN.properties.i
@@ -2520,13 +2621,16 @@ data/src/windows/native/sun/windows/awt_TextArea.cpp.i
data/src/share/classes/javax/swing/plaf/metal/package.html.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java.i
data/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java.i
+data/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml.i
data/src/share/classes/sun/tools/tree/ConvertExpression.java.i
data/test/sun/net/www/protocol/http/B5017051.java.i
data/test/java/net/URLConnection/GetContentType.java.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/ShutdownThread.java.i
data/test/java/nio/Buffer/CharAt.java.i
data/make/jpda/transport/socket/Makefile.i
+data/src/macosx/native/jobjc/src/core/native/NativeBuffer.m.i
data/src/share/classes/sun/tools/tree/CastExpression.java.i
+data/src/share/native/common/check_version.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.properties.i
data/src/share/classes/java/security/PrivateKey.java.i
data/src/share/native/sun/font/layout/CharSubstitutionFilter.h.i
@@ -2535,13 +2639,15 @@ data/src/share/classes/javax/swing/GrayFilter.java.i
data/src/share/classes/com/sun/tracing/dtrace/DependencyClass.java.i
data/make/tools/compile_properties/Makefile.i
data/src/share/classes/sun/tools/tree/LengthExpression.java.i
+data/test/sun/security/provider/certpath/X509CertPath/ForwardBuildCompromised.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/PerfDataBufferPrologue.java.i
data/src/linux/doc/man/ja/jhat.1.i
data/test/java/rmi/server/useCustomRef/UseCustomRef_Skel.java.i
data/src/share/classes/sun/reflect/UnsafeBooleanFieldAccessorImpl.java.i
data/src/share/classes/javax/script/ScriptException.java.i
-data/test/java/awt/font/StyledMetrics/BoldSpace.java.i
+data/src/share/classes/java/awt/image/renderable/RenderContext.java.i
data/make/sun/javazic/tzdata/iso3166.tab.i
-data/src/share/classes/sun/misc/JavaIOAccess.java.i
+data/src/share/classes/sun/io/ByteToCharCp935.java.i
data/src/solaris/native/java/io/FileInputStream_md.c.i
data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.properties.i
data/test/com/sun/crypto/provider/Cipher/RC2ArcFour/CipherKAT.java.i
@@ -2554,30 +2660,31 @@ data/test/java/io/Serializable/packageAccess/run.sh.i
data/src/share/classes/com/sun/media/sound/SoftChannel.java.i
data/src/share/classes/java/util/zip/ZipError.java.i
data/test/javax/swing/border/Test4129681.java.i
-data/src/share/classes/java/nio/Heap-X-Buffer.java.i
data/test/java/net/InetAddress/GetLoopbackAddress.java.i
-data/src/share/classes/sun/util/locale/AsciiUtil.java.i
+data/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java.i
data/src/solaris/classes/sun/java2d/xr/DirtyRegion.java.i
data/test/javax/management/monitor/ThreadPoolTest.java.i
data/src/share/native/sun/security/ec/impl/mp_gf2m-priv.h.i
data/test/javax/management/loading/mlet2.html.i
data/test/com/sun/security/sasl/digest/CheckNegotiatedQOPs.java.i
-data/test/sun/security/provider/PolicyFile/Comparator.java.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init6.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_zh.properties.i
data/src/share/classes/java/text/MergeCollation.java.i
data/test/com/sun/security/sasl/util/CheckAccess.java.i
-data/src/share/classes/sun/reflect/ClassFileAssembler.java.i
+data/src/share/classes/java/sql/Types.java.i
+data/src/macosx/native/jobjc/src/core/native/NativeObjectLifecycleManager.m.i
data/src/share/native/sun/awt/image/jpeg/jdmerge.c.i
data/test/com/sun/security/sasl/digest/Integrity.java.i
data/src/share/classes/sun/invoke/util/VerifyAccess.java.i
-data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java.i
+data/make/com/sun/jndi/dns/Makefile.i
data/src/share/classes/sun/net/www/content/audio/x_wav.java.i
-data/test/sun/tools/jcmd/jcmd-f.sh.i
+data/src/share/classes/javax/swing/plaf/metal/MetalBorders.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java.i
data/src/share/classes/sun/text/resources/FormatData_es_UY.java.i
-data/test/javax/swing/border/Test6625450.java.i
+data/src/share/classes/com/sun/net/httpserver/package-info.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicMenuUI.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/DesktopProperty.java.i
+data/test/java/io/etc/FileDescriptorSharing.java.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java.i
data/src/share/classes/com/sun/jmx/remote/security/NotificationAccessController.java.i
data/src/share/classes/sun/util/logging/LoggingSupport.java.i
@@ -2587,51 +2694,55 @@ data/src/share/native/java/lang/fdlibm/src/e_hypot.c.i
data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmac.java.i
data/src/share/classes/java/util/logging/LogRecord.java.i
data/src/windows/native/sun/windows/awt_Object.cpp.i
+data/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java.i
+data/src/share/classes/javax/swing/text/TabExpander.java.i
data/src/share/classes/java/lang/management/BufferPoolMXBean.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java.i
data/src/solaris/native/sun/awt/img_util_md.h.i
-data/test/java/util/regex/POSIX_Unicode.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine.h.i
data/src/solaris/doc/sun/man/man1/ja/jmap.1.i
+data/test/javax/management/ImplementationVersion/ImplVersionReader.java.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java.i
-data/test/org/openjdk/jigsaw/cli/signer-prikey.pem.i
-data/src/windows/classes/sun/java2d/windows/Win32OffScreenSurfaceData.java.i
+data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java.i
+data/src/share/classes/sun/tools/tree/NewInstanceExpression.java.i
data/src/share/classes/javax/print/attribute/standard/JobKOctetsProcessed.java.i
data/test/java/util/List/LockStep.java.i
data/src/share/classes/sun/nio/cs/ext/IBM865.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionDesc.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_it_IT.properties.i
-data/test/java/nio/channels/Channels/Write.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapCtx.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthSeparatorUI.java.i
data/make/tools/GenerateCharacter/CharacterData00.java.template.i
-data/src/share/classes/sun/reflect/FieldAccessorImpl.java.i
+data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java.i
data/src/share/classes/java/io/StringWriter.java.i
-data/test/javax/crypto/JceSecurity/MyProvider.java.i
+data/src/share/classes/sun/management/CompilationImpl.java.i
+data/src/share/classes/sun/tools/tree/WhileStatement.java.i
data/src/share/classes/javax/management/Impact.java.i
data/src/share/classes/javax/management/remote/rmi/NoCallStackClassLoader.java.i
data/src/share/classes/sun/java2d/loops/Blit.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.dll.i
data/test/java/nio/channels/AsynchronousFileChannel/LotsOfWrites.java.i
data/make/tools/src/build/tools/fontchecker/FontFileFilter.java.i
-data/test/java/net/InetSocketAddress/CreateUnresolved.java.i
+data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java.i
data/src/solaris/classes/sun/security/provider/NativePRNG.java.i
data/src/share/classes/sun/awt/WindowClosingSupport.java.i
+data/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java.i
data/src/solaris/native/sun/awt/multiVis.c.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/ShadowEffect.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s.i
data/src/share/classes/java/lang/ThreadLocal.java.i
data/src/share/classes/sun/tools/tree/CatchStatement.java.i
data/src/share/classes/sun/io/ByteToCharDBCS_EBCDIC.java.i
-data/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java.i
-data/test/javax/crypto/Cipher/TestCipherMode.java.i
+data/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c.i
data/test/java/io/Serializable/oldTests/SerializeWithException.java.i
+data/src/linux/doc/man/orbd.1.i
data/src/share/classes/sun/text/resources/FormatData_en_MT.java.i
-data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java.i
data/src/share/classes/com/sun/jndi/toolkit/url/GenericURLDirContext.java.i
+data/test/java/awt/geom/Arc2D/SerializationTest.java.i
data/src/share/classes/sun/text/resources/FormatData_es_US.java.i
data/test/java/security/KeyRep/DES.pre.1.5.key.i
-data/src/share/classes/org/ietf/jgss/ChannelBinding.java.i
+data/src/share/classes/sun/text/resources/CollationData_iw.java.i
data/test/java/beans/VetoableChangeSupport/TestSerialization.java.i
-data/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif.i
+data/src/share/classes/java/nio/file/StandardCopyOption.java.i
data/src/share/classes/java/util/logging/ConsoleHandler.java.i
data/src/share/classes/java/net/URLConnection.java.i
data/test/java/util/zip/ZipFile/ReadZip.java.i
@@ -2639,37 +2750,37 @@ data/src/share/classes/javax/swing/plaf/metal/icons/Error.gif.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java.i
data/src/share/classes/sun/awt/image/PixelConverter.java.i
data/make/tools/src/build/tools/jdwpgen/AltNode.java.i
+data/src/share/classes/javax/accessibility/AccessibleEditableText.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XMBeanNotifications.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ExternObjTrees.java.i
data/test/javax/management/monitor/AttributeArbitraryDataTypeTest.java.i
data/test/java/lang/Class/Cast.java.i
-data/src/share/classes/com/sun/jdi/InvalidTypeException.java.i
+data/src/share/classes/java/lang/NoSuchFieldException.java.i
data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VK.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionParser.java.i
data/src/share/classes/java/net/PortUnreachableException.java.i
data/src/share/classes/sun/io/CharToByteCp280.java.i
data/test/java/lang/StringBuffer/Replace.java.i
-data/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java.i
data/src/share/classes/com/sun/jndi/dns/DnsContext.java.i
data/test/javax/naming/ldap/LdapName/TrailingSpaceTest.java.i
data/src/share/classes/com/sun/media/sound/PortMixer.java.i
data/src/solaris/classes/sun/nio/ch/UnixAsynchronousSocketChannelImpl.java.i
-data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml.i
+data/src/share/classes/org/openjdk/jigsaw/RemoteRepositoryList.java.i
data/test/java/nio/channels/Selector/Close.java.i
data/src/share/classes/sun/security/pkcs/ContentInfo.java.i
data/src/share/classes/java/rmi/activation/ActivateFailedException.java.i
data/src/share/classes/com/sun/jmx/snmp/defaults/DefaultPaths.java.i
data/src/share/classes/sun/nio/cs/StreamDecoder.java.i
-data/test/java/io/Serializable/longString/LongString.java.i
+data/src/macosx/classes/com/apple/laf/AquaButtonRadioUI.java.i
data/src/solaris/doc/sun/man/man1/javah.1.i
-data/src/share/classes/sun/io/ByteToCharCp1123.java.i
+data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/StringConstant.java.i
data/make/tools/swing-beans/beaninfo/images/JTreeColor16.gif.i
data/src/share/classes/javax/xml/crypto/URIReference.java.i
data/test/java/util/EnumSet/Range.java.i
data/src/solaris/doc/sun/man/man1/ja/orbd.1.i
data/src/share/classes/java/io/Reader.java.i
-data/test/sun/security/validator/samedn.sh.i
-data/src/share/native/sun/security/ec/impl/mp_gf2m.h.i
+data/src/bsd/doc/man/native2ascii.1.i
data/test/java/rmi/reliability/benchmark/bench/serial/ProxyArrays.java.i
data/src/solaris/doc/sun/man/man1/ja/idlj.1.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/config.dtd.i
@@ -2678,7 +2789,7 @@ data/test/java/lang/instrument/MakeJAR2.sh.i
data/test/java/rmi/activation/CommandEnvironment/Retireable.java.i
data/src/windows/classes/sun/nio/fs/DefaultFileTypeDetector.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java.i
-data/src/solaris/classes/sun/awt/X11/Native.java.i
+data/make/com/sun/crypto/provider/Makefile.i
data/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.sh.i
data/src/share/classes/sun/io/ByteToCharEUC_CN.java.i
data/src/share/classes/sun/text/resources/FormatData_ro_RO.java.i
@@ -2688,18 +2799,18 @@ data/src/share/classes/java/security/spec/ECPrivateKeySpec.java.i
data/make/tools/CharsetMapping/IBM1364.c2b.i
data/make/tools/CharsetMapping/ISO_8859_2.map.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_DE.properties.i
-data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java.i
+data/src/share/classes/com/sun/net/ssl/X509KeyManager.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToggleButtonUI.java.i
-data/src/share/classes/sun/font/GlyphDisposedListener.java.i
data/src/share/classes/com/sun/media/sound/SoftChannelProxy.java.i
+data/src/share/classes/sun/nio/ch/Interruptible.java.i
data/src/share/classes/sun/nio/cs/ext/SJIS.java.i
data/src/share/demo/jfc/Font2DTest/RangeMenu.java.i
-data/test/java/security/SecureRandom/sha1prng-old.bin.i
-data/test/java/net/MulticastSocket/B6427403.java.i
+data/src/solaris/native/sun/nio/ch/PollArrayWrapper.c.i
+data/src/share/classes/sun/security/jgss/GSSNameImpl.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c.i
-data/src/share/classes/javax/sql/package.html.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java.i
data/make/tools/CharsetMapping/IBM935.map.i
-data/test/java/nio/file/Files/walkFileTree/grantAll.policy.i
+data/src/windows/native/sun/jkernel/graphics/masthead.bmp.i
data/test/sun/net/www/ParseUtil_6274990.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html.i
data/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java.i
@@ -2712,35 +2823,36 @@ data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoService.ja
data/test/sun/nio/cs/TestTrailingEscapesISO2022JP.java.i
data/src/share/classes/java/awt/SecondaryLoop.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java.i
-data/test/sun/security/rsa/TestCACerts.java.i
+data/src/bsd/doc/man/ja/jar.1.i
+data/src/share/classes/java/awt/font/GlyphJustificationInfo.java.i
data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.html.i
data/src/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java.i
data/src/share/classes/javax/naming/ldap/BasicControl.java.i
data/src/share/classes/sun/tools/tree/NotExpression.java.i
-data/src/share/classes/sun/io/CharToByteMacCentralEurope.java.i
+data/test/sun/nio/cs/FindASCIIRangeCodingBugs.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathEntryMeta.java.i
data/src/share/classes/javax/swing/ViewportLayout.java.i
-data/src/share/native/sun/security/ec/impl/ecdecode.c.i
data/src/linux/doc/man/serialver.1.i
data/src/windows/native/sun/windows/awt_DesktopProperties.cpp.i
data/test/java/lang/management/ThreadMXBean/ThreadCounts.java.i
-data/test/java/util/Collections/T5078378.java.i
+data/src/share/native/sun/font/layout/LESwaps.h.i
+data/src/share/native/sun/java2d/opengl/OGLMaskFill.c.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryImpl.java.i
data/test/java/io/Serializable/fieldTypeString/Write.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java.i
data/src/share/classes/java/beans/NameGenerator.java.i
data/src/windows/classes/sun/nio/ch/FileDispatcher.java.i
data/src/share/classes/javax/management/MBeanServerConnection.java.i
+data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java.i
data/src/share/sample/nio/server/N1.java.i
data/src/solaris/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
data/src/windows/native/sun/windows/initIDs.cpp.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/MiscTests.java.i
data/make/tools/CharsetMapping/ISO_8859_4.map.i
-data/test/sun/util/resources/TimeZone/Bug4858517.java.i
+data/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java.i
data/src/share/classes/sun/misc/SignalHandler.java.i
-data/test/java/io/File/FileMethods.java.i
data/test/java/io/Serializable/skipWriteObject/Write.java.i
+data/src/macosx/classes/com/apple/laf/AquaMenuBorder.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/MonitoredHostProvider.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java.i
data/src/share/classes/sun/print/PrintJobFlavorException.java.i
@@ -2748,17 +2860,17 @@ data/src/solaris/native/sun/java2d/x11/XRBackendNative.c.i
data/test/java/util/Vector/SyncLastIndexOf.java.i
data/src/share/classes/sun/nio/cs/ext/MacThai.java.i
data/src/share/classes/java/net/InetAddressImpl.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties.i
-data/src/share/classes/sun/rmi/rmic/Names.java.i
+data/src/macosx/native/apple/applescript/AppleScriptExecutionContext.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java.i
+data/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy.i
data/make/common/Defs.gmk.i
data/test/sun/security/x509/X500Name/EmailKeyword.java.i
-data/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java.i
+data/test/sun/security/pkcs11/fips/certs/ca.cer.i
data/src/share/classes/sun/tools/tree/BinaryArithmeticExpression.java.i
data/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java.i
data/test/com/sun/jdi/RedefineCrossEvent.java.i
data/test/java/security/UnresolvedPermission/Debug.java.i
data/src/share/native/sun/font/layout/ScriptAndLanguageTags.h.i
-data/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java.i
data/test/java/awt/font/TextLayout/VisibleAdvance.java.i
data/src/share/classes/javax/naming/Reference.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/infback.c.i
@@ -2766,7 +2878,6 @@ data/src/share/classes/sun/reflect/UnsafeQualifiedStaticIntegerFieldAccessorImpl
data/src/share/classes/javax/swing/event/InternalFrameListener.java.i
data/test/java/nio/file/attribute/DosFileAttributeView/Basic.java.i
data/src/share/classes/sun/tools/jconsole/MemoryTab.java.i
-data/src/windows/classes/sun/awt/windows/WMenuPeer.java.i
data/make/tools/CharsetMapping/IBM838.nr.i
data/src/solaris/doc/sun/man/man1/jconsole.1.i
data/test/java/beans/PropertyEditor/TestLongType.java.i
@@ -2774,21 +2885,20 @@ data/src/share/classes/sun/util/resources/CurrencyNames_ar_YE.properties.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java.i
data/src/share/classes/javax/print/attribute/standard/JobImpressionsSupported.java.i
data/test/com/sun/crypto/provider/TLS/keymatdata.txt.i
-data/test/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java.i
data/src/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java.i
data/src/share/classes/com/sun/tools/jdi/resources/jdi.properties.i
-data/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java.i
+data/src/share/classes/com/sun/jndi/dns/ResourceRecord.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/warning.png.i
data/test/sun/nio/cs/OLD/IBM937_OLD.java.i
data/test/sun/nio/cs/OLD/IBM937_OLD.java.d
data/test/java/util/EnumSet/ComplementOf.java.i
data/src/share/classes/sun/text/resources/FormatData_en_SG.java.i
-data/test/com/sun/jndi/ldap/NoWaitForReplyTest.java.i
+data/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableList.java.i
data/src/share/classes/sun/security/validator/PKIXValidator.java.i
data/src/share/classes/sun/misc/Version-template.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java.i
-data/src/share/sample/nio/file/DiskUsage.java.i
+data/test/java/nio/file/WatchService/LotsOfEvents.java.i
data/make/sun/security/tools/Makefile.i
data/make/tools/jdwpgen/Makefile.i
data/src/share/classes/java/nio/channels/SelectionKey.java.i
@@ -2796,48 +2906,54 @@ data/src/share/classes/java/beans/beancontext/BeanContextServiceProvider.java.i
data/make/com/sun/inputmethods/indicim/Makefile.i
data/test/sun/security/ssl/templates/SSLSocketTemplate.java.i
data/test/javax/crypto/spec/RC2ParameterSpec/RC2AlgorithmParameters.java.i
-data/src/share/classes/javax/management/loading/MLetMBean.java.i
+data/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java.i
data/test/sun/security/pkcs11/KeyStore/ProviderLoader.java.i
data/src/share/classes/com/sun/crypto/provider/OAEPParameters.java.i
-data/test/tools/pack200/T7007157.java.i
+data/src/macosx/native/com/apple/laf/AquaFileView.m.i
data/src/solaris/native/sun/awt/awt_dnd_dt.c.i
-data/src/solaris/native/java/io/FileSystem_md.c.i
+data/src/solaris/classes/sun/awt/motif/MFontConfiguration.java.i
+data/src/solaris/native/sun/nio/ch/sctp/SctpChannelImpl.c.i
data/test/java/beans/PropertyEditor/TestIntegerClass.java.i
data/test/sun/util/resources/TimeZone/Bug6317929.java.i
+data/test/java/awt/Robot/CtorTest/CtorTest.java.i
data/src/share/classes/java/nio/BufferPoolMXBean.java.i
data/src/share/back/MethodImpl.c.i
-data/test/java/nio/Buffer/genBasic.sh.i
-data/src/share/classes/sun/security/krb5/internal/Authenticator.java.i
+data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh.i
+data/src/share/classes/java/sql/ClientInfoStatus.java.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor32.gif.i
data/src/share/classes/javax/naming/InvalidNameException.java.i
data/src/share/native/java/io/io_util.c.i
data/test/java/lang/Integer/ValueOf.java.i
data/test/com/sun/jdi/redefineMethod/RedefineSubTarg.java.i
+data/test/java/beans/Statement/Test6224433.java.i
+data/test/java/io/StringWriter/NegativeBufferSize.java.i
data/src/share/classes/sun/misc/URLClassPath.java.i
-data/test/sun/tools/jconsole/ResourceCheckTest.java.i
data/src/share/classes/java/awt/Event.java.i
data/src/share/classes/javax/management/MBeanRegistration.java.i
-data/test/java/io/Serializable/sanityCheck/SanityCheck.java.i
data/src/share/classes/com/sun/jdi/VMCannotBeModifiedException.java.i
data/src/share/classes/sun/io/CharToByteCp866.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java.i
data/test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java.i
data/test/java/io/PushbackInputStream/Skip.java.i
-data/src/share/classes/javax/imageio/plugins/jpeg/package.html.i
+data/test/java/rmi/registry/readTest/readTest.java.i
data/test/javax/crypto/spec/RC2ParameterSpec/RC2ParameterSpecEquals.java.i
data/test/java/security/testlibrary/Providers.java.i
data/test/sun/security/pkcs11/Provider/ConfigQuotedString-nss.txt.i
data/src/share/classes/java/awt/KeyboardFocusManager.java.i
data/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.h.i
data/src/share/classes/com/sun/jmx/snmp/SnmpEngineFactory.java.i
-data/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java.i
+data/src/share/classes/java/io/OutputStreamWriter.java.i
data/test/sun/net/www/protocol/http/B6369510.java.i
data/src/share/classes/sun/security/jgss/GSSUtil.java.i
-data/src/share/classes/sun/nio/ch/ThreadPool.java.i
+data/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java.i
data/src/solaris/classes/sun/print/CUPSPrinter.java.i
data/src/share/demo/applets/MoleculeViewer/example1.html.i
data/src/solaris/native/sun/awt/gtk2_interface.c.i
-data/make/tools/src/build/tools/javazic/RuleDay.java.i
+data/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java.i
+data/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java.i
+data/src/macosx/classes/com/apple/eawt/event/GesturePhaseListener.java.i
data/test/java/security/Signature/ByteBuffers.java.i
data/src/solaris/classes/sun/awt/X11/XTrayIconPeer.java.i
data/test/com/sun/jdi/FinalLocalsTest.java.i
@@ -2853,19 +2969,18 @@ data/src/solaris/native/sun/nio/ch/SctpChannelImpl.c.i
data/make/tools/reorder/tools/MaxTime.java.i
data/src/share/native/sun/awt/libpng/pngpriv.h.i
data/test/java/lang/StringBuffer/AppendSB.java.i
-data/test/java/util/Formatter/Basic-X.java.i
-data/src/share/classes/java/rmi/activation/ActivationGroupID.java.i
+data/src/share/classes/sun/reflect/generics/tree/Tree.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java.i
data/src/share/classes/java/awt/event/MouseAdapter.java.i
data/src/share/classes/java/security/CodeSigner.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0010.java.i
-data/src/share/classes/javax/swing/JFrame.java.i
+data/src/linux/doc/man/ja/xjc.1.i
data/src/share/classes/sun/tools/tree/DoStatement.java.i
data/src/share/classes/com/sun/jdi/connect/spi/Connection.java.i
data/test/javax/management/remote/mandatory/connection/ReconnectTest.java.i
data/src/share/classes/sun/tools/tree/CaseStatement.java.i
data/make/README.html.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/TemplateWriter.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_NI.properties.i
data/src/share/classes/sun/security/jgss/SunProvider.java.i
data/test/java/beans/Introspector/Test4619536.java.i
@@ -2879,90 +2994,92 @@ data/test/demo/jvmti/hprof/CpuTimesTest.java.i
data/test/javax/xml/crypto/dsig/X509KeySelector.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java.i
data/test/java/io/Serializable/6559775/SerialRace.java.i
+data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java.i
data/src/solaris/classes/sun/java2d/xr/GrowablePointArray.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java.i
data/test/javax/print/applet/applet4/Applet4PrintService.java.i
data/src/share/classes/sun/security/x509/README.i
-data/src/share/classes/javax/management/StandardMBean.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java.i
data/src/share/classes/sun/io/CharToByteISO8859_9.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/InclusiveNamespaces.java.i
-data/test/org/openjdk/jigsaw/security.sh.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLong.java.i
data/src/share/classes/sun/io/UnknownCharacterException.java.i
+data/src/share/classes/java/lang/invoke/MethodHandleImpl.java.i
data/src/share/classes/java/util/zip/ZipConstants64.java.i
data/src/solaris/npt/npt_md.h.i
data/src/share/classes/java/beans/ParameterDescriptor.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalTitlePane.java.i
data/test/java/util/Locale/data/deflocale.winvista.i
-data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java.i
data/test/java/rmi/transport/pinLastArguments/PinLastArguments.java.i
data/test/demo/jvmti/mtrace/JFrameCreateTime.java.i
data/src/share/demo/nbproject/management/JTop/nbproject/file-targets.xml.i
data/test/java/lang/instrument/redefineAgent.mf.i
+data/make/com/sun/java/pack/mapfile-vers.i
data/make/modules/image.tools.ls.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Chars.java.i
-data/make/docs/Notes.html.i
+data/src/share/modules/jdk.awt/module-info.java.i
+data/src/share/sample/README.i
data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_VT.java.i
-data/test/sun/nio/cs/OLD/IBM970_OLD.java.i
data/src/share/classes/java/net/ProxySelector.java.i
data/test/java/util/AbstractList/FailFastIterator.java.i
-data/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFParser.java.i
data/src/share/classes/javax/swing/undo/CannotRedoException.java.i
data/src/share/classes/com/sun/jdi/VirtualMachineManager.java.i
data/src/share/classes/javax/management/MBeanServerBuilder.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c.i
data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderParameters.java.i
data/src/share/classes/sun/security/x509/EDIPartyName.java.i
data/src/share/classes/com/sun/rowset/internal/CachedRowSetReader.java.i
data/src/share/classes/com/sun/rowset/providers/package.html.i
data/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName_Stub.java.i
-data/src/share/native/sun/font/layout/LigatureSubstProc.cpp.i
-data/test/com/sun/jdi/sde/FilterMangleTest.java.i
+data/test/java/util/jar/Manifest/CreateManifest.java.i
data/src/share/classes/sun/util/resources/LocaleNames_zh_SG.properties.i
data/test/javax/swing/JComboBox/7031551/bug7031551.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingRequest.java.i
data/src/share/classes/sun/io/CharToByteCp834.java.i
data/src/share/classes/sun/dyn/util/package-info.java.i
data/test/java/lang/InheritableThreadLocal/Basic.java.i
+data/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java.i
data/src/share/classes/java/util/Deque.java.i
data/src/share/classes/java/awt/Desktop.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/security.policy.i
data/src/share/native/sun/awt/medialib/awt_ImagingLib.h.i
-data/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java.i
-data/src/share/classes/sun/security/util/DerValue.java.i
data/test/java/util/Collection/MOAT.java.i
data/src/share/classes/com/sun/beans/TypeResolver.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c.i
data/src/share/classes/java/lang/ReflectiveOperationException.java.i
-data/src/windows/classes/sun/nio/ch/SctpChannelImpl.java.i
+data/test/java/security/KeyRep/AES.pre.1.5.key.i
data/src/share/classes/java/nio/channels/GatheringByteChannel.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Driver.java.i
data/test/javax/security/auth/PrivateCredentialPermission/Serial.policy.i
data/test/java/rmi/reliability/scripts/run_juicer.ksh.i
data/make/tools/CharsetMapping/MacSymbol.map.i
+data/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
data/test/com/sun/jdi/SDENullTest.java.i
data/src/share/demo/jvmti/hprof/hprof_stack.c.i
+data/src/bsd/doc/man/DO_NOT_EDIT--GENERATED_FILES.i
+data/test/java/net/Socket/reset/Test.java.i
data/src/share/native/sun/awt/medialib/mlib_types.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xenc-schema.xsd.i
data/src/share/classes/sun/io/CharToByteCp862.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java.i
+data/make/tools/CharsetMapping/IBM1143.map.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4626070.java.i
+data/src/share/classes/java/awt/KeyEventPostProcessor.java.i
data/src/solaris/classes/sun/awt/motif/AWTLockAccess.java.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaMono32.gif.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c.i
data/src/share/classes/sun/io/ByteToCharPCK.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources_ko.properties.i
-data/test/java/security/cert/pkix/policyChanges/TestPolicy.java.i
data/src/share/native/sun/awt/image/jpeg/jdcoefct.c.i
+data/src/solaris/classes/sun/nio/fs/UnixFileKey.java.i
data/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak_Stub.java.i
data/src/solaris/classes/sun/awt/motif/MEmbeddedFramePeer.java.i
-data/src/share/classes/sun/util/resources/CalendarData_iw.properties.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Texture.java.i
data/make/tools/src/build/tools/jdwpgen/Node.java.i
data/src/share/classes/javax/swing/plaf/IconUIResource.java.i
data/src/share/classes/java/security/PrivilegedActionException.java.i
data/src/share/classes/sun/text/resources/FormatData_es_AR.java.i
data/make/tools/CharsetMapping/IBM1047.map.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java.i
data/src/solaris/native/sun/awt/awt_dnd.c.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/NoAuthClientAuth.java.i
data/test/com/sun/jdi/RedefineChangeClassOrder.sh.i
@@ -2970,28 +3087,30 @@ data/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c.i
data/src/share/native/java/net/DatagramPacket.c.i
data/test/java/beans/XMLDecoder/spec/TestDouble.java.i
data/make/java/verify/reorder-i586.i
-data/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java.i
+data/src/share/classes/com/sun/jdi/event/EventQueue.java.i
+data/src/macosx/classes/com/apple/laf/AquaTextFieldSearch.java.i
+data/src/share/classes/java/awt/datatransfer/FlavorMap.java.i
+data/src/share/classes/sun/text/resources/FormatData_sq.java.i
data/src/share/classes/java/net/NoRouteToHostException.java.i
data/src/share/classes/java/dyn/ClassValue.java.i
-data/src/share/classes/sun/tools/java/CompilerError.java.i
+data/src/macosx/bundle/JRE-Info.plist.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaLong.java.i
data/src/share/classes/sun/tools/jps/Arguments.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic.h.i
data/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_impl.c.i
data/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp.i
-data/src/share/native/sun/font/layout/CanonShaping.cpp.i
-data/src/solaris/native/sun/nio/ch/SocketChannelImpl.c.i
+data/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java.i
data/src/share/classes/com/sun/media/sound/ModelChannelMixer.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java.i
+data/make/sun/font/Makefile.i
data/test/java/awt/im/6396526/IMLookAndFeel.java.i
data/src/windows/native/java/net/NetworkInterface.c.i
-data/test/java/util/ResourceBundle/Test4300693RB.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/package.html.i
+data/src/share/sample/nio/server/README.txt.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_TitledBorderUIResource.java.i
data/src/solaris/classes/sun/awt/motif/MPanelPeer.java.i
data/src/solaris/classes/sun/awt/X11/XEmbedChildProxyPeer.java.i
data/src/share/classes/java/lang/Integer.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java.i
data/test/java/lang/Throwable/ChainedExceptions.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PrivateCtor.java.i
data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12CipherKAT.java.i
@@ -2999,81 +3118,88 @@ data/src/share/classes/com/sun/pept/ept/ContactInfoListIterator.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpOutgoingRequest.java.i
data/src/share/classes/sun/management/counter/LongCounter.java.i
data/src/share/classes/com/sun/java/util/jar/pack/ClassWriter.java.i
+data/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_YE.java.i
data/src/share/classes/javax/net/ssl/SSLParameters.java.i
data/src/share/classes/sun/java2d/pipe/BufferedPaints.java.i
-data/test/java/util/Locale/data/deflocale.rhel4.i
+data/test/java/lang/instrument/ilib/ClassDump.java.i
data/make/tools/CharsetMapping/Makefile.i
data/make/java/text/Makefile.i
data/test/java/lang/instrument/BootClassPath/BootClassPathTest.sh.i
data/src/share/classes/java/util/EventListener.java.i
-data/test/com/sun/jdi/BreakpointWithFullGC.sh.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java.i
-data/test/java/util/Locale/bug4123285.html.i
+data/src/share/native/sun/font/layout/LookupProcessor.h.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java.i
+data/src/share/classes/sun/awt/WindowClosingListener.java.i
data/test/java/net/Socket/asyncClose/Socket_getOutputStream_write.java.i
data/src/share/classes/sun/security/util/Resources_fr.java.i
data/test/com/sun/jdi/RequestReflectionTest.java.i
data/src/share/classes/java/util/Objects.java.i
+data/src/share/classes/java/lang/instrument/package.html.i
data/src/share/classes/sun/text/Normalizer.java.i
data/src/share/classes/sun/security/x509/CertificateX509Key.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplds4.so.i
data/src/share/classes/javax/swing/Renderer.java.i
+data/src/bsd/doc/man/xjc.1.i
data/test/java/nio/channels/AsynchronousChannelGroup/Basic.java.i
data/src/share/native/sun/font/layout/AnchorTables.h.i
-data/src/share/native/sun/awt/image/jpeg/jcinit.c.i
+data/test/sun/java2d/DirectX/AccelPaintsTest/AccelPaintsTest.java.i
+data/test/sun/security/krb5/auto/EmptyPassword.java.i
data/src/share/classes/javax/swing/text/html/parser/html32.bdtd.i
-data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java.i
data/test/java/util/jar/JarFile/Constructor.java.i
-data/test/com/sun/tools/attach/ProviderTests.sh.i
data/test/java/lang/StringBuffer/Trim.java.i
data/test/org/openjdk/jigsaw/cli/signer-cert.pem.i
data/src/share/classes/sun/tools/tree/FieldUpdater.java.i
+data/make/java/jli/Makefile.i
data/src/share/classes/sun/io/ByteToCharCp943C.java.i
-data/test/java/rmi/reliability/scripts/run_serialbench.ksh.i
+data/src/share/classes/sun/security/provider/IdentityDatabase.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpEntryOid.java.i
data/src/share/classes/com/sun/crypto/provider/SunJCE.java.i
data/test/javax/management/monitor/DerivedGaugeMonitorTest.java.i
-data/src/share/classes/java/security/Guard.java.i
+data/src/macosx/classes/sun/lwawt/LWKeyboardFocusManagerPeer.java.i
data/test/javax/management/eventService/SubscribeTest.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.allow.i
data/make/tools/swing-beans/beaninfo/images/JTextFieldMono32.gif.i
+data/src/macosx/classes/com/apple/eawt/PreferencesHandler.java.i
data/src/share/classes/java/awt/Dialog.java.i
data/test/sun/tools/jstat/jstatGcCapacityOutput1.sh.i
data/test/javax/management/loading/mlet3.html.i
data/make/tools/swing-beans/beaninfo/images/JComponentColor16.gif.i
+data/src/bsd/doc/man/apt.1.i
data/test/com/sun/crypto/provider/Mac/HmacSaltLengths.java.i
data/src/share/classes/sun/text/resources/FormatData_iw.java.i
-data/test/java/dyn/indify/Indify.java.i
+data/src/share/classes/sun/util/calendar/CalendarSystem.java.i
data/test/java/io/File/GetAbsolutePath.java.i
data/src/share/classes/javax/naming/directory/SchemaViolationException.java.i
data/make/tools/swing-beans/beaninfo/images/JOptionPaneColor32.gif.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverDirectHTTP.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy34.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java.i
+data/src/share/native/sun/awt/debug/debug_assert.c.i
data/src/share/classes/sun/security/x509/DistributionPointName.java.i
data/src/share/native/sun/font/layout/IndicClassTables.cpp.i
data/src/solaris/native/sun/awt/HPkeysym.h.i
+data/src/share/classes/java/lang/doc-files/theta.gif.i
data/test/java/util/ResourceBundle/FakeTestResource.java.i
data/test/java/lang/ProcessBuilder/SecurityManagerClinit.java.i
data/src/share/demo/jfc/Font2DTest/Font2DTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_CR.properties.i
-data/test/javax/management/remote/mandatory/notif/DeadListenerTest.java.i
+data/src/solaris/classes/sun/nio/ch/KQueuePort.java.i
data/test/java/util/zip/ZipFile/Constructor.java.i
data/src/share/classes/sun/security/provider/certpath/LDAPCertStore.java.i
data/src/share/classes/java/awt/LinearGradientPaintContext.java.i
-data/src/share/classes/sun/tools/jcmd/JCmd.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy.i
data/src/share/classes/sun/security/provider/PolicyParser.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1145.java.i
-data/test/java/beans/XMLDecoder/spec/TestVar.java.i
+data/src/share/classes/java/lang/invoke/InvokeGeneric.java.i
data/test/java/security/UnresolvedPermission/AccessorMethods.ca.i
data/src/share/classes/com/sun/jdi/event/ModificationWatchpointEvent.java.i
-data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassSyntax.java.i
+data/src/macosx/native/sun/awt/CPrinterJob.m.i
data/test/javax/management/namespace/MXBeanRefTest.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeyEngine.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFGenerator.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c.i
data/src/solaris/native/com/sun/management/LinuxOperatingSystem.c.i
-data/src/share/classes/javax/sql/ConnectionEvent.java.i
+data/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java.i
data/src/share/classes/javax/security/auth/spi/LoginModule.java.i
-data/src/share/classes/sun/tools/jconsole/ProxyClient.java.i
data/src/share/back/stream.c.i
data/src/share/classes/javax/sound/sampled/SourceDataLine.java.i
data/src/share/classes/java/beans/beancontext/BeanContextChildComponentProxy.java.i
@@ -3085,13 +3211,13 @@ data/src/share/classes/sun/io/CharToByteCp278.java.i
data/make/tools/swing-nimbus/Makefile.i
data/make/common/Rules.gmk.i
data/test/javax/swing/text/DefaultCaret/6938583/bug6938583.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java.i
+data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java.i
data/test/sun/security/provider/PolicyParser/ExtDirsB/b.jar.i
data/test/java/nio/channels/AsynchronousFileChannel/MyThreadFactory.java.i
data/src/share/classes/javax/swing/filechooser/FileNameExtensionFilter.java.i
data/test/java/nio/channels/SocketChannel/AdaptSocket.java.i
data/src/share/classes/sun/security/krb5/internal/TGSReq.java.i
-data/src/share/classes/java/util/zip/ZipInputStream.java.i
+data/test/java/net/URL/Protocol.java.i
data/src/share/classes/java/awt/AWTKeyStroke.java.i
data/src/share/classes/javax/xml/crypto/KeySelectorException.java.i
data/make/tools/CharsetMapping/IBM1025.nr.i
@@ -3101,15 +3227,18 @@ data/test/com/sun/security/sasl/digest/NoQuoteParams.java.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl.java.i
data/test/javax/swing/plaf/metal/MetalLookAndFeel/5073047/bug5073047.java.i
data/src/windows/native/sun/java2d/d3d/D3DTextRenderer_md.cpp.i
-data/src/solaris/native/sun/awt/awt_Checkbox.c.i
+data/src/share/classes/javax/swing/SpinnerListModel.java.i
+data/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/MyObjectImpl.java.i
data/test/javax/management/Introspector/AnnotationTest.java.i
data/src/share/classes/sun/management/resources/agent_fr.properties.i
+data/src/share/classes/java/rmi/dgc/Lease.java.i
data/src/share/classes/java/lang/reflect/Method.java.i
data/test/com/sun/net/httpserver/Test14.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicPasswordFieldUI.java.i
data/make/tools/CharsetMapping/IBM1123.c2b.i
-data/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java.i
+data/src/share/classes/javax/crypto/spec/DHParameterSpec.java.i
+data/src/share/classes/java/security/cert/CertificateRevokedException.java.i
data/test/java/lang/reflect/Generics/TestN1.java.i
data/test/java/util/LinkedHashSet/Basic.java.i
data/make/sun/image/generic/FILES_c.gmk.i
@@ -3122,52 +3251,54 @@ data/src/share/demo/jfc/CodePointIM/CodePointInputMethodDescriptor.java.i
data/src/share/classes/javax/security/auth/kerberos/KeyTab.java.i
data/src/share/classes/sun/security/krb5/KrbAsReqBuilder.java.i
data/test/java/net/InetAddress/policy.file.i
+data/src/share/classes/java/util/concurrent/ThreadFactory.java.i
data/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java.i
data/test/javax/xml/crypto/dsig/data/certs/badb.crt.i
data/src/share/native/sun/awt/image/jpeg/jccoefct.c.i
data/src/share/classes/sun/nio/cs/ext/IBM1097.java.i
data/make/tools/src/build/tools/jdwpgen/ClassLoaderObjectTypeNode.java.i
-data/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java.i
+data/src/share/classes/sun/io/ByteToCharCp964.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java.i
data/src/share/classes/sun/net/ftp/FtpDirParser.java.i
data/src/solaris/classes/sun/nio/fs/UnixChannelFactory.java.i
data/src/share/classes/javax/sound/sampled/LineEvent.java.i
data/src/share/classes/java/util/UnknownFormatFlagsException.java.i
-data/src/solaris/native/java/net/SocketInputStream.c.i
+data/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java.i
data/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.i
-data/make/java/text/FILES_java.gmk.i
-data/src/share/classes/sun/security/x509/RDN.java.i
+data/test/java/lang/reflect/Generics/TestC2.java.i
+data/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider.i
data/src/share/classes/java/io/FileFilter.java.i
data/test/javax/swing/border/Test6910490.java.i
data/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c.i
data/src/share/classes/sun/text/resources/FormatData_es.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h.i
-data/src/share/classes/java/util/logging/LoggingProxyImpl.java.i
data/src/share/native/java/lang/Package.c.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/Effect.java.i
data/test/sun/tools/jrunscript/jrunscriptTest.sh.i
data/src/share/classes/sun/management/snmp/util/SnmpLoadedClassData.java.i
-data/make/com/sun/java/browser/dom/Makefile.i
+data/src/share/classes/com/sun/security/auth/SubjectCodeSource.java.i
data/src/share/classes/java/text/ParseException.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalLabelUI.java.i
data/src/share/classes/java/util/concurrent/RunnableScheduledFuture.java.i
-data/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.d
+data/src/share/classes/java/awt/TextComponent.java.i
+data/src/solaris/native/sun/awt/awt_LoadLibrary.c.i
data/test/javax/swing/plaf/synth/Test6933784.java.i
data/src/share/classes/sun/io/CharToByteCp737.java.i
-data/test/java/rmi/dgc/dgcImplInsulation/security.policy.i
+data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java.i
data/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html.i
data/make/tools/CharsetMapping/ISO_8859_7.map.i
-data/test/sun/net/InetAddress/nameservice/CacheTest.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_iw_IL.properties.i
+data/test/java/io/InputStream/OpsAfterClose.java.i
data/src/share/native/sun/awt/debug/debug_trace.c.i
data/src/share/classes/sun/rmi/server/Activation.java.i
+data/test/java/awt/Frame/WindowDragTest/WindowDragTest.java.i
data/src/share/classes/java/io/FileReader.java.i
data/test/tools/pack200/badattr.jar.i
data/make/tools/src/build/tools/generatecharacter/Utility.java.i
data/src/share/classes/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java.i
-data/src/share/classes/javax/print/package.html.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/expresso.mid.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBoolean.java.i
-data/src/share/demo/jvmti/hprof/hprof_tls.c.i
+data/src/share/classes/java/text/Bidi.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticCharacterFieldAccessorImpl.java.i
data/src/share/classes/sun/java2d/loops/RenderLoops.java.i
data/src/share/classes/com/sun/jmx/namespace/serial/package.html.i
@@ -3175,26 +3306,25 @@ data/test/sun/tools/common/CommonSetup.sh.i
data/test/java/util/Locale/HashCodeTest.java.i
data/test/java/net/Socks/SocksProxyVersion.java.i
data/test/java/beans/VetoableChangeSupport/TestMethods.java.i
-data/test/java/net/URI/RelativeEncoding.java.i
-data/src/share/classes/sun/security/util/AuthResources_ja.java.i
+data/src/share/classes/sun/applet/Main.java.i
data/test/java/util/PriorityQueue/NoNulls.java.i
data/src/share/classes/sun/misc/ExtensionInfo.java.i
data/src/share/classes/javax/swing/JScrollBar.java.i
data/test/java/lang/ref/ReferenceEnqueuePending.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java.i
-data/test/java/util/HashMap/ToString.java.i
+data/src/share/classes/sun/awt/resources/awt_ja.properties.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsGraphicsUtils.java.i
-data/test/java/util/Locale/Bug4152725.java.i
+data/test/java/beans/Introspector/Test4144543.java.i
data/src/share/classes/sun/reflect/generics/tree/VoidDescriptor.java.i
data/src/share/native/sun/java2d/loops/ScaledBlit.c.i
-data/src/share/native/sun/font/layout/PairPositioningSubtables.h.i
data/src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c.i
-data/test/java/net/ipv6tests/TcpTest.java.i
+data/src/share/classes/sun/text/resources/CollationData_de.java.i
data/make/tools/src/build/tools/jdwpgen/SelectNode.java.i
data/src/share/classes/java/util/GregorianCalendar.java.i
data/src/share/classes/sun/text/resources/FormatData_de_AT.java.i
data/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java.i
data/src/share/classes/com/sun/jdi/PrimitiveValue.java.i
+data/src/share/classes/sun/java2d/InvalidPipeException.java.i
data/src/share/classes/java/security/cert/CertPathParameters.java.i
data/src/share/classes/sun/tools/java/MemberDefinition.java.i
data/test/java/lang/Appendable/Basic.java.i
@@ -3207,8 +3337,11 @@ data/src/share/classes/java/awt/Graphics.java.i
data/src/share/classes/sun/nio/cs/ext/MS936.java.i
data/test/sun/security/tools/jarsigner/TimestampCheck.java.i
data/src/share/classes/sun/tracing/ProviderSkeleton.java.i
+data/src/windows/native/sun/windows/awt_PrintControl.h.i
+data/src/share/classes/java/dyn/package-info.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGStreamMetadataFormat.java.i
data/test/javax/swing/text/html/Test4783068.java.i
+data/src/macosx/classes/com/apple/laf/AquaSpinnerUI.java.i
data/test/tools/launcher/Arrrghs.sh.i
data/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/SourcePanel.java.i
@@ -3218,22 +3351,24 @@ data/test/java/io/Serializable/serialver/nested/run.sh.i
data/src/share/classes/javax/swing/text/doc-files/Document-structure.gif.i
data/src/share/classes/java/security/KeyStore.java.i
data/src/share/classes/javax/management/relation/InvalidRelationIdException.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapResult.java.i
data/src/share/classes/com/sun/jdi/LongValue.java.i
data/src/share/classes/sun/net/www/content/audio/aiff.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/LongArrayCalls.java.i
data/test/java/awt/EventQueue/PushPopDeadlock2/PushPopTest.java.i
-data/src/share/classes/sun/util/calendar/CalendarSystem.java.i
data/src/share/classes/java/net/SecureCacheResponse.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java.i
data/test/java/beans/XMLEncoder/java_lang_String.java.i
-data/src/share/classes/javax/swing/plaf/TextUI.java.i
+data/test/java/lang/instrument/PremainClass/InheritAgent1011.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedRandomAccessList.java.i
data/make/tools/CharsetMapping/IBM871.map.i
data/test/java/util/concurrent/ThreadPoolExecutor/SelfInterrupt.java.i
data/test/java/lang/ThreadLocal/ThreadId.java.i
+data/src/bsd/doc/man/appletviewer.1.i
data/src/share/back/ThreadReferenceImpl.h.i
data/test/org/openjdk/jigsaw/eg/com/foo/bar/Main.java.i
data/src/share/classes/java/lang/reflect/GenericDeclaration.java.i
+data/test/com/sun/servicetag/servicetag4.properties.i
data/test/org/openjdk/jigsaw/services/optional.sh.i
data/test/javax/management/remote/mandatory/connection/DaemonRMIExporterTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RetrievalMethodResolver.java.i
@@ -3244,42 +3379,50 @@ data/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java.i
data/src/share/sample/nio/server/N2.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStateType.java.i
data/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CocoaConstants.java.i
data/src/solaris/sample/dtrace/hotspot/object_allocation_stat.d.i
data/make/tools/dtdbuilder/dtds/HTMLspecial.sgml.i
+data/src/share/classes/sun/rmi/transport/DGCAckHandler.java.i
data/src/share/classes/sun/nio/cs/ext/IBM277.java.i
-data/test/java/lang/management/ThreadMXBean/Semaphore.java.i
+data/src/share/back/stepControl.h.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathEntryImpl.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java.i
+data/src/share/classes/sun/util/resources/CalendarData_th.properties.i
+data/src/share/classes/sun/security/provider/certpath/AdjacencyList.java.i
data/test/java/awt/xembed/server/JavaClient.java.i
-data/src/share/native/sun/awt/image/DataBufferNative.c.i
data/test/java/nio/Buffer/LimitDirectMemory.java.i
data/src/windows/classes/sun/awt/windows/WDataTransferer.java.i
+data/src/share/classes/java/awt/peer/LabelPeer.java.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java.i
data/test/com/sun/jdi/RedefineClearBreakpoint.sh.i
data/make/jprt.gmk.i
+data/src/share/native/sun/management/MemoryImpl.c.i
data/test/java/io/Serializable/cloneArray/CloneArray.java.i
data/test/java/util/zip/ZipFile/ManyEntries.java.i
+data/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c.i
data/src/share/classes/java/util/concurrent/Delayed.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java.i
data/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.html.i
data/test/sun/java2d/cmm/ColorConvertOp/ImageFactory.java.i
data/src/share/classes/javax/naming/CompoundName.java.i
+data/src/share/classes/java/sql/Clob.java.i
data/src/share/classes/javax/script/ScriptEngineManager.java.i
data/test/javax/swing/JFileChooser/4150029/bug4150029.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Modularizer.java.i
data/src/share/native/sun/management/GcInfoBuilder.c.i
data/src/solaris/classes/sun/awt/X11/security-icon-yellow16.png.i
data/src/share/classes/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java.i
-data/test/java/util/ResourceBundle/Test4318520.java.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java.i
data/src/share/classes/com/sun/jmx/snmp/BerException.java.i
data/src/windows/classes/sun/nio/fs/WindowsPathType.java.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java.i
data/test/sun/security/tools/jarsigner/samename.sh.i
data/test/java/awt/image/mlib/MlibOpsTest.java.i
data/src/linux/doc/man/ja/apt.1.i
-data/src/share/classes/sun/text/resources/FormatData_en_IN.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_is_IS.properties.i
data/src/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java.i
data/make/tools/CharsetMapping/IBM1122.nr.i
+data/test/java/lang/management/ManagementFactory/StateTestMBean.java.i
data/src/share/classes/javax/swing/text/StateInvariantError.java.i
data/src/share/classes/com/sun/nio/file/ExtendedOpenOption.java.i
data/test/java/util/Formatter/BasicDateTime.java.i
@@ -3293,23 +3436,25 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/Directory.gif.i
data/src/windows/classes/sun/print/Win32PrintJob.java.i
data/src/share/native/sun/font/sunfontids.h.i
data/src/share/classes/sun/security/jgss/wrapper/GSSCredElement.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/Commands.java.i
data/test/java/io/readBytes/input.txt.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/TargetPanel.java.i
data/src/share/native/sun/font/layout/SubstitutionLookups.h.i
data/src/share/classes/javax/swing/border/package.html.i
data/src/share/classes/sun/awt/image/ByteArrayImageSource.java.i
data/src/share/classes/sun/reflect/generics/tree/Signature.java.i
-data/test/java/lang/instrument/TransformMethodTest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java.i
+data/src/share/classes/java/lang/invoke/MethodHandleStatics.java.i
+data/src/windows/classes/sun/nio/ch/FileKey.java.i
+data/test/java/nio/file/WatchService/grantDirOnly.policy.i
data/src/share/classes/java/net/SocketOption.java.i
data/src/share/classes/java/awt/image/WritableRenderedImage.java.i
data/src/share/classes/sun/java2d/pipe/SpanIterator.java.i
data/test/java/awt/FontClass/BigMetrics.java.i
data/src/share/classes/org/openjdk/jigsaw/Platform.java.i
-data/src/share/native/sun/java2d/cmm/lcms/lcms2.h.i
data/src/share/classes/javax/naming/directory/InvalidAttributeValueException.java.i
data/src/share/classes/sun/util/resources/LocaleNames_sr_Latn.properties.i
-data/src/share/classes/sun/management/HotspotClassLoading.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java.i
+data/src/share/native/sun/font/layout/MPreFixups.cpp.i
data/src/share/classes/sun/reflect/generics/tree/TypeArgument.java.i
data/src/share/classes/sun/net/www/content/audio/x_aiff.java.i
data/test/java/beans/Beans/Test4343723.java.i
@@ -3324,6 +3469,7 @@ data/src/solaris/native/java/net/SocketOutputStream.c.i
data/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c.i
data/test/java/security/cert/pkix/nameConstraintsMinMax/sun2labs2.cer.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolver.java.i
+data/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java.i
data/src/share/native/sun/awt/libpng/pngtrans.c.i
data/src/share/classes/sun/tracing/dtrace/DTraceProviderFactory.java.i
data/src/solaris/native/sun/awt/awt_MenuComponent.h.i
@@ -3335,50 +3481,52 @@ data/.hgignore.i
data/src/share/classes/sun/text/resources/FormatData_fr_CA.java.i
data/test/java/security/PermissionCollection/Concurrent.java.i
data/src/share/native/sun/font/layout/ValueRecords.cpp.i
-data/make/tools/src/build/tools/javazic/Zoneinfo.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c.i
+data/src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java.i
data/src/share/classes/org/ietf/jgss/GSSManager.java.i
-data/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java.i
data/test/java/nio/channels/Pipe/PipeChannel.java.i
-data/src/share/classes/sun/tools/tree/AssignDivideExpression.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelException.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java.i
data/test/java/util/TreeMap/HeadTailTypeError.java.i
data/src/share/classes/java/lang/invoke/FromGeneric.java.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/rmid.security.policy.i
-data/src/windows/native/java/io/dirent_md.c.i
+data/test/javax/swing/JTree/4330357/bug4330357.java.i
+data/src/share/classes/sun/awt/image/BufferedImageDevice.java.i
data/src/share/classes/sun/tools/tree/InstanceOfExpression.java.i
data/test/java/io/charStreams/RandomLineSource.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties.i
-data/test/java/nio/MappedByteBuffer/Truncate.java.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/ActivateMe.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/RestrictedKeywords.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapCtxFactory.java.i
data/src/share/classes/sun/security/krb5/internal/EncKrbCredPart.java.i
-data/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java.i
data/src/share/classes/sun/security/util/Resources_ja.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeClosed.gif.i
data/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h.i
data/src/share/classes/sun/text/resources/CollationData_zh_HK.java.i
data/src/share/classes/javax/naming/Referenceable.java.i
-data/test/java/beans/Beans/6669869/TestGuiAvailable.java.i
+data/src/share/classes/javax/sql/rowset/JdbcRowSet.java.i
data/test/sun/nio/cs/OLD/SimpleEUCDecoder.java.i
data/src/share/classes/java/rmi/NoSuchObjectException.java.i
-data/test/java/util/regex/SupplementaryTestCases.txt.i
+data/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java.i
+data/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java.i
data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIAltAuthTest.java.i
data/test/java/util/Collections/BigBinarySearch.java.i
data/src/share/classes/javax/print/attribute/standard/PresentationDirection.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java.i
+data/src/macosx/classes/com/apple/concurrent/LibDispatchConcurrentQueue.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLCtxAccessToSessCtx.java.i
+data/src/macosx/native/sun/java2d/opengl/CGLLayer.h.i
+data/src/macosx/native/sun/awt/CGraphicsConfig.m.i
data/src/share/classes/java/nio/Heap-X-Buffer.java.template.i
-data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java.i
+data/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif.i
+data/src/share/classes/sun/security/x509/GeneralNameInterface.java.i
data/src/share/classes/javax/sound/midi/package.html.i
data/src/share/classes/javax/management/modelmbean/ModelMBean.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h.i
+data/test/java/util/EnumMap/UniqueNullValue.java.i
data/src/share/classes/javax/swing/Box.java.i
data/test/java/util/Locale/data/deflocale.sol10.fmtasdefault.i
data/src/share/native/java/lang/fdlibm/src/s_modf.c.i
+data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c.i
data/test/java/util/Locale/Bug4184873Test.java.i
data/make/tools/src/build/tools/fontchecker/FontCheckerConstants.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java.i
@@ -3386,18 +3534,17 @@ data/test/sun/tools/jps/jps-m_Output1.awk.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/ControlPoint.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/SetLoopType.java.i
data/src/windows/classes/sun/nio/fs/RegistryFileTypeDetector.java.i
-data/make/tools/CharsetMapping/IBM970.map.i
+data/test/java/security/Provider/SupportsParameter.java.i
data/test/java/awt/event/OtherEvents/UngrabID/UngrabID.java.i
data/src/share/classes/javax/swing/plaf/synth/doc-files/synth.dtd.i
data/src/share/classes/sun/print/resources/orientRevPortrait.png.i
+data/src/macosx/classes/com/apple/laf/AquaInternalFrameManager.java.i
data/src/share/classes/sun/util/resources/CalendarData_es.properties.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_US.properties.i
data/test/sun/security/pkcs11/nss/p11-nss.txt.i
-data/test/demo/jvmti/hprof/HeapAllTest.java.i
+data/make/java/util/FILES_java.gmk.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal_mono.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.i
data/test/java/io/Serializable/recursiveClassDescLookup/Test.java.i
-data/src/share/classes/com/sun/media/sound/RIFFReader.java.i
data/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java.i
data/test/javax/management/standardmbean/FindMethodTest.java.i
data/src/share/classes/com/sun/jmx/namespace/serial/DefaultRewritingProcessor.java.i
@@ -3405,43 +3552,45 @@ data/make/tools/CharsetMapping/MS874.map.i
data/test/com/sun/security/auth/login/ConfigFile/Override.bad.config.i
data/src/share/classes/com/sun/security/auth/module/NTLoginModule.java.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509IssuerSerial.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java.i
data/src/share/classes/javax/management/relation/RelationService.java.i
data/src/share/classes/java/util/regex/UnicodeProp.java.i
-data/test/java/security/cert/pkix/policyChanges/ee.cer.i
+data/src/share/classes/javax/naming/ldap/ManageReferralControl.java.i
data/src/share/classes/java/security/InvalidKeyException.java.i
data/test/javax/print/applet/applet3/Applet3.java.i
data/src/share/classes/java/util/concurrent/locks/Condition.java.i
-data/src/share/classes/sun/management/MethodInfo.java.i
data/src/share/classes/javax/sql/RowSetListener.java.i
data/src/linux/doc/man/ja/policytool.1.i
+data/src/share/classes/java/security/AlgorithmParameterGenerator.java.i
data/test/java/net/InetAddress/B4762344.java.i
-data/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java.i
data/test/com/sun/jdi/ArrayLengthDumpTest.sh.i
data/test/sun/security/smartcardio/TestPresent.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_CO.properties.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_GT.properties.i
+data/src/share/classes/java/nio/file/FileRef.java.i
data/test/com/sun/org/apache/xml/internal/security/transforms/MyTransform.java.i
-data/test/java/util/ServiceLoader/FooProvider3.java.i
+data/make/sun/font/reorder-sparc.i
data/src/share/native/sun/awt/image/jpeg/jdmaster.c.i
data/src/share/classes/sun/net/httpserver/ChunkedInputStream.java.i
data/src/solaris/native/sun/awt/canvas.h.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Constant.java.i
data/src/share/classes/sun/reflect/generics/tree/TypeTree.java.i
data/test/com/sun/jdi/VMConnection.java.i
data/src/share/classes/sun/tools/tree/GreaterOrEqualExpression.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterJobDialog.java.i
data/make/tools/generate_nimbus/Makefile.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test06_ok.password.in.i
data/src/share/classes/javax/print/event/PrintJobAttributeListener.java.i
-data/src/linux/doc/man/DO_NOT_EDIT--GENERATED_FILES.i
-data/src/share/classes/sun/util/resources/CalendarData_ro.properties.i
+data/src/share/classes/sun/io/CharToByteCp1381.java.i
data/test/sun/management/jmxremote/bootstrap/TestLogger.java.i
-data/test/sun/security/krb5/auto/Action.java.i
+data/src/windows/native/sun/jkernel/kernel_en.rc.i
data/src/share/classes/java/awt/image/DirectColorModel.java.i
data/src/share/classes/java/security/spec/X509EncodedKeySpec.java.i
data/src/share/classes/javax/management/openmbean/SimpleType.java.i
-data/test/com/sun/jdi/GenericsTest.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/Root.java.i
data/test/java/security/KeyRep/HmacMD5.pre.1.5.key.i
-data/test/java/beans/PropertyEditor/TestByteTypeNull.java.i
-data/test/sun/tools/jconsole/ResourceCheckTest.sh.i
+data/src/share/classes/java/awt/event/WindowFocusListener.java.i
+data/test/java/net/SocketPermission/Wildcard.java.i
data/src/share/classes/com/sun/tracing/dtrace/Attributes.java.i
data/src/share/classes/java/io/TempFileHelper.java.i
data/src/windows/native/sun/windows/awt_CustomPaletteDef.h.i
@@ -3453,13 +3602,12 @@ data/src/share/classes/javax/swing/text/html/StyleSheet.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/CharArrays.java.i
data/test/java/awt/image/ConvolveOp/OpCompatibleImageTest.java.i
data/src/solaris/classes/java/io/UnixFileSystem.java.i
-data/test/javax/swing/JPopupMenu/6675802/bug6675802.java.i
data/src/share/classes/java/util/Hashtable.java.i
data/test/java/lang/Double/Extrema.java.i
data/test/java/io/Serializable/proxy/skipMissing/Handler.java.i
-data/test/sun/invoke/util/ValueConversionsTest.java.i
+data/src/share/classes/sun/font/FontLineMetrics.java.i
+data/test/java/io/Serializable/evolution/RenamePackage/run.sh.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecInvalidEncoding.java.i
-data/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java.i
data/src/share/native/sun/awt/image/jpeg/jdphuff.c.i
data/make/modules/tools/src/com/sun/classanalyzer/ModuleConfig.java.i
data/test/sun/security/krb5/etype/ETypeOrder.java.i
@@ -3468,7 +3616,7 @@ data/src/solaris/classes/sun/nio/ch/SctpShutdown.java.i
data/src/share/classes/java/dyn/MethodHandleNatives.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityRuntimeException.java.i
data/src/share/classes/com/sun/jmx/remote/util/CacheMap.java.i
-data/test/java/awt/font/FontNames/LocaleFamilyNames.java.i
+data/test/java/lang/String/Exceptions.java.i
data/test/java/awt/Focus/FocusTraversalPolicy/LayoutFTPTest.java.i
data/src/share/classes/javax/swing/text/TextAction.java.i
data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContext.java.i
@@ -3478,7 +3626,8 @@ data/test/sun/security/x509/AVA/DomainComponentEncoding.java.i
data/make/sun/image/generic/Makefile.i
data/test/java/net/URI/URItoURLTest.java.i
data/src/windows/classes/sun/java2d/d3d/D3DBlitLoops.java.i
-data/src/share/classes/java/awt/Shape.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.i
+data/test/java/util/zip/ConstructDeflaterInput.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java.i
data/test/com/sun/jdi/ListenAddress.java.i
data/test/javax/management/MBeanServer/InstanceNotFoundExceptionTest.java.i
@@ -3492,15 +3641,19 @@ data/make/tools/CharsetMapping/MS949.map.i
data/src/share/classes/javax/management/openmbean/MXBeanMappingClass.java.i
data/test/java/io/DataOutputStream/CounterOverflow.java.i
data/src/share/classes/com/sun/media/sound/SoftPerformer.java.i
+data/src/share/classes/java/awt/event/ComponentEvent.java.i
data/src/share/native/sun/font/layout/AttachmentPosnSubtables.h.i
data/src/share/native/sun/java2d/loops/Any4Byte.c.i
-data/src/share/classes/javax/swing/text/LayoutQueue.java.i
+data/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java.i
data/src/share/classes/com/sun/java/util/jar/pack/DriverResource.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLValidateContext.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStatus.java.i
-data/test/sun/security/provider/certpath/ReverseBuilder/prjM2mgrM.i
-data/test/tools/pack200/pack200-verifier/data/README.i
+data/test/sun/text/resources/Format/Bug4621320.java.i
+data/src/share/classes/com/sun/tools/jdi/JNITypeParser.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java.i
data/test/java/util/Formatter/BasicFloatObject.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/SctpNotification.java.i
+data/test/java/io/NegativeInitSize.java.i
data/src/share/classes/sun/java2d/cmm/PCMM.java.i
data/src/share/classes/java/rmi/ConnectIOException.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libplc4.so.i
@@ -3508,7 +3661,7 @@ data/src/windows/classes/java/lang/ProcessEnvironment.java.i
data/src/share/classes/javax/print/attribute/HashDocAttributeSet.java.i
data/src/share/native/sun/java2d/opengl/OGLBlitLoops.c.i
data/make/tools/swing-beans/beaninfo/images/JMenuBarColor16.gif.i
-data/test/com/sun/servicetag/DeleteServiceTag.java.i
+data/make/mkdemo/jfc/Notepad/Makefile.i
data/src/share/classes/sun/security/provider/SystemIdentity.java.i
data/test/javax/management/remote/mandatory/connection/ConnectionTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1252.java.i
@@ -3518,59 +3671,59 @@ data/test/java/math/BigDecimal/Constructor.java.i
data/make/sun/font/FILES_c.gmk.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java.i
data/src/share/classes/org/openjdk/jigsaw/Context.java.i
-data/test/sun/security/pkcs11/tls/masterdata.txt.i
+data/src/share/classes/javax/print/attribute/standard/JobKOctets.java.i
+data/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java.i
data/src/share/classes/sun/io/ByteToCharEUC.java.i
data/test/sun/tools/jstat/jstatLineCounts2.sh.i
data/test/com/sun/nio/sctp/SctpChannel/Send.java.i
data/test/java/io/Serializable/userRWObjError/UserRWObjError.java.i
data/src/solaris/native/sun/nio/ch/FileDispatcher.c.i
-data/test/java/nio/file/TestUtil.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java.i
data/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html.i
data/src/share/classes/java/security/IdentityScope.java.i
data/src/share/classes/sun/net/httpserver/SSLStreams.java.i
data/src/share/classes/java/security/cert/CRLException.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java.i
+data/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_pt_BR.properties.i
data/src/share/classes/com/sun/crypto/provider/HmacSHA1.java.i
-data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh.i
-data/src/share/classes/sun/tools/tree/NewArrayExpression.java.i
-data/src/solaris/hpi/native_threads/include/porting.h.i
-data/src/share/classes/com/sun/jdi/event/VMStartEvent.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java.i
data/src/share/classes/sun/security/ssl/ECDHCrypt.java.i
data/test/java/net/Socket/SoTimeout.java.i
data/src/share/classes/java/nio/channels/package.html.i
data/src/share/classes/sun/misc/FloatConsts.java.i
+data/test/sun/tools/jps/jps-Vvml_Output1.awk.i
data/src/share/demo/nio/zipfs/README.txt.i
data/src/share/sample/jmx/jmx-scandir/nbproject/jdk.xml.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_CN.properties.i
-data/src/share/lib/images/cursors/win32_MoveDrop32x32.gif.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressInputStream.java.i
data/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java.i
data/src/solaris/native/sun/awt/robot_common.c.i
data/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp.i
+data/test/java/nio/channels/SocketChannel/Stream.java.i
data/src/share/demo/jvmti/hprof/hprof_blocks.c.i
data/src/share/classes/com/sun/jmx/snmp/tasks/package.html.i
data/test/javax/management/remote/mandatory/loading/MissingClassTest.java.i
data/src/share/native/java/lang/fdlibm/src/s_sin.c.i
data/src/share/classes/java/io/EOFException.java.i
data/src/share/classes/com/sun/jmx/remote/util/ClassLogger.java.i
-data/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java.i
data/test/java/nio/channels/SocketChannel/Shutdown.java.i
data/test/java/lang/instrument/PremainClass/CreateFiles.java.i
data/src/solaris/native/sun/java2d/loops/vis_DrawLine.c.i
data/test/sun/security/krb5/OptionPADataInKDCReq.java.i
data/test/javax/crypto/CryptoPermission/LowercasePermCheck.java.i
+data/src/share/classes/com/sun/servicetag/SunConnection.java.i
data/test/java/beans/PropertyEditor/TestFontClassValue.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/Reader.java.i
data/test/java/security/cert/X509Certificate/emptyIssuerCert.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java.i
+data/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java.i
data/test/java/lang/reflect/Proxy/returnTypes/Test.java.i
data/src/share/classes/sun/nio/cs/ext/IBM280.java.i
data/src/share/classes/sun/text/resources/CollationData_mk.java.i
data/src/share/classes/sun/security/pkcs/PKCS10Attribute.java.i
data/src/share/classes/sun/nio/cs/UnicodeEncoder.java.i
+data/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java.i
data/src/share/classes/javax/print/event/PrintServiceAttributeListener.java.i
data/test/java/beans/PropertyEditor/TestEnumClassValue.java.i
data/src/share/classes/org/openjdk/jigsaw/FileHeader.java.i
@@ -3578,37 +3731,41 @@ data/src/share/native/sun/font/layout/GlyphSubstitutionTables.cpp.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties.i
data/src/share/classes/com/sun/tools/jdi/FloatValueImpl.java.i
data/src/share/classes/sun/tools/jstat/Token.java.i
+data/src/share/classes/java/net/CookieStore.java.i
data/make/tools/src/build/tools/generatebreakiteratordata/GenerateBreakIteratorData.java.i
data/src/share/classes/com/sun/jdi/request/WatchpointRequest.java.i
data/src/windows/back/exec_md.c.i
data/src/solaris/doc/sun/man/man1/wsgen.1.i
data/src/share/classes/sun/text/resources/FormatData_de_DE.java.i
+data/src/share/classes/java/awt/image/ImageConsumer.java.i
data/test/sun/security/x509/Extensions/BCNull.java.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java.i
-data/src/share/classes/sun/tools/tree/CommaExpression.java.i
+data/src/share/classes/sun/security/provider/DSAPrivateKey.java.i
data/src/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java.i
+data/src/share/classes/javax/management/namespace/MBeanServerConnectionWrapper.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SingletonSet.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_pt_BR.properties.i
data/test/java/nio/channels/AsynchronousSocketChannel/DieBeforeComplete.java.i
data/test/java/util/Formatter/BasicLong.java.i
data/src/share/native/sun/security/ec/impl/ecp_jac.c.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i
+data/src/macosx/classes/com/apple/eawt/FullScreenAdapter.java.i
data/src/share/classes/sun/security/krb5/KrbCred.java.i
-data/src/solaris/classes/sun/awt/XSettings.java.i
-data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html.i
-data/src/solaris/classes/sun/nio/fs/UnixMountEntry.java.i
+data/src/windows/native/sun/windows/awt_Desktop.cpp.i
+data/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java.i
data/src/solaris/hpi/src/interrupt.c.i
data/src/share/native/sun/java2d/loops/BlitBg.c.i
data/src/share/native/java/util/zip/zlib-1.1.3/trees.h.i
data/test/java/rmi/server/RMIClassLoader/spi/Foo.java.i
data/test/java/io/DataInputStream/SkipBytes.java.i
data/src/share/classes/sun/font/EAttribute.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java.i
+data/test/sun/nio/cs/OLD/X11KSC5601_OLD.java.i
data/src/share/classes/javax/crypto/JceSecurity.java.i
data/make/mkdemo/jfc/Stylepad/Makefile.i
+data/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java.i
data/src/share/classes/sun/io/CharToByteCp942.java.i
+data/src/macosx/classes/com/apple/laf/AquaInternalFrameDockIconUI.java.i
data/src/share/classes/sun/reflect/UnsafeStaticLongFieldAccessorImpl.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/TypeElement.java.i
data/make/tools/CharsetMapping/MS1253.map.i
data/src/share/classes/javax/security/auth/callback/TextOutputCallback.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/StringHeadTail.java.i
@@ -3618,16 +3775,17 @@ data/src/share/classes/sun/java2d/pipe/hw/ContextCapabilities.java.i
data/src/share/classes/com/sun/jndi/ldap/ManageReferralControl.java.i
data/src/windows/native/sun/nio/ch/ServerSocketChannelImpl.c.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUsmKeyHandler.java.i
-data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java.i
+data/make/java/management/FILES_c.gmk.i
data/test/java/util/zip/ReadLoc.java.i
data/make/java/zip/FILES_java.gmk.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf.i
+data/src/share/classes/com/sun/jmx/namespace/RoutingServerProxy.java.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaColor16.gif.i
-data/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java.i
+data/make/jpda/Makefile.i
data/make/common/shared/Defs-control.gmk.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_QA.properties.i
-data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java.i
+data/make/java/zip/reorder-sparc.i
data/src/share/classes/java/security/package.html.i
data/test/java/lang/instrument/RedefineBigClass.sh.i
data/src/share/classes/javax/security/cert/X509Certificate.java.i
@@ -3635,77 +3793,79 @@ data/src/share/classes/sun/awt/util/IdentityArrayList.java.i
data/src/share/classes/java/awt/image/ComponentSampleModel.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/HelperNodeList.java.i
data/src/share/classes/sun/text/resources/FormatData_is.java.i
+data/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java.i
data/src/share/demo/jfc/SampleTree/SampleData.java.i
data/test/java/net/NetworkInterface/Test.java.i
-data/test/java/io/Reader/SkipNegative.java.i
data/test/java/nio/Buffer/CopyDirectFloatMemory.java.i
data/src/share/classes/sun/swing/AccumulativeRunnable.java.i
data/make/com/sun/security/auth/module/FILES_export_solaris.gmk.i
data/src/share/native/sun/font/layout/IndicReordering.h.i
-data/src/share/classes/sun/nio/cs/ext/IBM420.java.i
data/src/share/classes/javax/xml/crypto/NoSuchMechanismException.java.i
data/test/com/sun/jdi/NotAField.sh.i
data/src/share/classes/sun/text/resources/CollationData_tr.java.i
-data/test/java/util/Collections/CheckedIdentityMap.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.d
+data/test/java/net/URL/ParseAuthority.java.i
data/make/sun/jkernel/FILES_c_windows.gmk.i
-data/test/java/nio/Buffer/CopyDirectByteMemory.java.i
+data/src/share/classes/org/openjdk/jigsaw/RemoteRepository.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileSystem.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Skip.java.i
-data/test/java/io/Serializable/available/Available.java.i
data/make/java/management/Exportedfiles.gmk.i
-data/src/share/classes/javax/swing/tree/TreeSelectionModel.java.i
data/src/share/classes/sun/nio/cs/ext/MS50220.java.i
data/src/share/classes/java/util/concurrent/RecursiveAction.java.i
data/src/solaris/classes/sun/awt/motif/MToolkit.java.i
+data/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java.i
data/src/solaris/native/sun/awt/awt_dnd_ds.c.i
+data/src/share/classes/com/sun/tools/jdi/CharValueImpl.java.i
+data/src/macosx/native/jobjc/src/core/native/Subclassing.m.i
data/make/launchers/Makefile.i
data/src/share/demo/jvmti/hprof/debug_malloc.h.i
data/src/share/classes/sun/misc/FloatingDecimal.java.i
-data/src/windows/classes/sun/awt/windows/WCheckboxPeer.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties.i
data/src/share/classes/java/rmi/server/RemoteStub.java.i
-data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java.i
+data/test/java/nio/charset/coders/ResetISO2022JP.java.i
data/test/java/nio/channels/AsynchronousSocketChannel/StressLoopback.java.i
+data/src/share/classes/javax/accessibility/AccessibleExtendedText.java.i
data/src/share/classes/com/sun/jdi/NativeMethodException.java.i
data/test/java/net/URL/RelativeURLTest.java.i
data/src/share/classes/java/sql/ResultSet.java.i
+data/src/macosx/bundle/JavaAppLauncher/src/JVMArgs.h.i
data/src/windows/classes/sun/awt/windows/WPanelPeer.java.i
data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java.i
data/test/sun/jvmstat/monitor/HostIdentifier/HostIdentifierCreate.java.i
data/src/share/classes/java/util/zip/Inflater.java.i
data/src/share/classes/javax/swing/text/rtf/AbstractFilter.java.i
data/test/java/util/ResourceBundle/Control/PackagePrivateRB.java.i
+data/test/java/security/cert/CertPathBuilder/GetInstance.java.i
data/src/share/classes/java/security/cert/CertificateFactorySpi.java.i
data/src/share/native/sun/java2d/Trace.c.i
data/src/share/classes/java/lang/StackTraceElement.java.i
-data/test/java/net/URLConnection/GetFileNameMap.java.i
data/src/share/classes/sun/io/ByteToCharCp1250.java.i
-data/test/java/awt/dnd/Button2DragTest/Button2DragTest.java.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/libplc4.dll.i
-data/src/windows/native/sun/windows/ShellFolder2.cpp.i
+data/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java.i
data/src/share/classes/java/beans/FeatureDescriptor.java.i
data/src/share/classes/javax/sound/sampled/spi/AudioFileWriter.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/rmid.security.policy.i
data/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java.i
data/src/share/classes/javax/imageio/plugins/jpeg/JPEGHuffmanTable.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_pt_BR.properties.i
-data/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java.i
data/src/share/javavm/export/jvmti.h.i
-data/test/javax/swing/Security/6657138/bug6657138.java.i
-data/src/share/classes/sun/reflect/SignatureIterator.java.i
+data/make/modules/jdk.awt.ls.i
+data/test/java/awt/PrintJob/EdgeTest/EdgeTest.java.i
+data/make/tools/src/build/tools/javazic/GenDoc.java.i
data/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java.i
data/src/share/classes/sun/text/resources/FormatData_es_VE.java.i
-data/test/sun/tools/jps/jps-lm_Output1.awk.i
+data/src/share/classes/javax/management/DefaultLoaderRepository.java.i
data/src/share/native/sun/security/ec/ecp_256.c.i
data/make/netbeans/jdwpgen/nbproject/build-impl.xml.i
data/test/javax/swing/ToolTipManager/Test6657026.java.i
data/src/share/lib/security/sunpkcs11-solaris.cfg.i
+data/src/share/classes/sun/security/x509/GeneralSubtrees.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Utils.java.i
data/test/sun/security/tools/keytool/i18n.html.i
data/test/java/beans/Introspector/6976577/test/Accessor.java.i
+data/src/macosx/classes/sun/lwawt/macosx/EventDispatchAccess.java.i
data/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java.i
data/src/share/classes/com/sun/rowset/internal/BaseRow.java.i
+data/src/share/classes/sun/jkernel/BackgroundDownloader.java.i
data/src/share/classes/org/openjdk/jigsaw/RepositoryCatalog.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java.i
data/test/javax/management/monitor/MBeanServerBuilderImpl.java.i
@@ -3717,7 +3877,8 @@ data/src/share/classes/com/sun/tools/jdi/GenericListeningConnector.java.i
data/test/tools/launcher/SolarisRunpath.sh.i
data/make/com/sun/demo/jvmti/hprof/Makefile.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.html.i
-data/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java.i
+data/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/BitFile.java.i
data/make/tools/CharsetMapping/IBM1112.c2b.i
data/src/solaris/classes/sun/java2d/xr/XRDrawImage.java.i
data/test/javax/management/mxbean/customtypes/CustomMXBean.java.i
@@ -3727,12 +3888,11 @@ data/src/share/classes/sun/security/timestamp/TimestampToken.java.i
data/make/javax/sound/jsoundhs/FILES.gmk.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/rmid.security.policy.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ResolutionInfo.java.i
-data/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java.i
data/src/share/lib/images/cursors/motif_CopyNoDrop32x32.gif.i
data/src/share/demo/scripting/jconsole-plugin/README.txt.i
data/make/tools/reorder/tools/util-sparc.il.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so.d
-data/test/java/beans/PropertyEditor/TestByteType.java.i
data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/netbeans-targets.xml.i
data/src/share/classes/com/sun/imageio/plugins/common/InputStreamAdapter.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libsoftokn3.so.i
@@ -3746,15 +3906,14 @@ data/src/windows/native/sun/windows/Devices.h.i
data/test/java/util/Collection/HotPotatoes.java.i
data/test/com/sun/nio/sctp/SctpChannel/Shutdown.java.i
data/src/solaris/native/sun/awt/awt_wm.h.i
-data/src/share/native/sun/java2d/opengl/OGLBlitLoops.h.i
-data/src/share/classes/sun/text/normalizer/NormalizerBase.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java.i
+data/src/share/classes/java/awt/event/FocusAdapter.java.i
data/test/javax/script/Test3.java.i
data/make/tools/CharsetMapping/MS1256.map.i
data/src/linux/doc/man/ja/idlj.1.i
data/src/share/classes/java/nio/file/NotDirectoryException.java.i
-data/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml.i
-data/src/share/classes/javax/swing/text/DefaultFormatter.java.i
-data/src/share/classes/java/sql/Savepoint.java.i
+data/src/share/classes/java/awt/font/LineBreakMeasurer.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/FrameworkGenerator.java.i
data/test/java/beans/PropertyEditor/MemoryClassLoader.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties.i
data/test/sun/tools/jcmd/jcmd_pid_Output2.awk.i
@@ -3767,69 +3926,68 @@ data/test/javax/security/auth/login/Configuration/GetInstance.bad.configURI.i
data/src/share/classes/sun/tools/tree/IntExpression.java.i
data/test/demo/jvmti/hprof/UseAllBytecodes.java.i
data/src/share/classes/sun/security/x509/CertificateSubjectName.java.i
-data/src/share/classes/javax/swing/ProgressMonitorInputStream.java.i
data/src/share/native/java/lang/fdlibm/src/e_atanh.c.i
-data/src/share/classes/java/util/ServiceLoader.java.i
data/src/solaris/classes/sun/awt/X11/XDropTargetProtocolListener.java.i
-data/test/java/net/Authenticator/B6870935.java.i
-data/src/windows/native/sun/nio/ch/FileDispatcherImpl.c.i
+data/src/share/classes/sun/reflect/generics/scope/ClassScope.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/infcodes.h.i
data/src/share/classes/java/nio/channels/NetworkChannel.java.i
-data/test/java/beans/XMLEncoder/java_sql_Timestamp.java.i
+data/src/share/classes/sun/nio/cs/IBM852.java.i
data/src/share/native/java/lang/Compiler.c.i
data/src/solaris/native/sun/font/X11TextRenderer.c.i
data/src/share/classes/com/sun/imageio/spi/FileImageInputStreamSpi.java.i
data/test/java/util/concurrent/atomic/Lazy.java.i
-data/test/java/net/URLConnection/Connect.java.i
data/src/share/classes/javax/swing/text/FieldView.java.i
data/src/share/classes/com/sun/security/auth/UnixPrincipal.java.i
-data/test/java/net/B6499348.java.i
+data/src/share/classes/sun/invoke/util/ValueConversions.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/Application.java.i
data/src/share/demo/jvmti/hprof/hprof_util.c.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java.i
data/src/share/classes/java/awt/image/MemoryImageSource.java.i
data/make/tools/CharsetMapping/IBM1026.nr.i
data/src/share/classes/java/awt/font/TextHitInfo.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt.i
+data/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBufferPrologue.java.i
data/test/javax/crypto/spec/IvParameterSpec/NullIV.java.i
-data/src/share/classes/sun/io/CharToByteCp1144.java.i
data/src/share/classes/sun/nio/ch/SelectorProviderImpl.java.i
data/test/java/util/Locale/LocaleCategory.java.i
data/src/share/classes/com/sun/media/sound/AutoClosingClip.java.i
-data/src/share/classes/sun/security/x509/GeneralNameInterface.java.i
data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java.i
data/src/share/classes/sun/awt/EventQueueDelegate.java.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.html.i
data/src/share/classes/sun/net/RegisteredDomain.java.i
data/src/share/classes/sun/nio/cs/ext/TIS_620.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirAgent.java.i
-data/src/share/classes/java/util/concurrent/ForkJoinPool.java.i
+data/test/java/util/logging/LoggingDeadlock.java.i
data/src/share/classes/sun/nio/cs/ext/IBM922.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-bw32.png.i
data/src/share/classes/sun/java2d/pipe/RegionSpanIterator.java.i
+data/src/bsd/doc/man/javap.1.i
data/test/javax/swing/MultiUIDefaults/4300666/bug4300666.java.i
data/make/tools/src/build/tools/addjsum/AddJsum.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java.i
data/src/linux/doc/man/ja/jvisualvm.1.i
data/src/share/demo/zipfs.i
data/test/java/net/ProxySelector/B6737819.java.i
data/src/share/classes/javax/net/ssl/HandshakeCompletedEvent.java.i
-data/test/javax/swing/JFileChooser/4847375/bug4847375.java.i
+data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties.i
data/src/share/classes/javax/security/auth/kerberos/KerberosTicket.java.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy.i
+data/src/solaris/classes/sun/font/FcFontConfiguration.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirClient.java.i
data/test/java/util/concurrent/LinkedBlockingQueue/LastElement.java.i
data/src/share/classes/java/util/jar/Attributes.java.i
-data/test/sun/text/resources/Format/Bug4762201.java.i
-data/test/javax/swing/border/Test4243289.html.i
-data/src/windows/native/sun/windows/awt.h.i
+data/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java.i
+data/test/javax/management/namespace/NamespaceControllerMBean.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1122.java.i
data/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java.i
data/test/com/sun/crypto/provider/Cipher/AES/TestISO10126Padding.java.i
data/test/java/security/cert/CertPathBuilder/targetConstraints/anchor.cer.i
-data/src/solaris/doc/sun/man/man1/ja/apt.1.i
data/test/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java.i
data/src/windows/native/java/io/FileDescriptor_md.c.i
data/src/share/classes/sun/security/pkcs/EncryptedPrivateKeyInfo.java.i
data/src/share/classes/sun/java2d/pipe/PixelToShapeConverter.java.i
+data/src/macosx/classes/com/apple/laf/ScreenMenuItemUI.java.i
+data/src/share/classes/com/sun/servicetag/resources/register_ja.html.i
data/src/share/classes/java/io/Writer.java.i
data/test/sun/tools/jstat/jstatClassOutput1.sh.i
data/src/solaris/native/sun/awt/awt_Menu.c.i
@@ -3839,45 +3997,50 @@ data/src/share/classes/sun/util/resources/TimeZoneNamesBundle.java.i
data/src/solaris/hpi/native_threads/src/sys_api_td.c.i
data/test/java/io/Serializable/parents/OriginalClass.java.i
data/src/share/npt/npt.h.i
-data/test/java/nio/charset/Charset/default.sh.i
data/src/share/classes/java/net/SocketImpl.java.i
data/src/share/classes/sun/security/jgss/krb5/MessageToken.java.i
-data/test/sun/security/util/HostnameMatcher/cert2.crt.i
data/src/solaris/classes/sun/font/XRTextRenderer.java.i
-data/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java.i
-data/test/java/rmi/server/serverStackTrace/ServerStackTrace.java.i
+data/src/share/classes/java/nio/file/FileVisitor.java.i
+data/src/macosx/classes/sun/java2d/IntegerNIORaster.java.i
data/test/java/awt/font/TextLayout/KernCrash.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java.i
+data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java.i
data/src/share/classes/java/awt/font/TransformAttribute.java.i
-data/test/sun/security/krb5/auto/BadKdc.java.i
+data/src/solaris/classes/sun/nio/fs/UnixFileStore.java.i
data/src/share/classes/sun/io/CharToByteCp838.java.i
data/src/share/classes/java/awt/GraphicsDevice.java.i
+data/make/tools/CharsetMapping/IBM1025.c2b.i
data/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java.i
data/src/windows/classes/sun/print/services/javax.print.PrintServiceLookup.i
data/test/javax/print/attribute/autosense/PrintAutoSenseData.java.i
-data/test/java/security/Security/signedfirst/exp.jar.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties.i
data/src/share/classes/java/util/zip/ZipFile.java.i
data/src/share/classes/java/security/cert/PolicyNode.java.i
data/src/share/classes/java/lang/IllegalAccessException.java.i
-data/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java.i
+data/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy.i
+data/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif.i
data/src/share/classes/com/sun/jmx/event/DaemonThreadFactory.java.i
data/src/share/classes/sun/io/CharToByteEUC_KR.java.i
data/test/java/io/Serializable/classDescHooks/ExternLoopback.java.i
-data/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java.i
+data/src/macosx/classes/com/apple/laf/AquaTextPasswordFieldUI.java.i
+data/src/solaris/native/java/net/SocketInputStream.c.i
+data/src/share/classes/javax/swing/colorchooser/SyntheticImage.java.i
data/src/share/classes/sun/net/www/protocol/http/DigestAuthentication.java.i
data/test/java/util/Currency/ValidateISO4217.java.i
-data/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java.i
+data/src/share/classes/sun/java2d/cmm/CMSManager.java.i
data/src/share/classes/javax/sql/rowset/BaseRowSet.java.i
data/test/javax/imageio/plugins/shared/BitDepth.java.i
+data/test/java/awt/im/InputContext/InputContextTest.java.i
+data/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java.i
+data/src/share/classes/sun/net/ftp/FtpDirEntry.java.i
data/src/share/classes/javax/swing/SwingWorker.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopStart.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Stub.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/CheckDeps.java.i
data/src/share/classes/javax/print/attribute/standard/ColorSupported.java.i
-data/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java.i
-data/make/tools/src/build/tools/javazic/Main.java.i
+data/src/share/native/sun/font/layout/MorphTables.h.i
data/src/share/native/sun/font/layout/LEGlyphStorage.h.i
data/src/share/classes/sun/tools/tree/SuperExpression.java.i
data/test/java/util/Locale/data/deflocale.exe.i
@@ -3885,45 +4048,47 @@ data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCVerboseLevel.ja
data/src/share/classes/javax/swing/doc-files/SizeSequence-1.gif.i
data/test/java/beans/PropertyEditor/TestLongTypeNull.java.i
data/test/com/sun/jdi/RedefineStep.sh.i
-data/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java.i
+data/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java.i
data/src/share/classes/java/security/spec/PKCS8EncodedKeySpec.java.i
data/src/share/classes/com/sun/jdi/event/ThreadDeathEvent.java.i
data/test/com/sun/jdi/VMDeathLastTest.java.i
data/test/java/nio/Buffer/CopyDirectShortMemory.java.i
data/test/javax/management/Introspector/ResourceInjectionTest.java.i
-data/src/share/classes/sun/print/PrintJob2D.java.i
data/make/tools/classanalyzer/build.xml.i
-data/make/netbeans/common/architectures/arch-amd64.properties.i
-data/src/share/classes/javax/swing/plaf/nimbus/ToolBarSeparatorPainter.java.i
-data/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt.i
+data/test/java/lang/instrument/RedefineMethodAddInvokeAgent.java.i
+data/test/java/util/regex/SupplementaryTestCases.txt.i
+data/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m.i
data/src/share/classes/sun/management/MemoryManagerImpl.java.i
data/src/share/classes/com/sun/servicetag/Util.java.i
data/src/share/classes/java/awt/EventQueue.java.i
-data/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java.i
+data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html.i
data/src/share/native/sun/java2d/loops/FourByteAbgr.h.i
data/src/share/classes/sun/awt/geom/Curve.java.i
data/src/share/classes/java/awt/event/KeyEvent.java.i
data/make/tools/swing-beans/beaninfo/images/JInternalFrameMono32.gif.i
data/src/solaris/classes/sun/font/X11TextRenderer.java.i
+data/src/share/classes/sun/security/action/LoadLibraryAction.java.i
data/test/java/lang/management/MemoryMXBean/LowMemoryTest.java.i
data/src/share/classes/javax/swing/filechooser/FileView.java.i
data/src/share/classes/javax/management/InstanceAlreadyExistsException.java.i
data/src/share/classes/com/sun/tools/jdi/TargetVM.java.i
+data/test/javax/swing/JPopupMenu/4966112/bug4966112.java.i
data/test/java/util/logging/AnonLoggerWeakRefLeak.sh.i
data/src/share/classes/com/sun/net/httpserver/HttpsParameters.java.i
data/src/share/classes/java/text/MessageFormat.java.i
-data/src/share/classes/java/sql/ParameterMetaData.java.i
+data/src/share/classes/com/sun/jdi/ShortType.java.i
data/make/java/sun_nio/FILES_java.gmk.i
data/src/share/classes/javax/sql/rowset/WebRowSet.java.i
data/src/share/classes/com/sun/media/sound/SoftChorus.java.i
data/src/share/classes/sun/nio/cs/ext/IBM870.java.i
data/src/share/classes/java/lang/reflect/AnnotatedElement.java.i
+data/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java.i
data/src/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java.i
data/test/java/io/RandomAccessFile/ReadLine.java.i
-data/test/java/security/KeyRep/AES.pre.1.5.key.i
data/src/share/classes/javax/swing/plaf/synth/SynthTabbedPaneUI.java.i
data/src/share/classes/sun/print/SunPageSelection.java.i
data/src/share/classes/com/sun/tools/extcheck/Main.java.i
+data/src/bsd/doc/man/ja/jps.1.i
data/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.java.i
data/src/share/classes/javax/xml/crypto/NodeSetData.java.i
data/src/share/classes/java/awt/datatransfer/StringSelection.java.i
@@ -3935,35 +4100,36 @@ data/src/share/classes/javax/swing/DropMode.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthToggleButtonUI.java.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono16.gif.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Platform.java.i
-data/make/tools/swing-beans/beaninfo/images/JScrollBarColor32.gif.i
-data/test/sun/security/validator/certreplace.sh.i
data/src/share/native/java/util/zip/zlib-1.2.5/gzclose.c.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c.i
data/test/sun/security/mscapi/KeytoolChangeAlias.sh.i
-data/make/tools/CharsetMapping/IBM1144.c2b.i
+data/src/share/classes/javax/swing/plaf/synth/SynthBorder.java.i
data/test/java/lang/module/_ModuleId.java.i
data/src/share/classes/javax/print/event/PrintJobAttributeEvent.java.i
data/test/javax/management/context/LocalizableTest.java.i
+data/src/windows/hpi/export/hpi_md.h.i
data/src/share/classes/sun/dyn/BoundMethodHandle.java.i
+data/make/javax/print/Makefile.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4513830.java.i
-data/test/java/util/concurrent/Exchanger/LoopHelpers.java.i
-data/src/windows/native/sun/windows/awt_Desktop.cpp.i
+data/src/share/classes/java/io/DataInputStream.java.i
data/test/java/io/FileDescriptor/Finalize.java.i
data/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate_Stub.java.i
-data/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties.i
-data/test/javax/management/descriptor/UnionTest.java.i
+data/src/share/classes/sun/net/TelnetProtocolException.java.i
+data/test/java/nio/file/Files/SkipSiblings.java.i
+data/src/share/classes/sun/reflect/ByteVectorFactory.java.i
data/make/tools/CharsetMapping/IBM1140.c2b.i
-data/src/share/classes/sun/security/provider/certpath/ForwardState.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_ME.properties.i
+data/src/macosx/classes/sun/lwawt/macosx/CMouseDragGestureRecognizer.java.i
data/test/java/beans/Introspector/Test6723447.java.i
data/test/javax/management/remote/mandatory/notif/ServerNotifs.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java.i
-data/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.lib.i
data/src/share/classes/sun/rmi/server/UnicastServerRef.java.i
data/test/java/util/zip/GZIP/Accordion.java.i
data/src/share/classes/sun/tools/jconsole/MBeansTab.java.i
data/src/share/classes/java/awt/image/ColorConvertOp.java.i
data/src/share/classes/sun/io/ByteToCharCp775.java.i
data/make/common/internal/ImportComponents.gmk.i
-data/src/share/classes/sun/nio/ch/PollSelectorProvider.java.i
data/test/java/rmi/transport/dgcDeadLock/TestImpl.java.i
data/src/share/classes/javax/net/ssl/X509TrustManager.java.i
data/make/sun/rmi/rmid/Makefile.i
@@ -3975,32 +4141,31 @@ data/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignature.java.i
data/test/javax/management/remote/mandatory/notif/EmptyDomainNotificationTest.java.i
+data/src/windows/resource/version.rc.i
data/test/javax/security/auth/PrivateCredentialPermission/Equals.java.i
-data/test/javax/swing/DataTransfer/6456844/bug6456844.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java.i
data/test/sun/security/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
data/test/sun/security/util/HostnameMatcher/cert3.crt.i
-data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template.i
+data/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java.i
data/src/share/classes/sun/print/PrinterGraphicsDevice.java.i
-data/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java.i
data/test/java/util/ResourceBundle/TestResource_de.java.i
data/src/share/classes/java/util/logging/Formatter.java.i
data/src/solaris/native/sun/awt/robot_common.h.i
data/src/share/classes/javax/swing/text/FlowView.java.i
data/test/java/net/URL/GetContent.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipUtils.java.i
-data/src/windows/native/sun/java2d/windows/dxCapabilities.cpp.i
+data/src/solaris/bin/jexec.c.i
data/src/share/classes/sun/util/resources/TimeZoneNames_fr.java.i
-data/src/share/sample/vm/jvm-clr/invoker.h.i
+data/src/share/classes/javax/management/loading/MLetParser.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_SY.properties.i
data/src/share/classes/java/util/concurrent/ForkJoinWorkerThread.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java.i
data/src/share/classes/com/sun/media/sound/InvalidFormatException.java.i
data/src/share/classes/com/sun/media/sound/RIFFWriter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherValue.java.i
-data/test/java/net/URLConnection/xml/xml1.i
+data/src/share/classes/sun/text/normalizer/UCharacterIterator.java.i
data/src/share/classes/sun/net/www/http/Hurryable.java.i
-data/src/windows/native/sun/jkernel/graphics/bullet.bmp.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLabelUI.java.i
data/src/share/classes/com/sun/tools/jdi/StringReferenceImpl.java.i
data/make/tools/CharsetMapping/IBM862.map.i
data/src/share/classes/sun/audio/AudioDataStream.java.i
@@ -4010,69 +4175,72 @@ data/test/java/io/charStreams/CharGenerator.java.i
data/test/com/sun/net/httpserver/bugs/HeadTest.java.i
data/test/java/net/Authenticator/B4759514.java.i
data/src/share/classes/com/sun/jdi/connect/TransportTimeoutException.java.i
-data/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java.i
+data/src/macosx/native/sun/nio/ch/KQueueArrayWrapper.c.i
data/src/share/classes/java/security/spec/DSAParameterSpec.java.i
data/src/share/sample/scripting/scriptpad/src/resources/mm.js.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmscgats.c.i
data/test/java/beans/VetoableChangeSupport/TestSynchronization.java.i
data/test/sun/security/util/DerValue/Indefinite.java.i
data/test/java/util/PluggableLocale/DateFormatProviderTest.sh.i
data/test/sun/net/InetAddress/nameservice/deadlock/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/java/beans/PropertyEditor/TestBooleanTypeNull.java.i
-data/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java.i
+data/src/share/classes/sun/io/ByteToCharMacTurkish.java.i
data/src/share/classes/sun/audio/AudioSecurityExceptionAction.java.i
data/src/solaris/native/sun/java2d/loops/java2d_Mlib.h.i
-data/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
+data/make/java/nio/addNotices.sh.i
data/test/java/io/Serializable/subclass/XObjectInputStream.java.i
data/test/java/security/BasicPermission/PermClass.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java.i
-data/test/javax/swing/JOptionPane/6464022/bug6464022.java.i
data/src/share/classes/org/openjdk/jigsaw/IdentityHashSet.java.i
data/test/java/io/Serializable/stopCustomDeserialization/Write.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c.i
data/src/share/classes/sun/java2d/pisces/PiscesMath.java.i
data/test/java/util/zip/ZipEntry/Constructor.java.i
+data/src/share/classes/javax/management/event/NotificationManager.java.i
data/src/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java.i
data/src/windows/native/sun/java2d/d3d/D3DPipeline.h.i
data/src/share/classes/sun/io/CharToByteMS949.java.i
data/src/share/native/sun/security/ec/ecdecode.c.i
data/src/share/classes/sun/awt/resources/awt_de.properties.i
-data/src/share/classes/sun/text/normalizer/UnicodeMatcher.java.i
-data/test/java/io/PipedInputStream/CloseAndAvailableRC.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.dll.i
+data/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java.i
data/src/share/classes/javax/management/remote/rmi/RMIConnector.java.i
-data/src/share/classes/java/awt/ModalEventFilter.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java.i
data/src/share/classes/java/awt/dnd/DnDEventMulticaster.java.i
-data/src/share/native/sun/awt/medialib/mlib_sys.c.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java.i
+data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh.i
data/src/share/classes/sun/security/validator/ValidatorException.java.i
data/src/share/classes/javax/print/attribute/standard/JobPriority.java.i
data/make/tools/auto_multi/Makefile.i
data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh.i
-data/test/sun/java2d/pisces/Renderer/Test7019861.java.i
+data/src/share/classes/java/nio/X-Buffer-bin.java.template.i
data/src/share/classes/javax/imageio/spi/ImageTranscoderSpi.java.i
data/test/javax/xml/crypto/dsig/ValidationTests.java.i
data/test/java/net/URLConnection/6212146/test.jar.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html.i
data/test/sun/security/krb5/auto/DupEtypes.java.i
data/test/java/security/Provider/GetInstance.java.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ja.properties.i
data/test/java/beans/PropertyEditor/TestByteClass.java.i
data/make/sun/awt/make.depend.i
+data/src/macosx/classes/com/apple/laf/AquaScrollBarUI.java.i
data/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java.i
data/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java.i
data/test/javax/swing/border/Test4252164.html.i
-data/test/sun/security/pkcs11/ec/TestKeyFactory.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java.i
data/test/com/sun/nio/sctp/SctpChannel/CommUp.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormatResources.java.i
data/make/tools/CharsetMapping/IBM1145.map.i
data/src/share/classes/sun/tools/jconsole/inspector/XTextFieldEditor.java.i
-data/src/share/classes/sun/security/util/ByteArrayLexOrder.java.i
data/test/java/lang/reflect/Constructor/Equals.java.i
-data/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java.i
+data/test/java/rmi/server/clientStackTrace/ClientStackTrace.java.i
data/src/solaris/classes/sun/awt/motif/MInputMethod.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/Algorithm.java.i
data/src/share/classes/java/rmi/activation/ActivationDesc.java.i
data/test/sun/security/smartcardio/TestControl.java.i
data/src/share/classes/java/beans/beancontext/BeanContextSupport.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmscgats.c.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterResources.java.i
+data/src/share/classes/java/lang/doc-files/captheta.gif.i
data/src/share/classes/sun/net/httpserver/StreamClosedException.java.i
data/test/sun/net/www/protocol/jar/resource.jar.i
data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.sh.i
@@ -4082,6 +4250,7 @@ data/src/windows/native/sun/java2d/d3d/D3DBlitLoops.cpp.i
data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabConstants.java.i
data/src/share/classes/java/beans/PropertyChangeListener.java.i
data/src/share/classes/sun/nio/cs/ext/IBM868.java.i
+data/src/macosx/native/sun/osxapp/PropertiesUtilities.h.i
data/src/share/classes/sun/print/PSStreamPrintService.java.i
data/test/java/nio/file/spi/TestProvider.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/HelpFormatter.java.i
@@ -4089,19 +4258,22 @@ data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef_Stub
data/test/sun/security/provider/PolicyParser/TokenStore.java.i
data/make/tools/src/build/tools/automulti/AutoMulti.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntRgb.c.i
+data/src/solaris/native/com/sun/security/auth/module/Unix.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.properties.i
-data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html.i
+data/src/bsd/doc/man/pack200.1.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java.i
data/src/share/classes/java/io/StreamTokenizer.java.i
data/src/share/classes/sun/io/ByteToCharCp278.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_WithComments.java.i
-data/src/share/native/java/lang/fdlibm/src/s_tan.c.i
+data/src/macosx/bin/java_md_macosx.c.i
+data/src/share/classes/sun/tools/jconsole/InternalDialog.java.i
data/src/share/classes/com/sun/jdi/doc-files/signature.html.i
data/src/share/native/java/lang/Double.c.i
data/test/sun/security/tools/jarsigner/JarSigning.keystore.i
data/src/share/classes/java/util/concurrent/ScheduledExecutorService.java.i
data/src/share/classes/java/util/PropertyResourceBundle.java.i
data/src/share/classes/java/awt/MenuContainer.java.i
-data/test/tools/pack200/TestExceptions.java.i
+data/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java.i
data/src/share/classes/com/sun/jndi/cosnaming/ExceptionMapper.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Solaris_Decoder.java.i
data/make/tools/CharsetMapping/IBM838.c2b.i
@@ -4114,18 +4286,22 @@ data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.sh.i
data/test/java/nio/file/Path/temporary_files.sh.i
data/src/share/classes/java/io/BufferedInputStream.java.i
data/src/share/demo/jvmti/hprof/debug_malloc.c.i
-data/test/javax/management/MBeanServer/PreRegisterTest.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CCustomCursor.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll.d
data/src/share/classes/com/sun/imageio/spi/RAFImageInputStreamSpi.java.i
-data/src/solaris/native/sun/awt/awt_Cursor.h.i
+data/src/windows/native/sun/font/fontpath.c.i
+data/src/share/classes/javax/sound/sampled/FloatControl.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim32.png.i
data/src/share/classes/javax/swing/plaf/FontUIResource.java.i
data/test/java/awt/Modal/WsDisabledStyle/OverBlocker/OverBlocker.java.i
data/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java.i
data/test/org/openjdk/jigsaw/package.sh.i
+data/test/java/util/Collections/EqualsTest.java.i
data/test/java/nio/Buffer/BasicInt.java.i
-data/src/share/classes/java/awt/TextArea.java.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java.i
data/test/java/lang/module/module-info-reader.sh.i
data/test/java/net/URLClassLoader/B5077773.sh.i
+data/src/share/classes/sun/util/resources/LocaleNamesBundle.java.i
data/src/share/classes/java/beans/BeanInfo.java.i
data/test/java/beans/XMLDecoder/spec/TestObject.java.i
data/test/sun/nio/cs/TestStringCodingUTF8.java.i
@@ -4134,17 +4310,21 @@ data/src/share/classes/com/sun/jndi/ldap/ClientId.java.i
data/src/share/classes/java/net/SocketOptions.java.i
data/src/share/classes/sun/security/internal/spec/TlsMasterSecretParameterSpec.java.i
data/src/share/classes/javax/naming/NoPermissionException.java.i
+data/src/share/classes/sun/applet/AppletIllegalArgumentException.java.i
data/src/share/classes/sun/java2d/loops/DrawGlyphList.java.i
data/src/share/classes/sun/net/www/HeaderParser.java.i
data/src/share/classes/sun/tools/jstat/OptionOutputFormatter.java.i
+data/src/share/classes/com/sun/security/auth/SolarisPrincipal.java.i
+data/src/macosx/classes/sun/lwawt/LWScrollPanePeer.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot_Skel.java.i
data/src/share/classes/com/sun/jdi/connect/Transport.java.i
data/test/java/util/StringTokenizer/Supplementary.java.i
-data/test/javax/management/remote/mandatory/URLTest.java.i
data/src/share/classes/sun/management/HotspotMemoryMBean.java.i
-data/test/java/dyn/InvokeGenericTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java.i
data/src/share/classes/com/sun/jdi/MonitorInfo.java.i
data/test/java/io/Serializable/misplacedArrayClassDesc/MisplacedArrayClassDesc.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/NType.java.i
+data/src/share/classes/java/lang/reflect/ParameterizedType.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/AllSoundOff.java.i
data/src/share/classes/com/sun/media/sound/AudioFloatConverter.java.i
data/test/javax/imageio/plugins/png/ShortHistogramTest.java.i
@@ -4153,49 +4333,50 @@ data/src/share/classes/sun/tools/jconsole/Formatter.java.i
data/make/tools/swing-beans/beaninfo/images/JButtonColor32.gif.i
data/src/share/classes/com/sun/jndi/url/iiop/iiopURLContextFactory.java.i
data/test/java/rmi/activation/Activatable/nestedActivate/group.security.policy.i
+data/src/bsd/doc/man/wsimport.1.i
data/src/share/classes/sun/net/www/http/HttpCaptureInputStream.java.i
data/test/sun/security/util/Debug/MultiOptions.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressConstants.java.i
-data/test/java/lang/management/MemoryMXBean/LowMemoryTestSerialGC.sh.i
+data/src/macosx/classes/com/apple/laf/AquaCaret.java.i
data/src/share/classes/java/lang/InternalError.java.i
data/src/share/classes/org/openjdk/jigsaw/ContextSet.java.i
-data/src/share/classes/sun/dyn/util/BytecodeSignature.java.i
+data/src/share/classes/com/sun/jmx/namespace/DomainInterceptor.java.i
data/test/sun/net/www/protocol/mailto/HandlerParse.java.i
data/make/tools/swing-beans/beaninfo/images/JViewportMono32.gif.i
data/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/java/lang/annotation/Missing/Missing.java.i
-data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt.i
+data/test/java/nio/channels/Channels/ShortWrite.java.i
data/make/tools/src/build/tools/jdwpgen/ErrorSetNode.java.i
data/src/share/classes/com/sun/jdi/request/MethodExitRequest.java.i
data/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java.i
data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono32.gif.i
data/src/share/classes/java/awt/geom/Line2D.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsTableMetaImpl.java.i
-data/src/share/classes/java/awt/peer/TextAreaPeer.java.i
+data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java.i
data/src/share/classes/javax/swing/event/MenuDragMouseEvent.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Coding.java.i
data/src/share/classes/javax/imageio/spi/ServiceRegistry.java.i
data/test/java/util/concurrent/SynchronousQueue/Fairness.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libfreebl3.so.d
-data/src/share/classes/com/sun/tools/example/debug/expr/Token.java.i
data/src/share/bin/emessages.h.i
data/test/java/util/Hashtable/SelfRef.java.i
data/test/java/util/regex/BMPTestCases.txt.i
data/test/com/sun/servicetag/newer-registry-version.xml.i
data/src/share/classes/java/beans/VetoableChangeListener.java.i
-data/make/mkdemo/applets/GraphicsTest/Makefile.i
-data/src/share/native/sun/security/ec/ec.h.i
+data/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java.i
+data/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java.i
+data/src/share/classes/sun/io/CharToByteCp870.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java.i
data/src/share/classes/sun/io/ByteToCharMS874.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntInt.java.i
-data/src/share/classes/javax/print/attribute/standard/PrintQuality.java.i
-data/src/share/classes/java/sql/SQLTransactionRollbackException.java.i
+data/make/mkdemo/jvmti/versionCheck/Makefile.i
+data/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java.i
data/src/share/native/sun/misc/MessageUtils.c.i
-data/src/share/classes/javax/swing/text/TabableView.java.i
data/src/solaris/native/sun/awt/awt_wm.c.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java.i
data/src/share/classes/com/sun/beans/decoder/DocumentHandler.java.i
data/src/share/classes/sun/nio/ch/MembershipKeyImpl.java.i
-data/test/java/net/URLClassLoader/sealing/Makefile.i
-data/src/windows/native/java/net/SocketInputStream.c.i
+data/test/sun/nio/cs/NIOJISAutoDetectTest.java.i
data/test/javax/management/openmbean/BadConstraintTest.java.i
data/test/javax/management/mxbean/ExceptionDiagnosisTest.java.i
data/test/java/net/SocketPermission/B4414825.java.i
@@ -4203,55 +4384,57 @@ data/src/share/demo/management/index.html.i
data/src/share/classes/sun/util/locale/InternalLocaleBuilder.java.i
data/src/share/classes/sun/util/resources/LocaleNames_es.properties.i
data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Skel.java.i
-data/make/java/nio/mxbean/Makefile.i
-data/test/sun/security/provider/PolicyFile/SelfWildcard.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ko.properties.i
+data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg.i
+data/src/share/classes/java/awt/MenuBar.java.i
+data/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java.i
data/src/share/demo/jvmti/hprof/hprof_md.h.i
-data/src/share/classes/sun/text/resources/CollationData_sk.java.i
+data/src/share/classes/sun/awt/image/ShortInterleavedRaster.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ru_RU.properties.i
data/src/share/classes/java/awt/Robot.java.i
-data/src/solaris/native/java/io/canonicalize_md.c.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterDialogPeer.java.i
data/test/java/beans/Introspector/Test5063390.java.i
+data/src/share/classes/java/lang/ClassLoader.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties.i
data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext_Stub.java.i
data/src/share/classes/sun/tools/java/BinaryCode.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java.i
data/test/java/util/PluggableLocale/CollatorProviderTest.java.i
-data/src/share/classes/javax/accessibility/AccessibleContext.java.i
-data/test/java/util/PluggableLocale/ClasspathTest.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java.i
+data/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XObject.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/util/KeyValuePair.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java.i
data/test/javax/management/modelmbean/DescriptorSupportSerialTest.java.i
data/test/javax/swing/JFileChooser/7036025/bug7036025.java.i
data/src/share/native/sun/awt/libpng/pngset.c.i
-data/src/share/classes/sun/swing/text/TextComponentPrintable.java.i
data/src/share/classes/sun/text/normalizer/ICUData.java.i
data/src/share/classes/javax/swing/text/html/parser/TagElement.java.i
-data/src/share/classes/java/awt/image/BufferedImageOp.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XTextField.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1098.java.i
-data/make/tools/CharsetMapping/GBK.map.i
-data/test/java/util/Random/NextIntPowerOfTwoMod.java.i
-data/src/windows/classes/com/sun/security/auth/module/README.i
+data/make/java/zip/mapfile-vers.i
+data/src/share/classes/sun/nio/cs/SingleByteEncoder.java.i
data/src/share/classes/javax/sound/sampled/AudioFormat.java.i
+data/test/java/net/URLConnection/DisconnectAfterEOF.java.i
data/make/jpda/transport/Makefile.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_ES.properties.i
data/test/com/sun/security/auth/login/ConfigFile/Override.good.config.i
+data/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java.i
data/src/share/demo/nbproject/management/FullThreadDump/nbproject/jdk.xml.i
+data/src/macosx/native/sun/awt/InitIDs.h.i
data/make/tools/swing-beans/beaninfo/images/JSeparatorColor32.gif.i
data/src/share/demo/jvmti/hprof/hprof_util.h.i
data/src/share/classes/javax/smartcardio/CardNotPresentException.java.i
-data/make/java/nio/FILES_java.gmk.i
+data/src/macosx/classes/sun/lwawt/SelectionClearListener.java.i
data/test/java/util/jar/JarFile/Signed.jar.i
data/src/share/classes/java/lang/ref/PhantomReference.java.i
data/src/solaris/hpi/include/hpi_init.h.i
-data/src/share/classes/java/sql/package.html.i
data/src/share/classes/sun/rmi/log/LogInputStream.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NSClass.java.i
data/test/javax/swing/JFileChooser/6798062/bug6798062.html.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_BA.properties.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/FunctionAlias.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java.i
-data/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java.i
+data/src/macosx/classes/com/apple/eawt/event/GestureEvent.java.i
data/test/javax/swing/JTable/6768387/bug6768387.java.i
-data/test/java/util/EnumSet/RetainAll.java.i
data/test/java/lang/ClassLoader/getdotresource.sh.i
data/test/sun/util/logging/SourceClassName.java.i
data/src/share/classes/javax/print/event/PrintJobAdapter.java.i
@@ -4259,26 +4442,28 @@ data/src/share/classes/sun/tools/javac/resources/javac_ja.properties.i
data/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.java.i
data/src/share/classes/java/lang/System.java.i
data/test/java/beans/XMLEncoder/Test4631471.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll.d
data/test/java/net/PlainSocketImpl/SetOption.java.i
data/src/share/classes/com/sun/jndi/cosnaming/RemoteToCorba.java.i
data/src/share/classes/sun/tools/java/RuntimeConstants.java.i
+data/src/macosx/classes/com/apple/eawt/AppReOpenedListener.java.i
data/src/share/classes/sun/util/resources/LocaleNames_en_MT.properties.i
data/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java.i
+data/src/share/classes/sun/reflect/UTF8.java.i
data/test/java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java.i
data/make/netbeans/common/architectures/arch-x86.properties.i
+data/src/share/classes/java/io/package.html.i
data/src/share/classes/java/util/logging/LoggingPermission.java.i
data/src/share/classes/sun/tools/jconsole/VMPanel.java.i
data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/security.policy.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManager.java.i
data/test/java/awt/print/PrinterJob/PageFormatChange.java.i
data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.policy.i
+data/src/share/classes/sun/awt/SunHints.java.i
data/make/tools/CharsetMapping/IBM937.nr.i
data/test/java/awt/print/Dialog/DialogOrient.java.i
data/test/sun/tools/jrunscript/repl.out.i
-data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java.i
-data/src/share/classes/java/beans/ThreadGroupContext.java.i
data/src/share/classes/java/io/Closeable.java.i
-data/test/javax/swing/RepaintManager/7013453/bug7013453.java.i
data/test/java/security/AccessController/PreserveCombiner.java.i
data/src/share/classes/sun/io/ByteToCharCp1257.java.i
data/src/share/classes/sun/reflect/MagicAccessorImpl.java.i
@@ -4287,18 +4472,18 @@ data/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Base.java.i
data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.html.i
data/src/share/classes/javax/sql/rowset/serial/SerialBlob.java.i
data/test/java/security/cert/CertPathBuilder/provider.policy.i
-data/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapCommunity.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/LocalControl.java.i
-data/test/sun/net/www/http/HttpClient/StreamingRetry.java.i
+data/test/java/io/StreamTokenizer/ReadAhead.java.i
data/test/javax/management/remote/mandatory/util/MapNullValuesTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeOpen.gif.i
-data/src/share/classes/java/awt/MultipleGradientPaint.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sv.properties.i
data/src/share/classes/sun/text/resources/FormatData_zh_TW.java.i
-data/test/java/util/PluggableLocale/ProviderTest.java.i
+data/test/tools/pack200/Utils.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SingletonMap.java.i
+data/src/windows/classes/sun/java2d/windows/WinVolatileSurfaceManager.java.i
data/src/share/classes/sun/font/ExtendedTextLabel.java.i
-data/src/share/demo/jvmti/heapViewer/README.txt.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif.i
data/test/java/beans/PropertyEditor/TestStringClassValue.java.i
data/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java.i
data/src/share/classes/javax/management/InQueryExp.java.i
@@ -4310,14 +4495,16 @@ data/src/share/back/standardHandlers.c.i
data/src/share/classes/java/math/RoundingMode.java.i
data/src/share/classes/sun/beans/editors/NumberEditor.java.i
data/src/solaris/native/sun/nio/ch/IOUtil.c.i
-data/src/share/classes/sun/security/krb5/internal/KrbApErrException.java.i
data/test/java/rmi/reliability/juicer/AppleUserImpl.java.i
data/src/share/classes/java/net/CacheRequest.java.i
+data/src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java.i
data/src/share/classes/javax/imageio/spi/DigraphNode.java.i
+data/src/solaris/native/sun/awt/swing_GTKEngine.c.i
data/src/share/native/sun/awt/debug/debug_util.h.i
-data/test/com/sun/tools/attach/badagent.mf.i
+data/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java.i
data/src/share/classes/java/io/ObjectStreamField.java.i
data/src/share/classes/sun/net/httpserver/SelectorCache.java.i
+data/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java.i
data/test/java/util/PluggableLocale/providersrc/FooDateFormat.java.i
data/test/javax/swing/JTextArea/4697612/bug4697612.txt.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/report/J2DAnalyzer.java.i
@@ -4327,56 +4514,66 @@ data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.propertie
data/src/share/classes/javax/management/namespace/JMXNamespaces.java.i
data/src/share/classes/com/sun/servicetag/resources/product_registration.xsd.i
data/test/java/math/BigDecimal/ScaleByPowerOfTenTests.java.i
+data/src/macosx/bundle/JavaAppLauncher/resources/English.lproj/InfoPlist.strings.i
data/src/share/native/sun/font/layout/OpenTypeUtilities.cpp.i
data/src/share/classes/sun/font/TextRecord.java.i
data/src/share/classes/java/beans/PropertyEditor.java.i
-data/test/java/lang/invoke/InvokeDynamicPrintArgs.java.i
data/src/windows/native/sun/java2d/windows/Win32OffScreenSurfaceData.cpp.i
-data/src/share/classes/sun/security/util/DerEncoder.java.i
+data/src/macosx/native/sun/awt/AWTEvent.h.i
data/test/sun/tools/jrunscript/jrunscript-cpTest.sh.i
data/src/share/classes/javax/swing/plaf/nimbus/ImageScalingHelper.java.i
+data/src/bsd/doc/man/javah.1.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIIcon.java.i
-data/test/sun/rmi/transport/tcp/blockAccept/TestImpl.java.i
+data/test/java/rmi/reliability/benchmark/runRmiBench.sh.i
data/src/linux/doc/man/ja/jsadebugd.1.i
+data/test/sun/management/jmxremote/bootstrap/Utils.java.i
data/test/java/beans/XMLEncoder/Test4880633.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CFileDialog.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM285.java.i
data/src/share/classes/java/awt/LayoutManager.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/Test.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/SessionListener.java.i
data/src/share/classes/java/lang/invoke/InvokeDynamic.java.i
-data/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java.i
+data/make/tools/CharsetMapping/IBM285.c2b.i
+data/src/share/classes/java/util/IllegalFormatPrecisionException.java.i
+data/src/share/native/sun/awt/image/cvutils/img_ordclruns.h.i
data/src/share/classes/sun/tools/java/Parser.java.i
data/test/javax/xml/crypto/dsig/data/certs/ca.crt.i
data/src/share/classes/javax/swing/text/rtf/charsets/ansi.txt.i
-data/src/share/classes/java/awt/Choice.java.i
+data/src/share/classes/sun/text/resources/FormatData_de.java.i
data/test/java/util/Formatter/BasicByte.java.i
data/test/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java.i
data/src/share/demo/applets/CardTest/example1.html.i
data/test/java/util/zip/StoredCRC.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java.i
+data/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIInsets.java.i
+data/src/share/classes/javax/swing/text/NavigationFilter.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanIntrospector.java.i
-data/test/com/sun/crypto/provider/Mac/MacClone.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java.i
-data/test/java/nio/channels/FileChannel/MapTest.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java.i
data/src/solaris/native/sun/awt/HeadlessToolkit.c.i
data/test/java/rmi/reliability/benchmark/bench/rmi/FloatArrayCalls.java.i
data/src/solaris/native/sun/nio/ch/EPoll.c.i
data/src/share/classes/sun/management/ManagementFactoryHelper.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java.i
+data/test/java/lang/ThreadLocal/MemoryLeak.java.i
+data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h.i
data/src/share/classes/sun/nio/ch/Reflect.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeBuffer.java.i
data/src/share/classes/java/awt/image/ColorModel.java.i
-data/test/java/security/cert/CertificateFactory/ReturnStream.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java.i
+data/src/share/classes/sun/security/x509/SerialNumber.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/NoArgumentOptionSpec.java.i
data/src/share/classes/com/sun/security/sasl/digest/FactoryImpl.java.i
-data/test/java/io/Serializable/proxy/replace/Test.java.i
data/src/share/classes/java/sql/SQLClientInfoException.java.i
data/test/java/util/ResourceBundle/Bug6572242.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2prjM.i
data/test/java/security/cert/X509Certificate/certextkeyusage.i
+data/src/share/classes/javax/swing/border/MatteBorder.java.i
data/make/java/java/FILES_c.gmk.i
data/src/share/classes/com/sun/net/httpserver/HttpServer.java.i
data/src/share/classes/sun/font/GlyphList.java.i
data/make/netbeans/jarzip/nbproject/project.xml.i
+data/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/group.security.policy.i
data/src/share/classes/sun/tools/asm/Label.java.i
data/src/share/classes/java/security/KeyFactory.java.i
@@ -4385,23 +4582,23 @@ data/test/sun/security/krb5/auto/LifeTimeInSeconds.java.i
data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.h.i
data/src/share/demo/jvmti/mtrace/Mtrace.java.i
data/src/share/demo/jvmti/hprof/manual.html.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties.i
data/test/java/net/NetworkInterface/IndexTest.java.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java.i
data/test/jprt.config.i
-data/src/share/classes/java/sql/Date.java.i
+data/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh.i
data/src/share/native/common/check_format.c.i
data/src/share/classes/javax/crypto/NoSuchPaddingException.java.i
data/src/share/classes/sun/print/ProxyGraphics2D.java.i
data/test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameService.java.i
data/make/tools/CharsetMapping/MacCroatian.map.i
-data/src/share/classes/java/security/cert/CertificateException.java.i
-data/src/share/native/sun/font/layout/ShapingTypeData.cpp.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java.i
+data/src/share/classes/sun/text/resources/FormatData_ca.java.i
data/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java.i
data/src/share/classes/sun/tools/tree/ShiftRightExpression.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTBootClassPathTableMeta.java.i
-data/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java.i
data/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java.i
-data/src/share/classes/javax/crypto/ExemptionMechanismSpi.java.i
data/src/windows/native/sun/windows/awt_PrintDialog.h.i
data/src/share/classes/com/sun/security/jgss/InquireType.java.i
data/test/sun/rmi/rmic/minimizeWrapperInstances/P.java.i
@@ -4409,27 +4606,29 @@ data/src/share/classes/com/sun/tools/jdi/FieldImpl.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_LU.properties.i
data/src/share/classes/javax/management/NotificationInfo.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSplitPaneDivider.java.i
-data/src/share/classes/sun/awt/image/VolatileSurfaceManager.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java.i
-data/test/sun/security/util/Resources/Format.config.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java.i
+data/test/java/net/InetAddress/HashSpread.java.i
+data/src/share/classes/java/lang/invoke/MutableCallSite.java.i
data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.sh.i
data/src/share/classes/java/awt/doc-files/GridBagLayout-1.gif.i
data/src/share/classes/java/lang/management/MemoryNotificationInfo.java.i
data/test/com/sun/net/httpserver/bugs/B6361557.java.i
data/src/windows/classes/com/sun/tools/jdi/SharedMemoryListeningConnector.java.i
data/src/solaris/native/sun/awt/utility/rect.h.i
+data/src/share/classes/com/sun/java/util/jar/pack/Code.java.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.i
data/test/javax/swing/JSlider/6848475/bug6848475.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java.i
data/src/solaris/doc/sun/man/man1/jhat.1.i
data/src/share/classes/java/awt/peer/FramePeer.java.i
+data/src/bsd/doc/man/jsadebugd.1.i
+data/test/sun/security/smartcardio/Utils.java.i
data/test/java/rmi/server/RemoteObject/toStub/ToStub_Stub.java.i
data/src/share/classes/sun/reflect/FieldAccessor.java.i
-data/test/java/beans/XMLDecoder/spec/TestNull.java.i
data/src/share/classes/sun/java2d/SurfaceManagerFactory.java.i
data/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c.i
-data/src/solaris/native/sun/java2d/loops/vis_IntBgr.c.i
data/src/share/classes/sun/security/krb5/internal/crypto/NullEType.java.i
+data/src/share/classes/com/sun/rowset/WebRowSetImpl.java.i
data/test/java/lang/management/ThreadMXBean/SynchronizationStatistics.java.i
data/test/java/beans/XMLDecoder/Test6338070.java.i
data/test/javax/swing/JFileChooser/6524424/bug6524424.html.i
@@ -4451,11 +4650,13 @@ data/src/share/classes/sun/security/provider/certpath/BasicChecker.java.i
data/make/sun/javazic/tzdata/factory.i
data/src/share/classes/java/security/DigestException.java.i
data/src/share/classes/java/awt/peer/TextFieldPeer.java.i
-data/src/solaris/native/sun/security/pkcs11/j2secmod_md.h.i
data/src/share/sample/scripting/scriptpad/src/resources/gui.js.i
+data/src/bsd/doc/man/javadoc.1.i
data/src/share/classes/javax/management/NotificationListener.java.i
data/src/share/classes/sun/io/CharToByteMacDingbat.java.i
+data/src/share/classes/sun/awt/image/WritableRasterNative.java.i
data/test/java/lang/reflect/Proxy/Boxing.java.i
+data/src/linux/doc/man/servertool.1.i
data/test/sun/security/x509/AVA/EmailAddressEncoding.java.i
data/src/solaris/hpi/native_threads/include/mutex_md.h.i
data/make/tools/src/build/tools/generatecharacter/PropList.java.i
@@ -4463,22 +4664,19 @@ data/test/sun/tools/jrunscript/dash-e.out.i
data/src/solaris/classes/sun/awt/X11/XEmbedHelper.java.i
data/src/share/classes/sun/io/CharToByteBig5.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.sh.i
-data/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml.i
-data/src/solaris/native/sun/java2d/x11/X11SurfaceData.h.i
+data/src/solaris/classes/sun/print/AttributeClass.java.i
data/src/share/classes/java/util/concurrent/CyclicBarrier.java.i
data/src/share/classes/sun/security/krb5/internal/rcache/AuthTime.java.i
-data/src/share/classes/sun/rmi/server/Dispatcher.java.i
data/src/share/native/sun/security/ec/impl/mplogic.c.i
data/src/share/classes/sun/print/resources/tumble.png.i
data/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java.i
data/src/solaris/classes/sun/java2d/xr/XRUtils.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CTrayIcon.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRootPaneUI.java.i
-data/src/share/classes/sun/java2d/pisces/Dasher.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load4.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java.i
data/test/javax/imageio/CachePremissionsTest/rw.policy.i
data/src/share/classes/sun/tools/java/ClassNotFound.java.i
-data/src/share/classes/sun/print/PSStreamPrintJob.java.i
-data/test/ProblemList.txt.i
data/src/share/classes/java/net/Inet6Address.java.i
data/src/share/classes/com/sun/pept/presentation/TargetFinder.java.i
data/src/solaris/classes/sun/awt/motif/MTextAreaPeer.java.i
@@ -4488,32 +4686,38 @@ data/src/share/classes/javax/naming/directory/AttributeModificationException.jav
data/test/javax/xml/crypto/dsig/data/certs/balor.crt.i
data/test/javax/print/applet/applet1/Applet1PrintServiceLookup.java.i
data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.java.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/GenericArrayTypeImpl.java.i
+data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.html.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c.i
+data/make/tools/classanalyzer/Makefile.i
data/make/java/management/Makefile.i
data/test/sun/management/HotspotRuntimeMBean/GetTotalSafepointTime.java.i
-data/src/share/native/sun/java2d/loops/FourByteAbgr.c.i
+data/src/share/classes/com/sun/crypto/provider/DESCrypt.java.i
data/src/share/classes/com/sun/net/httpserver/HttpsConfigurator.java.i
data/src/share/classes/sun/java2d/HeadlessGraphicsEnvironment.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/Session.java.i
-data/src/share/back/log_messages.c.i
+data/src/share/classes/java/lang/annotation/Documented.java.i
data/src/share/classes/sun/security/jgss/spnego/SpNegoCredElement.java.i
-data/src/share/classes/com/sun/tools/example/doc/index.html.i
data/test/javax/management/monitor/CounterMonitorDeadlockTest.java.i
-data/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java.i
+data/make/docs/Makefile.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties.i
+data/test/java/net/URLConnection/RedirectLimit.java.i
data/src/share/classes/javax/naming/CompositeName.java.i
data/test/java/io/File/isDirectory/Applet.java.i
-data/src/share/classes/javax/swing/table/TableCellRenderer.java.i
+data/src/linux/doc/man/ja/serialver.1.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java.i
data/test/java/beans/PropertyEditor/6380849/SecondBean.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java.i
data/test/java/lang/instrument/NullRedefineClassesTests.java.i
data/test/java/beans/Introspector/Test6422403.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedMap.java.i
+data/src/macosx/classes/com/apple/eawt/package.html.i
+data/test/sun/security/provider/PolicyParser/p002.policy.i
data/test/java/util/AbstractMap/Equals.java.i
data/src/share/classes/com/sun/media/sound/SF2Modulator.java.i
data/make/tools/manifest.mf.i
data/test/sun/net/www/http/HttpClient/B6726695.java.i
+data/src/share/native/sun/java2d/opengl/OGLContext.c.i
data/test/javax/sound/midi/Gervill/AudioFloatConverter/GetFormat.java.i
+data/test/sun/security/tools/keytool/newhelp.sh.i
data/src/share/classes/javax/swing/JCheckBox.java.i
data/src/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMEnterprise.java.i
@@ -4522,50 +4726,51 @@ data/src/share/classes/com/sun/java/browser/dom/DOMUnsupportedException.java.i
data/src/share/classes/java/lang/management/PlatformLoggingMXBean.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiFileChooserUI.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_bg_BG.properties.i
-data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy.i
+data/src/bsd/doc/man/ja/jinfo.1.i
data/src/share/classes/javax/swing/JDialog.java.i
data/src/share/classes/javax/swing/text/html/parser/AttributeList.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java.i
+data/src/macosx/bin/java_md_macosx.h.i
data/src/share/classes/javax/print/attribute/standard/JobImpressions.java.i
data/src/solaris/native/sun/awt/awt_Cursor.c.i
data/src/solaris/classes/sun/awt/X11/XMouseDragGestureRecognizer.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_AE.properties.i
-data/src/share/classes/com/sun/pept/ept/EPTFactory.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java.i
+data/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java.i
data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/JarFileCompare.java.i
data/test/sun/security/krb5/TimeInCCache.java.i
+data/test/java/nio/channels/Selector/ByteServer.java.i
data/src/share/back/FieldImpl.c.i
-data/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties.i
data/src/share/classes/com/sun/pept/protocol/MessageDispatcher.java.i
data/src/share/classes/sun/security/util/AuthResources_it.java.i
data/test/javax/management/loading/LibraryLoader/UseNativeLib0.html.i
+data/src/share/classes/sun/io/CharToByteCp857.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties.i
-data/src/share/classes/sun/text/resources/FormatData_bg_BG.java.i
+data/src/share/classes/sun/tools/tree/FinallyStatement.java.i
data/src/linux/doc/man/ja/extcheck.1.i
data/src/share/classes/sun/net/ProgressMonitor.java.i
-data/test/java/beans/Performance/TestPropertyChangeSupport.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/COMMarkerSegment.java.i
data/test/java/lang/reflect/Generics/TestBadSignatures.java.i
data/src/share/classes/sun/java2d/pipe/GlyphListPipe.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_vi.properties.i
-data/src/solaris/classes/sun/awt/UNIXToolkit.java.i
+data/make/netbeans/common/architectures/arch-amd64.properties.i
+data/src/share/classes/java/io/StreamCorruptedException.java.i
data/make/com/sun/nio/sctp/FILES_java.gmk.i
-data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c.i
+data/src/share/classes/java/awt/doc-files/modal-example3.gif.i
data/src/share/classes/com/sun/beans/decoder/LongElementHandler.java.i
data/test/com/sun/net/httpserver/testkeys.i
data/make/java/rmi/Makefile.i
-data/test/java/io/Serializable/enum/missingConstant/Read.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java.i
data/test/java/nio/channels/Pipe/NonBlocking.java.i
data/src/share/classes/javax/sound/sampled/EnumControl.java.i
+data/src/macosx/native/sun/font/CGGlyphImages.h.i
data/test/java/util/Locale/bug6312358.java.i
data/test/java/nio/channels/SocketChannel/Basic.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitter.java.i
data/src/windows/classes/sun/nio/fs/WindowsLinkSupport.java.i
data/test/java/util/PluggableLocale/fooprovider.jar.i
data/src/share/classes/sun/text/normalizer/RuleCharacterIterator.java.i
+data/src/share/classes/sun/text/resources/CollationData_ko.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_TW.properties.i
data/src/share/native/sun/java2d/opengl/OGLTextRenderer.c.i
-data/make/tools/src/build/tools/commentchecker/CommentChecker.java.i
data/test/org/openjdk/jigsaw/cli/ModuleFormatHeaderHashTest.java.i
data/test/java/nio/file/Files/probeContentType/Basic.java.i
data/src/share/classes/javax/management/NotificationBroadcasterSupport.java.i
@@ -4577,6 +4782,8 @@ data/src/share/classes/java/awt/FontFormatException.java.i
data/src/share/classes/javax/imageio/ImageTypeSpecifier.java.i
data/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource2.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c.i
+data/src/share/classes/java/awt/peer/FileDialogPeer.java.i
+data/src/macosx/classes/com/apple/laf/AquaRootPaneUI.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiDesktopIconUI.java.i
data/src/solaris/classes/sun/nio/fs/GnomeFileTypeDetector.java.i
data/test/java/io/File/CompareTo.java.i
@@ -4586,13 +4793,12 @@ data/src/share/classes/sun/security/jgss/GSSToken.java.i
data/src/share/classes/sun/net/www/protocol/jar/URLJarFile.java.i
data/test/javax/swing/plaf/nimbus/Test6741426.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclEntryImpl.java.i
-data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java.i
+data/src/share/back/ClassObjectReferenceImpl.h.i
data/test/java/lang/instrument/RetransformBigClass.sh.i
data/make/tools/winver/src/StdAfx.cpp.i
data/test/javax/swing/text/WrappedPlainView/6857057/StubLeafElement.java.i
data/test/java/awt/font/LineBreakMeasurer/FRCTest.java.i
data/test/java/rmi/activation/checkusage/CheckUsage.java.i
-data/make/common/BuildNativePackages.gmk.i
data/make/javax/sound/jsoundalsa/mapfile-vers.i
data/src/share/classes/org/relaxng/datatype/DatatypeBuilder.java.i
data/src/linux/doc/man/rmid.1.i
@@ -4602,53 +4808,56 @@ data/test/sun/security/krb5/auto/NoInitNoKeytab.java.i
data/src/share/classes/javax/swing/text/DefaultEditorKit.java.i
data/test/sun/security/tools/keytool/AltProviderPath.sh.i
data/src/share/classes/sun/net/www/MessageHeader.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java.i
-data/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING.i
+data/src/share/demo/nbproject/jfc/TransparentRuler/build.xml.i
data/test/com/sun/jdi/Exit0.java.i
data/test/java/nio/charset/coders/Surrogates.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanManagerMXBean.java.i
data/src/share/classes/sun/util/resources/LocaleNames_ar.properties.i
-data/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java.i
+data/src/solaris/native/sun/awt/medialib/vis_32.il.i
data/test/java/io/Writer/Append.java.i
data/test/sun/misc/URLClassPath/testclasses.jar.i
data/src/share/bin/splashscreen.h.i
data/src/windows/native/sun/java2d/windows/ddrawUtils.cpp.i
+data/src/share/classes/sun/security/krb5/SCDynamicStoreConfig.java.i
data/test/javax/swing/JTable/6937798/bug6937798.java.i
data/src/share/classes/sun/security/util/Debug.java.i
+data/src/macosx/classes/com/apple/laf/ScreenPopupFactory.java.i
data/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.java.i
data/src/share/classes/sun/reflect/generics/tree/LongSignature.java.i
data/test/javax/security/auth/login/LoginContext/ModuleSubject.config.i
data/src/share/classes/sun/jvmstat/monitor/MonitoredVm.java.i
data/test/java/beans/Statement/Test4653179.java.i
-data/test/javax/script/Test7.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java.i
data/test/java/io/OutputStreamWriter/WriteAfterClose.java.i
data/src/windows/native/sun/windows/Hashtable.cpp.i
data/src/share/classes/sun/io/ByteToCharCp1256.java.i
data/src/share/classes/java/security/cert/CRLReason.java.i
-data/test/sun/security/pkcs11/Secmod/TrustAnchors.java.i
+data/make/common/Mapfile-vers.gmk.i
data/src/share/classes/sun/security/acl/GroupImpl.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java.i
data/src/share/native/sun/font/layout/ScriptAndLanguage.h.i
-data/src/share/native/sun/awt/image/cvutils/img_input8.h.i
+data/test/java/io/Serializable/evolution/AddedSuperClass/README.i
+data/src/share/classes/java/security/PublicKey.java.i
data/make/tools/CharsetMapping/MS932.c2b.i
data/src/solaris/bin/sparc/jvm.cfg.i
data/src/share/classes/sun/text/resources/FormatData.java.i
+data/test/javax/security/auth/PrivateCredentialPermission/Subset.policy.i
data/src/share/classes/sun/misc/JavaSecurityAccess.java.i
-data/src/share/classes/sun/text/CollatorUtilities.java.i
-data/src/share/modules/jdk.swing/module-info.java.i
data/src/windows/native/sun/nio/ch/IOUtil.c.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh.i
+data/src/share/native/sun/java2d/loops/ImageData.h.i
data/src/windows/classes/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.java.i
data/src/share/classes/javax/swing/text/html/FormSubmitEvent.java.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Ports.cpp.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources.properties.i
-data/make/tools/CharsetMapping/MS936.map.d
+data/src/share/classes/sun/misc/RegexpTarget.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/trees.c.i
data/test/com/sun/jdi/AcceptTimeout.java.i
data/src/share/classes/javax/swing/text/View.java.i
-data/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java.i
data/test/com/sun/management/GarbageCollectorMXBean/GarbageCollectionNotificationContentTest.java.i
data/src/share/native/sun/security/ec/impl/ecl_gf.c.i
-data/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy.i
+data/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java.i
+data/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java.i
data/src/share/classes/java/lang/management/MemoryMXBean.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkSupported.java.i
data/src/share/classes/sun/nio/cs/ext/IBM933.java.i
@@ -4656,7 +4865,6 @@ data/src/share/classes/sun/awt/image/IntegerInterleavedRaster.java.i
data/src/share/classes/sun/launcher/resources/launcher_de.properties.i
data/test/demo/jvmti/minst/MinstTest.java.i
data/src/share/classes/sun/nio/ch/AsynchronousFileChannelImpl.java.i
-data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java.i
data/make/javax/sound/jsoundhs/mapfile-vers.i
data/src/share/classes/java/util/PropertyPermission.java.i
data/src/windows/classes/sun/awt/windows/WFramePeer.java.i
@@ -4666,7 +4874,7 @@ data/make/tools/CharsetMapping/IBM922.map.i
data/src/share/classes/sun/text/resources/FormatData_tr.java.i
data/test/java/io/LineNumberInputStream/SkipEOL.java.i
data/src/share/classes/sun/nio/cs/ext/MacTurkish.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h.i
+data/src/macosx/classes/sun/awt/CGraphicsEnvironment.java.i
data/src/share/classes/sun/text/resources/FormatData_nl_NL.java.i
data/src/share/classes/sun/dyn/WrapperInstance.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/NotifySupport.java.i
@@ -4677,9 +4885,10 @@ data/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstLogic.h.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn_ME.java.i
data/test/java/io/Serializable/maskSyntheticModifier/run.sh.i
data/src/share/classes/sun/io/CharToByteEUC_JP_Solaris.java.i
+data/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java.i
data/src/share/classes/javax/management/MBean.java.i
data/src/share/classes/sun/print/PSStreamPrinterFactory.java.i
-data/test/java/util/Collections/EmptyIterator.java.i
+data/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy.i
data/src/share/classes/java/sql/SQLTransientConnectionException.java.i
data/test/com/sun/nio/sctp/SctpMultiChannel/Util.java.i
data/src/solaris/classes/sun/font/NativeStrike.java.i
@@ -4692,7 +4901,8 @@ data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/file-targets.x
data/test/tools/launcher/UnicodeTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1047.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/ResetAllControllers.java.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SubclassAcrossPackage.java.i
+data/src/share/classes/java/awt/TextArea.java.i
+data/src/share/native/common/jni_util.h.i
data/test/java/lang/instrument/RetransformApp.java.i
data/src/share/back/StringReferenceImpl.h.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_it.properties.i
@@ -4704,40 +4914,45 @@ data/test/java/net/Authenticator/BasicTest.java.i
data/test/java/util/regex/RegExTest.java.i
data/src/share/classes/sun/print/resources/serviceui_de.properties.i
data/src/share/classes/sun/io/ByteToCharCp280.java.i
+data/src/macosx/classes/sun/nio/ch/KQueueSelectorImpl.java.i
data/test/sun/net/idn/TestStringPrep.java.i
data/src/share/classes/java/text/DateFormatSymbols.java.i
data/src/share/classes/sun/security/krb5/internal/APRep.java.i
data/test/javax/management/MBeanServer/PostExceptionTest.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownAccContrModelException.java.i
data/test/java/util/Collections/BinarySearchNullComparator.java.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java.i
+data/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKEngine.java.i
data/test/sun/security/pkcs11/sslecc/JSSEClient.java.i
data/src/share/classes/javax/swing/JSpinner.java.i
data/src/solaris/native/sun/awt/awt_MToolkit.c.i
data/src/share/classes/sun/management/counter/Units.java.i
+data/src/share/classes/javax/management/loading/ClassLoaderRepository.java.i
data/src/share/classes/java/net/Proxy.java.i
data/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html.i
data/test/sun/security/pkcs11/KeyStore/loader.jar.i
data/src/share/classes/sun/tools/tree/EqualExpression.java.i
-data/src/share/native/sun/font/layout/MirroredCharData.cpp.i
+data/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java.i
data/src/share/back/VirtualMachineImpl.c.i
data/src/share/classes/sun/font/CompositeGlyphMapper.java.i
data/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java.i
data/src/share/classes/org/openjdk/jigsaw/ConfigurationException.java.i
data/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls_Stub.java.i
-data/src/share/classes/sun/security/x509/RFC822Name.java.i
+data/src/share/classes/javax/sound/midi/spi/MidiFileReader.java.i
+data/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif.i
data/test/java/beans/PropertyEditor/TestDoubleTypeValue.java.i
data/src/share/classes/java/sql/SQLDataException.java.i
data/test/javax/management/namespace/JMXNamespaceSecurityTest.java.i
data/src/share/classes/javax/naming/ldap/PagedResultsControl.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libsoftokn3.chk.i
-data/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java.i
data/src/share/classes/javax/crypto/EncryptedPrivateKeyInfo.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in.i
-data/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java.i
+data/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java.i
+data/src/share/classes/java/lang/invoke/Invokers.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadHandshake.java.i
data/test/sun/tools/jps/jps-V_2.sh.i
data/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java.i
+data/src/share/classes/javax/sound/sampled/Clip.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiColorChooserUI.java.i
data/src/share/classes/java/io/PipedInputStream.java.i
data/src/share/classes/sun/nio/cs/ext/MS950.java.i
@@ -4748,40 +4963,44 @@ data/src/share/classes/sun/tools/java/MethodSet.java.i
data/src/share/classes/javax/print/ServiceUIFactory.java.i
data/src/share/classes/javax/management/remote/rmi/RMIConnectionImpl.java.i
data/src/windows/native/sun/jkernel/kernel_zh_TW.rc.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java.i
-data/test/sun/rmi/rmic/defaultStubVersion/run.sh.i
+data/make/sun/font/mapfile-vers.openjdk.i
+data/src/linux/doc/man/ja/jps.1.i
data/src/share/classes/javax/security/auth/login/AccountExpiredException.java.i
-data/make/tools/CharsetMapping/IBM948.c2b.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Opaque.java.i
+data/test/java/lang/Double/ParseHexFloatingPoint.java.i
data/src/solaris/native/sun/nio/ch/SolarisEventPort.c.i
+data/src/macosx/native/java/util/MacOSXPreferencesFile.m.i
data/test/java/lang/Class/getDeclaredMethod/Exceptions.java.i
data/src/share/classes/java/lang/reflect/GenericArrayType.java.i
data/make/sun/javazic/javatz/java_us_ids.txt.i
+data/src/share/classes/sun/security/ssl/DHClientKeyExchange.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c.i
data/src/share/classes/sun/management/ThreadInfoCompositeData.java.i
data/src/windows/classes/sun/nio/ch/WindowsSelectorProvider.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxReceivers.java.i
-data/src/share/classes/sun/nio/cs/ext/GB18030.java.i
data/test/javax/management/remote/mandatory/notif/UnexpectedNotifTest.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipUtils.java.i
data/src/share/classes/sun/management/HotSpotDiagnostic.java.i
+data/src/share/classes/com/sun/net/ssl/SSLPermission.java.i
data/make/tools/swing-beans/beaninfo/images/JOptionPaneColor16.gif.i
data/src/share/demo/jvmti/mtrace/mtrace.c.i
data/src/share/classes/sun/tools/tree/OrExpression.java.i
+data/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java.i
data/src/share/demo/nbproject/management/FullThreadDump/build.properties.i
data/test/com/sun/management/OperatingSystemMXBean/GetTotalPhysicalMemorySize.java.i
data/src/share/classes/java/awt/im/InputContext.java.i
data/src/share/classes/java/text/package.html.i
data/src/solaris/native/java/util/FileSystemPreferences.c.i
data/src/share/classes/sun/net/www/MimeEntry.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/Functions.java.i
+data/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java.i
+data/src/share/classes/sun/nio/cs/US_ASCII.java.i
data/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/ReplaceTrees.java.i
-data/test/java/io/Serializable/backRefCNFException/Write.java.i
+data/test/java/beans/PropertyChangeSupport/TestMethods.java.i
data/src/share/classes/sun/java2d/pipe/BufferedContext.java.i
data/src/share/classes/javax/swing/SwingHeavyWeight.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicFormattedTextFieldUI.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java.i
+data/src/share/classes/javax/crypto/spec/package.html.i
data/test/sun/security/pkcs11/Cipher/TestSymmCiphers.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/RemoteClass.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/infblock.h.i
@@ -4790,20 +5009,23 @@ data/src/share/sample/nio/server/Acceptor.java.i
data/src/share/classes/sun/nio/cs/ext/Big5.java.i
data/src/share/classes/java/util/concurrent/RejectedExecutionException.java.i
data/src/share/classes/javax/naming/NoInitialContextException.java.i
+data/src/solaris/native/com/sun/management/MacosxOperatingSystem.c.i
data/src/share/classes/com/sun/jdi/DoubleType.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMicrosecondPosition.java.i
+data/src/macosx/classes/apple/laf/JRSUIFocus.java.i
data/src/share/classes/javax/swing/ButtonGroup.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterSurfaceData.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties.i
data/src/windows/classes/sun/awt/windows/WComponentPeer.java.i
-data/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.i
+data/src/share/classes/sun/management/CompilerThreadStat.java.i
data/make/tools/swing-beans/beaninfo/images/JComboBoxColor16.gif.i
data/src/share/classes/javax/swing/text/html/parser/ResourceLoader.java.i
data/src/share/classes/javax/swing/plaf/TableHeaderUI.java.i
-data/src/windows/classes/sun/security/mscapi/Key.java.i
-data/src/windows/classes/sun/awt/windows/ThemeReader.java.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java.i
data/src/windows/classes/sun/awt/windows/WFileDialogPeer.java.i
data/README.i
+data/src/macosx/classes/sun/lwawt/LWLabelPeer.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntIntInt.java.i
data/src/share/classes/com/sun/management/mgmt-overview.html.i
data/src/share/classes/javax/swing/LegacyGlueFocusTraversalPolicy.java.i
@@ -4815,7 +5037,6 @@ data/src/windows/classes/sun/nio/fs/WindowsFileCopy.java.i
data/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java.i
data/src/share/classes/com/sun/jdi/InternalException.java.i
data/src/share/classes/sun/text/normalizer/TrieIterator.java.i
-data/src/share/classes/org/openjdk/jigsaw/RemoteRepositoryList.java.i
data/src/share/classes/javax/management/MBeanException.java.i
data/test/sun/tools/jhat/minimal.bin.i
data/src/share/classes/java/awt/doc-files/BorderLayout-1.gif.i
@@ -4823,6 +5044,7 @@ data/src/share/classes/java/io/SequenceInputStream.java.i
data/src/share/demo/jvmti/gctest/gctest.c.i
data/test/java/lang/Class/getModifiers/StripACC_SUPER.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/GetName.java.i
+data/src/windows/npt/utf_md.h.i
data/test/java/net/URL/B4148751.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManagerMXBean.java.i
data/src/share/native/sun/management/management.h.i
@@ -4831,16 +5053,15 @@ data/src/share/classes/sun/security/util/Resources_de.java.i
data/make/tools/CharsetMapping/MacHebrew.map.i
data/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c.i
-data/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java.i
-data/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java.i
data/make/tools/UnicodeData/UnicodeData.txt.i
+data/src/share/classes/sun/util/resources/CurrencyNames_nl_BE.properties.i
data/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java.i
data/make/tools/UnicodeData/UnicodeData.txt.d
+data/src/macosx/classes/com/apple/laf/ScreenMenu.java.i
data/src/share/classes/java/util/concurrent/ConcurrentHashMap.java.i
data/src/share/classes/java/sql/SQLData.java.i
data/src/share/classes/sun/security/provider/ByteArrayAccess.java.i
data/test/java/lang/instrument/BootClassPath/DummyMain.java.i
-data/test/javax/management/namespace/namespace.policy.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono16.gif.i
data/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java.i
data/src/share/classes/sun/nio/cs/IBM855.java.i
@@ -4856,12 +5077,12 @@ data/src/share/classes/sun/font/FreetypeFontScaler.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameUI.java.i
data/src/share/classes/com/sun/jndi/ldap/Obj.java.i
data/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java.i
+data/src/macosx/native/com/apple/laf/JRSUIFocus.m.i
data/src/share/native/sun/awt/image/cvutils/img_dcm.h.i
-data/test/java/net/URLConnection/GetLastModified.java.i
+data/src/share/demo/nbproject/jfc/Metalworks/build.properties.i
data/test/java/nio/file/Files/probeContentType/ForceLoad.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/menu.gif.i
data/src/share/classes/sun/tools/java/ClassFile.java.i
-data/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/Close.java.i
data/src/share/classes/javax/swing/doc-files/groupLayout.3.gif.i
data/src/share/demo/jvmti/waiters/Monitor.hpp.i
@@ -4870,10 +5091,10 @@ data/src/share/classes/javax/xml/crypto/dsig/TransformException.java.i
data/test/java/net/URLClassLoader/sealing/checksealed.sh.i
data/src/share/classes/javax/management/monitor/CounterMonitor.java.i
data/test/javax/management/context/localizable/MBeanDescriptions_fr.java.i
-data/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif.i
data/make/netbeans/jmx/nbproject/project.xml.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBoolean.java.i
-data/src/share/classes/sun/reflect/misc/MethodUtil.java.i
+data/src/solaris/classes/java/lang/UNIXProcess.java.bsd.i
data/src/share/native/sun/font/layout/HangulLayoutEngine.cpp.i
data/src/linux/doc/man/rmiregistry.1.i
data/test/com/sun/jdi/MethodEntryExitEvents.java.i
@@ -4885,14 +5106,14 @@ data/src/share/classes/sun/io/ByteToCharMacSymbol.java.i
data/src/solaris/doc/sun/man/man1/wsimport.1.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java.i
data/src/windows/classes/sun/java2d/d3d/D3DBufImgOps.java.i
-data/src/share/classes/java/beans/beancontext/BeanContextContainerProxy.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java.i
data/test/com/sun/jdi/redefineMethod/RedefineSetUp.sh.i
+data/src/macosx/classes/com/apple/eawt/ApplicationListener.java.i
data/src/share/classes/sun/tools/tree/ThrowStatement.java.i
-data/src/share/classes/javax/net/ssl/SSLException.java.i
+data/src/solaris/doc/sun/man/man1/ja/native2ascii.1.i
data/src/share/classes/java/util/Date.java.i
data/src/share/classes/com/sun/script/util/BindingsImpl.java.i
data/make/com/sun/org/apache/Makefile.i
-data/test/java/net/Socket/RST.java.i
data/src/linux/doc/man/jstack.1.i
data/src/share/back/EventRequestImpl.c.i
data/src/share/classes/com/sun/tools/jdi/ShortValueImpl.java.i
@@ -4900,38 +5121,42 @@ data/test/sun/management/windows/revokeall.exe.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java.i
data/src/share/classes/javax/management/RuntimeMBeanException.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextFieldUI.java.i
-data/test/com/sun/jdi/connect/spi/GeneratedConnectors.java.i
data/src/share/classes/java/net/StandardProtocolFamily.java.i
data/src/share/classes/java/io/WriteAbortedException.java.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiOut.c.i
data/src/share/native/sun/java2d/loops/UshortIndexed.c.i
+data/make/tools/CharsetMapping/IBM943.map.i
data/src/share/classes/java/io/ObjectInputStream.java.i
-data/test/sun/tools/jcmd/jcmd_pid_Output1.awk.i
+data/src/share/classes/sun/text/resources/FormatData_ar_BH.java.i
data/test/java/net/Inet6Address/B6206527.java.i
+data/src/macosx/classes/com/apple/laf/AquaFileView.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionalArgumentOptionSpec.java.i
data/src/share/classes/javax/crypto/CipherSpi.java.i
data/test/java/beans/XMLEncoder/javax_swing_BoxLayout.java.i
data/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java.i
-data/src/share/native/sun/security/ec/impl/ecl_curve.c.i
data/test/java/beans/XMLEncoder/java_awt_geom_AffineTransform.java.i
+data/test/java/net/Socket/asyncClose/BrokenPipe.java.i
data/make/sun/jkernel/Makefile.i
data/src/share/classes/java/util/zip/Deflater.java.i
data/src/share/classes/sun/io/ByteToCharCp950.java.i
-data/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java.i
-data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java.i
-data/test/java/util/ResourceBundle/Test4318520RB_en.properties.i
+data/src/share/classes/javax/swing/InputMap.java.i
+data/src/share/classes/com/sun/jndi/dns/DnsClient.java.i
+data/src/share/classes/sun/net/dns/ResolverConfiguration.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java.i
data/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor32.gif.i
data/src/share/native/java/util/zip/zlib-1.2.5/gzguts.h.i
data/test/sun/security/pkcs11/ec/pkcs12/secp256r1server-secp384r1ca.p12.i
+data/src/share/classes/java/nio/channels/MembershipKey.java.i
data/make/mksample/webservices/Makefile.i
-data/src/share/classes/com/sun/jmx/namespace/DomainInterceptor.java.i
+data/src/share/classes/sun/dyn/util/BytecodeSignature.java.i
data/src/windows/native/sun/java2d/opengl/WGLSurfaceData.h.i
data/src/share/classes/javax/swing/text/html/package.html.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/PrincipalImpl.java.i
data/src/share/classes/javax/management/relation/RoleInfoNotFoundException.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java.i
+data/src/share/classes/sun/misc/resources/Messages_zh_CN.java.i
+data/src/share/classes/sun/management/MemoryPoolImpl.java.i
data/src/share/back/FrameID.h.i
data/test/java/lang/Runtime/exec/ExecEmptyString.java.i
data/test/java/beans/XMLDecoder/spec/TestBoolean.java.i
@@ -4939,13 +5164,15 @@ data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMStructure.java.i
data/src/solaris/classes/sun/java2d/jules/JulesRenderingEngine.java.i
data/src/share/classes/javax/management/remote/rmi/package.html.i
data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java.i
-data/test/sun/net/www/http/HttpClient/ProxyFromCache.java.i
+data/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/UtilsTest.java.i
data/test/sun/tools/jhat/jmap.bin.d
-data/src/share/native/sun/java2d/opengl/OGLMaskBlit.c.i
data/test/java/net/URLConnection/GetResponseCode.java.i
+data/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java.i
data/src/share/classes/java/beans/Customizer.java.i
data/test/java/lang/ref/EnqueueNullRef.java.i
data/src/solaris/native/sun/awt/awt_xembed.h.i
+data/src/share/classes/javax/swing/text/html/ListView.java.i
data/test/sun/security/ssl/templates/SSLSocketSSLEngineTemplate.java.i
data/src/share/classes/javax/naming/LimitExceededException.java.i
data/test/java/security/cert/CertPathValidator/OCSP/AIACheck.java.i
@@ -4953,34 +5180,36 @@ data/src/share/classes/javax/accessibility/AccessibleRelation.java.i
data/test/com/sun/jdi/PopAndInvokeTest.java.i
data/src/share/native/com/sun/java/util/jar/pack/utils.h.i
data/src/share/classes/java/rmi/server/LoaderHandler.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/p11-solaris.txt.i
+data/test/java/lang/annotation/Missing/Missing.java.i
data/src/share/native/sun/awt/medialib/mlib_image_types.h.i
data/src/share/classes/sun/java2d/StateTrackable.java.i
data/src/share/classes/javax/swing/text/html/IsindexView.java.i
data/test/java/beans/PropertyEditor/TestIntegerClassJava.java.i
-data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i
+data/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif.i
data/test/sun/misc/Encode/GetBytes.java.i
data/src/share/classes/java/lang/invoke/SpreadGeneric.java.i
data/src/share/classes/javax/management/relation/RelationException.java.i
-data/src/windows/native/sun/windows/awt_ole.h.i
+data/src/share/classes/sun/io/CharToByteCp437.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/FileMatch.java.i
-data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg.i
-data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java.i
+data/src/solaris/classes/sun/java2d/xr/XIDGenerator.java.i
data/src/share/classes/java/awt/dnd/DragSourceEvent.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthToolBarUI.java.i
-data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java.i
-data/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java.i
+data/test/java/util/concurrent/locks/Lock/FlakyMutex.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java.i
+data/test/java/lang/reflect/Proxy/Basic1.java.i
data/src/share/classes/sun/net/httpserver/Event.java.i
+data/test/java/rmi/transport/checkLeaseInfoLeak/security.policy.i
data/src/share/native/java/lang/fdlibm/src/s_lib_version.c.i
data/src/share/classes/javax/swing/plaf/basic/BasicRootPaneUI.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/TMSchema.java.i
data/src/solaris/native/java/io/FileDescriptor_md.c.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.d
data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java.i
-data/test/javax/management/ObjectName/ComparatorTest.java.i
data/test/java/util/Collections/NCopies.java.i
-data/make/tools/CharsetMapping/IBM297.map.i
+data/src/share/classes/javax/imageio/ImageReadParam.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM.java.i
data/make/tools/sharing/classlist.linux.i
+data/src/windows/native/sun/java2d/d3d/D3DContext.h.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/NullTest.java.i
data/src/share/classes/java/lang/management/ThreadInfo.java.i
data/src/share/classes/sun/io/CharToByteMS874.java.i
@@ -4989,30 +5218,30 @@ data/make/mkdemo/jfc/CodePointIM/Makefile.i
data/src/share/classes/sun/reflect/generics/tree/FieldTypeSignature.java.i
data/make/mkdemo/scripting/Makefile.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.jibx.xml.i
+data/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java.i
data/src/share/classes/sun/text/resources/FormatData_zh.java.i
data/test/com/sun/crypto/provider/KeyAgreement/DHGenSharedSecret.java.i
data/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java.i
data/test/java/io/OutputStreamWriter/TestWrite.java.i
data/test/java/io/Serializable/NPEProvoker/NPEProvoker.java.i
-data/src/share/native/sun/font/layout/ContextualSubstSubtables.h.i
data/test/java/io/Serializable/evolution/AddedExternField/WriteAddedField.java.i
data/src/share/classes/sun/reflect/MethodAccessorImpl.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java.i
data/src/share/classes/sun/misc/MessageUtils.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/AttrCompare.java.i
-data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java.i
+data/src/share/classes/sun/security/jgss/krb5/WrapToken.java.i
+data/src/share/classes/java/awt/peer/TextAreaPeer.java.i
data/src/share/classes/sun/security/x509/PKIXExtensions.java.i
data/test/java/net/URL/UppercaseScheme.java.i
data/src/share/demo/jvmti/agent_util/agent_util.c.i
data/src/windows/native/java/net/DualStackPlainSocketImpl.c.i
data/src/share/classes/javax/print/attribute/SupportedValuesAttribute.java.i
-data/src/share/classes/sun/management/snmp/util/JvmContextFactory.java.i
+data/src/windows/native/sun/nio/ch/SocketChannelImpl.c.i
data/make/java/nio/Makefile.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/rmid.security.policy.i
data/src/windows/native/sun/java2d/windows/dxCapabilities.h.i
data/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java.i
data/make/tools/swing-beans/beaninfo/images/JWindowColor32.gif.i
-data/test/java/lang/reflect/Method/InheritedMethods.java.i
data/test/sun/java2d/OpenGL/DrawBufImgOp.java.i
data/src/share/classes/java/awt/Paint.java.i
data/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java.i
@@ -5023,29 +5252,27 @@ data/test/java/io/Reader/ReadParams.java.i
data/src/share/classes/sun/awt/NativeLibLoader.java.i
data/src/windows/native/java/io/canonicalize_md.c.i
data/src/share/classes/com/sun/media/sound/PCMtoPCMCodec.java.i
-data/src/share/classes/sun/tools/jconsole/VMInternalFrame.java.i
data/src/share/classes/com/sun/nio/sctp/MessageInfo.java.i
data/src/solaris/doc/sun/man/man1/ja/servertool.1.i
data/src/share/classes/sun/tools/jconsole/SheetDialog.java.i
data/src/share/classes/sun/security/ssl/JsseJce.java.i
data/src/solaris/doc/sun/man/man1/jstatd.1.i
-data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java.i
data/src/share/classes/java/awt/doc-files/Choice-1.gif.i
data/src/share/classes/sun/io/ByteToCharMS950.java.i
data/src/share/classes/sun/java2d/loops/MaskBlit.java.i
data/test/java/nio/channels/FileChannel/Release.java.i
data/src/share/classes/javax/management/DescriptorFields.java.i
-data/src/share/classes/sun/util/locale/LocaleUtils.java.i
-data/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java.i
-data/src/share/classes/sun/text/normalizer/ReplaceableString.java.i
+data/src/share/classes/java/beans/beancontext/BeanContextContainerProxy.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/arabic.ut8.txt.i
data/src/share/native/sun/awt/medialib/mlib_SysMath.h.i
data/src/share/classes/javax/imageio/event/IIOReadProgressListener.java.i
+data/test/java/net/URLConnection/GetXmlContentType.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnspr4.so.i
data/src/share/classes/sun/reflect/generics/factory/CoreReflectionFactory.java.i
data/make/tools/CharsetMapping/IBM1149.c2b.i
data/src/share/native/sun/awt/image/imageInitIDs.c.i
-data/test/java/nio/charset/Charset/EmptyCharsetName.java.i
+data/src/share/classes/java/awt/event/ItemEvent.java.i
+data/src/macosx/classes/sun/lwawt/LWScrollBarPeer.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/AlternativeLongOptionSpec.java.i
data/test/java/util/Collections/EmptySortedSet.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuUI.java.i
@@ -5054,9 +5281,9 @@ data/make/tools/CharsetMapping/IBM874.map.i
data/test/org/openjdk/jigsaw/ConfigurationBuilder.java.i
data/src/share/native/com/sun/media/sound/DirectAudioDeviceProvider.c.i
data/src/share/native/sun/security/ec/ecl.c.i
-data/test/java/util/Collections/AsLifoQueue.java.i
data/test/sun/java2d/pipe/RegionOps.java.i
-data/src/share/classes/sun/print/resources/orientRevLandscape.png.i
+data/src/share/classes/javax/swing/plaf/synth/SynthOptionPaneUI.java.i
+data/src/share/classes/java/lang/IllegalStateException.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/SOSMarkerSegment.java.i
data/src/share/classes/sun/io/CharToByteCp863.java.i
data/make/sun/cmm/Makefile.i
@@ -5068,7 +5295,9 @@ data/test/sun/security/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
data/src/share/classes/javax/management/Attribute.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntInt.java.i
data/test/sun/nio/cs/Test6392804.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java.i
+data/src/share/classes/java/util/spi/LocaleServiceProvider.java.i
+data/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java.i
+data/src/share/classes/com/sun/jmx/namespace/serial/RoutingOnlyProcessor.java.i
data/test/java/rmi/testlibrary/StreamPipe.java.i
data/src/share/classes/javax/management/loading/DefaultLoaderRepository.java.i
data/make/tools/src/build/tools/jdwpgen/AbstractSimpleTypeNode.java.i
@@ -5076,68 +5305,72 @@ data/src/share/classes/java/awt/GridBagConstraints.java.i
data/test/javax/crypto/Cipher/InOutBuffers.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.h.i
data/make/tools/src/build/tools/generatecharacter/SpecialCaseMap.java.i
-data/test/java/lang/String/Split.java.i
+data/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection-failed.jpg.i
data/src/share/classes/java/security/Signature.java.i
data/src/share/classes/sun/text/resources/FormatData_sv.java.i
data/make/modules/Makefile.i
+data/src/macosx/classes/sun/java2d/CRenderer.java.i
data/test/javax/swing/JComboBox/6607130/bug6607130.java.i
data/src/share/classes/com/sun/jdi/Bootstrap.java.i
data/src/share/classes/sun/rmi/transport/WeakRef.java.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_normal.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java.i
+data/test/javax/management/mxbean/JMXServiceURLTest.java.i
data/make/tools/dir_diff/Makefile.i
+data/src/share/native/sun/font/layout/KernTable.h.i
data/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java.i
+data/src/macosx/classes/com/apple/eawt/ApplicationAdapter.java.i
data/src/share/classes/com/sun/pept/ept/ContactInfoList.java.i
data/src/share/classes/java/util/AbstractQueue.java.i
data/test/java/io/Serializable/readObjectNoData/Read.java.i
-data/test/java/util/ResourceBundle/Bug4083270Test.properties.i
-data/make/mkdemo/jvmti/versionCheck/Makefile.i
+data/src/share/classes/sun/io/CharToByteMacRomania.java.i
+data/src/share/classes/javax/print/attribute/standard/PrintQuality.java.i
data/src/share/classes/sun/nio/fs/MimeType.java.i
data/src/share/classes/sun/net/www/http/KeepAliveStream.java.i
-data/test/sun/security/krb5/auto/ok-as-delegate-xrealm.sh.i
data/src/share/classes/javax/swing/text/html/EditableView.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html.i
-data/src/share/classes/javax/swing/plaf/ComponentInputMapUIResource.java.i
+data/src/share/classes/javax/management/DescriptorAccess.java.i
+data/src/share/classes/java/sql/SQLTransactionRollbackException.java.i
data/src/share/classes/sun/launcher/LauncherHelper.java.i
data/test/java/lang/instrument/StressGetObjectSizeApp.java.i
data/src/share/classes/javax/swing/text/GlyphView.java.i
data/test/java/beans/PropertyChangeSupport/1.6.0.ser.i
data/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java.i
data/src/share/classes/java/util/package.html.i
+data/src/share/instrument/EncodingSupport.c.i
data/src/share/classes/sun/jkernel/BundleCheck.java.i
data/src/share/native/sun/awt/image/cvutils/img_alpha.h.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt.i
-data/test/java/text/Format/MessageFormat/Bug7003643.java.i
-data/src/solaris/doc/sun/man/man1/ja/javac.1.i
-data/src/share/classes/com/sun/jmx/defaults/ServiceName.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapURL.java.i
+data/src/share/classes/com/sun/media/sound/ModelOscillator.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c.i
data/src/share/classes/com/sun/servicetag/Registry.java.i
data/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.spi.TransportService.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusiveWithComments.java.i
-data/src/solaris/classes/sun/awt/X11/XFontPeer.java.i
-data/src/share/classes/sun/tools/jstat/ExpressionResolver.java.i
+data/src/share/classes/javax/swing/Painter.java.i
data/src/share/classes/javax/swing/plaf/ViewportUI.java.i
data/test/com/sun/jndi/dns/CheckAccess.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java.i
+data/src/share/classes/javax/imageio/stream/ImageOutputStream.java.i
data/src/share/classes/java/security/PrivilegedAction.java.i
data/src/share/classes/sun/nio/fs/NativeBuffers.java.i
+data/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java.i
data/src/windows/native/sun/jkernel/graphics/warningmasthead.bmp.i
data/src/share/classes/com/sun/nio/sctp/package-info.java.i
-data/src/share/classes/java/awt/BufferCapabilities.java.i
-data/test/org/openjdk/jigsaw/repocat.sh.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java.i
data/make/sun/jawt/make.depend.i
data/test/java/util/ResourceBundle/Control/XmlRB.xml.i
data/src/share/classes/sun/management/snmp/util/MibLogger.java.i
-data/test/java/lang/Math/CubeRootTests.java.i
data/test/java/nio/channels/Selector/Alias.java.i
-data/src/share/classes/sun/audio/AudioStream.java.i
-data/test/com/oracle/net/Sanity.java.i
+data/src/macosx/classes/com/apple/laf/AquaTabbedPaneUI.java.i
+data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Decoder.java.i
data/test/java/awt/Focus/AutoRequestFocusTest/TestHelper.java.i
data/src/share/classes/sun/misc/JavaLangAccess.java.i
data/make/javax/security/Makefile.i
data/src/share/classes/java/security/cert/PKIXCertPathValidatorResult.java.i
data/make/mkdemo/jfc/TableExample/Makefile.i
+data/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java.i
data/test/com/sun/jdi/JdbReadTwiceTest.sh.i
+data/src/bsd/doc/man/serialver.1.i
+data/test/com/sun/jdi/RedefineImplementor.sh.i
data/src/share/native/java/lang/StrictMath.c.i
data/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c.i
data/make/common/Sanity.gmk.i
@@ -5150,26 +5383,29 @@ data/test/java/net/URL/B6529759.java.i
data/test/com/sun/jdi/sde/Mangle.sde.i
data/src/windows/classes/sun/nio/ch/SinkChannelImpl.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_de.properties.i
+data/src/share/classes/javax/management/ClientContext.java.i
data/src/share/classes/java/math/MutableBigInteger.java.i
data/src/share/classes/java/lang/ConditionalSpecialCasing.java.i
data/src/share/classes/javax/xml/crypto/XMLStructure.java.i
data/test/sun/security/tools/policytool/i18n.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetAttenuation.java.i
data/src/solaris/hpi/export/path_md.h.i
-data/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml.i
+data/src/share/classes/org/openjdk/jigsaw/package-info.java.i
data/src/share/classes/javax/print/attribute/standard/JobPrioritySupported.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ja.properties.i
data/src/share/classes/java/lang/Number.java.i
data/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.h.i
+data/src/share/classes/sun/text/resources/FormatData_th_TH.java.i
data/test/javax/print/applet/AppletPrintLookup.html.i
data/src/share/classes/com/sun/jmx/event/EventClientFactory.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java.i
-data/test/java/util/Locale/data/deflocale.sol10.i
+data/src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java.i
data/src/share/classes/java/util/EventListenerProxy.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/Generator.java.i
data/test/sun/rmi/log/ReliableLog/Recovery.java.i
data/src/share/classes/javax/swing/MultiUIDefaults.java.i
data/test/sun/rmi/rmic/minimizeWrapperInstances/run.sh.i
+data/src/macosx/classes/com/apple/eawt/event/MagnificationEvent.java.i
data/src/share/native/sun/awt/image/jpeg/jidctint.c.i
data/src/share/classes/sun/misc/HexDumpEncoder.java.i
data/src/share/native/sun/java2d/loops/DrawLine.c.i
@@ -5189,37 +5425,44 @@ data/test/sun/nio/cs/SurrogateTestEUCTW.plane5.surrogates.i
data/src/share/classes/sun/security/jgss/krb5/MessageToken_v2.java.i
data/test/javax/swing/JColorChooser/Test4234761.java.i
data/make/java/util/Makefile.i
+data/src/macosx/classes/sun/lwawt/macosx/CAccessible.java.i
+data/test/java/nio/file/Files/grantAll.policy.i
+data/make/sun/security/pkcs11/mapfile-vers.i
data/src/windows/resource/java.manifest.i
data/src/share/classes/sun/text/resources/FormatData_sr.java.i
-data/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c.i
+data/test/java/util/ResourceBundle/ReferencesTestBundle.properties.i
+data/src/share/classes/javax/swing/border/StrokeBorder.java.i
data/src/share/classes/java/security/InvalidParameterException.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBufferPrologue.java.i
data/src/share/classes/javax/net/ssl/KeyStoreBuilderParameters.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/Environment.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionContextImpl/Timeout.java.i
+data/src/share/classes/sun/io/ByteToCharCp949C.java.i
data/test/java/beans/PropertyEditor/TestIntegerClassValue.java.i
data/test/tools/launcher/UglyPrintVersion.java.i
data/test/java/lang/System/finalization/FinThreads.java.i
data/test/java/util/ResourceBundle/Bug4165815Test.java.i
-data/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopEvenOfWindow.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ko.properties.i
data/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_IQ.java.i
+data/src/share/classes/java/nio/channels/MulticastChannel.java.i
data/src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java.i
-data/test/java/beans/PropertyEditor/TestShortTypeValue.java.i
data/test/java/lang/RuntimePermission/ExitVM.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java.i
-data/src/share/classes/sun/io/ByteToCharEUC2.java.i
+data/test/java/nio/channels/AsynchronousSocketChannel/Basic.java.i
+data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml.i
+data/src/bsd/doc/man/ja/jstatd.1.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java.i
data/src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java.i
data/src/share/classes/java/sql/SQLInvalidAuthorizationSpecException.java.i
-data/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java.i
+data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter.i
+data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java.i
data/src/share/classes/sun/dyn/MemberName.java.i
-data/test/java/io/Serializable/duplicateSerialFields/Setup.java.i
data/src/share/native/java/lang/fdlibm/src/w_asin.c.i
-data/make/sun/tracing/dtrace/mapfile-vers.i
-data/src/share/classes/sun/awt/image/ShortInterleavedRaster.java.i
+data/src/share/classes/com/sun/tools/jdi/LongValueImpl.java.i
+data/src/share/classes/sun/text/resources/CollationData_sk.java.i
data/test/javax/management/descriptor/EqualsHashCodeTest.java.i
-data/make/sun/rmi/rmi/Makefile.i
+data/src/share/classes/com/sun/rowset/internal/XmlResolver.java.i
data/test/java/io/Serializable/illegalHandle/tooHighHandle.ser.i
data/test/java/nio/channels/DatagramChannel/Connect.java.i
data/src/share/demo/jfc/Metalworks/MetalworksHelp.java.i
@@ -5231,15 +5474,14 @@ data/test/sun/net/www/protocol/http/6550798/TestCache.java.i
data/src/share/classes/sun/nio/cs/ext/IBM869.java.i
data/src/solaris/doc/sun/man/man1/ja/policytool.1.i
data/src/share/classes/java/awt/image/renderable/ParameterBlock.java.i
-data/test/javax/crypto/spec/DESKeySpec/CheckParity.java.i
data/src/share/classes/sun/nio/ch/ServerSocketAdaptor.java.i
data/test/sun/security/mscapi/SignUsingSHA2withRSA.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties.i
+data/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java.i
data/src/share/classes/sun/net/www/content/image/x_xbitmap.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_AR.properties.i
-data/test/javax/script/Test4.js.i
data/src/share/classes/sun/text/resources/FormatData_sr_RS.java.i
data/test/java/beans/VetoableChangeSupport/Test4425885.java.i
+data/src/share/classes/sun/tracing/dtrace/DTraceProbe.java.i
data/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java.i
data/src/share/classes/sun/tools/jar/ModuleInfo.java.i
data/src/share/classes/sun/awt/Graphics2Delegate.java.i
@@ -5255,30 +5497,31 @@ data/test/java/beans/XMLEncoder/4741757/TestSecurityManager.java.i
data/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource2.i
data/src/share/native/sun/font/layout/LookupTables.cpp.i
data/test/java/lang/invoke/InvokeGenericTest.java.i
-data/src/share/classes/sun/net/NetProperties.java.i
+data/make/sun/rmi/oldtools/FILES_java.gmk.i
data/src/share/classes/sun/nio/cs/ext/IBM970.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/DigesterOutputStream.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Decoder.java.i
data/src/share/classes/java/util/spi/package.html.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/Utils.java.i
data/test/javax/swing/border/Test4247606.java.i
data/make/java/npt/mapfile-vers.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java.i
data/src/share/classes/java/nio/charset/UnmappableCharacterException.java.i
+data/src/macosx/classes/com/apple/laf/AquaOptionPaneUI.java.i
data/src/share/classes/com/sun/media/sound/SF2Sample.java.i
data/src/windows/classes/sun/security/mscapi/KeyStore.java.i
-data/src/share/native/java/lang/fdlibm/src/e_asin.c.i
-data/src/share/classes/javax/swing/plaf/synth/SynthMenuBarUI.java.i
+data/src/share/classes/javax/accessibility/AccessibleContext.java.i
data/src/share/classes/com/sun/jmx/namespace/ObjectNameRouter.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedData.java.i
data/test/org/openjdk/jigsaw/_RemoteRepositoryList.java.i
-data/test/sun/security/provider/certpath/speech2speech.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java.i
data/src/share/classes/com/sun/media/sound/AuFileReader.java.i
data/test/sun/net/www/protocol/jar/B4957695.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOff.java.i
-data/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup.i
data/src/share/native/sun/font/layout/DeviceTables.cpp.i
data/src/share/classes/sun/dyn/anon/InvalidConstantPoolFormatException.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/PlatformModuleBuilder.java.i
+data/src/share/classes/java/util/StringTokenizer.java.i
data/src/share/classes/sun/nio/cs/ext/IBM297.java.i
data/test/java/rmi/activation/Activatable/restartLatecomer/group.security.policy.i
data/src/share/classes/sun/security/krb5/internal/ccache/CCacheInputStream.java.i
@@ -5287,6 +5530,7 @@ data/src/share/classes/sun/nio/cs/ext/IBM1124.java.i
data/src/share/classes/sun/io/ByteToCharCp1006.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnssckbi.so.i
data/src/share/classes/sun/jvmstat/monitor/ByteArrayMonitor.java.i
+data/test/javax/naming/ldap/LdapName/LdapParserTests.java.i
data/src/share/lib/images/cursors/motif_LinkNoDrop32x32.gif.i
data/make/com/sun/net/ssl/Makefile.i
data/test/sun/net/www/protocol/http/UserAuth.java.i
@@ -5294,19 +5538,19 @@ data/test/sun/net/www/http/HttpClient/ProxyTest.java.i
data/src/share/classes/javax/swing/border/LineBorder.java.i
data/src/share/classes/java/util/IllegalFormatFlagsException.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIStyle.java.i
-data/src/share/native/sun/font/layout/LigatureSubstitution.h.i
data/src/share/classes/sun/security/krb5/internal/ccache/MemoryCredentialsCache.java.i
data/src/solaris/classes/sun/awt/motif/MToolkitThreadBlockedHandler.java.i
data/src/share/classes/sun/tools/asm/ClassConstantData.java.i
data/src/windows/lib/plugin.properties.i
+data/src/share/classes/sun/reflect/misc/ReflectUtil.java.i
data/src/share/classes/java/io/IOError.java.i
data/src/share/classes/javax/security/sasl/RealmCallback.java.i
data/src/share/native/sun/awt/image/BufImgSurfaceData.c.i
data/src/share/classes/javax/swing/JApplet.java.i
data/src/share/classes/javax/swing/text/html/CommentView.java.i
data/src/solaris/classes/sun/awt/motif/X11Clipboard.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java.i
data/src/share/classes/javax/net/ssl/HandshakeCompletedListener.java.i
+data/src/share/classes/javax/print/attribute/ResolutionSyntax.java.i
data/src/share/classes/sun/reflect/generics/repository/ClassRepository.java.i
data/test/java/net/Socket/ProxyCons.java.i
data/src/share/demo/jvmti/hprof/hprof_tracker.c.i
@@ -5314,11 +5558,10 @@ data/test/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java.i
data/src/share/classes/javax/naming/ldap/Rdn.java.i
data/make/tools/UnicodeData/Scripts.txt.i
data/src/solaris/native/sun/font/X11FontScaler.h.i
-data/test/java/util/jar/JarFile/SorryClosed.java.i
data/test/java/lang/Math/Log1pTests.java.i
data/src/share/classes/javax/print/attribute/standard/DateTimeAtCompleted.java.i
data/src/share/native/sun/awt/libpng/pngwutil.c.i
-data/src/share/classes/org/ietf/jgss/GSSCredential.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/group.security.policy.i
data/src/share/classes/sun/reflect/generics/tree/ByteSignature.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfoSupport.java.i
@@ -5328,11 +5571,11 @@ data/test/javax/management/remote/mandatory/subjectDelegation/policy13.i
data/src/share/classes/java/rmi/StubNotFoundException.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByte.java.i
data/src/share/classes/java/security/AccessControlContext.java.i
-data/src/share/classes/sun/java2d/loops/GeneralRenderer.java.i
-data/src/share/classes/sun/tools/java/Scanner.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XTextField.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/AnnotationParser.java.i
+data/src/share/classes/javax/swing/text/Document.java.i
+data/src/share/classes/java/awt/image/BufferedImageOp.java.i
data/src/share/classes/java/beans/beancontext/BeanContextServicesSupport.java.i
-data/test/java/math/BigInteger/CompareToTests.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_2.java.i
data/test/java/rmi/server/RMIClassLoader/spi/java.rmi.server.RMIClassLoaderSpi.i
data/src/share/classes/com/sun/script/javascript/ExternalScriptable.java.i
data/src/share/classes/sun/security/ssl/CipherSuiteList.java.i
@@ -5340,12 +5583,13 @@ data/src/share/classes/com/sun/media/sound/JDK13Services.java.i
data/src/share/classes/sun/nio/cs/ext/SimpleEUCEncoder.java.i
data/test/java/lang/reflect/Generics/getAnnotationTest.java.i
data/src/share/classes/sun/tools/jar/resources/jar_sv.properties.i
+data/src/share/classes/sun/java2d/cmm/ColorTransform.java.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/custom_provider.sh.i
-data/src/share/classes/sun/security/provider/VerificationProvider.java.i
-data/make/java/zip/mapfile-vers.i
+data/make/tools/CharsetMapping/GBK.map.i
data/src/share/classes/java/awt/image/ShortLookupTable.java.i
data/src/windows/native/java/net/InetAddressImplFactory.c.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h.i
+data/src/share/classes/java/io/Bits.java.i
data/test/java/awt/Multiscreen/WindowGCChangeTest/WindowGCChangeTest.java.i
data/test/sun/security/mscapi/access.policy.i
data/test/java/nio/charset/coders/BashStreams.java.i
@@ -5362,33 +5606,32 @@ data/src/share/classes/javax/crypto/CryptoPolicyParser.java.i
data/src/share/classes/javax/swing/plaf/nimbus/State.java.i
data/make/jpda/bdi/Makefile.i
data/test/java/util/AbstractMap/ToString.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java.i
+data/src/macosx/native/sun/awt/JavaTextAccessibility.h.i
+data/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMBean.java.i
-data/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java.i
-data/test/java/math/BigDecimal/ZeroScalingTests.java.i
+data/test/java/util/AbstractSequentialList/AddAll.java.i
data/src/share/classes/com/sun/tools/jdi/ThreadListener.java.i
+data/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java.i
data/src/share/classes/com/sun/crypto/provider/CipherCore.java.i
-data/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java.i
-data/test/com/oracle/security/ucrypto/TestRSA.java.i
-data/test/java/beans/XMLEncoder/java_awt_Point.java.i
-data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c.i
+data/src/share/classes/com/sun/media/sound/SF2LayerRegion.java.i
+data/test/java/util/logging/LoggingDeadlock2.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxColor16.gif.i
-data/test/sun/net/www/http/HttpClient/IsKeepingAlive.java.i
data/test/java/beans/PropertyEditor/TestColorClassJava.java.i
data/src/solaris/back/exec_md.c.i
data/test/javax/naming/ldap/LdapName/NameTests.java.i
+data/src/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalTheme.java.i
data/src/share/classes/javax/accessibility/AccessibleKeyBinding.java.i
data/src/windows/native/sun/windows/awt_PrintControl.cpp.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/GUIDemo.java.i
data/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java.i
data/src/share/classes/java/dyn/Invokers.java.i
data/src/share/classes/sun/security/krb5/Asn1Exception.java.i
data/src/share/classes/com/sun/crypto/provider/DESCipher.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/OpenStream.java.i
-data/src/share/classes/sun/rmi/registry/RegistryImpl.java.i
data/make/java/awt/Makefile.i
-data/make/tools/CharsetMapping/IBM1147.map.i
+data/src/share/classes/java/io/InputStream.java.i
data/test/sun/security/pkcs11/Secmod/GetPrivateKey.java.i
data/make/java/nio/mapfile-solaris.i
data/test/sun/security/ec/p12passwords.txt.i
@@ -5397,31 +5640,32 @@ data/src/share/classes/sun/nio/cs/ext/EUC_CN.java.i
data/src/windows/native/sun/windows/awt_Rectangle.cpp.i
data/src/share/classes/sun/security/pkcs11/P11KeyStore.java.i
data/test/com/sun/jdi/OnThrowTarget.java.i
-data/test/com/sun/tools/attach/PermissionTests.sh.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java.i
data/src/share/classes/com/sun/jdi/DoubleValue.java.i
data/src/share/classes/javax/swing/TablePrintable.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html.i
data/make/tools/CharsetMapping/IBM937.map.i
-data/src/solaris/classes/sun/awt/X11/XToolkit.java.i
+data/src/share/demo/jvmti/hprof/hprof_io.c.i
+data/src/share/classes/java/security/AlgorithmConstraints.java.i
+data/src/share/classes/sun/tools/jstat/OptionFinder.java.i
data/src/share/classes/javax/naming/ldap/StartTlsResponse.java.i
-data/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java.i
-data/src/share/classes/com/sun/security/auth/module/NTSystem.java.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageDecoratedDnDInOut.java.i
data/src/solaris/native/sun/net/sdp/SdpSupport.c.i
data/make/tools/CharsetMapping/IBM875.c2b.i
data/src/share/classes/sun/nio/ch/Groupable.java.i
data/test/javax/management/mxbean/StandardMBeanOverrideTest.java.i
+data/src/share/classes/java/net/CookiePolicy.java.i
data/make/jpda/transport/shmem/mapfile-vers.i
data/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java.i
data/test/java/security/cert/X509Certificate/emptySubjectCert.i
data/make/sun/org/mozilla/javascript/Makefile.i
data/src/windows/native/sun/nio/ch/Iocp.c.i
-data/src/share/classes/sun/security/krb5/Credentials.java.i
+data/src/share/classes/java/awt/dnd/DropTargetAdapter.java.i
data/test/javax/script/Test1.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/DesktopIcon.gif.i
-data/src/share/classes/sun/nio/ch/IOVecWrapper.java.i
-data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java.i
-data/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif.i
-data/src/solaris/doc/sun/man/man1/idlj.1.i
+data/src/share/classes/javax/swing/event/AncestorListener.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java.i
data/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java.i
data/src/windows/hpi/include/monitor_md.h.i
data/src/share/native/sun/security/jgss/wrapper/NativeUtil.h.i
@@ -5432,9 +5676,9 @@ data/src/share/classes/javax/print/attribute/standard/MediaName.java.i
data/test/com/sun/tools/attach/Shutdown.java.i
data/src/share/classes/java/beans/IntrospectionException.java.i
data/src/share/classes/sun/tools/tree/UnsignedShiftRightExpression.java.i
-data/src/windows/native/sun/windows/awt_MMStub.h.i
+data/src/share/classes/javax/swing/SwingUtilities.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Controller.java.i
-data/src/share/classes/java/rmi/server/RMIClientSocketFactory.java.i
data/src/share/classes/java/awt/image/BandedSampleModel.java.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/heapdump.js.i
data/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamClose.java.i
@@ -5443,18 +5687,19 @@ data/src/share/classes/sun/util/resources/TimeZoneNames_ja.java.i
data/src/share/classes/sun/rmi/transport/ObjectTable.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletColor16.gif.i
data/src/share/classes/sun/swing/plaf/synth/Paint9Painter.java.i
-data/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java.i
data/src/share/classes/sun/util/resources/CalendarData_it.properties.i
data/test/org/openjdk/jigsaw/TrivialWebServer.java.i
-data/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java.i
data/src/share/classes/sun/text/resources/CollationData_el.java.i
-data/test/java/nio/file/Files/walkFileTree/MaxDepth.java.i
+data/test/java/lang/instrument/MakeJAR.sh.i
data/src/share/classes/java/lang/AutoCloseable.java.i
data/test/java/nio/channels/Selector/WakeupEmpty.java.i
data/src/share/native/sun/java2d/loops/LineUtils.h.i
data/test/java/beans/XMLEncoder/java_lang_Character.java.i
-data/src/share/classes/sun/util/resources/CalendarData_en_IE.properties.i
-data/test/javax/swing/JFileChooser/6520101/bug6520101.java.i
+data/src/share/classes/com/sun/jdi/ThreadGroupReference.java.i
+data/test/java/lang/management/MemoryMXBean/PendingAllGC.sh.i
+data/src/share/classes/java/awt/MenuItem.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c.i
+data/src/share/classes/sun/tools/jstat/Arguments.java.i
data/test/java/io/DataInputStream/ReadLinePushback.java.i
data/src/share/classes/javax/swing/plaf/synth/Region.java.i
data/src/share/classes/sun/misc/Unsafe.java.i
@@ -5462,15 +5707,12 @@ data/test/java/io/Serializable/nullArgExceptionOrder/Test.java.i
data/test/java/awt/font/TextLayout/TextLayoutBounds.java.i
data/src/share/classes/sun/net/ProgressListener.java.i
data/src/share/classes/java/text/BreakIterator.java.i
-data/src/windows/native/sun/windows/awt_MenuBar.cpp.i
data/src/share/classes/sun/nio/cs/ThreadLocalCoders.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java.i
+data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java.i
data/src/share/classes/sun/management/ClassLoadingImpl.java.i
data/src/share/classes/java/lang/ref/Reference.java.i
data/src/share/classes/sun/net/www/http/HttpCaptureOutputStream.java.i
data/test/javax/management/remote/mandatory/connection/CloseUnconnectedTest.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java.i
-data/make/tools/dtdbuilder/dtds/public.map.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose-pressed.gif.i
data/src/share/classes/sun/tools/java/BinaryAttribute.java.i
data/src/solaris/bin/ergo.c.i
@@ -5482,20 +5724,25 @@ data/src/share/classes/com/sun/jndi/url/ldaps/ldapsURLContextFactory.java.i
data/src/share/classes/sun/launcher/LauncherHelp.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiToolBarUI.java.i
data/src/share/demo/nbproject/management/JTop/build.properties.i
-data/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java.i
-data/src/solaris/native/sun/awt/awt_DrawingSurface.h.i
-data/src/share/classes/sun/text/resources/FormatData_nl.java.i
+data/test/java/security/Policy/Dynamic/DynamicPolicy.java.i
+data/src/macosx/native/sun/font/CoreTextSupport.m.i
data/src/share/classes/java/util/zip/ZipCoder.java.i
data/src/share/classes/com/sun/jndi/toolkit/dir/LazySearchEnumerationImpl.java.i
data/test/java/awt/Insets/CombinedTestApp1.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes128CksumType.java.i
+data/src/macosx/native/apple/security/KeystoreImpl.m.i
+data/test/java/beans/XMLEncoder/Test6256805.java.i
data/src/solaris/native/sun/security/smartcardio/pcsc_md.h.i
+data/src/solaris/classes/sun/nio/fs/BsdFileSystem.java.i
+data/src/share/classes/sun/swing/AccessibleMethod.java.i
data/src/share/classes/javax/security/auth/kerberos/KeyImpl.java.i
data/make/sun/jkernel/FILES_java.gmk.i
+data/src/macosx/classes/sun/java2d/opengl/CGLLayer.java.i
data/src/share/classes/sun/dyn/FilterGeneric.java.i
data/src/share/native/java/lang/fdlibm/src/s_signgam.c.i
data/src/share/classes/java/nio/file/DirectoryNotEmptyException.java.i
data/src/share/classes/javax/accessibility/AccessibleTextSequence.java.i
+data/src/macosx/classes/sun/lwawt/LWMouseInfoPeer.java.i
data/src/solaris/classes/sun/awt/X11/XAbstractMenuItem.java.i
data/src/share/classes/sun/management/snmp/jvminstr/README.i
data/src/solaris/classes/java/util/prefs/FileSystemPreferencesFactory.java.i
@@ -5509,43 +5756,46 @@ data/test/java/util/Locale/GenerateKeyList.java.i
data/src/share/classes/java/dyn/Linkage.java.i
data/src/share/classes/java/beans/Statement.java.i
data/src/share/classes/sun/management/RuntimeImpl.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_it.properties.i
+data/src/macosx/native/sun/awt/LWCToolkit.h.i
+data/src/bsd/doc/man/ja/wsimport.1.i
data/test/java/lang/System/Versions.java.i
data/src/share/classes/javax/xml/crypto/dsig/Transform.java.i
data/test/java/awt/Robot/ManualInstructions/ManualInstructions.java.i
-data/src/share/native/sun/security/ec/ec.c.i
data/src/share/classes/sun/io/CharToByteCp950.java.i
data/make/tools/swing-beans/beaninfo/images/JLabelColor32.gif.i
data/test/sun/security/pkcs11/nss/db/cert8.db.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/C14nHelper.java.i
-data/src/windows/classes/sun/awt/windows/WPageDialogPeer.java.i
-data/test/java/io/BufferedInputStream/SkipTest.java.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiUtils.c.i
+data/src/share/classes/java/security/URIParameter.java.i
data/src/share/classes/sun/nio/cs/UTF_16LE_BOM.java.i
data/src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureBaseRSA.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/compress.c.i
-data/test/com/sun/jdi/ConnectedVMs.java.i
data/src/share/sample/nio/chatserver/ChatServer.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java.i
data/make/sun/font/mapfile-vers.i
data/src/share/classes/com/sun/jdi/ThreadReference.java.i
-data/src/share/classes/sun/security/x509/X500Name.java.i
data/src/share/classes/sun/text/resources/CollationData_fi.java.i
+data/src/share/classes/sun/nio/ch/Invoker.java.i
data/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp.i
data/test/sun/net/www/protocol/http/Finalizer.java.i
-data/src/share/classes/javax/swing/text/doc-files/Document-insert.gif.i
-data/src/share/native/java/lang/fdlibm/src/s_rint.c.i
+data/test/ProblemList.txt.i
+data/src/macosx/classes/com/apple/eawt/event/GestureAdapter.java.i
+data/src/share/classes/java/awt/IllegalComponentStateException.java.i
data/src/share/classes/java/net/Authenticator.java.i
data/test/java/nio/file/Files/walkFileTree/TerminateWalk.java.i
data/test/java/lang/ClassLoader/deadlock/SupAlice.java.i
-data/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java.i
-data/test/java/util/Timer/KillThread.java.i
+data/src/macosx/classes/com/apple/eawt/AppEventListener.java.i
+data/src/share/sample/nio/server/ChannelIOSecure.java.i
+data/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java.i
data/test/java/util/ResourceBundle/Test4314141B_fr_CH.properties.i
+data/src/bsd/doc/man/rmiregistry.1.i
data/src/share/classes/sun/text/resources/FormatData_vi_VN.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java.i
data/src/linux/doc/man/keytool.1.i
data/test/javax/swing/JSlider/6587742/bug6587742.java.i
+data/test/sun/net/www/protocol/http/NoCache.java.i
data/src/share/native/sun/java2d/loops/AnyByteBinary.h.i
data/test/java/io/PipedOutputStream/MultipleConnect.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Skip.java.i
@@ -5553,20 +5803,17 @@ data/test/java/util/ResourceBundle/Bug4168625Class.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ByteCalls.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelEntryImpl.java.i
data/src/solaris/instrument/FileSystemSupport_md.h.i
+data/make/sun/font/t2k/mapfile-vers.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/NullCases.java.i
-data/src/share/sample/nio/multicast/MulticastAddress.java.i
data/src/share/classes/javax/imageio/plugins/jpeg/JPEGQTable.java.i
data/test/java/util/ResourceBundle/Bug6190861.java.i
-data/src/share/classes/java/nio/file/attribute/AclEntryType.java.i
data/src/share/classes/sun/java2d/DestSurfaceProvider.java.i
data/src/share/classes/sun/security/ssl/CipherBox.java.i
data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.java.i
data/src/share/classes/java/net/doc-files/net-properties.html.i
data/src/windows/classes/sun/security/krb5/internal/tools/Ktab.java.i
data/src/solaris/native/sun/java2d/loops/vis_UshortGray.c.i
-data/src/windows/native/sun/windows/awt_Scrollbar.cpp.i
-data/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java.i
-data/src/share/classes/sun/misc/FormattedFloatingDecimal.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java.i
data/test/sun/security/pkcs11/KeyStore/ClientAuth.java.i
data/src/solaris/native/java/io/RandomAccessFile_md.c.i
data/src/share/classes/sun/nio/cs/ext/MacCyrillic.java.i
@@ -5576,6 +5823,7 @@ data/test/java/lang/Thread/StopBeforeStart.java.i
data/src/share/classes/javax/management/AndQueryExp.java.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_ko.properties.i
data/src/share/classes/javax/print/attribute/standard/PrinterURI.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.chk.i
data/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptor.java.i
data/src/share/classes/sun/security/x509/IssuingDistributionPointExtension.java.i
data/src/share/classes/javax/swing/event/PopupMenuEvent.java.i
@@ -5588,18 +5836,14 @@ data/test/javax/management/openmbean/ConstraintTest.java.i
data/src/windows/lib/content-types.properties.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransform.java.i
data/test/java/lang/management/ManagementFactory/ProxyTypeMapping.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html.i
data/src/share/classes/com/sun/jdi/request/ClassUnloadRequest.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java.i
-data/src/share/classes/sun/text/CodePointIterator.java.i
data/test/demo/jvmti/HeapUser.java.i
data/make/common/shared/Sanity.gmk.i
-data/test/javax/print/StreamPrintingOrientation.java.i
data/src/share/back/bag.h.i
data/src/share/classes/sun/nio/ch/DirectBuffer.java.i
-data/test/java/beans/Introspector/Test5102804.java.i
-data/test/javax/management/ImplementationVersion/ImplVersionCommand.java.i
-data/test/java/beans/Introspector/Test4498236.java.i
+data/src/share/classes/javax/management/namespace/VirtualEventManager.java.i
+data/src/share/classes/java/rmi/UnknownHostException.java.i
data/src/share/classes/javax/naming/spi/InitialContextFactoryBuilder.java.i
data/src/share/classes/sun/misc/VMSupport.java.i
data/src/windows/classes/sun/awt/Win32GraphicsConfig.java.i
@@ -5608,29 +5852,30 @@ data/make/tools/CharsetMapping/EUC_KR.map.i
data/src/share/classes/sun/jkernel/ByteArrayToFromHexDigits.java.i
data/src/solaris/classes/sun/awt/X11/XToolkitThreadBlockedHandler.java.i
data/src/share/classes/sun/management/counter/Variability.java.i
-data/src/share/back/standardHandlers.h.i
+data/src/share/classes/java/lang/module/package-info.java.i
data/src/linux/doc/man/javaws.1.i
data/src/share/classes/com/sun/crypto/provider/BlockCipherParamsCore.java.i
data/src/share/native/java/util/zip/ZipFile.c.i
-data/src/share/native/sun/security/ec/mpprime.h.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties.i
data/src/share/classes/javax/swing/undo/StateEditable.java.i
data/test/sun/net/www/protocol/jar/bar.jar.i
-data/make/tools/CharsetMapping/IBM420.c2b.i
-data/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java.i
+data/make/sun/jar/Makefile.i
+data/src/solaris/bin/arm/jvm.cfg.i
data/test/com/sun/jdi/MethodCallsReflection.java.i
data/src/share/native/sun/font/layout/IndicRearrangement.h.i
data/src/share/classes/java/nio/channels/ServerSocketChannel.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl_Stub.java.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetName.java.i
+data/src/macosx/native/sun/awt/CMenuBar.h.i
data/test/com/sun/jdi/VarargsTest.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassPath.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameTitlePane.java.i
data/test/javax/crypto/Cipher/GetMaxAllowed.java.i
+data/src/share/classes/java/util/jar/Manifest.java.i
data/src/share/classes/sun/io/CharToByteCp935.java.i
data/test/sun/security/pkcs11/Provider/Login.policy.i
data/src/share/classes/sun/management/snmp/jvminstr/NotificationTarget.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_sv.properties.i
-data/src/share/demo/nio/zipfs/Demo.java.i
+data/make/tools/CharsetMapping/MS1254.map.i
data/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup_Stub.java.i
data/test/java/lang/Math/RoundTests.java.i
data/src/share/instrument/JPLISAssert.c.i
@@ -5653,7 +5898,7 @@ data/test/com/sun/jdi/RedefineTTYLineNumber.sh.i
data/src/share/classes/javax/naming/ldap/Control.java.i
data/src/share/classes/javax/sound/midi/ShortMessage.java.i
data/src/share/classes/sun/tools/jconsole/resources/disconnected24.png.i
-data/test/javax/print/applet/applet2/Applet2.java.i
+data/src/share/native/sun/java2d/loops/ByteIndexed.c.i
data/src/share/classes/sun/java2d/loops/FontInfo.java.i
data/test/java/beans/XMLEncoder/6777487/TestBox.java.i
data/src/share/classes/sun/misc/RegexpPool.java.i
@@ -5670,41 +5915,46 @@ data/src/share/demo/applets/MoleculeViewer/models/buckminsterfullerine.xyz.i
data/src/share/classes/javax/swing/undo/CannotUndoException.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java.i
+data/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java.i
data/src/share/classes/java/dyn/MethodTypeForm.java.i
data/src/share/classes/javax/naming/ldap/SortKey.java.i
-data/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java.i
+data/src/macosx/native/com/apple/laf/JRSUIConstantSync.m.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CategoryClassFile.java.i
data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor32.gif.i
data/src/share/classes/sun/security/x509/AccessDescription.java.i
+data/src/share/native/sun/awt/libpng/pngdebug.h.i
data/src/share/classes/com/sun/jdi/connect/AttachingConnector.java.i
data/src/share/classes/java/security/DigestInputStream.java.i
data/src/share/classes/java/net/MalformedURLException.java.i
data/src/share/classes/com/sun/jndi/ldap/SearchResultWithControls.java.i
-data/test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java.i
+data/src/solaris/classes/sun/nio/fs/UnixException.java.i
data/src/windows/classes/sun/security/mscapi/SunMSCAPI.java.i
-data/test/javax/swing/JTree/6505523/bug6505523.java.i
data/test/java/util/PluggableLocale/providersrc/Utils.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so.i
+data/make/sun/lwawt/FILES_c_macosx.gmk.i
data/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java.i
+data/test/javax/swing/text/html/CSS/4530474/test.html.i
data/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java.i
data/src/share/classes/java/lang/invoke/ToGeneric.java.i
-data/test/sun/security/ssl/sanity/interop/JSSEServer.java.i
data/src/share/classes/java/security/cert/LDAPCertStoreParameters.java.i
data/src/share/classes/javax/print/event/PrintJobListener.java.i
-data/test/javax/print/attribute/SidesPageRangesTest.java.i
+data/make/tools/UnicodeData/PropList.txt.i
data/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak_Stub.java.i
data/test/sun/pisces/StrokeShapeTest.java.i
-data/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java.i
+data/make/sun/font/reorder-sparcv9.i
data/src/share/classes/java/lang/module/ModuleId.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO_8859_3.java.i
data/test/java/lang/Class/forName/classes/hyphen.class.i
-data/src/share/classes/java/text/RuleBasedBreakIterator.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties.i
data/test/java/io/Serializable/auditStreamSubclass/AuditStreamSubclass.java.i
+data/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/package.html.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c.i
data/make/tools/swing-beans/GenSwingBeanInfo.java.i
data/test/java/beans/VetoableChangeSupport/Test6630275.java.i
data/test/javax/management/namespace/LeadingSeparatorsTest.java.i
-data/src/share/native/sun/security/ec/impl/secoidt.h.i
-data/test/org/openjdk/jigsaw/cli/tsa-prikey.pem.i
+data/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
+data/src/share/classes/javax/naming/directory/BasicAttribute.java.i
data/src/solaris/classes/sun/awt/X11/XEventDispatcher.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_IQ.properties.i
data/src/share/classes/sun/awt/SubRegionShowable.java.i
@@ -5721,13 +5971,12 @@ data/src/solaris/native/sun/tools/attach/LinuxVirtualMachine.c.i
data/src/share/classes/sun/reflect/generics/tree/CharSignature.java.i
data/src/share/classes/com/sun/jndi/dns/DnsName.java.i
data/make/common/shared/Sanity-Settings.gmk.i
+data/src/share/demo/jfc/SampleTree/DynamicTreeNode.java.i
data/test/java/rmi/server/useCustomRef/security.policy.i
data/src/share/classes/com/sun/java/browser/net/ProxyService.java.i
-data/src/share/classes/sun/awt/geom/Order2.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XOperations.java.i
-data/src/share/classes/sun/tools/jconsole/Version.java.template.i
data/src/share/classes/java/nio/file/attribute/DosFileAttributes.java.i
-data/make/sun/headless/reorder-i586.i
+data/src/share/classes/java/sql/DatabaseMetaData.java.i
data/src/share/classes/java/security/cert/CertificateExpiredException.java.i
data/src/share/classes/javax/management/modelmbean/InvalidTargetObjectTypeException.java.i
data/src/solaris/classes/sun/awt/X11/XDropTargetContextPeer.java.i
@@ -5735,37 +5984,33 @@ data/test/java/io/BufferedReader/BigMark.java.i
data/test/java/beans/PropertyEditor/TestBooleanTypeValue.java.i
data/test/java/lang/Enum/ValueOf.java.i
data/src/share/classes/sun/misc/resources/Messages_es.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load7.java.i
+data/test/sun/net/www/protocol/jar/B5105410.sh.i
data/src/share/classes/java/dyn/DirectMethodHandle.java.i
data/src/windows/native/sun/security/smartcardio/pcsc_md.c.i
data/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java.i
-data/test/java/util/TreeMap/NullPermissiveComparator.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.c.i
-data/test/java/io/Serializable/unnamedPackageSwitch/A.java.i
data/src/share/demo/nbproject/jfc/Font2DTest/build.xml.i
data/test/java/net/URLConnection/UnknownContentType.java.i
data/test/sun/security/tools/keytool/autotest.sh.i
+data/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java.i
data/src/share/classes/sun/nio/cs/IBM850.java.i
data/src/solaris/native/sun/nio/fs/genSolarisConstants.c.i
-data/test/javax/management/remote/mandatory/connection/AddressableTest.java.i
-data/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java.i
-data/src/windows/classes/sun/awt/windows/WFontMetrics.java.i
+data/src/share/classes/sun/awt/ModalityListener.java.i
+data/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSessionNulls.java.i
data/src/share/classes/java/awt/image/Kernel.java.i
data/src/windows/native/java/lang/ProcessEnvironment_md.c.i
-data/src/share/classes/sun/util/resources/LocaleNames_et.properties.i
data/src/share/classes/sun/security/smartcardio/SunPCSC.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_2.java.i
data/src/share/classes/java/sql/SQLNonTransientConnectionException.java.i
-data/src/share/back/ClassLoaderReferenceImpl.h.i
+data/test/com/sun/jndi/ldap/ReadTimeoutTest.java.i
data/src/share/classes/javax/print/SimpleDoc.java.i
data/src/share/classes/sun/net/www/http/KeepAliveStreamCleaner.java.i
data/test/vm/verifier/VerifyStackForExceptionHandlers.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ResetAllControllers.java.i
data/src/share/classes/javax/sql/rowset/sqlxml.xsd.i
-data/test/sun/jvmstat/monitor/VmIdentifier/testcases.i
+data/test/java/io/LineNumberReader/SkipInput.txt.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/InstructionSyntax.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java.i
+data/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java.i
+data/src/share/classes/javax/management/remote/JMXProviderException.java.i
data/src/linux/doc/man/javac.1.i
data/make/tools/src/build/tools/jdwpgen/IntTypeNode.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java.i
@@ -5774,40 +6019,39 @@ data/test/java/io/Serializable/class/SerialA.java.i
data/test/java/nio/channels/SocketChannel/VectorIO.java.i
data/src/share/classes/sun/security/pkcs/ParsingException.java.i
data/test/sun/net/idn/nfsmxs.spp.i
-data/test/java/beans/PropertyEditor/TestLongClassJava.java.i
-data/test/sun/tools/jcmd/usage.out.i
+data/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java.i
+data/make/tools/CharsetMapping/IBM860.map.i
data/test/java/nio/channels/DatagramChannel/NoSender.java.i
data/src/share/classes/javax/swing/text/TableView.java.i
-data/src/share/classes/javax/swing/LayoutStyle.java.i
data/src/share/classes/sun/security/x509/CertificatePolicyId.java.i
-data/test/java/io/PrintWriter/FailingConstructors.java.i
+data/src/share/classes/sun/io/CharToByteCp858.java.i
data/test/sun/tools/jstatd/jstatdServerName.sh.i
data/src/share/classes/javax/crypto/MacSpi.java.i
+data/src/bsd/doc/man/extcheck.1.i
data/src/share/classes/javax/imageio/plugins/bmp/BMPImageWriteParam.java.i
-data/src/share/classes/java/security/cert/CertPathBuilder.java.i
data/src/share/classes/sun/security/ssl/krb5/KerberosClientKeyExchangeImpl.java.i
data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh.i
-data/test/javax/crypto/Mac/NullMacSpi.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java.i
data/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh.i
+data/make/com/sun/tools/attach/FILES_java.gmk.i
data/src/share/classes/sun/misc/RequestProcessor.java.i
data/test/sun/pisces/ThinLineTest.java.i
data/src/share/classes/java/lang/invoke/VolatileCallSite.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java.i
data/src/share/demo/jvmti/hprof/sample.makefile.txt.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedList.java.i
data/test/tools/launcher/i18nTest.sh.i
-data/test/java/lang/instrument/PremainClass/InheritAgent0011.java.i
data/test/java/nio/Buffer/SwapMicroBenchmark.java.i
data/test/java/nio/file/WatchService/OverflowEventIsLoner.java.i
data/src/windows/native/sun/windows/awt_KeyEvent.h.i
data/src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc.i
data/src/share/classes/sun/reflect/generics/tree/MethodTypeSignature.java.i
-data/make/tools/src/build/tools/javazic/Mappings.java.i
-data/src/share/classes/sun/text/resources/FormatData_ko.java.i
data/make/tools/CharsetMapping/IBM918.c2b.i
data/test/java/net/InetAddress/IPv4Formats.java.i
+data/src/macosx/classes/com/apple/laf/AquaLabelUI.java.i
data/test/javax/management/namespace/NullObjectNameTest.java.i
data/src/share/classes/sun/tools/tree/BinaryCompareExpression.java.i
-data/src/share/classes/sun/font/NullFontScaler.java.i
+data/src/share/classes/javax/print/URIException.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl.java.i
data/src/solaris/classes/sun/awt/X11/XFramePeer.java.i
data/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java.i
@@ -5815,25 +6059,25 @@ data/src/share/classes/javax/naming/ldap/LdapName.java.i
data/src/share/classes/javax/crypto/IllegalBlockSizeException.java.i
data/make/mkdemo/jvmti/hprof/Makefile.i
data/src/share/classes/javax/swing/DefaultSingleSelectionModel.java.i
-data/test/java/net/URLEncoder/Decoder.java.i
+data/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java.i
+data/src/share/classes/java/security/SecureRandomSpi.java.i
data/src/share/classes/sun/net/util/URLUtil.java.i
data/src/share/classes/javax/naming/ServiceUnavailableException.java.i
data/src/share/transport/shmem/sysShmem.h.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html.i
+data/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java.i
data/src/share/classes/sun/io/ByteToCharCp921.java.i
data/src/share/classes/sun/security/jgss/krb5/InitialToken.java.i
-data/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMeta.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java.i
-data/src/share/classes/javax/xml/crypto/URIDereferencer.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScanner.java.i
data/src/share/classes/java/security/KeyPairGenerator.java.i
-data/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java.i
+data/test/sun/management/jmxremote/startstop/JMXStartStopDoSomething.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParserConstants.java.i
-data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdParallelGC.sh.i
+data/src/share/classes/sun/tools/jconsole/resources/mbean.gif.i
data/test/sun/security/krb5/etype/WeakCrypto.java.i
data/src/share/classes/com/sun/net/ssl/KeyManagerFactory.java.i
-data/test/java/security/SecureRandom/GetAlgorithm.java.i
+data/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java.i
data/src/share/classes/com/sun/jmx/snmp/package.html.i
data/test/javax/swing/MultiUIDefaults/4300666/bug4300666.html.i
data/src/share/native/sun/security/ec/impl/mpi-config.h.i
@@ -5842,60 +6086,67 @@ data/test/sun/net/www/http/HttpClient/GetProxyPort.java.i
data/test/sun/security/provider/PolicyFile/SelfWildcard.policy.i
data/test/sun/tools/jps/jps-Defaults.sh.i
data/src/share/classes/com/sun/tools/hat/build.xml.i
-data/src/windows/classes/java/io/FileDescriptor.java.i
data/test/java/lang/management/MemoryMXBean/MemoryManagementParallelGC.sh.i
data/src/share/classes/javax/swing/plaf/basic/CenterLayout.java.i
data/make/mksample/dtrace/Makefile.i
data/src/share/classes/sun/nio/cs/ext/IBM1146.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpMsgProcessingModel.java.i
-data/src/share/classes/sun/launcher/resources/launcher_fr.properties.i
data/src/share/classes/javax/print/DocFlavor.java.i
data/src/solaris/classes/sun/nio/fs/DefaultFileTypeDetector.java.i
+data/src/solaris/bin/java-rmi.cgi.sh.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_ko.properties.i
data/test/java/beans/XMLDecoder/spec/TestFalse.java.i
data/test/java/lang/reflect/Field/Set.java.i
data/test/sun/java2d/loops/Bug7049339.java.i
data/src/share/demo/jvmti/hprof/hprof.h.i
data/src/share/classes/sun/security/smartcardio/TerminalImpl.java.i
-data/src/share/classes/java/awt/peer/FontPeer.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_be_BY.properties.i
-data/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java.i
+data/make/tools/swing-beans/SwingBeanInfo.template.i
data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskFill.c.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_AU.properties.i
-data/test/java/util/EnumMap/EnumMapBash.java.i
+data/src/share/classes/java/awt/MultipleGradientPaint.java.i
data/src/share/classes/com/sun/beans/decoder/ClassElementHandler.java.i
data/src/share/native/sun/java2d/loops/Blit.c.i
+data/test/sun/nio/cs/StrCodingBenchmark.java.i
+data/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c.i
data/src/share/classes/java/io/OptionalDataException.java.i
data/test/javax/swing/JFormattedTextField/Test6462562.java.i
+data/src/macosx/native/apple/applescript/NS_Java_ConversionUtils.h.i
data/test/java/io/RandomAccessFile/skipBytes/SkipBytes.java.i
data/test/java/util/zip/InterruptibleZip.java.i
data/make/sun/security/ec/mapfile-vers.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/RectangleShape.java.i
+data/src/share/sample/nio/server/Content.java.i
data/test/java/net/URL/TestPort.java.i
data/test/com/sun/net/httpserver/Test3.java.i
data/src/share/classes/sun/security/x509/SubjectAlternativeNameExtension.java.i
+data/src/macosx/native/sun/awt/CDragSource.h.i
+data/src/macosx/classes/com/apple/laf/AquaTabbedPaneTabState.java.i
data/test/java/awt/Mixing/MixingOnDialog.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java.i
data/src/share/classes/sun/applet/AppletResourceLoader.java.i
data/src/share/classes/java/text/PatternEntry.java.i
-data/test/java/awt/font/TextLayout/TestSinhalaChar.java.i
+data/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.i
+data/src/macosx/bin/jexec.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverLocalFilesystem.java.i
data/src/solaris/doc/sun/man/man1/java.1.i
+data/test/java/io/charStreams/LineSink.java.i
data/test/java/lang/ClassLoader/defineClass/TestClass.java.i
+data/src/share/classes/sun/text/resources/FormatData_it_CH.java.i
data/test/java/security/cert/CertPathBuilder/StubProvider.java.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_it.properties.i
data/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java.i
data/src/solaris/classes/sun/awt/X11/XEmbedChildProxy.java.i
-data/test/javax/swing/JLayer/6872503/bug6872503.java.i
+data/test/java/nio/channels/FileChannel/ReadToLimit.java.i
data/make/sun/net/Makefile.i
data/test/java/lang/reflect/Generics/HashCodeTest.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.i
+data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp.i
+data/src/share/classes/javax/naming/event/package.html.i
+data/make/sun/cmm/lcms/Makefile.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverXPointer.java.i
data/test/java/lang/System/IHashCode.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk2.key.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/rmid.security.policy.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java.i
+data/src/share/classes/javax/xml/crypto/dom/package.html.i
data/make/tools/GenerateCharacter/Character.c.template.i
data/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedSortedSet.java.i
@@ -5907,23 +6158,29 @@ data/make/java/jvm/Makefile.i
data/src/solaris/native/sun/awt/awt_XmDnD.h.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeOpen.gif.i
data/make/tools/swing-beans/beaninfo/images/JMenuMono32.gif.i
+data/src/share/classes/javax/swing/text/html/BlockView.java.i
data/src/share/classes/sun/rmi/runtime/Log.java.i
data/test/java/net/Socket/IDNTest.java.i
data/src/share/native/common/jni_util.c.i
data/src/solaris/native/sun/security/smartcardio/pcsc_md.c.i
data/test/java/awt/Mouse/MouseModifiersUnitTest/ModifierPermutation.java.i
-data/test/com/sun/security/auth/login/ConfigFile/Override.props.i
+data/make/tools/src/build/tools/charsetmapping/DBCS.java.i
+data/test/java/util/ResourceBundle/Control/Chinese_zh.properties.i
data/src/share/classes/sun/text/resources/FormatData_mt_MT.java.i
+data/test/javax/management/generified/ListTypeCheckTest.java.i
data/test/com/sun/nio/sctp/SctpServerChannel/Accept.java.i
data/test/java/util/zip/ZipFile/FinalizeZipFile.java.i
data/src/share/classes/javax/swing/tree/TreeCellRenderer.java.i
data/test/java/util/ResourceBundle/Bug6356571.properties.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTaskUtils.java.i
data/src/solaris/native/java/io/io_util_md.c.i
-data/src/share/native/com/sun/java/util/jar/pack/bytes.cpp.i
+data/src/share/demo/nbproject/scripting/jconsole-plugin/build.properties.i
+data/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java.i
data/make/mkdemo/jvmti/mapfile-vers.i
data/src/share/classes/javax/swing/text/ViewFactory.java.i
+data/src/bsd/doc/man/jstat.1.i
data/test/sun/security/ssl/sanity/interop/JSSEClient.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/ElementWType.java.i
data/src/share/classes/javax/swing/text/html/parser/ContentModel.java.i
data/src/windows/native/sun/java2d/d3d/D3DBufImgOps.cpp.i
data/test/java/io/Serializable/ClassCastExceptionDetail/Write.java.i
@@ -5931,26 +6188,26 @@ data/src/share/classes/javax/crypto/KeyGeneratorSpi.java.i
data/src/share/classes/sun/security/pkcs11/P11KeyFactory.java.i
data/test/javax/management/Introspector/SqeDescriptorKey.java.i
data/src/share/classes/java/lang/CharacterData.java.i
-data/test/java/util/zip/ZipFile/crash.jar.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_es.properties.i
+data/src/macosx/native/sun/awt/CMenuComponent.m.i
data/src/share/classes/sun/io/CharToByteCp037.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/PrimitiveCoder.java.i
data/make/tools/swing-beans/beaninfo/images/JTreeColor32.gif.i
-data/test/java/net/URLClassLoader/closetest/build2.sh.i
+data/src/windows/classes/java/util/prefs/WindowsPreferences.java.i
data/test/java/net/URL/Constructor.java.i
data/make/sun/awt/CondenseRules.awk.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifier.java.i
data/src/share/classes/sun/io/ByteToCharJohab.java.i
data/test/sun/security/provider/PolicyParser/ExtDirsChange.java.i
data/src/share/classes/com/sun/jmx/snmp/UserAcl.java.i
-data/src/windows/native/sun/nio/ch/FileDispatcher.c.i
+data/src/macosx/native/sun/awt/PrinterSurfaceData.m.i
+data/test/java/io/File/SetLastModified.java.i
data/src/share/classes/com/sun/naming/internal/VersionHelper12.java.i
data/src/solaris/classes/sun/font/XRGlyphCacheEntry.java.i
data/src/share/native/sun/font/bidi/uchardir.c.i
-data/test/java/net/URLConnection/ChunkedEncoding.java.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java.i
data/make/mksample/nio/server/Makefile.i
data/test/java/nio/channels/DatagramChannel/Receive.java.i
data/src/share/classes/javax/print/attribute/standard/NumberOfInterveningJobs.java.i
-data/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java.i
data/src/share/classes/sun/net/www/http/PosterOutputStream.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_fr.properties.i
data/src/share/native/sun/awt/image/jpeg/jdmarker.c.i
@@ -5959,81 +6216,94 @@ data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_stat.d.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/MgmtData.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIB.java.i
data/test/java/net/Socket/LinkLocal.java.i
-data/make/common/shared/Defs-windows.gmk.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java.i
data/make/sun/rmi/rmic/Makefile.i
-data/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java.i
+data/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java.i
data/make/common/internal/Resources.gmk.i
data/src/share/classes/org/openjdk/jigsaw/Linker.java.i
+data/test/tools/launcher/I18NTest.java.i
data/test/sun/net/InetAddress/nameservice/chaining/Simple2NameServiceDescriptor.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c.i
+data/src/bsd/doc/man/ja/servertool.1.i
data/src/share/classes/com/sun/naming/internal/ResourceManager.java.i
data/src/solaris/classes/sun/java2d/xr/XRMaskBlit.java.i
+data/test/java/util/zip/ZipInputStream/Constructor.java.i
data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Encoder.java.i
data/src/share/classes/sun/io/ByteToCharCp939.java.i
data/make/sun/usagetracker/Makefile.i
+data/make/tools/reorder/tests/LoadJFrame.java.i
data/test/javax/security/auth/login/Configuration/GetInstance.configURI.i
+data/test/javax/swing/text/html/TableView/7030332/sample2.png.i
data/test/com/sun/jdi/EarlyReturnTest.java.i
data/test/sun/management/HotspotClassLoadingMBean/GetLoadedClassSize.java.i
-data/src/share/bin/version_comp.c.i
+data/src/share/classes/java/awt/RenderingHints.java.i
data/make/com/sun/image/Makefile.i
-data/src/share/lib/calendars.properties.i
+data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java.i
data/src/share/classes/java/util/concurrent/Exchanger.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java.i
+data/test/java/io/File/WinSpecialFiles.java.i
+data/src/bsd/doc/man/servertool.1.i
+data/test/javax/swing/SwingUtilities/7146377/bug7146377.java.i
data/test/java/io/ByteArrayInputStream/Skip.java.i
+data/src/share/classes/java/nio/file/FileSystem.java.i
+data/src/share/back/ClassObjectReferenceImpl.c.i
data/src/share/classes/java/util/ArrayList.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_impl.h.i
+data/src/share/classes/sun/util/logging/resources/logging_ja.properties.i
data/src/share/classes/java/nio/file/attribute/PosixFileAttributes.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest14_ko.ssl.in.i
data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToCGISocketFactory.java.i
data/src/share/classes/sun/security/ssl/HandshakeHash.java.i
+data/test/sun/tools/jstatd/usage.out.i
data/src/share/classes/javax/management/timer/Timer.java.i
data/src/solaris/hpi/src/linker_md.c.i
-data/src/share/classes/sun/tools/tree/ConditionalExpression.java.i
data/test/sun/security/x509/equalNames/AltNamesEqualsTest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java.i
data/make/tools/CharsetMapping/IBM424.map.i
-data/src/share/native/java/lang/fdlibm/src/w_j1.c.i
-data/src/share/classes/java/sql/Driver.java.i
data/src/share/classes/java/nio/channels/AsynchronousSocketChannel.java.i
data/test/sun/tools/jstat/jstatGcCauseOutput1.sh.i
data/src/solaris/doc/sun/man/man1/ja/jrunscript.1.i
-data/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java.i
+data/src/share/classes/javax/print/attribute/standard/Fidelity.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java.i
data/test/java/nio/channels/SocketChannel/Connect.java.i
-data/src/share/classes/javax/swing/text/html/default.css.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java.i
data/src/solaris/native/sun/awt/awt_KeyboardFocusManager.h.i
data/make/common/shared/Defs-linux.gmk.i
data/src/share/native/com/sun/java/util/jar/pack/coding.cpp.i
data/src/share/classes/javax/sql/rowset/rowset.properties.i
+data/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/FunctionTest.java.i
data/src/share/classes/org/openjdk/jigsaw/ModuleFile.java.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_de.properties.i
-data/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java.i
+data/src/share/classes/java/dyn/BootstrapMethod.java.i
+data/src/share/classes/sun/security/provider/ConfigSpiFile.java.i
data/src/windows/native/java/net/icmp.h.i
data/test/java/net/InetSocketAddress/B4849451.java.i
+data/src/share/classes/java/awt/event/WindowStateListener.java.i
data/src/share/classes/javax/crypto/spec/DESKeySpec.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Framework.java.i
data/test/java/awt/Mixing/OverlappingButtons.java.i
data/make/sun/awt/FILES_export_windows.gmk.i
data/src/share/classes/javax/naming/event/EventContext.java.i
-data/src/solaris/classes/sun/awt/X11/XWM.java.i
-data/test/javax/management/remote/mandatory/version/ImplVersionCommand.java.i
+data/test/java/util/PluggableLocale/ClasspathTest.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/ssl3.lib.i
data/test/javax/management/remote/mandatory/provider/provider/JMXConnectorProviderImpl.java.i
data/test/java/net/URL/share_file_urls.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml.i
-data/src/share/native/sun/java2d/cmm/lcms/icc34.h.i
+data/src/share/classes/sun/rmi/rmic/RemoteClass.java.i
data/test/javax/security/auth/login/Configuration/Synchronize.java.i
data/src/share/classes/java/nio/channels/FileLock.java.i
+data/src/share/native/java/lang/fdlibm/src/s_frexp.c.i
data/src/share/classes/sun/security/provider/certpath/Builder.java.i
data/test/sun/security/tools/keytool/console.sh.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java.i
+data/test/javax/swing/JPopupMenu/6675802/bug6675802.java.i
data/src/share/back/stream.h.i
data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.c.i
+data/src/share/classes/com/sun/media/sound/WaveFileReader.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.access.in.i
data/src/share/classes/java/lang/ref/package.html.i
data/src/share/classes/java/awt/doc-files/TextArea-1.gif.i
-data/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer.i
data/src/share/classes/com/sun/media/sound/SoftInstrument.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java.i
+data/src/share/sample/nio/server/ChannelIO.java.i
data/test/sun/security/pkcs11/rsa/KeyWrap.java.i
data/make/tools/swing-beans/beaninfo/images/JToolBarColor32.gif.i
data/src/share/classes/sun/net/httpserver/ExchangeImpl.java.i
@@ -6044,22 +6314,20 @@ data/src/share/demo/jvmti/hprof/hprof_site.h.i
data/test/javax/swing/plaf/synth/SynthToolBarUI/6739756/bug6739756.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java.i
data/src/windows/classes/sun/security/krb5/internal/tools/Klist.java.i
-data/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java.i
+data/src/share/bin/parse_manifest.c.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownModelLcdException.java.i
data/src/share/classes/javax/sql/rowset/spi/SyncProviderException.java.i
data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass.java.i
data/src/share/classes/java/util/prefs/InvalidPreferencesFormatException.java.i
data/src/share/classes/sun/management/counter/perf/PerfInstrumentation.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java.i
data/test/javax/print/applet/applet1/META-INF/services/javax.print.PrintServiceLookup.i
data/src/windows/classes/sun/java2d/opengl/WGLSurfaceData.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiPopupMenuUI.java.i
data/src/share/classes/sun/text/resources/FormatData_en_CA.java.i
data/make/com/sun/tools/attach/Exportedfiles.gmk.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngineResult/Deserialize.java.i
-data/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java.i
-data/src/share/classes/javax/management/BinaryRelQueryExp.java.i
-data/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java.i
+data/test/javax/swing/JLabel/6501991/bug6501991.java.i
+data/src/share/classes/sun/launcher/resources/launcher_fr.properties.i
data/src/share/classes/java/rmi/server/ServerRef.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Error.gif.i
data/src/share/classes/com/sun/tools/example/doc/javadt.html.i
@@ -6069,9 +6337,8 @@ data/src/share/classes/sun/tools/native2ascii/Main.java.i
data/test/java/io/Serializable/subclassGC/SubclassGC.java.i
data/src/share/classes/java/util/List.java.i
data/src/share/classes/javax/swing/text/PasswordView.java.i
-data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp.i
data/test/java/lang/management/CompositeData/MemoryNotifInfoCompositeData.java.i
-data/test/sun/pisces/JoinMiterTest.java.i
+data/make/com/sun/demo/jvmti/Makefile.i
data/src/share/classes/com/sun/tracing/ProviderFactory.java.i
data/src/share/classes/sun/security/jgss/spnego/NegTokenInit.java.i
data/src/share/classes/sun/nio/cs/KOI8_R.java.i
@@ -6079,24 +6346,25 @@ data/test/java/io/Serializable/arraySuidConflict/Foo.java.i
data/src/share/native/sun/java2d/loops/Any3Byte.h.i
data/test/java/awt/font/TextLayout/CombiningPerf.java.i
data/src/share/classes/javax/print/attribute/standard/OutputDeviceAssigned.java.i
-data/test/java/util/Collections/AddAll.java.i
+data/src/share/classes/sun/io/CharToByteCp424.java.i
data/src/windows/classes/sun/java2d/d3d/D3DVolatileSurfaceManager.java.i
data/src/share/classes/java/util/zip/package.html.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java.i
data/src/share/classes/java/nio/channels/spi/package.html.i
data/test/java/security/KeyRep/HmacSHA1.pre.1.5.key.i
data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java.i
-data/test/java/util/concurrent/DelayQueue/Stress.java.i
+data/src/share/classes/com/sun/media/sound/ModelStandardDirector.java.i
data/src/share/native/sun/font/layout/SubtableProcessor.h.i
data/src/share/classes/java/lang/invoke/AdapterMethodHandle.java.i
data/test/javax/management/context/ContextForwarderTest.java.i
-data/test/java/lang/invoke/ClassValueTest.java.i
-data/src/share/back/ThreadGroupReferenceImpl.h.i
-data/src/share/native/sun/java2d/loops/AlphaMacros.c.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties.i
+data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c.i
data/test/sun/rmi/runtime/Log/4504153/Test4504153.java.i
data/src/share/back/log_messages.h.i
data/test/java/rmi/activation/log/LogTest.java.i
data/test/sun/security/provider/certpath/CertId/CheckCertId.java.i
+data/src/bsd/doc/man/jstatd.1.i
+data/src/macosx/classes/com/apple/eawt/OpenURIHandler.java.i
data/src/share/classes/com/sun/nio/file/ExtendedCopyOption.java.i
data/src/share/classes/com/sun/media/sound/SoftMixingClip.java.i
data/test/javax/imageio/stream/StreamCloserLeak/run_test.sh.i
@@ -6104,15 +6372,15 @@ data/test/javax/crypto/spec/RC5ParameterSpec/RC5ParameterSpecEquals.java.i
data/test/java/util/Locale/Bug4316602.java.i
data/src/share/classes/java/awt/image/ImagingOpException.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtils.java.i
-data/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/deflate.h.i
data/src/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java.i
data/src/share/classes/javax/print/attribute/IntegerSyntax.java.i
-data/test/javax/swing/JComponent/4337267/bug4337267.java.i
+data/src/share/classes/sun/io/CharToByteISO8859_7.java.i
data/src/share/demo/applets/MoleculeViewer/models/water.xyz.i
-data/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java.i
+data/src/share/classes/sun/nio/cs/ext/SJIS_0213.java.i
data/src/share/demo/nbproject/jfc/TableExample/build.properties.i
-data/test/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java.i
+data/src/share/classes/sun/awt/im/CompositionArea.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/SubclassingTest.java.i
data/test/java/util/ResourceBundle/Control/ExpirationTest.sh.i
data/test/java/lang/instrument/AppendToClassPathSetUp.sh.i
data/test/java/io/Reader/Skip.java.i
@@ -6121,56 +6389,54 @@ data/src/share/demo/management/MemoryMonitor/README.txt.i
data/src/share/classes/java/awt/image/RenderedImage.java.i
data/test/java/security/cert/CertPathBuilder/StubProviderImpl.java.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono32.gif.i
-data/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java.i
+data/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java.i
data/src/share/classes/sun/nio/cs/ext/IBM964.java.d
data/src/share/native/sun/java2d/pipe/BufferedMaskBlit.c.i
data/test/java/nio/file/spi/SetDefaultProvider.java.i
-data/src/share/native/java/lang/Throwable.c.i
data/src/share/classes/sun/management/HotspotCompilationMBean.java.i
-data/test/java/rmi/reliability/juicer/OrangeEcho.java.i
+data/src/share/classes/javax/swing/event/UndoableEditListener.java.i
data/src/share/classes/com/sun/jndi/toolkit/url/Uri.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Traffic.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java.i
data/src/share/classes/javax/swing/text/GlyphPainter2.java.i
data/make/modules/ld.jdk.swing.i
data/test/java/nio/charset/RemovingSunIO/TestUnmappableForLength.java.i
data/src/share/classes/javax/swing/DefaultListCellRenderer.java.i
data/src/share/classes/com/sun/net/httpserver/Authenticator.java.i
-data/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java.i
+data/src/share/classes/javax/imageio/spi/IIORegistry.java.i
data/src/solaris/native/sun/nio/ch/Sctp.h.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasUIDefaults.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicIntegerArray.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpec.java.i
-data/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java.i
-data/test/sun/tools/jrunscript/jrunscript-argsTest.sh.i
+data/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java.i
data/src/share/classes/sun/security/krb5/internal/ccache/CredentialsCache.java.i
data/src/share/classes/sun/io/ByteToCharCp866.java.i
data/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRuntimeMBean.java.i
-data/test/java/util/Arrays/CopyMethods.java.i
+data/make/templates/gpl-header.i
data/make/tools/spp/Makefile.i
data/src/share/classes/sun/io/ByteToCharMacDingbat.java.i
data/src/share/classes/sun/security/jgss/krb5/Krb5InitCredential.java.i
+data/src/macosx/classes/sun/lwawt/LWTextComponentPeer.java.i
data/src/windows/classes/sun/io/Win32ErrorMode.java.i
data/src/share/classes/javax/sound/midi/Instrument.java.i
-data/test/java/rmi/reliability/juicer/Orange.java.i
-data/test/com/oracle/security/ucrypto/TestDigest.java.i
+data/test/sun/security/provider/PolicyFile/AliasExpansion.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_ImageCopy.h.i
data/test/javax/management/Introspector/AnnotatedNotificationInfoTest.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiOptionPaneUI.java.i
data/src/share/classes/sun/text/resources/FormatData_es_MX.java.i
data/src/solaris/native/sun/awt/VDrawingArea.h.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgbPre_Mask.c.i
-data/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.i
+data/src/share/classes/sun/io/ByteToCharCp875.java.i
data/test/sun/net/InetAddress/nameservice/SimpleNameServiceDescriptor.java.i
data/test/java/nio/channels/Selector/WakeupOverflow.java.i
data/src/share/classes/sun/management/resources/agent_sv.properties.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java.i
-data/test/sun/security/krb5/auto/OkAsDelegate.java.i
+data/src/share/classes/sun/awt/image/ToolkitImage.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java.i
data/test/sun/security/pkcs11/fips/truststore.i
data/test/java/rmi/activation/Activatable/unregisterInactive/security.policy.i
data/test/java/lang/ProcessBuilder/BigFork.java.i
-data/src/share/classes/javax/print/attribute/TextSyntax.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java.i
data/src/share/classes/sun/font/Decoration.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDefaultSoundbank.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java.i
@@ -6183,39 +6449,43 @@ data/src/share/classes/javax/swing/text/EditorKit.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_SLOT_INFO.java.i
data/src/share/native/sun/security/ec/impl/ecp_192.c.i
data/src/share/classes/sun/security/x509/CertificateIssuerExtension.java.i
-data/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java.i
+data/src/share/classes/java/awt/PopupMenu.java.i
data/src/share/classes/sun/text/resources/FormatData_hi_IN.java.i
+data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java.i
data/src/share/classes/java/awt/dnd/DragGestureRecognizer.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_en_SG.properties.i
+data/src/share/classes/sun/io/CharToByteCp860.java.i
data/src/share/classes/java/util/TimeZone.java.i
data/src/share/native/sun/java2d/loops/Ushort4444Argb.c.i
data/make/modules/tools/src/com/sun/classanalyzer/Klass.java.i
data/src/solaris/classes/java/util/prefs/FileSystemPreferences.java.i
data/src/share/classes/java/beans/EventHandler.java.i
-data/test/java/util/ServiceLoader/FooProvider2.java.i
+data/test/java/util/Hashtable/HashCode.java.i
data/src/windows/native/java/lang/java_props_md.c.i
data/test/java/rmi/reliability/benchmark/bench/serial/Shorts.java.i
-data/src/windows/native/sun/windows/awt_dlls.h.i
+data/src/share/classes/sun/tools/tree/AssignExpression.java.i
data/make/com/sun/jndi/toolkit/Makefile.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java.i
data/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.html.i
-data/src/solaris/hpi/native_threads/src/threads_md.c.i
+data/test/java/io/Serializable/proxy/replace/Test.java.i
data/src/share/classes/com/sun/net/ssl/HttpsURLConnection.java.i
data/test/javax/management/descriptor/DescriptorConstructorTest.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneWarning.wav.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java.i
+data/src/share/classes/com/sun/media/sound/DLSInfo.java.i
data/src/share/classes/java/awt/print/Pageable.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java.i
data/src/share/classes/sun/tools/tree/BinaryBitExpression.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/ContentHandlerAlreadyRegisteredException.java.i
data/src/share/classes/sun/reflect/UnsafeStaticObjectFieldAccessorImpl.java.i
+data/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template.i
data/src/linux/doc/man/ja/native2ascii.1.i
data/src/share/demo/jfc/SwingApplet/README.txt.i
data/test/sun/util/resources/TimeZone/Bug6377794.java.i
data/src/windows/classes/sun/java2d/d3d/D3DMaskBlit.java.i
data/test/sun/misc/ClassLoaderUtil/test.jar.i
-data/test/sun/nio/cs/TestUTF8.java.i
+data/src/macosx/native/sun/font/CoreTextSupport.h.i
+data/make/tools/CharsetMapping/IBM935.c2b.i
+data/test/java/lang/annotation/loaderLeak/C.java.i
data/src/solaris/classes/sun/awt/X11/XLayerProtocol.java.i
data/src/share/classes/com/sun/jndi/ldap/ReferralEnumeration.java.i
data/test/java/lang/instrument/RemoveTransformerTest.java.i
@@ -6232,55 +6502,60 @@ data/src/share/classes/sun/reflect/generics/tree/BooleanSignature.java.i
data/test/sun/security/pkcs11/tls/TestMasterSecret.java.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/XMLKit.java.i
data/src/share/classes/sun/text/normalizer/UTF16.java.i
-data/src/share/classes/javax/swing/JSlider.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java.i
+data/src/share/classes/java/text/Collator.java.i
data/src/share/classes/sun/security/x509/CRLNumberExtension.java.i
+data/src/macosx/native/sun/font/AWTFont.m.i
data/test/org/openjdk/jigsaw/cli/ca-cert.pem.i
data/test/java/util/Random/DistinctSeeds.java.i
data/test/com/oracle/net/sanity.sh.i
data/test/java/security/Provider/Equals.java.i
+data/test/java/rmi/Naming/legalRegistryNames/Legal.java.i
data/src/share/classes/sun/net/www/protocol/jar/URLJarFileCallBack.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java.i
+data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java.i
data/src/share/classes/sun/reflect/generics/repository/FieldRepository.java.i
data/test/java/lang/ClassLoader/deadlock/Bob.java.i
data/src/share/classes/sun/awt/image/IntegerComponentRaster.java.i
data/test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_es.java.i
+data/src/share/classes/java/util/concurrent/atomic/package-info.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/DesCbcCrcEType.java.i
data/src/share/native/sun/font/layout/MultipleSubstSubtables.h.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_sv.properties.i
data/make/tools/dtdbuilder/dtds/html32.dtd.i
-data/src/share/sample/scripting/scriptpad/build.xml.i
+data/test/javax/management/modelmbean/DescriptorSupportTest.java.i
data/src/share/classes/javax/naming/spi/InitialContextFactory.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1110.java.i
data/test/java/io/File/isDirectory/Applet.html.i
-data/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java.i
+data/test/java/util/Locale/serialized/java6locale__US.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java.i
data/test/javax/script/Test6.js.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaField.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js.i
+data/test/java/nio/channels/FileChannel/Read.java.i
data/src/share/native/sun/font/layout/KhmerLayoutEngine.cpp.i
data/src/share/classes/javax/swing/plaf/metal/sounds/PopupMenuPopup.wav.i
data/src/share/native/java/lang/fdlibm/src/s_ceil.c.i
data/make/mksample/nio/chatserver/Makefile.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/StructOffsetResolver.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IgnoreAllErrorHandler.java.i
-data/test/java/beans/Introspector/TestTypeResolver.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapNameParser.java.i
data/test/java/util/Collections/WrappedNull.java.i
data/test/java/beans/XMLDecoder/spec/AbstractTest.java.i
data/test/java/nio/Buffer/BasicFloat.java.i
data/src/share/classes/sun/io/CharToByteMacArabic.java.i
-data/src/share/classes/sun/security/acl/WorldGroupImpl.java.i
+data/test/java/net/InetAddress/ptr/lookup.sh.i
data/src/solaris/classes/sun/nio/ch/SctpAssocChange.java.i
data/test/java/nio/channels/SocketChannel/GetChannel.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterDevice.java.i
data/test/javax/xml/crypto/dsig/data/sign-spec.xml.i
data/src/share/classes/sun/print/resources/orientLandscape.png.i
data/src/share/classes/java/security/ProtectionDomain.java.i
data/src/share/classes/com/sun/tools/jdi/IntegerTypeImpl.java.i
-data/test/java/nio/channels/SocketChannel/ConnectState.java.i
-data/test/java/security/Policy/Dynamic/setpolicy.jp.i
+data/test/java/io/Serializable/maskSyntheticModifier/Foo.java.i
data/src/share/classes/sun/security/internal/spec/TlsKeyMaterialSpec.java.i
data/src/solaris/native/sun/awt/awt_MenuComponent.c.i
+data/src/share/classes/java/text/BreakDictionary.java.i
data/make/sun/audio/Makefile.i
data/test/sun/security/provider/DSA/TestKeyPairGenerator.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Ports.c.i
@@ -6289,59 +6564,66 @@ data/src/windows/native/sun/windows/awt_DnDDS.h.i
data/src/share/back/eventHelper.c.i
data/test/java/net/Socket/ShutdownInput.java.i
data/src/share/classes/com/sun/media/sound/MidiInDeviceProvider.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_lt.properties.i
data/src/share/classes/sun/nio/cs/ext/ISCII91.java.i
+data/make/netbeans/common/file-view.ent.i
data/src/share/classes/sun/nio/fs/AbstractFileStoreSpaceAttributeView.java.i
data/src/share/classes/javax/script/ScriptEngine.java.i
data/make/tools/CharsetMapping/IBM1098.map.i
data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.h.i
-data/src/share/classes/javax/naming/directory/BasicAttribute.java.i
data/src/solaris/classes/sun/awt/X11/XWindowAttributesData.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/zlib.h.i
data/src/linux/doc/man/unpack200.1.i
data/.jcheck/conf.i
+data/test/sun/tools/jrunscript/jrunscript-fTest.sh.i
data/src/share/classes/com/sun/tools/script/shell/init.js.i
data/make/java/main/Makefile.i
data/src/share/back/FieldImpl.h.i
data/src/share/classes/javax/sound/midi/MidiDevice.java.i
+data/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java.i
data/test/com/sun/security/auth/callback/TextCallbackHandler/NPE.java.i
data/src/share/native/java/lang/fdlibm/src/w_acosh.c.i
data/test/java/util/PluggableLocale/providersrc/CurrencyNameProviderImpl.java.i
data/src/share/classes/sun/util/resources/LocaleNames_zh_TW.properties.i
-data/src/share/native/sun/security/ec/ec2_233.c.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c.i
+data/make/tools/CharsetMapping/HKSCS2008.c2b.i
+data/src/share/classes/sun/text/resources/FormatData_de_LU.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html.i
data/src/share/native/common/jdk_util.h.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Disable.java.i
+data/test/javax/management/modelmbean/ExoticTargetTypeTest.java.i
data/src/share/classes/javax/swing/SortOrder.java.i
data/src/share/classes/sun/launcher/resources/launcher_ko.properties.i
data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemColor16.gif.i
data/src/share/demo/nbproject/jfc/SampleTree/nbproject/project.xml.i
data/test/sun/security/pkcs11/MessageDigest/DigestKAT.java.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java.i
data/src/share/classes/sun/text/resources/FormatData_bg.java.i
data/make/java/text/bidi/Makefile.i
data/src/share/classes/java/lang/Class.java.i
data/src/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxMenuItemUI.java.i
-data/src/share/native/sun/nio/ch/nio.h.i
-data/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp.i
+data/src/share/demo/jvmti/hprof/hprof_reference.h.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java.i
+data/make/java/java/mapfile-vers.i
data/src/share/classes/java/rmi/dgc/DGC.java.i
data/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh.i
data/src/share/classes/javax/swing/plaf/multi/MultiSliderUI.java.i
data/test/java/awt/xembed/server/TesterClient.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java.i
data/test/java/awt/geom/CubicCurve2D/IntersectsTest.java.i
-data/src/share/classes/sun/reflect/generics/tree/BottomSignature.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java.i
+data/src/share/classes/sun/text/resources/FormatData_sk_SK.java.i
data/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass2.java.i
data/test/com/sun/jdi/ExceptionEvents.java.i
data/test/java/lang/instrument/BufferClassLoader.java.i
data/src/share/classes/sun/io/ByteToCharCp1251.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifBorders.java.i
-data/src/share/native/java/util/zip/zip_util.c.i
+data/make/tools/CharsetMapping/IBM970.c2b.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_MidiIn.c.i
data/make/tools/CharsetMapping/sjis0213.map.i
data/make/tools/GenerateCharacter/CharacterData0E.java.template.i
data/test/com/sun/management/HotSpotDiagnosticMXBean/GetVMOption.java.i
data/src/share/classes/sun/util/logging/resources/logging_pt_BR.properties.i
-data/test/java/util/TimeZone/OldIDMappingTest.sh.i
+data/src/macosx/classes/com/apple/laf/AquaButtonExtendedTypes.java.i
data/make/mkdemo/jpda/Makefile.i
data/test/java/beans/PropertyEditor/TestLongClassNull.java.i
data/test/java/nio/channels/Selector/SelectAfterRead.java.i
@@ -6350,56 +6632,57 @@ data/test/javax/swing/JEditorPane/4492274/bug4492274.java.i
data/test/sun/java2d/cmm/ProfileOp/ReadProfileTest.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java.i
data/src/share/classes/sun/reflect/UnsafeIntegerFieldAccessorImpl.java.i
-data/test/javax/management/descriptor/ImmutableArrayFieldTest.java.i
+data/test/com/sun/jdi/ShutdownDebuggee.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Base64.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java.i
data/test/java/util/regex/TestCases.txt.i
data/make/README-builds.html.i
data/src/share/classes/java/security/spec/DSAPrivateKeySpec.java.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierString.java.i
-data/src/share/classes/sun/beans/editors/ByteEditor.java.i
+data/src/windows/native/sun/windows/awt_MenuBar.cpp.i
data/test/sun/security/krb5/auto/MaxRetries.java.i
data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabInputStream.java.i
data/src/share/classes/java/awt/doc-files/FontMetrics-1.gif.i
data/test/java/rmi/server/RMIClassLoader/spi/ServiceConfiguration.java.i
data/src/share/classes/com/sun/jdi/VoidValue.java.i
+data/src/share/classes/com/sun/imageio/stream/StreamCloser.java.i
data/src/share/classes/java/lang/ArrayIndexOutOfBoundsException.java.i
data/src/share/native/sun/awt/image/cvutils/img_opaque.h.i
data/src/share/native/java/util/zip/Inflater.c.i
data/test/java/awt/FullScreen/BufferStrategyExceptionTest/BufferStrategyExceptionTest.java.i
data/test/javax/management/monitor/ReflectionExceptionTest.java.i
data/src/share/classes/sun/reflect/generics/repository/AbstractRepository.java.i
-data/make/tools/src/build/tools/automulti/README.txt.i
+data/src/share/classes/java/lang/IllegalMonitorStateException.java.i
data/make/java/main/java/mapfile-i586.i
data/test/java/util/Currency/tablea1.txt.i
data/src/share/native/sun/security/ec/impl/ecp_256.c.i
data/src/share/classes/javax/sql/StatementEventListener.java.i
data/test/sun/security/provider/PolicyFile/Comparator.Comparator.Policy.i
-data/test/java/util/Formatter/Basic.java.i
+data/src/share/native/java/lang/fdlibm/src/e_lgamma_r.c.i
+data/src/macosx/classes/com/apple/laf/AquaInternalFramePaneUI.java.i
data/src/share/classes/javax/print/attribute/standard/JobKOctetsSupported.java.i
-data/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XTree.java.i
data/test/java/net/URLClassLoader/closetest/serverRoot/Test.java.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor16.gif.i
data/test/java/util/EnumSet/BogusEnumSet.java.i
data/src/share/classes/java/security/spec/MGF1ParameterSpec.java.i
-data/make/sun/launcher/Makefile.i
-data/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java.i
-data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java.i
-data/src/solaris/classes/sun/awt/X11/XInputMethod.java.i
+data/src/share/classes/com/sun/security/auth/module/UnixSystem.java.i
+data/make/com/apple/Makefile.i
+data/src/share/classes/javax/xml/crypto/Data.java.i
data/test/java/lang/ClassLoader/deadlock/Alice.java.i
data/test/javax/xml/crypto/dsig/data/signature-x509-sn.xml.i
data/test/javax/sound/midi/Gervill/SoftLinearResampler/Interpolate.java.i
data/test/java/io/StringReader/Skip.java.i
data/test/java/io/PrintStream/OversynchronizedTest.java.i
-data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java.i
-data/src/share/classes/sun/management/counter/perf/PerfDataType.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneDivider.java.i
+data/src/share/classes/sun/net/NetworkServer.java.i
data/src/share/classes/java/lang/ClassNotFoundException.java.i
data/test/javax/print/attribute/SupportedPrintableAreas.java.i
+data/src/share/classes/javax/management/modelmbean/package.html.i
data/test/java/nio/Buffer/CopyDirectDoubleMemory.java.i
-data/test/com/sun/jdi/CatchCaughtTest.sh.i
+data/test/tools/launcher/ChangeDataModel.sh.i
data/src/windows/classes/sun/print/services/javax.print.StreamPrintServiceFactory.i
-data/test/java/net/URL/SpecifyHandler.java.i
-data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java.i
+data/src/share/classes/javax/swing/text/TabStop.java.i
data/src/share/classes/java/nio/channels/CompletionHandler.java.i
data/src/share/classes/sun/awt/VerticalBagLayout.java.i
data/test/javax/swing/JFileChooser/6868611/bug6868611.java.i
@@ -6410,13 +6693,14 @@ data/test/java/rmi/server/RemoteServer/SetLogNull.java.i
data/test/java/lang/management/MemoryMXBean/MemoryTestAllGC.sh.i
data/src/solaris/native/java/nio/MappedByteBuffer.c.i
data/src/share/classes/sun/tools/tree/LessOrEqualExpression.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java.i
data/src/share/classes/com/sun/tools/jdi/InternalEventHandler.java.i
data/test/com/sun/crypto/provider/Mac/HmacMD5.java.i
data/src/share/native/java/lang/fdlibm/src/e_jn.c.i
data/src/linux/doc/man/ja/wsgen.1.i
data/test/java/beans/XMLEncoder/java_awt_Component.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/inflate.c.diff.i
-data/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java.i
data/src/share/sample/nio/file/Chmod.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_it.properties.i
data/src/share/back/inStream.h.i
@@ -6426,47 +6710,50 @@ data/test/java/lang/StringBuffer/GetCharsSrcEndLarger.java.i
data/test/sun/pisces/DashStrokeTest.java.i
data/test/com/sun/jdi/MethodExitReturnValuesTest.java.i
data/src/share/classes/com/sun/crypto/provider/Padding.java.i
+data/src/bsd/doc/man/ja/jmap.1.i
+data/src/share/classes/java/security/interfaces/DSAParams.java.i
data/src/share/native/sun/java2d/loops/IntBgr.c.i
data/src/share/demo/applets/DrawTest/DrawTest.java.i
data/src/share/classes/java/awt/dnd/SerializationTester.java.i
-data/test/java/nio/charset/CharsetEncoder/CanEncode.java.i
+data/src/macosx/classes/com/apple/laf/AquaMenuBarUI.java.i
data/src/share/classes/java/rmi/ConnectException.java.i
data/make/sun/javazic/tzdata/europe.i
+data/src/share/classes/sun/io/CharToByteUnicodeBig.java.i
data/src/share/classes/javax/swing/SortingFocusTraversalPolicy.java.i
data/test/javax/management/loading/LibraryLoader/native.jar.i
+data/src/share/demo/jfc/Notepad/resources/new.gif.i
+data/src/solaris/bin/java_md_common.c.i
data/src/share/back/vm_interface.h.i
-data/src/share/classes/sun/misc/PerformanceLogger.java.i
+data/src/share/classes/sun/security/x509/CertificateAlgorithmId.java.i
data/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthGraphicsUtils.java.i
data/src/solaris/native/sun/tools/attach/SolarisVirtualMachine.c.i
-data/src/share/classes/sun/security/util/ByteArrayTagOrder.java.i
-data/test/org/openjdk/jigsaw/cli/prikey.pem.i
-data/test/java/awt/FontClass/CreateFont/DeleteFont.sh.i
+data/src/share/classes/java/awt/package.html.i
+data/src/share/classes/javax/swing/plaf/TreeUI.java.i
data/src/share/classes/javax/management/OrQueryExp.java.i
data/src/share/classes/com/sun/script/javascript/JSAdapter.java.i
data/test/java/util/TreeMap/ContainsValue.java.i
-data/test/java/nio/file/WatchService/grantDirOnly.policy.i
+data/src/share/classes/javax/swing/text/html/parser/DTDConstants.java.i
data/test/java/io/SystemInAvailable.java.i
data/src/share/classes/com/sun/tools/example/doc/jdb.html.i
data/test/java/security/cert/CertificateFactory/openssl/open.i
data/src/share/classes/sun/nio/cs/ext/EUC_JP.java.i
data/src/share/classes/java/util/logging/Level.java.i
data/src/share/classes/sun/reflect/NativeConstructorAccessorImpl.java.i
-data/test/java/net/URL/HandlerLoop.java.i
-data/src/share/classes/com/sun/media/sound/AbstractLine.java.i
+data/src/share/classes/java/awt/geom/IllegalPathStateException.java.i
data/test/java/util/ResourceBundle/Test4314141B_es_ES.java.i
-data/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/ValueConverter.java.i
data/test/java/lang/ClassLoader/deadlock/Starter.java.i
data/test/java/math/BigInteger/UnicodeConstructor.java.i
data/test/javax/management/namespace/LazyDomainTest.java.i
-data/src/share/classes/java/util/EnumSet.java.i
data/src/share/classes/javax/naming/StringRefAddr.java.i
data/test/javax/swing/text/Utilities/bug7045593.java.i
data/make/sun/security/util/Makefile.i
data/src/share/demo/jvmti/hprof/hprof_ioname.c.i
-data/test/sun/net/www/protocol/jar/B5105410.java.i
+data/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/OriginServer.java.i
data/src/share/classes/com/sun/java/browser/net/ProxyServiceProvider.java.i
+data/test/java/util/jar/JarEntry/test.jar.i
data/test/java/util/ResourceBundle/Bug4168625Resource.java.i
data/test/java/nio/MappedByteBuffer/ZeroMap.java.i
data/src/windows/native/sun/windows/awt_Palette.cpp.i
@@ -6478,14 +6765,16 @@ data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es
data/test/java/security/KeyPairGenerator/Failover.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ServerProvider.java.i
data/test/java/lang/ClassLoader/deadlock/GetResource.java.i
+data/src/macosx/classes/com/apple/laf/AquaMenuBarBorder.java.i
data/src/solaris/native/sun/awt/awt_TextField.c.i
data/src/share/classes/sun/reflect/UnsafeStaticFloatFieldAccessorImpl.java.i
data/test/sun/tools/jstat/gcCauseOutput1.awk.i
data/src/share/classes/javax/management/MBeanServer.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/StructTest.java.i
data/src/share/classes/sun/nio/cs/ext/ISO2022_KR.java.i
data/make/tools/swing-beans/beaninfo/images/JPanelMono32.gif.i
data/src/share/classes/java/security/cert/X509CRLEntry.java.i
-data/src/linux/doc/man/jarsigner.1.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseEngineException.java.i
data/test/sun/net/www/ftptest/FtpAuthHandler.java.i
data/test/java/nio/channels/Selector/BasicConnect.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_hr_HR.properties.i
@@ -6494,41 +6783,47 @@ data/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.html.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractPerfDataBuffer.java.i
data/src/share/classes/javax/accessibility/AccessibleExtendedComponent.java.i
data/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java.i
+data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java.i
data/src/solaris/classes/sun/awt/X11/XDropTargetProtocol.java.i
data/src/share/classes/java/util/Observable.java.i
+data/src/macosx/classes/com/apple/laf/AquaUtils.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_ZA.properties.i
data/src/share/classes/sun/security/provider/certpath/AdaptableX509CertSelector.java.i
data/src/share/native/sun/security/ec/impl/ec2_aff.c.i
data/test/java/lang/Short/Decode.java.i
data/src/share/classes/java/awt/peer/SystemTrayPeer.java.i
-data/src/share/classes/java/math/SignedMutableBigInteger.java.i
+data/test/javax/management/remote/mandatory/loading/SingleClassLoader.java.i
data/src/share/classes/javax/crypto/spec/PBEParameterSpec.java.i
-data/test/sun/net/idn/nfscss.spp.i
+data/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java.i
data/test/java/io/Serializable/evolution/AddedField/run.i
-data/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java.i
+data/src/share/demo/nbproject/management/MemoryMonitor/build.xml.i
data/test/java/net/URL/TestIPv6Addresses.java.i
-data/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java.i
-data/test/java/lang/Character/Scripts.txt.i
+data/src/macosx/native/sun/awt/CFileDialog.h.i
+data/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/FrameMaximize.wav.i
data/make/netbeans/common/java-data-no-native.ent.i
data/src/share/native/sun/awt/giflib/gifalloc.c.i
data/src/share/classes/sun/awt/image/GifImageDecoder.java.i
+data/src/bsd/doc/man/ja/javadoc.1.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasPath.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/Destinations.java.i
data/src/share/native/sun/awt/image/cvutils/img_output24.h.i
data/src/share/classes/sun/io/ByteToCharMacRoman.java.i
data/src/share/classes/com/sun/crypto/provider/ai.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_BH.properties.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/PooledTestCase.java.i
+data/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java.i
data/src/share/classes/sun/io/CharToByteCp284.java.i
-data/src/windows/classes/sun/nio/ch/PipeImpl.java.i
+data/test/java/net/Socket/asyncClose/DatagramSocket_receive.java.i
data/test/java/io/Serializable/enum/basic/Test.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/PeerAddrChange.java.i
data/src/windows/classes/sun/security/mscapi/PRNG.java.i
data/test/java/lang/Class/getEnclosingClass/T4992170.java.i
data/src/share/classes/sun/io/CharToByteCp1256.java.i
-data/src/share/classes/java/awt/image/BufferedImage.java.i
+data/src/share/classes/java/text/spi/NumberFormatProvider.java.i
+data/test/java/text/BreakIterator/ExceptionTest.java.i
data/src/share/classes/sun/net/www/protocol/file/FileURLConnection.java.i
-data/src/windows/native/sun/windows/ThemeReader.cpp.i
-data/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java.i
+data/src/solaris/back/proc_md.h.i
+data/src/share/classes/sun/util/resources/CalendarData_es_US.properties.i
data/src/share/classes/javax/swing/text/Position.java.i
data/src/solaris/classes/sun/nio/ch/SctpSocketDispatcher.java.i
data/src/share/classes/sun/net/httpserver/HttpContextImpl.java.i
@@ -6537,86 +6832,89 @@ data/src/share/classes/sun/security/ssl/KerberosPreMasterSecret.java.i
data/src/share/classes/java/security/Identity.java.i
data/make/tools/src/build/tools/jdwpgen/TaggedObjectTypeNode.java.i
data/test/java/io/readBytes/MemoryLeak.java.i
+data/make/sun/motif12/reorder-i586.i
data/src/solaris/classes/java/io/FileDescriptor.java.i
data/test/java/io/Serializable/defaulted/GetFieldRead.java.i
data/test/java/util/Currency/PropertiesTest.java.i
-data/test/com/sun/jdi/ExclusiveBind.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java.i
data/src/share/classes/java/awt/geom/RoundRectIterator.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfByteArrayMonitor.java.i
-data/test/java/lang/instrument/BootClassPath/Agent.java.i
data/test/javax/security/auth/x500/X500Principal/OIDMap.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Handler.java.i
data/src/share/native/sun/java2d/loops/ProcessPath.c.i
data/src/share/classes/com/sun/tools/jdi/ArrayTypeImpl.java.i
data/src/share/classes/javax/crypto/spec/SecretKeySpec.java.i
data/src/share/classes/org/openjdk/jigsaw/ModuleFileWriter.java.i
+data/src/macosx/classes/com/apple/laf/AquaTableUI.java.i
data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/file-targets.xml.i
data/src/share/classes/sun/jkernel/StandaloneMessageDigest.java.i
-data/src/windows/native/sun/windows/awt_KeyEvent.cpp.i
+data/src/share/classes/com/sun/beans/decoder/FieldElementHandler.java.i
data/src/share/native/sun/awt/libpng/png.c.i
data/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java.i
+data/src/bsd/doc/man/ja/xjc.1.i
+data/src/share/classes/java/awt/GridLayout.java.i
data/src/share/classes/sun/nio/cs/ext/IBM921.java.i
data/src/share/classes/java/nio/file/ClosedFileSystemException.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-failed.png.i
data/src/solaris/classes/sun/awt/motif/X11Johab.java.i
data/src/share/classes/javax/swing/text/Style.java.i
+data/make/mkdemo/management/MemoryMonitor/Makefile.i
data/test/java/net/Socks/SocksServer.java.i
data/test/sun/security/smartcardio/apdu.log.i
data/src/share/classes/sun/java2d/pipe/hw/ExtendedBufferCapabilities.java.i
data/src/share/classes/sun/audio/AudioDevice.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java.i
-data/src/share/classes/javax/management/AttributeChangeNotification.java.i
+data/src/share/classes/javax/swing/JLayeredPane.java.i
data/src/share/classes/java/util/Currency.java.i
data/src/share/classes/sun/security/pkcs11/P11Cipher.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties.i
-data/src/share/classes/javax/swing/event/MenuEvent.java.i
+data/test/java/awt/font/FontNames/LocaleFamilyNames.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_SY.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sl_SI.properties.i
data/src/share/classes/com/sun/jmx/mbeanserver/ClassLoaderRepositorySupport.java.i
-data/src/share/classes/sun/tools/jinfo/JInfo.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/CheckStatus.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultRGBChooserPanel.java.i
data/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c.i
data/src/share/native/sun/security/ec/impl/ecl-exp.h.i
data/src/share/classes/com/sun/jndi/dns/DnsUrl.java.i
-data/test/java/nio/channels/Selector/TemporarySelector.java.i
-data/test/java/util/Formatter/Basic.sh.i
+data/src/share/classes/sun/tools/tree/Context.java.i
data/src/share/classes/sun/security/util/Resources_ko.java.i
+data/test/java/rmi/registry/checkusage/CheckUsage.java.i
data/src/share/classes/sun/dyn/Invokers.java.i
data/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java.i
data/src/share/classes/javax/swing/plaf/UIResource.java.i
data/src/share/classes/sun/management/counter/AbstractCounter.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update.i
data/make/sun/javazic/javatz/java_11_ids.txt.i
data/test/java/lang/instrument/BootClassPath/Cleanup.java.i
data/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt.i
data/src/share/classes/java/awt/event/ItemListener.java.i
data/test/com/sun/jdi/TargetAdapter.java.i
data/test/javax/script/Test1.js.i
-data/test/java/beans/PropertyEditor/TestByteTypeValue.java.i
+data/test/com/sun/tools/attach/ProviderTests.sh.i
data/src/share/classes/java/io/DataOutputStream.java.i
-data/src/share/lib/images/cursors/motif_MoveDrop32x32.gif.i
+data/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java.i
data/src/share/classes/com/sun/nio/sctp/IllegalUnbindException.java.i
data/src/share/classes/java/security/KeyPair.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/TunnelProxy.java.i
data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.gif.i
-data/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java.i
+data/make/common/Rules-SCCS.gmk.i
data/src/share/classes/sun/tools/jmap/JMap.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java.i
+data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java.i
data/make/tools/CharsetMapping/IBM278.c2b.i
-data/src/share/instrument/JarFacade.c.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/FFIType.java.i
+data/src/solaris/native/sun/awt/awt_motif21.c.i
data/make/java/management/mapfile-vers.i
-data/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java.i
data/src/share/classes/javax/management/StringValueExp.java.i
data/src/share/classes/sun/tools/jconsole/Worker.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java.i
data/src/share/back/JDWP.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/JCEMapper.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h.i
-data/src/share/native/sun/font/layout/GlyphDefinitionTables.h.i
+data/test/java/awt/Menu/NullMenuLabelTest/NullMenuLabelTest.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java.i
data/src/share/classes/javax/imageio/spi/package.html.i
-data/src/share/classes/sun/net/smtp/SmtpProtocolException.java.i
-data/src/share/classes/sun/management/Util.java.i
+data/src/share/classes/sun/management/snmp/util/JvmContextFactory.java.i
+data/test/demo/jvmti/hprof/CpuTimesDefineClassTest.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/Connections.java.i
data/test/java/util/jar/JarFile/bogus-signerinfo-attr.jar.i
data/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonUI.java.i
@@ -6624,14 +6922,15 @@ data/src/share/classes/javax/swing/UIDefaults.java.i
data/test/java/awt/FontClass/CreateFont/A.ttf.i
data/test/sun/security/pkcs11/KeyStore/BasicData/p11-nss.txt.i
data/src/share/classes/javax/swing/text/doc-files/View-flexibility.jpg.i
+data/src/macosx/classes/sun/lwawt/macosx/CAccessibleText.java.i
data/test/com/sun/management/ThreadMXBean/ThreadCpuTimeArray.java.i
data/src/share/classes/javax/swing/event/MouseInputListener.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java.i
+data/test/com/sun/net/httpserver/bugs/6725892/Test.java.i
data/src/solaris/doc/sun/man/man1/jps.1.i
-data/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java.i
+data/src/share/classes/sun/management/Agent.java.i
data/src/share/classes/javax/print/attribute/standard/SheetCollate.java.i
data/test/sun/security/pkcs11/Provider/Absolute.cfg.i
-data/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java.i
+data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.java.i
data/src/share/classes/sun/text/normalizer/VersionInfo.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Aes128CtsHmacSha1EType.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_TOKEN_INFO.java.i
@@ -6639,119 +6938,121 @@ data/test/java/lang/reflect/Method/Equals.java.i
data/test/java/nio/charset/Charset/Contains.java.i
data/src/share/classes/java/awt/Insets.java.i
data/test/com/sun/jdi/AccessSpecifierTest.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/config.i
+data/src/share/classes/sun/swing/plaf/synth/SynthUI.java.i
data/src/share/classes/sun/tools/asm/Cover.java.i
data/src/share/classes/java/dyn/Switcher.java.i
+data/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java.i
data/src/share/classes/javax/sql/rowset/spi/SyncFactory.java.i
data/src/share/classes/java/awt/FocusTraversalPolicy.java.i
data/test/java/lang/reflect/Proxy/NullClassLoader.java.i
data/test/java/nio/channels/AsynchronousFileChannel/Basic.java.i
-data/test/javax/naming/spi/DirectoryManager/DummyContext.java.i
+data/src/share/classes/java/util/jar/JarOutputStream.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1381.java.i
data/src/share/classes/com/sun/jmx/namespace/serial/JMXNamespaceContext.java.i
-data/src/share/classes/sun/tools/jconsole/manifest.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h.i
data/src/solaris/hpi/native_threads/src/threads_solaris.c.i
data/test/com/sun/jdi/CountEvent.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/MarkReset.java.i
-data/src/share/classes/sun/reflect/MethodAccessor.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy33.i
-data/src/share/native/sun/java2d/loops/IntDcm.h.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputImageTests.java.i
+data/src/share/classes/java/util/concurrent/ForkJoinTask.java.i
+data/test/javax/swing/plaf/synth/7032791/bug7032791.java.i
+data/src/share/native/sun/awt/medialib/mlib.h.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyAuthTest.java.i
-data/src/share/classes/java/sql/DataTruncation.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libfreebl_hybrid_3.chk.i
data/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java.i
data/src/solaris/classes/sun/awt/motif/MInputMethodControl.java.i
data/src/share/native/sun/awt/image/cvutils/img_input8_32.h.i
+data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif.i
data/src/share/classes/sun/java2d/pipe/AATextRenderer.java.i
-data/test/java/net/CookieHandler/NullUriCookieTest.java.i
+data/test/java/awt/font/TextLayout/TestTibetan.java.i
data/src/share/native/sun/security/ec/impl/ecl.c.i
data/test/sun/management/jmxremote/bootstrap/TestApplication.java.i
data/src/windows/classes/sun/nio/ch/SocketDispatcher.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/DigestMethodParameterSpec.java.i
data/test/java/util/TimSort/ArrayBuilder.java.i
-data/src/share/classes/sun/applet/AppletEvent.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizerSpi.java.i
-data/test/java/lang/instrument/RedefineSetUp.sh.i
data/src/share/classes/sun/io/ByteToCharCp870.java.i
data/test/java/io/PushbackReader/Skip.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_zh_HK.java.i
-data/src/share/classes/sun/management/counter/perf/ByteArrayCounterSnapshot.java.i
+data/test/com/sun/jndi/cosnaming/CNNameParser.java.i
data/src/share/classes/sun/management/counter/perf/PerfLongArrayCounter.java.i
data/src/share/classes/sun/util/logging/LoggingProxy.java.i
-data/test/java/lang/ClassLoader/Assert.java.i
data/make/tools/CharsetMapping/IBM933.c2b.i
data/test/java/lang/reflect/Proxy/CharType.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/package.html.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/access.properties.i
data/test/sun/net/www/httptest/HttpTransaction.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/LValue.java.i
-data/test/org/openjdk/jigsaw/remrepo.sh.i
-data/test/java/io/Reader/OpsAfterClose.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM424.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_fr_CA.properties.i
data/test/sun/text/resources/Format/Bug4685470.java.i
data/src/share/classes/java/dyn/MutableCallSite.java.i
-data/src/solaris/doc/sun/man/man1/native2ascii.1.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/package.html.i
+data/src/linux/doc/man/jinfo.1.i
+data/test/java/text/Format/DateFormat/Bug6683975.java.i
data/test/java/beans/Introspector/Test4168833.java.i
-data/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java.i
+data/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in.i
+data/src/share/classes/java/awt/AlphaComposite.java.i
data/test/java/util/Locale/LocaleTestFmwk.java.i
data/src/share/classes/sun/misc/resources/Messages_ja.java.i
data/src/share/classes/java/lang/doc-files/chi.gif.i
data/test/sun/security/pkcs11/Secmod/AddPrivateKey.java.i
-data/test/java/net/URLConnection/xml/xml3.i
-data/test/java/net/URL/TestRFC2732.java.i
data/test/javax/rmi/ssl/SocketFactoryTest.java.i
-data/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java.i
-data/src/share/classes/sun/io/CharToByteGBK.java.i
+data/make/tools/CharsetMapping/IBM930.nr.i
data/src/solaris/sample/dtrace/hotspot/hotspot_calls_tree.d.i
-data/make/netbeans/common/standard-bindings.ent.i
-data/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelTo.java.i
data/src/share/classes/sun/security/rsa/SunRsaSignEntries.java.i
data/src/share/classes/com/sun/jndi/ldap/Connection.java.i
data/src/share/classes/sun/security/provider/Sun.java.i
data/src/windows/native/sun/windows/ObjectList.cpp.i
+data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider.i
data/src/share/classes/sun/security/jgss/krb5/Krb5Context.java.i
data/test/sun/management/HotspotClassLoadingMBean/ClassToLoad0.java.i
data/test/java/beans/XMLEncoder/javax_swing_DefaultCellEditor.java.i
-data/src/share/lib/security/java.policy.i
+data/src/share/classes/javax/management/Query.java.i
data/test/javax/management/descriptor/SerializedInfo.java.i
-data/test/java/util/EnumSet/AllOf.java.i
-data/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java.i
-data/src/share/classes/javax/accessibility/Accessible.java.i
+data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh.i
+data/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java.i
+data/src/share/classes/com/sun/tools/script/shell/Main.java.i
data/make/com/oracle/security/ucrypto/FILES_c.gmk.i
-data/src/share/classes/sun/font/CoreMetrics.java.i
+data/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java.i
data/test/java/nio/channels/SocketChannel/Open.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java.i
data/test/javax/management/descriptor/DefaultDescriptorTest.java.i
-data/src/share/classes/sun/security/acl/OwnerImpl.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java.i
+data/src/share/classes/java/awt/geom/QuadIterator.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFMetadata.java.i
+data/src/share/classes/com/sun/java/browser/net/ProxyInfo.java.i
data/src/share/classes/sun/print/PeekGraphics.java.i
data/test/javax/management/mxbean/customtypes/CustomLongMXBean.java.i
data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-0-attack.xml.i
-data/src/share/classes/sun/text/resources/FormatData_es_NI.java.i
+data/src/windows/native/sun/jkernel/DownloadDialog.h.i
data/src/windows/native/sun/java2d/d3d/D3DMaskFill.h.i
-data/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java.i
+data/test/javax/management/namespace/SourceNamespaceTest.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java.i
-data/test/sun/security/tools/keytool/file-in-help.sh.i
+data/make/java/hpi/windows/Makefile.i
+data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter.i
+data/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/manifest.i
data/src/share/classes/sun/dyn/MethodTypeImpl.java.i
data/test/javax/print/applet/applet2/Applet2PrintService.java.i
-data/src/share/classes/java/security/CryptoPrimitive.java.i
+data/src/share/classes/sun/text/resources/FormatData_ga_IE.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_zh_CN.properties.i
data/test/java/util/WeakHashMap/Iteration.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java.i
data/src/share/classes/com/sun/java/browser/dom/DOMAccessor.java.i
-data/test/java/lang/ThreadLocal/TLRemoveTest.java.i
+data/test/java/nio/file/Files/walkFileTree/walk_file_tree.sh.i
data/test/java/io/pathNames/win32/DriveOnly.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java.i
+data/make/com/sun/security/sasl/Makefile.i
data/test/com/sun/net/httpserver/Test9a.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java.i
-data/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java.i
+data/src/share/demo/jvmti/gctest/README.txt.i
+data/src/share/classes/sun/security/x509/CertException.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_es.properties.i
data/test/sun/management/jmxremote/bootstrap/management_test05_ko.properties.in.i
+data/src/share/classes/com/sun/pept/presentation/MessageStruct.java.i
data/src/solaris/npt/utf_md.c.i
+data/src/share/lib/security/java.security-macosx.i
data/test/javax/management/Introspector/DescribedMXBean.java.i
data/src/share/classes/com/sun/rowset/internal/InsertRow.java.i
-data/src/share/classes/sun/text/resources/FormatData_sr_CS.java.i
-data/test/java/util/zip/ZipFile/ManyZipFiles.java.i
+data/make/tools/CharsetMapping/IBM937.c2b.i
+data/make/netbeans/awt2d/nbproject/project.xml.i
+data/test/java/util/LinkedList/Clone.java.i
data/src/share/classes/org/relaxng/datatype/DatatypeLibraryFactory.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/Server.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_in_ID.properties.i
@@ -6760,47 +7061,46 @@ data/src/share/classes/sun/management/VMOptionCompositeData.java.i
data/src/windows/instrument/EncodingSupport_md.c.i
data/test/java/io/InputStream/ReadParams.java.i
data/test/java/net/ProxySelector/B6563259.java.i
-data/test/java/lang/ThreadGroup/NullThreadName.java.i
+data/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so.i
data/test/java/nio/channels/Selector/SelectorLimit.java.i
data/src/windows/native/java/net/Inet4AddressImpl.c.i
-data/src/solaris/doc/sun/man/man1/javac.1.i
-data/test/java/beans/XMLEncoder/EnumPrivate.java.i
+data/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup.i
data/src/share/classes/java/awt/FileDialog.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverSpi.java.i
+data/make/com/sun/tools/attach/mapfile-bsd.i
data/test/java/beans/PropertyEditor/TestShortClassValue.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/NonpublicInterface1.java.i
data/make/sun/javazic/javatz/fullset.txt.i
-data/src/solaris/classes/sun/nio/ch/EPollSelectorProvider.java.i
+data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c.i
data/src/share/classes/java/lang/ThreadDeath.java.i
data/src/share/classes/com/sun/tracing/package-info.java.i
data/test/sun/tools/jmap/Basic.sh.i
data/src/share/classes/java/lang/Runnable.java.i
data/make/tools/CharsetMapping/ISO_8859_9.map.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy.i
data/test/java/lang/Class/forName/InvalidNameWithSlash.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Constants.java.i
-data/test/java/io/Serializable/class/run.sh.i
-data/test/java/util/Locale/serialized/java6locale_ROOT.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticOptions.java.i
+data/src/macosx/native/sun/awt/PrinterView.h.i
+data/test/javax/swing/JTable/7027139/bug7027139.java.i
data/src/solaris/hpi/src/system_md.c.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c.i
data/src/share/classes/java/awt/Window.java.i
data/src/share/classes/sun/security/provider/DSAPublicKeyImpl.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/package.html.i
-data/test/java/nio/channels/FileChannel/AtomicAppend.java.i
+data/src/share/classes/com/sun/jarsigner/ContentSigner.java.i
data/src/share/classes/java/lang/String.java.i
data/test/sun/tools/native2ascii/resources/ImmutableResourceTest.java.i
data/test/java/lang/instrument/RedefineMethodAddInvoke.sh.i
+data/src/share/classes/javax/swing/event/MenuListener.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/GetFilePointer.java.i
data/src/share/native/sun/java2d/loops/ProcessPath.h.i
data/src/share/classes/sun/misc/REException.java.i
data/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeakClient.java.i
data/src/share/classes/com/sun/jmx/remote/security/MBeanServerAccessController.java.i
-data/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java.i
-data/make/tools/CharsetMapping/MS1250.map.i
-data/src/share/lib/security/java.security-solaris.i
+data/test/java/util/jar/JarInputStream/EmptyJar.java.i
data/src/share/classes/javax/accessibility/AccessibleTableModelChange.java.i
data/src/share/classes/sun/awt/SunToolkit.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionParserState.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_CO.java.i
data/src/share/classes/java/lang/doc-files/javalang.doc.anc40.gif.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException2.java.i
data/src/share/classes/java/nio/X-Buffer.java.template.i
@@ -6808,430 +7108,453 @@ data/test/java/text/Bidi/Bug6665028.java.i
data/test/sun/nio/cs/OLD/MS950_OLD.java.i
data/test/sun/nio/cs/TestJIS0212Decoder.java.i
data/src/share/classes/sun/util/resources/CalendarData_sk.properties.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java.i
data/src/share/classes/sun/net/ProgressSource.java.i
-data/src/windows/native/sun/windows/awt_PrintJob.cpp.i
+data/test/java/util/logging/ParentLoggersTest.java.i
data/src/share/classes/sun/management/snmp/jvminstr/NotificationTargetImpl.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono16.gif.i
-data/src/share/classes/javax/swing/event/ListDataListener.java.i
data/src/share/classes/java/awt/image/PackedColorModel.java.i
data/src/solaris/doc/sun/man/man1/ja/java.1.i
+data/src/bsd/doc/man/ja/jconsole.1.i
data/src/windows/classes/sun/tools/attach/WindowsVirtualMachine.java.i
data/test/java/beans/VetoableChangeSupport/1.5.0_10.ser.i
data/src/share/classes/sun/management/GarbageCollectorImpl.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_PE.properties.i
+data/src/solaris/classes/sun/nio/ch/LinuxAsynchronousChannelProvider.java.i
data/src/share/native/sun/font/layout/TibetanLayoutEngine.cpp.i
data/src/share/native/sun/security/ec/ec2.h.i
-data/src/share/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml.i
data/test/java/util/concurrent/BlockingQueue/LastElement.java.i
-data/src/share/classes/sun/java2d/SunGraphics2D.java.i
data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownMonitor.java.i
-data/test/java/net/Socket/setReuseAddress/Basic.java.i
+data/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/Question.gif.i
+data/test/java/nio/channels/SocketChannel/OutOfBand.java.i
data/src/linux/doc/man/jvisualvm.1.i
data/test/sun/security/krb5/auto/BadKdc1.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMBean.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1147.java.i
-data/src/share/classes/java/text/RuleBasedCollator.java.i
+data/src/share/classes/javax/swing/text/JTextComponent.java.i
data/make/tools/src/build/tools/jdwpgen/AbstractGroupNode.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_TN.properties.i
+data/test/sun/security/jgss/CtorTests2.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticObjectFieldAccessorImpl.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSliderUI.java.i
-data/src/share/classes/sun/nio/cs/UTF_32LE.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CDesktopPeer.java.i
+data/src/share/classes/javax/imageio/ImageWriteParam.java.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java.i
data/src/share/classes/sun/text/resources/FormatData_fi.java.i
data/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html.i
data/test/java/nio/file/Files/CheckPermissions.java.i
data/test/java/awt/im/JTextFieldTest.java.i
-data/src/share/classes/sun/security/krb5/internal/AuthContext.java.i
data/src/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java.i
data/src/share/classes/javax/crypto/KeyAgreementSpi.java.i
data/src/share/classes/sun/tools/jconsole/BorderedComponent.java.i
-data/src/share/classes/java/beans/AppletInitializer.java.i
data/test/java/awt/event/InputEvent/ButtonArraysEquality/ButtonArraysEquality.java.i
data/src/share/classes/java/nio/charset/CoderResult.java.i
data/src/solaris/hpi/export/io_md.h.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup_Stub.java.i
-data/test/sun/nio/cs/OLD/DBCS_IBM_EBCDIC_Decoder.java.i
+data/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp.i
+data/src/share/classes/java/awt/GraphicsEnvironment.java.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/CallbackInterface.java.i
data/test/java/security/UnresolvedPermission/Equals.java.i
-data/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java.i
+data/src/share/classes/java/lang/management/package.html.i
+data/src/macosx/native/jobjc/rungen.i
data/make/tools/CharsetMapping/MS932.nr.i
data/src/share/classes/sun/security/x509/InvalidityDateExtension.java.i
data/src/share/classes/java/text/RBTableBuilder.java.i
data/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java.i
-data/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh.i
-data/src/share/classes/sun/security/tools/JarSignerResources_ja.java.i
+data/src/share/classes/sun/awt/image/ImageFetcher.java.i
data/src/windows/native/sun/windows/awt_FileDialog.cpp.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle.properties.i
-data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.h.i
+data/src/share/classes/com/sun/imageio/plugins/common/PaletteBuilder.java.i
data/src/windows/native/java/net/SocketOutputStream.c.i
data/src/share/classes/sun/security/krb5/internal/KRBError.java.i
-data/src/share/classes/com/sun/jarsigner/ContentSigner.java.i
+data/src/share/classes/sun/security/util/ByteArrayLexOrder.java.i
data/src/share/classes/sun/util/resources/LocaleNames_be.properties.i
-data/src/share/native/java/lang/reflect/Proxy.c.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in.i
+data/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java.i
data/src/share/classes/java/net/SocksConsts.java.i
data/test/com/sun/jdi/WatchFramePop.sh.i
-data/src/solaris/classes/sun/awt/X11/XException.java.i
+data/src/share/classes/javax/management/remote/JMXPrincipal.java.i
data/test/sun/tools/jstat/gcNewOutput1.awk.i
data/src/share/classes/com/sun/net/ssl/X509TrustManager.java.i
data/make/tools/src/build/tools/charsetmapping/SBCS.java.i
-data/src/share/classes/java/awt/peer/TrayIconPeer.java.i
-data/src/solaris/native/java/net/linux_close.c.i
+data/test/com/sun/net/httpserver/Test13.java.i
+data/src/share/classes/sun/security/krb5/KrbTgsReq.java.i
+data/test/sun/misc/Cleaner/ExitOnThrow.java.i
data/src/solaris/sample/dtrace/README.txt.i
-data/src/solaris/classes/sun/java2d/xr/XRBackend.java.i
-data/src/share/classes/sun/io/CharToByteUnicodeBig.java.i
+data/test/com/sun/servicetag/FindServiceTags.java.i
+data/test/java/util/PluggableLocale/providersrc/CollatorProviderImpl.java.i
data/src/share/classes/sun/audio/NativeAudioStream.java.i
-data/src/share/classes/javax/print/FlavorException.java.i
+data/src/share/native/sun/awt/image/cvutils/README.i
+data/src/share/classes/sun/security/tools/KeyStoreUtil.java.i
data/test/sun/security/pkcs11/KeyStore/Basic.java.i
data/src/share/classes/javax/naming/directory/Attribute.java.i
data/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java.i
data/make/tools/swing-beans/beaninfo/images/JToolBarColor16.gif.i
-data/test/sun/net/www/protocol/http/UserCookie.java.i
+data/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java.i
+data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java.i
-data/src/share/classes/sun/tools/jar/JarException.java.i
+data/test/sun/java2d/XRenderBlitsTest.java.i
data/test/sun/nio/cs/TestSJIS0213.java.i
-data/src/share/classes/sun/text/resources/FormatData_fr_BE.java.i
-data/make/netbeans/common/windows-sources.ent.i
+data/src/share/classes/sun/util/resources/CalendarData_vi.properties.i
+data/src/share/classes/java/lang/InstantiationException.java.i
data/test/java/lang/ClassLoader/findSystemClass/Loadee.resource.i
data/src/windows/classes/sun/java2d/windows/Win32SurfaceData.java.i
data/src/share/classes/sun/security/jgss/wrapper/GSSNameElement.java.i
-data/src/share/classes/java/nio/file/CopyMoveHelper.java.i
+data/src/share/classes/sun/awt/image/OffScreenImageSource.java.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanDirConfigTest.java.i
+data/src/macosx/native/sun/awt/AWTView.h.i
data/src/share/native/sun/font/layout/LEInsertionList.cpp.i
-data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/SingleCertificateResolver.java.i
data/src/share/classes/java/nio/file/AccessDeniedException.java.i
data/src/share/classes/java/lang/management/ManagementPermission.java.i
data/src/solaris/doc/sun/man/man1/ja/xjc.1.i
data/src/share/classes/java/nio/file/FileAction.java.i
-data/test/sun/security/krb5/auto/basic.sh.i
-data/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties.i
+data/test/com/sun/jdi/CompatibleConnectors.java.i
+data/test/org/openjdk/jigsaw/services/services-jar.sh.i
data/test/java/io/Serializable/classDescHooks/Foo.ser.i
-data/src/share/native/sun/font/layout/StateTableProcessor.cpp.i
+data/src/share/classes/com/sun/security/jgss/GSSUtil.java.i
data/make/netbeans/swing/build.xml.i
-data/src/share/classes/java/awt/Button.java.i
+data/src/share/classes/javax/swing/event/ListDataListener.java.i
data/test/java/util/TimeZone/ListTimeZones.java.i
data/src/solaris/native/sun/awt/awt_DrawingSurface.c.i
data/src/share/classes/java/text/CharacterIteratorFieldDelegate.java.i
-data/src/share/classes/javax/management/openmbean/TabularType.java.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java.i
-data/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html.i
+data/src/share/demo/scripting/jconsole-plugin/src/scripts/verbose.js.i
+data/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java.i
+data/src/share/classes/sun/text/normalizer/Utility.java.i
data/test/tools/launcher/UnicodeTest.jar.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/ToolkitPropertyTest_Enable.java.i
data/src/windows/classes/sun/awt/windows/WCanvasPeer.java.i
data/test/java/io/pathNames/General.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Package.java.i
+data/test/java/net/ipv6tests/UdpTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es.properties.i
data/src/share/classes/sun/security/krb5/ServiceName.java.i
-data/test/sun/tools/jstat/jstatSnap2.sh.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h.i
-data/test/sun/security/x509/AVA/AVAEqualsHashCode.java.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java.i
+data/test/java/beans/Beans/Test4080522.java.i
+data/test/java/beans/PropertyEditor/TestIntegerClassNull.java.i
data/src/share/classes/sun/util/LocaleServiceProviderPool.java.i
-data/test/java/net/Inet6Address/IPv6Numeric.java.i
-data/test/java/io/Serializable/oldTests/ArrayFields.java.i
+data/test/java/util/concurrent/FutureTask/Customized.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CDataTransferer.java.i
+data/test/java/beans/XMLEncoder/java_lang_reflect_Method.java.i
data/test/sun/net/www/protocol/http/StreamingOutputStream.java.i
data/src/share/classes/javax/net/ssl/KeyManagerFactory.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/report/IIOComparator.java.i
+data/src/share/classes/java/util/NavigableSet.java.i
+data/src/macosx/native/sun/java2d/opengl/OGLFuncs_md.h.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathTableMetaImpl.java.i
data/src/share/native/sun/awt/image/cvutils/img_fscolor.h.i
-data/test/java/util/Timer/DelayOverflow.java.i
+data/test/java/util/MissingFormatArgumentException/GetFormatSpecifier.java.i
+data/test/sun/tools/jcmd/usage.out.i
data/src/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMapping.java.i
data/src/share/classes/sun/management/LockDataConverterMXBean.java.i
data/test/java/net/InetAddress/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/javax/swing/JTable/Test6888156.java.i
+data/test/javax/swing/JTabbedPane/4624207/bug4624207.java.i
data/test/java/io/File/SymLinks.java.i
data/test/java/nio/channels/ServerSocketChannel/AcceptAddress.java.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/libplds4.lib.i
data/test/java/util/ResourceBundle/RB4353454_en.properties.i
data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.jar.i
-data/src/share/classes/sun/awt/GlobalCursorManager.java.i
-data/test/tools/pack200/MemoryAllocatorTest.java.i
+data/src/windows/native/sun/windows/awt_Cursor.h.i
+data/src/solaris/doc/sun/man/man1/ja/jdb.1.i
data/src/share/native/sun/misc/GC.c.i
+data/test/sun/net/InetAddress/nameservice/B6442088.java.i
data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_ASCII_Encoder.java.i
data/src/share/classes/sun/net/www/content/audio/wav.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputStreamTests.java.i
-data/test/java/io/RandomAccessFile/skipBytes/input.txt.i
+data/src/solaris/native/sun/awt/awt_Component.h.i
data/src/windows/classes/sun/java2d/SurfaceManagerFactory.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmspack.c.i
data/src/share/classes/javax/imageio/stream/ImageOutputStreamImpl.java.i
data/make/mkdemo/applets/ArcTest/Makefile.i
+data/src/bsd/doc/man/idlj.1.i
data/test/java/beans/PropertyEditor/TestEnumClass.java.i
-data/src/share/classes/sun/security/smartcardio/PCSC.java.i
+data/src/share/classes/sun/text/resources/FormatData_no_NO_NY.java.i
data/src/share/classes/com/sun/jdi/Type.java.i
-data/src/share/classes/sun/management/snmp/util/SnmpCachedData.java.i
-data/src/share/native/com/sun/media/sound/Utilities.h.i
+data/test/java/io/FileInputStream/OpsAfterClose.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java.i
data/src/share/classes/sun/security/krb5/internal/KrbErrException.java.i
-data/src/share/classes/sun/nio/cs/ext/MS932DB.java.i
+data/test/java/util/concurrent/ExecutorCompletionService/ExecutorCompletionServiceLoops.java.i
data/src/windows/native/sun/awt/utility/rect.h.i
data/src/share/lib/management/snmp.acl.template.i
data/src/share/classes/javax/swing/plaf/basic/BasicDirectoryModel.java.i
data/src/share/classes/java/io/NotActiveException.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java.i
+data/make/com/sun/tools/attach/FILES_c.gmk.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/ClientHelloRead.java.i
-data/src/share/classes/sun/misc/Compare.java.i
-data/test/tools/launcher/VerifyExceptions.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in.i
+data/src/share/classes/java/lang/reflect/InvocationHandler.java.i
+data/src/share/classes/java/security/GuardedObject.java.i
data/test/java/security/Permission/NullName.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java.i
+data/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIProperty.java.i
-data/src/share/classes/javax/print/attribute/standard/MediaSize.java.i
+data/src/share/classes/javax/swing/DebugGraphics.java.i
data/src/share/classes/javax/naming/PartialResultException.java.i
data/test/TEST.ROOT.i
data/src/share/classes/sun/security/pkcs/PKCS10.java.i
data/test/com/sun/jdi/JDIScaffold.java.i
data/test/java/util/zip/Available.java.i
data/src/share/classes/sun/io/CharToByteEUC_TW.java.i
-data/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java.i
data/test/com/sun/jdi/ProcessAttachDebugger.java.i
data/src/share/classes/sun/io/CharToByteISO8859_15.java.i
data/test/com/sun/net/httpserver/Test6a.java.i
-data/src/share/native/sun/font/DrawGlyphList.c.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c.i
+data/src/share/classes/sun/print/ProxyGraphics.java.i
data/test/java/beans/PropertyEditor/TestIntegerType.java.i
+data/src/windows/lib/tzmappings.i
data/src/share/classes/com/sun/nio/sctp/ShutdownNotification.java.i
data/src/share/classes/javax/sound/sampled/Mixer.java.i
-data/src/share/classes/java/security/cert/CertStoreParameters.java.i
+data/src/share/classes/sun/awt/ScrollPaneWheelScroller.java.i
+data/src/solaris/back/util_md.h.i
+data/src/share/classes/sun/management/MemoryUsageCompositeData.java.i
data/test/java/io/pathNames/win32/RenameDelete.java.i
data/test/java/lang/ref/Basic.java.i
data/test/java/awt/Focus/NonFocusableWindowTest/NoEventsTest.java.i
data/src/share/native/sun/java2d/opengl/OGLRenderQueue.h.i
-data/make/tools/swing-beans/beaninfo/images/JMenuMono16.gif.i
+data/make/tools/src/build/tools/javazic/Gen.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/OriginServer.java.i
data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java.i
-data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.h.i
+data/test/sun/security/provider/PolicyFile/NullCodeSource.java.i
data/test/javax/swing/JInternalFrame/Test6325652.java.i
data/test/javax/xml/crypto/dsig/data/certs/test.jks.i
data/make/javax/accessibility/Makefile.i
data/src/share/classes/java/security/spec/KeySpec.java.i
data/test/java/util/PluggableLocale/CurrencyNameProviderTest.java.i
-data/src/share/classes/sun/jvmstat/monitor/StringMonitor.java.i
+data/test/java/beans/Introspector/7122138/pack/Super.java.i
data/make/tools/winver/src/StdAfx.h.i
+data/src/share/classes/sun/font/CompositeFont.java.i
data/test/sun/net/InetAddress/nameservice/deadlock/ThrowingNameServiceDescriptor.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java.i
data/src/solaris/classes/sun/awt/X11/XScrollbarClient.java.i
-data/src/share/classes/java/security/cert/X509CertSelector.java.i
+data/test/java/lang/Runtime/exec/Space.java.i
data/test/java/security/AccessControlContext/CheckNullPermission.java.i
-data/make/tools/src/build/tools/charsetmapping/Utils.java.i
+data/src/share/native/sun/awt/image/jpeg/jmemsys.h.i
data/src/solaris/lib/images/cursors/cursors.properties.i
data/src/share/classes/java/net/UnknownHostException.java.i
-data/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/resources/jconsole.js.i
data/src/share/classes/sun/io/ByteToCharMacCentralEurope.java.i
data/src/share/classes/java/rmi/AlreadyBoundException.java.i
data/src/share/classes/javax/swing/plaf/nimbus/ShadowEffect.java.i
data/src/windows/native/sun/jkernel/kernel_es.rc.i
-data/test/com/sun/security/sasl/pw.properties.i
data/test/java/io/charStreams/UTF16.java.i
data/test/sun/java2d/pipe/hw/RSLContextInvalidationTest/RSLContextInvalidationTest.java.i
data/make/tools/swing-beans/beaninfo/images/JDialogMono32.gif.i
-data/test/java/util/ResourceBundle/Control/StressOut_ko.properties.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java.i
-data/test/java/nio/channels/Selector/ReadAfterConnect.java.i
+data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArrayIntInt.java.i
+data/src/share/demo/applets/SortDemo/example1.html.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnssckbi.so.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java.i
data/test/java/util/logging/LoggerResourceBundleRace.java.i
data/test/sun/security/ssl/javax/net/ssl/Fix5070632.java.i
-data/src/share/classes/sun/util/logging/resources/logging_de.properties.i
+data/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java.i
data/src/share/classes/com/sun/jndi/ldap/LdapPoolManager.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CDropTarget.java.i
data/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java.i
-data/src/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java.i
-data/src/share/classes/com/sun/jdi/event/ExceptionEvent.java.i
-data/src/share/classes/java/sql/Types.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/Util.java.i
+data/src/share/classes/sun/util/locale/AsciiUtil.java.i
+data/src/share/classes/sun/reflect/ClassFileAssembler.java.i
+data/test/java/io/File/WinDeviceName.java.i
+data/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java.i
data/test/javax/management/openmbean/ArrayTypeTest.java.i
data/src/share/classes/java/util/InputMismatchException.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapCtx.java.i
-data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiatorImpl.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_it_IT.properties.i
+data/src/share/classes/sun/reflect/FieldAccessorImpl.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/Apple.java.i
data/test/java/util/zip/ZipFile/ReadAfterClose.java.i
data/src/windows/native/sun/windows/awt_ole.cpp.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListReader.java.i
data/test/java/net/Socket/Timeout.java.i
-data/src/share/classes/java/nio/file/StandardCopyOption.java.i
-data/test/java/nio/channels/Selector/OpRead.java.i
+data/make/tools/swing-beans/beaninfo/images/JDialogColor16.gif.i
+data/src/solaris/native/sun/jdga/dgalock.c.i
+data/src/share/classes/sun/security/provider/PolicySpiFile.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsComboBoxUI.java.i
data/src/share/classes/com/sun/jndi/url/corbaname/corbanameURLContextFactory.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTLibraryPathEntryImpl.java.i
data/src/share/classes/java/security/interfaces/RSAKey.java.i
data/src/share/classes/java/nio/StringCharBuffer.java.i
-data/make/com/sun/crypto/provider/Makefile.i
-data/src/share/classes/com/sun/net/ssl/X509KeyManager.java.i
+data/src/solaris/classes/sun/awt/X11/Native.java.i
+data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval_Stub.java.i
data/test/sun/text/resources/LocaleData.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModel.java.i
+data/src/share/classes/javax/sql/package.html.i
data/test/sun/security/mscapi/PublicKeyInterop.sh.i
data/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5DesCksumType.java.i
data/test/sun/java2d/DirectX/SwingOnScreenScrollingTest/SwingOnScreenScrollingTest.java.i
-data/test/sun/nio/cs/FindASCIIRangeCodingBugs.java.i
-data/src/share/native/sun/java2d/opengl/OGLMaskFill.c.i
+data/src/share/classes/sun/io/CharToByteMacCentralEurope.java.i
+data/test/java/util/Collections/T5078378.java.i
data/src/share/classes/javax/security/sasl/SaslServer.java.i
data/test/java/nio/channels/FileChannel/Force.java.i
-data/src/share/classes/javax/sound/midi/Track.java.i
+data/src/share/classes/sun/text/resources/CollationData_es.java.i
data/test/org/openjdk/jigsaw/cli/keystore.jks.i
-data/src/share/classes/java/awt/CardLayout.java.i
+data/make/tools/CharsetMapping/IBM921.map.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetKeyTo.java.i
data/src/share/classes/java/rmi/server/RemoteObjectInvocationHandler.java.i
data/make/netbeans/j2se/build.properties.i
-data/src/share/native/java/util/zip/zlib-1.1.3/inffast.h.i
+data/src/share/demo/nbproject/project.xml.i
data/src/share/classes/java/awt/geom/Point2D.java.i
data/src/share/native/com/sun/media/sound/DirectAudio.h.i
-data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive_Stub.java.i
+data/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java.i
+data/src/solaris/doc/sun/man/man1/ja/jhat.1.i
data/src/share/classes/com/sun/media/sound/FastShortMessage.java.i
data/src/share/classes/java/security/cert/X509CRL.java.i
data/src/share/classes/java/rmi/server/LogStream.java.i
-data/test/java/rmi/registry/readTest/readTest.java.i
+data/src/share/classes/javax/imageio/plugins/jpeg/package.html.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystem.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java.i
+data/src/share/demo/jvmti/heapViewer/heapViewer.c.i
data/test/java/beans/VetoableChangeSupport/Test4092906.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpCounter64.java.i
-data/src/linux/doc/man/ja/xjc.1.i
+data/src/share/classes/java/rmi/activation/ActivationGroupID.java.i
+data/src/share/classes/javax/swing/JFrame.java.i
data/make/sun/rmi/registry/Makefile.i
data/test/java/security/cert/CertPathValidator/targetConstraints/sun2labs1.cer.i
data/test/java/util/Formatter/BasicByteObject.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformInterestedHost.java.i
+data/src/share/classes/javax/management/StandardMBean.java.i
data/src/share/classes/sun/text/resources/FormatData_en_US.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/file.gif.i
data/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt.i
-data/test/com/sun/jdi/ArrayRangeTest.java.i
-data/src/share/classes/com/sun/jdi/Field.java.i
+data/src/macosx/classes/com/apple/laf/AquaSplitPaneUI.java.i
data/src/share/demo/applets/WireFrame/models/cube.obj.i
data/test/java/awt/Focus/NonFocusableWindowTest/Test.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMBean.java.i
+data/make/tools/CharsetMapping/MacDingbat.map.i
data/test/java/io/Serializable/GetField/Write.java.i
data/src/share/classes/javax/management/NotificationFilter.java.i
data/src/share/classes/sun/print/resources/serviceui_fr.properties.i
data/make/tools/CharsetMapping/MacThai.map.i
-data/src/share/sample/nio/server/README.txt.i
+data/test/java/util/ResourceBundle/Test4300693RB.java.i
data/test/java/io/Serializable/proxy/replace/Resolved.java.i
data/src/solaris/classes/sun/awt/X11FontManager.java.i
-data/test/java/lang/instrument/ilib/ClassDump.java.i
-data/src/share/classes/com/sun/tools/jdi/ConnectorImpl.java.i
+data/test/java/util/Locale/data/deflocale.rhel4.i
+data/src/share/classes/javax/swing/colorchooser/SlidingSpinner.java.i
+data/src/share/native/java/lang/fdlibm/src/s_cbrt.c.i
data/src/share/classes/sun/java2d/opengl/OGLRenderer.java.i
data/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Close.java.i
data/test/sun/net/www/protocol/jar/foo2.jar.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/SetInstance.java.i
-data/test/java/security/KeyRep/RSA.pre.1.5.key.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/NetMaskImpl.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy34.i
data/test/java/util/ResourceBundle/Bug6287579.java.i
data/test/javax/management/modelmbean/ModelMBeanInfoSupport/logging.properties.i
-data/src/share/classes/com/sun/beans/decoder/MethodElementHandler.java.i
+data/src/macosx/native/sun/awt/awt.m.i
+data/src/share/classes/javax/sql/ConnectionEvent.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h.i
data/test/java/util/TimeZone/TimeZoneDatePermissionCheck.java.i
-data/src/share/demo/jvmti/waiters/waiters.cpp.i
+data/test/java/io/Serializable/superclassDataLoss/A.java.i
data/test/javax/swing/JComboBox/6632953/bug6632953.java.i
data/src/solaris/classes/sun/nio/ch/SolarisAsynchronousChannelProvider.java.i
data/test/java/nio/charset/Charset/NullCharsetName.java.i
-data/make/tools/CharsetMapping/MacGreek.map.i
-data/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/Module.java.i
data/test/java/rmi/reliability/benchmark/bench/TextReporter.java.i
data/src/share/classes/java/text/DontCareFieldPosition.java.i
data/src/solaris/classes/sun/awt/X11/XMenuBarPeer.java.i
-data/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java.i
-data/test/java/lang/StackTraceElement/PublicConstructor.java.i
+data/make/java/net/Makefile.i
+data/src/share/classes/sun/util/resources/CalendarData_zh.properties.i
+data/src/macosx/classes/sun/font/CCharToGlyphMapper.java.i
data/src/share/classes/java/security/cert/PKIXCertPathChecker.java.i
data/make/java/hpi/hpi_common.gmk.i
data/test/javax/swing/SwingWorker/6432565/bug6432565.java.i
-data/test/tools/launcher/Makefile.SolarisRunpath.i
-data/test/java/beans/Introspector/Test4144543.java.i
-data/src/share/classes/sun/text/resources/CollationData_de.java.i
+data/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java.i
+data/test/java/util/Locale/Bug4152725.java.i
+data/test/java/net/ipv6tests/TcpTest.java.i
data/src/share/classes/javax/crypto/CryptoPermission.java.i
-data/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java.i
data/src/windows/native/sun/java2d/d3d/D3DVertexCacher.h.i
data/src/share/classes/sun/awt/SunGraphicsCallback.java.i
-data/src/solaris/native/sun/awt/Xrandr.h.i
-data/src/solaris/sample/dtrace/hotspot/class_loading_stat.d.i
-data/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java.i
-data/test/java/util/WeakHashMap/ZeroInitCap.java.i
+data/src/share/classes/javax/naming/InitialContext.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ja.properties.i
+data/make/tools/CharsetMapping/EUC_CN.map.i
+data/test/sun/net/sdp/ProbeIB.java.i
data/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericStreamCipher.java.i
data/src/share/demo/nbproject/jfc/SwingApplet/build.properties.i
data/src/share/native/java/lang/fdlibm/src/e_scalb.c.i
data/src/share/native/sun/awt/image/jpeg/jdsample.c.i
data/test/sun/java2d/DirectX/StrikeDisposalCrashTest/StrikeDisposalCrashTest.java.i
+data/src/share/classes/sun/print/resources/duplex.png.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.properties.i
data/test/java/nio/file/WatchService/grantDirAndTree.policy.i
data/test/java/beans/PropertyEditor/TestShortType.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/AgreementMethod.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM864.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuUI.java.i
data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java.i
+data/src/share/native/sun/management/GarbageCollectorImpl.c.i
data/make/sun/cmm/lcms/FILES_c_unix.gmk.i
data/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java.i
-data/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java.i
data/make/netbeans/common/jtreg-sources.ent.i
data/src/share/classes/sun/nio/cs/HistoricallyNamedCharset.java.i
data/test/java/net/URL/RestoreURL.java.i
data/src/share/classes/com/sun/jdi/LocalVariable.java.i
data/src/share/classes/sun/text/resources/FormatData_ro.java.i
data/test/java/awt/Graphics2D/DrawString/DrawStrSuper.java.i
-data/src/share/native/sun/java2d/loops/IntArgbBm.c.i
-data/src/share/classes/java/lang/NoSuchFieldException.java.i
+data/src/share/classes/sun/tools/jconsole/Version.java.template.i
+data/test/java/lang/management/ThreadMXBean/ThreadExecutionSynchronizer.java.i
+data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_KW.properties.i
-data/src/share/native/sun/awt/image/jpeg/jpeglib.h.i
data/test/javax/management/MBeanServerFactory/NamedMBeanServerTest.java.i
-data/make/java/util/FILES_java.gmk.i
+data/test/demo/jvmti/hprof/HeapAllTest.java.i
data/src/share/classes/com/sun/crypto/provider/DESedeWrapCipher.java.i
data/make/sun/jpeg/FILES_c.gmk.i
data/src/solaris/classes/sun/awt/X11GraphicsDevice.java.i
data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveMgr.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_StrokeBorder.java.i
data/src/share/classes/com/sun/beans/decoder/JavaElementHandler.java.i
+data/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java.i
data/src/share/native/sun/security/ec/impl/mp_gf2m.c.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/OutputFileGenerator.java.i
data/test/java/lang/String/RegionMatches.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishCipher.java.i
-data/src/share/native/java/lang/Shutdown.c.i
-data/test/java/io/Serializable/evolution/RenamePackage/run.sh.i
-data/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh.i
+data/test/sun/invoke/util/ValueConversionsTest.java.i
data/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java.i
data/test/java/math/BigInteger/TestValueExact.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java.i
-data/test/java/beans/XMLEncoder/java_awt_MenuShortcut.java.i
+data/src/share/classes/java/awt/Shape.java.i
+data/src/share/classes/java/nio/charset/CoderMalfunctionError.java.i
+data/src/share/classes/javax/swing/text/LayoutQueue.java.i
+data/src/macosx/native/jobjc/extract_classes.pl.i
data/src/share/classes/java/rmi/activation/package.html.i
data/test/java/security/BasicPermission/MixedBasicPermissions.java.i
-data/src/share/classes/javax/print/attribute/standard/JobKOctets.java.i
-data/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java.i
+data/test/sun/security/pkcs11/tls/masterdata.txt.i
+data/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java.i
data/test/sun/tools/jstat/lineCounts3.awk.i
-data/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BezierControlPoint.java.i
-data/src/share/classes/sun/applet/AppletImageRef.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/DoFinalReturnLen.java.i
+data/src/share/classes/sun/tools/tree/NewArrayExpression.java.i
+data/make/mkdemo/jvmti/heapViewer/Makefile.i
data/src/share/classes/com/sun/jdi/VirtualMachine.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Encoder.java.i
-data/src/share/classes/com/sun/servicetag/SunConnection.java.i
-data/src/share/classes/sun/security/jgss/wrapper/Krb5Util.java.i
-data/src/share/native/sun/java2d/loops/IntArgbBm.h.i
+data/src/share/native/sun/java2d/cmm/lcms/lcms2.h.i
+data/src/share/classes/sun/text/resources/FormatData_fr_BE.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/Basics.java.i
+data/test/com/sun/crypto/provider/TLS/TestPRF12.java.i
data/src/share/classes/sun/io/ByteToCharMS936.java.i
data/src/share/classes/javax/swing/text/AttributeSet.java.i
data/src/share/classes/sun/misc/Regexp.java.i
data/test/javax/management/MBeanServer/MBeanExceptionTest.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties.i
data/test/java/awt/font/Threads/FontThread.java.i
data/src/share/classes/java/util/logging/Filter.java.i
-data/make/jpda/Makefile.i
+data/src/share/classes/com/sun/jndi/ldap/NamingEventNotifier.java.i
data/src/windows/native/sun/java2d/d3d/D3DContext.cpp.i
+data/src/share/classes/sun/util/resources/LocaleNames_pl.properties.i
data/make/sun/jdga/mapfile-vers.i
data/src/share/classes/javax/swing/text/StyledEditorKit.java.i
data/make/tools/CharsetMapping/MacUkraine.map.i
-data/src/share/native/java/lang/fdlibm/src/w_lgamma_r.c.i
data/src/share/classes/javax/management/openmbean/ArrayType.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/SetName.java.i
+data/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java.i
data/test/sun/security/mscapi/ShortRSAKey512.sh.i
-data/make/tools/src/build/tools/javazic/GenDoc.java.i
+data/src/share/classes/sun/jvmstat/monitor/StringMonitor.java.i
data/src/share/classes/sun/security/ssl/ProtocolVersion.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/BitFile.java.i
-data/test/java/util/Locale/Bug4184873_id.i
+data/src/share/classes/com/sun/jdi/request/EventRequest.java.i
+data/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java.i
data/make/netbeans/j2se/README.i
-data/src/share/classes/sun/io/CharToByteUnicodeBigUnmarked.java.i
+data/src/windows/classes/sun/awt/windows/TranslucentWindowPainter.java.i
data/test/java/io/Serializable/survivePrematureClose/SurvivePrematureClose.java.i
data/make/tools/CharsetMapping/ISO_8859_5.map.i
+data/src/solaris/native/common/jdk_util_md.h.i
+data/src/share/classes/java/util/zip/CRC32.java.i
data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.html.i
-data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties.i
data/src/share/classes/java/nio/charset/CodingErrorAction.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/crc32.java.i
+data/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java.i
data/src/share/classes/com/sun/crypto/provider/OutputFeedback.java.i
data/test/java/awt/List/ScrollOutside/ScrollOut.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java.i
+data/src/solaris/classes/sun/nio/ch/KQueue.java.i
+data/test/javax/swing/JViewport/7107099/bug7107099.java.i
data/make/tools/CharsetMapping/IBM1142.c2b.i
data/src/windows/native/sun/windows/awt_DrawingSurface.h.i
-data/src/share/classes/sun/misc/JarIndex.java.i
+data/src/share/classes/java/security/spec/ECFieldF2m.java.i
data/src/share/native/java/lang/fdlibm/src/e_atan2.c.i
-data/src/share/classes/sun/nio/cs/ext/IBM1122.java.i
+data/src/windows/native/sun/windows/awt.h.i
data/make/tools/CharsetMapping/IBM280.nr.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ResultLogConfig.java.i
data/src/share/classes/java/nio/charset/spi/package.html.i
@@ -7240,93 +7563,100 @@ data/src/share/classes/sun/reflect/UnsafeFieldAccessorImpl.java.i
data/src/windows/classes/sun/nio/ch/Iocp.java.i
data/src/share/classes/com/sun/jmx/snmp/ThreadContext.java.i
data/src/share/classes/java/security/Certificate.java.i
+data/src/bsd/doc/man/javaws.1.i
data/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java.i
-data/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllNotesOff.java.i
data/test/java/nio/file/Path/delete_on_close.sh.i
-data/src/share/classes/javax/naming/spi/package.html.i
-data/test/java/awt/TextArea/TextAreaCursorTest/HoveringAndDraggingTest.html.i
+data/src/windows/native/sun/java2d/windows/RegistryKey.h.i
+data/src/windows/classes/java/net/DefaultDatagramSocketImplFactory.java.i
data/test/com/sun/jdi/sde/onion/pickle/Mangle.java.i
data/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h.i
-data/src/share/classes/com/sun/jdi/ShortType.java.i
-data/test/java/lang/reflect/Method/InheritedInterfaceMethods.java.i
+data/src/share/classes/java/sql/ParameterMetaData.java.i
+data/test/java/net/ResponseCache/file2.1.i
data/src/share/native/sun/java2d/cmm/lcms/cmsio1.c.i
+data/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java.i
data/test/javax/security/auth/kerberos/ServicePermissionTest.java.i
data/src/share/classes/sun/rmi/rmic/resources/rmic_ja.properties.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java.i
+data/src/macosx/classes/com/apple/laf/AquaImageFactory.java.i
data/test/java/io/Serializable/classDescFlagConflict/Foo.java.i
data/src/share/native/java/lang/fdlibm/include/fdlibm.h.i
data/src/share/classes/sun/font/PhysicalStrike.java.i
data/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStore.java.i
data/src/share/classes/sun/jkernel/DownloadManager.java.i
data/src/share/native/java/net/Inet6Address.c.i
-data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java.i
-data/test/java/beans/Introspector/memory/SimpleClassLoader.java.i
+data/src/share/classes/sun/font/FontUtilities.java.i
+data/src/macosx/native/sun/awt/OSVersion.h.i
data/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java.i
data/test/java/nio/channels/DatagramChannel/SRTest.java.i
+data/make/apple/applescript/Makefile.i
data/src/solaris/doc/sun/man/man1/jvisualvm.1.i
data/src/share/classes/javax/security/auth/callback/NameCallback.java.i
-data/src/share/classes/sun/io/ByteToCharMacTurkish.java.i
-data/make/java/nio/addNotices.sh.i
-data/test/org/openjdk/jigsaw/services/view.sh.i
-data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html.i
+data/src/windows/classes/sun/security/krb5/internal/tools/KinitOptions.java.i
+data/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
+data/src/windows/classes/sun/awt/windows/WColor.java.i
+data/test/tools/launcher/ChangeDataModel.java.i
data/src/share/classes/java/security/spec/AlgorithmParameterSpec.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/RetrievalMethod.java.i
-data/src/share/demo/jfc/Metalworks/Metalworks.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_sys.c.i
+data/src/share/classes/java/io/LineNumberReader.java.i
+data/test/sun/util/resources/Locale/Bug4965260.java.i
data/make/tools/CharsetMapping/IBM500.nr.i
data/test/java/util/zip/DeflateIn_InflateOut.java.i
data/test/sun/security/provider/PolicyFile/CanonPath.java.i
data/src/share/classes/java/security/MessageDigestSpi.java.i
data/test/sun/security/provider/SecureRandom/SelfSeed.java.i
data/src/share/classes/sun/font/CreatedFontTracker.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java.i
-data/src/share/classes/sun/tools/jconsole/InternalDialog.java.i
+data/src/share/native/java/lang/fdlibm/src/s_tan.c.i
data/test/javax/management/notification/BroadcasterSupportDeadlockTest.java.i
data/src/share/native/sun/awt/debug/debug_mem.c.i
-data/test/java/net/Socket/TestClose.java.i
+data/src/share/classes/sun/io/CharToByteJIS0212.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadCpuTimeMonitoring.java.i
-data/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java.i
data/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/ReferenceNotInitializedException.java.i
data/src/solaris/classes/sun/awt/X11/XMenuPeer.java.i
data/src/share/classes/sun/security/jgss/spi/GSSCredentialSpi.java.i
data/src/share/classes/sun/tools/tree/AssignMultiplyExpression.java.i
data/src/share/native/sun/java2d/loops/TransformHelper.c.i
+data/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java.i
data/test/com/sun/jdi/connect/spi/ListConnectors.java.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB555.png.i
-data/src/share/classes/sun/nio/cs/Unicode.java.i
+data/test/java/lang/instrument/IsModifiableClassApp.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsBorders.java.i
-data/test/sun/nio/cs/NIOJISAutoDetectTest.java.i
+data/src/windows/native/java/net/SocketInputStream.c.i
data/src/share/classes/com/sun/tracing/dtrace/NameAttributes.java.i
data/src/share/classes/java/security/SignatureSpi.java.i
-data/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java.i
-data/src/share/classes/javax/sound/sampled/AudioFileFormat.java.i
+data/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
+data/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java.i
data/src/share/classes/javax/rmi/ssl/SslRMIClientSocketFactory.java.i
data/src/share/classes/com/sun/security/auth/callback/TextCallbackHandler.java.i
data/src/share/native/sun/awt/image/jpeg/jfdctfst.c.i
data/src/share/classes/javax/management/InvalidAttributeValueException.java.i
-data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider.i
+data/test/java/util/Locale/data/deflocale.input.i
data/src/share/classes/javax/print/attribute/standard/package.html.i
-data/test/java/security/cert/CertificateFactory/SlowStream.java.i
+data/src/share/classes/java/lang/reflect/package-info.java.i
data/test/java/awt/Focus/FrameJumpingToMouse/FrameJumpingToMouse.java.i
data/src/share/classes/com/sun/java/util/jar/pack/Fixups.java.i
data/test/java/awt/regtesthelpers/process/ProcessCommunicator.java.i
data/src/share/native/java/util/zip/zip_util.h.i
data/src/share/classes/javax/smartcardio/TerminalFactory.java.i
data/src/share/classes/java/security/AllPermission.java.i
+data/src/macosx/classes/com/apple/resources/MacOSXResourceBundle.java.i
data/src/share/classes/java/lang/management/RuntimeMXBean.java.i
+data/src/share/classes/javax/security/auth/login/AccountLockedException.java.i
data/src/windows/native/sun/net/www/protocol/http/NTLMAuthSequence.c.i
data/src/share/back/StackFrameImpl.h.i
data/src/share/classes/com/sun/beans/decoder/ShortElementHandler.java.i
+data/src/solaris/classes/sun/awt/X11/XWrapperBase.java.i
data/src/share/classes/com/sun/media/sound/SoftAudioPusher.java.i
data/make/tools/classanalyzer/nbproject/project.xml.i
+data/src/bsd/doc/man/ja/jsadebugd.1.i
data/src/share/classes/sun/tools/jconsole/MaximizableInternalFrame.java.i
data/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.i
data/make/tools/swing-beans/beaninfo/images/JFrameMono32.gif.i
data/src/share/classes/java/awt/datatransfer/DataFlavor.java.i
data/test/java/util/Collections/ReplaceAll.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReaderSpi.java.i
-data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c.i
-data/test/java/lang/Class/forName/classes/right-square.class.i
+data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.i
data/test/com/sun/jdi/MonitorFrameInfo.java.i
data/test/java/security/BasicPermission/SerialVersion.1.2.1.i
data/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventListener.java.i
@@ -7334,49 +7664,59 @@ data/test/sun/security/tools/keytool/KeyToolTest.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c.i
data/src/share/classes/sun/reflect/AccessorGenerator.java.i
data/src/share/classes/com/sun/media/sound/DirectAudioDeviceProvider.java.i
+data/src/share/classes/javax/print/event/PrintEvent.java.i
data/test/sun/net/www/http/HttpClient/OpenServer.policy.i
data/src/share/native/java/util/zip/zlib-1.2.3/zconf.h.i
-data/test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java.i
data/test/com/sun/jdi/ZZZcleanup.sh.i
-data/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java.i
+data/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java.i
+data/src/macosx/native/sun/awt/ApplicationDelegate.m.i
data/src/share/classes/javax/swing/text/html/HTML.java.i
data/make/java/zip/FILES_c.gmk.i
data/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java.i
data/src/solaris/classes/sun/awt/X11/XConstants.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java.i
-data/test/java/lang/Runtime/exec/ConcurrentRead.java.i
-data/make/docs/Makefile.i
-data/src/linux/doc/man/ja/serialver.1.i
+data/src/share/classes/sun/java2d/pisces/Dasher.java.i
+data/src/macosx/native/com/apple/laf/AquaNativeResources.m.i
+data/src/bsd/doc/man/ja/native2ascii.1.i
+data/src/solaris/classes/sun/awt/X11/InfoWindow.java.i
+data/src/share/classes/javax/print/attribute/standard/DialogTypeSelection.java.i
+data/src/share/classes/javax/swing/table/TableCellRenderer.java.i
+data/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java.i
data/src/share/classes/javax/swing/event/HyperlinkListener.java.i
data/src/solaris/doc/sun/man/man1/ja/javah.1.i
data/src/share/classes/java/util/EmptyStackException.java.i
-data/src/share/classes/java/awt/doc-files/modal-example3.gif.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSeparatorUI.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c.i
+data/test/java/io/Serializable/enum/missingConstant/Read.java.i
+data/test/javax/swing/JToolBar/4247996/bug4247996.java.i
data/src/share/classes/javax/print/PrintService.java.i
-data/src/share/classes/sun/security/provider/certpath/X509CertificatePair.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/IBDemo.java.i
+data/src/share/demo/nbproject/management/VerboseGC/nbproject/netbeans-targets.xml.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java.i
+data/test/java/io/File/Create.java.i
data/src/share/classes/com/sun/jndi/ldap/SimpleClientId.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserColor32.gif.i
-data/src/share/demo/nbproject/jfc/TransparentRuler/build.xml.i
+data/src/solaris/native/sun/security/smartcardio/MUSCLE/COPYING.i
data/src/share/classes/com/sun/beans/finder/MethodFinder.java.i
-data/src/share/classes/sun/java2d/pipe/RenderQueue.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java.i
data/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributes.java.i
data/src/share/classes/sun/management/ThreadImpl.java.i
+data/src/share/classes/sun/tools/java/BinaryMember.java.i
data/src/share/native/sun/font/layout/OpenTypeLayoutEngine.h.i
-data/test/java/net/ResponseCache/file2.1.i
-data/test/java/io/charStreams/StringConvert.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplds4.so.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java.i
data/src/share/classes/sun/tools/jconsole/ThreadTab.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_es.properties.i
data/make/mkdemo/jfc/Java2D/Makefile.i
-data/src/share/classes/sun/tools/jstat/SyntaxException.java.i
+data/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ColorSpaceCvtCrashTest/ColorSpaceCvtCrashTest.java.i
data/test/java/math/BigInteger/ExtremeShiftingTests.java.i
data/src/share/demo/applets/MoleculeViewer/models/benzene.xyz.i
-data/src/share/native/java/lang/fdlibm/src/w_acos.c.i
-data/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh.i
-data/src/share/classes/com/sun/media/sound/SimpleSoundbank.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ko_KR.properties.i
+data/src/solaris/classes/sun/awt/X11/java-icon32.png.i
data/src/share/classes/com/sun/jndi/ldap/LdapRequest.java.i
data/src/share/classes/java/awt/font/TextLayout.java.i
+data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.i
data/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c.i
+data/src/bsd/doc/man/orbd.1.i
data/src/share/classes/java/io/Serializable.java.i
data/test/java/util/ResourceBundle/Control/ExpirationTest.java.i
data/src/share/classes/sun/management/counter/LongArrayCounter.java.i
@@ -7384,60 +7724,62 @@ data/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java
data/test/sun/java2d/DirectX/InfiniteValidationLoopTest/InfiniteValidationLoopTest.java.i
data/src/share/classes/sun/awt/resources/awt_zh_CN.properties.i
data/src/share/classes/sun/text/resources/FormatData_es_DO.java.i
-data/test/java/beans/XMLEncoder/java_sql_Time.java.i
data/src/share/classes/java/rmi/MarshalException.java.i
-data/src/share/classes/javax/crypto/spec/package.html.i
-data/test/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionTimeOutTests.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/TestEnvironment.java.i
data/src/share/classes/java/util/ServiceConfigurationError.java.i
-data/src/share/classes/sun/management/CompilerThreadStat.java.i
+data/src/solaris/classes/sun/java2d/opengl/GLXGraphicsConfig.java.i
data/src/share/classes/sun/io/CharToByteCp1122.java.i
data/src/share/classes/sun/net/www/protocol/https/Handler.java.i
data/make/tools/swing-beans/beaninfo/images/BorderColor16.gif.i
-data/src/share/classes/javax/imageio/spi/ImageReaderSpi.java.i
data/src/share/classes/sun/security/pkcs11/Session.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Des.java.i
data/test/com/sun/crypto/provider/KeyAgreement/DHGenSecretKey.java.i
-data/test/java/lang/ThreadLocal/Basic.java.i
+data/test/java/util/zip/pkware123456789012345.zip.i
data/src/windows/native/java/io/WinNTFileSystem_md.c.i
+data/src/share/classes/javax/swing/DefaultDesktopManager.java.i
data/test/java/rmi/server/serverStackTrace/Impl1_Stub.java.i
+data/src/solaris/native/sun/awt/awt_Scrollbar.c.i
data/src/share/classes/java/beans/Introspector.java.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/Bug6571733.java.i
data/test/java/net/URLConnection/ZeroContentLength.java.i
data/test/javax/swing/JColorChooser/Test6559154.java.i
-data/test/sun/security/mscapi/KeyStoreCompatibilityMode.java.i
-data/test/javax/script/ProviderTest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/UnrecognizedOptionException.java.i
data/src/share/classes/java/io/StringReader.java.i
+data/src/share/back/eventFilter.c.i
data/src/share/classes/sun/io/ByteToCharJIS0201.java.i
data/test/com/sun/jdi/RepStep.java.i
-data/src/share/classes/javax/swing/InputMap.java.i
+data/src/share/classes/sun/jvmstat/monitor/VmIdentifier.java.i
data/src/share/classes/javax/management/MBeanAttributeInfo.java.i
data/src/windows/classes/sun/nio/ch/FileDispatcherImpl.java.i
data/src/share/native/sun/awt/image/jpeg/jdtrans.c.i
-data/src/share/classes/sun/misc/resources/Messages_zh_CN.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Result.java.i
data/src/share/classes/javax/sql/DataSource.java.i
data/src/share/classes/javax/swing/text/doc-files/paragraph.gif.i
data/src/share/classes/javax/net/ssl/ManagerFactoryParameters.java.i
data/src/share/classes/sun/awt/image/ImageFetchable.java.i
-data/src/share/classes/sun/io/CharToByteCp437.java.i
-data/src/solaris/classes/sun/java2d/xr/XIDGenerator.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngineId.java.i
+data/src/windows/native/sun/windows/awt_ole.h.i
+data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.java.i
+data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Encoder.java.i
data/test/sun/security/provider/certpath/CertId/interCA.der.i
-data/src/share/classes/javax/imageio/ImageReadParam.java.i
+data/make/tools/CharsetMapping/IBM297.map.i
+data/src/share/classes/java/awt/Button.java.i
data/src/share/classes/com/sun/imageio/plugins/common/SubImageInputStream.java.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/SetVariable.java.i
data/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass.java.i
data/test/java/beans/XMLDecoder/spec/TestJava.java.i
data/src/share/classes/com/sun/tools/jconsole/package.html.i
-data/test/sun/nio/cs/OLD/X11GB2312_OLD.java.i
+data/src/share/classes/com/sun/media/sound/AiffFileWriter.java.i
data/test/java/lang/management/GarbageCollectorMXBean/GcInfoCompositeType.java.i
data/test/sun/security/pkcs11/PKCS11Test.java.i
data/make/sun/text/FILES_java.gmk.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDSource.java.i
data/test/javax/management/eventService/PublishTest.java.i
-data/src/windows/native/sun/windows/awt_Brush.cpp.i
+data/test/java/io/Serializable/subclass/Allow.policy.i
data/src/share/classes/sun/io/ByteToCharCp1383.java.i
-data/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java.i
data/test/sun/misc/Cleaner/exitOnThrow.sh.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/ObjectInspector.java.i
data/test/com/sun/jdi/ModificationWatchpoints.java.i
data/test/java/lang/management/ManagementFactory/StateTest.java.i
data/src/share/classes/java/awt/geom/EllipseIterator.java.i
@@ -7447,6 +7789,7 @@ data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Util.java.i
data/test/sun/nio/cs/OLD/IBM942C_OLD.java.i
data/src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java.i
data/test/java/nio/channels/SocketChannel/AsyncCloseChannel.java.i
+data/src/share/classes/sun/net/httpserver/HttpsServerImpl.java.i
data/make/java/verify/reorder-sparcv9.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c.i
data/test/java/awt/List/SetFontTest/SetFontTest.html.i
@@ -7454,52 +7797,50 @@ data/src/share/classes/com/sun/jndi/ldap/LdapAttribute.java.i
data/src/share/classes/com/sun/nio/sctp/Association.java.i
data/test/sun/security/tools/jarsigner/AlgOptions.jar.i
data/test/java/lang/Runtime/shutdown/ShutdownHooks.java.i
-data/src/share/classes/org/openjdk/jigsaw/package-info.java.i
+data/src/share/demo/nbproject/jfc/Metalworks/nbproject/jdk.xml.i
data/test/sun/security/pkcs11/rsa/TestKeyFactory.java.i
-data/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java.i
data/test/java/beans/PropertyChangeSupport/TestEquals.java.i
-data/src/share/native/sun/awt/image/jpeg/jidctfst.c.i
data/src/solaris/classes/sun/awt/X11/XAWTLookAndFeel.java.i
+data/src/share/sample/scripting/scriptpad/nbproject/file-targets.xml.i
data/test/javax/management/ObjectName/ValueOfTest.java.i
-data/src/share/classes/java/nio/channels/MulticastChannel.java.i
-data/src/share/classes/sun/security/jca/ServiceId.java.i
-data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java.i
-data/src/share/classes/com/sun/tools/jdi/LongValueImpl.java.i
-data/src/share/classes/com/sun/rowset/internal/XmlResolver.java.i
-data/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java.i
+data/src/share/classes/sun/text/resources/FormatData_ar_IQ.java.i
+data/src/share/classes/sun/util/resources/CalendarData_in_ID.properties.i
+data/make/sun/tracing/dtrace/mapfile-vers.i
+data/make/sun/rmi/rmi/Makefile.i
+data/make/docs/CORE_PKGS.gmk.i
data/test/java/nio/charset/Charset/RegisteredCharsets.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/DimensionMapper.java.i
-data/src/share/classes/sun/nio/cs/ext/JISAutoDetect.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_ko.properties.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread_Stub.java.i
data/src/share/classes/javax/sql/ConnectionPoolDataSource.java.i
data/src/share/native/sun/security/ec/impl/mpi.h.i
-data/make/sun/rmi/oldtools/FILES_java.gmk.i
+data/src/share/classes/sun/net/NetProperties.java.i
+data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h.i
data/src/share/classes/java/awt/event/HierarchyBoundsListener.java.i
data/make/java/redist/Makefile.i
data/src/share/demo/applets/SortDemo/SortItem.java.i
-data/src/share/classes/com/sun/media/sound/RealTimeSequencer.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html.i
data/test/javax/security/auth/Subject/Synch.java.i
-data/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy.i
+data/test/java/io/DataInputStream/ReadFully.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java.i
data/test/java/io/Serializable/illegalHandle/Test.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathTableMetaImpl.java.i
+data/src/share/classes/org/ietf/jgss/GSSCredential.java.i
data/test/javax/management/notification/NotifInfoTest.java.i
data/test/java/security/KeyRep/RSA.1.5.key.i
-data/src/share/classes/sun/nio/cs/ISO_8859_2.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java.i
+data/test/java/math/BigInteger/CompareToTests.java.i
data/src/share/classes/javax/swing/text/Segment.java.i
-data/test/sun/nio/cs/ISCIITest.java.i
-data/test/javax/swing/JTable/6263446/bug6263446.java.i
-data/test/sun/util/calendar/Bug6653944.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/Token.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java.i
data/test/com/sun/net/httpserver/bugs/B6529200.java.i
-data/src/share/classes/com/sun/media/sound/SF2LayerRegion.java.i
+data/src/share/classes/javax/crypto/spec/DHPrivateKeySpec.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/sortDown.png.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/ParseException.java.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy.i
+data/test/com/sun/tools/attach/PermissionTests.sh.i
+data/make/tools/CharsetMapping/IBM1383.map.i
data/src/share/native/java/lang/fdlibm/src/s_finite.c.i
-data/src/share/classes/javax/print/event/package.html.i
+data/src/share/classes/com/sun/tracing/ProbeName.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c.i
data/src/share/demo/jfc/TableExample/JDBCAdapter.java.i
+data/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java.i
data/src/share/classes/javax/swing/BorderFactory.java.i
data/src/solaris/classes/sun/awt/X11/XPopupMenuPeer.java.i
data/make/common/Defs-windows.gmk.i
@@ -7509,27 +7850,26 @@ data/make/tools/src/build/tools/dtdbuilder/DTDParser.java.i
data/src/share/classes/sun/io/CharToByteMS950_HKSCS.java.i
data/src/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java.i
data/src/share/native/sun/java2d/loops/ByteIndexed.h.i
-data/src/share/classes/java/awt/MenuItem.java.i
+data/src/share/classes/sun/util/resources/CalendarData_en_IE.properties.i
data/test/java/nio/channels/SocketChannel/Write.java.i
data/make/tools/CharsetMapping/IBM1097.map.i
-data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/Constants.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ProgramChange.java.i
data/src/share/classes/sun/nio/cs/ext/IBM284.java.i
data/src/share/native/sun/font/layout/SubstitutionLookups.cpp.i
data/test/com/sun/jdi/sde/TemperatureTable.sde.i
data/src/share/classes/java/awt/MultipleGradientPaintContext.java.i
data/test/sun/security/x509/AVA/BadName.java.i
data/src/share/classes/javax/naming/Name.java.i
-data/test/sun/management/windows/README.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java.i
data/src/share/demo/jvmti/hprof/hprof_monitor.h.i
-data/test/org/openjdk/jigsaw/ModuleInfoBuilder.java.i
-data/test/java/lang/Throwable/LocalizedMessage.java.i
+data/src/share/demo/java2d/J2DBench/README.i
+data/src/share/classes/javax/swing/text/rtf/RTFAttributes.java.i
data/src/share/classes/javax/swing/JTextArea.java.i
-data/test/com/sun/jdi/RefTypes.java.i
+data/src/solaris/classes/sun/awt/motif/MCanvasPeer.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer.java.i
data/test/java/beans/Introspector/4520754/FooBar.java.i
-data/src/share/native/sun/awt/libpng/pngwio.c.i
data/src/share/classes/sun/java2d/DisposerRecord.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png.i
+data/src/share/classes/java/rmi/package.html.i
data/test/javax/swing/JPopupMenu/6495920/bug6495920.java.i
data/src/share/demo/jvmti/compiledMethodLoad/compiledMethodLoad.c.i
data/test/com/sun/servicetag/TestLoadFromXML.java.i
@@ -7541,20 +7881,23 @@ data/src/share/classes/javax/swing/plaf/basic/BasicSpinnerUI.java.i
data/test/java/nio/channels/DatagramChannel/IsBound.java.i
data/test/java/awt/Component/F10TopToplevel/F10TopToplevel.html.i
data/src/share/classes/javax/security/auth/login/LoginContext.java.i
-data/make/sun/jar/Makefile.i
-data/test/java/util/Vector/LastIndexOf.java.i
+data/make/tools/CharsetMapping/IBM420.c2b.i
+data/src/share/classes/javax/swing/event/PopupMenuListener.java.i
data/src/share/classes/sun/security/ssl/SSLServerSocketFactoryImpl.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedMap.java.i
data/src/share/classes/sun/util/resources/CalendarData_sv.properties.i
-data/make/tools/CharsetMapping/IBM856.map.i
+data/test/com/sun/jdi/SuspendNoFlagTest.sh.i
data/test/java/security/AccessControlContext/FailureDebugOption.java.i
+data/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java.i
+data/src/share/classes/sun/dyn/ToGeneric.java.i
data/src/solaris/classes/sun/awt/X11/XDataTransferer.java.i
data/test/com/sun/crypto/provider/Cipher/PBE/PBEParametersTest.java.i
data/src/share/classes/sun/nio/ch/AsynchronousChannelGroupImpl.java.i
data/test/com/sun/management/OperatingSystemMXBean/GetFreePhysicalMemorySize.java.i
data/make/org/ietf/jgss/FILES_java.gmk.i
-data/make/sun/font/reorder-sparcv9.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java.i
+data/test/java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java.i
data/src/solaris/classes/sun/awt/X11/XSystemTrayPeer.java.i
data/test/javax/security/auth/SubjectDomainCombiner/Regression.policy.i
data/test/sun/nio/cs/OLD/X11GBK_OLD.java.i
@@ -7565,17 +7908,20 @@ data/src/share/classes/sun/awt/AWTAutoShutdown.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2steve.cer.i
data/test/java/beans/Introspector/Test4896879.java.i
-data/test/javax/management/query/CustomQueryTest.java.i
+data/src/share/classes/com/sun/media/sound/JSSecurityManager.java.i
+data/src/macosx/native/sun/awt/splashscreen/splashscreen_config.h.i
+data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java.i
data/src/share/classes/sun/java2d/opengl/OGLDrawImage.java.i
data/test/sun/tools/jstat/lineCounts2.awk.i
data/test/com/sun/net/httpserver/Test11.java.i
data/test/sun/security/provider/PolicyParser/BogusGrants.java.i
-data/src/share/native/sun/font/layout/LELanguages.h.i
-data/src/share/demo/applets/SortDemo/example1.html.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java.i
-data/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java.i
+data/test/com/sun/crypto/provider/TLS/prfdata.txt.i
+data/src/share/classes/sun/io/ByteToCharCp1097.java.i
+data/src/windows/native/sun/java2d/d3d/D3DPaints.cpp.i
data/test/java/util/Locale/data/deflocale.jds3.i
data/src/share/classes/sun/security/jgss/krb5/Krb5AcceptCredential.java.i
+data/src/macosx/classes/sun/lwawt/LWTextAreaPeer.java.i
data/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUI.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ClientProvider.java.i
data/src/share/classes/java/dyn/ConstantCallSite.java.i
@@ -7584,53 +7930,53 @@ data/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java.
data/src/share/classes/java/rmi/RMISecurityException.java.i
data/src/share/classes/com/sun/security/sasl/gsskerb/GssKrb5Client.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfigMXBean.java.i
-data/make/tools/swing-beans/SwingBeanInfo.template.i
+data/src/share/classes/sun/util/resources/CurrencyNames_be_BY.properties.i
data/make/tools/swing-beans/beaninfo/images/JRootPaneColor32.gif.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transforms.java.i
+data/test/java/io/Serializable/available/Available.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy31.i
data/test/sun/security/tools/jarsigner/checkusage.sh.i
-data/make/java/main/java/mapfile-sparc.i
-data/src/share/native/sun/awt/libpng/pngrutil.c.i
+data/src/share/classes/sun/java2d/Surface.java.i
data/test/java/lang/Double/NaNInfinityParsing.java.i
-data/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java.i
-data/src/share/classes/com/sun/jmx/namespace/serial/RoutingOnlyProcessor.java.i
+data/test/java/awt/Component/isLightweightCrash/StubPeerCrash.java.i
data/test/java/security/ProtectionDomain/Recursion.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java.i
+data/src/share/classes/javax/management/event/EventReceiver.java.i
data/test/java/net/MulticastSocket/TestDefaults.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java.i
+data/src/share/classes/sun/rmi/rmic/IndentingWriter.java.i
data/test/com/sun/security/auth/login/ConfigFile/IllegalURL.java.i
-data/test/java/lang/String/IndexOfEmptyInEmpty.java.i
+data/src/share/classes/sun/security/util/DerInputBuffer.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/JObjCClassFile.java.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keystore.i
-data/src/share/classes/java/util/concurrent/CancellationException.java.i
-data/test/java/io/File/SetLastModified.java.i
+data/src/linux/doc/man/schemagen.1.i
+data/src/windows/native/sun/nio/ch/FileDispatcher.c.i
data/src/share/classes/sun/print/BackgroundServiceLookup.java.i
-data/src/share/classes/javax/swing/text/rtf/package.html.i
+data/test/com/sun/java/swing/plaf/gtk/Test6635110.java.i
data/test/javax/xml/crypto/dsig/data/signature-x509-crt.xml.i
-data/src/solaris/classes/java/net/DefaultDatagramSocketImplFactory.java.i
+data/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java.i
data/src/windows/classes/sun/font/NativeFont.java.i
-data/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml.i
data/src/share/classes/javax/management/namespace/JMXNamespaceMBean.java.i
data/test/java/nio/channels/SocketChannel/CloseRegisteredChannel.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserColor16.gif.i
data/test/java/security/ProtectionDomain/CheckWhatYouGet.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppOutputStream/NoExceptionOnClose.java.i
-data/test/java/awt/PrintJob/Text/StringWidth.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java.i
+data/test/sun/security/krb5/NegativeNonce.java.i
+data/src/share/classes/java/nio/file/WatchEvent.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/OutputTests.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java.i
data/src/solaris/classes/sun/awt/motif/MGlobalCursorManager.java.i
data/make/sun/jpeg/reorder-i586.i
-data/test/java/awt/FullScreen/SetFSWindow/FSFrame.java.i
+data/src/share/native/sun/security/ec/mp_gf2m.h.i
data/make/com/sun/jndi/rmi/Makefile.i
data/test/java/math/BigDecimal/EqualsTests.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathTableMeta.java.i
-data/test/java/security/Security/removing/RemoveStaticProvider.java.i
data/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh.i
data/src/share/classes/sun/util/resources/LocaleNames_pt_BR.properties.i
data/src/solaris/classes/sun/awt/motif/MChoicePeer.java.i
-data/make/com/sun/demo/jvmti/Makefile.i
-data/test/javax/xml/crypto/dsig/data/envelope.xml.i
-data/src/share/classes/sun/io/CharToByteCp424.java.i
+data/test/sun/pisces/JoinMiterTest.java.i
+data/test/java/lang/System/Available.java.i
+data/test/java/util/Collections/AddAll.java.i
data/test/java/io/Serializable/oldTests/ArrayTest.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c.i
+data/src/share/native/sun/java2d/loops/AlphaMacros.c.i
data/test/javax/management/security/AvoidGetMBeanInfoCallsTest.java.i
data/src/share/classes/sun/security/util/AuthResources_zh_TW.java.i
data/src/share/native/org/openjdk/jigsaw/BootLoader.c.i
@@ -7638,354 +7984,364 @@ data/src/share/demo/jfc/Font2DTest/resources/resource.data.i
data/src/share/classes/sun/net/TelnetOutputStream.java.i
data/src/share/classes/sun/net/www/protocol/netdoc/Handler.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/RemoteObjArrayCalls.java.i
-data/src/share/classes/javax/imageio/spi/IIORegistry.java.i
+data/test/sun/security/ssl/sanity/ciphersuites/CheckCipherSuites.java.i
+data/src/macosx/classes/sun/java2d/MacosxSurfaceManagerFactory.java.i
data/src/share/classes/java/util/jar/JarInputStream.java.i
data/src/share/demo/jvmti/hprof/hprof_frame.h.i
-data/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java.i
+data/test/sun/security/krb5/auto/OkAsDelegate.java.i
data/src/share/classes/javax/imageio/spi/ImageOutputStreamSpi.java.i
data/test/java/text/BreakIterator/MirroredBreakIterator.java.i
data/test/java/io/FileDescriptor/Sharing.java.i
data/src/solaris/classes/sun/awt/windows/ThemeReader.java.i
-data/src/share/classes/sun/io/CharToByteCp860.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_en_SG.properties.i
+data/test/com/sun/jdi/connect/spi/NullTransportService.java.i
data/src/share/sample/scripting/scriptpad/src/resources/Main.js.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest08_ko.properties.in.i
-data/make/tools/CharsetMapping/IBM935.c2b.i
-data/test/tools/jar/JarEntryTime.java.i
+data/test/sun/nio/cs/TestUTF8.java.i
+data/test/javax/naming/ldap/LdapName/CompareToEqualsTests.java.i
data/src/share/classes/java/awt/doc-files/AWTThreadIssues.html.i
-data/src/share/classes/java/text/Collator.java.i
-data/src/solaris/classes/sun/awt/motif/MWindowPeer.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h.i
+data/make/modules/modules.config.i
data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor_Stub.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileSystemProvider.java.i
data/src/share/classes/sun/security/ssl/AppOutputStream.java.i
data/test/com/sun/jdi/LineNumberOnBraceTest.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/prjMcrl.i
-data/test/javax/management/remote/mandatory/notif/RMINotifTest.java.i
data/test/sun/tools/jhat/jmap.bin.i
data/test/javax/management/mxbean/GenericArrayTypeTest.java.i
data/src/share/classes/sun/awt/im/InputMethodPopupMenu.java.i
data/make/sun/rmi/oldtools/Makefile.i
data/src/share/classes/java/awt/TexturePaintContext.java.i
data/test/java/nio/charset/coders/Util.java.i
-data/test/java/io/File/GetParent.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SubjectNameResolver.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java.i
+data/src/share/native/sun/nio/ch/nio.h.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeUI.java.i
data/test/demo/jvmti/gctest/Gctest.java.i
-data/test/javax/management/descriptor/ImmutableDescriptorSerialTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/JavaCup32.png.i
data/src/share/classes/sun/swing/SwingUtilities2.java.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/gzread.c.i
-data/src/windows/native/sun/java2d/windows/RegistryKey.h.i
-data/src/share/native/sun/awt/libpng/pngdebug.h.i
+data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithUnexpectedRID.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecuritySubSystem.java.i
data/src/share/classes/javax/xml/crypto/dsig/Reference.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XTree.java.i
+data/test/sun/java2d/DirectX/TransformedPaintTest/TransformedPaintTest.java.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassWriter.java.i
data/test/tools/launcher/ExecutionEnvironment.java.i
-data/src/windows/native/sun/windows/security_warning_bw.ico.i
-data/src/share/classes/javax/swing/text/TabStop.java.i
+data/src/macosx/native/com/apple/resources/MacOSXResourceBundle.m.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java.i
+data/test/java/net/URL/SpecifyHandler.java.i
data/test/org/openjdk/jigsaw/_PublishedRepository.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/mgrMcrl.i
data/src/linux/doc/man/ja/appletviewer.1.i
data/src/share/classes/javax/swing/undo/doc-files/UndoManager-1.gif.i
data/test/java/awt/Focus/FrameMinimizeTest/FrameMinimizeTest.java.i
-data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java.i
+data/test/java/nio/charset/CharsetEncoder/CanEncode.java.i
data/test/java/lang/Integer/BitTwiddle.java.i
data/make/com/sun/nio/sctp/FILES_c.gmk.i
-data/test/java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java.i
-data/make/tools/generate_break_iterator/Makefile.i
+data/test/sun/net/www/protocol/jar/B5105410.java.i
data/test/java/io/Serializable/resolveClass/deserializeButton/Test.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiSplitPaneUI.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/PerThreadGroupPool.java.i
data/test/sun/security/krb5/auto/IgnoreChannelBinding.java.i
-data/src/share/classes/sun/reflect/UnsafeStaticCharacterFieldAccessorImpl.java.i
+data/src/windows/classes/java/net/PlainSocketImpl.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/Dependence.java.i
data/test/java/awt/Focus/ChoiceFocus/ChoiceFocus.java.i
data/make/com/sun/net/httpserver/Makefile.i
-data/src/share/classes/sun/io/ByteToCharDBCS_ASCII.java.i
-data/src/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java.i
+data/test/java/lang/Character/Scripts.txt.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_BH.properties.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/memory.bat.i
-data/src/share/classes/sun/util/resources/CalendarData_es_US.properties.i
+data/test/java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java.i
data/test/sun/nio/cs/X11CNS11643P1.java.i
data/test/java/lang/annotation/package-info.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedObjectFieldAccessorImpl.java.i
+data/test/com/sun/jdi/ExclusiveBind.java.i
data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemory.java.i
-data/src/share/classes/javax/swing/event/EventListenerList.java.i
-data/src/share/classes/java/rmi/server/Unreferenced.java.i
+data/src/share/classes/java/util/Queue.java.i
+data/src/windows/resource/icons/awt.ico.i
data/test/java/io/Serializable/defaultReadObjectCNFException/DefaultReadObjectCNFException.java.i
data/test/com/sun/jdi/EarlyReturnNegativeTest.java.i
-data/src/share/classes/sun/misc/SharedSecrets.java.i
-data/src/share/classes/javax/swing/JLayeredPane.java.i
+data/src/share/classes/javax/management/AttributeChangeNotification.java.i
data/test/sun/security/util/HostnameMatcher/cert1.crt.i
data/src/share/classes/sun/security/ssl/HandshakeOutStream.java.i
data/test/java/util/prefs/RemoveReadOnlyNode.java.i
-data/src/windows/native/java/net/net_util_md.h.i
+data/src/macosx/native/com/apple/laf/ScreenMenu.h.i
data/test/java/lang/management/ManagementFactory/ValidateOpenTypes.java.i
data/src/share/classes/javax/swing/plaf/TableUI.java.i
data/src/linux/doc/man/jar.1.i
data/src/share/classes/sun/security/krb5/internal/KDCReqBody.java.i
data/src/share/classes/java/awt/color/ICC_Profile.java.i
data/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskFill.c.i
+data/src/macosx/native/sun/osxapp/PropertiesUtilities.m.i
data/src/share/classes/com/sun/tools/jdi/DoubleValueImpl.java.i
data/make/tools/GenerateCharacter/CharacterData01.java.template.i
-data/src/share/classes/java/util/jar/Pack200.java.i
-data/test/javax/swing/plaf/synth/7032791/bug7032791.java.i
-data/test/javax/sound/midi/Gervill/ModelSource/SetTransform.java.i
-data/test/java/awt/font/TextLayout/TestTibetan.java.i
+data/src/share/native/sun/java2d/loops/IntDcm.h.i
+data/test/com/sun/crypto/provider/Cipher/CTR/CounterMode.java.i
+data/test/java/net/CookieHandler/NullUriCookieTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_zh_CN.properties.i
-data/src/share/classes/sun/nio/cs/ext/IBM424.java.i
-data/src/linux/doc/man/jinfo.1.i
-data/src/share/classes/java/awt/AlphaComposite.java.i
+data/src/share/classes/javax/swing/text/TextLayoutStrategy.java.i
+data/src/share/classes/com/sun/management/package.html.i
+data/test/org/openjdk/jigsaw/remrepo.sh.i
+data/src/solaris/doc/sun/man/man1/native2ascii.1.i
+data/test/java/lang/Class/getEnclosingMethod/EnclosingMethodTests.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPlatformView.java.i
data/src/share/classes/com/sun/crypto/provider/CounterMode.java.i
data/src/share/classes/sun/net/www/MimeTable.java.i
-data/test/sun/security/krb5/ParseConfig.java.i
-data/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java.i
-data/src/share/classes/java/awt/geom/QuadIterator.java.i
-data/src/share/classes/sun/java2d/loops/CustomComponent.java.i
+data/src/share/classes/javax/swing/undo/CompoundEdit.java.i
+data/src/share/classes/sun/font/CoreMetrics.java.i
+data/src/share/classes/sun/security/acl/OwnerImpl.java.i
+data/make/tools/CharsetMapping/IBM933.map.i
data/test/sun/tools/jps/vmflags.i
-data/src/share/demo/jvmti/gctest/README.txt.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_MatteBorderUIResource.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageClipping.c.i
data/make/tools/CharsetMapping/IBM948.map.i
-data/src/share/classes/javax/print/attribute/Attribute.java.i
data/src/share/classes/sun/tools/tree/DeclarationStatement.java.i
-data/test/java/rmi/activation/rmidViaInheritedChannel/rmid.security.policy.i
+data/src/solaris/demo/jni/Poller/PollingServer.java.i
data/src/share/classes/javax/management/QueryParser.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/CountInterface.java.i
-data/src/share/classes/sun/text/resources/FormatData_sl.java.i
+data/src/share/classes/javax/swing/AbstractListModel.java.i
+data/test/java/beans/PropertyEditor/TestDoubleClassValue.java.i
data/test/java/lang/ClassLoader/GetDotResource.java.i
data/src/share/classes/com/sun/media/sound/SoftResampler.java.i
-data/test/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in.i
+data/test/sun/security/pkcs11/Cipher/ReinitCipher.java.i
data/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java.i
data/src/share/classes/sun/misc/Service.java.i
data/test/sun/nio/cs/StrCodingBenchmarkUTF8.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsopt.c.i
data/src/share/classes/sun/misc/JavaNetAccess.java.i
-data/test/java/security/Security/Nulls.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java.i
+data/test/sun/security/ssl/etc/unknown_keystore.i
data/src/share/classes/sun/nio/ch/SocketAdaptor.java.i
data/src/share/demo/nbproject/jfc/SampleTree/nbproject/jdk.xml.i
-data/src/share/classes/sun/security/x509/CertificatePolicySet.java.i
+data/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh.i
data/test/javax/management/modelmbean/DefaultDescriptorFieldTest.java.i
data/src/share/demo/nbproject/scripting/jconsole-plugin/build.xml.i
-data/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java.i
+data/test/sun/security/krb5/auto/Context.java.i
data/test/java/net/Inet6Address/B6214234.java.i
data/src/share/demo/nbproject/jfc/FileChooserDemo/build.xml.i
data/src/share/classes/javax/swing/text/package.html.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/ca.key.i
-data/src/share/classes/com/sun/security/jgss/GSSUtil.java.i
+data/src/share/classes/javax/script/ScriptContext.java.i
+data/src/share/native/sun/font/layout/StateTableProcessor.cpp.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Function.java.i
data/src/share/classes/javax/security/auth/callback/ChoiceCallback.java.i
data/src/share/classes/com/sun/security/jgss/ExtendedGSSContext.java.i
data/src/share/classes/java/text/spi/package.html.i
data/src/share/classes/sun/security/tools/TimestampedSigner.java.i
-data/test/sun/security/provider/PolicyFile/nullDomain.java.i
-data/src/share/classes/com/sun/media/sound/SoftLimiter.java.i
-data/src/solaris/native/sun/awt/awt_Component.h.i
+data/src/windows/classes/sun/awt/windows/WScrollPanePeer.java.i
+data/test/java/io/RandomAccessFile/skipBytes/input.txt.i
data/test/java/io/Serializable/evolution/AddedSuperClass/WriteAddedSuperClass.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMeta.java.i
+data/src/share/native/com/sun/media/sound/Utilities.h.i
data/src/share/classes/sun/util/resources/CalendarData_ar.properties.i
-data/test/java/lang/Double/ToHexString.java.i
data/src/share/classes/java/util/regex/MatchResult.java.i
data/test/sun/security/krb5/ServiceNameClone.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java.i
data/test/java/nio/Buffer/Basic-X.java.i
-data/test/com/oracle/security/ucrypto/UcryptoTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/BerEncoder.java.i
data/make/com/sun/rowset/Makefile.i
data/src/solaris/classes/sun/awt/motif/MFramePeer.java.i
+data/src/share/classes/sun/dyn/util/VerifyAccess.java.i
data/src/solaris/classes/sun/print/UnixPrintService.java.i
+data/src/macosx/classes/com/apple/eawt/PrintFilesHandler.java.i
data/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp.i
-data/make/common/shared/Defs-versions.gmk.i
+data/make/common/shared/Compiler.gmk.i
data/src/share/classes/sun/util/resources/LocaleNames_hi.properties.i
-data/test/java/lang/System/SecurityRace.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_LB.properties.i
+data/src/share/classes/javax/swing/text/doc-files/Document-remove.gif.i
+data/src/share/classes/sun/rmi/server/resources/rmid_sv.properties.i
data/src/share/classes/javax/swing/plaf/basic/BasicFileChooserUI.java.i
data/src/share/classes/sun/security/jgss/krb5/AcceptSecContextToken.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java.i
-data/src/share/classes/sun/misc/Timeable.java.i
-data/make/tools/CharsetMapping/IBM921.map.i
+data/make/tools/CharsetMapping/IBM949.map.i
+data/src/share/classes/java/awt/CardLayout.java.i
+data/src/bsd/doc/man/ja/appletviewer.1.i
data/src/share/native/sun/java2d/loops/AlphaMath.h.i
data/test/java/security/Policy/GetInstance/GetInstance.java.i
-data/test/java/io/Serializable/superclassDataLoss/B.java.i
+data/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java.i
data/src/share/classes/sun/tools/jconsole/resources/disconnected16.png.i
data/src/solaris/classes/sun/java2d/jules/JulesTile.java.i
data/test/sun/net/www/http/KeepAliveCache/KeepAliveTimerThread.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CThreading.java.i
data/test/java/net/NetworkInterface/Equals.java.i
data/src/share/native/sun/awt/splashscreen/java_awt_SplashScreen.c.i
data/src/share/classes/sun/io/ByteToCharMacUkraine.java.i
-data/src/share/classes/sun/io/CharToByteHKSCS.java.i
+data/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java.i
data/test/java/net/ProxySelector/SystemProxies.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/Module.java.i
-data/test/java/io/InputStream/Skip.java.i
+data/src/share/classes/sun/jvmstat/monitor/event/MonitorStatusChangeEvent.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c.i
data/src/share/classes/javax/management/monitor/GaugeMonitor.java.i
data/test/java/beans/XMLEncoder/Test6852574.java.i
data/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java.i
-data/src/share/classes/sun/security/tools/CertAndKeyGen.java.i
-data/src/share/classes/javax/sound/midi/MidiFileFormat.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c.i
+data/src/share/classes/javax/net/ssl/SSLContext.java.i
+data/src/macosx/classes/com/apple/eawt/AppEvent.java.i
data/test/sun/security/provider/PolicyFile/getinstance/TwoArgPermission.java.i
-data/src/share/classes/com/sun/tracing/dtrace/ProviderAttributes.java.i
+data/make/sun/javazic/javatz/java_zone_ids.txt.i
+data/src/share/classes/sun/io/CharToByteJIS0208_Solaris.java.i
data/test/sun/net/InetAddress/nameservice/simple/SimpleNameServiceDescriptor.java.i
data/src/windows/native/sun/jkernel/kernel_de.rc.i
-data/src/share/classes/java/io/UTFDataFormatException.java.i
+data/src/share/native/sun/font/layout/LigatureSubstitution.h.i
data/test/java/util/Map/LockStep.java.i
+data/src/share/classes/javax/swing/undo/UndoableEditSupport.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/crc32.c.diff.i
-data/test/java/beans/PropertyEditor/TestFloatType.java.i
-data/src/share/classes/java/security/spec/ECFieldF2m.java.i
-data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono32.gif.i
-data/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java.i
-data/test/tools/launcher/unresolvedExceptions.sh.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties.i
+data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.java.i
+data/src/share/classes/sun/security/krb5/Realm.java.i
+data/src/share/classes/sun/misc/JarIndex.java.i
+data/make/tools/CharsetMapping/IBM864.map.i
+data/src/share/classes/javax/naming/spi/package.html.i
data/test/demo/zipfs/PathOps.java.i
-data/src/windows/classes/sun/awt/windows/WColor.java.i
-data/test/sun/util/resources/Locale/Bug4965260.java.i
+data/test/org/openjdk/jigsaw/services/view.sh.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ServerIdentityTest.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java.i
data/test/com/sun/net/httpserver/TestLogging.java.i
-data/src/share/classes/sun/io/CharToByteJIS0212.java.i
+data/test/java/net/Socket/TestClose.java.i
data/test/org/openjdk/jigsaw/install-files.sh.i
data/test/java/lang/instrument/RedefineBigClassApp.java.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java.i
data/src/share/classes/sun/awt/image/ShortComponentRaster.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapEntry.java.i
-data/test/demo/jvmti/hprof/HelloWorld.java.i
+data/src/share/classes/java/dyn/ToGeneric.java.i
+data/src/macosx/native/jobjc/src/core/native/SEL.m.i
data/test/sun/net/www/ParseUtil_4922813.java.i
data/src/share/classes/sun/io/ByteToCharMS949.java.i
data/src/solaris/classes/sun/java2d/jules/TrapezoidList.java.i
data/src/share/classes/sun/jkernel/Bundle.java.i
data/test/java/lang/Math/Log10Tests.java.i
-data/src/share/classes/java/security/AuthProvider.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.html.i
+data/test/java/lang/Throwable/NewChainedExceptions.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterDialog.java.i
+data/test/javax/swing/Security/6657138/bug6657138.java.i
data/src/share/classes/sun/jvmstat/monitor/event/HostEvent.java.i
-data/test/java/net/URLConnection/RedirectLimit.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ko_KR.properties.i
+data/test/javax/swing/text/html/parser/Parser/6990651/bug6990651.java.i
+data/src/share/native/java/lang/fdlibm/src/w_acos.c.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/testEnabledProtocols.java.i
+data/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java.i
data/src/share/classes/java/lang/module/VersionQuery.java.i
data/src/share/classes/java/lang/module/Version.java.i
-data/src/share/classes/sun/net/www/protocol/http/NegotiateCallbackHandler.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/UnrecognizedOptionException.java.i
+data/src/share/classes/sun/font/GlyphDisposedListener.java.i
+data/test/javax/script/ProviderTest.java.i
data/src/share/classes/javax/print/attribute/package.html.i
data/test/java/io/pathNames/win32/BadDriveLetter.java.i
data/src/share/classes/sun/tools/jconsole/MemoryPoolProxy.java.i
-data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java.i
-data/src/share/classes/sun/security/pkcs12/MacData.java.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.i
data/src/share/classes/sun/security/x509/certAttributes.html.i
data/test/javax/swing/text/GlyphView/6539700/bug6539700.java.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn_RS.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedDoubleFieldAccessorImpl.java.i
+data/src/share/classes/sun/security/pkcs11/JarVerifier.java.i
data/src/share/classes/com/sun/media/sound/SimpleInstrument.java.i
-data/test/java/beans/XMLDecoder/spec/TestNew.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java.i
+data/src/linux/doc/man/jstatd.1.i
data/src/share/classes/java/awt/image/AreaAveragingScaleFilter.java.i
+data/test/javax/swing/JColorChooser/Test4461329.java.i
data/src/share/classes/sun/invoke/anon/ConstantPoolParser.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XSheet.java.i
data/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java.i
-data/src/share/native/sun/font/layout/MorphTables.cpp.i
+data/make/tools/src/build/tools/javazic/BackEnd.java.i
data/test/java/net/InetAddress/B6296240.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ThrowingTasks.java.i
+data/test/sun/management/windows/README.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInput.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceListener.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java.i
-data/test/com/sun/jdi/SuspendNoFlagTest.sh.i
-data/test/java/lang/Class/forName/classes/Z.class.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.lib.i
+data/make/tools/CharsetMapping/IBM856.map.i
data/src/solaris/native/sun/nio/fs/LinuxWatchService.c.i
data/src/solaris/doc/sun/man/man1/orbd.1.i
+data/src/share/classes/java/awt/Font.java.i
data/src/share/native/sun/font/bidi/ubidiln.c.i
-data/make/tools/CharsetMapping/IBM1144.map.i
data/test/tools/launcher/TestHelper.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxUI.java.i
data/src/share/classes/sun/text/resources/FormatData_pl_PL.java.i
-data/src/share/classes/java/nio/file/WatchEvent.java.i
+data/test/java/awt/PrintJob/Text/StringWidth.java.i
data/src/share/native/sun/security/ec/impl/ecp_384.c.i
-data/test/java/lang/System/Available.java.i
+data/test/javax/xml/crypto/dsig/data/envelope.xml.i
+data/src/share/native/sun/awt/image/jpeg/jdcolor.c.i
data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/uncompr.c.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java.i
-data/make/modules/modules.config.i
+data/src/solaris/classes/sun/awt/motif/MWindowPeer.java.i
data/src/share/classes/com/sun/tools/jdi/ValueContainer.java.i
data/src/share/classes/sun/text/normalizer/NormalizerImpl.java.i
-data/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java.i
+data/src/share/classes/sun/text/resources/FormatData_fr_LU.java.i
data/test/sun/security/ssl/sanity/pluggability/MySSLSocketFacImpl.java.i
-data/test/java/io/Reader/NullLock.java.i
data/test/sun/security/krb5/auto/BadKdc2.java.i
data/src/share/sample/vm/jvm-clr/invoked.cs.i
data/src/windows/native/sun/windows/security_warning.ico.i
-data/test/com/sun/net/httpserver/bugs/B6433018.java.i
+data/make/netbeans/common/share-view.ent.i
+data/src/solaris/native/sun/awt/VDrawingAreaP.h.i
data/make/sun/nio/Makefile.i
-data/src/share/classes/java/util/Queue.java.i
+data/src/share/classes/javax/swing/event/EventListenerList.java.i
data/test/java/security/KeyFactory/GenerateRSAPrivateCrtKey.java.i
data/src/share/sample/scripting/scriptpad/src/com/sun/sample/scriptpad/Main.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java.i
data/src/share/classes/sun/io/CharToByteKOI8_R.java.i
-data/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java.i
-data/src/share/classes/javax/swing/AbstractListModel.java.i
+data/src/share/classes/sun/text/resources/FormatData_sl.java.i
data/src/share/classes/sun/tools/tree/AssignBitOrExpression.java.i
data/src/share/classes/sun/io/ByteToCharCp420.java.i
data/make/modules/tools/src/com/sun/classanalyzer/BootAnalyzer.java.i
data/src/share/classes/java/util/IllegalFormatConversionException.java.i
data/src/linux/doc/man/java.1.i
data/src/share/classes/sun/io/CharToByteISO8859_4.java.i
-data/test/java/util/EnumMap/DistinctEntrySetElements.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java.i
-data/make/tools/CharsetMapping/IBM949.map.i
-data/src/share/classes/sun/io/ByteToCharJIS0212_Solaris.java.i
+data/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java.i
+data/src/share/classes/sun/java2d/pipe/LoopPipe.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java.i
+data/test/java/io/Serializable/superclassDataLoss/B.java.i
data/test/java/util/Locale/data/deflocale.win7.i
data/test/com/sun/jdi/ImmutableResourceTest.sh.i
+data/src/macosx/native/jobjc/src/runtime-additions/java/com/apple/jobjc/Utils.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close.gif.i
-data/src/share/classes/sun/security/krb5/Realm.java.i
+data/test/java/beans/PropertyEditor/TestFloatType.java.i
data/test/java/beans/PropertyEditor/TestIntegerTypeJava.java.i
-data/src/share/classes/java/dyn/ToGeneric.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapEntry.java.i
data/src/share/demo/jvmti/heapTracker/heapTracker.c.i
data/src/share/classes/sun/security/smartcardio/CardImpl.java.i
data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/security.policy.i
-data/src/share/native/sun/awt/image/jpeg/jidctred.c.i
data/src/share/classes/java/awt/event/NativeLibLoader.java.i
-data/test/java/nio/channels/SelectionKey/AtomicAttachTest.java.i
-data/test/javax/swing/JInternalFrame/6725409/bug6725409.java.i
+data/test/java/io/FileOutputStream/FileOpenPos.java.i
+data/src/solaris/bin/java_md.h.i
data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorTrustAnchor.java.i
data/src/share/classes/sun/reflect/UnsafeLongFieldAccessorImpl.java.i
data/test/java/rmi/transport/checkFQDN/TellServerName.java.i
data/src/share/native/sun/font/layout/KernTable.cpp.i
-data/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif.i
data/test/sun/security/pkcs11/sslecc/keystore.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so.i
-data/test/java/io/FileOutputStream/FileOpenPos.java.i
+data/test/java/nio/channels/SelectionKey/AtomicAttachTest.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthComboPopup.java.i
-data/src/share/back/commonRef.c.i
+data/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java.i
data/make/sun/rmi/Makefile.i
data/src/share/classes/org/relaxng/datatype/helpers/ParameterlessDatatypeBuilder.java.i
-data/src/share/classes/javax/swing/plaf/multi/package.html.i
+data/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/PaintedShape.java.i
-data/src/share/classes/sun/text/resources/thai_dict.d
+data/src/share/classes/java/awt/ComponentOrientation.java.i
data/src/share/classes/sun/text/SupplementaryCharacterData.java.i
data/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2mgrM.i
+data/src/share/classes/sun/util/resources/CalendarData_el_CY.properties.i
data/src/windows/native/sun/security/krb5/WindowsDirectory.c.i
data/src/share/classes/javax/imageio/event/IIOReadUpdateListener.java.i
-data/src/share/javavm/export/jvmticmlr.h.i
+data/src/share/classes/sun/net/httpserver/ContextList.java.i
data/test/sun/security/krb5/PAData.java.i
-data/test/java/rmi/MarshalledObject/compare/Compare.java.i
+data/src/share/classes/java/io/CharArrayWriter.java.i
data/make/tools/swing-beans/beaninfo/images/JScrollPaneMono16.gif.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/MacOSXFramework.java.i
data/src/solaris/classes/sun/awt/X11/XProtocolConstants.java.i
+data/src/share/classes/sun/security/acl/AllPermissionsImpl.java.i
data/src/share/classes/sun/security/krb5/KerberosSecrets.java.i
data/src/windows/native/sun/windows/awt_Choice.cpp.i
+data/src/share/classes/org/openjdk/jigsaw/LoaderPool.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/inffast.h.i
data/make/java/verify/Makefile.i
-data/src/share/classes/java/lang/InstantiationError.java.i
data/src/share/classes/java/awt/peer/ChoicePeer.java.i
data/make/com/oracle/net/Makefile.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/OuterGlowEffect.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java.i
+data/src/share/classes/sun/text/resources/thai_dict.i
data/test/tools/launcher/deleteI18n.sh.i
data/make/tools/src/build/tools/generatenimbus/ObjectFactory.java.i
data/src/share/classes/sun/nio/cs/ext/IBM037.java.i
data/src/share/classes/java/awt/im/spi/InputMethodContext.java.i
-data/test/sun/rmi/rmic/manifestClassPath/run.sh.i
+data/test/sun/security/mscapi/PublicKeyInterop.java.i
+data/src/macosx/native/sun/awt/awt_DrawingSurface.m.i
data/test/demo/jvmti/heapTracker/HeapTrackerTest.java.i
+data/src/share/classes/javax/swing/text/html/parser/Parser.java.i
data/src/share/classes/java/beans/PersistenceDelegate.java.i
data/test/com/sun/security/sasl/digest/names.properties.i
data/src/windows/native/sun/nio/fs/RegistryFileTypeDetector.c.i
data/src/share/classes/sun/awt/WindowIDProvider.java.i
data/test/javax/script/DummyScriptEngineFactory.java.i
-data/src/share/classes/java/util/LinkedHashSet.java.i
data/make/com/sun/script/Makefile.i
data/src/share/classes/sun/security/provider/MD2.java.i
data/test/java/beans/XMLEncoder/java_awt_Font.java.i
-data/test/java/net/MulticastSocket/JoinGroup.java.i
+data/src/share/native/java/lang/Thread.c.i
data/src/share/classes/sun/security/x509/GeneralSubtree.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.password.in.i
data/test/tools/pack200/pack200-verifier/make/build.xml.i
@@ -7996,45 +8352,50 @@ data/src/share/classes/java/rmi/server/Operation.java.i
data/src/share/native/sun/security/ec/impl/logtab.h.i
data/src/share/classes/sun/net/idn/StringPrep.java.i
data/src/share/classes/sun/io/CharToBytePCK.java.i
-data/test/javax/management/modelmbean/SimpleModelMBean/logging.properties.i
+data/test/java/nio/file/DirectoryStream/Basic.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/File.gif.i
data/test/java/security/Policy/Root/Root.java.i
data/src/share/classes/com/sun/jndi/url/dns/dnsURLContext.java.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB565.png.i
data/test/java/util/ResourceBundle/Bug4179766Getter.java.i
data/src/share/classes/sun/reflect/UnsafeStaticDoubleFieldAccessorImpl.java.i
-data/test/java/util/ResourceBundle/Test4314141A_de_.properties.i
data/test/java/beans/XMLEncoder/java_awt_BorderLayout.java.i
-data/test/javax/management/namespace/VirtualMBeanNotifTest.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/Instruction.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_QA.java.i
+data/src/macosx/native/sun/awt/DnDUtilities.m.i
data/test/java/nio/channels/DatagramChannel/BasicMulticastTests.java.i
data/src/windows/native/sun/nio/ch/FileKey.c.i
data/test/java/security/cert/CertPathValidator/trustAnchor/labs2isrg2.cer.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_th.properties.i
data/src/share/classes/sun/swing/MenuItemLayoutHelper.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpMask.java.i
data/src/share/native/com/sun/java/util/jar/pack/coding.h.i
data/src/share/classes/sun/java2d/pipe/hw/AccelGraphicsConfig.java.i
data/src/share/classes/sun/io/CharToByteCp1006.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h.i
+data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/PitchBend.java.i
data/test/java/nio/channels/FileChannel/TransferToChannel.java.i
data/src/share/classes/javax/naming/directory/package.html.i
data/src/windows/native/sun/windows/awt_Unicode.h.i
data/test/java/lang/reflect/Field/4498653/StaticInitializerTest.java.i
+data/src/macosx/native/jobjc/src/runtime-additions/native/NativeThread.m.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseException.java.i
data/src/share/classes/java/awt/Checkbox.java.i
data/src/share/classes/sun/font/StandardGlyphVector.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneColor16.gif.i
data/src/share/classes/javax/management/openmbean/OpenDataException.java.i
data/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java.i
+data/src/share/classes/java/dyn/AdapterMethodHandle.java.i
data/src/share/classes/sun/jkernel/StandaloneSHA.java.i
data/src/share/classes/sun/nio/cs/IBM862.java.i
+data/make/java/java/reorder-sparc.i
data/test/java/util/Locale/serialized/java6locale_en_US.i
-data/src/solaris/classes/sun/font/XMap.java.i
-data/test/java/util/Collections/RotateEmpty.java.i
-data/test/java/net/DatagramSocket/SendDatagramToBadAddress.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties.i
data/test/java/rmi/reliability/juicer/security.policy.i
data/make/sun/javazic/javatz/java_win_ids.txt.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/AbstractObjCClassFile.java.i
data/src/windows/native/sun/windows/awt_InputTextInfor.h.i
data/src/share/native/sun/java2d/cmm/lcms/cmsps2.c.i
data/src/share/classes/org/openjdk/jigsaw/PublishedRepository.java.i
@@ -8054,7 +8415,9 @@ data/test/java/util/zip/DataDescriptor.java.i
data/test/java/util/jar/JarFile/VerifySignedJar.java.i
data/src/share/classes/java/awt/print/Book.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/GradientStop.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java.i
data/src/share/classes/java/util/UnknownFormatConversionException.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/CategoryTest.java.i
data/src/share/classes/sun/nio/cs/ext/EUC_TW.java.d
data/make/tools/src/build/tools/javazic/Zone.java.i
data/test/sun/security/mscapi/246810.cer.i
@@ -8062,12 +8425,13 @@ data/src/share/classes/java/lang/package-info.java.i
data/src/share/demo/jfc/Metalworks/MetalworksFrame.java.i
data/test/java/net/Socket/SetReceiveBufferSize.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/DependencyConfig.java.i
+data/src/share/classes/sun/nio/cs/MS1257.java.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.dll.d
data/src/share/demo/java2d/J2DBench/src/j2dbench/ui/EnableButton.java.i
data/src/share/classes/javax/xml/crypto/dsig/SignatureProperties.java.i
data/test/java/lang/management/ThreadMXBean/FindDeadlocks.java.i
data/src/share/classes/sun/text/resources/FormatData_pt_PT.java.i
-data/src/share/classes/javax/swing/text/MaskFormatter.java.i
+data/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java.i
data/src/share/lib/management/jmxremote.access.i
data/src/share/classes/sun/awt/ComponentAccessor.java.i
data/src/share/native/sun/font/bidi/ubidiimp.h.i
@@ -8075,28 +8439,28 @@ data/src/share/classes/sun/text/resources/FormatData_ar_AE.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadata.java.i
data/make/tools/src/build/tools/generatecharacter/PrintCharacterRanges.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmCompilationImpl.java.i
+data/src/windows/classes/sun/java2d/windows/WindowsFlags.java.i
data/src/share/classes/sun/tools/asm/Instruction.java.i
data/src/share/classes/com/sun/security/auth/UserPrincipal.java.i
-data/make/tools/makeclasslist/Makefile.i
+data/src/share/classes/java/lang/Exception.java.i
+data/test/java/lang/StrictMath/HyperbolicTests.java.i
data/test/java/util/PluggableLocale/barprovider.jar.i
-data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java.i
+data/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java.i
data/src/share/classes/java/nio/channels/Pipe.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c.i
-data/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java.i
+data/src/share/javavm/export/jawt.h.i
data/test/java/awt/Mixing/ValidBounds.java.i
data/src/solaris/classes/sun/print/services/javax.print.StreamPrintServiceFactory.i
data/src/share/classes/sun/management/VMManagementImpl.java.i
data/src/share/classes/java/nio/file/FileStore.java.i
+data/src/share/classes/sun/tools/java/Environment.java.i
data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Foo.java.i
data/src/share/native/java/lang/reflect/Array.c.i
data/test/java/lang/String/IsEmpty.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1111.java.i
data/src/share/classes/javax/crypto/spec/OAEPParameterSpec.java.i
data/src/share/classes/sun/nio/cs/ext/Johab.java.i
-data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java.i
data/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java.i
-data/test/java/nio/file/WatchService/WithSecurityManager.java.i
data/test/sun/security/krb5/tools/onlythree.conf.i
data/src/share/classes/sun/security/x509/GeneralNames.java.i
data/src/windows/native/sun/windows/awt_Clipboard.h.i
@@ -8104,11 +8468,13 @@ data/src/share/classes/java/util/NoSuchElementException.java.i
data/make/javax/sound/jsoundds/Makefile.i
data/test/javax/management/monitor/NullAttributeValueTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c.i
+data/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java.i
data/make/tools/CharsetMapping/sbcs.i
data/src/share/native/sun/awt/image/jpeg/jcmainct.c.i
-data/make/tools/classanalyzer/Makefile.i
+data/src/share/classes/javax/swing/KeyboardManager.java.i
+data/src/share/classes/sun/applet/AppletEvent.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/StubSkeletonWriter.java.i
+data/make/tools/sharing/classlist.macosx.i
data/src/share/classes/java/nio/file/FileSystemLoopException.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/MarkSupported.java.i
data/src/solaris/native/java/net/Inet4AddressImpl.c.i
@@ -8116,30 +8482,33 @@ data/test/sun/security/tools/policytool/Alias.java.i
data/test/java/util/PluggableLocale/GenericTest.java.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedList.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java.i
-data/test/java/util/logging/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
-data/test/sun/security/util/DerValue/EmptyValue.java.i
+data/src/share/native/sun/security/krb5/nativeccache.c.i
+data/test/java/util/IdentityHashMap/ToArray.java.i
+data/src/share/classes/sun/tools/tree/CommaExpression.java.i
data/src/solaris/classes/sun/nio/ch/FileDispatcher.java.i
data/test/java/io/Serializable/getSuidClinitError/GetSuidClinitError.java.i
data/test/java/beans/XMLEncoder/javax_swing_Box.java.i
data/src/share/native/java/lang/fdlibm/src/s_fabs.c.i
data/test/com/sun/jdi/CommandCommentDelimiter.sh.i
-data/test/sun/rmi/rmic/newrmic/equivalence/Agent.java.i
+data/test/javax/management/Introspector/DescribedMX.java.i
data/src/share/classes/java/io/FilterOutputStream.java.i
data/test/sun/security/krb5/ConfPlusProp.java.i
+data/make/com/apple/osxui/Makefile.i
data/src/share/classes/java/lang/EnumConstantNotPresentException.java.i
data/src/share/classes/java/util/concurrent/locks/ReentrantReadWriteLock.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java.i
data/src/share/classes/java/awt/dnd/peer/DropTargetContextPeer.java.i
data/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java.i
data/make/tools/CharsetMapping/IBM861.map.i
-data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml.i
+data/src/share/classes/com/sun/jndi/ldap/LdapName.java.i
+data/src/share/classes/java/lang/Readable.java.i
data/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java.i
data/test/java/security/cert/CertPathValidator/trustAnchor/sun2labs2.cer.i
data/src/share/native/java/lang/String.c.i
data/test/java/beans/XMLEncoder/java_net_URI.java.i
data/src/share/classes/sun/awt/geom/PathConsumer2D.java.i
data/src/share/instrument/Utilities.c.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java.i
-data/src/share/classes/java/beans/MetaData.java.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.h.i
data/test/java/security/cert/PKIXBuilderParameters/InvalidParameters.java.i
data/test/javax/swing/JSlider/6794836/bug6794836.java.i
data/src/windows/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
@@ -8152,14 +8521,12 @@ data/test/javax/script/Test4.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/package.html.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxMono32.gif.i
data/test/java/nio/file/Files/FileAttributes.java.i
-data/src/share/native/sun/font/FontInstanceAdapter.h.i
+data/test/com/sun/jdi/FieldWatchpoints.java.i
data/src/solaris/classes/sun/nio/fs/UnixFileModeAttribute.java.i
-data/src/share/native/sun/security/ec/impl/ec.h.i
data/src/share/classes/java/text/RuleBasedCollationKey.java.i
-data/src/share/classes/sun/tools/tree/ShortExpression.java.i
data/test/sun/tools/jstat/timeStamp1.awk.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/security.policy.i
-data/src/solaris/classes/sun/awt/motif/X11Selection.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/StructClassFile.java.i
data/test/javax/crypto/JceSecurity/MyCertificateFactory.java.i
data/src/share/classes/com/sun/crypto/provider/HmacPKCS12PBESHA1.java.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/PoisonPill.java.i
@@ -8174,56 +8541,66 @@ data/src/windows/native/sun/nio/ch/SocketDispatcher.c.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelTableMeta.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java.i
data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java.i
+data/test/java/nio/charset/coders/ref.windows-31j.i
+data/test/sun/security/mscapi/RSAEncryptDecrypt.sh.i
data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11.java.i
+data/src/windows/native/sun/windows/awt_Event.cpp.i
data/src/share/classes/javax/crypto/SecretKeyFactorySpi.java.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy.i
data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/config.i
data/src/share/classes/sun/io/CharToByteCp1146.java.i
-data/test/com/sun/net/httpserver/bugs/B6431193.java.i
data/src/share/classes/sun/text/resources/CollationData_pt.java.i
-data/src/windows/back/proc_md.h.i
+data/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp.i
data/src/share/classes/sun/io/ByteToCharCp1254.java.i
data/make/tools/CharsetMapping/MS1255.map.i
data/src/share/classes/java/nio/file/FileSystems.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_it.properties.i
data/test/javax/swing/JTextArea/7049024/bug7049024.java.i
data/src/share/classes/com/sun/jdi/Accessible.java.i
-data/src/solaris/classes/sun/java2d/xr/XRMaskFill.java.i
+data/src/share/native/sun/security/ec/impl/ec2_193.c.i
data/src/share/classes/java/lang/NoSuchFieldError.java.i
+data/src/share/classes/sun/tools/tree/SubtractExpression.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_HN.properties.i
data/test/sun/tools/jstat/jstatLineCounts4.sh.i
-data/test/javax/swing/JSlider/4252173/bug4252173.java.i
+data/src/share/native/sun/awt/image/cvutils/img_noscale.h.i
+data/test/java/beans/XMLEncoder/java_io_File.java.i
data/test/java/lang/Class/getDeclaredClasses/Sanity.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c.i
-data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java.i
data/test/java/beans/XMLEncoder/java_awt_GridBagConstraints.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperties.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java.i
-data/src/share/classes/sun/net/www/protocol/http/Negotiator.java.i
-data/test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java.i
+data/src/share/native/sun/awt/giflib/gif_err.c.i
+data/make/tools/src/build/tools/dtdbuilder/PublicMapping.java.i
data/test/sun/security/krb5/auto/HttpNegotiateServer.java.i
data/src/share/classes/javax/net/ssl/SSLContextSpi.java.i
data/test/com/sun/jdi/NativeInstanceFilterTarg.java.i
data/test/java/beans/Introspector/6380849/beans/FirstBeanBeanInfo.java.i
+data/src/share/classes/sun/beans/editors/ColorEditor.java.i
data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.html.i
data/make/tools/src/build/tools/generatebreakiteratordata/CharSet.java.i
data/src/share/classes/sun/nio/ch/OptionAdaptor.java.i
+data/src/macosx/native/sun/awt/JavaComponentAccessibility.h.i
+data/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h.i
+data/test/java/util/Collections/Enum.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java.i
data/src/share/native/sun/java2d/loops/Ushort555Rgbx.c.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticFieldAccessorImpl.java.i
data/test/tools/launcher/UnresolvedExceptions.java.i
data/test/java/nio/file/DirectoryStream/Filters.java.i
data/test/com/sun/jdi/LaunchCommandLine.java.i
+data/make/sun/xawt/Makefile.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java.i
data/make/tools/CharsetMapping/IBM950.c2b.i
data/test/java/util/TimSort/SortPerf.java.i
data/src/share/classes/sun/io/ByteToCharCp1148.java.i
-data/test/javax/management/loading/LibraryLoader/UseNativeLib1.html.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java.i
data/test/java/util/ResourceBundle/Bug4177489_Resource.java.i
data/src/share/classes/javax/sound/sampled/AudioPermission.java.i
data/src/share/classes/com/sun/pept/encoding/Encoder.java.i
data/src/windows/native/com/sun/security/auth/module/nt.c.i
data/src/share/classes/com/sun/media/sound/SunCodec.java.i
data/test/javax/management/eventService/MyFetchingEventForwarder.java.i
+data/src/share/classes/org/ietf/jgss/GSSName.java.i
data/test/java/beans/README.i
data/test/java/awt/Component/PaintAll/PaintAll.java.i
data/test/sun/nio/cs/OLD/IBM1383_OLD.java.i
@@ -8231,32 +8608,34 @@ data/src/share/sample/scripting/scriptpad/src/scripts/browse.js.i
data/src/share/classes/com/sun/jndi/ldap/Filter.java.i
data/test/java/beans/XMLEncoder/Test6963811.java.i
data/test/sun/net/www/http/HttpClient/MultiThreadTest.java.i
+data/src/macosx/classes/apple/laf/JRSUIStateFactory.java.i
data/src/share/classes/java/awt/font/NumericShaper.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_da_DK.properties.i
data/src/windows/classes/java/lang/ProcessImpl.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_en.properties.i
+data/src/share/classes/java/util/zip/DeflaterInputStream.java.i
data/src/share/classes/javax/accessibility/package.html.i
data/test/com/sun/security/sasl/digest/PropertiesFileCallbackHandler.java.i
data/test/sun/security/mscapi/noaccess.policy.i
-data/test/sun/tools/jstat/printCompilationOutput1.awk.i
data/test/java/nio/Buffer/AllocateDirectInit.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/RehandshakeFinished.java.i
data/test/sun/tools/jps/jps-v_1.sh.i
data/src/share/classes/java/lang/AssertionError.java.i
data/src/share/classes/sun/io/CharToByteUTF16.java.i
data/test/java/lang/instrument/ASimpleInstrumentationTestCase.java.i
-data/make/tools/swing-beans/beaninfo/images/JTreeMono16.gif.i
+data/src/share/sample/nio/multicast/MulticastAddress.java.i
data/src/windows/native/sun/jkernel/kernel.cpp.i
+data/src/share/classes/sun/awt/resources/awt_pt_BR.properties.i
+data/make/sun/awt/Depend.sed.i
data/test/tools/launcher/Arrrghs.java.i
-data/src/share/lib/audio/soundbank.gm.d
-data/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties.i
+data/src/share/classes/javax/security/auth/x500/X500Principal.java.i
data/src/share/classes/sun/io/ByteToCharISO2022JP.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ReadTimeout.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialRef.java.i
data/src/share/classes/com/sun/media/sound/ModelDirector.java.i
+data/src/share/classes/java/io/ObjectInputValidation.java.i
data/src/share/classes/sun/io/ByteToCharEUC_TW.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/PoolCleaner.java.i
-data/src/windows/javavm/export/jni_md.h.i
+data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java.i
data/test/org/openjdk/jigsaw/cli/ModuleFormatTestLeftOverBytes.java.i
data/test/java/beans/beancontext/Test4233980.java.i
data/make/sun/jawt/Depend.sed.i
@@ -8264,35 +8643,32 @@ data/src/share/classes/javax/swing/border/Border.java.i
data/test/java/lang/Class/getModifiers/ForInnerClass.java.i
data/src/solaris/native/sun/nio/ch/FileChannelImpl.c.i
data/src/share/classes/java/security/acl/Acl.java.i
-data/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml.i
-data/src/share/native/sun/security/ec/impl/ecl-curve.h.i
+data/src/share/classes/sun/util/resources/LocaleNames_ro.properties.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/group.security.policy.i
data/src/share/classes/java/nio/file/spi/AbstractPath.java.i
data/test/java/beans/PropertyEditor/6380849/editors/ThirdBeanEditor.java.i
data/src/share/classes/sun/java2d/pipe/ParallelogramPipe.java.i
data/src/share/classes/javax/naming/spi/ObjectFactory.java.i
-data/test/javax/script/MyContext.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c.i
data/src/share/classes/sun/nio/cs/ext/IBM1025.java.i
data/src/share/classes/sun/io/CharToByteDBCS_EBCDIC.java.i
data/make/tools/CharsetMapping/IBM950.map.i
data/src/share/classes/sun/security/acl/AclEntryImpl.java.i
-data/test/sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh.i
+data/src/share/classes/com/sun/jdi/InvalidTypeException.java.i
data/make/tools/CharsetMapping/IBM1124.map.i
data/src/solaris/native/sun/nio/ch/ServerSocketChannelImpl.c.i
data/src/share/demo/jfc/Notepad/resources/Notepad_sv.properties.i
-data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java.i
-data/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java.i
+data/src/share/classes/javax/net/ssl/SSLEngineResult.java.i
data/src/share/classes/java/util/LinkedList.java.i
data/src/share/classes/javax/management/relation/package.html.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy.i
data/test/com/sun/security/sasl/ClientCallbackHandler.java.i
data/src/share/classes/sun/io/CharToByteCp852.java.i
data/src/share/native/java/util/zip/Adler32.c.i
data/src/share/classes/sun/tools/javac/ErrorMessage.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java.i
-data/src/windows/native/sun/windows/awt_InputEvent.h.i
data/src/share/native/sun/java2d/loops/ByteBinary1Bit.c.i
data/test/java/net/URLConnection/HttpContinueStackOverflow.java.i
+data/src/bsd/doc/man/java.1.i
data/test/javax/swing/JColorChooser/Test6524757.java.i
data/src/share/native/sun/security/ec/ecp_521.c.i
data/test/sun/nio/cs/TestISO2022JPEncoder.java.i
@@ -8301,27 +8677,29 @@ data/src/share/classes/sun/tools/java/Type.java.i
data/src/share/classes/sun/net/ftp/FtpReplyCode.java.i
data/test/com/sun/jdi/RunToExit.java.i
data/src/share/classes/sun/security/jgss/spi/GSSNameSpi.java.i
-data/src/share/classes/sun/io/ByteToCharCp1112.java.i
+data/src/macosx/bundle/JDK-Info.plist.i
data/src/share/classes/com/sun/jmx/interceptor/package.html.i
data/src/share/native/sun/security/ec/ec2_mont.c.i
data/test/javax/management/MBeanInfo/EqualExceptionTest.java.i
data/src/share/classes/sun/font/ScriptRunData.java.i
data/test/sun/net/www/protocol/file/FileMap.java.i
-data/test/com/sun/net/httpserver/bugs/B6424196.java.i
data/test/demo/zipfs/ZipFSTester.java.i
data/test/java/util/Formatter/BasicFloat.java.i
+data/make/tools/CharsetMapping/MacRomania.map.i
data/src/share/classes/sun/security/krb5/KrbServiceLocator.java.i
data/test/sun/security/pkcs11/rsa/rsakeys.ks.i
data/make/javax/crypto/Makefile.i
-data/test/sun/nio/cs/LeftOverSurrogate.java.i
+data/test/javax/imageio/plugins/png/MergeStdCommentTest.java.i
data/src/share/native/sun/java2d/loops/Ushort565Rgb.c.i
data/test/sun/tools/jstat/options2.out.i
data/src/solaris/native/java/util/TimeZone_md.c.i
data/src/share/classes/sun/misc/ClassLoaderUtil.java.i
+data/src/share/classes/sun/util/resources/CalendarData_be.properties.i
data/test/java/beans/PropertyChangeSupport/Test4353056.java.i
data/src/windows/native/sun/windows/CmdIDList.cpp.i
-data/test/sun/security/pkcs11/KeyStore/Basic.policy.i
-data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.i
+data/src/share/demo/applets/WireFrame/models/hughes_500.obj.i
+data/src/bsd/doc/man/ja/apt.1.i
+data/src/windows/native/common/gdefs_md.h.i
data/make/java/java/localegen.sh.i
data/src/share/classes/javax/swing/plaf/InternalFrameUI.java.i
data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor32.gif.i
@@ -8336,18 +8714,17 @@ data/test/javax/security/auth/x500/X500Principal/Equals.java.i
data/test/com/sun/servicetag/Util.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0110.java.i
data/src/windows/native/sun/windows/awt_PopupMenu.cpp.i
-data/src/share/native/sun/management/MemoryManagerImpl.c.i
+data/src/share/classes/sun/security/acl/PermissionImpl.java.i
data/test/sun/nio/ch/TempBuffer.java.i
data/src/share/demo/jvmti/hprof/hprof_listener.h.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetLatency.java.i
data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java.i
+data/test/java/beans/VetoableChangeSupport/Test7148143.java.i
data/src/share/classes/sun/security/pkcs11/P11Util.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Trace.java.i
-data/test/java/util/TreeMap/EmptyMapAndNulls.java.i
data/src/share/classes/sun/security/krb5/internal/APOptions.java.i
data/test/java/lang/instrument/PremainClass/DummyMain.java.i
data/src/share/classes/java/lang/NoClassDefFoundError.java.i
-data/test/java/util/concurrent/DelayQueue/Iterate.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/MyRMI.java.i
data/test/javax/sound/sampled/FileWriter/WriterCloseInput.java.i
data/test/java/math/BigDecimal/PrecisionTests.java.i
@@ -8357,15 +8734,17 @@ data/src/share/classes/sun/security/x509/X500Signer.java.i
data/src/share/classes/javax/sound/midi/MidiChannel.java.i
data/src/share/classes/java/util/zip/Adler32.java.i
data/test/java/rmi/testlibrary/TestLibrary.java.i
+data/src/macosx/classes/apple/applescript/AppleScriptEngine.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpLcd.java.i
data/src/share/classes/com/sun/media/sound/SoftReverb.java.i
-data/make/tools/buildmetaindex/Makefile.i
+data/test/java/net/URLEncoder/Decoder.java.i
data/test/com/sun/security/sasl/digest/PrivacyRc4.java.i
data/test/javax/crypto/SecretKeyFactory/FailOverTest.sh.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java.i
data/src/share/classes/java/nio/file/WatchService.java.i
data/make/java/version/Makefile.i
data/src/share/classes/javax/naming/event/NamingExceptionEvent.java.i
+data/src/macosx/classes/com/apple/concurrent/LibDispatchSerialQueue.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h.i
data/src/share/classes/sun/nio/cs/ext/IBM949.java.i
data/src/share/classes/sun/util/resources/CalendarData_nl.properties.i
data/test/java/text/Format/DateFormat/Bug6645292.java.i
@@ -8373,25 +8752,29 @@ data/src/share/classes/javax/swing/JToolTip.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntInt.java.i
data/test/java/awt/FontClass/CreateFont/fileaccess/FontFile.java.i
data/test/sun/net/www/protocol/http/spnegoReadme.i
+data/src/share/classes/sun/text/resources/FormatData_pl.java.i
data/src/share/classes/sun/text/resources/FormatData_es_PY.java.i
data/src/share/classes/javax/swing/text/doc-files/Document-notification.gif.i
+data/test/java/beans/EventHandler/Test6179222.java.i
data/src/share/classes/sun/io/ByteToCharJIS0208_Solaris.java.i
data/test/java/nio/file/Path/InterruptCopy.java.i
data/test/sun/security/krb5/tools/ktarg.sh.i
data/src/share/classes/sun/security/ec/ECParameters.java.i
+data/src/windows/native/sun/windows/awt_new.cpp.i
data/src/share/classes/sun/management/resources/agent_ko.properties.i
data/test/javax/management/namespace/JMXNamespaceTest.java.i
data/test/java/util/UUID/Serial.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ChannelPressure.java.i
-data/src/solaris/classes/sun/awt/X11/XListPeer.java.i
+data/src/share/classes/sun/io/CharToByteCp943.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c.i
-data/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java.i
+data/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ms_MY.properties.i
+data/src/macosx/classes/sun/lwawt/macosx/CFRetainedResource.java.i
data/src/share/classes/sun/security/ssl/RSASignature.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c.i
data/src/share/classes/com/sun/crypto/provider/RSACipher.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java.i
data/test/javax/management/mxbean/MiscTest.java.i
-data/src/share/native/java/lang/fdlibm/src/k_sin.c.i
data/src/share/classes/javax/swing/plaf/synth/SynthButtonUI.java.i
data/src/share/classes/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java.i
data/src/share/classes/java/awt/geom/RectangularShape.java.i
@@ -8416,31 +8799,30 @@ data/test/javax/crypto/JceSecurity/MyX509CertImpl.java.i
data/src/solaris/native/sun/java2d/x11/X11Renderer.c.i
data/src/share/classes/javax/swing/event/UndoableEditEvent.java.i
data/src/share/classes/sun/awt/ModalExclude.java.i
-data/src/share/classes/sun/security/tools/JarSignerResources.java.i
data/src/share/classes/com/sun/jmx/remote/internal/RMIExporter.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/JType.java.i
data/test/java/nio/channels/Selector/WakeupNow.java.i
data/src/share/classes/sun/nio/ByteBuffered.java.i
data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport1.java.i
data/test/java/util/jar/JarFile/thawjar.jar.i
data/src/share/classes/com/sun/jdi/ClassNotPreparedException.java.i
data/test/sun/net/www/protocol/jar/foo1.jar.d
-data/src/linux/doc/man/apt.1.i
+data/src/share/classes/javax/imageio/ImageReader.java.i
data/src/share/native/com/sun/java/util/jar/pack/utils.cpp.i
-data/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.i
data/src/solaris/classes/sun/awt/motif/X11CNS11643.java.i
data/src/share/classes/javax/swing/event/TreeExpansionListener.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiTextUI.java.i
-data/src/share/classes/sun/nio/cs/ext/HKSCS.java.i
+data/src/share/classes/sun/invoke/empty/Empty.java.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_LineBorderUIResource.java.i
data/make/tools/src/build/tools/buildmetaindex/BuildMetaIndex.java.i
data/test/sun/tools/native2ascii/A2N_4701617.expected.i
-data/src/share/classes/sun/io/ByteToCharEUC_KR.java.i
+data/src/share/classes/sun/io/ByteToCharCp942C.java.i
data/test/java/lang/invoke/MethodTypeTest.java.i
data/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.java.i
data/src/share/classes/java/lang/management/MonitorInfo.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_sv.properties.i
data/src/share/classes/javax/management/relation/RoleUnresolved.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java.i
+data/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java.i
data/test/java/beans/Introspector/Test6277246.java.i
data/src/solaris/classes/java/lang/ProcessImpl.java.i
data/test/java/util/Collections/Rotate.java.i
@@ -8453,6 +8835,7 @@ data/make/common/shared/Platform.gmk.i
data/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java.i
data/src/share/classes/com/sun/tools/jdi/VMModifiers.java.i
data/src/share/classes/javax/swing/colorchooser/ColorModel.java.i
+data/src/share/classes/java/awt/KeyEventDispatcher.java.i
data/src/share/classes/sun/reflect/generics/parser/SignatureParser.java.i
data/test/sun/security/pkcs11/KeyAgreement/TestShort.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.keystore.i
@@ -8460,16 +8843,16 @@ data/src/share/demo/nio/zipfs/META-INF/services/java.nio.file.spi.FileSystemProv
data/src/share/classes/javax/management/AttributeList.java.i
data/src/share/transport/socket/socketTransport.c.i
data/test/javax/print/applet/AppletPrintLookup.sh.i
-data/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java.i
+data/src/share/classes/sun/awt/NullComponentPeer.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuColor32.gif.i
data/test/sun/net/www/protocol/file/GetLastModified.java.i
data/src/solaris/classes/sun/nio/fs/LinuxFileStore.java.i
-data/test/org/openjdk/jigsaw/ContextBuilder.java.i
data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdConcMarkSweepGC.sh.i
data/src/share/classes/sun/security/provider/certpath/ssl/SSLServerCertStoreHelper.java.i
data/src/share/classes/sun/nio/cs/ext/DBCSDecoderMapping.java.i
+data/src/share/classes/sun/font/FontAccess.java.i
data/src/share/classes/sun/security/util/AuthResources_es.java.i
-data/src/share/classes/com/sun/media/sound/SF2Instrument.java.i
+data/src/share/classes/java/security/spec/RSAPrivateKeySpec.java.i
data/src/share/classes/sun/management/NotificationEmitterSupport.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpSendOutputStream.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim16.png.i
@@ -8477,42 +8860,45 @@ data/make/tools/CharsetMapping/IBM280.map.i
data/src/share/classes/sun/audio/InvalidAudioFormatException.java.i
data/test/sun/rmi/rmic/oldjavacRemoved/Foo.java.i
data/test/java/net/DatagramPacket/Offset.java.i
-data/make/sun/nio/cs/Makefile.i
-data/src/share/classes/sun/java2d/loops/DrawRect.java.i
+data/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh.i
data/src/share/classes/javax/xml/crypto/dsig/spec/C14NMethodParameterSpec.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java.i
+data/src/solaris/native/sun/awt/awt_mgrsel.c.i
data/test/java/lang/StrictMath/Expm1Tests.java.i
data/test/com/sun/jdi/redefine/RedefineSetUp.sh.i
data/test/com/sun/jdi/PopAndStepTest.java.i
data/src/share/classes/java/awt/image/WritableRaster.java.i
+data/src/share/classes/java/net/CookieManager.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java.i
-data/src/share/classes/sun/print/ServiceDialog.java.i
+data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java.i
data/src/share/classes/sun/security/jgss/TokenTracker.java.i
data/src/share/classes/javax/naming/OperationNotSupportedException.java.i
data/make/tools/swing-beans/beaninfo/images/JCheckBoxMono16.gif.i
data/test/sun/security/tools/policytool/ChangeUI.sh.i
data/test/com/sun/management/OperatingSystemMXBean/GetProcessCpuLoad.java.i
-data/src/solaris/native/sun/net/spi/SdpProvider.c.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java.i
-data/test/com/sun/jdi/Redefine-g.sh.i
-data/src/share/demo/jvmti/waiters/Agent.hpp.i
+data/src/share/classes/sun/nio/fs/AbstractWatchKey.java.i
+data/src/share/classes/com/sun/jdi/ObjectCollectedException.java.i
+data/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java.i
+data/src/macosx/classes/sun/lwawt/LWCanvasPeer.java.i
+data/test/sun/net/www/ParseUtil_6478588.java.i
data/src/share/classes/sun/tools/tree/PostIncExpression.java.i
data/test/java/io/LineNumberInputStream/Available.java.i
data/test/sun/nio/cs/EncodingNothing.java.i
data/src/share/native/sun/java2d/loops/IntArgbPre.h.i
data/test/java/nio/channels/Pipe/SelectPipe.java.i
+data/test/java/beans/PropertyEditor/Test4968709.java.i
data/make/jpda/back/mapfile-vers.i
data/src/share/native/java/util/zip/zlib-1.2.3/patches/zlib.h.diff.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java.i
-data/test/java/util/ResourceBundle/Test4314141.java.i
data/test/sun/nio/cs/CheckHistoricalNames.java.i
data/src/share/classes/sun/security/util/Resources_sv.java.i
data/test/sun/tools/jps/jps-Vvm.sh.i
+data/src/share/classes/sun/text/normalizer/UCharacter.java.i
data/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java.i
+data/src/macosx/classes/sun/font/CStrikeDisposer.java.i
+data/make/sun/text/FILES_properties.gmk.i
data/src/share/native/sun/java2d/loops/IntArgb.h.i
-data/test/sun/java2d/OpenGL/GradientPaints.java.i
+data/src/share/classes/java/awt/Transparency.java.i
data/src/share/classes/sun/misc/VM.java.i
-data/make/common/Defs-embedded.gmk.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterPageDialog.java.i
data/test/java/security/cert/CertPathValidator/indirectCRL/openssl.cnf.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/rmid.security.policy.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c.i
@@ -8520,18 +8906,19 @@ data/make/tools/CharsetMapping/IBM1143.c2b.i
data/make/netbeans/jconsole/build.properties.i
data/src/share/classes/sun/security/provider/JavaKeyStore.java.i
data/test/java/dyn/InvokeDynamicPrintArgs.java.i
-data/src/share/classes/org/openjdk/jigsaw/FilePaths.java.i
+data/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java.i
data/src/share/classes/sun/swing/plaf/GTKKeybindings.java.i
data/src/windows/classes/sun/awt/windows/WBufferStrategy.java.i
-data/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java.i
data/test/java/awt/GraphicsDevice/CloneConfigsTest.java.i
data/test/java/lang/Math/HypotTests.java.i
data/src/share/classes/sun/security/jgss/spnego/SpNegoToken.java.i
data/test/javax/swing/text/html/TableView/7030332/sample3.png.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml.i
data/make/netbeans/jdwpgen/nbproject/findbugs.settings.i
data/make/com/sun/tools/attach/mapfile-linux.i
data/src/share/native/sun/java2d/Disposer.h.i
data/src/share/classes/sun/tools/tree/TypeExpression.java.i
+data/src/windows/native/sun/windows/awt_Pen.h.i
data/src/share/classes/sun/nio/cs/Surrogate.java.i
data/src/share/classes/sun/security/provider/certpath/CertPathHelper.java.i
data/make/java/dyn/Makefile.i
@@ -8541,22 +8928,25 @@ data/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java.i
data/src/share/classes/sun/io/CharToByteCp933.java.i
data/src/share/classes/sun/net/httpserver/ServerConfig.java.i
data/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java.i
+data/src/share/classes/java/util/prefs/PreferenceChangeListener.java.i
data/src/share/classes/java/rmi/ServerRuntimeException.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.pwd.i
data/src/share/classes/javax/imageio/stream/FileCacheImageOutputStream.java.i
+data/src/share/classes/javax/sound/midi/Sequence.java.i
data/src/share/classes/sun/applet/AppletViewer.java.i
-data/test/sun/security/x509/X500Name/AllAttribs.java.i
+data/make/java/sql/Makefile.i
+data/src/macosx/native/sun/awt/AWTSurfaceLayers.h.i
data/src/share/classes/sun/nio/cs/ext/PCK.java.i
data/test/java/net/ProxySelector/LoopbackAddresses.java.i
-data/src/share/classes/sun/awt/CharsetString.java.i
+data/src/share/classes/java/rmi/server/Unreferenced.java.i
data/test/sun/security/util/DerValue/BadValue.java.i
data/test/java/security/cert/CertificateRevokedException/Basic.java.i
data/test/java/io/PrintWriter/SubClass.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrument.java.i
data/make/javax/crypto/Defs-jce.gmk.i
-data/src/linux/doc/man/ja/jarsigner.1.i
+data/src/macosx/classes/apple/security/AppleProvider.java.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/CheckLoader.java.i
-data/src/share/classes/javax/swing/plaf/basic/ComboPopup.java.i
+data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathEntryMBean.java.i
data/src/share/classes/sun/tools/java/Package.java.i
data/src/windows/classes/sun/java2d/windows/WinBackBufferSurfaceData.java.i
@@ -8573,7 +8963,7 @@ data/test/java/io/Writer/WriteFromString.java.i
data/test/java/lang/reflect/Generics/Probe.java.i
data/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c.i
data/src/share/native/sun/java2d/SurfaceData.h.i
-data/make/mkdemo/management/README.txt.i
+data/src/share/classes/sun/awt/image/ImagingLib.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ComURLNulls.java.i
data/src/share/classes/javax/management/modelmbean/DescriptorSupport.java.i
data/test/sun/security/mscapi/ShortRSAKey768.sh.i
@@ -8581,6 +8971,7 @@ data/src/share/classes/javax/swing/plaf/basic/BasicBorders.java.i
data/test/org/openjdk/jigsaw/maze.sh.i
data/src/share/lib/images/cursors/win32_CopyDrop32x32.gif.i
data/make/tools/CharsetMapping/Johab.map.d
+data/make/org/jcp/Makefile.i
data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxIcon.java.i
data/test/java/util/zip/InfoZip.java.i
data/test/java/nio/Buffer/LimitDirectMemory.sh.i
@@ -8590,8 +8981,6 @@ data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh.i
data/make/tools/CharsetMapping/Johab.map.i
data/test/javax/swing/SwingTest.java.i
data/test/java/security/UnresolvedPermission/DebugPermission0.java.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java.i
-data/test/lib/security/java.policy/Ext_AllPolicy.sh.i
data/src/share/classes/sun/java2d/pipe/RenderingEngine.java.i
data/test/com/sun/servicetag/JavaServiceTagTest1.java.i
data/src/share/classes/java/nio/file/FileSystemException.java.i
@@ -8599,12 +8988,12 @@ data/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java.i
data/test/java/net/Authenticator/B4933582.sh.i
data/src/solaris/hpi/native_threads/include/np.h.i
data/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java.i
-data/test/javax/script/NullUndefinedVarTest.java.i
-data/src/share/classes/sun/java2d/pipe/RegionIterator.java.i
+data/test/java/rmi/activation/Activatable/shutdownGracefully/TestSecurityManager.java.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif.i
data/test/java/security/KeyRep/Blowfish.pre.1.5.key.i
data/test/javax/swing/JColorChooser/Test6541987.java.i
data/test/java/util/EnumSet/JumboRange.java.i
-data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif.i
+data/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java.i
data/src/share/classes/javax/management/relation/RelationSupportMBean.java.i
data/test/javax/management/relation/RelationTypeTest.java.i
@@ -8616,11 +9005,10 @@ data/src/share/classes/sun/invoke/util/package-info.java.i
data/test/javax/management/descriptor/ImmutableDescriptorSetFieldsTest.java.i
data/test/java/lang/annotation/Missing/MissingWrapper.java.i
data/src/share/classes/sun/nio/fs/BasicFileAttributesHolder.java.i
-data/src/share/native/sun/awt/image/jpeg/jinclude.h.i
data/src/share/classes/sun/util/resources/CalendarData_de.properties.i
data/src/share/classes/sun/io/ByteToCharCp1381.java.i
data/src/share/classes/java/net/URI.java.i
-data/src/windows/native/sun/jkernel/graphics/cautionshield32.bmp.i
+data/src/share/classes/sun/misc/FormattedFloatingDecimal.java.i
data/src/share/classes/javax/swing/table/TableCellEditor.java.i
data/test/java/beans/Introspector/Test6660539.java.i
data/src/share/classes/javax/smartcardio/ATR.java.i
@@ -8630,26 +9018,27 @@ data/src/share/classes/com/sun/inputmethods/internal/thaiim/java.awt.im.spi.Inpu
data/src/share/classes/sun/text/normalizer/NormalizerDataReader.java.i
data/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java.i
data/src/share/classes/sun/swing/ImageCache.java.i
+data/test/sun/nio/cs/StreamEncoderClose.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLEncryptionException.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Strings.java.i
+data/src/share/native/java/lang/fdlibm/src/k_standard.c.i
data/src/share/classes/sun/security/provider/SunEntries.java.i
+data/src/share/classes/com/sun/net/ssl/TrustManager.java.i
+data/src/share/demo/jvmti/hprof/hprof_frame.c.i
data/src/share/classes/sun/nio/cs/ext/MS50221.java.i
data/test/java/net/Inet4Address/isSiteLocalAddress.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-failed.png.i
+data/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java.i
data/test/sun/security/pkcs11/KeyAgreement/TestDH.java.i
data/make/tools/sharing/tests/Hello.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/OpenStream.java.i
-data/test/sun/security/tools/jarsigner/oldsig.sh.i
+data/src/share/classes/java/security/KeyStoreException.java.i
data/test/com/sun/jdi/MethodCalls.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c.i
data/test/java/beans/PropertyEditor/TestColorClass.java.i
-data/src/share/classes/javax/swing/plaf/ListUI.java.i
data/src/share/demo/jfc/Notepad/resources/Notepad_fr.properties.i
data/src/share/classes/sun/io/ByteToCharCp949.java.i
data/test/java/util/ResourceBundle/RestrictedBundleTest.java.i
data/test/java/io/StringReader/NegativeMarkLimit.java.i
data/src/windows/native/sun/nio/ch/nio_util.h.i
-data/src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthScrollBarUI.java.i
data/src/share/classes/java/io/SerialCallbackContext.java.i
data/src/linux/doc/man/jcmd.1.i
@@ -8657,12 +9046,16 @@ data/src/solaris/classes/sun/net/sdp/SdpProvider.java.i
data/src/share/classes/com/sun/jdi/event/Event.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedByte.java.i
data/test/javax/crypto/spec/RC5ParameterSpec/InvalidIV.java.i
-data/test/java/beans/PropertyEditor/TestFloatTypeJava.java.i
+data/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/MethodDisambiguator.java.i
data/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties.i
+data/src/macosx/classes/com/apple/laf/AquaTextPaneUI.java.i
data/src/share/classes/sun/io/ByteToCharCp838.java.i
data/test/javax/rmi/ssl/keystore.i
data/src/share/native/java/lang/fdlibm/src/w_j0.c.i
data/src/share/classes/sun/security/krb5/internal/crypto/DesMacKCksumType.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java.i
data/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java.i
data/src/share/classes/java/nio/X-Buffer-bin.java.i
data/src/share/classes/sun/util/xml/XMLUtils.java.i
@@ -8673,40 +9066,37 @@ data/src/share/classes/javax/swing/SizeRequirements.java.i
data/src/share/classes/sun/management/HotspotThread.java.i
data/make/modules/image.rest.ls.i
data/src/linux/doc/man/ja/rmiregistry.1.i
-data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java.i
+data/src/solaris/classes/sun/misc/FileURLMapper.java.i
data/src/share/classes/javax/sound/midi/MidiSystem.java.i
data/src/share/native/sun/java2d/loops/ThreeByteBgr.h.i
data/src/share/native/java/util/zip/zlib-1.1.3/zutil.h.i
data/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java.i
-data/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java.i
+data/make/java/beans/Makefile.i
data/src/share/classes/sun/security/jgss/GSSCredentialImpl.java.i
+data/src/share/classes/javax/swing/tree/AbstractLayoutCache.java.i
data/make/sun/awt/mapfile-vers-linux.i
data/src/share/classes/java/util/prefs/AbstractPreferences.java.i
data/src/share/classes/com/sun/tools/jdi/ValueImpl.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLongLongBoolean.java.i
data/src/share/classes/sun/security/x509/DeltaCRLIndicatorExtension.java.i
-data/test/java/rmi/transport/checkFQDN/CheckFQDN.java.i
data/make/tools/CharsetMapping/IBM1006.map.i
data/test/java/lang/instrument/appendToClassLoaderSearch/B.2.i
-data/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java.i
+data/test/java/util/concurrent/Exchanger/LoopHelpers.java.i
data/src/share/classes/sun/net/www/protocol/https/HttpsURLConnectionImpl.java.i
data/src/share/classes/sun/java2d/pipe/hw/AccelDeviceEventNotifier.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/directory.gif.i
-data/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java.i
-data/test/demo/jvmti/hprof/HeapBinaryFormatTest.java.i
data/src/share/classes/sun/text/normalizer/UnicodeSet.java.i
-data/src/solaris/classes/sun/awt/X11/XAtom.java.i
+data/src/share/classes/sun/security/provider/MD4.java.i
+data/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetTransmitters.java.i
data/test/java/lang/Math/HyperbolicTests.java.i
-data/src/share/classes/java/awt/geom/FlatteningPathIterator.java.i
data/test/javax/management/remote/mandatory/version/JMXSpecVersionTest.java.i
data/src/share/classes/com/sun/media/sound/DLSSample.java.i
-data/test/java/nio/channels/AsyncCloseAndInterrupt.java.i
+data/src/share/classes/java/security/SecureClassLoader.java.i
data/make/tools/CharsetMapping/IBM285.map.i
data/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java.i
data/make/tools/src/build/tools/jdwpgen/ConstantNode.java.i
-data/src/share/classes/javax/naming/ldap/ExtendedRequest.java.i
data/test/java/lang/instrument/NullGetObjectSizeTest.java.i
data/src/share/classes/java/rmi/server/package.html.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init5.java.i
@@ -8714,7 +9104,6 @@ data/src/solaris/classes/sun/nio/ch/SctpNotification.java.i
data/make/common/Demo.gmk.i
data/src/share/classes/sun/beans/editors/BooleanEditor.java.i
data/test/java/awt/Graphics2D/RenderClipTest/6766342.tests.i
-data/src/share/classes/sun/text/resources/FormatData_pt_BR.java.i
data/test/java/nio/BufferPoolMXBean/Basic.java.i
data/test/java/awt/font/GlyphVector/VisualBounds.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetPolarity.java.i
@@ -8726,24 +9115,25 @@ data/src/share/classes/sun/dyn/MethodHandleNatives.java.i
data/src/share/classes/javax/swing/doc-files/JLayeredPane-1.gif.i
data/src/share/native/sun/font/layout/ScriptAndLanguage.cpp.i
data/src/share/classes/com/sun/media/sound/AutoConnectSequencer.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/Property.java.i
data/src/share/classes/javax/swing/doc-files/JRootPane-1.gif.i
data/test/javax/swing/JButton/6604281/bug6604281.java.i
-data/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM930.java.i
+data/test/java/io/File/Cons.java.i
+data/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java.i
data/src/share/classes/sun/nio/cs/IBM874.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java.i
data/test/java/lang/ClassLoader/findSystemClass/java/lang/Object.class.i
data/src/share/classes/sun/management/snmp/jvminstr/JVM_MANAGEMENT_MIB_IMPL.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/image-delayed.png.i
data/src/share/classes/java/lang/reflect/Executable.java.i
-data/test/java/nio/channels/SocketChannel/BufferSize.java.i
+data/test/java/security/IdentityScope/NoDefaultSystemScope.java.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyName.java.i
data/src/share/classes/com/sun/media/sound/SoftTuning.java.i
data/test/javax/swing/JColorChooser/Test4222508.html.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in.i
+data/src/bsd/doc/man/jhat.1.i
data/src/share/classes/sun/security/ssl/SSLSocketImpl.java.i
-data/src/share/native/sun/font/layout/GlyphIterator.h.i
+data/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/credits.html.i
data/src/share/classes/sun/security/jgss/GSSManagerImpl.java.i
data/src/share/classes/sun/reflect/DelegatingConstructorAccessorImpl.java.i
@@ -8751,25 +9141,26 @@ data/src/share/classes/java/awt/image/DataBufferUShort.java.i
data/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local.jpg.i
data/src/windows/classes/sun/nio/fs/DefaultFileSystemProvider.java.i
-data/src/share/classes/com/sun/jdi/request/package.html.i
+data/test/java/net/URLEncoder/URLEncodeDecode.java.i
data/make/sun/management/Makefile.i
-data/test/java/util/Arrays/Sorting.java.i
data/src/share/native/sun/font/layout/Features.cpp.i
data/test/java/lang/System/finalization/FinExit.sh.i
data/src/share/classes/sun/security/ssl/ClientHandshaker.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/TreeClosed.gif.i
data/make/tools/src/build/tools/automulti/TestALFLookAndFeel.java.i
+data/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java.i
data/src/share/classes/java/net/ResponseCache.java.i
data/src/share/classes/java/awt/SplashScreen.java.i
+data/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java.i
data/make/java/hpi/native/reorder-i586.i
data/test/ModulesProblemList.txt.i
-data/test/javax/swing/JDialog/6639507/bug6639507.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java.i
data/test/java/lang/management/ThreadMXBean/ThreadUserTime.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameTitlePane.java.i
-data/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh.i
-data/test/java/io/Serializable/classDescFlagConflict/Read.java.i
data/src/windows/native/sun/windows/awt_Debug.cpp.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/BootClassPathMinus.java.i
data/src/share/classes/java/lang/management/MemoryUsage.java.i
+data/src/share/demo/jvmti/hprof/hprof_ioname.h.i
data/src/share/classes/sun/io/ByteToCharCp942.java.i
data/test/java/nio/channels/SocketChannel/FinishConnect.java.i
data/test/java/util/PluggableLocale/providersrc/java.text.spi.BreakIteratorProvider.i
@@ -8779,36 +9170,39 @@ data/src/share/back/stepControl.c.i
data/test/sun/security/pkcs11/KeyStore/Solaris.sh.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk.properties.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_fr.properties.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ComodoHacker.java.i
data/test/java/io/File/CreateNewFile.java.i
data/src/share/classes/sun/io/CharToByteSingleByte.java.i
data/src/share/classes/javax/security/auth/DestroyFailedException.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.ssl.in.i
data/test/sun/security/util/BitArray/NamedBitList.java.i
+data/src/share/classes/java/net/PasswordAuthentication.java.i
data/src/share/classes/sun/security/x509/CertificateExtensions.java.i
data/src/share/classes/com/sun/media/sound/WaveFileWriter.java.i
+data/src/macosx/native/sun/awt/AWTView.m.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.html.i
data/src/share/classes/javax/swing/tree/RowMapper.java.i
+data/src/macosx/classes/sun/font/CFontConfiguration.java.i
data/src/share/native/sun/awt/medialib/mlib_image_proto.h.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/error.png.i
-data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteGray.c.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java.i
+data/src/share/classes/com/sun/security/auth/PolicyParser.java.i
data/test/sun/java2d/DirectX/OpaqueImageToSurfaceBlitTest/OpaqueImageToSurfaceBlitTest.java.i
data/src/share/native/sun/java2d/loops/UshortGray.h.i
data/src/share/native/java/util/zip/zlib-1.1.3/zconf.h.i
-data/test/java/net/Inet6Address/serialize/Readme.txt.i
+data/make/common/shared/Defs-java.gmk.i
data/src/share/classes/java/awt/AWTError.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/internal/AbbreviationMap.java.i
data/make/tools/swing-beans/beaninfo/images/JOptionPaneMono16.gif.i
data/test/com/sun/jdi/PopAsynchronousTest.java.i
data/src/share/classes/java/awt/color/ProfileDataException.java.i
-data/test/javax/script/Test3.js.i
-data/src/solaris/doc/sun/man/man1/ja/keytool.1.i
+data/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java.i
data/make/com/sun/security/auth/module/Makefile.i
data/src/share/classes/javax/swing/colorchooser/DiagramComponent.java.i
data/test/java/lang/StringBuffer/Capacity.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskFill.cpp.i
data/src/share/classes/javax/security/auth/login/ConfigurationSpi.java.i
+data/src/share/classes/sun/awt/resources/awt_zh_TW.properties.i
data/src/share/classes/javax/management/MatchQueryExp.java.i
data/src/share/classes/sun/tools/jstat/Expression.java.i
data/src/share/classes/java/util/prefs/XmlSupport.java.i
@@ -8823,20 +9217,24 @@ data/test/javax/management/eventService/ListenerTest.java.i
data/test/java/lang/instrument/ATransformerManagementTestCase.java.i
data/src/share/native/sun/awt/image/jpeg/jdhuff.c.i
data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.config.i
-data/test/java/nio/channels/SocketChannel/Open.sh.i
data/src/share/classes/java/awt/CheckboxGroup.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java.i
data/src/share/classes/java/util/concurrent/BrokenBarrierException.java.i
+data/src/solaris/doc/sun/man/man1/ja/jsadebugd.1.i
data/src/share/classes/sun/tools/serialver/serialver_ja.properties.i
data/src/share/classes/sun/tools/jstat/AscendingMonitorComparator.java.i
data/test/java/net/URLClassLoader/AddURLTest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties.i
data/src/share/native/sun/font/layout/GlyphIterator.cpp.i
+data/src/macosx/classes/sun/lwawt/LWContainerPeer.java.i
data/test/java/lang/management/MemoryMXBean/MemoryManagementSerialGC.sh.i
data/test/sun/management/jmxremote/RunTest.sh.i
data/test/sun/security/tools/policytool/OpenPolicy.html.i
+data/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java.i
+data/src/macosx/classes/com/apple/laf/AquaPainter.java.i
+data/src/share/classes/sun/tools/jconsole/TimeComboBox.java.i
data/src/share/bin/wildcard.c.i
-data/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java.i
+data/src/share/classes/sun/text/resources/FormatData_mt.java.i
data/src/share/native/java/lang/fdlibm/src/e_j1.c.i
data/src/share/classes/sun/security/ssl/InputRecord.java.i
data/test/java/beans/PropertyEditor/Test6397609.java.i
@@ -8849,7 +9247,6 @@ data/test/javax/management/notification/NotifExecutorTest.java.i
data/test/sun/tools/jconsole/ImmutableResourceTest.java.i
data/src/windows/classes/sun/print/Win32MediaTray.java.i
data/src/share/classes/java/security/interfaces/ECPublicKey.java.i
-data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy.i
data/src/share/classes/sun/security/krb5/internal/crypto/RsaMd5CksumType.java.i
data/src/solaris/native/sun/awt/awt_GraphicsEnv.c.i
data/src/share/classes/java/awt/GraphicsConfiguration.java.i
@@ -8862,10 +9259,9 @@ data/src/share/classes/javax/management/remote/JMXAuthenticator.java.i
data/src/share/classes/java/util/DuplicateFormatFlagsException.java.i
data/test/sun/security/util/DerValue/NegInt.java.i
data/src/share/classes/sun/net/www/protocol/http/NTLMAuthenticationProxy.java.i
-data/test/java/io/InputStreamReader/One.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Bytes.java.i
data/src/solaris/native/sun/security/smartcardio/MUSCLE/winscard.h.i
-data/test/java/awt/print/PrinterJob/ExceptionTest.java.i
+data/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c.i
data/test/javax/management/Introspector/AnnotatedMBeanTest.java.i
data/src/share/classes/java/awt/ContainerOrderFocusTraversalPolicy.java.i
data/src/share/classes/sun/io/CharToByteISO8859_8.java.i
@@ -8875,17 +9271,18 @@ data/src/share/native/sun/java2d/opengl/OGLVertexCache.c.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsIconFactory.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseStart.java.i
data/src/share/classes/sun/audio/AudioTranslatorStream.java.i
+data/test/sun/security/pkcs11/nss/lib/README.i
data/test/java/util/BitSet/And.java.i
data/test/sun/net/InetAddress/nameservice/dns/Lookup.java.i
data/test/javax/management/remote/mandatory/passwordAccessFile/PasswordAccessFileTest.java.i
-data/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java.i
+data/test/java/beans/PropertyEditor/TestEnumClassNull.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java.i
data/src/solaris/native/sun/nio/ch/InheritedChannel.c.i
data/src/share/classes/sun/security/krb5/internal/KdcErrException.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/gzio.c.i
data/src/share/javavm/include/opcodes.list.i
data/test/java/lang/instrument/InstrumentationHandoff.java.i
-data/test/java/beans/Introspector/Test6194788.java.i
+data/src/share/native/sun/awt/image/dither.c.i
data/test/java/lang/reflect/ReflectPermission/Exceptions.java.i
data/src/share/classes/com/sun/jndi/cosnaming/CNBindingEnumeration.java.i
data/test/org/openjdk/jigsaw/preinstall.sh.i
@@ -8893,27 +9290,31 @@ data/test/com/sun/servicetag/InvalidRegistrationData.java.i
data/src/share/classes/sun/tools/tree/FloatExpression.java.i
data/src/share/classes/com/sun/jdi/event/MonitorContendedEnteredEvent.java.i
data/src/solaris/classes/sun/awt/X11/XWindowPeer.java.i
+data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties.i
data/src/share/classes/java/lang/instrument/UnmodifiableClassException.java.i
data/src/share/classes/sun/io/CharToByteCp949.java.i
-data/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java.i
-data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java.i
-data/src/solaris/native/sun/awt/VDrawingAreaP.h.i
+data/src/share/classes/java/net/SdpSocketImpl.java.i
+data/test/tools/launcher/Makefile.SolarisRunpath.i
data/src/share/classes/sun/text/resources/FormatData_ar_LB.java.i
data/src/share/classes/sun/io/ByteToCharCp284.java.i
data/src/share/classes/com/sun/jndi/dns/Resolver.java.i
data/src/share/classes/sun/security/x509/BasicConstraintsExtension.java.i
data/src/share/classes/sun/net/httpserver/DefaultHttpServerProvider.java.i
-data/src/share/classes/javax/print/attribute/standard/OrientationRequested.java.i
+data/test/java/awt/event/MouseEvent/CheckGetMaskForButton/CheckGetMaskForButton.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java.i
data/src/share/native/common/opcodes.in_out.i
data/src/share/classes/com/sun/jndi/ldap/BerDecoder.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in.i
data/src/solaris/native/sun/awt/awt_xembed.c.i
data/src/share/classes/java/io/FilterWriter.java.i
data/src/share/classes/com/sun/jdi/ObjectReference.java.i
data/src/share/classes/com/sun/media/sound/FFT.java.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_png.c.i
+data/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java.i
data/src/share/classes/javax/swing/CellEditor.java.i
data/test/java/security/Policy/GetPermissions/JarURL.java.i
data/test/java/lang/instrument/AppendToClassPathTest.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Pointer.java.i
data/src/share/classes/java/nio/file/Files.java.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java.i
data/src/share/classes/javax/swing/plaf/nimbus/NimbusStyle.java.i
@@ -8935,11 +9336,11 @@ data/test/java/net/Socket/TestTcpNoDelay.java.i
data/src/share/classes/sun/beans/editors/DoubleEditor.java.i
data/src/share/classes/java/security/cert/CertificateFactory.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java.i
-data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h.i
+data/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif.i
data/src/share/classes/java/security/cert/CertificateNotYetValidException.java.i
data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/netbeans-targets.xml.i
data/src/share/classes/sun/rmi/transport/Endpoint.java.i
-data/test/sun/security/tools/policytool/ChangeUI.html.i
+data/src/share/classes/java/lang/reflect/Member.java.i
data/src/share/native/sun/awt/medialib/mlib_sys.h.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnspr4.so.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpAdaptorServer.java.i
@@ -8952,43 +9353,43 @@ data/src/share/classes/javax/sound/sampled/BooleanControl.java.i
data/test/java/io/Serializable/6559775/SerialVictim.java.i
data/src/share/classes/sun/io/CharToByteCp871.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1140.java.i
+data/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java.i
data/src/share/sample/vm/jvm-clr/README.txt.i
data/src/share/native/com/sun/media/sound/MidiOutDevice.c.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inffast.h.i
data/test/java/lang/instrument/RedefineClassesTests.java.i
data/src/windows/native/sun/windows/awt_IconCursor.cpp.i
-data/src/share/classes/javax/swing/LayoutComparator.java.i
+data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.java.i
data/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/run_any_task.sh.i
data/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/IconManager.java.i
+data/src/macosx/native/jobjc/README.txt.i
+data/test/java/nio/channels/Selector/OpRead.java.i
data/src/share/classes/java/lang/module/ModuleNotPresentException.java.i
data/test/java/awt/font/TextLayout/UnderlinePositionTest.java.i
data/src/share/classes/java/awt/event/MouseMotionListener.java.i
-data/src/solaris/transport/socket/socket_md.h.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Invoke.java.i
data/src/share/classes/javax/imageio/spi/ImageInputStreamSpi.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c.i
data/test/java/rmi/transport/httpSocket/security.policy.i
data/src/share/classes/java/awt/geom/RectIterator.java.i
data/test/demo/jvmti/waiters/WaitersTest.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/HeadTail.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c.i
+data/src/share/classes/sun/tools/jconsole/resources/connected16.png.i
data/src/share/classes/java/util/PriorityQueue.java.i
data/test/sun/misc/Encode/Encode.java.i
data/test/sun/security/provider/PolicyParser/p001.policy.i
-data/test/sun/security/provider/PolicyFile/Alias.policy.i
+data/src/share/native/sun/font/layout/PairPositioningSubtables.h.i
data/src/share/classes/java/awt/image/SampleModel.java.i
data/test/java/rmi/reliability/benchmark/bench/BenchInfo.java.i
data/src/solaris/doc/sun/man/man1/rmic.1.i
-data/src/solaris/classes/sun/awt/X11/XContentWindow.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_fi.properties.i
data/src/share/classes/javax/net/ssl/TrustManagerFactorySpi.java.i
data/src/windows/classes/sun/security/mscapi/JarVerifier.java.i
data/src/share/native/sun/awt/libpng/README.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c.i
data/src/share/classes/java/security/spec/PSSParameterSpec.java.i
-data/test/javax/management/openmbean/CompositeDataStringTest.java.i
-data/src/share/classes/com/sun/beans/decoder/AccessorElementHandler.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java.i
+data/src/share/classes/javax/print/attribute/PrintJobAttribute.java.i
+data/test/sun/security/util/DerValue/EmptyValue.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/package.html.i
data/src/share/classes/sun/misc/GC.java.i
data/src/share/classes/javax/management/monitor/MonitorSettingException.java.i
@@ -9001,20 +9402,20 @@ data/test/java/util/concurrent/ThreadPoolExecutor/Custom.java.i
data/test/javax/swing/JColorChooser/Test4177735.java.i
data/test/sun/security/provider/MessageDigest/TestSHAClone.java.i
data/src/linux/doc/man/ja/servertool.1.i
-data/test/java/io/Serializable/oldTests/CircularList.java.i
+data/src/solaris/classes/sun/awt/XSettings.java.i
data/test/java/util/zip/ZipFile/input.zip.i
data/test/com/sun/jndi/ldap/LdapsReadTimeoutTest.java.i
+data/src/share/classes/com/sun/jmx/event/LeaseManager.java.i
data/src/share/classes/com/sun/jmx/snmp/mpm/SnmpMsgTranslator.java.i
data/src/solaris/hpi/native_threads/src/monitor_md.c.i
-data/src/share/classes/javax/naming/TimeLimitExceededException.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java.i
data/make/jpda/front/Makefile.i
data/src/share/classes/java/nio/file/PathMatcher.java.i
data/src/share/classes/sun/io/ByteToCharMS950_HKSCS.java.i
data/test/java/lang/String/ToUpperCase.java.i
+data/src/share/classes/sun/net/www/http/HttpClient.java.i
data/src/share/classes/javax/accessibility/AccessibleText.java.i
data/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c.i
-data/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog.i
+data/test/java/util/Formatter/Basic.java.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java.i
data/src/share/classes/javax/swing/DefaultListSelectionModel.java.i
data/src/share/classes/sun/text/resources/FormatData_en_AU.java.i
@@ -9023,38 +9424,42 @@ data/test/sun/security/krb5/auto/TwoPrinces.java.i
data/test/java/lang/invoke/ThrowExceptionsTest.java.i
data/src/share/classes/javax/swing/text/StringContent.java.i
data/test/java/io/PipedReader/ReadToArray.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-40.xml.i
data/src/share/classes/com/sun/tools/hat/internal/oql/OQLException.java.i
data/src/share/classes/com/sun/jarsigner/package.html.i
data/src/share/classes/javax/swing/text/DefaultTextUI.java.i
data/src/share/classes/sun/font/GlyphLayout.java.i
data/src/share/classes/java/sql/Timestamp.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so.i
+data/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java.i
data/src/share/classes/java/nio/exceptions.i
data/src/share/native/sun/awt/medialib/mlib_image_get.h.i
data/test/java/lang/instrument/ilib/Options.java.i
data/src/share/classes/sun/util/resources/LocaleNames_ms.properties.i
+data/src/share/demo/management/FullThreadDump/ThreadMonitor.java.i
data/src/share/classes/sun/io/CharToByteMacGreek.java.i
data/src/solaris/native/java/util/logging.c.i
data/make/sun/applet/Makefile.i
data/src/share/classes/sun/security/ssl/Debug.java.i
data/src/share/classes/javax/swing/plaf/SpinnerUI.java.i
data/src/solaris/classes/sun/awt/motif/MEmbeddedFrame.java.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java.i
data/src/share/classes/java/util/TreeSet.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/EchoImpl.java.i
-data/src/solaris/native/sun/awt/color.h.i
+data/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
data/src/share/classes/com/oracle/net/Sdp.java.i
data/src/share/demo/nbproject/jfc/Notepad/nbproject/netbeans-targets.xml.i
data/test/java/text/Bidi/BidiBug.java.i
data/test/java/net/URI/Test.java.i
data/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java.i
+data/src/share/classes/sun/tools/jconsole/OverviewPanel.java.i
data/test/java/lang/management/ThreadMXBean/DisableTest.java.i
data/test/sun/security/pkcs11/tls/TestPremaster.java.i
data/test/sun/nio/ch/SelProvider.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/StackFrame.java.i
data/src/share/classes/sun/net/httpserver/TimeSource.java.i
data/src/share/classes/sun/security/krb5/internal/EncKDCRepPart.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java.i
+data/test/sun/management/jmxremote/startstop/management_cl.properties.i
data/src/share/classes/javax/swing/plaf/multi/MultiListUI.java.i
data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandard.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java.i
@@ -9062,53 +9467,51 @@ data/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java.i
data/test/java/beans/XMLDecoder/spec/TestChar.java.i
data/make/tools/src/build/tools/jdwpgen/RootNode.java.i
data/test/java/beans/XMLDecoder/spec/TestByte.java.i
-data/src/share/demo/management/JTop/JTop.java.i
+data/src/share/classes/sun/misc/VMNotification.java.i
data/src/share/classes/sun/text/resources/FormatData_be.java.i
-data/src/share/classes/sun/applet/AppletViewerFactory.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.java.i
data/test/sun/security/krb5/auto/LoginModuleOptions.java.i
data/make/tools/swing-beans/beaninfo/images/JSeparatorMono16.gif.i
+data/make/sun/jawt/mapfile-vers.i
data/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclBlock.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringConstantMonitor.java.i
data/test/java/awt/Graphics/LCDTextAndGraphicsState.java.i
data/src/share/classes/sun/awt/KeyboardFocusManagerPeerImpl.java.i
data/src/share/classes/java/lang/NumberFormatException.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_MT.properties.i
-data/src/share/classes/javax/swing/JRadioButtonMenuItem.java.i
+data/test/com/sun/crypto/provider/TLS/TestPremaster.java.i
data/src/share/classes/sun/io/CharToByteCp1255.java.i
data/test/java/io/StreamTokenizer/NullConstruct.java.i
data/test/javax/management/Introspector/LegacyIntrospectorTest.java.i
+data/test/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java.i
data/src/share/classes/javax/rmi/ssl/SslRMIServerSocketFactory.java.i
-data/src/share/classes/sun/tools/tree/ShiftLeftExpression.java.i
-data/src/share/classes/javax/swing/DebugGraphicsFilter.java.i
+data/src/share/classes/sun/io/CharToByteSJIS.java.i
data/src/share/classes/sun/misc/CEStreamExhausted.java.i
data/make/netbeans/common/sample-view.ent.i
-data/test/com/sun/jdi/TargetListener.java.i
-data/src/windows/native/com/sun/management/OperatingSystem_md.c.i
+data/src/share/classes/sun/util/resources/OpenListResourceBundle.java.i
data/test/sun/nio/cs/TestIllegalSJIS.java.i
data/THIRD_PARTY_README.i
data/src/share/classes/com/sun/jmx/snmp/SnmpAckPdu.java.i
data/test/java/util/ResourceBundle/Control/StressOut_zh_CN.properties.i
-data/src/solaris/classes/sun/awt/X11/XChoicePeer.java.i
+data/src/share/classes/com/sun/management/DiagnosticCommandInfo.java.i
data/src/share/classes/java/lang/reflect/WildcardType.java.i
-data/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java.i
data/test/sun/security/tools/jarsigner/a%b/percent.keystore.i
data/src/share/native/sun/font/layout/IndicRearrangementProcessor.h.i
data/src/share/classes/java/awt/dnd/DragSourceContext.java.i
data/src/share/classes/com/sun/inputmethods/internal/thaiim/ThaiRules.java.i
-data/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java.i
data/make/jpda/tty/Makefile.i
-data/test/java/beans/Beans/Test4067824.java.i
+data/test/demo/jvmti/gctest/BigHello.java.i
+data/src/macosx/classes/sun/awt/CGraphicsConfig.java.i
data/src/linux/doc/man/wsimport.1.i
data/src/share/classes/javax/swing/plaf/basic/BasicTableUI.java.i
data/src/share/classes/java/text/RBCollationTables.java.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init1.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/japanese.ut8.txt.i
data/src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java.i
-data/test/javax/management/MBeanServer/MBeanServerNotificationTest.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java.i
-data/test/javax/print/attribute/ServiceDialogTest.java.i
data/src/share/demo/jvmti/waiters/README.txt.i
+data/src/share/native/java/lang/fdlibm/src/w_gamma.c.i
data/src/share/classes/sun/util/resources/CurrencyNames.properties.i
data/test/java/nio/channels/SocketChannel/OpenLeak.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/PrematureLoadTest.java.i
@@ -9118,49 +9521,47 @@ data/src/solaris/native/sun/awt/awt_xembed_server.h.i
data/test/java/lang/Thread/StackTraces.java.i
data/test/java/util/ResourceBundle/Test4314141B_fr_CH.java.i
data/test/java/nio/file/Files/DeleteOnClose.java.i
-data/test/sun/tools/jstatd/jstatdUsage1.sh.i
+data/src/solaris/native/sun/awt/awt_Font.c.i
data/src/share/sample/nio/server/Server.java.i
+data/make/java/redist/FILES.gmk.i
data/src/solaris/classes/sun/awt/motif/X11DragSourceContextPeer.java.i
-data/src/share/native/sun/awt/image/jpeg/jctrans.c.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java.i
data/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/Foo.java.i
-data/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java.i
+data/src/macosx/native/sun/awt/OSVersion.m.i
+data/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java.i
+data/make/sun/security/pkcs11/Makefile.i
data/test/java/io/Serializable/PutField/Read2.java.i
data/src/share/classes/sun/io/CharToByteISO2022KR.java.i
data/src/share/lib/sound.properties.i
data/test/com/sun/net/httpserver/Test8.java.i
data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java.i
-data/src/share/classes/javax/management/event/RMIPushEventForwarder.java.i
data/src/share/classes/com/sun/jndi/cosnaming/CNCtxFactory.java.i
data/src/share/classes/javax/sound/midi/Synthesizer.java.i
data/test/java/lang/reflect/Generics/exceptionCauseTest.java.i
data/src/share/classes/sun/io/CharToByteCp1141.java.i
data/test/java/nio/file/Path/DeleteOnClose.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java.i
-data/src/share/classes/sun/util/ResourceBundleEnumeration.java.i
+data/src/share/classes/sun/io/ByteToCharISO2022CN.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskBlit.cpp.i
data/test/java/lang/instrument/TransformerManagementThreadRemoveTests.java.i
data/test/java/nio/charset/CharsetDecoder/AverageMax.java.i
data/src/share/classes/java/lang/module/ModuleClassLoader.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplc4.so.i
-data/test/java/util/Locale/LocaleCategory.sh.i
data/src/share/classes/sun/io/CharToByteCp937.java.i
data/src/share/classes/java/nio/file/ProviderMismatchException.java.i
-data/src/share/classes/java/security/UnrecoverableKeyException.java.i
data/src/share/classes/java/security/spec/RSAKeyGenParameterSpec.java.i
data/test/java/security/Policy/GetInstance/GetInstanceProvider.java.i
data/src/share/classes/sun/management/MonitorInfoCompositeData.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformAbsolute.java.i
+data/test/java/beans/XMLEncoder/java_awt_ScrollPane.java.i
data/test/java/lang/Class/getDeclaredField/Exceptions.java.i
data/src/share/classes/javax/xml/crypto/dom/DOMStructure.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/package.html.i
+data/test/sun/net/www/protocol/http/RelativeRedirect.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextConstructionTests.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/infblock.c.i
+data/src/share/classes/javax/swing/plaf/synth/SynthContext.java.i
data/test/sun/security/tools/jarsigner/emptymanifest.sh.i
data/test/java/lang/String/CaseConvertSameInstance.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java.i
+data/src/share/classes/java/nio/charset/Charset-X-Coder.java.i
data/src/share/classes/sun/java2d/loops/FillSpans.java.i
data/src/share/classes/sun/font/CharToGlyphMapper.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/security.policy.i
@@ -9169,6 +9570,7 @@ data/test/sun/security/krb5/canonicalize/Test.java.i
data/src/share/classes/java/security/spec/RSAOtherPrimeInfo.java.i
data/src/share/classes/sun/net/httpserver/ChunkedOutputStream.java.i
data/src/share/classes/javax/swing/text/html/ObjectView.java.i
+data/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf.i
data/src/share/classes/javax/security/cert/CertificateException.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/SmallObjTreeCalls.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadingImpl.java.i
@@ -9178,34 +9580,40 @@ data/test/javax/sound/sampled/FileWriter/AlawEncoderSync.java.i
data/test/java/util/IllegalFormatException/Constructors.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java.i
data/src/share/classes/sun/tools/jstat/Parser.java.i
+data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.c.i
data/src/share/native/java/lang/fdlibm/src/s_scalbn.c.i
+data/src/share/classes/java/util/TooManyListenersException.java.i
+data/src/macosx/classes/sun/lwawt/macosx/event/NSEvent.java.i
data/src/share/native/sun/security/ec/ecp.h.i
data/test/java/math/BigInteger/ModPow.java.i
data/src/share/back/debugLoop.h.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/UIPropertyMapper.java.i
+data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties.i
data/test/java/rmi/activation/Activatable/nonExistentActivatable/rmid.security.policy.i
-data/src/share/classes/sun/nio/cs/ISO_8859_9.java.i
-data/src/share/classes/sun/misc/JavaNetHttpCookieAccess.java.i
+data/src/share/classes/sun/management/GcInfoCompositeData.java.i
+data/make/mksample/nio/Makefile.i
data/src/share/classes/org/openjdk/internal/joptsimple/RequiredArgumentOptionSpec.java.i
data/src/share/classes/com/sun/management/GcInfo.java.i
data/test/javax/sound/midi/Gervill/ModelSource/SetIdentifier.java.i
-data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html.i
data/src/share/classes/javax/management/remote/rmi/RMIIIOPServerImpl.java.i
data/test/java/util/Locale/Bug4518797.java.i
-data/src/share/classes/sun/font/FileFontStrike.java.i
-data/test/javax/accessibility/6986385/bug6986385.java.i
+data/test/com/sun/jdi/RedefineFinal.sh.i
+data/test/sun/security/pkcs11/ec/p12passwords.txt.i
data/test/java/awt/Frame/UnfocusableMaximizedFrameResizablity/UnfocusableMaximizedFrameResizablity.java.i
data/src/share/classes/sun/java2d/pisces/Curve.java.i
data/test/java/util/PluggableLocale/providersrc/java.text.spi.NumberFormatProvider.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneMono32.gif.i
data/src/share/classes/sun/rmi/rmic/newrmic/BatchEnvironment.java.i
data/test/java/security/KeyRep/DH.pre.1.5.key.i
-data/test/java/awt/PrintJob/PrintArcTest/PrintArcTest.java.i
+data/src/macosx/native/sun/awt/ApplicationDelegate.h.i
+data/test/com/sun/jdi/CatchCaughtTest.sh.i
data/src/share/classes/java/security/cert/CertPathValidatorSpi.java.i
+data/src/share/classes/javax/swing/ScrollPaneConstants.java.i
data/src/share/classes/java/rmi/MarshalledObject.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java.i
data/src/share/classes/sun/util/resources/LocaleNames_de.properties.i
-data/src/share/classes/sun/misc/Sort.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/DSAKeyValue.java.i
data/test/javax/crypto/SecretKeyFactory/P1SecretKeyFactory.java.i
data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java.i
@@ -9215,32 +9623,32 @@ data/test/java/nio/file/Files/ForceLoad.java.i
data/src/share/classes/sun/awt/image/OffScreenImage.java.i
data/test/sun/security/krb5/krb5-capaths.conf.i
data/test/java/lang/reflect/Module/module-annotation.sh.i
-data/test/javax/swing/JScrollBar/6924059/bug6924059.java.i
+data/test/java/util/ResourceBundle/Control/XmlRB_ja.xml.i
data/src/share/demo/jvmti/hprof/hprof_error.c.i
-data/test/java/net/SocketPermission/NoAction.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java.i
data/src/share/classes/sun/io/ByteToCharCp297.java.i
-data/test/javax/management/namespace/DomainCreationTest.java.i
+data/test/com/sun/tools/attach/redefineagent.mf.i
data/make/java/nio/Exportedfiles.gmk.i
data/test/sun/tools/jhat/HatHeapDump1Test.java.i
data/test/javax/swing/UIManager/Test6657026.java.i
data/src/share/sample/scripting/scriptpad/nbproject/project.xml.i
-data/test/javax/imageio/plugins/bmp/TopDownTest.java.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java.i
data/src/share/classes/java/lang/SafeVarargs.java.i
-data/test/sun/security/tools/keytool/CloneKeyAskPassword.sh.i
+data/src/share/classes/sun/tools/tree/UnaryExpression.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassFileParser.java.i
data/src/share/classes/javax/swing/text/html/CSSParser.java.i
-data/test/sun/security/rsa/TestKeyPairGenerator.java.i
data/test/com/sun/crypto/provider/Cipher/DES/Sealtest.java.i
data/test/javax/swing/JList/6823603/bug6823603.java.i
data/src/share/demo/applets/NervousText/example1.html.i
-data/src/share/classes/sun/nio/cs/ISO_8859_4.java.i
+data/src/share/classes/sun/java2d/cmm/lcms/LCMS.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/SynthModel.java.i
-data/src/solaris/native/common/jdk_util_md.h.i
-data/test/javax/crypto/SealedObject/NullKeySealedObject.java.i
+data/src/share/native/sun/font/FontInstanceAdapter.h.i
data/test/sun/security/krb5/auto/SPNEGO.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java.i
data/test/javax/swing/JFileChooser/6945316/bug6945316.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c.i
-data/test/java/lang/instrument/RedefineMethodAddInvokeTarget.java.i
+data/make/tools/reorder/tools/util-i586.il.i
+data/src/share/native/sun/awt/libpng/pngerror.c.i
data/src/windows/native/sun/windows/colordata.h.i
data/test/javax/management/eventService/FetchingTest.java.i
data/test/java/net/URL/B5086147.java.i
@@ -9248,30 +9656,25 @@ data/src/share/classes/javax/security/auth/login/FailedLoginException.java.i
data/src/share/classes/sun/nio/fs/AbstractFileSystemProvider.java.i
data/src/share/classes/sun/util/resources/CalendarData_tr.properties.i
data/src/share/transport/socket/socketTransport.h.i
+data/src/share/classes/sun/text/resources/CollationData_sr_Latn.java.i
data/test/java/io/PipedInputStream/Constructors.java.i
-data/src/share/native/java/util/zip/zlib-1.2.5/inffixed.h.i
data/test/java/util/Collections/CheckedQueue.java.i
data/src/share/classes/javax/swing/SwingConstants.java.i
data/src/share/classes/javax/swing/ComboBoxModel.java.i
data/test/javax/swing/JColorChooser/Test6348456.html.i
-data/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls.i
data/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.java.i
data/test/javax/management/remote/mandatory/connection/DeadLockTest.java.i
data/src/share/classes/javax/swing/event/InternalFrameAdapter.java.i
data/test/sun/security/tools/jarsigner/oldsig/A.jar.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubNextRequestHandler.java.i
-data/test/java/lang/StringBuffer/Supplementary.java.i
data/test/javax/management/loading/MLetCLR/MLetCommand.java.i
-data/test/java/beans/Introspector/4520754/Foo.java.i
data/make/sun/cmm/lcms/FILES_c_windows.gmk.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Repositor.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageWriter.java.i
data/src/share/classes/sun/tools/jstat/Literal.java.i
data/src/windows/native/sun/windows/awt_Unicode.cpp.i
data/make/modules/image.awt.ls.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_CL.properties.i
data/make/sun/awt/mapfile-vers.i
-data/make/sun/security/ec/Makefile.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java.i
data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.java.i
data/make/tools/src/build/tools/jdwpgen/ErrorNode.java.i
data/src/share/classes/sun/applet/AppletMessageHandler.java.i
@@ -9287,20 +9690,19 @@ data/src/share/classes/java/awt/im/InputSubset.java.i
data/src/share/native/sun/awt/image/cvutils/img_output8_32.h.i
data/src/share/classes/sun/swing/DefaultLayoutStyle.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c.i
+data/src/macosx/classes/com/apple/laf/AquaToolTipUI.java.i
data/src/share/classes/sun/awt/image/ImageRepresentation.java.i
data/src/solaris/classes/sun/security/provider/NativeSeedGenerator.java.i
data/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.c.i
data/src/share/classes/javax/print/AttributeException.java.i
data/test/java/net/ipv6tests/Tests.java.i
data/src/share/classes/sun/security/jgss/krb5/Krb5Token.java.i
-data/test/java/security/BasicPermission/SerialVersion.java.i
+data/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java.i
data/src/share/classes/java/nio/file/FileVisitResult.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java.i
data/src/share/classes/java/security/KeyStoreSpi.java.i
data/src/share/native/sun/java2d/opengl/OGLFuncs.c.i
-data/make/tools/CharsetMapping/IBM037.nr.i
data/src/share/classes/sun/awt/geom/Edge.java.i
-data/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java.i
data/src/share/demo/nbproject/jfc/Metalworks/build.xml.i
data/src/share/classes/sun/security/util/Cache.java.i
data/src/share/classes/sun/net/ftp/FtpLoginException.java.i
@@ -9311,6 +9713,7 @@ data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Mono.java.i
data/src/solaris/hpi/export/hpi_md.h.i
data/test/java/io/FileOutputStream/AtomicAppend.java.i
data/src/share/classes/sun/net/www/protocol/mailto/MailToURLConnection.java.i
+data/src/windows/native/sun/jkernel/kernel.def.i
data/test/java/nio/channels/Selector/CloseInvalidatesKeys.java.i
data/src/windows/transport/socket/socket_md.h.i
data/src/share/classes/java/lang/invoke/FilterGeneric.java.i
@@ -9320,7 +9723,7 @@ data/test/sun/security/util/Resources/NewResourcesNames.java.i
data/test/javax/swing/plaf/nimbus/Test6919629.java.i
data/test/java/util/IdentityHashMap/EntrySetIteratorRemoveInvalidatesEntry.java.i
data/src/share/classes/com/sun/media/sound/SoftControl.java.i
-data/test/java/nio/Buffer/CopyDirect-X-Memory.java.template.i
+data/src/share/classes/java/rmi/activation/UnknownGroupException.java.i
data/make/mksample/scripting/scriptpad/Makefile.i
data/src/share/native/java/util/zip/zlib-1.1.3/trees.c.i
data/src/share/classes/java/math/BigInteger.java.i
@@ -9330,34 +9733,33 @@ data/test/java/util/zip/ZipEntry/Clone.java.i
data/src/share/classes/java/util/concurrent/ScheduledFuture.java.i
data/make/tools/src/build/tools/jdwpgen/NameValueNode.java.i
data/src/share/classes/java/awt/peer/RobotPeer.java.i
-data/src/share/classes/sun/java2d/SunCompositeContext.java.i
+data/src/macosx/native/sun/awt/GeomUtilities.h.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/homeFolder.gif.i
data/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java.i
data/test/javax/swing/plaf/synth/6771547/SynthTest.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiTableUI.java.i
data/test/sun/nio/cs/OLD/DBCS_IBM_ASCII_Decoder.java.i
+data/src/share/classes/java/lang/CloneNotSupportedException.java.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListTransferable.java.i
data/test/sun/nio/cs/X11CNS11643P2.java.i
-data/test/java/security/cert/CertPathValidatorException/cert_file.i
+data/src/share/classes/java/dyn/MethodHandleImpl.java.i
data/src/share/classes/java/nio/file/Watchable.java.i
data/test/java/util/ResourceBundle/Bug6356571.java.i
-data/test/java/net/URLConnection/UNCTest.java.i
data/test/java/util/ResourceBundle/KeySetResources.properties.i
data/src/share/demo/jvmti/hprof/hprof_loader.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureInputDebugger.java.i
data/src/share/classes/sun/management/ManagementFactory.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java.i
data/src/solaris/classes/sun/nio/fs/LinuxFileSystemProvider.java.i
-data/src/solaris/classes/sun/awt/X11/XAtomList.java.i
data/src/share/classes/com/sun/net/ssl/internal/ssl/X509ExtendedTrustManager.java.i
-data/src/share/native/sun/reflect/Reflection.c.i
+data/src/share/classes/sun/io/ByteToCharCp1145.java.i
data/src/share/classes/javax/management/MBeanServerFactory.java.i
-data/src/solaris/classes/sun/java2d/xr/XRMaskImage.java.i
-data/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties.i
+data/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif.i
data/src/solaris/demo/jni/Poller/Poller.c.i
+data/src/share/classes/sun/java2d/StateTrackableDelegate.java.i
data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/DummySourceDataLine.java.i
data/src/share/classes/sun/tools/tree/DivRemExpression.java.i
-data/src/solaris/doc/sun/man/man1/ja/serialver.1.i
data/test/com/sun/jdi/SimulResumerTest.java.i
data/test/javax/swing/text/DefaultHighlighter/6771184/bug6771184.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollPaneUI.java.i
@@ -9373,9 +9775,10 @@ data/src/share/classes/javax/accessibility/AccessibleState.java.i
data/src/share/classes/sun/security/krb5/internal/ktab/KeyTabEntry.java.i
data/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java.i
data/test/java/lang/Thread/HoldsLock.java.i
-data/test/com/sun/jdi/SourceNameFilterTest.java.i
+data/test/java/nio/channels/SocketChannel/CloseAfterConnect.java.i
data/test/java/io/BufferedReader/EOL.java.i
data/test/sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java.i
+data/src/share/classes/sun/io/CharToByteCp1097.java.i
data/test/java/lang/Runtime/exec/ExitValue.java.i
data/src/share/classes/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java.i
data/src/solaris/native/sun/awt/awt_MenuItem.h.i
@@ -9387,19 +9790,20 @@ data/src/share/classes/javax/swing/ListSelectionModel.java.i
data/src/share/classes/javax/print/attribute/standard/MediaSizeName.java.i
data/src/share/classes/sun/awt/image/SurfaceManager.java.i
data/make/netbeans/common/architectures/name-Linux.properties.i
-data/src/windows/native/sun/windows/awt_DataTransferer.h.i
data/test/java/lang/instrument/PremainClass/NoPremainAgent.sh.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in.i
+data/src/bsd/doc/man/jstack.1.i
+data/test/javax/management/MBeanServer/OldMBeanServerTest.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CategoryClassClassFile.java.i
data/make/sun/security/krb5/FILES_c_windows.gmk.i
data/src/share/classes/java/awt/dnd/DragGestureListener.java.i
+data/test/java/io/Serializable/unshared/Read.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionSet.java.i
data/src/share/classes/com/sun/tools/attach/AttachNotSupportedException.java.i
data/test/sun/security/x509/AVA/EmptyValue.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonUI.java.i
-data/src/share/classes/com/sun/jdi/InvalidStackFrameException.java.i
data/src/windows/hpi/include/mutex_md.h.i
data/make/tools/reorder/tests/IntToString.java.i
-data/src/windows/native/java/net/net_util_md.c.i
+data/src/share/instrument/PathCharsValidator.h.i
data/src/share/classes/javax/swing/plaf/ScrollBarUI.java.i
data/src/share/classes/com/sun/media/sound/MidiOutDevice.java.i
data/src/share/classes/java/awt/Conditional.java.i
@@ -9407,11 +9811,10 @@ data/src/share/classes/java/lang/doc-files/upsilon.gif.i
data/src/share/classes/com/sun/jndi/dns/ZoneNode.java.i
data/src/share/classes/java/lang/management/CompilationMXBean.java.i
data/src/share/classes/javax/smartcardio/CardException.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuBarColor32.gif.i
-data/test/java/awt/xembed/server/TestXEmbedServerJava.java.i
+data/test/java/util/Hashtable/IllegalLoadFactor.java.i
data/test/java/lang/Class/getMethod/NullInParamList.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/JavaLang.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java.i
-data/test/java/beans/PropertyEditor/TestShortTypeJava.java.i
data/src/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java.i
data/test/java/lang/ClassLoader/GetPackage.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c.i
@@ -9419,113 +9822,119 @@ data/src/share/classes/javax/swing/plaf/synth/SynthPasswordFieldUI.java.i
data/src/solaris/doc/sun/man/man1/ja/appletviewer.1.i
data/src/share/classes/java/awt/Toolkit.java.i
data/src/share/classes/sun/nio/ch/IOUtil.java.i
-data/test/java/io/Serializable/arraySuidConflict/Read.java.i
data/src/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java.i
data/test/sun/security/krb5/edu.mit.Kerberos.i
-data/test/java/util/Collections/FindSubList.java.i
+data/test/java/nio/file/Files/walkFileTree/denyAll.policy.i
+data/src/macosx/classes/sun/lwawt/macosx/CClipboard.java.i
+data/make/tools/src/build/tools/javazic/Rule.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIComponent.java.i
data/src/share/classes/sun/awt/datatransfer/TransferableProxy.java.i
data/src/share/classes/javax/script/CompiledScript.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java.i
data/test/sun/net/www/protocol/ftp/HandlerEquals.java.i
-data/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java.i
data/test/sun/security/ssl/sun/net/www/http/ChunkedOutputStream/Test.java.i
data/test/java/nio/file/WatchService/denyAll.policy.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_ko.properties.i
-data/test/javax/management/MBeanServer/DynamicWrapperMBeanTest.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java.i
+data/src/share/classes/com/sun/security/auth/NTUserPrincipal.java.i
+data/make/common/internal/NativeCompileRules.gmk.i
data/src/solaris/native/sun/awt/awt_Event.h.i
data/src/share/classes/javax/swing/event/HyperlinkEvent.java.i
-data/src/solaris/hpi/native_threads/include/threads_md.h.i
data/src/share/classes/sun/launcher/resources/launcher_it.properties.i
-data/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif.i
+data/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java.i
data/src/share/classes/sun/font/TextLabel.java.i
data/src/share/classes/sun/awt/im/InputMethodContext.java.i
data/make/jpda/gui/Makefile.i
data/test/java/security/cert/CertPathBuilder/selfIssued/README.i
+data/src/macosx/classes/com/apple/eawt/event/SwipeListener.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptionProperty.java.i
data/test/javax/swing/JColorChooser/Test4759306.html.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformer.java.i
data/make/tools/swing-beans/beaninfo/images/JListColor32.gif.i
-data/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c.i
data/test/java/io/charStreams/LineNumbers.java.i
data/src/share/classes/sun/tools/tree/IdentifierExpression.java.i
+data/src/bsd/doc/man/ja/jdb.1.i
+data/make/java/nio/genCoder.sh.i
data/test/sun/security/pkcs11/KeyStore/BasicData/ca.cert.i
-data/test/com/sun/jdi/PrivateTransportTest.sh.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DRIMarkerSegment.java.i
data/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java.i
data/src/share/classes/javax/print/attribute/standard/Compression.java.i
data/test/java/net/URLConnection/xml/xml2.xml.i
data/test/java/beans/Introspector/6976577/Test6976577.java.i
-data/src/share/classes/sun/tools/jstat/ExpressionExecuter.java.i
+data/src/share/classes/sun/awt/geom/Order2.java.i
data/src/share/classes/sun/nio/cs/ext/MacUkraine.java.i
data/src/share/native/java/lang/fdlibm/src/s_asinh.c.i
data/src/share/back/eventHelper.h.i
data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java.i
+data/test/java/nio/channels/FileChannel/Write.java.i
data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.c.i
data/test/com/sun/servicetag/registration.xml.i
data/src/windows/classes/sun/java2d/d3d/D3DRenderer.java.i
-data/src/share/classes/sun/tracing/dtrace/DTraceProbe.java.i
+data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsSupported.java.i
data/src/share/classes/com/sun/jdi/BooleanValue.java.i
data/test/java/util/concurrent/Phaser/Basic.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java.i
data/src/share/classes/java/awt/dnd/MouseDragGestureRecognizer.java.i
data/test/com/sun/servicetag/servicetag3.properties.i
-data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java.i
-data/test/java/awt/MultipleGradientPaint/MultiGradientTest.java.i
+data/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java.i
data/test/tools/launcher/UnicodeCleanup.java.i
-data/src/share/classes/sun/text/normalizer/UProperty.java.i
+data/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java.i
data/src/share/classes/com/sun/jmx/interceptor/DomainDispatchInterceptor.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509IssuerSerialResolver.java.i
data/src/share/classes/sun/net/www/protocol/http/logging/HttpLogFormatter.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/dk/Des3DkCrypto.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java.i
data/src/share/demo/management/VerboseGC/PrintGCStat.java.i
-data/src/share/classes/javax/imageio/ImageWriter.java.i
-data/test/sun/nio/cs/OLD/IBM949_OLD.java.i
-data/src/windows/native/sun/java2d/d3d/D3DShaders.h.i
+data/test/javax/swing/border/Test4760089.java.i
+data/src/share/classes/com/sun/tools/extcheck/ExtCheck.java.i
data/src/share/classes/javax/management/namespace/JMXNamespaceView.java.i
data/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh.i
data/src/share/classes/sun/tools/jconsole/resources/collapse-winlf.png.i
data/test/java/awt/image/LookupOp/SingleArrayTest.java.i
data/make/com/sun/java/browser/net/Makefile.i
-data/src/share/classes/sun/reflect/generics/tree/BaseType.java.i
+data/make/sun/security/mscapi/Makefile.i
data/test/javax/swing/text/html/TableView/7030332/bug7030332.html.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Element.java.i
data/make/tools/CharsetMapping/HKSCS2008.map.i
-data/src/share/classes/sun/security/pkcs/PKCS7.java.i
+data/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html.i
data/src/share/classes/javax/print/attribute/standard/PrinterResolution.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java.i
-data/test/javax/management/Introspector/ImmutableNotificationInfoTest.java.i
+data/test/java/awt/KeyboardFocusmanager/TypeAhead/TestDialogTypeAhead.html.i
data/test/javax/swing/plaf/metal/MetalBumps/Test6657026.java.i
data/test/java/awt/Focus/ConsumeNextKeyTypedOnModalShowTest/ConsumeNextKeyTypedOnModalShowTest.java.i
data/test/java/lang/management/BufferPoolMXBean/Basic.java.i
-data/test/sun/security/krb5/auto/DynamicKeytab.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_PA.java.i
+data/src/share/classes/java/awt/HeadlessException.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java.i
data/src/share/classes/com/sun/tools/jdi/FloatTypeImpl.java.i
data/src/solaris/classes/sun/nio/fs/UnixFileStoreAttributes.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java.i
-data/test/java/util/logging/LoggerWeakRefLeak.java.i
+data/test/java/io/Serializable/oldTests/WritePrimitive.java.i
data/test/java/beans/PropertyChangeSupport/Test7087429.java.i
data/src/share/classes/sun/security/jgss/GSSCaller.java.i
data/test/java/lang/instrument/GetObjectSizeTest.java.i
data/src/solaris/bin/amd64/jvm.cfg.i
data/src/share/classes/java/awt/List.java.i
data/make/com/sun/java/Makefile.i
-data/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java.i
+data/src/share/classes/sun/security/ec/ECPublicKeyImpl.java.i
+data/src/macosx/classes/com/apple/laf/AquaUtilControlSize.java.i
data/src/share/classes/com/sun/jdi/CharType.java.i
data/src/share/classes/javax/print/attribute/standard/Copies.java.i
data/src/share/classes/com/sun/jmx/remote/util/EventClientConnection.java.i
data/src/share/classes/sun/beans/editors/ShortEditor.java.i
data/src/share/classes/java/lang/Object.java.i
-data/test/java/util/PriorityQueue/RemoveContains.java.i
-data/test/java/nio/charset/StandardCharsets/Standard.java.i
+data/src/share/classes/com/sun/jdi/event/VMStartEvent.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/package.html.i
-data/src/share/classes/sun/text/resources/FormatData_th_TH_TH.java.i
data/src/share/classes/java/lang/ProcessBuilder.java.i
data/src/share/classes/sun/awt/RequestFocusController.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/inflate.c.i
data/test/java/util/concurrent/locks/ReentrantLock/LockOncePerThreadLoops.java.i
data/test/sun/nio/cs/OLD/DBCSDecoderMapping.java.i
data/src/share/classes/javax/swing/JInternalFrame.java.i
+data/src/macosx/native/sun/awt/CGraphicsDevice.m.i
data/test/java/lang/String/ContentEquals.java.i
+data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties.i
data/src/share/classes/sun/tools/jconsole/VariableGridLayout.java.i
data/test/java/lang/StringBuffer/Exceptions.java.i
data/src/share/classes/javax/swing/ComboBoxEditor.java.i
@@ -9537,22 +9946,23 @@ data/test/java/lang/Runtime/exec/ExecWithInput.java.i
data/src/share/hpi/include/hpi_impl.h.i
data/test/java/security/cert/CertPathValidator/OCSP/RootCert.pem.i
data/src/share/classes/sun/tools/jstat/ParserException.java.i
-data/test/java/util/ServiceLoader/Basic.java.i
-data/src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java.i
+data/test/com/sun/java/swing/plaf/windows/Test6824600.java.i
+data/src/share/classes/javax/swing/text/html/default.css.i
+data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java.i
+data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJobHeadless.java.i
data/test/java/beans/XMLEncoder/java_awt_Color.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CImage.java.i
data/src/share/classes/javax/swing/text/html/HTMLDocument.java.i
data/src/share/classes/java/io/PrintWriter.java.i
data/src/windows/native/common/jni_util_md.c.i
data/src/share/classes/java/beans/IndexedPropertyDescriptor.java.i
data/src/windows/classes/sun/awt/windows/WingDings.java.i
-data/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetVoiceStatus.java.i
data/test/sun/security/provider/PolicyFile/EmailAddress.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java.i
data/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java.i
data/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java.i
data/test/javax/swing/JTableHeader/6884066/bug6884066.java.i
-data/src/share/native/sun/font/layout/LayoutEngine.cpp.i
data/src/share/classes/com/sun/nio/sctp/NotificationHandler.java.i
data/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java.i
data/src/share/classes/java/sql/SQLSyntaxErrorException.java.i
@@ -9560,7 +9970,6 @@ data/src/share/classes/javax/swing/DebugGraphicsObserver.java.i
data/test/java/security/KeyRep/DSA.pre.1.5.key.i
data/test/sun/security/tools/keytool/StartDateTest.java.i
data/test/java/awt/print/PrinterJob/Collate2DPrintingTest.java.i
-data/test/javax/management/ImplementationVersion/policy.i
data/src/share/classes/java/util/LocaleISOData.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/zutil.h.i
@@ -9569,67 +9978,72 @@ data/src/share/classes/sun/net/www/protocol/http/AuthCache.java.i
data/src/share/classes/com/sun/jmx/namespace/serial/SerialRewritingProcessor.java.i
data/src/share/classes/sun/font/TrueTypeFont.java.i
data/test/sun/security/krb5/auto/NoAddresses.java.i
-data/src/share/classes/javax/swing/AbstractCellEditor.java.i
+data/test/com/sun/jdi/JdbMissStep.sh.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/MyRMI.java.i
data/test/java/awt/EventQueue/MainAppContext/MainAppContext.java.i
data/src/share/classes/java/text/CalendarBuilder.java.i
data/src/share/demo/applets/WireFrame/ThreeD.java.i
+data/test/java/text/Format/DateFormat/Bug7130335.java.i
data/test/java/net/ResponseCache/file1.cache.i
data/src/share/classes/sun/awt/HorizBagLayout.java.i
-data/src/windows/native/sun/jkernel/stdafx.cpp.i
+data/src/share/classes/java/security/SecurityPermission.java.i
data/test/javax/management/remote/mandatory/threads/ExecutorTest.java.i
data/src/share/native/sun/awt/libpng/png.h.i
data/make/tools/src/build/tools/jdwpgen/ValueTypeNode.java.i
data/src/share/classes/javax/print/attribute/PrintRequestAttribute.java.i
+data/src/linux/doc/man/rmic.1.i
data/src/share/classes/javax/swing/plaf/metal/MetalHighContrastTheme.java.i
data/src/share/classes/sun/nio/cs/ext/SimpleEUCDecoder.java.i
data/src/share/classes/sun/security/krb5/internal/ETypeInfo.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer.i
+data/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c.i
+data/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java.i
data/src/share/classes/sun/security/x509/AlgorithmId.java.i
data/test/javax/swing/JSlider/6742358/bug6742358.java.i
data/test/java/nio/file/Files/WalkWithSecurity.java.i
data/src/share/classes/java/util/IllegalFormatException.java.i
-data/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh.i
+data/src/macosx/classes/sun/lwawt/macosx/CMenuBar.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java.i
+data/test/java/nio/channels/Selector/LotsOfCancels.java.i
data/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/package.html.i
data/test/java/beans/VetoableChangeSupport/Test4994635.java.i
data/src/share/classes/javax/net/ssl/SSLHandshakeException.java.i
data/src/share/classes/sun/misc/NativeSignalHandler.java.i
-data/src/share/classes/java/io/PrintStream.java.i
-data/src/share/classes/sun/io/CharToByteCp949C.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java.i
+data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp.i
data/src/share/classes/sun/applet/AppletClassLoader.java.i
data/src/share/classes/javax/accessibility/AccessibleComponent.java.i
data/src/share/classes/sun/tools/java/BinaryClass.java.i
-data/test/javax/management/modelmbean/DescriptorSupportXMLTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsButtonListener.java.i
data/test/java/awt/Focus/InputVerifierTest3/InputVerifierTest3.java.i
-data/src/share/classes/sun/tools/jar/resources/jar_de.properties.i
-data/test/sun/security/pkcs11/tls/TestPRF.java.i
+data/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java.i
+data/test/java/lang/StringBuffer/InsertMaxValue.java.i
data/test/java/beans/PropertyEditor/TestDoubleType.java.i
data/src/share/classes/sun/io/ByteToCharJIS0208.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c.i
data/test/java/io/FileInputStream/FinalizeShdCallClose.java.i
data/src/share/lib/cmm/lcms/CIEXYZ.pf.i
data/src/share/classes/java/lang/ClassValue.java.i
+data/test/javax/swing/JFileChooser/4524490/bug4524490.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/helper/package.html.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java.i
data/src/share/classes/sun/print/SunMinMaxPage.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-bw16.png.i
-data/src/share/classes/sun/misc/JavaUtilJarAccess.java.i
+data/src/share/classes/javax/print/package.html.i
data/test/java/util/ResourceBundle/Bug6359330.java.i
data/test/java/lang/Class/getEnclosingClass/build.sh.i
data/src/share/classes/javax/swing/event/TreeModelListener.java.i
data/test/java/lang/String/ToLowerCase.java.i
-data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java.i
+data/test/sun/nio/cs/TestUTF_16.java.i
data/src/share/classes/com/sun/java/browser/dom/DOMAccessException.java.i
data/src/share/classes/sun/net/www/protocol/https/AbstractDelegateHttpsURLConnection.java.i
-data/test/sun/tools/jcmd/dcmd-script.txt.i
+data/src/share/native/sun/awt/image/jpeg/jpeglib.h.i
data/src/share/classes/javax/security/auth/Refreshable.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_MA.java.i
-data/src/share/classes/javax/accessibility/AccessibleResourceBundle.java.i
data/make/tools/CharsetMapping/MacTurkish.map.i
data/test/sun/tools/jstack/Basic.sh.i
data/src/share/classes/java/security/AccessControlException.java.i
+data/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java.i
data/test/javax/management/standardmbean/DeadlockTest.java.i
data/test/javax/naming/RefAddr/NullContent.java.i
data/src/solaris/bin/ppc/jvm.cfg.i
@@ -9638,10 +10052,11 @@ data/src/share/classes/org/openjdk/jigsaw/Resolver.java.i
data/test/com/sun/jdi/RepStepTarg.java.i
data/src/windows/native/sun/jkernel/kernel_it.rc.i
data/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties.i
data/src/share/classes/java/awt/font/GraphicAttribute.java.i
data/src/share/classes/java/awt/ColorPaintContext.java.i
data/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java.i
-data/test/java/io/File/ListNull.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ByteArrayCalls.java.i
data/test/sun/net/InetAddress/nameservice/deadlock/Hang.java.i
data/src/share/classes/com/sun/media/sound/ModelPerformer.java.i
data/src/share/classes/javax/management/remote/JMXServerErrorException.java.i
@@ -9651,15 +10066,13 @@ data/src/share/native/sun/awt/medialib/mlib_ImageFilters.c.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/utils/HasResources.java.i
data/src/share/classes/java/awt/geom/QuadCurve2D.java.i
-data/src/windows/native/sun/java2d/d3d/D3DRenderer.h.i
-data/test/java/io/Serializable/oldTests/SimpleArrays.java.i
+data/src/share/classes/javax/swing/event/TreeModelEvent.java.i
data/src/share/classes/sun/util/calendar/ImmutableGregorianDate.java.i
data/src/share/classes/java/net/SocketTimeoutException.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh.i
data/src/share/classes/sun/security/timestamp/TSRequest.java.i
-data/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java.i
data/src/share/classes/sun/net/www/protocol/http/HttpLogFormatter.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c.i
data/src/share/classes/sun/reflect/annotation/EnumConstantNotPresentExceptionProxy.java.i
data/test/com/sun/jmx/snmp/TimeTicksWrapping.java.i
data/src/share/classes/javax/naming/AuthenticationNotSupportedException.java.i
@@ -9668,15 +10081,14 @@ data/make/mksample/jmx/Makefile.i
data/src/share/classes/java/util/zip/DataFormatException.java.i
data/test/sun/tools/jstat/compilerOutput1.awk.i
data/src/windows/native/java/io/io_util_md.h.i
-data/test/java/nio/channels/SocketChannel/UnboundSocketTests.java.i
+data/src/share/classes/sun/tools/jconsole/resources/mbeanserverdelegate.gif.i
data/test/java/lang/System/IgnoreNullSecurityManager.java.i
data/src/share/classes/java/awt/font/TextAttribute.java.i
-data/test/com/sun/net/httpserver/Test6.java.i
+data/make/java/java/reflect/Makefile.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208.java.i
data/test/java/rmi/testlibrary/RemoteExiter.java.i
data/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java.i
-data/src/share/classes/com/sun/servicetag/ServiceTag.java.i
data/test/java/net/MulticastSocket/B6425815.java.i
data/test/java/lang/ToString.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntIntIntIntInt.java.i
@@ -9685,11 +10097,11 @@ data/src/share/classes/com/sun/crypto/provider/RC2Crypt.java.i
data/src/share/classes/sun/io/ByteToCharCp850.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java.i
data/src/share/classes/sun/text/resources/CollationData_lv.java.i
-data/src/share/classes/org/openjdk/jigsaw/Launcher.java.i
data/test/java/io/SequenceInputStream/ConstructorNull.java.i
data/make/tools/swing-beans/beaninfo/images/JFrameMono16.gif.i
data/make/tools/swing-beans/beaninfo/images/JScrollPaneMono32.gif.i
data/src/solaris/demo/jigsaw/basic/Makefile.i
+data/src/share/classes/java/awt/doc-files/Scrollbar-2.gif.i
data/test/java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java.i
data/test/java/util/Vector/ComodifiedRemoveAllElements.java.i
data/src/linux/doc/man/tnameserv.1.i
@@ -9700,38 +10112,40 @@ data/src/share/classes/sun/util/EmptyListResourceBundle.java.i
data/src/share/classes/java/lang/doc-files/capiota.gif.i
data/test/sun/util/resources/TimeZone/Bug4640234.java.i
data/test/java/rmi/reliability/juicer/AppleEvent.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_DO.properties.i
+data/src/share/classes/javax/swing/text/PlainDocument.java.i
+data/test/java/nio/channels/DatagramChannel/NotBound.java.i
data/src/windows/classes/java/util/prefs/WindowsPreferencesFactory.java.i
data/src/windows/native/sun/java2d/d3d/D3DRenderer.cpp.i
data/test/java/util/Currency/CheckDataVersion.java.i
data/test/java/util/concurrent/BlockingQueue/LoopHelpers.java.i
-data/src/share/classes/sun/awt/im/CompositionAreaHandler.java.i
+data/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh.i
data/src/share/classes/com/sun/beans/decoder/ElementHandler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/package.html.i
+data/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java.i
data/src/share/classes/javax/crypto/JceSecurityManager.java.i
data/src/solaris/classes/sun/awt/X11/XProtocol.java.i
data/make/tools/src/build/tools/charsetmapping/HKSCS.java.i
data/test/tools/launcher/Settings.java.i
data/src/share/classes/java/lang/doc-files/javalang.doc.anc21.gif.i
+data/src/share/classes/javax/swing/undo/UndoableEdit.java.i
+data/src/share/classes/sun/io/ByteToCharBig5_Solaris.java.i
data/src/share/native/sun/security/ec/mpi-config.h.i
data/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java.i
data/src/share/classes/java/util/JapaneseImperialCalendar.java.i
data/test/java/nio/channels/DatagramChannel/Refused.java.i
data/src/share/classes/javax/swing/plaf/ComboBoxUI.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_PH.properties.i
-data/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java.i
+data/make/docs/Notes.html.i
data/src/share/native/sun/awt/image/jpeg/jpegint.h.i
data/src/share/classes/javax/net/ssl/SSLSessionContext.java.i
data/test/sun/security/krb5/canonicalize/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/javax/swing/JColorChooser/Test4887836.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicScrollBarUI.java.i
-data/test/java/io/Serializable/enum/badResolve/Read.java.i
+data/src/share/classes/sun/tracing/dtrace/JVM.java.i
data/test/sun/net/www/protocol/file/Equals.java.i
data/src/solaris/classes/sun/awt/X11/XCheckboxMenuItemPeer.java.i
data/src/share/classes/java/util/zip/DeflaterOutputStream.java.i
-data/src/solaris/doc/sun/man/man1/jsadebugd.1.i
-data/src/share/classes/java/sql/PreparedStatement.java.i
data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java.i
data/src/share/classes/java/dyn/InvokeDynamicBootstrapError.java.i
data/make/tools/swing-beans/beaninfo/images/JListMono32.gif.i
@@ -9741,32 +10155,35 @@ data/test/java/io/File/NullArgs.java.i
data/test/sun/security/smartcardio/TestConnectAgain.java.i
data/src/share/classes/javax/xml/crypto/dsig/SignatureMethod.java.i
data/src/share/classes/sun/security/ssl/ByteBufferInputStream.java.i
+data/test/java/net/HttpURLConnection/getResponseCode.java.i
data/src/windows/native/sun/windows/MouseInfo.cpp.i
data/make/sun/util/Makefile.i
data/test/javax/security/auth/login/Configuration/GetInstance.config.i
data/src/share/classes/sun/security/provider/SecureRandom.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/SendFailed.java.i
data/test/java/lang/instrument/RemoveAbsentTransformerTest.java.i
data/src/share/classes/javax/management/QueryExp.java.i
data/src/solaris/classes/sun/awt/X11/XBaseMenuWindow.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsClassicLookAndFeel.java.i
-data/src/share/classes/sun/io/ByteToCharCp856.java.i
data/test/java/rmi/registry/readTest/testPkg/Client.java.i
-data/src/share/classes/java/awt/image/BandCombineOp.java.i
+data/src/share/lib/security/java.security-solaris.i
data/src/share/classes/sun/tools/tree/BitXorExpression.java.i
data/src/solaris/javavm/export/jawt_md.h.i
data/src/share/demo/jvmti/hprof/hprof_cpu.c.i
data/test/sun/net/www/protocol/file/EncodedMultiByteChar.java.i
+data/src/share/native/sun/font/layout/SubtableProcessor.cpp.i
data/src/share/classes/sun/net/httpserver/FixedLengthInputStream.java.i
-data/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java.i
+data/src/share/native/sun/font/layout/Lookups.cpp.i
+data/make/sun/org/Makefile.i
data/src/share/classes/javax/naming/NameParser.java.i
-data/src/share/classes/java/awt/GradientPaintContext.java.i
data/make/sun/javazic/tzdata/leapseconds.i
+data/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java.i
data/src/share/classes/java/nio/file/attribute/BasicFileAttributeView.java.i
data/src/share/classes/java/awt/peer/ContainerPeer.java.i
data/test/java/lang/instrument/Different_ExampleRedefine.java.i
data/src/share/native/sun/security/ec/impl/ecp_jm.c.i
data/make/tools/reorder/tools/mcount.c.i
-data/src/share/classes/sun/text/resources/CollationData_ro.java.i
+data/test/javax/management/modelmbean/RequiredModelMBeanGetAttributeTest.java.i
data/src/windows/native/sun/windows/UnicowsLoader.cpp.i
data/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c.i
data/src/share/classes/sun/java2d/pipe/AlphaPaintPipe.java.i
@@ -9776,22 +10193,20 @@ data/src/windows/native/sun/windows/awt_DCHolder.cpp.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/IsOpen.java.i
data/test/sun/net/ftp/FtpGetContent.java.i
data/src/share/back/ObjectReferenceImpl.c.i
+data/test/tools/jar/index/MetaInf.java.i
data/src/share/classes/java/lang/NullPointerException.java.i
data/src/share/classes/sun/awt/ModalityEvent.java.i
data/src/solaris/demo/jigsaw/basic/src/org/hello/Main.java.i
data/src/share/classes/sun/util/resources/CalendarData_sr.properties.i
-data/test/sun/net/www/protocol/http/HttpInputStream.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_pt_BR.properties.i
data/src/share/classes/sun/text/resources/CollationData_et.java.i
-data/make/netbeans/world/nbproject/project.xml.i
-data/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java.i
+data/src/share/classes/java/io/StringBufferInputStream.java.i
data/src/share/classes/java/security/MessageDigest.java.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h.i
data/test/java/util/zip/TimeChecksum.java.i
data/test/sun/nio/cs/TestJIS0208Decoder.java.i
data/src/share/classes/com/sun/security/sasl/CramMD5Client.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java.i
data/make/tools/src/build/tools/jdwpgen/StringTypeNode.java.i
-data/src/share/classes/sun/java2d/SurfaceData.java.i
data/src/share/classes/javax/naming/Binding.java.i
data/src/share/classes/sun/io/ByteToCharCp833.java.i
data/test/demo/jvmti/versionCheck/FailsWhenJvmtiVersionDiffers.java.i
@@ -9800,7 +10215,6 @@ data/src/share/classes/javax/print/attribute/standard/JobMediaSheets.java.i
data/src/share/classes/javax/crypto/NullCipherSpi.java.i
data/src/share/classes/sun/io/CharToByteCp1257.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so.i
-data/test/java/rmi/activation/Activatable/nestedActivate/security.policy.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringString.java.i
data/src/share/classes/sun/io/CharToByteCp875.java.i
data/src/solaris/demo/jni/Poller/LinkedQueue.java.i
@@ -9808,25 +10222,30 @@ data/test/javax/management/remote/mandatory/connectorServer/CloseConnectionTest.
data/src/share/classes/com/sun/jndi/ldap/EventSupport.java.i
data/test/java/beans/PropertyChangeSupport/Test4092905.java.i
data/src/share/classes/com/sun/jdi/InvalidLineNumberException.java.i
-data/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java.i
+data/src/solaris/back/linker_md.c.i
data/src/share/classes/sun/net/ftp/FtpClient.java.i
data/test/java/util/ResourceBundle/KeySetTest.java.i
data/src/share/demo/jvmti/hprof/hprof_string.c.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifButtonListener.java.i
data/src/share/native/sun/awt/image/jpeg/jcapistd.c.i
data/src/share/classes/java/rmi/activation/ActivationInstantiator.java.i
+data/make/tools/src/build/tools/generatecharacter/CharacterName.java.i
+data/src/share/lib/images/cursors/motif_CopyDrop32x32.gif.i
data/src/share/hpi/export/hpi.h.i
data/src/share/classes/java/awt/event/FocusEvent.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/altroot/Node.java.i
-data/test/sun/misc/EscapePath.java.i
+data/src/share/classes/sun/java2d/Spans.java.i
data/test/sun/security/util/Oid/SerialTest.java.i
data/make/tools/src/build/tools/javazic/DayOfWeek.java.i
+data/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java.i
data/test/sun/security/krb5/auto/BasicKrb5Test.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java.i
data/src/share/classes/javax/crypto/CipherOutputStream.java.i
data/test/java/lang/ProcessBuilder/Basic.java.i
data/src/share/classes/java/util/RegularEnumSet.java.i
data/src/solaris/native/sun/awt/awt_MenuItem.c.i
data/src/share/classes/sun/dyn/anon/ConstantPoolPatch.java.i
+data/src/share/classes/sun/tools/tree/BinaryExpression.java.i
data/test/java/io/Serializable/superclassDataLoss/Test.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/PermissionImpl.java.i
data/test/java/util/Locale/data/deflocale.c.i
@@ -9835,14 +10254,19 @@ data/src/solaris/classes/sun/awt/X11/genhash.awk.i
data/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h.i
data/src/linux/doc/man/ja/jstat.1.i
data/src/share/demo/jvmti/hprof/hprof_reference.c.i
+data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h.i
+data/make/tools/swing-beans/beaninfo/images/JTreeMono16.gif.i
data/src/share/classes/javax/sql/rowset/Predicate.java.i
data/src/share/classes/java/nio/channels/WritableByteChannel.java.i
-data/src/share/classes/sun/nio/cs/FastCharsetProvider.java.i
+data/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java.i
+data/src/share/classes/sun/net/www/protocol/http/Handler.java.i
data/make/tools/swing-beans/beaninfo/images/JWindowMono32.gif.i
data/test/sun/security/pkcs11/fips/key3.db.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsProxyStackOverflow.java.i
data/src/share/classes/java/awt/AWTPermission.java.i
+data/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties.i
+data/src/share/classes/javax/swing/ScrollPaneLayout.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/OutputListener.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh.i
data/src/solaris/native/sun/awt/awt_GlobalCursorManager.c.i
@@ -9854,19 +10278,20 @@ data/src/share/classes/javax/swing/JDesktopPane.java.i
data/src/share/classes/javax/management/monitor/CounterMonitorMBean.java.i
data/src/share/native/sun/security/ec/impl/ecl-priv.h.i
data/src/windows/classes/sun/java2d/opengl/WGLVolatileSurfaceManager.java.i
-data/test/java/rmi/Naming/LookupNameWithColon.java.i
+data/test/com/sun/tools/extcheck/TestExtcheckArgs.java.i
+data/src/share/classes/javax/swing/text/rtf/RTFAttribute.java.i
data/src/share/classes/java/nio/file/InvalidPathException.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c.i
+data/src/share/classes/sun/tools/tree/CheckContext.java.i
data/src/share/classes/sun/security/ssl/EphemeralKeyManager.java.i
data/src/solaris/classes/sun/awt/motif/MWindowAttributes.java.i
-data/test/sun/security/tools/policytool/UsePolicy.html.i
+data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java.i
data/make/mksample/webservices/EbayClient/Makefile.i
data/src/share/classes/javax/swing/plaf/nimbus/skin.laf.i
data/test/java/net/URLClassLoader/jars/class_path_test_classpath.jar.i
-data/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java.i
+data/src/share/native/sun/security/ec/impl/secitem.c.i
data/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java.i
data/test/java/lang/management/ThreadMXBean/ResetPeakThreadCount.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif.i
data/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java.i
data/src/share/classes/sun/font/StandardTextSource.java.i
data/src/share/classes/com/sun/beans/decoder/ByteElementHandler.java.i
@@ -9874,14 +10299,12 @@ data/test/sun/net/www/protocol/http/CloseOptionHeader.java.i
data/src/share/classes/javax/management/timer/TimerMBean.java.i
data/src/share/classes/sun/swing/UIAction.java.i
data/src/share/classes/java/util/Scanner.java.i
-data/src/share/classes/java/awt/image/DataBufferShort.java.i
+data/src/share/classes/java/awt/Scrollbar.java.i
data/src/share/native/sun/java2d/ShaderList.c.i
data/src/share/classes/javax/swing/JRadioButton.java.i
data/test/javax/swing/JFileChooser/6738668/bug6738668.java.i
data/src/share/classes/javax/swing/text/rtf/charsets/mac.txt.i
-data/test/java/net/InetSocketAddress/ToString.java.i
-data/src/share/classes/java/io/PipedOutputStream.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java.i
+data/src/share/classes/javax/swing/tree/TreeSelectionModel.java.i
data/src/share/native/java/lang/fdlibm/src/e_acosh.c.i
data/test/sun/rmi/rmic/newrmic/equivalence/DayTimeServerImpl.java.i
data/src/solaris/classes/sun/awt/X11/XLabelPeer.java.i
@@ -9889,14 +10312,15 @@ data/src/share/native/sun/security/pkcs11/wrapper/p11_general.c.i
data/test/com/sun/jdi/sde/SourceDebugExtensionTest.java.i
data/src/share/classes/sun/security/util/AuthResources_sv.java.i
data/src/share/classes/javax/swing/DefaultRowSorter.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowRefs.java.i
+data/src/share/classes/java/sql/package.html.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/security.policy.i
data/test/java/nio/file/Path/CopyAndMove.java.i
-data/test/sun/security/krb5/IPv6.java.i
+data/src/solaris/classes/sun/awt/X11InputMethod.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/package.html.i
data/src/share/classes/javax/swing/SizeSequence.java.i
-data/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf.i
+data/src/share/classes/sun/jvmstat/monitor/event/package.html.i
data/src/share/classes/java/awt/doc-files/Modality.html.i
+data/src/macosx/native/sun/awt/CSystemColors.h.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/services/com.message.spi.MessageService.i
data/src/share/classes/java/dyn/NoAccessException.java.i
data/src/share/classes/sun/io/ByteToCharEUC_JP.java.i
@@ -9905,28 +10329,30 @@ data/src/share/classes/sun/util/resources/LocaleNames_mt.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM942C.java.i
data/test/com/sun/crypto/provider/Mac/MacKAT.java.i
data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_2.java.i
+data/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_EmptyBorder.java.i
data/src/windows/classes/sun/awt/windows/WDropTargetContextPeer.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java.i
+data/test/java/security/Policy/GetInstance/GetInstanceSecurity.java.i
+data/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java.i
data/test/sun/security/provider/PolicyParser/ExtDirsB.java.i
data/src/windows/native/sun/windows/awt_KeyboardFocusManager.h.i
+data/src/share/classes/java/awt/event/WindowAdapter.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_pt_BR.properties.i
-data/src/solaris/doc/sun/man/man1/rmid.1.i
+data/src/share/classes/sun/security/krb5/internal/crypto/ArcFourHmacEType.java.i
data/src/share/demo/jfc/Font2DTest/Font2DTestApplet.java.i
-data/test/sun/net/www/http/HttpClient/ImplicitFileName.java.i
+data/test/java/net/MulticastSocket/B6427403.java.i
data/src/share/classes/java/util/IllegalFormatCodePointException.java.i
-data/src/solaris/classes/sun/awt/motif/X11KSC5601.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/Util.java.i
data/src/share/classes/com/sun/media/sound/DirectAudioDevice.java.i
-data/test/java/security/KeyStore/keystore.jks.i
-data/src/share/classes/java/awt/event/ActionListener.java.i
+data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif.i
data/src/share/classes/javax/swing/text/BadLocationException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/CanonicalizationException.java.i
data/src/share/native/java/io/io_util.h.i
-data/test/sun/security/smartcardio/TestConnect.java.i
data/test/java/io/RandomAccessFile/EOF.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageClipping.h.i
-data/make/javax/rmi/ssl/Makefile.i
-data/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java.i
+data/src/solaris/native/sun/awt/swing_GTKStyle.c.i
+data/src/share/classes/sun/tools/tree/ConditionVars.java.i
+data/src/macosx/classes/com/apple/laf/AquaScrollRegionBorder.java.i
data/src/share/classes/sun/security/x509/URIName.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/remote-connection.jpg.i
data/src/share/classes/java/beans/IndexedPropertyChangeEvent.java.i
@@ -9936,16 +10362,12 @@ data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineD
data/test/java/util/ResourceBundle/Control/DefaultControlTest.java.i
data/test/java/beans/XMLEncoder/javax_swing_JLayeredPane.java.i
data/test/java/lang/StringBuilder/Supplementary.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java.i
-data/src/share/classes/sun/nio/cs/ext/MacRomania.java.i
data/src/share/classes/sun/java2d/pipe/GlyphListLoopPipe.java.i
data/src/windows/hpi/src/threads_md.c.i
data/test/com/sun/jdi/redefine/RedefineTest.java.i
-data/src/share/classes/java/awt/im/package.html.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java.i
-data/src/share/classes/sun/nio/fs/AbstractWatchService.java.i
-data/src/share/classes/sun/tools/serialver/serialver.properties.i
-data/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java.i
+data/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libplds4.dll.i
+data/src/share/classes/java/util/ServiceLoader.java.i
data/src/share/classes/sun/io/CharToByteCp868.java.i
data/src/share/classes/sun/io/ByteToCharBig5.java.i
data/src/share/classes/sun/security/provider/certpath/X509CertPath.java.i
@@ -9955,249 +10377,249 @@ data/test/javax/sound/midi/Gervill/RiffReaderWriter/Skip.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_7.java.i
data/test/java/lang/ref/NullQueue.java.i
data/src/windows/javavm/export/jawt_md.h.i
+data/src/share/classes/java/security/acl/Group.java.i
data/test/sun/security/provider/PolicyFile/Utf8.java.i
data/test/javax/management/monitor/CounterMonitorInitThresholdTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_FR.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolver.java.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/TokenList.java.i
-data/test/sun/security/x509/X500Name/NullX500Name.java.i
data/test/javax/swing/JMenuItem/7036148/bug7036148.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c.i
data/test/java/lang/annotation/Missing/A.java.i
data/test/java/net/Socket/SetSoLinger.java.i
+data/test/java/nio/channels/Channels/ReadOffset.java.i
data/make/tools/classanalyzer/classanalyzer.html.i
-data/src/share/classes/sun/tools/jconsole/inspector/XMBean.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nssdbm3.dll.i
data/src/share/native/sun/font/layout/LEFontInstance.cpp.i
+data/src/share/native/sun/security/ec/ecl.h.i
data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServerImpl.java.i
data/src/share/classes/javax/swing/text/html/FrameSetView.java.i
-data/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java.i
+data/src/share/native/sun/security/ec/impl/ec2_233.c.i
data/src/share/classes/javax/management/ObjectInstance.java.i
data/src/share/classes/java/awt/ScrollPaneAdjustable.java.i
-data/test/java/util/Locale/PrintDefaultLocale.java.i
-data/src/share/demo/jfc/SampleTree/resources/images/expanded.gif.i
+data/src/macosx/classes/com/apple/laf/AquaTableHeaderBorder.java.i
+data/src/share/classes/javax/swing/border/AbstractBorder.java.i
data/src/share/classes/sun/nio/cs/ext/MacRoman.java.i
-data/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf.i
-data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so.i
-data/src/solaris/classes/sun/nio/ch/FileKey.java.i
+data/src/share/sample/scripting/scriptpad/README.txt.i
data/src/share/classes/javax/management/ObjectNameTemplate.java.i
data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java.i
-data/src/share/sample/jmx/jmx-scandir/index.html.i
+data/src/share/classes/java/util/EnumSet.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/GroupImpl.java.i
+data/test/java/net/URLConnection/UNCTest.sh.i
data/test/java/nio/charset/coders/Check.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java.i
-data/src/windows/classes/sun/awt/windows/WMenuBarPeer.java.i
data/src/share/classes/sun/awt/AppContext.java.i
data/test/java/beans/XMLDecoder/spec/TestLong.java.i
-data/test/javax/security/auth/Subject/Synch2.policy.i
-data/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java.i
+data/src/solaris/doc/sun/man/man1/rmiregistry.1.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTableHeaderUI.java.i
data/src/windows/native/java/io/Win32FileSystem_md.c.i
-data/src/windows/native/sun/windows/Hashtable.h.i
+data/src/share/classes/java/util/IllegalFormatWidthException.java.i
data/src/share/classes/java/rmi/activation/Activatable.java.i
data/src/share/classes/javax/swing/RepaintManager.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishCrypt.java.i
data/src/share/classes/sun/security/jgss/wrapper/NativeGSSContext.java.i
+data/src/macosx/native/sun/awt/PrintModel.h.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/ImplicitHandshake.java.i
data/src/share/classes/java/awt/doc-files/RadialGradientPaint-3.png.i
data/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c.i
data/src/share/native/java/lang/Object.c.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java.i
-data/src/share/native/sun/font/layout/GlyphPositionAdjustments.cpp.i
+data/src/windows/classes/sun/awt/windows/WTrayIconPeer.java.i
data/make/sun/security/jgss/wrapper/FILES_c.gmk.i
-data/src/share/classes/com/sun/jdi/Mirror.java.i
+data/src/share/classes/sun/tools/asm/StringExpressionConstantData.java.i
data/test/java/util/Locale/serialized/java6locale_no_NO_NY.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java.i
+data/src/share/classes/javax/management/BetweenQueryExp.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java.i
+data/test/java/util/Locale/PrintDefaultLocale.java.i
data/src/solaris/transport/socket/socket_md.c.i
data/src/share/classes/javax/swing/MenuElement.java.i
data/src/share/classes/sun/security/krb5/internal/AuthorizationDataEntry.java.i
data/src/share/classes/sun/io/CharToByteCp922.java.i
data/test/java/lang/instrument/ManifestTestApp.java.i
-data/src/solaris/hpi/native_threads/include/condvar_md.h.i
+data/test/java/beans/XMLDecoder/spec/TestNull.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ExportObjs.java.i
-data/src/solaris/classes/sun/awt/X11GraphicsConfig.java.i
-data/src/share/classes/java/awt/dnd/DropTargetDragEvent.java.i
-data/src/windows/classes/sun/net/NetHooks.java.i
-data/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java.i
+data/test/java/util/jar/JarFile/SorryClosed.java.i
+data/src/share/classes/sun/security/action/GetBooleanAction.java.i
+data/src/macosx/native/sun/awt/JavaComponentAccessibility.m.i
+data/test/com/sun/tools/extcheck/TestExtcheckArgs.sh.i
+data/test/java/util/ResourceBundle/Control/Bug6530694.java.i
data/make/tools/swing-beans/beaninfo/images/JDialogColor32.gif.i
data/test/java/lang/StrictMath/Tests.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputTests.java.i
-data/test/sun/net/idn/TestData.java.i
-data/src/share/classes/sun/rmi/transport/Transport.java.i
+data/test/sun/security/pkcs11/KeyAgreement/TestInterop.java.i
+data/src/share/classes/javax/sound/midi/Patch.java.i
+data/src/share/classes/sun/text/resources/FormatData_ja_JP_JP.java.i
+data/src/share/sample/nio/chatserver/README.txt.i
data/src/share/classes/java/sql/SQLOutput.java.i
data/src/windows/classes/sun/awt/windows/fontconfig.98.properties.i
data/src/solaris/native/sun/awt/awt_TopLevel.h.i
+data/src/share/classes/java/lang/VerifyError.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTableHeaderUI.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmssm.c.i
-data/src/share/classes/javax/management/MXBean.java.i
+data/test/sun/rmi/runtime/Log/6409194/logging.properties.i
data/src/share/classes/javax/net/ssl/SSLPermission.java.i
data/src/share/classes/sun/swing/MenuItemCheckIconFactory.java.i
data/test/java/lang/instrument/FakeTestDriver.java.i
data/src/solaris/classes/sun/awt/X11/XErrorHandler.java.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java.i
+data/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java.i
data/src/share/classes/sun/nio/cs/ext/EUC_JP_Open.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1001.java.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_3.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c.i
data/test/com/sun/jdi/StringConvertTest.sh.i
data/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java.i
-data/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES.i
+data/src/share/classes/sun/nio/cs/ext/IBM861.java.i
data/src/share/classes/sun/io/ByteToCharMacIceland.java.i
-data/src/share/sample/scripting/scriptpad/src/scripts/memory.js.i
data/src/windows/native/sun/windows/awt_MenuItem.h.i
data/test/com/sun/jdi/RedefineException.sh.i
data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.8.properties.i
-data/test/java/util/Locale/bug4122700.java.i
-data/make/tools/swing-beans/beaninfo/images/JFileChooserColor16.gif.i
-data/make/tools/swing-beans/beaninfo/SwingBeanInfoBase.java.i
+data/test/sun/net/www/httptest/AbstractCallback.java.i
+data/src/share/classes/sun/java2d/pipe/Region.java.i
data/src/share/classes/java/awt/peer/CheckboxMenuItemPeer.java.i
data/test/java/lang/String/ICCBasher.java.i
data/src/share/native/sun/awt/image/cvutils/img_dirdither.h.i
-data/test/javax/sound/midi/Gervill/ModelDestination/SetTransform.java.i
-data/src/share/classes/java/awt/event/WindowStateListener.java.i
-data/src/share/classes/java/math/BigDecimal.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirsA.java.i
+data/test/java/beans/PropertyEditor/TestByteType.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthConstants.java.i
data/src/share/classes/java/security/ProviderException.java.i
data/src/share/classes/java/nio/file/attribute/AclEntry.java.i
data/test/java/io/Serializable/wrongReturnTypes/Write.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/kidpr.ttf.i
data/src/share/classes/sun/security/x509/Extension.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c.i
-data/src/share/classes/sun/tools/tree/Statement.java.i
+data/test/java/util/BitSet/StickySize.java.i
data/src/solaris/classes/sun/awt/X11/XDialogPeer.java.i
-data/src/share/classes/sun/util/locale/LocaleObjectCache.java.i
+data/src/share/native/sun/awt/image/jpeg/jidctfst.c.i
data/src/share/native/sun/java2d/pipe/SpanClipRenderer.c.i
+data/src/windows/classes/sun/nio/ch/sctp/SctpChannelImpl.java.i
data/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions_Disable.java.i
data/test/java/awt/dnd/URIListBetweenJVMsTest/FileListTransferable.java.i
data/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java.i
data/src/share/classes/com/sun/media/sound/ModelDestination.java.i
+data/src/bsd/doc/man/jrunscript.1.i
data/src/share/classes/sun/awt/OSInfo.java.i
data/make/com/oracle/Makefile.i
data/test/sun/text/resources/Format/Bug4395196.java.i
data/src/solaris/native/sun/nio/fs/UnixCopyFile.c.i
-data/src/solaris/classes/sun/nio/fs/SolarisFileStore.java.i
+data/test/sun/tools/jstat/gcOldCapacityOutput1.awk.i
data/src/share/classes/sun/tools/jstatd/RemoteVmImpl.java.i
data/src/share/classes/sun/io/CharToByteJohab.java.i
-data/test/sun/security/krb5/auto/Context.java.i
-data/src/share/classes/javax/imageio/IIOParam.java.i
data/src/share/classes/sun/audio/ContinuousAudioDataStream.java.i
data/src/windows/native/sun/java2d/d3d/D3DGlyphCache.cpp.i
data/src/share/classes/sun/security/krb5/EncryptedData.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKRegion.java.i
data/src/share/classes/java/awt/event/ComponentAdapter.java.i
-data/make/tools/README.txt.i
+data/test/java/awt/Graphics2D/DrawString/AlphaSurfaceText.java.i
data/src/share/classes/com/sun/jdi/BooleanType.java.i
data/src/solaris/classes/sun/awt/X11/XComponentPeer.java.i
-data/src/share/classes/javax/swing/text/Keymap.java.i
data/src/share/classes/sun/util/resources/CalendarData_en_GB.properties.i
data/src/solaris/classes/sun/awt/X11/java-icon16.png.i
data/src/share/classes/java/sql/SQLInput.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_pt.properties.i
-data/src/share/classes/sun/text/resources/CollationData_bg.java.i
+data/test/java/nio/file/attribute/PosixFileAttributeView/Basic.java.i
data/src/share/classes/com/sun/jmx/snmp/mpm/package.html.i
data/test/java/awt/FileDialog/RegexpFilterTest/RegexpFilterTest.java.i
data/test/java/lang/StringBuffer/GetCharsOverLength.java.i
data/test/sun/tools/native2ascii/Native2AsciiTests.sh.i
-data/test/sun/net/www/protocol/http/WebGet.java.i
+data/test/java/awt/event/MouseWheelEvent/DisabledComponent/DisabledComponent.java.i
data/src/solaris/classes/sun/awt/X11/java-icon24.png.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java.i
data/src/share/classes/javax/swing/text/rtf/MockAttributeSet.java.i
data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java.i
data/test/com/sun/jmx/snmp/SnmpOidHashCode.java.i
data/src/windows/native/java/io/FileSystem_md.c.i
+data/src/share/classes/sun/nio/cs/ext/IBM500.java.i
data/test/com/sun/net/httpserver/bugs/B6886436.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c.i
data/test/javax/management/generified/GenericTest.java.i
data/test/tools/jar/UpdateManifest.java.i
-data/src/share/classes/com/sun/media/sound/FastSysexMessage.java.i
-data/make/sun/cmm/lcms/mapfile-vers.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTestConcMarkSweepGC.sh.i
+data/make/tools/CharsetMapping/IBM1144.map.i
data/src/share/classes/com/sun/jmx/snmp/SnmpCounter.java.i
-data/src/share/demo/jvmti/hprof/hprof_cpu.h.i
+data/src/macosx/native/sun/awt/QuartzRenderer.m.i
data/make/java/hpi/native/reorder-sparc.i
data/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c.i
data/src/share/classes/sun/audio/AudioPlayer.java.i
-data/test/sun/security/tools/jarsigner/JarSigningNonAscii.java.i
+data/make/sun/management/jmxremote/Makefile.i
data/test/java/net/URLClassLoader/B7050028.java.i
-data/src/share/classes/javax/crypto/CryptoPermissions.java.i
-data/test/java/beans/XMLEncoder/Test4679556.java.i
+data/test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java.i
+data/make/tools/CharsetMapping/IBM273.c2b.i
data/test/javax/swing/JFileChooser/4252173/bug4252173.java.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/jane2jane.cer.i
-data/test/java/awt/Mixing/MixingOnShrinkingHWButton.java.i
-data/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy.i
+data/src/share/classes/java/math/package-info.java.i
+data/make/java/main/java/mapfile-amd64.i
data/test/java/io/PipedInputStream/FasterWriter.java.i
data/src/share/classes/javax/print/attribute/HashAttributeSet.java.i
data/src/share/classes/sun/security/x509/CertificatePoliciesExtension.java.i
data/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java.i
data/src/windows/native/sun/java2d/windows/DDBlitLoops.cpp.i
+data/src/macosx/native/jobjc/build.xml.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/RegisteringActivatable.java.i
-data/make/common/shared/Defs.gmk.i
-data/test/java/beans/Introspector/Test4984912.java.i
+data/src/share/classes/java/awt/GradientPaintContext.java.i
+data/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java.i
data/src/share/classes/com/sun/net/ssl/KeyManagerFactorySpi.java.i
+data/test/javax/swing/JList/6462008/bug6462008.java.i
+data/test/javax/swing/JOptionPane/7138665/bug7138665.java.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog_Stub.java.i
data/src/share/classes/java/lang/Runtime.java.i
data/src/solaris/doc/sun/man/man1/ja/extcheck.1.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif.i
-data/src/windows/native/sun/jkernel/DownloadDialog.cpp.i
+data/src/solaris/native/sun/awt/awt_motif.h.i
data/src/share/classes/sun/tools/java/ClassDeclaration.java.i
-data/src/share/native/sun/java2d/loops/ByteBinary1Bit.h.i
-data/src/share/classes/java/lang/annotation/package-info.java.i
+data/test/java/util/Locale/LocaleEnhanceTest.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/MonitoredHostProvider.java.i
data/src/share/classes/javax/swing/text/rtf/charsets/NeXT.txt.i
-data/test/javax/management/notification/SupportClearTest.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/KMTMGetNothing.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFormat.java.i
data/src/share/javavm/export/jni.h.i
data/src/share/classes/java/net/HttpURLConnection.java.i
data/src/solaris/native/sun/java2d/x11/X11SurfaceData.c.i
data/test/java/util/TimSort/Sorter.java.i
-data/src/share/classes/sun/rmi/rmic/newrmic/Resources.java.i
+data/test/com/sun/jdi/sde/TemperatureTable.jsp.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCTableMetaImpl.java.i
data/src/share/classes/javax/swing/JButton.java.i
data/src/share/classes/javax/swing/plaf/SeparatorUI.java.i
-data/make/java/main/java/Makefile.i
+data/src/share/native/sun/font/sunFont.c.i
data/src/share/classes/sun/security/ssl/EngineWriter.java.i
-data/test/javax/management/namespace/ExportNamespaceTest.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java.i
+data/test/com/sun/net/httpserver/bugs/B6431193.java.i
+data/src/share/demo/jfc/SampleTree/SampleTree.java.i
data/test/java/net/PlainSocketImpl/BigBacklog.java.i
data/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java.i
data/src/share/classes/sun/security/krb5/internal/KDCOptions.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c.i
data/src/share/native/sun/awt/debug/debug_util.c.i
data/test/java/beans/PropertyEditor/TestStringClassJava.java.i
data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithoutRID.java.i
-data/src/share/classes/com/sun/beans/finder/ConstructorFinder.java.i
-data/src/share/sample/nio/server/Reply.java.i
-data/src/share/classes/sun/io/ByteToCharHKSCS_2001.java.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankInputStream2.java.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java.i
+data/test/java/io/PushbackInputStream/Available.java.i
+data/test/javax/swing/JInternalFrame/Test6505027.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_zh_SG.java.i
data/src/solaris/classes/sun/nio/ch/DatagramDispatcher.java.i
data/test/javax/management/standardmbean/RegistrationTest.java.i
data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.c.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties.i
+data/test/com/sun/security/sasl/digest/pw.properties.i
data/src/share/classes/javax/swing/Action.java.i
-data/test/java/security/UnresolvedPermission/DebugPermissionBad.java.i
-data/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain2.txt.i
+data/src/share/classes/sun/tools/java/Identifier.java.i
data/test/sun/nio/cs/MalformedSurrogates.java.i
data/test/java/util/jar/Attributes/PutAndPutAll.java.i
data/src/share/classes/sun/net/www/protocol/mailto/Handler.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopIconUI.java.i
+data/src/share/classes/com/sun/beans/decoder/PropertyElementHandler.java.i
data/test/java/rmi/activation/Activatable/checkRegisterInLog/group.security.policy.i
-data/src/share/classes/java/lang/Readable.java.i
+data/src/bsd/doc/man/ja/rmiregistry.1.i
+data/src/share/classes/sun/util/resources/LocaleNames_in.properties.i
data/src/share/classes/java/awt/CompositeContext.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/DSAKeyValueResolver.java.i
-data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java.i
data/test/java/awt/Frame/InitialMaximizedTest/InitialMaximizedTest.html.i
data/src/share/classes/sun/tools/tree/LocalMember.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java.i
+data/src/share/classes/java/net/SocketPermission.java.i
data/src/share/classes/javax/sound/midi/MidiEvent.java.i
-data/src/share/classes/sun/io/CharToByteMacTurkish.java.i
+data/test/java/beans/XMLEncoder/Test5023559.java.i
data/src/share/classes/java/beans/beancontext/BeanContextMembershipListener.java.i
-data/make/tools/CharsetMapping/MacArabic.map.i
data/src/share/native/java/util/zip/zlib-1.1.3/infutil.c.i
-data/src/windows/native/common/locale_str.h.i
-data/src/share/classes/javax/swing/undo/UndoableEdit.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_it.properties.i
data/src/share/classes/sun/security/provider/X509Factory.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/image-delayed.png.i
-data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest2.java.i
+data/src/share/classes/sun/security/util/DerOutputStream.java.i
+data/make/tools/CharsetMapping/MS1252.map.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_fr.java.i
-data/src/share/classes/sun/rmi/transport/TransportConstants.java.i
data/src/share/native/sun/font/layout/HebrewShaping.cpp.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/Open.java.i
data/test/com/sun/crypto/provider/TLS/TestPRF.java.i
@@ -10205,21 +10627,20 @@ data/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.properties.i
data/src/share/classes/javax/security/auth/x500/X500PrivateCredential.java.i
data/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java.i
-data/make/tools/src/build/tools/generatebreakiteratordata/RuleBasedBreakIteratorBuilder.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy21.i
+data/src/macosx/classes/apple/laf/JRSUIConstants.java.i
+data/src/macosx/native/sun/awt/CGraphicsEnv.m.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/TargetFileListFrame.java.i
-data/src/share/classes/com/sun/media/sound/SoftPointResampler.java.i
+data/test/sun/security/pkcs11/SecureRandom/Basic.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/log4j.properties.i
data/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java.i
-data/test/java/nio/channels/SocketChannel/Bind.java.i
+data/make/tools/CharsetMapping/IBM1123.map.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSet.java.i
data/test/javax/management/openmbean/GenericMBeanExceptionTest.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngineParameters.java.i
+data/src/share/classes/sun/misc/CRC16.java.i
data/src/share/classes/sun/jvmstat/monitor/package.html.i
-data/src/share/classes/sun/font/Font2D.java.i
+data/make/sun/dcpr/Makefile.i
data/src/share/classes/java/beans/Beans.java.i
-data/src/share/classes/sun/reflect/ConstructorAccessor.java.i
-data/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java.i
+data/test/javax/management/notification/SupportClearTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/XMLUtils.java.i
data/src/share/classes/sun/management/snmp/util/package.html.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMURIDereferencer.java.i
@@ -10235,80 +10656,83 @@ data/src/share/classes/java/util/prefs/NodeChangeListener.java.i
data/src/share/classes/java/nio/file/attribute/BasicFileAttributes.java.i
data/src/share/classes/sun/jvmstat/monitor/event/VmEvent.java.i
data/test/java/lang/Class/forName/classes/left-square.class.i
-data/src/share/classes/org/openjdk/jigsaw/cli/Commands.java.i
+data/make/java/util/FILES_properties.gmk.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/BlendingMode.java.i
+data/src/share/classes/sun/text/resources/FormatData_el.java.i
data/make/java/java_hprof_demo/Makefile.i
data/src/windows/native/sun/font/lcdglyph.c.i
-data/test/java/io/Serializable/subclassGC/security.policy.i
data/make/tools/freetypecheck/Makefile.i
data/src/share/sample/jmx/jmx-scandir/nbproject/file-targets.xml.i
data/test/java/nio/file/Path/CheckPermissions.java.i
-data/src/share/classes/javax/swing/ComponentInputMap.java.i
+data/make/tools/CharsetMapping/IBM284.c2b.i
data/test/java/rmi/testlibrary/JavaVM.java.i
-data/test/com/sun/servicetag/DuplicateNotFound.java.i
+data/test/sun/management/jmxremote/bootstrap/management_test06_ok.properties.in.i
data/src/share/classes/javax/naming/event/NamingListener.java.i
+data/src/share/classes/java/sql/Statement.java.i
data/src/share/classes/javax/security/auth/login/LoginException.java.i
-data/test/java/nio/file/Files/TerminateWalk.java.i
-data/test/java/awt/FileDialog/MultipleMode/MultipleMode.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM278.java.i
data/src/share/classes/sun/io/CharToByteJIS0212_Solaris.java.i
-data/src/share/classes/sun/nio/cs/UTF_16BE.java.i
+data/src/linux/doc/man/ja/jarsigner.1.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/PainterBorder.java.i
-data/test/java/nio/channels/Selector/CloseThenRegister.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_PY.properties.i
+data/test/java/io/BufferedInputStream/SkipTest.java.i
data/src/solaris/classes/sun/java2d/xr/XRSurfaceDataProxy.java.i
+data/src/linux/doc/man/ja/jstack.1.i
data/src/share/classes/java/lang/SecurityManager.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicReference.java.i
data/test/java/beans/Introspector/Test6528714.java.i
data/test/sun/rmi/rmic/covariantReturns/G5Impl.java.i
data/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java.i
-data/src/windows/classes/sun/java2d/ScreenUpdateManager.java.i
+data/test/java/util/zip/ZipFile/Available.java.i
data/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java.i
data/src/share/demo/jfc/TableExample/TableExample4.java.i
data/test/sun/net/www/EncDec.doc.i
+data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java.i
+data/src/share/native/sun/java2d/loops/Index8Gray.c.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_LU.properties.i
data/src/share/classes/com/sun/jmx/snmp/SnmpTooBigException.java.i
-data/src/share/classes/com/sun/imageio/plugins/common/BogusColorSpace.java.i
-data/test/java/lang/Runtime/exec/StreamsSurviveDestroy.java.i
-data/src/share/classes/sun/tools/javac/CompilerMember.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_HN.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/NoteOverFlowTest.java.i
+data/test/sun/text/resources/Collator/Bug4848897.java.i
data/src/windows/npt/utf_md.c.i
data/test/javax/management/ObjectName/ValueWildcardTest.java.i
data/src/windows/native/sun/java2d/d3d/D3DUtils.h.i
data/src/share/native/java/util/zip/zlib-1.2.3/crc32.h.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java.i
-data/src/share/classes/javax/xml/crypto/KeySelector.java.i
+data/src/solaris/bin/java_md_solinux.h.i
+data/test/java/lang/instrument/RedefineClassWithNativeMethod.sh.i
data/src/share/classes/java/text/DateFormat.java.i
data/test/sun/security/provider/SeedGenerator/Awt_Hang_Test.java.i
-data/src/solaris/classes/sun/awt/X11/XHorizontalScrollbar.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxNativeDispatcher.java.i
+data/test/sun/nio/cs/TestEUC_TW.java.i
+data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.sh.i
data/src/share/classes/sun/awt/image/DataBufferNative.java.i
-data/test/java/beans/Introspector/4750368/com/foo/test/Component.java.i
data/make/tools/src/build/tools/charsetmapping/JIS0213.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java.i
-data/src/share/classes/java/net/HttpRetryException.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java.i
+data/src/bsd/doc/man/ja/extcheck.1.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipConstants.java.i
data/test/java/util/Random/NextBytes.java.i
-data/make/com/sun/servicetag/Makefile.i
-data/src/share/classes/sun/security/x509/PolicyMappingsExtension.java.i
+data/src/share/demo/jvmti/waiters/waiters.cpp.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferAudioFormatFloat.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java.i
+data/src/share/demo/applets/Fractal/CLSFractal.java.i
data/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java.i
data/test/java/awt/font/TextLayout/DecorationBoundsTest.java.i
data/src/share/demo/applets/SpreadSheet/example1.html.i
data/test/sun/security/pkcs11/ec/ReadPKCS12.java.i
-data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java.i
-data/test/sun/security/pkcs11/Provider/Login.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java.i
+data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.java.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/group.security.policy.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/EffectUtilsTemp.java.i
data/test/java/io/Serializable/partialClassDesc/PartialClassDesc.java.i
-data/src/linux/doc/man/policytool.1.i
+data/src/share/classes/org/openjdk/jigsaw/LibraryPool.java.i
data/src/share/classes/com/sun/tools/jdi/LocalVariableImpl.java.i
-data/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java.i
-data/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java.i
-data/src/share/classes/sun/java2d/pipe/TextPipe.java.i
-data/src/share/classes/sun/io/CharToByteCp285.java.i
+data/test/java/nio/channels/FileChannel/TransferToNonWritable.java.i
+data/test/java/lang/instrument/BootClassPath/Setup.java.i
+data/src/share/back/error_messages.h.i
+data/src/share/classes/sun/nio/cs/SingleByteDecoder.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization_fr.properties.i
+data/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java.i
data/make/mkdemo/jfc/SwingSet3/Makefile.i
data/src/share/native/java/util/zip/zlib-1.1.3/infutil.h.i
data/make/sun/javazic/tzdata/VERSION.i
@@ -10318,72 +10742,74 @@ data/src/share/native/sun/security/ec/impl/ecp_mont.c.i
data/src/share/classes/javax/management/BadStringOperationException.java.i
data/src/share/classes/sun/security/x509/CertificateIssuerName.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/TestAllSuites.java.i
-data/test/java/nio/channels/Selector/BasicAccept.java.i
-data/src/share/classes/javax/xml/crypto/dsig/SignedInfo.java.i
+data/src/share/classes/java/text/AttributedCharacterIterator.java.i
+data/test/java/net/Socket/InheritTimeout.java.i
data/test/java/net/Inet6Address/serialize/Serialize.java.i
+data/test/javax/swing/JLabel/7004134/bug7004134.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_th_TH.properties.i
-data/test/java/security/SecureRandom/sha1prng-new.bin.i
+data/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java.i
data/src/solaris/native/sun/awt/awt_Robot.c.i
data/test/sun/security/pkcs11/fips/CipherTest.java.i
+data/test/tools/launcher/PrintVersion.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/EType.java.i
data/make/tools/CharsetMapping/IBM833.c2b.i
data/src/share/classes/java/security/Permissions.java.i
data/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java.i
-data/src/share/classes/javax/naming/ldap/ControlFactory.java.i
-data/src/solaris/classes/sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java.i
-data/test/javax/swing/JSlider/4987336/box.gif.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/Gradient.java.i
-data/test/sun/tools/jstat/jstatClassloadOutput1.sh.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_PCM.c.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy21.i
+data/test/javax/xml/crypto/dsig/data/certs/crl.i
+data/make/tools/GenerateCharacter/CharacterDataLatin1.java.template.i
data/src/share/classes/sun/util/calendar/Gregorian.java.i
data/src/share/classes/sun/security/ssl/AppInputStream.java.i
data/test/javax/print/attribute/AttributeTest.java.i
data/src/share/classes/java/security/Key.java.i
data/test/java/nio/channels/DatagramChannel/SelectWhenRefused.java.i
-data/src/windows/native/sun/windows/awt_IconCursor.h.i
+data/src/share/classes/sun/security/krb5/KrbAsReq.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/basic.keystore.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformEnvelopedSignature.java.i
data/src/share/classes/sun/io/CharToByteMacSymbol.java.i
-data/src/share/classes/java/lang/doc-files/theta.gif.i
+data/test/javax/management/namespace/VirtualMBeanNotifTest.java.i
data/src/share/classes/sun/invoke/anon/ConstantPoolPatch.java.i
-data/make/launchers/Makefile.launcher.i
-data/test/java/io/StreamTokenizer/Comment.java.i
+data/src/share/classes/java/net/JarURLConnection.java.i
+data/make/sun/javazic/tzdata/pacificnew.i
data/test/java/math/BigInteger/OperatorNpeTests.java.i
-data/LICENSE.i
+data/make/sun/security/ec/FILES_c.gmk.i
+data/src/macosx/classes/apple/launcher/JavaAppLauncher.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthMenuItemUI.java.i
-data/src/share/classes/sun/io/ByteToCharCp1258.java.i
+data/test/sun/java2d/DirectX/IAEforEmptyFrameTest/IAEforEmptyFrameTest.java.i
data/src/share/classes/sun/tools/jconsole/ConnectDialog.java.i
data/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java.i
-data/test/java/nio/channels/Selector/LotsOfCancels.java.i
+data/src/share/classes/javax/naming/directory/InvalidSearchControlsException.java.i
data/src/share/classes/java/security/cert/PKIXParameters.java.i
data/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java.i
-data/test/java/rmi/activation/Activatable/restartService/RestartService.java.i
+data/make/tools/src/build/tools/jdwpgen/TypeNode.java.i
data/src/share/classes/com/sun/tools/jdi/DoubleTypeImpl.java.i
data/test/javax/swing/JColorChooser/Test4711996.java.i
-data/test/java/net/Socket/reset/Test.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/PreferredKey.java.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.chk.i
data/test/java/util/TreeMap/cr5045147.java.i
data/src/share/classes/java/awt/print/package.html.i
data/test/sun/security/provider/PolicyFile/Alias.keystore.i
-data/test/java/lang/ClassLoader/findSystemClass/Loadee.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/Warn.gif.i
data/src/share/classes/java/lang/Cloneable.java.i
data/src/share/classes/javax/swing/JToggleButton.java.i
data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/project.xml.i
-data/test/java/net/URL/HashCode.java.i
+data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties.i
+data/src/share/classes/java/lang/Comparable.java.i
data/test/java/lang/management/ThreadMXBean/Locks.java.i
data/src/share/classes/java/security/cert/PolicyQualifierInfo.java.i
data/test/javax/management/remote/mandatory/notif/policy.positive.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/ProxyTunnelServer.java.i
+data/src/share/demo/management/VerboseGC/README.txt.i
data/src/share/classes/java/dyn/MethodHandle.java.i
data/src/share/demo/jvmti/hprof/hprof_blocks.h.i
-data/test/java/io/PrintStream/FailingConstructors.java.i
+data/test/java/rmi/testlibrary/TestFailedException.java.i
data/test/java/rmi/server/serverStackTrace/Impl1_Skel.java.i
data/test/sun/security/pkcs11/fips/certs/server.cer.i
-data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.vertical.gif.i
-data/src/share/classes/javax/naming/spi/ResolveResult.java.i
-data/test/java/io/RandomAccessFile/Close.java.i
+data/test/sun/security/pkcs11/fips/ImportKeyStore.java.i
+data/test/javax/crypto/NullCipher/TestWithoutInit.java.i
data/src/share/classes/java/awt/peer/PopupMenuPeer.java.i
data/src/share/classes/java/awt/dnd/Autoscroll.java.i
-data/test/java/beans/Introspector/memory/Bean2.java.i
data/src/share/native/java/lang/fdlibm/src/e_log.c.i
data/test/sun/rmi/transport/proxy/EagerHttpFallback.java.i
data/test/sun/security/pkcs11/SecmodTest.java.i
@@ -10391,13 +10817,13 @@ data/test/sun/net/www/AuthHeaderTest.java.i
data/test/com/sun/tools/attach/PermissionTest.java.i
data/test/com/sun/jdi/HomeTest.java.i
data/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java.i
-data/test/sun/security/tools/policytool/i18n.sh.i
+data/test/sun/net/www/http/KeepAliveCache/B5045306.java.i
data/src/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java.i
-data/src/share/native/java/lang/Float.c.i
-data/src/share/classes/com/sun/jndi/ldap/LdapURL.java.i
+data/src/share/classes/sun/io/ByteToCharMS932.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain5.txt.i
data/src/share/native/sun/awt/libpng/pngread.c.i
data/test/java/beans/XMLDecoder/spec/TestFloat.java.i
-data/src/share/native/sun/security/jgss/wrapper/gssapi.h.i
+data/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMBean.java.i
data/src/share/back/ArrayReferenceImpl.c.i
data/src/share/classes/java/util/IllformedLocaleException.java.i
@@ -10407,88 +10833,97 @@ data/test/java/net/Socket/UrgentDataTest.java.i
data/src/share/classes/sun/management/OperatingSystemImpl.java.i
data/test/demo/jvmti/hprof/OptionsTest.java.i
data/src/solaris/doc/sun/man/man1/ja/jarsigner.1.i
-data/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java.i
+data/make/tools/swing-beans/beaninfo/images/JInternalFrameColor32.gif.i
data/src/share/classes/com/sun/media/sound/SF2Layer.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/TokenMgrError.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/DnDTarget.java.i
data/test/sun/security/ssl/sun/net/www/httpstest/HttpTransaction.java.i
data/src/share/classes/javax/swing/ActionPropertyChangeListener.java.i
-data/src/share/classes/sun/io/ByteToCharCp933.java.i
+data/test/java/io/pathNames/win32/SJIS.java.i
data/test/javax/script/Test6.java.i
data/src/share/classes/sun/nio/cs/ext/IBM943.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java.i
-data/src/share/classes/java/awt/image/renderable/RenderContext.java.i
+data/test/java/awt/font/StyledMetrics/BoldSpace.java.i
data/test/java/nio/file/WatchService/FileTreeModifier.java.i
data/test/java/lang/instrument/GetInitiatedClassesTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsCheckBoxMenuItemUI.java.i
data/src/share/classes/sun/text/resources/FormatData_es_ES.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/Commands.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/batch.sh.i
data/src/share/classes/javax/swing/JCheckBoxMenuItem.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java.i
+data/src/macosx/classes/com/apple/eawt/event/RotationEvent.java.i
data/test/java/lang/management/ThreadMXBean/SharedSynchronizer.java.i
data/src/share/native/sun/management/HotSpotDiagnostic.c.i
-data/src/share/classes/sun/security/provider/certpath/CertId.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java.i
+data/test/sun/security/tools/keytool/trystore.sh.i
data/test/java/math/BigDecimal/RangeTests.java.i
-data/src/share/native/sun/awt/medialib/mlib_status.h.i
+data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml.i
data/src/share/classes/javax/swing/text/ComponentView.java.i
-data/src/windows/native/sun/nio/ch/WindowsAsynchronousServerSocketChannelImpl.c.i
-data/src/share/classes/java/awt/color/package.html.i
+data/test/javax/crypto/Cipher/TestCipherMode.java.i
+data/test/java/lang/Math/Expm1Tests.java.i
data/test/java/awt/PrintJob/Security/SecurityDialogTest.java.i
data/src/share/classes/javax/naming/event/ObjectChangeListener.java.i
+data/test/javax/swing/tree/DefaultTreeCellRenderer/7142955/bug7142955.java.i
data/src/share/classes/javax/swing/tree/DefaultTreeModel.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMTransform.java.i
+data/src/share/classes/sun/tools/tree/ExprExpression.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest12_ok.ssl.in.i
data/test/javax/sound/midi/Gervill/SoftTuning/GetTuningInt.java.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain7.txt.i
-data/test/java/io/Serializable/PutField/Write2.java.i
-data/src/share/classes/sun/security/jgss/GSSNameImpl.java.i
+data/src/share/classes/com/sun/tools/example/doc/index.html.i
data/test/javax/sound/midi/Gervill/SoftChannel/Controller.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/p11-activcard.txt.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_ActiveSense.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c.i
-data/src/share/classes/java/awt/font/GlyphJustificationInfo.java.i
+data/test/sun/security/rsa/TestCACerts.java.i
data/src/share/demo/jfc/Metalworks/MetalworksPrefs.java.i
data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/PublicInterface.java.i
-data/test/java/security/Policy/Dynamic/DynamicPolicy.java.i
+data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh.i
data/test/com/sun/tracing/BasicWithSecurityMgr.java.i
-data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java.i
-data/make/tools/src/build/tools/jdwpgen/AbstractTypeListNode.java.i
-data/src/share/classes/sun/util/resources/CalendarData_mk.properties.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java.i
+data/test/javax/management/modelmbean/DescriptorSupportXMLTest.java.i
+data/test/sun/util/resources/TimeZone/Bug4858517.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_es.properties.i
+data/src/share/classes/javax/management/event/FetchingEventForwarder.java.i
data/src/windows/classes/sun/java2d/windows/DDBlitLoops.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java.i
+data/test/javax/swing/JTree/4314199/bug4314199.html.i
data/src/linux/doc/man/ja/jdb.1.i
data/src/share/classes/javax/crypto/spec/IvParameterSpec.java.i
-data/src/share/classes/com/sun/jndi/dns/ResourceRecord.java.i
+data/test/javax/print/applet/applet2/Applet2PrintServiceLookup.java.i
data/make/tools/swing-beans/beaninfo/images/JEditorPaneMono16.gif.i
-data/make/tools/jarreorder/Makefile.i
+data/src/macosx/native/sun/awt/QuartzSurfaceData.m.i
+data/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheOctetStreamData.java.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/DnDTarget.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeObjectLifecycleManager.java.i
data/test/org/openjdk/jigsaw/preinstall-setup.sh.i
data/src/share/classes/sun/security/jgss/krb5/InitSecContextToken.java.i
data/src/share/classes/sun/io/ByteToCharUnicodeLittleUnmarked.java.i
-data/src/share/classes/sun/security/util/DerInputBuffer.java.i
+data/src/share/classes/sun/security/x509/PolicyMappingsExtension.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/internal/ColumnarData.java.i
data/test/java/util/ResourceBundle/Bug4396021GeneralMessages.java.i
data/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java.i
data/src/share/native/sun/awt/libpng/pngmem.c.i
data/src/share/classes/java/net/URLStreamHandler.java.i
-data/src/share/classes/sun/reflect/generics/tree/Tree.java.i
+data/test/java/util/Formatter/Basic-X.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/SELTest.java.i
data/src/share/classes/sun/nio/ch/DatagramChannelImpl.java.i
data/src/share/classes/sun/tools/jstat/RawOutputFormatter.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java.i
data/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java.i
data/src/share/classes/sun/security/provider/DSAKeyFactory.java.i
+data/src/share/classes/java/lang/ref/FinalReference.java.i
+data/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java.i
+data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c.i
data/src/share/native/sun/management/VMManagementImpl.c.i
-data/src/share/classes/javax/swing/text/rtf/RTFParser.java.i
+data/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java.i
data/test/java/awt/Focus/ContainerFocusAutoTransferTest/ContainerFocusAutoTransferTest.java.i
data/test/com/sun/crypto/provider/KeyFactory/PBKDF2HmacSHA1FactoryTest.java.i
+data/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java.i
data/src/share/sample/nio/file/Copy.java.i
data/src/share/classes/javax/security/auth/callback/ConfirmationCallback.java.i
data/test/sun/net/idn/nfscsi.spp.i
+data/src/share/classes/sun/font/Underline.java.i
data/test/sun/net/www/protocol/http/ProtocolRedirect.java.i
data/src/solaris/native/sun/security/smartcardio/MUSCLE/pcsclite.h.i
data/src/share/classes/java/util/concurrent/CompletionService.java.i
-data/src/share/classes/com/sun/jdi/event/EventQueue.java.i
+data/test/java/awt/Window/OwnedWindowsLeak/OwnedWindowsLeak.java.i
data/src/solaris/bin/ergo_zero.c.i
data/src/windows/native/sun/windows/awt_List.cpp.i
data/test/sun/tools/jstat/gcOldOutput1.awk.i
@@ -10498,123 +10933,127 @@ data/test/tools/launcher/libraryCaller.h.i
data/src/share/native/java/io/ObjectInputStream.c.i
data/test/sun/security/rsa/rsakeys.ks.i
data/test/javax/swing/JColorChooser/Test6199676.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java.i
-data/src/share/classes/sun/security/provider/IdentityDatabase.java.i
+data/src/share/native/sun/font/layout/LEFontInstance.h.i
+data/test/java/rmi/reliability/scripts/run_serialbench.ksh.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java.i
data/test/java/security/BasicPermission/PermClass.1.3.1.i
+data/src/share/classes/sun/font/CMap.java.i
data/src/share/classes/java/awt/geom/NoninvertibleTransformException.java.i
data/test/javax/management/mxbean/MXBeanPreRegisterTest.java.i
data/src/share/classes/java/lang/annotation/RetentionPolicy.java.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpec.java.i
-data/src/share/classes/java/lang/invoke/InvokeGeneric.java.i
+data/test/java/beans/XMLDecoder/spec/TestVar.java.i
data/src/share/classes/javax/net/ssl/SSLSocketFactory.java.i
data/src/share/classes/sun/text/resources/BreakIteratorInfo_th.java.i
data/make/tools/CharsetMapping/ISO_8859_15.map.i
data/src/share/classes/sun/text/resources/FormatData_da.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/B.1.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java.i
data/src/share/native/sun/font/layout/NonContextualGlyphSubstProc.h.i
data/src/windows/native/sun/windows/awt_DnDDT.h.i
-data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
+data/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif.i
data/test/java/awt/image/GetSamplesTest.java.i
data/test/com/sun/nio/sctp/SctpChannel/Receive.java.i
data/test/org/openjdk/jigsaw/cli/timestamp-test.sh.i
-data/src/solaris/native/sun/awt/awt_dnd.h.i
-data/test/java/lang/reflect/Generics/TestC2.java.i
+data/make/java/text/FILES_java.gmk.i
data/test/com/sun/jdi/redefineMethod/Different_RedefineSubTarg.java.i
data/test/java/security/BasicPermission/PermClass.1.2.1.i
-data/test/sun/rmi/rmic/newrmic/equivalence/ComputeServer.java.i
+data/test/java/rmi/dgc/dgcImplInsulation/security.policy.i
data/test/java/dyn/6987555/Test6987555.java.i
data/test/java/awt/event/HierarchyEvent/AncestorResized/AncestorResized.java.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties.i
data/make/modules/tools/src/com/sun/classanalyzer/AnnotatedDependency.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicProgressBarUI.java.i
data/src/share/native/sun/awt/image/cvutils/img_dir8dither.h.i
-data/src/share/classes/sun/applet/Main.java.i
-data/src/share/classes/sun/awt/resources/awt_ja.properties.i
+data/src/share/classes/sun/security/util/AuthResources_ja.java.i
+data/test/java/util/HashMap/ToString.java.i
data/src/share/native/sun/java2d/opengl/OGLRenderer.c.i
data/src/share/classes/sun/management/HotspotInternal.java.i
-data/src/share/classes/com/sun/pept/presentation/Tie.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/inffixed.h.i
+data/src/macosx/classes/com/apple/eawt/QuitStrategy.java.i
data/test/sun/security/tools/policytool/SaveAs.sh.i
-data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c.i
data/test/com/sun/net/httpserver/FileServerHandler.java.i
data/test/java/lang/management/ThreadMXBean/InvalidThreadID.java.i
+data/src/share/classes/com/sun/media/sound/SoftVoice.java.i
data/test/java/net/Socket/asyncClose/AsyncClose.java.i
data/make/javax/swing/plaf/Makefile.i
-data/src/share/classes/sun/util/resources/CalendarData_th.properties.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetConnectionBlocks.java.i
data/src/share/classes/javax/management/loading/MLetObjectInputStream.java.i
data/test/java/awt/print/PrinterJob/duke.gif.i
data/src/solaris/doc/sun/man/man1/ja/unpack200.1.i
-data/test/java/security/cert/CertificateFactory/BadX509CertData.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html.i
+data/src/macosx/native/sun/awt/CDropTargetContextPeer.m.i
data/make/javax/swing/beaninfo/Makefile.i
-data/test/sun/security/tools/policytool/SaveAs.html.i
+data/src/share/classes/java/util/concurrent/ThreadLocalRandom.java.i
data/src/share/classes/java/awt/image/IndexColorModel.java.i
data/test/java/rmi/activation/Activatable/restartCrashedService/group.security.policy.i
data/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java.i
data/make/common/internal/Defs-jaxws.gmk.i
-data/src/share/classes/java/beans/XMLDecoder.java.i
-data/src/solaris/doc/sun/man/man1/jrunscript.1.i
-data/src/share/classes/sun/awt/image/BufferedImageDevice.java.i
+data/src/share/classes/javax/swing/text/StyleConstants.java.i
+data/src/windows/native/java/io/dirent_md.c.i
data/test/java/util/logging/LoggingDeadlock3.props.i
data/src/share/classes/com/sun/crypto/provider/DESedeKeyGenerator.java.i
data/src/share/classes/javax/xml/crypto/KeySelectorResult.java.i
-data/src/share/classes/javax/sql/rowset/JdbcRowSet.java.i
-data/src/solaris/native/sun/java2d/loops/vis_ThreeByteBgr.c.i
+data/test/java/beans/Beans/6669869/TestGuiAvailable.java.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java.i
data/src/share/classes/java/awt/image/PixelGrabber.java.i
-data/test/javax/print/attribute/CollateAttr.java.i
+data/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java.i
data/test/java/beans/XMLEncoder/Test4652928.java.i
data/src/windows/native/java/util/TimeZone_md.h.i
data/test/tools/launcher/MiscTests.java.i
data/src/share/classes/sun/awt/OrientableFlowLayout.java.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/toc.html.i
data/test/sun/security/mscapi/AccessKeyStore.java.i
data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Cipher.java.i
-data/src/share/classes/sun/io/CharToByteCp850.java.i
data/src/share/back/transport.h.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java.i
data/src/share/classes/sun/security/ssl/MAC.java.i
-data/test/java/net/SocketPermission/Wildcard.java.i
-data/test/sun/security/util/PropertyExpander/ExpandAndEncode.java.i
+data/test/sun/tools/jconsole/ResourceCheckTest.sh.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Longs.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/coders/ComplexCoderDescriptor.java.i
data/src/share/classes/sun/nio/ch/PendingFuture.java.i
data/make/modules/modularize.sh.i
data/test/java/lang/instrument/AppendToBootstrapClassPathSetUp.sh.i
data/test/sun/util/resources/TimeZone/Bug6442006.java.i
data/test/java/text/Bidi/BidiEmbeddingTest.java.i
data/test/java/security/Policy/GetInstance/GetInstance.policy.i
-data/make/mkdemo/jfc/Notepad/Makefile.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java.i
+data/test/com/sun/servicetag/DeleteServiceTag.java.i
+data/test/java/lang/ClassLoader/package2/Class2.java.i
data/src/solaris/classes/java/net/PlainDatagramSocketImpl.java.i
data/src/share/classes/javax/management/MBeanNotificationInfo.java.i
data/src/share/classes/java/util/Collection.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XDataViewer.java.i
-data/src/share/demo/jfc/Font2DTest/resources/TextResources_zh_CN.properties.i
data/src/share/native/sun/awt/libpng/pngrtran.c.i
data/src/share/classes/sun/security/ssl/HandshakeMessage.java.i
data/test/java/io/Serializable/optionalDataEnd/OptionalDataEnd.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java.i
data/test/java/io/PipedWriter/FlushAfterClose.java.i
data/src/share/classes/javax/management/MBeanServerNotification.java.i
data/src/share/classes/javax/rmi/ssl/package.html.i
data/src/share/classes/sun/text/resources/FormatData_hu.java.i
data/src/share/classes/sun/dyn/util/Wrapper.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_CheckedCollection.java.i
+data/make/tools/CharsetMapping/euc_tw.map.i
data/make/tools/src/build/tools/generatenimbus/Utils.java.i
data/src/solaris/classes/sun/awt/X11/XAWTXSettings.java.i
data/src/share/classes/sun/io/ByteToCharHKSCS.java.i
data/src/share/classes/sun/font/TextSourceLabel.java.i
-data/src/share/classes/com/sun/servicetag/RegistrationData.java.i
-data/src/share/classes/sun/nio/cs/ext/EUC_KR.java.i
+data/make/com/sun/nio/Makefile.i
data/src/share/classes/sun/java2d/loops/DrawParallelogram.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/InvalidKeyResolverException.java.i
data/src/solaris/hpi/export/byteorder_md.h.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/ui/CompactLayout.java.i
-data/src/share/classes/javax/sql/rowset/spi/SyncFactoryException.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_TW.properties.i
data/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java.i
data/src/share/classes/javax/swing/plaf/nimbus/SynthPainterImpl.java.i
-data/src/share/classes/javax/management/DefaultLoaderRepository.java.i
+data/test/sun/tools/jps/jps-lm_Output1.awk.i
data/test/java/net/Inet6Address/serialize/serial1.4.2.ser.i
-data/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land.i
+data/src/share/bin/jli_util.h.i
data/make/tools/CharsetMapping/IBM278.nr.i
-data/test/sun/security/provider/DSA/TestDSA.java.i
+data/test/java/lang/Short/ByteSwap.java.i
+data/test/java/lang/ClassLoader/deadlock/SupBob.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr.properties.i
data/src/share/classes/com/sun/jndi/url/iiopname/iiopnameURLContextFactory.java.i
data/src/windows/native/sun/management/FileSystemImpl.c.i
@@ -10623,56 +11062,62 @@ data/src/share/classes/sun/awt/DisplayChangedListener.java.i
data/src/share/classes/java/util/concurrent/locks/Lock.java.i
data/src/share/classes/sun/net/httpserver/UnmodifiableHeaders.java.i
data/src/share/native/com/sun/java/util/jar/pack/main.cpp.i
+data/src/macosx/native/jobjc/TODOS.i
data/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java.i
data/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation_Stub.java.i
data/src/share/classes/sun/font/FontFamily.java.i
data/src/share/demo/nbproject/jfc/TableExample/nbproject/project.xml.i
-data/make/jprt.config.i
+data/make/netbeans/jconsole/build.xml.i
data/src/share/classes/java/awt/geom/LineIterator.java.i
-data/test/java/lang/management/MemoryMXBean/PendingAllGC.sh.i
+data/test/java/beans/XMLEncoder/Test5023557.java.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.policy.i
data/src/share/classes/sun/tools/native2ascii/N2AFilter.java.i
-data/test/javax/management/namespace/NamespaceControllerMBean.java.i
+data/test/javax/swing/border/Test4243289.html.i
data/test/java/security/UnresolvedPermission/AccessorMethods.signer2.i
+data/src/share/classes/sun/text/resources/CollationData_hr.java.i
data/src/share/classes/javax/swing/GraphicsWrapper.java.i
-data/src/share/classes/sun/nio/cs/ext/MS949.java.i
+data/src/macosx/native/jobjc/src/core/native/FFIType.m.i
data/src/solaris/native/sun/java2d/loops/java2d_Mlib.c.i
data/src/share/classes/java/lang/invoke/DirectMethodHandle.java.i
-data/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c.i
-data/test/javax/management/namespace/VirtualPropsTest.java.i
+data/make/tools/jarsplit/Makefile.i
+data/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java.i
data/src/share/classes/com/sun/tools/example/doc/trace.html.i
data/test/java/lang/StringBuilder/Insert.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO_8859_8.java.i
data/src/share/classes/java/io/PipedWriter.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java.i
data/test/sun/nio/cs/FindEncoderBugs.java.i
+data/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java.i
data/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp.i
data/src/share/classes/javax/naming/InterruptedNamingException.java.i
+data/test/java/util/zip/FlaterCriticalArray.java.i
data/src/share/classes/sun/security/tools/JarSigner.java.i
data/test/com/sun/jdi/ClassLoaderClassesTest.java.i
-data/test/sun/security/pkcs11/fips/fips.cfg.i
data/src/windows/native/sun/windows/alloc.h.i
data/test/java/nio/file/Files/content_type.sh.i
data/test/java/beans/XMLEncoder/javax_swing_tree_DefaultTreeModel.java.i
data/src/share/classes/sun/nio/cs/ext/MS1256.java.i
-data/test/java/nio/file/Files/SkipSiblings.java.i
+data/test/javax/management/descriptor/UnionTest.java.i
data/src/share/classes/sun/io/ByteToCharCp855.java.i
-data/test/javax/management/mxbean/MXBeanAnnotationTest.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/NativeBufferTest.java.i
data/make/tools/src/build/tools/generatecharacter/UnicodeSpec.java.i
-data/src/share/classes/sun/awt/image/BufImgVolatileSurfaceManager.java.i
+data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.template.i
data/test/java/lang/Class/getEnclosingConstructor/EnclosingConstructorTests.java.i
-data/src/share/classes/sun/net/www/ApplicationLaunchException.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h.i
+data/src/macosx/classes/com/apple/laf/AquaTextFieldBorder.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_DirectSound.cpp.i
-data/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java.i
data/test/tools/launcher/ZipMeUp.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/ReadBlocksClose.java.i
-data/src/share/classes/com/sun/java/browser/net/ProxyInfo.java.i
+data/src/share/native/java/util/zip/zlib-1.2.5/zconf.h.i
+data/src/share/classes/java/awt/ModalEventFilter.java.i
+data/src/windows/classes/sun/awt/windows/WCheckboxPeer.java.i
data/test/sun/net/www/protocol/http/RetryUponTimeout.java.i
data/src/share/classes/javax/management/remote/JMXConnectorServerProvider.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMEnvelopedTransform.java.i
+data/test/sun/security/pkcs11/ec/TestKeyFactory.java.i
data/src/windows/native/java/util/WindowsPreferences.c.i
-data/test/java/rmi/testlibrary/TestParams.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Arg.java.i
data/src/share/classes/com/sun/tools/jdi/ClassLoaderReferenceImpl.java.i
-data/test/sun/jvmstat/testlibrary/Sleeper.java.i
-data/test/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java.i
-data/src/share/classes/com/sun/rowset/internal/XmlErrorHandler.java.i
+data/test/tools/pack200/TestExceptions.java.i
+data/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider.i
data/src/share/classes/javax/management/remote/MBeanServerForwarder.java.i
data/test/javax/swing/JFileChooser/7036025/security.policy.i
data/test/sun/nio/cs/TestIllegalISO2022Esc.java.i
@@ -10684,78 +11129,79 @@ data/make/tools/src/build/tools/generatenimbus/PainterGenerator.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest09_ko.properties.in.i
data/src/share/classes/sun/text/resources/FormatData_ar_OM.java.i
data/src/share/classes/sun/applet/AppletThreadGroup.java.i
-data/src/share/classes/com/sun/jdi/InterfaceType.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer.i
+data/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt.i
data/src/share/classes/javax/print/attribute/standard/Media.java.i
data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.policy.i
data/src/share/classes/sun/net/ftp/impl/FtpClient.java.i
-data/src/share/classes/sun/java2d/pipe/PixelToParallelogramConverter.java.i
+data/src/share/native/sun/security/ec/ec.h.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibHandler.java.i
data/src/share/classes/sun/text/resources/FormatData_et.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpV6Address.java.i
data/src/share/classes/sun/net/spi/nameservice/NameService.java.i
-data/src/share/classes/javax/print/PrintException.java.i
-data/src/share/classes/java/awt/MenuBar.java.i
+data/src/share/classes/com/sun/jdi/CharValue.java.i
+data/test/sun/security/provider/PolicyFile/SelfWildcard.java.i
data/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java.i
-data/src/share/classes/sun/nio/cs/SingleByteEncoder.java.i
+data/src/share/classes/sun/font/TextSource.java.i
+data/test/java/util/Random/NextIntPowerOfTwoMod.java.i
data/test/java/nio/charset/coders/StreamTimeout.java.i
-data/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java.i
data/src/share/classes/org/ietf/jgss/MessageProp.java.i
data/src/share/native/java/io/RandomAccessFile.c.i
+data/src/share/classes/sun/tools/jconsole/ClassTab.java.i
data/src/share/classes/javax/sound/sampled/LineListener.java.i
-data/src/share/sample/nio/server/ChannelIO.java.i
-data/test/java/util/ResourceBundle/Bug4168625Resource2.java.i
-data/src/solaris/native/sun/awt/awt_xembed_server.c.i
+data/test/javax/accessibility/6986385/bug6986385.java.i
data/src/share/classes/java/nio/file/ReadOnlyFileSystemException.java.i
data/make/tools/CharsetMapping/IBM943.nr.i
data/src/solaris/classes/sun/nio/fs/UnixFileAttributeViews.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/floppy.gif.i
-data/test/java/util/PluggableLocale/ClasspathTest.sh.i
+data/src/share/demo/jvmti/heapViewer/README.txt.i
+data/src/windows/native/sun/windows/hand.cur.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadataFormat.java.i
data/src/share/classes/javax/swing/table/JTableHeader.java.i
data/make/java/java/localelist.sh.i
-data/src/share/native/sun/java2d/loops/AnyByte.c.i
+data/src/share/native/java/util/zip/zlib-1.2.5/zutil.h.i
data/src/share/native/sun/java2d/opengl/J2D_GL/glext.h.i
data/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java.i
+data/make/sun/javazic/tzdata/antarctica.i
data/src/share/classes/sun/security/krb5/KrbException.java.i
data/src/share/classes/javax/management/event/package-info.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/Type.java.i
data/test/java/io/BufferedInputStream/CloseStream.java.i
-data/src/share/classes/com/sun/crypto/provider/AESParameters.java.i
+data/test/javax/xml/crypto/dsig/SecurityManager/policy.i
+data/src/macosx/native/jobjc/JObjC.xcodeproj/default.pbxuser.i
+data/src/share/classes/com/sun/jdi/event/package.html.i
data/src/windows/classes/com/sun/management/OSMBeanFactory.java.i
data/src/share/classes/java/nio/charset/StandardCharsets.java.i
data/test/java/util/ResourceBundle/Bug4179766Class.java.i
-data/test/java/lang/String/SBConstructor.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java.i
+data/src/share/classes/java/security/cert/CertificateException.java.i
data/src/share/classes/com/sun/management/OperatingSystemMXBean.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/PaintModel.java.i
+data/src/share/classes/sun/awt/image/VolatileSurfaceManager.java.i
data/test/java/beans/PropertyEditor/6380849/TestPropertyEditor.java.i
data/src/share/classes/java/awt/peer/ComponentPeer.java.i
-data/src/share/classes/sun/net/www/URLConnection.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/PKCS12Oid.java.i
+data/test/sun/net/InetAddress/nameservice/dns/CanonicalName.java.i
data/src/share/native/sun/misc/VM.c.i
data/make/mkdemo/jfc/Font2DTest/Makefile.i
data/src/share/classes/sun/java2d/pipe/SpanShapeRenderer.java.i
data/test/com/sun/jdi/OnThrowTest.java.i
data/test/javax/management/remote/mandatory/connection/RMIExitTest.java.i
+data/src/macosx/classes/sun/lwawt/PlatformComponent.java.i
+data/test/java/nio/Buffer/StringCharBufferSliceTest.java.i
data/src/share/native/sun/awt/image/jpeg/jfdctint.c.i
-data/src/share/classes/sun/tools/tree/MultiplyExpression.java.i
+data/src/share/native/sun/reflect/ConstantPool.c.i
data/src/share/native/sun/awt/medialib/mlib_ImageUtils.c.i
data/src/solaris/hpi/native_threads/include/monitor_md.h.i
-data/src/share/classes/com/sun/crypto/provider/DESCrypt.java.i
+data/src/share/native/sun/java2d/loops/FourByteAbgr.c.i
data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations_Stub.java.i
+data/make/common/BuildPackages.gmk.i
data/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java.i
-data/test/sun/nio/cs/OLD/Johab_OLD.java.i
+data/test/sun/net/www/ParseUtil_6306697.java.i
data/test/java/beans/XMLEncoder/Test4936682.java.i
data/test/java/nio/file/Files/Links.java.i
data/src/share/classes/java/util/concurrent/ThreadPoolExecutor.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java.i
data/test/java/awt/Frame/FrameLocation/FrameLocation.java.i
data/test/sun/tools/jcmd/help_help.out.i
data/test/tools/pack200/Pack200Simple.sh.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java.i
-data/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java.i
-data/src/share/classes/java/awt/Font.java.i
+data/src/share/classes/com/sun/jdi/event/ClassPrepareEvent.java.i
data/src/share/classes/sun/text/resources/FormatData_en_NZ.java.i
data/src/share/native/sun/awt/image/cvutils/img_fsdither.h.i
data/src/share/classes/java/lang/module/ModuleIdQuery.java.i
@@ -10766,16 +11212,16 @@ data/src/share/classes/sun/jvmstat/perfdata/resources/aliasmap.i
data/src/share/classes/sun/dyn/CallSiteImpl.java.i
data/test/java/io/File/BlockIsDirectory.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_VE.properties.i
-data/src/share/classes/sun/java2d/loops/GraphicsPrimitiveProxy.java.i
+data/src/share/classes/sun/text/CollatorUtilities.java.i
data/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java.i
-data/test/java/lang/Class/forName/classes/period.class.i
data/src/share/native/sun/font/layout/MarkArrays.h.i
data/test/java/io/pathNames/win32/DriveSlash.java.i
data/src/share/classes/sun/misc/DoubleConsts.java.i
-data/src/share/classes/com/sun/jmx/event/EventParams.java.i
+data/test/java/io/Serializable/oldTests/SimpleArrays.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolEntryMeta.java.i
data/test/java/util/EnumMap/EntrySetIteratorRemoveInvalidatesEntry.java.i
-data/test/java/rmi/activation/Activatable/forceLogSnapshot/group.security.policy.i
+data/src/macosx/classes/sun/lwawt/LWTextFieldPeer.java.i
+data/test/java/util/Collections/EmptyIterator.java.i
data/test/java/rmi/activation/Activatable/restartLatecomer/security.policy.i
data/src/share/classes/sun/tools/tree/AssignSubtractExpression.java.i
data/make/tools/swing-beans/beaninfo/images/JDesktopPaneColor32.gif.i
@@ -10784,63 +11230,73 @@ data/src/share/classes/sun/awt/image/FileImageSource.java.i
data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Encoder.java.i
data/src/share/classes/sun/net/sdp/SdpSupport.java.i
data/src/share/classes/sun/io/CharToByteCp864.java.i
-data/src/windows/bin/java-rmi.c.i
data/test/sun/nio/cs/ConvertSingle.java.i
data/src/windows/native/sun/windows/awt_BitmapUtil.cpp.i
-data/src/share/classes/com/sun/jdi/request/MonitorContendedEnterRequest.java.i
+data/src/share/native/sun/font/layout/MirroredCharData.cpp.i
data/make/sun/jpeg/mapfile-vers-closed.i
data/test/com/sun/net/httpserver/DummyVerifier.java.i
-data/make/java/nio/reorder-sparcv9.i
+data/src/share/classes/java/sql/Savepoint.java.i
data/src/share/classes/java/lang/invoke/ConstantCallSite.java.i
+data/src/macosx/classes/com/apple/laf/AquaIcon.java.i
+data/src/windows/native/java/net/NetworkInterface.h.i
data/src/share/classes/com/sun/inputmethods/internal/thaiim/resources/DisplayNames.properties.i
+data/src/macosx/classes/com/apple/laf/AquaListUI.java.i
data/test/sun/nio/cs/TestUTF8BOM.java.i
-data/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.i
-data/test/java/util/logging/GetGlobalTest.java.i
+data/src/solaris/classes/sun/nio/ch/SocketDispatcher.java.i
+data/make/netbeans/common/windows-view.ent.i
+data/make/java/nio/mapfile-bsd.i
data/src/share/classes/javax/swing/plaf/synth/SynthDefaultLookup.java.i
data/src/windows/lib/images/cursors/cursors.properties.i
data/src/share/classes/sun/security/x509/X509Key.java.i
+data/src/share/classes/javax/swing/Spring.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation1Test.java.i
+data/src/share/classes/com/sun/tools/hat/resources/platform_names.txt.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize.gif.i
-data/src/windows/npt/utf_md.h.i
-data/src/share/classes/sun/font/FontScalerException.java.i
+data/src/macosx/classes/com/apple/laf/resources/aqua.properties.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load7.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java.i
+data/src/share/classes/java/nio/file/StandardWatchEventKinds.java.i
data/src/share/classes/javax/swing/event/TableModelListener.java.i
data/src/share/classes/sun/java2d/pipe/DrawImagePipe.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPlatformResponder.java.i
data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_Swing.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/IntArrays.java.i
-data/src/share/classes/sun/security/x509/X400Address.java.i
+data/src/bsd/doc/man/unpack200.1.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecVisitor.java.i
data/src/solaris/classes/sun/awt/X11/XlibWrapper.java.i
-data/src/share/classes/java/lang/annotation/Retention.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ro_RO.properties.i
+data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java.i
+data/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.i
+data/src/windows/classes/java/io/Win32FileSystem.java.i
+data/make/javax/rmi/ssl/Makefile.i
data/test/java/net/CookieHandler/CookieHandlerTest.java.i
-data/src/share/classes/sun/net/dns/ResolverConfiguration.java.i
+data/test/java/util/ResourceBundle/Test4318520RB_en.properties.i
data/src/share/native/java/net/net_util.h.i
data/src/solaris/doc/sun/man/man1/ja/schemagen.1.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/Generator.java.i
data/make/sun/jpeg/reorder-sparc.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/GetSize.java.i
-data/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java.i
data/test/java/beans/XMLEncoder/Test6501431.java.i
-data/test/java/lang/reflect/Proxy/Basic1.java.i
+data/src/macosx/classes/sun/nio/ch/KQueueSelectorProvider.java.i
+data/test/java/util/concurrent/ConcurrentHashMap/MapLoops.java.i
data/make/netbeans/common/standard-actions.ent.i
data/src/share/native/java/util/zip/zlib-1.2.5/README.i
data/src/share/classes/java/nio/charset/MalformedInputException.java.i
data/src/share/native/sun/awt/image/jpeg/jerror.c.i
+data/src/share/classes/sun/font/FontScaler.java.i
data/src/share/classes/javax/swing/plaf/DesktopPaneUI.java.i
data/src/share/classes/sun/awt/PeerEvent.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c.i
+data/make/com/sun/tracing/Makefile.i
data/src/solaris/classes/sun/awt/X11/XCreateWindowParams.java.i
-data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java.i
-data/test/java/io/Serializable/nonserializable/ExceptionDetail.java.i
data/src/share/native/sun/font/layout/GlyphDefinitionTables.cpp.i
-data/src/share/classes/com/sun/security/auth/SolarisPrincipal.java.i
+data/src/share/classes/sun/misc/resources/Messages_it.java.i
data/src/share/classes/javax/swing/text/doc-files/Document-coord.gif.i
-data/src/share/classes/sun/text/resources/CollationData_sr_Latn.java.i
+data/src/share/classes/sun/text/resources/FormatData_et_EE.java.i
data/src/share/classes/java/awt/image/PixelInterleavedSampleModel.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/FileMonitoredVm.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_Decoder.java.i
data/test/java/security/Security/signedfirst/Static.props.i
data/test/java/io/DataOutputStream/WriteUTF.java.i
data/src/share/demo/jfc/CodePointIM/README_zh_CN.html.i
+data/src/share/lib/security/java.security.i
data/src/share/classes/sun/text/resources/CollationData_no.java.i
data/src/share/classes/javax/sound/midi/MetaEventListener.java.i
data/src/share/classes/com/sun/net/httpserver/HttpContext.java.i
@@ -10849,136 +11305,147 @@ data/test/java/util/jar/JarFile/SignedJarFileGetInputStream.java.i
data/test/com/sun/security/auth/login/ConfigFile/InnerClassConfig.config.i
data/src/share/classes/com/sun/rowset/internal/SyncResolverImpl.java.i
data/test/javax/swing/JFileChooser/6698013/bug6698013.java.i
-data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_EBCDIC_Decoder.java.i
+data/test/com/oracle/net/Sanity.java.i
data/src/share/demo/jvmti/heapTracker/HeapTracker.java.i
data/test/java/security/UnresolvedPermission/DebugPermission2.java.i
+data/test/java/math/BigDecimal/MultiplyTests.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicMenuBarUI.java.i
data/src/share/classes/javax/script/Compilable.java.i
-data/test/java/net/InetAddress/WhiteSpaceHostTest.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/coders/PrimitiveCoderDescriptor.java.i
+data/test/java/beans/XMLEncoder/Test4646747.java.i
data/test/sun/net/www/protocol/jar/foo1.jar.i
data/src/share/classes/com/sun/jdi/IntegerType.java.i
data/src/share/classes/sun/java2d/pipe/PixelDrawPipe.java.i
data/src/share/back/ArrayReferenceImpl.h.i
-data/src/share/classes/javax/swing/border/StrokeBorder.java.i
-data/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c.i
+data/test/javax/sound/midi/Sequencer/SequencerImplicitSynthOpen.java.i
+data/src/share/native/sun/font/layout/LookupProcessor.cpp.i
data/src/share/classes/sun/security/krb5/internal/EncKrbPrivPart.java.i
data/src/share/classes/javax/swing/colorchooser/ColorModelHSV.java.i
data/src/share/classes/com/sun/media/sound/SoftFilter.java.i
data/src/share/native/sun/security/pkcs11/j2secmod.h.i
data/src/solaris/classes/sun/awt/X11/XInputMethodDescriptor.java.i
-data/test/java/lang/Runtime/exec/ArgWithSpaceAndFinalBackslash.java.i
-data/src/share/classes/java/net/BindException.java.i
+data/test/java/util/ResourceBundle/Control/BadControlsTest.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmstypes.c.i
+data/src/macosx/native/sun/awt/CImage.m.i
data/src/share/sample/nio/file/FileType.java.i
data/src/share/classes/sun/io/ByteToCharGB18030DB.java.i
-data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.form.i
+data/test/java/io/Serializable/badSerialPersistentField/BadSerialPersistentField.java.i
+data/src/solaris/native/sun/nio/ch/DatagramDispatcher.c.i
data/src/share/classes/java/util/concurrent/ConcurrentNavigableMap.java.i
data/src/share/classes/javax/print/attribute/HashPrintRequestAttributeSet.java.i
data/test/java/util/Collections/Swap.java.i
data/test/java/nio/channels/DatagramChannel/UseDGWithIPv6.java.i
data/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java.i
data/src/share/classes/sun/util/locale/LocaleExtensions.java.i
-data/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java.i
+data/src/share/classes/sun/io/CharToByteISO8859_5.java.i
data/src/share/classes/sun/security/x509/CertificateSubjectUniqueIdentity.java.i
data/src/share/native/sun/font/layout/LayoutEngine.h.i
data/test/java/util/Collections/MinMax.java.i
data/src/share/classes/java/io/UnsupportedEncodingException.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/AnnotationParser.java.i
+data/src/share/classes/sun/java2d/loops/GeneralRenderer.java.i
data/src/share/classes/sun/reflect/UnsafeFieldAccessorFactory.java.i
data/src/share/classes/javax/swing/tree/MutableTreeNode.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Method.java.i
+data/src/share/classes/sun/security/x509/CertificateValidity.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1112.java.i
+data/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ja.properties.i
data/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java.i
data/src/linux/doc/man/jps.1.i
data/test/com/sun/jdi/RedefineClasses.sh.i
-data/src/share/classes/javax/imageio/ImageIO.java.i
-data/src/windows/native/sun/windows/hand.cur.i
+data/src/share/classes/com/sun/jndi/ldap/Ber.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_it.properties.i
data/make/tools/swing-beans/beaninfo/images/JComboBoxMono16.gif.i
+data/test/sun/tools/native2ascii/N2A_4636448.expected.i
+data/test/com/sun/tools/attach/SimpleProvider.java.i
data/test/java/nio/channels/SocketChannel/SocketOptionTests.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/group.security.policy.i
data/src/share/classes/javax/swing/plaf/OptionPaneUI.java.i
-data/test/javax/swing/JInternalFrame/6726866/bug6726866.html.i
+data/src/share/classes/java/io/LineNumberInputStream.java.i
data/src/share/native/sun/font/layout/CursiveAttachmentSubtables.h.i
-data/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java.i
+data/make/tools/swing-beans/beaninfo/images/JPanelColor16.gif.i
data/src/share/classes/javax/swing/plaf/multi/MultiDesktopPaneUI.java.i
data/src/share/demo/jfc/SampleTree/README.txt.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/InterprocessMessages.java.i
data/test/sun/security/krb5/auto/OkAsDelegateXRealm.java.i
data/make/netbeans/common/demo-sources.ent.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java.i
data/src/share/classes/sun/io/ByteToCharConverter.java.i
data/src/share/classes/sun/nio/cs/ext/MS874.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserMono16.gif.i
-data/make/modules/jdk.boot.ls.i
+data/test/java/beans/XMLEncoder/4741757/TestStackOverflow.java.i
data/src/share/classes/sun/util/resources/LocaleNames_it.properties.i
data/src/share/sample/jmx/jmx-scandir/src/etc/password.properties.i
data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.h.i
data/src/share/native/sun/font/layout/IndicLayoutEngine.cpp.i
data/test/java/util/Collections/ViewSynch.java.i
-data/src/share/classes/java/security/spec/ECField.java.i
+data/test/com/sun/jdi/ConnectedVMs.java.i
data/src/share/classes/sun/font/FontRunIterator.java.i
-data/src/linux/doc/man/servertool.1.i
-data/src/share/classes/java/awt/peer/LabelPeer.java.i
+data/src/windows/classes/com/sun/tools/jdi/SharedMemoryAttachingConnector.java.i
+data/test/javax/management/remote/mandatory/connectorServer/ConnectorStopDeadlockTest.java.i
data/test/javax/swing/border/Test4252164.java.i
-data/src/share/sample/nio/server/ChannelIOSecure.java.i
+data/test/java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java.i
+data/src/share/classes/javax/sound/sampled/Line.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java.i
data/test/sun/nio/cs/TestUTF_32.java.i
-data/src/share/classes/com/sun/jndi/rmi/registry/RegistryContextFactory.java.i
+data/test/java/awt/event/MouseEvent/AWTPanelSmoothWheel/AWTPanelSmoothWheel.html.i
data/src/share/classes/java/text/EntryPair.java.i
data/src/solaris/classes/sun/awt/X11/keysym2ucs.h.i
data/src/windows/native/sun/windows/awt_MenuBar.h.i
data/src/share/classes/sun/security/jgss/spnego/NegTokenTarg.java.i
+data/test/javax/swing/text/html/CSS/4530474/bug4530474.java.i
data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_4.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/package.html.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/FloppyDrive.gif.i
data/src/share/classes/sun/security/jgss/krb5/CipherHelper.java.i
data/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java.i
data/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt.i
-data/src/share/classes/java/lang/module/package-info.java.i
-data/src/share/classes/org/ietf/jgss/GSSContext.java.i
-data/src/share/classes/sun/awt/shell/ShellFolder.java.i
+data/src/share/back/standardHandlers.h.i
+data/src/share/classes/java/lang/annotation/ElementType.java.i
+data/test/java/nio/file/attribute/BasicFileAttributeView/Basic.java.i
data/src/share/native/com/sun/tools/jdi/SharedMemory.h.i
data/src/share/classes/sun/security/provider/DSAParameterGenerator.java.i
data/test/sun/security/util/Resources/Format.java.i
data/test/com/sun/crypto/provider/Cipher/Blowfish/BlowfishTestVector.java.i
data/src/share/classes/com/sun/jmx/remote/util/OrderClassLoaders.java.i
-data/src/share/classes/sun/java2d/InvalidPipeException.java.i
+data/test/java/awt/xembed/server/TestXEmbedServerJava.java.i
data/test/sun/tools/jstat/jstatGcNewOutput1.sh.i
-data/src/share/classes/com/sun/jndi/rmi/registry/ReferenceWrapper.java.i
+data/src/share/classes/java/awt/event/ActionListener.java.i
data/src/share/classes/sun/jvmstat/monitor/HostIdentifier.java.i
+data/src/share/native/sun/security/ec/impl/ec2.h.i
data/src/share/classes/com/sun/net/ssl/package.html.i
data/src/share/classes/com/sun/media/sound/SoftCubicResampler.java.i
-data/test/sun/security/pkcs11/sslecc/CipherTest.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties.i
+data/src/macosx/classes/com/apple/laf/AquaComboBoxPopup.java.i
+data/src/share/classes/java/text/RuleBasedBreakIterator.java.i
data/src/share/demo/applets/SortDemo/BidirBubbleSortAlgorithm.java.i
data/test/sun/java2d/cmm/ColorConvertOp/PYCC.png.i
data/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java.i
data/src/solaris/native/sun/security/pkcs11/j2secmod_md.c.i
-data/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java.i
+data/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java.i
data/src/solaris/doc/sun/man/man1/ja/jar.1.i
-data/test/com/sun/jdi/DebuggerThreadTest.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java.i
-data/src/share/classes/sun/awt/datatransfer/DataTransferer.java.i
+data/test/java/net/Inet6Address/B4923906.java.i
+data/test/javax/crypto/CipherSpi/DirectBBRemaining.java.i
+data/src/share/classes/sun/util/resources/CalendarData.properties.i
data/make/tools/compile_font_config/Makefile.i
-data/src/share/sample/nio/file/WatchDir.java.i
+data/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java.i
data/test/javax/management/Introspector/DuplicateGetterTest.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java.i
data/src/windows/native/sun/windows/awt_Menu.h.i
-data/src/solaris/bin/zero/jvm.cfg.i
+data/src/share/classes/sun/awt/AWTCharset.java.i
data/src/share/classes/sun/awt/image/BufImgSurfaceData.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CloseSocket.java.i
+data/test/javax/crypto/Mac/NullMacSpi.java.i
data/src/share/classes/sun/misc/UCEncoder.java.i
data/test/java/lang/ClassLoader/package1/Class1.java.i
data/test/java/awt/Frame/ShownOffScreenOnWin98/ShownOffScreenOnWin98Test.java.i
-data/src/share/classes/javax/print/URIException.java.i
+data/src/share/classes/sun/font/NullFontScaler.java.i
data/make/tools/CharsetMapping/ISO_8859_13.map.i
+data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy.i
data/src/share/classes/java/security/spec/EllipticCurve.java.i
-data/src/windows/native/java/net/NetworkInterface.h.i
+data/test/sun/net/www/http/HttpClient/IsKeepingAlive.java.i
data/make/java/applet/Makefile.i
-data/src/share/classes/java/text/Format.java.i
data/test/java/lang/instrument/BigClass.java.i
data/src/share/native/sun/font/layout/LigatureSubstProc.h.i
data/test/sun/rmi/rmic/newrmic/equivalence/OrangeEcho.java.i
-data/make/tools/CharsetMapping/IBM420.nr.i
+data/src/macosx/classes/sun/lwawt/macosx/CPopupMenu.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/README.i
data/test/com/sun/jdi/Unload2Targ.java.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Foo.java.i
@@ -10986,105 +11453,114 @@ data/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.j
data/make/sun/cmm/kcms/FILES_c_unix.gmk.i
data/test/sun/security/tools/jarsigner/newsize7.sh.i
data/src/share/native/sun/awt/image/cvutils/img_colors.h.i
-data/test/java/util/ResourceBundle/Control/Chinese_zh.properties.i
-data/test/java/lang/instrument/AppendToBootstrapClassPathTest.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn.java.i
+data/src/share/classes/javax/naming/event/NamingEvent.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.password.in.i
-data/src/share/classes/javax/naming/event/package.html.i
+data/src/share/classes/org/jcp/xml/dsig/internal/MacOutputStream.java.i
data/test/java/lang/ThreadGroup/Stop.java.i
data/make/com/sun/security/auth/FILES_java.gmk.i
data/test/java/lang/ClassLoader/deadlock/DelegatingLoader.java.i
data/src/share/classes/javax/swing/text/ElementIterator.java.i
-data/make/tools/src/build/tools/charsetmapping/DBCS.java.i
+data/test/com/sun/security/auth/login/ConfigFile/Override.props.i
data/test/java/util/logging/ClassLoaderLeakTest.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/zutil.c.i
-data/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java.i
+data/test/java/nio/file/WatchService/Basic.java.i
data/src/share/classes/sun/launcher/resources/launcher_sv.properties.i
data/test/sun/tools/jstat/jstatFileURITest1.sh.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java.i
+data/test/java/net/URLConnection/ChunkedEncoding.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_CN.properties.i
data/src/share/classes/sun/awt/EventListenerAggregate.java.i
data/src/share/classes/com/sun/tracing/dtrace/ModuleAttributes.java.i
data/test/java/io/File/GetXSpace.java.i
data/src/share/classes/sun/tools/jstat/Operator.java.i
data/src/share/classes/sun/print/PathGraphics.java.i
-data/test/sun/net/www/http/HttpClient/RetryPost.sh.i
-data/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java.i
+data/src/share/demo/jfc/CodePointIM/README_ja.html.i
+data/src/share/demo/applets/GraphicsTest/GraphicsTest.java.i
+data/make/tools/CharsetMapping/MacArabic.map.i
data/src/share/classes/sun/nio/ch/SocketOpts.java.i
data/src/share/classes/sun/font/StrikeCache.java.i
data/test/java/lang/reflect/Method/GenericStringTest.java.i
data/src/windows/classes/sun/security/mscapi/RSAKeyPair.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java.i
data/src/share/classes/sun/management/AgentConfigurationError.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java.i
-data/src/share/classes/sun/rmi/rmic/RemoteClass.java.i
+data/src/share/native/sun/java2d/cmm/lcms/icc34.h.i
data/src/share/classes/javax/management/Descriptor.java.i
data/make/sun/cmm/kcms/FILES_c_windows.gmk.i
-data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedInt.java.i
data/test/sun/tools/jstatd/jpsOutput1.awk.i
data/src/share/classes/com/sun/script/javascript/RhinoClassShutter.java.i
data/src/share/classes/sun/swing/FilePane.java.i
-data/make/java/main/java/mapfile-amd64.i
-data/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java.i
+data/src/share/classes/sun/io/CharToByteBig5_Solaris.java.i
+data/test/javax/security/auth/kerberos/KerberosTixDateTest.java.i
+data/src/share/classes/sun/jkernel/StandaloneByteArrayAccess.java.i
+data/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java.i
data/src/share/classes/com/sun/crypto/provider/SymmetricCipher.java.i
-data/src/share/classes/com/sun/media/sound/ModelStandardDirector.java.i
+data/test/java/util/concurrent/DelayQueue/Stress.java.i
data/test/sun/nio/cs/OLD/TestIBMDB.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/README.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/package.html.i
-data/src/share/native/java/util/zip/zlib-1.1.3/deflate.h.i
+data/src/share/classes/com/sun/security/sasl/ClientFactoryImpl.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java.i
-data/src/share/classes/sun/awt/im/CompositionArea.java.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.java.i
data/test/com/sun/net/httpserver/Test4.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/ArgumentList.java.i
-data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html.i
+data/src/share/classes/sun/tools/jconsole/LabeledComponent.java.i
data/test/sun/text/resources/Collator/Bug4248694.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ResourceFile.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java.i
data/test/java/awt/Focus/RequestFocusToDisabledCompTest/RequestFocusToDisabledCompTest.java.i
+data/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributeView.java.i
data/test/sun/security/pkcs11/rsa/GenKeyStore.java.i
data/src/share/classes/sun/net/URLCanonicalizer.java.i
+data/src/share/classes/java/lang/ArrayStoreException.java.i
data/test/java/util/Collections/Frequency.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestPreciseTimestampRendering.java.i
data/src/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuItemUI.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementChecker.java.i
-data/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java.i
+data/src/share/classes/javax/swing/JSlider.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509ExtendedKeyManager.java.i
data/make/tools/swing-beans/beaninfo/images/JFileChooserMono32.gif.i
data/make/tools/src/build/tools/jdwpgen/AbstractSimpleNode.java.i
data/test/javax/management/namespace/EventWithNamespaceTest.java.i
-data/test/javax/swing/JScrollPane/6559589/bug6559589.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMInformCommunity.java.i
+data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java.i
+data/test/java/beans/Introspector/TestTypeResolver.java.i
data/src/share/classes/java/beans/PropertyEditorSupport.java.i
data/src/share/classes/sun/font/FontDesignMetrics.java.i
-data/test/javax/swing/plaf/nimbus/ColorCustomizationTest.java.i
+data/test/sun/misc/URLClassPath/ClassnameCharTest.sh.i
data/src/windows/classes/sun/awt/windows/WListPeer.java.i
+data/make/jpda/expr/Makefile.i
+data/src/share/classes/javax/management/loading/PrivateClassLoader.java.i
data/test/java/util/Locale/Bug4175998Test.java.i
-data/make/com/sun/jndi/cosnaming/Makefile.i
-data/src/share/classes/sun/text/resources/FormatData_de_LU.java.i
+data/src/share/native/sun/security/ec/ec2_233.c.i
data/src/share/classes/java/awt/event/MouseListener.java.i
data/src/share/classes/sun/tools/tree/ContinueStatement.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCEntryMeta.java.i
data/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java.i
data/src/share/classes/sun/jvmstat/monitor/Units.java.i
data/test/java/security/KeyRep/PBE.pre.1.5.key.i
-data/test/com/sun/jdi/ShutdownDebuggee.java.i
+data/test/javax/management/descriptor/ImmutableArrayFieldTest.java.i
data/src/share/classes/sun/util/resources/LocaleNames_uk.properties.i
data/src/share/classes/com/sun/jdi/connect/Connector.java.i
data/test/java/net/URLClassLoader/getresourceasstream/Test.java.i
data/src/share/classes/com/sun/security/sasl/ntlm/NTLMClient.java.i
-data/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_el_CY.properties.i
-data/src/share/classes/com/sun/security/auth/module/UnixSystem.java.i
+data/make/sun/launcher/Makefile.i
data/ASSEMBLY_EXCEPTION.i
data/src/share/classes/sun/io/ByteToCharUTF16.java.i
data/src/share/classes/java/lang/Iterable.java.i
data/test/java/net/Socket/ReadTimeout.java.i
data/make/tools/src/build/tools/javazic/ZoneRec.java.i
+data/src/share/classes/com/sun/jmx/snmp/tasks/Task.java.i
data/src/share/native/sun/awt/medialib/mlib_sys_proto.h.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java.i
-data/src/share/classes/sun/text/resources/FormatData_zh_CN.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/RemoteVm.java.i
+data/src/share/classes/java/awt/datatransfer/Clipboard.java.i
+data/src/share/sample/scripting/scriptpad/build.xml.i
data/src/share/classes/sun/tools/tree/VarDeclarationStatement.java.i
+data/src/share/classes/sun/util/resources/CalendarData_sq.properties.i
data/src/share/demo/jvmti/minst/minst.c.i
+data/src/share/classes/com/sun/jdi/connect/ListeningConnector.java.i
data/src/share/classes/com/sun/jndi/ldap/AbstractLdapNamingEnumeration.java.i
data/src/share/classes/sun/security/pkcs11/KeyCache.java.i
data/test/java/util/Collections/ReverseOrder.java.i
@@ -11092,15 +11568,18 @@ data/test/java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalizationMethod.java.i
data/make/tools/src/build/tools/jdwpgen/LocationTypeNode.java.i
data/src/share/classes/javax/swing/text/ChangedCharSetException.java.i
+data/src/share/classes/javax/swing/text/html/BRView.java.i
data/test/org/openjdk/jigsaw/optional-jaxp.sh.i
data/src/share/native/sun/font/bidi/jbidi.c.i
data/test/java/nio/file/Files/SimpleFileTypeDetector.java.i
+data/make/common/shared/Compiler-llvm.gmk.i
data/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java.i
data/test/java/nio/channels/AsynchronousSocketChannel/Leaky.java.i
data/test/java/beans/XMLDecoder/spec/TestTrue.java.i
data/make/tools/CharsetMapping/IBM1149.map.i
data/src/share/classes/sun/io/CharToByteISO2022.java.i
-data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchStructCoding.java.i
+data/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java.i
data/test/java/net/DatagramSocket/ImplicitBind.java.i
data/src/share/classes/javax/print/event/PrintJobEvent.java.i
data/src/share/classes/sun/io/ByteToCharCp864.java.i
@@ -11109,124 +11588,128 @@ data/src/share/classes/sun/tools/tree/PositiveExpression.java.i
data/src/share/classes/com/sun/jdi/InvocationException.java.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/InvalidateServerSessionRenegotiate.java.i
-data/test/javax/security/auth/login/LoginContext/ConfigConstructorNoPerm.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncBufferedOutputStream.java.i
data/test/java/rmi/MarshalledObject/compare/HashCode.java.i
data/test/sun/security/krb5/auto/SpnegoReqFlags.java.i
data/src/share/demo/jvmti/hprof/hprof_loader.h.i
-data/test/java/io/Serializable/proxy/replace/WriteReplace.java.i
+data/src/share/demo/jfc/Notepad/resources/open.gif.i
data/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpecList.java.i
data/test/java/io/charStreams/UTF8.java.i
data/src/share/classes/javax/script/SimpleBindings.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/StructOffsetResolverBigBang.java.i
data/test/java/util/AbstractCollection/ToString.java.i
-data/test/java/util/Locale/serialized/java6locale_iw_IL.i
data/test/java/io/RandomAccessFile/Seek.java.i
data/test/java/security/cert/CertificateFactory/GenerateCertificatesEmptyCollection.java.i
data/test/java/security/BasicPermission/NullOrEmptyName.java.i
data/src/share/native/sun/java2d/opengl/OGLTextRenderer.h.i
-data/test/sun/security/provider/PolicyParser/EncodeURL.java.i
data/test/javax/swing/JSlider/4987336/bug4987336.html.i
data/test/com/sun/security/sasl/gsskerb/PropertiesFileCallbackHandler.java.i
-data/src/solaris/sample/dtrace/hotspot/method_compile_stat.d.i
-data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter.i
+data/src/share/classes/javax/swing/event/ListSelectionListener.java.i
+data/test/sun/security/tools/keytool/file-in-help.sh.i
data/src/share/classes/com/sun/java/util/jar/pack/Attribute.java.i
-data/make/com/sun/security/sasl/Makefile.i
+data/src/share/classes/com/sun/jdi/request/MonitorContendedEnteredRequest.java.i
+data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java.i
data/src/share/native/sun/awt/giflib/gif_lib.h.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ExceptionCalls.java.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/invoke.js.i
data/src/share/classes/java/lang/ref/SoftReference.java.i
-data/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceTableMetaImpl.java.i
data/src/share/classes/javax/swing/plaf/MenuItemUI.java.i
+data/test/sun/net/InetAddress/nameservice/chaining/Providers.java.i
data/src/share/classes/com/sun/rowset/JoinRowSetImpl.java.i
data/src/share/classes/javax/management/remote/JMXConnectorServerMBean.java.i
+data/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java.i
data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/file-targets.xml.i
data/src/share/native/sun/font/layout/LayoutTables.h.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so.d
-data/test/javax/security/auth/x500/X500Principal/RFC4514.java.i
data/src/share/classes/java/sql/SQLTransientException.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libsoftokn3.so.i
-data/src/share/classes/sun/security/provider/DSAPrivateKey.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_de.properties.i
+data/test/org/openjdk/jigsaw/ContextBuilder.java.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/netbeans-targets.xml.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif.i
data/make/tools/CharsetMapping/IBM869.map.i
-data/src/share/classes/sun/awt/image/ImageFetcher.java.i
+data/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh.i
data/src/share/classes/java/awt/Image.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties.i
data/src/solaris/classes/sun/font/XRGlyphCache.java.i
+data/make/netbeans/swing/build.properties.i
data/src/share/classes/sun/security/x509/PolicyInformation.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java.i
-data/test/java/beans/XMLEncoder/6777487/TestCheckedCollection.java.i
+data/test/sun/net/www/protocol/http/UserCookie.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.RelPassPolicy.i
+data/src/macosx/classes/com/apple/eawt/QuitResponse.java.i
data/src/solaris/classes/sun/awt/X11/XPropertyCache.java.i
data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor16.gif.i
data/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java.i
data/test/javax/sound/midi/Gervill/SoftAudioBuffer/NewSoftAudioBuffer.java.i
data/test/java/nio/Buffer/genCopyDirectMemory.sh.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java.i
+data/test/sun/tools/jstat/jstatSnap2.sh.i
data/src/share/classes/javax/naming/Context.java.i
data/test/java/beans/Introspector/4520754/Test4520754.java.i
data/test/javax/xml/crypto/dsig/SignatureValidator.java.i
data/src/share/classes/java/util/concurrent/Executor.java.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider.i
-data/src/share/classes/java/lang/reflect/InvocationHandler.java.i
-data/src/share/lib/images/cursors/invalid32x32.gif.i
+data/src/share/classes/sun/misc/Compare.java.i
data/src/share/classes/java/lang/management/ManagementFactory.java.i
-data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.i
+data/src/share/demo/management/JTop/JTopPlugin.java.i
+data/src/solaris/bin/java_md_solinux.c.i
data/src/share/classes/sun/tools/tree/SynchronizedStatement.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmslut.c.i
data/src/share/classes/sun/nio/cs/ext/IBM1006.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/SEL.java.i
data/make/tools/CharsetMapping/IBM942.map.i
data/src/share/classes/java/awt/image/ImageProducer.java.i
data/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java.i
data/src/share/native/sun/awt/libpng/pngget.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyInfo.java.i
data/test/sun/nio/cs/Test4206507.java.i
-data/test/java/lang/instrument/TransformerManagementThreadAddTests.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_MatteBorder.java.i
-data/src/share/classes/sun/text/resources/CollationData_es.java.i
+data/src/share/classes/javax/sound/midi/Track.java.i
data/src/windows/classes/sun/awt/Win32FontManager.java.i
data/src/share/classes/java/lang/ref/ReferenceQueue.java.i
data/src/share/native/sun/font/layout/TibetanReordering.h.i
data/test/java/io/Serializable/classDescFlagConflict/Foo.ser.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/Constants.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SingletonList.java.i
+data/src/share/classes/java/util/Calendar.java.i
data/test/java/util/ResourceBundle/Control/MissingResourceCauseTest.java.i
-data/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java.i
+data/test/java/awt/FontClass/FontAccess.java.i
data/src/windows/native/sun/windows/awt_InputEvent.cpp.i
data/test/java/net/ipv6tests/BadIPv6Addresses.java.i
-data/test/com/sun/jdi/FetchLocals.java.i
+data/src/share/native/sun/awt/image/imageInitIDs.h.i
data/test/java/security/cert/CertificateFactory/openssl/BadFooter.java.i
-data/src/share/classes/sun/util/resources/CalendarData_zh.properties.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/InvalidCanonicalizerException.java.i
-data/src/solaris/classes/sun/net/spi/SdpProvider.java.i
+data/src/macosx/classes/com/apple/laf/AquaBorder.java.i
+data/test/java/lang/StackTraceElement/PublicConstructor.java.i
+data/src/share/classes/com/sun/crypto/provider/DESKeyGenerator.java.i
+data/src/solaris/sample/dtrace/hotspot/class_loading_stat.d.i
data/src/share/demo/applets/WireFrame/models/dinasaur.obj.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/dnsstore.i
data/src/solaris/classes/sun/awt/X11/XKeysym.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_2.java.i
data/src/share/classes/com/sun/crypto/provider/FeedbackCipher.java.i
data/src/share/classes/sun/nio/cs/ISO_8859_15.java.i
+data/src/bsd/doc/man/ja/jstat.1.i
data/test/java/io/OutputStreamWriter/Encode.java.i
-data/src/share/classes/java/text/AttributedCharacterIterator.java.i
-data/make/mkdemo/jvmti/heapViewer/Makefile.i
+data/test/java/nio/channels/Selector/BasicAccept.java.i
+data/src/share/classes/sun/applet/AppletImageRef.java.i
data/test/javax/swing/plaf/basic/BasicSplitPaneUI/Test6657026.java.i
-data/test/sun/security/provider/PolicyFile/AliasExpansion.java.i
+data/test/sun/tools/jstat/classOutput1.awk.i
+data/src/share/classes/javax/sound/midi/spi/MidiFileWriter.java.i
data/test/java/rmi/testlibrary/RegistryRunner_Stub.java.i
-data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContextFactory.java.i
+data/test/javax/swing/GroupLayout/6613904/bug6613904.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/v1_0/BasicType.java.i
data/src/share/classes/com/sun/awt/SecurityWarning.java.i
-data/src/share/native/java/lang/fdlibm/src/w_exp.c.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h.i
data/test/java/awt/Focus/FocusTraversalPolicy/DefaultFTPTest.java.i
data/src/share/classes/javax/sound/midi/Sequencer.java.i
-data/test/sun/net/www/protocol/http/B6299712.java.i
data/src/share/classes/sun/security/krb5/internal/PAEncTSEnc.java.i
data/src/share/classes/sun/rmi/transport/DGCImpl.java.i
data/src/share/classes/com/sun/security/sasl/PlainClient.java.i
-data/src/share/transport/shmem/shmemBack.c.i
data/src/share/demo/nbproject/jfc/Notepad/build.xml.i
data/src/share/classes/com/sun/jndi/url/dns/dnsURLContextFactory.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java.i
-data/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java.i
-data/src/share/classes/java/dyn/MethodType.java.i
+data/src/share/classes/javax/crypto/ExemptionMechanismSpi.java.i
+data/src/share/classes/javax/sound/sampled/AudioFileFormat.java.i
+data/src/share/classes/com/sun/media/sound/SoftSincResampler.java.i
data/src/share/classes/sun/misc/ProxyGenerator.java.i
data/src/share/classes/sun/tools/jconsole/resources/masthead-right.png.i
data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies.java.i
@@ -11237,17 +11720,17 @@ data/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java.i
data/src/share/classes/java/awt/im/spi/package.html.i
data/src/share/classes/javax/security/auth/callback/package.html.i
data/test/javax/management/mxbean/ComparatorExceptionTest.java.i
-data/test/java/beans/PropertyEditor/TestStringClassNull.java.i
+data/test/java/io/charStreams/StringConvert.java.i
data/src/share/classes/java/io/ExpiringCache.java.i
data/src/windows/native/sun/windows/awtmsg.h.i
data/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java.i
data/src/share/classes/sun/security/jgss/wrapper/NativeGSSFactory.java.i
-data/src/share/classes/sun/net/www/http/HttpCapture.java.i
+data/make/tools/strip_properties/Makefile.i
data/test/java/net/DatagramSocket/SetReceiveBufferSize.java.i
data/src/solaris/native/sun/nio/fs/SolarisWatchService.c.i
data/make/com/sun/java/pack/FILES_cpp.gmk.i
data/src/share/npt/README.txt.i
-data/src/share/classes/sun/security/x509/CRLReasonCodeExtension.java.i
+data/test/java/util/concurrent/DelayQueue/Iterate.java.i
data/src/share/classes/javax/print/attribute/standard/JobStateReason.java.i
data/test/com/sun/security/sasl/names.properties.i
data/src/share/classes/javax/print/attribute/standard/JobState.java.i
@@ -11257,51 +11740,55 @@ data/src/share/classes/com/sun/jmx/snmp/SnmpStatusException.java.i
data/test/java/beans/Introspector/4520754/infos/ComponentBeanInfo.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsCreateSockTest.java.i
data/test/javax/management/mxbean/MXBeanTest.java.i
-data/test/java/lang/instrument/StressGetObjectSizeTest.sh.i
+data/make/common/Defs-modules.gmk.i
data/src/solaris/classes/sun/awt/X11/XEmbeddedFrame.java.i
data/test/java/util/zip/ZipFile/EnumAfterClose.java.i
data/src/share/classes/sun/security/krb5/internal/ASRep.java.i
data/make/com/sun/security/jgss/Makefile.i
data/src/share/native/com/sun/media/sound/PortMixerProvider.c.i
data/test/com/sun/jdi/JdbVarargsTest.sh.i
-data/src/share/classes/com/sun/tracing/ProbeName.java.i
+data/src/share/classes/sun/text/resources/CollationData_vi.java.i
+data/src/share/classes/javax/print/event/package.html.i
data/test/java/rmi/activation/CommandEnvironment/security.policy.i
data/src/solaris/classes/sun/awt/X11/generator/sizes.64-solaris-i386.i
data/src/share/classes/java/util/logging/Handler.java.i
-data/src/share/demo/java2d/J2DBench/README.i
-data/src/share/classes/sun/tools/tree/BinaryExpression.java.i
-data/src/share/classes/java/rmi/package.html.i
+data/test/java/lang/Throwable/LocalizedMessage.java.i
+data/test/com/sun/security/sasl/pw.properties.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-delayed.png.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_zh_CN.properties.i
data/src/share/native/java/util/zip/zlib-1.2.3/zutil.c.i
data/src/share/back/ClassLoaderReferenceImpl.c.i
data/src/share/classes/sun/security/jca/ProviderConfig.java.i
-data/src/share/classes/sun/dyn/ToGeneric.java.i
+data/make/sun/nio/cs/Makefile.i
+data/src/macosx/classes/com/apple/laf/AquaProgressBarUI.java.i
data/src/share/classes/java/awt/doc-files/FocusCycle.gif.i
data/src/solaris/classes/sun/awt/motif/java.fonts.dir.i
data/test/tools/pack200/Pack200Test.java.i
-data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
data/test/java/nio/charset/coders/IOCoders.java.i
-data/src/share/classes/sun/java2d/Surface.java.i
+data/src/share/native/sun/awt/libpng/pngrutil.c.i
data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneError.wav.i
-data/src/share/classes/sun/rmi/rmic/IndentingWriter.java.i
-data/src/linux/doc/man/schemagen.1.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/GoodProvider.java.i
+data/src/share/classes/java/util/concurrent/CancellationException.java.i
data/test/java/io/RandomAccessFile/WriteUTF.java.i
data/src/share/native/sun/awt/image/jpeg/jccolor.c.i
data/src/share/classes/sun/management/counter/StringCounter.java.i
data/test/java/net/CookieHandler/CookieManagerTest.java.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README.i
-data/src/solaris/native/sun/nio/ch/DatagramDispatcher.c.i
+data/make/tools/src/build/tools/jdwpgen/CommentNode.java.i
+data/test/java/net/Inet6Address/IPv6Numeric.java.i
data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.h.i
+data/src/share/classes/java/rmi/server/ServerNotActiveException.java.i
data/src/windows/native/sun/windows/awt_PopupMenu.h.i
data/make/sun/cmm/kcms/Makefile.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AliasFileParser.java.i
data/src/share/classes/javax/swing/plaf/nimbus/Effect.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpGauge.java.i
+data/test/java/io/File/GetParent.java.i
data/test/java/net/URL/jar_urls.i
data/src/share/classes/sun/reflect/annotation/AnnotationParser.java.i
data/test/sun/net/www/protocol/http/HttpOnly.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll.i
data/test/java/io/FileInputStream/LargeFileAvailable.java.i
data/test/java/util/jar/JarInputStream/BadSignedJar.jar.i
+data/src/macosx/classes/com/apple/laf/AquaFocusHandler.java.i
data/src/share/classes/javax/print/attribute/standard/JobStateReasons.java.i
data/src/share/classes/sun/text/resources/FormatData_in_ID.java.i
data/src/share/classes/java/lang/ApplicationShutdownHooks.java.i
@@ -11309,51 +11796,59 @@ data/test/javax/sound/midi/Gervill/RiffReaderWriter/Read.java.i
data/src/solaris/classes/sun/awt/motif/X11GB18030_0.java.i
data/test/java/io/Serializable/typeSafeEnum/TypeSafeEnum.java.i
data/test/java/lang/invoke/CallSiteTest.java.i
-data/test/java/util/Hashtable/SimpleSerialization.java.i
-data/src/share/classes/sun/text/resources/CollationData_cs.java.i
-data/src/share/classes/javax/script/ScriptContext.java.i
+data/src/share/classes/java/net/URL.java.i
+data/src/solaris/classes/sun/awt/motif/MDropTargetContextPeer.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/ca.key.i
+data/src/share/classes/javax/naming/NameClassPair.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c.i
data/src/share/native/sun/java2d/loops/DrawPath.h.i
data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.h.i
data/src/share/classes/java/awt/Label.java.i
data/src/windows/native/sun/java2d/d3d/D3DMaskCache.h.i
data/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java.i
-data/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java.i
+data/src/share/classes/sun/io/CharToByteHKSCS.java.i
data/src/share/classes/sun/security/x509/PolicyConstraintsExtension.java.i
data/test/java/security/cert/CertPathValidatorException/Serial.java.i
-data/make/tools/CharsetMapping/IBM864.map.i
-data/test/java/util/jar/JarFile/MevNPE.java.i
+data/src/share/classes/javax/swing/plaf/nimbus/OuterGlowEffect.java.i
+data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html.i
data/src/share/classes/sun/text/resources/FormatData_it.java.i
+data/src/share/classes/sun/io/CharToByteISO2022CN_GB.java.i
data/make/tools/sharing/classlist.windows.i
data/test/java/util/Locale/data/deflocale.win7.fmtasdefault.i
data/test/java/io/FileInputStream/OpenDir.java.i
-data/src/linux/doc/man/jstatd.1.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerEntryImpl.java.i
data/src/share/classes/sun/tools/util/CommandLine.java.i
data/test/java/lang/instrument/PremainClass/ZeroArgPremainAgent.java.i
-data/src/share/classes/javax/swing/plaf/ProgressBarUI.java.i
-data/src/share/classes/javax/swing/colorchooser/CenterLayout.java.i
-data/src/share/classes/sun/text/resources/FormatData_fr_LU.java.i
+data/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java.i
+data/src/share/classes/java/util/BitSet.java.i
+data/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java.i
data/src/share/classes/sun/jvmstat/monitor/MonitorException.java.i
-data/test/java/awt/font/TextLayout/TestHebrewMark.java.i
+data/src/share/demo/jfc/Font2DTest/Font2DTest.html.i
data/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java.i
data/src/share/classes/javax/print/DocPrintJob.java.i
data/test/java/beans/Introspector/Test6868189.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirs1.policy.i
-data/src/share/demo/management/FullThreadDump/ThreadMonitor.java.i
+data/src/share/native/sun/awt/image/jpeg/jidctred.c.i
+data/src/share/native/com/sun/media/sound/SoundDefs.h.i
+data/test/java/beans/Introspector/Test4498236.java.i
data/test/sun/security/provider/PolicyFile/Comparator.Principal.Policy.i
-data/src/share/classes/javax/management/remote/rmi/RMIConnectorServer.java.i
+data/src/share/classes/javax/swing/plaf/multi/package.html.i
data/test/java/awt/font/NumericShaper/EasternArabicTest.java.i
data/src/share/classes/javax/naming/ldap/LdapContext.java.i
data/test/java/net/InterfaceAddress/NetworkPrefixLength.java.i
-data/test/sun/security/tools/keytool/NoExtNPE.sh.i
+data/src/share/classes/com/sun/beans/finder/ClassFinder.java.i
data/src/share/classes/javax/management/namespace/JMXRemoteNamespaceMBean.java.i
data/src/share/classes/java/awt/image/RGBImageFilter.java.i
+data/src/share/demo/jvmti/hprof/hprof_class.c.i
+data/src/share/classes/sun/net/httpserver/LeftOverInputStream.java.i
data/src/share/classes/sun/security/ssl/SSLSessionContextImpl.java.i
+data/src/macosx/native/sun/osxapp/QueuingApplicationDelegate.m.i
data/src/windows/classes/sun/java2d/windows/Win32SurfaceDataProxy.java.i
data/test/sun/security/tools/keytool/resource.sh.i
data/test/sun/nio/cs/OLD/IBM943_OLD.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_th.properties.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolTableMetaImpl.java.i
data/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorIntermediate.java.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates.i
+data/test/java/util/Collections/RotateEmpty.java.i
data/src/share/classes/java/awt/font/GlyphMetrics.java.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDTarget.java.i
data/test/java/security/Security/removing/RemoveProviders.java.i
@@ -11361,13 +11856,14 @@ data/test/java/rmi/activation/Activatable/downloadParameterClass/Bar.java.i
data/test/java/io/Serializable/subclass/run.sh.i
data/test/java/io/Writer/WriteParams.java.i
data/make/common/internal/Defs-jaxp.gmk.i
-data/src/share/javavm/export/jawt.h.i
+data/test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java.i
+data/test/sun/security/pkcs11/Provider/Login.sh.i
data/src/share/classes/sun/net/spi/nameservice/dns/DNSNameServiceDescriptor.java.i
-data/src/share/classes/com/sun/crypto/provider/TlsKeyMaterialGenerator.java.i
-data/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiOut.c.i
+data/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java.i
data/src/share/classes/javax/management/timer/package.html.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/AcceptLargeFragments.java.i
-data/test/javax/management/Introspector/DescribedMX.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionContextImpl/Timeout.java.i
data/src/solaris/classes/sun/awt/X11/XCursorFontConstants.java.i
data/test/sun/net/InetAddress/nameservice/simple/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/javax/crypto/CryptoPermission/RC2PermCheck.java.i
@@ -11383,32 +11879,37 @@ data/make/sun/javazic/javatz/jdk1.1.x_zone_ids.txt.i
data/src/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java.i
data/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java.i
data/src/share/demo/jfc/FileChooserDemo/README.txt.i
-data/src/share/classes/sun/tools/tree/SubtractExpression.java.i
+data/src/solaris/classes/sun/awt/X11/XException.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/ClassConsolidator.java.i
data/test/javax/swing/UIDefaults/6795356/bug6795356.java.i
data/test/sun/net/www/protocol/jar/jarbug/etc/jar1/res1.txt.i
data/src/share/classes/sun/awt/VariableGridLayout.java.i
data/src/share/demo/jfc/Metalworks/MetalworksDocumentFrame.java.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnUnmarshal.java.i
+data/src/share/demo/nbproject/jfc/SwingApplet/build.xml.i
+data/test/javax/management/loading/LibraryLoader/UseNativeLib1.html.i
data/make/sun/security/other/Makefile.i
data/src/windows/back/linker_md.c.i
+data/src/share/classes/javax/imageio/spi/IIOServiceProvider.java.i
data/test/java/util/Currency/Bug4512215.java.i
-data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/jdk.xml.i
+data/test/java/rmi/reliability/juicer/OrangeEchoImpl.java.i
data/test/java/lang/instrument/ilib/RuntimeConstants.java.i
data/test/java/security/cert/pkix/nameConstraintsMinMax/VerifyNameConstraints.java.i
-data/src/share/native/java/security/AccessController.c.i
data/src/share/classes/com/sun/jndi/cosnaming/CNCtx.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ro.properties.i
+data/src/share/demo/nbproject/jfc/Notepad/nbproject/jdk.xml.i
+data/src/share/classes/sun/nio/cs/UTF_8.java.i
data/src/share/classes/javax/management/ManagedAttribute.java.i
-data/src/share/classes/javax/net/ssl/SSLEngineResult.java.i
+data/src/share/classes/sun/rmi/transport/proxy/RMIHttpToPortSocketFactory.java.i
data/src/windows/javavm/include/typedefs_md.h.i
-data/test/java/nio/channels/FileChannel/ReadFull.java.i
data/test/javax/xml/crypto/dsig/data/signature-external-dsa.xml.i
data/test/javax/swing/JTableHeader/6889007/bug6889007.java.i
data/src/share/classes/sun/tools/jstatd/RemoteHostImpl.java.i
-data/test/javax/management/relation/RelationNotificationSourceTest.java.i
+data/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java.i
data/src/linux/doc/man/ja/wsimport.1.i
data/make/sun/net/others/Makefile.i
data/test/java/security/KeyRep/Serial.java.i
+data/src/share/classes/sun/net/ftp/FtpProtocolException.java.i
+data/test/java/beans/PropertyChangeSupport/Test7148143.java.i
data/src/share/classes/javax/swing/border/SoftBevelBorder.java.i
data/test/java/io/PrintStream/CheckError.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthColorChooserUI.java.i
@@ -11418,8 +11919,8 @@ data/src/share/classes/sun/tools/jstat/ExpressionEvaluator.java.i
data/make/common/Modules.gmk.i
data/src/solaris/hpi/export/timeval_md.h.i
data/src/share/classes/javax/naming/BinaryRefAddr.java.i
-data/src/share/classes/java/lang/VerifyError.java.i
-data/src/solaris/classes/sun/java2d/jules/JulesAATileGenerator.java.i
+data/src/share/classes/com/sun/security/auth/module/NTSystem.java.i
+data/test/com/sun/jdi/redefine/SchemaChange_RedefineSubTarg.java.i
data/src/share/classes/sun/util/logging/resources/logging_fr.properties.i
data/src/share/classes/java/util/zip/GZIPOutputStream.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so.d
@@ -11428,76 +11929,79 @@ data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnss3.so.i
data/src/share/classes/sun/java2d/pisces/PiscesCache.java.i
data/test/java/security/cert/CertPathValidator/OCSP/AIACert.pem.i
data/src/share/classes/com/sun/crypto/provider/PrivateKeyInfo.java.i
-data/src/share/classes/sun/io/ByteToCharCp942C.java.i
+data/src/share/classes/sun/io/ByteToCharEUC_KR.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/AtomicContext.java.i
data/src/share/classes/sun/awt/resources/awt_sv.properties.i
data/test/sun/security/pkcs11/ec/TestCurves.java.i
-data/src/share/classes/sun/awt/NullComponentPeer.java.i
+data/src/share/demo/jfc/FileChooserDemo/ExampleFileView.java.i
+data/src/share/classes/java/awt/doc-files/Checkbox-1.gif.i
data/test/java/util/zip/TestZipError.java.i
data/make/tools/swing-beans/beaninfo/images/BoxMono16.gif.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedSet.java.i
-data/test/java/security/BasicPermission/PermClass.1.4.i
+data/src/share/native/java/lang/fdlibm/src/e_cosh.c.i
data/src/share/demo/applets/SimpleGraph/example1.html.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4512704.java.i
-data/src/share/classes/sun/util/resources/CalendarData_lt.properties.i
+data/src/share/classes/sun/awt/resources/awt_ko.properties.i
data/src/share/classes/javax/management/build.xml.i
data/test/sun/net/www/http/ChunkedInputStream/TestAvailable.java.i
data/src/share/classes/sun/dyn/FromGeneric.java.i
-data/src/share/classes/java/awt/Transparency.java.i
+data/test/sun/java2d/OpenGL/GradientPaints.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java.i
data/test/java/beans/PropertyEditor/TestLongClass.java.i
data/src/share/native/sun/misc/Signal.c.i
-data/src/share/classes/javax/swing/text/html/HRuleView.java.i
+data/src/share/classes/sun/security/krb5/internal/TransitedEncoding.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java.i
data/make/tools/CharsetMapping/HKSCS2001.c2b.i
data/src/share/classes/java/nio/file/NotLinkException.java.i
+data/src/share/native/java/lang/fdlibm/src/s_ilogb.c.i
data/src/share/native/sun/java2d/loops/Ushort565Rgb.h.i
data/test/com/oracle/security/ucrypto/TestAES.java.i
-data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c.i
+data/src/share/classes/sun/util/resources/CalendarData_pl.properties.i
data/test/com/sun/security/sasl/digest/ClientCallbackHandler.java.i
data/src/windows/native/sun/java2d/windows/WindowsFlags.h.i
data/test/java/rmi/server/serverStackTrace/ServerStackTrace_Stub.java.i
data/src/share/classes/sun/jvmstat/monitor/MonitoredHost.java.i
data/test/java/nio/channels/ServerSocketChannel/SocketOptionTests.java.i
data/src/share/classes/sun/security/util/AuthResources_de.java.i
-data/test/javax/swing/border/Test4760089.java.i
+data/test/java/nio/channels/Selector/SelectorTest.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ClassPath.java.i
data/src/share/classes/java/util/Random.java.i
data/src/solaris/bin/ergo_sparc.c.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java.i
+data/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png.i
data/src/share/classes/sun/text/resources/BreakIteratorRules.java.i
-data/test/com/sun/net/httpserver/SimpleSSLContext.java.i
+data/test/java/lang/Long/Unsigned.java.i
data/src/share/classes/sun/security/krb5/RealmException.java.i
-data/src/share/native/java/lang/fdlibm/src/k_standard.c.i
-data/src/share/classes/sun/java2d/Disposer.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Strings.java.i
+data/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png.i
+data/src/macosx/native/com/sun/media/sound/PLATFORM_API_MacOSX_Utils.cpp.i
data/src/share/classes/javax/sound/midi/MidiUnavailableException.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_lv_LV.properties.i
data/src/share/classes/sun/security/provider/SystemSigner.java.i
data/test/java/awt/TrayIcon/DragEventSource/DragEventSource.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/NewModelStandardTransformBooleanBooleanInt.java.i
data/src/share/classes/javax/crypto/spec/RC5ParameterSpec.java.i
-data/src/solaris/classes/sun/misc/FileURLMapper.java.i
+data/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java.i
data/test/java/util/ServiceLoader/FooProvider1.java.i
data/test/sun/nio/cs/FindASCIICodingBugs.java.i
-data/test/java/nio/channels/Pipe/EmptyRead.java.i
+data/src/share/classes/java/security/interfaces/DSAPrivateKey.java.i
data/src/share/classes/javax/swing/text/html/OptionComboBoxModel.java.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/rmid.security.policy.i
data/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java.i
-data/src/share/classes/java/security/SecureClassLoader.java.i
+data/test/java/nio/channels/AsyncCloseAndInterrupt.java.i
data/src/share/demo/nbproject/jfc/TransparentRuler/build.properties.i
data/src/share/native/sun/java2d/loops/IntRgb.h.i
data/test/java/awt/event/MouseEvent/MouseClickTest/MouseClickTest.html.i
+data/make/java/jli/mapfile-vers.i
data/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java.i
data/src/share/classes/java/sql/NClob.java.i
data/src/windows/native/sun/java2d/windows/dxInit.cpp.i
-data/test/sun/net/www/ftptest/FtpFileSystemHandler.java.i
data/test/java/rmi/invalidName/InvalidName.java.i
data/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono.java.i
data/src/share/classes/sun/security/x509/OCSPNoCheckExtension.java.i
data/test/sun/security/pkcs11/Serialize/SerializeProvider.java.i
-data/src/share/classes/com/sun/security/auth/PolicyParser.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/CipherSuite/SSL_NULL.java.i
+data/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java.i
data/src/share/classes/java/nio/charset/package.html.i
data/src/share/classes/javax/swing/doc-files/groupLayout.1.gif.i
data/test/java/nio/channels/FileChannel/ClosedChannelTransfer.java.i
@@ -11507,56 +12011,62 @@ data/src/share/classes/java/awt/TextField.java.i
data/src/solaris/native/sun/awt/XDrawingAreaP.h.i
data/test/javax/management/ObjectName/ObjectNameGetInstanceTest.java.i
data/test/java/beans/XMLEncoder/javax_swing_KeyStroke.java.i
-data/test/java/awt/regtesthelpers/AbstractTest.java.i
-data/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c.i
+data/test/java/awt/print/PrinterJob/ExceptionTest.java.i
data/make/tools/CharsetMapping/IBM1140.map.i
+data/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java.i
data/test/javax/management/modelmbean/OnUnregisterTest.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XMBeanAttributes.java.i
-data/test/sun/tools/jps/usage.out.i
-data/src/share/classes/java/net/SdpSocketImpl.java.i
+data/src/share/classes/sun/tools/asm/NumberConstantData.java.i
+data/test/java/lang/management/ManagementFactory/MXBeanProxyTest.java.i
+data/make/apple/Makefile.i
+data/src/macosx/classes/com/apple/eawt/event/RotationListener.java.i
data/test/java/lang/Thread/StartOOMTest.java.i
data/src/share/classes/java/lang/NegativeArraySizeException.java.i
data/src/share/classes/com/sun/jdi/ArrayType.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedFieldAccessorImpl.java.i
-data/make/tools/swing-beans/beaninfo/images/JPanelMono16.gif.i
-data/src/share/classes/sun/io/CharToByteUnicodeLittle.java.i
+data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.h.i
+data/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java.i
data/src/share/classes/sun/font/FontResolver.java.i
+data/src/bsd/doc/man/ja/klist.1.i
data/src/share/native/com/sun/java/util/jar/pack/zip.h.i
data/src/share/classes/sun/io/ByteToCharCp1141.java.i
data/test/java/lang/Integer/ParsingTest.java.i
data/make/tools/UnicodeData/SpecialCasing.txt.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java.i
+data/src/share/classes/org/openjdk/jigsaw/FilePaths.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTableUI.java.i
data/test/javax/management/Introspector/NotCompliantCauseTest.java.i
data/src/share/lib/images/cursors/win32_CopyNoDrop32x32.gif.i
-data/src/share/classes/sun/management/resources/agent_es.properties.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteGray.c.i
+data/src/macosx/classes/com/apple/eawt/QuitHandler.java.i
data/test/javax/management/security/MBeanPermissionTest.java.i
data/src/share/classes/javax/security/auth/spi/package.html.i
data/src/share/classes/com/sun/jdi/VMDisconnectedException.java.i
data/src/solaris/doc/sun/man/man1/ja/javaws.1.i
data/src/windows/native/java/io/Console_md.c.i
-data/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java.i
+data/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java.i
data/src/share/classes/sun/text/resources/FormatData_lt.java.i
-data/src/share/classes/sun/misc/VMNotification.java.i
+data/src/share/classes/javax/imageio/event/IIOReadWarningListener.java.i
+data/src/share/demo/management/JTop/JTop.java.i
data/src/share/classes/java/nio/file/attribute/FileStoreSpaceAttributeView.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java.i
data/test/java/io/OutputStream/WriteParams.java.i
-data/src/share/classes/sun/io/CharToByteSJIS.java.i
+data/src/share/classes/sun/tools/tree/ShiftLeftExpression.java.i
data/src/windows/hpi/export/byteorder_md.h.i
data/test/com/sun/jdi/ConstantPoolInfo.java.i
-data/test/sun/nio/cs/TestCompoundTest.java.i
data/test/java/net/Socket/OldSocketImpl.sh.i
-data/test/java/security/UnresolvedPermission/AccessorMethods.signer1.i
data/src/share/classes/java/text/CollationElementIterator.java.i
-data/src/share/native/sun/security/ec/impl/ec2_233.c.i
-data/src/solaris/native/sun/awt/list.c.i
-data/make/tools/src/build/tools/jdwpgen/BooleanTypeNode.java.i
+data/test/java/awt/PrintJob/RoundedRectTest/RoundedRectTest.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmscam02.c.i
+data/src/share/classes/sun/text/normalizer/Trie.java.i
data/src/share/classes/sun/tools/tree/AddExpression.java.i
data/test/sun/security/tools/jarsigner/AlgOptions.sh.i
data/test/java/lang/Long/ParsingTest.java.i
-data/src/share/classes/java/util/IllegalFormatPrecisionException.java.i
+data/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif.i
+data/test/javax/swing/JSlider/4252173/bug4252173.java.i
data/src/windows/native/sun/java2d/j2d_md.h.i
data/test/lib/security/java.policy/Ext_AllPolicy.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1026.java.i
+data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_ME.properties.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/XmlConfigUtils.java.i
data/src/share/classes/sun/security/krb5/internal/KRBSafeBody.java.i
data/src/windows/native/sun/windows/awt_Button.h.i
@@ -11565,158 +12075,164 @@ data/src/share/classes/java/awt/event/InvocationEvent.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyValue.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthMenuLayout.java.i
data/test/java/nio/file/Path/FileAttributes.java.i
-data/test/java/lang/instrument/NoTransformerAddedTest.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c.i
-data/test/com/sun/tools/attach/redefineagent.mf.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetDefaultConnectionsEnabled.java.i
+data/test/javax/management/namespace/DomainCreationTest.java.i
+data/test/javax/imageio/plugins/bmp/TopDownTest.java.i
data/test/java/security/cert/pkix/nameConstraintsMinMax/sun.cer.i
data/test/java/awt/print/PrinterJob/Margins.java.i
data/test/java/nio/charset/RemovingSunIO/TestCOMP.java.i
-data/src/share/classes/sun/tools/tree/AssignAddExpression.java.i
+data/test/java/awt/FileDialog/MultipleMode/MultipleMode.html.i
+data/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java.i
data/src/windows/native/sun/windows/ObjectList.h.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties.i
data/src/share/classes/sun/security/x509/FreshestCRLExtension.java.i
-data/src/share/classes/sun/awt/dnd/SunDropTargetEvent.java.i
+data/test/java/security/BasicPermission/SerialVersion.java.i
data/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java.i
data/make/com/sun/java/pack/prop/Makefile.i
-data/src/share/native/sun/font/layout/TibetanLayoutEngine.h.i
+data/test/sun/security/validator/samedn.sh.i
data/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp.i
data/src/share/native/java/lang/fdlibm/src/e_gamma.c.i
data/src/share/native/sun/security/ec/impl/ec_naf.c.i
-data/test/java/io/File/MaxPathLength.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_sv.properties.i
+data/src/solaris/classes/sun/java2d/xr/XRMaskImage.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_zh_TW.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM33722.java.i
data/src/share/classes/com/sun/crypto/provider/DESKey.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java.i
-data/test/javax/security/auth/x500/X500Principal/NameFormat.java.i
-data/test/sun/security/rsa/TestSignatures.java.i
-data/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java.i
data/make/tools/CharsetMapping/IBM850.map.i
data/test/sun/security/krb5/auto/BadKdc3.java.i
data/src/share/classes/com/sun/jmx/snmp/ServiceName.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarC/my/impl/StandardMessageService.java.i
-data/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java.i
-data/src/windows/native/sun/windows/ComCtl32Util.cpp.i
-data/test/java/nio/file/Files/walkFileTree/denyAll.policy.i
-data/make/common/internal/NativeCompileRules.gmk.i
+data/src/macosx/native/sun/awt/CDataTransferer.m.i
+data/src/share/native/java/lang/fdlibm/src/w_atanh.c.i
+data/test/java/util/Collections/FindSubList.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMeta.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_MECHANISM_INFO.java.i
data/test/java/rmi/registry/reexport/Reexport.java.i
data/src/share/classes/javax/swing/event/TableModelEvent.java.i
-data/src/share/classes/sun/io/CharToByteCp1112.java.i
-data/test/sun/security/jgss/spnego/NegTokenTargFields.java.i
data/make/tools/CharsetMapping/DoubleByte-X.java.template.i
-data/src/share/classes/com/sun/jdi/request/MethodEntryRequest.java.i
+data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerService.java.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain1.txt.i
data/src/share/classes/sun/reflect/MethodAccessorGenerator.java.i
+data/src/share/classes/sun/tools/jar/resources/jar.properties.i
data/src/share/classes/java/security/spec/ECGenParameterSpec.java.i
data/src/share/classes/sun/io/ByteToCharCp868.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.h.i
+data/src/windows/classes/sun/nio/fs/WindowsWatchService.java.i
data/src/share/classes/java/util/concurrent/DelayQueue.java.i
-data/test/org/openjdk/jigsaw/cli/expired-signer-cert.pem.i
-data/src/share/classes/sun/security/ec/ECPublicKeyImpl.java.i
-data/test/java/nio/channels/Selector/OutOfBand.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/LZWCompressor.java.i
data/test/java/beans/PropertyChangeSupport/TestSerialization.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/PKCS11Constants.java.i
data/src/share/classes/sun/tools/attach/HotSpotAttachProvider.java.i
data/test/javax/management/ObjectInstance/ObjectInstanceNullTest.java.i
data/test/sun/nio/cs/DecoderOverflow.java.i
data/src/share/classes/sun/util/resources/LocaleNames_fr.properties.i
-data/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java.i
+data/src/share/native/sun/font/layout/MPreFixups.h.i
+data/make/com/sun/security/auth/Makefile.i
data/test/sun/net/InetAddress/nameservice/simple/CacheTest.java.i
data/make/tools/swing-beans/beaninfo/images/JToolBarMono32.gif.i
-data/test/sun/security/pkcs11/Secmod/secmod.db.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nssdbm3.chk.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java.i
data/make/netbeans/common/build-folder.ent.i
data/src/share/classes/javax/swing/JFileChooser.java.i
-data/src/share/classes/java/security/SecurityPermission.java.i
+data/src/windows/native/sun/jkernel/stdafx.cpp.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileStore.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java.i
-data/test/java/io/LineNumberReader/MarkReset.java.i
+data/src/macosx/classes/com/apple/eawt/Application.java.i
+data/src/macosx/classes/com/apple/laf/AquaMnemonicHandler.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif.i
data/src/share/classes/sun/java2d/pisces/Transform4.java.i
-data/test/java/lang/StringBuffer/InsertMaxValue.java.i
+data/test/sun/security/pkcs11/tls/TestPRF.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/deflate.c.i
data/src/share/classes/sun/tools/tree/InlineReturnStatement.java.i
data/src/share/classes/sun/io/CharToByteCp500.java.i
+data/src/share/classes/java/rmi/server/SkeletonNotFoundException.java.i
data/test/javax/security/auth/Subject/doAs/Test.java.i
data/src/windows/native/sun/windows/awt_Object.h.i
data/src/share/classes/com/sun/rowset/package.html.i
data/make/sun/dcpr/FILES_c.gmk.i
data/test/sun/security/mscapi/SignUsingNONEwithRSA.sh.i
-data/src/share/classes/org/openjdk/jigsaw/LoaderPool.java.i
+data/test/java/nio/charset/spi/FooProvider.java.i
+data/src/windows/native/sun/java2d/d3d/D3DShaderGen.c.i
data/test/sun/security/krb5/UnknownCCEntry.java.i
data/test/sun/net/www/http/ChunkedInputStream/ChunkedCharEncoding.sh.i
data/src/share/native/sun/font/layout/TibetanReordering.cpp.i
data/src/share/native/java/util/zip/zlib-1.2.5/ChangeLog.i
data/test/java/net/ResponseCache/B6181108.java.i
+data/test/sun/management/jmxremote/startstop/REMOTE_TESTING.txt.i
data/src/share/classes/sun/font/Type1Font.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java.i
+data/test/com/sun/servicetag/SystemRegistryTest.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/Echo.java.i
data/test/javax/management/monitor/StartStopTest.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java.i
+data/src/share/classes/com/sun/servicetag/package.html.i
data/src/share/classes/sun/reflect/UnsafeQualifiedByteFieldAccessorImpl.java.i
-data/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java.i
+data/src/share/classes/javax/management/remote/JMXConnectorServer.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiScrollPaneUI.java.i
data/test/java/lang/module/Main.java.i
-data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/Traffic.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java.i
-data/src/share/classes/java/awt/font/LineBreakMeasurer.java.i
-data/test/java/nio/channels/DatagramChannel/NotBound.java.i
+data/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java.i
+data/make/java/nio/reorder-sparcv9.i
+data/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/Foo.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh.i
+data/src/macosx/native/sun/awt/CCursorManager.m.i
+data/make/tools/src/build/tools/jdwpgen/Context.java.i
data/src/share/classes/sun/io/ByteToCharMacCroatian.java.i
data/src/share/classes/javax/swing/JComboBox.java.i
data/src/share/classes/javax/management/remote/JMXConnectorProvider.java.i
+data/src/share/classes/sun/tools/tree/GreaterExpression.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy25.i
data/src/solaris/classes/sun/nio/fs/UnixCopyFile.java.i
data/make/java/java/Exportedfiles.gmk.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/TemplateLayer.java.i
-data/test/java/util/PluggableLocale/BreakIteratorProviderTest.java.i
-data/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java.i
+data/test/java/security/AccessControlContext/NullCombinerEquals.java.i
data/test/javax/management/namespace/VirtualNamespaceQueryTest.java.i
data/src/share/classes/sun/rmi/transport/tcp/MultiplexConnectionInfo.java.i
-data/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency_Stub.java.i
+data/test/sun/security/tools/policytool/UsePolicy.html.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ja.properties.i
data/test/javax/swing/JSpinner/6532833/bug6532833.java.i
-data/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java.i
-data/src/share/classes/java/awt/Scrollbar.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java.i
+data/src/share/classes/java/awt/image/DataBufferShort.java.i
+data/src/share/classes/sun/net/httpserver/HttpConnection.java.i
data/test/java/beans/XMLEncoder/java_lang_Enum.java.i
data/src/solaris/hpi/include/largefile_solaris.h.i
data/src/share/classes/java/security/cert/PKIXCertPathBuilderResult.java.i
-data/src/share/classes/sun/jvmstat/monitor/event/package.html.i
+data/test/java/security/cert/CertPathBuilder/selfIssued/openssl.cnf.i
data/test/java/rmi/reliability/benchmark/bench/serial/ProxyClassDesc.java.i
data/src/share/classes/sun/text/resources/BreakIteratorRules_th.java.i
data/test/java/io/Serializable/classDescHooks/CNFException.java.i
-data/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java.i
+data/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java.i
data/src/solaris/native/sun/awt/awt_Choice21.c.i
data/src/share/native/com/sun/java/util/jar/pack/zip.cpp.i
data/src/solaris/native/sun/awt/awt_Mlib.h.i
data/src/share/demo/nbproject/management/VerboseGC/build.properties.i
+data/test/java/net/Inet6Address/IPv6AddressTypes.java.i
data/make/tools/CharsetMapping/IBM870.map.i
data/test/org/openjdk/jigsaw/cli/signed-module.policy.i
data/test/javax/management/Introspector/DescribedMBean.java.i
+data/src/share/classes/com/sun/jdi/request/BreakpointRequest.java.i
data/test/javax/management/remote/mandatory/loading/TargetMBeanTest.java.i
data/src/share/classes/org/openjdk/jigsaw/LinkingContext.java.i
-data/src/share/classes/javax/crypto/spec/PBEKeySpec.java.i
+data/src/share/classes/javax/net/ssl/SSLServerSocketFactory.java.i
data/src/share/classes/javax/swing/text/CompositeView.java.i
data/test/java/rmi/registry/altSecurityManager/TestSecurityManager.java.i
-data/src/share/classes/java/util/IllegalFormatWidthException.java.i
+data/src/windows/native/sun/windows/Hashtable.h.i
data/test/java/net/URLConnection/URLConnectionHeaders.java.i
data/src/share/classes/com/sun/beans/decoder/DoubleElementHandler.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheData.java.i
data/src/share/classes/com/sun/servicetag/WindowsSystemEnvironment.java.i
data/src/share/classes/org/openjdk/jigsaw/PathLinker.java.i
data/src/share/classes/com/sun/beans/decoder/NewElementHandler.java.i
-data/test/com/sun/tools/extcheck/TestExtcheckArgs.sh.i
+data/test/java/awt/Window/SetBackgroundNPE/SetBackgroundNPE.java.i
data/src/share/classes/java/lang/instrument/IllegalClassFormatException.java.i
data/test/org/openjdk/jigsaw/optional-deps.sh.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java.i
+data/test/java/nio/file/Files/probeContentType/META-INF/services/java.nio.file.spi.FileTypeDetector.i
+data/src/share/native/sun/font/layout/GlyphPositioningTables.h.i
data/src/share/classes/java/security/Signer.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM861.java.i
+data/src/solaris/doc/sun/man/man1/DO_NOT_EDIT--GENERATED_FILES.i
data/src/share/classes/javax/management/openmbean/TabularData.java.i
data/test/java/security/SignedObject/Correctness.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java.i
data/src/share/classes/javax/net/ssl/ExtendedSSLSession.java.i
-data/src/windows/native/sun/windows/awt_TextArea.h.i
+data/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java.i
data/test/java/util/ResourceBundle/Control/Chinese_zh_CN.properties.i
data/src/share/classes/sun/rmi/transport/Target.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Decoder.java.i
@@ -11724,184 +12240,196 @@ data/src/share/classes/sun/io/CharToByteCp1025.java.i
data/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c.i
data/src/share/demo/jfc/TableExample/TableSorter.java.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/group.security.policy.i
-data/make/sun/management/jmxremote/Makefile.i
-data/src/share/classes/sun/net/www/protocol/https/HttpsClient.java.i
-data/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java.i
+data/test/sun/security/tools/jarsigner/JarSigningNonAscii.java.i
+data/src/share/classes/java/dyn/MethodHandleProvider.java.i
data/test/java/io/Serializable/maskSyntheticModifier/Test.java.i
data/test/sun/security/rsa/GenKeyStore.java.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java.i
data/src/share/native/sun/awt/medialib/safe_alloc.h.i
-data/test/java/util/Locale/LocaleEnhanceTest.java.i
+data/src/share/classes/java/nio/file/LinkPermission.java.i
+data/src/share/native/sun/java2d/loops/ByteBinary1Bit.h.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Layer.java.i
data/make/java/text/base/FILES_java.gmk.i
-data/test/javax/management/mxbean/OperationImpactTest.java.i
-data/src/share/demo/jfc/SampleTree/SampleTree.java.i
+data/test/java/util/EnumSet/AllOf.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/RGBColorConvertTest.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_NOTIFY.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java.i
+data/src/share/sample/nio/server/Reply.java.i
data/make/tools/CharsetMapping/IBM1381.map.i
-data/src/share/classes/sun/tools/java/Identifier.java.i
+data/test/com/sun/jndi/ldap/LdapName/EmptyNameSearch.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java.i
data/test/javax/imageio/plugins/jpeg/ReadAsGrayTest.java.i
data/make/javax/crypto/policy/unlimited/default_local.policy.i
data/test/sun/rmi/rmic/oldjavacRemoved/sunToolsJavacMain.sh.i
data/src/share/classes/sun/security/provider/certpath/PolicyChecker.java.i
data/src/share/demo/jvmti/hprof/hprof_tag.c.i
-data/make/sun/dcpr/Makefile.i
+data/src/share/classes/sun/font/Font2D.java.i
data/src/share/classes/sun/util/calendar/ZoneInfo.java.i
data/test/java/io/charStreams/BCat.java.i
-data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/package.html.i
data/src/share/classes/javax/swing/plaf/multi/MultiSpinnerUI.java.i
-data/make/tools/CharsetMapping/IBM284.c2b.i
+data/src/share/classes/javax/swing/ComponentInputMap.java.i
data/src/solaris/native/sun/awt/awt_MToolkit.h.i
data/src/share/classes/javax/security/sasl/SaslClient.java.i
data/test/java/dyn/MethodHandlesTest.java.i
-data/test/java/util/zip/ZipFile/Available.java.i
+data/src/windows/classes/sun/java2d/ScreenUpdateManager.java.i
data/src/share/classes/sun/io/CharToByteCp943C.java.i
-data/src/share/classes/sun/text/normalizer/RangeValueIterator.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java.i
+data/make/tools/swing-beans/beaninfo/images/JTableMono16.gif.i
data/src/share/classes/sun/security/ssl/Krb5Helper.java.i
data/test/java/awt/Modal/WsDisabledStyle/Winkey/Winkey.java.i
data/src/share/native/sun/java2d/opengl/OGLSurfaceData.c.i
-data/src/share/back/error_messages.h.i
+data/src/share/classes/sun/java2d/pipe/TextPipe.java.i
data/make/mkdemo/applets/Blink/Makefile.i
data/src/share/classes/java/awt/event/KeyListener.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java.i
-data/src/share/classes/sun/security/provider/SHA2.java.i
-data/make/sun/javazic/tzdata/pacificnew.i
+data/make/tools/src/build/tools/spp/Spp.java.i
+data/test/java/io/StreamTokenizer/Comment.java.i
+data/src/share/classes/sun/tools/java/AmbiguousClass.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_EmptyMap.java.i
-data/src/share/classes/sun/security/rsa/RSAPadding.java.i
+data/test/sun/net/www/protocol/http/DigestTest.java.i
+data/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java.i
data/src/share/classes/sun/management/HotspotInternalMBean.java.i
data/test/java/lang/management/ManagementFactory/ThreadMXBeanProxy.java.i
data/test/sun/misc/BootClassLoaderHook/TestHook.java.i
data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/jstack.js.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_3.java.i
-data/test/sun/security/tools/keytool/trystore.sh.i
+data/src/share/classes/sun/security/provider/certpath/CertId.java.i
data/test/sun/tools/jps/jps-Vvml.sh.i
data/src/share/classes/java/rmi/activation/ActivationGroupDesc.java.i
data/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java.i
data/make/tools/swing-beans/DocBeanInfo.java.i
data/src/share/classes/sun/util/resources/CalendarData_fr.properties.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks.i
+data/src/share/demo/jvmti/hprof/hprof_object.h.i
data/test/sun/security/ssl/sanity/pluggability/CipherSuites.java.i
+data/src/share/classes/javax/swing/text/html/ResourceLoader.java.i
data/src/share/classes/java/awt/doc-files/FlowLayout-1.gif.i
-data/test/java/io/Serializable/class/SerialA_2.java.i
+data/test/java/io/BufferedInputStream/ReadAfterClose.java.i
+data/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java.i
data/src/solaris/doc/sun/man/man1/pack200.1.i
data/make/sun/awt/FILES_export_unix.gmk.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageReader.java.i
data/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java.i
+data/src/share/classes/com/sun/beans/WildcardTypeImpl.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-b64-dsa.xml.i
-data/test/java/util/concurrent/ConcurrentQueues/GCRetention.java.i
-data/src/solaris/classes/sun/awt/motif/X11SelectionHolder.java.i
+data/test/javax/print/attribute/CollateAttr.java.i
data/test/sun/security/krb5/krb5.conf.i
-data/test/java/rmi/reliability/benchmark/bench/serial/Longs.java.i
+data/test/javax/management/remote/mandatory/notif/RMINotifTest.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c.i
-data/test/java/lang/ClassLoader/package2/Class2.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_RANDOM_DATA.java.i
data/test/java/lang/Class/forName/InitArg.java.i
data/src/share/classes/java/security/interfaces/ECPrivateKey.java.i
-data/make/tools/src/build/tools/dtdbuilder/PublicMapping.java.i
-data/test/java/lang/annotation/ParameterAnnotations.java.i
data/src/share/classes/java/text/DigitList.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/ParserRules.java.i
data/make/tools/CharsetMapping/IBM1148.c2b.i
data/test/javax/management/context/LocaleTest.java.i
data/make/netbeans/jmx/build.xml.i
+data/src/macosx/classes/com/apple/laf/ScreenMenuPropertyHandler.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_TN.java.i
data/test/java/io/File/CheckTempDir.java.i
+data/src/macosx/classes/apple/laf/JRSUIState.java.i
data/test/sun/net/www/HeaderTests.java.i
-data/src/share/native/java/util/zip/zlib-1.2.5/zconf.h.i
+data/src/share/classes/sun/awt/shell/ShellFolder.java.i
data/test/org/openjdk/jigsaw/cli/ModuleFormatTest01.java.i
data/src/share/classes/sun/security/smartcardio/PCSCTerminals.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMIpAddress.java.i
+data/make/com/sun/jmx/Makefile.i
data/src/share/native/sun/font/bidi/uchardir.h.i
-data/src/share/demo/java2d/J2DBench/resources/textdata/english.ut8.txt.i
-data/src/share/classes/sun/print/resources/duplex.png.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/ca.cer.i
+data/src/share/native/sun/security/ec/impl/ecdecode.c.i
+data/src/macosx/classes/com/apple/eawt/FullScreenListener.java.i
data/src/linux/doc/man/ja/jconsole.1.i
-data/test/javax/management/mxbean/LeakTest.java.i
data/src/share/demo/jvmti/versionCheck/versionCheck.c.i
data/src/share/classes/java/lang/Thread.java.i
data/make/sun/headless/reorder-sparcv9.i
data/make/netbeans/common/properties.ent.i
-data/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java.i
+data/src/share/sample/vm/clr-jvm/Makefile.i
data/test/java/util/jar/Attributes/Name.java.i
-data/test/sun/net/www/ParseUtil_6306697.java.i
-data/src/share/classes/sun/net/www/protocol/https/DefaultHostnameVerifier.java.i
+data/test/sun/nio/cs/OLD/Johab_OLD.java.i
+data/test/java/beans/Introspector/Test6311051.java.i
data/src/share/classes/javax/swing/plaf/basic/DefaultMenuLayout.java.i
data/src/share/native/java/lang/fdlibm/src/s_log1p.c.i
data/src/share/demo/jvmti/mtrace/sample.makefile.txt.i
data/src/share/classes/javax/swing/event/TreeWillExpandListener.java.i
data/src/share/classes/sun/text/resources/CollationData_nl.java.i
+data/src/share/classes/sun/io/ByteToCharCp1025.java.i
+data/test/java/io/RandomAccessFile/OpsAfterClose.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedBooleanFieldAccessorImpl.java.i
-data/src/solaris/classes/sun/nio/ch/SocketDispatcher.java.i
+data/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c.i
+data/src/share/native/sun/awt/image/jpeg/jpegdecoder.c.i
data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatchByteArray.java.i
data/test/java/awt/FontClass/CreateFont/bigfont.html.i
-data/test/java/util/Hashtable/IllegalLoadFactor.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecVisitor.java.i
-data/src/windows/classes/java/io/Win32FileSystem.java.i
+data/src/share/classes/com/sun/jdi/InterfaceType.java.i
+data/src/share/classes/sun/security/x509/X400Address.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain6.txt.i
+data/test/sun/net/util/IPAddressUtilTest.java.i
data/test/java/util/ResourceBundle/TestResource.java.i
+data/src/macosx/classes/sun/lwawt/PlatformWindow.java.i
data/src/share/classes/java/util/EnumMap.java.i
-data/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties.i
+data/src/share/classes/javax/management/MBeanOperationInfo.java.i
data/test/java/rmi/reliability/benchmark/bench/Makefile.i
+data/src/share/classes/java/security/cert/TrustAnchor.java.i
data/make/tools/swing-beans/beaninfo/images/JTextFieldColor16.gif.i
data/src/share/classes/javax/crypto/SealedObject.java.i
data/test/sun/security/krb5/ConfigWithQuotations.java.i
data/src/share/native/com/sun/java/util/jar/pack/unpack.h.i
data/test/sun/tools/jcmd/jcmd-pid.sh.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostName.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java.i
-data/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java.i
+data/test/java/lang/instrument/MakeJAR3.sh.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PolyPressure.java.i
+data/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java.i
data/test/java/nio/channels/FileChannel/Truncate.java.i
data/src/share/classes/javax/sql/XAConnection.java.i
data/test/java/beans/XMLDecoder/spec/TestProperty.java.i
-data/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h.i
-data/src/solaris/classes/sun/java2d/xr/XRPaints.java.i
-data/src/share/classes/java/lang/annotation/ElementType.java.i
-data/src/share/classes/sun/io/CharToByteCp420.java.i
+data/src/share/classes/org/ietf/jgss/GSSContext.java.i
+data/src/share/classes/sun/util/resources/CalendarData_ja.properties.i
+data/src/share/classes/sun/misc/JavaAWTAccess.java.i
+data/test/java/beans/Introspector/Test4918902.java.i
data/src/share/classes/javax/accessibility/AccessibleValue.java.i
data/src/share/classes/javax/swing/plaf/ButtonUI.java.i
-data/src/share/classes/sun/awt/AWTCharset.java.i
+data/src/solaris/bin/zero/jvm.cfg.i
data/test/javax/imageio/CachePremissionsTest/rwd.policy.i
-data/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java.i
data/test/sun/tools/native2ascii/A2N_6247817.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java.i
data/test/java/util/ResourceBundle/Control/MalformedDataRB_en.properties.i
data/src/share/classes/java/lang/doc-files/javalang.doc.anc38.gif.i
-data/test/java/nio/file/WatchService/Basic.java.i
+data/test/javax/sound/sampled/AudioFormat/PCM_FLOAT_support.java.i
data/make/jprt.properties.i
-data/src/share/demo/applets/GraphicsTest/GraphicsTest.java.i
+data/test/sun/net/www/http/HttpClient/RetryPost.sh.i
data/test/java/beans/XMLEncoder/6777487/TestEncoder.java.i
data/src/share/native/java/lang/fdlibm/src/w_sqrt.c.i
data/test/java/rmi/transport/dgcDeadLock/TestImpl_Stub.java.i
data/src/share/native/sun/awt/image/jpeg/jidctflt.c.i
data/test/java/nio/Buffer/CopyDirect-X-Memory.java.i
+data/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif.i
data/src/share/classes/javax/management/NotificationBroadcaster.java.i
data/test/java/util/Locale/serialized/java6locale___Java.i
data/src/share/classes/javax/swing/text/DefaultFormatterFactory.java.i
data/make/java/hpi/native/reorder-sparcv9.i
data/test/sun/security/ssl/sun/net/www/httpstest/AbstractCallback.java.i
-data/src/share/instrument/Utilities.h.i
+data/src/share/classes/javax/sql/rowset/spi/XmlWriter.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java.i
-data/src/share/classes/sun/security/jgss/krb5/MicToken_v2.java.i
+data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.cpp.i
data/src/share/classes/javax/naming/NamingSecurityException.java.i
data/test/sun/jvmstat/perfdata/PrologSanity/PrologSizeSanityCheck.java.i
data/test/java/lang/Class/forName/classes/0.class.i
-data/src/share/classes/sun/security/krb5/internal/ccache/Credentials.java.i
+data/test/java/io/Serializable/proxy/replace/WriteReplace.java.i
data/src/share/classes/javax/accessibility/AccessibleHyperlink.java.i
+data/test/com/sun/jdi/PopSynchronousTest.java.i
data/src/share/classes/java/awt/geom/Arc2D.java.i
data/src/share/classes/javax/swing/JOptionPane.java.i
-data/src/share/classes/sun/security/krb5/internal/LocalSeqNumber.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.java.i
data/src/share/classes/javax/imageio/metadata/IIOMetadata.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c.i
-data/src/share/classes/java/rmi/UnexpectedException.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/SctpChannelImpl.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java.i
data/src/share/classes/java/beans/beancontext/BeanContextServicesListener.java.i
-data/test/java/beans/XMLEncoder/6329581/Test6329581.java.i
+data/src/solaris/native/java/lang/java_props_macosx.h.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMManagers.java.i
data/src/share/classes/com/sun/nio/sctp/SendFailedNotification.java.i
data/src/share/classes/sun/io/ByteToCharCp1140.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_JO.properties.i
-data/src/share/classes/com/sun/imageio/plugins/common/I18N.java.i
+data/make/tools/swing-beans/beaninfo/images/JSpinnerMono32.gif.i
data/src/share/classes/java/sql/RowId.java.i
data/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java.i
data/src/share/classes/javax/swing/plaf/synth/package.html.i
@@ -11909,28 +12437,31 @@ data/src/share/classes/javax/security/cert/Certificate.java.i
data/test/java/beans/PropertyEditor/TestIntegerTypeNull.java.i
data/make/common/Cscope.gmk.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolState.java.i
-data/src/share/classes/com/sun/tools/hat/README.txt.i
data/test/java/net/Authenticator/B4962064.java.i
data/src/share/classes/java/awt/event/ComponentListener.java.i
-data/test/java/lang/Math/WorstCaseTests.java.i
-data/src/share/classes/sun/text/resources/CollationData_vi.java.i
-data/src/share/native/sun/font/layout/GDEFMarkFilter.h.i
+data/src/share/classes/javax/sound/midi/MidiFileFormat.java.i
+data/src/share/classes/sun/nio/cs/ArrayDecoder.java.i
+data/test/java/net/URLClassLoader/sealing/Makefile.i
data/test/com/sun/crypto/provider/KeyGenerator/TestExplicitKeyLength.java.i
data/src/share/classes/sun/nio/cs/ext/MacCentralEurope.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_hu.properties.i
+data/make/tools/src/build/tools/javazic/Mappings.java.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h.i
+data/src/macosx/native/sun/font/CGGlyphOutlines.h.i
data/test/java/nio/charset/spi/basic.sh.i
+data/src/bsd/doc/man/schemagen.1.i
data/src/share/classes/java/util/concurrent/locks/AbstractQueuedSynchronizer.java.i
data/src/share/classes/sun/misc/ClassFileTransformer.java.i
-data/src/share/demo/jfc/Font2DTest/Font2DTest.html.i
-data/make/sun/xawt/Makefile.i
+data/src/share/classes/java/io/ObjectOutput.java.i
+data/src/macosx/classes/com/apple/laf/AquaTreeUI.java.i
+data/test/java/awt/font/TextLayout/TestHebrewMark.java.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/manual.security.policy.i
data/test/java/math/BigDecimal/AddTests.java.i
data/make/netbeans/awt2d/build.properties.i
data/src/share/classes/javax/management/OperationsException.java.i
-data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/jdk.xml.i
+data/src/share/native/sun/font/DrawGlyphList.c.i
data/src/share/native/sun/security/ec/ecc_impl.h.i
data/src/share/classes/sun/java2d/loops/GraphicsPrimitive.java.i
-data/src/share/classes/com/sun/crypto/provider/DESedeKeyFactory.java.i
-data/make/tools/CharsetMapping/IBM863.map.i
+data/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerIntIntIntIntInt.java.i
data/test/com/sun/crypto/provider/Cipher/CTS/CTSMode.java.i
data/src/share/classes/sun/misc/CEFormatException.java.i
@@ -11939,30 +12470,32 @@ data/test/java/awt/Focus/CloseDialogActivateOwnerTest/java.policy.i
data/src/windows/native/sun/java2d/windows/WinBackBufferSurfaceData.cpp.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/secmod.db.i
data/src/share/classes/sun/management/snmp/jvmmib/JVM_MANAGEMENT_MIBOidTable.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextMeasureTests.java.i
+data/test/javax/management/relation/RelationNotificationSourceTest.java.i
data/src/windows/native/sun/net/spi/DefaultProxySelector.c.i
data/test/java/io/File/SetAccess.java.i
data/make/tools/src/build/tools/makeclasslist/MakeClasslist.java.i
+data/src/share/classes/java/sql/BatchUpdateException.java.i
data/src/solaris/classes/sun/awt/motif/MEmbedCanvasPeer.java.i
data/src/share/classes/sun/security/krb5/internal/KRBPriv.java.i
data/src/share/classes/java/awt/MenuComponent.java.i
-data/src/share/classes/java/awt/doc-files/GridBagLayout-baseline.png.i
+data/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h.i
+data/src/share/classes/sun/java2d/Disposer.java.i
data/src/share/classes/java/util/FormatterClosedException.java.i
data/test/javax/management/monitor/CounterMonitorThresholdTest.java.i
data/src/share/classes/sun/security/util/BitArray.java.i
data/make/tools/src/build/tools/jdwpgen/ByteTypeNode.java.i
-data/src/share/classes/sun/tools/asm/NumberConstantData.java.i
+data/test/sun/tools/jps/usage.out.i
data/src/share/classes/sun/awt/PaintEventDispatcher.java.i
data/src/linux/doc/man/jhat.1.i
data/src/share/native/java/util/zip/zlib-1.1.3/minigzip.c.i
-data/src/share/classes/javax/swing/event/RowSorterListener.java.i
+data/src/share/classes/sun/security/krb5/internal/LastReq.java.i
data/src/share/classes/javax/print/attribute/standard/DocumentName.java.i
data/src/share/classes/java/io/CharConversionException.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmscam02.c.i
+data/src/solaris/native/sun/awt/list.c.i
data/src/share/classes/javax/swing/plaf/metal/MetalTreeUI.java.i
+data/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java.i
data/make/com/sun/security/Makefile.i
data/src/share/demo/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor.i
-data/test/java/math/BigDecimal/CompareToTests.java.i
data/test/java/lang/annotation/Missing/D.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java.i
data/make/javax/sound/Makefile.i
@@ -11970,67 +12503,63 @@ data/src/solaris/classes/sun/java2d/x11/X11SurfaceDataProxy.java.i
data/src/share/classes/sun/text/resources/FormatData_lv.java.i
data/src/share/classes/sun/tools/tree/NullExpression.java.i
data/src/share/native/sun/font/layout/OpenTypeTables.h.i
-data/test/java/util/ResourceBundle/Control/Bug6530694.java.i
+data/src/share/lib/images/cursors/invalid32x32.gif.i
data/src/share/classes/sun/io/ByteToCharCp943.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/DetailsView.gif.i
+data/test/java/io/LineNumberReader/MarkReset.java.i
data/src/share/classes/sun/security/krb5/KrbCryptoException.java.i
data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java.i
-data/src/share/classes/com/sun/servicetag/package.html.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVersion.java.i
data/test/java/io/RandomAccessFile/WriteBytesChars.java.i
-data/src/share/classes/com/sun/jndi/ldap/PersistentSearchControl.java.i
+data/test/javax/sound/midi/Gervill/ModelStandardTransform/SetTransform.java.i
data/src/share/classes/javax/net/ssl/X509ExtendedKeyManager.java.i
data/src/share/classes/javax/crypto/ExemptionMechanismException.java.i
data/test/javax/xml/crypto/dsig/GenerationTests.java.i
data/test/com/sun/jdi/ReferrersTest.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/run.sh.i
-data/src/share/classes/sun/reflect/InstantiationExceptionConstructorAccessorImpl.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java.i
+data/test/java/lang/management/ManagementFactory/PlatformMBeanServerTest.java.i
+data/test/javax/sound/midi/Gervill/SoftFilter/TestProcessAudio.java.i
+data/src/share/classes/javax/print/PrintException.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c.i
-data/src/share/classes/sun/text/resources/FormatData_sk_SK.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/ResultContainer.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierModelTransform.java.i
-data/src/solaris/native/sun/nio/ch/FileKey.c.i
-data/src/share/classes/sun/util/resources/LocaleNames_zh.properties.i
+data/make/com/apple/osx/Makefile.i
+data/test/sun/management/jmxremote/bootstrap/rmiregistry.properties.i
+data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.template.i
data/src/share/classes/javax/swing/JScrollPane.java.i
data/src/share/classes/java/lang/module/RequireOptionalModule.java.i
-data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html.i
+data/test/javax/script/NullUndefinedVarTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/NameSpaceSymbTable.java.i
-data/test/sun/tools/jrunscript/hello.js.i
+data/test/com/sun/servicetag/InvalidServiceTag.java.i
data/test/javax/crypto/Cipher/TestGetInstance.java.i
-data/src/share/classes/javax/net/ssl/SSLEngine.java.i
data/test/java/beans/PropertyChangeSupport/TestListeners.java.i
-data/test/java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java.i
+data/test/java/io/Serializable/class/SerialA_2.java.i
data/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load2.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ColConvTest.java.i
data/src/share/classes/sun/security/provider/certpath/State.java.i
data/make/tools/src/build/tools/jdwpgen/AbstractNamedNode.java.i
data/src/share/classes/javax/swing/package.html.i
-data/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java.i
+data/src/share/classes/sun/nio/cs/ext/EUC_KR.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties.i
-data/src/share/classes/sun/java2d/pisces/Stroker.java.i
-data/src/share/classes/javax/management/MBeanOperationInfo.java.i
+data/test/java/util/PluggableLocale/providersrc/LocaleNames_xx.properties.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java.i
-data/test/java/lang/instrument/MakeJAR3.sh.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test05_ko.access.in.i
data/src/share/classes/javax/net/ssl/SSLProtocolException.java.i
-data/src/share/classes/sun/security/x509/DNSName.java.i
+data/src/macosx/classes/sun/lwawt/LWButtonPeer.java.i
+data/test/java/security/CodeSigner/Serialize.java.i
data/src/share/classes/com/sun/beans/decoder/ValueObject.java.i
data/test/java/util/concurrent/Phaser/TieredArriveLoops.java.i
data/src/share/classes/com/sun/jdi/request/ClassPrepareRequest.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/NotActivatableInterface.java.i
data/test/sun/tools/jps/jps-q.sh.i
data/src/share/native/java/util/zip/zlib-1.1.3/example.c.i
-data/test/java/lang/management/ThreadMXBean/AllThreadIds.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315WithComments.java.i
data/test/javax/management/modelmbean/UnserializableTargetObjectTest.java.i
data/test/javax/management/context/LocaleAwareBroadcasterTest.java.i
data/src/share/classes/sun/misc/ServiceConfigurationError.java.i
-data/test/javax/print/attribute/GetCopiesSupported.java.i
-data/src/share/classes/javax/management/namespace/MBeanServerConnectionWrapper.java.i
+data/src/windows/classes/sun/awt/windows/ThemeReader.java.i
data/make/tools/src/build/tools/charsetmapping/GenerateDBCS.java.i
data/test/java/io/FilePermission/SpecTests.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java.i
+data/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java.i
data/test/java/lang/management/ThreadMXBean/LockedSynchronizers.java.i
data/test/java/io/Serializable/enum/ignoreSerializationFields/Test.java.i
data/src/share/classes/java/lang/invoke/FilterOneArgument.java.i
@@ -12038,22 +12567,21 @@ data/test/com/sun/jdi/BadHandshakeTest.java.i
data/test/java/nio/channels/etc/Shadow.java.i
data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderResult.java.i
data/src/share/classes/sun/awt/Mutex.java.i
-data/src/share/native/sun/font/layout/AlternateSubstSubtables.h.i
data/src/windows/classes/sun/print/Win32PrintServiceLookup.java.i
data/src/share/classes/sun/text/resources/CollationData_pl.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c.i
-data/test/java/io/Serializable/skippedObjCNFException/Write.java.i
+data/test/java/util/regex/POSIX_Unicode.java.i
data/test/javax/management/query/QueryDottedAttrTest.java.i
data/src/share/classes/java/net/Inet4AddressImpl.java.i
data/test/com/sun/jdi/NewInstanceTest.java.i
data/test/java/beans/PropertyEditor/TestColorClassNull.java.i
data/make/tools/CharsetMapping/IBM939.nr.i
data/test/java/text/Format/DateFormat/Bug4823811.java.i
-data/src/solaris/classes/sun/awt/X11/security-icon-bw48.png.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1.xml.i
-data/src/share/classes/sun/java2d/pipe/AAShapePipe.java.i
+data/make/common/Defs-solaris.gmk.i
data/src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java.i
data/src/share/native/sun/awt/libpng/pngpread.c.i
+data/src/share/native/sun/awt/image/BufImgSurfaceData.h.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xenc-schema.rng.i
data/src/share/classes/java/net/URISyntaxException.java.i
data/test/javax/swing/plaf/metal/MetalInternalFrameUI/Test6657026.java.i
@@ -12062,12 +12590,10 @@ data/make/common/shared/PrivateDefs.gmk-example.i
data/src/share/classes/javax/print/attribute/standard/PrinterMessageFromOperator.java.i
data/src/share/classes/sun/security/ssl/DHCrypt.java.i
data/src/share/classes/java/nio/file/package-info.java.i
-data/test/javax/management/Introspector/SetWrongTypeAttributeTest.java.i
+data/src/macosx/native/jobjc/src/core/native/Invoke.m.i
data/src/share/classes/sun/management/resources/agent_zh_CN.properties.i
-data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java.i
data/src/share/back/debugDispatch.h.i
-data/test/sun/security/action/Generify.java.i
-data/src/share/native/sun/font/layout/LESwaps.h.i
+data/src/windows/native/sun/windows/awt_InputEvent.h.i
data/src/share/classes/java/dyn/MethodHandleStatics.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/ReadFloatArray.java.i
data/test/sun/util/resources/Calendar/Bug4518811.java.i
@@ -12094,27 +12620,29 @@ data/src/share/classes/com/sun/jdi/StringReference.java.i
data/make/sun/xawt/ToBin.java.i
data/test/java/net/URL/ftp_urls.i
data/test/java/io/Serializable/wrongReturnTypes/Read.java.i
-data/test/com/sun/jdi/AllLineLocations.java.i
+data/src/share/classes/sun/security/x509/RDN.java.i
data/test/java/rmi/server/serverStackTrace/Impl2_Stub.java.i
-data/test/javax/swing/JSpinner/6463712/bug6463712.java.i
+data/make/tools/CharsetMapping/IBM420.nr.i
data/src/share/classes/sun/swing/UIClientPropertyKey.java.i
data/test/javax/swing/JFileChooser/6550546/bug6550546.java.i
data/src/share/classes/sun/net/InetAddressCachePolicy.java.i
-data/test/sun/nio/cs/OLD/IBM950_OLD.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java.i
+data/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java.i
data/src/share/classes/java/awt/image/ComponentColorModel.java.i
data/test/sun/security/ssl/javax/net/ssl/SSLContextVersion.java.i
-data/test/javax/rmi/ssl/SSLSocketParametersTest.sh.i
+data/src/share/classes/javax/sound/sampled/AudioInputStream.java.i
data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/file-targets.xml.i
data/src/share/classes/sun/net/ProgressEvent.java.i
data/test/sun/tools/jps/jps-Vvm_Output1.awk.i
data/src/share/classes/sun/util/resources/TimeZoneNames_en.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization.properties.i
data/src/share/classes/com/sun/jmx/interceptor/MBeanServerInterceptorSupport.java.i
+data/src/macosx/native/sun/awt/GeomUtilities.m.i
data/src/share/classes/sun/io/CharToByteTIS620.java.i
data/src/share/classes/javax/swing/plaf/DesktopIconUI.java.i
data/src/linux/doc/man/pack200.1.i
data/src/share/classes/sun/io/ByteToCharCp1146.java.i
-data/test/java/util/ResourceBundle/Control/PackagePrivateTest.java.i
+data/src/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java.i
data/src/solaris/classes/sun/print/UnixPrintServiceLookup.java.i
data/test/java/util/EnumSet/LargeEnumIteratorRemoveResilience.java.i
data/test/javax/swing/SwingWorker/6480289/bug6480289.java.i
@@ -12130,59 +12658,61 @@ data/src/share/classes/com/sun/jmx/defaults/JmxProperties.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ColorConvertTest.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicBoolean.java.i
data/src/share/classes/sun/tools/asm/FieldConstantData.java.i
-data/make/tools/CharsetMapping/IBM937.c2b.i
+data/src/windows/native/sun/jkernel/graphics/cautionshield32.bmp.i
data/src/share/native/sun/java2d/loops/Index12Gray.h.i
data/src/solaris/native/sun/nio/ch/EPollPort.c.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
data/test/java/io/charStreams/ABCInputStream.java.i
+data/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher.i
data/test/java/lang/management/RuntimeMXBean/UpTime.java.i
data/src/share/demo/management/FullThreadDump/README.txt.i
data/test/java/rmi/transport/readTimeout/TestIface.java.i
data/test/java/lang/management/RuntimeMXBean/GetSystemProperties.java.i
data/test/sun/security/provider/KeyStore/pw.jks.i
data/src/share/classes/sun/text/resources/FormatData_ja.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/ReflectionException.java.i
data/test/java/nio/file/Files/walkFileTree/grantTopOnly.policy.i
-data/src/share/classes/java/lang/reflect/Constructor.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/Classes.java.i
-data/test/javax/management/modelmbean/LoggingExceptionTest.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Aes256.java.i
data/test/java/util/concurrent/forkjoin/NQueensCS.java.i
+data/src/share/demo/jvmti/hprof/hprof_object.c.i
data/test/java/util/jar/JarFile/JarNoManifest.java.i
data/test/java/awt/FontClass/CreateFont/DeleteFont.java.i
data/make/mkdemo/management/JTop/Makefile.i
data/src/share/native/sun/security/ec/impl/ec2_163.c.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libplc4.so.i
+data/test/javax/sound/sampled/DataLine/DataLine_ArrayIndexOutOfBounds.java.i
data/src/share/classes/sun/misc/Version.java.template.i
-data/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java.i
+data/src/macosx/native/apple/applescript/NS_Java_ConversionUtils.m.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy22.i
data/test/sun/rmi/rmic/classFileVersion/G1.java.i
data/src/solaris/native/sun/awt/awt_AWTEvent.h.i
data/test/com/sun/jdi/DeleteEventRequestsTest.java.i
data/src/share/demo/nbproject/management/JTop/nbproject/jdk.xml.i
-data/src/share/classes/sun/management/MemoryImpl.java.i
+data/src/solaris/transport/socket/socket_md.h.i
data/make/com/Makefile.i
+data/test/sun/security/krb5/auto/Basic.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/ClassAnalyzer.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java.i
data/src/share/native/sun/font/layout/LEInsertionList.h.i
data/src/share/classes/java/lang/Short.java.i
data/src/share/classes/javax/swing/text/html/HTMLWriter.java.i
data/test/com/sun/tools/attach/ProviderTest.java.i
-data/test/sun/nio/cs/CheckICNE.java.i
data/src/share/classes/sun/util/resources/CalendarData_pt_PT.properties.i
data/src/windows/transport/shmem/shmem_md.c.i
data/src/share/back/classTrack.c.i
data/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key.i
data/src/share/classes/sun/nio/cs/ext/IBM273.java.i
data/src/share/classes/java/dyn/MemberName.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.properties.i
data/src/share/classes/javax/swing/text/MutableAttributeSet.java.i
data/src/share/classes/sun/util/resources/LocaleNames_sr.properties.i
-data/src/share/classes/sun/nio/ch/OptionKey.java.i
data/src/solaris/native/sun/awt/awt_mgrsel.h.i
-data/src/solaris/classes/sun/awt/motif/X11GB2312.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/InformalProtocol.java.i
data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevelRevoked.java.i
data/test/javax/management/MBeanInfo/NotificationInfoTest.java.i
-data/test/java/io/IOException/LastErrorString.java.i
+data/src/share/classes/java/security/cert/CollectionCertStoreParameters.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/Clear.java.i
+data/test/sun/security/krb5/auto/GSS.java.i
data/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java.i
data/test/com/sun/jdi/OptionTest.java.i
data/test/java/beans/XMLEncoder/4741757/AbstractTest.java.i
@@ -12190,7 +12720,6 @@ data/src/share/classes/sun/security/provider/PolicyFile.java.i
data/make/java/fdlibm/Makefile.i
data/test/java/net/URL/URIToURLTest.java.i
data/src/share/classes/sun/security/provider/certpath/PolicyNodeImpl.java.i
-data/test/tools/launcher/DefaultLocaleTest.sh.i
data/test/tools/pack200/pack200-verifier/src/xmlkit/CommandLineParser.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/RemapInstrument.java.i
data/src/share/classes/sun/nio/cs/IBM857.java.i
@@ -12201,10 +12730,11 @@ data/test/com/sun/crypto/provider/KeyAgreement/DHKeyGenSpeed.java.i
data/test/java/net/URLConnection/xml/xml4.i
data/src/share/classes/sun/security/util/PendingException.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibRequest.java.i
+data/src/macosx/classes/com/apple/eawt/OpenFilesHandler.java.i
data/src/share/native/sun/security/ec/ecl_mult.c.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Read.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11_OmitComments.java.i
-data/src/share/back/threadControl.c.i
+data/test/sun/security/util/Resources/Format.config.i
data/test/com/sun/security/auth/login/ConfigFile/InconsistentError.java.i
data/src/share/classes/javax/print/Doc.java.i
data/src/share/classes/com/sun/tools/jdi/MethodImpl.java.i
@@ -12227,27 +12757,27 @@ data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Directory.gif.i
data/test/java/lang/instrument/appendToClassLoaderSearch/BootSupport.java.i
data/src/share/classes/sun/security/x509/OIDMap.java.i
data/test/java/io/Unicode.java.i
+data/src/share/classes/javax/sql/RowSetMetaData.java.i
data/test/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/ProgramChange.java.i
-data/test/java/beans/XMLDecoder/spec/TestField.java.i
data/test/java/lang/Double/BitwiseConversion.java.i
data/test/sun/security/krb5/auto/NonMutualSpnego.java.i
data/src/solaris/doc/sun/man/man1/ja/wsgen.1.i
+data/test/sun/management/jmxremote/startstop/management_jcmd.properties.i
data/src/share/classes/javax/swing/text/html/InlineView.java.i
-data/test/java/io/BufferedInputStream/ReadAfterClose.java.i
+data/test/org/openjdk/jigsaw/cli/jmod-basic.sh.i
data/test/java/beans/Introspector/4520754/WombatBeanInfo.java.i
data/src/solaris/classes/sun/awt/X11/XDragSourceProtocolListener.java.i
data/src/share/classes/org/openjdk/jigsaw/JigsawModuleSystem.java.i
data/test/javax/management/MBeanServer/MBeanServerInvocationHandlerExceptionTest.java.i
data/test/java/awt/Mixing/LWPopupMenu.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java.i
+data/src/macosx/native/sun/awt/CTrayIcon.h.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_16nw.c.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_es.properties.i
data/test/javax/swing/JColorChooser/Test4759934.html.i
data/src/share/native/sun/font/layout/ClassDefinitionTables.cpp.i
data/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java.i
data/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.java.i
-data/src/share/classes/javax/print/attribute/standard/Fidelity.java.i
data/src/solaris/native/java/io/Console_md.c.i
data/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh.i
data/test/java/util/Collections/ReverseOrder2.java.i
@@ -12256,18 +12786,18 @@ data/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java.i
data/src/windows/classes/sun/java2d/windows/GDIRenderer.java.i
data/src/share/classes/sun/font/FontStrike.java.i
data/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/sqlite3.dll.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_test04_ok.password.in.i
data/src/linux/doc/man/ja/keytool.1.i
-data/test/sun/security/smartcardio/TestMultiplePresent.java.i
+data/test/java/net/Socket/TrafficClass.java.i
data/src/share/classes/java/util/FormatFlagsConversionMismatchException.java.i
data/src/share/classes/java/nio/file/attribute/FileStoreAttributeView.java.i
-data/test/sun/security/pkcs11/Provider/ConfigQuotedString.java.i
+data/test/javax/swing/JMenuItem/6209975/bug6209975.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/AbstractMonitoredVm.java.i
data/src/share/classes/javax/smartcardio/Card.java.i
data/src/share/classes/sun/nio/cs/ext/MacGreek.java.i
-data/src/share/classes/javax/swing/DesktopManager.java.i
+data/src/macosx/native/sun/awt/ImageSurfaceData.m.i
data/src/share/classes/sun/net/spi/nameservice/NameServiceDescriptor.java.i
-data/test/java/awt/Mixing/Validating.java.i
data/src/windows/native/sun/windows/awt_Dimension.h.i
data/test/java/math/BigDecimal/FloatDoubleValueTests.java.i
data/test/java/nio/file/Files/walkFileTree/PrintFileTree.java.i
@@ -12278,10 +12808,10 @@ data/src/share/back/classTrack.h.i
data/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/internal/Strings.java.i
data/test/java/security/Provider/DefaultPKCS11.java.i
-data/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java.i
+data/src/share/classes/com/sun/net/httpserver/Filter.java.i
data/src/share/npt/utf.c.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmRTBootClassPathSupport.java.i
-data/src/share/classes/javax/sql/rowset/spi/SyncResolver.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java.i
data/test/java/awt/print/PageFormat/PageFormatFromAttributes.java.i
data/src/share/classes/sun/tools/javac/SourceMember.java.i
data/src/share/classes/java/awt/doc-files/FocusSpec.html.i
@@ -12289,7 +12819,7 @@ data/make/tools/src/build/tools/jdwpgen/LongTypeNode.java.i
data/src/share/classes/javax/management/namespace/MBeanServerSupport.java.i
data/test/java/util/ResourceBundle/Test4314141B_fr.properties.i
data/src/share/native/sun/java2d/loops/IntRgbx.c.i
-data/src/share/classes/java/nio/charset/StandardCharset.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownSubSystemException.java.i
data/src/windows/native/sun/windows/ComCtl32Util.h.i
data/test/java/util/HashMap/KeySetRemove.java.i
data/src/windows/native/sun/jkernel/kernel_fr.rc.i
@@ -12298,7 +12828,9 @@ data/src/share/classes/com/sun/jdi/event/LocatableEvent.java.i
data/test/javax/swing/JFileChooser/6798062/bug6798062.java.i
data/src/share/classes/org/openjdk/jigsaw/FileConstants.java.i
data/test/java/rmi/activation/Activatable/checkActivateRef/group.security.policy.i
-data/src/solaris/classes/sun/awt/X11/XScrollbar.java.i
+data/src/windows/native/sun/windows/awt_Multimon.h.i
+data/src/macosx/native/sun/awt/CDropTarget.m.i
+data/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java.i
data/test/sun/rmi/transport/tcp/blockAccept/TestIface.java.i
data/test/javax/management/eventService/NotSerializableNotifTest.java.i
data/test/java/net/URLConnection/contentHandler/COM/foo/content/text/plain.java.i
@@ -12317,42 +12849,45 @@ data/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html.i
data/src/share/classes/javax/swing/text/LayeredHighlighter.java.i
data/test/javax/management/MBeanInfo/SerializedMBeanInfo.java.i
data/test/java/beans/XMLEncoder/Test4993777.java.i
-data/src/share/classes/com/sun/tools/example/debug/gui/Icons.java.i
+data/src/share/classes/sun/io/CharToByteGBK.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java.i
data/test/sun/tools/jstat/jstatGcOldOutput1.sh.i
data/src/share/classes/org/openjdk/internal/joptsimple/IllegalOptionClusterException.java.i
data/src/share/classes/java/io/DataOutput.java.i
data/src/share/classes/java/util/concurrent/LinkedTransferQueue.java.i
-data/src/solaris/doc/sun/man/man1/jstack.1.i
+data/src/share/classes/java/beans/AppletInitializer.java.i
data/src/share/instrument/FileSystemSupport.h.i
-data/test/java/nio/channels/TestThread.java.i
+data/test/com/sun/jdi/AllLineLocations.java.i
+data/src/share/classes/java/nio/channels/DatagramChannel.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemMgrPoolRelEntryMeta.java.i
data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream2.java.i
data/src/share/classes/java/nio/file/attribute/AclEntryPermission.java.i
data/src/share/classes/javax/swing/RowSorter.java.i
data/test/java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java.i
-data/test/sun/net/www/protocol/jar/B5105410.sh.i
+data/test/javax/swing/JSpinner/6463712/bug6463712.java.i
data/test/com/sun/servicetag/servicetag5.properties.i
data/src/share/classes/sun/reflect/generics/tree/ClassSignature.java.i
data/test/java/io/BufferedReader/MarkedFillAtEOF.java.i
-data/test/java/lang/instrument/PremainClass/PremainClassTest.sh.i
+data/test/sun/rmi/rmic/manifestClassPath/Util.sh.i
data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.properties.i
data/src/share/demo/nbproject/jfc/Metalworks/nbproject/project.xml.i
+data/make/sun/awt/FILES_c_windows.gmk.i
data/src/linux/doc/man/ja/klist.1.i
data/src/share/classes/org/openjdk/jigsaw/Configuration.java.i
data/src/share/classes/sun/security/krb5/internal/rcache/ReplayCache.java.i
-data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java.i
-data/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java.i
+data/test/java/rmi/transport/readTimeout/security.policy.i
+data/src/share/classes/com/sun/media/sound/DLSSampleOptions.java.i
+data/src/macosx/classes/com/apple/eawt/FullScreenUtilities.java.i
data/test/sun/tools/jstat/gcPermCapacityOutput1.awk.i
-data/src/solaris/classes/java/lang/ProcessEnvironment.java.i
data/test/java/awt/regtesthelpers/Util.java.i
data/test/sun/util/resources/TimeZone/Bug4848242.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/services/no.name.service.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSubSystem.java.i
data/src/windows/native/sun/windows/WBufferStrategy.cpp.i
+data/src/macosx/classes/com/apple/laf/AquaFonts.java.i
data/test/tools/launcher/MultipleJRE.sh.i
data/src/share/classes/javax/xml/crypto/dsig/Manifest.java.i
-data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java.i
+data/test/java/nio/channels/AsynchronousChannelGroup/BadProperties.java.i
data/src/share/classes/com/sun/net/httpserver/HttpHandler.java.i
data/test/java/awt/FontClass/LCDScale.java.i
data/src/share/classes/sun/security/x509/CRLExtensions.java.i
@@ -12361,10 +12896,9 @@ data/src/share/classes/java/awt/datatransfer/FlavorTable.java.i
data/src/share/native/sun/java2d/loops/Index8Gray.h.i
data/src/share/classes/javax/accessibility/AccessibleStateSet.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReuseAddr.java.i
-data/src/solaris/classes/sun/awt/X11/XRootWindow.java.i
+data/src/share/classes/javax/swing/AbstractSpinnerModel.java.i
data/src/share/classes/javax/net/ssl/SSLServerSocket.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java.i
-data/src/share/classes/javax/management/openmbean/InvalidKeyException.java.i
+data/src/share/classes/sun/text/resources/FormatData_sr_CS.java.i
data/src/share/classes/sun/awt/image/ImageWatched.java.i
data/make/tools/src/build/tools/jdwpgen/ReferenceTypeNode.java.i
data/test/sun/net/www/protocol/http/BasicLongCredentials.java.i
@@ -12372,6 +12906,7 @@ data/test/java/io/Serializable/resolveClass/deserializeButton/Foo.java.i
data/test/javax/sql/rowset/serial/SerialBlob/SetBinaryStream.java.i
data/test/javax/management/openmbean/NullConstructorParamsTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsToolBarSeparatorUI.java.i
+data/src/share/classes/javax/smartcardio/CommandAPDU.java.i
data/src/windows/native/sun/java2d/d3d/D3DBlitLoops.h.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyValue.java.i
data/test/javax/swing/JScrollBar/4865918/bug4865918.java.i
@@ -12383,13 +12918,16 @@ data/test/java/rmi/reliability/benchmark/bench/rmi/CharArrayCalls.java.i
data/test/sun/nio/cs/UkrainianIsNotRussian.java.i
data/make/common/internal/BinaryPlugs.gmk.i
data/src/share/classes/java/io/SerializablePermission.java.i
+data/src/share/classes/com/sun/tools/jdi/PacketStream.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerTableMeta.java.i
data/src/share/classes/sun/io/ByteToCharMacThai.java.i
data/test/java/util/concurrent/ScheduledThreadPoolExecutor/Stress.java.i
data/src/share/classes/com/sun/tools/jdi/MirrorImpl.java.i
-data/test/sun/security/provider/PolicyParser/PrincipalExpansionErrorAction.java.i
+data/src/windows/classes/sun/awt/windows/WMenuPeer.java.i
data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableBlockCipher.java.i
-data/src/share/classes/java/lang/RuntimePermission.java.i
+data/make/sun/awt/mapfile-vers-bsd.i
+data/src/macosx/classes/com/apple/concurrent/LibDispatchQueue.java.i
+data/test/javax/management/namespace/namespace.policy.i
data/make/sun/javazic/tzdata/solar87.i
data/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java.i
data/src/share/classes/sun/nio/cs/ext/ISO_8859_11.java.i
@@ -12397,20 +12935,19 @@ data/src/share/classes/javax/management/JMException.java.i
data/src/share/classes/sun/security/provider/SHA5.java.i
data/src/share/classes/sun/text/normalizer/SymbolTable.java.i
data/test/sun/management/jmxremote/bootstrap/ssl/keystore.i
-data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.d
data/test/java/awt/Window/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java.i
data/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java.i
data/src/windows/classes/sun/nio/fs/WindowsChannelFactory.java.i
data/src/share/native/java/util/TimeZone.c.i
data/src/share/classes/com/sun/beans/decoder/FalseElementHandler.java.i
-data/src/share/classes/java/util/UUID.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthParser.java.i
+data/src/share/classes/sun/java2d/pipe/RenderQueue.java.i
data/src/share/classes/javax/management/relation/RelationTypeSupport.java.i
-data/test/java/util/Calendar/Bug6645263.java.i
data/src/share/classes/java/net/ContentHandler.java.i
-data/test/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java.i
+data/src/share/classes/com/sun/servicetag/ServiceTag.java.i
data/src/solaris/doc/sun/man/man1/ja/rmiregistry.1.i
-data/test/javax/sound/midi/File/SMPTESequence.java.i
-data/src/solaris/sample/dtrace/hotspot_jni/README.txt.i
+data/test/javax/print/applet/applet0/Applet0.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java.i
data/test/java/io/LineNumberReader/Skip.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_sv.java.i
data/test/sun/misc/Safe.java.i
@@ -12423,51 +12960,51 @@ data/src/solaris/classes/sun/awt/X11/MotifColorUtilities.java.i
data/test/java/lang/AssertionError/Cause.java.i
data/test/sun/security/pkcs11/nss/db/secmod.db.i
data/src/share/classes/sun/nio/cs/UTF_32LE_BOM.java.i
+data/src/share/classes/javax/swing/Icon.java.i
data/src/solaris/native/sun/awt/jawt.c.i
data/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java.i
data/src/share/classes/sun/util/resources/CalendarData_en_MT.properties.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpTools.java.i
data/src/share/demo/nbproject/management/VerboseGC/nbproject/jdk.xml.i
-data/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties.i
-data/src/share/classes/sun/print/CustomMediaSizeName.java.i
+data/src/share/classes/javax/print/attribute/DocAttributeSet.java.i
+data/src/share/classes/sun/tools/asm/LocalVariableTable.java.i
data/test/java/lang/instrument/NativeMethodPrefixAgent.java.i
data/src/share/classes/sun/font/BidiUtils.java.i
-data/src/share/classes/java/rmi/registry/RegistryHandler.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.java.i
data/src/share/classes/com/sun/media/sound/WaveFileFormat.java.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4517355.java.i
data/test/java/lang/instrument/RedefineClassesDisabledTest.java.i
-data/src/share/classes/sun/misc/Resource.java.i
-data/src/share/classes/com/sun/beans/decoder/ValueObjectImpl.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java.i
+data/src/share/classes/sun/security/krb5/internal/SeqNumber.java.i
data/src/share/sample/vm/clr-jvm/jinvoker.cpp.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ServerTimeout.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PublicCtor.java.i
-data/src/share/classes/sun/security/tools/PolicyTool.java.i
data/test/java/beans/XMLEncoder/Test4994637.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Decoder.java.i
-data/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java.i
data/src/share/classes/sun/font/Script.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java.i
-data/test/javax/management/modelmbean/ExoticTargetTypeTest.java.i
+data/src/share/classes/sun/security/krb5/internal/ccache/CCacheOutputStream.java.i
data/src/share/classes/javax/imageio/metadata/IIOMetadataFormat.java.i
-data/test/java/math/BigDecimal/PowTests.java.i
+data/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java.i
+data/test/java/awt/im/InputContext/bug4625203.java.i
data/test/sun/security/provider/PolicyFile/TokenStore.java.i
data/test/sun/tools/jrunscript/jrunscript-eTest.sh.i
+data/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java.i
data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankFile.java.i
data/src/share/classes/sun/jkernel/KernelError.java.i
data/make/java/net/mapfile-vers.i
data/test/javax/sound/midi/Gervill/SoftChannel/Mute.java.i
data/src/share/classes/java/awt/peer/LightweightPeer.java.i
-data/src/share/classes/java/text/BreakDictionary.java.i
+data/src/share/classes/sun/security/tools/JarSignerResources.java.i
data/src/solaris/native/java/lang/ProcessEnvironment_md.c.i
data/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java.i
data/test/com/sun/servicetag/missing-environ-field.xml.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java.i
data/make/com/oracle/util/Makefile.i
data/src/share/classes/javax/swing/text/html/parser/Entity.java.i
-data/src/share/native/java/lang/fdlibm/src/s_logb.c.i
+data/src/share/classes/sun/text/resources/FormatData_ms.java.i
data/src/share/classes/javax/sql/RowSetReader.java.i
data/src/share/classes/sun/security/tools/KeyTool.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_hr.properties.i
+data/test/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_mk_MK.properties.i
data/test/javax/management/remote/mandatory/notif/NotificationSender.java.i
@@ -12479,30 +13016,33 @@ data/src/share/classes/javax/swing/event/CellEditorListener.java.i
data/make/javax/sound/jsoundalsa/Makefile.i
data/src/share/classes/sun/io/CharToByteCp273.java.i
data/src/share/classes/java/awt/image/DataBufferDouble.java.i
+data/src/solaris/native/sun/font/X11FontScaler.c.i
data/src/windows/javavm/export/jvm_md.h.i
+data/src/macosx/native/sun/awt/CClipboard.m.i
+data/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java.i
data/src/windows/native/sun/jkernel/version.rc.i
data/src/share/classes/sun/security/timestamp/TSResponse.java.i
data/src/share/classes/com/sun/jndi/url/ldap/ldapURLContextFactory.java.i
data/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java.i
data/src/share/classes/sun/management/jmxremote/package.html.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.dll.i
data/src/share/classes/java/beans/Encoder.java.i
data/src/share/classes/java/nio/file/attribute/AclEntryFlag.java.i
data/src/share/classes/sun/awt/event/IgnorePaintEvent.java.i
data/src/share/classes/java/awt/peer/CheckboxPeer.java.i
-data/test/sun/java2d/cmm/ColorConvertOp/GRAY.png.i
+data/src/share/classes/sun/security/ssl/Record.java.i
data/src/share/classes/sun/text/resources/CollationData_sv.java.i
data/make/netbeans/common/architectures/name-SunOS.properties.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipPath.java.i
-data/test/java/lang/annotation/loaderLeak/C.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnspr4.so.i
data/test/sun/security/pkcs11/nss/p11-deimos.txt.i
data/src/share/classes/javax/swing/DefaultFocusManager.java.i
data/src/share/classes/javax/print/StreamPrintService.java.i
data/src/share/classes/sun/invoke/util/VerifyType.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileSystemProvider.java.i
-data/test/java/nio/file/Files/PassThroughFileSystem.java.i
data/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NonAutoClose.java.i
-data/make/tools/src/build/tools/jdwpgen/Context.java.i
+data/make/tools/generate_break_iterator/Makefile.i
+data/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java.i
data/make/tools/CharsetMapping/IBM871.c2b.i
data/src/share/classes/javax/swing/JLayer.java.i
data/make/modules/update_module.sh.i
@@ -12518,51 +13058,55 @@ data/test/java/util/Locale/data/deflocale.rhel5.fmtasdefault.i
data/src/share/native/sun/awt/image/jpeg/jcmaster.c.i
data/src/share/classes/javax/smartcardio/CardPermission.java.i
data/src/share/classes/sun/nio/cs/ext/MacHebrew.java.i
-data/test/javax/swing/JColorChooser/Test4380468.html.i
data/src/windows/classes/com/sun/tools/jdi/SharedMemoryTransportService.java.i
data/src/share/classes/sun/io/ByteToCharCp1255.java.i
data/src/share/classes/javax/naming/MalformedLinkException.java.i
data/test/java/net/URL/Equals.java.i
-data/src/share/classes/sun/awt/dnd/SunDragSourceContextPeer.java.i
-data/make/jpda/transport/socket/mapfile-vers.i
-data/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java.i
+data/test/com/sun/net/httpserver/bugs/B6424196.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/package.html.i
data/test/java/rmi/transport/httpSocket/HttpSocketTest_Stub.java.i
data/make/tools/reorder/tests/Hello.java.i
data/src/share/classes/sun/security/ssl/SSLSessionImpl.java.i
data/src/share/back/debugInit.h.i
data/src/share/demo/applets/BarChart/example2.html.i
-data/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperty.java.i
data/test/java/awt/FullScreen/MultimonFullscreenTest/MultimonFullscreenTest.java.i
data/test/sun/security/tools/keytool/PrintSSL.java.i
+data/make/javax/swing/plaf/FILES.gmk.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/HandshakeOutStream/NullCerts.java.i
data/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java.i
-data/src/solaris/hpi/native_threads/src/condvar_md.c.i
+data/src/share/native/sun/font/layout/ContextualGlyphSubstProc.cpp.i
data/test/java/beans/PropertyEditor/TestByteClassJava.java.i
data/test/javax/management/openmbean/CompositeDataToMapTest.java.i
data/src/share/classes/sun/security/ssl/Handshaker.java.i
data/make/tools/src/build/tools/generatenimbus/UIStyle.java.i
data/src/share/classes/sun/reflect/generics/tree/SimpleClassTypeSignature.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile.i
-data/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java.i
-data/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java.i
+data/src/macosx/classes/sun/font/CStrike.java.i
+data/src/share/classes/sun/nio/ch/PollSelectorProvider.java.i
+data/src/share/classes/sun/print/PrintJobAttributeException.java.i
data/src/share/classes/com/sun/media/sound/SoftProvider.java.i
data/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java.i
data/make/sun/jawt/Makefile.i
+data/src/share/classes/javax/print/attribute/Size2DSyntax.java.i
data/test/com/sun/tracing/BasicFunctionality.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityCache.java.i
+data/src/share/classes/java/lang/annotation/ContainerAnnotation.java.i
+data/test/java/io/IOException/LastErrorString.java.i
data/test/sun/tools/jstat/lineCounts1.awk.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c.i
+data/test/javax/swing/JSlider/6794831/bug6794831.java.i
data/test/java/nio/channels/Channels/Basic2.java.i
+data/src/macosx/classes/com/apple/eawt/AboutHandler.java.i
data/src/share/classes/sun/tools/jstat/JStatLogger.java.i
data/test/javax/imageio/plugins/png/ItxtUtf8Test.java.i
data/test/java/math/BigDecimal/RoundingTests.java.i
data/test/java/nio/channels/Selector/RegAfterPreClose.java.i
data/test/java/io/Serializable/resolveClass/consTest/Boot.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load1.java.i
data/src/share/native/sun/java2d/pipe/SpanIterator.h.i
data/src/share/classes/sun/util/locale/Extension.java.i
data/test/java/awt/Focus/WrongKeyTypedConsumedTest/WrongKeyTypedConsumedTest.java.i
-data/src/share/classes/sun/font/Underline.java.i
+data/test/sun/security/tools/keytool/NoExtNPE.sh.i
data/src/share/classes/sun/awt/HToolkit.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthSliderUI.java.i
data/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java.i
@@ -12578,11 +13122,11 @@ data/src/share/classes/sun/util/resources/CurrencyNames_pl_PL.properties.i
data/src/share/classes/java/io/FilterInputStream.java.i
data/test/sun/security/tools/keytool/selfissued.sh.i
data/test/com/sun/crypto/provider/TLS/masterdata.txt.i
-data/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java.i
+data/test/com/sun/jdi/VMDeathRequestTest.java.i
data/src/share/classes/java/net/ServerSocket.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java.i
+data/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java.i
data/test/java/util/Arrays/Correct.java.i
-data/src/share/native/sun/management/GarbageCollectorImpl.c.i
data/test/javax/security/auth/login/LoginContext/DefaultHandlerModule.java.i
data/src/share/classes/javax/swing/JEditorPane.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/IllegalOptionSpecificationException.java.i
@@ -12592,6 +13136,8 @@ data/src/share/classes/sun/tools/asm/NameAndTypeConstantData.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalPopupMenuSeparatorUI.java.i
data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja.properties.i
data/src/share/classes/java/awt/event/package.html.i
+data/test/java/security/KeyStore/KeyStoreBuilder.java.i
+data/src/share/classes/java/dyn/FilterOneArgument.java.i
data/test/javax/security/auth/PrivateCredentialPermission/Subset.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsInternalFrameUI.java.i
data/src/share/native/java/lang/fdlibm/src/k_tan.c.i
@@ -12600,29 +13146,28 @@ data/test/sun/security/ssl/javax/net/ssl/NewAPIs/JSSERenegotiate.java.i
data/src/share/classes/java/nio/file/OpenOption.java.i
data/test/sun/security/provider/KeyStore/WrongPassword.java.i
data/test/javax/script/UnescapedBracketRegExTest.java.i
-data/src/share/classes/sun/tools/tree/BinaryAssignExpression.java.i
-data/test/com/sun/tools/attach/BadAgent.java.i
-data/test/sun/security/provider/PolicyParser/p002.policy.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java.i
+data/src/share/classes/javax/swing/colorchooser/ColorSelectionModel.java.i
data/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest14_ko.properties.in.i
data/src/share/classes/java/util/Arrays.java.i
-data/src/share/classes/java/nio/channels/Channel.java.i
+data/test/sun/security/rsa/TestKeyPairGenerator.java.i
data/test/java/security/Provider/Turkish.java.i
-data/src/share/native/sun/security/ec/ecl.h.i
+data/test/java/lang/reflect/Method/invoke/IllegalAccessInInvoke.java.i
data/test/java/util/concurrent/BlockingQueue/CancelledProducerConsumerLoops.java.i
data/src/share/classes/com/sun/jdi/request/DuplicateRequestException.java.i
data/src/share/classes/sun/text/resources/FormatData_vi.java.i
data/test/java/net/URL/RelativePath.java.i
-data/test/java/util/ResourceBundle/ReferencesTestBundle.properties.i
-data/src/share/classes/java/awt/image/ReplicateScaleFilter.java.i
-data/src/share/instrument/Reentrancy.h.i
+data/src/share/classes/java/lang/StringBuilder.java.i
+data/make/common/Release.gmk.i
+data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java.i
data/src/share/classes/sun/text/resources/CollationData.java.i
-data/src/share/classes/sun/reflect/misc/ReflectUtil.java.i
-data/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java.i
+data/src/share/classes/java/lang/reflect/Constructor.java.i
data/src/share/demo/jvmti/hprof/hprof_check.h.i
data/src/share/classes/sun/dyn/AdapterMethodHandle.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html.i
-data/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java.i
+data/src/bsd/doc/man/ja/jrunscript.1.i
+data/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider1.java.i
data/test/java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientModeClientAuth.java.i
@@ -12630,16 +13175,15 @@ data/src/share/classes/javax/sql/rowset/serial/package.html.i
data/test/tools/pack200/UnpackerMemoryTest.java.i
data/src/share/classes/sun/nio/cs/UTF_32.java.i
data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankFile.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/SpecListener.java.i
data/src/share/classes/sun/tracing/dtrace/DTraceProvider.java.i
-data/test/javax/swing/JTextArea/4697612/bug4697612.java.i
+data/test/sun/rmi/transport/tcp/blockAccept/TestImpl.java.i
data/test/Makefile.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c.i
-data/test/sun/security/provider/PolicyFile/SelfExpansion.java.i
+data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-config.jpg.i
data/make/tools/swing-beans/beaninfo/images/JLabelMono32.gif.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init4.java.i
data/make/tools/CharsetMapping/IBM775.map.i
-data/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/NTypeParser.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicationException.java.i
data/src/share/classes/sun/text/resources/FormatData_ms_MY.java.i
@@ -12651,17 +13195,17 @@ data/src/share/classes/sun/security/provider/certpath/CertStoreHelper.java.i
data/test/javax/management/namespace/RoutingServerProxyTest.java.i
data/src/share/classes/sun/invoke/util/Wrapper.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N11_WithComments.java.i
-data/src/share/classes/java/awt/font/OpenType.java.i
+data/src/share/native/sun/font/layout/GlyphDefinitionTables.h.i
data/src/share/demo/jvmti/hprof/hprof_class.h.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComKeyManagerFactoryImpl.java.i
data/src/share/native/sun/java2d/loops/FourByteAbgrPre.h.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineResultArgs.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/Expr.jj.i
+data/src/macosx/classes/com/apple/eawt/SystemSleepListener.java.i
data/test/sun/net/www/protocol/file/GetContentType.java.i
data/src/solaris/demo/jigsaw/basic/run.sh.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h.i
-data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java.i
+data/src/share/classes/javax/management/namespace/JMXNamespace.java.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ScanDirConfig.java.i
data/src/share/classes/javax/management/relation/RelationSupport.java.i
data/test/sun/security/provider/PolicyParser/AvoidPropertyExpansionExceptions.java.i
@@ -12671,10 +13215,10 @@ data/src/share/native/sun/font/layout/ValueRecords.h.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h.i
data/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java.i
data/src/solaris/native/sun/awt/awt_AWTEvent.c.i
-data/src/windows/native/sun/java2d/windows/ddrawObject.h.i
+data/src/share/classes/java/nio/channels/Selector.java.i
data/src/share/classes/sun/java2d/loops/ScaledBlit.java.i
data/test/java/io/charStreams/Cat.java.i
-data/test/sun/security/ssl/README.i
+data/src/macosx/native/jobjc/src/core/native/JObjCRuntime.m.i
data/src/windows/native/sun/windows/UnicowsLoader.h.i
data/src/share/classes/sun/io/CharToByteCp865.java.i
data/src/share/classes/java/security/GeneralSecurityException.java.i
@@ -12685,15 +13229,15 @@ data/src/share/classes/javax/swing/plaf/synth/SynthMenuItemLayoutHelper.java.i
data/src/share/classes/java/lang/ArithmeticException.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/Orange.java.i
data/src/share/classes/javax/management/ClassAttributeValueExp.java.i
-data/test/java/util/zip/TestEmptyZip.java.i
-data/test/java/lang/instrument/NamedBuffer.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_pt_PT.properties.i
data/src/share/native/sun/font/layout/SimpleArrayProcessor.cpp.i
-data/test/com/sun/net/httpserver/bugs/B6393710.java.i
+data/test/sun/security/krb5/auto/basic.sh.i
data/src/windows/native/sun/jkernel/kernel_pt_BR.rc.i
data/test/java/lang/System/ExitFinalizersAndJIT.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_PA.properties.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarA/com/message/spi/MessageService.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/TestThread.java.i
+data/src/share/classes/java/text/Format.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CWrapper.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/package.html.i
data/src/share/classes/sun/nio/ch/SctpStdSocketOption.java.i
data/src/share/classes/java/awt/geom/Ellipse2D.java.i
@@ -12702,37 +13246,44 @@ data/src/share/classes/java/io/CharArrayReader.java.i
data/test/sun/tools/jps/jps-lm.sh.i
data/src/share/classes/javax/management/remote/IdentityMBeanServerForwarder.java.i
data/src/share/classes/sun/awt/geom/Order3.java.i
-data/test/javax/script/DummyScriptEngine.java.i
+data/src/macosx/classes/com/apple/laf/AquaSliderUI.java.i
data/src/share/back/invoker.c.i
data/test/sun/management/jmxremote/bootstrap/Makefile.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java.i
data/src/share/classes/com/sun/servicetag/SolarisSystemEnvironment.java.i
-data/test/java/beans/XMLEncoder/Test6921644.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/BufferedMonitoredVm.java.i
data/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java.i
-data/test/sun/security/provider/PolicyFile/TrustedCert.keystore.i
+data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif.i
+data/src/macosx/classes/apple/security/KeychainStore.java.i
+data/test/java/lang/Integer/Unsigned.java.i
data/test/java/lang/instrument/RedefineClassWithNativeMethodApp.java.i
-data/test/java/util/ResourceBundle/Bug6190861Data_en_US.properties.i
-data/make/mkdemo/jvmti/heapTracker/Makefile.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl_Stub.java.i
+data/test/javax/swing/JColorChooser/Test4380468.html.i
data/test/javax/management/remote/mandatory/util/CacheMapTest.java.i
data/src/share/classes/sun/tools/jcmd/Arguments.java.i
data/test/java/util/Formatter/BasicBigDecimal.java.i
data/test/java/security/Security/removing/RemoveStaticProvider.policy.i
+data/src/share/classes/java/lang/Shutdown.java.i
data/test/java/beans/XMLEncoder/6380849/Bean.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.pass.i
data/test/java/net/URLClassLoader/jars/class_path_test.jar.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
+data/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh.i
data/test/java/rmi/reliability/benchmark/bench/serial/GetPutFieldTrees.java.i
data/src/share/classes/sun/java2d/loops/DrawGlyphListLCD.java.i
-data/test/java/awt/Component/isLightweightCrash/IsLightweightCrash.java.i
+data/src/share/classes/java/lang/InstantiationError.java.i
data/src/share/classes/sun/net/ftp/FtpClientProvider.java.i
data/src/share/classes/com/sun/security/auth/NTSidDomainPrincipal.java.i
data/src/share/native/sun/security/ec/mplogic.h.i
data/test/sun/security/x509/X500Name/DerValueConstructor.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java.i
data/src/share/classes/java/net/package.html.i
data/src/share/classes/sun/net/spi/DefaultProxySelector.java.i
-data/test/java/rmi/transport/readTimeout/security.policy.i
+data/test/sun/rmi/rmic/newrmic/equivalence/run.sh.i
+data/src/bsd/doc/man/jps.1.i
data/test/java/lang/String/CaseInsensitiveComparator.java.i
-data/test/java/util/Collections/CheckedMapBash.java.i
+data/src/share/classes/sun/text/normalizer/RangeValueIterator.java.i
+data/make/sun/osxapp/Makefile.i
data/src/share/classes/javax/sql/rowset/serial/SerialException.java.i
data/test/java/io/Serializable/finalFields/FinalFields.java.i
data/make/tools/swing-beans/beaninfo/images/JComboBoxMono32.gif.i
@@ -12741,9 +13292,9 @@ data/src/share/classes/java/nio/channels/ByteChannel.java.i
data/test/java/net/MulticastSocket/SetTTLAndGetTTL.java.i
data/src/share/classes/com/sun/tools/example/README.i
data/test/java/beans/Introspector/4520754/Wombat.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java.i
+data/test/java/util/PluggableLocale/BreakIteratorProviderTest.java.i
data/src/share/classes/java/awt/geom/CubicCurve2D.java.i
-data/test/java/nio/Buffer/CopyDirectIntMemory.java.i
+data/test/java/net/CookieHandler/B6644726.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBooleanBooleanInt.java.i
data/test/com/sun/net/httpserver/Test9.java.i
data/src/share/native/sun/java2d/pipe/Region.h.i
@@ -12753,32 +13304,31 @@ data/test/java/security/ProtectionDomain/AllPerm.jar.i
data/test/com/sun/security/sasl/gsskerb/NoSecurityLayer.java.i
data/src/share/demo/jfc/SwingApplet/SwingApplet.java.i
data/src/share/classes/sun/launcher/resources/launcher.properties.i
-data/src/share/classes/javax/naming/CannotProceedException.java.i
-data/src/share/classes/sun/rmi/server/Util.java.i
-data/src/share/classes/sun/security/util/HostnameChecker.java.i
+data/test/javax/management/remote/mandatory/socketFactories/RMISocketFactoriesTest.java.i
data/src/share/classes/java/util/AbstractSequentialList.java.i
data/src/share/classes/sun/reflect/generics/tree/Wildcard.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java.i
data/make/sun/cmm/kcms/mapfile-vers.i
+data/test/java/security/cert/PKIXParameters/InvalidParameters.java.i
data/src/share/native/sun/awt/image/jpeg/jcapimin.c.i
data/test/java/rmi/reliability/benchmark/bench/rmi/BenchServer.java.i
-data/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java.i
data/src/share/classes/com/sun/crypto/provider/PKCS5Padding.java.i
data/src/share/native/java/nio/Bits.c.i
data/src/share/classes/java/lang/doc-files/javalang.doc.anc41.gif.i
data/src/share/classes/javax/naming/spi/DirObjectFactory.java.i
+data/src/share/classes/javax/sound/midi/Transmitter.java.i
data/test/java/util/ResourceBundle/Bug4257318Res_en.java.i
-data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java.i
data/src/share/native/sun/security/ec/ecl_curve.c.i
data/test/java/nio/channels/DatagramChannel/ThereCanBeOnlyOne.java.i
data/test/java/util/EnumSet/OneUniverse.java.i
data/src/share/classes/javax/net/ssl/TrustManager.java.i
data/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java.i
data/src/share/demo/jfc/SampleTree/SampleTreeCellRenderer.java.i
-data/src/share/native/sun/font/layout/LETypes.h.i
+data/make/tools/src/build/tools/jarsplit/JarSplit.java.i
data/src/solaris/classes/sun/awt/motif/X11JIS0201.java.i
+data/src/bsd/doc/man/ja/jhat.1.i
data/src/share/classes/sun/java2d/opengl/OGLBufImgOps.java.i
-data/test/java/io/charStreams/StringGenerator.java.i
+data/make/sun/xawt/mapfile-vers.i
data/test/demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_sv.properties.i
data/src/share/native/sun/java2d/loops/MaskFill.c.i
@@ -12789,10 +13339,12 @@ data/src/share/classes/com/sun/jdi/event/MethodExitEvent.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformLinear.java.i
data/test/java/lang/ref/SoftReference/Pin.java.i
data/test/java/util/Collections/NullComparator.java.i
-data/test/java/beans/PropertyEditor/TestDoubleClassValue.java.i
-data/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf.i
+data/test/sun/jvmstat/testlibrary/Sleeper.java.i
+data/src/macosx/native/sun/awt/LWCToolkit.m.i
+data/src/solaris/classes/java/net/PlainSocketImpl.java.i
+data/make/tools/GenerateCharacter/check_class.c.template.i
data/src/share/classes/sun/security/timestamp/HttpTimestamper.java.i
+data/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_es.properties.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c.i
data/test/sun/awt/image/ImageRepresentation/LUTCompareTest.java.i
@@ -12801,14 +13353,17 @@ data/test/java/beans/Introspector/memory/Test4809008.java.i
data/test/javax/swing/JLayer/6875153/bug6875153.java.i
data/test/java/util/concurrent/DelayQueue/PollUnexpired.java.i
data/src/share/classes/java/util/regex/PatternSyntaxException.java.i
-data/src/solaris/native/sun/nio/ch/SctpNet.c.i
+data/test/java/security/KeyStore/keystore.jks.i
data/src/share/classes/sun/awt/ExtendedKeyCodes.java.i
+data/test/javax/management/mxbean/customtypes/IntegerIsStringFactory.java.i
data/src/linux/doc/man/ja/javac.1.i
data/src/share/classes/sun/text/normalizer/CharacterIteratorWrapper.java.i
data/test/java/util/Calendar/WeekDateTest.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ar_OM.properties.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/SpecListener.java.i
data/test/java/lang/instrument/RetransformBigClassApp.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java.i
+data/make/netbeans/jarzip/build.xml.i
+data/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m.i
data/src/share/classes/javax/management/loading/MLet.java.i
data/src/share/demo/applets/GraphicsTest/example1.html.i
data/src/share/classes/java/lang/doc-files/capchi.gif.i
@@ -12821,6 +13376,8 @@ data/src/windows/native/sun/nio/ch/Net.c.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java.i
data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPParameterSpec.java.i
data/src/share/classes/java/awt/image/FilteredImageSource.java.i
+data/src/macosx/classes/com/apple/eio/FileManager.java.i
+data/src/share/classes/com/sun/media/sound/SunFileReader.java.i
data/src/share/classes/com/sun/crypto/provider/PBEKey.java.i
data/src/share/classes/javax/swing/JPanel.java.i
data/src/share/classes/java/rmi/server/SocketSecurityException.java.i
@@ -12830,9 +13387,9 @@ data/src/share/classes/javax/management/relation/Role.java.i
data/src/share/classes/javax/sound/sampled/DataLine.java.i
data/src/share/classes/sun/tracing/dtrace/Activation.java.i
data/test/java/nio/charset/StandardCharset/Standard.java.i
-data/test/javax/swing/JInternalFrame/6726866/bug6726866.java.i
+data/src/share/native/sun/java2d/loops/UshortIndexed.h.i
data/src/share/classes/com/sun/crypto/provider/AESWrapCipher.java.i
-data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java.i
+data/src/share/native/sun/awt/image/jpeg/jctrans.c.i
data/src/share/classes/java/io/InvalidClassException.java.i
data/test/java/lang/Math/Rint.java.i
data/src/share/classes/com/sun/tools/jdi/PrimitiveTypeImpl.java.i
@@ -12840,7 +13397,7 @@ data/test/javax/crypto/Cipher/GCMAPI.java.i
data/src/windows/native/sun/windows/awt_Choice.h.i
data/src/solaris/classes/sun/nio/ch/FileDispatcherImpl.java.i
data/src/share/native/sun/font/layout/CanonData.cpp.i
-data/src/share/classes/com/sun/media/sound/JavaSoundAudioClip.java.i
+data/src/share/back/commonRef.c.i
data/test/java/net/URL/PerConnectionProxy.java.i
data/test/java/awt/Insets/WindowWithWarningTest/WindowWithWarningTest.html.i
data/test/java/text/Bidi/Bug6850113.java.i
@@ -12852,16 +13409,16 @@ data/src/share/classes/javax/swing/plaf/nimbus/InnerGlowEffect.java.i
data/test/java/awt/Robot/RobotExtraButton/RobotExtraButton.java.i
data/test/javax/security/auth/login/LoginContext/DefaultHandler.java.i
data/src/share/classes/javax/sql/rowset/spi/XmlReader.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inffast.c.i
-data/test/java/lang/reflect/Proxy/ClassRestrictions.java.i
+data/test/java/beans/XMLEncoder/Test4679556.java.i
data/test/java/net/NetworkInterface/IPv4Only.java.i
data/src/share/native/sun/security/ec/impl/mpmontg.c.i
data/src/share/classes/sun/io/ByteToCharCp437.java.i
-data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java.i
-data/src/share/classes/sun/text/resources/CollationData_iw.java.i
-data/src/share/classes/sun/text/resources/FormatData_es_PR.java.i
+data/test/com/sun/net/httpserver/Test8a.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchFunCall.java.i
+data/make/javax/crypto/policy/limited/LIMITED.i
data/src/share/classes/java/security/interfaces/RSAPublicKey.java.i
data/src/share/classes/javax/print/attribute/standard/JobOriginatingUserName.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/NativeTypeTest.java.i
data/test/sun/net/ftp/FtpURL.java.i
data/test/java/beans/XMLEncoder/javax_swing_JButton.java.i
data/test/java/security/cert/X509CertSelector/SetNameConstraintsEmptySequence.java.i
@@ -12870,45 +13427,42 @@ data/test/javax/security/auth/login/LoginContext/ConfigConstructor.config.i
data/src/share/classes/sun/nio/ch/DatagramSocketAdaptor.java.i
data/test/sun/nio/cs/ISO8859x.java.i
data/test/java/io/Serializable/proxy/skipMissing/Write.java.i
-data/src/share/native/java/lang/fdlibm/src/k_cos.c.i
-data/src/share/classes/sun/font/TextSource.java.i
+data/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java.i
+data/src/share/classes/sun/nio/ch/IOVecWrapper.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java.i
data/test/java/nio/channels/Selector/Wakeup.java.i
data/test/java/util/ResourceBundle/awtres.jar.i
data/test/java/util/Arrays/Fill.java.i
data/test/java/lang/management/MemoryMXBean/MemoryTest.java.i
-data/src/share/classes/java/rmi/server/ObjID.java.i
+data/src/share/classes/sun/rmi/log/LogOutputStream.java.i
data/src/share/demo/jvmti/waiters/Agent.cpp.i
data/test/sun/security/provider/PolicyFile/Comparator.Combined.Policy.i
data/src/windows/native/sun/java2d/windows/GDIBlitLoops.cpp.i
data/test/javax/management/Introspector/UnDescribed.java.i
-data/src/windows/classes/sun/awt/windows/WDesktopProperties.java.i
data/src/share/classes/com/sun/net/httpserver/HttpExchange.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-yellow48.png.i
data/test/java/security/UnresolvedPermission/DebugPermission1.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2.i
data/src/share/classes/sun/security/krb5/internal/LastReqEntry.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/NoteOn.java.i
-data/test/java/lang/Class/IsEnum.java.i
+data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_C_INITIALIZE_ARGS.java.i
data/src/share/classes/javax/swing/event/ChangeListener.java.i
-data/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java.i
-data/src/share/native/java/lang/fdlibm/src/e_gamma_r.c.i
+data/src/macosx/classes/sun/nio/ch/DefaultSelectorProvider.java.i
data/src/share/classes/sun/misc/Cleaner.java.i
data/test/sun/net/www/protocol/jar/GetContentType.java.i
+data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.policy.i
data/src/share/classes/sun/text/resources/FormatData_ga.java.i
data/src/share/classes/sun/awt/image/ImageConsumerQueue.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load6.java.i
+data/src/share/native/sun/awt/image/jpeg/jcdctmgr.c.i
data/make/tools/generatecurrencydata/Makefile.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim24.png.i
-data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/mgrM2leadMA.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java.i
+data/src/share/classes/javax/naming/RefAddr.java.i
data/test/java/io/pathNames/win32/DriveRelativePath.java.i
data/test/java/nio/Buffer/CopyDirectMemory.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterGraphicsConfig.java.i
data/make/sun/net/spi/nameservice/dns/Makefile.i
-data/test/javax/crypto/SecretKeyFactory/FailOverTest.java.i
-data/test/java/util/ResourceBundle/Test4300693.java.i
+data/src/share/native/sun/security/ec/mpi.h.i
data/test/java/nio/channels/FileChannel/TryLock.java.i
data/src/share/classes/sun/text/resources/CollationData_fr.java.i
data/src/share/classes/sun/java2d/cmm/ProfileActivator.java.i
@@ -12919,36 +13473,36 @@ data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableStreamMetadata.jav
data/test/sun/tools/jps/jps-Vvml_Output2.awk.i
data/test/vm/verifier/VerifyProtectedConstructor.java.i
data/src/windows/native/common/java_main_md.h.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/ParseError.java.i
data/make/tools/CharsetMapping/MS1258.map.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java.i
data/test/sun/net/sdp/Sanity.java.i
+data/test/javax/swing/SwingUtilities/4917669/bug4917669.java.i
data/src/share/native/sun/java2d/opengl/OGLFuncMacros.h.i
data/src/share/classes/javax/management/openmbean/KeyAlreadyExistsException.java.i
data/src/share/classes/sun/tools/asm/SwitchData.java.i
data/test/java/lang/instrument/classpathAgent.mf.i
-data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java.i
+data/src/share/native/sun/font/layout/DeviceTables.h.i
data/src/share/classes/com/sun/jndi/ldap/NotifierArgs.java.i
data/src/share/demo/jvmti/heapTracker/README.txt.i
data/test/sun/rmi/rmic/defaultStubVersion/G1Impl.java.i
data/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java.i
-data/test/javax/swing/JFileChooser/6484091/bug6484091.java.i
+data/src/share/classes/java/net/MulticastSocket.java.i
data/make/tools/swing-beans/beaninfo/images/JTreeMono32.gif.i
-data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_SG.properties.i
+data/src/share/classes/java/io/ObjectStreamConstants.java.i
data/src/share/classes/sun/misc/UUDecoder.java.i
+data/src/macosx/classes/com/apple/laf/AquaTabbedPaneContrastUI.java.i
data/src/share/classes/sun/nio/cs/SingleByte.java.i
data/test/sun/security/pkcs11/fips/keystore.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load8.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java.i
data/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java.i
data/src/share/native/sun/awt/giflib/gif_lib_private.h.i
data/src/windows/native/sun/windows/awt_Font.h.i
data/src/solaris/native/sun/awt/awt_Choice12.c.i
data/test/java/nio/channels/AsynchronousChannelGroup/GroupOfOne.java.i
-data/test/java/util/prefs/ExportSubtree.java.i
-data/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java.i
+data/src/share/back/threadControl.c.i
data/make/tools/CharsetMapping/MacRoman.map.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipFileAttributes.java.i
data/test/sun/tools/jstat/jstatCompilerOutput1.sh.i
@@ -12956,25 +13510,23 @@ data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DelayOverflow.java.i
data/src/share/classes/javax/swing/ArrayTable.java.i
data/test/sun/security/tools/jarsigner/Test4431684.java.i
data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/DetectInvalidEncoding.java.i
-data/test/sun/tools/jhat/hprof.bin.i
+data/make/tools/swing-beans/beaninfo/BeanInfoUtils.java.i
data/test/java/lang/Class/EnumPoseur.java.src.i
data/test/javax/swing/RepaintManager/6608456/bug6608456.java.i
data/src/share/classes/sun/security/ssl/EngineInputRecord.java.i
-data/src/share/classes/sun/font/TextLineComponent.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java.i
data/src/windows/classes/sun/awt/windows/WKeyboardFocusManagerPeer.java.i
-data/src/share/classes/java/beans/XMLEncoder.java.i
+data/test/java/nio/channels/ServerSocketChannel/AdaptServerSocket.java.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/README.i
data/make/sun/rmi/cgi/Makefile.i
data/src/share/classes/java/rmi/dgc/VMID.java.i
data/src/share/classes/javax/swing/PopupFactory.java.i
-data/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties.i
-data/test/java/security/Policy/GetInstance/GetInstanceSecurity.java.i
+data/src/share/classes/sun/text/resources/CollationData_en.java.i
data/src/share/classes/javax/swing/JRootPane.java.i
data/src/share/classes/com/sun/media/sound/MidiUtils.java.i
data/src/share/classes/sun/security/ssl/SunJSSE.java.i
-data/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java.i
-data/src/share/classes/java/awt/peer/PanelPeer.java.i
-data/test/java/io/FilterOutputStream/BoundsCheck.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherInput.java.i
+data/test/java/beans/PropertyEditor/TestByteTypeNull.java.i
data/test/org/openjdk/jigsaw/_JigsawVersion.java.i
data/src/share/classes/javax/swing/text/html/LineView.java.i
data/src/share/classes/sun/security/ssl/SessionId.java.i
@@ -12982,110 +13534,106 @@ data/src/solaris/classes/sun/awt/X11/XDropTargetEventProcessor.java.i
data/src/share/native/sun/java2d/loops/ByteGray.c.i
data/test/java/net/MulticastSocket/TimeToLive.java.i
data/src/share/classes/sun/text/resources/FormatData_lv_LV.java.i
-data/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties.i
data/src/share/classes/com/sun/pept/ept/MessageInfo.java.i
data/src/share/classes/javax/imageio/stream/MemoryCacheImageInputStream.java.i
data/test/java/security/PermissionCollection/AddToReadOnlyPermissionCollection.java.i
data/test/java/beans/PropertyEditor/TestEnumClassJava.java.i
-data/test/java/text/Format/DateFormat/Bug4396385.java.i
+data/src/share/native/java/lang/Runtime.c.i
data/make/tools/reorder/tools/remove_mcount.c.i
-data/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java.i
-data/make/tools/swing-beans/beaninfo/images/JTableMono16.gif.i
+data/make/tools/CharsetMapping/IBM1141.c2b.i
+data/test/java/awt/Component/isLightweightCrash/IsLightweightCrash.java.i
data/src/share/classes/java/util/concurrent/CopyOnWriteArrayList.java.i
-data/src/share/classes/sun/nio/ch/FileLockImpl.java.i
data/src/share/classes/javax/swing/text/rtf/Constants.java.i
data/src/share/demo/management/FullThreadDump/FullThreadDump.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_de.properties.i
-data/src/share/classes/java/awt/font/LineMetrics.java.i
data/src/share/classes/java/security/cert/CertPathBuilderException.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Floats.java.i
+data/src/share/demo/nbproject/management/JTop/nbproject/project.xml.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ClassListWriter.java.i
data/src/share/native/java/lang/fdlibm/src/s_copysign.c.i
data/src/share/classes/sun/io/CharToByteCp1026.java.i
data/test/demo/jvmti/heapViewer/HeapViewerTest.java.i
data/src/solaris/native/sun/awt/VDrawingArea.c.i
-data/test/java/util/ResourceBundle/Test4314141B_en.properties.i
data/test/java/util/ServiceLoader/Load.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/MissingResourceFailureException.java.i
-data/test/sun/net/www/protocol/http/SetIfModifiedSince.java.i
data/src/windows/native/sun/windows/awt_ScrollPane.cpp.i
-data/src/share/classes/sun/nio/cs/ext/ISO2022_JP_2.java.i
+data/src/share/sample/jmx/jmx-scandir/build.xml.i
data/test/javax/swing/JTabbedPane/6416920/bug6416920.java.i
data/src/share/classes/java/util/concurrent/ConcurrentSkipListSet.java.i
-data/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java.i
data/src/share/classes/java/text/spi/DateFormatProvider.java.i
-data/test/sun/net/www/protocol/http/ProxyTunnelServer.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java.i
+data/test/java/io/Serializable/PutField/Write.java.i
data/src/share/back/debugInit.c.i
data/test/sun/nio/cs/EUC_TW_OLD.java.i
data/test/demo/jvmti/hprof/DefineClass.java.i
data/src/share/classes/sun/print/resources/oneside.png.i
-data/test/sun/net/InetAddress/nameservice/B6442088.java.i
+data/src/share/classes/sun/management/MethodInfo.java.i
data/test/javax/swing/JSlider/6742358/bug6742358.html.i
-data/src/solaris/classes/sun/awt/X11/XSelection.java.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_ColorUIResource.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/README.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java.i
data/test/java/nio/channels/SocketChannel/BigReadWrite.java.i
data/src/share/classes/java/util/SimpleTimeZone.java.i
+data/src/macosx/classes/com/apple/laf/AquaMenuPainter.java.i
data/test/java/rmi/activation/CommandEnvironment/group.security.policy.i
data/src/share/back/invoker.h.i
data/test/javax/sound/midi/Gervill/ModelDestination/NewModelDestinationModelIdentifier.java.i
data/make/tools/src/build/tools/dirdiff/DirDiff.java.i
+data/test/javax/xml/crypto/dsig/data/signature-keyname.xml.i
data/make/docs/NON_CORE_PKGS.gmk.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverSpi.java.i
data/test/java/util/Locale/serialized/java6locale_en_US_Java.i
data/test/javax/print/attribute/Chroma.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipher.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties.i
+data/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml.i
+data/src/share/classes/sun/util/resources/CalendarData_mk.properties.i
data/src/share/classes/com/sun/tools/jdi/LineInfo.java.i
-data/test/javax/security/auth/login/Configuration/Synchronize.config.i
-data/test/java/lang/reflect/Constructor/TestParameterAnnotations.java.i
+data/src/macosx/native/jobjc/bridgesupport.gmk.i
data/src/solaris/native/java/net/PlainSocketImpl.c.i
data/src/share/classes/sun/util/resources/TimeZoneNames_en_GB.java.i
data/make/common/Defs-linux.gmk.i
data/src/share/classes/sun/net/httpserver/HttpError.java.i
data/src/share/classes/javax/management/BadBinaryOpValueExpException.java.i
-data/src/share/classes/sun/tools/jconsole/ClassTab.java.i
+data/src/share/native/sun/font/layout/LEStandalone.h.i
data/src/share/classes/javax/imageio/event/IIOWriteWarningListener.java.i
data/test/java/io/ObjectInputStream/ResolveProxyClass.java.i
data/test/java/nio/channels/ServerSocketChannel/NonBlockingAccept.java.i
data/src/share/classes/sun/reflect/generics/reflectiveObjects/LazyReflectiveObjectGenerator.java.i
data/src/share/classes/sun/management/HotspotRuntime.java.i
data/src/share/classes/sun/swing/plaf/synth/SynthIcon.java.i
-data/test/javax/swing/JSlider/6348946/bug6348946.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicListUI.java.i
-data/test/java/beans/XMLEncoder/java_util_HashMap.java.i
+data/src/solaris/classes/sun/nio/ch/EPollSelectorProvider.java.i
data/test/java/beans/XMLEncoder/java_awt_GradientPaint.java.i
-data/src/share/classes/java/util/jar/Manifest.java.i
+data/test/java/awt/Paint/PgramUserBoundsTest.java.i
+data/src/windows/native/sun/windows/awt_DataTransferer.h.i
+data/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java.i
data/test/java/util/concurrent/CyclicBarrier/Basic.java.i
-data/src/share/demo/jvmti/agent_util/agent_util.h.i
+data/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties.i
+data/src/share/classes/sun/management/VMManagement.java.i
+data/src/share/classes/sun/io/CharToByteCp970.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_ko.properties.i
+data/test/javax/swing/JTable/4220171/bug4220171.java.i
data/test/java/awt/Toolkit/Headless/ExceptionContract/ExceptionContract.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/rmid.security.policy.i
data/make/tools/CharsetMapping/HKSCS2001.map.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/package.html.i
data/src/share/classes/sun/text/resources/FormatData_ca_ES.java.i
-data/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java.i
data/src/share/classes/sun/security/pkcs11/P11SecureRandom.java.i
-data/test/org/openjdk/jigsaw/tester.sh.i
data/src/share/classes/sun/security/acl/PrincipalImpl.java.i
data/src/windows/native/sun/jkernel/kernel_ja.rc.i
data/src/share/classes/sun/java2d/pipe/CompositePipe.java.i
data/src/share/classes/sun/tools/tree/Node.java.i
-data/test/com/sun/servicetag/environ.properties.i
+data/src/share/classes/java/beans/PropertyChangeSupport.java.i
data/test/java/io/RandomAccessFile/ReadWritePrimitives.java.i
data/src/share/classes/com/sun/media/sound/DLSSoundbank.java.i
data/test/javax/management/modelmbean/SimpleModelMBean/policy.i
-data/src/share/classes/java/text/spi/BreakIteratorProvider.java.i
+data/src/share/classes/sun/tools/tree/ArrayAccessExpression.java.i
data/src/share/classes/sun/tools/java/AmbiguousMember.java.i
+data/src/bsd/doc/man/javac.1.i
data/src/share/classes/sun/security/krb5/internal/util/KrbDataOutputStream.java.i
data/test/java/net/Socket/SocksConnectTimeout.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/XMLCipherParameters.java.i
-data/test/java/net/Socket/asyncClose/BrokenPipe.java.i
+data/test/java/lang/Class/IsEnum.java.i
data/src/share/classes/javax/accessibility/AccessibleHypertext.java.i
-data/test/java/awt/Robot/CtorTest/CtorTest.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_IE.properties.i
+data/test/java/awt/font/TextLayout/TestSinhalaChar.java.i
+data/src/share/demo/jfc/Metalworks/Metalworks.java.i
data/src/share/classes/javax/swing/table/TableStringConverter.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java.i
data/src/share/classes/sun/tools/javac/Main.java.i
@@ -13097,6 +13645,8 @@ data/src/share/classes/sun/io/CharToByteCp1140.java.i
data/test/java/security/testlibrary/CertUtils.java.i
data/make/mkdemo/nio/Makefile.i
data/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c.i
+data/make/tools/swing-beans/beaninfo/images/JComboBoxColor32.gif.i
+data/src/bsd/doc/man/jarsigner.1.i
data/src/share/classes/sun/print/psfont.properties.ja.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemGCTableMeta.java.i
data/make/mkdemo/applets/DitherTest/Makefile.i
@@ -13111,16 +13661,18 @@ data/src/share/classes/sun/swing/text/CompoundPrintable.java.i
data/test/java/beans/PropertyEditor/TestByteClassNull.java.i
data/test/java/lang/Class/getClasses/Sanity.java.i
data/make/com/sun/inputmethods/thaiim/Makefile.i
+data/src/share/classes/sun/tools/java/SyntaxError.java.i
data/src/share/classes/java/util/zip/GZIPInputStream.java.i
data/src/share/classes/com/sun/tools/jdi/SDE.java.i
data/make/sun/net/spi/nameservice/Makefile.i
data/src/share/classes/javax/swing/text/DefaultStyledDocument.java.i
data/src/share/classes/sun/rmi/server/resources/rmid_fr.properties.i
+data/src/macosx/classes/sun/awt/CGraphicsDevice.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libsoftokn3.so.d
data/src/windows/classes/sun/management/FileSystemImpl.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/Files.java.i
data/test/sun/security/pkcs11/sslecc/JSSEServer.java.i
-data/test/java/lang/management/MemoryMXBean/Pending.java.i
+data/test/sun/nio/cs/OLD/GBK_OLD.java.i
data/src/share/classes/com/sun/nio/sctp/HandlerResult.java.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/sysprops.js.i
data/test/java/util/ResourceBundle/Control/StressOut_en_CA.properties.i
@@ -13138,7 +13690,6 @@ data/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubRequestHandler.java.i
data/src/linux/doc/man/ja/ktab.1.i
data/test/java/util/ResourceBundle/KeySetResources_ja_JP.properties.i
-data/test/java/awt/Modal/SupportedTest/SupportedTest.java.i
data/make/tools/dtdbuilder/dtds/HTMLsymbol.sgml.i
data/src/solaris/native/sun/nio/fs/SolarisNativeDispatcher.c.i
data/make/netbeans/awt2d/build.xml.i
@@ -13146,30 +13697,29 @@ data/src/share/classes/sun/rmi/rmic/newrmic/Constants.java.i
data/src/share/classes/com/sun/jndi/dns/ResourceRecords.java.i
data/test/java/io/Serializable/duplicateSerialFields/Test.java.i
data/src/share/demo/jfc/Metalworks/PropertiesMetalTheme.java.i
-data/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java.i
-data/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java.i
+data/src/share/classes/java/util/prefs/package.html.i
+data/src/share/classes/sun/nio/ch/SimpleAsynchronousFileChannelImpl.java.i
+data/src/bsd/doc/man/wsgen.1.i
data/src/share/classes/com/sun/tools/example/debug/tty/MessageOutput.java.i
data/src/share/classes/sun/nio/cs/MS1252.java.i
-data/src/share/classes/sun/text/resources/FormatData_fi_FI.java.i
+data/test/java/security/UnresolvedPermission/AccessorMethods.signer1.i
data/test/sun/nio/cs/HWKatakanaMS932EncodeTest.java.i
data/src/share/classes/sun/net/www/protocol/jar/Handler.java.i
-data/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java.i
data/src/share/classes/sun/nio/cs/ArrayEncoder.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AppleUserImpl.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.h.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c.i
data/src/share/classes/javax/sound/sampled/spi/package.html.i
-data/src/solaris/classes/sun/management/FileSystemImpl.java.i
+data/test/sun/security/pkcs11/fips/fips.cfg.i
data/test/sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml.i
-data/src/share/native/sun/font/layout/LEFontInstance.h.i
+data/src/macosx/native/sun/font/AWTFont.h.i
+data/src/share/classes/javax/swing/plaf/ProgressBarUI.java.i
data/make/com/sun/tools/attach/mapfile-solaris.i
-data/test/sun/tools/native2ascii/A2N_4630463.i
data/src/share/native/sun/font/layout/GXLayoutEngine.h.i
data/test/java/nio/Buffer/Chew.java.i
data/test/java/beans/Introspector/4520754/FooBarBeanInfo.java.i
-data/test/com/sun/jdi/DeferredStepTest.sh.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java.i
+data/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java.i
+data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemColor32.gif.i
data/src/share/demo/jfc/Notepad/resources/Notepad_zh_CN.properties.i
data/src/share/classes/javax/print/MimeType.java.i
data/test/java/util/Vector/CopyInto.java.i
@@ -13178,12 +13728,12 @@ data/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_EG.properties.i
data/test/java/util/Collections/T6433170.java.i
data/src/share/classes/java/awt/datatransfer/Transferable.java.i
-data/test/java/net/Authenticator/Deadlock.java.i
+data/make/modules/modularize.i
data/src/share/classes/sun/java2d/loops/FillPath.java.i
data/test/java/nio/charset/spi/FooCharset.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/uncompr.c.i
data/src/share/classes/javax/swing/plaf/SliderUI.java.i
-data/src/share/sample/vm/clr-jvm/invoker.cs.i
+data/make/mkdemo/applets/NervousText/Makefile.i
data/src/share/classes/java/awt/dnd/DragSourceMotionListener.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_it.properties.i
data/make/mkdemo/jfc/SampleTree/Makefile.i
@@ -13195,7 +13745,7 @@ data/src/share/classes/sun/net/httpserver/Request.java.i
data/src/share/classes/sun/dyn/DirectMethodHandle.java.i
data/src/share/classes/javax/swing/JSeparator.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java.i
-data/src/share/classes/sun/java2d/pipe/TextRenderer.java.i
+data/test/java/beans/PropertyEditor/TestFloatTypeJava.java.i
data/src/share/classes/sun/font/DelegatingShape.java.i
data/src/share/sample/nio/server/AcceptHandler.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Computer.gif.i
@@ -13203,18 +13753,22 @@ data/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount
data/test/java/text/Bidi/Bug7041232.java.i
data/test/com/sun/servicetag/InstanceUrnCheck.java.i
data/src/share/classes/java/awt/doc-files/TextField-1.gif.i
-data/src/share/demo/jfc/Metalworks/MetalThemeMenu.java.i
+data/src/share/classes/sun/security/util/DerEncoder.java.i
data/test/sun/nio/cs/TestISO2022JPSubBytes.java.i
data/src/share/classes/sun/io/CharToByteHKSCS_2001.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java.i
data/make/mkdemo/jfc/TransparentRuler/Makefile.i
data/src/share/classes/sun/security/jca/JCAUtil.java.i
data/src/share/native/sun/awt/image/cvutils/img_util.h.i
-data/src/share/classes/java/security/PublicKey.java.i
+data/src/share/classes/com/sun/jmx/defaults/package.html.i
+data/src/share/classes/javax/management/event/EventForwarder.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/package.html.i
data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/project.xml.i
data/src/share/classes/sun/io/CharToByteMacUkraine.java.i
data/src/share/classes/sun/security/krb5/EncryptionKey.java.i
data/src/solaris/classes/sun/nio/fs/SolarisWatchService.java.i
data/src/share/classes/com/sun/crypto/provider/DESedeCrypt.java.i
+data/src/share/classes/javax/naming/ReferralException.java.i
data/src/share/native/sun/font/glyphblitting.h.i
data/src/share/classes/sun/management/counter/perf/Prologue.java.i
data/test/demo/jvmti/hprof/MonitorTest.java.i
@@ -13228,11 +13782,14 @@ data/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h.i
data/test/java/io/File/basic.sh.i
data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-java-jar.jpg.i
data/test/java/io/Serializable/packageAccess/B.java.i
+data/src/share/classes/sun/awt/HeadlessToolkit.java.i
data/test/java/util/TimeZone/Bug6772689.java.i
data/test/java/nio/charset/coders/ref.shift_jis.i
+data/src/share/classes/javax/swing/text/ParagraphView.java.i
data/src/share/classes/sun/nio/cs/ext/MacArabic.java.i
data/src/share/back/FrameID.c.i
data/test/java/nio/Buffer/CopyDirectLongMemory.java.i
+data/test/sun/security/krb5/auto/TwoTab.java.i
data/src/share/classes/com/sun/tools/script/shell/messages.properties.i
data/src/share/native/java/lang/fdlibm/src/e_sqrt.c.i
data/test/java/util/zip/ZipFile/FinalizeInflater.java.i
@@ -13240,13 +13797,16 @@ data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/pac
data/src/share/native/sun/security/ec/impl/ecp_aff.c.i
data/src/share/classes/java/security/interfaces/DSAPublicKey.java.i
data/src/share/classes/sun/misc/JavaxSecurityAuthKerberosAccess.java.i
+data/src/share/classes/java/lang/OutOfMemoryError.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXSLT.java.i
-data/test/java/net/InetAddress/GetLocalHostWithSM.java.i
+data/test/java/security/PrivilegedActionException/PrintWrappedException.java.i
+data/src/share/classes/sun/io/CharToByteUnicodeLittle.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_15.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/libplc4.lib.i
data/test/java/lang/instrument/PremainClass/InheritAgent1010.java.i
data/src/share/lib/cmm/lcms/LINEAR_RGB.pf.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/LoadAll.java.i
-data/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java.i
+data/src/share/classes/sun/security/x509/CertificatePolicyMap.java.i
data/test/com/sun/crypto/provider/Cipher/DES/TestUtility.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathFilterCHGPContainer.java.i
data/test/java/lang/String/Regex.java.i
@@ -13254,31 +13814,34 @@ data/src/share/classes/sun/io/CharToByteCp1123.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfo.java.i
data/test/java/lang/instrument/ExampleForBootClassPath.java.i
data/src/share/demo/jfc/Notepad/resources/Notepad_ja.properties.i
-data/test/sun/security/ssl/javax/net/ssl/TLSv12/ShortRSAKey512.java.i
+data/test/com/sun/jdi/BreakpointWithFullGC.sh.i
data/test/java/beans/Introspector/Test4274639.java.i
data/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp.i
data/test/java/lang/management/RuntimeMXBean/PropertiesTest.java.i
data/test/sun/security/util/BigInt/BigIntEqualsHashCode.java.i
data/test/java/lang/annotation/Missing/B.java.i
+data/src/macosx/classes/com/apple/eawt/_AppEventHandler.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/CheckNullEntity.java.i
data/test/java/beans/Introspector/4750368/Test4750368.java.i
data/src/share/classes/sun/tools/jstat/OptionFormat.java.i
-data/make/common/Program.gmk.i
+data/src/solaris/classes/sun/font/XMap.java.i
data/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h.i
data/test/sun/security/tools/jarsigner/JavaApplication1.jar.i
-data/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java.i
+data/src/share/classes/com/sun/crypto/provider/DESParameters.java.i
data/src/share/classes/com/sun/crypto/provider/ElectronicCodeBook.java.i
+data/test/java/util/Calendar/Bug7017458.java.i
data/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java.i
-data/test/java/net/URLClassLoader/getresourceasstream/test.jar.i
+data/src/share/classes/javax/swing/event/AncestorEvent.java.i
+data/src/share/classes/java/security/UnrecoverableKeyException.java.i
data/test/javax/management/Introspector/UnregisterMBeanExceptionTest.java.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.html.i
data/src/share/classes/sun/util/resources/CalendarData_es_ES.properties.i
-data/src/share/native/sun/font/layout/ContextualGlyphInsertion.h.i
-data/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider.i
+data/src/share/classes/javax/imageio/ImageIO.java.i
data/test/sun/nio/cs/OLD/IBM935_OLD.java.i
-data/test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java.i
-data/test/java/awt/Color/OpacityChange/OpacityChange.java.i
+data/src/share/classes/sun/text/CodePointIterator.java.i
+data/src/share/classes/javax/print/StreamPrintServiceFactory.java.i
data/test/java/net/Socket/asyncClose/Socket_getInputStream_read.java.i
+data/make/sun/security/jgss/wrapper/Makefile.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/ReadOnly.java.i
data/src/share/classes/javax/crypto/CipherInputStream.java.i
data/src/share/classes/javax/print/MultiDoc.java.i
@@ -13287,13 +13850,14 @@ data/make/tools/src/build/tools/jdwpgen/OutNode.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiMenuItemUI.java.i
data/src/solaris/doc/sun/man/man1/jstat.1.i
data/src/solaris/demo/jvmti/hprof/hprof_md.c.i
+data/test/javax/swing/text/html/TableView/7030332/sample1.png.i
data/test/sun/security/mscapi/SignUsingSHA2withRSA.sh.i
data/make/mkdemo/jfc/Laffy/Makefile.i
-data/src/share/classes/sun/util/logging/PlatformLogger.java.i
data/src/share/classes/sun/io/CharToByteISO8859_1.java.i
+data/src/share/classes/java/lang/SuppressWarnings.java.i
data/src/share/classes/java/lang/IncompatibleClassChangeError.java.i
data/test/java/net/URLDecoder/EncodeDecode.java.i
-data/test/java/awt/xembed/server/RunTestXEmbed.java.i
+data/src/share/classes/java/util/ArrayDeque.java.i
data/src/share/classes/sun/util/locale/BaseLocale.java.i
data/test/javax/swing/UIDefaults/6622002/bug6622002.java.i
data/src/share/classes/sun/swing/PrintColorUIResource.java.i
@@ -13301,7 +13865,6 @@ data/src/share/native/sun/awt/image/awt_ImageRep.c.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init3.java.i
data/src/share/classes/java/util/Vector.java.i
data/src/solaris/native/sun/nio/ch/Net.c.i
-data/test/javax/swing/JFileChooser/6840086/bug6840086.java.i
data/src/solaris/native/sun/awt/awt_Canvas.c.i
data/test/com/sun/jdi/MultiBreakpointsTest.java.i
data/test/java/beans/PropertyEditor/Test6963811.java.i
@@ -13311,55 +13874,59 @@ data/src/share/classes/javax/swing/doc-files/JScrollPane-1.gif.i
data/test/java/awt/Component/NoUpdateUponShow/NoUpdateUponShow.java.i
data/test/java/util/ResourceBundle/Test4314141A_.properties.i
data/src/windows/hpi/src/monitor_md.c.i
-data/test/java/beans/Introspector/6380849/beans/FirstBean.java.i
+data/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.i
data/make/common/shared/Defs-utils.gmk.i
data/src/windows/hpi/export/io_md.h.i
data/src/share/classes/sun/security/x509/CertAndKeyGen.java.i
data/src/share/classes/sun/security/krb5/Confounder.java.i
data/src/share/classes/sun/misc/LRUCache.java.i
data/src/share/lib/images/cursors/win32_LinkNoDrop32x32.gif.i
-data/test/sun/tools/jstatd/jstatdDefaults.sh.i
-data/test/sun/nio/cs/TestStringCoding.java.i
+data/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/SignatureMethodParameterSpec.java.i
data/make/mkdemo/scripting/jconsole-plugin/Makefile.i
data/src/share/classes/sun/security/ssl/DefaultSSLContextImpl.java.i
data/src/share/native/sun/security/ec/ec2_193.c.i
data/src/share/classes/sun/text/resources/FormatData_fr.java.i
-data/test/javax/script/Test5.js.i
+data/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
data/test/javax/crypto/spec/DESKeySpec/NullKey.java.i
data/test/java/beans/XMLEncoder/javax_swing_Box_Filler.java.i
-data/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java.i
data/src/share/classes/java/awt/Container.java.i
-data/src/solaris/classes/sun/awt/motif/X11Dingbats.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/Icons.java.i
data/test/sun/nio/cs/Test4200310.sh.i
-data/src/share/classes/sun/io/ByteToCharCp424.java.i
-data/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.i
-data/src/share/classes/java/util/concurrent/ExecutorService.java.i
+data/test/java/io/charStreams/RandomLines.java.i
+data/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java.i
+data/test/demo/jvmti/hprof/HeapBinaryFormatTest.java.i
data/src/share/classes/sun/security/validator/Validator.java.i
data/src/share/classes/java/awt/event/PaintEvent.java.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/DirectoryScannerConfig.java.i
+data/src/share/classes/sun/reflect/UnsafeQualifiedStaticShortFieldAccessorImpl.java.i
data/src/share/classes/javax/management/SendNotification.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java.i
data/src/share/classes/sun/security/krb5/internal/rcache/CacheTable.java.i
data/make/tools/swing-beans/beaninfo/images/JButtonMono32.gif.i
+data/src/share/sample/scripting/scriptpad/src/resources/conc.js.i
data/test/java/io/Serializable/longString/mesg.ser.i
data/test/javax/swing/JColorChooser/Test6348456.java.i
data/test/java/awt/print/PrinterJob/ValidatePage/ValidatePage.java.i
data/test/javax/imageio/metadata/DOML3Node.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CMouseInfoPeer.java.i
data/src/share/classes/sun/reflect/UnsafeStaticBooleanFieldAccessorImpl.java.i
data/src/share/classes/sun/net/www/content/text/PlainTextInputStream.java.i
data/src/share/classes/sun/tools/jar/Manifest.java.i
data/src/share/classes/javax/print/attribute/standard/Finishings.java.i
data/src/share/classes/javax/swing/doc-files/groupLayout.sequential.horizontal.gif.i
data/test/sun/security/krb5/etype/weakcrypto.conf.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/NSClassTest.java.i
data/test/javax/swing/JSlider/6579827/bug6579827.java.i
data/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java.i
data/test/java/net/Socket/TestAfterClose.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java.i
+data/src/share/classes/sun/security/ssl/CipherSuite.java.i
+data/test/javax/management/remote/mandatory/notif/DeadListenerTest.java.i
data/make/tools/CharsetMapping/IBM277.nr.i
data/test/sun/misc/URLClassPath/ClassnameCharTest.java.i
-data/test/sun/security/pkcs11/Signature/ReinitSignature.java.i
+data/test/java/util/ResourceBundle/Bug6204853_Utf8.properties.i
+data/src/macosx/classes/com/apple/laf/AquaComboBoxButton.java.i
data/src/share/classes/javax/naming/directory/SearchResult.java.i
+data/src/macosx/classes/java/util/prefs/MacOSXPreferencesFactory.java.i
data/src/share/classes/javax/swing/BufferStrategyPaintManager.java.i
data/src/windows/native/sun/java2d/d3d/D3DUtils.cpp.i
data/src/share/classes/java/nio/channels/package-info.java.i
@@ -13371,31 +13938,32 @@ data/src/share/classes/javax/swing/undo/StateEdit.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/InterruptedIO.java.i
data/make/java/java_crw_demo/Makefile.i
data/src/share/native/sun/font/layout/GlyphPositioningTables.cpp.i
-data/test/java/lang/Float/BitwiseConversion.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java.i
data/test/java/net/DatagramSocket/Send12k.java.i
-data/src/solaris/classes/sun/awt/motif/MButtonPeer.java.i
+data/test/java/nio/channels/Selector/LotsOfUpdates.java.i
data/src/share/classes/java/lang/module/Dependence.java.i
data/test/java/beans/PropertyEditor/TestStringClass.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java.i
+data/src/windows/native/sun/java2d/windows/dxCapabilities.cpp.i
data/src/share/demo/jvmti/hprof/hprof_io.h.i
-data/make/netbeans/j2se/nbproject/project.xml.i
+data/test/java/net/Inet6Address/serialize/Readme.txt.i
data/src/share/native/java/util/zip/zlib-1.2.5/inftrees.h.i
data/test/sun/tools/jcmd/jcmd-Defaults.sh.i
data/src/share/classes/sun/nio/cs/ext/MS1258.java.i
data/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_MX.properties.i
data/src/share/native/com/sun/media/sound/Ports.h.i
-data/test/java/util/Locale/bug6277243.java.i
+data/test/java/beans/XMLDecoder/spec/TestNew.java.i
data/src/share/classes/com/sun/security/auth/NTNumericCredential.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_PR.properties.i
+data/make/mksample/nio/file/Makefile.i
data/src/share/classes/javax/management/MBeanTrustPermission.java.i
data/test/java/beans/Introspector/Test4935607.java.i
-data/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java.i
-data/test/java/beans/XMLDecoder/spec/TestClass.java.i
+data/src/share/classes/javax/sql/rowset/spi/SyncResolver.java.i
data/src/share/classes/com/sun/tools/jdi/META-INF/services/com.sun.jdi.connect.Connector.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java.i
+data/src/share/classes/java/util/TimerTask.java.i
+data/src/share/classes/sun/text/resources/FormatData_en_IE.java.i
data/src/share/classes/java/lang/Byte.java.i
-data/src/solaris/classes/sun/awt/X11/generator/functions.txt.i
+data/test/sun/security/ssl/sanity/interop/JSSEServer.java.i
data/test/java/util/logging/AnonLoggerWeakRefLeak.java.i
data/test/javax/management/namespace/VirtualMBeanTest.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/inflate.c.i
@@ -13405,30 +13973,28 @@ data/src/share/classes/com/sun/jndi/ldap/BerEncoder.java.i
data/src/share/classes/sun/font/FontManager.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthInternalFrameTitlePane.java.i
data/src/share/classes/sun/tools/jconsole/resources/brandlogo.png.i
-data/src/windows/hpi/src/path_md.c.i
-data/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java.i
data/src/share/classes/sun/security/krb5/internal/util/KerberosString.java.i
data/src/share/classes/java/awt/image/AffineTransformOp.java.i
data/src/windows/native/sun/java2d/d3d/D3DBadHardware.h.i
data/src/share/classes/com/sun/security/auth/NTSidGroupPrincipal.java.i
+data/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java.i
data/src/share/demo/scripting/jconsole-plugin/build.xml.i
data/src/share/classes/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java.i
data/src/share/native/sun/java2d/Trace.h.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchUnsafe.java.i
data/test/demo/jvmti/hprof/CpuSamplesTest.java.i
-data/src/share/classes/java/security/cert/CertificateRevokedException.java.i
+data/test/java/lang/reflect/Constructor/TestParameterAnnotations.java.i
data/src/share/classes/sun/management/GarbageCollectionNotifInfoCompositeData.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/CFTypeClassFile.java.i
data/src/share/classes/javax/swing/plaf/PopupMenuUI.java.i
-data/test/java/util/zip/GZIP/GZIPInputStreamRead.java.i
data/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java.i
data/test/java/net/URL/B5086147.sh.i
-data/src/windows/classes/java/net/PlainSocketImpl.java.i
-data/test/javax/management/query/QueryNotifFilterTest.java.i
+data/src/solaris/classes/sun/awt/motif/X11DropTargetContextPeer.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/AbstractOptionSpec.java.i
data/test/java/nio/charset/spi/default-pol.i
-data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java.i
data/src/share/classes/java/sql/DriverManager.java.i
data/src/share/classes/com/sun/servicetag/RegistrationDocument.java.i
-data/test/java/rmi/transport/checkLeaseInfoLeak/security.policy.i
+data/test/sun/text/resources/Format/Bug4807540.java.i
data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.properties.i
data/src/share/classes/javax/swing/tree/TreePath.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthScrollPaneUI.java.i
@@ -13437,24 +14003,28 @@ data/make/tools/UnicodeData/VERSION.i
data/test/java/beans/XMLEncoder/6777487/TestEnumMap.java.i
data/src/share/classes/sun/tools/jconsole/CreateMBeanDialog.java.i
data/src/share/classes/javax/swing/ButtonModel.java.i
+data/src/share/classes/javax/management/NotificationInfos.java.i
+data/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java.i
data/src/share/classes/javax/management/QueryEval.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletColor32.gif.i
data/src/windows/classes/sun/awt/windows/WDesktopPeer.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java.i
data/test/sun/nio/cs/TestISO2022JP.java.i
data/src/share/classes/java/io/FilePermission.java.i
-data/src/share/classes/sun/tools/serialver/SerialVer.java.i
+data/src/share/classes/sun/audio/AudioStream.java.i
data/src/share/classes/sun/nio/cs/ext/IBM918.java.i
data/test/javax/imageio/plugins/bmp/BMPSubsamplingTest.java.i
-data/src/share/classes/javax/swing/plaf/DimensionUIResource.java.i
+data/src/share/classes/javax/crypto/spec/RC2ParameterSpec.java.i
data/test/sun/misc/ClassLoaderUtil/Test.java.i
+data/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java.i
+data/test/java/net/URLConnection/xml/not-xml1.i
data/test/java/lang/management/ClassLoadingMXBean/LoadCounts.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java.i
data/src/solaris/classes/sun/awt/X11/ListHelper.java.i
-data/test/java/io/Serializable/6559775/README.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java.i
data/test/sun/net/idn/nfscis.spp.i
data/test/javax/management/remote/mandatory/connection/RMISerializeTest.java.i
data/src/windows/classes/sun/java2d/windows/WinBackBuffer.java.i
+data/make/tools/sharing/tests/GHello.java.i
data/src/solaris/native/sun/awt/awt_motif.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/Init.java.i
data/src/share/classes/java/util/Formattable.java.i
@@ -13462,7 +14032,7 @@ data/src/share/classes/sun/util/resources/CalendarData_ca.properties.i
data/src/share/classes/sun/jvmstat/monitor/Variability.java.i
data/test/com/sun/jdi/InstancesTest.java.i
data/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java.i
-data/src/share/classes/java/text/CollationKey.java.i
+data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java.i
data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2_Stub.java.i
data/test/java/security/KeyPairGenerator/GenerateKeypair.java.i
data/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java.i
@@ -13472,214 +14042,212 @@ data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor32.gif.i
data/test/sun/security/provider/PolicyFile/TrustedCert.java.i
data/src/share/classes/sun/swing/plaf/WindowsKeybindings.java.i
data/test/javax/management/mxbean/ThreadMXBeanTest.java.i
-data/src/share/classes/com/sun/media/sound/DLSSampleOptions.java.i
+data/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html.i
data/test/java/util/Collections/SetFromMap.java.i
data/test/sun/tools/jrunscript/Hello.java.i
data/test/java/nio/file/Files/CreateFileTree.java.i
+data/src/share/classes/sun/security/x509/AlgIdDSA.java.i
data/src/share/classes/javax/management/monitor/MonitorNotification.java.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java.i
data/src/windows/bin/java_md.c.i
data/src/share/classes/java/util/JumboEnumSet.java.i
data/test/com/sun/servicetag/NewRegistrationData.java.i
data/src/share/classes/sun/net/www/protocol/http/AuthenticationHeader.java.i
-data/test/sun/security/provider/PolicyFile/CombinedPerms.java.i
data/src/share/classes/sun/security/krb5/internal/util/KerberosFlags.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterIsAcceptingJobs.java.i
data/test/java/util/Formatter/Constructors.java.i
-data/src/share/instrument/InstrumentationImplNativeMethods.c.i
+data/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java.i
data/src/solaris/native/sun/java2d/x11/XRSurfaceData.c.i
data/src/share/classes/com/sun/jmx/snmp/SnmpValue.java.i
data/make/sun/motif12/reorder-sparc.i
data/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java.i
data/src/share/classes/sun/text/normalizer/UnicodeSetIterator.java.i
data/test/sun/security/krb5/Krb5NameEquals.java.i
-data/test/javax/crypto/CryptoPermission/AllPermCheck.java.i
+data/test/java/beans/beancontext/Test4132698.java.i
data/src/share/classes/java/awt/AWTEvent.java.i
+data/test/java/util/ResourceBundle/Bug6204853.properties.i
data/src/share/demo/jfc/Notepad/resources/paste.gif.i
data/test/sun/tools/jcmd/jcmd_Output1.awk.i
data/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh.i
data/test/org/openjdk/jigsaw/_RepositoryCatalog.java.i
data/test/java/rmi/registry/readTest/testPkg/Server.java.i
data/test/sun/net/www/protocol/jar/B4756443.java.i
-data/src/share/sample/nio/server/BP.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuItemColor32.gif.i
data/src/share/classes/java/util/concurrent/locks/ReentrantLock.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPointer.java.i
-data/src/solaris/hpi/include/interrupt.h.i
-data/src/share/native/sun/awt/libpng/pngerror.c.i
data/test/java/rmi/reliability/benchmark/bench/serial/ClassDesc.java.i
data/make/org/openjdk/Makefile.i
data/src/share/classes/java/awt/print/PrinterAbortException.java.i
data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/project.xml.i
data/src/share/lib/logging.properties.i
data/src/share/classes/sun/io/CharToByteCp874.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java.i
+data/src/bsd/doc/man/ja/kinit.1.i
+data/test/org/openjdk/jigsaw/hello-view.sh.i
data/src/share/native/java/lang/fdlibm/src/e_sinh.c.i
-data/test/java/rmi/activation/Activatable/createPrivateActivable/group.security.policy.i
-data/src/share/classes/sun/applet/AppletIOException.java.i
+data/test/java/rmi/reliability/benchmark/bench/Benchmark.java.i
+data/src/share/classes/javax/sound/sampled/Port.java.i
data/test/java/lang/Math/CeilAndFloorTests.java.i
-data/test/java/util/Locale/bug4123285.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java.i
-data/src/share/classes/sun/security/pkcs/SigningCertificateInfo.java.i
-data/src/share/classes/sun/reflect/generics/tree/TypeSignature.java.i
-data/test/java/lang/instrument/AInstrumentationTestCase.java.i
-data/test/sun/misc/Version/Version.java.i
-data/test/javax/print/applet/applet3/Applet3PrintService.java.i
-data/src/share/classes/sun/text/bidi/BidiRun.java.i
-data/src/solaris/javavm/export/jni_md.h.i
+data/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java.i
+data/src/share/native/sun/security/ec/impl/ec.h.i
+data/test/java/nio/channels/FileChannel/Position.java.i
+data/test/java/beans/PropertyChangeSupport/Test4985020.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtils.h.i
data/test/javax/swing/JFileChooser/6741890/bug6741890.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java.i
+data/src/windows/classes/com/sun/security/auth/module/README.i
data/make/tools/src/build/tools/jdwpgen/UntaggedValueTypeNode.java.i
data/src/share/classes/sun/awt/shell/ShellFolderManager.java.i
data/test/java/net/DatagramPacket/CheckBoundaries.java.i
data/src/share/classes/java/security/cert/PKIXBuilderParameters.java.i
data/test/java/net/Socket/asyncClose/ServerSocket_accept.java.i
-data/src/share/classes/javax/naming/ldap/UnsolicitedNotification.java.i
+data/src/share/classes/sun/net/www/protocol/http/InMemoryCookieStore.java.i
data/test/java/lang/Throwable/LegacyChainedExceptionSerialization.java.i
data/src/share/classes/sun/security/provider/certpath/BuildStep.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapItem.java.i
+data/test/java/beans/VetoableChangeSupport/1.6.0.ser.i
data/src/share/classes/sun/security/ssl/HandshakeInStream.java.i
data/src/windows/native/sun/windows/awt_FileDialog.h.i
-data/src/share/native/java/util/zip/zlib-1.1.3/zadler32.c.i
-data/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java.i
-data/src/share/classes/sun/nio/fs/Globs.java.i
+data/src/windows/bin/i586/jvm.cfg.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h.i
data/test/java/security/Identity/EqualsHashCodeContract.java.i
data/test/sun/security/util/DerValue/DerValueEqualsHashCode.java.i
data/make/sun/xawt/FILES_export_unix.gmk.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolAnalyzer.java.i
+data/test/java/nio/channels/DatagramChannel/ChangingAddress.java.i
data/test/java/io/Serializable/packageAccess/D.java.i
data/src/share/classes/sun/nio/ch/SelectionKeyImpl.java.i
data/test/java/util/ResourceBundle/Control/ControlFactoryTest.java.i
data/src/share/classes/javax/smartcardio/CardTerminal.java.i
data/make/tools/src/build/tools/jdwpgen/Parse.java.i
-data/src/share/classes/sun/io/CharToByteCp964.java.i
-data/src/share/classes/sun/tools/jstat/Scale.java.i
+data/src/share/classes/java/awt/print/PrinterGraphics.java.i
data/test/java/net/URLConnection/RequestPropertyValues.java.i
-data/make/mkdemo/applets/SimpleGraph/Makefile.i
+data/src/share/classes/sun/security/x509/X500Name.java.i
data/test/java/io/PipedOutputStream/NotConnected.java.i
data/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.html.i
data/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java.i
-data/src/share/classes/sun/tools/tree/FinallyStatement.java.i
+data/src/share/classes/sun/text/resources/FormatData_bg_BG.java.i
data/src/share/classes/javax/management/AttributeValueExp.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHere.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java.i
+data/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/Tracer.java.i
data/src/share/classes/java/awt/event/KeyAdapter.java.i
-data/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java.i
-data/src/share/classes/com/sun/jdi/ObjectCollectedException.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.i
+data/test/sun/nio/cs/X11CNS11643.java.i
data/test/java/lang/annotation/loaderLeak/A.java.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/TransformParameterSpec.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libnss3.so.d
data/make/tools/CharsetMapping/IBM874.nr.i
data/src/share/classes/com/sun/rmi/rmid/ExecPermission.java.i
data/src/share/classes/java/util/Map.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sv.properties.i
+data/test/java/io/Serializable/6559775/README.i
+data/src/share/javavm/export/classfile_constants.h.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/SyntaxException.java.i
data/test/java/rmi/reliability/README.i
data/src/share/classes/java/util/Stack.java.i
data/src/share/classes/java/awt/SystemColor.java.i
data/test/java/beans/XMLEncoder/sun_swing_PrintColorUIResource.java.i
data/src/share/classes/com/sun/crypto/provider/DESKeyFactory.java.i
-data/test/demo/jvmti/hprof/HeapDumpTest.java.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Base.java.i
data/src/share/classes/java/security/KeyManagementException.java.i
data/src/share/classes/org/openjdk/jigsaw/Library.java.i
data/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh.i
-data/src/share/classes/java/lang/TypeNotPresentException.java.i
+data/test/java/util/AbstractMap/SimpleEntries.java.i
data/src/share/classes/java/util/regex/Matcher.java.i
data/make/tools/reorder/tests/JHello.java.i
data/src/share/javavm/include/opcodes.length.i
data/src/share/classes/java/security/acl/Permission.java.i
-data/src/share/classes/sun/tools/tree/PreIncExpression.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthPopupMenuUI.java.i
data/test/java/awt/dnd/FileListBetweenJVMsTest/SourceFileListFrame.java.i
data/test/java/rmi/RemoteException/chaining/Chaining.java.i
-data/src/windows/classes/sun/security/smartcardio/PlatformPCSC.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/ContainmentFilter.java.i
+data/src/share/classes/java/io/FilenameFilter.java.i
+data/test/javax/management/ObjectInstance/MBeanInfoFailTest.java.i
data/src/share/classes/sun/io/CharToByteEUC.java.i
data/test/java/lang/System/finalization/FinExit.java.i
data/test/java/beans/XMLEncoder/Test4950122.java.i
data/test/java/io/File/DeleteOnExit.java.i
data/src/share/classes/javax/imageio/spi/RegisterableService.java.i
-data/src/share/classes/sun/io/ByteToCharCp1097.java.i
+data/test/tools/jar/JarEntryTime.java.i
data/src/share/classes/sun/nio/cs/MS1250.java.i
data/src/share/classes/sun/tools/tree/BitNotExpression.java.i
-data/test/java/lang/reflect/Array/ExceedMaxDim.java.i
+data/src/macosx/native/sun/awt/CMenuComponent.h.i
data/src/share/classes/sun/java2d/pipe/ShapeSpanIterator.java.i
-data/src/share/classes/java/util/AbstractSet.java.i
-data/src/share/classes/sun/security/x509/AlgIdDSA.java.i
-data/src/windows/classes/sun/awt/windows/WClipboard.java.i
+data/src/share/classes/sun/io/ByteToCharMacCyrillic.java.i
+data/test/java/io/Serializable/skippedObjCNFException/Write.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/RootJObjCClass.java.i
data/src/share/classes/sun/reflect/package.html.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpBadSecurityLevelException.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java.i
data/src/share/classes/javax/net/ssl/SSLSession.java.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java.i
data/src/solaris/classes/sun/awt/X11/XDragSourceContextPeer.java.i
-data/src/share/native/sun/java2d/opengl/OGLMaskBlit.h.i
data/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java.i
data/test/java/awt/Mixing/setComponentZOrder.java.i
-data/src/share/classes/sun/print/CustomMediaTray.java.i
+data/src/share/classes/sun/tools/jconsole/Plotter.java.i
data/test/java/beans/XMLDecoder/spec/TestString.java.i
+data/src/macosx/native/sun/font/AWTStrike.m.i
data/src/share/native/sun/awt/image/jpeg/jcphuff.c.i
data/test/sun/security/provider/certpath/DisabledAlgorithms/README.i
data/src/share/classes/com/sun/tools/attach/spi/package.html.i
-data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java.i
-data/src/windows/classes/sun/awt/windows/WChoicePeer.java.i
+data/test/javax/xml/crypto/dsig/data/xmldsig-xfilter2.xml.i
+data/src/macosx/native/sun/osxapp/AWT_debug.h.i
data/src/share/classes/com/sun/media/sound/AuFileFormat.java.i
data/test/java/net/URLClassLoader/B6827999.java.i
data/test/javax/swing/ToolTipManager/Test6256140.java.i
-data/src/share/native/sun/security/ec/mp_gf2m.h.i
+data/src/solaris/doc/sun/man/man1/jstack.1.i
data/src/share/classes/sun/nio/cs/ext/IBM948.java.i
-data/src/share/demo/jvmti/hprof/hprof_object.h.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif.i
+data/test/java/security/Security/ClassLoaderDeadlock/CreateSerialized.java.i
+data/src/macosx/classes/com/apple/laf/AquaTextAreaUI.java.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/Count.java.i
data/test/java/net/URLClassLoader/closetest/test1/com/foo/Resource1.i
-data/src/share/classes/sun/security/krb5/KrbKdcReq.java.i
+data/test/sun/nio/cs/LatinCharReplacementTWTest.java.i
data/test/java/util/EnumMap/ToArray.java.i
-data/src/share/classes/sun/security/ssl/X509TrustManagerImpl.java.i
-data/src/share/classes/com/sun/jdi/request/MonitorWaitedRequest.java.i
-data/src/share/classes/com/sun/servicetag/resources/register_ja.html.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java.i
+data/make/tools/CharsetMapping/IBM868.map.i
+data/test/com/sun/servicetag/DuplicateNotFound.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_sk_SK.properties.i
+data/test/java/nio/channels/TestThread.java.i
+data/src/share/classes/com/sun/security/sasl/digest/SecurityCtx.java.i
data/test/sun/nio/cs/OLD/EUC_KR_OLD.java.i
data/src/solaris/native/sun/awt/awt_TextField.h.i
-data/src/share/classes/org/openjdk/internal/joptsimple/internal/ValueConverter.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTBootClassPathTableMetaImpl.java.i
data/src/windows/native/common/jdk_util_md.c.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c.i
+data/src/share/classes/javax/sql/rowset/RowSetFactory.java.i
+data/src/share/classes/sun/tools/jconsole/resources/masthead-left.png.i
data/src/share/native/sun/awt/libpng/LICENSE.i
data/src/share/classes/sun/management/Sensor.java.i
-data/make/netbeans/common/jtreg-view.ent.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/freebl3.dll.d
data/src/share/classes/javax/management/openmbean/CompositeDataView.java.i
-data/src/share/classes/sun/misc/Cache.java.i
-data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono16.gif.i
-data/src/share/native/sun/awt/image/cvutils/img_noscale.h.i
+data/src/share/classes/java/lang/annotation/Retention.java.i
+data/src/share/classes/javax/swing/JComponent.java.i
+data/src/share/classes/sun/security/util/HostnameChecker.java.i
data/src/share/classes/com/sun/tools/jdi/Packet.java.i
-data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/file-targets.xml.i
+data/test/java/beans/XMLEncoder/javax_swing_border_EtchedBorder.java.i
data/test/java/nio/charset/Charset/EncDec.java.i
data/src/share/classes/java/net/SocketAddress.java.i
data/src/solaris/doc/sun/man/man1/javap.1.i
data/src/share/classes/sun/tools/jstat/RowClosure.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/dk/ArcFourCrypto.java.i
-data/src/share/classes/java/nio/X-Buffer-bin.java.template.i
-data/test/java/beans/EventHandler/Test6179222.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/Constants.java.i
+data/test/sun/net/www/protocol/jar/getcontenttype.sh.i
+data/test/java/lang/instrument/RedefineSetUp.sh.i
data/src/share/classes/sun/util/logging/resources/logging.properties.i
data/src/share/classes/sun/nio/cs/ext/IBM1047.java.i
-data/src/share/classes/sun/awt/TracedEventQueue.java.i
+data/test/sun/management/windows/revokeall.c.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemoryMetaImpl.java.i
data/test/java/awt/AlphaComposite/TestAlphaCompositeForNaN.java.i
data/src/share/native/java/lang/SecurityManager.c.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/MyCursor.java.i
data/src/share/classes/sun/text/resources/FormatData_ar.java.i
data/test/java/rmi/activation/Activatable/checkActivateRef/rmid.security.policy.i
-data/test/java/beans/Statement/Test6788531.java.i
+data/test/java/lang/Class/IsSynthetic.java.i
data/src/solaris/doc/sun/man/man1/ja/jinfo.1.i
data/test/sun/security/tools/keytool/NewSize7.java.i
data/src/share/classes/javax/swing/JFormattedTextField.java.i
data/src/share/classes/sun/security/krb5/PrincipalName.java.i
-data/test/javax/swing/JTabbedPane/6670274/bug6670274.java.i
+data/src/share/classes/sun/security/tools/CertAndKeyGen.java.i
data/src/share/classes/java/security/interfaces/DSAKey.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c.i
+data/src/macosx/native/sun/font/CCharToGlyphMapper.m.i
data/src/share/classes/sun/security/provider/DSAParameters.java.i
-data/src/share/classes/javax/swing/event/RowSorterEvent.java.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonMono16.gif.i
-data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.cpp.i
-data/src/share/classes/com/sun/security/auth/LdapPrincipal.java.i
+data/src/share/classes/javax/swing/text/TabSet.java.i
+data/test/java/lang/reflect/Method/InheritedInterfaceMethods.java.i
+data/test/org/openjdk/jigsaw/cli/TimestampTest.java.i
+data/make/sun/font/reorder-i586.i
data/test/sun/security/krb5/auto/KeyTabCompat.java.i
data/make/netbeans/common/architectures/arch-i386.properties.i
data/src/share/classes/java/nio/channels/spi/SelectorProvider.java.i
@@ -13688,50 +14256,56 @@ data/src/share/classes/sun/print/resources/serviceui_ko.properties.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedSet.java.i
data/test/java/util/zip/InflateIn_DeflateOut.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy35.i
-data/src/share/classes/javax/security/auth/callback/CallbackHandler.java.i
+data/src/share/classes/sun/text/normalizer/UCharacterProperty.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/manifest.i
data/test/com/sun/nio/sctp/SctpChannel/Util.java.i
data/test/sun/tools/jstat/hsperfdata_3433.i
-data/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java.i
-data/src/share/classes/java/lang/ClassCircularityError.java.i
+data/src/share/native/sun/security/ec/mp_gf2m-priv.h.i
data/src/share/classes/com/sun/tools/attach/VirtualMachine.java.i
data/src/windows/bin/java_md.h.i
-data/src/share/classes/sun/util/resources/LocaleNames_nl.properties.i
+data/src/share/classes/javax/swing/text/doc-files/Document-insert.gif.i
+data/src/share/classes/java/beans/ExceptionListener.java.i
data/test/javax/security/auth/login/LoginContext/ResetModule.java.i
+data/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java.i
+data/src/share/classes/java/nio/file/attribute/FileAttributeView.java.i
data/test/java/lang/management/ThreadMXBean/LockingThread.java.i
data/src/share/classes/sun/io/ByteToCharCp834.java.i
data/src/share/classes/com/sun/jdi/VMMismatchException.java.i
data/src/share/classes/sun/security/krb5/internal/KDCRep.java.i
data/src/share/classes/sun/java2d/opengl/OGLPaints.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/JavaUtils.java.i
-data/src/share/classes/java/io/PushbackReader.java.i
+data/src/share/classes/sun/beans/editors/FontEditor.java.i
data/src/share/classes/sun/tools/jstat/Jstat.java.i
data/src/share/classes/javax/management/event/EventSubscriber.java.i
data/src/share/native/sun/java2d/loops/MapAccelFunc.c.i
data/src/share/classes/java/beans/PropertyEditorManager.java.i
-data/src/share/classes/java/applet/package.html.i
+data/src/macosx/native/sun/awt/CMenuItem.m.i
+data/src/share/classes/java/rmi/activation/ActivationGroup.java.i
data/src/share/classes/com/sun/jndi/url/ldap/ldapURLContext.java.i
-data/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java.i
+data/src/macosx/native/sun/awt/AWTSurfaceLayers.m.i
+data/src/windows/native/java/util/logging.c.i
data/src/share/classes/java/util/concurrent/Executors.java.i
-data/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java.i
-data/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java.i
+data/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java.i
+data/src/share/classes/sun/java2d/loops/FillRect.java.i
+data/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif.i
data/test/java/text/Bidi/Bug7051769.java.i
data/test/com/sun/jdi/ProcessAttachDebuggee.java.i
data/src/share/classes/java/nio/package.html.i
+data/src/share/classes/sun/tools/tree/ByteExpression.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1143.java.i
+data/src/share/native/sun/java2d/pipe/RenderBuffer.c.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c.i
data/test/com/sun/crypto/provider/Cipher/DES/FlushBug.java.i
-data/test/java/lang/instrument/PremainClass/InheritAgent1011.java.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java.i
+data/test/java/security/spec/ECCBasic.java.i
data/test/sun/net/idn/PunycodeTest.java.i
data/src/share/classes/sun/font/CompositeStrike.java.i
-data/src/share/classes/sun/security/provider/certpath/OCSPResponse.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/TruncateArray.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/korean.ut8.txt.i
data/src/share/back/ClassTypeImpl.h.i
-data/src/share/classes/sun/security/provider/SeedGenerator.java.i
data/test/java/net/MulticastSocket/MulticastTTL.java.i
-data/make/tools/swing-beans/beaninfo/images/JButtonMono16.gif.i
-data/src/share/classes/sun/nio/cs/MS1257.java.i
+data/test/sun/security/krb5/IPv6.java.i
+data/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java.i
+data/test/java/util/concurrent/CopyOnWriteArrayList/EqualsRace.java.i
data/src/share/classes/sun/net/util/IPAddressUtil.java.i
data/src/share/classes/java/awt/dnd/package.html.i
data/src/share/classes/sun/tools/jconsole/inspector/XMBeanOperations.java.i
@@ -13741,26 +14315,23 @@ data/test/java/rmi/activation/Activatable/checkImplClassLoader/rmid.security.pol
data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.java.i
data/test/java/util/Scanner/FailingConstructors.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfo.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_KW.java.i
-data/src/share/classes/com/sun/jdi/connect/ListeningConnector.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_no_NO_NY.properties.i
+data/test/sun/rmi/rmic/newrmic/equivalence/Agent.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java.i
data/make/java/nio/spp.sh.i
data/src/share/classes/java/nio/file/FileTreeWalker.java.i
data/src/share/native/sun/tracing/dtrace/JVM.c.i
data/src/share/classes/com/sun/jdi/Method.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java.i
data/make/sun/nio/cs/FILES_java.gmk.i
data/test/javax/management/query/QuerySubstringTest.java.i
data/src/share/classes/com/sun/beans/decoder/StringElementHandler.java.i
data/src/share/classes/sun/net/ResourceManager.java.i
-data/src/share/classes/sun/security/pkcs/EncodingException.java.i
-data/test/java/net/URLClassLoader/closetest/Common.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCMUtils.h.i
-data/src/windows/classes/java/lang/Terminator.java.i
-data/test/java/net/MulticastSocket/Leave.java.i
+data/src/share/classes/sun/text/normalizer/UProperty.java.i
data/make/tools/src/build/tools/charsetmapping/GenerateSBCS.java.i
data/src/share/classes/sun/font/AttributeValues.java.i
data/test/java/lang/ThreadGroup/Daemon.java.i
-data/src/share/classes/java/sql/SQLPermission.java.i
+data/src/share/classes/sun/net/www/protocol/https/HttpsClient.java.i
data/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java.i
data/src/share/classes/sun/swing/BakedArrayList.java.i
data/src/share/classes/javax/management/relation/RoleResult.java.i
@@ -13768,15 +14339,15 @@ data/src/share/classes/javax/management/remote/rmi/RMIJRMPServerImpl.java.i
data/make/mkdemo/jvmti/compiledMethodLoad/Makefile.i
data/test/java/util/jar/JarFile/no-manifest.jar.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/EchoImpl_Stub.java.i
-data/src/share/classes/java/net/Inet4Address.java.i
-data/test/java/rmi/server/useCustomRef/UseCustomRef.java.i
+data/test/sun/net/www/protocol/http/SetIfModifiedSince.java.i
+data/test/sun/security/pkcs11/ec/TestECDH.java.i
data/src/windows/native/sun/windows/README.JNI.i
data/src/share/classes/javax/security/cert/CertificateExpiredException.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html.i
data/src/share/classes/javax/naming/ldap/package.html.i
data/src/share/demo/jfc/Metalworks/GreenMetalTheme.java.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/DirectoryScannerTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JRootPaneMono32.gif.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/OwnerImpl.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/CksumType.java.i
data/test/javax/management/remote/mandatory/notif/NotificationBufferTest.java.i
data/src/share/classes/sun/io/CharToByteISCII91.java.i
@@ -13785,66 +14356,69 @@ data/src/share/instrument/Reentrancy.c.i
data/src/share/classes/javax/swing/text/html/TextAreaDocument.java.i
data/test/com/sun/crypto/provider/Cipher/PBE/PBEKeysAlgorithmNames.java.i
data/make/javax/sound/jsoundhs/Makefile.i
-data/test/java/net/DatagramSocket/SendSize.java.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java.i
data/test/java/beans/PropertyEditor/TestFontClass.java.i
data/test/java/nio/charset/CharsetEncoder/Flush.java.i
-data/src/share/classes/sun/font/SunFontManager.java.i
-data/src/linux/doc/man/ja/javadoc.1.d
+data/src/share/classes/sun/text/resources/FormatData_ko_KR.java.i
+data/src/share/classes/sun/jkernel/Mutex.java.i
data/src/share/classes/com/sun/security/auth/module/Crypt.java.i
data/src/share/classes/java/lang/reflect/ReflectPermission.java.i
-data/src/linux/doc/man/ja/javadoc.1.i
+data/src/share/classes/sun/net/www/protocol/http/BasicAuthentication.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ReverseNameLookup.java.i
data/src/share/classes/sun/misc/CharacterEncoder.java.i
-data/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64.i
-data/src/share/back/eventFilter.h.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/OpaqueClassFile.java.i
+data/src/macosx/classes/apple/laf/AquaLookAndFeel.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid.properties.i
data/test/java/util/concurrent/ExecutorService/Invoke.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/zadler32.c.i
-data/src/share/classes/sun/applet/AppletPanel.java.i
-data/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c.i
+data/test/sun/tools/jps/jps-l_Output1.awk.i
+data/src/share/classes/sun/security/util/BigInt.java.i
+data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0212.java.i
+data/src/share/javavm/export/jdwpTransport.h.i
data/src/share/classes/javax/swing/ImageIcon.java.i
data/src/share/classes/com/sun/jdi/request/EventRequestManager.java.i
-data/src/windows/native/sun/windows/awt_MouseEvent.cpp.i
-data/test/java/net/SocketPermission/ActionSpace.java.i
-data/test/java/util/concurrent/locks/Lock/FlakyMutex.java.i
-data/src/share/classes/com/sun/rowset/WebRowSetImpl.java.i
+data/src/share/demo/jfc/Metalworks/UISwitchListener.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecBuilder.java.i
+data/test/java/io/Serializable/arraySuidConflict/Read.java.i
data/test/sun/net/sdp/sanity.sh.i
data/test/java/awt/GraphicsEnvironment/TestGetDefScreenDevice.java.i
-data/test/com/sun/java/swing/plaf/gtk/Test6635110.java.i
-data/make/tools/CharsetMapping/IBM860.map.i
-data/test/java/io/StreamTokenizer/input.txt.i
+data/make/tools/CharsetMapping/SingleByte-X.java.i
+data/src/solaris/native/sun/awt/awt_DrawingSurface.h.i
+data/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java.i
+data/make/modules/tools/src/com/sun/classanalyzer/ResolutionInfo.java.i
data/test/sun/security/provider/PolicyFile/TrustedCert.policy.i
-data/test/java/nio/charset/RemovingSunIO/SunioAlias.java.i
-data/src/share/classes/sun/text/resources/FormatData_zh_SG.java.i
+data/test/java/util/Collections/Ser.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/SetPatch.java.i
data/src/share/classes/javax/imageio/IIOException.java.i
-data/src/share/classes/com/sun/jdi/request/EventRequest.java.i
+data/src/share/sample/nio/server/Sendable.java.i
+data/make/common/shared/Defs-windows.gmk.i
data/test/java/beans/PropertyEditor/6380849/editors/SecondBeanEditor.java.i
data/test/java/lang/Class/getModifiers/ForStaticInnerClass.java.i
data/test/java/net/InetAddress/MyPrincipal.java.i
data/src/share/classes/java/awt/doc-files/modal-example2.gif.i
+data/src/macosx/native/sun/font/CGGlyphImages.m.i
data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Des3KdCksumType.java.i
data/src/share/native/sun/java2d/loops/ParallelogramUtils.h.i
-data/src/share/classes/java/util/concurrent/FutureTask.java.i
+data/src/share/classes/javax/swing/InputVerifier.java.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/Receiver.java.i
data/src/share/classes/java/net/StandardSocketOption.java.i
data/test/java/beans/PropertyEditor/TestBooleanClass.java.i
+data/src/share/classes/sun/security/util/DerIndefLenConverter.java.i
data/src/windows/native/java/io/RandomAccessFile_md.c.i
data/src/share/native/sun/font/layout/ThaiShaping.cpp.i
-data/test/java/net/URLClassLoader/getresourceasstream/test.sh.i
+data/test/java/rmi/activation/Activatable/nonExistentActivatable/group.security.policy.i
data/src/share/native/sun/java2d/cmm/lcms/cmsmatsh.c.i
-data/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java.i
-data/test/java/io/NegativeInitSize.java.i
+data/src/share/classes/sun/font/FontManagerFactory.java.i
+data/src/share/classes/java/io/PrintStream.java.i
data/test/java/lang/ClassLoader/ExceptionHidingLoader.java.i
-data/src/linux/doc/man/jsadebugd.1.i
+data/test/javax/security/auth/Subject/Serial.java.i
data/src/share/classes/sun/io/CharToByteCp833.java.i
data/src/share/classes/com/sun/jndi/cosnaming/IiopUrl.java.i
data/src/share/classes/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java.i
-data/src/share/classes/java/awt/event/MouseMotionAdapter.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_ru.properties.i
data/src/share/classes/com/sun/media/sound/ReferenceCountingDevice.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthCheckBoxUI.java.i
-data/test/java/nio/Buffer/BasicShort.java.i
+data/src/share/classes/sun/net/www/protocol/http/AuthScheme.java.i
+data/src/solaris/native/sun/awt/CUPSfuncs.c.i
data/src/share/classes/com/sun/beans/decoder/NullElementHandler.java.i
data/test/javax/naming/spi/DirectoryManager/DummyObjectFactory.java.i
data/src/solaris/classes/sun/awt/X11/XVerticalScrollbar.java.i
@@ -13852,80 +14426,81 @@ data/src/share/classes/com/sun/media/sound/PortMixerProvider.java.i
data/src/share/sample/nio/server/Handler.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaValue.java.i
data/src/share/native/sun/font/layout/GlyphPositionAdjustments.h.i
-data/test/java/net/URLConnection/ResendPostBody.java.i
+data/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java.i
data/test/java/util/concurrent/Phaser/Arrive.java.i
-data/test/java/util/Locale/icuLocales.txt.i
-data/src/share/transport/socket/sysSocket.h.i
+data/src/share/classes/javax/swing/JMenuBar.java.i
data/test/com/sun/jdi/redefineMethod/RedefineTest.java.i
data/test/java/nio/Buffer/Order.java.i
data/test/javax/print/attribute/ChromaticityValues.java.i
data/make/tools/src/build/tools/dtdbuilder/DTDInputStream.java.i
data/src/share/classes/java/nio/file/Path.java.i
-data/test/javax/security/auth/PrivateCredentialPermission/Subset.policy.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java.i
+data/test/com/sun/jdi/DeferredStepTest.sh.i
data/src/share/classes/javax/swing/ProgressMonitor.java.i
data/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider.i
-data/test/sun/security/mscapi/AccessKeyStore.sh.i
+data/src/share/classes/javax/naming/LinkRef.java.i
data/src/share/classes/java/lang/Override.java.i
data/src/share/classes/java/sql/PseudoColumnUsage.java.i
data/test/java/lang/Double/ParseDouble.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpNull.java.i
data/src/share/classes/javax/naming/SizeLimitExceededException.java.i
+data/src/share/classes/java/awt/color/ICC_ProfileRGB.java.i
data/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java.i
data/test/sun/nio/cs/OLD/DoubleByteDecoder.java.i
data/src/share/classes/java/beans/ConstructorProperties.java.i
data/src/share/classes/sun/applet/AppletProps.java.i
-data/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java.i
+data/test/java/beans/PropertyEditor/TestEnumSubclassJava.java.i
data/src/share/classes/sun/java2d/opengl/OGLUtilities.java.i
-data/src/solaris/classes/sun/awt/X11/XDesktopPeer.java.i
+data/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif.i
data/test/javax/swing/JPopupMenu/Separator/6547087/bug6547087.java.i
data/src/share/classes/javax/management/remote/rmi/RMIServer.java.i
-data/src/share/demo/jfc/CodePointIM/CodePointInputMethod.java.i
+data/test/com/sun/jdi/redefine/RedefineSubTarg.java.i
data/test/java/lang/instrument/RetransformAgent.java.i
data/src/share/classes/sun/text/CompactByteArray.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c.i
-data/src/share/classes/com/sun/nio/sctp/AssociationChangeNotification.java.i
-data/test/java/beans/PropertyEditor/TestColorClassValue.java.i
-data/test/javax/swing/JPopupMenu/6691503/bug6691503.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMBean.java.i
data/src/share/classes/com/sun/crypto/provider/AESCrypt.java.i
+data/test/javax/management/context/localizable/WhatsitMBean.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/zcrc32.c.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java.i
+data/test/javax/management/remote/mandatory/notif/NotificationSenderMBean.java.i
data/test/java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Extra.java.i
data/src/share/classes/sun/java2d/opengl/OGLContext.java.i
data/src/share/classes/sun/java2d/cmm/ProfileDeferralInfo.java.i
-data/src/share/classes/com/sun/media/sound/ModelOscillator.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM864.java.i
-data/test/java/net/URLClassLoader/closetest/test2/com/foo/TestClass1.java.i
+data/src/share/demo/java2d/J2DBench/resources/textdata/greek.ut8.txt.i
+data/test/java/security/BasicPermission/EqualsImplies.java.i
+data/test/java/io/BufferedReader/Ready.java.i
data/test/java/net/URLConnection/ExifContentGuesser.java.i
data/test/com/sun/jdi/ArgumentValuesTest.java.i
-data/src/share/classes/sun/awt/CausedFocusEvent.java.i
+data/src/solaris/classes/sun/nio/ch/PipeImpl.java.i
data/test/java/util/HashMap/SetValue.java.i
data/src/share/native/sun/font/bidi/ubidi.h.i
data/src/solaris/native/sun/awt/awt_MenuBar.c.i
data/test/sun/security/pkcs11/Signature/ByteBuffers.java.i
+data/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java.i
data/test/java/io/Serializable/packageAccess/Test.java.i
-data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildOddSel.java.i
-data/src/share/native/common/jdk_util.c.i
+data/src/share/classes/sun/security/action/PutAllAction.java.i
+data/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java.i
data/test/javax/imageio/stream/StreamCloserLeak/test/Main.java.i
data/src/share/classes/com/sun/net/ssl/TrustManagerFactorySpi.java.i
data/src/share/classes/sun/io/CharToByteMacHebrew.java.i
-data/test/java/net/URLEncoder/URLEncoderEncodeArgs.java.i
-data/src/share/classes/javax/management/relation/RelationType.java.i
+data/src/share/classes/sun/java2d/opengl/OGLGraphicsConfig.java.i
+data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java.i
data/src/share/demo/java2d/J2DBench/nbproject/project.xml.i
data/test/sun/net/www/http/HttpClient/RequestURI.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/Basic.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_PKCS5_PBKD2_PARAMS.java.i
data/src/share/classes/sun/net/www/http/KeepAliveCache.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nssckbi.dll.d
data/test/java/util/ArrayList/RangeCheckMicroBenchmark.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c.i
-data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java.i
+data/test/javax/script/MyContext.java.i
+data/src/share/classes/javax/naming/spi/ResolveResult.java.i
data/src/share/classes/sun/security/jgss/wrapper/GSSLibStub.java.i
data/test/java/io/Serializable/inactiveRegistration/InactiveRegistration.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/JDIListener.java.i
-data/test/sun/security/smartcardio/TestExclusive.java.i
+data/test/sun/nio/cs/FindDecoderBugs.java.i
data/src/share/classes/sun/awt/KeyboardFocusManagerPeerProvider.java.i
data/test/java/nio/channels/DatagramChannel/IsConnected.java.i
-data/src/share/classes/javax/management/relation/RelationNotification.java.i
+data/test/java/security/cert/pkix/policyChanges/ca.cer.i
data/make/tools/swing-beans/beaninfo/images/JPopupMenuColor32.gif.i
data/test/com/sun/crypto/provider/TLS/prf12data.txt.i
data/test/java/math/BigInteger/StringConstructor.java.i
@@ -13933,18 +14508,20 @@ data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.ja
data/test/java/util/Locale/Bug4210525.java.i
data/src/share/classes/java/util/zip/ZipException.java.i
data/src/windows/native/java/io/dirent_md.h.i
-data/test/java/dyn/ClassValueTest.java.i
+data/test/java/awt/regtesthelpers/Sysout.java.i
data/make/tools/reorder/tests/LoadFrame.java.i
data/make/tools/CharsetMapping/IBM935.nr.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/NTypeMerger.java.i
data/src/share/classes/sun/tools/tree/NaryExpression.java.i
data/test/sun/security/tools/jarsigner/ts.sh.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmOSMeta.java.i
+data/src/share/classes/sun/management/snmp/util/SnmpTableHandler.java.i
data/src/share/classes/com/sun/java/util/jar/pack/FixedList.java.i
data/src/share/classes/sun/io/ByteToCharUnicodeLittle.java.i
+data/src/macosx/classes/com/apple/eawt/_AppEventLegacyHandler.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java.i
data/test/java/nio/file/Files/BytesAndLines.java.i
-data/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java.i
-data/src/share/classes/java/beans/DesignMode.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/DropShadowEffect.java.i
+data/test/java/lang/Character/PropertyValueAliases.txt.i
+data/src/share/classes/sun/text/resources/FormatData_uk.java.i
data/src/share/classes/sun/java2d/pisces/Renderer.java.i
data/src/share/classes/sun/print/resources/serviceui_zh_TW.properties.i
data/src/share/classes/org/openjdk/jigsaw/Loader.java.i
@@ -13955,10 +14532,11 @@ data/test/sun/security/krb5/ParseCAPaths.java.i
data/src/share/classes/java/nio/file/LinkOption.java.i
data/src/share/classes/java/awt/Stroke.java.i
data/test/java/math/BigDecimal/NegateTests.java.i
+data/test/com/sun/net/httpserver/Test10.java.i
data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.Connector.i
data/src/share/demo/jvmti/heapTracker/heapTracker.h.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanArrayCalls.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedSet.java.i
+data/test/sun/security/krb5/auto/ok-as-delegate-xrealm.sh.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/CertsInFilesystemDirectoryResolver.java.i
data/test/java/security/KeyFactory/Failover.java.i
data/test/java/security/cert/CertPathBuilder/targetConstraints/BuildEEBasicConstraints.java.i
data/test/java/lang/instrument/ilib/ClassReaderWriter.java.i
@@ -13967,78 +14545,91 @@ data/make/java/verify/mapfile-vers.i
data/test/java/awt/Graphics2D/DrawString/ScaledLCDTextMetrics.java.i
data/make/mksample/nio/multicast/Makefile.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBufferFloat.java.i
-data/src/share/classes/org/openjdk/jigsaw/ClassInfo.java.i
+data/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java.i
+data/src/macosx/classes/com/apple/laf/AquaGroupBorder.java.i
data/test/javax/swing/JColorChooser/Test4165217.java.i
+data/src/share/demo/jvmti/hprof/hprof_table.h.i
+data/test/java/io/PipedWriter/ConnectAfterReaderClose.java.i
data/test/java/awt/print/PrinterJob/PrintAWTImage.java.i
+data/src/share/native/sun/font/fontscalerdefs.h.i
data/test/sun/net/www/http/HttpClient/CookieHttpClientTest.java.i
-data/src/share/native/java/lang/fdlibm/src/w_hypot.c.i
+data/src/share/classes/com/sun/jmx/snmp/InetAddressAcl.java.i
data/src/windows/hpi/export/timeval_md.h.i
data/test/java/io/ByteArrayOutputStream/ToString.java.i
-data/test/java/io/pathNames/GeneralWin32.java.i
+data/src/share/classes/sun/tools/tree/LessExpression.java.i
+data/src/share/demo/nbproject/jfc/TableExample/nbproject/netbeans-targets.xml.i
data/src/share/classes/javax/swing/AncestorNotifier.java.i
+data/src/share/classes/org/relaxng/datatype/Datatype.java.i
data/src/solaris/doc/sun/man/man1/unpack200.1.i
data/src/share/classes/com/sun/tools/jdi/TypeComponentImpl.java.i
data/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/java/net/MyDatagramSocketImplFactory.java.i
-data/src/share/classes/sun/tools/jstat/resources/jstat_unsupported_options.i
+data/src/share/classes/com/sun/crypto/provider/AESParameters.java.i
data/make/tools/GenerateCharacter/Makefile.i
-data/src/share/classes/sun/io/ByteToCharCp935.java.i
+data/src/share/classes/sun/misc/JavaIOAccess.java.i
data/make/java/main/javaw/Makefile.i
+data/src/share/classes/java/beans/DefaultPersistenceDelegate.java.i
+data/src/bsd/doc/man/ja/pack200.1.i
+data/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java.i
data/src/share/classes/javax/management/JMX.java.i
-data/make/com/sun/jndi/dns/Makefile.i
+data/test/java/util/PluggableLocale/TimeZoneNameProviderTest.java.i
data/src/share/classes/java/lang/InterruptedException.java.i
-data/test/org/openjdk/jigsaw/_Library.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java.i
+data/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java.i
data/src/solaris/classes/sun/font/NativeStrikeDisposer.java.i
data/src/share/native/sun/security/ec/ec2_163.c.i
data/src/share/classes/javax/naming/CommunicationException.java.i
-data/src/share/classes/sun/management/CompilationImpl.java.i
+data/src/share/classes/sun/rmi/runtime/RuntimeUtil.java.i
+data/test/javax/crypto/JceSecurity/MyProvider.java.i
data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/ShutdownImpl.java.i
data/make/sun/tools/Makefile.i
-data/test/javax/naming/ldap/LdapName/LdapParserTests.java.i
-data/src/share/classes/sun/management/HotspotThreadMBean.java.i
+data/src/share/classes/org/ietf/jgss/ChannelBinding.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif.i
data/test/java/io/Serializable/typeStringBackRef/TypeStringBackRef.java.i
+data/src/share/classes/java/lang/RuntimeException.java.i
data/src/windows/classes/sun/net/www/protocol/file/Handler.java.i
-data/src/share/native/sun/font/layout/MPreFixups.h.i
-data/test/org/openjdk/jigsaw/hello.sh.i
+data/src/share/native/sun/security/ec/impl/mp_gf2m.h.i
+data/src/share/classes/sun/net/smtp/SmtpProtocolException.java.i
data/test/java/awt/print/PrinterJob/ImagePrinting/ClippedImages.java.i
data/make/common/CancelImplicits.gmk.i
-data/src/share/native/sun/awt/debug/debug_assert.c.i
-data/src/solaris/native/sun/nio/ch/PollArrayWrapper.c.i
-data/src/windows/native/sun/jkernel/graphics/masthead.bmp.i
-data/test/java/util/ResourceBundle/Control/PrivateConstructorRB.java.i
+data/src/share/classes/java/lang/RuntimePermission.java.i
+data/test/java/security/SecureRandom/sha1prng-old.bin.i
+data/test/java/nio/file/Files/walkFileTree/grantAll.policy.i
+data/src/share/classes/sun/tools/jconsole/inspector/XArrayDataViewer.java.i
data/test/java/rmi/activation/Activatable/checkAnnotations/security.policy.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest12_ko.properties.in.i
data/test/java/nio/file/WatchService/grantDirAndOneLevel.policy.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/duke.gif.i
data/src/share/classes/javax/swing/plaf/basic/BasicViewportUI.java.i
data/src/solaris/classes/sun/awt/motif/MFileDialogPeer.java.i
-data/src/share/classes/com/sun/media/sound/AudioSynthesizer.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java.i
+data/src/share/classes/com/sun/media/sound/JARSoundbankReader.java.i
+data/src/share/classes/java/security/PolicySpi.java.i
data/test/javax/swing/text/WrappedPlainView/6857057/bug6857057.java.i
-data/src/solaris/classes/com/sun/management/UnixOperatingSystem.java.i
+data/test/org/openjdk/jigsaw/_Resolver.java.i
data/make/tools/CharsetMapping/MS1251.map.i
data/test/java/beans/Introspector/Test4072197.java.i
data/make/java/main/java/mapfile-sparcv9.i
+data/src/windows/classes/java/net/DefaultInterface.java.i
data/test/java/lang/reflect/Modifier/toStringTest.java.i
-data/src/share/demo/jfc/Metalworks/BigContrastMetalTheme.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14NMethod.java.i
-data/src/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java.i
-data/src/solaris/classes/sun/awt/motif/MFontConfiguration.java.i
+data/test/com/sun/jndi/ldap/NoWaitForReplyTest.java.i
+data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.sh.i
+data/src/share/classes/javax/management/loading/MLetMBean.java.i
+data/src/solaris/native/java/io/FileSystem_md.c.i
data/src/share/classes/javax/swing/plaf/synth/SynthDesktopIconUI.java.i
-data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.sh.i
+data/test/java/nio/Buffer/genBasic.sh.i
data/src/share/demo/applets/WireFrame/example2.html.i
-data/make/mkdemo/jvmti/README.txt.i
+data/test/javax/sound/sampled/AudioFormat/Matches_NOT_SPECIFIED.java.i
data/test/java/security/CodeSigner/cert_file.i
data/test/sun/rmi/rmic/covariantReturns/run.sh.i
-data/src/share/classes/java/io/OutputStreamWriter.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java.i
-data/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java.i
-data/test/sun/java2d/DirectX/OnScreenRenderingResizeTest/OnScreenRenderingResizeTest.java.i
+data/test/java/lang/ClassLoader/defineClass/DefineClassByteBuffer.java.i
+data/src/share/classes/javax/print/attribute/standard/OrientationRequested.java.i
+data/make/tools/src/build/tools/javazic/RuleDay.java.i
+data/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java.i
data/src/share/classes/sun/dc/DuctusRenderingEngine.java.i
data/test/org/openjdk/jigsaw/repolist.sh.i
data/test/javax/swing/plaf/synth/6771547/synthconfig.xml.i
+data/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java.i
+data/src/macosx/classes/sun/java2d/opengl/CGLVolatileSurfaceManager.java.i
data/test/java/net/Socket/ShutdownBoth.java.i
-data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy.i
+data/src/macosx/native/sun/awt/CClipboard.h.i
data/src/share/classes/sun/security/jgss/GSSContextImpl.java.i
data/src/share/classes/sun/text/resources/FormatData_no_NO.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_CH.properties.i
@@ -14047,27 +14638,28 @@ data/src/share/classes/java/net/URLStreamHandlerFactory.java.i
data/test/java/awt/print/PrinterJob/SameService.java.i
data/test/sun/security/jgss/DefaultGssConfig.java.i
data/src/share/native/sun/reflect/NativeAccessors.c.i
-data/src/solaris/native/sun/awt/awt_InputMethod.c.i
-data/src/solaris/classes/sun/net/www/protocol/http/NTLMAuthentication.java.i
+data/src/solaris/native/sun/java2d/loops/vis_IntBgr.c.i
+data/src/solaris/doc/sun/man/man1/ja/jvisualvm.1.i
+data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/Receiver.java.i
data/test/sun/net/www/protocol/jar/copyin.sh.i
-data/make/tools/CharsetMapping/IBM1143.map.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/MyX509KeyManager.java.i
data/test/sun/tools/jstat/jstatGcOutput1.sh.i
-data/test/javax/smartcardio/Serialize.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_GB.properties.i
data/src/share/classes/javax/management/openmbean/OpenMBeanParameterInfo.java.i
data/src/share/classes/sun/security/ec/ECKeyPairGenerator.java.i
data/src/share/classes/sun/tools/tree/IncDecExpression.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java.i
+data/src/share/classes/sun/security/jgss/krb5/WrapToken_v2.java.i
data/test/java/beans/XMLEncoder/javax_swing_OverlayLayout.java.i
data/test/java/nio/file/Files/walkFileTree/Nulls.java.i
+data/src/solaris/native/java/lang/java_props_macosx.c.i
data/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c.i
-data/src/windows/transport/shmem/shmem_md.h.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Struct.java.i
data/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java.i
data/src/windows/native/sun/windows/awt_GDIObject.h.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/back.gif.i
data/make/tools/CharsetMapping/IBM1025.map.i
-data/src/share/classes/java/lang/management/package.html.i
+data/src/share/classes/java/util/concurrent/ForkJoinPool.java.i
data/test/com/sun/jdi/LocationTest.java.i
-data/test/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java.i
data/src/share/classes/java/awt/font/MultipleMaster.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_en_IE.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert2.i
@@ -14075,24 +14667,23 @@ data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankUrl.java.i
data/src/share/native/com/sun/media/sound/PlatformMidi.h.i
data/src/share/native/java/util/zip/zlib-1.2.5/zcrc32.c.i
data/test/javax/management/remote/mandatory/socketFactories/RMIServerFactory.java.i
-data/src/share/classes/javax/swing/SpinnerListModel.java.i
+data/src/solaris/native/sun/awt/awt_Checkbox.c.i
data/src/share/classes/sun/security/ec/NamedCurve.java.i
-data/src/share/classes/javax/crypto/spec/DHParameterSpec.java.i
+data/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java.i
data/test/sun/security/krb5/auto/Test5653.java.i
data/src/share/classes/sun/tools/java/BinaryConstantPool.java.i
-data/test/sun/security/tools/jarsigner/diffend.sh.i
-data/src/share/classes/sun/io/ByteToCharCp964.java.i
+data/test/sun/net/www/protocol/http/B6299712.java.i
data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImpl_Stub.java.i
data/test/java/util/concurrent/FutureTask/CancelledFutureLoops.java.i
data/src/share/classes/sun/security/ssl/ProtocolList.java.i
-data/src/share/classes/com/sun/security/auth/SubjectCodeSource.java.i
+data/make/com/sun/java/browser/dom/Makefile.i
data/src/share/demo/jfc/TableExample/TableMap.java.i
data/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java.i
data/src/share/classes/javax/imageio/event/IIOWriteProgressListener.java.i
-data/src/share/classes/sun/applet/resources/MsgAppletViewer_de.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_PA.java.i
data/src/share/demo/nbproject/management/JTop/build.xml.i
data/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
-data/src/share/classes/java/text/Bidi.java.i
+data/src/share/demo/jvmti/hprof/hprof_tls.c.i
data/src/share/sample/nio/server/B1.java.i
data/test/java/util/zip/ZipFile/CorruptedZipFiles.java.i
data/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java.i
@@ -14101,91 +14692,96 @@ data/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.
data/test/sun/nio/cs/JISAutoDetectTest.java.i
data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/hindi.ut8.txt.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/SimpleShape.java.i
-data/src/windows/classes/sun/awt/Win32ColorModel24.java.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav.i
-data/src/share/classes/javax/swing/text/html/HTMLFrameHyperlinkEvent.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM949C.java.i
+data/test/java/awt/FontClass/SurrogateTest/SupplementaryCanDisplayUpToTest.java.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy.i
+data/test/java/lang/management/ThreadMXBean/Semaphore.java.i
data/test/java/io/File/Basic.java.i
data/src/share/classes/java/security/DigestOutputStream.java.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/p11-nss.txt.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/HMACParameterSpec.java.i
-data/test/javax/management/remote/mandatory/connectorServer/StandardForwardersTest.java.i
+data/test/java/util/ResourceBundle/Test4318520.java.i
+data/test/java/net/DatagramSocket/SendDatagramToBadAddress.java.i
+data/src/windows/classes/sun/awt/windows/WCustomCursor.java.i
data/test/java/lang/Character/CheckScript.java.i
data/src/share/classes/sun/net/www/content/image/png.java.i
data/test/java/net/ProxySelector/NullSelector.java.i
-data/src/solaris/bin/arm/jvm.cfg.i
+data/test/javax/management/mxbean/MXBeanAnnotationTest.java.i
data/src/share/classes/sun/nio/ch/ServerSocketChannelImpl.java.i
-data/src/share/native/sun/font/layout/MPreFixups.cpp.i
+data/test/java/net/DatagramSocket/SendSize.java.i
data/test/sun/nio/cs/OLD/IBM948_OLD.java.d
data/src/share/classes/sun/rmi/transport/LiveRef.java.i
data/src/share/classes/sun/security/krb5/internal/TCPClient.java.i
data/src/solaris/native/java/lang/java_props_md.c.i
data/test/java/lang/instrument/DummyClass.java.i
-data/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider.i
data/src/share/classes/sun/tools/tree/SwitchStatement.java.i
-data/make/com/sun/jmx/Makefile.i
+data/src/macosx/native/sun/awt/CFRetainedResource.m.i
+data/test/com/sun/crypto/provider/Cipher/DES/KeyWrapping.java.i
data/src/windows/classes/sun/nio/ch/DefaultSelectorProvider.java.i
data/test/demo/jvmti/hprof/CpuOldTest.java.i
+data/make/PatchList.solaris.i
data/test/sun/nio/cs/OLD/MS932_OLD.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/NoteOff.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NewSocketMethods.java.i
+data/src/macosx/native/sun/osxapp/ThreadUtilities.m.i
data/make/tools/CharsetMapping/ISO_8859_11.map.i
+data/src/share/classes/javax/swing/border/CompoundBorder.java.i
data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.h.i
data/test/java/awt/image/GetDataElementsTest.java.i
-data/make/sun/security/mscapi/Makefile.i
-data/src/windows/native/sun/jkernel/kernel_en.rc.i
+data/src/share/classes/sun/util/resources/CalendarData_ro.properties.i
+data/test/sun/security/krb5/auto/Action.java.i
data/test/sun/nio/cs/OLD/IBM943C_OLD.java.i
-data/test/java/lang/ref/ReferenceEnqueue.java.i
+data/src/share/classes/java/io/PipedOutputStream.java.i
data/test/java/awt/print/PrinterJob/GetMediasTest.java.i
data/test/java/util/ResourceBundle/Bug6204853.java.i
-data/test/javax/security/auth/login/Configuration/GetInstanceConfigSpi.java.i
+data/src/share/native/sun/awt/image/DataBufferNative.c.i
data/test/java/lang/invoke/6991596/Test6991596.java.i
data/test/java/net/URLClassLoader/closetest/build.sh.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c.i
data/src/share/demo/java2d/J2DBench/options/default.opt.i
data/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/jibxhelpers/FontMapper.java.i
+data/test/tools/pack200/pack200-verifier/data/README.i
data/src/share/classes/com/sun/crypto/provider/AESCipher.java.i
data/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_2.java.i
data/src/share/classes/javax/crypto/KeyAgreement.java.i
data/src/share/classes/javax/management/monitor/package.html.i
-data/src/windows/native/sun/jkernel/DownloadHelper.h.i
+data/test/java/nio/file/TestUtil.java.i
data/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/CountedTimerTask.java.i
data/test/java/math/BigDecimal/DivideMcTests.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/PolyPressure.java.i
-data/test/sun/java2d/DirectX/NonOpaqueDestLCDAATest/NonOpaqueDestLCDAATest.java.i
+data/test/org/openjdk/jigsaw/hello.sh.i
data/test/java/util/PluggableLocale/ExecTest.sh.i
-data/src/share/classes/sun/text/resources/FormatData_ms.java.i
-data/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java.i
-data/src/share/classes/sun/util/calendar/ZoneInfoFile.java.i
+data/src/solaris/classes/sun/nio/fs/UnixUserPrincipals.java.i
+data/src/macosx/native/sun/awt/PrinterSurfaceData.h.i
+data/src/share/classes/java/awt/DisplayMode.java.i
data/test/java/net/InetAddress/Simple2NameServiceDescriptor.java.i
data/src/solaris/classes/sun/awt/motif/MCheckboxMenuItemPeer.java.i
data/src/share/classes/sun/security/x509/AttributeNameEnumeration.java.i
-data/test/org/openjdk/jigsaw/services/many.sh.i
-data/test/javax/script/CommonSetup.sh.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java.i
data/make/tools/src/build/tools/charsetmapping/Main.java.i
data/src/share/classes/sun/security/util/ManifestDigester.java.i
-data/src/solaris/classes/sun/java2d/xr/GrowableIntArray.java.i
+data/src/solaris/classes/sun/nio/fs/UnixMountEntry.java.i
data/test/java/util/jar/JarInputStream/ScanSignedJar.java.i
-data/src/share/classes/sun/font/FontLineMetrics.java.i
+data/test/java/net/Socket/AccurateTimeout.java.i
data/test/java/io/charStreams/LineGenerator.java.i
-data/make/java/management/FILES_c.gmk.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BaseBench.java.i
+data/test/java/rmi/server/RemoteObject/notExtending/NotExtending_Stub.java.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetExclusiveClass.java.i
data/make/tools/CharsetMapping/euc_tw.map.d
data/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java.i
data/test/sun/nio/cs/EucJpLinux0212.java.i
data/src/share/classes/sun/security/krb5/internal/MethodData.java.i
-data/test/java/net/URL/ParseAuthority.java.i
+data/src/solaris/doc/sun/man/man1/ja/serialver.1.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfDataBufferImpl.java.i
data/make/mkdemo/jfc/Makefile.i
data/src/share/native/sun/java2d/loops/AnyByte.h.i
-data/src/share/classes/com/sun/tools/hat/resources/platform_names.txt.i
-data/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java.i
-data/make/tools/CharsetMapping/euc_tw.map.i
-data/src/share/native/sun/awt/image/jpeg/jversion.h.i
+data/src/share/native/sun/font/layout/LEGlyphStorage.cpp.i
+data/src/solaris/hpi/native_threads/include/porting.h.i
+data/make/tools/CharsetMapping/IBM284.map.i
data/src/share/classes/java/rmi/server/RMIFailureHandler.java.i
-data/make/tools/CharsetMapping/IBM939.c2b.i
+data/test/java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java.i
+data/test/java/lang/instrument/ilib/Info.java.i
+data/test/java/nio/file/Files/Misc.java.i
data/test/sun/security/pkcs11/fips/JSSEClient.java.i
data/src/share/native/sun/font/layout/LEGlyphFilter.h.i
data/src/solaris/native/sun/awt/medialib/vis_proto.h.i
@@ -14193,125 +14789,127 @@ data/test/sun/security/provider/certpath/DisabledAlgorithms/openssl.cnf.i
data/src/linux/doc/man/jstat.1.i
data/src/solaris/classes/sun/awt/X11/XFileDialogPeer.java.i
data/test/javax/management/relation/NonArrayListTest.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509CRL.java.i
+data/src/share/native/sun/java2d/opengl/OGLBlitLoops.h.i
data/test/sun/nio/cs/BufferUnderflowEUCTWTest.java.i
-data/src/share/classes/java/security/DomainCombiner.java.i
+data/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java.i
data/src/share/demo/java2d/J2DBench/resources/textdata/hebrew.ut8.txt.i
data/src/share/classes/com/sun/jdi/connect/spi/package.html.i
data/src/share/classes/javax/swing/doc-files/groupLayout.2.gif.i
-data/src/share/classes/sun/nio/cs/IBM852.java.i
+data/test/java/beans/XMLEncoder/java_sql_Timestamp.java.i
data/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java.i
-data/src/share/classes/sun/invoke/util/ValueConversions.java.i
+data/test/java/net/B6499348.java.i
data/src/share/classes/javax/naming/spi/DirectoryManager.java.i
-data/src/share/native/sun/java2d/loops/GraphicsPrimitiveMgr.c.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain0.txt.i
data/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java.i
data/src/windows/native/sun/windows/awt_MouseEvent.h.i
data/test/java/math/BigInteger/ModPowPowersof2.java.i
data/test/java/nio/channels/DatagramChannel/ReceiveISA.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/package.html.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java.i
data/src/share/classes/sun/io/ByteToCharDoubleByte.java.i
data/src/share/classes/sun/security/x509/X509Cert.java.i
data/test/com/sun/jdi/NullLocalVariable.sh.i
-data/src/share/classes/java/nio/file/FileVisitor.java.i
-data/src/solaris/classes/sun/nio/fs/UnixFileStore.java.i
+data/test/java/rmi/server/serverStackTrace/ServerStackTrace.java.i
+data/test/sun/security/krb5/auto/BadKdc.java.i
data/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif.i
+data/test/java/security/Security/signedfirst/exp.jar.i
+data/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java.i
data/test/java/lang/annotation/AnnotationTypeMismatchException/FoundType.java.i
-data/src/share/classes/javax/swing/colorchooser/SyntheticImage.java.i
+data/make/mkdemo/jvmti/README.txt.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxSSLContextImpl.java.i
data/make/tools/CharsetMapping/IBM833.map.i
data/make/tools/CharsetMapping/ISO_8859_3.map.i
data/src/share/classes/javax/management/modelmbean/XMLParseException.java.i
data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService_Stub.java.i
-data/src/share/classes/com/sun/security/auth/NTSidUserPrincipal.java.i
-data/test/java/beans/Introspector/Test6963811.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Multiple.java.i
+data/test/com/sun/jdi/StepTest.java.i
data/src/solaris/classes/sun/java2d/xr/XRRenderer.java.i
data/test/sun/management/HotspotRuntimeMBean/GetSafepointSyncTime.java.i
data/src/share/classes/java/awt/font/package.html.i
data/test/sun/tools/jstat/jstatHelp.sh.i
data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Array.java.i
data/src/share/native/sun/font/layout/SingleTableProcessor.cpp.i
+data/src/share/classes/sun/io/ByteToCharSingleByte.java.i
data/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh.i
data/src/share/classes/com/sun/net/ssl/KeyManager.java.i
-data/src/share/classes/java/sql/Clob.java.i
+data/src/share/classes/javax/smartcardio/CardChannel.java.i
+data/src/share/classes/sun/tools/jstat/ColumnFormat.java.i
+data/make/tools/CharsetMapping/IBM1144.c2b.i
data/src/share/classes/javax/swing/plaf/synth/SynthPanelUI.java.i
-data/src/share/classes/java/io/DataInputStream.java.i
+data/test/java/security/cert/CertificateFactory/BadX509CertData.java.i
+data/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java.i
data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.html.i
-data/test/java/lang/ThreadLocal/TestThreadId.java.i
data/test/java/awt/event/MouseEvent/EventTimeInFuture/EventTimeInFuture.java.i
data/test/java/util/UUID/UUIDTest.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_CheckedMap.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_CREATEMUTEX.java.i
+data/test/javax/swing/DataTransfer/6456844/bug6456844.java.i
data/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp.i
data/test/java/beans/XMLEncoder/Test6570354.java.i
data/test/java/awt/image/MemoryLeakTest/MemoryLeakTest.java.i
data/src/share/classes/sun/print/resources/serviceui.properties.i
-data/src/share/classes/sun/text/normalizer/UCharacterIterator.java.i
+data/test/java/net/URLConnection/xml/xml1.i
data/test/java/util/logging/LoggerWeakRefLeak.sh.i
data/src/windows/native/sun/windows/awt_DnDDT.cpp.i
data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.grantedPolicy.i
data/src/share/classes/sun/security/provider/certpath/OCSPRequest.java.i
data/make/tools/CharsetMapping/IBM1142.map.i
+data/src/macosx/classes/com/apple/eawt/event/GestureHandler.java.i
data/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java.i
data/test/sun/security/pkcs11/fips/cert8.db.i
data/src/share/classes/sun/io/ByteToCharISO2022KR.java.i
-data/src/share/classes/javax/swing/JMenuItem.java.i
+data/src/share/native/java/lang/fdlibm/src/w_hypot.c.i
data/test/demo/zipfs/basic.sh.i
-data/test/java/lang/StrictMath/HypotTests.java.i
+data/src/share/classes/com/sun/media/sound/SoftMixingMixer.java.i
data/src/share/classes/com/sun/servicetag/LinuxSystemEnvironment.java.i
data/make/tools/sharing/tests/JHello.java.i
-data/test/java/lang/Double/Constants.java.i
-data/test/java/nio/channels/etc/NetworkChannelTests.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionException.java.i
+data/test/java/net/URLConnection/xml/xml3.i
+data/src/share/native/sun/awt/libpng/pngstruct.h.i
data/src/share/classes/java/awt/GraphicsCallback.java.i
-data/src/share/classes/javax/security/auth/x500/X500Principal.java.i
+data/test/java/lang/instrument/PremainClass/InheritAgent0011.java.i
data/test/java/lang/instrument/PremainClass/README.i
data/test/java/util/ResourceBundle/Control/NonResourceBundle.java.i
data/src/share/classes/com/sun/pept/transport/Connection.java.i
data/src/share/classes/javax/swing/text/Caret.java.i
data/test/java/io/PrintWriter/OpsAfterClose.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ipstore.i
-data/src/share/classes/javax/imageio/event/IIOReadWarningListener.java.i
-data/src/windows/classes/sun/nio/ch/FileKey.java.i
+data/src/share/classes/sun/tools/jar/resources/jar_de.properties.i
+data/src/solaris/native/sun/awt/awt_Cursor.h.i
data/test/java/net/DatagramPacket/ReuseBuf.java.i
data/src/share/classes/sun/io/CharToByteCp1143.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxTransmitters.java.i
-data/src/share/classes/sun/applet/AppletIllegalArgumentException.java.i
+data/make/java/nio/FILES_java.gmk.i
+data/src/share/classes/java/util/jar/Pack200.java.i
data/src/share/classes/sun/applet/AppletAudioClip.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/OrangeEchoImpl.java.i
+data/test/java/io/Serializable/unnamedPackageSwitch/A.java.i
data/src/share/classes/sun/security/krb5/Config.java.i
data/src/share/native/java/lang/Class.c.i
data/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h.i
+data/src/share/classes/sun/tools/tree/ForStatement.java.i
data/src/share/demo/jfc/TableExample/TableExample.java.i
data/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java.i
-data/src/share/classes/java/util/concurrent/locks/ReadWriteLock.java.i
+data/make/mkdemo/applets/GraphicsTest/Makefile.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Category.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-interim48.png.i
-data/make/tools/sharing/tests/GHello.java.i
-data/src/share/transport/shmem/shmemBase.h.i
+data/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java.i
+data/src/share/classes/sun/text/resources/FormatData_zh_CN.java.i
data/make/tools/swing-beans/beaninfo/images/JInternalFrameMono16.gif.i
-data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-result.jpg.i
+data/make/java/nio/mxbean/Makefile.i
data/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneUI.java.i
-data/src/share/native/sun/security/ec/impl/ec.c.i
+data/src/share/instrument/JPLISAgent.c.i
data/src/share/hpi/src/hpi.c.i
data/make/tools/src/build/tools/jdwpgen/ClassTypeNode.java.i
data/test/java/nio/charset/CharsetDecoder/EmptyInput.java.i
-data/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java.i
data/test/javax/swing/AbstractButton/6711682/bug6711682.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableSortedSet.java.i
data/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java.i
-data/test/java/net/Authenticator/B4678055.java.i
data/test/javax/imageio/plugins/png/PngOutputTypeTest.java.i
data/src/share/demo/jfc/Notepad/resources/cut.gif.i
data/test/tools/launcher/lib/sparc/lib32/liblibrary.so.i
data/src/share/native/sun/font/layout/GlyphPosnLookupProc.h.i
data/test/java/rmi/activation/Activatable/nestedActivate/ActivateMe.java.i
-data/src/share/sample/scripting/scriptpad/src/resources/conc.js.i
-data/test/java/util/Locale/serialized/java6locale__US.i
-data/src/share/classes/com/sun/jndi/dns/DnsNameParser.java.i
-data/test/com/sun/jdi/FilterNoMatch.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_nl_NL.properties.i
-data/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java.i
+data/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh.i
+data/test/javax/management/ObjectName/ComparatorTest.java.i
+data/test/java/lang/InheritableThreadLocal/ITLRemoveTest.java.i
+data/test/com/sun/jdi/FilterNoMatch.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_CheckedRandomAccessList.java.i
data/test/com/sun/security/sasl/log.properties.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_US.properties.i
@@ -14325,94 +14923,98 @@ data/src/share/classes/com/sun/media/sound/DataPusher.java.i
data/test/java/lang/reflect/Generics/TestC1.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java.i
data/src/share/classes/java/util/concurrent/ConcurrentLinkedQueue.java.i
-data/src/share/classes/sun/text/resources/FormatData_de.java.i
+data/src/share/classes/java/awt/Choice.java.i
data/test/java/util/Hashtable/ReadObject.java.i
data/test/javax/print/applet/applet1/Applet1.java.i
data/src/share/classes/javax/swing/MenuSelectionManager.java.i
data/make/tools/CharsetMapping/IBM424.nr.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties.i
+data/src/share/classes/javax/swing/LayoutComparator.java.i
data/src/share/native/sun/awt/giflib/dgif_lib.c.i
data/src/share/demo/nbproject/jfc/Metalworks/nbproject/netbeans-targets.xml.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java.i
data/test/javax/print/DialogMargins.java.i
data/src/share/classes/sun/awt/EmbeddedFrame.java.i
-data/test/sun/security/smartcardio/Utils.java.i
+data/src/share/classes/sun/security/pkcs12/MacData.java.i
data/src/share/classes/com/sun/media/sound/SunFileWriter.java.i
data/make/com/oracle/security/ucrypto/mapfile-vers.i
-data/test/org/openjdk/jigsaw/_Resolver.java.i
+data/test/java/nio/charset/Charset/default.sh.i
data/test/javax/swing/border/Test4120351.java.i
data/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Compress.java.i
-data/src/share/native/java/lang/fdlibm/src/s_expm1.c.i
+data/src/windows/native/sun/windows/awt_MenuItem.cpp.i
+data/src/share/classes/java/awt/geom/AffineTransform.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load4.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java.i
data/make/tools/swing-beans/beaninfo/images/JTextPaneMono16.gif.i
data/src/windows/native/sun/java2d/d3d/D3DGlyphCache.h.i
-data/src/share/classes/javax/swing/DefaultDesktopManager.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSortedMap.java.i
data/test/java/lang/instrument/bootclasspathAgent.mf.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/maximize-pressed.gif.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedSortedMap.java.i
-data/test/javax/print/applet/applet4/Applet4.java.i
data/test/java/net/Socket/AddressTest.java.i
data/src/share/classes/com/sun/servicetag/resources/Putback-Notes.txt.i
data/src/windows/native/java/lang/ProcessImpl_md.c.i
data/src/solaris/classes/sun/java2d/xr/XcbRequestCounter.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/Coder.java.i
data/src/share/classes/javax/management/remote/JMXConnectorServerFactory.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedCollection.java.i
data/src/solaris/native/sun/java2d/loops/vis_SrcMaskFill.c.i
-data/test/sun/security/ssl/templates/SSLEngineTemplate.java.i
-data/test/java/io/File/HashCodeEquals.java.i
+data/src/share/classes/javax/management/MBeanPermission.java.i
+data/src/macosx/native/sun/awt/QuartzSurfaceData.h.i
+data/src/bsd/doc/man/ja/policytool.1.i
data/src/share/classes/sun/reflect/generics/scope/Scope.java.i
data/src/linux/doc/man/ja/rmic.1.i
data/src/share/native/sun/awt/image/jpeg/jdapimin.c.i
-data/src/share/classes/java/dyn/MethodHandleProvider.java.i
-data/src/share/classes/sun/tools/java/SyntaxError.java.i
+data/src/share/classes/javax/swing/text/TabableView.java.i
+data/src/share/classes/sun/print/CustomMediaSizeName.java.i
data/src/share/classes/sun/font/TrueTypeGlyphMapper.java.i
-data/test/java/security/KeyRep/RC5.pre.1.5.key.i
data/src/share/classes/java/lang/reflect/Proxy.java.i
data/make/org/Makefile.i
data/src/share/classes/java/util/concurrent/PriorityBlockingQueue.java.i
-data/src/solaris/classes/sun/awt/X11/UnsafeXDisposerRecord.java.i
-data/src/share/native/sun/java2d/loops/ImageData.h.i
-data/test/java/util/jar/JarEntry/test.jar.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactoryBER.java.i
-data/src/solaris/classes/sun/awt/X11/XScrollPanePeer.java.i
-data/test/java/awt/print/Dialog/DialogType.java.i
+data/src/share/modules/jdk.swing/module-info.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/generate.sh.i
+data/test/java/awt/image/ConvolveOp/EdgeNoOpCrash.java.i
+data/src/share/classes/com/sun/jmx/snmp/defaults/SnmpProperties.java.i
+data/test/java/rmi/activation/Activatable/nestedActivate/rmid.security.policy.i
+data/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java.i
+data/test/java/util/ResourceBundle/Bug4168625Resource2.java.i
data/src/share/classes/sun/security/pkcs11/P11Signature.java.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPMetadata.java.i
data/src/share/classes/sun/awt/geom/ChainEnd.java.i
-data/make/README.i
+data/src/share/classes/sun/tools/jconsole/inspector/IconManager.java.i
data/src/solaris/doc/sun/man/man1/ja/jconsole.1.i
data/src/share/native/sun/security/ec/mpi-priv.h.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts/Company-corporate.ttf.i
data/src/share/classes/com/sun/tools/hat/resources/hat.js.i
+data/test/java/security/Security/signedfirst/Static.sh.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_PitchBend.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java.i
data/make/tools/swing-beans/beaninfo/images/JViewportColor16.gif.i
data/src/share/sample/vm/jvm-clr/invoker.java.i
data/src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java.i
-data/src/share/classes/javax/sound/midi/spi/MidiFileReader.java.i
+data/src/share/classes/sun/security/x509/RFC822Name.java.i
data/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh.i
data/test/sun/security/krb5/DnsFallback.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c.i
data/test/java/lang/instrument/ParallelTransformerLoaderAgent.java.i
-data/test/java/io/InputStream/OpsAfterClose.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/OutputFile.java.i
+data/test/java/beans/VetoableChangeSupport/TestListeners.java.i
+data/test/sun/net/InetAddress/nameservice/CacheTest.java.i
data/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/inflate.h.i
-data/src/share/classes/sun/nio/cs/US_ASCII.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/Functions.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so.i
data/test/java/rmi/reliability/benchmark/bench/serial/Main.java.i
-data/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java.i
data/src/share/classes/sun/security/pkcs11/P11Mac.java.i
data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/IOExceptionIfEncodedURLTest.java.i
data/src/share/classes/java/sql/Ref.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/ca2.cert.i
data/src/share/classes/java/sql/Array.java.i
-data/test/javax/xml/crypto/dsig/data/signature-keyname.xml.i
-data/src/share/native/sun/java2d/opengl/OGLContext.h.i
+data/test/java/nio/charset/spi/Test.java.i
+data/src/share/native/java/lang/fdlibm/src/s_logb.c.i
data/make/tools/CharsetMapping/IBM037.c2b.i
data/src/share/classes/sun/nio/cs/StreamEncoder.java.i
-data/test/java/awt/im/InputContext/bug4625203.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/SimpleNode.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c.i
data/src/share/classes/javax/swing/SwingPaintEventDispatcher.java.i
@@ -14420,19 +15022,17 @@ data/test/demo/jvmti/DemoRun.java.i
data/src/share/sample/nio/chatserver/DataReader.java.i
data/src/share/classes/javax/naming/event/EventDirContext.java.i
data/make/tools/src/build/tools/jdwpgen/CommandSetNode.java.i
-data/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java.i
data/test/javax/rmi/ssl/SSLSocketParametersTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_ar_BH.java.i
+data/test/sun/tools/jcmd/jcmd_pid_Output1.awk.i
data/test/java/nio/channels/ServerSocketChannel/Open.java.i
-data/src/share/classes/com/sun/jndi/dns/DnsClient.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java.i
+data/test/java/awt/Toolkit/ToolkitPropertyTest/SystemPropTest_2.java.i
+data/test/java/beans/Introspector/7122138/Test7122138.java.i
data/src/share/classes/com/sun/tools/jdi/VMAction.java.i
data/test/javax/management/descriptor/MBeanInfoInteropTest.java.i
data/src/share/classes/sun/nio/fs/Cancellable.java.i
data/src/share/classes/java/lang/doc-files/sigma1.gif.i
data/src/share/sample/nbproject/project.xml.i
-data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java.i
-data/make/tools/swing-beans/beaninfo/images/JFrameColor32.gif.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.dll.i
data/test/java/nio/file/DirectoryStream/SecureDS.java.i
data/src/share/native/sun/java2d/loops/IntArgb.c.i
data/test/java/net/Socks/SocksV4Test.java.i
@@ -14441,104 +15041,103 @@ data/test/java/beans/XMLEncoder/java_beans_Statement.java.i
data/test/java/nio/file/Files/walkFileTree/CreateFileTree.java.i
data/test/java/nio/charset/coders/SJISPropTest.java.i
data/src/windows/classes/java/io/WinNTFileSystem.java.i
-data/src/share/sample/nio/chatserver/README.txt.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreUp.wav.i
data/src/linux/doc/man/javap.1.i
data/make/sun/javazic/tzdata/solar88.i
data/test/javax/swing/JSlider/6587742/bug6587742.html.i
-data/src/solaris/native/sun/awt/XDrawingArea.c.i
-data/make/tools/CharsetMapping/IBM870.c2b.i
+data/src/share/classes/java/beans/package.html.i
+data/src/share/classes/sun/util/locale/LocaleUtils.java.i
data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpInformHandler.java.i
-data/src/share/classes/com/sun/jmx/namespace/NamespaceInterceptor.java.i
data/src/share/classes/java/net/DatagramSocketImplFactory.java.i
data/test/javax/swing/JSlider/6524424/bug6524424.html.i
data/src/windows/classes/sun/awt/windows/WDragSourceContextPeer.java.i
data/src/share/classes/javax/swing/text/Element.java.i
-data/make/sun/motif12/reorder-i586.i
+data/test/sun/security/provider/PolicyFile/Alias.policy.i
data/src/share/classes/javax/management/QualifiedAttributeValueExp.java.i
data/src/share/classes/java/lang/Compiler.java.i
data/src/solaris/native/sun/awt/awt_DataTransferer.h.i
data/src/windows/native/sun/windows/awt_Debug.h.i
data/src/share/native/sun/awt/image/cvutils/img_input32.h.i
-data/test/javax/management/mxbean/JMXServiceURLTest.java.i
-data/src/share/classes/javax/management/DynamicMBean.java.i
-data/test/java/lang/String/Exceptions.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/Hello.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriterSpi.java.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html.i
data/test/sun/nio/cs/SurrogateTestEUCTW.java.i
data/test/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java.i
-data/src/share/classes/sun/text/resources/FormatData_cs_CZ.java.i
-data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java.i
+data/src/solaris/classes/sun/awt/X11/XFontPeer.java.i
data/src/windows/native/sun/windows/awt_InputMethod.cpp.i
data/src/share/classes/javax/swing/text/doc-files/OpenBookIcon.gif.i
data/test/sun/java2d/SunGraphicsEnvironment/TestSGEuseAlternateFontforJALocales.java.i
data/src/solaris/native/sun/awt/awt_XmDnD.c.i
data/src/windows/hpi/export/path_md.h.i
-data/src/share/classes/java/rmi/server/RMIServerSocketFactory.java.i
+data/make/common/BuildToolJar.gmk.i
data/test/java/security/Exceptions/ChainingConstructors.java.i
-data/test/sun/net/sdp/ProbeIB.java.i
+data/src/share/native/sun/font/layout/GDEFMarkFilter.cpp.i
data/src/share/classes/java/lang/invoke/SwitchPoint.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/SSLEngineService.java.i
data/test/javax/swing/JColorChooser/Test6977726.html.i
+data/src/share/native/sun/java2d/opengl/OGLPaints.c.i
data/src/share/classes/sun/io/CharToByteCp297.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerShadowEffect.java.i
-data/test/sun/net/www/protocol/http/DigestTest.java.i
+data/test/java/beans/PropertyEditor/TestShortTypeValue.java.i
data/src/solaris/bin/java_md.c.i
-data/test/java/nio/channels/AsynchronousSocketChannel/Basic.java.i
+data/src/solaris/classes/sun/awt/X11/XContentWindow.java.i
data/src/share/classes/sun/nio/fs/Reflect.java.i
-data/src/share/demo/applets/WireFrame/Matrix3D.java.i
+data/src/share/classes/javax/naming/ldap/StartTlsRequest.java.i
+data/test/sun/java2d/cmm/ProfileOp/SetDataTest.java.i
+data/src/share/native/sun/java2d/loops/IntRgb.c.i
data/src/share/classes/sun/tools/asm/NameAndTypeData.java.i
-data/test/com/sun/jdi/InnerTarg.java.i
data/make/tools/src/build/tools/javazic/Month.java.i
data/make/tools/swing-beans/beaninfo/images/JPanelColor32.gif.i
data/src/linux/doc/man/jconsole.1.i
data/src/share/classes/java/text/SimpleDateFormat.java.i
-data/test/java/nio/Buffer/StringCharBufferSliceTest.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c.i
data/test/javax/management/monitor/StringMonitorDeadlockTest.java.i
data/src/share/classes/sun/util/resources/TimeZoneNames_en_CA.java.i
+data/src/share/classes/java/awt/event/FocusListener.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPasswordFieldUI.java.i
-data/src/windows/classes/sun/nio/fs/WindowsException.java.i
data/make/mkdemo/applets/Animator/Makefile.i
+data/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java.i
data/make/tools/winver/src/winver.cpp.i
data/src/share/classes/java/awt/dnd/DropTarget.java.i
data/test/java/lang/Runtime/exec/ExecWithLotsOfArgs.java.i
data/test/javax/swing/MultiUIDefaults/Test6860438.java.i
+data/make/sun/security/action/Makefile.i
data/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java.i
data/src/solaris/classes/sun/awt/motif/X11GBK.java.i
+data/src/macosx/bundle/JavaAppLauncher/src/JavaAppLauncher.m.i
data/src/share/classes/sun/rmi/transport/proxy/WrappedSocket.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialArray.java.i
data/test/sun/security/tools/policytool/OpenPolicy.java.i
data/test/java/lang/management/ThreadMXBean/Barrier.java.i
-data/test/java/util/AbstractSequentialList/AddAll.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMeta.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/Reference.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c.i
+data/test/java/beans/XMLEncoder/java_awt_Point.java.i
data/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java.i
data/src/share/classes/javax/print/attribute/AttributeSetUtilities.java.i
-data/src/share/classes/java/io/InputStream.java.i
+data/make/tools/CharsetMapping/IBM1147.map.i
data/src/share/classes/sun/security/action/GetLongAction.java.i
data/test/sun/security/pkcs11/Provider/csp.cfg.i
data/src/share/classes/java/util/Dictionary.java.i
-data/src/share/classes/sun/tools/jstat/OptionFinder.java.i
+data/src/solaris/classes/sun/awt/X11/XToolkit.java.i
data/test/sun/net/www/protocol/http/AsyncDisconnect.java.i
-data/src/share/classes/javax/print/ServiceUI.java.i
-data/test/javax/swing/JColorChooser/Test4380468.java.i
-data/test/org/openjdk/jigsaw/hello-view.sh.i
+data/test/sun/net/www/http/HttpClient/ImplicitFileName.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h.i
data/src/windows/native/sun/awt/splashscreen/splashscreen_config.h.i
data/src/share/classes/sun/io/CharToByteISO8859_3.java.i
data/src/share/classes/sun/nio/cs/ext/DoubleByteDecoder.java.i
data/src/share/demo/applets/Clock/example1.html.i
data/src/share/classes/java/awt/datatransfer/MimeType.java.i
-data/src/share/native/sun/java2d/loops/AnyShort.h.i
data/src/share/classes/javax/swing/TimerQueue.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c.i
+data/test/javax/swing/JFileChooser/6520101/bug6520101.java.i
data/test/javax/swing/JColorChooser/Test4222508.java.i
data/test/sun/rmi/transport/tcp/blockAccept/security.policy.i
data/test/java/beans/PropertyEditor/TestFloatClassJava.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetMaxPolyphony.java.i
data/src/share/classes/javax/naming/spi/ContinuationDirContext.java.i
data/src/share/sample/scripting/scriptpad/src/scripts/textcolor.js.i
-data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav.i
+data/test/java/beans/Introspector/4750368/com/foo/test/Component.java.i
data/test/sun/security/util/Resources/NewNamesFormat.java.i
-data/src/share/classes/javax/sound/sampled/FloatControl.java.i
-data/make/mkdemo/jni/Makefile.i
+data/src/solaris/classes/sun/font/NativeGlyphMapper.java.i
data/test/sun/security/pkcs11/Provider/cspPlus.cfg.i
data/src/windows/native/sun/windows/check.bmp.i
data/make/tools/swing-beans/beaninfo/images/JWindowColor16.gif.i
@@ -14546,163 +15145,169 @@ data/src/solaris/native/sun/awt/awt_Menu.h.i
data/test/javax/management/mxbean/SameObjectTwoNamesTest.java.i
data/src/linux/doc/man/extcheck.1.i
data/src/share/classes/javax/swing/plaf/package.html.i
-data/src/share/classes/java/awt/IllegalComponentStateException.java.i
+data/src/share/native/java/lang/fdlibm/src/s_rint.c.i
data/src/share/classes/java/util/concurrent/SynchronousQueue.java.i
-data/test/java/awt/Focus/IconifiedFrameFocusChangeTest/IconifiedFrameFocusChangeTest.java.i
+data/test/java/util/Timer/KillThread.java.i
data/src/share/classes/java/security/NoSuchProviderException.java.i
-data/src/share/classes/java/lang/doc-files/captheta.gif.i
+data/test/org/openjdk/jigsaw/cli/expired-signer-cert.pem.i
data/make/tools/swing-beans/beaninfo/images/JTableColor32.gif.i
data/src/share/classes/com/sun/jndi/ldap/pool/PooledConnection.java.i
data/src/windows/native/sun/windows/mlib_types_md.h.i
data/test/javax/management/Introspector/Described.java.i
data/test/javax/management/remote/mandatory/loading/MethodResultTest.java.i
data/src/share/classes/sun/font/Font2DHandle.java.i
-data/src/share/javavm/export/jdwpTransport.h.i
-data/src/share/classes/java/rmi/UnknownHostException.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/WriteOutputStream.java.i
+data/test/sun/security/pkcs11/tls/keymatdata.txt.i
+data/test/javax/management/ImplementationVersion/ImplVersionCommand.java.i
data/test/java/io/Serializable/6559775/Test6559775.sh.i
+data/make/tools/CharsetMapping/KOI8_R.map.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.chk.i
data/src/share/classes/javax/print/attribute/standard/JobImpressionsCompleted.java.i
data/src/share/classes/com/sun/security/ntlm/NTLMException.java.i
-data/test/javax/print/PrintSubInputStream/Example.java.i
-data/make/tools/CharsetMapping/MS1254.map.i
+data/src/share/demo/nio/zipfs/Demo.java.i
data/make/tools/CharsetMapping/IBM855.map.i
data/src/share/classes/sun/security/ec/ECDHKeyAgreement.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/StorageResolverException.java.i
-data/src/share/native/sun/java2d/loops/ByteIndexed.c.i
+data/src/solaris/native/sun/nio/ch/FileKey.c.i
+data/test/javax/print/applet/applet2/Applet2.java.i
+data/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java.i
data/test/com/sun/jdi/ExpiredRequestDeletionTest.java.i
+data/src/share/classes/sun/security/pkcs11/Token.java.i
data/make/mkdemo/applets/MoleculeViewer/Makefile.i
data/src/share/classes/sun/security/util/SecurityConstants.java.i
+data/test/javax/swing/JTable/6735286/bug6735286.java.i
data/src/share/classes/com/sun/beans/finder/AbstractFinder.java.i
data/src/share/demo/jvmti/hprof/hprof_monitor.c.i
data/src/solaris/native/sun/awt/multi_font.c.i
-data/make/tools/UnicodeData/PropList.txt.i
+data/test/javax/print/attribute/SidesPageRangesTest.java.i
data/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_1.java.i
-data/src/share/classes/java/dyn/BootstrapMethod.java.i
-data/src/share/classes/javax/swing/event/TreeExpansionEvent.java.i
+data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java.i
+data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java.i
data/src/share/classes/javax/security/sasl/AuthorizeCallback.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/G1Impl.java.i
data/test/javax/sound/sampled/Clip/ClipSetPos.java.i
-data/src/share/classes/java/sql/DatabaseMetaData.java.i
-data/test/javax/swing/border/Test4124729.java.i
+data/make/sun/headless/reorder-i586.i
data/test/com/sun/security/sasl/ntlm/Conformance.java.i
-data/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.c.i
data/src/share/classes/sun/text/resources/FormatData_ar_SA.java.i
-data/test/java/io/Serializable/defaultDataEnd/DefaultDataEnd.java.i
-data/test/javax/swing/JTabbedPane/4624207/bug4624207.java.i
+data/test/javax/management/remote/mandatory/connection/AddressableTest.java.i
+data/test/java/util/prefs/PrefsSpi.sh.i
data/src/share/classes/sun/jvmstat/monitor/Monitor.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/ImageTests.java.i
data/src/share/classes/javax/naming/NameAlreadyBoundException.java.i
-data/src/share/classes/sun/io/CharToByteCp858.java.i
+data/test/java/io/PrintWriter/FailingConstructors.java.i
data/test/java/rmi/activation/Activatable/shutdownGracefully/security.policy.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/InputRecord/SSLSocketTimeoutNulls.java.i
-data/src/share/classes/sun/net/www/http/HttpClient.java.i
-data/src/share/classes/sun/java2d/cmm/ColorTransform.java.i
+data/src/share/classes/sun/reflect/BootstrapConstructorAccessorImpl.java.i
+data/src/share/classes/sun/nio/fs/Globs.java.i
data/make/javax/swing/Makefile.i
data/src/share/classes/sun/java2d/SurfaceDataProxy.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/DummySourceDataLine.java.i
data/src/share/classes/javax/print/attribute/standard/JobName.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Code.java.i
+data/src/solaris/sample/dtrace/hotspot_jni/README.txt.i
data/test/sun/tools/native2ascii/test1.i
data/src/share/native/java/util/zip/zlib-1.2.5/zutil.c.i
data/test/java/lang/Class/getField/Exceptions.java.i
-data/test/java/security/cert/CertPathValidator/indirectCRL/README.i
-data/test/sun/nio/cs/OLD/IBM933_OLD.java.i
-data/src/share/classes/sun/security/x509/SerialNumber.java.i
-data/src/share/demo/jfc/FileChooserDemo/resources/images/jpgIcon.jpg.i
-data/src/solaris/native/sun/java2d/loops/vis_GlyphListXor.c.i
+data/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java.i
+data/test/java/io/Serializable/oldTests/CircularList.java.i
+data/test/sun/security/tools/jarsigner/ec.sh.i
+data/src/share/native/sun/java2d/opengl/OGLMaskBlit.c.i
+data/test/tools/launcher/unresolvedExceptions.sh.i
data/src/share/classes/java/nio/file/spi/package-info.java.i
-data/src/share/classes/sun/text/resources/FormatData_it_CH.java.i
-data/src/share/demo/jfc/SampleTree/DynamicTreeNode.java.i
+data/src/share/classes/java/nio/channels/FileChannel.java.i
+data/test/sun/security/provider/PolicyFile/TrustedCert.keystore1.i
+data/src/share/classes/sun/util/resources/LocaleNames_et.properties.i
+data/src/share/native/sun/java2d/opengl/OGLContext.h.i
+data/test/javax/smartcardio/HistoricalBytes.java.i
data/src/share/classes/java/rmi/server/UID.java.i
-data/test/java/rmi/server/clientStackTrace/ClientStackTrace.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DSurfaceDataProxy.java.i
data/test/java/security/cert/CertPathValidatorException/jdk6.serial.i
data/src/share/native/sun/java2d/loops/ByteBinary2Bit.c.i
-data/src/share/classes/sun/io/ByteToCharUnicodeBigUnmarked.java.i
+data/test/sun/nio/cs/ISCIITest.java.i
data/src/share/classes/javax/swing/JPopupMenu.java.i
data/src/share/classes/sun/util/TimeZoneNameUtility.java.i
-data/test/java/net/SocketPermission/Ctor.java.i
-data/src/share/demo/nbproject/jfc/Metalworks/build.properties.i
+data/src/share/classes/javax/swing/plaf/basic/ComboPopup.java.i
+data/src/share/classes/sun/management/MemoryImpl.java.i
data/test/sun/security/krb5/auto/OneKDC.java.i
-data/src/share/classes/java/security/spec/ECParameterSpec.java.i
-data/test/java/io/LineNumberReader/ReadReadLine.java.i
-data/make/netbeans/awt2d/nbproject/project.xml.i
-data/src/share/native/sun/awt/image/cvutils/img_dcm8.h.i
+data/src/share/classes/sun/net/www/http/HttpCapture.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextAreaUI.java.i
+data/src/share/classes/java/awt/color/ColorSpace.java.i
+data/src/macosx/classes/java/net/DefaultInterface.java.i
+data/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java.i
data/src/share/classes/sun/awt/image/ImageDecoder.java.i
-data/src/share/demo/jvmti/hprof/hprof_class.c.i
+data/src/share/lib/calendars.properties.i
data/test/sun/nio/cs/OLD/MS932DB.java.i
data/src/windows/native/java/nio/MappedByteBuffer.c.i
-data/test/java/io/Serializable/oldTests/CheckingEquality.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_EC.properties.i
-data/test/javax/swing/JSlider/6794831/bug6794831.java.i
+data/src/share/classes/java/sql/Driver.java.i
data/src/share/classes/java/dyn/MethodHandles.java.i
data/src/solaris/classes/sun/java2d/jules/TileWorker.java.i
-data/src/share/classes/sun/security/provider/ConfigSpiFile.java.i
+data/src/share/demo/nbproject/jfc/Font2DTest/nbproject/jdk.xml.i
data/test/tools/pack200/pack200-verifier/data/golden.jar.i
data/src/share/native/sun/java2d/opengl/OGLPaints.h.i
data/src/share/classes/javax/print/attribute/standard/PrinterState.java.i
data/src/share/javavm/include/opcodes.wide.i
data/src/share/classes/sun/util/resources/LocaleNames_el.properties.i
-data/src/share/classes/java/nio/file/attribute/PosixFilePermissions.java.i
+data/test/sun/java2d/SunGraphics2D/SimplePrimQuality.java.i
data/test/java/lang/instrument/GetAllLoadedClassesTest.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/PackageCtor.java.i
data/test/javax/management/remote/mandatory/notif/NotificationAccessControllerTest.java.i
data/src/share/classes/sun/tools/tree/AssignBitAndExpression.java.i
data/src/share/classes/javax/security/cert/CertificateNotYetValidException.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_it.java.i
-data/src/share/classes/java/io/ObjectInputValidation.java.i
+data/src/solaris/hpi/include/interrupt.h.i
data/test/sun/text/resources/Format/Bug4994312.java.i
-data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_BA.properties.i
+data/test/java/lang/invoke/ClassValueTest.java.i
data/test/java/awt/Focus/ToFrontFocusTest/ToFrontFocus.html.i
-data/make/mksample/nio/file/Makefile.i
+data/src/share/classes/java/nio/Heap-X-Buffer.java.i
data/test/java/beans/Introspector/6380849/beans/ThirdBean.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_7.java.i
+data/test/javax/swing/JComponent/4337267/bug4337267.java.i
data/test/java/awt/dnd/Button2DragTest/Button2DragTest.html.i
-data/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.i
-data/test/com/sun/jdi/sde/testString.i
-data/src/share/classes/com/sun/jndi/ldap/sasl/SaslOutputStream.java.i
-data/src/share/classes/javax/swing/event/UndoableEditListener.java.i
-data/test/sun/rmi/rmic/newrmic/equivalence/AppleEvent.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java.i
+data/src/share/demo/jfc/Metalworks/KhakiMetalTheme.java.i
+data/test/java/rmi/reliability/juicer/OrangeEcho.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.key.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/CloseInboundException.java.i
-data/test/javax/management/mxbean/GenericTypeTest.java.i
-data/make/templates/gpl-header.i
+data/test/java/util/Arrays/CopyMethods.java.i
data/test/java/nio/channels/Selector/SelectAndClose.java.i
data/src/share/classes/java/beans/ReflectionUtils.java.i
data/src/share/demo/applets/CardTest/CardTest.java.i
-data/src/share/classes/sun/awt/image/ToolkitImage.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteMonitoredVm.java.i
data/test/sun/security/tools/keytool/SecretKeyKS.sh.i
-data/src/share/classes/sun/tools/jconsole/TimeComboBox.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java.i
data/make/tools/swing-beans/beaninfo/images/JColorChooserMono32.gif.i
data/src/windows/classes/sun/awt/windows/WMenuItemPeer.java.i
data/src/share/classes/java/awt/print/PageFormat.java.i
-data/test/java/util/Hashtable/HashCode.java.i
+data/test/java/util/ServiceLoader/FooProvider2.java.i
data/test/java/rmi/transport/checkLeaseInfoLeak/LeaseLeak.java.i
data/src/share/classes/sun/reflect/annotation/ExceptionProxy.java.i
-data/test/java/io/etc/FileDescriptorSharing.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/ChangeLog.i
data/test/sun/nio/cs/OLD/TestX11CS.java.i
data/src/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CPrinterGraphics.java.i
data/src/share/classes/com/sun/nio/sctp/AbstractNotificationHandler.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy11.i
data/src/share/classes/sun/dyn/FilterOneArgument.java.i
-data/src/share/classes/sun/launcher/resources/launcher_ja.properties.i
-data/src/share/classes/java/util/concurrent/atomic/package-info.java.i
-data/src/share/classes/com/sun/jdi/request/ThreadStartRequest.java.i
-data/make/javax/print/Makefile.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/AclImpl.java.i
+data/test/java/lang/management/RuntimeMXBean/TestInputArgument.sh.i
data/src/share/native/java/util/zip/CRC32.c.i
-data/test/java/net/InetAddress/ptr/lookup.sh.i
+data/src/share/classes/sun/security/acl/WorldGroupImpl.java.i
data/test/java/lang/StringBuffer/InsertNullString.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticByteFieldAccessorImpl.java.i
-data/test/java/beans/XMLDecoder/spec/TestShort.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.access.in.i
data/test/java/security/MessageDigest/ArgumentSanity.java.i
data/src/share/classes/com/sun/beans/ObjectHandler.java.i
data/test/javax/sound/midi/Gervill/AudioFloatInputStream/GetFrameLength.java.i
data/src/share/classes/javax/swing/doc-files/groupLayout.example.png.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/package.html.i
+data/test/com/sun/tools/attach/BasicTests.sh.i
+data/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c.i
data/test/java/util/zip/ConstructInflaterOutput.java.i
data/test/sun/security/rsa/TestKeyFactory.java.i
-data/src/share/classes/sun/tools/tree/ExprExpression.java.i
-data/make/java/java/mapfile-vers.i
+data/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh.i
+data/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp.i
data/src/share/native/sun/font/layout/MarkToBasePosnSubtables.h.i
+data/test/java/util/concurrent/FutureTask/ExplicitSet.java.i
+data/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java.i
data/src/share/native/sun/management/management.c.i
data/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties.i
data/test/java/nio/charset/Charset/AvailableCharsetNames.java.i
@@ -14711,29 +15316,30 @@ data/src/share/classes/java/rmi/activation/UnknownObjectException.java.i
data/src/share/classes/sun/rmi/rmic/BatchEnvironment.java.i
data/test/java/util/PluggableLocale/providersrc/java.text.spi.CollatorProvider.i
data/test/java/awt/font/TextLayout/TestOldHangul.java.i
-data/src/share/native/java/lang/fdlibm/src/e_lgamma_r.c.i
+data/src/share/native/sun/awt/image/cvutils/img_dcm8.h.i
data/src/share/classes/sun/security/ssl/EngineOutputRecord.java.i
-data/test/java/io/charStreams/LineSink.java.i
-data/src/share/classes/javax/xml/crypto/Data.java.i
+data/test/java/io/Serializable/corruptedUTFConsumption/CorruptedUTFConsumption.java.i
+data/src/solaris/classes/sun/awt/X11/XInputMethod.java.i
data/test/sun/tools/jps/jps-m.sh.i
data/test/sun/security/krb5/BadKdcDefaultValue.java.i
data/src/solaris/native/sun/nio/ch/NativeThread.c.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif.i
data/make/tools/swing-beans/beaninfo/images/JPasswordFieldColor16.gif.i
data/test/com/sun/jdi/DeoptimizeWalk.sh.i
data/src/share/classes/sun/io/CharToByteMacIceland.java.i
data/src/share/classes/com/sun/security/auth/module/LdapLoginModule.java.i
data/src/share/classes/java/util/logging/XMLFormatter.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c.i
data/make/netbeans/j2se/build.xml.i
data/src/share/classes/sun/dyn/anon/ConstantPoolVisitor.java.i
-data/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java.i
-data/src/windows/native/sun/windows/awt_Cursor.cpp.i
+data/test/javax/security/auth/x500/X500Principal/RFC4514.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/GetRoot.java.i
data/test/sun/security/provider/PolicyParser/ExtDirs.policy.i
-data/make/netbeans/jdwpgen/nbproject/project.properties.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/beans/AbstractBean.java.i
+data/test/org/openjdk/jigsaw/security.sh.i
data/src/share/classes/javax/print/attribute/standard/PrinterInfo.java.i
data/test/javax/security/auth/login/LoginContext/DefaultHandler.config.i
-data/src/share/classes/java/beans/beancontext/BeanContextMembershipEvent.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/StreamBuffer.java.i
+data/make/tools/swing-beans/beaninfo/images/JScrollBarColor16.gif.i
data/src/solaris/native/sun/nio/ch/SocketDispatcher.c.i
data/src/share/native/sun/font/layout/GlyphSubstitutionTables.h.i
data/test/java/beans/Introspector/6380849/beans/SecondBean.java.i
@@ -14743,13 +15349,15 @@ data/src/share/lib/images/cursors/win32_LinkDrop32x32.gif.i
data/src/share/native/sun/font/layout/OpenTypeUtilities.h.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostTrap.java.i
data/src/solaris/native/sun/awt/awt_UNIXToolkit.c.i
+data/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.i
data/test/javax/security/auth/PrivateCredentialPermission/EmptyName.java.i
+data/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java.i
data/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java.i
data/src/share/classes/com/sun/jmx/event/RepeatedSingletonJob.java.i
-data/test/sun/security/mscapi/SignUsingNONEwithRSA.java.i
data/src/share/classes/sun/io/CharToByteCp869.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_VERSION.java.i
-data/test/javax/script/Helper.java.i
+data/test/com/sun/net/httpserver/SelCacheTest.java.i
+data/src/macosx/native/sun/awt/CMenuBar.m.i
data/src/share/classes/javax/management/ReflectionException.java.i
data/src/share/classes/com/sun/security/auth/NTSidPrimaryGroupPrincipal.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SunX509ExtendedTM.java.i
@@ -14757,82 +15365,87 @@ data/test/javax/management/mxbean/MBeanOperationInfoTest.java.i
data/src/share/back/commonRef.h.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/Close.java.i
data/src/share/classes/java/lang/invoke/MethodType.java.i
-data/src/share/classes/javax/swing/SpinnerDateModel.java.i
+data/src/share/bin/java.h.i
+data/src/macosx/classes/com/apple/laf/AquaPopupMenuSeparatorUI.java.i
data/make/modules/jdk.tools.ls.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java.i
data/src/share/classes/javax/swing/text/html/ParagraphView.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/JarFileSystemProvider.java.i
data/src/windows/native/sun/java2d/d3d/D3DBufImgOps.h.i
+data/src/share/classes/sun/security/util/AuthResources.java.i
data/test/java/nio/channels/SocketChannel/Hangup.java.i
data/test/javax/print/CheckDupFlavor.java.i
data/src/share/classes/javax/management/relation/RoleInfo.java.i
data/test/javax/sql/rowset/serial/SerialClob/SetAsciiStream.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_jpeg.c.i
data/test/java/awt/Graphics/TextAAHintsTest.java.i
+data/src/macosx/native/com/apple/laf/ScreenPopupFactory.m.i
+data/src/share/classes/java/awt/AttributeValue.java.i
data/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java.i
data/src/share/classes/sun/java2d/pipe/RegionClipSpanIterator.java.i
data/src/share/classes/javax/swing/plaf/basic/DragRecognitionSupport.java.i
data/test/java/util/ResourceBundle/Bug4083270Test.java.i
data/test/sun/security/x509/AlgorithmId/TurkishRegion.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedFloatFieldAccessorImpl.java.i
-data/test/java/util/LinkedList/Clone.java.i
+data/test/java/util/zip/ZipFile/ManyZipFiles.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Ports.c.i
data/src/share/classes/javax/swing/plaf/ToolTipUI.java.i
-data/src/share/classes/javax/management/IntrospectionException.java.i
+data/src/share/classes/java/awt/peer/FontPeer.java.i
data/test/java/net/Inet4Address/textToNumericFormat.java.i
-data/src/share/classes/sun/swing/ImageIconUIResource.java.i
+data/make/jpda/transport/socket/mapfile-vers.i
data/make/netbeans/jdwpgen/nbproject/genfiles.properties.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/config/XmlConfigUtilsTest.java.i
data/src/share/classes/javax/swing/plaf/ToolBarUI.java.i
data/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libplc4.so.i
-data/src/share/classes/javax/security/auth/login/AccountNotFoundException.java.i
data/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConvex.java.i
data/src/share/classes/sun/java2d/loops/TransformBlit.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java.i
-data/src/share/classes/java/lang/module/ModuleInfoReader.java.i
+data/src/bsd/doc/man/tnameserv.1.i
+data/make/modules/tools/Makefile.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMBean.java.i
data/src/share/classes/java/dyn/FilterGeneric.java.i
data/make/javax/sound/SoundDefs.gmk.i
data/test/java/rmi/server/RMIClassLoader/spi/Installed.java.i
data/src/share/back/EventRequestImpl.h.i
data/test/java/lang/management/MemoryPoolMXBean/ThresholdTest.java.i
-data/src/windows/native/sun/font/fontpath.c.i
+data/test/java/math/BigDecimal/PowTests.java.i
+data/make/java/invoke/Makefile.i
data/src/share/classes/javax/management/NotQueryExp.java.i
data/test/java/lang/reflect/Proxy/returnTypes/GetArray.java.i
-data/src/share/classes/javax/swing/ListModel.java.i
+data/src/share/native/sun/management/Flag.c.i
+data/src/share/classes/sun/java2d/loops/DrawLine.java.i
+data/src/share/classes/javax/print/attribute/URISyntax.java.i
data/src/share/classes/java/rmi/NotBoundException.java.i
data/src/share/classes/sun/tools/jconsole/JConsole.java.i
data/test/java/util/zip/zip.java.i
data/src/linux/doc/man/ja/jar.1.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties.i
-data/src/share/classes/sun/io/ByteToCharBig5_Solaris.java.i
+data/src/share/native/sun/awt/image/jpeg/jinclude.h.i
data/src/share/classes/java/rmi/server/RMIClassLoaderSpi.java.i
-data/test/java/beans/PropertyEditor/TestIntegerClassNull.java.i
+data/test/sun/security/x509/AVA/AVAEqualsHashCode.java.i
data/make/sun/misc/Makefile.i
-data/src/share/classes/java/util/NavigableSet.java.i
+data/src/share/classes/sun/security/provider/SeedGenerator.java.i
data/src/share/classes/sun/dyn/package-info.java.i
-data/test/java/security/cert/PolicyNode/speech2eve.i
+data/test/java/util/Calendar/Bug6645263.java.i
data/src/share/demo/jvmti/mtrace/README.txt.i
data/src/share/classes/sun/misc/JavaSecurityCodeSignerAccess.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmspack.c.i
+data/src/share/classes/sun/util/resources/LocaleNames_nl.properties.i
data/test/java/lang/management/MemoryMXBean/GetMBeanInfo.java.i
-data/make/com/sun/tools/attach/FILES_c.gmk.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/NonJMXPrincipalsTest.java.i
data/src/share/classes/com/sun/servicetag/SystemEnvironment.java.i
data/src/share/classes/java/util/Locale.java.i
data/src/share/classes/sun/text/resources/FormatData_cs.java.i
data/test/javax/swing/plaf/nimbus/Test6849805.java.i
-data/src/share/classes/sun/print/ProxyGraphics.java.i
-data/src/share/classes/sun/awt/ScrollPaneWheelScroller.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java.i
-data/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java.i
+data/src/share/classes/sun/io/ByteToCharBig5_HKSCS.java.i
+data/src/windows/native/sun/jkernel/DownloadDialog.cpp.i
+data/src/macosx/classes/sun/lwawt/macosx/CInputMethodDescriptor.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java.i
data/make/tools/swing-beans/beaninfo/images/JTextPaneColor32.gif.i
data/test/javax/management/remote/mandatory/connectorServer/MBSFPreStartPostStartTest.java.i
data/src/share/classes/sun/io/CharToByteDBCS_ASCII.java.i
data/test/java/lang/Thread/NullStackTrace.java.i
-data/test/java/lang/management/ManagementFactory/StateTestMBean.java.i
+data/test/sun/management/HotspotRuntimeMBean/GetSafepointCount.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishConstants.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialStruct.java.i
data/test/com/sun/jdi/NoLaunchOptionTest.java.i
@@ -14840,77 +15453,81 @@ data/src/share/classes/javax/swing/plaf/metal/icons/ocean/computer.gif.i
data/test/java/lang/Character/PropList.txt.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl_Stub.java.i
data/test/sun/net/www/protocol/http/UserAgent.java.i
+data/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java.i
data/test/javax/swing/JColorChooser/Test6707406.java.i
data/src/share/classes/sun/font/StrikeMetrics.java.i
data/test/sun/security/provider/MessageDigest/DigestKAT.java.i
data/test/java/rmi/transport/httpSocket/HttpSocketTest.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java.i
data/make/mkdemo/applets/DrawTest/Makefile.i
data/src/share/classes/sun/misc/PerfCounter.java.i
-data/test/sun/rmi/rmic/defaultStubVersion/G1.java.i
-data/src/solaris/native/sun/awt/fontpath.c.i
+data/src/macosx/classes/sun/font/CFont.java.i
data/src/share/native/sun/security/ec/ec_naf.c.i
-data/make/java/net/Makefile.i
+data/src/share/classes/java/util/zip/CheckedOutputStream.java.i
+data/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaObject.java.i
data/test/java/util/TimeZone/OldIDMappingTest.java.i
-data/src/share/classes/javax/naming/InitialContext.java.i
+data/src/solaris/native/sun/awt/Xrandr.h.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/QA.java.i
data/test/sun/security/ec/truststore.i
data/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh.i
-data/src/share/classes/java/awt/event/WindowFocusListener.java.i
+data/test/sun/security/provider/certpath/speech2speech.i
+data/src/share/classes/java/awt/BorderLayout.java.i
data/src/share/classes/java/nio/channels/exceptions.i
data/src/share/sample/nio/server/BN.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java.i
-data/src/share/classes/javax/print/attribute/DocAttributeSet.java.i
+data/src/windows/classes/sun/nio/ch/DatagramDispatcher.java.i
data/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames_Stub.java.i
data/test/javax/swing/text/html/TableView/7030332/sample4.png.i
-data/src/share/classes/sun/java2d/cmm/lcms/LCMS.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java.i
+data/test/sun/security/action/Generify.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/Identity.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java.i
+data/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageZoom_NN_f.c.i
data/test/com/sun/net/httpserver/bugs/B6421581.java.i
data/src/share/classes/javax/swing/undo/package.html.i
data/src/share/classes/java/nio/file/attribute/PosixFilePermission.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/SourceFileListFrame.java.i
-data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringStringInt.java.i
-data/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java.i
+data/src/solaris/hpi/native_threads/src/condvar_md.c.i
+data/src/macosx/classes/sun/lwawt/macosx/CPlatformComponent.java.i
+data/src/share/classes/com/sun/crypto/provider/HmacCore.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java.i
data/src/solaris/classes/sun/awt/motif/MMenuPeer.java.i
data/test/java/nio/file/Files/InterruptCopy.java.i
data/src/solaris/classes/sun/awt/X11/XAWTFormatter.java.i
data/make/tools/swing-beans/beaninfo/images/JToggleButtonMono16.gif.i
-data/test/java/lang/instrument/IsModifiableClassApp.java.i
-data/src/share/classes/sun/java2d/pisces/META-INF/services/sun.java2d.pipe.RenderingEngine.i
+data/src/share/classes/sun/nio/cs/Unicode.java.i
+data/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java.i
data/src/share/classes/javax/swing/event/CaretListener.java.i
data/test/javax/management/loading/ParserInfiniteLoopTest.java.i
data/src/share/classes/java/awt/image/renderable/package.html.i
-data/src/solaris/classes/sun/awt/X11/XWrapperBase.java.i
+data/test/javax/sound/midi/Gervill/ModelIdentifier/EqualsObject.java.i
data/src/share/classes/sun/io/ConversionBufferFullException.java.i
-data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS_XP.java.i
+data/test/java/lang/Class/forName/classes/right-square.class.i
data/src/share/classes/java/awt/doc-files/MenuBar-1.gif.i
-data/src/windows/classes/java/util/prefs/WindowsPreferences.java.i
-data/src/solaris/classes/sun/awt/X11/InfoWindow.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XPlottingViewer.java.i
+data/test/java/lang/Runtime/exec/ConcurrentRead.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java.i
data/test/java/beans/XMLEncoder/java_util_RegularEnumSet.java.i
data/src/share/classes/java/security/interfaces/DSAKeyPairGenerator.java.i
-data/test/tools/pack200/dyn.jar.i
+data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i
data/test/java/lang/String/Encodings.java.i
-data/test/java/awt/Multiscreen/WPanelPeerPerf/WPanelPeerPerf.java.i
+data/src/share/classes/sun/tools/jstat/SyntaxException.java.i
data/test/java/nio/channels/SocketChannel/IsConnectable.java.i
data/src/share/sample/nio/file/AclEdit.java.i
-data/make/sun/security/jgss/wrapper/Makefile.i
+data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java.i
+data/test/java/util/EnumMap/DistinctEntrySetElements.java.i
data/test/java/beans/PropertyEditor/TestBooleanClassNull.java.i
data/src/share/classes/javax/swing/colorchooser/DefaultColorSelectionModel.java.i
data/src/windows/native/sun/windows/awt_Component.cpp.i
data/src/windows/native/sun/windows/awt_Insets.h.i
-data/src/share/classes/sun/security/x509/CertificatePolicyMap.java.i
-data/test/java/io/Serializable/subclass/Allow.policy.i
+data/make/mkdemo/jni/Makefile.i
+data/src/windows/native/sun/windows/awt_Brush.cpp.i
data/test/java/net/URLClassLoader/ClassLoad.java.i
data/test/javax/management/mxbean/customtypes/package-info.java.i
data/src/share/classes/java/applet/AppletContext.java.i
-data/make/docs/CORE_PKGS.gmk.i
+data/src/share/classes/java/lang/Boolean.java.i
+data/src/share/classes/javax/print/attribute/standard/PDLOverrideSupported.java.i
data/test/java/rmi/activation/Activatable/restartCrashedService/security.policy.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/BootAnalyzer.java.i
-data/make/tools/CharsetMapping/IBM1383.map.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.dll.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/security.policy.i
+data/src/macosx/classes/com/apple/concurrent/LibDispatchNative.java.i
data/src/solaris/native/sun/awt/awt_FileDialog.c.i
data/src/solaris/lib/content-types.properties.i
data/src/share/classes/sun/security/krb5/internal/KRBCred.java.i
@@ -14920,97 +15537,95 @@ data/src/share/classes/sun/security/pkcs11/P11RSACipher.java.i
data/test/java/nio/channels/AsynchronousFileChannel/CustomThreadPool.java.i
data/src/share/classes/javax/security/cert/CertificateParsingException.java.i
data/src/share/classes/sun/security/action/GetPropertyAction.java.i
-data/src/windows/native/sun/java2d/d3d/D3DPaints.cpp.i
+data/test/java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java.i
data/test/javax/swing/JSlider/4987336/bug4987336.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIRegion.java.i
data/src/solaris/classes/sun/awt/motif/MLabelPeer.java.i
+data/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java.i
data/src/share/classes/com/sun/crypto/provider/HmacMD5.java.i
data/src/share/classes/java/lang/invoke/MethodHandleProxies.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulk.java.i
data/src/share/classes/javax/accessibility/AccessibleRole.java.i
data/src/share/bin/jli_util.c.i
data/src/windows/native/sun/windows/awt_new.h.i
-data/src/share/classes/java/util/zip/CheckedOutputStream.java.i
+data/src/share/classes/java/awt/BufferCapabilities.java.i
data/test/java/beans/XMLEncoder/javax_swing_border_LineBorder.java.i
data/src/share/classes/sun/security/krb5/internal/KRBSafe.java.i
data/test/java/lang/StringBuilder/Exceptions.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS5022X_Encoder.java.i
+data/src/share/classes/java/security/cert/CertSelector.java.i
data/src/share/classes/sun/print/ImagePrinter.java.i
data/test/java/nio/file/Files/CopyAndMove.java.i
data/src/linux/doc/man/xjc.1.i
data/src/share/classes/javax/security/auth/callback/LanguageCallback.java.i
-data/src/share/classes/java/util/concurrent/atomic/AtomicLong.java.i
-data/test/java/security/Signature/NONEwithRSA.java.i
+data/src/share/lib/images/cursors/win32_MoveDrop32x32.gif.i
+data/src/share/classes/sun/io/ByteToCharISO2022.java.i
data/test/java/net/URLClassLoader/closetest/test2/com/foo/Resource1.i
+data/src/macosx/classes/com/apple/laf/AquaFocus.java.i
data/test/com/sun/jdi/Java_gTest.java.i
data/test/java/nio/channels/SocketChannel/Trivial.java.i
-data/test/sun/security/rsa/TestKeyPairGeneratorLength.java.i
data/test/java/util/ResourceBundle/Test4314141A___EURO.properties.i
-data/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java.i
-data/src/share/classes/sun/tools/tree/GreaterExpression.java.i
+data/test/sun/security/tools/policytool/UsePolicy.sh.i
data/test/com/sun/jdi/InvokeTest.java.i
data/test/javax/management/mxbean/customtypes/IntegerIsLongFactory.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/ID.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/Solo.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java.i
-data/test/java/util/Collections/RacingCollections.java.i
data/test/javax/management/monitor/GaugeMonitorDeadlockTest.java.i
-data/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java.i
data/src/share/demo/nbproject/management/FullThreadDump/build.xml.i
data/test/javax/sound/midi/Gervill/ModelStandardIndexedDirector/ModelStandardIndexedDirectorTest.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java.i
+data/test/com/sun/net/httpserver/bugs/FixedLengthInputStream.java.i
data/test/java/util/Collections/Disjoint.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid_sv.properties.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_LB.properties.i
data/test/req.flg.i
data/src/solaris/native/java/net/InetAddressImplFactory.c.i
-data/test/javax/management/openmbean/OpenTypeDescriptorTest.java.i
+data/test/javax/swing/JTree/4314199/bug4314199.java.i
data/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.i
-data/src/share/classes/java/text/ChoiceFormat.java.i
+data/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif.i
data/test/java/io/File/MaxPath.java.i
data/test/java/security/KeyRep/SerialDSAPubKey.java.i
-data/test/java/beans/PropertyEditor/TestDoubleClassNull.java.i
-data/test/javax/management/namespace/JMXNamespaceViewTest.java.i
+data/src/macosx/classes/com/apple/concurrent/LibDispatchRetainedResource.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_BevelBorderUIResource.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormat.java.i
data/src/solaris/classes/sun/java2d/x11/XSurfaceData.java.i
data/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir.i
data/test/java/rmi/Naming/LookupIPv6.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelInstrumentIntInt.java.i
data/src/share/classes/javax/naming/ldap/HasControls.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/HardDrive.gif.i
-data/src/share/classes/com/sun/media/sound/JARSoundbankReader.java.i
-data/src/windows/native/sun/windows/awt_Checkbox.cpp.i
+data/src/share/classes/javax/swing/text/rtf/package.html.i
+data/src/share/classes/javax/swing/DesktopManager.java.i
data/src/windows/native/java/io/io_util_md.c.i
-data/src/share/demo/applets/WireFrame/models/hughes_500.obj.i
+data/src/share/classes/sun/applet/AppletViewerFactory.java.i
data/src/share/classes/org/relaxng/datatype/ValidationContext.java.i
data/src/share/native/sun/java2d/loops/DrawPath.c.i
data/test/java/util/concurrent/locks/Lock/TimedAcquire.java.i
data/src/share/classes/sun/text/resources/FormatData_no.java.i
-data/src/solaris/bin/java_md.h.i
+data/test/javax/swing/JInternalFrame/6725409/bug6725409.java.i
data/src/share/classes/java/nio/file/FileVisitOption.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM871.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libplds4.so.i
data/test/java/util/Arrays/ArrayObjectMethods.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/Load1.java.i
data/src/share/classes/com/sun/net/ssl/SSLContextSpi.java.i
-data/src/share/classes/java/io/CharArrayWriter.java.i
-data/test/sun/security/mscapi/PublicKeyInterop.java.i
+data/test/java/rmi/MarshalledObject/compare/Compare.java.i
+data/test/sun/rmi/rmic/manifestClassPath/run.sh.i
data/src/windows/native/sun/security/pkcs11/j2secmod_md.h.i
data/src/share/classes/java/awt/doc-files/MultiScreen.gif.i
-data/src/share/native/java/lang/Thread.c.i
+data/test/java/net/MulticastSocket/JoinGroup.java.i
data/src/share/classes/sun/io/ByteToCharCp874.java.i
data/test/java/lang/annotation/loaderLeak/LoaderLeak.sh.i
data/test/java/security/spec/EllipticCurveMatch.java.i
data/test/javax/swing/JComponent/6683775/bug6683775.java.i
+data/src/macosx/native/sun/osxapp/ThreadUtilities.h.i
data/test/javax/swing/LookAndFeel/6474153/bug6474153.java.i
data/test/javax/management/namespace/JMXDomainTest.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByte.java.i
-data/make/javax/swing/plaf/FILES.gmk.i
-data/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java.i
+data/src/solaris/native/sun/awt/XDrawingArea.c.i
+data/test/java/awt/Mixing/MixingOnShrinkingHWButton.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiTreeUI.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetPitchCorrection.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties.i
-data/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java.i
data/src/share/classes/sun/security/provider/certpath/IndexedCollectionCertStore.java.i
+data/test/sun/text/resources/Collator/Bug6755060.java.i
data/src/share/classes/java/lang/UnknownError.java.i
data/test/javax/swing/JScrollBar/4708809/bug4708809.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/AnonCipherWithWantClientAuth.java.i
@@ -15022,87 +15637,88 @@ data/src/share/classes/java/util/concurrent/atomic/AtomicLongArray.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c.i
data/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java.i
data/src/share/classes/javax/imageio/metadata/IIOMetadataController.java.i
-data/test/java/util/ResourceBundle/Test4314141A__DE.properties.i
+data/src/share/classes/javax/crypto/spec/PBEKeySpec.java.i
+data/test/javax/swing/JTabbedPane/7010561/bug7010561.java.i
data/src/windows/native/sun/java2d/d3d/D3DSurfaceData.cpp.i
data/test/java/security/BasicPermission/ExitVMEquals.java.i
-data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java.i
+data/test/java/lang/instrument/BootClassPath/Agent.java.i
data/src/share/classes/java/nio/file/attribute/PosixFileAttributeView.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/JObjCRuntime.java.i
+data/src/macosx/native/sun/awt/CMenuItem.h.i
data/src/share/classes/javax/management/event/EventClient.java.i
data/src/windows/native/sun/windows/awt_Color.cpp.i
-data/test/javax/xml/crypto/dsig/SecurityManager/policy.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/BooleanCalls.java.i
+data/test/java/net/URLClassLoader/closetest/build2.sh.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/CriticalSubjectAltName.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsEntryMBean.java.i
+data/src/share/classes/javax/security/auth/callback/PasswordCallback.java.i
data/src/share/classes/java/awt/im/InputMethodHighlight.java.i
data/make/tools/swing-beans/beaninfo/images/JAppletMono16.gif.i
-data/make/tools/CharsetMapping/IBM918.map.i
-data/src/share/native/sun/font/layout/TrimmedArrayProcessor.cpp.i
-data/src/share/native/sun/security/ec/impl/ec2_193.c.i
-data/test/java/beans/XMLEncoder/java_io_File.java.i
+data/make/modules/tools/nbproject/project.properties.i
+data/src/windows/back/proc_md.h.i
+data/src/solaris/classes/sun/java2d/xr/XRMaskFill.java.i
+data/src/share/classes/java/io/UTFDataFormatException.java.i
data/make/sun/security/krb5/Makefile.i
-data/src/share/classes/javax/swing/plaf/FileChooserUI.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/Callback_Stub.java.i
data/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java.i
data/src/solaris/doc/sun/man/man1/ja/wsimport.1.i
data/src/share/classes/javax/security/auth/package.html.i
-data/test/com/sun/servicetag/servicetag4.properties.i
+data/src/share/classes/sun/io/CharToByteISO8859_2.java.i
data/test/javax/smartcardio/TestCardPermission.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/SOFMarkerSegment.java.i
-data/src/share/classes/java/util/zip/DeflaterInputStream.java.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_en.properties.i
data/src/share/classes/java/security/acl/Owner.java.i
data/src/share/classes/com/sun/pept/encoding/Decoder.java.i
+data/src/windows/classes/sun/awt/windows/WRobotPeer.java.i
data/make/common/Library.gmk.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java.i
+data/src/share/classes/sun/nio/cs/ext/MacRomania.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CDragSourceContextPeer.java.i
data/test/java/util/Collections/CheckedSetBash.java.i
-data/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java.i
-data/src/share/classes/java/security/cert/TrustAnchor.java.i
+data/src/macosx/classes/com/apple/eawt/_AppMiscHandlers.java.i
+data/src/share/native/java/lang/fdlibm/src/e_asin.c.i
data/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java.i
data/src/share/classes/com/sun/tools/jdi/CommandSender.java.i
-data/src/share/classes/java/awt/PageAttributes.java.i
-data/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java.i
data/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java.i
data/src/solaris/native/java/net/Inet6AddressImpl.c.i
-data/src/share/classes/sun/tools/tree/BreakStatement.java.i
+data/src/share/classes/java/awt/doc-files/DesktopProperties.html.i
data/test/java/io/File/GetCanonicalPath.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/collapsed.gif.i
-data/test/java/nio/file/WatchService/LotsOfEvents.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DTextRenderer.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java.i
data/test/javax/management/remote/mandatory/notif/policy.negative.i
data/src/share/classes/sun/nio/cs/ext/MS1255.java.i
data/src/share/classes/javax/swing/text/html/MinimalHTMLWriter.java.i
data/test/java/lang/management/OperatingSystemMXBean/PlatformMXBeanTest.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java.i
data/src/share/classes/sun/security/jgss/GSSHeader.java.i
-data/src/share/classes/sun/io/CharToByteCp943.java.i
+data/src/solaris/classes/sun/awt/X11/XListPeer.java.i
data/src/share/classes/sun/util/locale/StringTokenIterator.java.i
-data/test/java/nio/channels/DatagramChannel/Sender.java.i
+data/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java.i
data/src/share/classes/javax/imageio/stream/ImageInputStream.java.i
data/src/share/bin/java.c.i
data/test/java/net/InterfaceAddress/Equals.java.i
-data/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java.i
data/make/tools/swing-beans/beaninfo/images/JWindowMono16.gif.i
-data/test/sun/java2d/DirectX/AcceleratedScaleTest/AcceleratedScaleTest.java.i
+data/src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java.i
data/src/share/classes/javax/security/auth/kerberos/ServicePermission.java.i
data/src/share/classes/javax/management/loading/package.html.i
-data/test/java/util/Vector/IllegalConstructorArgs.java.i
+data/test/java/util/concurrent/BlockingQueue/MultipleProducersSingleConsumerLoops.java.i
data/test/java/lang/reflect/Proxy/returnTypes/GetSerializable.java.i
-data/test/java/beans/PropertyEditor/TestEnumSubclassValue.java.i
-data/src/share/classes/sun/font/FontAccess.java.i
+data/src/macosx/native/jobjc/src/core/native/MacOSXFramework.m.i
+data/test/java/beans/Introspector/6380849/beans/FirstBean.java.i
data/src/share/classes/sun/awt/DebugSettings.java.i
data/src/share/back/ReferenceTypeImpl.h.i
data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.keyPass.i
+data/src/macosx/native/jobjc/JObjC.xcodeproj/project.pbxproj.i
data/test/tools/pack200/PackageVersionTest.java.i
-data/make/sun/jpeg/mapfile-vers.i
data/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java.i
-data/src/share/classes/sun/nio/cs/UTF_8.java.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates.i
+data/make/common/Defs-embedded.gmk.i
data/src/share/classes/sun/awt/resources/awt.properties.i
-data/src/share/classes/java/nio/file/DirectoryStream.java.i
data/src/share/classes/javax/swing/text/DateFormatter.java.i
data/test/java/beans/XMLEncoder/java_awt_LinearGradientPaint.java.i
data/src/share/native/java/net/InetAddress.c.i
-data/src/share/classes/sun/nio/cs/ISO_8859_13.java.i
-data/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java.i
+data/test/javax/management/loading/DocumentRootTest.java.i
+data/src/share/classes/com/sun/pept/ept/EPTFactory.java.i
data/test/java/awt/FontClass/CreateFont/BigFont.java.i
data/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java.i
data/make/mkdemo/jfc/SwingApplet/Makefile.i
@@ -15112,27 +15728,31 @@ data/src/share/classes/javax/xml/crypto/dsig/dom/package.html.i
data/test/java/awt/TextField/ScrollSelectionTest/ScrollSelectionTest.html.i
data/src/share/classes/java/util/HashMap.java.i
data/make/netbeans/common/make.xml.i
+data/src/macosx/classes/com/apple/laf/AquaTableHeaderUI.java.i
data/src/share/classes/sun/security/provider/MD5.java.i
-data/src/share/classes/java/security/KeyStoreException.java.i
-data/test/sun/rmi/rmic/extraCompilation/run.sh.i
+data/test/sun/security/tools/jarsigner/oldsig.sh.i
+data/test/javax/crypto/Cipher/Turkish.java.i
data/make/mkdemo/management/FullThreadDump/Makefile.i
-data/src/share/classes/java/util/logging/ErrorManager.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/RealTimeTuning.java.i
data/test/com/sun/tools/attach/ApplicationSetup.sh.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java.i
data/src/share/classes/sun/nio/cs/UTF_32BE.java.i
data/src/solaris/classes/sun/awt/motif/MDataTransferer.java.i
-data/make/java/beans/Makefile.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java.i
+data/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java.i
data/test/java/nio/channels/Selector/KeySets.java.i
data/src/share/native/java/io/ObjectStreamClass.c.i
data/test/java/beans/PropertyEditor/TestByteClassValue.java.i
-data/src/share/classes/sun/security/provider/MD4.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_vi.properties.i
data/src/windows/native/sun/windows/awt_Mlib.cpp.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEG.java.i
+data/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java.i
+data/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java.i
data/test/org/openjdk/jigsaw/properties.xml.i
-data/make/tools/CharsetMapping/IBM1123.map.i
-data/src/windows/classes/sun/awt/windows/WMouseDragGestureRecognizer.java.i
+data/src/windows/native/com/sun/management/OperatingSystem_md.c.i
+data/src/share/native/sun/font/layout/GlyphIterator.h.i
data/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java.i
data/src/share/classes/java/lang/Process.java.i
+data/src/share/back/SDE.h.i
data/src/share/demo/scripting/jconsole-plugin/src/scripts/jtop.js.i
data/src/share/classes/java/lang/BootstrapMethodError.java.i
data/src/share/classes/sun/misc/UUEncoder.java.i
@@ -15140,42 +15760,45 @@ data/test/sun/text/resources/Format/Bug4651568.java.i
data/src/share/native/java/sql/DriverManager.c.i
data/src/solaris/native/sun/xawt/XlibWrapper.c.i
data/test/sun/security/tools/jarsigner/LargeJarEntry.java.i
-data/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java.i
+data/src/share/native/sun/java2d/loops/Ushort555Rgb.h.i
data/test/javax/management/remote/mandatory/connectorServer/SetMBeanServerForwarder.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmMemoryMeta.java.i
+data/src/windows/native/sun/java2d/d3d/D3DRenderQueue.cpp.i
data/src/solaris/classes/sun/awt/X11/XTextTransferHelper.java.i
data/src/share/classes/sun/tools/tree/AssignOpExpression.java.i
-data/make/tools/src/build/tools/jdwpgen/StringObjectTypeNode.java.i
+data/src/solaris/doc/sun/man/man1/ja/keytool.1.i
data/test/java/math/BigInteger/ModPow65537.java.i
-data/src/share/classes/com/sun/crypto/provider/KeyGeneratorCore.java.i
+data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.html.i
data/test/java/lang/instrument/ParallelTransformerLoaderApp.java.i
data/make/tools/swing-beans/beaninfo/images/JPopupMenuColor16.gif.i
+data/test/javax/naming/InitialContext/EnvClone.java.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_Omni.java.i
data/src/share/classes/java/security/cert/CertPathHelperImpl.java.i
data/src/windows/resource/java.rc.i
data/src/share/classes/sun/awt/im/InputContext.java.i
data/test/javax/management/monitor/MultiMonitorTest.java.i
+data/src/share/classes/com/sun/jdi/TypeComponent.java.i
+data/src/macosx/native/jobjc/src/tests/native/FunCallBench.m.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_ja.properties.i
data/src/share/classes/javax/swing/LayoutFocusTraversalPolicy.java.i
data/src/share/classes/javax/swing/colorchooser/ColorModelCMYK.java.i
data/test/sun/net/www/protocol/http/ChunkedErrorStream.java.i
data/src/share/classes/java/rmi/server/RemoteRef.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_de.properties.i
+data/test/java/beans/XMLEncoder/java_sql_Time.java.i
data/test/java/lang/Class/getModifiers/ResolveFrom.java.i
-data/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java.i
+data/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java.i
data/test/javax/management/mxbean/AmbiguousConstructorTest.java.i
data/src/share/classes/javax/sound/sampled/ReverbType.java.i
data/src/share/classes/sun/print/PageableDoc.java.i
data/src/share/classes/javax/security/auth/kerberos/JavaxSecurityAuthKerberosAccessImpl.java.i
-data/src/share/classes/javax/swing/SingleSelectionModel.java.i
-data/src/share/classes/java/lang/reflect/Member.java.i
+data/test/sun/security/tools/policytool/ChangeUI.html.i
data/test/javax/xml/crypto/dsig/data/signature-retrievalmethod-rawx509crt.xml.i
-data/src/share/classes/sun/security/krb5/KrbTgsReq.java.i
+data/src/share/classes/java/nio/channels/AsynchronousFileChannel.java.i
+data/make/tools/CharsetMapping/IBM948.c2b.i
data/test/javax/security/auth/x500/X500Principal/DerIsConstructor.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthRadioButtonMenuItemUI.java.i
data/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.html.i
data/src/share/classes/sun/security/x509/X509CertInfo.java.i
-data/src/solaris/native/sun/awt/awt_PopupMenu.h.i
+data/src/solaris/native/sun/awt/awt_Insets.h.i
data/test/java/beans/XMLEncoder/java_sql_Date.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparc/libnssckbi.so.i
data/make/tools/sharing/classlist.solaris.i
@@ -15184,59 +15807,66 @@ data/src/share/classes/com/sun/tools/example/debug/tty/TTY.java.i
data/test/java/rmi/Naming/DefaultRegistryPort.java.i
data/make/tools/dtdbuilder/Makefile.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonMenuItemUI.java.i
-data/src/share/demo/scripting/jconsole-plugin/src/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
+data/src/solaris/native/sun/awt/color.h.i
data/test/javax/print/attribute/MediaMappingsTest.java.i
+data/src/share/classes/javax/security/auth/RefreshFailedException.java.i
data/test/javax/xml/crypto/dsig/data/exc-signature.xml.i
data/test/javax/sound/midi/Gervill/ModelPerformer/SetSelfNonExclusive.java.i
data/test/java/lang/reflect/Generics/SignatureTest.java.i
data/src/share/classes/java/lang/invoke/CountingMethodHandle.java.i
data/src/share/demo/jvmti/hprof/jvm.hprof.txt.i
+data/src/solaris/doc/sun/man/man1/jmap.1.i
data/src/share/classes/java/awt/peer/DialogPeer.java.i
-data/test/demo/jvmti/gctest/BigHello.java.i
+data/src/bsd/doc/man/keytool.1.i
+data/test/java/beans/Beans/Test4067824.java.i
+data/src/share/native/sun/awt/libpng/pnglibconf.h.i
data/src/share/classes/java/rmi/activation/ActivationID.java.i
-data/test/java/net/SocketPermission/Equals.java.i
-data/make/java/redist/FILES.gmk.i
-data/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java.i
+data/test/java/security/SecureRandom/Serialize.java.i
+data/test/java/nio/channels/SocketChannel/Open.sh.i
data/make/tools/src/build/tools/jdwpgen/ArrayRegionTypeNode.java.i
data/test/sun/security/tools/keytool/DummyProvider.java.i
data/src/solaris/sample/dtrace/hotspot/method_invocation_stat.d.i
data/src/share/native/sun/awt/image/jpeg/jquant2.c.i
data/src/windows/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.i
data/src/share/classes/java/io/ObjectStreamClass.java.i
-data/test/sun/net/www/protocol/http/RelativeRedirect.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/package.html.i
+data/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java.i
data/src/share/classes/java/util/prefs/PreferencesFactory.java.i
-data/src/share/classes/java/util/TooManyListenersException.java.i
+data/test/java/net/SocketPermission/Ctor.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadingMBean.java.i
data/src/share/classes/java/util/Properties.java.i
data/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.java.i
data/src/share/classes/sun/tools/jar/Main.java.i
data/src/share/classes/java/awt/doc-files/GridLayout-2.gif.i
-data/test/java/util/ResourceBundle/Control/XmlRB_ja.xml.i
-data/test/javax/print/applet/applet2/META-INF/services/javax.print.PrintServiceLookup.i
+data/test/javax/swing/JScrollBar/6924059/bug6924059.java.i
+data/test/sun/security/util/PropertyExpander/ExpandAndEncode.java.i
data/src/solaris/native/sun/awt/fontconfig.h.i
data/test/java/net/URL/Test.java.i
data/make/netbeans/common/shared.xml.i
-data/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider.i
+data/make/sun/security/smartcardio/mapfile-vers.i
data/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c.i
-data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorServerProvider.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/RSAKeyValueResolver.java.i
-data/src/share/classes/com/sun/media/sound/AiffFileFormat.java.i
+data/test/com/sun/tools/attach/BadAgent.java.i
+data/test/javax/print/attribute/ServiceDialogTest.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/HmacSha1Aes256CksumType.java.i
data/test/java/lang/reflect/Field/GenericStringTest.java.i
-data/src/share/classes/java/util/CurrencyData.properties.i
+data/src/share/native/sun/security/ec/ecl-exp.h.i
+data/test/org/openjdk/jigsaw/cli/signer-prikey.pem.i
data/test/java/beans/XMLEncoder/Test6187118.java.i
data/src/share/classes/org/openjdk/jigsaw/cli/Signer.java.i
data/src/share/classes/javax/sql/rowset/JoinRowSet.java.i
data/src/share/classes/sun/java2d/pisces/Helpers.java.i
data/test/sun/security/krb5/auto/ok-as-delegate.sh.i
-data/src/share/classes/java/rmi/activation/UnknownGroupException.java.i
+data/test/java/nio/Buffer/CopyDirect-X-Memory.java.template.i
data/src/share/instrument/JarFacade.h.i
data/test/java/rmi/reliability/juicer/AppleUser.java.i
data/src/windows/native/sun/windows/awt_ScrollPane.h.i
data/test/java/io/RandomAccessFile/ParameterCheck.java.i
-data/src/share/classes/sun/io/ByteToCharCp1145.java.i
+data/src/share/native/sun/reflect/Reflection.c.i
data/test/sun/nio/cs/TestUni2HKSCS.java.i
+data/src/share/classes/java/awt/print/PrinterJob.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.c.i
-data/test/java/rmi/reliability/benchmark/runRmiBench.sh.i
+data/src/share/classes/java/awt/print/PrinterIOException.java.i
+data/src/share/classes/java/nio/channels/Channel.java.i
data/src/share/native/sun/java2d/loops/DrawRect.c.i
data/src/solaris/classes/sun/nio/fs/UnixFileSystem.java.i
data/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java.i
@@ -15244,40 +15874,39 @@ data/test/java/io/PrintWriter/CheckError.java.i
data/test/sun/security/smartcardio/TestTransmit.java.i
data/test/java/util/concurrent/forkjoin/Integrate.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfIntegerMonitor.java.i
-data/src/solaris/bin/jexec.c.i
+data/test/javax/crypto/SealedObject/NullKeySealedObject.java.i
data/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c.i
data/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java.i
-data/src/share/classes/javax/naming/LinkLoopException.java.i
data/test/sun/nio/cs/OLD/EUC_CN_OLD.java.i
data/src/share/classes/sun/tools/tree/BinaryShiftExpression.java.i
data/src/share/classes/java/rmi/activation/ActivationException.java.i
data/test/sun/net/www/protocol/http/B6890349.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509IssuerSerial.java.i
-data/src/share/classes/sun/security/ec/ECDSASignature.java.i
+data/src/solaris/native/java/io/canonicalize_md.c.i
data/src/share/native/sun/awt/image/jpeg/jchuff.c.i
data/make/tools/swing-beans/beaninfo/images/JViewportColor32.gif.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/CustomUIDefault.java.i
-data/make/sun/security/pkcs11/mapfile-vers.i
-data/test/java/lang/StringCoding/CheckEncodings.sh.i
-data/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadAllInstruments.java.i
+data/src/share/classes/javax/imageio/ImageWriter.java.i
+data/src/share/classes/sun/reflect/generics/tree/BaseType.java.i
+data/src/share/classes/sun/security/pkcs/PKCS7.java.i
data/test/java/rmi/registry/classPathCodebase/security.policy.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c.i
data/test/java/net/URLClassLoader/sealing/b/p/B.java.i
data/src/solaris/classes/sun/nio/fs/UnixPath.java.i
data/test/java/util/concurrent/ConcurrentQueues/IteratorWeakConsistency.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpV3Message.java.i
-data/src/share/classes/sun/nio/cs/ext/Big5_HKSCS_2001.java.i
-data/src/share/classes/java/nio/file/WatchKey.java.i
+data/test/sun/jvmstat/monitor/VmIdentifier/testcases.i
+data/src/solaris/classes/sun/awt/X11/security-icon-bw48.png.i
data/src/share/classes/java/util/logging/Logging.java.i
data/test/java/io/Serializable/explicitCNFException/ExplicitCNFException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidDigestValueException.java.i
-data/src/share/classes/sun/java2d/loops/DrawLine.java.i
+data/src/share/back/eventFilter.h.i
data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_BA.properties.i
-data/test/java/lang/Class/forName/classes/3.class.i
+data/test/sun/jvmstat/testlibrary/utils.sh.i
data/src/share/classes/sun/security/krb5/internal/crypto/DesMacCksumType.java.i
data/test/javax/security/auth/login/Exceptions/NewExceptions.java.i
data/src/share/classes/sun/nio/cs/CharsetMapping.java.i
-data/make/tools/reorder/tests/LoadJFrame.java.i
+data/src/macosx/classes/com/apple/eio/package.html.i
+data/test/javax/security/auth/login/Configuration/Synchronize.config.i
data/src/share/classes/java/lang/ref/WeakReference.java.i
data/src/share/classes/java/nio/file/CopyOption.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/DayTimeInterface.java.i
@@ -15292,163 +15921,174 @@ data/src/solaris/classes/sun/nio/fs/UnixSecureDirectoryStream.java.i
data/src/share/classes/sun/awt/AWTSecurityManager.java.i
data/test/javax/management/Introspector/annot/Name.java.i
data/src/windows/classes/sun/nio/fs/WindowsDirectoryStream.java.i
-data/src/share/classes/javax/accessibility/AccessibleEditableText.java.i
+data/src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java.i
data/test/java/beans/PropertyEditor/TestBooleanClassJava.java.i
-data/test/java/math/BigDecimal/MultiplyTests.java.i
+data/test/java/util/ResourceBundle/Test4314141A_de_.properties.i
+data/src/macosx/native/sun/awt/JavaAccessibilityAction.m.i
data/make/sun/awt/Makefile.i
+data/src/share/classes/java/awt/geom/PathIterator.java.i
data/src/share/classes/javax/net/ssl/HostnameVerifier.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.html.i
-data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java.i
-data/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java.i
data/src/share/classes/java/nio/file/FileAlreadyExistsException.java.i
data/test/sun/security/provider/X509Factory/BigCRL.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAccess.java.i
data/src/windows/classes/sun/security/provider/NativePRNG.java.i
-data/src/share/native/sun/awt/image/cvutils/img_output16_32.h.i
data/src/solaris/classes/sun/awt/X11ComponentPeer.java.i
data/test/javax/crypto/SecretKeyFactory/P2.jar.i
-data/src/share/native/sun/font/layout/SubtableProcessor.cpp.i
-data/src/share/classes/sun/rmi/transport/ConnectionInputStream.java.i
+data/test/java/text/Bidi/BidiConformance.java.i
+data/test/java/lang/StringCoding/CheckEncodings.sh.i
+data/src/share/classes/java/rmi/server/RMISocketFactory.java.i
data/src/solaris/classes/java/lang/UNIXProcess.java.linux.i
+data/src/share/demo/README.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java.i
data/src/share/native/sun/font/AccelGlyphCache.c.i
-data/src/solaris/back/linker_md.c.i
+data/test/java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java.i
data/src/share/classes/com/sun/security/sasl/ServerFactoryImpl.java.i
data/src/share/classes/sun/rmi/transport/proxy/RMISocketInfo.java.i
data/test/java/lang/reflect/Assignment/ArrayAssignment.java.i
+data/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.h.i
data/make/tools/swing-beans/beaninfo/images/JTableMono32.gif.i
data/src/share/classes/sun/security/tools/PathList.java.i
-data/make/sun/security/pkcs11/Makefile.i
+data/src/share/classes/sun/print/ServiceDialog.java.i
data/test/sun/security/pkcs11/rsa/TestSignatures.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java.i
data/src/share/classes/javax/print/attribute/standard/QueuedJobCount.java.i
-data/src/share/classes/com/sun/jdi/ThreadGroupReference.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFAttribute.java.i
+data/test/javax/swing/JColorChooser/Test4380468.java.i
+data/test/java/rmi/Naming/LookupNameWithColon.java.i
data/test/java/lang/instrument/TestClass2.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputImageTests.java.i
-data/test/java/lang/management/ThreadMXBean/ThreadStackTrace.java.i
-data/test/javax/print/PrintSE/PrintSE.sh.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiIn.c.i
+data/src/windows/classes/sun/awt/windows/WPageDialogPeer.java.i
+data/test/javax/swing/JPopupMenu/6691503/bug6691503.java.i
data/test/java/lang/invoke/MethodHandlesTest.java.i
data/src/share/classes/java/util/concurrent/locks/LockSupport.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java.i
data/test/java/net/DatagramSocket/InheritHandle.java.i
-data/src/solaris/native/sun/awt/awt_Selection.c.i
data/test/java/util/Formatter/BasicDouble.java.i
data/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java.i
-data/test/javax/swing/border/Test4243289.java.i
+data/src/share/sample/nio/server/URLDumper.java.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/ASCII_UCodeESC_CharStream.java.i
data/test/java/io/FileInputStream/LeadingSlash.java.i
data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldMono16.gif.i
-data/src/share/classes/sun/tools/tree/ConditionVars.java.i
-data/test/javax/management/Introspector/GetMBeanInfoExceptionTest.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DRenderQueue.java.i
+data/src/bsd/doc/man/ja/ktab.1.i
+data/src/share/classes/java/lang/Float.java.i
data/make/javax/swing/beaninfo/manifest.i
-data/test/java/lang/management/ThreadMXBean/MyOwnSynchronizer.java.i
+data/src/share/classes/java/awt/im/package.html.i
data/src/share/classes/javax/swing/text/html/parser/DTD.java.i
data/src/share/classes/javax/security/sasl/SaslServerFactory.java.i
data/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java.i
data/src/share/classes/java/dyn/WrongMethodTypeException.java.i
data/src/share/classes/java/nio/charset/exceptions.i
-data/src/share/classes/javax/swing/border/AbstractBorder.java.i
-data/src/share/sample/scripting/scriptpad/README.txt.i
+data/src/macosx/native/sun/awt/PrintModel.m.i
+data/src/share/demo/jfc/SampleTree/resources/images/expanded.gif.i
+data/src/solaris/classes/sun/nio/ch/FileKey.java.i
data/test/javax/security/auth/x500/X500Principal/EscapedChars.java.i
data/src/share/classes/javax/swing/text/DocumentFilter.java.i
-data/src/windows/native/sun/windows/stdhdrs.h.i
data/src/share/classes/javax/script/package.html.i
data/src/share/classes/sun/awt/geom/Order0.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/CheckDeps.java.i
+data/src/share/native/sun/font/layout/ThaiLayoutEngine.cpp.i
data/test/java/io/File/AccessDenied.java.i
data/src/share/classes/java/awt/geom/Rectangle2D.java.i
data/test/java/rmi/server/clientStackTrace/security.policy.i
+data/test/sun/security/krb5/auto/SSL.java.i
data/src/share/classes/sun/nio/ch/SelectorImpl.java.i
+data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml.i
data/test/java/math/BigInteger/ProbablePrime.java.i
-data/test/javax/management/namespace/NamespaceCreationTest.java.i
data/test/javax/management/MBeanServer/NotifDeadlockTest.java.i
+data/src/macosx/native/jobjc/run-and-write-if-okay.i
data/src/share/classes/sun/security/ssl/HelloExtensions.java.i
data/src/share/classes/sun/security/krb5/internal/APReq.java.i
data/src/share/classes/java/awt/peer/ListPeer.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_it.properties.i
data/test/javax/management/remote/mandatory/notif/ListenerScaleTest.java.i
+data/src/share/native/common/gdefs.h.i
data/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java.i
-data/test/javax/sound/midi/Gervill/ModelSource/NewModelSourceModelIdentifierBoolean.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java.i
data/src/share/classes/com/sun/jmx/remote/internal/IIOPHelper.java.i
data/src/solaris/classes/sun/java2d/BackBufferCapsProvider.java.i
data/src/share/classes/sun/text/resources/uprops.icu.i
data/src/share/classes/javax/swing/filechooser/FileSystemView.java.i
data/test/com/sun/jdi/HelloWorld.java.i
-data/src/share/classes/com/sun/jndi/ldap/BindingWithControls.java.i
+data/src/share/classes/sun/misc/BASE64Encoder.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/Token.java.i
data/test/java/io/charStreams/WriteLengths.java.i
data/make/sun/xawt/FILES_c_unix.gmk.i
-data/test/javax/management/remote/mandatory/notif/NotificationBufferCreationTest.java.i
-data/test/sun/tools/jps/jps-Vm_Output2.awk.i
-data/src/share/classes/com/sun/jdi/Value.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CCheckboxMenuItem.java.i
+data/test/javax/swing/JTextArea/4697612/bug4697612.java.i
+data/src/share/classes/sun/jvmstat/monitor/event/VmStatusChangeEvent.java.i
data/src/share/classes/java/awt/event/MouseEvent.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize-pressed.gif.i
-data/make/org/jcp/Makefile.i
+data/src/share/classes/sun/security/jgss/krb5/MicToken.java.i
data/make/netbeans/jconsole/nbproject/project.xml.i
data/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java.i
data/test/sun/security/provider/MessageDigest/Offsets.java.i
data/test/org/openjdk/jigsaw/cli/signed-module.sh.i
-data/make/java/invoke/Makefile.i
-data/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java.i
+data/test/java/lang/ClassLoader/Assert.java.i
data/src/share/classes/sun/dyn/MethodHandleImpl.java.i
data/test/java/util/zip/DeInflate.java.i
data/test/java/beans/XMLDecoder/Test4864117.java.i
data/src/share/sample/forkjoin/mergesort/MergeDemo.java.i
data/test/sun/net/www/ftptest/FtpCommandHandler.java.i
-data/src/windows/native/sun/java2d/windows/ddrawUtils.h.i
-data/src/share/classes/sun/nio/cs/ext/IBM278.java.i
+data/test/sun/security/provider/PolicyFile/SelfExpansion.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java.i
+data/test/java/awt/FileDialog/MultipleMode/MultipleMode.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_CH.properties.i
data/test/sun/rmi/rmic/newrmic/equivalence/Task.java.i
-data/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java.i
-data/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java.i
+data/test/java/awt/Focus/ClearLwQueueBreakTest/ClearLwQueueBreakTest.java.i
+data/src/share/classes/sun/awt/AWTAccessor.java.i
data/test/javax/swing/JEditorPane/6917744/test.html.i
data/src/share/classes/java/awt/Point.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nssutil3.lib.i
data/src/share/classes/org/openjdk/internal/joptsimple/ArgumentAcceptingOptionSpec.java.i
data/test/java/nio/channels/Selector/CloseWhenKeyIdle.java.i
-data/src/share/classes/java/net/SocketPermission.java.i
+data/src/share/classes/javax/swing/LayoutStyle.java.i
data/test/java/io/File/Unicode.java.i
data/src/share/classes/sun/util/locale/LocaleSyntaxException.java.i
-data/make/sun/Makefile.i
+data/src/share/classes/javax/accessibility/AccessibleBundle.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/FuncHereContext.java.i
-data/make/sun/cmm/lcms/Makefile.i
+data/src/share/classes/sun/text/normalizer/ReplaceableString.java.i
data/src/share/classes/com/sun/jdi/request/ThreadDeathRequest.java.i
-data/src/share/classes/sun/security/krb5/KrbAsReq.java.i
+data/src/windows/native/sun/windows/awt_IconCursor.h.i
data/test/java/lang/Runtime/exec/Status.java.i
data/test/javax/sound/midi/Gervill/ModelPerformer/GetOscillators.java.i
data/src/share/classes/sun/dyn/anon/AnonymousClassLoader.java.i
-data/test/sun/security/mscapi/RSAEncryptDecrypt.sh.i
+data/src/share/classes/com/sun/media/sound/MidiDeviceReceiverEnvelope.java.i
data/src/solaris/doc/sun/man/man1/jcmd.1.i
data/src/share/classes/com/sun/security/sasl/Provider.java.i
-data/make/com/sun/tracing/dtrace/Makefile.i
+data/test/java/util/ServiceLoader/FooService.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/FloatArrays.java.i
data/test/java/nio/channels/Selector/lots_of_updates.sh.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/PerfDataBuffer.java.i
+data/test/lib/security/java.policy/Ext_AllPolicy.sh.i
data/test/java/net/InetAddress/SimpleNameService.java.i
+data/src/macosx/classes/sun/awt/fontconfigs/macosx.fontconfig.properties.i
data/src/share/native/sun/security/ec/impl/ecp_521.c.i
-data/src/solaris/instrument/FileSystemSupport_md.c.i
+data/src/solaris/doc/sun/man/man1/ja/javac.1.i
data/src/windows/classes/sun/awt/windows/WPrintDialogPeer.java.i
data/src/share/classes/javax/management/RuntimeOperationsException.java.i
-data/src/share/classes/sun/io/CharToByteJIS0201.java.i
+data/test/javax/management/namespace/RemoveNotificationListenerTest.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Clazz.java.i
data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono32.gif.i
-data/src/share/classes/javax/swing/plaf/TreeUI.java.i
-data/test/javax/management/MBeanInfo/SerializationTest.java.i
+data/src/share/classes/javax/xml/crypto/URIDereferencer.java.i
data/src/share/native/java/util/concurrent/atomic/AtomicLong.c.i
data/src/share/classes/org/ietf/jgss/GSSException.java.i
data/test/javax/naming/ldap/LdapName/EscapeUnescapeTests.java.i
+data/make/tools/CharsetMapping/extsbcs.i
data/test/java/util/LinkedList/Remove.java.i
data/test/com/sun/jdi/DeleteAllBkptsTest.java.i
+data/src/share/classes/sun/rmi/server/ActivationGroupInit.java.i
data/src/windows/classes/sun/awt/windows/WPathGraphics.java.i
data/test/sun/security/provider/PolicyFile/EmailAddress.policy.i
data/test/java/net/URL/abnormal_http_urls.i
-data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JToolBarMono16.gif.i
+data/src/share/classes/java/awt/image/TileObserver.java.i
+data/src/share/classes/org/relaxng/datatype/DatatypeLibrary.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c.i
-data/src/share/classes/sun/beans/editors/ColorEditor.java.i
+data/test/java/net/BindException/Test.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/dk/DkCrypto.java.i
-data/src/share/classes/java/nio/Buffer.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c.i
-data/src/share/classes/sun/util/resources/CalendarData.properties.i
+data/test/java/util/EnumSet/RetainAll.java.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/SimpleStandardMBean.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Doubles.java.i
data/src/share/classes/java/util/AbstractMap.java.i
data/src/share/classes/sun/tools/tree/StringExpression.java.i
data/test/java/util/zip/InflaterBufferSize.java.i
@@ -15458,153 +16098,169 @@ data/src/share/classes/java/awt/image/package.html.i
data/src/share/classes/sun/awt/image/BadDepthException.java.i
data/test/javax/management/loading/mlet1.html.i
data/test/sun/nio/ch/Basic.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java.i
data/test/java/io/Serializable/classDescGetField/GetField.java.i
data/test/sun/nio/cs/OLD/IBM930_OLD.java.i
-data/make/com/sun/nio/Makefile.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java.i
+data/src/share/classes/com/sun/servicetag/RegistrationData.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java.i
data/src/share/classes/sun/reflect/annotation/AnnotationType.java.i
-data/src/share/bin/jli_util.h.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarA/META-INF/services/my.happy.land.i
data/src/share/classes/com/sun/media/sound/AbstractDataLine.java.i
-data/src/share/classes/sun/security/ssl/ECDHClientKeyExchange.java.i
+data/test/sun/security/smartcardio/TestConnect.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c.i
-data/make/netbeans/jconsole/build.xml.i
+data/make/jprt.config.i
data/src/share/classes/sun/tools/tree/BooleanExpression.java.i
-data/test/java/awt/Multiscreen/DeviceIdentificationTest/DeviceIdentificationTest.java.i
-data/test/sun/security/ssl/etc/unknown_keystore.i
+data/test/javax/management/namespace/VirtualPropsTest.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/ReflectionException.java.i
+data/src/macosx/classes/com/apple/concurrent/package.html.i
data/test/java/lang/Integer/GetInteger.java.i
-data/src/windows/native/sun/windows/awt_Panel.h.i
+data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/EncryptedKeyResolver.java.i
-data/test/java/awt/TrayIcon/CtorTest/CtorTest.java.i
+data/test/java/lang/String/IndexOfEmptyInEmpty.java.i
data/test/java/beans/Introspector/memory/Bean.java.i
data/src/share/classes/sun/net/httpserver/UndefLengthOutputStream.java.i
data/src/share/classes/javax/imageio/stream/MemoryCache.java.i
-data/test/sun/rmi/rmic/covariantReturns/G2Impl.java.i
+data/src/share/classes/sun/io/CharToByteMacRoman.java.i
data/src/share/classes/sun/java2d/pipe/BufferedBufImgOps.java.i
+data/src/macosx/classes/apple/laf/JRSUIUtils.java.i
data/test/sun/security/pkcs11/fips/secmod.db.i
data/src/share/classes/sun/security/krb5/internal/crypto/HmacMd5ArcFourCksumType.java.i
-data/src/share/classes/javax/management/remote/JMXPrincipal.java.i
-data/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java.i
+data/test/java/lang/StringBuffer/Supplementary.java.i
+data/src/share/classes/com/sun/jndi/ldap/VersionHelper.java.i
data/test/java/nio/file/Files/walk_file_tree.sh.i
data/src/share/classes/javax/management/remote/JMXConnector.java.i
data/test/java/lang/management/MemoryMXBean/CollectionUsageThreshold.java.i
data/src/share/classes/sun/io/ByteToCharUTF8.java.i
data/test/java/lang/Float/Extrema.java.i
data/src/share/classes/sun/security/pkcs11/Config.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c.i
-data/src/share/classes/sun/nio/cs/ArrayDecoder.java.i
+data/test/demo/jvmti/hprof/HelloWorld.java.i
+data/test/java/net/InetAddress/B5087907.java.i
+data/src/windows/native/sun/windows/stdhdrs.h.i
data/src/share/native/sun/security/ec/ecl-priv.h.i
data/src/share/native/sun/awt/image/jpeg/jfdctflt.c.i
data/src/solaris/doc/sun/man/man1/ja/tnameserv.1.i
-data/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java.i
+data/src/share/demo/jvmti/waiters/Agent.hpp.i
data/src/share/classes/com/sun/tools/jdi/SocketAttachingConnector.java.i
data/src/windows/native/sun/windows/awt.rc.i
-data/src/share/classes/java/nio/Direct-X-Buffer.java.i
+data/test/java/nio/file/Files/walkFileTree/WalkWithSecurity.java.i
data/make/sun/font/t2k/Makefile.i
data/src/share/classes/sun/util/resources/CurrencyNames_fi_FI.properties.i
+data/src/share/classes/sun/nio/ch/NativeDispatcher.java.i
data/src/share/classes/javax/swing/JTextField.java.i
-data/make/com/sun/tracing/Makefile.i
-data/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif.i
data/test/com/sun/nio/sctp/SctpMultiChannel/SocketOptionTests.java.i
data/src/solaris/classes/sun/awt/X11/XRobotPeer.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Cons.java.i
-data/src/share/classes/javax/swing/plaf/SplitPaneUI.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java.i
data/test/org/openjdk/jigsaw/cli/keystore.pw.i
-data/test/sun/security/pkcs11/ec/TestECDSA.java.i
+data/src/share/classes/java/security/PermissionCollection.java.i
data/src/share/classes/java/awt/peer/DesktopPeer.java.i
-data/test/javax/swing/JInternalFrame/Test6505027.java.i
-data/src/share/classes/sun/security/x509/IPAddressName.java.i
-data/test/sun/tools/native2ascii/N2A_4636448.expected.i
-data/src/share/classes/java/io/LineNumberInputStream.java.i
+data/src/share/native/java/lang/Shutdown.c.i
+data/test/java/net/URLConnection/RequestProperties.java.i
+data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/DirectoryScannerMXBean.java.i
+data/src/macosx/classes/com/apple/concurrent/Dispatch.java.i
+data/test/java/beans/XMLDecoder/spec/TestField.java.i
+data/test/javax/swing/JInternalFrame/6726866/bug6726866.html.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c.i
data/test/java/lang/Math/TanTests.java.i
data/src/share/classes/com/sun/jdi/request/MonitorWaitRequest.java.i
-data/src/share/classes/sun/text/resources/FormatData_en_IE.java.i
-data/src/share/classes/java/io/NotSerializableException.java.i
+data/src/share/classes/sun/tools/javac/resources/javac.properties.i
data/src/share/classes/java/lang/AbstractMethodError.java.i
data/test/java/util/concurrent/CountDownLatch/Basic.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/GeneratedClassFile.java.i
+data/src/share/demo/jvmti/index.html.i
data/src/share/classes/com/sun/management/VMOption.java.i
data/src/share/classes/sun/text/resources/FormatData_it_IT.java.i
data/test/java/util/ResourceBundle/KeySetMessages_zh_CN.java.i
-data/src/share/classes/sun/awt/resources/awt_zh_TW.properties.i
-data/src/share/classes/sun/java2d/opengl/OGLMaskBlit.java.i
+data/src/share/classes/sun/awt/datatransfer/DataTransferer.java.i
+data/src/share/sample/nio/file/WatchDir.java.i
data/make/tools/src/build/tools/jdwpgen/GroupNode.java.i
data/test/javax/print/TestRaceCond.java.i
+data/src/macosx/native/sun/java2d/opengl/CGLSurfaceData.m.i
data/src/share/classes/java/sql/Struct.java.i
data/make/tools/commentchecker/Makefile.i
data/test/java/awt/FileDialog/FileNameOverrideTest/FileNameOverrideTest.java.i
-data/src/share/classes/javax/swing/plaf/basic/BasicDesktopPaneUI.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/IntroTest.java.i
+data/test/java/security/cert/pkix/policyChanges/TestPolicy.java.i
data/src/share/classes/sun/awt/DefaultMouseInfoPeer.java.i
data/src/windows/native/sun/tools/attach/WindowsAttachProvider.c.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpEngine.java.i
-data/test/java/rmi/activation/Activatable/restartService/RestartService_Stub.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/paletteClose.gif.i
+data/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java.i
data/test/sun/security/ssl/javax/net/ssl/HttpsURLConnection/DelayDefaultContextLoading.java.i
-data/src/share/classes/sun/tools/jconsole/LabeledComponent.java.i
+data/test/java/awt/appletviewer/IOExceptionIfEncodedURLTest/test.html.i
data/src/share/classes/sun/security/x509/OIDName.java.i
-data/make/modules/tools/Makefile.i
+data/src/share/classes/java/lang/module/ModuleInfoReader.java.i
data/src/share/classes/sun/security/pkcs/SignerInfo.java.i
data/test/sun/security/tools/jarsigner/nameclash.sh.i
data/test/sun/net/www/protocol/http/spnegoLog.properties.i
data/test/sun/rmi/rmic/newrmic/equivalence/AgentServerImpl.java.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/InterprocessMessages.java.i
-data/src/share/native/sun/nio/ch/genSocketOptionRegistry.c.i
+data/test/java/net/Socket/setReuseAddress/Basic.java.i
data/test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java.i
+data/test/java/net/Socket/asyncClose/AsyncCloseTest.java.i
data/test/java/io/Serializable/proxy/Basic.java.i
data/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java.i
data/src/share/classes/sun/nio/ch/AbstractFuture.java.i
data/src/windows/classes/sun/awt/windows/WTextComponentPeer.java.i
data/test/javax/management/remote/mandatory/loading/RMIDownloadTest.java.i
data/src/share/classes/javax/management/relation/RoleList.java.i
-data/src/share/classes/sun/io/ByteToCharUnicodeBig.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLTwoLevel.java.i
data/src/share/classes/com/sun/jndi/toolkit/dir/AttrFilter.java.i
data/src/share/classes/sun/net/idn/uidna.spp.i
data/test/java/beans/Introspector/Test6707234.java.i
+data/test/tools/launcher/MainClassAttributeTest.java.i
data/src/share/classes/com/sun/servicetag/resources/javase_servicetag.properties.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain9.txt.i
+data/test/org/openjdk/jigsaw/library.sh.i
data/src/share/classes/java/io/DataInput.java.i
-data/src/share/classes/sun/security/x509/AuthorityKeyIdentifierExtension.java.i
+data/test/javax/management/modelmbean/LoggingExceptionTest.java.i
data/src/share/classes/sun/security/util/AuthResources_pt_BR.java.i
data/src/windows/native/java/io/FileOutputStream_md.c.i
data/test/javax/swing/JComponent/6989617/bug6989617.java.i
-data/test/java/awt/FontClass/FontAccess.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c.i
+data/test/javax/management/remote/mandatory/loading/DeserializeEncodedURLTest.java.i
+data/src/share/classes/javax/swing/text/html/parser/DocumentParser.java.i
+data/src/share/classes/java/nio/file/SimpleFileVisitor.java.i
data/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java.i
data/src/share/classes/sun/text/resources/FormatData_zh_HK.java.i
-data/make/tools/src/build/tools/javazic/RuleRec.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java.i
+data/src/share/transport/shmem/shmemBack.c.i
+data/test/sun/security/pkcs11/ec/pkcs12/sect193r1server-rsa1024ca.p12.i
data/test/java/rmi/server/RMIClassLoader/getClassLoader/Foo.java.i
data/src/share/classes/sun/text/resources/CollationData_sq.java.i
-data/src/share/classes/javax/swing/table/TableModel.java.i
-data/test/sun/java2d/pipe/hw/VSyncedBufferStrategyTest/VSyncedBufferStrategyTest.java.i
+data/src/solaris/classes/sun/awt/fontconfigs/solaris.fontconfig.5.9.properties.i
+data/test/java/util/Locale/LocaleCategory.sh.i
data/test/java/awt/EventDispatchThread/PreserveDispathThread/PreserveDispatchThread.java.i
data/src/share/classes/com/sun/servicetag/BrowserSupport.java.i
-data/make/mksample/webservices/EbayServer/Makefile.i
-data/make/common/Defs-modules.gmk.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_fr.properties.i
+data/src/share/classes/sun/misc/Timeable.java.i
+data/test/java/lang/instrument/StressGetObjectSizeTest.sh.i
+data/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet_Stub.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticLongFieldAccessorImpl.java.i
-data/test/tools/pack200/Pack200Props.java.i
+data/src/share/classes/sun/security/jca/ServiceId.java.i
data/test/sun/misc/JarIndex/metaInfFilenames/Basic.java.i
-data/make/tools/src/build/tools/jdwpgen/CommentNode.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/README.i
data/test/javax/swing/SwingUtilities/7088744/bug7088744.java.i
data/src/share/classes/javax/swing/JProgressBar.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/SctpNet.java.i
data/test/java/awt/PrintJob/QuoteAndBackslashTest/QuoteAndBackslashTest.java.i
data/src/share/classes/javax/swing/doc-files/JRootPane-2.gif.i
data/src/share/classes/java/dyn/SpreadGeneric.java.i
data/test/sun/rmi/log/ReliableLog/SnapshotSize.java.i
data/src/share/demo/jfc/Metalworks/AquaMetalTheme.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMeta.java.i
-data/src/share/instrument/PathCharsValidator.c.i
+data/src/windows/native/java/net/net_util_md.h.i
data/src/share/classes/com/sun/servicetag/resources/jdk_header.png.i
data/test/java/text/Bidi/Bug7002398.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpMsg.java.i
+data/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider.i
data/test/javax/management/mxbean/PropertyNamesTest.java.i
data/src/share/classes/java/nio/file/Paths.java.i
-data/test/java/net/URL/Protocol.java.i
+data/test/java/util/Locale/serialized/java6locale_ROOT.i
data/src/share/classes/com/sun/tools/jdi/BaseLineInfo.java.i
data/test/java/awt/KeyboardFocusmanager/TypeAhead/ButtonActionKeyTest/ButtonActionKeyTest.java.i
data/src/share/back/bag.c.i
data/test/java/io/Serializable/class/SerialA_3.java.i
data/src/share/classes/com/sun/tools/hat/Main.java.i
+data/src/share/classes/javax/swing/text/NumberFormatter.java.i
data/test/java/awt/Focus/NoAutotransferToDisabledCompTest/NoAutotransferToDisabledCompTest.java.i
data/src/share/classes/javax/swing/undo/doc-files/UndoManager-4.gif.i
data/test/java/util/ResourceBundle/Control/AbstractRB.java.i
@@ -15613,14 +16269,13 @@ data/src/share/demo/jvmti/mtrace/mtrace.h.i
data/src/share/native/sun/awt/medialib/awt_ImagingLib.c.i
data/test/java/security/Policy/Dynamic/TestDynamicPolicy.java.i
data/src/linux/doc/man/ja/kinit.1.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/ShortArrayCalls.java.i
+data/src/share/classes/sun/nio/cs/ext/MS949.java.i
data/src/share/classes/java/applet/AppletStub.java.i
-data/test/java/nio/channels/FileChannel/Pwrite.java.i
-data/test/sun/security/pkcs11/tls/keymatdata.txt.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/manifest.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvIndex3_8_8nw.c.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/rsa/BrokenRSAPrivateCrtKey.java.i
data/test/java/util/Formatter/BasicChar.java.i
data/test/sun/tools/native2ascii/A2N_4630463.expected.i
-data/src/share/classes/sun/util/LocaleDataMetaInfo-XLocales.java.i
+data/src/share/classes/sun/rmi/rmic/Names.java.i
data/src/share/classes/javax/swing/RowFilter.java.i
data/src/share/classes/sun/awt/ConstrainableGraphics.java.i
data/make/tools/swing-beans/beaninfo/images/JTabbedPaneMono32.gif.i
@@ -15629,52 +16284,52 @@ data/test/sample/chatserver/ChatTest.java.i
data/test/java/io/FileOutputStream/OpsAfterClose.java.i
data/src/share/classes/sun/tools/jps/Jps.java.i
data/src/share/classes/javax/management/RuntimeErrorException.java.i
-data/test/java/util/ResourceBundle/Bug6299235Test.java.i
+data/src/macosx/classes/java/util/prefs/MacOSXPreferencesFile.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCryptoBinary.java.i
data/src/share/demo/nbproject/jfc/Notepad/nbproject/project.xml.i
data/src/share/classes/com/sun/jmx/mbeanserver/SecureClassLoaderRepository.java.i
data/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java.i
-data/src/share/classes/sun/net/ftp/FtpDirEntry.java.i
+data/test/javax/swing/JTable/6263446/bug6263446.java.i
data/test/sun/security/pkcs11/KeyStore/Basic.sh.i
data/src/share/sample/scripting/scriptpad/src/resources/scriptpad.js.i
data/src/share/classes/sun/net/www/MeteredStream.java.i
-data/test/java/beans/XMLEncoder/java_awt_ScrollPane.java.i
+data/test/javax/xml/crypto/dsig/data/signature-external-b64-dsa.xml.i
data/test/sun/management/jmxremote/bootstrap/management_test03_ko.properties.in.i
-data/src/share/native/java/lang/fdlibm/src/w_atanh.c.i
+data/src/windows/native/sun/windows/ComCtl32Util.cpp.i
data/test/sun/tools/jps/jps-l_2.sh.i
data/test/java/util/EnumSet/InsertWrongType.java.i
data/src/share/back/export/sys.h.i
data/test/java/rmi/activation/Activatable/restartService/rmid.security.policy.i
-data/make/com/sun/security/auth/Makefile.i
+data/src/share/classes/sun/reflect/SerializationConstructorAccessorImpl.java.i
data/src/share/classes/sun/misc/Ref.java.i
data/src/share/native/sun/font/freetypeScaler.c.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmThreadInstanceEntryImpl.java.i
-data/src/share/classes/sun/security/ssl/DHClientKeyExchange.java.i
+data/test/java/awt/dnd/Button2DragTest/Button2DragTest.java.i
data/src/share/native/sun/awt/image/cvutils/img_fsgray.h.i
-data/src/share/classes/java/util/concurrent/ExecutorCompletionService.java.i
data/src/share/classes/sun/security/ec/SunECEntries.java.i
data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipInfo.java.i
-data/src/windows/classes/sun/nio/fs/WindowsSecurity.java.i
+data/src/solaris/classes/com/sun/management/OSMBeanFactory.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JJTParserState.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java.i
-data/src/windows/native/sun/java2d/d3d/D3DContext.h.i
+data/src/share/classes/sun/management/resources/agent_es.properties.i
data/src/share/classes/sun/security/x509/CertAttrSet.java.i
data/src/windows/native/sun/windows/awt_Frame.cpp.i
-data/src/solaris/doc/sun/man/man1/keytool.1.i
data/src/share/classes/sun/rmi/server/ActivatableServerRef.java.i
data/src/share/classes/sun/security/util/Resources_zh_TW.java.i
data/src/share/classes/java/nio/file/ClosedWatchServiceException.java.i
-data/make/tools/GenerateCharacter/CharacterDataUndefined.java.template.i
data/src/share/classes/javax/management/NumericValueExp.java.i
+data/src/macosx/classes/com/apple/eawt/event/GesturePhaseEvent.java.i
+data/src/share/classes/sun/util/resources/CalendarData_et.properties.i
data/test/com/sun/jdi/RedefineAnnotation.sh.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/EncryptionConstants.java.i
-data/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/UnconnectedSocketWrongExceptions.java.i
data/test/java/io/Serializable/GetField/Read.java.i
data/src/share/classes/sun/rmi/transport/StreamRemoteCall.java.i
data/src/share/native/java/lang/fdlibm/src/w_log10.c.i
data/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java.i
+data/test/javax/swing/JToolTip/4846413/bug4846413.java.i
data/make/sun/security/pkcs11/FILES_c.gmk.i
data/src/share/classes/sun/awt/im/InputMethodManager.java.i
data/src/share/classes/javax/sound/midi/MidiMessage.java.i
@@ -15683,37 +16338,40 @@ data/test/demo/jvmti/minst/MinstExample.java.i
data/make/tools/CharsetMapping/MS936.map.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemMgrPoolRelTableMetaImpl.java.i
data/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.h.i
-data/src/share/sample/vm/clr-jvm/Makefile.i
+data/make/tools/CharsetMapping/IBM875.map.i
+data/test/java/util/concurrent/ConcurrentQueues/ConcurrentQueueLoops.java.i
data/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java.i
data/src/share/classes/sun/dyn/InvokeGeneric.java.i
data/src/share/native/sun/font/layout/SegmentSingleProcessor.h.i
-data/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java.i
-data/src/share/classes/java/awt/datatransfer/UnsupportedFlavorException.java.i
+data/make/tools/reorder/tests/LoadToolkit.java.i
+data/src/share/demo/jfc/Notepad/README.txt.i
+data/src/share/classes/java/awt/dnd/peer/DropTargetPeer.java.i
data/test/java/util/ResourceBundle/Test4314141A.properties.i
data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/ClassCompare.java.i
+data/src/macosx/classes/com/apple/laf/AquaFileChooserUI.java.i
data/src/share/native/sun/java2d/loops/Any4Byte.h.i
data/src/share/classes/sun/net/www/protocol/ftp/Handler.java.i
data/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test.java.i
data/src/share/classes/sun/tools/javac/ErrorConsumer.java.i
-data/src/share/native/sun/management/Flag.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NExclusive.java.i
+data/src/share/classes/java/nio/file/DirectoryStream.java.i
+data/src/share/classes/java/rmi/UnexpectedException.java.i
data/src/share/classes/com/sun/imageio/plugins/common/iio-plugin.properties.i
-data/src/share/native/sun/font/layout/SinglePositioningSubtables.h.i
-data/src/share/native/java/util/zip/zlib-1.2.3/deflate.h.i
+data/src/share/classes/javax/security/sasl/SaslException.java.i
data/src/share/classes/sun/nio/cs/standard-charsets.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_CU.properties.i
data/test/java/io/Serializable/classDescHooks/ClassDescHooks.java.i
-data/test/java/beans/PropertyChangeSupport/1.5.0_10.ser.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/SPKIData.java.i
data/make/tools/CharsetMapping/IBM870.nr.i
data/src/share/classes/java/lang/module/ModuleInfo.java.i
data/test/java/util/concurrent/Executors/Throws.java.i
data/src/share/native/sun/awt/image/cvutils/img_output16.h.i
data/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java.i
-data/src/share/classes/java/lang/Shutdown.java.i
+data/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java.i
+data/make/mkdemo/jvmti/gctest/Makefile.i
data/src/share/classes/javax/swing/plaf/synth/SynthStyleFactory.java.i
data/test/javax/management/context/localizable/MBeanDescriptions.properties.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_png.c.i
-data/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in.i
+data/src/share/classes/sun/text/resources/FormatData_es_GT.java.i
+data/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html.i
data/src/share/classes/java/util/EventObject.java.i
data/src/share/classes/sun/nio/cs/ext/DoubleByte.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization_it.properties.i
@@ -15723,187 +16381,194 @@ data/test/java/net/URL/OpenConnection.java.i
data/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java.i
data/test/com/sun/tools/attach/AgentSetup.sh.i
data/src/share/native/sun/security/ec/logtab.h.i
+data/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java.i
data/test/sun/nio/cs/OLD/IBM950_OLD.java.d
data/src/solaris/classes/sun/nio/fs/SolarisNativeDispatcher.java.i
-data/test/sun/util/resources/Locale/Bug6275682.java.i
+data/src/macosx/classes/sun/java2d/opengl/CGLSurfaceData.java.i
+data/src/share/sample/vm/jvm-clr/Makefile.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeDirContext.java.i
-data/make/com/sun/sql/Makefile.i
+data/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy23.i
-data/src/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java.i
+data/test/sun/nio/cs/OLD/IBM950_OLD.java.i
data/src/solaris/native/sun/awt/awt_TextArea.c.i
-data/make/tools/CharsetMapping/dbcs.i
+data/src/share/classes/java/net/CookieHandler.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java.i
data/make/tools/src/build/tools/generatenimbus/Generator.java.i
-data/src/share/native/sun/font/layout/DeviceTables.h.i
data/test/java/nio/charset/Charset/CharsetContainmentTest.java.i
data/test/java/net/PortUnreachableException/Test.java.i
data/test/org/openjdk/jigsaw/eg/com/foo/bar/module-info.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgbPre.c.i
data/src/share/classes/java/lang/management/PlatformComponent.java.i
data/src/share/classes/java/util/logging/SocketHandler.java.i
-data/test/sun/net/idn/nfsmxp.spp.i
+data/src/share/demo/jvmti/hprof/hprof_stack.h.i
data/test/sun/management/jmxremote/LocalRMIServerSocketFactoryTest.java.i
data/src/share/classes/sun/misc/Timer.java.i
data/src/share/classes/com/sun/jndi/ldap/EventQueue.java.i
data/src/share/classes/sun/security/krb5/KrbPriv.java.i
data/test/java/lang/management/RuntimeMXBean/InputArgument.java.i
+data/src/windows/npt/npt_md.h.i
data/src/share/classes/sun/security/util/PolicyUtil.java.i
data/make/com/sun/nio/sctp/Exportedfiles.gmk.i
data/src/share/classes/sun/security/x509/KeyIdentifier.java.i
data/src/share/classes/javax/swing/text/AbstractDocument.java.i
+data/src/macosx/native/sun/font/AWTStrike.h.i
data/test/sun/java2d/cmm/ColorConvertOp/LRGB.png.i
data/test/java/awt/dnd/URIListBetweenJVMsTest/URIListBetweenJVMsTest.java.i
data/src/share/classes/java/beans/beancontext/BeanContextEvent.java.i
data/src/share/classes/sun/security/krb5/KdcComm.java.i
-data/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties.i
-data/src/windows/native/java/net/Inet6AddressImpl.c.i
-data/test/com/sun/crypto/provider/Cipher/AES/TestKATForECB_IV.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarB/META-INF/JAVA2.DS.i
+data/test/java/lang/instrument/ExampleRedefine.java.i
+data/test/java/lang/management/MemoryMXBean/CollectionUsageThresholdParallelGC.sh.i
data/src/share/classes/sun/awt/FontConfiguration.java.i
-data/test/sun/security/pkcs11/fips/TrustManagerTest.java.i
+data/test/com/sun/net/httpserver/bugs/B6393710.java.i
data/src/share/classes/javax/crypto/SecretKey.java.i
data/test/java/util/Arrays/Big.java.i
data/test/javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_BO.properties.i
data/src/share/classes/com/sun/jmx/namespace/serial/RewritingProcessor.java.i
-data/src/windows/native/sun/java2d/d3d/D3DShaderGen.c.i
-data/test/javax/naming/InitialContext/EnvClone.java.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/CheckMyTrustedKeystore.java.i
+data/test/com/oracle/security/ucrypto/TestRSA.java.i
data/test/sun/nio/cs/OLD/MS936_OLD.java.i
data/test/com/sun/crypto/provider/Cipher/UTIL/TestUtil.java.i
data/test/java/beans/PropertyEditor/TestEnumSubclass.java.i
data/src/share/classes/java/beans/VetoableChangeListenerProxy.java.i
data/src/share/classes/java/net/SocketImplFactory.java.i
data/src/share/classes/sun/security/krb5/internal/ETypeInfo2.java.i
-data/src/share/classes/sun/reflect/UnsafeQualifiedIntegerFieldAccessorImpl.java.i
+data/test/com/sun/jdi/BreakpointTest.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Main.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMCanonicalXMLC14N11Method.java.i
data/make/mkdemo/applets/WireFrame/Makefile.i
-data/test/java/io/Serializable/unshared/Read.java.i
-data/src/share/classes/sun/net/ftp/FtpProtocolException.java.i
+data/test/sun/net/www/ftptest/FtpFileSystemHandler.java.i
+data/src/share/classes/java/lang/IndexOutOfBoundsException.java.i
data/src/share/native/sun/awt/splashscreen/splashscreen_gfx_impl.h.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/key3.db.i
data/src/share/classes/sun/awt/geom/AreaOp.java.i
+data/test/javax/swing/JPopupMenu/6987844/bug6987844.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.h.i
data/test/java/rmi/reliability/benchmark/bench/serial/ObjArrays.java.i
data/test/java/util/ResourceBundle/ResourceBundleTest.java.i
-data/src/share/lib/security/java.security.i
+data/make/sun/awt/mapfile-mawt-vers.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ja.properties.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl.java.i
data/src/share/classes/sun/awt/resources/awt_fr.properties.i
-data/src/share/classes/com/sun/imageio/spi/RAFImageOutputStreamSpi.java.i
-data/test/sun/tools/jstatd/usage.out.i
+data/test/javax/xml/crypto/dsig/data/signature.xml.i
+data/test/sun/security/jgss/spnego/NegTokenTargFields.java.i
data/src/share/classes/javax/security/auth/kerberos/KerberosPrincipal.java.i
data/src/share/classes/java/dyn/LinkagePermission.java.i
data/test/sun/net/InetAddress/nameservice/chaining/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
-data/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java.i
+data/test/java/nio/channels/FileChannel/ReadFull.java.i
data/src/share/lib/images/cursors/motif_LinkDrop32x32.gif.i
-data/src/share/classes/com/sun/tools/jdi/CharValueImpl.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_4.java.i
data/src/share/classes/com/sun/beans/finder/PersistenceDelegateFinder.java.i
data/test/sun/security/pkcs11/tls/prfdata.txt.i
-data/test/java/util/zip/pkware123456789012345.zip.i
-data/src/share/classes/java/util/concurrent/ThreadFactory.java.i
+data/test/java/lang/ThreadLocal/Basic.java.i
+data/src/share/classes/javax/print/attribute/TextSyntax.java.i
data/src/share/classes/java/util/jar/JarEntry.java.i
-data/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java.i
-data/src/windows/classes/sun/awt/windows/WGlobalCursorManager.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.access.in.i
data/make/tools/GenerateCharacter/CharacterDataPrivateUse.java.template.i
data/test/org/openjdk/jigsaw/cli/SignedModuleFileTest.sh.i
data/test/java/net/Socket/SocketImplTest.java.i
-data/src/share/classes/sun/print/PrintJobAttributeException.java.i
+data/src/windows/classes/sun/java2d/windows/GDIWindowSurfaceData.java.i
data/src/share/classes/sun/reflect/generics/reflectiveObjects/ParameterizedTypeImpl.java.i
-data/test/javax/swing/JLayer/6824395/bug6824395.java.i
+data/test/java/util/ResourceBundle/Control/BadStaticInitRB.java.i
data/src/share/classes/java/security/UnrecoverableEntryException.java.i
data/test/java/rmi/reliability/juicer/OrangeImpl.java.i
-data/test/java/io/Serializable/6966692/Victim.java.i
-data/src/share/sample/nio/server/RequestHandler.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionException.java.i
+data/src/share/classes/sun/tools/jstat/Identifier.java.i
data/test/java/io/Serializable/enum/array/Test.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO2022_CN.java.i
+data/src/share/classes/sun/tools/tree/BinaryAssignExpression.java.i
data/test/java/net/DatagramPacket/Constructor.java.i
data/src/share/classes/sun/reflect/annotation/AnnotationTypeMismatchExceptionProxy.java.i
data/src/windows/native/sun/java2d/d3d/D3DResourceManager.cpp.i
-data/src/share/classes/javax/swing/SwingUtilities.java.i
-data/src/share/classes/javax/print/attribute/PrintJobAttribute.java.i
+data/test/com/sun/jdi/Redefine-g.sh.i
+data/test/javax/management/remote/mandatory/provider/META-INF/services/javax.management.remote.JMXConnectorProvider.i
data/src/share/classes/sun/reflect/generics/repository/ConstructorRepository.java.i
data/test/java/lang/StrictMath/Log10Tests.java.i
-data/test/java/nio/file/Files/MaxDepth.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames.properties.i
+data/make/mkdemo/jvmti/waiters/Makefile.i
+data/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java.i
+data/src/share/classes/com/sun/jdi/PrimitiveType.java.i
+data/test/javax/print/StreamPrintingOrientation.java.i
data/make/mkdemo/applets/TicTacToe/Makefile.i
data/test/java/net/Socket/OldSocketImpl.java.i
data/test/java/net/DatagramSocketImpl/CheckDiscard.java.i
data/src/share/classes/sun/java2d/pipe/LCDTextRenderer.java.i
data/test/java/security/cert/CertPathBuilder/targetConstraints/sun.cer.i
-data/src/share/classes/sun/util/resources/CurrencyNames_pt_PT.properties.i
+data/test/java/util/zip/TestEmptyZip.java.i
data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup_Stub.java.i
data/src/windows/classes/sun/nio/fs/WindowsFileAttributeViews.java.i
data/src/share/classes/sun/dyn/util/ValueConversions.java.i
data/src/share/classes/sun/io/CharToByteUnicode.java.i
data/test/java/beans/XMLEncoder/6380849/BeanPersistenceDelegate.java.i
data/src/share/classes/com/sun/jndi/ldap/ServiceLocator.java.i
-data/src/share/classes/java/text/spi/NumberFormatProvider.java.i
+data/src/share/classes/sun/java2d/loops/CustomComponent.java.i
data/test/sun/management/HotspotClassLoadingMBean/GetUnloadedClassSize.java.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java.i
-data/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java.i
data/src/share/native/sun/font/layout/SingleTableProcessor.h.i
data/src/share/classes/java/lang/annotation/Annotation.java.i
data/test/java/nio/channels/Channels/Basic.java.i
-data/src/share/classes/com/sun/jdi/AbsentInformationException.java.i
+data/test/com/sun/jdi/GenericsTest.java.i
data/src/share/classes/sun/tools/tree/BitAndExpression.java.i
-data/src/share/demo/jfc/CodePointIM/resources/codepoint_zh_CN.properties.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHandlerTest.java.i
data/test/java/net/URL/GetDefaultPort.java.i
-data/src/share/demo/applets/GraphicsTest/AppletFrame.java.i
-data/test/java/lang/Throwable/SuppressedExceptions.java.i
+data/src/share/classes/sun/util/resources/LocaleNames.properties.i
data/src/share/classes/sun/reflect/ClassFileConstants.java.i
-data/src/share/native/sun/java2d/loops/Index8Gray.c.i
+data/test/java/io/InputStream/Skip.java.i
data/src/share/classes/java/awt/FlowLayout.java.i
data/test/javax/script/StringWriterPrintTest.java.i
data/src/share/classes/java/awt/geom/Dimension2D.java.i
data/src/windows/classes/sun/awt/windows/WObjectPeer.java.i
-data/make/javax/crypto/policy/unlimited/default_US_export.policy.i
+data/src/share/classes/sun/util/resources/CurrencyNames_es_SV.properties.i
data/src/share/classes/sun/awt/RepaintArea.java.i
+data/src/share/classes/java/rmi/Remote.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk3.cert.i
-data/make/javax/crypto/policy/limited/LIMITED.i
+data/src/share/classes/sun/text/resources/FormatData_es_PR.java.i
data/src/share/classes/com/sun/nio/sctp/SctpChannel.java.i
data/make/tools/swing-beans/beaninfo/images/JSliderColor32.gif.i
-data/src/share/classes/sun/rmi/log/LogOutputStream.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/PaddingTest.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ConstantPoolParser.java.i
data/src/share/classes/javax/sound/sampled/AudioSystem.java.i
-data/src/share/classes/javax/naming/RefAddr.java.i
-data/src/share/native/sun/security/ec/mpi.h.i
+data/test/javax/swing/text/html/CSS/4530474/test.css.i
+data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java.i
+data/test/javax/crypto/SecretKeyFactory/FailOverTest.java.i
data/src/share/classes/java/sql/Wrapper.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_PBE_PARAMS.java.i
-data/test/javax/crypto/Mac/TestGetInstance.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.cert.i
+data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i
+data/test/javax/sound/midi/Gervill/ModelPerformer/SetVelFrom.java.i
data/src/solaris/classes/sun/awt/X11/security-icon-yellow32.png.i
-data/src/share/classes/java/net/MulticastSocket.java.i
-data/src/share/classes/java/io/ObjectStreamConstants.java.i
+data/test/javax/swing/JFileChooser/6484091/bug6484091.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_SG.properties.i
data/test/com/sun/jdi/JdbLockTest.sh.i
+data/src/share/classes/sun/util/resources/CalendarData_en.properties.i
data/src/share/classes/sun/io/ByteToCharCp037.java.i
data/test/java/beans/PropertyEditor/Test7087876.java.i
data/test/sun/nio/cs/TestX11JIS0201.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherData.java.i
-data/test/java/net/CookieHandler/B6791927.java.i
data/make/java/java_crw_demo/mapfile-vers.i
data/src/share/classes/sun/security/provider/certpath/Vertex.java.i
-data/make/tools/CharsetMapping/IBM1141.c2b.i
-data/test/java/io/Serializable/PutField/Write.java.i
+data/src/share/classes/javax/print/attribute/HashPrintJobAttributeSet.java.i
+data/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java.i
data/src/share/modules/jdk.base/module-info.java.i
-data/make/sun/jawt/Depend.mak.i
data/src/share/classes/sun/tools/tree/TryStatement.java.i
data/src/share/classes/java/awt/peer/MenuComponentPeer.java.i
data/test/sun/security/tools/keytool/readjar.sh.i
data/src/share/native/sun/security/ec/ecp_384.c.i
data/test/java/awt/List/SetFontTest/SetFontTest.java.i
data/src/share/classes/java/security/cert/package.html.i
-data/src/share/native/sun/font/fontscalerdefs.h.i
-data/src/share/classes/sun/io/CharToByteCp970.java.i
+data/test/java/io/Serializable/primitiveClasses/PrimitiveClasses.java.i
+data/src/share/demo/jvmti/agent_util/agent_util.h.i
data/src/share/classes/sun/reflect/UnsafeStaticByteFieldAccessorImpl.java.i
data/test/sun/util/resources/Calendar/Bug4527203.java.i
data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ActivateMe.java.i
data/src/share/classes/sun/nio/ch/Net.java.i
data/test/java/io/Serializable/classDescHooks/Loopback.java.i
data/test/java/beans/PropertyEditor/TestFloatTypeNull.java.i
-data/src/share/classes/sun/text/resources/FormatData_th_TH.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c.i
+data/test/tools/pack200/MemoryAllocatorTest.java.i
+data/src/share/classes/com/sun/media/sound/DLSInstrument.java.i
+data/test/java/beans/PropertyEditor/TestDoubleClassNull.java.i
data/src/share/sample/jmx/jmx-scandir/logging.properties.i
-data/test/sun/security/krb5/auto/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
+data/test/java/awt/PrintJob/PrintArcTest/PrintArcTest.java.i
data/src/share/classes/sun/tools/javac/resources/javac_zh_CN.properties.i
-data/test/lib/security/cacerts/VerifyCACerts.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/ContextEnumerator.java.i
data/make/tools/CharsetMapping/ISO_8859_8.map.i
data/src/share/classes/sun/misc/resources/Messages.java.i
data/test/java/lang/ClassLoader/UninitializedParent.java.i
@@ -15912,69 +16577,68 @@ data/src/share/classes/sun/rmi/rmic/RMIConstants.java.i
data/src/solaris/classes/sun/nio/ch/EPollPort.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_EmptyList.java.i
data/test/sun/security/krb5/auto/RRC.java.i
-data/src/share/classes/javax/swing/ScrollPaneLayout.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM964.java.i
+data/test/tools/pack200/Pack200Props.java.i
data/src/share/classes/javax/print/attribute/UnmodifiableSetException.java.i
-data/src/share/classes/sun/java2d/DefaultDisposerRecord.java.i
data/test/java/util/concurrent/FutureTask/Throw.java.i
data/test/java/awt/event/MouseEvent/CTORRestrictions/CTORRestrictions.java.i
data/src/share/classes/sun/io/Converters.java.i
-data/src/share/classes/sun/awt/SunHints.java.i
+data/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.java.i
data/test/java/awt/dnd/ImageDecoratedDnD/ImageGenerator.java.i
data/test/java/security/Provider/ProviderInfoCheck.java.i
data/test/sun/nio/cs/SurrogateTestHKSCS.java.i
data/test/demo/zipfs/Basic.java.i
data/src/share/classes/sun/java2d/NullSurfaceData.java.i
-data/src/share/classes/sun/tools/asm/StringConstantData.java.i
data/src/share/classes/javax/swing/event/SwingPropertyChangeSupport.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/gzwrite.c.i
data/test/java/text/Format/DateFormat/Bug6609750.java.i
-data/test/sun/nio/cs/StrCodingBenchmark.java.i
+data/test/javax/management/Introspector/SetWrongTypeAttributeTest.java.i
data/src/share/classes/sun/io/CharToByteMacCroatian.java.i
data/test/java/beans/PropertyEditor/TestShortClass.java.i
data/src/solaris/classes/sun/awt/motif/MMenuBarPeer.java.i
data/src/share/classes/sun/security/x509/CertificateVersion.java.i
-data/test/javax/management/modelmbean/DescriptorSupportTest.java.i
-data/src/share/demo/applets/DrawTest/example1.html.i
-data/make/tools/CharsetMapping/ISO_8859_6.map.i
-data/src/share/classes/com/sun/media/sound/StandardMidiFileReader.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java.i
-data/src/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java.i
+data/test/java/util/ResourceBundle/Bug6190861Data_en_US.properties.i
+data/make/sun/security/ec/Makefile.i
+data/src/solaris/classes/sun/awt/X11/XAtom.java.i
+data/make/mkdemo/jvmti/heapTracker/Makefile.i
+data/src/macosx/classes/sun/font/CFontManager.java.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/InterprocessMessages.java.i
data/src/share/back/ArrayTypeImpl.c.i
data/src/share/native/com/sun/media/sound/MidiInDevice.c.i
data/src/solaris/classes/sun/awt/X11/XWindow.java.i
data/src/share/classes/java/awt/MediaTracker.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpAwareServerSocket.java.i
-data/src/share/classes/sun/text/resources/FormatData_pl.java.i
+data/test/java/lang/Float/BitwiseConversion.java.i
data/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java.i
-data/src/share/classes/sun/tools/tree/ConstantExpression.java.i
-data/src/share/native/sun/awt/image/cvutils/img_ordclruns.h.i
+data/test/sun/security/provider/PolicyFile/nullDomain.java.i
data/src/share/classes/sun/security/pkcs11/Secmod.java.i
-data/make/tools/fontchecker/Makefile.i
+data/test/javax/management/remote/mandatory/URLTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxKeyManagerFactoryImpl.java.i
data/test/java/lang/management/MemoryMXBean/LowMemoryTest2.java.i
-data/src/share/classes/com/sun/imageio/stream/StreamFinalizer.java.i
+data/src/solaris/doc/sun/man/man1/idlj.1.i
data/src/share/classes/sun/reflect/LangReflectAccess.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathFuncHereAPI.java.i
data/test/java/security/BasicPermission/SerialVersion.1.4.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy14.i
+data/src/share/classes/java/awt/dnd/DragSourceDropEvent.java.i
data/make/tools/CharsetMapping/IBM1141.map.i
data/src/share/classes/sun/net/httpserver/FixedLengthOutputStream.java.i
data/src/solaris/native/java/lang/locale_str.h.i
data/test/java/io/Serializable/enum/constantSubclasses/Write.java.i
data/test/java/io/Serializable/packageAccess/C.java.i
data/src/share/classes/com/sun/security/auth/X500Principal.java.i
-data/src/share/classes/javax/sound/sampled/Port.java.i
+data/src/share/classes/sun/applet/AppletIOException.java.i
data/test/java/util/ArrayList/Bug6533203.java.i
data/src/share/classes/javax/naming/directory/DirContext.java.i
+data/src/share/classes/java/net/DatagramSocketImpl.java.i
data/src/share/classes/javax/management/remote/JMXConnectionNotification.java.i
data/src/share/classes/sun/misc/InvalidJarIndexException.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/ClientServer.java.i
-data/src/share/classes/com/sun/tools/jdi/BooleanTypeImpl.java.i
+data/src/solaris/doc/sun/man/man1/jsadebugd.1.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH1_DERIVE_PARAMS.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/NTypePrinter.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/LoopbackSSLSocket.java.i
data/test/java/math/BigDecimal/StringConstructor.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java.i
data/src/share/classes/java/lang/invoke/BoundMethodHandle.java.i
+data/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java.i
data/make/sun/javazic/tzdata/etcetera.i
data/src/share/classes/sun/net/TransferProtocolClient.java.i
data/test/java/nio/file/WatchService/SensitivityModifier.java.i
@@ -15982,71 +16646,73 @@ data/make/sun/javazic/Makefile.i
data/src/share/classes/com/sun/script/util/ScriptEngineFactoryBase.java.i
data/src/share/classes/sun/io/CharToByteCp942C.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIPaint.java.i
-data/src/share/classes/sun/tools/jconsole/resources/masthead-left.png.i
-data/src/share/classes/sun/tools/tree/AssignExpression.java.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c.i
+data/test/java/util/EnumMap/EnumMapBash.java.i
data/test/java/nio/channels/Selector/SelectNowWhenEmpty.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java.i
+data/src/share/classes/java/awt/print/PrinterException.java.i
+data/src/share/classes/sun/misc/Resource.java.i
data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_ja.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressInputStream.java.i
-data/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java.i
-data/src/share/classes/java/security/AlgorithmConstraints.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/TestUtils.java.i
+data/src/share/classes/sun/security/ssl/Krb5Proxy.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/CipherSuiteOrder.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/Mono.java.i
-data/src/share/classes/javax/net/ssl/CertPathTrustManagerParameters.java.i
+data/src/share/native/sun/awt/image/cvutils/img_output8.h.i
data/src/windows/native/sun/java2d/d3d/D3DSurfaceData.h.i
-data/src/share/classes/com/sun/media/sound/ModelStandardTransform.java.i
-data/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java.i
-data/src/share/native/sun/java2d/opengl/OGLVertexCache.h.i
+data/src/macosx/classes/com/apple/laf/AquaButtonToggleUI.java.i
+data/src/macosx/classes/sun/lwawt/LWCursorManager.java.i
+data/test/java/net/URI/RelativeEncoding.java.i
+data/test/java/beans/PropertyEditor/TestShortTypeJava.java.i
+data/src/share/classes/com/sun/tools/jdi/LocationImpl.java.i
data/test/java/security/cert/pkix/policyChanges/anchor.cer.i
data/src/share/classes/sun/net/httpserver/HttpServerImpl.java.i
data/src/share/classes/sun/nio/cs/CESU_8.java.i
data/test/java/awt/font/Rotate/TestTransform.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDimension.java.i
-data/src/share/classes/java/net/Socket.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid.properties.i
+data/src/macosx/native/sun/osxapp/QueuingApplicationDelegate.h.i
+data/src/share/classes/com/sun/media/sound/AudioSynthesizer.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_DATE.java.i
data/src/share/classes/com/sun/tracing/Provider.java.i
data/test/java/beans/PropertyEditor/TestShortClassJava.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_pt_BR.properties.i
data/test/java/beans/XMLEncoder/Test4968523.java.i
data/src/share/classes/javax/swing/text/html/FormView.java.i
-data/src/share/classes/sun/jvmstat/monitor/remote/package.html.i
-data/src/share/classes/sun/tools/jconsole/OverviewPanel.java.i
-data/src/share/sample/jmx/jmx-scandir/src/etc/access.properties.i
+data/test/java/rmi/activation/Activatable/notSerializable/NotSerializable.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/PixelTests.java.i
data/src/share/classes/java/awt/doc-files/List-1.gif.i
data/src/share/classes/java/awt/image/VolatileImage.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CMenu.java.i
data/src/share/classes/com/sun/security/cert/internal/x509/X509V1CertImpl.java.i
data/test/sun/security/smartcardio/README.txt.i
-data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java.i
data/src/share/classes/java/security/cert/Extension.java.i
+data/test/java/beans/VetoableChangeSupport/TestEquals.java.i
data/test/java/util/LinkedList/AddAll.java.i
data/src/share/demo/management/MemoryMonitor/MemoryMonitor.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry.properties.i
-data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Reset.java.i
+data/src/windows/javavm/export/jni_md.h.i
+data/test/javax/security/auth/x500/X500Principal/NameFormat.java.i
data/src/windows/native/sun/windows/awt_TextComponent.h.i
-data/src/share/classes/sun/audio/AudioData.java.i
-data/make/common/Mapfile-vers.gmk.i
+data/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java.i
+data/src/share/classes/sun/misc/SharedSecrets.java.i
data/src/share/back/debugLoop.c.i
data/src/share/classes/javax/management/MBeanRegistrationException.java.i
data/make/tools/CharsetMapping/IBM1383.c2b.i
-data/test/java/beans/VetoableChangeSupport/TestListeners.java.i
-data/src/solaris/native/sun/awt/awt_LoadLibrary.c.i
+data/test/java/io/RandomAccessFile/Close.java.i
+data/test/java/io/Serializable/sanityCheck/SanityCheck.java.i
data/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java.i
-data/src/share/classes/javax/xml/crypto/dsig/spec/XSLTTransformParameterSpec.java.i
+data/src/share/classes/org/openjdk/jigsaw/ClassInfo.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java.i
data/src/share/classes/sun/text/resources/FormatData_ar_SD.java.i
data/test/javax/swing/text/CSSBorder/6796710/bug6796710.java.i
data/src/share/classes/sun/security/x509/ExtendedKeyUsageExtension.java.i
-data/test/javax/management/namespace/RemoveNotificationListenerTest.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetVendor.java.i
data/test/java/security/ProtectionDomain/NullPerms.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/newFolder.gif.i
-data/make/tools/swing-beans/beaninfo/images/JEditorPaneColor16.gif.i
-data/make/tools/src/build/tools/jdwpgen/CommandNode.java.i
-data/src/share/classes/java/net/PasswordAuthentication.java.i
+data/src/share/classes/java/security/DomainCombiner.java.i
+data/test/java/io/Serializable/concurrentClassDescLookup/ConcurrentClassDescLookup.java.i
+data/test/javax/swing/border/Test6625450.java.i
data/test/java/lang/invoke/indify/Indify.java.i
data/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsSocketFacTest.java.i
+data/test/javax/management/remote/mandatory/passwordAuthenticator/RMIPasswdAuthTest.java.i
data/test/java/math/BigDecimal/ToPlainStringTests.java.i
data/test/java/net/URLConnection/SetIfModifiedSince.java.i
data/src/share/classes/sun/awt/geom/Order1.java.i
@@ -16054,54 +16720,52 @@ data/src/share/classes/sun/tools/java/BinaryExceptionHandler.java.i
data/src/solaris/native/sun/awt/awt_motif12.c.i
data/src/share/sample/jmx/jmx-scandir/keystore.i
data/test/javax/script/PluggableContextTest.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormat.java.i
-data/src/share/classes/javax/swing/border/CompoundBorder.java.i
-data/test/sun/security/pkcs11/Cipher/TestRSACipher.java.i
+data/src/share/classes/javax/imageio/spi/ImageReaderSpi.java.i
+data/test/java/security/cert/PolicyNode/GetPolicyQualifiers.java.i
data/test/javax/swing/JSlider/6524424/bug6524424.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuBarMono32.gif.i
data/src/share/classes/sun/io/ByteToCharMS932DB.java.i
-data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties.i
data/test/javax/swing/JEditorPane/bug4714674.java.i
data/src/share/classes/java/awt/event/InputMethodListener.java.i
data/src/share/classes/java/lang/invoke/WrongMethodTypeException.java.i
-data/test/javax/management/remote/mandatory/notif/NotificationSenderMBean.java.i
-data/make/tools/CharsetMapping/IBM284.map.i
-data/test/java/beans/PropertyEditor/TestByteTypeJava.java.i
+data/test/java/nio/channels/SocketChannel/Bind.java.i
+data/src/share/native/sun/awt/image/jpeg/jversion.h.i
data/test/sun/net/InetAddress/nameservice/simple/SimpleNameService.java.i
-data/src/share/classes/sun/management/MemoryUsageCompositeData.java.i
-data/src/share/classes/java/awt/event/ItemEvent.java.i
-data/test/java/net/InetAddress/B5087907.java.i
+data/src/share/classes/sun/java2d/pipe/SolidTextRenderer.java.i
+data/test/java/util/PluggableLocale/ClasspathTest.sh.i
+data/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.i
+data/src/share/native/java/lang/fdlibm/src/k_cos.c.i
data/test/sun/net/www/EmbeddedEquals.java.i
-data/src/share/classes/javax/smartcardio/CardChannel.java.i
+data/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java.i
data/test/javax/management/remote/mandatory/version/policy.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy24.i
-data/src/share/classes/sun/text/resources/CollationData_hr.java.i
-data/src/share/classes/com/sun/media/sound/SoftMixingMixer.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/XMBeanInfo.java.i
+data/src/solaris/native/sun/nio/ch/SocketChannelImpl.c.i
+data/test/java/lang/StrictMath/HypotTests.java.i
+data/test/java/nio/channels/etc/NetworkChannelTests.java.i
data/src/share/classes/javax/swing/event/TableColumnModelListener.java.i
-data/test/java/lang/ThreadLocal/MemoryLeak.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/Echo.java.i
data/test/javax/security/auth/SubjectDomainCombiner/Optimize.java.i
data/src/share/classes/javax/swing/KeyStroke.java.i
data/test/com/sun/tools/attach/java.policy.deny.i
-data/src/share/classes/javax/security/auth/callback/PasswordCallback.java.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEP_KAT.java.i
data/src/share/native/sun/font/layout/LigatureSubstSubtables.h.i
-data/test/java/util/PluggableLocale/LocaleNameProviderTest.sh.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java.i
+data/src/share/classes/com/sun/servicetag/SolarisServiceTag.java.i
+data/test/sun/security/provider/PolicyFile/CombinedPerms.java.i
data/src/linux/doc/man/ja/orbd.1.i
-data/src/share/classes/sun/nio/ch/Interruptible.java.i
-data/make/tools/CharsetMapping/IBM1026.map.i
-data/test/java/rmi/Naming/RmiIsNoScheme.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java.i
+data/src/share/classes/sun/nio/ch/ThreadPool.java.i
+data/test/tools/launcher/DefaultLocaleTest.sh.i
+data/src/share/native/java/lang/fdlibm/src/s_expm1.c.i
data/src/share/classes/javax/management/QueryNotificationFilter.java.i
-data/src/share/bin/java.h.i
-data/src/share/classes/javax/management/MBeanPermission.java.i
+data/test/javax/print/applet/applet4/Applet4.java.i
+data/test/sun/security/ssl/templates/SSLEngineTemplate.java.i
data/test/java/nio/channels/Selector/CheckLocking.java.i
data/src/share/classes/javax/swing/plaf/TabbedPaneUI.java.i
+data/src/macosx/classes/com/apple/eawt/UserSessionListener.java.i
data/src/share/classes/com/sun/media/sound/ModelWavetable.java.i
data/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java.i
-data/test/java/text/Format/DateFormat/WeekDateTest.java.i
data/test/java/awt/List/ActionAfterRemove/ActionAfterRemove.java.i
data/src/windows/native/sun/jkernel/kernel_ko.rc.i
-data/src/share/test/pack200/pack.conf.i
+data/src/solaris/classes/java/lang/ProcessEnvironment.java.i
data/test/java/dyn/MethodTypeTest.java.i
data/test/javax/management/Introspector/InvokeGettersTest.java.i
data/src/share/classes/sun/security/validator/KeyStores.java.i
@@ -16109,48 +16773,47 @@ data/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java.i
data/src/share/classes/com/sun/crypto/provider/BlowfishParameters.java.i
data/test/javax/management/namespace/EventWithNamespaceControlTest.java.i
data/src/solaris/classes/sun/font/FontConfigManager.java.i
-data/make/common/BuildToolJar.gmk.i
+data/src/share/classes/java/rmi/server/RMIServerSocketFactory.java.i
data/src/share/classes/sun/applet/AppletListener.java.i
data/src/share/classes/javax/sql/RowSet.java.i
-data/test/org/openjdk/jigsaw/MockLibrary.java.i
data/test/java/lang/reflect/Constructor/GenericStringTest.java.i
data/src/solaris/native/sun/java2d/loops/vis_GlyphList.c.i
data/src/share/classes/javax/security/sasl/AuthenticationException.java.i
-data/test/com/sun/security/auth/login/ConfigFile/EmptyOption.java.i
+data/src/share/classes/java/awt/image/ReplicateScaleFilter.java.i
data/src/share/classes/sun/tools/jconsole/OutputViewer.java.i
data/src/share/classes/sun/net/www/content/image/x_xpixmap.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/package.html.i
data/src/share/classes/javax/sound/midi/InvalidMidiDataException.java.i
data/test/sun/security/pkcs11/nss/db/key3.db.i
-data/src/solaris/classes/sun/nio/fs/UnixNativeDispatcher.java.i
+data/test/javax/management/openmbean/CompositeDataStringTest.java.i
data/src/share/sample/nio/server/FileContent.java.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Client.java.i
+data/src/share/classes/javax/swing/event/TreeExpansionEvent.java.i
data/src/solaris/native/sun/awt/medialib/vis_asi.h.i
data/src/share/classes/com/sun/tools/jdi/ProcessAttachingConnector.java.i
data/test/javax/crypto/spec/GCMParameterSpec/GCMParameterSpecTest.java.i
-data/src/share/classes/sun/io/CharToByteCp857.java.i
+data/src/share/sample/scripting/scriptpad/src/scripts/memory.js.i
data/test/sun/java2d/DirectX/RenderingToCachedGraphicsTest/RenderingToCachedGraphicsTest.java.i
data/test/javax/sound/midi/Gervill/SoftChannel/NoteOff2.java.i
data/src/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java.i
data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/security.policy.i
-data/src/share/classes/java/awt/datatransfer/FlavorEvent.java.i
+data/src/solaris/doc/sun/man/man1/javac.1.i
data/test/java/io/PrintStream/NullConstructor.java.i
data/test/sun/net/www/protocol/http/GetOutputStream.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java.i
+data/test/com/sun/jdi/sde/testString.i
data/test/java/beans/VetoableChangeSupport/Test4076065.java.i
data/src/share/classes/com/sun/tools/jdi/RawCommandLineLauncher.java.i
-data/src/share/native/sun/font/layout/LookupTables.h.i
+data/test/java/beans/XMLDecoder/spec/TestShort.java.i
data/src/share/classes/java/awt/image/ByteLookupTable.java.i
data/src/share/classes/javax/management/openmbean/TabularDataSupport.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedShortFieldAccessorImpl.java.i
data/src/share/classes/sun/invoke/anon/ConstantPoolVisitor.java.i
data/src/share/classes/sun/net/ApplicationProxy.java.i
-data/src/share/classes/sun/io/ByteToCharCp860.java.i
data/src/share/native/sun/font/layout/StateTables.h.i
data/src/share/classes/sun/tools/tree/ArrayExpression.java.i
data/src/solaris/classes/sun/awt/X11/OwnershipListener.java.i
data/src/share/native/sun/java2d/loops/Ushort4444Argb.h.i
-data/src/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java.i
+data/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduRequest.java.i
data/test/sun/security/pkcs11/SecureRandom/TestDeserialization.java.i
data/test/java/awt/TextArea/MouseOverScrollbarWhenTyping/Test1.java.i
data/src/solaris/classes/sun/nio/ch/SctpNet.java.i
@@ -16164,59 +16827,62 @@ data/src/share/classes/sun/security/util/PathList.java.i
data/src/share/classes/javax/swing/AbstractAction.java.i
data/src/share/classes/com/sun/jdi/FloatType.java.i
data/test/java/util/concurrent/Executors/AutoShutdown.java.i
-data/src/share/classes/sun/reflect/generics/tree/IntSignature.java.i
-data/make/sun/security/smartcardio/Makefile.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Open.java.i
+data/src/share/native/sun/font/layout/GDEFMarkFilter.h.i
data/test/java/security/KeyRep/DSA.1.5.key.i
-data/src/share/classes/sun/awt/WindowClosingListener.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java.i
data/test/java/nio/file/Files/denyAll.policy.i
data/test/javax/management/monitor/ThreadPoolAccTest.java.i
data/src/share/classes/com/sun/tools/jdi/ByteTypeImpl.java.i
data/src/share/classes/sun/nio/cs/ext/MacSymbol.java.i
-data/src/linux/doc/man/ja/javaws.1.i
+data/src/share/classes/javax/naming/CannotProceedException.java.i
data/src/share/classes/sun/text/resources/ubidi.icu.i
-data/make/tools/src/build/tools/generatecharacter/CharacterScript.java.i
+data/test/java/util/ResourceBundle/Test4300693.java.i
data/test/java/awt/Frame/ShownOnPack/ShownOnPack.html.i
data/src/share/classes/sun/io/CharToByteEUC_JP.java.i
data/src/share/classes/javax/management/openmbean/CompositeData.java.i
data/test/java/lang/Class/forName/NonJavaNames.sh.i
data/src/share/classes/java/lang/invoke/MethodHandle.java.i
data/src/share/classes/javax/management/ImmutableDescriptor.java.i
-data/src/share/classes/java/lang/Boolean.java.i
+data/src/share/classes/sun/security/provider/SHA2.java.i
data/src/solaris/demo/jigsaw/basic/src/module-info.java.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/FooReceiverImpl.java.i
data/src/share/classes/java/lang/VirtualMachineError.java.i
data/src/share/javavm/include/opcodes.h.i
-data/src/share/classes/sun/text/resources/FormatData_lt_LT.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverAnonymous.java.i
data/test/java/security/Security/SecurityPropFile/SecurityPropFile.file.i
-data/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c.i
-data/src/share/classes/javax/accessibility/AccessibleIcon.java.i
-data/src/share/classes/java/util/TreeMap.java.i
+data/src/macosx/classes/com/apple/laf/AquaMenuUI.java.i
+data/test/java/net/Authenticator/Deadlock.java.i
data/test/java/awt/Graphics2D/RenderClipTest/RenderClipTest.java.i
-data/src/share/classes/javax/management/loading/PrivateClassLoader.java.i
-data/test/java/io/Serializable/skipToEndOfBlockData/SkipToEndOfBlockData.java.i
+data/src/share/classes/java/text/ChoiceFormat.java.i
+data/make/tools/CharsetMapping/IBM1145.c2b.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Identities.java.i
+data/src/solaris/native/sun/nio/ch/sctp/SctpNet.c.i
data/test/javax/swing/JFileChooser/6524424/bug6524424.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/FileCopier.java.i
data/test/java/nio/channels/AsynchronousDatagramChannel/Basic.java.i
-data/src/share/classes/java/rmi/server/SkeletonNotFoundException.java.i
+data/test/java/io/Serializable/underlyingOutputStreamException/UnderlyingOutputStreamException.java.i
data/src/solaris/classes/sun/awt/X11/XBaseWindow.java.i
data/src/share/demo/jfc/Notepad/resources/save.gif.i
+data/src/macosx/bundle/JavaAppLauncher/src/main.m.i
data/src/share/classes/sun/tools/jconsole/inspector/XTable.java.i
-data/test/java/util/Map/Get.java.i
-data/make/modules/tools/nbproject/project.properties.i
+data/src/macosx/native/sun/osxapp/NSApplicationAWT.h.i
+data/make/tools/CharsetMapping/IBM918.map.i
data/test/java/rmi/reliability/juicer/AppleImpl.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/jmxremote.password.i
+data/src/share/classes/sun/nio/cs/ext/HKSCS_2001.java.i
data/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java.i
data/test/sun/rmi/rmic/minimizeWrapperInstances/PImpl.java.i
-data/test/java/net/URL/OpenStream.java.i
-data/src/share/back/stepControl.h.i
-data/src/share/classes/com/sun/security/jgss/InquireSecContextPermission.java.i
-data/src/share/classes/java/awt/JobAttributes.java.i
+data/test/java/security/cert/CertPathValidator/indirectCRL/CircularCRLOneLevelRevoked.java.i
+data/src/share/classes/sun/security/pkcs/EncodingException.java.i
+data/test/java/nio/channels/DatagramChannel/Sender.java.i
+data/src/share/classes/java/awt/color/package.html.i
data/make/tools/CharsetMapping/DoubleByte-X.java.i
data/src/share/classes/java/util/logging/LoggingMXBean.java.i
data/src/share/classes/sun/management/HotspotClassLoadingMBean.java.i
data/src/share/classes/javax/script/SimpleScriptContext.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/package.html.i
-data/src/share/classes/javax/swing/event/AncestorEvent.java.i
-data/src/share/classes/java/lang/reflect/MalformedParameterizedTypeException.java.i
+data/test/javax/management/remote/mandatory/connection/CloseFailedClientTest.java.i
+data/test/javax/swing/JFileChooser/6840086/bug6840086.java.i
data/make/com/sun/java/pack/Makefile.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/security.policy.i
data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/OpenStream.java.i
@@ -16228,35 +16894,35 @@ data/test/sun/security/util/DerInputBuffer/BigInteger0.java.i
data/test/java/lang/StringBuffer/AppendCharSequence.java.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/Group.java.i
data/src/share/classes/java/awt/im/spi/InputMethod.java.i
-data/test/sun/text/resources/Format/Bug4621320.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c.i
+data/src/share/classes/java/util/logging/LoggingProxyImpl.java.i
+data/test/java/util/Collections/CheckedMapBash.java.i
data/test/java/util/zip/ZipFile/deletetempjar.sh.i
data/src/windows/native/sun/java2d/windows/ddrawObject.cpp.i
-data/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h.i
-data/test/sun/tools/native2ascii/test3.i
+data/src/share/native/sun/java2d/opengl/OGLVertexCache.h.i
+data/test/java/net/Authenticator/B4769350.java.i
data/test/java/rmi/transport/checkFQDN/CheckFQDN_Stub.java.i
data/src/share/classes/org/openjdk/jigsaw/Files.java.i
data/test/java/security/Security/SecurityPropFile/SecurityPropFile.java.i
-data/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadString.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_SESSION_INFO.java.i
data/make/mkdemo/nio/zipfs/Makefile.i
data/src/share/demo/applets/ArcTest/example1.html.i
data/test/sun/security/util/DerInputBuffer/PaddedBitString.java.i
-data/src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java.i
+data/test/sun/text/resources/Format/Bug4762201.java.i
data/src/share/classes/sun/misc/Perf.java.i
-data/make/tools/CharsetMapping/HKSCS2008.c2b.i
-data/test/sun/security/krb5/NegativeNonce.java.i
-data/test/java/security/Provider/CertStoreConstructorParam.java.i
+data/src/share/classes/sun/tools/tree/MultiplyExpression.java.i
+data/src/windows/native/sun/java2d/d3d/D3DResourceManager.h.i
+data/src/windows/native/sun/windows/awt_Panel.h.i
data/src/share/classes/com/sun/media/sound/ModelIdentifier.java.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/group.security.policy.i
+data/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java.i
data/src/share/classes/com/sun/tracing/dtrace/FunctionAttributes.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringVariableMonitor.java.i
data/src/share/demo/applets/DitherTest/DitherTest.java.i
data/src/windows/classes/sun/java2d/windows/DDScaleLoops.java.i
-data/src/share/sample/nio/server/URLDumper.java.i
+data/src/solaris/classes/sun/awt/X11/XFocusProxyWindow.java.i
data/test/java/io/Serializable/unnamedPackageSwitch/Test.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_nl_BE.properties.i
-data/src/windows/native/java/util/logging.c.i
+data/test/java/beans/XMLEncoder/Test6921644.java.i
+data/make/netbeans/common/standard-bindings.ent.i
data/src/solaris/classes/sun/java2d/xr/MaskTile.java.i
data/src/share/classes/java/awt/Panel.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH2_DERIVE_PARAMS.java.i
@@ -16268,94 +16934,105 @@ data/make/sun/security/mscapi/FILES_cpp.gmk.i
data/src/linux/doc/man/ja/jrunscript.1.i
data/src/solaris/classes/sun/awt/X11/XMSelectionListener.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java.i
-data/test/java/util/TimSort/README.i
data/test/java/awt/print/Dialog/DialogCopies.java.i
+data/src/share/classes/javax/xml/crypto/OctetStreamData.java.i
data/src/share/demo/applets/Fractal/example1.html.i
data/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java.i
data/src/share/classes/sun/java2d/loops/FillParallelogram.java.i
-data/test/sun/nio/cs/OLD/IBM1381_OLD.java.i
-data/make/tools/src/build/tools/charsetmapping/GenerateMapping.java.i
+data/src/share/classes/org/openjdk/internal/joptsimple/OptionMissingRequiredArgumentException.java.i
+data/test/com/sun/crypto/provider/Cipher/DES/PerformanceTest.java.i
data/test/java/lang/instrument/TestClass3.java.i
-data/test/java/net/HttpURLConnection/getResponseCode.java.i
+data/test/sun/net/www/protocol/jar/jarbug/src/test/RunAllTests.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_ca.properties.i
data/src/share/classes/sun/security/x509/IssuerAlternativeNameExtension.java.i
data/make/netbeans/jconsole/README.i
data/src/share/classes/sun/java2d/opengl/OGLTextRenderer.java.i
-data/src/share/classes/java/security/PermissionCollection.java.i
+data/test/sun/security/pkcs11/ec/TestECDSA.java.i
data/make/javax/management/Makefile.i
data/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so.i
-data/src/share/classes/sun/io/CharToByteMacRoman.java.i
+data/test/java/nio/file/Files/TerminateWalk.java.i
data/test/javax/xml/crypto/dsig/data/certs/bres.crt.i
data/make/com/sun/demo/Makefile.i
data/src/share/classes/sun/applet/AppletSecurity.java.i
-data/src/share/classes/sun/font/CompositeFont.java.i
-data/make/tools/swing-beans/beaninfo/images/JComboBoxColor32.gif.i
+data/test/javax/management/eventService/LeaseTest.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSet.java.i
+data/test/sun/security/util/HostnameMatcher/cert4.crt.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Repositor.java.i
data/src/share/classes/java/awt/event/MouseWheelListener.java.i
data/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java.i
data/test/sun/security/pkcs11/Signature/TestDSA.java.i
data/test/java/lang/annotation/Missing/Marker.java.i
data/src/windows/classes/sun/nio/ch/NativeThread.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageLogic_proto.h.i
+data/test/sun/security/smartcardio/TestExclusive.java.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticFloatFieldAccessorImpl.java.i
data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.html.i
-data/src/share/classes/java/nio/file/SimpleFileVisitor.java.i
-data/src/share/native/sun/awt/libpng/pnginfo.h.i
+data/src/solaris/classes/sun/awt/X11/XChoicePeer.java.i
+data/test/com/sun/jdi/ClassesByName2Test.java.i
data/make/mksample/forkjoin/mergesort/Makefile.i
data/src/share/classes/javax/imageio/stream/IIOByteBuffer.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/Parser.jj.i
data/src/share/classes/sun/io/ByteToCharCp1144.java.i
data/test/javax/management/mxbean/MerlinMXBean.java.i
-data/src/share/classes/sun/awt/image/WritableRasterNative.java.i
+data/src/solaris/doc/sun/man/man1/keytool.1.i
data/src/share/classes/com/sun/media/sound/AlawCodec.java.i
data/src/share/classes/com/sun/jdi/event/BreakpointEvent.java.i
data/test/java/io/Serializable/arraySuidConflict/Write.java.i
data/src/share/sample/forkjoin/mergesort/MergeSort.java.i
data/test/java/rmi/Naming/UnderscoreHost.java.i
+data/src/macosx/native/apple/applescript/AS_NS_ConversionUtils.m.i
data/src/share/classes/java/util/logging/LogManager.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/Restart.java.i
-data/src/share/classes/javax/swing/plaf/multi/doc-files/multi_tsc.html.i
-data/test/org/openjdk/jigsaw/pubrepo.sh.i
-data/src/share/sample/vm/jvm-clr/Makefile.i
-data/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.i
-data/src/share/classes/java/net/CookieHandler.java.i
-data/src/share/demo/jvmti/hprof/hprof_stack.h.i
-data/src/share/native/sun/font/layout/ExtensionSubtables.h.i
-data/test/java/security/KeyStore/KeyStoreBuilder.java.i
+data/test/sun/management/jmxremote/bootstrap/management_test01_ok.properties.in.i
+data/src/macosx/classes/apple/applescript/AppleScriptEngineFactory.java.i
+data/test/sun/util/resources/Locale/Bug6275682.java.i
+data/test/java/net/URLClassLoader/closetest/CloseTest.java.i
+data/make/tools/CharsetMapping/dbcs.i
+data/test/sun/net/idn/nfsmxp.spp.i
+data/src/share/classes/sun/net/httpserver/Code.java.i
+data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/sqlite3.dll.i
+data/src/share/classes/javax/net/ssl/SSLEngine.java.i
data/test/java/util/concurrent/Executors/PrivilegedCallables.java.i
data/src/share/classes/com/sun/jdi/ByteValue.java.i
+data/src/share/classes/sun/dyn/Access.java.i
data/test/java/io/Serializable/serialver/nested/Test.java.i
-data/test/sun/java2d/cmm/ProfileOp/SetDataTest.java.i
+data/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java.i
+data/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/Dummy.java.i
data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java.i
-data/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java.i
+data/src/share/classes/sun/io/CharToByteJIS0201.java.i
data/src/share/lib/management/jmxremote.password.template.i
data/test/java/lang/management/ThreadMXBean/LockedMonitors.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java.i
-data/src/share/classes/java/nio/charset/Charset.java.i
+data/test/java/nio/file/Files/MaxDepth.java.i
data/test/javax/swing/JSlider/6918861/bug6918861.java.i
-data/test/com/sun/tools/attach/BasicTests.sh.i
-data/src/share/classes/sun/font/LayoutPathImpl.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetChannels.java.i
+data/test/java/awt/Mixing/Validating.java.i
data/test/sun/net/www/protocol/http/spnegoTest.i
data/make/tools/swing-beans/beaninfo/images/BoxColor32.gif.i
-data/test/java/net/InetSocketAddress/B6469803.java.i
+data/src/solaris/native/sun/awt/colordata.h.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libplc4.so.i
-data/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java.i
+data/src/share/classes/javax/management/event/EventClientDelegateMBean.java.i
+data/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java.i
data/src/share/classes/sun/io/CharToByteCp939.java.i
data/test/javax/management/ObjectInstance/ToStringMethodTest.java.i
data/src/share/native/sun/security/ec/mpi.c.i
data/make/tools/CharsetMapping/IBM1123.nr.i
data/make/java/nio/reorder-sparc.i
+data/src/share/classes/sun/util/calendar/CalendarUtils.java.i
data/src/share/classes/javax/swing/text/rtf/RTFReader.java.i
data/src/share/classes/sun/net/www/content/text/Generic.java.i
-data/test/javax/crypto/SecretKeyFactory/P1.jar.i
-data/src/share/classes/sun/management/resources/agent_de.properties.i
+data/src/share/classes/sun/management/snmp/package.html.i
+data/src/share/classes/sun/tools/asm/StringConstantData.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageCopy.h.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/ActivateMe.java.i
+data/test/java/util/Locale/data/deflocale.rhel5.i
+data/make/tools/src/build/tools/javazic/Zoneinfo.java.i
data/src/share/demo/nbproject/jfc/SampleTree/nbproject/netbeans-targets.xml.i
data/src/share/native/java/lang/fdlibm/src/e_j0.c.i
-data/src/share/classes/java/awt/dnd/DragSourceDropEvent.java.i
+data/src/share/classes/sun/tools/tree/IfStatement.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/policy14.i
data/src/share/demo/jfc/Notepad/resources/Notepad.properties.i
-data/src/share/classes/sun/util/resources/CalendarData_el_CY.properties.i
+data/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java.i
data/src/share/classes/javax/management/monitor/MonitorMBean.java.i
-data/src/share/classes/java/net/DatagramSocketImpl.java.i
+data/test/java/nio/channels/Selector/ConnectWrite.java.i
data/test/javax/swing/JTextArea/Test6593649.java.i
data/test/java/net/URLClassLoader/extdir/extention.jar.i
data/src/solaris/native/sun/awt/extutil.h.i
@@ -16366,89 +17043,91 @@ data/test/java/beans/Introspector/6380849/infos/ThirdBeanBeanInfo.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/Ints.java.i
data/src/share/classes/javax/naming/directory/ModificationItem.java.i
data/src/share/classes/java/util/RandomAccess.java.i
-data/test/sun/java2d/pisces/Test7036754.java.i
-data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java.i
+data/test/sun/rmi/rmic/covariantReturns/G2Impl.java.i
+data/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java.i
data/src/windows/bin/amd64/jvm.cfg.i
data/src/share/demo/applets/SortDemo/QSortAlgorithm.java.i
data/test/java/awt/MenuBar/DeadlockTest1/DeadlockTest1.java.i
data/src/share/native/sun/awt/image/jpeg/README.i
data/src/share/classes/com/sun/beans/finder/PrimitiveTypeMap.java.i
-data/src/share/classes/javax/swing/text/TextLayoutStrategy.java.i
+data/src/share/classes/com/sun/imageio/plugins/common/I18NImpl.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthStyle.java.i
data/test/java/util/ResourceBundle/Control/TestResourceRB.java.i
data/src/share/classes/sun/awt/PlatformFont.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_en_NZ.properties.i
-data/src/share/classes/javax/management/loading/MLetParser.java.i
+data/src/share/classes/sun/io/ByteToCharCp1112.java.i
data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak_Stub.java.i
data/test/java/util/concurrent/atomic/VMSupportsCS8.java.i
-data/test/sun/nio/cs/X11CNS11643.java.i
-data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor32.gif.i
+data/test/sun/tools/jhat/hprof.bin.i
+data/test/java/rmi/activation/ActivationSystem/activeGroup/security.policy.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/CanvasMapper.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java.i
+data/src/solaris/classes/sun/nio/fs/LinuxDosFileAttributeView.java.i
data/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c.i
-data/src/share/classes/java/beans/package.html.i
-data/test/java/util/Locale/data/deflocale.input.i
-data/test/sun/misc/Encode/DecodeBuffer.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_INFO.java.i
+data/test/java/lang/Runtime/exec/setcwd.sh.i
data/test/java/net/Authenticator/B4921848.java.i
data/src/windows/native/sun/windows/awt_Scrollbar.h.i
data/src/share/classes/sun/tools/serialver/serialver_zh_CN.properties.i
data/test/java/nio/file/FileStore/Basic.java.i
data/src/share/classes/sun/util/resources/CalendarData_hi.properties.i
data/src/windows/native/sun/windows/awt_Label.h.i
-data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java.i
-data/test/java/io/PipedWriter/ConnectAfterReaderClose.java.i
-data/src/share/classes/java/util/prefs/PreferenceChangeListener.java.i
+data/src/share/native/com/sun/java/util/jar/pack/bytes.cpp.i
+data/test/sun/tools/jstat/jstatLineCounts3.sh.i
data/test/java/lang/instrument/appendToClassLoaderSearch/CircularityErrorTest.java.i
data/test/com/sun/jdi/ResumeOneThreadTest.java.i
data/src/share/classes/java/text/spi/CollatorProvider.java.i
data/test/sun/misc/CopyMemory.java.i
data/test/java/beans/Introspector/4168475/Test4168475.java.i
+data/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy.i
data/test/javax/management/eventService/LeaseManagerDeadlockTest.java.i
data/src/windows/native/sun/windows/awt_Rectangle.h.i
-data/test/java/beans/beancontext/Test4132698.java.i
+data/src/windows/classes/java/net/TwoStacksPlainSocketImpl.java.i
data/src/share/classes/sun/util/resources/CalendarData_sl.properties.i
-data/src/share/classes/java/lang/Comparable.java.i
+data/make/altclasses/Makefile.i
data/test/sun/net/www/protocol/file/NonUTF8EncodedChar.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/coders/CoderDescriptor.java.i
+data/src/macosx/classes/com/apple/laf/AquaInternalFrameBorderMetrics.java.i
data/src/share/classes/sun/net/www/content/image/jpeg.java.i
-data/src/share/classes/sun/reflect/ByteVectorImpl.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ShutdownNowExecuteRace.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Struct.java.i
data/test/java/util/Formatter/BasicBigInteger.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/Redirect.java.i
-data/src/share/classes/sun/net/httpserver/Code.java.i
+data/src/share/native/sun/font/layout/ExtensionSubtables.h.i
data/src/share/classes/sun/security/rsa/RSASignature.java.i
data/src/share/classes/sun/tools/native2ascii/A2NFilter.java.i
data/src/share/classes/java/awt/event/InputEvent.java.i
data/test/java/rmi/server/RemoteServer/AddrInUse.java.i
-data/src/share/classes/javax/management/event/EventClientDelegateMBean.java.i
+data/src/share/classes/javax/management/timer/TimerAlarmClockNotification.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/ChangeLog.i
-data/src/share/classes/sun/management/snmp/package.html.i
+data/test/javax/crypto/SecretKeyFactory/P1.jar.i
data/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java.i
data/src/share/native/sun/security/jgss/wrapper/NativeUtil.c.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetDeviceInfo.java.i
-data/src/share/classes/sun/reflect/generics/tree/DoubleSignature.java.i
+data/test/java/awt/FileDialog/FileDialogReturnTest/FileDialogReturnTest.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmspcs.c.i
data/src/share/classes/javax/swing/JPasswordField.java.i
data/src/share/classes/sun/java2d/loops/TransformHelper.java.i
data/src/share/classes/javax/security/sasl/Sasl.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/java.policy.fail.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java.i
-data/src/share/classes/javax/naming/event/NamingEvent.java.i
-data/test/sun/security/provider/SeedGenerator/Priority_Inversion.java.i
+data/test/java/lang/instrument/AppendToBootstrapClassPathTest.java.i
+data/src/share/classes/javax/management/remote/package.html.i
data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduBulk.java.i
data/test/sun/security/krb5/auto/W83.java.i
-data/test/java/net/Authenticator/BasicTest4.java.i
+data/src/share/classes/sun/net/www/protocol/http/NegotiateCallbackHandler.java.i
data/src/windows/hpi/src/system_md.c.i
data/test/java/awt/event/MouseEvent/SmoothWheel/SmoothWheel.java.i
data/src/share/native/com/sun/java/util/jar/pack/bands.cpp.i
data/src/solaris/native/common/jni_util_md.c.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/ASCII_CharStream.java.i
-data/test/java/rmi/reliability/scripts/create_benchmark_jars.ksh.i
+data/src/share/classes/sun/security/krb5/internal/ccache/FileCCacheConstants.java.i
+data/src/share/classes/java/nio/file/attribute/AclEntryType.java.i
data/test/java/lang/StrictMath/Log1pTests.java.i
data/src/solaris/native/sun/awt/gtk2_interface.h.i
data/src/share/classes/javax/swing/plaf/multi/MultiToolTipUI.java.i
data/test/java/beans/PropertyEditor/TestDoubleClass.java.i
data/test/java/io/Serializable/subclassGC/SubclassOfOOS.java.i
-data/test/sun/net/www/ParseUtil_6478588.java.i
+data/src/share/instrument/JPLISAgent.h.i
data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.policy.i
data/test/javax/crypto/NullCipher/TestNPE.java.i
data/src/share/classes/com/sun/jdi/event/VMDeathEvent.java.i
@@ -16458,23 +17137,26 @@ data/src/share/demo/jfc/SampleTree/SampleTreeModel.java.i
data/src/share/classes/sun/print/resources/serviceui_zh_CN.properties.i
data/test/org/openjdk/jigsaw/_Configurator.java.i
data/src/share/classes/javax/accessibility/AccessibleTable.java.i
+data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java.i
data/test/java/security/ProtectionDomain/AllPerm.java.i
data/src/share/classes/java/io/DeleteOnExitHook.java.i
data/test/com/sun/net/httpserver/Test1.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthFormattedTextFieldUI.java.i
+data/src/share/native/sun/font/layout/CanonShaping.h.i
data/test/sun/rmi/rmic/newrmic/equivalence/TestInterface.java.i
-data/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java.i
-data/src/share/classes/com/sun/beans/WildcardTypeImpl.java.i
+data/src/share/classes/sun/util/logging/PlatformLogger.java.i
+data/src/solaris/native/sun/nio/ch/SctpNet.c.i
data/src/share/native/sun/font/fontscaler.h.i
data/src/share/classes/com/sun/servicetag/resources/register.html.i
data/src/share/demo/jvmti/heapViewer/sample.makefile.txt.i
data/src/share/classes/javax/swing/MutableComboBoxModel.java.i
data/test/java/net/URLClassLoader/sealing/CheckSealed.java.i
data/src/windows/classes/java/net/DualStackPlainSocketImpl.java.i
+data/test/java/rmi/activation/CommandEnvironment/NullOptions.java.i
+data/test/com/sun/security/sasl/digest/AuthRealms.java.i
data/test/java/io/File/Mkdir.java.i
data/src/windows/native/java/net/NetworkInterface_win9x.c.i
data/test/java/rmi/server/UnicastRemoteObject/useDynamicProxies/UseDynamicProxies_Stub.java.i
-data/test/java/nio/Buffer/BasicChar.java.i
data/src/share/classes/sun/reflect/generics/tree/FormalTypeParameter.java.i
data/src/share/classes/sun/print/resources/serviceui_it.properties.i
data/src/share/classes/com/sun/tools/jdi/ShortTypeImpl.java.i
@@ -16482,7 +17164,7 @@ data/src/share/classes/sun/util/resources/CurrencyNames_mt_MT.properties.i
data/test/java/lang/StringBuffer/SetLength.java.i
data/test/sun/security/krb5/auto/CrossRealm.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java.i
-data/src/share/classes/sun/text/resources/FormatData_sr_BA.java.i
+data/src/share/classes/sun/security/util/UntrustedCertificates.java.i
data/test/javax/swing/JSlider/6278700/bug6278700.java.i
data/src/solaris/classes/sun/misc/OSEnvironment.java.i
data/test/java/security/CodeSource/Implies.java.i
@@ -16494,56 +17176,59 @@ data/test/sun/java2d/cmm/ColorConvertOp/ColConvDCMTest.java.i
data/test/java/rmi/MarshalledObject/compare/annotatedRef.i
data/src/windows/classes/sun/security/krb5/internal/tools/Kinit.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_CS.properties.i
-data/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java.i
+data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetPropertyInfo.java.i
data/test/java/awt/FileDialog/DefaultFocusOwner/DefaultFocusOwner.java.i
-data/src/share/classes/sun/rmi/server/WeakClassHashMap.java.i
-data/make/sun/javazic/javatz/java_zone_ids.txt.i
+data/test/java/lang/management/ThreadMXBean/AllThreadIds.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ar_OM.properties.i
data/src/share/demo/jfc/TableExample/TableExample2.java.i
data/test/java/nio/file/Path/PassThroughFileSystem.java.i
data/test/javax/security/auth/PrivateCredentialPermission/Serial.java.i
data/test/java/lang/instrument/AddTransformerTest.java.i
-data/make/tools/CharsetMapping/MS932.map.i
+data/test/java/nio/channels/FileChannel/Size.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/spi/ProviderInit.java.i
data/src/share/classes/sun/text/resources/CollationData_da.java.i
data/src/share/npt/utf.h.i
data/src/share/classes/sun/nio/cs/ext/DelegatableDecoder.java.i
-data/test/com/sun/tools/attach/RedefineAgent.java.i
+data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl.java.i
data/src/share/classes/sun/tools/jar/resources/jar_it.properties.i
data/src/solaris/classes/sun/awt/motif/MMenuItemPeer.java.i
data/src/share/classes/java/security/cert/CertStore.java.i
-data/test/javax/management/MBeanServer/NewMBeanListenerTest.java.i
+data/src/macosx/classes/com/apple/laf/AquaFileSystemModel.java.i
data/src/share/classes/sun/tools/jstat/OptionLister.java.i
data/test/sun/tools/jps/jps-l_Output2.awk.i
data/src/share/classes/java/awt/doc-files/GridLayout-1.gif.i
data/test/java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.html.i
+data/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509KeyManager/SelectOneKeyOutOfMany.java.i
data/test/sun/rmi/rmic/covariantReturns/G5.java.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/DnDSource.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpString.java.i
data/test/java/util/ResourceBundle/Bug6299235Test.sh.i
data/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/FunctionGenerator.java.i
data/test/java/beans/Introspector/Test6447751.java.i
data/test/sun/net/www/protocol/http/TunnelThroughProxy.java.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/Serialize/SamePackageCtor.java.i
-data/test/java/util/concurrent/Exchanger/ExchangeLoops.java.i
+data/src/share/demo/nbproject/scripting/jconsole-plugin/nbproject/jdk.xml.i
data/test/java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/java.policy.deny.i
data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComSSLContextImpl.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c.i
data/src/share/classes/sun/net/httpserver/HttpsExchangeImpl.java.i
-data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java.i
data/src/share/classes/sun/text/resources/CollationData_ca.java.i
-data/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java.i
+data/src/share/classes/sun/java2d/DefaultDisposerRecord.java.i
data/src/share/classes/sun/security/x509/DistributionPoint.java.i
-data/test/java/util/Locale/serialized/java6locale_th_TH_TH.i
+data/test/com/sun/jdi/CountFilterTest.java.i
data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.java.i
data/src/share/classes/sun/io/ByteToCharCp500.java.i
-data/test/javax/management/remote/mandatory/version/ImplVersionTest.java.i
+data/make/tools/makeclasslist/Makefile.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_LOCKMUTEX.java.i
data/make/java/text/base/Makefile.i
data/test/java/awt/Window/WindowType/WindowType.java.i
data/src/share/native/sun/security/smartcardio/pcsc.c.i
-data/src/share/classes/javax/sound/sampled/spi/MixerProvider.java.i
+data/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js.i
data/test/java/util/EnumMap/SimpleSerialization.java.i
data/src/share/classes/java/lang/reflect/Array.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315OmitComments.java.i
@@ -16553,6 +17238,7 @@ data/src/share/classes/java/util/concurrent/TimeUnit.java.i
data/src/share/classes/sun/tools/jar/resources/jar_fr.properties.i
data/test/java/nio/file/Path/Links.java.i
data/src/share/classes/sun/nio/cs/ext/Big5_Solaris.java.i
+data/src/macosx/classes/com/apple/eawt/ApplicationBeanInfo.java.i
data/src/windows/native/sun/windows/awt_InputTextInfor.cpp.i
data/src/share/classes/javax/swing/text/doc-files/editor.gif.i
data/test/sun/tools/native2ascii/test2.i
@@ -16562,37 +17248,43 @@ data/test/java/util/ResourceBundle/Control/Chinese_zh_TW.properties.i
data/src/share/sample/nio/chatserver/NameReader.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmThreadContentionMonitoring.java.i
data/test/sun/awt/font/ClassLoaderLeakTest.java.i
-data/src/share/classes/javax/swing/tree/AbstractLayoutCache.java.i
-data/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c.i
+data/test/javax/management/MBeanServer/PostRegisterDeadlockTest2.java.i
+data/make/modules/modules.properties.i
data/test/javax/management/mxbean/TypeNameTest.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostClient.java.i
data/src/share/classes/sun/io/ByteToCharEUC_JP_LINUX.java.i
data/src/solaris/classes/sun/nio/fs/LinuxWatchService.java.i
data/test/java/awt/image/BufferedImage/TinyScale.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_it_CH.properties.i
-data/test/com/sun/jdi/MixedSuspendTest.sh.i
-data/test/javax/swing/SwingWorker/6493680/bug6493680.java.i
+data/src/share/classes/java/rmi/ServerError.java.i
+data/make/mksample/webservices/EbayServer/Makefile.i
+data/src/share/classes/java/awt/image/RasterFormatException.java.i
data/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java.i
-data/src/share/native/sun/security/ec/impl/mpprime.h.i
-data/src/share/classes/sun/beans/editors/IntegerEditor.java.i
+data/src/windows/native/sun/windows/awt_Checkbox.cpp.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ExtendedKeySocket.java.i
-data/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java.i
+data/src/macosx/bundle/JavaAppLauncher/resources/JavaAppLauncher-Info.plist.i
+data/src/share/sample/nio/server/RequestHandler.java.i
data/src/share/native/java/lang/fdlibm/src/e_acos.c.i
data/test/java/lang/Math/Tests.java.i
-data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_zh_CN.properties.i
+data/src/share/classes/sun/security/tools/PolicyTool.java.i
data/src/share/classes/java/util/concurrent/ConcurrentSkipListMap.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll.i
data/src/share/classes/sun/tools/tree/InlineNewInstanceExpression.java.i
-data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html.i
+data/src/share/native/java/lang/Throwable.c.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/freebl3.dll.d
data/src/share/classes/sun/nio/cs/ext/DoubleByteEncoder.java.i
data/src/share/classes/java/awt/Graphics2D.java.i
data/test/javax/swing/plaf/synth/Test6660049.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/ClosedStreams.java.i
+data/src/share/classes/javax/accessibility/AccessibleStreamable.java.i
data/src/linux/doc/man/ja/pack200.1.i
-data/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c.i
+data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall_Stub.java.i
data/test/java/nio/charset/Charset/NIOCharsetAvailabilityTest.java.i
-data/make/tools/CharsetMapping/IBM273.c2b.i
+data/src/share/classes/java/awt/geom/FlatteningPathIterator.java.i
data/test/javax/management/remote/mandatory/notif/NotifBufferSizePropertyNameTest.java.i
-data/src/share/classes/sun/print/SunAlternateMedia.java.i
+data/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java.i
data/test/java/io/Serializable/stopCustomDeserialization/Read.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriterSpi.java.i
data/test/java/io/Serializable/lookupInterfaceDesc/LookupInterfaceDesc.java.i
@@ -16603,7 +17295,8 @@ data/src/share/classes/java/beans/VetoableChangeSupport.java.i
data/test/java/lang/management/MXBean/MXBeanBehavior.java.i
data/test/java/lang/Class/getDeclaredClasses/TypeTag.java.i
data/src/share/classes/sun/launcher/resources/launcher_zh_TW.properties.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java.i
+data/test/sun/management/jmxremote/startstop/JMXStartStopTest.sh.i
+data/src/share/classes/sun/io/CharToByteMacThai.java.i
data/test/java/rmi/server/RemoteServer/setLogPermission/SetLogPermission.java.i
data/src/share/classes/com/sun/crypto/provider/PCBC.java.i
data/test/java/io/charStreams/LineLengths.java.i
@@ -16617,32 +17310,31 @@ data/src/share/classes/sun/util/BuddhistCalendar.java.i
data/src/share/classes/sun/text/resources/FormatData_sq_AL.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c.i
data/test/com/sun/jdi/LineNumberInfo.java.i
+data/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.m.i
data/src/share/classes/java/awt/event/ActionEvent.java.i
data/test/javax/smartcardio/TestCommandAPDU.java.i
data/src/share/classes/javax/swing/plaf/nimbus/LoweredBorder.java.i
-data/test/java/util/concurrent/Semaphore/RacingReleases.java.i
data/src/share/classes/java/awt/font/TextJustifier.java.i
data/test/java/io/DataInputStream/ReadUTF.java.i
data/test/sun/jvmstat/monitor/MonitoredVm/CR6672135.java.i
data/test/sun/security/ssl/javax/net/ssl/TLSv11/GenericBlockCipher.java.i
-data/src/share/classes/java/awt/ScrollPane.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_EmptySet.java.i
data/test/java/net/PortUnreachableException/Concurrent.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1149.java.i
-data/test/java/text/Collator/Bug5047314.java.i
+data/src/share/classes/javax/accessibility/AccessibleIcon.java.i
data/src/share/classes/java/nio/channels/Channels.java.i
data/test/java/util/ResourceBundle/Bug4179766Resource.java.i
data/src/solaris/back/path_md.h.i
data/test/java/beans/XMLDecoder/spec/TestArray.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/package.html.i
-data/src/share/demo/nbproject/jfc/SwingApplet/nbproject/netbeans-targets.xml.i
-data/test/sun/tools/jps/jps-Vvml_2.sh.i
+data/test/org/openjdk/jigsaw/MockLibrary.java.i
data/src/share/demo/applets/MoleculeViewer/models/ethane.xyz.i
data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.html.i
-data/test/javax/management/eventService/ReconnectableConnectorTest.java.i
-data/src/share/classes/sun/nio/ch/Invoker.java.i
+data/test/java/net/Socket/RST.java.i
+data/make/tools/src/build/tools/automulti/README.txt.i
data/test/com/sun/jdi/AfterThreadDeathTest.java.i
-data/src/share/native/sun/java2d/loops/MaskBlit.c.i
+data/src/share/classes/sun/text/resources/FormatData_ar_JO.java.i
data/src/share/native/sun/misc/VMSupport.c.i
+data/src/macosx/classes/sun/lwawt/macosx/CSystemTray.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_KEY_MAT_OUT.java.i
data/src/windows/classes/sun/nio/ch/SourceChannelImpl.java.i
data/src/linux/doc/man/jrunscript.1.i
@@ -16653,28 +17345,26 @@ data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/param
data/test/java/awt/FontClass/FontPrivilege.java.i
data/test/sun/tools/jstat/jstatTimeStamp1.sh.i
data/src/share/native/sun/awt/debug/debug_trace.h.i
-data/src/share/classes/sun/nio/cs/ext/IBM1383.java.i
+data/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c.i
data/test/java/lang/Float/Constants.java.i
-data/src/share/classes/java/awt/dnd/DropTargetListener.java.i
data/test/java/security/ProtectionDomain/Recursion.policy.i
data/src/share/classes/java/nio/file/attribute/FileTime.java.i
-data/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java.i
data/test/java/util/PluggableLocale/providersrc/TimeZoneNameProviderImpl.java.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressOutputStream.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java.i
+data/test/java/util/zip/Bounds.java.i
data/src/share/classes/java/lang/StringIndexOutOfBoundsException.java.i
-data/test/javax/management/MBeanInfo/NullInfoArraysTest.java.i
data/src/share/classes/sun/security/krb5/internal/HostAddresses.java.i
data/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java.i
data/test/javax/script/Test8.js.i
data/make/sun/security/jgss/wrapper/mapfile-vers.i
-data/src/windows/classes/sun/awt/windows/WRobotPeer.java.i
+data/test/sun/tools/jstat/lineCounts4.awk.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java.i
data/src/share/classes/java/security/acl/LastOwnerException.java.i
data/src/solaris/native/sun/xawt/XWindow.c.i
-data/test/java/util/MissingFormatArgumentException/GetFormatSpecifier.java.i
+data/test/java/util/PluggableLocale/providersrc/java.util.spi.LocaleNameProvider.i
data/test/java/util/logging/LoggingMXBeanTest2.java.i
-data/src/share/classes/javax/management/remote/package.html.i
+data/test/javax/script/DummyScriptEngine.java.i
data/test/java/lang/Boolean/ParseBoolean.java.i
data/src/share/classes/javax/swing/plaf/ColorUIResource.java.i
data/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c.i
@@ -16682,18 +17372,17 @@ data/make/mkdemo/jfc/Metalworks/Makefile.i
data/test/tools/launcher/I18NJarTest.java.i
data/src/share/classes/javax/crypto/Mac.java.i
data/src/share/demo/applets/WireFrame/example3.html.i
-data/test/com/sun/jdi/TemplateTest.java.i
data/src/solaris/native/sun/nio/ch/UnixAsynchronousSocketChannelImpl.c.i
data/src/share/classes/java/awt/dnd/peer/DragSourceContextPeer.java.i
data/src/windows/classes/sun/awt/windows/WToolkit.java.i
data/src/share/classes/java/text/DictionaryBasedBreakIterator.java.i
data/src/share/classes/javax/security/auth/callback/UnsupportedCallbackException.java.i
-data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java.i
+data/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java.i
data/test/com/sun/servicetag/SvcTagClient.java.i
data/src/share/classes/javax/print/event/PrintServiceAttributeEvent.java.i
data/test/javax/sound/midi/Gervill/SF2SoundbankReader/TestGetSoundbankInputStream.java.i
-data/test/javax/script/GetInterfaceTest.java.i
-data/src/share/classes/sun/tools/tree/ReturnStatement.java.i
+data/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails_Stub.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstrument.java.i
data/make/tools/src/build/tools/javazic/Simple.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicRadioButtonUI.java.i
data/src/linux/doc/man/ja/jinfo.1.i
@@ -16702,77 +17391,83 @@ data/src/share/native/sun/font/layout/KhmerReordering.h.i
data/src/share/classes/sun/management/resources/agent_zh_TW.properties.i
data/src/share/classes/sun/io/ByteToCharCp1122.java.i
data/test/java/util/Formatter/BasicDoubleObject.java.i
+data/make/tools/src/build/tools/fontchecker/README.txt.i
+data/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties.i
data/src/share/classes/javax/management/monitor/StringMonitorMBean.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionArgumentConversionException.java.i
data/test/com/sun/jdi/connect/spi/Foo.java.i
-data/src/windows/classes/sun/awt/windows/WCustomCursor.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java.i
+data/src/solaris/native/java/io/io_util_md.h.i
+data/test/java/awt/font/NumericShaper/EqualsTest.java.i
data/test/com/sun/jdi/RedefinePop.sh.i
data/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h.i
data/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java.i
data/src/share/classes/javax/print/attribute/standard/JobHoldUntil.java.i
data/src/share/classes/java/awt/image/DataBufferFloat.java.i
data/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java.i
-data/test/sun/text/resources/Collator/Bug6755060.java.i
+data/src/share/classes/sun/tools/jcmd/JCmd.java.i
+data/src/share/classes/com/sun/security/sasl/ExternalClient.java.i
data/src/share/classes/com/sun/crypto/provider/DESConstants.java.i
data/test/com/sun/jdi/redefine/Different_RedefineSubTarg.java.i
data/src/share/classes/sun/applet/AppletObjectInputStream.java.i
data/test/java/beans/XMLEncoder/Bean.java.i
data/src/share/demo/applets/SimpleGraph/GraphApplet.java.i
+data/test/java/security/cert/CertPathValidatorException/GetMessage.java.i
data/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java.i
data/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java.i
data/src/share/demo/jfc/SwingApplet/SwingApplet.html.i
data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html.i
data/test/org/openjdk/jigsaw/cli/JpkgArgsTest.java.i
data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_MidiUtils.c.i
+data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java.i
data/src/windows/native/sun/java2d/d3d/D3DTestRaster.h.i
data/src/share/classes/com/sun/java/util/jar/pack/NativeUnpack.java.i
data/src/share/classes/com/sun/jmx/namespace/RoutingConnectionProxy.java.i
data/src/share/classes/javax/crypto/ExemptionMechanism.java.i
-data/src/solaris/classes/sun/awt/X11/XMenuWindow.java.i
-data/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java.i
+data/src/solaris/native/sun/awt/awt_PopupMenu.h.i
+data/src/windows/bin/java-rmi.c.i
data/make/tools/reorder/tools/Combine.java.i
+data/test/java/beans/PropertyEditor/TestStringClassNull.java.i
data/test/java/util/ResourceBundle/Bug4257318Res.java.i
data/src/share/classes/java/util/concurrent/LinkedBlockingDeque.java.i
-data/make/java/hpi/windows/Makefile.i
-data/test/com/sun/jdi/sde/MangleStepTest.java.i
+data/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java.i
+data/src/share/native/sun/awt/medialib/mlib_image.h.i
data/test/java/util/Formatter/BasicBoolean.java.i
data/src/share/classes/sun/invoke/package-info.java.i
-data/src/share/classes/java/lang/IllegalStateException.java.i
+data/src/share/classes/javax/swing/DebugGraphicsFilter.java.i
+data/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java.i
data/src/windows/classes/sun/java2d/opengl/WGLGraphicsConfig.java.i
data/src/share/classes/java/awt/font/TextLine.java.i
data/test/java/beans/EventHandler/Test6277266.java.i
-data/src/share/classes/sun/util/resources/CalendarData_vi.properties.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c.i
+data/src/share/classes/sun/misc/Sort.java.i
data/test/javax/imageio/metadata/BooleanAttributes.java.i
data/src/share/classes/javax/print/attribute/standard/MediaTray.java.i
data/src/share/classes/com/sun/jdi/connect/package.html.i
data/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java.i
data/test/java/lang/ProcessBuilder/Zombies.java.i
-data/test/javax/management/mxbean/RandomMXBeanTest.java.i
+data/src/share/classes/java/lang/management/MemoryManagerMXBean.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so.d
data/src/share/classes/sun/io/MalformedInputException.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java.i
-data/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/XMBean.java.i
data/src/share/classes/sun/tracing/MultiplexProviderFactory.java.i
-data/test/java/text/BreakIterator/ExceptionTest.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10Attribute.java.i
data/src/windows/native/sun/jkernel/DownloadHelper.cpp.i
data/src/share/classes/javax/management/namespace/JMXNamespacePermission.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirsA/a.jar.i
data/src/share/classes/sun/applet/AppletSecurityException.java.i
data/src/share/classes/sun/security/ssl/SSLServerSocketImpl.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmThreadInstanceTableMeta.java.i
data/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java.i
-data/test/java/util/zip/FlaterTest.java.i
+data/src/solaris/classes/sun/java2d/opengl/GLXVolatileSurfaceManager.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/Load.java.i
-data/src/solaris/native/sun/jdga/dgalock.c.i
+data/src/share/classes/com/sun/media/sound/SoftLimiter.java.i
data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java.i
data/test/javax/swing/JLabel/6596966/bug6596966.java.i
-data/src/share/classes/sun/io/ByteToCharCp1098.java.i
+data/src/share/classes/com/sun/tools/jdi/BooleanValueImpl.java.i
data/test/sun/net/www/protocol/http/B6660405.java.i
data/test/sun/security/smartcardio/TestChannel.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest11_ok.properties.in.i
data/src/share/classes/sun/io/CharToByteConverter.java.i
-data/src/share/classes/javax/sound/midi/Soundbank.java.i
+data/make/netbeans/j2se/nbproject/project.xml.i
data/test/sun/security/util/Resources/Format.policy.i
data/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java.i
data/src/share/classes/javax/security/auth/login/AppConfigurationEntry.java.i
@@ -16782,20 +17477,22 @@ data/test/java/io/Serializable/accessConstants/AccessConstants.java.i
data/test/java/io/File/IsHidden.java.i
data/src/solaris/native/com/sun/security/auth/module/Solaris.c.i
data/src/windows/native/sun/windows/awt_TextField.h.i
-data/src/share/classes/sun/security/krb5/internal/HostAddress.java.i
+data/src/share/classes/sun/rmi/server/WeakClassHashMap.java.i
+data/make/com/oracle/jfr/Makefile.i
data/test/java/lang/System/System.policy.i
data/src/share/classes/javax/swing/plaf/multi/MultiTabbedPaneUI.java.i
data/test/java/security/cert/CertificateFactory/openssl/OpenSSLCert.java.i
data/test/java/awt/EventQueue/6638195/bug6638195.java.i
data/src/share/classes/sun/tools/tree/PostDecExpression.java.i
-data/test/java/io/Serializable/enum/ignoreSerializationMethods/Test.java.i
+data/src/share/classes/javax/swing/plaf/metal/MetalDesktopIconUI.java.i
data/src/windows/native/sun/io/Win32ErrorMode.c.i
+data/src/windows/classes/sun/awt/Win32ColorModel24.java.i
data/src/share/classes/com/sun/jdi/event/MonitorContendedEnterEvent.java.i
data/test/java/awt/im/4959409/bug4959409.html.i
data/test/org/openjdk/jigsaw/cli/ee-cert.pem.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/package.html.i
-data/src/share/classes/java/awt/AttributeValue.java.i
-data/src/share/classes/sun/management/Agent.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DHTMarkerSegment.java.i
+data/src/share/classes/sun/io/CharToByteCp850.java.i
+data/test/javax/management/namespace/ExportNamespaceTest.java.i
data/src/share/classes/sun/awt/datatransfer/SunClipboard.java.i
data/.hgtags.i
data/src/windows/native/sun/nio/ch/FileChannelImpl.c.i
@@ -16808,73 +17505,78 @@ data/src/windows/back/util_md.h.i
data/src/share/classes/java/awt/PrintJob.java.i
data/test/javax/security/auth/login/Configuration/ConfigFileWithBlank.java.i
data/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java.i
+data/src/solaris/native/java/net/bsd_close.c.i
data/test/java/lang/Runtime/exec/ExecWithDir.java.i
data/test/org/openjdk/jigsaw/cli/ImportPrivateKey.java.i
-data/test/java/awt/im/4490692/bug4490692.html.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/ding.dls.i
data/make/modules/imagine.sh.i
data/src/share/classes/sun/reflect/UnsafeStaticIntegerFieldAccessorImpl.java.i
-data/src/share/classes/java/lang/AssertionStatusDirectives.java.i
+data/test/java/nio/charset/RemovingSunIO/SunioAlias.java.i
data/make/common/Release-embedded.gmk.i
data/src/share/classes/javax/swing/plaf/basic/package.html.i
data/test/sun/tools/jrunscript/dash-f.out.i
data/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java.i
-data/src/solaris/classes/sun/awt/motif/X11GB18030_1.java.i
-data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config.i
-data/src/share/classes/java/security/AlgorithmParameterGenerator.java.i
+data/src/windows/native/sun/java2d/d3d/D3DRuntimeTest.h.i
+data/test/java/lang/instrument/PremainClass/PremainClassTest.sh.i
+data/test/java/util/ResourceBundle/Bug4083270Test.properties.i
data/src/share/demo/nbproject/jfc/Font2DTest/build.properties.i
-data/src/share/classes/sun/dyn/util/VerifyAccess.java.i
+data/make/tools/CharsetMapping/MS932.map.i
+data/src/share/classes/javax/swing/CellRendererPane.java.i
data/test/sun/tools/jhat/HelloWorld.java.i
data/test/java/util/concurrent/ConcurrentHashMap/MapCheck.java.i
data/src/windows/hpi/src/sys_api_md.c.i
data/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java.i
data/src/share/demo/jvmti/java_crw_demo/README.txt.i
+data/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java.i
data/src/solaris/sample/dtrace/hotspot/README.txt.i
-data/test/java/util/zip/ZipFile/CopyJar.java.i
-data/src/share/native/java/lang/fdlibm/src/w_sinh.c.i
-data/src/share/classes/java/nio/channels/ReadableByteChannel.java.i
-data/src/share/classes/sun/rmi/runtime/NewThreadAction.java.i
-data/test/java/rmi/testlibrary/RegistryRunner.java.i
+data/test/java/beans/PropertyEditor/TestFloatClassNull.java.i
+data/make/tools/CharsetMapping/IBM1026.map.i
+data/src/solaris/native/sun/awt/awt_dnd.h.i
+data/src/share/classes/sun/rmi/runtime/NewThreadAction.java.i
+data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix.java.i
data/src/windows/native/sun/windows/awt_TextComponent.cpp.i
data/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c.i
data/src/share/classes/javax/management/BinaryOpValueExp.java.i
data/test/java/security/KeyRep/Serial.policy.i
-data/src/share/classes/java/dyn/package-info.java.i
+data/src/share/classes/com/sun/jndi/cosnaming/CorbanameUrl.java.i
data/src/share/classes/java/util/SortedMap.java.i
data/src/share/classes/javax/net/ssl/package.html.i
-data/test/java/rmi/Naming/UnderscoreHost_Stub.java.i
data/test/java/io/FileInputStream/Available.java.i
data/src/windows/classes/sun/security/mscapi/RSASignature.java.i
-data/test/java/io/Serializable/evolution/AddedSuperClass/README.i
+data/src/share/classes/com/sun/jdi/InvalidStackFrameException.java.i
data/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/G1.java.i
-data/src/share/classes/com/sun/tools/hat/MANIFEST.mf.i
-data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/group.security.policy.i
+data/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java.i
+data/test/sun/security/ec/keystore.i
data/src/share/classes/sun/print/resources/serviceui_es.properties.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextRenderTests.java.i
data/src/share/native/sun/awt/image/jpeg/jdct.h.i
data/src/share/classes/sun/util/logging/resources/logging_sv.properties.i
+data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp.i
data/test/com/sun/jdi/InvokeHangTest.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.properties.i
data/test/java/util/concurrent/FutureTask/LoopHelpers.java.i
data/src/share/native/sun/security/ec/ECC_JNI.cpp.i
-data/src/share/classes/sun/nio/cs/ext/IBM1026.java.i
+data/src/share/classes/sun/invoke/anon/AnonymousClassLoader.java.i
data/test/sun/tools/jps/jps-v_Output1.awk.i
data/src/share/classes/sun/print/BackgroundLookupListener.java.i
data/src/share/classes/sun/tools/java/ClassType.java.i
-data/src/share/classes/sun/security/pkcs10/PKCS10.java.i
+data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_1.java.i
data/test/javax/management/remote/mandatory/loading/UserClassLoaderTest.java.i
+data/src/macosx/classes/com/apple/eawt/event/package.html.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorStructureException.java.i
-data/test/sun/tools/jstatd/jstatdPort.sh.i
+data/test/javax/script/VersionTest.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java.i
data/src/share/demo/jfc/Metalworks/resources/MyTheme.theme.i
-data/test/java/nio/channels/Channels/ShortWrite.java.i
+data/test/java/nio/channels/Channels/Write.java.i
data/test/java/net/Authenticator/B4933582.java.i
data/src/share/classes/sun/print/resources/serviceui_ja.properties.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/MyKeyManager.java.i
data/src/share/classes/sun/security/provider/certpath/URICertStore.java.i
data/test/java/net/URL/RelativeURL.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java.i
+data/test/javax/management/remote/mandatory/connectorServer/StandardForwardersTest.java.i
data/src/share/classes/sun/security/krb5/internal/util/KrbDataInputStream.java.i
+data/test/sun/awt/image/DrawByteBinary.java.i
data/src/share/classes/com/sun/crypto/provider/HmacMD5KeyGenerator.java.i
data/src/share/classes/sun/text/resources/CollationData_uk.java.i
data/src/share/classes/java/awt/font/TextMeasurer.java.i
@@ -16882,43 +17584,43 @@ data/src/share/classes/java/lang/annotation/Target.java.i
data/test/java/lang/Long/GetLong.java.i
data/test/java/beans/Introspector/Test4948761.java.i
data/src/share/demo/jvmti/minst/Minst.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/AssociationChange.java.i
data/src/share/native/sun/awt/image/cvutils/img_output8_16_32.h.i
data/test/sun/security/krb5/auto/ReplayCache.java.i
data/src/share/classes/sun/rmi/rmic/resources/rmic.properties.i
data/test/sun/java2d/X11SurfaceData/DrawImageBgTest/DrawImageBgTest.java.i
-data/src/share/classes/javax/security/cert/CertificateEncodingException.java.i
+data/src/share/classes/javax/naming/ldap/PagedResultsResponseControl.java.i
data/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh.i
data/src/share/classes/sun/security/pkcs/PKCS9Attributes.java.i
data/src/share/classes/sun/java2d/pipe/PixelFillPipe.java.i
data/test/java/awt/dnd/DnDFileGroupDescriptor/DnDTarget.java.i
data/src/share/native/sun/awt/image/cvutils/img_output32.h.i
-data/test/java/beans/Performance/TestVetoableChangeSupport.java.i
+data/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_ko.properties.i
data/src/share/classes/sun/nio/cs/UnicodeDecoder.java.i
data/make/common/shared/Compiler-sun.gmk.i
data/src/share/classes/sun/text/resources/CollationData_zh_TW.java.i
data/src/windows/native/sun/security/mscapi/security.cpp.i
data/test/java/util/Formatter/Flush.java.i
-data/src/share/classes/javax/swing/plaf/LabelUI.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/minimize.gif.i
data/test/java/beans/PropertyEditor/TestShortTypeNull.java.i
data/src/share/classes/sun/swing/SwingLazyValue.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh.i
data/test/start-Xvfb.sh.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ObjTreeCalls.java.i
data/src/windows/native/sun/windows/awt_Checkbox.h.i
-data/src/share/classes/sun/swing/text/CountingPrintable.java.i
-data/src/share/classes/org/openjdk/internal/joptsimple/OptionMissingRequiredArgumentException.java.i
+data/src/windows/classes/sun/awt/windows/WChoicePeer.java.i
+data/test/java/util/logging/SimpleFormatterFormat.java.i
data/test/javax/management/notification/FilterExceptionTest.java.i
data/src/windows/native/sun/windows/awt_Brush.h.i
-data/src/share/classes/com/sun/tools/jdi/PacketStream.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadAllInstruments.java.i
data/test/com/sun/net/httpserver/bugs/B6339483.java.i
-data/src/share/classes/javax/swing/text/TabExpander.java.i
+data/test/com/sun/management/ThreadMXBean/ThreadAllocatedMemoryArray.java.i
data/src/share/classes/javax/swing/ClientPropertyKey.java.i
data/test/javax/swing/Security/6938813/bug6938813.java.i
data/src/share/native/java/net/Inet4Address.c.i
data/test/sun/security/provider/PolicyFile/CombinedPerms.policy.i
data/src/share/classes/javax/management/relation/InvalidRoleValueException.java.i
-data/src/share/classes/sun/tools/jstack/JStack.java.i
data/src/share/classes/java/io/RandomAccessFile.java.i
data/test/java/beans/XMLEncoder/Test5023552.java.i
data/src/windows/native/sun/java2d/d3d/D3DVertexCacher.cpp.i
@@ -16932,6 +17634,7 @@ data/test/sun/tools/jhat/README.TXT.i
data/src/share/native/sun/awt/image/jpeg/jcsample.c.i
data/src/share/native/java/net/net_util.c.i
data/src/share/classes/sun/security/jgss/krb5/SubjectComber.java.i
+data/src/macosx/native/sun/awt/CFileDialog.m.i
data/src/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java.i
data/src/share/classes/com/sun/tools/jdi/SunCommandLineLauncher.java.i
data/src/share/classes/com/sun/net/ssl/SSLSecurity.java.i
@@ -16949,15 +17652,14 @@ data/src/share/classes/java/lang/doc-files/capsigma.gif.i
data/src/share/native/sun/java2d/loops/Index12Gray.c.i
data/test/java/util/zip/ZipFile/Assortment.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c.i
-data/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java.i
+data/src/share/classes/javax/swing/text/MaskFormatter.java.i
data/src/share/classes/sun/java2d/pipe/hw/AccelSurface.java.i
-data/src/share/classes/com/sun/net/ssl/SSLPermission.java.i
+data/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java.i
data/src/share/demo/jfc/Notepad/resources/copy.gif.i
-data/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java.i
data/src/share/classes/sun/io/ByteToCharCp937.java.i
data/make/netbeans/jarzip/build.properties.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties.i
+data/src/share/classes/sun/beans/editors/FloatEditor.java.i
+data/src/macosx/classes/com/apple/laf/AquaPanelUI.java.i
data/test/com/sun/jdi/AnyDebuggeeTest.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolCollectThreshdSupport.java.i
data/src/solaris/doc/sun/man/man1/jarsigner.1.i
@@ -16966,23 +17668,26 @@ data/test/java/util/Objects/BasicObjectsTest.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicInteger.java.i
data/src/share/classes/sun/security/jgss/spi/MechanismFactory.java.i
data/test/javax/management/namespace/JMXRemoteNamespaceTest.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/AssociationImpl.java.i
+data/test/java/beans/XMLDecoder/spec/TestInt.java.i
data/src/windows/native/sun/java2d/opengl/J2D_GL/wglext.h.i
data/test/java/security/cert/GetInstance.java.i
-data/make/tools/CharsetMapping/MS1252.map.i
+data/src/share/classes/java/security/cert/CertPathBuilder.java.i
data/src/share/classes/org/openjdk/internal/joptsimple/internal/Column.java.i
data/src/share/classes/sun/net/TelnetInputStream.java.i
data/test/java/beans/PropertyEditor/TestFloatClass.java.i
data/test/java/security/SecureClassLoader/TestClass.java.i
-data/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java.i
data/make/tools/CharsetMapping/IBM424.c2b.i
-data/src/share/classes/sun/security/ssl/Alerts.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh.i
+data/make/tools/GenerateCharacter/CharacterDataUndefined.java.template.i
data/test/java/nio/channels/TestUtil.java.i
data/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.d
data/src/share/classes/java/awt/image/DataBufferInt.java.i
data/src/share/classes/sun/security/pkcs11/P11ECKeyFactory.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageConstXor.c.i
-data/src/share/classes/sun/java2d/pipe/BufferedOpCodes.java.i
-data/test/java/nio/channels/FileChannel/MapAssertions.java.i
+data/test/sun/management/HotspotClassLoadingMBean/GetClassInitializationTime.java.i
+data/test/java/net/URLConnection/UNCTest.java.i
data/src/share/classes/sun/io/CharToByteISO8859_6.java.i
data/make/netbeans/common/java-data-native.ent.i
data/src/share/classes/sun/tools/tree/DivideExpression.java.i
@@ -16991,33 +17696,36 @@ data/src/windows/hpi/src/linker_md.c.i
data/src/share/classes/sun/text/bidi/BidiLine.java.i
data/src/share/classes/sun/jvmstat/monitor/LongMonitor.java.i
data/src/share/classes/sun/util/resources/LocaleNames_bg.properties.i
-data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java.i
data/test/java/io/charStreams/ABCReader.java.i
data/src/share/native/java/lang/fdlibm/src/s_matherr.c.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c.i
data/test/sun/tools/jps/jps-V_Output2.awk.i
-data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport_Stub.java.i
+data/test/java/lang/management/CompositeData/ThreadInfoCompositeData.java.i
data/src/share/native/sun/font/layout/ICUFeatures.h.i
data/src/share/classes/javax/print/MultiDocPrintService.java.i
-data/make/sun/javazic/tzdata/antarctica.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd.i
+data/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1383.java.i
data/test/java/net/MulticastSocket/TestInterfaces.java.i
data/test/java/rmi/server/RMIClassLoader/spi/TestProvider2.java.i
data/src/share/classes/com/sun/jndi/dns/Header.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java.i
+data/test/org/openjdk/jigsaw/tester.sh.i
data/src/share/classes/sun/nio/cs/ext/IBM856.java.i
+data/src/solaris/classes/sun/awt/motif/X11Dingbats.java.i
data/src/share/classes/com/sun/jdi/request/InvalidRequestStateException.java.i
data/src/solaris/doc/sun/man/man1/ja/jps.1.i
data/test/java/net/DatagramSocket/B6411513.java.i
-data/test/java/lang/instrument/ilib/Injector.java.i
data/src/windows/native/common/jdk_util_md.h.i
data/src/share/classes/java/dyn/BoundMethodHandle.java.i
data/src/share/classes/sun/management/counter/perf/LongCounterSnapshot.java.i
+data/test/java/security/ProtectionDomain/RecursionDebug.java.i
data/test/javax/security/auth/Subject/Generic.java.i
data/test/javax/management/ObjectName/SerialCompatTest.java.i
data/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java.i
data/src/share/classes/sun/tools/tree/RemainderExpression.java.i
data/src/share/classes/sun/java2d/pipe/LoopBasedPipe.java.i
data/test/sun/security/ssl/sanity/pluggability/MySSLServerSocketFacImpl.java.i
+data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh.i
data/test/java/beans/Introspector/6380849/infos/SecondBeanBeanInfo.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/InvalidSignatureValueException.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntRgbx.c.i
@@ -17025,30 +17733,33 @@ data/test/java/util/Formattable/StockName.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_el_GR.properties.i
data/test/sun/management/AgentCheckTest.java.i
data/src/share/classes/sun/management/counter/perf/PerfLongCounter.java.i
-data/src/share/native/sun/font/sunFont.c.i
+data/test/com/sun/jdi/SourceNameFilterTest.java.i
data/test/javax/management/namespace/JMXRemoteTargetNamespace.java.i
-data/src/share/native/sun/java2d/opengl/OGLContext.c.i
-data/src/share/classes/sun/tools/tree/WhileStatement.java.i
+data/test/com/sun/net/httpserver/SimpleSSLContext.java.i
+data/test/javax/management/remote/mandatory/version/ImplVersionTest.java.i
data/make/com/sun/nio/sctp/mapfile-vers.i
-data/make/tools/CharsetMapping/MacRomania.map.i
+data/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java.i
data/make/javax/crypto/policy/limited/exempt_local.policy.i
data/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java.i
data/test/java/net/Socket/setReuseAddress/Restart.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapClientFactory.java.i
+data/test/java/text/Format/DateFormat/WeekDateTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/CheckMethods.java.i
data/test/java/lang/Double/ToString.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll.i
data/test/java/beans/PropertyEditor/TestBooleanClassValue.java.i
-data/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java.i
+data/test/java/beans/PropertyChangeSupport/1.5.0_10.ser.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java.i
data/test/java/nio/file/attribute/FileStoreAttributeView/Basic.java.i
+data/test/java/lang/management/ThreadMXBean/Utils.java.i
data/test/javax/print/PrintSE/PrintSE.java.i
data/test/java/net/ResponseCache/getResponseCode.java.i
data/test/com/sun/jdi/RedefineIntConstantToLong.sh.i
data/src/solaris/classes/sun/tools/attach/LinuxAttachProvider.java.i
data/src/windows/classes/sun/net/www/protocol/http/NTLMAuthSequence.java.i
data/test/java/io/Serializable/readObjectNoData/Write.java.i
-data/test/java/beans/Introspector/memory/Test4508780.java.i
-data/test/sun/misc/URLClassPath/ClassnameCharTest.sh.i
-data/test/java/net/Socket/FDClose.java.i
+data/test/tools/pack200/pack200-verifier/src/xmlkit/ClassSyntax.java.i
+data/test/javax/print/PrintSE/PrintSE.sh.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/TestThread.java.i
data/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java.i
data/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java.i
data/test/java/nio/channels/ConfigureBlocking.java.i
@@ -17057,80 +17768,83 @@ data/src/share/classes/java/lang/management/MemoryType.java.i
data/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java.i
data/src/share/sample/nio/server/MalformedRequestException.java.i
data/src/share/classes/javax/management/DescriptorKey.java.i
-data/test/org/openjdk/jigsaw/_JigsawVersionQuery.java.i
-data/src/share/native/sun/font/layout/LookupProcessor.h.i
+data/src/solaris/classes/sun/awt/X11/XWM.java.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/FrameRestoreDown.wav.i
data/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/MyActivationGroupImpl.java.i
-data/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java.i
+data/src/share/classes/javax/swing/plaf/ListUI.java.i
data/make/sun/font/t2k/FILES_c.gmk.i
data/src/share/demo/jfc/CodePointIM/resources/codepoint_ja.properties.i
data/src/share/classes/sun/reflect/UnsafeQualifiedStaticBooleanFieldAccessorImpl.java.i
data/test/javax/sound/midi/Gervill/SoftSincResampler/Interpolate.java.i
data/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java.i
-data/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java.i
+data/src/share/classes/sun/nio/ch/AllocatedNativeObject.java.i
data/src/share/classes/sun/awt/InputMethodSupport.java.i
data/test/java/security/Policy/Root/Root.policy.i
data/src/share/classes/sun/util/resources/CalendarData_fi.properties.i
-data/make/templates/gpl-cp-header.i
+data/src/share/classes/com/sun/tools/hat/README.txt.i
data/src/share/classes/javax/swing/tree/TreeModel.java.i
data/test/java/beans/PropertyEditor/TestLongTypeValue.java.i
data/test/java/util/PriorityQueue/ForgetMeNot.java.i
data/src/share/native/sun/awt/libpng/pngconf.h.i
data/test/sun/security/krb5/ktab/HighestKvno.java.i
-data/src/windows/native/sun/windows/awt_Window.h.i
+data/src/share/classes/com/sun/media/sound/StandardMidiFileWriter.java.i
data/test/sun/security/krb5/auto/BadKdc4.java.i
data/make/java/zip/Makefile.i
data/test/java/rmi/server/RMIClassLoader/useGetURLs/security.policy.i
data/src/share/classes/sun/tools/jar/resources/jar_ja.properties.i
+data/src/share/classes/org/openjdk/internal/joptsimple/internal/Classes.java.i
data/src/share/classes/com/sun/net/ssl/TrustManagerFactory.java.i
data/test/java/nio/channels/Selector/WakeupAfterClose.java.i
+data/src/macosx/native/sun/awt/CTrayIcon.m.i
data/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/CompressConstants.java.i
data/make/java/nio/FILES_c.gmk.i
data/test/sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh.i
data/src/share/classes/javax/print/attribute/standard/RequestingUserName.java.i
data/test/java/rmi/server/RMIClassLoader/useGetURLs/Dummy.java.i
-data/make/tools/src/build/tools/jdwpgen/ArrayObjectTypeNode.java.i
data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.java.i
data/make/java/nio/mapfile-linux.i
data/make/com/sun/tools/attach/Makefile.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/GetInputStream.java.i
data/src/share/classes/javax/swing/text/html/parser/Element.java.i
data/test/java/nio/channels/Selector/SelectWrite.java.i
-data/src/share/classes/javax/swing/text/rtf/RTFGenerator.java.i
-data/src/windows/native/sun/jkernel/stdafx.h.i
+data/src/share/classes/sun/security/krb5/internal/KrbApErrException.java.i
+data/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java.i
data/src/share/classes/java/util/concurrent/BlockingDeque.java.i
data/src/windows/classes/sun/awt/windows/WFontConfiguration.java.i
data/test/sun/security/pkcs11/KeyGenerator/DESParity.java.i
data/src/share/classes/java/util/concurrent/CountDownLatch.java.i
-data/src/share/demo/nbproject/jfc/TableExample/build.xml.i
+data/src/share/classes/java/rmi/registry/LocateRegistry.java.i
data/test/java/awt/Container/isRemoveNotifyNeeded/JInternalFrameTest.java.i
data/test/javax/swing/text/html/TableView/7030332/bug7030332.java.i
data/src/share/classes/javax/swing/event/MenuKeyEvent.java.i
+data/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java.i
data/src/share/classes/com/sun/jndi/ldap/DigestClientId.java.i
data/test/java/util/concurrent/locks/ReentrantReadWriteLock/MapLoops.java.i
data/src/share/classes/java/util/concurrent/locks/package-info.java.i
-data/test/java/nio/file/Path/TemporaryFiles.java.i
-data/src/share/classes/sun/io/ByteToCharCp277.java.i
+data/test/java/io/Serializable/subclassGC/security.policy.i
data/make/com/sun/java/pack/mapfile-vers-unpack200.i
data/src/windows/classes/sun/nio/ch/PollArrayWrapper.java.i
data/test/java/util/PluggableLocale/providersrc/DateFormatSymbolsProviderImpl.java.i
data/src/solaris/native/java/util/TimeZone_md.h.i
data/test/com/sun/servicetag/servicetag1.properties.i
-data/test/com/sun/jdi/CatchPatternTest.sh.i
+data/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.i
data/test/com/sun/jdi/RedefineMulti.sh.i
+data/test/java/rmi/server/RemoteObject/toStub/ToStub.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/PerfDataFile.java.i
-data/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh.i
+data/src/share/native/sun/font/layout/LayoutEngine.cpp.i
data/src/share/classes/sun/reflect/generics/scope/DummyScope.java.i
data/src/share/native/java/util/zip/Deflater.c.i
data/src/share/classes/sun/java2d/loops/DrawPath.java.i
-data/src/windows/classes/sun/java2d/d3d/D3DDrawImage.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpPduBulkType.java.i
data/test/java/io/File/DeleteOnExitNPE.java.i
data/src/share/classes/com/sun/media/sound/SoftSynthesizer.java.i
data/src/share/classes/java/security/spec/InvalidKeySpecException.java.i
-data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java.i
+data/src/macosx/classes/com/apple/eawt/ScreenSleepListener.java.i
+data/test/sun/security/pkcs11/fips/TrustManagerTest.java.i
data/test/java/util/jar/TestExtra.java.i
-data/src/share/classes/javax/security/sasl/SaslException.java.i
+data/test/java/util/Locale/Bug4184873_id.i
data/src/share/classes/sun/security/provider/certpath/ReverseState.java.i
-data/test/java/beans/PropertyEditor/TestEnumClassNull.java.i
+data/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties.i
data/src/share/classes/java/util/Timer.java.i
data/make/tools/swing-beans/beaninfo/images/BoxColor16.gif.i
data/test/javax/imageio/plugins/jpeg/WritingInterruptionTest.java.i
@@ -17144,32 +17858,35 @@ data/src/share/classes/javax/swing/text/html/CSSBorder.java.i
data/make/tools/src/build/tools/generatenimbus/Paint.java.i
data/src/solaris/classes/sun/java2d/x11/X11SurfaceData.java.i
data/src/solaris/javavm/export/jvm_md.h.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nss3.dll.d
data/src/share/classes/javax/swing/Scrollable.java.i
data/test/java/lang/Runtime/shutdown/ShutdownHooks.sh.i
data/src/share/classes/java/lang/module/UnsupportedElementTypeException.java.i
data/test/java/util/ResourceBundle/Bug6190861Data.properties.i
data/src/share/classes/com/sun/pept/protocol/Interceptors.java.i
data/test/sun/management/jmxremote/bootstrap/launcher.c.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/Generator.java.i
data/src/share/classes/sun/io/ByteToCharJISAutoDetect.java.i
data/src/share/classes/sun/io/ByteToCharJIS0212.java.i
data/src/share/classes/javax/naming/ldap/InitialLdapContext.java.i
data/test/javax/management/monitor/CounterMonitorTest.java.i
data/src/share/native/sun/management/HotspotThread.c.i
data/src/windows/native/sun/windows/awt_DesktopProperties.h.i
-data/test/java/io/RandomAccessFile/OpenSync.java.i
+data/src/solaris/classes/sun/awt/motif/X11GB2312.java.i
data/test/com/sun/crypto/provider/Mac/HmacPBESHA1.java.i
data/src/share/classes/javax/management/ObjectName.java.i
data/src/share/native/java/lang/fdlibm/src/s_significand.c.i
data/src/share/classes/sun/misc/Lock.java.i
-data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java.i
+data/test/java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java.i
data/test/java/util/zip/ZipFile/DeleteTempJar.java.i
-data/src/share/classes/java/awt/doc-files/RadialGradientPaint-4.png.i
-data/src/share/classes/javax/swing/plaf/synth/SynthRootPaneUI.java.i
+data/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties.i
+data/src/macosx/classes/sun/lwawt/LWChoicePeer.java.i
+data/src/share/sample/scripting/scriptpad/nbproject/netbeans-targets.xml.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.java.i
data/src/share/classes/com/sun/media/sound/AiffFileReader.java.i
data/src/share/classes/sun/security/util/Resources_it.java.i
data/make/mksample/Makefile.i
-data/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java.i
data/make/netbeans/jmx/build.properties.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/SignatureAlgorithmSpi.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c.i
@@ -17182,73 +17899,72 @@ data/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java.i
data/test/java/beans/Introspector/memory/Bean4.java.i
data/make/tools/swing-beans/beaninfo/images/JPasswordFieldMono16.gif.i
data/src/windows/transport/socket/socket_md.c.i
-data/test/javax/imageio/CachePremissionsTest/w.policy.i
data/test/java/lang/management/ThreadMXBean/SynchronizerDeadlock.java.i
-data/src/share/classes/sun/text/resources/CollationData_ko.java.i
+data/test/java/io/PipedInputStream/CloseAndAvailableRC.java.i
data/src/share/native/java/lang/ref/Finalizer.c.i
data/src/share/classes/java/nio/ByteOrder.java.i
data/src/share/classes/java/nio/file/FileSystemNotFoundException.java.i
data/test/java/util/zip/ZipFile/GetDirEntry.java.i
data/src/share/classes/com/sun/tools/jdi/VMListener.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/jobjc/UnsafeRuntimeAccess.java.i
data/src/share/classes/com/sun/crypto/provider/HmacSHA1KeyGenerator.java.i
data/test/java/util/Locale/serialized/java6locale_en.i
-data/make/com/sun/java/browser/Makefile.i
+data/test/sun/security/pkcs11/Provider/ConfigShortPath.java.i
data/src/share/classes/sun/util/resources/LocaleNames_el_CY.properties.i
data/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java.i
+data/test/java/util/zip/StreamIOAfterClose.java.i
data/test/sun/tools/jstatd/jstatGcutilOutput1.awk.i
-data/src/share/native/sun/reflect/ConstantPool.c.i
+data/test/java/nio/file/WatchService/WithSecurityManager.java.i
data/make/tools/swing-beans/beaninfo/images/JLabelMono16.gif.i
-data/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java.i
-data/make/sun/jawt/mapfile-vers.i
-data/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java.i
+data/test/javax/print/applet/applet3/Applet3PrintService.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedMap.java.i
-data/test/com/sun/net/httpserver/Test10.java.i
+data/src/share/classes/java/awt/font/OpenType.java.i
data/src/share/native/sun/java2d/loops/Any3Byte.c.i
data/src/share/classes/com/sun/rowset/FilteredRowSetImpl.java.i
-data/src/share/classes/sun/io/ByteToCharCp1147.java.i
+data/src/share/classes/sun/security/rsa/RSACore.java.i
data/make/com/sun/jarsigner/Makefile.i
-data/src/solaris/bin/ergo_i586.c.i
-data/src/share/demo/java2d/J2DBench/resources/images/photo.jpg.i
+data/test/sun/security/ssl/javax/net/ssl/NewAPIs/HttpsURLConnectionLocalCertificateChain.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmMemPoolTableMeta.java.i
data/src/windows/native/sun/windows/awt_Insets.cpp.i
-data/test/com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.storePass.i
-data/test/javax/naming/ldap/LdapName/CompareToEqualsTests.java.i
+data/src/share/classes/javax/crypto/CryptoAllPermission.java.i
+data/test/com/sun/net/httpserver/Test12.java.i
+data/src/share/classes/sun/text/resources/FormatData_hr_HR.java.i
data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono16.gif.i
-data/src/share/classes/sun/net/ftp/impl/DefaultFtpClientProvider.java.i
+data/src/solaris/classes/sun/awt/X11/XWarningWindow.java.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_mix_mono_overdrive.java.i
data/test/sun/tools/jrunscript/jrunscript-DTest.sh.i
data/src/share/classes/sun/util/calendar/Era.java.i
-data/src/windows/native/sun/windows/awt_Robot.h.i
-data/src/share/classes/com/sun/media/sound/SoftVoice.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.i
+data/test/javax/swing/SwingWorker/6493680/bug6493680.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java.i
+data/test/org/openjdk/jigsaw/services/many.sh.i
data/test/com/sun/net/httpserver/docs/test1/smallfile.txt.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/ActivateMe.java.i
data/src/share/classes/java/lang/invoke/package-info.java.i
-data/test/java/io/Externalizable/definesWriteObject/DefinesWriteObject.java.i
+data/make/tools/src/build/tools/javazic/RuleRec.java.i
data/src/share/classes/sun/util/CoreResourceBundleControl-XLocales.java.i
data/src/share/native/sun/security/ec/ecl_gf.c.i
-data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleConfig.java.i
+data/test/java/lang/instrument/ExampleForClassPath.java.i
data/src/share/classes/sun/tools/java/ArrayType.java.i
data/src/share/classes/sun/util/resources/CalendarData_lv.properties.i
-data/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java.i
-data/src/solaris/classes/sun/awt/X11/XWINProtocol.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_es.properties.i
+data/src/share/native/sun/security/ec/impl/mpprime.h.i
data/src/windows/classes/sun/awt/Win32GraphicsDevice.java.i
data/test/java/nio/channels/DatagramChannel/AdaptDatagramSocket.java.i
data/test/java/lang/Boolean/GetBoolean.java.i
data/test/sun/security/tools/jarsigner/crl.sh.i
data/src/share/classes/javax/management/InvalidApplicationException.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorTypeException.java.i
+data/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing_Stub.java.i
data/src/share/classes/java/sql/Connection.java.i
data/test/java/nio/channels/AsynchronousServerSocketChannel/WithSecurityManager.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeMetaImpl.java.i
data/test/tools/pack200/SegmentLimit.java.i
data/src/solaris/doc/sun/man/man1/xjc.1.i
-data/test/sun/security/ec/certs/sunlabscerts.pem.i
data/test/sun/security/ssl/sun/net/www/httpstest/HttpServer.java.i
data/src/share/classes/java/awt/geom/ArcIterator.java.i
data/test/org/openjdk/jigsaw/hello-repo.sh.i
-data/src/share/lib/images/cursors/motif_CopyDrop32x32.gif.i
+data/src/solaris/classes/com/sun/management/UnixOperatingSystem.java.i
data/src/share/classes/sun/misc/JavaIOFileDescriptorAccess.java.i
-data/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java.i
+data/src/share/sample/nio/file/DiskUsage.java.i
data/make/sun/nio/FILES_java.gmk.i
data/test/java/rmi/reliability/benchmark/bench/serial/LongArrays.java.i
data/src/windows/classes/sun/misc/FileURLMapper.java.i
@@ -17257,55 +17973,58 @@ data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/RuntimeExceptionP
data/src/share/classes/javax/swing/plaf/ComponentUI.java.i
data/src/share/classes/sun/java2d/loops/ProcessPath.java.i
data/test/sun/tools/jstat/classloadOutput1.awk.i
-data/src/share/classes/javax/print/attribute/standard/Sides.java.i
+data/src/share/native/sun/awt/image/jpeg/jdhuff.h.i
data/test/sun/nio/cs/SurrogateTestEUCTW.plane15.surrogates.i
+data/make/common/Release-macosx.gmk.i
data/src/share/classes/sun/util/resources/CalendarData_el.properties.i
-data/test/java/lang/instrument/ATestCaseScaffold.java.i
+data/test/java/lang/annotation/TestIncompleteAnnotationExceptionNPE.java.i
data/src/share/classes/javax/script/Bindings.java.i
-data/src/share/classes/sun/util/resources/CalendarData_en.properties.i
-data/src/share/classes/sun/java2d/cmm/lcms/LCMSTransform.java.i
-data/src/windows/hpi/export/hpi_md.h.i
+data/test/java/nio/channels/Selector/OutOfBand.java.i
+data/test/javax/swing/RepaintManager/7013453/bug7013453.java.i
+data/test/java/io/Serializable/longString/LongString.java.i
data/test/com/sun/crypto/provider/Cipher/AES/Test4512524.java.i
+data/src/bsd/doc/man/jmap.1.i
data/test/com/sun/jdi/TestScaffold.java.i
-data/src/solaris/native/sun/awt/cursor.c.i
+data/src/share/sample/vm/jvm-clr/invoker.h.i
data/src/solaris/classes/sun/nio/ch/NativeThread.java.i
-data/test/java/rmi/testlibrary/ActivationLibrary.java.i
+data/test/sun/security/ec/certs/sunlabscerts.pem.i
data/test/java/nio/file/Files/delete_on_close.sh.i
data/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java.i
data/src/share/native/java/util/zip/zlib-1.2.3/compress.c.i
data/test/java/util/TreeMap/SubMap.java.i
-data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java.i
+data/test/sun/security/x509/X500Name/AllAttribs.java.i
+data/make/common/Defs-macosx.gmk.i
data/test/sun/net/www/http/ChunkedOutputStream/Test.java.i
data/src/share/classes/sun/nio/cs/ext/IBM1046.java.i
-data/src/solaris/classes/sun/awt/X11/XKeySymConstants.java.i
-data/src/share/classes/javax/swing/text/html/ListView.java.i
-data/make/netbeans/common/share-sources.ent.i
-data/test/java/beans/PropertyChangeSupport/Test4985020.java.i
-data/test/java/security/cert/CertPath/Serialize.java.i
+data/src/windows/native/sun/windows/awt_DataTransferer.cpp.i
+data/test/java/awt/dnd/URIListBetweenJVMsTest/TargetFileListFrame.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/manifest.mf.i
+data/src/share/classes/com/sun/jndi/ldap/LdapSchemaParser.java.i
+data/src/share/classes/sun/text/resources/FormatData_en.java.i
data/test/javax/naming/ldap/LdapName/LdapNameConstruction.java.i
-data/src/share/classes/com/sun/media/sound/AuFileWriter.java.i
+data/src/share/classes/com/sun/crypto/provider/DESedeKey.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java.i
data/src/share/native/common/check_code.c.i
-data/src/share/classes/javax/print/attribute/PrintServiceAttribute.java.i
data/make/modules/bootmodule.roots.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/ElementCheckerImpl.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/IIOPProxy.java.i
data/src/share/classes/javax/swing/plaf/synth/ImagePainter.java.i
data/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java.i
data/src/share/classes/javax/swing/plaf/PanelUI.java.i
-data/src/share/classes/sun/security/ssl/SSLSocketFactoryImpl.java.i
+data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.html.i
+data/src/macosx/lib/Info-privileged.plist.i
data/test/sun/security/provider/PolicyParser/p004.policy.i
-data/src/share/classes/com/sun/nio/sctp/InvalidStreamException.java.i
+data/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java.i
data/test/java/io/File/ToURL.java.i
-data/src/share/classes/javax/sound/midi/Sequence.java.i
+data/test/java/rmi/activation/ActivateFailedException/activateFails/group.security.policy.i
data/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h.i
data/src/share/classes/com/sun/net/httpserver/Headers.java.i
data/src/share/classes/javax/swing/undo/AbstractUndoableEdit.java.i
-data/test/java/nio/channels/Selector/SelectorTest.java.i
+data/src/share/classes/javax/swing/tree/TreeCellEditor.java.i
data/src/share/classes/sun/security/krb5/internal/TicketFlags.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java.i
+data/src/share/classes/sun/tools/jinfo/JInfo.java.i
data/src/share/classes/sun/tools/jstat/Closure.java.i
-data/src/share/classes/javax/swing/text/rtf/charsets/cpg850.txt.i
-data/src/share/native/sun/java2d/opengl/OGLPaints.c.i
+data/src/share/classes/sun/text/resources/FormatData_mk_MK.java.i
+data/src/share/classes/javax/print/attribute/standard/PagesPerMinute.java.i
data/src/share/classes/java/awt/BasicStroke.java.i
data/test/java/util/Collections/CheckedNull.java.i
data/src/windows/classes/sun/print/Win32PrintService.java.i
@@ -17315,14 +18034,14 @@ data/src/share/classes/javax/net/ssl/SSLPeerUnverifiedException.java.i
data/src/share/classes/sun/tools/jconsole/inspector/Utils.java.i
data/src/share/javavm/include/opcodes.weight.i
data/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java.i
-data/src/share/classes/com/sun/nio/sctp/IllegalReceiveException.java.i
+data/src/share/classes/com/sun/jdi/Field.java.i
data/src/solaris/classes/sun/font/NativeFont.java.i
-data/test/java/io/Serializable/defaulted/GetFieldWrite.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureECDSA.java.i
+data/test/java/nio/channels/FileChannel/Transfers.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/truststore.i
data/src/share/back/ObjectReferenceImpl.h.i
data/src/share/classes/javax/print/attribute/standard/Severity.java.i
data/make/tools/CharsetMapping/IBM277.c2b.i
-data/make/sun/text/FILES_properties.gmk.i
+data/test/javax/management/MBeanServer/DynamicWrapperMBeanTest.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_uk_UA.properties.i
data/test/javax/management/modelmbean/InfoSupportTest.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java.i
@@ -17330,52 +18049,53 @@ data/src/share/classes/javax/swing/plaf/synth/SynthListUI.java.i
data/src/share/classes/java/net/SocketInputStream.java.i
data/test/java/nio/file/FileSystem/Basic.java.i
data/make/netbeans/jdwpgen/build.xml.i
-data/test/java/security/IdentityScope/NoDefaultSystemScope.java.i
+data/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java.i
+data/test/javax/crypto/Cipher/ByteBuffers.java.i
data/test/java/util/logging/LoggingDeadlock3.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/infcodes.c.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify.gif.i
data/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h.i
+data/src/share/classes/com/sun/media/sound/AbstractMixer.java.i
data/test/com/sun/tools/attach/agent.mf.i
data/test/java/io/StreamTokenizer/Reset.java.i
-data/test/java/beans/EventHandler/Test6277246.java.i
+data/test/java/security/Provider/CertStoreConstructorParam.java.i
data/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java.i
-data/src/share/demo/nbproject/management/FullThreadDump/nbproject/netbeans-targets.xml.i
+data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_CompoundBorderUIResource.java.i
data/src/share/classes/sun/tools/jconsole/AboutDialog.java.i
-data/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html.i
+data/test/java/awt/Modal/LWModalTest/LWModalTest.java.i
data/make/sun/javazic/tzdata/zone.tab.i
-data/src/solaris/native/sun/java2d/loops/vis_AlphaMacros.h.i
-data/src/share/native/sun/font/layout/GXLayoutEngine.cpp.i
-data/make/sun/image/vis/FILES_c.gmk.i
-data/src/solaris/native/java/lang/UNIXProcess_md.c.i
-data/test/javax/swing/JSlider/4987336/cupanim.gif.i
-data/test/java/security/Security/signedfirst/Static.sh.i
+data/test/java/net/SocketPermission/Equals.java.i
+data/test/java/awt/event/MouseEvent/MouseWheelEventAbsoluteCoordsTest/MouseWheelEventAbsoluteCoordsTest.java.i
+data/src/share/demo/jvmti/hprof/hprof_event.c.i
+data/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java.i
+data/test/javax/swing/JSlider/4987336/cupanim.gif.i
+data/src/share/classes/javax/swing/table/TableColumnModel.java.i
data/src/share/classes/sun/swing/text/html/FrameEditorPaneTag.java.i
-data/src/share/classes/sun/security/jgss/LoginConfigImpl.java.i
-data/test/java/nio/channels/Channels/ReadOffset.java.i
+data/src/solaris/classes/sun/tools/attach/BsdAttachProvider.java.i
+data/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnspr4.so.i
data/src/share/native/sun/font/layout/SimpleArrayProcessor.h.i
data/src/share/classes/sun/nio/cs/ext/IBM1141.java.i
-data/src/share/classes/sun/io/CharToByteCp1047.java.i
+data/test/javax/swing/JComboBox/7082443/bug7082443.java.i
+data/test/java/util/AbstractList/CheckForComodification.java.i
data/src/share/classes/sun/text/resources/CollationData_sl.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloped-dsa.xml.i
data/src/share/classes/sun/swing/PrintingStatus.java.i
-data/src/share/classes/javax/swing/plaf/MenuBarUI.java.i
-data/make/netbeans/README.i
+data/test/java/beans/Introspector/4520754/Foo.java.i
data/test/javax/management/eventService/SubUnsubTest.java.i
data/src/share/native/sun/awt/libpng/CHANGES.i
data/src/share/classes/java/awt/event/AdjustmentListener.java.i
-data/src/share/classes/java/util/concurrent/CopyOnWriteArraySet.java.i
-data/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java.i
-data/test/java/nio/channels/FileChannel/Write.java.i
+data/src/share/classes/sun/print/SunAlternateMedia.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Question.gif.i
data/src/share/classes/com/sun/java/swing/SwingUtilities3.java.i
data/src/share/classes/javax/swing/text/html/HTMLEditorKit.java.i
-data/src/share/demo/jvmti/hprof/hprof_reference.h.i
+data/test/com/sun/jdi/sde/FilterMangleTest.java.i
data/test/java/net/URLClassLoader/sealing/b.jar.i
data/test/java/nio/channels/DatagramChannel/SendToUnresolved.java.i
-data/src/share/native/java/lang/fdlibm/src/s_frexp.c.i
-data/test/java/net/DatagramSocket/ChangingAddress.java.i
+data/test/java/awt/Modal/SupportedTest/SupportedTest.java.i
+data/src/share/native/sun/java2d/loops/AnyShort.h.i
data/test/sun/net/www/protocol/jar/jarbug/src/jar1/LoadResourceBundle.java.i
-data/make/javax/imageio/Makefile.i
+data/test/javax/imageio/CachePremissionsTest/w.policy.i
data/src/share/classes/sun/tools/java/MethodType.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_util.c.i
data/src/share/classes/java/nio/file/AccessMode.java.i
@@ -17385,16 +18105,16 @@ data/test/java/util/PluggableLocale/NumberFormatProviderTest.sh.i
data/src/windows/classes/sun/awt/windows/awtLocalization_zh_TW.properties.i
data/src/share/classes/com/sun/crypto/provider/ARCFOURCipher.java.i
data/src/share/classes/sun/font/FontStrikeDesc.java.i
-data/src/share/classes/com/sun/media/sound/Printer.java.i
-data/test/java/rmi/reliability/benchmark/bench/rmi/LongCalls.java.i
+data/src/share/classes/javax/management/BinaryRelQueryExp.java.i
+data/test/sun/security/provider/PolicyFile/getinstance/GetInstance.policy.i
data/src/share/classes/com/sun/jmx/event/ReceiverBuffer.java.i
data/test/javax/management/MustBeValidMBeanInfo/MustBeValidCommand.java.i
data/src/share/classes/javax/management/relation/Relation.java.i
data/src/share/classes/sun/reflect/ConstantPool.java.i
-data/src/share/classes/sun/io/ByteToCharCp1025.java.i
-data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif.i
-data/test/java/util/concurrent/BlockingQueue/ProducerConsumerLoops.java.i
-data/test/java/lang/String/Supplementary.java.i
+data/test/java/security/KeyPairGenerator/SolarisShortDSA.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ServerHandler.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformBase64Decode.java.i
+data/src/share/native/java/lang/fdlibm/src/w_remainder.c.i
data/src/windows/resource/unpack200_proto.exe.manifest.i
data/src/share/classes/org/openjdk/jigsaw/ModuleFileVerifier.java.i
data/src/share/native/sun/java2d/pipe/PathConsumer2D.h.i
@@ -17403,40 +18123,40 @@ data/test/java/rmi/activation/Activatable/restartService/group.security.policy.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_DESTROYMUTEX.java.i
data/test/java/util/logging/RacingThreadsTest.java.i
data/test/java/awt/GraphicsEnvironment/LoadLock/GE_init2.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsClient/ProxyTunnelServer.java.i
+data/src/share/classes/javax/swing/plaf/basic/icons/image-delayed.png.i
data/src/windows/classes/sun/awt/windows/WLabelPeer.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMHostInform.java.i
data/test/java/security/cert/PolicyNode/speech2speech.i
data/test/java/lang/management/MemoryMXBean/LowMemoryTestParallelGC.sh.i
data/test/java/io/Serializable/enum/badResolve/Write.java.i
-data/src/share/classes/javax/script/Invocable.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpUnknownMsgProcModelException.java.i
+data/src/share/classes/sun/io/CharToByteCp930.java.i
+data/src/share/classes/sun/reflect/SignatureIterator.java.i
data/src/solaris/hpi/src/memory_md.c.i
data/src/share/classes/java/security/interfaces/ECKey.java.i
-data/src/share/classes/javax/management/monitor/StringMonitor.java.i
-data/test/java/lang/Compare.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpInt.java.i
data/test/java/util/zip/ZipFile/Comment.java.i
+data/src/share/classes/sun/text/IntHashtable.java.i
data/src/solaris/lib/flavormap.properties.i
+data/src/macosx/classes/apple/launcher/appLauncherErrors.properties.i
data/src/share/classes/org/openjdk/jigsaw/Catalog.java.i
data/test/java/rmi/server/RMIClassLoader/noSecurityManager/Dummy.java.i
data/src/share/classes/sun/security/x509/SubjectInfoAccessExtension.java.i
-data/src/share/native/sun/security/ec/impl/ec2.h.i
+data/test/java/io/File/WinMaxPath.java.i
data/make/tools/src/build/tools/generatecharacter/GenerateCharacter.java.i
-data/src/share/classes/java/awt/event/ComponentEvent.java.i
+data/test/javax/management/MBeanInfo/MBeanInfoEqualsTest.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferFile.java.i
-data/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp.i
+data/make/sun/security/jgss/Makefile.i
data/test/com/sun/net/httpserver/docs/test1/largefile.txt.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0201.java.i
data/make/com/sun/jmx/snmp/Makefile.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.i
-data/src/share/classes/java/lang/management/MemoryPoolMXBean.java.i
+data/src/share/classes/javax/print/CancelablePrintJob.java.i
data/src/share/classes/java/security/UnresolvedPermissionCollection.java.i
-data/test/com/sun/security/sasl/digest/AuthRealms.java.i
-data/src/share/classes/java/dyn/AdapterMethodHandle.java.i
+data/test/sun/security/provider/PolicyParser/ExtDirsA/a.jar.i
+data/test/com/sun/tools/attach/badagent.mf.i
data/test/java/net/MulticastSocket/MulticastAddresses.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpDecryptedPdu.java.i
+data/test/java/security/Policy/Dynamic/setpolicy.jp.i
data/src/share/classes/java/beans/Visibility.java.i
-data/test/com/sun/jdi/sde/TemperatureTable.jsp.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTest.java.i
data/src/share/classes/sun/io/ByteToCharCp1026.java.i
data/make/modules/optional.depconfig.i
data/test/javax/management/MBeanServer/AttributeListMapTest.java.i
@@ -17448,64 +18168,64 @@ data/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java.i
data/test/java/io/Serializable/maskSyntheticModifier/Foo.class.i
data/src/share/classes/java/net/DatagramSocket.java.i
data/src/share/classes/java/sql/SQLWarning.java.i
-data/src/solaris/doc/sun/man/man1/ja/jhat.1.i
+data/src/share/native/sun/security/ec/impl/ecp.h.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/ActivatableImpl_Stub.java.i
data/test/sun/nio/cs/TestCp93xSISO.java.i
data/src/share/classes/java/awt/dnd/DragSourceDragEvent.java.i
data/src/share/classes/sun/tools/jar/resources/jar_es.properties.i
data/test/java/lang/management/ManagementFactory/MXBeanException.java.i
-data/src/share/classes/javax/swing/text/html/parser/Parser.java.i
+data/test/java/nio/channels/DatagramChannel/EmptyBuffer.java.i
data/src/solaris/classes/sun/java2d/xr/XRVolatileSurfaceManager.java.i
data/src/share/classes/java/awt/LayoutManager2.java.i
-data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties.i
+data/test/java/awt/Mixing/MixingInHwPanel.java.i
data/src/solaris/sample/dtrace/hotspot/monitors.d.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunity.java.i
data/test/java/net/URLEncoder/SurrogatePairs.java.i
data/src/share/classes/java/io/FileInputStream.java.i
-data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c.i
+data/src/share/classes/javax/swing/filechooser/FileFilter.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DGraphicsDevice.java.i
data/src/share/classes/java/util/InvalidPropertiesFormatException.java.i
data/src/share/classes/sun/jkernel/DigestOutputStream.java.i
-data/src/share/classes/com/sun/media/sound/AbstractMixer.java.i
+data/test/java/net/MulticastSocket/Leave.java.i
data/src/share/classes/javax/naming/InsufficientResourcesException.java.i
-data/src/share/classes/javax/swing/Icon.java.i
-data/src/share/classes/sun/tools/java/Environment.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/text/TextTests.java.i
+data/test/java/util/ResourceBundle/Test4314141B_en.properties.i
data/src/share/demo/nbproject/jfc/TableExample/nbproject/jdk.xml.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest10_ok.properties.in.i
-data/test/javax/management/MBeanServer/PreDeregisterDeadlockTest.java.i
-data/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp.i
+data/src/share/classes/java/awt/image/BufferedImage.java.i
+data/test/com/sun/crypto/provider/KeyAgreement/DHKeyFactory.java.i
data/test/java/util/PluggableLocale/DateFormatProviderTest.java.i
data/test/java/util/BitSet/BSMethods.java.i
-data/src/share/demo/applets/MoleculeViewer/XYZApp.java.i
+data/test/java/net/ServerSocket/AcceptCauseFileDescriptorLeak.java.i
data/test/java/util/zip/FileBuilder.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMask.java.i
-data/src/share/classes/javax/swing/border/EtchedBorder.java.i
+data/src/share/classes/javax/swing/text/AsyncBoxView.java.i
data/src/share/classes/com/sun/tracing/dtrace/package-info.java.i
-data/src/share/back/SDE.h.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/FrameworkClassFile.java.i
+data/src/share/native/sun/font/layout/LigatureSubstProc.cpp.i
data/test/java/util/ResourceBundle/Control/XMLResourceBundleTest.java.i
-data/src/solaris/bin/sparcv9/jvm.cfg.i
+data/src/share/classes/java/beans/XMLEncoder.java.i
data/test/java/awt/geom/Path2D/FillPPathTest.java.i
-data/make/tools/CharsetMapping/IBM970.c2b.i
-data/src/windows/native/sun/windows/awt_PrintDialog.cpp.i
-data/src/share/classes/javax/crypto/CryptoAllPermission.java.i
+data/src/share/native/java/util/zip/zip_util.c.i
+data/test/java/nio/channels/FileChannel/MapTest.java.i
data/src/share/classes/sun/io/CharToByteMS932DB.java.i
-data/src/share/classes/javax/naming/NamingException.java.i
-data/src/share/classes/java/awt/Adjustable.java.i
+data/src/share/classes/java/util/ListIterator.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedList.java.i
data/test/com/sun/nio/sctp/SctpChannel/Bind.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/AdobeMarkerSegment.java.i
data/src/share/npt/npt.c.i
-data/src/share/native/sun/font/layout/CanonShaping.h.i
-data/src/share/classes/javax/security/sasl/package.html.i
-data/test/javax/print/applet/applet4/Applet4PrintServiceLookup.java.i
-data/src/share/classes/java/util/zip/CRC32.java.i
+data/test/com/sun/jdi/PrivateTransportTest.sh.i
+data/test/java/util/Formatter/Basic.sh.i
+data/src/share/classes/sun/nio/cs/ext/GB18030.java.i
data/test/java/lang/management/CompositeData/OpenTypeConverter.java.i
data/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so.i
data/src/share/classes/sun/nio/cs/MS1253.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java.i
data/src/share/classes/javax/management/MalformedObjectNameException.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EngineEnforceUseClientMode.java.i
data/src/share/classes/sun/nio/cs/ext/GB18030.java.d
data/test/java/beans/Introspector/7064279/test.jar.i
-data/src/share/classes/com/sun/jmx/event/LeaseManager.java.i
+data/test/java/util/jar/JarFile/MevNPE.java.i
data/src/share/classes/sun/text/UCompactIntArray.java.i
data/test/sun/security/tools/policytool/Alias.html.i
data/src/share/native/java/lang/fdlibm/src/e_pow.c.i
@@ -17513,37 +18233,39 @@ data/src/solaris/classes/sun/nio/fs/UnixFileSystemProvider.java.i
data/src/solaris/doc/sun/man/man1/ja/pack200.1.i
data/src/share/classes/sun/applet/AppletEventMulticaster.java.i
data/test/java/util/ResourceBundle/Bug4168625Test.java.i
-data/src/share/classes/sun/font/FontScaler.java.i
-data/src/share/back/ClassObjectReferenceImpl.c.i
+data/test/javax/sound/midi/Gervill/SoftPointResampler/Interpolate.java.i
+data/test/java/lang/StrictMath/ExactArithTests.java.i
+data/src/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java.i
data/src/share/classes/sun/text/resources/CollationData_lt.java.i
-data/test/java/io/Serializable/class/SerialA_1.java.i
+data/src/share/classes/javax/swing/event/DocumentListener.java.i
data/src/share/classes/com/sun/net/ssl/HostnameVerifier.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/HasUIStyle.java.i
data/src/share/classes/sun/security/pkcs11/P11RSAKeyFactory.java.i
-data/src/share/classes/sun/security/x509/CertificateSerialNumber.java.i
-data/src/share/classes/sun/io/ByteToCharCp852.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh.i
+data/test/javax/script/Helper.java.i
data/src/share/classes/sun/nio/cs/ext/MS950_HKSCS.java.i
data/src/linux/doc/man/ja/jmap.1.i
-data/test/java/net/MulticastSocket/Test.java.i
+data/src/share/native/sun/awt/medialib/mlib_status.h.i
data/src/share/classes/sun/io/ByteToCharCp1046.java.i
-data/src/share/classes/org/openjdk/jigsaw/BaseContext.java.i
+data/src/share/classes/sun/tools/jstat/ExpressionExecuter.java.i
data/src/share/classes/javax/sql/rowset/serial/SerialClob.java.i
data/src/share/classes/com/sun/imageio/plugins/png/RowFilter.java.i
data/test/javax/swing/JFileChooser/6570445/bug6570445.java.i
data/src/share/native/java/lang/fdlibm/src/s_floor.c.i
data/test/java/nio/channels/FileChannel/ExpandingMap.java.i
data/src/windows/native/sun/windows/awt_AWTEvent.h.i
-data/src/share/classes/sun/jvmstat/monitor/remote/BufferedMonitoredVm.java.i
-data/test/java/util/ResourceBundle/Bug6204853.properties.i
-data/src/share/classes/sun/io/CharToByteMacRomania.java.i
+data/src/share/classes/sun/util/resources/CalendarData_iw.properties.i
+data/src/share/classes/sun/misc/JavaNetHttpCookieAccess.java.i
+data/src/share/classes/sun/rmi/server/Dispatcher.java.i
data/make/java/hpi/native/Makefile.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/HttpsPost.java.i
+data/src/macosx/classes/sun/lwawt/LWPanelPeer.java.i
data/src/windows/classes/sun/nio/fs/WindowsPath.java.i
data/src/share/instrument/InvocationAdapter.c.i
data/src/share/classes/java/nio/Direct-X-Buffer-bin.java.i
data/test/javax/swing/text/LayoutQueue/Test6588003.java.i
data/make/tools/swing-beans/beaninfo/images/JFormattedTextFieldColor16.gif.i
-data/src/share/classes/sun/management/resources/agent_it.properties.i
+data/test/java/nio/channels/AsynchronousChannelGroup/AsExecutor.java.i
data/src/share/classes/sun/net/ProgressMeteringPolicy.java.i
data/test/sun/tools/jinfo/Basic.sh.i
data/src/share/classes/sun/java2d/pipe/SpanClipRenderer.java.i
@@ -17551,532 +18273,552 @@ data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChan
data/test/com/sun/security/auth/login/ConfigFile/Override.java.i
data/src/windows/native/sun/windows/awt_TextField.cpp.i
data/test/sun/tools/native2ascii/A2N_4701617.i
-data/src/share/native/sun/font/layout/KhmerReordering.cpp.i
-data/test/sun/security/pkcs11/rsa/TestCACerts.java.i
+data/src/solaris/demo/jigsaw/basic/setup.sh.i
+data/src/share/classes/java/awt/peer/PanelPeer.java.i
data/test/javax/management/MustBeValidMBeanInfo/logging.properties.i
data/src/share/classes/sun/rmi/server/MarshalOutputStream.java.i
data/src/solaris/native/sun/java2d/loops/vis_IntArgb.c.i
-data/src/share/classes/sun/io/ByteToCharCp33722.java.i
+data/test/java/io/FilterOutputStream/BoundsCheck.java.i
data/test/sun/net/www/http/ChunkedInputStream/test.txt.i
data/make/netbeans/jdwpgen/nbproject/project.xml.i
+data/src/macosx/native/sun/awt/jawt.m.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/resources/metacity/SwingFallbackTheme/metacity-1/metacity-theme-1.xml.i
data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_it.properties.i
-data/src/share/classes/java/util/spi/LocaleNameProvider.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509CertificateResolver.java.i
data/test/java/awt/Window/PropertyChangeListenerLockSerialization/PropertyChangeListenerLockSerialization.java.i
data/test/java/io/Serializable/evolution/RenamePackage/test/SerialDriver.java.i
data/src/share/classes/java/nio/charset/Charset-X-Coder.java.template.i
data/test/sun/net/www/protocol/jar/jarbug/src/test/TestBug4523159.java.i
-data/src/share/demo/jvmti/hprof/hprof_ioname.h.i
+data/test/sun/net/www/http/ChunkedInputStream/test.txt.d
+data/src/macosx/native/jobjc/src/runtime-additions/native/NativeString.m.i
data/test/java/beans/XMLEncoder/Test6437265.java.i
data/make/netbeans/jdwpgen/nbproject/sqe.properties.i
data/src/share/classes/sun/awt/image/JPEGImageDecoder.java.i
data/test/sun/security/tools/jarsigner/JarSigning_RU.jar.i
-data/src/share/classes/javax/imageio/stream/FileCacheImageInputStream.java.i
+data/src/share/native/sun/font/layout/MorphStateTables.h.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-dsa.xml.i
data/src/share/classes/java/awt/font/StyledParagraph.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c.i
-data/test/java/util/zip/ZipFile/ClearStaleZipFileInputStreams.java.i
+data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java.i
+data/test/java/rmi/reliability/juicer/Apple.java.i
data/make/tools/CharsetMapping/IBM273.map.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/LargeBufs.java.i
-data/make/sun/javazic/tzdata/systemv.i
data/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java.i
-data/test/com/sun/jdi/NoLocInfoTest.java.i
+data/test/com/sun/jdi/connect/spi/GeneratedConnectors.java.i
data/src/share/sample/nio/multicast/Sender.java.i
data/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java.i
data/src/windows/classes/sun/awt/windows/WPrinterJob.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pkcs11_softtoken/objstore_info.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/AppInputStream/RemoveMarkReset.java.i
-data/src/solaris/classes/sun/awt/motif/MInputMethodDescriptor.java.i
+data/make/tools/CharsetMapping/IBM297.nr.i
+data/test/java/text/Collator/Bug5047314.java.i
data/src/share/classes/sun/security/krb5/internal/EncASRepPart.java.i
data/test/java/util/ResourceBundle/Bug4195978Test.java.i
+data/test/sun/tools/jstat/jstatLineCounts1.sh.i
data/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java.i
-data/test/java/math/BigDecimal/StrippingZerosTest.java.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html.i
-data/test/java/util/Collections/Enum.java.i
-data/src/share/classes/java/net/CookieStore.java.i
-data/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/UninitializedDisplayModeChangeTest.java.i
+data/test/javax/swing/border/Test4124729.java.i
+data/test/java/util/Locale/bug4123285.java.i
+data/src/share/classes/java/nio/channels/ScatteringByteChannel.java.i
+data/src/solaris/classes/sun/awt/motif/X11Selection.java.i
+data/test/com/sun/jndi/ldap/LdapUnicodeURL.java.i
+data/make/jpda/jdwp/jdwp.spec.i
data/test/java/lang/annotation/PackageMain.java.i
data/test/tools/jar/index/jarcontents/META-INF/services/A.i
-data/src/share/classes/sun/io/ByteToCharSJIS.java.i
+data/test/java/lang/instrument/PremainClass/InheritAgent0101.java.i
data/src/solaris/doc/sun/man/man1/serialver.1.i
data/src/share/classes/javax/swing/text/html/TableView.java.i
-data/src/share/native/sun/security/ec/ecl-exp.h.i
+data/src/share/classes/sun/tools/jconsole/OverviewTab.java.i
+data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml.i
+data/src/share/classes/java/rmi/server/ObjID.java.i
data/src/share/classes/sun/util/locale/ParseStatus.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/SignatureDSA.java.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java.i
data/test/javax/xml/crypto/dsig/data/signature-x509-ski.xml.i
+data/src/share/native/com/sun/media/sound/DirectAudioDevice.c.i
data/src/share/classes/sun/util/resources/LocaleNames_ja.properties.i
-data/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/PainterGenerator.java.i
data/test/sun/util/resources/Locale/Bug4429024.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthContext.java.i
+data/src/solaris/classes/sun/awt/motif/MDragSourceContextPeer.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthSplitPaneUI.java.i
-data/src/share/classes/com/sun/media/sound/JSSecurityManager.java.i
+data/test/sun/management/jmxremote/bootstrap/management_test02_ok.properties.in.i
data/src/share/classes/java/text/ParsePosition.java.i
-data/test/java/beans/PropertyEditor/Test4968709.java.i
+data/src/share/classes/com/sun/media/sound/DLSRegion.java.i
data/test/com/sun/tools/attach/BasicTests.java.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.java.i
-data/make/com/sun/org/Makefile.i
-data/src/solaris/doc/sun/man/man1/ja/jstatd.1.i
-data/make/jdk_generic_profile.sh.i
-data/src/share/classes/com/sun/rowset/providers/RIXMLProvider.java.i
-data/src/solaris/classes/sun/java2d/jules/JulesShapePipe.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java.i
+data/src/share/classes/javax/swing/ListCellRenderer.java.i
+data/make/java/main/java/Makefile.i
+data/test/java/lang/ThreadGroup/Suspend.java.i
data/src/share/classes/java/security/CodeSource.java.i
data/test/sun/security/pkcs11/fips/JSSEServer.java.i
data/test/java/rmi/server/Unmarshal/PrimitiveClasses.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java.i
-data/src/share/classes/sun/font/CMap.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_hr.properties.i
data/make/tools/swing-beans/beaninfo/images/JSpinnerColor16.gif.i
-data/src/share/classes/sun/misc/BASE64Encoder.java.i
+data/src/share/classes/sun/net/httpserver/ServerImpl.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.i
data/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java.i
-data/src/share/classes/javax/print/attribute/standard/DateTimeAtCreation.java.i
-data/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java.i
+data/src/solaris/native/sun/awt/awt_ScrollPane.c.i
data/test/sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh.i
-data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html.i
data/src/share/classes/java/util/logging/Logger.java.i
-data/src/share/classes/com/sun/java/browser/dom/DOMService.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-sparcv9/libnss3.so.d
data/src/share/classes/sun/text/resources/FormatData_sl_SI.java.i
data/test/java/lang/instrument/RedefineClassWithNativeMethodAgent.java.i
data/src/share/classes/java/nio/channels/SocketChannel.java.i
-data/src/share/classes/javax/swing/FocusManager.java.i
+data/test/java/beans/PropertyEditor/TestByteTypeJava.java.i
data/src/share/classes/sun/security/pkcs11/P11TlsKeyMaterialGenerator.java.i
+data/test/sun/nio/cs/EuroConverter.java.i
+data/test/java/lang/ref/ReferenceEnqueue.java.i
data/test/sun/tools/jrunscript/common.sh.i
data/test/sun/tools/jstat/gcCapacityOutput1.awk.i
data/src/share/classes/sun/io/ByteToCharCp871.java.i
-data/src/share/classes/com/sun/jmx/interceptor/DispatchInterceptor.java.i
+data/test/javax/management/eventService/ReconnectableConnectorTest.java.i
data/src/share/classes/javax/management/event/RMIPushServer.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames_de.java.i
+data/test/com/sun/jdi/TargetListener.java.i
data/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java.i
data/test/java/awt/image/IncorrectSampleMaskTest.java.i
data/make/modules/tools/src/com/sun/classanalyzer/ShowDeps.java.i
-data/src/solaris/classes/sun/awt/motif/MCheckboxPeer.java.i
+data/test/java/awt/Graphics2D/DrawString/RotTransText.java.i
data/test/javax/management/namespace/Wombat.java.i
data/src/share/classes/sun/security/provider/DSAKeyPairGenerator.java.i
data/test/java/io/Serializable/resolveClass/consTest/Test.java.i
data/test/sun/security/provider/PolicyParser/ExtDirs3.policy.i
data/test/java/rmi/activation/Activatable/nonExistentActivatable/security.policy.i
-data/src/share/classes/sun/util/resources/CurrencyNames_sr_ME.properties.i
+data/src/share/sample/jmx/jmx-scandir/src/etc/access.properties.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuUI.java.i
data/src/share/classes/sun/nio/ch/ExtendedSocketOption.java.i
data/test/java/util/Observable/ClearChanged.java.i
-data/src/solaris/doc/sun/man/man1/ja/jvisualvm.1.i
+data/test/javax/swing/text/WrappedPlainView/6857057/StubBranchElement.java.i
data/test/java/util/NavigableMap/LockStep.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c.i
-data/test/sun/rmi/rmic/manifestClassPath/Util.sh.i
+data/test/sun/util/calendar/Bug6653944.java.i
data/src/share/classes/java/io/ByteArrayInputStream.java.i
data/test/java/security/cert/CertPathBuilder/NoExtensions.java.i
data/test/java/util/ServiceLoader/basic.sh.i
-data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_pt_BR.properties.i
+data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain10.txt.i
data/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java.i
-data/src/share/classes/sun/rmi/transport/tcp/MultiplexInputStream.java.i
+data/test/java/net/URLClassLoader/B6896088.java.i
+data/src/share/classes/sun/io/ByteToCharCp277.java.i
data/src/share/classes/javax/sound/midi/SysexMessage.java.i
-data/make/tools/swing-beans/beaninfo/images/JScrollBarColor16.gif.i
-data/src/share/classes/com/sun/tools/jdi/SocketTransportService.java.i
+data/test/java/util/PluggableLocale/ProviderTest.java.i
+data/make/tools/CharsetMapping/IBM420.map.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalMonitoredVm.java.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libsoftokn3.so.i
-data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java.i
-data/src/share/classes/java/security/URIParameter.java.i
+data/test/sun/security/provider/KeyStore/CaseSensitiveAliases.java.i
+data/test/com/sun/jdi/UnloadEventTarg.java.i
+data/src/share/classes/com/sun/rowset/CachedRowSetImpl.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509IssuerSerial.java.i
-data/test/java/security/cert/CertPathValidatorException/GetMessage.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthArrowButton.java.i
-data/src/share/classes/javax/accessibility/AccessibleStreamable.java.i
-data/src/share/classes/javax/management/event/EventRelay.java.i
-data/src/share/classes/javax/management/remote/rmi/RMIConnection.java.i
+data/src/solaris/doc/sun/man/man1/ja/apt.1.i
+data/src/windows/native/sun/windows/awt_Frame.h.i
+data/src/share/classes/sun/tools/jstat/resources/jstat_options.i
+data/src/share/classes/java/io/ObjectInput.java.i
+data/test/javax/management/eventService/EventClientExecutorTest.java.i
+data/src/solaris/native/sun/awt/awt_Window.h.i
data/src/share/classes/sun/security/jgss/spi/GSSContextSpi.java.i
+data/src/share/classes/com/sun/jmx/namespace/package.html.i
data/src/share/native/java/util/zip/zlib-1.2.3/gzio.c.i
-data/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java.i
-data/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java.i
data/test/sun/net/www/httptest/HttpCallback.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalBorders.java.i
-data/src/share/classes/javax/accessibility/AccessibleRelationSet.java.i
-data/src/share/classes/sun/tools/tree/NewInstanceExpression.java.i
+data/test/sun/tools/jcmd/jcmd-f.sh.i
+data/test/java/text/Format/DateFormat/ISO8601ZoneTest.java.i
+data/src/share/classes/javax/accessibility/AccessibleRelationSet.java.i
+data/src/windows/classes/sun/java2d/windows/Win32OffScreenSurfaceData.java.i
data/src/share/classes/sun/awt/image/URLImageSource.java.i
-data/test/java/util/zip/ConstructDeflaterInput.java.i
-data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java.i
+data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableCollection.java.i
+data/test/java/net/InetSocketAddress/CreateUnresolved.java.i
data/src/share/native/sun/java2d/loops/IntBgr.h.i
data/test/java/awt/PrintJob/SaveDialogTitleTest.java.i
data/src/share/classes/java/security/KeyException.java.i
-data/src/solaris/classes/sun/nio/fs/UnixFileKey.java.i
+data/test/org/openjdk/jigsaw/pubrepo.sh.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/RadialGradient.java.i
-data/make/sun/security/action/Makefile.i
+data/test/java/awt/Cursor/PredefinedPrivate/PredefinedPrivate.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_LY.properties.i
data/test/java/nio/Buffer/BasicDouble.java.i
data/test/sun/java2d/cmm/ColorConvertOp/MTColConvTest.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java.i
+data/src/share/demo/applets/SortDemo/BubbleSortAlgorithm.java.i
data/test/java/lang/instrument/NativeMethodPrefixApp.java.i
-data/src/share/classes/javax/management/modelmbean/package.html.i
+data/src/share/classes/sun/io/ByteToCharCp1123.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpMessage.java.i
data/src/share/classes/javax/swing/colorchooser/package.html.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGBuffer.java.i
+data/src/macosx/native/sun/awt/AWTEvent.m.i
+data/test/javax/management/eventService/CustomForwarderTest.java.i
+data/src/share/classes/javax/naming/TimeLimitExceededException.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostServer.java.i
-data/src/share/classes/com/sun/jndi/ldap/Ber.java.i
+data/src/share/classes/sun/tools/jstack/JStack.java.i
data/src/solaris/classes/sun/nio/ch/InheritedChannel.java.i
data/test/java/io/BufferedInputStream/Fill.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd.i
data/test/sun/util/logging/PlatformLoggerTest.java.i
data/src/share/classes/sun/awt/HKSCS.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/pk1.key.i
-data/src/share/classes/com/sun/tools/jdi/JNITypeParser.java.i
-data/src/windows/native/sun/nio/ch/WindowsSelectorImpl.c.i
+data/src/share/classes/java/awt/Frame.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest13_ok.ssl.in.i
data/test/com/sun/jdi/ClassesByName.java.i
-data/test/sun/security/pkcs11/fips/certs/ca.cer.i
-data/src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h.i
+data/test/java/awt/image/ImagingOpsNoExceptionsTest/ImagingOpsNoExceptionsTest.java.i
+data/test/sun/security/mscapi/ShortRSAKeyWithinTLS.java.i
data/src/share/classes/java/sql/SQLNonTransientException.java.i
-data/test/java/text/Bidi/BidiConformance.java.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java.i
+data/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java.i
+data/make/netbeans/common/architectures/name-Bsd.properties.i
+data/src/share/classes/sun/java2d/pipe/BufferedTextPipe.java.i
data/test/java/beans/XMLEncoder/java_lang_reflect_Field.java.i
data/src/share/classes/javax/sound/midi/MetaMessage.java.i
-data/test/sun/awt/image/DrawByteBinary.java.i
-data/src/share/classes/java/sql/ClientInfoStatus.java.i
+data/test/tools/pack200/T7007157.java.i
+data/src/share/classes/sun/security/krb5/internal/Authenticator.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Des3.java.i
-data/test/java/beans/XMLEncoder/Test5023557.java.i
-data/make/tools/CharsetMapping/IBM1025.c2b.i
-data/test/javax/swing/JFileChooser/6688203/bug6688203.java.i
+data/src/solaris/classes/sun/awt/X11/XScrollbar.java.i
+data/src/share/classes/sun/rmi/server/Util.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningPatch.java.i
data/src/share/classes/com/sun/java/util/jar/pack/AdaptiveCoding.java.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/DOMValidateContext.java.i
+data/test/java/util/ResourceBundle/Control/PackagePrivateTest.java.i
data/test/sun/text/resources/Format/Bug4442855.java.i
data/test/sun/nio/cs/ReadZero.java.i
data/test/sun/security/tools/policytool/ChangeUI.java.i
data/src/share/classes/java/net/UnknownServiceException.java.i
data/src/share/classes/java/beans/beancontext/package.html.i
-data/src/share/native/sun/awt/image/cvutils/img_icm.h.i
+data/test/java/security/BasicPermission/Homogeneity.java.i
data/test/java/util/Currency/Bug6807534.java.i
data/test/java/lang/ClassLoader/package1/package3/Class3.java.i
data/src/share/classes/java/awt/event/TextEvent.java.i
-data/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c.i
+data/make/netbeans/jdwpgen/nbproject/project.properties.i
data/src/share/classes/java/lang/SecurityException.java.i
-data/src/share/modules/jdk.awt/module-info.java.i
+data/test/java/rmi/reliability/benchmark/bench/serial/Chars.java.i
data/src/share/classes/java/awt/font/FontRenderContext.java.i
data/src/share/classes/sun/nio/cs/ISO_8859_5.java.i
-data/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java.i
+data/make/java/main/java/mapfile-sparc.i
data/make/com/sun/security/auth/module/FILES_c_solaris.gmk.i
data/src/share/classes/java/util/logging/StreamHandler.java.i
-data/src/share/classes/java/lang/IllegalThreadStateException.java.i
data/src/share/classes/javax/security/auth/callback/Callback.java.i
data/make/tools/CharsetMapping/IBM284.nr.i
-data/src/share/demo/scripting/jconsole-plugin/src/scripts/hello.js.i
-data/test/javax/management/modelmbean/AddAttributeChangeNotificationListenerTest.java.i
+data/src/share/classes/javax/sound/sampled/spi/MixerProvider.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM964.java.i
data/src/solaris/native/sun/awt/awt_Plugin.c.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_ko.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/DevanagariTables.java.i
+data/src/windows/classes/sun/nio/fs/WindowsException.java.i
data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties.i
data/src/share/classes/javax/swing/BoxLayout.java.i
-data/make/sun/font/Makefile.i
-data/test/sun/security/tools/jarsigner/ec.sh.i
-data/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java.i
+data/test/java/dyn/InvokeGenericTest.java.i
+data/src/share/classes/javax/imageio/IIOParam.java.i
data/src/share/classes/sun/nio/cs/ext/ISO_8859_6.java.i
-data/src/share/native/java/lang/fdlibm/src/w_remainder.c.i
-data/src/share/classes/sun/java2d/StateTrackableDelegate.java.i
+data/test/java/lang/invoke/InvokeDynamicPrintArgs.java.i
+data/test/java/util/Locale/bug4123285.html.i
data/test/java/beans/XMLEncoder/6777487/TestCheckedMap.java.i
+data/make/common/shared/Defs-macosx.gmk.i
data/src/share/classes/javax/swing/undo/UndoManager.java.i
-data/make/java/jli/Makefile.i
+data/src/share/classes/sun/security/krb5/internal/HostAddress.java.i
data/src/solaris/classes/sun/java2d/xr/GrowableEltArray.java.i
data/test/java/io/File/createTempFile/Patterns.java.i
-data/test/java/util/logging/LoggingDeadlock4.java.i
+data/test/java/dyn/indify/Indify.java.i
data/src/share/demo/jvmti/minst/README.txt.i
-data/src/share/classes/java/awt/image/ImageConsumer.java.i
+data/src/share/classes/com/sun/tools/example/debug/gui/ClassManager.java.i
data/make/sun/net/FILES_java.gmk.i
data/src/share/classes/javax/management/InstanceNotFoundException.java.i
data/make/tools/CharsetMapping/IBM1146.c2b.i
-data/src/share/native/sun/java2d/opengl/OGLBufImgOps.c.i
+data/test/sun/java2d/cmm/ProfileOp/MTReadProfileTest.java.i
data/src/share/classes/sun/nio/cs/UTF_16.java.i
-data/test/java/util/ResourceBundle/Control/StressOut_ja_JP.properties.i
-data/test/java/net/Socket/TrafficClass.java.i
+data/src/share/classes/java/util/zip/ZipInputStream.java.i
+data/src/share/classes/java/beans/MetaData.java.i
data/test/java/rmi/reliability/benchmark/bench/ConfigFormatException.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java.i
data/src/share/demo/applets.html.i
+data/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java.i
data/src/share/classes/sun/launcher/resources/launcher_zh_CN.properties.i
-data/test/java/util/PluggableLocale/providersrc/java.util.spi.CurrencyNameProvider.i
+data/test/java/lang/instrument/NoTransformerAddedTest.java.i
data/src/share/classes/sun/text/resources/FormatData_hr.java.i
data/src/share/classes/java/lang/reflect/TypeVariable.java.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources_ja.properties.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMCommunities.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h.i
data/src/share/classes/java/util/jar/package.html.i
-data/src/share/classes/java/awt/geom/package.html.i
data/test/java/util/ResourceBundle/Bug4177489Test.java.i
-data/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/VerifyTreeSet.java.i
data/src/share/classes/sun/security/rsa/RSAPublicKeyImpl.java.i
data/test/sun/security/pkcs11/ec/ReadCertificates.java.i
data/test/javax/xml/crypto/dsig/data/certs/xmldsig.jks.i
+data/src/share/demo/jvmti/minst/sample.makefile.txt.i
data/src/windows/back/mutex_md.h.i
-data/src/windows/native/sun/windows/awt_PrintControl.h.i
+data/test/java/security/cert/CertificateFactory/SlowStream.java.i
data/src/share/classes/java/util/logging/package.html.i
data/make/tools/CharsetMapping/JIS_X_0201.map.i
-data/make/tools/src/build/tools/generatenimbus/SynthModel.java.i
+data/src/share/classes/javax/swing/plaf/TextUI.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_RS.properties.i
data/test/java/beans/PropertyEditor/TestEnumSubclassNull.java.i
-data/src/share/native/sun/java2d/loops/DrawParallelogram.c.i
+data/test/java/lang/Throwable/SuppressedExceptions.java.i
data/src/share/classes/sun/nio/cs/ext/ISO2022_JP.java.i
data/test/com/sun/tools/attach/Application.java.i
-data/src/share/classes/sun/rmi/transport/DGCAckHandler.java.i
+data/src/solaris/classes/sun/net/spi/SdpProvider.java.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethod.java.i
-data/src/share/native/sun/management/MemoryImpl.c.i
+data/src/share/classes/sun/swing/ImageIconUIResource.java.i
data/src/share/classes/java/util/Set.java.i
data/src/share/native/sun/awt/image/jpeg/jmemmgr.c.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/Canonicalizer.java.i
-data/test/javax/management/Introspector/ParameterNameTest.java.i
+data/test/java/rmi/activation/ActivationSystem/unregisterGroup/security.policy.i
data/src/share/classes/java/lang/Long.java.i
+data/src/share/classes/sun/text/resources/FormatData_ru_RU.java.i
data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear.c.i
data/src/share/classes/com/sun/jdi/ReferenceType.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmClassLoadingMeta.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/JavaxTrustManagerFactoryImpl.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/gzlib.c.i
-data/src/share/classes/sun/awt/image/BytePackedRaster.java.i
+data/src/share/classes/sun/management/HotspotClassLoading.java.i
data/src/share/native/sun/awt/medialib/j2d_names.h.i
-data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh.i
+data/src/share/classes/java/awt/dnd/DropTargetListener.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AppleImpl.java.i
data/src/share/classes/sun/java2d/pipe/BufferedMaskBlit.java.i
data/src/solaris/classes/sun/awt/motif/X11JIS0208.java.i
-data/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c.i
data/src/share/classes/com/sun/crypto/provider/DESedeCipher.java.i
-data/src/share/native/java/lang/fdlibm/src/e_cosh.c.i
+data/test/sun/security/ssl/sun/net/www/httpstest/ClosedChannelList.java.i
data/src/share/classes/javax/management/NotCompliantMBeanException.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XNodeInfo.java.i
data/src/solaris/demo/jni/Poller/Poller.java.i
-data/src/share/classes/sun/rmi/registry/resources/rmiregistry_de.properties.i
+data/src/share/classes/sun/tools/java/CompilerError.java.i
data/test/com/sun/security/sasl/gsskerb/log.properties.i
-data/test/java/nio/channels/SocketChannel/CloseAfterConnect.java.i
+data/test/java/awt/Mouse/ExtraMouseClick/ExtraMouseClick.java.i
data/src/share/demo/nbproject/management/VerboseGC/build.xml.i
-data/make/mkdemo/jvmti/mtrace/Makefile.i
+data/src/share/classes/java/beans/XMLDecoder.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/EchoTest.java.i
data/src/share/classes/java/text/CollationRules.java.i
-data/test/java/awt/Toolkit/HeadlessTray/HeadlessTray.java.i
data/src/share/classes/javax/management/InstanceOfQueryExp.java.i
data/src/share/classes/sun/io/CharToByteCp1145.java.i
-data/test/java/awt/im/InputContext/InputContextTest.java.i
-data/src/share/classes/java/lang/invoke/MutableCallSite.java.i
+data/test/javax/swing/JOptionPane/6464022/bug6464022.java.i
+data/src/share/native/sun/security/ec/impl/secoidt.h.i
data/src/share/classes/sun/io/ByteToCharUnicode.java.i
data/test/sun/tools/native2ascii/NativeErrors.java.i
-data/src/share/classes/java/lang/invoke/Invokers.java.i
+data/src/share/classes/javax/swing/JToolBar.java.i
data/src/share/classes/sun/swing/plaf/windows/ClassicSortArrowIcon.java.i
-data/src/share/classes/javax/management/event/FetchingEventForwarder.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleInfo.java.i
data/make/netbeans/common/architectures/README.i
data/src/share/classes/sun/management/MappedMXBeanType.java.i
+data/test/java/net/Socket/GetLocalAddress.java.i
data/src/share/classes/java/awt/ActiveEvent.java.i
-data/src/share/native/com/sun/java/util/jar/pack/unpack.cpp.i
+data/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java.i
data/src/share/native/java/lang/java_props.h.i
data/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/v2_0/TypeCode.java.i
-data/src/share/classes/java/io/ByteArrayOutputStream.java.i
+data/src/share/classes/javax/management/loading/MLetContent.java.i
data/src/share/classes/sun/tools/jconsole/inspector/ThreadDialog.java.i
-data/src/share/classes/javax/swing/plaf/RootPaneUI.java.i
+data/src/share/classes/sun/text/resources/FormatData_pt_BR.java.i
data/test/java/util/BitSet/MemoryLeak.java.i
-data/test/javax/swing/JFileChooser/6342301/bug6342301.java.i
-data/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java.i
+data/src/share/classes/sun/java2d/cmm/ProfileDeferralMgr.java.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaColor32.gif.i
-data/test/java/security/AccessControlContext/NullCombinerEquals.java.i
+data/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java.i
data/src/share/classes/sun/security/smartcardio/PCSCException.java.i
-data/src/share/classes/sun/util/resources/CalendarData_sq.properties.i
+data/src/share/classes/sun/launcher/resources/launcher_ja.properties.i
data/test/java/awt/print/PrinterJob/PrtException.java.i
data/src/share/classes/com/sun/media/sound/ModelSource.java.i
data/src/share/classes/javax/swing/text/html/MuxingAttributeSet.java.i
data/src/share/classes/java/awt/MouseInfo.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/jibxhelpers/ColorMapper.java.i
data/src/share/classes/sun/io/CharToByteCp1147.java.i
-data/make/java/redist/fonts/Makefile.i
+data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageDecoratedDnDNegative.html.i
data/src/share/classes/sun/text/resources/FormatData_nl_BE.java.i
data/test/com/sun/security/sasl/gsskerb/run-nosec-wjaas.csh.i
data/test/sun/misc/JarIndex/metaInfFilenames/jarB/b/B.java.i
-data/src/share/classes/com/sun/jmx/namespace/RoutingServerProxy.java.i
+data/src/share/classes/org/openjdk/jigsaw/cli/Librarian.java.i
data/test/sun/java2d/pisces/Renderer/TestNPE.java.i
data/test/sun/net/www/http/KeepAliveStream/KeepAliveStreamCloseWithWrongContentLength.java.i
-data/make/java/zip/reorder-sparc.i
+data/src/share/classes/org/relaxng/datatype/DatatypeException.java.i
+data/src/bsd/doc/man/ja/serialver.1.i
data/src/windows/classes/sun/java2d/d3d/D3DSurfaceData.java.i
data/src/share/classes/sun/rmi/transport/proxy/HttpOutputStream.java.i
-data/src/share/classes/org/openjdk/jigsaw/RemoteRepository.java.i
+data/src/macosx/classes/com/apple/laf/AquaToolBarSeparatorUI.java.i
+data/test/java/nio/Buffer/CopyDirectByteMemory.java.i
data/src/share/classes/java/nio/file/DirectoryIteratorException.java.i
data/src/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java.i
-data/test/java/nio/charset/coders/ResetISO2022JP.java.i
+data/src/share/classes/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java.i
data/test/java/awt/font/Rotate/Shear.java.i
data/src/share/classes/com/sun/beans/finder/PrimitiveWrapperMap.java.i
data/test/java/lang/Thread/UncaughtExceptions.sh.i
-data/src/share/classes/sun/net/httpserver/HttpExchangeImpl.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java.i
+data/src/windows/native/sun/windows/ShellFolder2.cpp.i
data/test/sun/nio/cs/SurrogateTestEUCTW.plane7.surrogates.i
data/src/share/classes/java/rmi/server/RemoteServer.java.i
-data/src/share/classes/javax/swing/WindowConstants.java.i
+data/src/share/classes/java/security/cert/CertPathValidator.java.i
data/test/java/awt/dnd/ImageDecoratedDnDInOut/ImageGenerator.java.i
data/test/com/sun/jdi/Unload1Targ.java.i
data/test/javax/management/Introspector/NotAnMBeanTest.java.i
data/src/share/native/sun/java2d/loops/UshortGray.c.i
-data/test/sun/management/jmxremote/bootstrap/rmiregistry.properties.i
-data/test/sun/tools/jps/jps-help.sh.i
-data/src/share/classes/java/awt/event/FocusAdapter.java.i
-data/src/share/native/sun/awt/image/dither.c.i
+data/make/common/shared/Defs.gmk.i
+data/src/share/classes/sun/text/normalizer/NormalizerBase.java.i
+data/src/share/classes/javax/swing/text/DefaultFormatter.java.i
data/test/java/net/Authenticator/B4722333.java.i
data/src/solaris/native/sun/awt/randr.h.i
data/src/share/native/java/lang/fdlibm/src/e_lgamma.c.i
-data/src/solaris/classes/sun/awt/X11/security-icon-yellow24.png.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/Application.java.i
+data/src/share/classes/javax/swing/ProgressMonitorInputStream.java.i
+data/make/sun/javazic/tzdata/systemv.i
data/make/tools/CharsetMapping/IBM500.c2b.i
-data/src/share/classes/sun/nio/cs/ext/MacCroatian.java.i
data/src/share/classes/sun/rmi/server/ActivationGroupImpl.java.i
-data/src/solaris/native/sun/java2d/loops/vis_FourByteAbgrPre.c.i
-data/src/solaris/classes/sun/font/FcFontConfiguration.java.i
-data/src/share/native/sun/awt/libpng/pnglibconf.h.i
-data/src/share/classes/sun/io/ByteToCharSingleByte.java.i
+data/test/javax/swing/JFileChooser/4847375/bug4847375.java.i
+data/test/java/util/concurrent/Exchanger/ExchangeLoops.java.i
+data/test/java/util/PriorityQueue/RemoveContains.java.i
+data/src/share/classes/sun/nio/ch/OptionKey.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java.i
-data/src/share/classes/sun/awt/image/ImagingLib.java.i
+data/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java.i
+data/test/sun/security/util/HostnameMatcher/cert2.crt.i
data/test/java/beans/PropertyEditor/TestEditor.java.i
data/src/share/classes/java/util/concurrent/Phaser.java.i
data/test/sun/rmi/rmic/classFileVersion/run.sh.i
+data/test/com/sun/jdi/UnpreparedByName.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libnspr4.so.i
data/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuningByteArray.java.i
-data/src/share/native/sun/font/layout/MorphTables.h.i
+data/test/java/io/Serializable/NoClassDefFoundErrorTrap/NoClassDefFoundErrorTrap.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c.i
data/test/sun/java2d/pipe/Test7027667.java.i
data/test/java/awt/Focus/RestoreFocusOnDisabledComponentTest/RestoreFocusOnDisabledComponentTest.java.i
data/src/share/classes/java/security/spec/package.html.i
data/test/org/openjdk/jigsaw/cli/expired-signer-prikey.pem.i
data/make/java/Makefile.i
-data/src/windows/npt/npt_md.h.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_sv.properties.i
data/test/java/util/ResourceBundle/bug6572242.properties.i
data/test/java/rmi/reliability/benchmark/bench/Util.java.i
data/test/java/util/Formatter/FailingConstructors.java.i
-data/src/share/classes/sun/tools/jar/CommandLine.java.i
data/test/javax/management/remote/mandatory/provider/provider/JMXConnectorServerProviderImpl.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c.i
-data/src/share/classes/sun/nio/cs/MS1254.java.i
+data/src/share/classes/javax/management/IntrospectionException.java.i
data/test/java/lang/StringBuffer/IndexOf.java.i
data/src/share/classes/sun/security/internal/interfaces/TlsMasterSecret.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/libnspr4.lib.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c.i
data/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c.i
-data/src/windows/native/sun/windows/awt_new.cpp.i
+data/src/share/classes/sun/tools/tree/ReturnStatement.java.i
data/src/windows/demo/jvmti/hprof/hprof_md.c.i
data/src/share/classes/sun/security/krb5/Checksum.java.i
data/src/share/classes/sun/security/provider/certpath/SunCertPathBuilderException.java.i
+data/src/share/demo/jvmti/hprof/hprof_b_spec.h.i
data/src/share/classes/com/sun/java/swing/plaf/motif/icons/Warn.gif.i
-data/src/share/classes/sun/security/pkcs11/JarVerifier.java.i
-data/src/share/classes/javax/management/event/NotificationManager.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_ca_ES.properties.i
+data/test/javax/security/auth/login/LoginContext/DefaultHandlerImpl.java.i
+data/src/windows/classes/sun/awt/windows/WClipboard.java.i
data/src/share/classes/sun/io/ByteToCharCp865.java.i
data/test/java/io/Serializable/resolveClass/MethodTest.java.i
data/test/java/beans/PropertyEditor/TestIntegerTypeValue.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/ObjArrayCalls.java.i
data/src/share/classes/java/beans/beancontext/BeanContextServiceProviderBeanInfo.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageMetadataFormatResources.java.i
-data/test/java/net/URLConnection/xml/not-xml1.i
+data/make/netbeans/world/nbproject/project.xml.i
data/src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java.i
data/src/share/classes/sun/nio/cs/ext/IBM838.java.i
data/src/share/classes/sun/util/logging/resources/logging_it.properties.i
-data/src/share/classes/java/nio/file/FileRef.java.i
+data/src/share/native/java/lang/fdlibm/src/w_lgamma_r.c.i
data/test/javax/sound/midi/Gervill/SoftChannel/Omni.java.i
-data/src/share/classes/javax/management/loading/MLetContent.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/DescriptorCache.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/inffixed.h.i
data/src/share/classes/javax/sql/ConnectionEventListener.java.i
data/src/share/classes/sun/util/resources/CalendarData_hu.properties.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/package.html.i
-data/make/jpda/expr/Makefile.i
+data/test/sun/java2d/SunGraphics2D/DrawImageBilinear.java.i
data/test/java/io/Serializable/resolveClass/deserializeButton/run.sh.i
-data/test/java/lang/Runtime/exec/WinCommand.java.i
-data/src/share/classes/sun/text/resources/FormatData_ga_IE.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java.i
+data/src/share/native/sun/java2d/pipe/ShapeSpanIterator.c.i
data/src/share/classes/java/security/spec/DSAPublicKeySpec.java.i
data/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java.i
data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/jdk.xml.i
data/src/windows/native/sun/java2d/d3d/D3DPaints.h.i
data/make/mkdemo/applets/Clock/Makefile.i
-data/src/share/classes/sun/util/resources/CalendarData_ja.properties.i
-data/src/share/classes/sun/security/provider/certpath/AdjacencyList.java.i
+data/test/java/util/zip/ZipFile/CopyJar.java.i
+data/test/javax/management/remote/mandatory/loading/DefaultProviderTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/implementations/ResolverFragment.java.i
data/src/share/classes/sun/java2d/cmm/lcms/META-INF/services/sun.java2d.cmm.PCMM.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_ECDH1_DERIVE_PARAMS.java.i
-data/test/java/awt/Mixing/MixingInHwPanel.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/DoubleBean.java.i
-data/make/mkdemo/applets/NervousText/Makefile.i
+data/test/java/util/concurrent/Semaphore/RacingReleases.java.i
+data/test/com/oracle/security/ucrypto/TestDigest.java.i
+data/src/share/classes/com/sun/media/sound/RIFFReader.java.i
data/src/share/classes/javax/xml/crypto/dsig/XMLSignatureException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509DataContent.java.i
data/test/java/lang/Float/ParseFloat.java.i
data/src/share/classes/javax/management/DescriptorRead.java.i
-data/src/solaris/native/com/sun/security/auth/module/Unix.c.i
+data/test/sun/rmi/rmic/extraCompilation/run.sh.i
data/test/com/sun/tools/attach/application.mf.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/ssl3.dll.i
data/test/javax/management/loading/LibraryLoader/jar_src/RandomGen.h.i
data/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationBroadcaster.java.i
-data/test/com/sun/servicetag/servicetag2.properties.i
+data/src/macosx/native/sun/awt/CPopupMenu.m.i
data/src/solaris/classes/sun/awt/X11/XAwtState.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMBase64Transform.java.i
+data/test/com/sun/crypto/provider/Mac/MacClone.java.i
data/make/sun/javazic/tzdata/solar89.i
data/test/java/awt/Graphics2D/MTGraphicsAccessTest/MTGraphicsAccessTest.java.i
+data/src/share/demo/jvmti/agent_util/README.txt.i
data/src/share/classes/javax/naming/directory/BasicAttributes.java.i
-data/src/windows/native/sun/jkernel/resource.h.i
-data/src/share/classes/sun/security/jgss/krb5/Krb5Util.java.i
+data/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java.i
data/test/java/lang/management/MemoryMXBean/MemoryUtil.java.i
data/src/share/classes/javax/naming/directory/AttributeInUseException.java.i
data/test/java/beans/XMLEncoder/Test6531597.java.i
data/test/java/io/Serializable/writeReplace/WriteReplace.java.i
-data/test/javax/imageio/plugins/png/MergeStdCommentTest.java.i
-data/test/java/lang/StrictMath/HyperbolicTests.java.i
+data/test/javax/swing/JFileChooser/6688203/bug6688203.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/ChannelPressure.java.i
+data/test/java/util/ResourceBundle/TestResource_it.java.i
data/test/com/sun/jdi/connect/spi/SimpleLaunchingConnector.java.i
data/test/java/awt/font/TextLayout/AttributeValuesCastTest.java.i
data/test/javax/swing/JColorChooser/Test6827032.java.i
-data/test/com/sun/awt/Translucency/TranslucentJAppletTest/TranslucentJAppletTest.java.i
-data/src/share/classes/sun/net/www/protocol/http/NegotiatorImpl.java.i
+data/src/share/classes/sun/security/krb5/internal/TGSRep.java.i
+data/src/share/native/sun/security/jgss/wrapper/gssapi.h.i
+data/src/macosx/classes/sun/awt/SunToolkitSubclass.java.i
data/src/share/classes/sun/nio/cs/ext/ISO2022_CN_CNS.java.i
data/src/share/classes/sun/reflect/misc/ConstructorUtil.java.i
-data/src/share/lib/images/cursors/win32_MoveNoDrop32x32.gif.i
+data/src/share/classes/javax/imageio/spi/PartiallyOrderedSet.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/NullCalls.java.i
data/src/share/classes/sun/text/resources/FormatData_el_GR.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadUnsignedShort.java.i
data/test/java/rmi/activation/ActivationSystem/unregisterGroup/rmid.security.policy.i
data/test/java/io/Serializable/oldTests/ArrayOpsTest.java.i
-data/test/java/lang/Character/CheckProp.java.i
+data/src/share/native/sun/font/layout/AlternateSubstSubtables.h.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader.i
-data/src/share/classes/com/sun/java/util/jar/pack/CodingMethod.java.i
-data/src/share/classes/sun/text/resources/FormatData_ca.java.i
-data/src/share/classes/com/sun/jmx/snmp/internal/SnmpModelLcd.java.i
+data/src/share/classes/java/sql/Date.java.i
+data/test/java/beans/Introspector/Test4634390.java.i
+data/src/share/classes/java/lang/annotation/AnnotationTypeMismatchException.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource3.java.i
data/make/tools/CharsetMapping/IBM1364.map.i
-data/test/java/util/Locale/Bug4184873_yi.i
+data/test/java/util/Vector/IllegalConstructorArgs.java.i
data/src/share/demo/jvmti/hprof/hprof_tracker.h.i
data/src/share/classes/com/sun/jdi/request/StepRequest.java.i
data/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemGCEntryImpl.java.i
data/src/share/demo/jvmti/hprof/hprof_error.h.i
-data/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp.i
-data/test/java/util/concurrent/ConcurrentQueues/RemovePollRace.java.i
+data/src/share/classes/sun/io/CharToByteCp949C.java.i
+data/test/java/beans/XMLEncoder/java_util_HashMap.java.i
data/test/java/util/zip/ZipCoding.java.i
data/test/com/sun/net/httpserver/Test5.java.i
data/make/tools/reorder/tests/Exit.java.i
-data/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in.i
-data/test/java/lang/ref/SoftReference/Bash.java.i
+data/make/common/shared/Defs-versions.gmk.i
+data/test/com/sun/jdi/UnpreparedClasses.java.i
data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadShort.java.i
data/test/java/net/DatagramPacket/Unresolved.java.i
data/src/share/classes/sun/io/CharToByteCp1124.java.i
-data/test/java/util/Locale/data/deflocale.sh.i
-data/src/share/classes/java/lang/annotation/Documented.java.i
+data/test/java/io/Serializable/unresolvedClassDesc/Foo.java.i
+data/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java.i
+data/src/share/back/log_messages.c.i
data/src/share/classes/com/sun/jndi/ldap/pool/PoolCallback.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java.i
data/test/java/io/StreamTokenizer/QuoteTest.java.i
data/src/share/classes/com/sun/jmx/remote/protocol/iiop/ClientProvider.java.i
data/test/com/sun/jdi/DoubleAgentTest.java.i
data/test/java/lang/ClassLoader/findSystemClass/Loader.java.i
-data/src/share/classes/javax/xml/crypto/dom/package.html.i
+data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.policy.i
data/test/java/lang/Math/IeeeRecommendedTests.java.i
-data/src/share/classes/sun/util/resources/CalendarData_et.properties.i
+data/test/java/lang/instrument/TransformMethodTest.java.i
data/test/java/util/ResourceBundle/Bug4396021SpecialMessages.java.i
-data/src/share/classes/java/io/StreamCorruptedException.java.i
+data/src/share/classes/sun/net/www/http/ChunkedInputStream.java.i
+data/src/solaris/classes/sun/awt/UNIXToolkit.java.i
data/src/solaris/classes/sun/awt/X11/XQueryTree.java.i
-data/src/share/classes/javax/swing/border/MatteBorder.java.i
-data/test/com/sun/security/sasl/Cram.java.i
+data/test/java/util/ServiceLoader/Basic.java.i
+data/src/macosx/native/com/apple/laf/JRSUIConstantSync.h.i
data/test/java/io/FileOutputStream/FileOpen.sh.i
data/make/tools/CharsetMapping/MS1257.map.i
data/src/share/classes/javax/management/openmbean/InvalidOpenTypeException.java.i
data/src/windows/native/sun/java2d/d3d/D3DPipeline.cpp.i
-data/src/share/back/ClassObjectReferenceImpl.h.i
-data/test/java/rmi/reliability/benchmark/bench/serial/DoubleArrays.java.i
+data/test/javax/management/Introspector/MBeanDescriptionTest.java.i
+data/src/share/demo/nio/zipfs/com/sun/nio/zipfs/ZipCoder.java.i
+data/test/javax/script/GetInterfaceTest.java.i
data/src/share/native/sun/security/ec/ecp_192.c.i
data/src/share/classes/sun/swing/plaf/synth/StyleAssociation.java.i
data/make/mkdemo/applets/BarChart/Makefile.i
-data/src/solaris/native/sun/awt/medialib/vis_32.il.i
+data/test/javax/sound/midi/Gervill/SoftProvider/GetDevice.java.i
data/test/java/lang/annotation/RecursiveAnnotation.java.i
-data/test/java/security/cert/CertPathValidator/nameConstraints/openssl.cnf.i
-data/src/share/classes/sun/util/resources/CalendarData_in_ID.properties.i
+data/src/macosx/classes/com/apple/laf/ImageCache.java.i
+data/test/sun/security/pkcs11/Secmod/TrustAnchors.java.i
+data/src/share/native/sun/awt/image/cvutils/img_input8.h.i
data/src/share/classes/sun/io/ByteToCharMacArabic.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java.i
data/test/javax/imageio/plugins/png/GrayPngTest.java.i
data/test/java/lang/instrument/Counter.java.i
data/src/share/demo/jfc/Font2DTest/README.txt.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetLoopLength.java.i
+data/src/macosx/classes/sun/lwawt/LWComponentPeer.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/sortUp.png.i
data/src/share/native/sun/security/ec/impl/mplogic.h.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/info.png.i
-data/make/modules/jdk.awt.ls.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/implementations/X509SKIResolver.java.i
data/src/share/classes/sun/nio/cs/ext/JIS_X_0208_MS932_Encoder.java.i
data/make/netbeans/world/build.properties.i
data/test/java/rmi/reliability/benchmark/bench/serial/Booleans.java.i
@@ -18084,89 +18826,96 @@ data/src/share/classes/java/lang/reflect/InvocationTargetException.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/SignerOutputStream.java.i
data/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted_Stub.java.i
data/src/share/classes/com/sun/tools/jdi/VoidTypeImpl.java.i
-data/test/java/io/StreamTokenizer/ReadAhead.java.i
-data/test/sun/nio/cs/OLD/X11KSC5601_OLD.java.i
+data/test/sun/nio/cs/TestIBMBugs.java.i
+data/test/sun/management/HotspotClassLoadingMBean/GetMethodDataSize.java.i
data/test/java/lang/management/ThreadMXBean/ThreadInfoArray.java.i
-data/make/sun/font/mapfile-vers.openjdk.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Test.java.i
data/src/share/classes/sun/net/www/protocol/gopher/GopherClient.java.i
data/test/java/util/Locale/data/deflocale.winxp.i
-data/test/com/sun/security/auth/callback/DialogCallbackHandler/Default.java.i
+data/test/javax/sound/midi/Gervill/DLSSoundbankReader/TestGetSoundbankUrl.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java.i
data/test/sun/nio/cs/OLD/IBM949C_OLD.java.i
-data/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java.i
-data/test/java/beans/PropertyChangeSupport/TestMethods.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java.i
-data/test/com/sun/crypto/provider/Cipher/RSA/TestOAEPWithParams.java.i
+data/test/sun/security/pkcs11/MessageDigest/ReinitDigest.java.i
+data/test/java/io/Serializable/backRefCNFException/Write.java.i
+data/test/sun/tools/jcmd/jcmd-help.sh.i
+data/src/share/classes/sun/security/pkcs10/PKCS10Attributes.java.i
data/src/windows/native/sun/windows/awt_Canvas.h.i
data/test/javax/management/remote/mandatory/subjectDelegation/SimpleStandardMBean.java.i
data/src/share/classes/java/nio/file/attribute/FileAttribute.java.i
data/src/share/classes/javax/swing/ToolTipManager.java.i
data/src/solaris/native/sun/awt/medialib/vis_64.il.i
+data/src/macosx/native/sun/awt/CInputMethod.m.i
+data/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java.i
data/src/share/classes/java/awt/Dimension.java.i
-data/src/share/classes/java/awt/peer/FileDialogPeer.java.i
+data/test/java/lang/management/ThreadMXBean/ThreadBlockedCount.java.i
data/src/share/classes/sun/print/OpenBook.java.i
data/test/java/io/Serializable/oldTests/PrimitivesTest.java.i
data/test/java/io/BufferedReader/ReadLine.java.i
data/test/javax/sound/midi/Gervill/ModelDestination/SetIdentifier.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/JavaxURLNulls.java.i
-data/src/share/native/sun/awt/image/BufImgSurfaceData.h.i
+data/src/solaris/classes/sun/nio/ch/SctpSendFailed.java.i
data/src/share/bin/splashscreen_stubs.c.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Error.gif.i
-data/test/javax/management/MBeanServer/OldMBeanServerTest.java.i
+data/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java.i
+data/src/share/native/java/lang/reflect/Proxy.c.i
data/src/solaris/classes/sun/awt/X11/XEmbeddingContainer.java.i
-data/src/share/classes/sun/rmi/server/ActivationGroupInit.java.i
+data/test/java/rmi/transport/checkFQDN/CheckFQDN.java.i
data/src/share/classes/sun/awt/Symbol.java.i
data/src/share/classes/java/security/spec/ECFieldFp.java.i
data/test/java/io/Serializable/readPastObject/ReadPastObject.java.i
data/test/java/security/cert/CertPathValidator/nameConstraints/NameConstraintsWithRID.java.i
-data/make/tools/CharsetMapping/IBM943.map.i
+data/src/share/classes/javax/swing/JMenuItem.java.i
data/src/share/classes/sun/tools/jstat/Alignment.java.i
data/src/windows/classes/sun/awt/windows/WButtonPeer.java.i
data/src/share/classes/sun/util/resources/CalendarData_ms_MY.properties.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/rmi/RemoteVmManager.java.i
-data/test/java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java.i
-data/test/com/sun/crypto/provider/TLS/TestPRF12.java.i
+data/test/sun/net/www/http/HttpClient/ProxyFromCache.java.i
+data/test/sun/security/mscapi/SignUsingNONEwithRSA.java.i
data/src/share/classes/java/awt/dnd/DropTargetEvent.java.i
-data/src/share/classes/javax/management/relation/RelationServiceMBean.java.i
data/test/java/nio/MappedByteBuffer/Basic.java.i
-data/test/sun/security/pkcs11/Provider/Login.sh.i
+data/src/share/classes/javax/swing/plaf/metal/sounds/MenuItemCommand.wav.i
data/src/share/classes/sun/text/resources/FormatData_fr_FR.java.i
data/src/windows/classes/java/net/TwoStacksPlainDatagramSocketImpl.java.i
-data/src/share/classes/javax/swing/undo/doc-files/UndoManager-3.gif.i
-data/test/sun/tools/jstat/classOutput1.awk.i
+data/test/java/net/URLEncoder/URLEncoderEncodeArgs.java.i
+data/test/java/util/Collections/AsLifoQueue.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXSLTTransform.java.i
data/src/solaris/native/java/net/net_util_md.h.i
data/src/windows/native/sun/windows/awt_List.h.i
-data/src/share/classes/sun/security/jgss/krb5/WrapToken.java.i
+data/test/javax/management/mxbean/OperationImpactTest.java.i
data/test/java/util/concurrent/ConcurrentMap/ConcurrentModification.java.i
-data/src/share/classes/javax/swing/plaf/nimbus/NimbusIcon.java.i
-data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Close.java.i
+data/test/java/io/Serializable/6966692/Victim.java.i
+data/test/java/util/logging/LoggerWeakRefLeak.java.i
+data/src/macosx/classes/com/apple/laf/AquaButtonBorder.java.i
data/src/share/classes/java/awt/image/RasterOp.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java.i
+data/src/macosx/classes/sun/lwawt/LWListPeer.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h.i
-data/src/share/classes/java/awt/doc-files/Scrollbar-2.gif.i
+data/test/java/lang/instrument/NamedBuffer.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent1000.java.i
-data/test/sun/net/util/IPAddressUtilTest.java.i
-data/src/share/classes/com/sun/imageio/spi/FileImageOutputStreamSpi.java.i
+data/src/share/classes/java/awt/Composite.java.i
+data/src/share/classes/javax/naming/LinkLoopException.java.i
+data/test/java/lang/String/Split.java.i
data/src/solaris/classes/sun/awt/motif/MDialogPeer.java.i
-data/src/share/classes/javax/security/auth/RefreshFailedException.java.i
+data/src/share/classes/java/rmi/server/RMIClientSocketFactory.java.i
+data/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java.i
data/test/java/security/Signature/TestInitSignWithMyOwnRandom.java.i
data/src/linux/doc/man/idlj.1.i
data/test/sun/java2d/pipe/hw/RSLAPITest/RSLAPITest.java.i
-data/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java.i
+data/src/share/classes/javax/management/relation/RelationServiceMBean.java.i
data/src/share/classes/javax/swing/event/CaretEvent.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c.i
-data/src/share/native/sun/awt/image/jpeg/jcmarker.c.i
+data/src/windows/native/sun/java2d/d3d/D3DShaders.h.i
data/test/com/sun/tools/attach/CommonSetup.sh.i
data/test/com/sun/nio/sctp/SctpMultiChannel/Send.java.i
data/test/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java.i
data/test/java/lang/management/ThreadMXBean/ThreadStateTest.java.i
data/test/java/io/Serializable/class/NonSerialA_2.java.i
-data/src/share/classes/java/awt/color/ICC_ProfileRGB.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ScheduledTickleService.java.i
data/src/solaris/native/sun/awt/awt_Insets.c.i
data/src/share/native/sun/font/layout/GlyphLookupTables.h.i
+data/src/share/classes/sun/io/ByteToCharCp948.java.i
data/src/share/classes/sun/text/resources/FormatData_th.java.i
data/src/share/classes/com/sun/jdi/event/VMDisconnectEvent.java.i
-data/src/linux/doc/man/ja/jstack.1.i
+data/src/share/classes/sun/io/ByteToCharEUC2.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java.i
data/src/share/native/java/util/zip/ZipEntry.c.i
data/test/sun/security/pkcs11/KeyStore/BasicData/random.cert.i
@@ -18175,141 +18924,141 @@ data/test/com/sun/security/sasl/digest/AuthNoUtf8.java.i
data/test/java/io/OutputStreamWriter/BoundsCheck.java.i
data/src/share/classes/sun/tools/jar/SignatureFile.java.i
data/src/share/classes/java/util/ResourceBundle.java.i
-data/test/java/awt/Graphics2D/DrawString/EmptyAttrString.java.i
+data/test/java/math/BigDecimal/ZeroScalingTests.java.i
data/test/java/net/URLConnection/B5052093.java.i
data/test/com/sun/jdi/ImmutableResourceTest.java.i
data/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html.i
data/src/share/classes/javax/accessibility/AccessibleSelection.java.i
-data/src/share/classes/com/sun/beans/decoder/FloatElementHandler.java.i
+data/test/java/lang/Double/ToHexString.java.i
data/src/share/classes/sun/io/CharToByteEUC_JP_LINUX.java.i
data/src/share/native/sun/awt/image/cvutils/img_globals.c.i
data/make/sun/splashscreen/Makefile.i
-data/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java.i
+data/src/share/classes/sun/tools/jconsole/inspector/OperationEntry.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c.i
-data/test/java/io/Serializable/ClassCastExceptionDetail/Read.java.i
+data/src/share/classes/sun/management/manifest.i
data/test/sun/security/tools/jarsigner/onlymanifest.sh.i
data/src/share/classes/javax/management/event/RMIPushEventRelay.java.i
data/src/solaris/classes/sun/awt/X11/XPanelPeer.java.i
data/src/share/classes/javax/management/relation/MBeanServerNotificationFilter.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CloseKeepAliveCached.java.i
-data/src/share/classes/javax/swing/text/Document.java.i
-data/src/share/classes/sun/tools/jstat/ColumnFormat.java.i
+data/src/share/classes/sun/tools/java/Scanner.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/Node.java.i
data/make/sun/headless/mapfile-vers.i
-data/src/share/classes/sun/security/rsa/RSAKeyPairGenerator.java.i
+data/src/share/classes/sun/java2d/pipe/ValidatePipe.java.i
+data/test/com/sun/security/sasl/digest/Privacy.java.i
data/src/share/classes/sun/io/ByteToCharCp862.java.i
data/test/java/util/concurrent/LinkedBlockingQueue/ToArray.java.i
-data/src/share/classes/sun/net/www/protocol/http/HttpAuthenticator.java.i
-data/test/java/beans/VetoableChangeSupport/TestEquals.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/UnloadInstruments.java.i
+data/test/sun/security/pkcs11/KeyStore/ClientAuthData/server.keystore.i
data/make/tools/CharsetMapping/IBM1046.map.i
data/src/share/classes/sun/io/CharToByteCp1148.java.i
data/src/share/classes/java/awt/event/WindowEvent.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_3.java.i
-data/src/share/classes/javax/swing/text/html/parser/DocumentParser.java.i
+data/src/share/classes/sun/rmi/registry/RegistryImpl.java.i
data/test/java/io/File/GetXSpace.sh.i
data/test/sun/rmi/rmic/covariantReturns/G2.java.i
data/test/java/awt/Menu/OpensWithNoGrab/OpensWithNoGrab.java.i
data/src/share/demo/jfc/SampleTree/resources/images/collapsed.gif.i
-data/src/share/classes/java/awt/dnd/DropTargetAdapter.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolver.java.i
+data/src/share/classes/sun/security/krb5/Credentials.java.i
+data/test/java/util/ResourceBundle/Test4314141A__DE.properties.i
data/src/share/classes/sun/management/counter/perf/StringCounterSnapshot.java.i
data/src/share/classes/sun/nio/ch/MembershipRegistry.java.i
-data/src/share/classes/java/awt/image/RasterFormatException.java.i
+data/src/windows/native/sun/windows/awt_MMStub.h.i
data/make/modules/tools/nbproject/project.xml.i
data/src/share/classes/sun/text/resources/FormatData_mk.java.i
data/src/share/classes/sun/tools/java/ClassDefinition.java.i
data/test/com/sun/net/httpserver/bugs/B6341616.java.i
data/src/share/classes/com/sun/beans/finder/Signature.java.i
-data/test/javax/print/LookupServices.java.i
-data/test/sun/security/krb5/auto/SSL.java.i
-data/src/share/classes/java/awt/doc-files/DesktopProperties.html.i
-data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.html.i
-data/src/share/classes/sun/swing/AccessibleMethod.java.i
+data/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/RemoveInstrument.java.i
+data/src/share/classes/sun/text/resources/FormatData_nl.java.i
+data/test/java/util/Locale/bug4122700.java.i
+data/test/com/sun/jdi/sde/MangleStepTest.java.i
data/make/com/sun/xml/Makefile.i
data/src/share/classes/java/util/prefs/PreferenceChangeEvent.java.i
data/src/share/classes/javax/print/attribute/standard/PrinterStateReason.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/classes/JObjCClassClassFile.java.i
data/test/javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java.i
-data/src/share/classes/sun/awt/HeadlessToolkit.java.i
-data/src/share/native/sun/management/MemoryPoolImpl.c.i
-data/test/java/io/Serializable/oldTests/AnnotateClass.java.i
+data/src/share/native/sun/security/ec/ec.c.i
+data/src/share/classes/java/rmi/activation/Activator.java.i
data/src/share/classes/java/dyn/VolatileCallSite.java.i
-data/make/tools/src/build/tools/automulti/TestALFGenerator.java.i
data/test/javax/management/remote/mandatory/socketFactories/RMIClientFactory.java.i
data/src/solaris/classes/sun/awt/X11/XClipboard.java.i
-data/src/windows/native/sun/windows/awt_Label.cpp.i
+data/src/macosx/classes/apple/laf/JRSUIControl.java.i
+data/test/java/nio/file/Files/PassThroughFileSystem.java.i
data/src/share/classes/org/openjdk/jigsaw/cli/package-info.java.i
-data/test/com/sun/jdi/VMDeathRequestTest.java.i
-data/test/java/io/Serializable/evolution/RenamePackage/extension/ExtendedObjectInputStream.java.i
-data/src/share/demo/nbproject/management/MemoryMonitor/nbproject/netbeans-targets.xml.i
+data/src/windows/native/sun/windows/awt_Scrollbar.cpp.i
+data/src/share/native/sun/awt/libpng/pngtest.c.i
data/src/share/classes/sun/management/snmp/jvminstr/package.html.i
data/src/share/classes/sun/util/resources/TimeZoneNames_hi.java.i
data/src/windows/classes/sun/java2d/windows/DDRenderer.java.i
-data/src/share/classes/javax/management/namespace/VirtualEventManager.java.i
+data/test/java/beans/Introspector/Test5102804.java.i
data/test/sun/nio/cs/TestISCII91.java.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/PangoFonts.java.i
+data/src/share/classes/sun/reflect/UnsafeStaticShortFieldAccessorImpl.java.i
data/src/share/classes/org/openjdk/jigsaw/SignedModule.java.i
data/test/java/lang/instrument/RetransformBigClassAgent.java.i
-data/src/share/classes/java/text/spi/DateFormatSymbolsProvider.java.i
+data/src/windows/native/common/locale_str.h.i
data/src/share/classes/org/openjdk/jigsaw/KernelLoader.java.i
-data/src/windows/classes/sun/nio/fs/WindowsWatchService.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_en_IE.properties.i
data/test/java/nio/file/Path/UriImportExport.java.i
data/src/share/classes/sun/awt/AWTPermissionFactory.java.i
data/make/ASSEMBLY_EXCEPTION.i
data/test/java/net/URLClassLoader/sealing/a/p/A.java.i
data/test/java/io/Serializable/class/Test.java.i
data/test/java/lang/reflect/Module/ModuleAnnotationTest.java.i
-data/src/solaris/classes/java/net/PlainSocketImpl.java.i
data/src/share/classes/java/beans/EventSetDescriptor.java.i
data/test/java/util/concurrent/ConcurrentHashMap/toArray.java.i
data/test/javax/swing/GroupLayout/7071166/bug7071166.java.i
-data/src/share/classes/javax/sql/RowSetMetaData.java.i
+data/src/solaris/native/sun/java2d/x11/X11SurfaceData.h.i
data/test/com/sun/servicetag/ValidRegistrationData.java.i
-data/src/solaris/classes/sun/nio/fs/UnixException.java.i
+data/test/com/sun/management/OperatingSystemMXBean/GetTotalSwapSpaceSize.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/ActivateMe.java.i
data/src/solaris/classes/sun/awt/X11/GtkFileDialogPeer.java.i
data/test/sun/security/ssl/javax/net/ssl/FixingJavadocs/SSLSocketInherit.java.i
data/test/sun/net/idn/NFS4StringPrep.java.i
data/src/share/classes/java/lang/UnsupportedOperationException.java.i
-data/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStoreHelper.java.i
+data/test/org/openjdk/jigsaw/cli/tsa-prikey.pem.i
data/src/share/native/sun/security/ec/impl/ecc_impl.h.i
data/src/share/classes/javax/swing/filechooser/package.html.i
data/src/share/classes/javax/swing/text/html/OptionListModel.java.i
data/test/java/io/Serializable/unresolvedClassDesc/Write.java.i
data/test/sun/rmi/rmic/classFileVersion/G1Impl.java.i
data/test/java/lang/invoke/6987555/Test6987555.java.i
+data/src/macosx/classes/java/util/prefs/MacOSXPreferences.java.i
data/src/windows/classes/sun/java2d/d3d/D3DMaskFill.java.i
data/test/java/security/Security/SecurityPropFile/SecurityPropFile.policy.i
data/test/java/util/ResourceBundle/Bug4396021.java.i
-data/src/share/classes/javax/management/DescriptorAccess.java.i
+data/make/tools/CharsetMapping/MS936.map.d
data/test/java/security/Provider/CaseSensitiveServices.java.i
-data/src/share/classes/sun/security/jgss/ProviderList.java.i
-data/src/share/classes/java/lang/IllegalMonitorStateException.java.i
-data/src/windows/native/sun/windows/awt_Event.cpp.i
+data/test/java/beans/PropertyEditor/TestLongClassJava.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/README.i
+data/src/windows/classes/sun/nio/ch/SctpChannelImpl.java.i
+data/make/sun/lwawt/Makefile.i
data/test/tools/pack200/CommandLineTests.java.i
-data/src/share/classes/sun/security/x509/PrivateKeyUsageExtension.java.i
+data/src/share/classes/sun/text/resources/FormatData_ko.java.i
data/test/tools/pack200/AttributeTests.java.i
data/src/windows/native/sun/windows/awt_TrayIcon.h.i
-data/src/share/classes/com/sun/tools/jdi/NonConcreteMethodImpl.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/ProxyArrayCalls.java.i
data/src/share/classes/java/dyn/InvokeDynamic.java.i
-data/src/share/classes/javax/sound/sampled/Line.java.i
+data/make/tools/CharsetMapping/MacGreek.map.i
data/src/share/classes/sun/misc/ExtensionInstallationProvider.java.i
data/src/share/classes/sun/security/tools/policytool/PolicyTool.java.i
-data/src/windows/classes/sun/security/mscapi/RSAKeyPairGenerator.java.i
+data/test/java/security/SecureRandom/GetAlgorithm.java.i
data/test/java/lang/reflect/Generics/StringsAndBounds.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/package.html.i
data/src/share/back/ThreadGroupReferenceImpl.c.i
data/src/share/classes/sun/tools/tree/CodeContext.java.i
-data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java.i
+data/src/share/classes/java/nio/channels/SeekableByteChannel.java.i
data/src/share/sample/nio/server/Dispatcher1.java.i
data/src/share/classes/sun/net/www/protocol/http/NegotiateAuthentication.java.i
data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiOut.c.i
data/src/share/classes/javax/management/openmbean/OpenMBeanInfo.java.i
-data/src/share/classes/javax/security/auth/login/CredentialNotFoundException.java.i
+data/test/java/net/URLConnection/Connect.java.i
data/src/share/classes/javax/sound/sampled/package.html.i
-data/test/java/nio/channels/FileChannel/ReadToLimit.java.i
+data/test/javax/swing/JLayer/6872503/bug6872503.java.i
data/test/java/net/URL/runconstructor.sh.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipDirectoryStream.java.i
data/test/java/awt/PrintJob/PageSetupDlgBlockingTest/PageSetupDlgBlockingTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_en_PH.java.i
-data/make/tools/src/build/tools/stripproperties/StripProperties.java.i
data/src/solaris/classes/sun/java2d/x11/X11VolatileSurfaceManager.java.i
data/test/java/beans/XMLDecoder/spec/TestMethod.java.i
data/src/share/classes/java/awt/peer/TextComponentPeer.java.i
@@ -18317,18 +19066,19 @@ data/src/share/classes/sun/net/SocksProxy.java.i
data/src/share/classes/sun/security/util/PropertyExpander.java.i
data/test/java/awt/dnd/ImageDecoratedDnDNegative/ImageGenerator.java.i
data/src/share/classes/sun/font/ScriptRun.java.i
-data/src/share/classes/java/rmi/Remote.java.i
+data/src/share/classes/sun/management/snmp/jvminstr/JvmRTInputArgsEntryImpl.java.i
data/test/javax/crypto/SecretKeyFactory/Provider2.java.i
-data/test/java/awt/PrintJob/EdgeTest/EdgeTest.java.i
+data/test/sun/security/provider/certpath/DisabledAlgorithms/generate.sh.i
data/src/share/classes/javax/swing/Autoscroller.java.i
-data/src/share/classes/javax/management/NotificationFilterSupport.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpRequestTree.java.i
data/test/java/security/Provider/ChangeProviders.java.i
-data/src/windows/native/sun/java2d/d3d/D3DGraphicsDevice.cpp.i
-data/src/share/classes/java/awt/RenderingHints.java.i
+data/test/javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java.i
+data/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java.i
+data/src/share/bin/version_comp.c.i
data/src/share/native/sun/awt/image/cvutils/img_fsutil.h.i
data/test/com/sun/jdi/ClassLoaderTarg.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java.i
-data/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java.i
+data/src/solaris/classes/sun/awt/X11/XGlobalCursorManager.java.i
data/test/sun/tools/jhat/HatRun.java.i
data/src/share/classes/javax/swing/undo/doc-files/UndoManager-2.gif.i
data/src/share/classes/sun/util/resources/LocaleNames_da.properties.i
@@ -18337,46 +19087,44 @@ data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_CommonUtil
data/src/share/back/ThreadReferenceImpl.c.i
data/test/java/io/File/ToURI.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/NewModelByteBufferByteArrayIntInt.java.i
+data/make/tools/src/build/tools/generatenimbus/SynthModel.java.i
data/src/share/classes/sun/security/ssl/BaseSSLSocketImpl.java.i
-data/src/share/bin/parse_manifest.c.i
-data/test/java/beans/XMLEncoder/Test6256805.java.i
+data/test/sun/security/pkcs11/KeyGenerator/TestKeyGenerator.java.i
+data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java.i
data/src/share/classes/java/security/Principal.java.i
-data/test/javax/swing/JLabel/6501991/bug6501991.java.i
+data/test/javax/swing/plaf/metal/MetalSliderUI/Test6657026.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmRTClassPathEntryImpl.java.i
-data/test/sun/security/validator/CertReplace.java.i
data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest10_ok.password.in.i
-data/src/share/classes/java/awt/peer/MenuItemPeer.java.i
-data/test/sun/nio/cs/StreamEncoderClose.java.i
+data/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/types/TypeCache.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM930.java.i
data/test/javax/security/sasl/Sasl/PassSysProps.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/XMLSignatureException.java.i
data/src/share/classes/sun/rmi/rmic/RMIGenerator.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/Main.java.i
data/src/share/lib/cmm/lcms/sRGB.pf.i
+data/src/bsd/doc/man/rmid.1.i
data/src/linux/doc/man/ja/jstatd.1.i
data/make/sun/javazic/tzdata/australasia.i
data/test/sun/net/InetAddress/nameservice/chaining/Simple1NameServiceDescriptor.java.i
data/test/javax/security/auth/x500/X500Principal/KeywordMap.java.i
-data/src/share/classes/sun/tools/tree/BitOrExpression.java.i
data/src/share/classes/sun/security/util/SignatureFileVerifier.java.i
data/src/share/classes/sun/text/resources/CollationData_ru.java.i
-data/test/javax/swing/JTable/6777378/bug6777378.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/X509ExtendedTMEnabled.java.i
-data/src/share/classes/java/awt/PopupMenu.java.i
-data/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c.i
-data/src/share/classes/java/rmi/server/ServerNotActiveException.java.i
-data/src/share/classes/com/sun/media/sound/DLSInfo.java.i
+data/test/sun/net/www/protocol/http/ProxyTunnelServer.java.i
+data/src/windows/native/sun/windows/awt_dlls.h.i
+data/src/share/classes/javax/management/remote/rmi/RMIServerImpl.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/LoadInstrument.java.i
data/src/share/demo/java2d/J2DBench/build.xml.i
-data/test/java/lang/annotation/Missing/MissingTest.java.i
-data/test/java/rmi/testlibrary/README.jcov.i
data/src/share/classes/java/nio/channels/AsynchronousDatagramChannel.java.i
data/src/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java.i
data/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh.i
data/test/sun/nio/cs/OLD/IBM942_OLD.java.i
-data/test/java/nio/channels/FileChannel/Read.java.i
+data/test/java/util/zip/FlaterTest.java.i
data/src/share/demo/nbproject/jfc/SampleTree/build.xml.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java.i
-data/src/share/classes/javax/net/ssl/SSLSessionBindingEvent.java.i
-data/test/java/io/Serializable/maskSyntheticModifier/Foo.java.i
+data/src/share/classes/java/awt/image/DataBufferByte.java.i
+data/test/java/nio/channels/SocketChannel/ConnectState.java.i
data/src/share/classes/com/sun/tracing/dtrace/ModuleName.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/NamedObject.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c.i
@@ -18385,89 +19133,93 @@ data/test/javax/swing/JColorChooser/Test6977726.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiPanelUI.java.i
data/test/java/math/BigDecimal/SerializationTests.java.i
data/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties.i
-data/src/share/classes/javax/swing/event/MenuListener.java.i
+data/test/java/lang/management/ThreadMXBean/ThreadCpuTime.java.i
data/src/share/javavm/include/sys_api.h.i
-data/src/share/classes/java/security/AlgorithmParametersSpi.java.i
+data/src/share/classes/javax/security/sasl/package.html.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/PerfStringMonitor.java.i
-data/src/share/classes/javax/sql/rowset/RowSetFactory.java.i
+data/src/share/classes/sun/reflect/generics/tree/BottomSignature.java.i
data/test/com/sun/jdi/GetLocalVariables4Test.sh.i
data/src/share/classes/sun/io/CharToByteCp1383.java.i
data/test/java/nio/MappedByteBuffer/Force.java.i
-data/test/java/rmi/Naming/legalRegistryNames/Legal.java.i
-data/src/share/demo/jfc/Notepad/resources/new.gif.i
+data/test/sun/nio/cs/TestStringCoding.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/ConstructorsNullTest/ConstructorsNullTest.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java.i
data/src/solaris/classes/sun/net/NetHooks.java.i
data/src/share/classes/javax/naming/ldap/SortResponseControl.java.i
-data/src/share/classes/sun/net/NetworkServer.java.i
+data/src/share/classes/java/io/BufferedOutputStream.java.i
+data/src/share/classes/sun/management/counter/perf/PerfDataType.java.i
data/test/sun/security/pkcs11/KeyStore/ClientAuth.sh.i
data/test/java/util/prefs/SerializeExceptions.java.i
-data/make/tools/swing-beans/beaninfo/images/AbstractButtonColor16.gif.i
+data/test/java/io/InputStreamReader/One.java.i
data/make/com/sun/sql/FILES_java.gmk.i
data/src/share/classes/com/sun/media/sound/SoftShortMessage.java.i
data/test/java/util/Locale/ThaiGov.java.i
+data/src/share/classes/com/sun/media/sound/AiffFileFormat.java.i
data/test/javax/management/loading/SystemClassLoaderTest.java.i
-data/test/com/sun/nio/sctp/SctpChannel/Connect.java.i
-data/test/java/io/charStreams/RandomLines.java.i
+data/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java.i
+data/test/java/awt/FontClass/CreateFont/DeleteFont.sh.i
data/test/sun/security/ssl/javax/net/ssl/GetInstance.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_iw_IL.properties.i
+data/src/share/classes/sun/io/ByteToCharCp1098.java.i
+data/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java.i
data/src/share/classes/com/sun/jdi/ClassNotLoadedException.java.i
data/test/sun/security/ssl/etc/keystore.i
data/src/share/demo/nbproject/jfc/TableExample/nbproject/file-targets.xml.i
data/test/sun/net/www/ParseUtil_6380332.java.i
data/test/javax/swing/JColorChooser/Test4887836.html.i
-data/src/solaris/classes/sun/awt/X11/XCustomCursor.java.i
-data/make/modules/jdk.depconfig.i
+data/test/sun/security/provider/PolicyFile/TrustedCert.keystore.i
data/test/java/io/PrintWriter/ClearErrorWriter.java.i
data/test/java/beans/XMLEncoder/java_util_Collections_CheckedSet.java.i
-data/test/com/sun/crypto/provider/Cipher/PBE/DecryptWithoutParameters.java.i
+data/test/sun/net/idn/nfscss.spp.i
data/src/windows/classes/sun/java2d/d3d/D3DGraphicsConfig.java.i
data/test/java/io/Serializable/6966692/README.i
data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/config/ScanManagerConfig.java.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/security.policy.i
+data/test/java/util/zip/ZipFile/crash.jar.i
data/test/java/io/BufferedInputStream/ReadZeroBytes.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metalworks.html.i
+data/test/java/util/Arrays/Sorting.java.i
data/src/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java.i
-data/src/share/classes/javax/sound/midi/Transmitter.java.i
+data/src/macosx/native/jobjc/src/core/native/NSClass.m.i
+data/src/share/classes/javax/naming/ldap/ExtendedRequest.java.i
+data/src/solaris/native/sun/awt/awt_Label.c.i
data/src/share/demo/jfc/TableExample/README.txt.i
data/test/java/nio/channels/DatagramChannel/NetworkConfiguration.java.i
-data/src/share/classes/sun/tools/tree/Context.java.i
-data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h.i
+data/test/java/nio/channels/Selector/TemporarySelector.java.i
+data/src/share/classes/sun/font/FileFontStrike.java.i
data/test/javax/swing/JPopupMenu/6690791/bug6690791.java.i
data/src/share/native/sun/java2d/cmm/lcms/lcms2_plugin.h.i
-data/make/common/Rules-SCCS.gmk.i
-data/src/share/classes/com/sun/crypto/provider/JarVerifier.java.i
-data/test/com/sun/java/swing/plaf/windows/Test6824600.java.i
-data/src/share/classes/javax/print/attribute/DocAttribute.java.i
+data/src/solaris/classes/sun/nio/ch/PollSelectorImpl.java.i
+data/src/share/classes/javax/sound/midi/Soundbank.java.i
+data/test/java/util/concurrent/ThreadPoolExecutor/ModifyCorePoolSize.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadLong.java.i
data/src/windows/classes/sun/awt/windows/WWindowPeer.java.i
-data/test/com/sun/net/httpserver/bugs/6725892/Test.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_Solaris_Encoder.java.i
data/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c.i
data/src/solaris/classes/sun/awt/X11/XScrollbarPeer.java.i
data/src/share/classes/java/net/ProtocolFamily.java.i
data/test/java/net/DatagramSocket/BindFailTest.java.i
data/src/share/classes/sun/util/logging/resources/logging_ko.properties.i
-data/src/share/classes/java/util/jar/JarOutputStream.java.i
-data/make/tools/swing-beans/beaninfo/images/JRootPaneColor16.gif.i
+data/test/javax/naming/spi/DirectoryManager/DummyContext.java.i
+data/src/share/classes/sun/security/provider/VerificationProvider.java.i
data/test/sun/security/util/DerInputBuffer/TimeParsing.java.i
data/src/windows/native/sun/windows/awt_Color.h.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIDefault.java.i
+data/src/share/classes/sun/tools/jconsole/VMInternalFrame.java.i
data/test/java/net/URLConnection/xml/not-xml2.i
data/test/org/openjdk/jigsaw/_RemoteRepository.java.i
data/src/share/classes/javax/crypto/interfaces/DHPublicKey.java.i
-data/test/java/io/CharArrayReader/Constructor.java.i
-data/src/share/classes/javax/print/StreamPrintServiceFactory.java.i
+data/src/share/demo/applets/DrawTest/example1.html.i
+data/test/java/lang/instrument/TransformerManagementThreadAddTests.java.i
data/src/share/classes/sun/reflect/ConstructorAccessorImpl.java.i
data/test/java/awt/print/PrinterJob/ImagePrinting/ImageTypes.java.i
data/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java.i
-data/src/share/classes/javax/management/Query.java.i
-data/src/share/native/java/util/zip/zlib-1.2.5/patches/ChangeLog_java.i
+data/src/share/lib/security/java.policy.i
+data/src/share/classes/sun/security/jgss/krb5/Krb5MechFactory.java.i
data/src/share/classes/sun/io/CharToByteCp1252.java.i
data/src/share/classes/sun/util/resources/LocaleNames_sv.properties.i
-data/src/share/classes/javax/print/attribute/standard/JobMessageFromOperator.java.i
+data/test/java/lang/Character/CheckProp.java.i
data/src/share/sample/nio/chatserver/Client.java.i
data/test/java/awt/Component/F10TopToplevel/F10TopToplevel.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/iconify-pressed.gif.i
-data/src/share/classes/java/lang/invoke/MethodHandleStatics.java.i
+data/src/share/classes/com/sun/jdi/AbsentInformationException.java.i
data/src/share/classes/sun/java2d/pisces/TransformingPathConsumer2D.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiMenuBarUI.java.i
data/src/share/back/VirtualMachineImpl.h.i
@@ -18476,49 +19228,53 @@ data/src/share/lib/images/cursors/motif_MoveNoDrop32x32.gif.i
data/test/sun/security/tools/policytool/UpdatePermissions.sh.i
data/src/share/native/sun/font/layout/ThaiStateTables.cpp.i
data/make/sun/javazic/tzdata/africa.i
-data/test/java/awt/Focus/NonFocusableResizableTooSmall/NonFocusableResizableTooSmall.java.i
+data/src/share/native/java/util/zip/zlib-1.2.5/trees.h.i
data/test/java/io/StringReader/ClosedReady.java.i
data/src/share/classes/java/applet/Applet.java.i
data/src/share/classes/javax/sound/sampled/spi/AudioFileReader.java.i
-data/test/java/beans/XMLEncoder/java_lang_reflect_Method.java.i
-data/src/share/classes/java/lang/StringBuffer.java.i
+data/test/java/beans/Introspector/Test6963811.java.i
+data/src/share/classes/javax/net/ssl/SSLException.java.i
data/src/share/native/java/lang/fdlibm/src/s_ldexp.c.i
data/src/share/classes/javax/smartcardio/ResponseAPDU.java.i
data/test/java/net/URLClassLoader/GetURLsTest.java.i
data/test/java/nio/channels/AsynchronousChannelGroup/Attack.java.i
-data/src/solaris/classes/com/sun/management/OSMBeanFactory.java.i
-data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif.i
+data/src/share/classes/sun/nio/cs/UTF_32LE.java.i
+data/src/solaris/native/sun/security/pkcs11/j2secmod_md.h.i
data/src/share/classes/java/sql/Blob.java.i
data/src/share/classes/javax/crypto/interfaces/PBEKey.java.i
-data/test/sun/tools/jstat/jstatLineCounts1.sh.i
+data/src/share/native/java/lang/fdlibm/src/w_j1.c.i
data/test/javax/management/openmbean/IsValueTest.java.i
-data/src/share/classes/com/sun/jmx/remote/util/ClassLoaderWithRepository.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/etsi.xsd.i
+data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/rmid.security.policy.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_f.c.i
data/src/share/native/sun/java2d/opengl/OGLBufImgOps.h.i
data/test/sun/security/provider/PolicyParser/p003.policy.i
-data/test/javax/management/eventService/CustomForwarderTest.java.i
-data/test/java/io/Serializable/oldTests/WritePrimitive.java.i
+data/test/java/awt/event/MouseEvent/RobotLWTest/RobotLWTest.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM420.java.i
data/src/share/classes/java/awt/doc-files/GridBagLayout-2.gif.i
-data/test/java/net/ipv6tests/UdpTest.java.i
+data/src/share/classes/javax/sound/midi/SoundbankResource.java.i
+data/src/share/classes/com/sun/java/util/jar/pack/Package.java.i
data/make/tools/swing-beans/beaninfo/images/JSeparatorColor16.gif.i
data/test/java/io/OutputStreamWriter/NullCreate.java.i
data/src/share/native/sun/rmi/server/MarshalInputStream.c.i
data/test/sun/security/tools/jarsigner/oldsig/A.class.i
-data/src/share/back/eventFilter.c.i
+data/src/share/classes/sun/security/krb5/internal/crypto/dk/AesDkCrypto.java.i
data/make/tools/src/build/tools/javazic/Checksum.java.i
data/test/sun/security/pkcs11/ec/TestECGenSpec.java.i
-data/src/share/classes/java/security/GuardedObject.java.i
+data/test/javax/management/MBeanServer/AttributeListTypeSafeTest.java.i
data/test/com/sun/awt/Translucency/WindowOpacity.java.i
data/src/share/classes/sun/security/ec/SunEC.java.i
-data/src/share/demo/jvmti/heapViewer/heapViewer.c.i
+data/test/javax/management/MBeanServer/NewMBeanListenerTest.java.i
data/test/sun/net/InetAddress/nameservice/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
data/test/sun/nio/cs/X11CNS11643P3.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java.i
-data/test/sun/management/jmxremote/bootstrap/management_ssltest13_ko.properties.in.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java.i
+data/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java.i
+data/src/bsd/doc/man/ja/tnameserv.1.i
+data/src/share/demo/jvmti/hprof/hprof_cpu.h.i
+data/src/share/classes/sun/util/resources/CurrencyNames_nl_NL.properties.i
+data/src/windows/native/sun/java2d/d3d/D3DRenderer.h.i
data/src/share/classes/java/util/SortedSet.java.i
+data/src/solaris/classes/sun/nio/ch/sctp/Shutdown.java.i
data/test/javax/sound/midi/Gervill/ModelSource/NewModelSource.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapSchemaCtx.java.i
+data/src/share/classes/sun/util/logging/resources/logging_de.properties.i
data/src/share/classes/java/sql/SQLTimeoutException.java.i
data/src/share/classes/sun/security/action/GetIntegerAction.java.i
data/src/share/classes/java/net/HttpCookie.java.i
@@ -18526,11 +19282,11 @@ data/make/tools/src/build/tools/jdwpgen/RepeatNode.java.i
data/src/share/classes/com/sun/awt/AWTUtilities.java.i
data/make/tools/src/build/tools/charsetmapping/CharsetMapping.java.i
data/src/share/classes/sun/invoke/util/BytecodeDescriptor.java.i
-data/src/share/demo/nbproject/project.xml.i
+data/src/share/native/java/util/zip/zlib-1.1.3/inffast.h.i
+data/src/macosx/native/com/apple/laf/AquaLookAndFeel.m.i
data/test/javax/swing/JLayer/6994419/bug6994419.java.i
data/src/share/native/sun/misc/Version.c.i
data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.html.i
-data/src/share/classes/sun/text/resources/FormatData_es_CL.java.i
data/test/java/util/PluggableLocale/providersrc/DecimalFormatSymbolsProviderImpl.java.i
data/test/javax/print/applet/applet1/Applet1PrintService.java.i
data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/GetChannels.java.i
@@ -18538,36 +19294,37 @@ data/src/share/classes/javax/swing/plaf/nimbus/InnerShadowEffect.java.i
data/make/sun/javazic/tzdata_jdk/jdk11_backward.i
data/src/share/classes/sun/rmi/server/LoaderHandler.java.i
data/test/javax/management/monitor/InstantiateMonitorNotificationTest.java.i
-data/make/tools/CharsetMapping/EUC_CN.map.i
-data/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties.i
-data/src/share/classes/sun/util/resources/LocaleNamesBundle.java.i
+data/test/java/util/WeakHashMap/ZeroInitCap.java.i
+data/src/windows/classes/sun/awt/windows/WSystemTrayPeer.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java.i
data/src/share/classes/com/sun/tools/jdi/LongTypeImpl.java.i
-data/test/sun/security/provider/certpath/DisabledAlgorithms/CPValidatorEndEntity.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddResource.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c.i
data/test/sun/security/util/asn1StringTypes/StringTypes.java.i
data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod_Stub.java.i
+data/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java.i
data/src/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java.i
data/make/tools/src/build/tools/jdwpgen/NameNode.java.i
data/test/java/util/zip/ZipInputStream/Skip.java.i
-data/test/java/security/PrivilegedActionException/PrintWrappedException.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp.i
data/src/share/classes/javax/naming/directory/InitialDirContext.java.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain4.txt.i
data/src/share/classes/javax/naming/NamingEnumeration.java.i
-data/src/share/classes/sun/rmi/transport/Channel.java.i
+data/test/com/sun/net/httpserver/bugs/B6744329.java.i
data/src/share/classes/javax/naming/spi/ContinuationContext.java.i
-data/src/share/classes/sun/text/resources/CollationData_is.java.i
-data/src/share/classes/javax/swing/CellRendererPane.java.i
+data/src/solaris/classes/sun/awt/X11/XMenuWindow.java.i
+data/test/sun/security/rsa/TestSignatures.java.i
data/src/solaris/classes/sun/java2d/x11/X11Renderer.java.i
data/src/share/classes/java/awt/print/Printable.java.i
data/test/javax/management/openmbean/EqualsTest.java.i
data/src/share/classes/javax/swing/event/package.html.i
data/src/share/classes/sun/security/pkcs11/P11SecretKeyFactory.java.i
-data/make/tools/CharsetMapping/IBM1145.c2b.i
+data/src/share/classes/sun/nio/cs/ext/IBM871.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageCreate.h.i
-data/src/share/classes/javax/swing/JToolBar.java.i
-data/src/share/classes/sun/font/FontUtilities.java.i
+data/make/netbeans/common/jtreg-view.ent.i
+data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.java.i
data/src/share/classes/java/util/AbstractCollection.java.i
-data/src/share/classes/sun/security/x509/CertificateAlgorithmId.java.i
+data/test/java/awt/xembed/server/RunTestXEmbed.java.i
data/test/java/text/Collator/Bug6970930.java.i
data/src/share/classes/com/sun/jdi/event/EventSet.java.i
data/src/share/classes/java/awt/dnd/peer/package.html.i
@@ -18577,25 +19334,27 @@ data/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java.i
data/make/tools/src/build/tools/generatenimbus/Shape.java.i
data/src/share/classes/javax/net/ssl/X509KeyManager.java.i
data/src/share/classes/java/nio/file/spi/FileSystemProvider.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_lt_LT.properties.i
+data/test/sun/security/provider/PolicyParser/ExtDirs1.policy.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/ResourceResolverException.java.i
data/make/tools/swing-beans/beaninfo/images/JTextAreaMono16.gif.i
data/test/java/io/Serializable/writeObjectMemory/WriteObjectMemory.java.i
-data/src/share/classes/javax/print/event/PrintEvent.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/EmptyExtensionData.java.i
data/test/java/util/WeakHashMap/GCDuringIteration.java.i
data/src/share/classes/sun/awt/image/ImageFormatException.java.i
data/src/solaris/native/sun/xawt/awt_Desktop.c.i
+data/test/javax/print/applet/YesNo.java.i
data/src/solaris/sample/dtrace/hotspot/method_invocation_tree.d.i
+data/src/share/native/java/lang/fdlibm/src/e_exp.c.i
data/test/java/util/prefs/ConflictInFlush.java.i
-data/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java.i
-data/src/share/classes/java/nio/file/attribute/FileAttributeView.java.i
-data/test/java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java.i
+data/src/bsd/doc/man/ja/javac.1.i
+data/src/share/classes/sun/misc/JavaUtilJarAccess.java.i
+data/make/javax/crypto/policy/unlimited/default_US_export.policy.i
+data/test/java/net/SocketPermission/ActionSpace.java.i
data/test/java/io/Serializable/proxy/skipMissing/Read.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/zlib.h.i
data/test/java/awt/geom/CubicCurve2D/SolveCubicTest.java.i
data/make/sun/awt/Depend.mak.i
-data/src/share/classes/java/rmi/server/RemoteCall.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetAvailableInstruments2.java.i
data/src/share/demo/jvmti/hprof/hprof_site.c.i
data/src/share/classes/java/lang/instrument/ClassFileTransformer.java.i
data/test/javax/sound/midi/Gervill/AudioFloatFormatConverter/SkipTest.java.i
@@ -18607,287 +19366,295 @@ data/src/share/sample/nio/server/RequestServicer.java.i
data/src/share/demo/jvmti/hprof/hprof_init.c.i
data/src/share/demo/nbproject/jfc/Notepad/build.properties.i
data/test/com/sun/security/auth/login/ConfigFile/InconsistentError.config.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14N.java.i
+data/src/share/classes/com/sun/media/sound/RealTimeSequencer.java.i
data/test/java/io/Serializable/GetField/Read2.java.i
data/src/share/classes/javax/smartcardio/TerminalFactorySpi.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XPlotter.java.i
data/make/mksample/nbproject/Makefile.i
-data/src/share/classes/java/beans/ExceptionListener.java.i
-data/src/share/demo/applets/MoleculeViewer/models/HyaluronicAcid.xyz.i
+data/src/share/classes/javax/accessibility/AccessibleResourceBundle.java.i
+data/src/share/classes/com/sun/tools/hat/MANIFEST.mf.i
data/test/javax/management/remote/mandatory/serverError/JMXServerErrorTest.java.i
data/src/share/classes/java/awt/peer/MouseInfoPeer.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c.i
-data/src/share/classes/com/sun/nio/sctp/Notification.java.i
-data/src/share/classes/javax/swing/event/PopupMenuListener.java.i
-data/src/share/classes/java/lang/reflect/UndeclaredThrowableException.java.i
+data/src/share/classes/com/sun/crypto/provider/TlsMasterSecretGenerator.java.i
+data/test/java/util/Vector/LastIndexOf.java.i
+data/src/share/classes/sun/io/ByteToCharEUC_JP_Solaris.java.i
+data/src/solaris/native/sun/awt/awt_util.c.i
data/test/java/net/DatagramSocket/TestAfterClose.java.i
-data/test/com/sun/jdi/PopSynchronousTest.java.i
-data/src/solaris/classes/sun/nio/ch/Port.java.i
-data/src/share/classes/javax/management/event/EventReceiver.java.i
+data/test/javax/management/query/CustomQueryTest.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CCursorManager.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/Set8BitExtensionBuffer.java.i
+data/src/macosx/native/jobjc/src/tests/java/com/apple/jobjc/BenchIDPop.java.i
+data/make/modules/BuildPackages.gmk.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java.i
data/test/sun/security/pkcs11/Secmod/key3.db.i
data/test/java/io/PushbackInputStream/ClosedStream.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventNotifier.java.i
+data/test/sun/tools/jcmd/dcmd-script.txt.i
data/src/share/classes/javax/imageio/ImageTranscoder.java.i
-data/test/com/sun/security/auth/CreateLdapPrincipals.java.i
-data/src/share/classes/sun/dyn/Access.java.i
+data/test/java/awt/FullScreen/SetFSWindow/FSFrame.java.i
+data/src/share/classes/sun/text/resources/FormatData_fi_FI.java.i
data/test/com/sun/jdi/sde/TemperatureTableTest.java.i
data/test/java/nio/Buffer/BasicLong.java.i
-data/test/com/sun/jdi/connect/spi/NullTransportService.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/README.update.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsPopupMenuSeparatorUI.java.i
+data/src/share/classes/com/sun/jdi/InconsistentDebugInfoException.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/ConnectionsRef.java.i
data/test/javax/swing/border/Test7034614.java.i
data/src/share/classes/com/sun/beans/decoder/BooleanElementHandler.java.i
-data/src/share/classes/javax/imageio/ImageWriteParam.java.i
+data/src/solaris/native/sun/java2d/loops/vis_ByteGray_FromRgb.c.i
data/src/share/classes/sun/text/resources/FormatData_ru.java.i
data/src/share/classes/javax/swing/text/html/ImageView.java.i
data/test/com/sun/jdi/FramesTest.java.i
-data/make/mkdemo/management/MemoryMonitor/Makefile.i
+data/test/java/security/cert/CertificateFactory/ReturnStream.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributes.java.i
data/src/share/classes/com/sun/security/auth/PrincipalComparator.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/DynamicMBean2.java.i
data/src/share/classes/com/sun/management/GarbageCollectorMXBean.java.i
data/src/share/classes/sun/nio/cs/ext/DBCS_IBM_ASCII_Decoder.java.i
-data/src/share/classes/javax/swing/undo/CompoundEdit.java.i
+data/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in.i
data/test/com/sun/crypto/provider/Cipher/PBE/PBEInvalidParamsTest.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/GetResponseCode.java.i
-data/src/share/classes/javax/naming/event/NamespaceChangeListener.java.i
+data/src/share/classes/javax/print/attribute/Attribute.java.i
data/src/share/classes/java/util/jar/JarVerifier.java.i
data/test/java/lang/instrument/RedefineBigClassAgent.java.i
-data/test/java/util/PluggableLocale/BreakIteratorProviderTest.sh.i
+data/src/share/classes/sun/security/x509/CertificatePolicySet.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/nssutil3.lib.i
data/test/java/io/Serializable/oldTests/CheckForException.java.i
data/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java.i
-data/src/share/classes/com/sun/jmx/snmp/BerEncoder.java.i
+data/test/com/oracle/security/ucrypto/UcryptoTest.java.i
data/src/share/classes/sun/reflect/DelegatingMethodAccessorImpl.java.i
-data/src/share/classes/javax/swing/text/doc-files/Document-remove.gif.i
-data/src/share/classes/sun/util/resources/CalendarData_pt.properties.i
-data/test/com/sun/jdi/RedefineFinal.sh.i
-data/src/share/demo/jfc/Notepad/resources/open.gif.i
+data/test/java/lang/System/SecurityRace.java.i
+data/test/sun/misc/Version/Version.java.i
+data/test/java/net/URLConnection/HandleContentTypeWithAttrs.java.i
data/make/tools/swing-beans/beaninfo/images/JRootPaneMono16.gif.i
data/src/share/native/java/lang/fdlibm/src/w_jn.c.i
data/src/share/classes/sun/management/FileSystem.java.i
data/src/share/classes/javax/management/relation/RoleUnresolvedList.java.i
-data/test/java/lang/Throwable/NewChainedExceptions.java.i
+data/src/share/classes/java/security/AuthProvider.java.i
data/src/share/classes/javax/swing/plaf/nimbus/DerivedColor.java.i
-data/src/windows/classes/sun/security/mscapi/RSAPrivateKey.java.i
+data/src/solaris/classes/sun/management/FileSystemImpl.java.i
data/src/solaris/classes/sun/print/UnixPrintJob.java.i
data/make/netbeans/common/unix-sources.ent.i
data/src/share/classes/javax/xml/crypto/URIReferenceException.java.i
-data/make/tools/src/build/tools/javazic/BackEnd.java.i
-data/src/share/classes/sun/io/ByteToCharCp1143.java.i
-data/test/java/awt/Dialog/DialogOverflowSizeTest/DialogSizeOverflowTest.java.i
+data/src/share/native/sun/font/layout/MorphTables.cpp.i
+data/test/java/net/URLConnection/GetLastModified.java.i
data/test/com/sun/jndi/ldap/LdapName/Case.java.i
-data/test/java/net/Socket/GetLocalAddress.java.i
-data/make/netbeans/common/share-view.ent.i
-data/make/sun/org/mozilla/Makefile.i
+data/test/java/io/Reader/NullLock.java.i
+data/test/com/sun/net/httpserver/bugs/B6433018.java.i
data/src/share/classes/sun/nio/ch/SimpleAsynchronousDatagramChannelImpl.java.i
-data/src/share/classes/javax/management/NotificationInfos.java.i
+data/test/java/awt/im/4490692/bug4490692.html.i
+data/src/macosx/classes/com/apple/laf/AquaMenuItemUI.java.i
data/src/share/native/sun/awt/image/jpeg/jchuff.h.i
data/test/javax/crypto/SecretKeyFactory/P2SecretKeyFactory.java.i
data/test/java/lang/StringBuilder/EnsureCapacity.java.i
data/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java.i
-data/src/share/classes/sun/tools/jstat/Arguments.java.i
-data/src/share/classes/java/awt/datatransfer/Clipboard.java.i
-data/src/share/classes/javax/swing/text/ParagraphView.java.i
-data/src/share/classes/java/awt/ComponentOrientation.java.i
-data/src/share/classes/sun/net/httpserver/ContextList.java.i
+data/src/windows/classes/sun/awt/windows/WFontMetrics.java.i
+data/make/tools/swing-beans/beaninfo/images/JTextPaneMono32.gif.i
+data/test/javax/management/MBeanInfo/NullInfoArraysTest.java.i
+data/src/share/classes/sun/text/resources/thai_dict.d
+data/src/share/javavm/export/jvmticmlr.h.i
data/src/share/classes/sun/beans/editors/LongEditor.java.i
-data/src/share/classes/sun/text/resources/thai_dict.i
-data/test/java/util/ArrayList/EnsureCapacity.java.i
+data/src/share/classes/sun/text/resources/FormatData_cs_CZ.java.i
+data/src/macosx/classes/sun/lwawt/LWCheckboxPeer.java.i
data/src/share/classes/javax/security/auth/login/AccountException.java.i
data/src/share/classes/java/util/Comparator.java.i
data/src/share/classes/sun/text/resources/FormatData_sk.java.i
-data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java.i
+data/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java.i
data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnectionOldImpl.java.i
-data/src/share/classes/java/nio/channels/MembershipKey.java.i
+data/src/share/classes/java/lang/AssertionStatusDirectives.java.i
data/src/share/native/sun/font/bidi/ubidi.c.i
-data/test/sun/net/InetAddress/nameservice/chaining/Providers.java.i
+data/src/share/classes/com/sun/imageio/plugins/wbmp/WBMPMetadata.java.i
data/src/share/classes/javax/management/openmbean/OpenType.java.i
data/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java.i
-data/make/java/java/reorder-sparc.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java.i
-data/src/share/classes/com/sun/tools/jdi/InterfaceTypeImpl.java.i
+data/src/share/classes/java/net/HttpRetryException.java.i
+data/make/tools/src/build/tools/jdwpgen/AbstractCommandNode.java.i
+data/test/javax/management/openmbean/OpenTypeDescriptorTest.java.i
data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password.i
data/src/share/classes/sun/management/counter/perf/InstrumentationException.java.i
-data/src/share/classes/java/awt/event/WindowAdapter.java.i
+data/src/share/native/sun/font/layout/SinglePositioningSubtables.h.i
data/src/solaris/bin/ergo.h.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources_en_GB.properties.i
data/test/java/lang/management/ThreadMXBean/SynchronizerLockingThread.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java.i
data/src/share/classes/javax/print/attribute/SetOfIntegerSyntax.java.i
data/test/sun/security/ssl/etc/truststore.i
-data/src/share/classes/com/sun/java/swing/plaf/gtk/icons/File.gif.i
+data/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java.i
data/test/tools/launcher/Test7029048.java.i
data/src/share/classes/java/security/acl/AclNotFoundException.java.i
-data/src/share/classes/sun/io/ByteToCharISO8859_5.java.i
+data/test/java/io/CharArrayReader/Constructor.java.i
data/src/solaris/native/sun/awt/XDrawingArea.h.i
data/test/sun/security/tools/keytool/printssl.sh.i
data/src/share/classes/sun/text/resources/FormatData_ar_DZ.java.i
data/src/share/native/sun/font/layout/HanLayoutEngine.h.i
-data/test/java/util/IdentityHashMap/ToArray.java.i
-data/src/share/native/sun/java2d/loops/IntArgbPre.c.i
+data/test/java/util/logging/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java.i
+data/test/org/openjdk/jigsaw/cli/signed-modular-jar.sh.i
data/test/java/net/MulticastSocket/SetLoopbackMode.java.i
-data/src/solaris/classes/sun/awt/X11CustomCursor.java.i
+data/src/share/classes/com/sun/security/auth/UnixNumericUserPrincipal.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_SA.properties.i
-data/src/share/classes/com/sun/jndi/ldap/LdapName.java.i
+data/src/share/demo/nbproject/jfc/TransparentRuler/nbproject/file-targets.xml.i
+data/src/share/classes/sun/text/resources/FormatData_is_IS.java.i
data/test/java/util/PluggableLocale/providersrc/java.util.spi.TimeZoneNameProvider.i
-data/test/java/net/URLConnection/RequestProperties.java.i
-data/test/java/beans/PropertyEditor/TestFloatClassNull.java.i
+data/src/share/classes/sun/font/FontScalerException.java.i
+data/test/com/sun/security/auth/login/ConfigFile/PropertyExpansion.config.i
data/src/share/classes/sun/net/www/protocol/http/HttpCallerInfo.java.i
-data/src/share/classes/com/sun/management/package.html.i
-data/test/java/nio/channels/FileChannel/Size.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/CompressOutputStream.java.i
+data/src/share/classes/java/awt/geom/package.html.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-hmac-sha1-trunclen-0-attack.xml.i
data/src/share/classes/sun/java2d/pipe/RenderBuffer.java.i
-data/src/share/native/java/util/zip/zlib-1.1.3/inftrees.h.i
+data/test/org/openjdk/jigsaw/repocat.sh.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c.i
-data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_ME.properties.i
-data/test/sun/tools/jstat/usage.out.i
+data/test/java/awt/Toolkit/HeadlessTray/HeadlessTray.java.i
data/src/share/classes/java/lang/ClassCastException.java.i
data/test/java/lang/instrument/PremainClass/Agent.jar.i
-data/src/share/native/sun/awt/giflib/gif_err.c.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/TestDisableLoadDefaultSoundbank.java.i
data/make/netbeans/jarzip/README.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/Function.java.i
data/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java.i
data/test/java/dyn/6991596/Test6991596.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/report/IIOComparator.java.i
+data/src/windows/transport/shmem/shmem_md.h.i
data/src/share/classes/sun/util/resources/CurrencyNames_ar_SD.properties.i
data/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/Shutdown.java.i
data/test/java/nio/channels/FileChannel/MapReadOnly.java.i
-data/src/share/lib/audio/soundbank.gm.i
-data/test/java/beans/XMLEncoder/Test5023550.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c.i
data/src/share/classes/sun/util/resources/LocaleNames_sq.properties.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.c.i
+data/src/share/lib/audio/soundbank.gm.d
data/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c.i
data/test/java/lang/reflect/Field/4490864/StaticFieldTest.java.i
data/test/sun/security/pkcs11/Mac/ReinitMac.java.i
-data/src/share/classes/sun/nio/fs/AbstractFileTypeDetector.java.i
+data/src/solaris/classes/sun/nio/fs/SolarisFileSystemProvider.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.d
data/src/windows/native/sun/windows/jawt.cpp.i
-data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Fedora.properties.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest11_ok.ssl.in.i
data/make/tools/swing-beans/beaninfo/images/JButtonColor16.gif.i
data/src/share/classes/java/io/InvalidObjectException.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.chk.i
+data/src/share/demo/jvmti/hprof/hprof_trace.h.i
data/test/javax/imageio/plugins/wbmp/CanDecodeTest.java.i
-data/src/share/classes/sun/text/resources/FormatData_is_IS.java.i
+data/test/java/io/Serializable/PutField/Write2.java.i
data/src/share/classes/java/awt/datatransfer/MimeTypeParseException.java.i
-data/src/windows/native/common/gdefs_md.h.i
-data/src/solaris/native/sun/awt/swing_GTKEngine.c.i
+data/test/sun/security/pkcs11/nss/lib/linux-i586/libnss3.so.i
+data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.properties.i
data/make/tools/src/build/tools/charsetmapping/EUC_TW.java.i
-data/test/java/lang/Thread/GenerifyStackTraces.java.i
+data/src/share/native/sun/awt/image/cvutils/img_output16_32.h.i
data/test/java/rmi/server/useCustomRef/Ping.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/TestEnvironment.java.i
+data/test/java/lang/Class/forName/classes/period.class.i
+data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java.i
+data/test/java/io/File/ListNull.java.i
data/test/java/io/Serializable/enum/mismatchedTypecode/Test.java.i
data/test/java/util/ResourceBundle/Bug4353454.java.i
-data/src/share/classes/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java.i
+data/src/share/classes/sun/rmi/transport/tcp/TCPConnection.java.i
data/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java.i
data/test/sun/security/krb5/ktab/KeyTabIndex.java.i
data/test/java/net/MulticastSocket/SetTTLTo0.java.i
data/src/share/classes/com/sun/jmx/snmp/tasks/TaskServer.java.i
data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/GetFormat.java.i
-data/src/share/demo/management/FullThreadDump/Deadlock.java.i
+data/src/share/classes/java/nio/channels/AsynchronousByteChannel.java.i
data/test/java/nio/channels/AsynchronousFileChannel/Lock.java.i
-data/src/share/classes/sun/security/util/DerIndefLenConverter.java.i
-data/src/share/classes/javax/imageio/ImageReader.java.i
-data/src/share/classes/sun/invoke/empty/Empty.java.i
+data/src/macosx/native/sun/awt/CDragSourceContextPeer.m.i
+data/src/solaris/classes/sun/awt/motif/MRobotPeer.java.i
+data/src/linux/doc/man/apt.1.i
+data/src/share/classes/sun/nio/cs/ext/HKSCS.java.i
data/src/share/classes/javax/swing/JWindow.java.i
data/src/share/classes/sun/awt/image/PNGImageDecoder.java.i
-data/src/share/classes/sun/jkernel/BackgroundDownloader.java.i
+data/src/solaris/classes/sun/java2d/xr/XRPaints.java.i
data/test/java/util/StringTokenizer/ResetPos.java.i
data/test/sun/tools/jstat/gcNewCapacityOutput1.awk.i
data/src/share/classes/com/sun/jmx/remote/internal/NotificationBuffer.java.i
-data/src/share/classes/java/security/spec/RSAPrivateKeySpec.java.i
-data/test/java/net/Inet6Address/IPv6AddressTypes.java.i
+data/src/share/classes/com/sun/media/sound/SF2Instrument.java.i
+data/src/share/classes/sun/java2d/loops/DrawRect.java.i
data/src/share/classes/javax/management/namespace/JMXDomain.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_CA.properties.i
-data/src/share/classes/sun/nio/fs/AbstractWatchKey.java.i
+data/test/java/rmi/testlibrary/TestParams.java.i
+data/src/solaris/native/sun/net/spi/SdpProvider.c.i
data/test/java/io/PrintStream/EncodingConstructor.java.i
data/src/share/classes/javax/swing/OverlayLayout.java.i
-data/test/java/beans/XMLEncoder/Test4646747.java.i
+data/src/share/classes/sun/rmi/transport/Channel.java.i
data/src/windows/classes/sun/awt/windows/WFontPeer.java.i
data/test/sun/tools/jps/jps-Vm_2.sh.i
data/test/javax/swing/border/Test6981576.java.i
data/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java.i
-data/test/javax/management/eventService/EventClientThreadTest.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsDesktopPaneUI.java.i
data/src/share/classes/sun/nio/cs/ext/MS932.java.i
-data/test/sun/security/krb5/RFC396xTest.java.i
-data/make/java/sql/Makefile.i
-data/src/share/classes/javax/security/auth/login/AccountLockedException.java.i
+data/src/share/classes/sun/tools/tree/ConditionalExpression.java.i
+data/src/share/native/java/lang/fdlibm/src/w_exp.c.i
data/src/share/classes/org/openjdk/jigsaw/ContextBuilder.java.i
data/src/share/classes/sun/tools/asm/ArrayData.java.i
-data/src/share/native/sun/awt/image/imageInitIDs.h.i
+data/src/share/native/sun/font/layout/ContextualGlyphSubstitution.h.i
data/test/java/beans/XMLEncoder/javax_swing_JSplitPane.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/Fp.java.i
data/test/com/sun/security/auth/callback/TextCallbackHandler/Confirm.java.i
-data/src/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java.i
-data/test/com/sun/servicetag/SystemRegistryTest.java.i
-data/make/tools/swing-beans/beaninfo/images/JRadioButtonMenuItemMono32.gif.i
+data/test/java/security/cert/pkix/nameConstraintsMinMax/labs2isrg2.cer.i
+data/test/java/lang/reflect/Method/InheritedMethods.java.i
+data/src/bsd/doc/man/ja/rmid.1.i
+data/src/share/classes/sun/java2d/pipe/RegionIterator.java.i
data/test/java/net/URLClassLoader/URLParsing.java.i
data/test/java/security/cert/CertPathBuilder/selfIssued/generate.sh.i
data/test/java/lang/management/MemoryMXBean/MemoryManagement.java.i
data/make/tools/swing-beans/beaninfo/images/JToggleButtonMono32.gif.i
data/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java.i
-data/src/share/classes/com/sun/net/ssl/TrustManager.java.i
+data/src/share/classes/sun/awt/CharsetString.java.i
data/src/share/classes/javax/management/openmbean/MXBeanMapping.java.i
-data/test/javax/management/remote/mandatory/passwordAccessFile/password.properties.i
+data/test/tools/pack200/TimeStamp.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/QueryListener.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/I18n.java.i
+data/src/share/native/sun/awt/image/cvutils/img_icm.h.i
data/src/solaris/classes/sun/awt/X11/XModalityProtocol.java.i
-data/src/share/classes/com/sun/jndi/cosnaming/CNNameParser.java.i
-data/src/share/classes/java/awt/peer/MenuBarPeer.java.i
+data/src/share/native/java/lang/fdlibm/src/w_sinh.c.i
+data/test/java/net/URLClassLoader/closetest/Common.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java.i
data/test/javax/swing/JTextArea/6925473/bug6925473.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java.i
data/src/share/classes/com/sun/tools/jdi/GenericAttachingConnector.java.i
data/test/sun/management/jmxremote/bootstrap/management_test04_ok.properties.in.i
data/test/sun/java2d/cmm/ColorConvertOp/ColCvtIntARGB.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_ga_IE.properties.i
data/src/share/classes/sun/swing/WindowsPlacesBar.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java.i
+data/src/share/classes/java/nio/channels/ReadableByteChannel.java.i
data/src/share/classes/sun/rmi/transport/ConnectionOutputStream.java.i
data/src/share/classes/javax/crypto/spec/DHPublicKeySpec.java.i
-data/src/share/classes/com/sun/jdi/LongType.java.i
-data/test/java/io/File/WinSpecialFiles.java.i
+data/test/java/util/ResourceBundle/Bug4177489_Resource_jf_JF.properties.i
data/test/javax/sound/midi/Gervill/SimpleInstrument/AddModelPerformerArrayIntIntIntInt.java.i
data/src/share/native/java/util/zip/zlib-1.1.3/inflate.c.i
data/src/solaris/classes/sun/awt/X11/XRepaintArea.java.i
data/test/com/sun/net/httpserver/Test2.java.i
-data/test/com/sun/jdi/BreakpointTest.java.i
+data/test/java/beans/PropertyEditor/TestColorClassValue.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_TLS_PRF_PARAMS.java.i
data/src/share/classes/java/util/concurrent/Semaphore.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmssamp.c.i
-data/src/solaris/doc/sun/man/man1/jdb.1.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/file/PerfDataBuffer.java.i
-data/src/share/classes/org/ietf/jgss/GSSName.java.i
+data/test/java/rmi/testlibrary/RegistryRunner.java.i
+data/test/javax/swing/JDialog/6639507/bug6639507.java.i
+data/test/java/io/Serializable/classDescFlagConflict/Read.java.i
data/test/org/openjdk/jigsaw/circular-deps.sh.i
data/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java.i
-data/make/common/internal/Defs-corba.gmk.i
+data/src/share/classes/javax/swing/DefaultListModel.java.i
data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java.i
-data/test/com/sun/nio/sctp/SctpServerChannel/NonBlockingAccept.java.i
+data/test/sun/security/ssl/sanity/pluggability/CheckSockFacExport2.java.i
data/src/share/classes/java/security/PrivilegedExceptionAction.java.i
-data/src/share/native/sun/awt/image/jpeg/jdcolor.c.i
+data/test/java/net/InetSocketAddress/ToString.java.i
data/src/share/classes/sun/dc/META-INF/services/sun.java2d.pipe.RenderingEngine.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/generator/ObjectCodeConvertors.java.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/synthdesigner/synthmodel/UIState.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/AgentServer.java.i
data/src/share/classes/sun/tools/attach/HotSpotVirtualMachine.java.i
data/src/share/classes/java/text/CharacterIterator.java.i
data/src/share/classes/javax/sound/midi/MidiDeviceReceiver.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemPoolThreshdSupport.java.i
-data/test/sun/management/jmxremote/bootstrap/jmxremote_test02_ok.password.in.i
-data/src/share/classes/javax/sound/sampled/Clip.java.i
+data/test/javax/script/Test3.js.i
+data/test/javax/crypto/CryptoPermission/RC4AliasPermCheck.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties.i
-data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java.i
+data/test/java/util/ArrayList/AddAll.java.i
data/test/sun/security/provider/PolicyFile/getinstance/OneArgPermission.java.i
data/src/solaris/native/java/net/PlainDatagramSocketImpl.c.i
data/src/share/classes/sun/security/util/SignatureFileManifest.java.i
data/test/javax/management/loading/MLetContentTest.java.i
data/src/share/native/sun/awt/image/cvutils/img_output8_16_24.h.i
-data/src/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java.i
-data/src/share/sample/jmx/jmx-scandir/src/com/sun/jmx/examples/scandir/ResultLogManager.java.i
-data/src/share/classes/java/awt/event/FocusListener.java.i
-data/src/share/classes/sun/reflect/generics/tree/TypeVariableSignature.java.i
-data/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java.i
-data/src/share/classes/java/beans/beancontext/BeanContextServiceAvailableEvent.java.i
-data/src/windows/classes/sun/java2d/windows/WindowsFlags.java.i
+data/test/java/io/File/HashCodeEquals.java.i
+data/test/java/beans/Introspector/Test6194788.java.i
+data/test/sun/security/smartcardio/TestMultiplePresent.java.i
+data/src/bsd/doc/man/ja/jarsigner.1.i
+data/test/java/security/Security/removing/RemoveStaticProvider.java.i
+data/src/share/classes/sun/java2d/pipe/TextRenderer.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPath2FilterContainer04.java.i
+data/test/java/io/Reader/SkipNegative.java.i
data/make/tools/src/build/tools/dtdbuilder/README.txt.i
data/src/windows/classes/sun/nio/fs/WindowsAclFileAttributeView.java.i
-data/src/windows/native/sun/java2d/d3d/D3DTextRenderer.cpp.i
+data/src/share/native/sun/awt/image/jpeg/jcinit.c.i
data/src/share/sample/vm/jvm-clr/invoker.cpp.i
data/src/share/classes/java/dyn/FromGeneric.java.i
data/test/javax/xml/crypto/dsig/data/signature-enveloping-rsa.xml.i
@@ -18896,19 +19663,19 @@ data/test/java/rmi/reliability/benchmark/bench/serial/ObjTrees.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java.i
data/test/java/io/InputStreamReader/NullCreate.java.i
data/src/share/classes/com/sun/java/swing/Painter.java.i
-data/src/share/classes/sun/misc/resources/Messages_fr.java.i
+data/src/windows/native/sun/windows/awt_MouseEvent.cpp.i
data/src/share/classes/java/awt/font/GlyphVector.java.i
-data/test/javax/naming/ldap/LdapName/RdnToAttrsTest.java.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libfreebl3.so.i
data/make/java/java/FILES_java.gmk.i
-data/src/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java.i
-data/test/java/nio/charset/spi/charsetProvider.sp.i
-data/src/share/classes/com/sun/jmx/mbeanserver/MXBeanMappingFactory.java.i
+data/test/javax/management/remote/mandatory/notif/NotificationEmissionTest.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java.i
+data/src/share/classes/com/sun/crypto/provider/AESKeyGenerator.java.i
data/src/share/classes/javax/swing/colorchooser/SmartGridLayout.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/package.html.i
+data/test/java/util/prefs/ExportSubtree.java.i
data/src/solaris/native/com/sun/management/SolarisOperatingSystem.c.i
data/src/share/classes/sun/tracing/package-info.java.i
data/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.java.i
-data/test/java/util/Collections/CheckedListBash.java.i
+data/test/sun/security/rsa/TestKeyPairGeneratorLength.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/Designer.jibx.xml.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.i
data/src/share/classes/sun/security/provider/certpath/KeyChecker.java.i
@@ -18916,314 +19683,324 @@ data/test/java/net/PortUnreachableException/OneExceptionOnly.java.i
data/test/java/util/LinkedHashMap/EmptyMapIterator.java.i
data/src/share/classes/java/awt/font/ImageGraphicAttribute.java.i
data/src/share/classes/javax/crypto/NullCipher.java.i
-data/src/solaris/native/sun/awt/awt_Font.c.i
+data/test/sun/tools/jstatd/jstatdUsage1.sh.i
data/test/sun/security/provider/PolicyFile/getinstance/TwoArgNullActionsPermission.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/AlgorithmAlreadyRegisteredException.java.i
-data/test/javax/management/ImplementationVersion/ImplVersionReader.java.i
-data/src/share/classes/sun/io/ByteToCharISO2022CN.java.i
+data/test/java/lang/String/SBConstructor.java.i
+data/src/share/classes/sun/util/ResourceBundleEnumeration.java.i
data/test/java/security/Policy/GetInstance/GetInstancePolicySpi.java.i
-data/make/tools/swing-beans/beaninfo/images/JMenuBarMono32.gif.i
+data/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c.i
data/make/modules/tools/src/com/sun/classanalyzer/ResourceFile.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java.i
-data/test/javax/security/auth/kerberos/KerberosTixDateTest.java.i
-data/src/share/classes/java/nio/charset/Charset-X-Coder.java.i
-data/test/sun/security/tools/keytool/newhelp.sh.i
-data/src/share/classes/sun/io/CharToByteBig5_Solaris.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageClear_f.c.i
-data/src/share/classes/sun/security/ssl/CipherSuite.java.i
+data/src/share/native/java/util/zip/zlib-1.1.3/infblock.c.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpMibTree.java.i
+data/src/share/demo/jfc/Metalworks/MetalThemeMenu.java.i
+data/test/javax/management/namespace/NamespaceCreationTest.java.i
+data/test/java/util/logging/LoggingDeadlock4.java.i
+data/test/java/text/Format/MessageFormat/Bug7003643.java.i
data/src/share/classes/sun/misc/BASE64Decoder.java.i
-data/src/share/classes/sun/management/GcInfoCompositeData.java.i
+data/src/share/classes/sun/nio/cs/ISO_8859_9.java.i
data/src/share/native/sun/java2d/loops/AlphaMath.c.i
+data/make/com/sun/jndi/Makefile.i
data/test/java/nio/charset/coders/Errors.java.i
data/src/share/hpi/include/vm_calls.h.i
data/src/solaris/classes/sun/awt/X11/MotifDnDDragSourceProtocol.java.i
-data/make/netbeans/common/file-view.ent.i
-data/src/share/classes/sun/reflect/UnsafeStaticFieldAccessorImpl.java.i
-data/src/share/classes/sun/tools/tree/UnaryExpression.java.i
+data/test/javax/swing/JTree/6505523/bug6505523.java.i
+data/test/java/net/SocketPermission/NoAction.java.i
+data/test/sun/security/tools/keytool/CloneKeyAskPassword.sh.i
data/test/javax/management/mxbean/MXBeanFlagTest.java.i
data/src/share/classes/java/security/AccessController.java.i
data/make/sun/dcpr/mapfile-vers.i
-data/src/share/classes/java/lang/instrument/package.html.i
+data/test/java/lang/instrument/RedefineMethodAddInvokeTarget.java.i
data/test/sun/security/tools/policytool/SaveAs.java.i
data/src/windows/native/sun/security/pkcs11/j2secmod_md.c.i
data/test/javax/swing/border/Test4760089.html.i
data/src/share/classes/sun/io/CharToByteUTF8.java.i
data/test/java/util/prefs/CommentsInXml.java.i
-data/src/share/classes/javax/management/namespace/JMXNamespace.java.i
+data/test/java/util/zip/GZIP/GZIPInputStreamRead.java.i
+data/src/macosx/classes/sun/java2d/OSXOffScreenSurfaceData.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformParam.java.i
data/src/share/classes/sun/awt/image/ImageAccessException.java.i
data/make/tools/CharsetMapping/IBM1148.map.i
data/make/common/Subdirs.gmk.i
-data/src/share/classes/java/net/CookiePolicy.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/iio/InputStreamTests.java.i
data/test/java/io/pathNames/unix/TrailingSlash.java.i
data/make/tools/swing-beans/beaninfo/images/JTextFieldColor32.gif.i
-data/src/share/demo/jvmti/hprof/hprof_trace.h.i
-data/src/share/classes/java/dyn/MethodHandleImpl.java.i
-data/src/share/native/java/lang/fdlibm/src/s_cbrt.c.i
-data/make/tools/swing-beans/beaninfo/images/JScrollBarMono32.gif.i
+data/test/sun/security/validator/CertReplace.java.i
+data/test/java/security/cert/CertPathValidatorException/cert_file.i
+data/src/solaris/classes/sun/awt/X11/XAtomList.java.i
+data/test/sun/security/ssl/sanity/pluggability/MySSLContextImpl.java.i
data/src/solaris/doc/sun/man/man1/ja/rmic.1.i
data/src/share/classes/javax/swing/plaf/synth/SynthEditorPaneUI.java.i
-data/test/sun/security/pkcs11/Cipher/ReinitCipher.java.i
+data/src/share/classes/com/sun/jdi/request/package.html.i
data/test/java/lang/ClassLoader/LoadNullClass.java.i
-data/src/share/classes/sun/io/CharToByteCp1097.java.i
+data/test/java/rmi/activation/Activatable/extLoadedImpl/ExtLoadedImplTest.java.i
data/test/sun/tools/native2ascii/A2N_4630971.i
data/test/java/io/Serializable/evolution/AddedSuperClass/ReadAddedSuperClass.java.i
-data/src/share/classes/javax/swing/ScrollPaneConstants.java.i
+data/test/java/awt/PrintJob/PrintCheckboxTest/PrintCheckboxManualTest.java.i
data/test/java/lang/management/ThreadMXBean/MonitorDeadlock.java.i
data/test/java/nio/channels/Selector/WakeupSpeed.java.i
data/src/share/classes/com/sun/crypto/provider/PBEKeyFactory.java.i
-data/src/share/instrument/PathCharsValidator.h.i
+data/src/windows/native/java/net/net_util_md.c.i
data/make/tools/CharsetMapping/Big5.map.i
data/src/share/classes/com/sun/security/ntlm/NTLM.java.i
-data/src/share/classes/javax/swing/text/ZoneView.java.i
-data/src/share/classes/java/awt/BorderLayout.java.i
-data/make/tools/src/build/tools/javazic/Rule.java.i
+data/test/sun/tools/jps/jps-Vm_Output2.awk.i
+data/src/share/classes/javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java.i
+data/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java.i
data/test/java/awt/dnd/ImageDecoratedDnD/ImageDecoratedDnD.html.i
data/test/com/sun/crypto/provider/TLS/TestMasterSecret.java.i
data/src/share/classes/sun/awt/image/NativeLibLoader.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_ja.properties.i
+data/src/macosx/native/com/apple/laf/JRSUIController.m.i
+data/test/java/beans/XMLEncoder/javax_swing_border_BevelBorder.java.i
data/src/share/classes/com/sun/tools/jdi/VoidValueImpl.java.i
data/src/share/classes/sun/tools/jconsole/inspector/XOpenTypeViewer.java.i
-data/test/javax/smartcardio/HistoricalBytes.java.i
+data/test/java/lang/annotation/ParameterAnnotations.java.i
data/src/solaris/sample/dtrace/hotspot/method_invocation_stat_filter.d.i
-data/src/share/classes/sun/management/snmp/jvmmib/JvmCompilationMBean.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTInputArgsTableMeta.java.i
data/src/share/classes/sun/management/snmp/jvminstr/JvmMemManagerTableMetaImpl.java.i
data/test/javax/security/auth/Subject/Synch2.java.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java.i
-data/src/share/classes/java/awt/HeadlessException.java.i
-data/test/javax/imageio/EmptyFileTest.java.i
-data/src/share/classes/com/sun/security/sasl/digest/DigestMD5Server.java.i
+data/test/sun/security/krb5/auto/DynamicKeytab.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java.i
+data/test/java/util/Locale/serialized/java6locale_th_TH_TH.i
+data/src/macosx/bundle/JavaAppLauncher/src/JVMArgs.m.i
data/test/javax/script/META-INF/services/javax.script.ScriptEngineFactory.i
-data/test/com/sun/jdi/UnloadEventTarg.java.i
+data/src/share/classes/javax/management/remote/JMXConnectorFactory.java.i
data/src/share/classes/java/awt/peer/WindowPeer.java.i
data/src/share/native/java/lang/fdlibm/src/w_lgamma.c.i
-data/src/share/classes/sun/io/CharToByteUnicodeLittleUnmarked.java.i
+data/src/windows/classes/java/io/FileDescriptor.java.i
data/make/sun/beans/Makefile.i
data/test/sun/net/www/protocol/http/Modified.java.i
data/make/mksample/scripting/Makefile.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpAccessControlModel.java.i
-data/test/java/net/HttpURLConnection/UnmodifiableMaps.java.i
+data/src/share/classes/com/sun/media/sound/UlawCodec.java.i
data/src/share/classes/sun/nio/ch/SocketOptsImpl.java.i
data/test/java/net/DatagramSocket/LocalSocketAddress.java.i
data/test/java/rmi/server/RMIClassLoader/noSecurityManager/LocalDummy.java.i
data/src/share/classes/javax/sound/midi/spi/SoundbankReader.java.i
data/src/share/classes/java/awt/peer/ScrollbarPeer.java.i
-data/src/share/classes/java/io/Bits.java.i
+data/test/java/security/cert/CertPathBuilder/targetConstraints/ee.cer.i
+data/src/bsd/doc/man/ja/unpack200.1.i
data/src/share/native/sun/font/layout/GlyphLookupTables.cpp.i
data/test/java/lang/Runtime/exec/SleepyCat.java.i
data/src/share/classes/javax/swing/Popup.java.i
data/test/sun/management/jmxremote/bootstrap/management_ssltest06_ok.properties.in.i
data/src/windows/native/sun/java2d/d3d/D3DMaskBlit.h.i
data/test/javax/security/auth/Subject/Serial.policy.i
-data/test/sun/nio/cs/TestUTF_16.java.i
+data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java.i
data/test/java/lang/Class/IsAnnotationType.java.i
-data/src/share/classes/com/sun/jmx/snmp/daemon/CommunicatorServerMBean.java.i
-data/src/share/classes/sun/io/CharToByteISO2022CN_GB.java.i
-data/src/share/classes/sun/security/provider/PolicySpiFile.java.i
+data/test/java/lang/Double/Constants.java.i
+data/src/share/native/sun/security/ec/impl/ecl_curve.c.i
+data/test/java/awt/Focus/WindowInitialFocusTest/WindowInitialFocusTest.html.i
data/src/windows/classes/sun/awt/windows/WInputMethodDescriptor.java.i
-data/test/java/io/File/Cons.java.i
-data/src/share/classes/javax/swing/event/TreeModelEvent.java.i
+data/src/share/classes/sun/security/pkcs10/PKCS10.java.i
+data/test/java/util/Collections/RacingCollections.java.i
data/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java.i
data/src/share/classes/sun/reflect/generics/tree/ReturnType.java.i
data/make/tools/CharsetMapping/MacCentralEurope.map.i
-data/make/java/java/reflect/Makefile.i
+data/test/com/sun/net/httpserver/Test6.java.i
data/src/share/demo/jfc/FileChooserDemo/ExampleFileSystemView.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/Makefile.i
data/test/javax/management/Introspector/ChangingNotifsTest.java.i
data/src/share/classes/sun/misc/resources/Messages_zh_TW.java.i
-data/make/common/shared/Defs-solaris.gmk.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/model/ReturnValue.java.i
data/src/share/classes/sun/rmi/rmic/resources/rmic_zh_CN.properties.i
data/src/share/classes/sun/security/x509/X509CertImpl.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_is_IS.properties.i
+data/src/share/transport/socket/sysSocket.h.i
data/src/share/classes/sun/nio/cs/ISO_8859_7.java.i
data/test/java/net/PlainSocketImpl/SetBufferSize.java.i
data/test/java/util/zip/ZipEntry/input.jar.i
data/src/share/classes/java/awt/peer/ButtonPeer.java.i
-data/src/share/classes/sun/tracing/dtrace/JVM.java.i
+data/test/java/io/Serializable/enum/badResolve/Read.java.i
data/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java.i
data/src/share/classes/com/sun/media/sound/SoftMainMixer.java.i
-data/src/share/classes/sun/tools/tree/ArrayAccessExpression.java.i
+data/src/share/native/java/util/zip/zlib-1.2.5/patches/ChangeLog_java.i
data/src/share/classes/javax/net/ssl/SSLSocket.java.i
-data/src/windows/native/sun/windows/awt_MenuItem.cpp.i
-data/src/solaris/bin/java-rmi.cgi.sh.i
-data/src/share/classes/sun/util/calendar/AbstractCalendar.java.i
-data/src/share/classes/java/io/StringBufferInputStream.java.i
-data/src/linux/doc/man/orbd.1.i
+data/src/share/demo/jfc/Font2DTest/resources/TextResources_zh_CN.properties.i
+data/test/sun/java2d/pisces/Renderer/Test7019861.java.i
+data/test/java/lang/instrument/ATestCaseScaffold.java.i
+data/test/java/util/ResourceBundle/Control/LoadingStrategiesTest.java.i
+data/test/sun/tools/jstatd/jstatdPort.sh.i
data/src/windows/native/sun/windows/awt_Event.h.i
-data/make/sun/net/spi/Makefile.i
data/make/java/java/genlocales.gmk.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/AnimationController.java.i
+data/test/java/util/TimeZone/OldIDMappingTest.sh.i
data/test/sun/pisces/ScaleTest.java.i
-data/src/share/native/sun/font/layout/GlyphPositioningTables.h.i
+data/test/java/net/URLConnection/GetFileNameMap.java.i
data/src/share/classes/sun/dyn/util/BytecodeDescriptor.java.i
-data/src/share/classes/sun/net/www/protocol/http/Handler.java.i
+data/src/share/classes/sun/nio/cs/FastCharsetProvider.java.i
data/test/javax/security/auth/Subject/doAs/Test.sh.i
data/src/share/native/sun/awt/image/jpeg/jmorecfg.h.i
data/test/java/beans/Introspector/6380849/TestBeanInfo.java.i
data/test/sun/net/www/protocol/http/B6518816.java.i
data/test/javax/rmi/ssl/truststore.i
data/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java.i
-data/src/share/demo/nbproject/jfc/FileChooserDemo/nbproject/netbeans-targets.xml.i
+data/test/java/io/Serializable/oldTests/AnnotateClass.java.i
data/test/java/io/Serializable/illegalHandle/negativeHandle.ser.i
-data/make/sun/jdbc/Makefile.i
data/test/javax/management/ImplementationVersion/ImplVersionTest.java.i
-data/src/solaris/classes/sun/awt/X11InputMethod.java.i
+data/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java.i
data/src/share/classes/javax/management/relation/RelationNotFoundException.java.i
data/src/share/native/sun/security/ec/mpmontg.c.i
-data/src/share/classes/com/sun/security/sasl/ntlm/NTLMServer.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java.i
+data/test/javax/management/mxbean/InvalidMXBeanRegistrationTest.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java.i
data/test/java/lang/Long/Decode.java.i
-data/make/tools/swing-beans/beaninfo/images/JToggleButtonColor16.gif.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c.i
data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableMap.java.i
-data/src/solaris/native/sun/awt/swing_GTKStyle.c.i
+data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/FileListTransferable.java.i
data/src/solaris/classes/sun/java2d/xr/GrowableByteArray.java.i
data/test/sun/security/mscapi/ShortRSAKey1024.sh.i
data/make/tools/swing-beans/beaninfo/images/JSplitPaneColor16.gif.i
data/src/share/classes/javax/management/GenericMBeanException.java.i
data/make/java/hpi/Makefile.i
+data/test/java/beans/XMLEncoder/java_awt_Rectangle.java.i
data/make/java/instrument/Makefile.i
data/src/share/classes/sun/tracing/PrintStreamProviderFactory.java.i
data/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java.i
-data/src/solaris/doc/sun/man/man1/rmiregistry.1.i
+data/test/javax/security/auth/Subject/Synch2.policy.i
data/src/share/classes/sun/text/resources/FormatData_es_PE.java.i
data/src/share/classes/java/io/IOException.java.i
-data/test/sun/net/www/MarkResetTest.java.i
data/src/share/demo/applets/Blink/Blink.java.i
data/src/solaris/doc/sun/man/man1/jar.1.i
data/test/com/sun/jdi/ShellScaffold.sh.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_gfx.h.i
+data/src/share/native/java/util/zip/zlib-1.2.3/uncompr.c.i
data/test/sun/security/krb5/tools/ktmissing.sh.i
data/src/share/classes/java/awt/dnd/DnDConstants.java.i
-data/test/java/awt/Toolkit/ScreenInsetsTest/ScreenInsetsTest.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarA/a/A.java.i
data/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java.i
data/test/java/nio/channels/FileChannel/Lock.java.i
-data/src/share/javavm/export/classfile_constants.h.i
+data/make/sun/awt/FILES_export_macosx.gmk.i
+data/test/sun/tools/jstat/jstatClassloadOutput1.sh.i
data/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java.i
data/test/com/sun/net/httpserver/bugs/B6526913.java.i
data/src/share/classes/java/awt/event/HierarchyListener.java.i
data/test/javax/crypto/EncryptedPrivateKeyInfo/GetAlgName.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduRequest.java.i
data/test/java/awt/Toolkit/Headless/GetPrintJob/GetPrintJob.java.i
-data/src/share/native/sun/java2d/pipe/RenderBuffer.c.i
+data/test/java/util/TreeMap/EmptyMapAndNulls.java.i
data/test/sun/security/pkcs11/Cipher/TestRawRSACipher.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM500.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inffast.c.i
data/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java.i
-data/src/share/classes/java/lang/reflect/package-info.java.i
-data/src/share/classes/com/sun/imageio/plugins/bmp/BMPConstants.java.i
+data/src/share/classes/sun/misc/PerformanceLogger.java.i
+data/test/java/beans/Introspector/Test4984912.java.i
data/test/javax/swing/JSplitPane/4885629/bug4885629.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/A.1.i
-data/src/share/classes/javax/management/remote/JMXProviderException.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_no.properties.i
+data/src/share/classes/sun/util/calendar/AbstractCalendar.java.i
+data/test/sun/security/ssl/sanity/pluggability/MySSLEngineImpl.java.i
data/src/solaris/classes/sun/awt/X11/XUtilConstants.java.i
+data/src/solaris/native/sun/xawt/XToolkit.c.i
data/src/share/classes/sun/util/resources/LocaleNames_mk.properties.i
-data/test/com/sun/security/sasl/digest/pw.properties.i
+data/src/solaris/hpi/native_threads/src/threads_md.c.i
data/src/share/javavm/export/jvm.h.i
data/test/java/lang/Math/AbsPositiveZero.java.i
data/make/common/shared/Compiler-gcc.gmk.i
data/src/share/sample/scripting/scriptpad/src/scripts/README.txt.i
data/src/share/classes/sun/util/resources/LocaleNames_sl.properties.i
data/src/share/classes/sun/security/krb5/internal/ccache/Tag.java.i
-data/test/com/sun/tools/attach/java.policy.allow.i
+data/test/java/beans/Introspector/memory/SimpleClassLoader.java.i
data/src/share/classes/com/sun/naming/internal/NamedWeakReference.java.i
data/test/sun/net/www/protocol/jar/jarbug/run.sh.i
-data/test/java/io/RandomAccessFile/OpsAfterClose.java.i
+data/test/sun/nio/cs/OLD/IBM1381_OLD.java.i
data/src/share/classes/com/sun/crypto/provider/ConstructKeys.java.i
data/test/java/beans/EventHandler/Test6788531.java.i
-data/src/share/classes/sun/tools/java/IdentifierToken.java.i
+data/src/share/classes/java/util/logging/ErrorManager.java.i
data/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java.i
data/test/sun/security/pkcs11/KeyStore/BasicData/p11-sca1000.txt.i
-data/src/share/classes/javax/swing/tree/TreeCellEditor.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_PY.properties.i
+data/test/java/nio/channels/Selector/CloseThenRegister.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/MessageDigestAlgorithm.java.i
data/src/share/classes/javax/management/MBeanConstructorInfo.java.i
data/test/com/sun/crypto/provider/Cipher/AES/TestShortBuffer.java.i
data/make/sun/jdga/Makefile.i
data/src/share/classes/javax/swing/plaf/synth/SynthProgressBarUI.java.i
-data/src/share/demo/applets/Fractal/CLSFractal.java.i
+data/src/share/classes/com/sun/imageio/plugins/png/PNGImageWriter.java.i
data/src/share/classes/sun/security/util/ManifestEntryVerifier.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c.i
data/src/share/classes/sun/reflect/ReflectionFactory.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java.i
-data/src/solaris/native/sun/awt/awt_util.c.i
+data/src/share/classes/javax/swing/text/rtf/charsets/cpg437.txt.i
+data/test/java/security/SecureRandom/sha1prng-new.bin.i
data/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java.i
data/src/share/classes/sun/reflect/misc/FieldUtil.java.i
-data/make/sun/security/ec/FILES_c.gmk.i
-data/src/share/classes/javax/naming/ReferralException.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/package.html.i
-data/test/sun/nio/cs/Test6254467.java.i
-data/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c.i
+data/LICENSE.i
+data/test/java/lang/management/MemoryMXBean/LowMemoryTestSerialGC.sh.i
+data/src/share/native/common/jdk_util.c.i
data/test/sun/security/krb5/confplusprop.conf.i
-data/src/share/classes/java/util/StringTokenizer.java.i
-data/test/java/security/Security/signedfirst/Dyn.sh.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMAclItem.java.i
-data/src/share/classes/javax/swing/text/PlainDocument.java.i
+data/test/java/net/URL/HashCode.java.i
+data/make/tools/swing-beans/beaninfo/images/JRadioButtonColor32.gif.i
+data/test/java/nio/channels/SocketChannel/BufferSize.java.i
+data/test/java/beans/Introspector/memory/Bean2.java.i
data/src/share/classes/sun/awt/CustomCursor.java.i
-data/test/sun/net/www/http/KeepAliveCache/B5045306.java.i
-data/src/share/classes/sun/io/ByteToCharMS932.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/Inform.gif.i
+data/test/sun/security/tools/policytool/i18n.sh.i
+data/src/share/native/java/lang/Float.c.i
+data/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java.i
data/test/java/io/PipedInputStream/ClosedWriter.java.i
data/src/share/classes/sun/management/counter/ByteArrayCounter.java.i
data/src/share/classes/javax/imageio/metadata/IIOMetadataNode.java.i
data/src/share/classes/sun/rmi/registry/resources/rmiregistry_fr.properties.i
data/test/java/beans/XMLEncoder/javax_swing_plaf_BorderUIResource_EtchedBorderUIResource.java.i
data/test/javax/management/remote/mandatory/connectorServer/RMIExporterTest.java.i
-data/test/java/lang/Math/Expm1Tests.java.i
+data/src/share/classes/java/awt/PageAttributes.java.i
+data/src/bsd/doc/man/ja/idlj.1.i
data/test/javax/swing/JColorChooser/Test4193384.java.i
-data/test/sun/security/provider/PolicyParser/PrincipalExpansionError.sh.i
-data/src/share/classes/com/sun/jmx/remote/internal/NotificationBufferFilter.java.i
-data/test/java/nio/file/Files/Misc.java.i
+data/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserConstants.java.i
+data/make/tools/jarreorder/Makefile.i
+data/test/sun/net/www/protocol/http/HttpInputStream.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c.i
data/test/sun/security/ssl/sun/net/www/httpstest/HttpCallback.java.i
-data/src/share/classes/java/lang/ref/FinalReference.java.i
+data/test/java/nio/MappedByteBuffer/Truncate.java.i
data/test/java/rmi/activation/ActivateFailedException/activateFails/security.policy.i
+data/src/macosx/classes/sun/lwawt/macosx/CTextPipe.java.i
data/src/share/classes/java/text/Annotation.java.i
data/test/java/lang/instrument/PremainClass/NoPremainAgent.java.i
data/src/share/classes/com/sun/jndi/toolkit/ctx/ComponentContext.java.i
data/test/javax/security/auth/x500/X500Principal/Parse.java.i
data/src/share/classes/sun/misc/CompoundEnumeration.java.i
-data/test/javax/script/ProviderTest.sh.i
+data/src/share/classes/javax/security/cert/CertificateEncodingException.java.i
data/src/share/native/sun/security/ec/ecp_aff.c.i
-data/src/share/classes/javax/swing/text/StyleConstants.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_CheckedList.java.i
+data/src/macosx/native/jobjc/src/generator/java/com/apple/internal/jobjc/generator/utils/StringStream.java.i
+data/src/solaris/doc/sun/man/man1/jrunscript.1.i
+data/test/sun/security/pkcs11/Signature/ReinitSignature.java.i
data/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java.i
-data/src/solaris/classes/sun/awt/X11/java-icon32.png.i
+data/src/share/classes/sun/awt/im/CompositionAreaHandler.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_zh_HK.java.i
-data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/OriginServer.java.i
+data/test/java/rmi/Naming/RmiIsNoScheme.java.i
data/src/share/classes/sun/java2d/loops/CompositeType.java.i
-data/src/share/classes/javax/swing/plaf/synth/SynthParser.java.i
+data/src/share/classes/org/openjdk/jigsaw/Launcher.java.i
data/test/sun/security/pkcs11/sslecc/truststore.i
data/src/share/classes/org/openjdk/internal/joptsimple/OptionSpecTokenizer.java.i
-data/test/java/net/URLConnection/UNCTest.sh.i
-data/test/java/lang/ClassLoader/deadlock/SupBob.java.i
-data/src/share/classes/sun/text/IntHashtable.java.i
-data/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java.i
-data/test/java/beans/XMLEncoder/java_awt_Rectangle.java.i
+data/src/share/classes/sun/text/resources/FormatData_sr_BA.java.i
+data/test/sun/security/provider/DSA/TestDSA.java.i
+data/src/share/native/sun/font/layout/KhmerReordering.cpp.i
+data/src/share/classes/com/sun/jmx/remote/protocol/rmi/ServerProvider.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/SelfIssuedCert.java.i
+data/src/macosx/classes/com/apple/eawt/AppHiddenListener.java.i
data/src/share/classes/javax/smartcardio/package.html.i
-data/make/tools/jarsplit/Makefile.i
+data/src/share/native/sun/java2d/pipe/BufferedRenderPipe.c.i
data/test/java/math/RoundingMode/RoundingModeTests.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/Agent.java.i
data/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.SuSE.properties.i
-data/src/share/native/sun/awt/libpng/pngwtran.c.i
+data/test/java/net/InetAddress/GetLocalHostWithSM.java.i
data/src/share/classes/javax/print/attribute/DateTimeSyntax.java.i
-data/src/share/native/sun/java2d/loops/ByteBinary4Bit.c.i
+data/test/java/lang/Math/CubeRootTests.java.i
data/test/javax/swing/JFileChooser/6489130/bug6489130.java.i
-data/test/java/io/Serializable/superclassDataLoss/A.java.i
+data/make/tools/swing-beans/beaninfo/images/JMenuBarColor32.gif.i
data/test/java/nio/file/attribute/FileTime/Basic.java.i
data/make/sun/motif12/reorder-sparcv9.i
-data/src/share/classes/java/nio/channels/DatagramChannel.java.i
-data/src/share/classes/com/sun/pept/presentation/MessageStruct.java.i
-data/src/share/classes/javax/swing/plaf/metal/MetalFontDesktopProperty.java.i
+data/test/java/security/Security/Nulls.java.i
+data/src/macosx/native/sun/awt/InitIDs.m.i
+data/test/java/beans/Performance/TestVetoableChangeSupport.java.i
+data/test/sun/nio/cs/SurrogateTestEUCTW.plane4.surrogates.i
data/test/java/lang/Integer/Decode.java.i
data/test/java/util/zip/GZIP/ReadUByte.java.i
data/test/java/util/Currency/PropertiesTest.sh.i
+data/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java.i
data/src/share/classes/java/rmi/server/Skeleton.java.i
-data/test/java/io/File/WinDeviceName.java.i
+data/test/java/io/BufferedReader/ReadLineSync.java.i
data/src/share/classes/sun/io/CharToByteCp1258.java.i
data/src/share/classes/org/openjdk/jigsaw/ContextFactory.java.i
data/test/java/security/cert/CertPathValidatorException/ReasonTest.java.i
data/src/share/classes/sun/util/locale/LanguageTag.java.i
-data/make/common/BuildPackages.gmk.i
+data/test/sun/security/pkcs11/Cipher/TestRSACipher.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java.i
-data/src/share/classes/java/lang/SuppressWarnings.java.i
+data/src/share/classes/sun/tools/tree/AssignDivideExpression.java.i
data/test/java/lang/Class/getDeclaringClass/Sanity.java.i
data/make/netbeans/swing/nbproject/project.xml.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsScrollBarUI.java.i
@@ -19231,152 +20008,153 @@ data/test/javax/management/mxbean/CustomTypeTest.java.i
data/src/share/classes/com/sun/jndi/ldap/EntryChangeResponseControl.java.i
data/src/solaris/native/sun/awt/list.h.i
data/src/share/classes/java/lang/module/ModuleSystem.java.i
-data/make/netbeans/common/windows-view.ent.i
-data/test/java/security/KeyRep/SerialOld.java.i
-data/src/share/classes/java/nio/file/StandardWatchEventKinds.java.i
+data/test/java/util/logging/GetGlobalTest.java.i
+data/src/share/classes/java/text/spi/BreakIteratorProvider.java.i
+data/src/share/classes/sun/java2d/SunGraphics2D.java.i
data/test/javax/management/monitor/NonComparableAttributeValueTest.java.i
-data/src/share/classes/org/openjdk/jigsaw/Repository.java.i
+data/src/share/classes/sun/tools/jconsole/ProxyClient.java.i
data/test/javax/management/timer/StartTest.java.i
data/test/java/nio/channels/FileChannel/Mode.java.i
-data/src/share/classes/com/sun/java/util/jar/pack/Instruction.java.i
-data/make/tools/CharsetMapping/IBM868.map.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/icons/ListView.gif.i
+data/test/java/io/Serializable/nonserializable/ExceptionDetail.java.i
data/test/java/lang/instrument/NullTransformerAddTest.java.i
-data/src/solaris/native/sun/java2d/loops/mlib_v_ImageXor.c.i
+data/src/share/classes/javax/swing/plaf/LabelUI.java.i
data/src/solaris/native/java/io/UnixFileSystem_md.c.i
data/test/javax/management/eventService/UsingEventService.java.i
data/src/share/classes/java/security/cert/CRL.java.i
data/src/share/native/sun/font/layout/NonContextualGlyphSubst.h.i
data/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java.i
-data/src/share/native/sun/font/layout/LookupProcessor.cpp.i
+data/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java.i
data/test/java/awt/font/NumericShaper/ShapingTest.java.i
-data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Get.java.i
+data/src/share/classes/java/net/BindException.java.i
data/test/com/sun/jdi/GetLocalVariables.java.i
-data/src/share/classes/sun/rmi/server/resources/rmid_ja.properties.i
-data/src/share/classes/java/awt/TextComponent.java.i
-data/src/share/classes/sun/security/util/AuthResources.java.i
+data/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.i
+data/src/share/classes/javax/print/attribute/standard/PrinterMakeAndModel.java.i
+data/test/sun/security/tools/jarsigner/diffend.sh.i
data/src/share/classes/javax/naming/LinkException.java.i
-data/make/sun/awt/FILES_c_windows.gmk.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandardMBean.java.i
data/src/share/lib/net.properties.i
-data/src/share/classes/sun/tools/jstat/resources/jstat_options.i
-data/make/modules/modules.properties.i
+data/src/share/native/sun/font/layout/LELanguages.h.i
+data/src/share/classes/org/openjdk/jigsaw/Repository.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicHTML.java.i
data/src/share/classes/com/sun/jdi/JDIPermission.java.i
data/src/share/sample/vm/clr-jvm/jinvokerExp.h.i
data/src/share/classes/com/sun/jmx/mbeanserver/package.html.i
data/test/javax/swing/JEditorPane/6917744/bug6917744.java.i
-data/src/share/classes/sun/font/TextLabelFactory.java.i
-data/src/share/classes/java/awt/KeyEventPostProcessor.java.i
+data/src/share/classes/sun/java2d/SurfaceData.java.i
+data/test/com/sun/jdi/DebuggerThreadTest.java.i
data/test/javax/script/Test8.java.i
data/src/share/native/sun/font/layout/Features.h.i
data/test/javax/naming/Name/Serialized13Name.java.i
data/src/share/classes/java/awt/image/ImageObserver.java.i
data/test/javax/swing/plaf/metal/MetalBorders/Test6657026.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c.i
-data/src/share/classes/javax/security/sasl/RealmChoiceCallback.java.i
+data/src/share/classes/sun/nio/cs/MS1254.java.i
data/test/javax/management/loading/MLetCLR/policy.i
-data/test/java/io/Serializable/unresolvedClassDesc/Foo.java.i
-data/test/java/nio/charset/coders/ref.windows-31j.i
+data/test/java/util/Locale/serialized/java6locale_iw_IL.i
+data/src/share/classes/sun/tools/jar/CommandLine.java.i
data/src/share/classes/com/sun/jndi/toolkit/dir/DirSearch.java.i
data/test/java/math/BigInteger/BigIntegerTest.java.i
data/src/share/classes/sun/text/resources/FormatData_hu_HU.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpIpAddress.java.i
data/src/solaris/classes/sun/nio/ch/SolarisEventPort.java.i
data/src/share/classes/sun/net/idn/StringPrepDataReader.java.i
-data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java.i
+data/test/javax/swing/JScrollPane/6559589/bug6559589.java.i
+data/test/javax/swing/UITest/UITest.java.i
data/test/java/io/File/SetReadOnly.java.i
data/src/share/classes/java/security/cert/PKIXReason.java.i
data/src/share/classes/javax/print/attribute/standard/JobSheets.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java.i
data/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp.i
data/src/share/classes/javax/management/openmbean/CompositeType.java.i
data/src/share/classes/sun/awt/FocusingTextField.java.i
data/src/share/classes/sun/swing/CachedPainter.java.i
data/src/share/classes/sun/swing/icon/SortArrowIcon.java.i
data/src/share/native/com/sun/java/util/jar/pack/jni.cpp.i
-data/make/tools/CharsetMapping/MacDingbat.map.i
+data/test/java/lang/annotation/Missing/MissingTest.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java.i
-data/src/share/sample/README.i
-data/src/share/classes/javax/swing/event/ListSelectionListener.java.i
+data/src/share/classes/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java.i
+data/src/solaris/sample/dtrace/hotspot/method_compile_stat.d.i
data/test/java/lang/invoke/RicochetTest.java.i
-data/src/share/classes/sun/reflect/UTF8.java.i
-data/test/java/util/logging/LoggingDeadlock.java.i
+data/src/share/classes/sun/rmi/transport/tcp/MultiplexOutputStream.java.i
+data/make/tools/src/build/tools/commentchecker/CommentChecker.java.i
data/test/java/net/URLClassLoader/closetest/test1/com/foo/TestClass1.java.i
data/test/javax/management/MBeanInfo/TooManyFooTest.java.i
-data/make/netbeans/swing/build.properties.i
+data/src/share/native/java/lang/fdlibm/src/k_sin.c.i
data/src/share/classes/sun/invoke/anon/InvalidConstantPoolFormatException.java.i
-data/src/share/classes/javax/swing/border/BevelBorder.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509SKI.java.i
data/src/share/classes/java/awt/doc-files/Scrollbar-1.gif.i
-data/src/share/demo/management/JTop/JTopPlugin.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureMethod.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.i
+data/src/share/classes/sun/io/CharToByteCp1144.java.i
data/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java.i
data/test/java/lang/invoke/JavaDocExamplesTest.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO_8859_8.java.i
+data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnss3.so.d
data/test/javax/management/remote/mandatory/passwordAuthenticator/jmxremote.password-alt.i
-data/src/share/classes/javax/accessibility/AccessibleExtendedText.java.i
+data/test/sun/tools/jconsole/ResourceCheckTest.java.i
data/test/java/io/Serializable/evolution/AddedField/ReadAddedField.java.i
-data/src/share/classes/sun/management/MemoryPoolImpl.java.i
+data/test/javax/sound/midi/Gervill/SF2SoundbankReader/ding.sf2.i
data/src/share/classes/com/sun/servicetag/UnauthorizedAccessException.java.i
data/test/sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java.i
data/test/java/beans/XMLEncoder/java_awt_Dimension.java.i
-data/test/java/io/Serializable/noSuchFieldClarification/NoSuchFieldClarification.java.i
-data/src/share/classes/com/sun/media/sound/SoftSincResampler.java.i
+data/test/java/security/cert/pkix/policyChanges/ee.cer.i
+data/src/share/classes/java/dyn/MethodType.java.i
data/src/share/classes/com/sun/net/httpserver/HttpsExchange.java.i
-data/test/javax/management/remote/mandatory/subjectDelegation/policy22.i
-data/make/tools/strip_properties/Makefile.i
+data/src/share/classes/sun/reflect/generics/tree/TypeSignature.java.i
+data/test/java/awt/GridLayout/LayoutExtraGaps/LayoutExtraGaps.java.i
data/src/windows/classes/com/sun/tools/jdi/SunSDK.java.i
-data/test/java/rmi/registry/checkusage/CheckUsage.java.i
+data/test/java/awt/dnd/ImageDecoratedDnD/MyCursor.java.i
data/test/java/io/charStreams/SmallReads.java.i
+data/test/com/sun/net/httpserver/Test7a.java.i
data/src/windows/native/sun/windows/awt_BitmapUtil.h.i
data/test/java/lang/annotation/loaderLeak/B.java.i
data/src/solaris/classes/sun/awt/motif/MFontPeer.java.i
-data/make/tools/src/build/tools/generatecharacter/CharacterName.java.i
+data/test/java/nio/channels/Selector/ReadAfterConnect.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetPropertyInfo.java.i
data/test/java/net/URLConnection/6212146/test.sh.i
-data/test/java/rmi/reliability/benchmark/bench/serial/SmallObjTrees.java.i
-data/src/share/classes/sun/java2d/pipe/hw/AccelTypedVolatileImage.java.i
+data/test/javax/crypto/CryptoPermission/AllPermCheck.java.i
+data/test/java/lang/reflect/Array/ExceedMaxDim.java.i
data/test/java/beans/PropertyEditor/6380849/FirstBeanEditor.java.i
-data/test/javax/management/eventService/LeaseTest.java.i
-data/src/share/classes/sun/util/resources/CalendarData_be.properties.i
+data/src/share/classes/javax/swing/plaf/metal/MetalMenuBarUI.java.i
+data/src/share/classes/sun/beans/editors/ByteEditor.java.i
data/src/share/classes/javax/swing/DefaultComboBoxModel.java.i
-data/src/share/classes/java/util/BitSet.java.i
+data/src/share/classes/javax/swing/colorchooser/CenterLayout.java.i
data/src/share/classes/java/security/spec/ECPoint.java.i
-data/test/sun/tools/jrunscript/jrunscript-fTest.sh.i
-data/src/share/classes/com/sun/beans/finder/ClassFinder.java.i
-data/src/share/classes/java/awt/Component.java.i
-data/test/sun/nio/cs/SurrogateTestEUCTW.plane3.surrogates.i
+data/test/sun/nio/cs/OLD/IBM933_OLD.java.i
+data/src/share/classes/sun/io/ByteToCharCp970.java.i
+data/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java.i
data/src/share/classes/sun/misc/JarFilter.java.i
data/src/share/classes/javax/print/attribute/HashPrintServiceAttributeSet.java.i
-data/src/share/classes/javax/swing/text/html/BlockView.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/NewSoftTuning.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java.i
-data/src/share/demo/jvmti/hprof/hprof_tag.h.i
+data/test/sun/security/tools/policytool/SaveAs.html.i
data/test/sun/text/resources/Format/Bug5096553.java.i
-data/src/share/classes/javax/imageio/spi/IIOServiceProvider.java.i
+data/src/share/classes/sun/rmi/transport/TransportConstants.java.i
data/test/java/net/InetAddress/Simple1NameServiceDescriptor.java.i
-data/src/share/demo/README.i
-data/src/share/native/sun/awt/image/cvutils/README.i
-data/src/solaris/native/sun/management/FileSystemImpl.c.i
+data/test/sun/misc/Encode/DecodeBuffer.java.i
+data/test/org/openjdk/jigsaw/ModuleInfoBuilder.java.i
data/test/java/lang/annotation/UnitTest.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalVmManager.java.i
+data/src/share/classes/sun/print/PSStreamPrintJob.java.i
data/src/share/classes/sun/security/ssl/SSLContextImpl.java.i
data/src/share/native/sun/font/FontInstanceAdapter.cpp.i
data/make/java/zip/reorder-i586.i
-data/src/share/classes/sun/awt/resources/awt_ko.properties.i
+data/src/share/classes/sun/util/resources/CalendarData_lt.properties.i
data/src/share/sample/jmx/jmx-scandir/nbproject/netbeans-targets.xml.i
data/test/sun/security/tools/keytool/i18n.sh.i
-data/src/share/native/java/lang/fdlibm/src/s_ilogb.c.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c.i
data/src/share/classes/overview-bundled.html.i
-data/src/solaris/classes/sun/awt/motif/MMouseDragGestureRecognizer.java.i
+data/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement3.java.i
data/src/share/classes/sun/security/provider/DSAPublicKey.java.i
-data/src/share/classes/java/security/interfaces/DSAPrivateKey.java.i
-data/src/share/classes/sun/net/NetworkClient.java.i
+data/test/java/nio/channels/Pipe/EmptyRead.java.i
data/src/solaris/doc/sun/man/man1/policytool.1.i
data/test/javax/sound/midi/Gervill/SoftLinearResampler2/Interpolate.java.i
data/src/share/classes/com/sun/imageio/plugins/gif/GIFStreamMetadata.java.i
data/src/share/classes/sun/awt/datatransfer/ToolkitThreadBlockedHandler.java.i
-data/test/sun/security/krb5/auto/AcceptorSubKey.java.i
+data/src/solaris/hpi/include/largefile_linux.h.i
+data/test/java/io/Serializable/packageAccess/A.java.i
data/test/java/beans/XMLDecoder/4676532/Test4676532.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh.i
data/src/share/classes/sun/text/resources/FormatData_iw_IL.java.i
data/src/share/classes/javax/management/NotificationEmitter.java.i
+data/test/sun/nio/cs/OLD/IBM948_OLD.java.i
data/src/share/classes/javax/naming/NameImpl.java.i
data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.java.i
data/test/java/io/Serializable/enum/constantSubclasses/Read.java.i
@@ -19385,41 +20163,44 @@ data/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java.i
data/test/java/net/ProxySelector/NullArguments.java.i
data/src/windows/hpi/src/memory_md.c.i
data/test/sun/java2d/cmm/ColorConvertOp/SRGB.png.d
-data/test/java/awt/FileDialog/MultipleMode/MultipleMode.html.i
+data/src/share/classes/sun/tools/tree/AssignAddExpression.java.i
data/src/share/sample/jmx/jmx-scandir/truststore.i
data/test/javax/imageio/plugins/gif/GifTransparencyTest.java.i
-data/src/share/demo/jfc/CodePointIM/README_ja.html.i
+data/src/macosx/classes/com/apple/eawt/AppForegroundListener.java.i
+data/src/share/classes/com/sun/media/sound/AbstractLine.java.i
data/src/share/classes/sun/nio/ch/NativeObject.java.i
+data/src/share/classes/sun/nio/ch/sctp/SctpStdSocketOption.java.i
data/make/javax/swing/html32dtd/Makefile.i
-data/src/share/classes/com/sun/net/httpserver/spi/package-info.java.i
+data/make/common/Program.gmk.i
data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameUI.java.i
-data/test/java/net/Socket/asyncClose/AsyncCloseTest.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/DynamicTest.java.i
+data/test/javax/management/MBeanServer/MBeanServerNotificationTest.java.i
+data/test/sun/security/pkcs11/Secmod/secmod.db.i
data/make/tools/swing-beans/beaninfo/images/JFileChooserMono16.gif.i
-data/src/share/classes/javax/management/remote/JMXConnectorServer.java.i
+data/src/solaris/classes/sun/java2d/xr/XRCompositeManager.java.i
data/test/java/net/InetAddress/CheckJNI.java.i
data/test/org/openjdk/jigsaw/services/hello.sh.i
data/src/share/classes/sun/java2d/SunGraphicsEnvironment.java.i
-data/make/tools/GenerateCharacter/CharacterData02.java.template.i
+data/src/windows/hpi/src/path_md.c.i
data/test/tools/launcher/libraryCaller.java.i
-data/test/java/rmi/activation/ActivationSystem/modifyDescriptor/rmid.security.policy.i
+data/test/sun/net/www/MarkResetTest.java.i
data/test/java/io/Serializable/validate/Validate.java.i
-data/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.i
-data/src/share/demo/jvmti/hprof/hprof_b_spec.h.i
+data/test/java/beans/Beans/6669869/TestDesignTime.java.i
+data/test/java/io/Serializable/subclass/Test.java.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java.i
data/src/share/classes/com/sun/security/sasl/ntlm/FactoryImpl.java.i
+data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java.i
data/src/share/classes/com/sun/crypto/provider/KeyProtector.java.i
data/src/share/classes/java/awt/peer/package.html.i
data/src/share/classes/sun/misc/resources/Messages_sv.java.i
-data/src/share/classes/com/sun/jmx/snmp/tasks/Task.java.i
-data/test/javax/xml/crypto/dsig/data/certs/lugh.crt.i
+data/src/share/classes/java/awt/Adjustable.java.i
+data/test/sun/nio/cs/EUCJPUnderflowDecodeTest.java.i
data/test/org/openjdk/jigsaw/optional-base.sh.i
data/src/share/classes/javax/xml/crypto/dsig/spec/XPathType.java.i
data/src/share/classes/java/security/cert/CertStoreSpi.java.i
data/test/java/nio/channels/DatagramChannel/SocketOptionTests.java.i
data/test/javax/swing/UIDefaults/6795356/SwingLazyValueTest.java.i
data/src/share/classes/sun/tools/tree/LongExpression.java.i
-data/test/java/awt/Toolkit/Headless/AWTEventListener/AWTListener.java.i
+data/test/java/io/Serializable/superclassDataLoss/run.sh.i
data/src/windows/native/sun/windows/DllUtil.h.i
data/test/java/awt/datatransfer/DragUnicodeBetweenJVMTest/DragUnicodeBetweenJVMTest.html.i
data/test/java/lang/instrument/PremainClass/InheritAgent1100.java.i
@@ -19429,16 +20210,17 @@ data/test/java/lang/instrument/ManifestTestAgent.java.i
data/test/java/nio/Buffer/CopyDirectCharMemory.java.i
data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorDataException.java.i
data/test/java/net/URLConnection/Redirect307Test.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_GT.properties.i
-data/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.java.i
-data/test/java/beans/Introspector/Test4918902.java.i
-data/test/java/security/KeyRep/SerialOld.policy.i
+data/test/com/sun/nio/sctp/SctpChannel/Connect.java.i
+data/test/java/net/URLClassLoader/getresourceasstream/test.jar.i
+data/src/share/classes/sun/io/CharToByteCp420.java.i
+data/src/share/classes/java/awt/font/LineMetrics.java.i
data/src/share/classes/sun/tools/jconsole/Utilities.java.i
data/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java.i
-data/src/share/classes/sun/io/CharToByteCp870.java.i
-data/src/share/classes/javax/sql/rowset/spi/XmlWriter.java.i
+data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_Util.c.i
+data/src/share/instrument/Utilities.h.i
data/src/solaris/classes/sun/nio/fs/UnixDirectoryStream.java.i
-data/src/share/native/sun/font/layout/HanLayoutEngine.cpp.i
+data/src/share/classes/javax/management/relation/RelationServiceNotRegisteredException.java.i
+data/src/macosx/native/jobjc/src/core/native/Function.m.i
data/src/share/classes/javax/management/JMRuntimeException.java.i
data/test/java/security/Security/signedfirst/DynSignedProvFirst.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/DelegatedTaskWrongException.java.i
@@ -19448,47 +20230,47 @@ data/src/share/classes/org/openjdk/jigsaw/Manifest.java.i
data/src/share/classes/javax/swing/text/BoxView.java.i
data/src/share/classes/sun/security/x509/CertificateIssuerUniqueIdentity.java.i
data/test/java/nio/file/Files/grantTopOnly.policy.i
-data/src/share/classes/java/sql/BatchUpdateException.java.i
+data/test/java/io/Serializable/class/SerialA_1.java.i
data/test/sun/security/pkcs11/nss/lib/linux-i586/libplds4.so.i
-data/src/share/classes/sun/nio/ch/NativeDispatcher.java.i
+data/src/solaris/classes/sun/nio/cs/ext/COMPOUND_TEXT_Encoder.java.i
data/src/share/classes/java/security/spec/RSAPrivateCrtKeySpec.java.i
-data/src/share/classes/com/sun/jdi/connect/LaunchingConnector.java.i
+data/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java.i
data/test/tools/launcher/CreatePlatformFile.java.i
data/src/share/classes/javax/swing/event/ChangeEvent.java.i
data/src/share/classes/com/sun/security/jgss/AuthorizationDataEntry.java.i
data/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c.i
data/src/share/classes/javax/xml/crypto/package.html.i
-data/src/windows/native/sun/windows/awt_Multimon.h.i
-data/test/com/sun/servicetag/InvalidServiceTag.java.i
+data/test/javax/management/Introspector/ImmutableNotificationInfoTest.java.i
+data/test/sun/tools/jrunscript/hello.js.i
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/ibutton.cert.i
data/test/java/beans/Introspector/BeanUtils.java.i
-data/src/share/classes/java/nio/file/attribute/AclFileAttributeView.java.i
+data/src/windows/native/sun/windows/awt_TextArea.h.i
data/test/java/io/PipedInputStream/WriterLoop.java.i
data/src/share/classes/javax/swing/plaf/nimbus/package.html.i
-data/src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java.i
data/src/windows/native/sun/tools/attach/WindowsVirtualMachine.c.i
data/src/share/classes/sun/tools/jconsole/Tab.java.i
-data/make/common/Defs-solaris.gmk.i
+data/src/share/classes/sun/java2d/pipe/AAShapePipe.java.i
data/src/share/classes/sun/security/x509/AVA.java.i
-data/src/share/classes/sun/util/resources/CalendarData_sr_Latn_RS.properties.i
+data/src/share/demo/jfc/Metalworks/resources/HelpFiles/javalogo.gif.i
data/test/javax/swing/JScrollPane/Test6526631.java.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java.i
-data/src/share/classes/sun/java2d/pipe/ValidatePipe.java.i
+data/test/sun/rmi/transport/tcp/blockAccept/TestImpl_Stub.java.i
+data/test/java/lang/Class/forName/Z.java.i
data/test/javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmMemManagerEntryMBean.java.i
data/src/share/classes/sun/security/ssl/KerberosClientKeyExchange.java.i
data/src/share/classes/sun/security/ssl/RandomCookie.java.i
-data/src/share/classes/javax/sound/sampled/AudioInputStream.java.i
-data/src/share/native/com/sun/media/sound/DirectAudioDevice.c.i
+data/test/javax/rmi/ssl/SSLSocketParametersTest.sh.i
+data/src/solaris/native/sun/awt/awt_Button.c.i
data/test/java/io/Serializable/unnamedPackageSwitch/run.sh.i
data/test/sun/security/pkcs11/nss/lib/solaris-amd64/libplds4.so.i
data/src/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java.i
-data/src/share/native/sun/java2d/opengl/OGLFuncs.h.i
data/test/sun/nio/cs/TestMiscEUC_JP.java.i
-data/make/tools/CharsetMapping/extsbcs.i
-data/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java.i
+data/test/java/beans/Introspector/memory/Test4508780.java.i
+data/src/share/native/sun/font/layout/ContextualSubstSubtables.h.i
data/src/share/native/sun/java2d/opengl/OGLSurfaceData.h.i
-data/src/share/classes/javax/management/event/EventForwarder.java.i
+data/src/share/classes/java/awt/image/BandCombineOp.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Des3CbcHmacSha1KdEType.java.i
data/test/sun/nio/cs/Test6275027.java.i
data/src/share/classes/sun/tools/jconsole/HTMLPane.java.i
@@ -19497,53 +20279,55 @@ data/make/mkdemo/applets/SpreadSheet/Makefile.i
data/test/java/net/DatagramSocket/DatagramTimeout.java.i
data/test/sun/security/pkcs12/PKCS12SameKeyId.java.i
data/src/share/demo/jvmti/compiledMethodLoad/README.txt.i
-data/test/javax/print/attribute/PSCopiesFlavorTest.java.i
+data/src/share/classes/sun/security/x509/IPAddressName.java.i
data/test/java/beans/XMLEncoder/java_awt_RadialGradientPaint.java.i
data/src/share/classes/com/sun/jdi/IncompatibleThreadStateException.java.i
data/src/share/classes/javax/naming/directory/InvalidSearchFilterException.java.i
-data/test/sun/tools/jps/jps-Vvml_Output1.awk.i
-data/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java.i
+data/src/solaris/native/sun/awt/awt_xembed_server.c.i
+data/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfo.java.i
data/make/tools/src/build/tools/compileproperties/CompileProperties.java.i
-data/src/share/classes/com/sun/net/httpserver/Filter.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiProgressBarUI.java.i
data/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_GR.properties.i
-data/test/com/sun/jdi/ControlFlow.java.i
+data/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java.i
data/src/share/native/sun/java2d/cmm/lcms/cmsmtrx.c.i
data/test/sun/security/pkcs11/Secmod/nss.cfg.i
data/test/java/awt/font/NumericShaper/MTTest.java.i
data/test/java/util/LinkedHashMap/Cache.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_ca.properties.i
+data/test/java/net/URL/TestRFC2732.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization_zh_CN.properties.i
data/src/share/native/com/sun/media/sound/MidiOutDeviceProvider.c.i
+data/src/macosx/classes/com/apple/laf/ScreenMenuPropertyListener.java.i
data/src/share/classes/javax/swing/plaf/LayerUI.java.i
-data/src/share/classes/javax/swing/AbstractSpinnerModel.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames_ko.java.i
+data/src/solaris/classes/sun/awt/X11/XRootWindow.java.i
+data/src/solaris/hpi/native_threads/include/threads_md.h.i
data/test/com/sun/jdi/FinalizerTest.java.i
data/src/share/classes/sun/rmi/rmic/newrmic/jrmp/JrmpGenerator.java.i
-data/src/share/classes/java/nio/file/LinkPermission.java.i
-data/test/com/sun/security/sasl/PropertiesFileCallbackHandler.java.i
+data/src/share/classes/com/sun/media/sound/SimpleSoundbank.java.i
+data/test/java/awt/Modal/NpeOnClose/NpeOnCloseTest.java.i
data/src/share/classes/com/sun/jdi/connect/spi/TransportService.java.i
-data/test/javax/print/applet/applet0/Applet0.java.i
+data/test/javax/sound/midi/File/SMPTESequence.java.i
data/src/share/classes/sun/security/x509/X509CRLEntryImpl.java.i
+data/src/macosx/native/sun/awt/CMenu.h.i
data/test/java/lang/module/module-info-annotation.sh.i
data/src/windows/native/sun/java2d/windows/Win32SurfaceData.h.i
-data/src/share/classes/sun/tools/asm/LocalVariableTable.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformC14NWithComments.java.i
-data/test/java/nio/file/DirectoryStream/Basic.java.i
-data/make/sun/rmi/rmi/mapfile-vers.i
-data/test/sun/security/ssl/javax/net/ssl/TLSv11/EmptyCertificateAuthorities.java.i
+data/src/share/classes/sun/util/resources/CurrencyNames_tr_TR.properties.i
+data/src/share/classes/sun/net/www/content/text/plain.java.i
+data/test/java/nio/Buffer/BasicChar.java.i
+data/src/share/classes/sun/tools/jconsole/LocalVirtualMachine.java.i
+data/make/tools/CharsetMapping/IBM863.map.i
data/src/share/classes/sun/security/x509/CRLDistributionPointsExtension.java.i
data/src/share/classes/sun/management/snmp/AdaptorBootstrap.java.i
data/src/share/native/sun/font/layout/AnchorTables.cpp.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/AnnotationParser.java.i
-data/src/share/classes/sun/nio/cs/ext/IBM285.java.i
+data/test/java/util/Locale/icuLocales.txt.i
data/src/share/native/common/jio.c.i
-data/src/share/classes/sun/security/ssl/Record.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/GRAY.png.i
data/src/share/native/sun/font/layout/SunLayoutEngine.cpp.i
data/src/windows/native/sun/jkernel/kernel_sv.rc.i
-data/src/solaris/native/sun/font/X11FontScaler.c.i
-data/src/share/instrument/EncodingSupport.c.i
-data/src/share/classes/sun/java2d/pipe/LoopPipe.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/GetReceiver2.java.i
+data/src/share/back/eventHandler.h.i
+data/test/com/sun/management/OperatingSystemMXBean/GetCommittedVirtualMemorySize.java.i
data/src/share/classes/java/nio/channels/AsynchronousChannel.java.i
data/test/java/nio/file/Files/probeContentType/SimpleFileTypeDetector.java.i
data/src/share/classes/org/openjdk/jigsaw/cli/Packager.java.i
@@ -19552,143 +20336,151 @@ data/src/share/classes/javax/management/MBeanServerInvocationHandler.java.i
data/src/windows/native/sun/jkernel/kernel.rc.i
data/src/share/classes/java/util/ConcurrentModificationException.java.i
data/src/solaris/native/sun/net/spi/DefaultProxySelector.c.i
-data/src/share/classes/com/sun/crypto/provider/DHKeyFactory.java.i
-data/src/share/classes/java/dyn/FilterOneArgument.java.i
-data/src/solaris/sample/dtrace/hotspot_jni/hotspot_jni_calls_tree.d.i
+data/src/share/classes/com/sun/media/sound/ModelStandardIndexedDirector.java.i
+data/src/share/classes/sun/text/resources/FormatData_uk_UA.java.i
+data/test/java/lang/Thread/GenerifyStackTraces.java.i
+data/test/java/awt/PrintJob/MultipleEnd/MultipleEnd.java.i
data/make/netbeans/common/unix-view.ent.i
data/src/share/classes/javax/naming/spi/NamingManager.java.i
-data/src/share/classes/sun/security/provider/certpath/CollectionCertStore.java.i
+data/test/javax/management/ObjectName/DelegateNameWildcardNameTest.java.i
data/test/sun/net/www/protocol/http/B6641309.java.i
-data/src/share/classes/sun/tools/jar/resources/jar.properties.i
-data/src/share/native/sun/java2d/loops/UshortIndexed.h.i
+data/src/solaris/classes/sun/print/services/javax.print.PrintServiceLookup.i
+data/test/javax/swing/border/Test4243289.java.i
data/test/sun/security/krb5/auto/NewSalt.java.i
-data/test/java/awt/Window/TranslucentShapedFrameTest/TSFrame.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/SubbufferLong.java.i
+data/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0100.java.i
data/test/javax/sound/midi/Gervill/SoftSynthesizer/ImplicitOpenClose.java.i
-data/src/share/classes/java/nio/channels/Selector.java.i
-data/src/share/classes/sun/reflect/ByteVectorFactory.java.i
+data/src/windows/native/sun/java2d/windows/ddrawObject.h.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/ClientTimeout.java.i
data/src/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java.i
-data/src/share/native/sun/java2d/cmm/lcms/cmsxform.c.i
+data/test/java/io/pathNames/GeneralWin32.java.i
+data/src/windows/native/sun/windows/security_warning_bw.ico.i
data/src/windows/classes/sun/misc/OSEnvironment.java.i
data/src/share/native/sun/security/ec/ecp_jac.c.i
data/test/java/lang/instrument/appendToClassLoaderSearch/run_tests.sh.i
data/src/windows/classes/sun/awt/windows/fontconfig.properties.i
-data/test/javax/swing/JTable/6735286/bug6735286.java.i
+data/src/share/classes/sun/nio/cs/ext/MacCroatian.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java.i
data/test/javax/swing/JFileChooser/6738668/security.policy.i
-data/src/share/demo/jvmti/hprof/hprof_object.c.i
+data/test/javax/sound/midi/Gervill/SoftAudioSynthesizer/Open.java.i
data/src/share/classes/javax/management/namespace/package-info.java.i
-data/src/share/classes/javax/imageio/metadata/package.html.i
+data/test/java/beans/XMLEncoder/Test5023550.java.i
data/src/share/classes/javax/swing/text/DefaultHighlighter.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/MonitoredHostProvider.java.i
+data/test/javax/crypto/spec/DESKeySpec/CheckWeakKeys.java.i
data/src/share/classes/java/awt/Canvas.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ja.properties.i
-data/make/tools/src/build/tools/jarsplit/JarSplit.java.i
-data/make/sun/xawt/mapfile-vers.i
+data/src/share/classes/sun/text/resources/CollationData_ro.java.i
+data/src/share/native/sun/font/layout/LETypes.h.i
+data/test/java/io/charStreams/StringGenerator.java.i
+data/src/macosx/classes/com/apple/laf/ScreenMenuItemCheckbox.java.i
data/src/share/classes/javax/security/auth/callback/TextInputCallback.java.i
-data/src/share/classes/sun/security/pkcs11/P11TlsPrfGenerator.java.i
-data/src/linux/doc/man/rmic.1.i
+data/src/share/classes/java/lang/IllegalThreadStateException.java.i
+data/src/share/classes/sun/reflect/MethodAccessor.java.i
+data/src/macosx/classes/com/apple/laf/ScreenMenuItem.java.i
data/src/share/classes/com/sun/jdi/event/MonitorWaitedEvent.java.i
data/test/java/beans/XMLEncoder/javax_swing_tree_TreePath.java.i
data/test/java/io/Serializable/evolution/AddedExternField/ReadAddedField.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c.i
-data/src/share/classes/com/sun/security/ntlm/Client.java.i
+data/test/java/security/KeyRep/SerialOld.policy.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTextPaneUI.java.i
-data/src/share/classes/javax/print/attribute/ResolutionSyntax.java.i
+data/test/javax/swing/JInternalFrame/6726866/bug6726866.java.i
data/src/share/classes/java/security/interfaces/package.html.i
data/src/share/demo/jvmti/hprof/hprof_string.h.i
data/src/share/demo/management/JTop/META-INF/services/com.sun.tools.jconsole.JConsolePlugin.i
-data/src/share/classes/java/lang/ArrayStoreException.java.i
-data/src/share/classes/javax/management/ClientContext.java.i
+data/test/java/lang/reflect/Proxy/ClassRestrictions.java.i
+data/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java.i
data/test/javax/security/auth/Subject/Synch3.java.i
data/src/share/classes/sun/security/action/GetBooleanSecurityPropertyAction.java.i
data/src/share/classes/sun/io/ByteToCharCp857.java.i
+data/test/java/lang/Math/ExactArithTests.java.i
data/test/org/openjdk/jigsaw/InstallFromRepo.java.i
-data/src/share/classes/java/util/Enumeration.java.i
+data/src/share/classes/javax/management/AttributeChangeNotificationFilter.java.i
data/src/share/classes/com/sun/jndi/ldap/BasicControl.java.i
data/src/share/classes/java/awt/color/CMMException.java.i
-data/src/share/native/sun/awt/image/jpeg/jcdctmgr.c.i
-data/src/share/classes/sun/text/resources/FormatData_ar_JO.java.i
-data/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java.i
+data/test/javax/sound/midi/Gervill/SoftTuning/Load6.java.i
+data/make/README.i
data/src/share/classes/java/io/BufferedWriter.java.i
data/test/java/security/MessageDigest/ByteBuffers.java.i
-data/src/share/classes/com/sun/jdi/request/BreakpointRequest.java.i
-data/test/java/beans/XMLDecoder/spec/TestInt.java.i
+data/src/share/native/sun/java2d/loops/MaskBlit.c.i
+data/test/javax/management/ImplementationVersion/policy.i
data/src/share/classes/java/awt/im/InputMethodRequests.java.i
data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/TestUtils.java.i
data/test/sun/net/www/http/ChunkedOutputStream/checkError.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/JmxMBeanServerBuilder.java.i
+data/src/share/classes/sun/font/TextLineComponent.java.i
data/src/share/native/java/lang/fdlibm/src/s_cos.c.i
data/src/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_DO.properties.i
-data/src/share/native/java/lang/Runtime.c.i
-data/test/java/security/cert/CertificateFactory/invalidEncodedCerts/invalidcert.pem.i
+data/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java.i
+data/test/java/text/Format/DateFormat/Bug4396385.java.i
+data/src/share/classes/sun/nio/ch/FileLockImpl.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpIncomingResponse.java.i
data/src/share/classes/java/awt/image/ConvolveOp.java.i
data/src/share/classes/sun/security/pkcs/PKCS8Key.java.i
data/test/javax/imageio/plugins/jpeg/ConcurrentReadingTest.java.i
data/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapBlock.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/params/XPathContainer.java.i
data/test/sun/tools/jhat/ParseTest.sh.i
data/test/javax/security/auth/Subject/doAs/policy.i
-data/src/share/demo/nbproject/jfc/SampleTree/nbproject/file-targets.xml.i
+data/test/javax/crypto/Mac/TestGetInstance.java.i
data/test/sun/security/x509/AVA/Allow.policy.i
data/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java.i
-data/test/tools/jar/index/MetaInf.java.i
+data/test/javax/swing/JSlider/6348946/bug6348946.java.i
data/src/share/classes/java/security/cert/CertStoreException.java.i
data/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java.i
-data/src/share/classes/java/beans/PropertyChangeSupport.java.i
-data/make/java/jli/mapfile-vers.i
+data/test/java/util/concurrent/FutureTask/DoneTimedGetLoops.java.i
+data/test/com/sun/servicetag/environ.properties.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/report/HTMLSeriesReporter.java.i
data/test/demo/jvmti/hprof/StackMapTableTest.java.i
-data/src/windows/native/sun/jkernel/kernel.def.i
+data/test/java/io/Serializable/duplicateSerialFields/Setup.java.i
data/test/java/nio/channels/FileChannel/ScatteringRead.java.i
data/src/solaris/classes/sun/awt/X11/generator/xlibtypes.txt.i
data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_ko.properties.i
data/test/org/openjdk/jigsaw/hello-optional.sh.i
data/src/share/classes/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java.i
+data/src/share/classes/com/sun/nio/sctp/Notification.java.i
data/test/sun/nio/cs/SurrogateTestEUCTW.plane6.surrogates.i
data/test/java/util/Timer/Args.java.i
data/src/share/classes/sun/io/ByteToCharISO8859_9.java.i
-data/src/share/classes/sun/text/resources/FormatData_sq.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/TestProvider.java.i
data/test/sun/util/resources/TimeZone/Bug6271396.java.i
data/test/com/sun/crypto/provider/Cipher/DES/DesAPITest.java.i
data/test/sun/security/pkcs11/fips/certs/anchor.cer.i
-data/src/share/classes/java/util/prefs/package.html.i
-data/src/share/classes/java/util/spi/LocaleServiceProvider.java.i
-data/src/share/native/sun/java2d/loops/ThreeByteBgr.c.i
-data/src/share/classes/javax/net/ssl/TrustManagerFactory.java.i
-data/test/java/io/File/Create.java.i
+data/test/javax/imageio/CachePremissionsTest/CachePermissionsTest.java.i
+data/src/share/classes/sun/security/tools/JarSignerResources_ja.java.i
+data/src/share/native/java/util/zip/zlib-1.2.5/zlib.h.i
+data/test/sun/tools/native2ascii/A2N_4630463.i
+data/test/com/sun/tools/attach/java.policy.allow.i
data/src/share/native/common/jlong.h.i
data/src/share/native/sun/awt/image/cvutils/img_orddither.h.i
data/test/sun/security/krb5/auto/MoreKvno.java.i
data/src/solaris/classes/sun/nio/ch/SctpResultContainer.java.i
+data/src/share/demo/java2d/J2DBench/resources/images/photo.jpg.i
data/src/share/classes/java/lang/Character.java.i
-data/src/share/classes/com/sun/jmx/defaults/package.html.i
+data/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c.i
data/src/solaris/classes/sun/java2d/opengl/GLXSurfaceData.java.i
data/test/java/util/Formatter/BasicShort.java.i
-data/src/share/demo/nbproject/jfc/SwingApplet/build.xml.i
+data/test/java/rmi/registry/interfaceHash/InterfaceHash.java.i
data/test/java/util/Formatter/BasicCharObject.java.i
-data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java.i
+data/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/BadKSProvider.java.i
-data/src/share/classes/java/lang/OutOfMemoryError.java.i
-data/src/share/classes/java/awt/doc-files/CheckboxGroup-1.gif.i
+data/src/share/demo/jvmti/hprof/hprof_tag.h.i
+data/src/windows/native/sun/windows/awt_PrintDialog.cpp.i
data/src/share/classes/sun/util/resources/CalendarData_is.properties.i
data/test/java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.html.i
-data/src/share/classes/java/math/package-info.java.i
-data/src/share/classes/com/sun/crypto/provider/DESParameters.java.i
-data/test/com/sun/tools/extcheck/TestExtcheckArgs.java.i
+data/src/solaris/classes/sun/awt/motif/MScrollPanePeer.java.i
+data/src/macosx/native/com/apple/laf/ScreenMenu.m.i
+data/test/java/lang/instrument/bootreporter/StringIdCallbackReporter.java.i
+data/test/java/nio/file/Files/walkFileTree/MaxDepth.java.i
data/test/java/lang/Class/getMethods/StarInheritance.java.i
-data/make/tools/CharsetMapping/KOI8_R.map.i
+data/test/java/awt/Color/OpacityChange/OpacityChange.java.i
data/test/java/io/PushbackReader/MarkReset.java.i
data/src/share/classes/sun/font/FileFont.java.i
data/test/java/io/charStreams/LineLengthsSource.java.i
data/src/share/classes/com/sun/accessibility/internal/resources/accessibility_en.properties.i
-data/src/share/classes/java/awt/color/ColorSpace.java.i
-data/test/java/rmi/activation/CommandEnvironment/NullOptions.java.i
+data/src/solaris/native/sun/awt/awt_Selection.c.i
+data/test/sun/rmi/rmic/defaultStubVersion/G1.java.i
data/src/share/classes/java/awt/EventFilter.java.i
-data/test/com/sun/jdi/RedefineImplementor.sh.i
-data/src/share/classes/java/lang/annotation/IncompleteAnnotationException.java.i
+data/src/share/classes/sun/security/ssl/Alerts.java.i
+data/src/share/classes/sun/io/ByteToCharCp424.java.i
data/test/java/nio/charset/coders/Surrogate.java.i
data/src/share/classes/com/sun/imageio/plugins/png/PNGImageReaderSpi.java.i
data/src/share/classes/sun/awt/resources/awt_es.properties.i
@@ -19696,66 +20488,71 @@ data/test/javax/crypto/SecretKeyFactory/Provider1.java.i
data/test/com/sun/org/apache/xml/internal/security/signature-enveloping-hmac-sha1-trunclen-8-attack.xml.i
data/test/sun/nio/cs/TestIBM1364.java.i
data/src/share/native/sun/awt/image/cvutils/img_scaleloop.h.i
-data/test/java/nio/channels/Selector/ByteServer.java.i
-data/src/share/classes/java/util/TimerTask.java.i
+data/src/share/classes/sun/util/resources/CalendarData_pt.properties.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/HasNextChunk.java.i
data/test/sun/security/krb5/tools/KtabCheck.java.i
data/src/share/classes/sun/rmi/server/UnicastServerRef2.java.i
-data/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java.i
+data/test/java/util/PluggableLocale/providersrc/DateFormatProviderImpl.java.i
data/src/share/classes/sun/security/provider/SHA.java.i
data/make/sun/awt/FILES_c_unix.gmk.i
-data/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java.i
+data/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java.i
data/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java.i
data/src/share/classes/sun/net/smtp/SmtpClient.java.i
+data/src/share/classes/sun/security/provider/certpath/UntrustedChecker.java.i
+data/src/bsd/doc/man/policytool.1.i
data/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java.i
data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMNetMaskV6.java.i
data/src/share/classes/sun/reflect/generics/repository/MethodRepository.java.i
-data/src/share/classes/sun/management/VMManagement.java.i
+data/src/share/classes/sun/security/provider/certpath/ForwardState.java.i
data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java.i
data/src/share/classes/javax/swing/event/InternalFrameEvent.java.i
-data/src/share/classes/sun/management/snmp/jvminstr/JvmRuntimeImpl.java.i
+data/test/java/nio/channels/Selector/KeysReady.java.i
data/src/share/native/sun/font/layout/SegmentSingleProcessor.cpp.i
-data/test/java/io/StringWriter/NegativeBufferSize.java.i
-data/test/javax/sound/midi/Gervill/SoftTuning/GetTuning.java.i
+data/test/sun/java2d/DirectX/DrawBitmaskToSurfaceTest.java.i
+data/src/windows/native/sun/windows/awt_Robot.h.i
data/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java.i
-data/src/share/classes/javax/sql/rowset/Joinable.java.i
-data/src/share/classes/sun/jvmstat/perfdata/monitor/MonitorVersionException.java.i
+data/src/share/classes/sun/text/normalizer/UnicodeMatcher.java.i
+data/src/share/sample/nio/server/BP.java.i
data/test/com/sun/security/sasl/gsskerb/AuthOnly.java.i
data/test/java/io/Serializable/InvalidClassException/noargctor/DefaultPackage.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/exceptions/XMLSecurityException.java.i
-data/src/share/classes/java/awt/GridLayout.java.i
-data/src/share/classes/sun/java2d/FontSupport.java.i
-data/test/java/util/ResourceBundle/Bug6204853_Utf8.properties.i
+data/src/share/classes/com/sun/jmx/snmp/daemon/SnmpSubBulkRequestHandler.java.i
+data/src/share/classes/sun/text/bidi/BidiRun.java.i
+data/src/share/instrument/InstrumentationImplNativeMethods.c.i
data/test/javax/management/namespace/QueryNamesTest.java.i
+data/make/sun/awt/FILES_c_macosx.gmk.i
data/src/share/classes/sun/net/idn/UCharacterEnums.java.i
-data/src/share/classes/sun/tools/tree/ByteExpression.java.i
+data/src/solaris/native/sun/awt/fontpath.c.i
data/test/sun/rmi/rmic/newrmic/equivalence/OrangeImpl.java.i
data/test/java/lang/instrument/bootreporter/StringIdCallback.java.i
-data/src/share/classes/sun/util/calendar/CalendarUtils.java.i
+data/test/java/awt/PrintJob/ConstrainedPrintingTest/ConstrainedPrintingTest.java.i
data/src/share/native/sun/font/layout/GlyphSubstLookupProc.h.i
-data/src/share/classes/javax/swing/filechooser/FileFilter.java.i
-data/test/java/net/SocketInputStream/SocketClosedException.java.i
+data/src/windows/classes/sun/security/smartcardio/PlatformPCSC.java.i
+data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java.i
+data/test/java/security/BasicPermission/PermClass.1.4.i
+data/src/macosx/classes/com/apple/eawt/event/MagnificationListener.java.i
data/test/java/beans/PropertyChangeSupport/Test4682386.java.i
-data/src/solaris/native/sun/awt/awt_Plugin.h.i
+data/test/java/nio/channels/FileChannel/MapAssertions.java.i
data/test/com/sun/security/sasl/ntlm/NTLMTest.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/icons/TreeLeaf.gif.i
+data/test/sun/management/jmxremote/bootstrap/rmiregistryssl.properties.i
data/src/share/back/eventHandlerRestricted.h.i
data/test/sun/security/provider/PolicyParser/ExtDirs.java.i
data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/security.policy.i
data/test/sun/security/ssl/javax/net/ssl/NewAPIs/SSLEngine/ConnectionTest.java.i
-data/src/share/classes/sun/net/httpserver/HttpsServerImpl.java.i
-data/src/share/classes/javax/naming/ldap/ManageReferralControl.java.i
+data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_OAEP_PARAMS.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/IntArrayCalls.java.i
data/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java.i
data/make/tools/CharsetMapping/IBM871.nr.i
data/src/share/classes/sun/util/resources/CurrencyNames_fr_BE.properties.i
data/test/javax/management/loading/GetMBeansFromURLTest.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicGraphicsUtils.java.i
-data/make/tools/swing-beans/beaninfo/images/JProgressBarColor16.gif.i
+data/make/com/sun/jndi/cosnaming/Makefile.i
data/test/java/nio/channels/SocketChannel/CloseTimeoutChannel.java.i
data/src/share/demo/jfc/TableExample/OldJTable.java.i
data/src/share/classes/sun/io/CharToByteCp1251.java.i
data/src/share/classes/com/sun/naming/internal/VersionHelper.java.i
-data/src/share/classes/java/awt/doc-files/Checkbox-1.gif.i
+data/make/netbeans/common/closed-share-view.ent.i
data/make/com/oracle/security/ucrypto/Makefile.i
data/test/com/sun/nio/sctp/SctpMultiChannel/Branch.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/GenSSLConfigs/ClientThread.java.i
@@ -19765,139 +20562,144 @@ data/src/share/classes/org/ietf/jgss/package.html.i
data/test/java/beans/PropertyEditor/6380849/ThirdBean.java.i
data/src/share/classes/java/beans/PropertyDescriptor.java.i
data/src/share/native/sun/awt/image/jpeg/jdapistd.c.i
-data/src/share/demo/jfc/Metalworks/UISwitchListener.java.i
+data/test/java/io/LineNumberReader/ReadReadLine.java.i
+data/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java.i
data/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java.i
-data/src/share/sample/nio/server/Sendable.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/KeyUtils.java.i
data/src/solaris/classes/sun/nio/ch/SinkChannelImpl.java.i
data/src/share/classes/com/sun/java/util/jar/pack/PropMap.java.i
data/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c.i
-data/src/solaris/native/java/io/io_util_md.h.i
-data/src/solaris/native/sun/awt/CUPSfuncs.c.i
+data/test/java/math/BigDecimal/StrippingZerosTest.java.i
+data/test/java/nio/Buffer/BasicShort.java.i
data/src/share/classes/sun/security/krb5/JavaxSecurityAuthKerberosAccess.java.i
-data/src/share/classes/javax/swing/JMenuBar.java.i
-data/src/share/classes/com/sun/net/httpserver/BasicAuthenticator.java.i
+data/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java.i
+data/src/macosx/native/sun/awt/CRobot.m.i
+data/src/share/classes/sun/font/LayoutPathImpl.java.i
+data/src/macosx/native/sun/java2d/opengl/CGLGraphicsConfig.h.i
+data/test/javax/security/auth/login/Configuration/GetInstance.java.i
+data/src/solaris/classes/sun/awt/X11/XDesktopPeer.java.i
data/make/sun/javazic/tzdata_jdk/gmt.i
data/src/share/native/java/lang/fdlibm/src/s_erf.c.i
-data/test/javax/management/context/localizable/WhatsitMBean.java.i
+data/src/share/classes/sun/io/ByteToCharUnicodeBig.java.i
data/test/sample/mergesort/MergeSortTest.java.i
-data/src/windows/native/com/sun/media/sound/PLATFORM_API_WinOS_MidiIn.cpp.i
-data/test/sun/security/ssl/sanity/interop/CipherTest.java.i
-data/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java.i
+data/test/com/sun/crypto/provider/Cipher/KeyWrap/NISTWrapKAT.java.i
+data/src/macosx/native/sun/java2d/opengl/CGLLayer.m.i
+data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties.i
+data/src/windows/classes/sun/awt/windows/WMenuBarPeer.java.i
data/src/share/classes/sun/security/pkcs/PKCS9Attribute.java.i
data/test/tools/launcher/DefaultLocaleTest.java.i
data/src/share/classes/javax/swing/plaf/metal/icons/ocean/question.png.i
data/test/java/io/PushbackInputStream/MarkReset.java.i
data/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java.i
data/test/java/net/URL/ParseURL.java.i
-data/test/javax/management/mxbean/customtypes/IntegerIsStringFactory.java.i
-data/test/java/awt/regtesthelpers/process/ProcessResults.java.i
-data/src/solaris/classes/sun/print/AttributeClass.java.i
+data/make/sun/jawt/Depend.mak.i
+data/src/share/classes/java/awt/print/Paper.java.i
+data/src/share/classes/sun/tools/tree/BreakStatement.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLabelUI.java.i
-data/src/share/demo/jvmti/hprof/hprof_table.h.i
-data/test/com/sun/net/httpserver/Test12.java.i
+data/src/share/native/sun/java2d/opengl/OGLFuncs.h.i
+data/test/java/awt/Dialog/NonResizableDialogSysMenuResize/NonResizableDialogSysMenuResize.java.i
data/src/solaris/classes/sun/nio/fs/UnixUriUtils.java.i
-data/src/share/classes/java/beans/DefaultPersistenceDelegate.java.i
-data/src/share/classes/javax/xml/crypto/dsig/dom/DOMSignContext.java.i
+data/make/modules/jdk.depconfig.i
+data/test/org/openjdk/jigsaw/_Library.java.i
data/test/java/nio/file/Files/ContentType.java.i
data/src/share/classes/sun/font/AttributeMap.java.i
data/src/windows/classes/sun/awt/windows/WTextFieldPeer.java.i
data/make/tools/swing-beans/beaninfo/images/JMenuBarMono16.gif.i
-data/src/share/classes/java/security/PolicySpi.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/AddInstrument.java.i
data/src/share/classes/sun/text/resources/FormatData_es_CR.java.i
data/src/share/classes/com/sun/jdi/ClassLoaderReference.java.i
data/test/com/sun/jdi/SuspendThreadTest.java.i
data/src/share/classes/sun/nio/cs/ext/IBM942.java.i
-data/make/tools/CharsetMapping/IBM285.c2b.i
-data/src/windows/native/common/jlong_md.h.i
-data/src/share/classes/javax/naming/NameClassPair.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_en_GB.properties.i
-data/test/javax/management/namespace/SerialParamProcessorTest.java.i
+data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/group.security.policy.i
+data/test/java/util/concurrent/CopyOnWriteArraySet/RacingCows.java.i
+data/src/share/classes/java/util/concurrent/ExecutorService.java.i
+data/test/javax/smartcardio/Serialize.java.i
+data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/inftrees.c.i
data/make/tools/CharsetMapping/IBM1026.c2b.i
-data/test/com/sun/tools/attach/SimpleProvider.java.i
-data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TSFrame.java.i
+data/test/java/io/Serializable/oldTests/CheckingEquality.java.i
+data/src/share/classes/java/util/concurrent/ExecutorCompletionService.java.i
data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_ko.properties.i
data/src/share/native/java/lang/fdlibm/src/w_atan2.c.i
data/test/javax/naming/ldap/LdapName/RdnMisc.java.i
data/src/share/classes/com/sun/media/sound/AbstractMidiDeviceProvider.java.i
-data/src/share/demo/jvmti/hprof/hprof_io.c.i
-data/src/share/classes/javax/swing/text/NavigationFilter.java.i
+data/test/javax/print/attribute/GetCopiesSupported.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java.i
data/test/sun/java2d/cmm/ColorConvertOp/ImageComparator.java.i
-data/src/share/classes/sun/instrument/InstrumentationImpl.java.i
+data/test/java/awt/GridBagLayout/GridBagLayoutIpadXYTest/GridBagLayoutIpadXYTest.java.i
data/src/share/javavm/include/typedefs.h.i
+data/test/javax/swing/JProgressBar/7141573/bug7141573.java.i
data/src/share/classes/com/sun/beans/WeakCache.java.i
data/src/windows/native/sun/windows/awt_DrawingSurface.cpp.i
data/make/tools/src/build/tools/charsetmapping/GenerateEUC_TW.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_AllChannels.java.i
+data/test/sun/rmi/rmic/newrmic/equivalence/CountServerImpl.java.i
data/test/java/lang/reflect/Proxy/nonJavaNames/Test.java.i
-data/src/share/classes/java/awt/DisplayMode.java.i
-data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemManagerState.java.i
+data/src/share/classes/sun/util/calendar/ZoneInfoFile.java.i
+data/test/javax/script/CommonSetup.sh.i
data/src/share/classes/javax/swing/event/DocumentEvent.java.i
data/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java.i
-data/src/share/native/sun/font/layout/TrimmedArrayProcessor.h.i
-data/test/java/beans/Statement/Test6224433.java.i
-data/test/javax/management/monitor/MBeanServerForwarderInvocationHandler.java.i
+data/src/share/native/java/lang/fdlibm/src/e_gamma_r.c.i
+data/src/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java.i
+data/src/share/classes/javax/security/auth/login/AccountNotFoundException.java.i
data/src/share/classes/com/sun/security/sasl/CramMD5Server.java.i
-data/src/share/classes/sun/util/resources/CalendarData_hr.properties.i
+data/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java.i
data/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/JarFileSystemProvider.java.i
data/src/share/classes/sun/io/CharToByteEUC_CN.java.i
data/src/share/classes/sun/dyn/JavaMethodHandle.java.i
data/src/share/native/sun/java2d/loops/LoopMacros.h.i
-data/src/share/classes/sun/security/acl/AllPermissionsImpl.java.i
+data/test/javax/management/modelmbean/SimpleModelMBean/logging.properties.i
data/test/sun/tools/common/CommonTests.sh.i
-data/make/tools/src/build/tools/fontchecker/README.txt.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMTrapNum.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/rmid.security.policy.i
+data/test/java/beans/XMLEncoder/6329581/Test6329581.java.i
data/src/share/classes/javax/swing/plaf/basic/icons/JavaCup16.png.i
data/src/share/classes/sun/tools/javac/BatchParser.java.i
-data/src/share/classes/java/net/URL.java.i
+data/make/tools/swing-beans/beaninfo/images/JCheckBoxMenuItemMono32.gif.i
data/src/share/demo/jvmti/gctest/sample.makefile.txt.i
-data/src/share/classes/sun/tools/tree/ForStatement.java.i
+data/test/java/util/ResourceBundle/Test4314141.java.i
data/src/share/classes/java/util/regex/package.html.i
-data/src/share/instrument/JPLISAgent.c.i
+data/src/share/native/sun/security/ec/impl/ec.c.i
data/test/java/beans/PropertyEditor/TestFontClassNull.java.i
-data/test/java/util/ResourceBundle/TestResource_it.java.i
+data/src/share/native/sun/java2d/loops/IntArgbBm.h.i
data/src/share/native/sun/java2d/cmm/lcms/cmserr.c.i
-data/src/windows/classes/sun/java2d/windows/WinVolatileSurfaceManager.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleCalls.java.i
data/make/sun/javazic/tzdata/asia.i
data/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java.i
-data/src/share/classes/sun/tools/jconsole/OverviewTab.java.i
+data/test/java/awt/regtesthelpers/AbstractTest.java.i
data/test/com/sun/jdi/connect/spi/META-INF/services/com.sun.jdi.connect.spi.TransportService.i
-data/src/share/classes/sun/nio/cs/UTF_16LE.java.i
data/make/netbeans/common/closed-share-sources.ent.i
data/make/com/sun/inputmethods/Makefile.i
-data/src/share/classes/java/awt/print/PrinterJob.java.i
+data/src/share/classes/java/security/Guard.java.i
data/src/share/classes/java/util/concurrent/AbstractExecutorService.java.i
-data/src/share/classes/sun/awt/im/SimpleInputMethodWindow.java.i
-data/src/solaris/demo/jni/Poller/PollingServer.java.i
+data/src/share/native/sun/nio/ch/genSocketOptionRegistry.c.i
data/src/solaris/classes/sun/java2d/xr/XRColor.java.i
-data/src/share/classes/sun/tools/java/AmbiguousClass.java.i
-data/make/mksample/nio/Makefile.i
+data/src/share/classes/java/awt/Component.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java.i
data/src/share/classes/java/dyn/JavaMethodHandle.java.i
data/make/tools/swing-beans/beaninfo/images/JSpinnerColor32.gif.i
-data/src/share/native/sun/security/ec/impl/secitem.c.i
-data/src/windows/native/sun/windows/awt_Pen.h.i
-data/test/java/beans/XMLEncoder/java_util_Date.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/NodeFilter.java.i
+data/src/share/classes/sun/text/resources/FormatData_en_IN.java.i
+data/test/java/beans/Introspector/7122138/pack/Sub.java.i
+data/src/share/modules/jdk/module-info.java.i
data/src/share/native/sun/font/layout/IndicReordering.cpp.i
data/src/solaris/classes/java/lang/UNIXProcess.java.solaris.i
data/src/share/demo/nbproject/management/FullThreadDump/nbproject/file-targets.xml.i
data/src/solaris/classes/sun/awt/motif/MComponentPeer.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/zadler32.c.i
data/test/java/io/PipedOutputStream/DeadReader.java.i
-data/src/share/native/common/jni_util.h.i
-data/test/com/sun/security/auth/callback/TextCallbackHandler/Default.java.i
-data/src/share/classes/java/lang/module/ModuleInfoAnnotation.java.i
-data/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java.i
-data/src/share/classes/sun/util/resources/CurrencyNames_es_SV.properties.i
+data/src/solaris/native/common/jlong_md.h.i
+data/src/share/classes/java/util/CurrencyData.properties.i
+data/src/share/classes/sun/security/util/DerValue.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/crisubn.jks.i
data/src/share/classes/javax/swing/table/TableColumn.java.i
data/src/windows/native/sun/windows/awt_Toolkit.cpp.i
-data/src/share/classes/com/sun/management/UnixOperatingSystemMXBean.java.i
+data/test/sun/tools/jconsole/ImmutableResourceTest.sh.i
data/src/share/classes/sun/util/resources/CurrencyNames_ja_JP.properties.i
-data/test/javax/security/auth/login/Configuration/GetInstanceSecurity.policy.i
-data/src/share/classes/javax/management/event/EventConsumer.java.i
+data/test/java/nio/file/Path/TemporaryFiles.java.i
+data/make/tools/src/build/tools/jdwpgen/CommandNode.java.i
data/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties.i
data/test/java/io/Externalizable/compatibility/ExternalizableBlockData.java.i
-data/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template.i
+data/src/share/classes/sun/net/www/protocol/http/Negotiator.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/package.html.i
data/make/sun/security/smartcardio/FILES_c.gmk.i
data/src/share/classes/javax/management/remote/JMXServiceURL.java.i
@@ -19906,24 +20708,27 @@ data/test/java/util/Hashtable/EqualsCast.java.i
data/test/java/awt/Mixing/NonOpaqueInternalFrame.java.i
data/src/share/classes/sun/print/psfontj2d.properties.i
data/test/java/lang/Math/MinMax.java.i
+data/src/macosx/classes/sun/java2d/OSXSurfaceData.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSliderUI.java.i
data/test/javax/sound/midi/Gervill/EmergencySoundbank/TestCreateSoundbank.java.i
data/test/java/io/Serializable/resolveClassException/ResolveClassException.java.i
data/src/share/classes/sun/tools/javac/BatchEnvironment.java.i
-data/test/sun/security/provider/PolicyFile/TrustedCert.keystore1.i
+data/src/macosx/classes/com/apple/eawt/event/GestureListener.java.i
+data/src/windows/native/sun/jkernel/resource.h.i
data/src/share/classes/com/sun/jdi/ClassObjectReference.java.i
data/src/share/classes/java/awt/peer/MenuPeer.java.i
-data/test/javax/management/mxbean/PreRegisterNameTest.java.i
-data/src/share/demo/nbproject/management/MemoryMonitor/build.xml.i
-data/make/tools/CharsetMapping/IBM875.map.i
+data/make/com/sun/servicetag/Makefile.i
+data/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java.i
+data/src/bsd/doc/man/jinfo.1.i
+data/test/sun/misc/EscapePath.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverSpi.java.i
-data/test/java/io/DataInputStream/ReadFully.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/expanded.gif.i
data/test/java/io/FileOutputStream/FinalizeShdCallClose.java.i
-data/src/share/classes/sun/java2d/cmm/CMSManager.java.i
-data/src/share/demo/nbproject/management/JTop/nbproject/project.xml.i
-data/src/solaris/native/sun/java2d/loops/vis_ByteIndexed.c.i
-data/src/share/classes/javax/swing/KeyboardManager.java.i
-data/test/java/net/URLConnection/GetXmlContentType.java.i
+data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties.i
+data/test/java/nio/channels/FileChannel/AtomicAppend.java.i
+data/src/windows/classes/sun/net/NetHooks.java.i
+data/src/share/classes/sun/security/util/ByteArrayTagOrder.java.i
+data/test/javax/security/auth/login/LoginContext/ResetConfigModule.java.i
data/test/java/util/ResourceBundle/Bug6355009.java.i
data/src/windows/native/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.c.i
data/src/windows/native/sun/windows/GDIHashtable.h.i
@@ -19934,94 +20739,96 @@ data/test/java/util/ResourceBundle/TestBug4179766.java.i
data/src/solaris/native/sun/awt/awt_PopupMenu.c.i
data/test/java/rmi/server/getRemoteClass/GetRemoteClass.java.i
data/test/sun/nio/cs/SJISCanEncode.java.i
-data/test/sun/management/jmxremote/bootstrap/Utils.java.i
+data/src/share/classes/javax/swing/SpinnerDateModel.java.i
data/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java.i
-data/src/share/classes/java/util/ArrayDeque.java.i
+data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/Handler.java.i
+data/src/macosx/native/java/util/SCDynamicStoreConfig.m.i
data/test/java/util/zip/NoExtensionSignature.java.i
-data/src/share/classes/sun/java2d/pipe/BufferedRenderPipe.java.i
-data/src/share/classes/javax/print/attribute/URISyntax.java.i
+data/src/share/classes/javax/management/monitor/GaugeMonitorMBean.java.i
+data/src/share/classes/javax/swing/ListModel.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLContextImpl/MD2InTrustAnchor.java.i
-data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nssckbi.dll.d
data/test/java/util/jar/JarInputStream/TestIndexedJarWithBadSignature.java.i
data/src/share/classes/sun/security/validator/EndEntityChecker.java.i
-data/src/share/demo/jvmti/hprof/hprof_init.h.i
+data/test/java/beans/XMLEncoder/java_util_Collections_UnmodifiableRandomAccessList.java.i
data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformSwitch.java.i
-data/test/sun/security/pkcs11/MessageDigest/TestCloning.java.i
data/test/java/lang/instrument/RedefineMethodAddInvokeApp.java.i
-data/test/java/awt/Multiscreen/UpdateGCTest/UpdateGCTest.java.i
-data/test/java/rmi/activation/Activatable/extLoadedImpl/security.policy.i
+data/test/javax/script/Test4.js.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/CipherReference.java.i
data/test/org/openjdk/jigsaw/cli/tsca-cert.pem.i
-data/src/share/classes/com/sun/crypto/provider/HmacCore.java.i
-data/test/java/beans/XMLEncoder/java_util_Collections_SynchronizedSortedMap.java.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/SetAllVMOptions.java.i
+data/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java.i
data/src/share/classes/com/sun/jmx/mbeanserver/MBeanServerDelegateImpl.java.i
data/src/share/classes/java/rmi/server/ExportException.java.i
data/test/java/lang/instrument/NullTransformerRemoveTest.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/IdResolver.java.i
data/src/share/classes/javax/security/auth/login/CredentialExpiredException.java.i
-data/make/tools/GenerateCharacter/check_class.c.template.i
-data/src/windows/classes/sun/awt/windows/WPopupMenuPeer.java.i
+data/test/java/rmi/reliability/scripts/create_benchmark_jars.ksh.i
+data/src/share/classes/java/nio/charset/Charset.java.i
data/src/share/classes/javax/swing/plaf/synth/ColorType.java.i
data/src/windows/classes/sun/awt/windows/fontconfig.Me.properties.i
data/make/modules/jdk7.depconfig.i
data/src/windows/classes/com/sun/management/OperatingSystem.java.i
data/src/windows/instrument/FileSystemSupport_md.h.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.d
-data/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java.i
-data/src/share/classes/com/sun/nio/sctp/PeerAddressChangeNotification.java.i
-data/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp.i
+data/src/macosx/native/apple/applescript/AppleScriptExecutionContext.m.i
+data/test/java/lang/ClassLoader/resource.jar.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libnss3.so.i
+data/test/javax/management/namespace/JMXNamespaceViewTest.java.i
data/src/share/classes/javax/management/namespace/JMXRemoteNamespace.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java.i
+data/test/javax/management/MBeanServer/PreRegisterTest.java.i
data/test/com/sun/net/httpserver/Test.java.i
data/src/share/classes/sun/io/ByteToCharGBK.java.i
data/test/java/util/ResourceBundle/Control/Bug6530694_de_DE.properties.i
-data/src/share/classes/java/security/interfaces/DSAParams.java.i
-data/src/share/classes/sun/io/CharToByteISO8859_5.java.i
-data/src/share/classes/org/openjdk/jigsaw/ModuleFileFormat.java.i
+data/test/java/rmi/registry/interfaceHash/ReferenceRegistryStub.java.i
+data/src/share/classes/sun/nio/cs/UTF_16LE.java.i
+data/src/share/classes/javax/swing/plaf/MenuBarUI.java.i
data/src/share/classes/sun/nio/ch/SocketChannelImpl.java.i
-data/src/share/native/java/lang/fdlibm/src/e_exp.c.i
+data/src/share/classes/sun/text/normalizer/UCharacterPropertyReader.java.i
data/test/java/security/UnresolvedPermission/AccessorMethods.java.i
data/src/share/classes/java/nio/file/AtomicMoveNotSupportedException.java.i
data/src/share/classes/java/lang/module/ModuleView.java.i
data/src/share/native/sun/java2d/opengl/OGLRenderQueue.c.i
data/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ActivateMe.java.i
+data/src/solaris/classes/java/net/DefaultInterface.java.i
data/src/share/classes/javax/security/cert/package.html.i
-data/src/share/classes/javax/crypto/BadPaddingException.java.i
-data/test/javax/sound/midi/Gervill/SoftReceiver/Send_AllSoundOff.java.i
-data/src/share/classes/com/sun/jmx/namespace/package.html.i
-data/make/com/sun/java/pack/mapfile-vers.i
+data/src/share/classes/sun/beans/editors/IntegerEditor.java.i
+data/make/sun/jdbc/Makefile.i
+data/test/java/awt/EventQueue/SecondaryLoopTest/SecondaryLoopTest.java.i
+data/src/share/classes/javax/swing/WindowConstants.java.i
data/test/javax/management/remote/mandatory/subjectDelegation/policy15.i
data/src/share/classes/java/util/MissingFormatArgumentException.java.i
data/test/java/security/KeyPairGenerator/GenerateRSAKeyPair.java.i
data/src/share/classes/sun/dyn/SpreadGeneric.java.i
data/src/share/back/debugDispatch.c.i
data/src/solaris/demo/jigsaw/basic/env.sh.i
-data/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c.i
+data/test/java/net/URL/HandlerLoop.java.i
+data/src/macosx/native/sun/awt/AWTWindow.m.i
data/test/java/lang/Byte/Decode.java.i
data/make/sun/awt/mawt.gmk.i
-data/test/java/io/Serializable/subclass/AbstractObjectOutputStream.java.i
+data/src/share/classes/java/nio/charset/StandardCharset.java.i
data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources_zh_CN.java.i
-data/test/java/security/ProtectionDomain/RecursionDebug.java.i
-data/make/tools/CharsetMapping/IBM930.nr.i
+data/test/org/openjdk/jigsaw/cli/prikey.pem.i
+data/src/share/sample/scripting/scriptpad/src/META-INF/manifest.mf.i
data/src/share/classes/javax/sound/sampled/UnsupportedAudioFileException.java.i
data/src/share/classes/sun/tools/tree/AssignBitXorExpression.java.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_ATTRIBUTE.java.i
+data/make/tools/fontchecker/Makefile.i
data/make/modules/jdk.swing.ls.i
data/test/javax/imageio/stream/StreamCloserLeak/testapp/Main.java.i
-data/src/share/classes/sun/net/www/http/ChunkedInputStream.java.i
+data/test/java/rmi/server/RMIClassLoader/downloadArrayClass/Receiver.java.i
data/src/share/classes/java/awt/font/ShapeGraphicAttribute.java.i
data/test/org/openjdk/jigsaw/install-repo.sh.i
data/src/share/classes/sun/security/krb5/KrbApRep.java.i
data/test/com/sun/awt/Translucency/TranslucentShapedFrameTest/TranslucentShapedFrameTest.java.i
data/src/share/classes/javax/management/Description.java.i
data/src/linux/doc/man/appletviewer.1.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java.i
data/src/share/classes/sun/management/LazyCompositeData.java.i
data/test/javax/swing/SwingUtilities/6797139/bug6797139.java.i
data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/DelegateHttpsURLConnection.java.i
data/src/share/classes/sun/reflect/generics/scope/MethodScope.java.i
data/test/org/openjdk/jigsaw/resource.sh.i
data/src/share/classes/sun/jvmstat/monitor/event/VmListener.java.i
-data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java.i
+data/src/share/native/sun/security/ec/impl/ecl-curve.h.i
data/test/sun/net/www/protocol/http/StackTraceTest.java.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/NewModelIdentifierStringInt.java.i
data/test/java/beans/XMLEncoder/Test7092744.java.i
@@ -20031,182 +20838,192 @@ data/src/solaris/doc/sun/man/man1/apt.1.i
data/test/javax/management/context/localizable/Whatsit.java.i
data/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java.i
data/test/java/io/BufferedWriter/Cleanup.java.i
-data/src/share/classes/sun/rmi/runtime/RuntimeUtil.java.i
+data/src/share/classes/sun/rmi/transport/ConnectionInputStream.java.i
data/test/java/awt/PrintJob/Text/stringwidth.sh.i
data/src/share/native/sun/management/ClassLoadingImpl.c.i
-data/src/share/classes/sun/print/PSPathGraphics.java.i
+data/make/tools/swing-beans/beaninfo/images/JScrollBarColor32.gif.i
data/src/share/classes/sun/util/calendar/TzIDOldMapping.java.i
-data/test/java/lang/instrument/RedefineMethodAddInvokeTarget_2.java.i
+data/src/share/classes/java/beans/ThreadGroupContext.java.i
data/test/sun/management/HotspotThreadMBean/GetInternalThreads.java.i
data/test/sun/security/pkcs11/Provider/Login-nss.txt.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ProtocolVersion/HttpsProtocols.java.i
-data/test/javax/security/auth/login/Configuration/GetInstance.java.i
+data/test/java/beans/XMLEncoder/EnumPrivate.java.i
+data/test/java/awt/regtesthelpers/process/ProcessResults.java.i
data/src/share/classes/sun/io/ByteToCharCp1253.java.i
-data/src/share/native/sun/java2d/loops/IntRgb.c.i
-data/src/share/native/common/gdefs.h.i
+data/src/share/classes/sun/print/PrintJob2D.java.i
+data/test/java/util/ArrayList/EnsureCapacity.java.i
data/src/share/classes/sun/java2d/pisces/LineSink.java.i
-data/src/share/native/sun/java2d/loops/AnyInt.c.i
+data/test/sun/net/www/http/HttpClient/StreamingRetry.java.i
data/test/java/lang/ThreadLocal/ImmutableLocal.java.i
-data/test/sun/security/util/HostnameMatcher/cert4.crt.i
+data/make/java/redist/fonts/Makefile.i
+data/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java.i
data/src/solaris/classes/sun/awt/motif/MCustomCursor.java.i
data/src/windows/native/sun/jkernel/graphics/java-icon.ico.i
-data/src/share/classes/sun/awt/AWTAccessor.java.i
+data/test/java/util/TimSort/README.i
data/src/share/classes/java/lang/UnsatisfiedLinkError.java.i
-data/src/share/classes/javax/accessibility/AccessibleBundle.java.i
+data/make/sun/Makefile.i
data/src/share/classes/sun/security/provider/ParameterCache.java.i
data/src/windows/native/sun/security/smartcardio/pcsc_md.h.i
-data/test/java/security/cert/CertPathBuilder/GetInstance.java.i
-data/make/tools/CharsetMapping/IBM420.map.i
+data/test/javax/sound/midi/Gervill/SoftAudioBuffer/Clear.java.i
+data/src/share/classes/com/sun/jdi/LongType.java.i
data/src/share/classes/java/security/NoSuchAlgorithmException.java.i
data/src/share/classes/javax/swing/SpringLayout.java.i
data/src/windows/classes/sun/awt/windows/WPageDialog.java.i
data/test/java/net/Socket/DeadlockTest.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsTreeUI.java.i
+data/test/javax/script/RhinoExceptionTest.java.i
data/make/tools/src/build/tools/javazic/Timezone.java.i
data/src/share/classes/sun/io/CharToByteCp1142.java.i
-data/src/share/classes/com/sun/jndi/ldap/VersionHelper.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java.i
+data/test/java/rmi/server/useCustomRef/UseCustomRef_Stub.java.i
data/src/share/classes/sun/security/krb5/internal/Krb5.java.i
data/src/share/classes/sun/reflect/generics/visitor/Visitor.java.i
data/src/share/classes/javax/naming/ConfigurationException.java.i
data/test/java/lang/management/ManagementFactory/ProxyExceptions.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java.i
+data/src/share/classes/javax/swing/plaf/SplitPaneUI.java.i
data/test/java/beans/Statement/Test6707226.java.i
data/test/java/lang/Class/forName/classes/plus.class.i
-data/src/solaris/demo/jigsaw/basic/setup.sh.i
+data/test/java/io/File/FileMethods.java.i
data/test/javax/sound/midi/Gervill/ModelIdentifier/SetObject.java.i
data/src/share/classes/sun/text/resources/CollationData_zh.java.i
data/test/java/io/Serializable/enum/classObject/Test.java.i
data/src/share/classes/javax/sound/midi/VoiceStatus.java.i
-data/test/java/io/Serializable/packageAccess/A.java.i
+data/src/solaris/classes/sun/awt/motif/MButtonPeer.java.i
data/src/share/classes/com/sun/media/sound/SoftLinearResampler.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/resolver/package.html.i
data/test/javax/script/Test2.js.i
-data/src/windows/native/sun/nio/ch/SocketChannelImpl.c.i
+data/test/sun/nio/cs/OLD/X11GB2312_OLD.java.i
data/make/tools/classanalyzer/src/com/sun/classanalyzer/PackageInfo.java.i
data/src/windows/native/sun/windows/awt_Font.cpp.i
data/make/tools/reorder/Makefile.i
data/src/share/classes/com/sun/java/browser/dom/DOMAction.java.i
data/src/share/demo/applets/BarChart/example1.html.i
-data/test/java/awt/Focus/ModalBlockedStealsFocusTest/ModalBlockedStealsFocusTest.java.i
+data/test/java/nio/channels/FileChannel/Pwrite.java.i
data/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java.i
+data/test/sun/security/pkcs11/nss/lib/windows-i586/nss3.lib.i
data/src/share/classes/com/sun/media/sound/Toolkit.java.i
data/test/java/lang/management/ThreadMXBean/FindMonitorDeadlock.java.i
-data/src/share/classes/sun/awt/resources/awt_pt_BR.properties.i
+data/src/windows/classes/sun/nio/fs/WindowsSecurity.java.i
data/src/share/classes/sun/reflect/NativeMethodAccessorImpl.java.i
data/src/solaris/classes/sun/awt/X11/XMSelection.java.i
data/src/share/classes/sun/net/www/protocol/http/spnego/NegotiateCallbackHandler.java.i
-data/src/share/classes/java/rmi/server/RMISocketFactory.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java.i
+data/src/solaris/classes/sun/awt/X11/XSelection.java.i
+data/src/share/classes/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java.i
data/test/sun/net/ftp/B6427768.java.i
-data/src/share/demo/jfc/Notepad/README.txt.i
+data/src/share/sample/vm/clr-jvm/invoker.cs.i
data/make/tools/src/build/tools/jdwpgen/Main.java.i
-data/src/share/classes/java/io/FilenameFilter.java.i
+data/make/tools/CharsetMapping/ISO_8859_6.map.i
data/test/sun/security/pkcs11/nss/lib/solaris-i586/libnspr4.so.i
data/src/share/native/sun/security/ec/impl/ecp_224.c.i
data/test/java/net/URLClassLoader/ClassPathTest.java.i
data/test/java/beans/XMLEncoder/java_awt_AWTKeyStroke.java.i
-data/src/share/classes/com/sun/nio/file/SensitivityWatchEventModifier.java.i
-data/src/share/classes/sun/management/MemoryNotifInfoCompositeData.java.i
+data/src/share/sample/jmx/jmx-scandir/test/com/sun/jmx/examples/scandir/ScanManagerTest.java.i
+data/make/com/sun/sql/Makefile.i
data/test/java/lang/Class/getEnclosingClass/EnclosingClass.java.i
-data/make/tools/src/build/tools/spp/Spp.java.i
+data/src/share/classes/sun/swing/text/TextComponentPrintable.java.i
data/test/java/rmi/transport/dgcDeadLock/security.policy.i
-data/test/java/lang/Double/ParseHexFloatingPoint.java.i
-data/test/java/lang/instrument/ExampleRedefine.java.i
-data/src/share/classes/sun/util/resources/LocaleNames.properties.i
+data/test/java/rmi/activation/Activatable/restartCrashedService/ActivateMe.java.i
+data/src/windows/native/java/net/Inet6AddressImpl.c.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsFileChooserUI.java.i
data/test/java/nio/channels/spi/AsynchronousChannelProvider/CheckProvider.java.i
-data/src/share/classes/java/awt/image/CropImageFilter.java.i
-data/src/share/classes/com/sun/jndi/ldap/LdapResult.java.i
+data/src/share/classes/sun/text/resources/FormatData_lt_LT.java.i
+data/test/java/util/Vector/SerializationDeadlock.java.i
+data/test/javax/sound/midi/Gervill/SoftChannel/ProgramAndBankChange.java.i
data/test/sun/security/tools/policytool/UpdatePermissions.java.i
-data/test/java/util/ResourceBundle/Control/BadStaticInitRB.java.i
-data/src/share/classes/sun/tools/jstat/Identifier.java.i
-data/src/share/classes/sun/io/ByteToCharCp948.java.i
-data/make/mkdemo/jvmti/waiters/Makefile.i
+data/test/javax/swing/JLayer/6824395/bug6824395.java.i
+data/test/javax/management/eventService/EventClientThreadTest.java.i
+data/src/windows/native/sun/nio/ch/FileDispatcherImpl.c.i
+data/src/share/classes/sun/management/HotspotThreadMBean.java.i
data/make/tools/CharsetMapping/IBM930.c2b.i
-data/src/share/classes/sun/tools/jconsole/resources/connected16.png.i
-data/test/java/net/InetAddress/HashSpread.java.i
+data/test/javax/crypto/spec/DESKeySpec/CheckParity.java.i
+data/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer_Stub.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_RS.properties.i
data/src/share/classes/sun/security/krb5/internal/crypto/Crc32CksumType.java.i
-data/make/common/shared/Compiler.gmk.i
data/test/javax/xml/crypto/dsig/data/certs/nemain.crt.i
data/src/solaris/classes/sun/awt/X11/XDnDConstants.java.i
-data/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties.i
data/src/share/native/sun/awt/medialib/mlib_ImageCheck.h.i
-data/make/sun/font/t2k/mapfile-vers.i
-data/test/sun/java2d/cmm/ProfileOp/ReadWriteProfileTest.java.i
-data/src/share/classes/java/lang/reflect/GenericSignatureFormatError.java.i
-data/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java.i
-data/make/java/nio/genCoder.sh.i
+data/src/share/classes/sun/reflect/ByteVectorImpl.java.i
+data/test/sun/security/krb5/auto/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor.i
+data/test/sun/security/krb5/RFC396xTest.java.i
+data/src/share/classes/sun/java2d/SunCompositeContext.java.i
+data/test/java/util/Locale/bug6277243.java.i
data/src/share/native/sun/font/layout/SingleSubstitutionSubtables.h.i
data/test/java/util/PluggableLocale/providersrc/java.text.spi.DecimalFormatSymbolsProvider.i
data/test/java/net/InetAddress/CachedUnknownHostName.java.i
data/test/java/rmi/reliability/benchmark/bench/rmi/IntCalls.java.i
-data/src/share/classes/java/util/MissingResourceException.java.i
+data/test/tools/pack200/pack200-verifier/src/sun/tools/pack/verify/Globals.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/BooleanArrays.java.i
data/src/share/classes/java/awt/dnd/DragSourceListener.java.i
data/src/windows/native/sun/windows/security_warning_int.ico.i
-data/src/share/classes/com/sun/crypto/provider/CipherTextStealing.java.i
-data/src/share/classes/java/awt/print/PrinterException.java.i
+data/test/java/security/Signature/NONEwithRSA.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/SimpleStandard.java.i
data/src/solaris/classes/sun/awt/X11/ToplevelStateListener.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/NativeArgumentBuffer.java.i
data/src/share/classes/java/lang/ClassFormatError.java.i
-data/src/share/classes/com/sun/tools/jdi/LocationImpl.java.i
-data/src/share/classes/java/nio/charset/CoderMalfunctionError.java.i
+data/test/java/io/PipedReader/Ready.java.i
+data/test/java/rmi/reliability/benchmark/bench/rmi/config.i
+data/src/macosx/native/sun/awt/CTextPipe.m.i
data/make/tools/javazic/Makefile.i
+data/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.i
data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java.i
data/src/share/native/com/sun/media/sound/PortMixer.c.i
data/src/share/classes/sun/java2d/pisces/PiscesRenderingEngine.java.i
-data/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java.i
-data/test/java/lang/Short/ByteSwap.java.i
+data/test/sun/net/www/protocol/jar/jarbug/src/jar1/GetResource.java.i
+data/src/share/classes/sun/util/resources/LocaleNames_hu.properties.i
data/src/share/classes/javax/imageio/stream/package.html.i
-data/src/share/native/sun/awt/libpng/pngstruct.h.i
data/src/share/classes/sun/util/resources/CalendarData_mt_MT.properties.i
data/test/demo/jvmti/Context.java.i
data/src/share/classes/javax/swing/text/AbstractWriter.java.i
-data/src/share/native/sun/awt/image/gif/gifdecoder.c.i
-data/src/share/classes/com/sun/servicetag/SolarisServiceTag.java.i
-data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter.i
+data/src/share/native/sun/management/MemoryPoolImpl.c.i
+data/test/java/util/PluggableLocale/LocaleNameProviderTest.sh.i
+data/src/share/classes/javax/print/attribute/standard/NumberOfDocuments.java.i
data/src/share/classes/java/awt/peer/CanvasPeer.java.i
data/src/share/classes/sun/rmi/rmic/Main.java.i
-data/test/javax/management/generified/ListTypeCheckTest.java.i
+data/test/sun/security/pkcs11/KeyStore/Basic.policy.i
data/test/java/rmi/reliability/benchmark/bench/XmlReporter.java.i
-data/test/java/rmi/server/RemoteObject/toStub/ToStub.java.i
-data/src/share/classes/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java.i
-data/src/linux/doc/man/ja/jps.1.i
+data/src/share/native/java/security/AccessController.c.i
+data/src/share/native/sun/java2d/opengl/OGLMaskBlit.h.i
+data/src/share/native/sun/font/layout/ContextualGlyphInsertion.h.i
data/test/java/security/Permission/ToString.java.i
data/src/share/demo/jfc/TableExample/TableExample3.java.i
data/test/java/awt/Choice/NonFocusablePopupMenuTest/NonFocusablePopupMenuTest.html.i
-data/src/windows/resource/icons/awt.ico.i
+data/src/share/classes/sun/tools/tree/BinaryLogicalExpression.java.i
data/test/java/rmi/transport/dgcDeadLock/Test.java.i
-data/src/share/classes/com/sun/jdi/PrimitiveType.java.i
-data/src/share/classes/sun/nio/cs/ext/SJIS_0213.java.i
+data/test/javax/print/attribute/PSCopiesFlavorTest.java.i
+data/src/share/classes/com/sun/jndi/rmi/registry/RemoteReference.java.i
data/src/share/classes/javax/management/MBeanServerDelegate.java.i
-data/src/solaris/native/sun/awt/awt_mgrsel.c.i
+data/test/java/awt/MultipleGradientPaint/MultiGradientTest.java.i
data/test/sun/tools/jstat/snap1.awk.i
-data/src/share/classes/java/io/InputStreamReader.java.i
+data/src/share/classes/sun/security/krb5/internal/AuthContext.java.i
data/test/sun/net/www/protocol/http/ResponseCacheStream.java.i
data/test/java/lang/instrument/ilib/Inject.java.i
+data/test/java/net/Socket/FDClose.java.i
data/src/share/classes/javax/management/event/EventClientNotFoundException.java.i
data/make/tools/CharsetMapping/IBM918.nr.i
-data/test/java/util/zip/input.jar.i
+data/src/macosx/native/sun/awt/CSystemColors.m.i
data/src/share/native/sun/java2d/loops/AnyInt.h.i
-data/src/share/classes/sun/reflect/generics/tree/ClassTypeSignature.java.i
-data/test/java/net/Authenticator/B4769350.java.i
+data/src/share/classes/sun/nio/ch/sctp/MessageInfoImpl.java.i
+data/src/share/classes/sun/rmi/registry/resources/rmiregistry_zh_TW.properties.i
+data/test/sun/tools/native2ascii/test3.i
data/test/java/beans/Introspector/7064279/Test7064279.java.i
-data/test/sun/net/www/protocol/http/spnegoLogin.conf.i
-data/src/share/classes/java/net/CookieManager.java.i
+data/src/share/classes/java/awt/Rectangle.java.i
+data/src/windows/classes/sun/security/mscapi/Key.java.i
data/src/share/native/sun/java2d/ShaderList.h.i
data/src/share/classes/javax/swing/DebugGraphicsInfo.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/GraphicsTests.java.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/ReadByteArrayIntInt.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicTransferable.java.i
data/test/java/util/PluggableLocale/CurrencyNameProviderTest.sh.i
+data/make/java/jobjc/Makefile.i
data/src/share/classes/sun/nio/ch/exceptions.i
data/src/share/classes/javax/crypto/ShortBufferException.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_sr_Latn_ME.properties.i
-data/test/javax/swing/text/html/TableView/7030332/sample2.png.i
+data/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c.i
+data/src/solaris/classes/sun/awt/X11/generator/functions.txt.i
data/src/share/classes/sun/security/util/DerInputStream.java.i
data/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.java.i
data/src/share/classes/sun/reflect/ClassDefiner.java.i
-data/test/com/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider.i
-data/src/solaris/native/sun/awt/colordata.h.i
+data/src/share/classes/javax/swing/plaf/nimbus/PainterImpl.template.i
+data/test/javax/management/remote/mandatory/connection/RMIConnector_NPETest.java.i
+data/src/macosx/native/jobjc/src/core/native/ID.m.i
data/src/windows/native/sun/windows/awt_TrayIcon.cpp.i
data/test/javax/sound/midi/Gervill/SoftReceiver/Send_NoteOn_Delayed.java.i
data/src/share/classes/javax/net/SocketFactory.java.i
@@ -20215,190 +21032,196 @@ data/make/sun/rmi/rmic/FILES.gmk.i
data/test/javax/xml/crypto/dsig/data/certs/morigu.crt.i
data/test/java/net/SocketInputStream/SocketTimeout.java.i
data/src/share/classes/sun/management/HotspotCompilation.java.i
-data/test/javax/sound/midi/Gervill/AudioFloatInputStream/Available.java.i
+data/make/com/sun/tracing/dtrace/Makefile.i
data/test/javax/sound/midi/Gervill/SimpleSoundbank/GetInstrument.java.i
data/test/sun/rmi/rmic/newrmic/equivalence/ServerImpl.java.i
data/src/solaris/native/sun/java2d/loops/vis_FuncArray.c.i
data/src/share/classes/javax/management/openmbean/MXBeanMappingFactoryClass.java.i
-data/src/solaris/native/sun/java2d/loops/vis_AlphaMaskBlit.c.i
+data/test/java/beans/Performance/TestPropertyChangeSupport.java.i
data/src/share/classes/sun/tools/tree/InlineMethodExpression.java.i
-data/src/share/classes/javax/management/BetweenQueryExp.java.i
+data/test/java/net/InetAddress/WhiteSpaceHostTest.java.i
data/test/javax/swing/JColorChooser/Test4759934.java.i
data/src/share/demo/jfc/Font2DTest/resources/TextResources_de.properties.i
-data/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java.i
+data/make/tools/CharsetMapping/IBM737.map.i
+data/test/org/openjdk/jigsaw/_JigsawVersionQuery.java.i
data/test/sun/security/krb5/confplusprop2.conf.i
data/test/com/sun/jdi/sde/InstallSDE.java.i
data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_zh_CN.java.i
-data/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ComTrustManagerFactoryImpl.java.i
+data/src/linux/doc/man/jarsigner.1.i
data/src/share/native/sun/font/layout/HangulLayoutEngine.h.i
-data/src/share/classes/sun/io/ByteToCharISO2022.java.i
-data/src/share/classes/javax/swing/text/html/BRView.java.i
+data/src/share/classes/sun/tools/tree/ConstantExpression.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inffast.h.i
data/test/java/util/zip/ZipFile/ShortRead.java.i
-data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii_ja.java.i
+data/test/com/sun/tools/attach/RedefineAgent.java.i
data/src/share/classes/javax/management/remote/JMXAddressable.java.i
data/src/share/classes/com/sun/tools/attach/VirtualMachineDescriptor.java.i
data/src/share/classes/java/util/logging/FileHandler.java.i
-data/src/share/classes/com/sun/media/sound/SunFileReader.java.i
-data/make/tools/swing-beans/beaninfo/images/JLayeredPaneMono32.gif.i
-data/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java.i
-data/test/com/sun/jdi/CountFilterTest.java.i
-data/src/share/classes/com/sun/jdi/TypeComponent.java.i
-data/src/share/classes/java/rmi/activation/ActivationGroup.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Available.java.i
+data/test/sun/security/provider/SeedGenerator/Priority_Inversion.java.i
+data/test/java/util/concurrent/ScheduledThreadPoolExecutor/DecorateTask.java.i
+data/test/com/sun/jdi/TemplateTest.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CMenuItem.java.i
+data/test/javax/management/query/QueryNotifFilterTest.java.i
+data/src/share/classes/java/nio/file/attribute/DosFileAttributeView.java.i
+data/test/javax/swing/plaf/basic/Test6984643.java.i
data/src/windows/classes/sun/java2d/d3d/D3DBackBufferSurfaceData.java.i
-data/src/share/classes/java/rmi/ServerError.java.i
+data/test/com/sun/jdi/MixedSuspendTest.sh.i
data/src/share/native/sun/awt/image/jpeg/jconfig.h.i
data/src/share/classes/com/sun/jdi/event/WatchpointEvent.java.i
data/test/com/sun/crypto/provider/Cipher/RSA/oaep-vect.txt.i
data/test/java/beans/XMLEncoder/Test4625418.java.i
-data/src/share/classes/sun/io/CharToByteMacThai.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/RandomFileInputStream/Read.java.i
data/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java.i
data/src/share/sample/jmx/jmx-scandir/docfiles/connect-local-ant-run.jpg.i
+data/src/solaris/classes/sun/awt/X11/MWMConstants.java.i
data/make/java/net/FILES_c.gmk.i
-data/src/share/classes/sun/util/resources/CurrencyNames_ca_ES.properties.i
+data/src/share/classes/sun/tools/tree/BitOrExpression.java.i
data/test/javax/crypto/Mac/ByteBuffers.java.i
-data/test/com/sun/net/httpserver/SelCacheTest.java.i
-data/src/share/classes/javax/management/loading/ClassLoaderRepository.java.i
+data/test/java/util/PluggableLocale/providersrc/LocaleNames_ja_JP_kyoto.properties.i
+data/make/sun/net/spi/Makefile.i
data/test/org/openjdk/jigsaw/cli/jmod-signed.sh.i
data/test/com/sun/jdi/FilterMatch.java.i
data/src/share/instrument/JavaExceptions.c.i
-data/src/share/classes/javax/swing/text/html/parser/DTDConstants.java.i
+data/test/sun/security/pkcs11/Secmod/nsstrust.cfg.i
data/test/javax/security/auth/login/LoginContext/ConfigConstructor.policy.i
data/src/share/native/sun/security/ec/ecp_mont.c.i
-data/src/share/classes/sun/reflect/annotation/TypeNotPresentExceptionProxy.java.i
+data/src/share/classes/sun/tools/native2ascii/resources/MsgNative2ascii.java.i
data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.java.i
data/src/share/classes/javax/sound/midi/ControllerEventListener.java.i
data/make/com/sun/security/auth/module/FILES_export_unix.gmk.i
-data/src/share/classes/java/beans/beancontext/BeanContextServiceRevokedListener.java.i
+data/src/share/classes/sun/jvmstat/perfdata/monitor/protocol/local/LocalEventTimer.java.i
data/src/share/native/java/lang/fdlibm/src/w_cosh.c.i
data/src/share/classes/sun/management/resources/agent.properties.i
-data/test/java/rmi/server/RMIClassLoader/loadProxyClasses/FnnClass.java.i
+data/test/java/rmi/testlibrary/RMID.java.i
+data/src/share/classes/java/sql/PreparedStatement.java.i
data/src/windows/classes/sun/awt/windows/awtLocalization_de.properties.i
data/test/com/sun/net/httpserver/bugs/B6401598.java.i
data/src/share/classes/javax/security/auth/x500/package.html.i
-data/src/solaris/classes/sun/awt/motif/MCanvasPeer.java.i
-data/src/share/classes/java/lang/management/MemoryManagerMXBean.java.i
+data/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java.i
+data/test/javax/management/mxbean/RandomMXBeanTest.java.i
data/src/share/classes/sun/net/idn/UCharacterDirection.java.i
data/test/sun/net/www/protocol/jar/jarbug/src/test/JarTest.java.i
data/src/share/classes/java/security/interfaces/RSAPrivateCrtKey.java.i
-data/src/share/classes/java/security/cert/CollectionCertStoreParameters.java.i
-data/src/share/classes/sun/text/resources/FormatData_ru_RU.java.i
-data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/LayerContainer.java.i
-data/src/windows/resource/version.rc.i
-data/src/share/classes/sun/tools/tree/IfStatement.java.i
-data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.d
-data/src/share/classes/java/awt/color/ICC_ColorSpace.java.i
+data/test/javax/sound/midi/Gervill/SimpleSoundbank/SetName.java.i
+data/test/java/lang/instrument/ilib/Injector.java.i
+data/test/java/util/EnumSet/SmallEnumIteratorRemoveResilience.java.i
+data/test/sun/security/krb5/ParseConfig.java.i
+data/test/java/io/File/MaxPathLength.java.i
+data/test/javax/sound/midi/Gervill/SoftSynthesizer/ding.sf2.i
+data/src/share/classes/com/sun/rowset/RowSetFactoryImpl.java.i
data/test/java/beans/XMLEncoder/Test6176120.java.i
data/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java.i
data/src/share/native/sun/awt/image/jpeg/jdpostct.c.i
data/src/share/demo/jvmti/hprof/hprof_check.c.i
data/test/javax/sound/midi/MidiDeviceConnectors/TestAllDevices.java.i
-data/src/share/classes/sun/font/FontManagerFactory.java.i
-data/src/share/classes/java/awt/geom/PathIterator.java.i
-data/test/java/net/URLClassLoader/B6896088.java.i
-data/test/javax/swing/border/Test6978482.java.i
+data/src/windows/classes/sun/awt/windows/awtLocalization_sv.properties.i
+data/src/macosx/classes/com/apple/laf/AquaEditorPaneUI.java.i
+data/test/java/security/KeyRep/RC5.pre.1.5.key.i
+data/test/java/rmi/Naming/UnderscoreHost_Stub.java.i
data/test/java/lang/Boolean/MakeBooleanComparable.java.i
-data/src/solaris/native/sun/awt/awt_Scrollbar.c.i
+data/test/java/lang/reflect/Proxy/returnTypes/GetCloneable.java.i
data/src/share/native/sun/font/layout/HebrewShaping.h.i
-data/src/share/classes/sun/security/pkcs11/Token.java.i
+data/src/share/classes/sun/print/PSPathGraphics.java.i
data/src/share/classes/sun/misc/Signal.java.i
data/src/share/classes/com/sun/media/sound/SF2Soundbank.java.i
-data/src/share/classes/org/jcp/xml/dsig/internal/dom/DOMDigestMethod.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/keyresolver/KeyResolverException.java.i
data/src/share/classes/sun/dyn/util/VerifyType.java.i
data/src/share/classes/sun/tools/tree/FieldExpression.java.i
data/src/share/classes/com/sun/jmx/snmp/internal/SnmpSecurityModel.java.i
data/test/javax/swing/JFileChooser/4150029/bug4150029.html.i
-data/src/share/classes/sun/management/counter/perf/PerfByteArrayCounter.java.i
+data/src/windows/classes/sun/awt/windows/WEmbeddedFrame.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_RSA_PKCS_PSS_PARAMS.java.i
data/test/sun/security/jgss/GssNPE.java.i
data/src/share/classes/java/io/PipedReader.java.i
-data/test/java/util/concurrent/BlockingQueue/Interrupt.java.i
-data/src/share/classes/java/security/cert/CertSelector.java.i
+data/src/share/classes/java/rmi/server/RemoteCall.java.i
+data/test/java/util/Map/Get.java.i
data/src/share/classes/javax/swing/event/MenuDragMouseListener.java.i
data/test/java/util/ArrayList/IteratorMicroBenchmark.java.i
-data/src/share/classes/sun/tools/tree/LessExpression.java.i
-data/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java.i
+data/src/solaris/javavm/export/jni_md.h.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/J2DBench.java.i
data/src/share/classes/com/sun/tools/jdi/VMState.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/x509/XMLX509Certificate.java.i
-data/test/java/nio/channels/AsynchronousChannelGroup/BadProperties.java.i
+data/src/macosx/classes/com/apple/eawt/_AppDockIconHandler.java.i
+data/src/share/native/sun/java2d/loops/ThreeByteBgr.c.i
data/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java.i
data/test/java/util/zip/ZipFile/ReleaseInflater.java.i
-data/src/share/classes/sun/security/ssl/ServerHandshaker.java.i
+data/src/share/classes/javax/naming/event/NamespaceChangeListener.java.i
data/make/tools/CharsetMapping/IBM1112.map.i
-data/src/share/classes/sun/tools/jconsole/inspector/TableSorter.java.i
-data/test/sun/security/provider/PolicyParser/UnresolvedProperty.policy.i
-data/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh.i
+data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/CloseTest.java.i
+data/src/windows/native/sun/windows/awt_Window.h.i
+data/test/sun/security/pkcs11/Provider/ConfigQuotedString.java.i
data/test/java/beans/PropertyEditor/TestDoubleTypeNull.java.i
-data/src/share/classes/sun/text/resources/unorm.icu.i
+data/src/solaris/classes/sun/awt/motif/X11GB18030_1.java.i
data/test/java/util/TreeMap/NullAtEnd.java.i
data/test/java/security/Security/signedfirst/StaticSignedProvFirst.java.i
data/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java.i
data/src/share/classes/sun/rmi/server/ActivatableRef.java.i
-data/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java.i
+data/src/share/classes/java/math/SignedMutableBigInteger.java.i
data/src/share/classes/com/sun/tools/attach/AttachPermission.java.i
data/test/javax/script/Test7.js.i
data/test/sun/nio/cs/TestISO2022CNDecoder.java.i
-data/src/share/classes/com/sun/media/sound/DLSInstrument.java.i
+data/src/windows/classes/sun/java2d/d3d/D3DContext.java.i
data/src/share/classes/javax/swing/JLabel.java.i
-data/src/share/classes/sun/nio/ch/AllocatedNativeObject.java.i
-data/src/solaris/native/sun/java2d/j2d_md.h.i
+data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.so.i
data/src/share/native/sun/java2d/loops/ByteBinary4Bit.h.i
data/test/javax/xml/crypto/dsig/KeySelectors.java.i
-data/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java.i
data/src/share/demo/nbproject/management/FullThreadDump/nbproject/project.xml.i
-data/src/share/classes/java/rmi/registry/LocateRegistry.java.i
+data/src/share/demo/nbproject/jfc/TableExample/build.xml.i
data/test/javax/management/query/QueryParseTest.java.i
-data/src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java.i
-data/src/share/native/sun/font/layout/KernTable.h.i
-data/src/share/native/java/lang/fdlibm/src/w_gamma.c.i
+data/test/com/sun/jdi/CatchPatternTest.sh.i
+data/test/javax/management/remote/mandatory/version/ImplVersionCommand.java.i
+data/src/share/classes/sun/io/ByteToCharCp856.java.i
data/make/com/sun/security/auth/module/FILES_export_windows.gmk.i
data/test/sun/security/util/Oid/S11N.sh.i
-data/src/share/classes/com/sun/imageio/stream/StreamCloser.java.i
+data/src/share/classes/sun/management/snmp/jvmmib/JvmRTClassPathEntryMeta.java.i
data/test/java/io/Serializable/backRefCNFException/Read.java.i
data/src/share/classes/sun/text/resources/FormatData_de_CH.java.i
-data/test/java/awt/KeyboardFocusmanager/TypeAhead/MenuItemActivatedTest/MenuItemActivatedTest.java.i
-data/src/share/classes/sun/net/httpserver/LeftOverInputStream.java.i
-data/src/share/classes/java/util/prefs/NodeChangeEvent.java.i
+data/test/java/awt/GraphicsEnvironment/PreferLocaleFonts.java.i
+data/test/java/util/Hashtable/SimpleSerialization.java.i
+data/test/java/beans/PropertyEditor/TestEnumSubclassValue.java.i
data/src/share/demo/nbproject/jfc/SampleTree/build.properties.i
data/test/java/nio/charset/coders/FullRead.java.i
data/src/share/classes/java/beans/Expression.java.i
-data/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher.i
+data/make/tools/swing-beans/beaninfo/images/JMenuColor16.gif.i
data/test/java/util/ResourceBundle/RBTestFmwk.java.i
-data/test/com/sun/jdi/EnumTest.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityParameters.java.i
-data/test/java/rmi/server/RMIClassLoader/spi/Property.java.i
+data/src/share/classes/java/io/NotSerializableException.java.i
data/src/share/classes/java/util/jar/JavaUtilJarAccessImpl.java.i
data/src/share/classes/java/rmi/activation/ActivationSystem.java.i
-data/src/share/classes/java/lang/invoke/MethodHandleImpl.java.i
-data/test/sun/security/pkcs11/ec/p12passwords.txt.i
-data/src/share/classes/sun/net/www/protocol/http/ntlm/NTLMAuthenticationCallback.java.i
+data/test/sun/tools/jps/jps-help.sh.i
+data/src/macosx/native/sun/awt/PrinterView.m.i
+data/test/java/rmi/activation/Activatable/restartService/security.policy.i
+data/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider.i
+data/test/javax/print/PrintSubInputStream/Example.java.i
data/src/share/native/sun/font/layout/LEScripts.h.i
data/src/share/classes/sun/security/util/AuthResources_ko.java.i
-data/make/tools/reorder/tests/LoadToolkit.java.i
+data/src/share/classes/sun/io/CharToByteCp1112.java.i
data/src/solaris/native/sun/awt/MouseInfo.c.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_UNLOCKMUTEX.java.i
-data/src/share/classes/sun/net/TelnetProtocolException.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/BootAnalyzer.java.i
data/test/sun/security/provider/PolicyParser/ExpansionErrorMisleading.policy.i
+data/src/share/classes/java/awt/doc-files/modal-example1.gif.i
data/test/java/awt/Graphics/DrawImageBG/SystemBgColorTest.java.i
data/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html.i
data/test/com/sun/crypto/provider/Cipher/DES/inputData/plain3.txt.i
-data/src/share/classes/java/security/SecureRandomSpi.java.i
-data/src/share/classes/sun/nio/cs/ext/MSISO2022JP.java.i
+data/test/com/sun/jdi/ControlFlow.java.i
+data/src/share/classes/sun/security/jgss/LoginConfigImpl.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/compress.c.i
-data/make/PatchList.solaris.i
-data/src/share/classes/javax/swing/undo/UndoableEditSupport.java.i
-data/src/share/classes/javax/smartcardio/CommandAPDU.java.i
+data/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java.i
+data/src/share/classes/sun/util/resources/TimeZoneNames_ko.java.i
+data/test/sun/nio/cs/TestCompoundTest.java.i
data/src/share/classes/sun/io/CharToByteCp861.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties.i
-data/make/tools/src/build/tools/generatebreakiteratordata/DictionaryBasedBreakIteratorBuilder.java.i
-data/src/share/classes/javax/sound/midi/SoundbankResource.java.i
-data/src/share/classes/com/sun/jmx/snmp/SnmpInt.java.i
+data/test/java/lang/String/Supplementary.java.i
+data/src/share/native/sun/awt/libpng/pngwio.c.i
+data/src/share/classes/javax/management/monitor/StringMonitor.java.i
data/test/java/util/prefs/PrefsSpi.java.i
-data/src/share/classes/java/io/ObjectOutput.java.i
-data/src/share/classes/java/lang/RuntimeException.java.i
-data/src/share/classes/java/lang/ClassLoader.java.i
-data/test/java/io/InputStreamReader/GrowAfterEOF.java.i
+data/test/java/net/Authenticator/B6870935.java.i
+data/make/tools/dtdbuilder/dtds/public.map.i
+data/test/com/sun/crypto/provider/Cipher/RSA/TestRSA.java.i
+data/test/java/net/CookieHandler/B6791927.java.i
data/test/java/rmi/reliability/benchmark/bench/serial/CustomObjTrees.java.i
data/src/solaris/classes/sun/awt/motif/X11JIS0212.java.i
+data/src/macosx/classes/sun/lwawt/macosx/CToolkitThreadBlockedHandler.java.i
data/make/java/sun_nio/Makefile.i
data/test/java/io/Serializable/6966692/Test6966692.sh.i
data/test/java/beans/Performance/TestIntrospector.java.i
@@ -20406,31 +21229,32 @@ data/test/com/sun/jdi/CatchAllTest.sh.i
data/src/share/classes/java/security/Provider.java.i
data/src/share/classes/sun/tools/jconsole/Version-template.java.i
data/src/share/classes/java/rmi/AccessException.java.i
-data/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java.i
+data/src/share/back/util.c.i
+data/make/javax/Makefile.i
data/src/share/classes/javax/security/auth/login/CredentialException.java.i
-data/test/sun/tools/jcmd/jcmd-help.sh.i
+data/src/share/native/sun/font/layout/CanonShaping.cpp.i
data/src/share/classes/sun/io/CharToByteCp856.java.i
-data/src/share/classes/sun/nio/cs/ext/ISO_8859_3.java.i
+data/test/java/awt/FileDialog/SaveFileNameOverrideTest/SaveFileNameOverrideTest.html.i
data/src/share/demo/jfc/CodePointIM/CodePointIM.java.i
data/src/share/classes/sun/io/ByteToCharCp285.java.i
data/test/java/lang/instrument/PremainClass/InheritAgent0111.java.i
-data/make/modules/BuildPackages.gmk.i
-data/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.i
-data/test/sun/nio/cs/EuroConverter.java.i
-data/src/share/classes/sun/jvmstat/monitor/remote/RemoteHost.java.i
+data/src/share/classes/sun/rmi/log/ReliableLog.java.i
+data/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowRefs.java.i
+data/test/java/rmi/activation/Activatable/nestedActivate/security.policy.i
+data/test/java/awt/event/MouseEvent/FrameMouseEventAbsoluteCoordsTest/FrameMouseEventAbsoluteCoordsTest.java.i
data/src/share/classes/java/security/KeyFactorySpi.java.i
data/test/java/nio/charset/Charset/Default.java.i
data/src/solaris/doc/sun/man/man1/ja/javadoc.1.d
-data/test/java/util/PluggableLocale/CollatorProviderTest.sh.i
+data/test/javax/swing/JFileChooser/6342301/bug6342301.java.i
data/src/share/classes/com/sun/servicetag/Installer.java.i
-data/src/share/sample/nio/server/Content.java.i
+data/make/tools/src/build/tools/javazic/Main.java.i
data/test/sun/security/util/Oid/OidFormat.java.i
data/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java.i
-data/src/windows/classes/sun/awt/windows/WScrollPanePeer.java.i
+data/test/sun/nio/cs/CheckICNE.java.i
data/src/share/classes/sun/security/jgss/HttpCaller.java.i
data/src/solaris/doc/sun/man/man1/ja/javadoc.1.i
-data/src/share/classes/javax/security/auth/login/Configuration.java.i
-data/src/share/classes/java/awt/geom/AffineTransform.java.i
+data/test/sun/security/ssl/javax/net/ssl/SSLServerSocket/DefaultSSLServSocketFac.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c.i
data/src/share/native/sun/security/ec/impl/mpi-priv.h.i
data/test/javax/sound/midi/Gervill/SoftLimiter/ProcessAudio_replace_overdrive_mono.java.i
data/src/share/native/sun/awt/debug/debug_mem.h.i
@@ -20442,44 +21266,43 @@ data/src/share/classes/sun/management/StackTraceElementCompositeData.java.i
data/src/windows/native/sun/java2d/d3d/D3DPipelineManager.cpp.i
data/src/share/classes/java/awt/peer/KeyboardFocusManagerPeer.java.i
data/src/share/classes/javax/swing/text/html/Map.java.i
-data/src/share/classes/java/awt/Frame.java.i
-data/src/share/classes/java/awt/KeyEventDispatcher.java.i
+data/make/tools/src/build/tools/automulti/TestALFGenerator.java.i
+data/src/windows/native/sun/jkernel/stdafx.h.i
data/src/windows/classes/sun/tools/attach/WindowsAttachProvider.java.i
data/src/share/classes/java/util/concurrent/TimeoutException.java.i
-data/src/share/classes/javax/swing/text/html/ResourceLoader.java.i
-data/test/java/net/CookieHandler/B6644726.java.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_de.properties.i
+data/src/share/classes/java/util/LinkedHashSet.java.i
+data/test/java/nio/Buffer/CopyDirectIntMemory.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBuffer/WriteTo.java.i
data/make/common/shared/Compiler-msvc.gmk.i
-data/src/solaris/doc/sun/man/man1/ja/jsadebugd.1.i
+data/test/sun/tools/jps/jps-Vvml_2.sh.i
data/src/share/classes/sun/tools/asm/Assembler.java.i
data/src/share/classes/java/awt/image/DataBuffer.java.i
data/src/share/classes/javax/swing/text/html/parser/ContentModelState.java.i
data/test/sun/nio/cs/CheckCaseInsensitiveEncAliases.java.i
-data/src/share/classes/sun/util/resources/TimeZoneNames.java.i
+data/make/tools/swing-beans/beaninfo/images/JPopupMenuMono32.gif.i
data/test/javax/swing/JEditorPane/4492274/test.html.i
data/src/windows/native/sun/windows/awt_Dimension.cpp.i
data/src/share/native/java/lang/fdlibm/src/w_fmod.c.i
data/src/share/classes/javax/management/BadAttributeValueExpException.java.i
data/src/share/classes/javax/management/BooleanValueExp.java.i
-data/test/java/util/logging/LoggingDeadlock2.java.i
+data/src/share/classes/java/awt/peer/MenuBarPeer.java.i
data/src/share/native/sun/java2d/opengl/OGLRenderer.h.i
data/src/share/classes/sun/io/ByteToCharISO8859_1.java.i
-data/src/share/classes/java/util/Calendar.java.i
+data/src/share/classes/sun/java2d/pipe/OutlineTextRenderer.java.i
data/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java.i
-data/src/share/classes/com/sun/management/DiagnosticCommandInfo.java.i
+data/src/share/classes/java/lang/module/ModuleInfoAnnotation.java.i
data/src/share/native/java/util/zip/zlib-1.2.5/deflate.h.i
-data/src/share/classes/sun/text/normalizer/ICUBinary.java.i
+data/src/share/classes/sun/tools/serialver/serialver.properties.i
data/test/java/util/Collection/IteratorAtEnd.java.i
data/test/javax/management/remote/mandatory/connection/MultiThreadDeadLockTest.java.i
data/src/share/native/java/lang/fdlibm/src/s_tanh.c.i
data/src/share/native/sun/java2d/loops/FillSpans.c.i
data/test/sun/rmi/rmic/newrmic/equivalence/MyObject.java.i
data/test/javax/management/loading/LibraryLoader/jar_src/UseNativeLib.java.i
-data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h.i
data/src/solaris/classes/sun/awt/X11/XNETProtocol.java.i
-data/src/share/native/java/io/FileInputStream.c.i
+data/src/share/classes/sun/io/CharToByteCp948.java.i
data/src/share/native/sun/security/ec/impl/mpi.c.i
-data/test/com/sun/jdi/UnpreparedByName.java.i
+data/test/com/sun/jdi/InnerTarg.java.i
data/src/share/classes/com/sun/tools/example/trace/EventThread.java.i
data/src/share/classes/java/util/DualPivotQuicksort.java.i
data/src/share/classes/java/security/spec/RSAPublicKeySpec.java.i
@@ -20488,295 +21311,306 @@ data/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java.i
data/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java.i
data/src/share/classes/sun/security/pkcs11/P11DHKeyFactory.java.i
data/test/java/awt/im/4959409/bug4959409.java.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java.i
+data/test/java/lang/Runtime/exec/WinCommand.java.i
data/src/solaris/bin/ia64/jvm.cfg.i
-data/test/java/awt/geom/Arc2D/SerializationTest.java.i
+data/test/javax/sound/midi/Gervill/ModelByteBufferWavetable/NewModelByteBufferWavetableModelByteBuffer.java.i
data/src/share/classes/javax/naming/spi/StateFactory.java.i
data/test/java/nio/channels/SocketChannel/ExceptionTranslation.java.i
data/test/java/io/Serializable/oldTests/BinaryTree.java.i
-data/src/share/classes/javax/management/relation/RoleStatus.java.i
+data/test/com/sun/servicetag/servicetag2.properties.i
+data/src/bsd/doc/man/ja/jstack.1.i
data/src/share/sample/jmx/jmx-scandir/docfiles/scandir-start.jpg.i
data/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c.i
data/src/share/classes/sun/security/util/Resources_es.java.i
data/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java.i
-data/src/share/classes/java/nio/file/FileSystem.java.i
+data/test/javax/management/remote/mandatory/connection/RMIConnectionIdTest.java.i
data/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java.i
data/test/sun/tools/jps/jps-m_Output2.awk.i
-data/test/com/sun/jdi/UnpreparedClasses.java.i
-data/test/java/io/Serializable/lookupAnyInvocation/LookupAnyInvocation.java.i
+data/test/java/lang/ref/SoftReference/Bash.java.i
+data/test/java/util/Locale/data/deflocale.sh.i
data/test/java/rmi/activation/Activatable/unregisterInactive/group.security.policy.i
data/make/sun/awt/README.i
data/test/java/net/HttpURLConnection/HttpResponseCode.java.i
-data/test/javax/management/Introspector/MBeanDescriptionTest.java.i
+data/test/sun/security/ssl/README.i
data/src/solaris/native/sun/awt/multiVis.h.i
data/test/java/io/PrintWriter/OversynchronizedTest.java.i
-data/src/solaris/native/sun/nio/fs/genUnixConstants.c.i
-data/src/share/classes/javax/swing/Spring.java.i
+data/src/share/native/java/util/zip/zlib-1.2.3/inftrees.c.i
+data/src/share/classes/sun/tools/serialver/SerialVer.java.i
data/src/windows/classes/sun/nio/ch/PendingIoCache.java.i
data/src/share/classes/javax/swing/tree/TreeNode.java.i
data/src/windows/native/sun/windows/GDIHashtable.cpp.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignedInfo.java.i
-data/src/share/native/com/sun/media/sound/SoundDefs.h.i
+data/test/sun/security/pkcs11/nss/lib/windows-amd64/softokn3.dll.i
+data/test/java/security/cert/CertPathValidator/OCSP/FailoverToCRL.java.i
+data/src/windows/native/sun/windows/ThemeReader.cpp.i
data/test/java/net/ServerSocket/ThreadStop.java.i
-data/src/share/classes/com/sun/tools/jdi/IntegerValueImpl.java.i
+data/make/tools/CharsetMapping/IBM037.nr.i
data/src/share/classes/sun/print/AttributeUpdater.java.i
data/test/java/beans/XMLEncoder/java_util_ArrayList.java.i
data/src/share/classes/javax/net/ssl/HttpsURLConnection.java.i
-data/make/tools/CharsetMapping/IBM942.c2b.i
-data/src/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java.i
-data/src/share/classes/com/sun/tools/jdi/CharTypeImpl.java.i
+data/test/java/security/KeyRep/SerialDSAPubKey.policy.i
+data/test/java/security/KeyRep/RSA.pre.1.5.key.i
+data/test/com/sun/jdi/RefTypes.java.i
data/test/java/util/zip/ZipFile/input.jar.i
-data/src/share/classes/javax/management/StandardEmitterMBean.java.i
+data/src/share/classes/sun/security/pkcs11/P11ECDHKeyAgreement.java.i
data/make/javax/rmi/Makefile.i
-data/src/solaris/doc/sun/man/man1/extcheck.1.i
-data/src/share/classes/sun/io/ByteToCharCp875.java.i
-data/src/share/classes/javax/xml/crypto/OctetStreamData.java.i
-data/make/modules/tools/src/com/sun/classanalyzer/ResolutionInfo.java.i
+data/src/share/classes/javax/management/event/RMIPushEventForwarder.java.i
+data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java.i
+data/test/java/nio/channels/ServerSocketChannel/Basic.java.i
+data/test/java/awt/Mouse/TitleBarDoubleClick/TitleBarDoubleClick.java.i
data/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java.i
data/src/share/classes/javax/print/attribute/standard/JobMediaSheetsCompleted.java.i
-data/src/share/classes/java/sql/Statement.java.i
-data/src/share/classes/sun/java2d/pipe/hw/BufferedContextProvider.java.i
+data/test/sun/misc/JarIndex/metaInfFilenames/jarC/META-INF/fonts.mf.i
+data/test/sun/nio/cs/OLD/IBM949_OLD.java.i
data/src/share/classes/sun/reflect/Reflection.java.i
+data/src/share/classes/sun/management/resources/agent_de.properties.i
data/src/share/classes/sun/reflect/generics/tree/ArrayTypeSignature.java.i
data/src/windows/native/sun/windows/awt_Dialog.cpp.i
-data/src/share/classes/java/rmi/activation/Activator.java.i
-data/test/javax/crypto/Cipher/Turkish.java.i
-data/src/share/classes/sun/text/normalizer/UCharacter.java.i
+data/src/share/classes/javax/swing/SingleSelectionModel.java.i
+data/src/share/classes/javax/swing/plaf/DimensionUIResource.java.i
+data/src/share/classes/java/applet/package.html.i
data/test/java/security/AccessControlContext/CheckCtor.java.i
data/src/share/demo/applets/MoleculeViewer/models/cyclohexane.xyz.i
+data/src/macosx/classes/com/apple/laf/ScreenMenuBar.java.i
data/src/share/native/java/io/ObjectOutputStream.c.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/KeyInfoContent.java.i
-data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c.i
+data/src/share/classes/sun/print/RasterPrinterJob.java.i
data/src/share/classes/javax/swing/text/Utilities.java.i
-data/src/share/classes/org/openjdk/jigsaw/Hi.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java.i
-data/src/share/classes/java/nio/channels/SeekableByteChannel.java.i
+data/src/share/classes/sun/java2d/pisces/Stroker.java.i
+data/src/share/classes/javax/swing/border/BevelBorder.java.i
+data/test/java/awt/event/KeyEvent/AcceleratorTest/AcceleratorTest.java.i
data/src/share/classes/java/nio/channels/InterruptibleChannel.java.i
-data/src/share/classes/sun/security/action/LoadLibraryAction.java.i
+data/src/share/classes/sun/text/resources/FormatData_en_PH.java.i
data/test/javax/swing/JFileChooser/6698013/bug6698013.html.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_34.c.i
data/test/sun/util/resources/TimeZone/IntlTest.java.i
data/test/javax/management/context/ContextTest.java.i
data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java.i
data/src/solaris/native/sun/awt/initIDs.c.i
-data/test/java/net/URLConnection/DisconnectAfterEOF.java.i
+data/test/sun/security/provider/certpath/ReverseBuilder/prjM2mgrM.i
data/test/sun/security/pkcs11/Secmod/Crypto.java.i
-data/test/java/awt/Paint/PgramUserBoundsTest.java.i
+data/test/java/nio/channels/FileChannel/Transfer.java.i
data/src/solaris/native/common/jdk_util_md.c.i
data/src/share/demo/jfc/Metalworks/resources/HelpFiles/metal.html.i
data/test/java/security/cert/X509Certificate/ExtKeyUsage.java.i
data/src/share/classes/com/sun/pept/ept/ContactInfo.java.i
-data/src/share/classes/java/util/concurrent/ThreadLocalRandom.java.i
+data/test/java/net/URLDecoder/B6463990.java.i
data/test/java/lang/Math/Atan2Tests.java.i
-data/src/share/classes/java/rmi/dgc/Lease.java.i
-data/src/share/classes/java/util/ListIterator.java.i
+data/test/javax/management/Introspector/ParameterNameTest.java.i
+data/src/share/native/sun/java2d/loops/FillParallelogram.c.i
data/src/windows/native/sun/nio/ch/WindowsAsynchronousFileChannelImpl.c.i
data/test/java/io/Serializable/serialver/classpath/Test.java.i
-data/src/share/classes/com/sun/beans/finder/BeanInfoFinder.java.i
+data/test/java/net/InetSocketAddress/B6469803.java.i
data/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java.i
data/test/java/util/Formatter/BasicBooleanObject.java.i
data/src/share/back/inStream.c.i
-data/src/share/classes/javax/imageio/stream/ImageOutputStream.java.i
-data/src/share/classes/sun/reflect/UnsafeByteFieldAccessorImpl.java.i
+data/test/java/rmi/server/RMIClassLoader/spi/security.policy.i
+data/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly_Stub.java.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java.i
data/test/java/util/ResourceBundle/Bug4168625Resource3_en.java.i
data/src/share/native/sun/font/layout/StateTableProcessor.h.i
data/test/sun/net/www/http/HttpClient/OpenServer.java.i
-data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java.i
-data/test/com/sun/net/httpserver/Test8a.java.i
+data/test/java/lang/ThreadLocal/TestThreadId.java.i
+data/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java.i
data/test/javax/swing/JScrollBar/6542335/bug6542335.java.i
-data/src/share/classes/com/sun/jdi/event/ClassUnloadEvent.java.i
+data/test/sun/java2d/DirectX/OverriddenInsetsTest/OverriddenInsetsTest.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/FrameMinimize.wav.i
data/test/javax/management/modelmbean/SimpleModelMBean/SimpleModelMBeanCommand.java.i
-data/make/com/sun/tools/attach/FILES_java.gmk.i
-data/src/share/classes/sun/security/pkcs11/P11KeyGenerator.java.i
-data/src/share/classes/com/sun/jdi/event/package.html.i
+data/test/com/sun/jdi/sde/MangleTest.java.i
+data/test/sun/tools/jstat/printCompilationOutput1.awk.i
+data/test/sun/security/ssl/sanity/pluggability/CheckSSLContextExport.java.i
data/test/java/util/AbstractList/HasNextAfterException.java.i
data/test/java/util/Deque/ChorusLine.java.i
-data/src/share/classes/sun/util/resources/LocaleNames_lt.properties.i
-data/src/share/classes/sun/security/x509/GeneralSubtrees.java.i
-data/src/share/classes/com/sun/jndi/toolkit/corba/CorbaUtils.java.i
+data/src/share/classes/sun/text/resources/FormatData_es_CL.java.i
+data/src/share/classes/sun/text/resources/FormatData_th_TH_TH.java.i
+data/src/solaris/doc/sun/man/man1/rmid.1.i
data/src/share/native/sun/font/layout/Lookups.h.i
+data/src/macosx/native/jobjc/src/runtime-additions/native/NativeNumber.m.i
data/src/solaris/sample/dtrace/hotspot_jni/CriticalSection_slow.d.i
data/test/sun/tools/jps/jps-l_1.sh.i
-data/src/share/classes/javax/swing/plaf/multi/MultiInternalFrameUI.java.i
-data/test/javax/print/applet/YesNo.java.i
+data/src/share/native/sun/awt/medialib/mlib_ImageClipping.h.i
+data/test/javax/script/ProviderTest.sh.i
data/src/share/classes/sun/security/jgss/krb5/Krb5CredElement.java.i
-data/src/share/classes/javax/sound/midi/MidiDeviceTransmitter.java.i
+data/src/share/classes/javax/swing/plaf/multi/MultiComboBoxUI.java.i
data/src/share/native/sun/font/layout/KhmerLayoutEngine.h.i
data/src/share/classes/sun/java2d/cmm/lcms/LCMSImageLayout.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/Aes256CtsHmacSha1EType.java.i
+data/src/solaris/doc/sun/man/man1/ja/jstatd.1.i
data/test/sun/security/pkcs11/tls/TestKeyMaterial.java.i
-data/test/java/lang/management/ThreadMXBean/Utils.java.i
-data/src/share/classes/org/relaxng/datatype/Datatype.java.i
+data/src/share/classes/javax/swing/plaf/metal/icons/ocean/close-pressed.gif.i
+data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/effects/InnerGlowEffect.java.i
data/test/sun/net/www/protocol/file/GetContentLength.java.i
-data/test/tools/launcher/PrintVersion.java.i
-data/src/share/demo/jfc/FileChooserDemo/FileChooserDemo.java.i
+data/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp.i
+data/test/sun/nio/cs/OLD/IBM970_OLD.java.i
data/test/java/io/Serializable/modifyStaticFields/ModifyStaticFields.java.i
-data/src/share/classes/java/nio/channels/FileChannel.java.i
+data/src/solaris/classes/sun/awt/motif/X11KSC5601.java.i
data/test/sun/security/pkcs11/nss/lib/linux-amd64/libsoftokn3.chk.i
data/src/share/classes/java/security/cert/CertificateEncodingException.java.i
data/test/java/nio/file/attribute/AclFileAttributeView/Basic.java.i
-data/src/share/classes/java/security/acl/Group.java.i
+data/test/java/net/Authenticator/B4678055.java.i
data/test/java/util/PluggableLocale/providersrc/FooNumberFormat.java.i
data/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c.i
-data/test/java/lang/instrument/MakeJAR.sh.i
-data/test/org/openjdk/jigsaw/library.sh.i
-data/make/modules/tools/src/com/sun/classanalyzer/ClassAnalyzer.java.i
-data/src/share/classes/sun/security/x509/SubjectKeyIdentifierExtension.java.i
-data/src/share/classes/sun/security/krb5/internal/crypto/KeyUsage.java.i
-data/src/share/classes/javax/swing/text/WhitespaceBasedBreakIterator.java.i
+data/src/share/native/java/util/zip/zlib-1.2.5/inffixed.h.i
+data/test/sun/net/www/protocol/http/spnegoLogin.conf.i
+data/make/sun/org/mozilla/Makefile.i
+data/test/sun/security/x509/X500Name/NullX500Name.java.i
+data/test/com/sun/security/sasl/Cram.java.i
+data/test/java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest.java.i
data/src/share/classes/sun/jvmstat/monitor/IntegerMonitor.java.i
data/src/windows/native/sun/awt/splashscreen/splashscreen_sys.c.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/X509TrustManagerImpl/PKIXExtendedTM.java.i
-data/src/share/classes/sun/tools/tree/CheckContext.java.i
+data/test/javax/management/remote/mandatory/passwordAccessFile/password.properties.i
+data/test/sun/security/ssl/sanity/interop/CipherTest.java.i
data/src/share/bin/defines.h.i
data/src/share/classes/java/awt/doc-files/RadialGradientPaint-1.png.i
-data/test/java/util/Vector/SerializationDeadlock.java.i
+data/test/sun/tools/jstat/usage.out.i
data/test/javax/crypto/Cipher/ByteBuffersNull.java.i
-data/src/share/classes/com/sun/jmx/snmp/agent/SnmpIndex.java.i
+data/make/tools/src/build/tools/jdwpgen/ClassObjectTypeNode.java.i
data/src/share/classes/java/lang/CharSequence.java.i
-data/src/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java.i
+data/src/macosx/classes/sun/lwawt/LWToolkit.java.i
+data/src/share/classes/javax/swing/text/ZoneView.java.i
data/test/java/beans/PropertyEditor/TestFloatClassValue.java.i
-data/src/share/demo/nbproject/jfc/Notepad/nbproject/file-targets.xml.i
-data/src/share/classes/java/nio/channels/AsynchronousByteChannel.java.i
+data/test/javax/management/mxbean/LeakTest.java.i
+data/src/share/demo/management/FullThreadDump/Deadlock.java.i
data/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java.i
data/src/share/native/sun/font/AccelGlyphCache.h.i
data/src/share/classes/sun/tools/jconsole/resources/JConsoleResources.java.i
data/src/windows/native/sun/windows/awt_Component.h.i
-data/src/share/classes/java/awt/doc-files/modal-example1.gif.i
+data/src/share/classes/java/rmi/registry/RegistryHandler.java.i
data/test/sun/tools/jstat/fileURITest1.awk.i
data/test/java/rmi/activation/Activatable/downloadParameterClass/security.policy.i
-data/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java.i
-data/src/share/classes/java/lang/Exception.java.i
+data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/resource/schema/xmldsig-core-schema.dtd.i
data/src/share/classes/sun/security/x509/X509AttributeName.java.i
-data/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt.i
-data/src/share/classes/java/awt/image/TileObserver.java.i
-data/src/share/classes/sun/util/logging/resources/logging_ja.properties.i
+data/make/tools/swing-beans/beaninfo/images/JListMono16.gif.i
+data/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c.i
+data/test/java/lang/Class/forName/classes/Z.class.i
data/src/share/demo/java2d/J2DBench/src/j2dbench/tests/RenderTests.java.i
-data/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_Ports.c.i
+data/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowBlockingTest.java.i
data/src/share/demo/jvmti/waiters/Thread.cpp.i
+data/src/bsd/doc/man/ja/javap.1.i
data/test/java/nio/Buffer/BasicByte.java.i
data/test/sun/security/krb5/auto/CleanState.java.i
-data/src/share/sample/scripting/scriptpad/src/scripts/linewrap.js.i
+data/test/java/security/cert/CertPathValidator/targetConstraints/ValidateTargetConstraints.java.i
data/test/java/lang/String/NonCharacterMapping.java.i
-data/src/solaris/doc/sun/man/man1/jmap.1.i
-data/src/share/classes/java/io/package.html.i
+data/src/share/classes/java/text/CollationKey.java.i
+data/make/common/shared/Defs-solaris.gmk.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c.i
+data/test/sun/security/pkcs12/Bug6415637.java.i
data/src/share/classes/java/io/InterruptedIOException.java.i
data/src/solaris/native/sun/awt/awt_util.h.i
data/src/share/classes/sun/io/ByteToCharCp922.java.i
data/src/share/classes/sun/io/CharToByteDoubleByte.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmClassesVerboseLevel.java.i
data/src/share/classes/sun/io/CharToByteMS936.java.i
-data/src/share/demo/jfc/Metalworks/resources/HelpFiles/toc.html.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/TransformationException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/motif/icons/image-failed.png.i
+data/src/share/native/java/util/zip/zlib-1.2.3/deflate.h.i
data/src/share/demo/applets/NervousText/NervousText.java.i
data/src/share/classes/sun/util/resources/CurrencyNames_de_AT.properties.i
-data/src/share/classes/com/sun/media/sound/UlawCodec.java.i
-data/src/share/classes/sun/awt/ModalityListener.java.i
+data/test/java/net/HttpURLConnection/UnmodifiableMaps.java.i
+data/test/tools/launcher/VerifyExceptions.java.i
data/src/share/classes/sun/text/resources/FormatData_sr_ME.java.i
data/src/share/classes/javax/swing/plaf/InsetsUIResource.java.i
-data/test/javax/management/openmbean/MBeanFeatureInfoSerialStore.java.i
+data/src/share/classes/sun/net/NetworkClient.java.i
data/src/share/classes/sun/awt/im/InputMethodAdapter.java.i
-data/src/share/classes/com/sun/tools/jdi/resources/jdi_zh_CN.properties.i
data/make/sun/text/Makefile.i
data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties.i
+data/test/sun/security/provider/certpath/X509CertPath/ValidateCompromised.java.i
data/src/share/classes/sun/tools/javac/SourceClass.java.i
data/test/java/lang/management/ThreadMXBean/ThreadDump.java.i
-data/test/java/util/Locale/data/deflocale.rhel5.i
+data/test/sun/nio/cs/Test6254467.java.i
data/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.java.i
data/src/share/classes/java/io/FileOutputStream.java.i
data/src/share/classes/sun/reflect/generics/visitor/TypeTreeVisitor.java.i
data/src/share/classes/javax/net/ServerSocketFactory.java.i
-data/src/share/demo/jvmti/hprof/hprof_frame.c.i
-data/src/share/classes/javax/swing/text/rtf/charsets/cpg437.txt.i
-data/src/share/classes/sun/util/resources/LocaleNames_no.properties.i
-data/src/solaris/native/sun/xawt/XToolkit.c.i
+data/test/java/rmi/reliability/juicer/Orange.java.i
+data/test/java/security/KeyRep/SerialOld.java.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/A.1.i
+data/src/share/classes/sun/io/ByteToCharCp860.java.i
data/test/java/rmi/activation/Activatable/forceLogSnapshot/rmid.security.policy.i
data/src/share/classes/javax/security/auth/SubjectDomainCombiner.java.i
-data/src/share/classes/javax/swing/table/AbstractTableModel.java.i
+data/src/share/demo/applets/SpreadSheet/SpreadSheet.java.i
data/test/java/io/charStreams/BufferSizes.java.i
data/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java.i
data/test/java/io/Externalizable/compatibility/old.ser.i
-data/src/share/classes/com/sun/security/sasl/ExternalClient.java.i
-data/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/HelloImpl_Stub.java.i
-data/test/java/lang/Class/forName/Z.java.i
+data/src/solaris/native/sun/java2d/loops/vis_UshortGray_FromRgb.c.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.policy.i
+data/src/share/classes/com/sun/jmx/defaults/ServiceName.java.i
data/src/share/classes/javax/swing/text/StyleContext.java.i
-data/src/share/classes/sun/reflect/generics/reflectiveObjects/NotImplementedException.java.i
+data/src/share/native/sun/java2d/cmm/lcms/cmslut.c.i
data/test/java/lang/ThreadLocal/InitialValue.java.i
data/src/share/classes/java/awt/peer/ScrollPanePeer.java.i
-data/src/share/classes/com/sun/tools/jdi/PrimitiveValueImpl.java.i
-data/make/tools/swing-beans/beaninfo/images/JProgressBarMono16.gif.i
-data/src/share/classes/javax/swing/text/NumberFormatter.java.i
-data/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java.i
+data/src/windows/native/sun/windows/awt_KeyEvent.cpp.i
+data/src/share/classes/javax/net/ssl/SSLSessionBindingListener.java.i
+data/test/java/math/BigDecimal/CompareToTests.java.i
data/test/javax/sql/rowset/serial/SerialClob/SetCharacterStream.java.i
-data/make/tools/src/build/tools/jdwpgen/ReferenceIDTypeNode.java.i
+data/src/share/lib/images/cursors/motif_MoveDrop32x32.gif.i
data/src/share/classes/sun/io/ByteToCharMacRomania.java.i
data/test/java/lang/ThreadGroup/SetMaxPriority.java.i
data/src/share/native/sun/security/ec/oid.c.i
data/test/sun/security/pkcs11/nss/lib/windows-i586/softokn3.dll.d
data/test/sun/security/pkcs11/KeyStore/ClientAuthData/cert8.db.i
-data/src/share/classes/javax/security/auth/PrivateCredentialPermission.java.i
+data/src/share/classes/sun/rmi/server/resources/rmid_ja.properties.i
+data/src/share/native/sun/java2d/cmm/lcms/cmsxform.c.i
data/src/windows/native/sun/java2d/windows/GDIRenderer.cpp.i
-data/src/share/classes/sun/security/ssl/KeyManagerFactoryImpl.java.i
-data/test/java/security/SecureRandom/Serialize.java.i
+data/src/solaris/native/sun/management/FileSystemImpl.c.i
+data/src/solaris/native/sun/java2d/j2d_md.h.i
data/src/share/classes/java/awt/AWTEventMulticaster.java.i
+data/src/macosx/native/jobjc/src/core/java/com/apple/jobjc/CFType.java.i
data/test/java/util/Hashtable/SerializationDeadlock.java.i
-data/test/sun/security/provider/PolicyParser/ExtDirsDefaultPolicy.java.i
+data/src/share/native/sun/font/layout/ShapingTypeData.cpp.i
data/src/share/classes/com/sun/java/swing/plaf/gtk/XColors.java.i
-data/test/java/security/cert/PKIXParameters/InvalidParameters.java.i
-data/test/com/sun/net/httpserver/Test7a.java.i
+data/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingTest.java.i
+data/test/sun/nio/cs/LeftOverSurrogate.java.i
+data/test/com/sun/security/auth/CreateLdapPrincipals.java.i
data/test/java/util/PluggableLocale/GenericTest.sh.i
-data/src/share/classes/sun/tools/java/BinaryMember.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c.i
data/test/sun/tools/jrunscript/jrunscript-helpTest.sh.i
data/test/sun/net/InetAddress/nameservice/SimpleNameService.java.i
-data/test/java/beans/XMLEncoder/javax_swing_plaf_FontUIResource.java.i
-data/src/share/classes/com/sun/inputmethods/internal/indicim/resources/DisplayNames_es.properties.i
-data/src/solaris/hpi/include/largefile_linux.h.i
+data/test/java/lang/reflect/Method/invoke/ErrorInInvoke.java.i
+data/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c.i
+data/test/sun/security/krb5/auto/AcceptorSubKey.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/ReferenceList.java.i
data/src/solaris/classes/sun/java2d/xr/XRGraphicsConfig.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/SetClientMode.java.i
-data/test/tools/jar/ChangeDir.java.i
+data/src/share/native/sun/font/layout/TrimmedArrayProcessor.h.i
data/test/com/sun/crypto/provider/KeyFactory/TestProviderLeak.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiTableHeaderUI.java.i
-data/src/share/classes/sun/security/rsa/SunRsaSign.java.i
+data/test/sun/tools/jrunscript/jrunscript-argsTest.sh.i
data/src/share/classes/java/awt/dnd/DragSourceAdapter.java.i
-data/src/solaris/doc/sun/man/man1/ja/native2ascii.1.i
+data/test/sun/tools/jstatd/jstatdDefaults.sh.i
data/test/javax/swing/JLayer/6875716/bug6875716.java.i
+data/src/share/classes/sun/security/util/Password.java.i
data/test/sun/nio/cs/Decode.java.i
-data/src/share/classes/sun/net/httpserver/HttpConnection.java.i
+data/src/windows/native/sun/java2d/opengl/WGLGraphicsConfig.h.i
data/src/solaris/classes/sun/java2d/xr/MaskTileManager.java.i
data/src/share/classes/sun/nio/ch/SelChImpl.java.i
data/test/java/util/Collections/EmptyCollectionSerialization.java.i
data/src/share/classes/sun/text/resources/FormatData_en_GB.java.i
data/src/share/classes/com/sun/media/sound/SoftProcess.java.i
-data/src/share/classes/com/sun/tools/jdi/ArrayReferenceImpl.java.i
+data/src/share/classes/sun/security/rsa/RSAPadding.java.i
data/src/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java.i
data/test/java/beans/XMLEncoder/javax_swing_JTree.java.i
-data/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java.i
+data/test/java/util/EnumSet/EnumSetBash.java.i
data/test/com/sun/jdi/MonitorEventTest.java.i
data/make/netbeans/jmx/README.i
-data/test/javax/swing/JPopupMenu/6987844/bug6987844.java.i
+data/test/com/sun/jdi/FetchLocals.java.i
data/make/tools/swing-beans/beaninfo/images/JListColor16.gif.i
-data/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.sh.i
+data/src/share/native/sun/awt/image/jpeg/jcmarker.c.i
data/src/share/classes/javax/print/attribute/standard/PageRanges.java.i
-data/test/java/nio/file/Files/grantAll.policy.i
-data/src/windows/native/sun/windows/awt_Cursor.h.i
+data/test/java/util/Collections/CheckedIdentityMap.java.i
+data/test/javax/management/MBeanInfo/SerializationTest.java.i
data/test/sun/security/ssl/com/sun/net/ssl/internal/www/protocol/https/HttpsURLConnection/trusted.jks.i
-data/src/share/classes/sun/text/resources/FormatData_uk_UA.java.i
-data/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java.i
-data/make/sun/awt/Depend.sed.i
-data/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java.i
+data/make/tools/buildmetaindex/Makefile.i
+data/test/sun/security/provider/PolicyFile/Comparator.java.i
+data/src/share/classes/sun/nio/cs/ext/IBM1148.java.i
+data/test/java/beans/XMLEncoder/java_util_Date.java.i
data/test/sun/tools/jstat/gcOutput1.awk.i
+data/src/solaris/native/sun/nio/ch/sctp/Sctp.h.i
data/test/sun/nio/cs/TestCp834_SBCS.java.i
data/test/java/beans/PropertyEditor/TestFloatTypeValue.java.i
-data/src/share/classes/javax/management/AttributeChangeNotificationFilter.java.i
-data/test/java/rmi/testlibrary/RMID.java.i
+data/src/share/classes/java/util/Enumeration.java.i
+data/src/share/classes/javax/print/attribute/standard/MultipleDocumentHandling.java.i
data/src/share/classes/com/sun/jdi/connect/VMStartException.java.i
data/src/share/classes/sun/tools/tree/NegativeExpression.java.i
data/src/share/classes/sun/io/CharToByteCp918.java.i
-data/test/java/io/charStreams/ABCOutputStream.java.i
data/src/share/classes/java/text/DecimalFormatSymbols.java.i
data/src/share/classes/java/lang/AbstractStringBuilder.java.i
data/src/share/classes/javax/swing/plaf/metal/sounds/OptionPaneInformation.wav.i
@@ -20787,122 +21621,126 @@ data/make/tools/CharsetMapping/IBM838.map.i
data/test/javax/management/remote/mandatory/version/ImplVersionReader.java.i
data/src/share/classes/com/sun/crypto/provider/DHParameters.java.i
data/src/share/classes/javax/management/MBeanServerDelegateMBean.java.i
-data/src/share/classes/com/sun/jmx/mbeanserver/SunJmxMBeanServer.java.i
+data/src/windows/classes/java/net/DualStackPlainDatagramSocketImpl.java.i
data/test/sun/security/tools/keytool/standard.sh.i
-data/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.i
-data/src/share/sample/scripting/scriptpad/nbproject/file-targets.xml.i
-data/src/share/classes/sun/reflect/generics/scope/ClassScope.java.i
+data/src/share/classes/javax/naming/NamingException.java.i
+data/src/share/classes/sun/nio/fs/AbstractWatchService.java.i
+data/test/java/lang/Compare.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c.i
-data/src/share/classes/javax/swing/text/rtf/RTFAttributes.java.i
+data/src/share/classes/sun/tools/tree/ShortExpression.java.i
data/test/java/util/StringTokenizer/FormFeed.java.i
+data/src/macosx/bin/amd64/jvm.cfg.i
data/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp.i
data/src/share/classes/com/sun/jdi/VoidType.java.i
-data/make/java/java/reorder-i586.i
+data/src/share/native/sun/font/layout/GXLayoutEngine.cpp.i
data/src/share/classes/sun/util/resources/CurrencyNames_es_UY.properties.i
-data/src/share/modules/jdk/module-info.java.i
+data/src/share/classes/javax/swing/DelegatingDefaultFocusManager.java.i
data/test/java/nio/file/attribute/UserDefinedFileAttributeView/Basic.java.i
data/test/sun/security/ssl/javax/net/ssl/TLSv11/ExportableStreamCipher.java.i
data/src/share/classes/com/sun/jndi/ldap/pool/PooledConnectionFactory.java.i
-data/src/share/demo/jvmti/index.html.i
-data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ServerHandshaker/GetPeerHostClient.java.i
+data/test/javax/swing/JTable/6777378/bug6777378.java.i
+data/test/java/net/MulticastSocket/Test.java.i
data/src/share/classes/com/sun/jmx/namespace/RoutingMBeanServerConnection.java.i
data/test/sun/security/provider/PolicyFile/SelfExpansion.policy.i
data/make/java/java/reorder-sparcv9.i
-data/src/share/classes/com/sun/jmx/snmp/IPAcl/JDMSecurityDefs.java.i
+data/test/javax/management/namespace/SerialParamProcessorTest.java.i
data/src/share/classes/com/sun/tools/attach/AgentInitializationException.java.i
data/src/share/classes/com/sun/security/jgss/jgss-overview.html.i
data/test/sun/nio/cs/FindASCIIReplBugs.java.i
data/test/sun/security/provider/certpath/ReverseBuilder/prjM2divE.i
data/src/share/classes/javax/swing/text/IconView.java.i
-data/src/share/classes/java/lang/CloneNotSupportedException.java.i
+data/src/share/classes/javax/swing/plaf/basic/BasicDesktopIconUI.java.i
data/test/javax/management/query/InstanceOfExpTest.java.i
-data/test/com/sun/jdi/CompatibleConnectors.java.i
-data/src/share/classes/javax/net/ssl/SSLContext.java.i
+data/src/solaris/classes/sun/awt/X11CustomCursor.java.i
+data/src/share/classes/sun/net/www/URLConnection.java.i
data/test/java/lang/management/ThreadMXBean/ThreadLists.java.i
data/src/share/classes/sun/management/jmxremote/SingleEntryRegistry.java.i
-data/src/share/classes/java/awt/Rectangle.java.i
-data/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java.i
+data/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java.i
+data/test/java/util/ResourceBundle/RestrictedBundleTest.html.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/utils/CachedXPathAPIHolder.java.i
data/test/java/security/SecureClassLoader/DefineClassByteBuffer.java.i
data/test/javax/security/auth/login/LoginContext/ConfigConstructor.java.i
-data/test/java/io/BufferedReader/ReadLineSync.java.i
+data/test/java/io/RandomAccessFile/OpenSync.java.i
data/src/solaris/lib/sdp/sdp.conf.template.i
data/src/share/classes/java/awt/geom/GeneralPath.java.i
data/src/share/classes/sun/nio/cs/ext/GBK.java.i
data/src/solaris/npt/utf_md.h.i
-data/test/java/lang/instrument/ilib/Info.java.i
-data/test/java/net/URLEncoder/URLEncodeDecode.java.i
+data/test/sun/security/pkcs11/MessageDigest/TestCloning.java.i
+data/make/common/BuildNativePackages.gmk.i
data/test/java/beans/XMLEncoder/java_awt_BasicStroke.java.i
-data/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java.i
-data/test/java/lang/ClassLoader/resource.jar.i
+data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh.i
+data/test/java/util/concurrent/ConcurrentHashMap/DistinctEntrySetElements.java.i
data/test/sun/tools/jstat/options1.out.i
data/src/windows/classes/sun/java2d/d3d/D3DPaints.java.i
data/test/java/nio/file/Path/SBC.java.i
-data/src/share/classes/com/sun/tools/extcheck/ExtCheck.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/storage/implementations/KeyStoreResolver.java.i
data/test/java/util/jar/JarFile/test.jar.i
-data/src/share/classes/com/sun/jndi/ldap/LdapReferralException.java.i
+data/make/tools/swing-beans/beaninfo/images/JLayeredPaneColor16.gif.i
data/src/share/classes/com/sun/jmx/snmp/SnmpPduFactory.java.i
data/src/share/classes/sun/nio/ch/Cancellable.java.i
data/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java.i
data/src/share/classes/sun/reflect/generics/reflectiveObjects/WildcardTypeImpl.java.i
data/src/solaris/hpi/include/largefile.h.i
-data/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java.i
+data/test/com/sun/jdi/EnumTest.java.i
data/src/share/modules/jdk.boot/module-info.java.i
-data/src/share/classes/sun/reflect/FieldInfo.java.i
data/src/share/classes/sun/util/PreHashedMap.java.i
data/src/windows/instrument/FileSystemSupport_md.c.i
-data/src/share/classes/sun/util/resources/CalendarData_pl.properties.i
+data/make/tools/src/build/tools/stripproperties/StripProperties.java.i
data/src/share/classes/sun/font/FontStrikeDisposer.java.i
-data/test/java/nio/channels/SocketChannel/Stream.java.i
+data/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64.i
data/test/java/awt/event/MouseEvent/MenuDragMouseEventAbsoluteCoordsTest/MenuDragMouseEventAbsoluteCoordsTest.java.i
data/test/java/awt/im/JTextFieldTest.html.i
data/test/java/awt/Frame/FrameSize/TestFrameSize.java.i
data/src/share/classes/java/net/FileNameMap.java.i
-data/src/share/classes/java/lang/reflect/ParameterizedType.java.i
+data/make/mkdemo/management/README.txt.i
data/test/sun/security/rsa/InvalidBitString.java.i
data/src/share/classes/sun/security/x509/ReasonFlags.java.i
data/src/share/native/sun/awt/medialib/mlib_ImageFilters.h.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsOptionPaneUI.java.i
-data/src/share/classes/sun/jvmstat/monitor/MonitoredVmUtil.java.i
-data/src/share/classes/com/sun/net/httpserver/package-info.java.i
+data/src/share/classes/javax/swing/event/RowSorterListener.java.i
+data/src/share/classes/com/sun/pept/presentation/Tie.java.i
+data/src/macosx/bundle/JavaAppLauncher/JavaAppLauncher.xcodeproj/project.pbxproj.i
+data/test/sun/rmi/rmic/defaultStubVersion/run.sh.i
data/src/share/sample/vm/clr-jvm/README.txt.i
-data/src/share/classes/java/awt/Composite.java.i
+data/src/share/classes/javax/swing/text/Keymap.java.i
data/src/share/classes/sun/security/pkcs11/wrapper/CK_X9_42_DH2_DERIVE_PARAMS.java.i
data/src/share/classes/java/lang/StackOverflowError.java.i
-data/test/javax/swing/text/html/TableView/7030332/sample1.png.i
+data/test/java/rmi/testlibrary/README.jcov.i
data/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java.i
+data/test/java/util/Locale/Bug4184873_he.i
data/src/share/classes/sun/io/CharToByteBig5_HKSCS.java.i
-data/make/tools/CharsetMapping/IBM737.map.i
-data/src/share/classes/java/nio/channels/AsynchronousFileChannel.java.i
+data/test/java/nio/channels/spi/AsynchronousChannelProvider/Provider2.java.i
+data/make/sun/jpeg/mapfile-vers.i
data/test/java/rmi/reliability/benchmark/bench/rmi/DoubleArrayCalls.java.i
data/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java.i
-data/make/com/sun/jndi/Makefile.i
-data/src/solaris/classes/sun/awt/X11/MWMConstants.java.i
+data/test/java/util/concurrent/ConcurrentQueues/GCRetention.java.i
+data/src/windows/classes/sun/awt/windows/WDesktopProperties.java.i
data/src/share/classes/sun/security/krb5/internal/crypto/Nonce.java.i
-data/make/sun/org/Makefile.i
+data/src/share/classes/javax/print/attribute/PrintServiceAttribute.java.i
data/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java.i
data/test/sun/security/tools/keytool/CloseFile.java.i
-data/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java.i
+data/src/solaris/native/sun/java2d/opengl/GLXGraphicsConfig.c.i
data/src/share/classes/sun/text/resources/FormatData_sr_Latn_BA.java.i
-data/test/java/rmi/activation/Activatable/restartService/security.policy.i
+data/src/share/classes/java/io/ByteArrayOutputStream.java.i
data/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c.i
data/src/share/classes/com/sun/jmx/remote/internal/ClientListenerInfo.java.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/InvalidTransformException.java.i
-data/src/solaris/native/sun/awt/awt_motif.h.i
-data/make/netbeans/jarzip/build.xml.i
+data/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java.i
+data/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/security.policy.i
+data/src/share/demo/applets/GraphicsTest/AppletFrame.java.i
data/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader.i
+data/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c.i
data/src/share/classes/sun/java2d/pipe/AATileGenerator.java.i
data/test/java/io/LineNumberInputStream/Skip.java.i
data/src/share/classes/javax/swing/event/ListSelectionEvent.java.i
data/test/com/sun/security/sasl/digest/log.properties.i
-data/src/share/demo/jvmti/minst/sample.makefile.txt.i
+data/src/share/classes/sun/nio/fs/DynamicFileAttributeView.java.i
data/src/solaris/classes/sun/awt/motif/MTextFieldPeer.java.i
data/src/share/classes/javax/swing/text/PlainView.java.i
-data/test/sun/security/pkcs11/Secmod/nsstrust.cfg.i
-data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsSpinnerUI.java.i
-data/src/share/classes/java/awt/print/PrinterIOException.java.i
+data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_es.properties.i
+data/test/java/beans/XMLEncoder/javax_swing_border_TitledBorder.java.i
+data/src/share/classes/sun/reflect/misc/MethodUtil.java.i
data/src/share/classes/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java.i
data/src/share/classes/javax/sql/rowset/CachedRowSet.java.i
-data/test/java/util/zip/StreamIOAfterClose.java.i
+data/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSessionImpl/HashCodeMissing.java.i
data/test/java/lang/Math/PowTests.java.i
data/make/javax/sound/FILES_c.gmk.i
data/test/java/net/ServerSocket/TestAfterClose.java.i
@@ -20910,95 +21748,95 @@ data/src/linux/doc/man/ja/schemagen.1.i
data/src/windows/classes/sun/nio/ch/WindowsAsynchronousChannelProvider.java.i
data/test/sun/jvmstat/monitor/VmIdentifier/VmIdentifierCreateResolve.java.i
data/src/share/classes/sun/java2d/loops/DrawGlyphListAA.java.i
-data/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java.i
+data/test/java/nio/charset/StandardCharsets/Standard.java.i
data/src/share/classes/javax/swing/doc-files/BoxLayout-1.gif.i
data/test/java/lang/StringCoding/Enormous.java.i
data/test/java/net/Socket/InheritHandle.java.i
-data/src/share/classes/sun/io/CharToByteCp948.java.i
-data/test/sun/nio/cs/OLD/IBM948_OLD.java.i
+data/src/share/native/java/io/FileInputStream.c.i
+data/src/share/classes/sun/reflect/FieldInfo.java.i
data/test/java/text/Bidi/Bug7042148.java.i
data/src/solaris/native/sun/jdga/jdga.h.i
data/make/tools/Makefile.i
data/src/share/classes/java/util/AbstractList.java.i
data/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/StateTestService.java.i
-data/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java.i
-data/src/share/classes/sun/nio/cs/ext/JIS_X_0212_MS5022X_Encoder.java.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/Option.java.i
data/src/share/native/sun/java2d/pipe/Region.c.i
-data/src/share/classes/sun/util/resources/LocaleNames_pl.properties.i
+data/src/share/classes/java/sql/SQLIntegrityConstraintViolationException.java.i
data/src/solaris/native/sun/java2d/loops/vis_SrcOverMaskBlit.c.i
-data/test/java/awt/KeyboardFocusmanager/DefaultPolicyChange/DefaultPolicyChange_AWT.java.i
-data/src/share/classes/javax/print/attribute/Size2DSyntax.java.i
-data/make/common/Release.gmk.i
+data/src/share/back/ThreadGroupReferenceImpl.h.i
+data/test/java/rmi/activation/Activatable/downloadParameterClass/group.security.policy.i
+data/src/share/classes/javax/sound/midi/spi/package.html.i
data/src/share/classes/java/lang/reflect/Modifier.java.i
-data/test/javax/swing/JLabel/7004134/bug7004134.java.i
-data/src/share/native/common/check_version.c.i
-data/test/java/util/zip/ZipInputStream/Constructor.java.i
+data/test/sun/java2d/cmm/ColorConvertOp/LRGB555.png.i
+data/test/java/beans/PropertyEditor/TestByteTypeValue.java.i
+data/test/java/util/ResourceBundle/Bug6299235Test.java.i
data/src/share/classes/javax/sql/StatementEvent.java.i
+data/src/bsd/doc/man/jar.1.i
data/src/share/classes/sun/reflect/UnsafeQualifiedCharacterFieldAccessorImpl.java.i
-data/src/share/classes/com/sun/media/sound/WaveFileReader.java.i
-data/src/share/classes/java/awt/datatransfer/FlavorMap.java.i
+data/test/sun/management/jmxremote/bootstrap/jmxremote_ssltest06_ok.access.in.i
+data/test/sun/security/provider/PolicyParser/EncodeURL.java.i
data/src/share/classes/sun/management/snmp/jvmmib/EnumJvmMemoryGCCall.java.i
-data/src/share/native/sun/security/jgss/wrapper/GSSLibStub.c.i
-data/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java.i
-data/test/java/io/Serializable/InvalidClassException/noargctor/NonSerialize/ProtectedCtor.java.i
-data/make/tools/swing-beans/beaninfo/images/JListMono16.gif.i
+data/test/javax/script/Test7.java.i
+data/src/share/classes/com/sun/rowset/RowSetResourceBundle_zh_TW.properties.i
+data/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java.i
+data/test/sun/security/pkcs11/KeyStore/BasicData/p11-ibutton.txt.i
data/test/java/beans/XMLEncoder/Test4822050.java.i
data/make/tools/swing-nimbus/classes/org/jdesktop/swingx/designer/paint/AbstractGradient.java.i
data/src/share/classes/javax/management/ValueExp.java.i
data/src/share/classes/javax/naming/directory/SearchControls.java.i
data/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java.i
-data/src/share/classes/sun/security/util/Password.java.i
+data/src/windows/classes/sun/awt/windows/WDefaultFontCharset.java.i
data/test/javax/sound/midi/Gervill/SoftTuning/Load5.java.i
-data/src/share/classes/sun/nio/fs/AbstractPath.java.i
-data/make/modules/modularize.i
+data/src/share/demo/java2d/J2DBench/src/j2dbench/ResultSet.java.i
data/src/share/classes/sun/util/resources/CalendarData_cs.properties.i
data/test/java/util/BitSet/PreviousBits.java.i
-data/src/share/classes/com/sun/media/sound/AiffFileWriter.java.i
-data/src/share/classes/java/nio/channels/spi/AbstractSelectionKey.java.i
+data/make/tools/swing-beans/beaninfo/images/JScrollPaneColor32.gif.i
+data/test/tools/pack200/dyn.jar.i
data/src/solaris/native/common/gdefs_md.h.i
-data/src/windows/lib/tzmappings.i
-data/src/share/classes/sun/security/pkcs11/wrapper/CK_SSL3_MASTER_KEY_DERIVE_PARAMS.java.i
+data/test/com/sun/jdi/ArrayRangeTest.java.i
+data/test/sun/security/pkcs11/sslecc/CipherTest.java.i
data/src/share/classes/java/awt/DefaultKeyboardFocusManager.java.i
data/test/java/rmi/activation/Activatable/createPrivateActivable/ActivateMe.java.i
data/src/windows/native/sun/windows/awt_GDIObject.cpp.i
data/test/java/nio/channels/FileChannel/MapOverEnd.java.i
data/src/share/classes/javax/naming/ldap/SortControl.java.i
data/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java.i
-data/test/java/util/zip/FlaterCriticalArray.java.i
-data/make/javax/Makefile.i
-data/src/share/demo/jvmti/agent_util/README.txt.i
+data/test/javax/swing/border/Test6978482.java.i
+data/test/java/io/charStreams/ABCOutputStream.java.i
+data/test/javax/management/modelmbean/ModelMBeanInfoSupport/GetAllDescriptorsTest.java.i
data/src/share/classes/java/awt/doc-files/RadialGradientPaint-2.png.i
-data/src/share/classes/com/sun/org/apache/xml/internal/security/encryption/EncryptedType.java.i
+data/src/macosx/classes/com/apple/eawt/event/SwipeEvent.java.i
+data/src/share/classes/com/sun/org/apache/xml/internal/security/keys/content/keyvalues/KeyValueContent.java.i
data/src/solaris/classes/sun/java2d/jules/JulesPathBuf.java.i
data/src/share/classes/java/util/LinkedHashMap.java.i
data/src/share/classes/javax/swing/plaf/multi/MultiRootPaneUI.java.i
data/src/share/classes/sun/management/snmp/jvmmib/JvmRTLibraryPathTableMeta.java.i
data/src/share/classes/java/io/FileSystem.java.i
-data/test/java/lang/instrument/appendToClassLoaderSearch/ClassUnloadTest.sh.i
-data/make/tools/reorder/tools/util-i586.il.i
+data/test/javax/sound/midi/Gervill/RiffReaderWriter/Available.java.i
+data/test/javax/sound/midi/Gervill/ModelStandardTransform/TransformConcave.java.i
data/src/share/classes/com/sun/nio/file/ExtendedWatchEventModifier.java.i
data/test/java/beans/PropertyChangeSupport/TestSynchronization.java.i
data/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java.i
data/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c.i
-data/test/java/util/Locale/Bug4184873_he.i
+data/src/share/classes/java/util/spi/LocaleNameProvider.java.i
data/src/share/classes/com/sun/script/javascript/JavaAdapter.java.i
-data/src/share/classes/sun/misc/RegexpTarget.java.i
+data/src/share/classes/sun/tools/jstat/Scale.java.i
data/src/share/classes/com/sun/tools/attach/package.html.i
-data/src/share/classes/sun/tools/tree/AssignUnsignedShiftRightExpression.java.i
+data/src/share/classes/com/sun/jmx/snmp/SnmpSecurityException.java.i
data/src/share/classes/sun/io/ByteToCharCp737.java.i
-data/src/share/classes/java/io/BufferedOutputStream.java.i
-data/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java.i
+data/test/java/util/zip/input.jar.i
+data/src/share/classes/sun/nio/fs/AbstractPath.java.i
data/src/share/classes/sun/nio/cs/IBM437.java.i
-data/test/java/net/Inet6Address/B4923906.java.i
+data/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java.i
data/src/share/classes/sun/nio/cs/MS1251.java.i
-data/make/tools/swing-beans/beaninfo/BeanInfoUtils.java.i
-data/test/java/text/Format/DateFormat/ISO8601ZoneTest.java.i
-data/src/share/classes/java/security/cert/CertPathValidator.java.i
-data/test/javax/swing/JColorChooser/Test4461329.java.i
+data/src/share/classes/com/sun/jmx/namespace/NamespaceInterceptor.java.i
+data/test/sun/security/mscapi/KeyStoreCompatibilityMode.java.i
+data/test/java/awt/dnd/FileListBetweenJVMsTest/FileListBetweenJVMsTest.java.i
+data/src/share/sample/jmx/jmx-scandir/index.html.i
data/test/java/io/LineNumberInputStream/MarkReset.java.i
data/src/share/classes/com/sun/java/swing/plaf/windows/WindowsMenuBarUI.java.i
-data/src/share/native/java/util/zip/zlib-1.2.5/zlib.h.i
+data/test/java/rmi/registry/readTest/readTest.sh.i
data/test/sun/security/tools/keytool/i18n.java.i
data/src/share/classes/java/beans/beancontext/BeanContextProxy.java.i
data/src/share/classes/com/sun/jndi/url/rmi/rmiURLContext.java.i
-data/test/javax/swing/plaf/basic/Test6984643.java.i
+data/src/share/classes/javax/management/DynamicMBean.java.i
diff --git a/jdk/.hg/store/undo b/jdk/.hg/store/undo
index b8b3535..c753f7a 100644
Binary files a/jdk/.hg/store/undo and b/jdk/.hg/store/undo differ
diff --git a/jdk/.hg/undo.desc b/jdk/.hg/undo.desc
index 94ace19..27957e6 100644
--- a/jdk/.hg/undo.desc
+++ b/jdk/.hg/undo.desc
@@ -1,3 +1,3 @@
-5227
+5236
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jdk
diff --git a/jdk/.hg/undo.dirstate b/jdk/.hg/undo.dirstate
index b3e92ed..6f74646 100644
Binary files a/jdk/.hg/undo.dirstate and b/jdk/.hg/undo.dirstate differ
diff --git a/jdk/.hgignore b/jdk/.hgignore
index 67c8465..e849b9e 100644
--- a/jdk/.hgignore
+++ b/jdk/.hgignore
@@ -4,3 +4,4 @@
^make/netbeans/.*/build/
^make/netbeans/.*/dist/
^.hgtip
+.DS_Store
diff --git a/jdk/.hgtags b/jdk/.hgtags
index c485f9d..fdc7634 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -152,3 +152,11 @@ b71d1acfae5240d8c1359443cd02b5ddb587231c jdk8-b17
664fa4fb0ee411ef048903c479f8b962fcdb2f4b jdk8-b21
dda27c73d8db4a9c7a23872b6f0c5106edcb2021 jdk8-b22
54202e0148ec7d4570cab5bc9b00d216a7677569 jdk8-b23
+34029a0c69bba882264a29fc822f8283fd15f104 jdk8-b24
+ec17fbe5b8fbc52da070eec43b4711d9354b2ab8 jdk8-b25
+5aca406e87cb9144a9405be312dadd728a9c6fe2 jdk8-b26
+c68342532e2e7deb3a25fc04ed3e4c142278f747 jdk8-b27
+1e1d41daaded291ab3a370ca6a27f7325701978e jdk8-b28
+c5b882dce0fe27e05dc64debc92b1fb9ebf880ec jdk8-b29
+cdbb33303ea344d5e9013e2dd642e7a6e7768db6 jdk8-b30
+27f0c08c427c65fcab6917edf646f59058e59524 jdk8-b31
diff --git a/jdk/make/Makefile b/jdk/make/Makefile
index a414b8b..11ca1f8 100644
--- a/jdk/make/Makefile
+++ b/jdk/make/Makefile
@@ -198,7 +198,7 @@ examples_help:
#
# 'all' target intro
#
-all::
+all::
@$(ECHO) $(PLATFORM) $(ARCH) $(RELEASE) build started: $(shell $(DATE) '+%y-%m-%d %H:%M')
# Just in case anyone uses this old name, same as 'build'
@@ -234,7 +234,20 @@ import_product:
all build:: sanity-all post-sanity-all
SUBDIRS = tools java javax sun com
-SUBDIRS_misc = org sunw jpda mkdemo mksample
+ifeq ($(PLATFORM), macosx)
+ SUBDIRS += apple
+endif
+SUBDIRS_misc = org sunw jpda
+
+# demos
+ifndef NO_DEMOS
+ SUBDIRS_misc += mkdemo
+endif
+
+# samples
+ifndef NO_SAMPLES
+ SUBDIRS_misc += mksample
+endif
# Alternate classes implementation
ifndef OPENJDK
@@ -399,4 +412,3 @@ include jprt.gmk
.PHONY: all build clean clobber optimized debug fastdebug create_links \
import import_product import_fastdebug import_debug \
test test_run test_start test_clean test_summary
-
diff --git a/jdk/make/com/Makefile b/jdk/make/com/Makefile
index 16b908c..6f45213 100644
--- a/jdk/make/com/Makefile
+++ b/jdk/make/com/Makefile
@@ -32,6 +32,11 @@ PRODUCT = com
include $(BUILDDIR)/common/Defs.gmk
SUBDIRS = sun oracle
+
+ifeq ($(PLATFORM), macosx)
+ SUBDIRS += apple
+endif
+
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
diff --git a/jdk/make/com/oracle/Makefile b/jdk/make/com/oracle/Makefile
index c83cf80..a657750 100644
--- a/jdk/make/com/oracle/Makefile
+++ b/jdk/make/com/oracle/Makefile
@@ -38,8 +38,14 @@ ifndef OPENJDK
endif
endif
+JFR =
+ifndef OPENJDK
+ifndef JAVASE_EMBEDDED
+ JFR = jfr
+endif
+endif
-SUBDIRS = net nio util $(UCRYPTO)
+SUBDIRS = $(JFR) net nio util $(UCRYPTO)
include $(BUILDDIR)/common/Subdirs.gmk
diff --git a/jdk/make/com/sun/Makefile b/jdk/make/com/sun/Makefile
index 33d5824..7c436af 100644
--- a/jdk/make/com/sun/Makefile
+++ b/jdk/make/com/sun/Makefile
@@ -47,7 +47,6 @@ SUBDIRS_enterprise = crypto/provider jndi \
org rowset net/httpserver
SUBDIRS_misc = $(SCRIPT_SUBDIR) tracing servicetag nio demo
-# Omit mirror since it's built with the apt tool.
SUBDIRS_tools = tools
include $(BUILDDIR)/common/Subdirs.gmk
diff --git a/jdk/make/com/sun/java/pack/Makefile b/jdk/make/com/sun/java/pack/Makefile
index 810891e..cc0e3f8 100644
--- a/jdk/make/com/sun/java/pack/Makefile
+++ b/jdk/make/com/sun/java/pack/Makefile
@@ -60,6 +60,7 @@ build: unpacker
vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
ifeq ($(STANDALONE),true)
+ ifneq ($(SYSTEM_ZLIB),true)
ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
@@ -76,6 +77,10 @@ ifeq ($(STANDALONE),true)
ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
OTHER_CXXFLAGS += $(ZINCLUDE)
LDDFLAGS += $(ZIPOBJS)
+ else
+ LDDFLAGS += -lz
+ OTHER_CXXFLAGS += -DSYSTEM_ZLIB
+ endif
else
OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
OTHER_LDLIBS += $(JVMLIB)
diff --git a/jdk/make/com/sun/nio/Makefile b/jdk/make/com/sun/nio/Makefile
index b3a20f0..ebca563 100644
--- a/jdk/make/com/sun/nio/Makefile
+++ b/jdk/make/com/sun/nio/Makefile
@@ -32,9 +32,13 @@ SUBDIRS_MAKEFLAGS += JAVAC_MAX_WARNINGS=true
SUBDIRS_MAKEFLAGS += JAVAC_WARNINGS_FATAL=true
include $(BUILDDIR)/common/Defs.gmk
-SUBDIRS = sctp
include $(BUILDDIR)/common/Subdirs.gmk
+ifneq ($(PLATFORM), macosx)
+SUBDIRS = sctp
+endif
+
+
all build clean clobber::
$(SUBDIRS-loop)
diff --git a/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk b/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk
index b56c69f..f2f6970 100644
--- a/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk
+++ b/jdk/make/com/sun/nio/sctp/Exportedfiles.gmk
@@ -29,11 +29,11 @@
ifneq ($(PLATFORM), windows)
FILES_export = \
- sun/nio/ch/SctpAssocChange.java \
- sun/nio/ch/SctpChannelImpl.java \
- sun/nio/ch/SctpNet.java \
- sun/nio/ch/SctpPeerAddrChange.java \
- sun/nio/ch/SctpResultContainer.java \
- sun/nio/ch/SctpServerChannelImpl.java \
- sun/nio/ch/SctpStdSocketOption.java
+ sun/nio/ch/sctp/AssociationChange.java \
+ sun/nio/ch/sctp/SctpChannelImpl.java \
+ sun/nio/ch/sctp/SctpNet.java \
+ sun/nio/ch/sctp/PeerAddrChange.java \
+ sun/nio/ch/sctp/ResultContainer.java \
+ sun/nio/ch/sctp/SctpServerChannelImpl.java \
+ sun/nio/ch/sctp/SctpStdSocketOption.java
endif
diff --git a/jdk/make/com/sun/nio/sctp/FILES_java.gmk b/jdk/make/com/sun/nio/sctp/FILES_java.gmk
index 725131e..667af33 100644
--- a/jdk/make/com/sun/nio/sctp/FILES_java.gmk
+++ b/jdk/make/com/sun/nio/sctp/FILES_java.gmk
@@ -42,25 +42,25 @@ FILES_java = \
com/sun/nio/sctp/SendFailedNotification.java \
com/sun/nio/sctp/ShutdownNotification.java \
\
- sun/nio/ch/SctpMessageInfoImpl.java \
- sun/nio/ch/SctpStdSocketOption.java
+ sun/nio/ch/sctp/MessageInfoImpl.java \
+ sun/nio/ch/sctp/SctpStdSocketOption.java
ifneq ($(PLATFORM), windows)
FILES_java += \
- sun/nio/ch/SctpAssocChange.java \
- sun/nio/ch/SctpAssociationImpl.java \
- sun/nio/ch/SctpChannelImpl.java \
- sun/nio/ch/SctpMultiChannelImpl.java \
- sun/nio/ch/SctpNet.java \
- sun/nio/ch/SctpNotification.java \
- sun/nio/ch/SctpPeerAddrChange.java \
- sun/nio/ch/SctpResultContainer.java \
- sun/nio/ch/SctpSendFailed.java \
- sun/nio/ch/SctpServerChannelImpl.java \
- sun/nio/ch/SctpShutdown.java
+ sun/nio/ch/sctp/AssociationChange.java \
+ sun/nio/ch/sctp/AssociationImpl.java \
+ sun/nio/ch/sctp/PeerAddrChange.java \
+ sun/nio/ch/sctp/ResultContainer.java \
+ sun/nio/ch/sctp/SctpChannelImpl.java \
+ sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+ sun/nio/ch/sctp/SctpNet.java \
+ sun/nio/ch/sctp/SctpNotification.java \
+ sun/nio/ch/sctp/SctpServerChannelImpl.java \
+ sun/nio/ch/sctp/SendFailed.java \
+ sun/nio/ch/sctp/Shutdown.java
else
FILES_java += \
- sun/nio/ch/SctpChannelImpl.java \
- sun/nio/ch/SctpMultiChannelImpl.java \
- sun/nio/ch/SctpServerChannelImpl.java
+ sun/nio/ch/sctp/SctpChannelImpl.java \
+ sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+ sun/nio/ch/sctp/SctpServerChannelImpl.java
endif
diff --git a/jdk/make/com/sun/nio/sctp/Makefile b/jdk/make/com/sun/nio/sctp/Makefile
index bf5090a..cff4bff 100644
--- a/jdk/make/com/sun/nio/sctp/Makefile
+++ b/jdk/make/com/sun/nio/sctp/Makefile
@@ -48,14 +48,16 @@ include $(BUILDDIR)/common/Library.gmk
#
# Find platform-specific C source files
#
-vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch
+vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch/sctp
#
# Include nio.h, net_util.h, sun_nio_ch_IOStatus.h, etc
#
OTHER_INCLUDES += \
-I$(SHARE_SRC)/native/sun/nio/ch \
+ -I$(SHARE_SRC)/native/sun/nio/ch/sctp \
-I$(SHARE_SRC)/native/java/net \
+ -I$(PLATFORM_SRC)/native/sun/nio/ch \
-I$(PLATFORM_SRC)/native/java/net \
-I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
@@ -76,5 +78,5 @@ endif # ifneq windows
clean clobber::
$(RM) -r $(CLASSDESTDIR)/com/sun/nio/sctp
- $(RM) -r $(CLASSDESTDIR)/sun/nio/ch
+ $(RM) -r $(CLASSDESTDIR)/sun/nio/ch/sctp
diff --git a/jdk/make/com/sun/nio/sctp/mapfile-vers b/jdk/make/com/sun/nio/sctp/mapfile-vers
index 058995e..ceb27da 100644
--- a/jdk/make/com/sun/nio/sctp/mapfile-vers
+++ b/jdk/make/com/sun/nio/sctp/mapfile-vers
@@ -25,30 +25,30 @@
SUNWprivate_1.1 {
global:
- Java_sun_nio_ch_SctpNet_init;
- Java_sun_nio_ch_SctpNet_socket0;
- Java_sun_nio_ch_SctpNet_bindx;
- Java_sun_nio_ch_SctpNet_branch0;
- Java_sun_nio_ch_SctpNet_listen0;
- Java_sun_nio_ch_SctpNet_connect0;
- Java_sun_nio_ch_SctpNet_close0;
- Java_sun_nio_ch_SctpNet_preClose0;
- Java_sun_nio_ch_SctpNet_getLocalAddresses0;
- Java_sun_nio_ch_SctpNet_getRemoteAddresses0;
- Java_sun_nio_ch_SctpNet_getPrimAddrOption0;
- Java_sun_nio_ch_SctpNet_setPrimAddrOption0;
- Java_sun_nio_ch_SctpNet_setPeerPrimAddrOption0;
- Java_sun_nio_ch_SctpNet_getInitMsgOption0;
- Java_sun_nio_ch_SctpNet_setInitMsgOption0;
- Java_sun_nio_ch_SctpNet_getIntOption0;
- Java_sun_nio_ch_SctpNet_setIntOption0;
- Java_sun_nio_ch_SctpNet_shutdown0;
- Java_sun_nio_ch_SctpChannelImpl_initIDs;
- Java_sun_nio_ch_SctpChannelImpl_checkConnect;
- Java_sun_nio_ch_SctpChannelImpl_receive0;
- Java_sun_nio_ch_SctpChannelImpl_send0;
- Java_sun_nio_ch_SctpServerChannelImpl_initIDs;
- Java_sun_nio_ch_SctpServerChannelImpl_accept0;
+ Java_sun_nio_ch_sctp_SctpNet_init;
+ Java_sun_nio_ch_sctp_SctpNet_socket0;
+ Java_sun_nio_ch_sctp_SctpNet_bindx;
+ Java_sun_nio_ch_sctp_SctpNet_branch0;
+ Java_sun_nio_ch_sctp_SctpNet_listen0;
+ Java_sun_nio_ch_sctp_SctpNet_connect0;
+ Java_sun_nio_ch_sctp_SctpNet_close0;
+ Java_sun_nio_ch_sctp_SctpNet_preClose0;
+ Java_sun_nio_ch_sctp_SctpNet_getLocalAddresses0;
+ Java_sun_nio_ch_sctp_SctpNet_getRemoteAddresses0;
+ Java_sun_nio_ch_sctp_SctpNet_getPrimAddrOption0;
+ Java_sun_nio_ch_sctp_SctpNet_setPrimAddrOption0;
+ Java_sun_nio_ch_sctp_SctpNet_setPeerPrimAddrOption0;
+ Java_sun_nio_ch_sctp_SctpNet_getInitMsgOption0;
+ Java_sun_nio_ch_sctp_SctpNet_setInitMsgOption0;
+ Java_sun_nio_ch_sctp_SctpNet_getIntOption0;
+ Java_sun_nio_ch_sctp_SctpNet_setIntOption0;
+ Java_sun_nio_ch_sctp_SctpNet_shutdown0;
+ Java_sun_nio_ch_sctp_SctpChannelImpl_initIDs;
+ Java_sun_nio_ch_sctp_SctpChannelImpl_checkConnect;
+ Java_sun_nio_ch_sctp_SctpChannelImpl_receive0;
+ Java_sun_nio_ch_sctp_SctpChannelImpl_send0;
+ Java_sun_nio_ch_sctp_SctpServerChannelImpl_initIDs;
+ Java_sun_nio_ch_sctp_SctpServerChannelImpl_accept0;
JNI_OnLoad;
local:
*;
diff --git a/jdk/make/com/sun/security/auth/module/Makefile b/jdk/make/com/sun/security/auth/module/Makefile
index f2cb5f1..c1b97c6 100644
--- a/jdk/make/com/sun/security/auth/module/Makefile
+++ b/jdk/make/com/sun/security/auth/module/Makefile
@@ -68,7 +68,7 @@ ifeq ($(PLATFORM), solaris)
include FILES_c_solaris.gmk
endif # solaris
-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux macosx))
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
diff --git a/jdk/make/com/sun/tools/attach/Exportedfiles.gmk b/jdk/make/com/sun/tools/attach/Exportedfiles.gmk
index 7e07d31..8852c76 100644
--- a/jdk/make/com/sun/tools/attach/Exportedfiles.gmk
+++ b/jdk/make/com/sun/tools/attach/Exportedfiles.gmk
@@ -43,5 +43,7 @@ FILES_export = \
sun/tools/attach/LinuxVirtualMachine.java
endif
-
-
+ifeq ($(PLATFORM), macosx)
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
diff --git a/jdk/make/com/sun/tools/attach/FILES_c.gmk b/jdk/make/com/sun/tools/attach/FILES_c.gmk
index b495431..8a5baec 100644
--- a/jdk/make/com/sun/tools/attach/FILES_c.gmk
+++ b/jdk/make/com/sun/tools/attach/FILES_c.gmk
@@ -39,4 +39,7 @@ FILES_c = \
LinuxVirtualMachine.c
endif
-
+ifeq ($(PLATFORM), macosx)
+FILES_c = \
+ BsdVirtualMachine.c
+endif
diff --git a/jdk/make/com/sun/tools/attach/FILES_java.gmk b/jdk/make/com/sun/tools/attach/FILES_java.gmk
index 2ac0b24..6e11f8c 100644
--- a/jdk/make/com/sun/tools/attach/FILES_java.gmk
+++ b/jdk/make/com/sun/tools/attach/FILES_java.gmk
@@ -43,6 +43,11 @@ FILES_java += \
sun/tools/attach/LinuxAttachProvider.java
endif
+ifeq ($(PLATFORM), macosx)
+FILES_java += \
+ sun/tools/attach/BsdAttachProvider.java
+endif
+
#
# Files that need to be copied
#
diff --git a/jdk/make/com/sun/tools/attach/Makefile b/jdk/make/com/sun/tools/attach/Makefile
index 87554d5..36f3cab 100644
--- a/jdk/make/com/sun/tools/attach/Makefile
+++ b/jdk/make/com/sun/tools/attach/Makefile
@@ -40,6 +40,9 @@ endif
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
endif
+ifeq ($(PLATFORM), macosx)
+FILES_m = mapfile-bsd
+endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
@@ -56,7 +59,11 @@ ifeq ($(PLATFORM), windows)
EXTRA_LIBS += psapi.lib
endif
-vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
+ifeq ($PLATFORM), macosx)
+ vpath %.c $(call NativeSrcDirList,,native/sun/tools/attach)
+else
+ vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach
+endif
all: classes copy-files
diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk
index 8f3cbfd..be16cc1 100644
--- a/jdk/make/common/Defs-linux.gmk
+++ b/jdk/make/common/Defs-linux.gmk
@@ -374,6 +374,7 @@ override LIBSOCKET =
override LIBNSL =
override LIBSCF =
override LIBTHREAD =
+override LIBDL = -ldl
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = true
ifeq ($(ARCH), amd64)
diff --git a/jdk/make/common/Defs-solaris.gmk b/jdk/make/common/Defs-solaris.gmk
index 543e0ce..ef8d794 100644
--- a/jdk/make/common/Defs-solaris.gmk
+++ b/jdk/make/common/Defs-solaris.gmk
@@ -713,6 +713,9 @@ LIBNSL = -lnsl
# service configuration facility library
LIBSCF = -lscf
+# Dynamic Loading library
+LIBDL = -ldl
+
# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
# EXCEPT for select compiles
# If a .o file is compiled non-PIC then it should be forced
diff --git a/jdk/make/common/Defs.gmk b/jdk/make/common/Defs.gmk
index 7dd9b5f..91fc33a 100644
--- a/jdk/make/common/Defs.gmk
+++ b/jdk/make/common/Defs.gmk
@@ -179,11 +179,18 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
ifdef ALT_FREETYPE_LIB_PATH
FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
+ ifeq ($(PLATFORM), macosx)
+ USING_SYSTEM_FT_LIB=true
+ endif
else
ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
else
- FREETYPE_LIB_PATH = /usr/lib
+ ifeq ($(PLATFORM), macosx)
+ FREETYPE_LIB_PATH = /usr/X11R6/lib
+ else
+ FREETYPE_LIB_PATH = /usr/lib
+ endif
USING_SYSTEM_FT_LIB=true
endif
endif
@@ -194,7 +201,11 @@ DEVTOOLS_FT_DIR_EXISTS = $(shell \
ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
FREETYPE_HEADERS_PATH = $(DEVTOOLS_FT_DIR)/include
else
- FREETYPE_HEADERS_PATH = /usr/include
+ ifeq ($(PLATFORM), macosx)
+ FREETYPE_HEADERS_PATH = /usr/X11R6/include
+ else
+ FREETYPE_HEADERS_PATH = /usr/include
+ endif
endif
endif
endif
@@ -259,6 +270,10 @@ ifdef PROGRAM
LDLIBS_COMMON = -ldl
endif
+ ifeq ($(PLATFORM), macosx)
+ LDLIBS_COMMON = -pthread
+ endif
+
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
@@ -399,7 +414,12 @@ OTHER_CPPFLAGS += $(INCLUDES)
# We define an intermediate variable for Java files because
# we use its value later to help define $SOURCEPATH
-VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
+ifeq ($(PLATFORM), macosx)
+ VPATH0.java = $(subst $(ONESPACE),:,$(GENSRCDIR) $(call JavaSrcDirList,,classes))
+else
+ VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes
+endif
+
ifdef OPENJDK
VPATH.java = $(VPATH0.java)
else
@@ -425,7 +445,12 @@ vpath %.$(OBJECT_SUFFIX) $(OBJDIR)
# namely jni.h, jvm.h, and jni_utils.h, plus their platform-specific
# relatives.
#
-VPATH.h = $(PLATFORM_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export
+VPATH0.h = $(PLATFORM_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/javavm/export
+ifdef OPENJDK
+ VPATH.h = $(VPATH0.h)
+else
+ VPATH.h = $(CLOSED_SHARE_SRC)/javavm/export$(CLASSPATH_SEPARATOR)$(VPATH0.h)
+endif
vpath %.h $(VPATH.h)
#
diff --git a/jdk/make/common/Library.gmk b/jdk/make/common/Library.gmk
index 6aafbde..36080ad 100644
--- a/jdk/make/common/Library.gmk
+++ b/jdk/make/common/Library.gmk
@@ -59,6 +59,14 @@ FILES_o = $(patsubst %.c, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notd
FILES_o += $(patsubst %.s, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_s))))
FILES_o += $(patsubst %.cpp, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_cpp))))
+ifeq ($(PLATFORM), macosx)
+FILES_o += $(patsubst %.m, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_objc))))
+FILES_o += $(patsubst %.mm, %.$(OBJECT_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_objcpp))))
+
+INCREMENTAL_BUILD=false
+
+endif # PLATFORM
+
ifeq ($(INCREMENTAL_BUILD),true)
FILES_d = $(patsubst %.c, %.$(DEPEND_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_c))))
FILES_d += $(patsubst %.cpp, %.$(DEPEND_SUFFIX), $(addprefix $(OBJDIR)/, $(notdir $(FILES_cpp))))
@@ -227,12 +235,17 @@ else # PLATFORM
# the shared library. On other platforms set this to false at the
# make command line.
#
+
+ifneq ($(PLATFORM), macosx)
+ ARFLAGS = -r
+endif
+
$(ACTUAL_LIBRARY):: $(COMPILE_FILES_o) $(FILES_m) $(FILES_reorder)
@$(prep-target)
@$(ECHO) "STATS: LIBRARY=$(LIBRARY), PRODUCT=$(PRODUCT), OPTIMIZATION_LEVEL=$(OPTIMIZATION_LEVEL)"
@$(ECHO) "Rebuilding $@ because of $?"
ifeq ($(LIBRARY), fdlibm)
- $(AR) -r $@ $(FILES_o)
+ $(AR) $(ARFLAGS) $@ $(FILES_o)
else # LIBRARY
$(LINKER) $(SHARED_LIBRARY_FLAG) -o $@ $(FILES_o) $(LDLIBS)
@$(call binary_file_verification,$@)
diff --git a/jdk/make/common/Program.gmk b/jdk/make/common/Program.gmk
index c31e41d..b8d6a89 100644
--- a/jdk/make/common/Program.gmk
+++ b/jdk/make/common/Program.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -38,12 +38,18 @@ ifeq ($(COMPILE_APPROACH),batch)
override COMPILE_APPROACH = normal
endif
-ifndef LAUNCHER_PLATFORM_SRC
-LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)
+# set the platform specific directory for macosx, also this platform shares
+# substantial family ties with its siblings (solaris and linux), thus we add
+# solaris src path to its compilation dependencies.
+ifeq ($(PLATFORM), macosx)
+ LAUNCHER_PLATFORM_SRC = $(BUILDDIR)/../src/macosx
+ LAUNCHER_SOLARIS_PLATFORM_SRC = $(BUILDDIR)/../src/solaris
+else
+ LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)
endif
ifndef LAUNCHER_SHARE_SRC
-LAUNCHER_SHARE_SRC = $(SHARE_SRC)
+ LAUNCHER_SHARE_SRC = $(SHARE_SRC)
endif
ACTUAL_PROGRAM_NAME = $(PROGRAM)$(EXE_SUFFIX)
@@ -66,7 +72,7 @@ endif
include $(JDK_TOPDIR)/make/common/Rules.gmk
ifdef NEVER_ACT_AS_SERVER_CLASS_MACHINE
-OTHER_CPPFLAGS += -DNEVER_ACT_AS_SERVER_CLASS_MACHINE
+ OTHER_CPPFLAGS += -DNEVER_ACT_AS_SERVER_CLASS_MACHINE
endif
#
@@ -78,40 +84,51 @@ endif
# On Windows, this is done by using the same directory as the executable
# itself, as with all the Windows libraries.
#
-ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
- LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
- OTHER_LDLIBS += -ljli
- ifeq ($(PLATFORM), solaris)
- ifeq ($(ARCH_DATA_MODEL), 32)
- LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
- else
- LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
- LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
- endif
- endif
- ifeq ($(PLATFORM), linux)
- LDFLAGS += $(LDFLAG_Z_ORIGIN)
- LDFLAGS += -Wl,--allow-shlib-undefined
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
- LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
+ifeq ($(PLATFORM), macosx)
+ ifneq ($(ARCH), universal)
+ LDFLAGS += -Wl,-all_load
+ endif
+ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+
+ ifeq ($(SYSTEM_ZLIB),true)
+ OTHER_LDLIBS += -lz
+ endif
+endif
+
+ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
+ LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
+ OTHER_LDLIBS += -ljli
+ ifeq ($(PLATFORM), solaris)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ LDFLAGS += -R \$$ORIGIN/../lib/$(LIBARCH)/jli
+ LDFLAGS += -R \$$ORIGIN/../jre/lib/$(LIBARCH)/jli
+ else
+ LDFLAGS += -R \$$ORIGIN/../../lib/$(LIBARCH)/jli
+ LDFLAGS += -R \$$ORIGIN/../../jre/lib/$(LIBARCH)/jli
endif
+ endif
+ ifeq ($(PLATFORM), linux)
+ LDFLAGS += $(LDFLAG_Z_ORIGIN)
+ LDFLAGS += -Wl,--allow-shlib-undefined
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../lib/$(LIBARCH)/jli
+ LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/../jre/lib/$(LIBARCH)/jli
+ endif
endif
+
ifeq ($(PLATFORM), windows)
- JLI_LCF = $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/jli.lcf
- ifdef STATIC_JLI
- LDFLAGS += -libpath:$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static
- else
- LDFLAGS += -libpath:$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)
- endif
- OTHER_LDLIBS += jli.lib
+ JLI_LCF = $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/jli.lcf
+ ifdef STATIC_JLI
+ LDFLAGS += -libpath:$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static
+ else
+ LDFLAGS += -libpath:$(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)
+ endif
+ OTHER_LDLIBS += jli.lib
endif
#
# Launcher specific files.
#
-FILES_o = \
- $(OBJDIR)/main.$(OBJECT_SUFFIX)
+FILES_o = $(OBJDIR)/main.$(OBJECT_SUFFIX)
$(ACTUAL_PROGRAM):: classes $(INIT)
@@ -119,19 +136,18 @@ $(ACTUAL_PROGRAM):: classes $(INIT)
# Windows only
#
ifeq ($(PLATFORM), windows)
+ # JDK name required here
+ RC_FLAGS += /D "JDK_FNAME=$(PROGRAM)$(EXE_SUFFIX)" \
+ /D "JDK_INTERNAL_NAME=$(PROGRAM)" \
+ /D "JDK_FTYPE=0x1L"
-# JDK name required here
-RC_FLAGS += /D "JDK_FNAME=$(PROGRAM)$(EXE_SUFFIX)" \
- /D "JDK_INTERNAL_NAME=$(PROGRAM)" \
- /D "JDK_FTYPE=0x1L"
-
-$(OBJDIR)/$(PROGRAM).res: $(VERSIONINFO_RESOURCE)
+ $(OBJDIR)/$(PROGRAM).res: $(VERSIONINFO_RESOURCE)
@$(prep-target)
-ifndef LOCAL_RESOURCE_FILE
+ ifndef LOCAL_RESOURCE_FILE
$(RC) $(RC_FLAGS) $(CC_OBJECT_OUTPUT_FLAG)$(@) $(VERSIONINFO_RESOURCE)
-endif
+ endif
-$(OBJDIR)/$(PROGRAM).lcf: $(OBJDIR)/$(PROGRAM).res $(FILES_o)
+ $(OBJDIR)/$(PROGRAM).lcf: $(OBJDIR)/$(PROGRAM).res $(FILES_o)
@$(prep-target)
@$(ECHO) $(FILES_o) > $@
ifndef LOCAL_RESOURCE_FILE
@@ -143,56 +159,74 @@ $(OBJDIR)/$(PROGRAM).lcf: $(OBJDIR)/$(PROGRAM).res $(FILES_o)
$(ACTUAL_PROGRAM):: $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX)
@$(install-cmd-file)
-ifeq ($(ARCH_DATA_MODEL), 32)
- STACK_SIZE=327680
-else
-# We need more Stack for Windows 64bit
- STACK_SIZE=1048576
-endif
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ STACK_SIZE=327680
+ else
+ # We need more Stack for Windows 64bit
+ STACK_SIZE=1048576
+ endif
-IMVERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
-$(OBJDIR)/$(PROGRAM).exe.manifest: $(JDK_TOPDIR)/src/windows/resource/java.manifest
+ IMVERSION=$(JDK_MINOR_VERSION).$(JDK_MICRO_VERSION).$(JDK_UPDATE_VER).$(COOKED_BUILD_NUMBER)
+ $(OBJDIR)/$(PROGRAM).exe.manifest: $(JDK_TOPDIR)/src/windows/resource/java.manifest
@$(prep-target)
$(SED) 's%IMVERSION%$(IMVERSION)%g;s%PROGRAM%$(PROGRAM)%g' $< > $@
-# We used a hand-crafted manifest file for all executables.
-# It is tweaked to embed the build number and executable name.
-# Use ";#2" for .dll and ";#1" for .exe in the MT command below:
-$(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF) $(OBJDIR)/$(PROGRAM).exe.manifest
+ # We used a hand-crafted manifest file for all executables.
+ # It is tweaked to embed the build number and executable name.
+ # Use ";#2" for .dll and ";#1" for .exe in the MT command below:
+ $(OBJDIR)/$(PROGRAM)$(EXE_SUFFIX):: $(OBJDIR)/$(PROGRAM).lcf $(FILES_o) $(JLI_LCF) $(OBJDIR)/$(PROGRAM).exe.manifest
@$(prep-target)
@set -- $?; \
$(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
$(LINK) -out:$@ /STACK:$(STACK_SIZE) \
-map:$(OBJDIR)/$(PROGRAM).map $(LFLAGS) $(LDFLAGS) \
@$(OBJDIR)/$(PROGRAM).lcf $(LDLIBS)
-ifdef MT
+ ifdef MT
$(MT) /manifest $(OBJDIR)/$(PROGRAM).exe.manifest /outputresource:$@;#1
-endif
+ endif
@$(call binary_file_verification,$@)
+else
+ #
+ # Note that we have to link -lthread even when USE_PTHREADS is true.
+ # This is becuase checkForCorrectLibthread() croaks otherwise.
+ #
+ LIBTHREAD = -lthread
+ ifeq ($(USE_PTHREADS),true)
+ THREADLIBS = -lpthread $(LIBTHREAD)
+ else
+ THREADLIBS = $(LIBTHREAD)
+ endif
-else # PLATFORM
-
-#
-# Note that we have to link -lthread even when USE_PTHREADS is true.
-# This is becuase checkForCorrectLibthread() croaks otherwise.
-#
-LIBTHREAD = -lthread
-ifeq ($(USE_PTHREADS),true)
- THREADLIBS = -lpthread $(LIBTHREAD)
-else # USE_PTHREADS
- THREADLIBS = $(LIBTHREAD)
-endif # USE_PTHREADS
+ ifeq ($(PLATFORM), macosx)
+ THREADLIBS = -pthread
+ # Needed for linking the various launchers
+ LDFLAGS += -framework Cocoa -framework Security \
+ -framework ApplicationServices
+ OTHER_CPPFLAGS += -DPACKAGE_PATH='"$(PACKAGE_PATH)"'
+
+ # Default Info.plist file for the command line tools. This gets overridden by
+ # some of the jvmstat tools so that they have task_for_pid() privileges
+ ifndef INFO_PLIST_FILE
+ INFO_PLIST_FILE = Info-cmdline.plist
+ endif
+ LDFLAGS += -sectcreate __TEXT __info_plist $(LAUNCHER_PLATFORM_SRC)/lib/$(INFO_PLIST_FILE)
+ else
+ INFO_PLIST_FILE=
+ endif
-#
-# This rule only applies on unix. It supports quantify and its ilk.
-#
-$(ACTUAL_PROGRAM):: $(FILES_o)
+ #
+ # This rule only applies on unix. It supports quantify and its ilk.
+ #
+ $(ACTUAL_PROGRAM):: $(FILES_o)
@$(prep-target)
@set -- $?; \
- $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
+ $(ECHO) Rebuilding $@ because of $$1 $$2 $$3 $$4 $$5 $$6 $${7:+...};
@$(MKDIR) -p $(TEMPDIR)
$(LINK_PRE_CMD) $(CC) $(CC_OBJECT_OUTPUT_FLAG)$@ $(LDFLAGS) \
- $(FILES_o) $(THREADLIBS) $(LDLIBS)
+ $(FILES_o) $(THREADLIBS) $(LDLIBS)
+ ifeq ($(findstring privileged, $(INFO_PLIST_FILE)), privileged)
+ -codesign -s openjdk_codesign $@
+ endif
@$(call binary_file_verification,$@)
$(install-module-file)
@@ -219,17 +253,17 @@ clobber::
# Now include make dependencies (created during compilation, see Rules.gmk)
#
ifeq ($(INCREMENTAL_BUILD),true)
-# Workaround: gnumake sometimes says files is empty when it shouldn't
-# was: files := $(foreach file, $(wildcard */$(ARCH)/*.$(DEPEND_SUFFIX)), $(file))
-files := $(shell $(LS) $(OBJDIR)/*.$(DEPEND_SUFFIX) 2>/dev/null)
-ifneq ($(strip $(files)),)
-include $(files)
-endif # files
-endif # INCREMENTAL_BUILD
+ # Workaround: gnumake sometimes says files is empty when it shouldn't
+ # was: files := $(foreach file, $(wildcard */$(ARCH)/*.$(DEPEND_SUFFIX)), $(file))
+ files := $(shell $(LS) $(OBJDIR)/*.$(DEPEND_SUFFIX) 2>/dev/null)
+ ifneq ($(strip $(files)),)
+ include $(files)
+ endif
+endif
ifdef JAVA_ARGS
-OTHER_CPPFLAGS += -DJAVA_ARGS='$(JAVA_ARGS)'
-OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"'
+ OTHER_CPPFLAGS += -DJAVA_ARGS='$(JAVA_ARGS)'
+ OTHER_CPPFLAGS += -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"'
endif
ifdef PROGRAM_MODULE
@@ -238,28 +272,35 @@ OTHER_CPPFLAGS += -DMODULE_VERSION='"$(MODULE_VERSION)"'
endif
ifeq ($(PLATFORM), windows)
-ifdef RELEASE
-OTHER_CPPFLAGS += -DVERSION='"$(RELEASE)"'
-endif
+ ifdef RELEASE
+ OTHER_CPPFLAGS += -DVERSION='"$(RELEASE)"'
+ endif
endif
ifneq ($(PLATFORM), windows)
-HAVE_GETHRTIME=true
+ HAVE_GETHRTIME=true
endif
ifeq ($(HAVE_GETHRTIME),true)
-OTHER_CPPFLAGS += -DHAVE_GETHRTIME
+ OTHER_CPPFLAGS += -DHAVE_GETHRTIME
endif
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
-OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ifeq ($(PLATFORM), macosx)
+ OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)/bin
+ ifneq ($(SYSTEM_ZLIB), true)
+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+ endif
+else
+ OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
+endif
-OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
+OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
VERSION_DEFINES += -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
- -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"'
+ -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"'
diff --git a/jdk/make/common/Release-embedded.gmk b/jdk/make/common/Release-embedded.gmk
index fd6141d..8a89b74 100644
--- a/jdk/make/common/Release-embedded.gmk
+++ b/jdk/make/common/Release-embedded.gmk
@@ -189,7 +189,7 @@ reduced-headless-image-jre:: $(RT_JAR) $(RESOURCES_JAR) $(BUILD_META_INDEX) $(HL
$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/audio
$(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/applet
$(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/awt_robot
- $(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/xawt
+ $(RM) $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libawt_xawt.so
$(RM) -r $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/$(LIBARCH)/libsplashscreen.so
@# Remove oblique fonts and reduce font support to LucidaSansRegular only
$(RM) -fr $(JRE_REDUCED_HEADLESS_IMAGE_DIR)/lib/oblique-fonts
diff --git a/jdk/make/common/Release.gmk b/jdk/make/common/Release.gmk
index 0933403..d387f7d 100644
--- a/jdk/make/common/Release.gmk
+++ b/jdk/make/common/Release.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -76,6 +76,10 @@ endif
JTG_DOCS = $(JDK_TOPDIR)/src/solaris/doc
+ifeq ($(PLATFORM), macosx)
+ include $(JDK_TOPDIR)/make/common/Release-$(PLATFORM).gmk
+endif
+
# The base names of all the license and document files for the jdk and jre
# (These files get placed in the jdk and jre install images)
ifdef OPENJDK
@@ -134,7 +138,6 @@ endif
JDK_MAN_PAGES = \
$(JRE_MAN_PAGES) \
appletviewer.1 \
- apt.1 \
extcheck.1 \
idlj.1 \
jar.1 \
@@ -233,11 +236,22 @@ sec-files sec-files-win jgss-files ::
@$(ECHO) ">>>Making "$@" @ `$(DATE)` ..."
# Order is important here, trim jre after jdk image is created
+ifeq ($(PLATFORM), macosx)
+
+legacy-images:: sanity-images post-sanity-images \
+ $(INITIAL_IMAGE_JRE) $(EXTRA_JRE_TARGETS) $(INITIAL_IMAGE_JDK) \
+ trim-image-jre trim-image-jdk \
+ identify-image-jre identify-image-jdk \
+ process-image-jre process-image-jdk sec-files sec-files-win jgss-files \
+ $(EXTRA_IMAGE_TARGETS)
+else
+
legacy-images:: sanity-images post-sanity-images \
$(INITIAL_IMAGE_JRE) $(INITIAL_IMAGE_JDK) \
trim-image-jre trim-image-jdk \
identify-image-jre identify-image-jdk \
process-image-jre process-image-jdk sec-files sec-files-win jgss-files
+endif
# Don't use these
image-jre:: initial-image-jre trim-image-jre identify-image-jre process-image-jre
@@ -266,7 +280,6 @@ SOURCES = \
com/sun/java/swing \
com/sun/javadoc \
com/sun/jmx \
- com/sun/mirror \
com/sun/source \
com/sun/naming \
com/sun/security/auth \
@@ -348,7 +361,6 @@ TOOLS = \
com/sun/javadoc \
com/sun/jdi \
com/sun/jarsigner \
- com/sun/mirror \
com/sun/source \
com/sun/tools/classfile \
com/sun/tools/doclets \
@@ -358,16 +370,16 @@ TOOLS = \
com/sun/tools/hat \
com/sun/tools/javac \
com/sun/tools/javadoc \
- com/sun/tools/apt \
com/sun/tools/javah \
com/sun/tools/javap \
com/sun/tools/corba \
com/sun/tools/internal/xjc \
com/sun/tools/internal/ws \
- META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \
- META-INF/services/com.sun.tools.xjc.Plugin \
+ META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
+ META-INF/services/com.sun.tools.internal.xjc.Plugin \
com/sun/istack/internal/tools \
- com/sun/istack/internal/ws \
+ com/sun/tools/internal/jxc/ap \
+ com/sun/tools/internal/ws/wscompile/plugin/at_generated \
com/sun/codemodel \
com/sun/tools/internal/jxc \
com/sun/xml/internal/rngom \
@@ -383,6 +395,11 @@ TOOLS = \
sun/tools/jinfo \
sun/tools/jmap
+# classes that go into jfr.jar
+JFR_CLASSES_DIRS= \
+ com/oracle/jrockit/jfr \
+ oracle/jrockit/jfr
+
# classes that go into jsse.jar
JSSE_CLASSES_DIRS = \
sun/security/provider/Sun.class \
@@ -438,7 +455,6 @@ NOTJRETOOLS = \
java-rmi.cgi \
javac$(EXE_SUFFIX) \
javadoc$(EXE_SUFFIX) \
- apt$(EXE_SUFFIX) \
javah$(EXE_SUFFIX) \
javap$(EXE_SUFFIX) \
jcmd$(EXE_SUFFIX) \
@@ -503,7 +519,7 @@ $(JDK_IMAGE_DIR)/demo/DEMOS_LICENSE: $(SHARE_JDK_DOC_SRC)/DEMOS_LICENSE
$(JDK_IMAGE_DIR)/sample/SAMPLES_LICENSE: $(SHARE_JDK_DOC_SRC)/SAMPLES_LICENSE
$(process-doc-file)
-# JRE files
+# JRE files
$(JRE_IMAGE_DIR)/%: $(SHARE_JRE_DOC_SRC)/%
$(process-doc-file)
ifeq ($(PLATFORM), windows)
@@ -528,13 +544,10 @@ $(NOT_RT_JAR_LIST): FRC
$(ECHO) "com/sun/javadoc/" >> $@
$(ECHO) "com/sun/jdi/" >> $@
$(ECHO) "com/sun/jarsigner/" >> $@
- $(ECHO) "com/sun/mirror/" >> $@
$(ECHO) "com/sun/source/" >> $@
$(ECHO) "com/sun/istack/internal/tools/" >> $@
- $(ECHO) "com/sun/istack/internal/ws/" >> $@
$(ECHO) "META-INF/services/com.sun.jdi.connect.Connector" >> $@
$(ECHO) "META-INF/services/com.sun.jdi.connect.spi.TransportService" >> $@
- $(ECHO) "META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory" >> $@
$(ECHO) "META-INF/services/com.sun.tools.xjc.Plugin" >> $@
$(ECHO) "com/sun/tools/" >> $@
$(ECHO) "sun/jvmstat/" >> $@
@@ -591,6 +604,23 @@ $(NOT_RT_JAR_LIST): FRC
$(ECHO) "sun/tools/jstack/" >> $@
$(ECHO) "sun/tools/jinfo/" >> $@
$(ECHO) "sun/tools/jmap/" >> $@
+ifndef OPENJDK
+ifndef JAVASE_EMBEDDED
+ $(ECHO) "com/oracle/jrockit/jfr/" >> $@
+ $(ECHO) "com/oracle/jrockit/jfr/client/" >> $@
+ $(ECHO) "com/oracle/jrockit/jfr/management/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/events/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/openmbean/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/parser/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/settings/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/tools/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/util/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/util/log/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/util/os/" >> $@
+ $(ECHO) "oracle/jrockit/jfr/util/text/" >> $@
+endif
+endif
# File order list for rt.jar
@@ -615,6 +645,20 @@ $(TOTAL_JAR_FILELIST): $(JARREORDER_JARFILE) $(NOT_RT_JAR_LIST)
$(MV) $@.temp $@
@($(CD) $(CLASSBINDIR) && $(java-vm-cleanup))
+# Create the jfr.jar containing Java Flight Recorder implementation
+JFR_JAR=
+ifndef OPENJDK
+ifndef JAVASE_EMBEDDED
+JFR_JAR=$(ABS_TEMPDIR)/jfr-orig.jar
+$(JFR_JAR): $(OTHER_JAR_MANIFEST_FILE)
+ $(prep-target)
+ $(CD) $(CLASSBINDIR) && \
+ $(BOOT_JAR_CMD) $(CREATE_JAR_OPTS) $(OTHER_JAR_MANIFEST_FILE) $@ \
+ $(JFR_CLASSES_DIRS) $(BOOT_JAR_JFLAGS)
+ @$(CD) $(CLASSBINDIR) && $(java-vm-cleanup)
+endif
+endif
+
# Create the rt.jar file list & non-class files list
JARSPLIT_JARFILE = $(BUILDTOOLJARDIR)/jarsplit.jar
@@ -749,7 +793,7 @@ initial-image-jre-sol64:: initial-image-jre-setup
# drive names like C:
initial-image-jre:: initial-image-jre-setup \
$(JRE_DOCFILES) \
- $(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) \
+ $(RT_JAR) $(RESOURCES_JAR) $(JSSE_JAR) $(JFR_JAR) \
$(BUILDMETAINDEX_JARFILE)
@# Copy in bin directory
$(CD) $(OUTPUTDIR) && $(FIND) bin -depth | $(CPIO) -pdum $(JRE_IMAGE_DIR)
@@ -777,6 +821,9 @@ initial-image-jre:: initial-image-jre-setup \
$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
+ifneq ($(JFR_JAR),)
+ $(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
+endif
@# Generate meta-index to make boot and extension class loaders lazier
$(CD) $(JRE_IMAGE_DIR)/lib && \
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
@@ -786,6 +833,10 @@ initial-image-jre:: initial-image-jre-setup \
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
-o meta-index *.jar
@$(CD) $(JRE_IMAGE_DIR)/lib/ext && $(java-vm-cleanup)
+ifeq ($(PLATFORM), macosx)
+ @#install jobjc, apple mac only
+ $(CP) $(OUTPUTDIR)/JObjC.build/JObjC.jar $(JRE_IMAGE_DIR)/lib/JObjC.jar
+endif
ifeq ($(PLATFORM), windows)
@# Remove certain *.lib files
$(CD) $(JRE_IMAGE_DIR)/lib && \
@@ -922,12 +973,20 @@ initial-image-jdk-db: $(DB_ZIP_LIST)
($(CD) $(JDK_IMAGE_DIR)/db && $(UNZIP) -o $$d); \
done
$(CP) $(ABS_DB_PATH)/README-JDK.html $(JDK_IMAGE_DIR)/db
+ifndef NO_DEMOS
$(RM) -rf $(DEMODIR)/db
$(MV) $(JDK_IMAGE_DIR)/db/demo $(DEMODIR)/db
$(CP) $(ABS_DB_PATH)/README-JDK-DEMOS.html $(DEMODIR)/db/
+else
+ $(RM) -rf $(JDK_IMAGE_DIR)/db/demo
+endif
$(RM) $(JDK_IMAGE_DIR)/db/index.html $(JDK_IMAGE_DIR)/db/register.html
endif
+# The launcher source files we need for src.zip
+FILES_launcher = $(wildcard $(SHARE_SRC)/bin/*) \
+ $(wildcard $(PLATFORM_SRC)/bin/java_md*)
+
# Standard jdk image
initial-image-jdk:: initial-image-jdk-setup \
initial-image-jdk-db \
@@ -969,7 +1028,7 @@ initial-image-jdk:: initial-image-jdk-setup \
@#
@# files that might not exist need to be touched.
@#
- $(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.xjc.Plugin
+ $(TOUCH) $(CLASSBINDIR)/META-INF/services/com.sun.tools.internal.xjc.Plugin
@#
@# lib/tools.jar
@#
@@ -1014,7 +1073,8 @@ initial-image-jdk:: initial-image-jdk-setup \
@# generated by the more efficient solaris/windows method of copying files.
@# So for Linux, make use of the -T option (like Solaris' -I option) of
@# obtaining the list of files from a file. MKS tar has no such option.
- ifeq ($(PLATFORM), linux)
+
+ ifneq (,$(findstring $(PLATFORM), linux macosx))
for d in $(SOURCE_DIRS); do \
$(RM) $(ABS_TEMPDIR)/src-files.list; \
($(CD) $$d && \
@@ -1052,27 +1112,18 @@ initial-image-jdk:: initial-image-jdk-setup \
$(RM) $(ABS_TEMPDIR)/src-files.list
$(CHMOD) -R +w $(JDK_IMAGE_DIR)/src
$(MKDIR) -p $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/java.c $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/java.h $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/manifest_info.h $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/parse_manifest.c $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/version_comp.c $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/version_comp.h $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/wildcard.h $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/wildcard.c $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/jli_util.h $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/jli_util.c $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/splashscreen_stubs.c $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(SHARE_SRC)/bin/splashscreen.h $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(PLATFORM_SRC)/bin/java_md.c $(JDK_IMAGE_DIR)/src/launcher
- $(CP) $(PLATFORM_SRC)/bin/java_md.h $(JDK_IMAGE_DIR)/src/launcher
+ $(CP) $(FILES_launcher) $(JDK_IMAGE_DIR)/src/launcher
$(CD) $(JDK_IMAGE_DIR)/src && $(ZIPEXE) -qr ../src.zip *
$(RM) -r $(JDK_IMAGE_DIR)/src
@#
@# demo, include
@#
+ifndef NO_DEMOS
$(CP) -r -f $(DEMODIR) $(JDK_IMAGE_DIR)
+endif
+ifndef NO_SAMPLES
$(CP) -r -f $(SAMPLEDIR) $(JDK_IMAGE_DIR)
+endif
$(CP) -r $(INCLUDEDIR) $(JDK_IMAGE_DIR)
@#
@# Swing BeanInfo generation
@@ -1335,4 +1386,3 @@ legacy-images images-clobber::
# Force rule
FRC:
-
diff --git a/jdk/make/common/Rules.gmk b/jdk/make/common/Rules.gmk
index 08f0b5a..f8b839f 100644
--- a/jdk/make/common/Rules.gmk
+++ b/jdk/make/common/Rules.gmk
@@ -51,12 +51,22 @@ $(CLASSDESTDIR) $(CLASSHDRDIR) $(OBJDIR) $(OUTPUTDIR) $(BINDIR) $(LIBDIR) $(LIBD
#
# All source tree areas for java/properties files (a few may be closed)
#
-ifdef OPENJDK
- ALL_CLASSES_SRC = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
+ifeq ($(PLATFORM), macosx)
+ ifdef OPENJDK
+ ALL_CLASSES_SRC = $(call JavaSrcDirList,,classes)
+ else
+ ALL_CLASSES_SRC = \
+ $(CLOSED_SHARE_SRC)/classes $(CLOSED_PLATFORM_SRC)/classes \
+ $(call JavaSrcDirList,,classes)
+ endif
else
- ALL_CLASSES_SRC = \
- $(CLOSED_SHARE_SRC)/classes $(CLOSED_PLATFORM_SRC)/classes \
- $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
+ ifdef OPENJDK
+ ALL_CLASSES_SRC = $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
+ else
+ ALL_CLASSES_SRC = \
+ $(CLOSED_SHARE_SRC)/classes $(CLOSED_PLATFORM_SRC)/classes \
+ $(SHARE_SRC)/classes $(PLATFORM_SRC)/classes
+ endif
endif
#
@@ -200,8 +210,14 @@ endif
$(CLASSDESTDIR)/%.class: $(GENSRCDIR)/%.java
@$(add-java-file)
+
+ifeq ($(PLATFORM), macosx)
+$(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java
+ @$(add-java-file)
+endif
$(CLASSDESTDIR)/%.class: $(PLATFORM_SRC)/classes/%.java
@$(add-java-file)
+
$(CLASSDESTDIR)/%.class: $(SHARE_SRC)/classes/%.java
@$(add-java-file)
diff --git a/jdk/make/common/internal/Defs-jaxws.gmk b/jdk/make/common/internal/Defs-jaxws.gmk
index 60336bd..ae0488f 100644
--- a/jdk/make/common/internal/Defs-jaxws.gmk
+++ b/jdk/make/common/internal/Defs-jaxws.gmk
@@ -34,7 +34,6 @@ IMPORT_RT_PACKAGES += \
javax/xml/ws \
javax/jws \
javax/annotation \
- com/sun/istack/internal \
com/sun/xml/internal/bind \
com/sun/xml/internal/fastinfoset \
com/sun/xml/internal/messaging \
@@ -42,13 +41,13 @@ IMPORT_RT_PACKAGES += \
com/sun/xml/internal/txw2 \
com/sun/xml/internal/ws \
com/sun/xml/internal/stream/buffer
+
NOT_USED_PACKAGES += \
com/sun/tools/internal/txw2
IMPORT_TOOLS_PACKAGES += \
com/sun/codemodel \
com/sun/istack/internal/tools \
- com/sun/istack/internal/ws \
com/sun/xml/internal/rngom \
com/sun/xml/internal/xsom \
com/sun/xml/internal/dtdparser \
@@ -56,8 +55,11 @@ IMPORT_TOOLS_PACKAGES += \
com/sun/tools/internal/ws \
com/sun/tools/internal/jxc \
org/relaxng \
- META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory \
- META-INF/services/com.sun.tools.internal.xjc.Plugin
+ META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin \
+ META-INF/services/com.sun.tools.internal.xjc.Plugin \
+ com/sun/tools/internal/jxc/ap \
+ com/sun/tools/internal/ws/wscompile/plugin/at_generated
+
#
# Modules that contain IMPORT_RT_PACKAGES and IMPORT_TOOLS_PACKAGES
diff --git a/jdk/make/common/internal/Defs-langtools.gmk b/jdk/make/common/internal/Defs-langtools.gmk
index 7871718..3a21271 100644
--- a/jdk/make/common/internal/Defs-langtools.gmk
+++ b/jdk/make/common/internal/Defs-langtools.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,7 @@ IMPORT_RT_PACKAGES += \
IMPORT_TOOLS_PACKAGES += \
com/sun/javadoc \
- com/sun/mirror \
com/sun/source \
- com/sun/tools/apt \
com/sun/tools/classfile \
com/sun/tools/doclets \
com/sun/tools/javac \
diff --git a/jdk/make/common/internal/NativeCompileRules.gmk b/jdk/make/common/internal/NativeCompileRules.gmk
index 5d9cf72..5379ef3 100644
--- a/jdk/make/common/internal/NativeCompileRules.gmk
+++ b/jdk/make/common/internal/NativeCompileRules.gmk
@@ -176,6 +176,24 @@ $(OBJDIR)/%.$(OBJECT_SUFFIX): %.s
endif
@$(check-conventions)
+# Obj-C files (Mac OS X only).
+ifeq ($(PLATFORM), macosx)
+$(OBJDIR)/%.$(OBJECT_SUFFIX): %.m
+ @$(prep-target)
+ $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
+ @$(check-conventions)
+
+$(OBJDIR)/%.$(OBJECT_SUFFIX): %.mm
+ @$(prep-target)
+ $(COMPILE.cc) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
+ @$(check-conventions)
+
+$(OBJDIR)/%.$(OBJECT_SUFFIX): %.c
+ @$(prep-target)
+ $(COMPILE.c) $(CC_OBJECT_OUTPUT_FLAG)$@ $(CFLAGS_GPROF) $<
+ @$(check-conventions)
+endif # PLATFORM
+
#
# Quick hack for making the compiler generate just the assembly file.
# $ gnumake obj/sparc/myfile.s
diff --git a/jdk/make/common/shared/Compiler-gcc.gmk b/jdk/make/common/shared/Compiler-gcc.gmk
index 092ec16..9dde0ba 100644
--- a/jdk/make/common/shared/Compiler-gcc.gmk
+++ b/jdk/make/common/shared/Compiler-gcc.gmk
@@ -67,7 +67,7 @@ ifeq ($(PLATFORM), linux)
CXX = $(COMPILER_PATH)g++
endif
# Option used to create a shared library
- SHARED_LIBRARY_FLAG = -shared -mimpure-text
+ SHARED_LIBRARY_FLAG = -shared
SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
endif
diff --git a/jdk/make/common/shared/Defs-java.gmk b/jdk/make/common/shared/Defs-java.gmk
index 1352a80..82211af 100644
--- a/jdk/make/common/shared/Defs-java.gmk
+++ b/jdk/make/common/shared/Defs-java.gmk
@@ -66,7 +66,11 @@ JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS = \
-XX:-PrintVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-LogVMOutput
# JVM options
-JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
+ifeq ($(PLATFORM), macosx)
+ JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS) -Djava.awt.headless=true
+else
+ JAVA_JVM_FLAGS = $(JAVA_HOTSPOT_DISABLE_PRINT_VMOPTIONS)
+endif
ifeq ($(ADD_CLIENT_VM_OPTION), true)
JAVA_JVM_FLAGS += -client
diff --git a/jdk/make/common/shared/Defs-utils.gmk b/jdk/make/common/shared/Defs-utils.gmk
index 1cebe93..9bc05d6 100644
--- a/jdk/make/common/shared/Defs-utils.gmk
+++ b/jdk/make/common/shared/Defs-utils.gmk
@@ -67,6 +67,13 @@ ifeq ($(PLATFORM),windows)
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
+ifeq ($(PLATFORM),macosx)
+ UTILS_COMMAND_PATH=$(UNIXCOMMAND_PATH)
+ UTILS_USR_BIN_PATH=$(USRBIN_PATH)
+ UTILS_CCS_BIN_PATH=$(USRBIN_PATH)
+ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
+endif
+
# Utilities
ifdef CROSS_COMPILE_ARCH
AR = $(COMPILER_PATH)ar
@@ -126,6 +133,7 @@ MKSINFO = $(UTILS_COMMAND_PATH)mksinfo
MSGFMT = $(UTILS_USR_BIN_PATH)msgfmt
MV = $(UTILS_COMMAND_PATH)mv
NAWK = $(UTILS_USR_BIN_PATH)nawk
+OTOOL = $(UTILS_USR_BIN_PATH)otool
PKGMK = $(UTILS_COMMAND_PATH)pkgmk
PRINTF = $(UTILS_USR_BIN_PATH)printf
PWD = $(UTILS_COMMAND_PATH)pwd
@@ -220,3 +228,26 @@ ifeq ($(PLATFORM),solaris)
ECHO = /usr/bin/echo
endif
+ifeq ($(PLATFORM), macosx)
+ BASENAME = $(UTILS_USR_BIN_PATH)basename
+ EGREP = $(UTILS_USR_BIN_PATH)egrep
+ EXPR = $(UTILS_COMMAND_PATH)expr
+ FMT = $(UTILS_USR_BIN_PATH)fmt
+ GREP = $(UTILS_USR_BIN_PATH)grep
+ GUNZIP = $(UTILS_USR_BIN_PATH)gunzip
+ ID = $(UTILS_USR_BIN_PATH)id
+ MSGFMT = $(UTILS_DEVTOOL_PATH)msgfmt
+ SED = $(UTILS_USR_BIN_PATH)sed
+ SORT = $(UTILS_USR_BIN_PATH)sort
+ TEST = $(UTILS_COMMAND_PATH)test
+ TOUCH = $(UTILS_USR_BIN_PATH)touch
+ TRUE = $(UTILS_USR_BIN_PATH)true
+ UNAME = $(UTILS_USR_BIN_PATH)uname
+ NAWK = $(UTILS_USR_BIN_PATH)awk
+ UNZIPSFX = $(UTILS_USR_BIN_PATH)unzipsfx
+ ZIPEXE = $(UTILS_USR_BIN_PATH)zip
+ CPIO = $(UTILS_USR_BIN_PATH)cpio
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ # Builtin shell command, no -e option needed
+ ECHO = echo
+endif
diff --git a/jdk/make/common/shared/Defs-versions.gmk b/jdk/make/common/shared/Defs-versions.gmk
index 01aa7ee..fba7037 100644
--- a/jdk/make/common/shared/Defs-versions.gmk
+++ b/jdk/make/common/shared/Defs-versions.gmk
@@ -44,6 +44,11 @@ ifeq ($(PLATFORM), linux)
override CC_VERSION = gcc
endif
+# Mac OS X uses LLVM by default
+ifeq ($(PLATFORM), macosx)
+ override CC_VERSION = llvm
+endif
+
##########################################################################
#
# List of JDK official minimum, expected, or required versions:
@@ -164,6 +169,17 @@ ifeq ($(PLATFORM), linux)
endif
endif
+# Mac specific
+ifeq ($(PLATFORM), macosx)
+ REQUIRED_OS_NAME = Darwin
+ REQUIRED_OS_VERSION = 11.2
+ REQUIRED_OS_VARIANT_NAME = MacOSX
+ REQUIRED_OS_VARIANT_VERSION = 10.7.2
+ REQUIRED_COMPILER_NAME = GCC4
+ REQUIRED_COMPILER_VERSION = GCC4
+ REQUIRED_CC_VER = 4.2.1
+endif
+
# Windows specific
ifeq ($(PLATFORM), windows)
REQUIRED_OS_NAME = Windows
diff --git a/jdk/make/common/shared/Defs.gmk b/jdk/make/common/shared/Defs.gmk
index b3860ea..f3fd2ab 100644
--- a/jdk/make/common/shared/Defs.gmk
+++ b/jdk/make/common/shared/Defs.gmk
@@ -177,6 +177,19 @@ $(shell \
fi)
endef
+# Expand SRCDIR_LIST, which is used to automatically include various
+# platform and shared sources/headers. This is mainly useful for the
+# Mac OS X build, which pulls its platform sources from the solaris and/or
+# macosx trees, depending on the component.
+ifeq ($(PLATFORM), macosx)
+ define JavaSrcDirList
+ $(JAVA_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
+ endef
+ define NativeSrcDirList
+ $(NATIVE_SRCDIR_LIST:%=$1$(JDK_TOPDIR)/%/$2)
+ endef
+endif
+
# Make sure certain variables are non-empty at this point
_check_values:=\
$(call CheckValue,ARCH,),\
diff --git a/jdk/make/common/shared/Platform.gmk b/jdk/make/common/shared/Platform.gmk
index 926b625..7713390 100644
--- a/jdk/make/common/shared/Platform.gmk
+++ b/jdk/make/common/shared/Platform.gmk
@@ -224,6 +224,85 @@ ifeq ($(SYSTEM_UNAME), Linux)
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
endif
+ifeq ($(SYSTEM_UNAME), Darwin)
+ PLATFORM = macosx
+ OS_NAME = darwin
+ OS_VENDOR = Apple
+ GB_OF_MEMORY := $(shell system_profiler SPHardwareDataType | fgrep Memory: | awk '{print $$2}')
+ MB_OF_MEMORY := $(shell expr ${GB_OF_MEMORY} '*' 1024)
+endif
+
+# Platform settings specific to BSD/Mac OS X
+ifeq ($(PLATFORM), macosx)
+ OS_VERSION := $(shell uname -r)
+
+ # Arch and OS name/version
+ # Darwin x86 builds are i386/amd64 universal by default.
+ # Allow arch to be set from the environment to avoid this.
+ ifeq ($(origin ARCH), undefined)
+ ifeq ($(PLATFORM), macosx)
+# ifdef OPENJDK -- when universal 32/64 binaries available in Hotspot
+# mach := universal
+# else
+ mach := x86_64
+# endif
+ else
+ mach := $(shell uname -m)
+ endif
+ else
+ mach := $(ARCH)
+ endif
+
+ archExpr = case "$(mach)" in \
+ i[3-9]86) \
+ echo i586 \
+ ;; \
+ sparc64) \
+ echo sparcv9 \
+ ;; \
+ sparc*) \
+ echo sparc \
+ ;; \
+ x86_64) \
+ echo amd64 \
+ ;; \
+ universal) \
+ echo universal \
+ ;; \
+ "Power Macintosh") \
+ echo ppc \
+ ;; \
+ *) \
+ echo $(mach) \
+ ;; \
+ esac
+ ARCH := $(shell $(archExpr) )
+ ARCH_FAMILY := $(ARCH)
+
+ # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64
+ # ARCH_DATA_MODEL does not exactly mean anything in universal
+ # but it has to be one or the other, so pick 32
+ ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))
+ ARCH_DATA_MODEL=32
+ else
+ ARCH_DATA_MODEL=64
+ endif
+
+ # Need to maintain the jre/lib/i386 location for 32-bit Intel
+ ifeq ($(ARCH), i586)
+ LIBARCH = i386
+ else
+ LIBARCH = $(ARCH)
+ endif
+
+ # Value of Java os.arch property
+ ARCHPROP = $(LIBARCH)
+
+ # Suffix for file bundles used in previous release
+ BUNDLE_FILE_SUFFIX=.tar.gz
+ # How much RAM does this machine have:
+endif
+
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
@@ -424,6 +503,22 @@ ifneq ($(PLATFORM), windows)
ARCH_VM_SUBDIR=lib/$(LIBARCH)
endif
+# Darwin-specific Overrides
+ifeq ($(SYSTEM_UNAME),Darwin)
+ # The suffix applied to runtime libraries
+ LIBRARY_SUFFIX = dylib
+ # The suffix applied to link libraries
+ ifeq ($(ARCH), universal)
+ LIB_SUFFIX = o
+ else
+ LIB_SUFFIX = a
+ endif
+
+ ifeq ($(PLATFORM), macosx)
+ ARCH_VM_SUBDIR=jre/lib
+ endif
+endif
+
# Machines with 512Mb or less of real memory are considered low memory
# build machines and adjustments will be made to prevent excessing
# system swapping during the build.
diff --git a/jdk/make/common/shared/Sanity-Settings.gmk b/jdk/make/common/shared/Sanity-Settings.gmk
index 30a3883..45c07ed 100644
--- a/jdk/make/common/shared/Sanity-Settings.gmk
+++ b/jdk/make/common/shared/Sanity-Settings.gmk
@@ -134,6 +134,8 @@ ALL_SETTINGS+=$(call addOptionalSetting,USE_HOTSPOT_INTERPRETER_MODE)
ALL_SETTINGS+=$(call addOptionalSetting,PEDANTIC)
ALL_SETTINGS+=$(call addOptionalSetting,DEV_ONLY)
ALL_SETTINGS+=$(call addOptionalSetting,NO_DOCS)
+ALL_SETTINGS+=$(call addOptionalSetting,NO_DEMOS)
+ALL_SETTINGS+=$(call addOptionalSetting,NO_SAMPLES)
ALL_SETTINGS+=$(call addOptionalSetting,NO_IMAGES)
ALL_SETTINGS+=$(call addOptionalSetting,TOOLS_ONLY)
ALL_SETTINGS+=$(call addOptionalSetting,INSANE)
@@ -264,4 +266,3 @@ ifdef OPENJDK
ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_JRE_FILE)
ALL_SETTINGS+=$(call addAltSetting,PREVIOUS_RELEASE_IMAGE)
endif
-
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
index 547117e..c2e8aaf 100644
--- a/jdk/make/common/shared/Sanity.gmk
+++ b/jdk/make/common/shared/Sanity.gmk
@@ -113,6 +113,13 @@ ifeq ($(PLATFORM), linux)
ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION))
endif
+ifeq ($(PLATFORM), macosx)
+ # What kind of system we are using
+ OS_VERSION := $(shell uname -r)
+ OS_VARIANT_NAME := MacOSX
+ OS_VARIANT_VERSION := $(shell sw_vers -productVersion)
+endif
+
ifeq ($(PLATFORM), windows)
# Windows 2000 is 5.0, Windows XP is 5.1, Windows 2003 is 5.2
# Assume 5.0 (Windows 2000) if systeminfo does not help
@@ -343,7 +350,13 @@ ifneq ($(PLATFORM), windows)
" Try setting LANG to 'C'. \n" \
"" >> $(WARNING_FILE) ; \
fi
+ifeq ($(PLATFORM), macosx)
+ @if [ "$(LANG)" = "" ]; then \
+ $(ECHO) "ERROR: LANG must be set on Mac OS X. Recommended value is \"C\"" >> $(ERROR_FILE) ; \
+ fi
endif
+endif
+
######################################################
# Check the Windows cygwin version
@@ -881,8 +894,10 @@ endif
######################################################
# Check for existence of DEVTOOLS_PATH
+# All needed tools come with base system on Apple
######################################################
sane-devtools_path:
+ifneq ($(OS_VENDOR), Apple)
@if [ "$(DEVTOOLS_PATH)" != "" -a ! -r "$(DEVTOOLS_PATH)" ]; then \
$(ECHO) "ERROR: You do not have a valid DEVTOOLS_PATH setting. \n" \
" Please check your access to \n" \
@@ -890,6 +905,7 @@ sane-devtools_path:
" and/or check your value of ALT_DEVTOOLS_PATH. \n" \
"" >> $(ERROR_FILE) ; \
fi
+endif
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
diff --git a/jdk/make/docs/CORE_PKGS.gmk b/jdk/make/docs/CORE_PKGS.gmk
index 84c8986..6b5f4af 100644
--- a/jdk/make/docs/CORE_PKGS.gmk
+++ b/jdk/make/docs/CORE_PKGS.gmk
@@ -64,7 +64,7 @@ ACTIVE_JSR_PKGS= \
javax.management.* \
javax.script \
javax.sql.* \
- javax.tools \
+ javax.tools.* \
javax.xml.* \
org.w3c.* \
org.xml.sax
@@ -218,6 +218,7 @@ CORE_PKGS = \
javax.swing.plaf.nimbus \
javax.swing.plaf.synth \
javax.tools \
+ javax.tools.annotation \
javax.transaction \
javax.transaction.xa \
javax.xml.parsers \
diff --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile
index 61756ea..fcb461a 100644
--- a/jdk/make/docs/Makefile
+++ b/jdk/make/docs/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -70,6 +70,8 @@ include $(BUILDDIR)/common/internal/ImportComponents.gmk
# WARNING: This could cause thrashing on low memory machines.
ifeq ($(ARCH_DATA_MODEL),64)
MAX_VM_MEMORY = 1024
+else ifeq ($(ARCH),universal)
+ MAX_VM_MEMORY = 1024
else
MAX_VM_MEMORY = 612
endif
@@ -358,64 +360,6 @@ $(COREAPI_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(CORE_P
#############################################################
#
-# mirrordocs
-#
-
-# Part of langtools
-ifdef LANGTOOLS_DIST
- ALL_OTHER_TARGETS += mirrordocs
-endif
-
-MIRROR_DOCDIR := $(JDK_API_DOCSDIR)/apt/mirror
-MIRROR2COREAPI := ../../$(JDKJRE2COREAPI)
-MIRROR_DOCTITLE := Mirror API
-MIRROR_WINDOWTITLE := Mirror API
-MIRROR_HEADER := <strong>Mirror API</strong>
-MIRROR_BOTTOM := $(call CommonBottom,$(MIRROR_FIRST_COPYRIGHT_YEAR))
-MIRROR_GROUPNAME := Packages
-MIRROR_OVERVIEW := $(IMPORTSRCDIR)/com/sun/mirror/overview.html
-MIRROR_REGEXP := com.sun.mirror.*
-# MIRROR_PKGS is located in NON_CORE_PKGS.gmk
-
-# The index.html, options, and packages files
-MIRROR_INDEX_FILE = $(MIRROR_DOCDIR)/index.html
-MIRROR_OPTIONS_FILE = $(DOCSTMPDIR)/mirror.options
-MIRROR_PACKAGES_FILE = $(DOCSTMPDIR)/mirror.packages
-
-mirrordocs: $(MIRROR_INDEX_FILE)
-
-# Set relative location to core api document root
-$(MIRROR_INDEX_FILE): GET2DOCSDIR=$(MIRROR2COREAPI)/..
-
-# Run javadoc if the index file is out of date or missing
-$(MIRROR_INDEX_FILE): $(MIRROR_OPTIONS_FILE) $(MIRROR_PACKAGES_FILE)
- $(prep-javadoc)
- $(call JavadocSummary,$(MIRROR_OPTIONS_FILE),$(MIRROR_PACKAGES_FILE))
- $(JAVADOC_CMD) $(JAVADOC_VM_MEMORY_FLAGS) -d $(@D) \
- @$(MIRROR_OPTIONS_FILE) @$(MIRROR_PACKAGES_FILE)
-
-# Create file with javadoc options in it
-$(MIRROR_OPTIONS_FILE): $(MIRROR_OVERVIEW)
- $(prep-target)
- @($(call OptionOnly,$(COMMON_JAVADOCFLAGS)) ; \
- $(call OptionPair,-sourcepath,$(RELEASEDOCS_SOURCEPATH)) ; \
- $(call OptionPair,-encoding,ascii) ; \
- $(call OptionPair,-overview,$(MIRROR_OVERVIEW)) ; \
- $(call OptionPair,-doctitle,$(MIRROR_DOCTITLE)) ; \
- $(call OptionPair,-windowtitle,$(MIRROR_WINDOWTITLE) $(DRAFT_WINTITLE));\
- $(call OptionPair,-header,$(MIRROR_HEADER)$(DRAFT_HEADER)) ; \
- $(call OptionPair,-bottom,$(MIRROR_BOTTOM)$(DRAFT_BOTTOM)) ; \
- $(call OptionTrip,-group,$(MIRROR_GROUPNAME),$(MIRROR_REGEXP)); \
- $(call OptionTrip,-linkoffline,$(MIRROR2COREAPI),$(COREAPI_DOCSDIR)); \
- ) >> $@
-
-# Create a file with the package names in it
-$(MIRROR_PACKAGES_FILE): $(DIRECTORY_CACHE) $(call PackageDependencies,$(MIRROR_PKGS))
- $(prep-target)
- $(call PackageFilter,$(MIRROR_PKGS))
-
-#############################################################
-#
# docletapidocs
#
diff --git a/jdk/make/docs/NON_CORE_PKGS.gmk b/jdk/make/docs/NON_CORE_PKGS.gmk
index e8eda9d..b68208b 100644
--- a/jdk/make/docs/NON_CORE_PKGS.gmk
+++ b/jdk/make/docs/NON_CORE_PKGS.gmk
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -71,11 +71,6 @@ DOCLETAPI_PKGS = com.sun.javadoc
TAGLETAPI_FILE = com/sun/tools/doclets/Taglet.java
-MIRROR_PKGS = com.sun.mirror.apt \
- com.sun.mirror.declaration \
- com.sun.mirror.type \
- com.sun.mirror.util
-
ATTACH_PKGS = com.sun.tools.attach \
com.sun.tools.attach.spi
@@ -88,6 +83,13 @@ SMARTCARDIO_PKGS = javax.smartcardio
SCTPAPI_PKGS = com.sun.nio.sctp
+ifeq ($(PLATFORM), macosx)
+APPLE_EXT_PKGS = com.apple.concurrent \
+ com.apple.eawt \
+ com.apple.eawt.event \
+ com.apple.eio
+endif
+
# non-core packages in rt.jar
NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(MGMT_PKGS) \
@@ -97,5 +99,6 @@ NON_CORE_PKGS = $(DOMAPI_PKGS) \
$(OLD_JSSE_PKGS) \
$(HTTPSERVER_PKGS) \
$(SMARTCARDIO_PKGS) \
- $(SCTPAPI_PKGS)
+ $(SCTPAPI_PKGS) \
+ $(APPLE_EXT_PKGS)
diff --git a/jdk/make/java/Makefile b/jdk/make/java/Makefile
index 3956cad..664861a 100644
--- a/jdk/make/java/Makefile
+++ b/jdk/make/java/Makefile
@@ -57,6 +57,10 @@ ifeq ($(PLATFORM), linux)
SUBDIRS += jexec
endif # PLATFORM
+ifeq ($(PLATFORM), macosx)
+ SUBDIRS += jobjc
+endif # PLATFORM
+
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
diff --git a/jdk/make/java/fdlibm/Makefile b/jdk/make/java/fdlibm/Makefile
index b83605c..5b208d8 100644
--- a/jdk/make/java/fdlibm/Makefile
+++ b/jdk/make/java/fdlibm/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -61,6 +61,12 @@ ifeq ($(PLATFORM),linux)
FASTDEBUG_OPTIMIZATION_LEVEL = NONE
endif
+ifeq ($(PLATFORM),macosx)
+ # Turn all optimizations off
+ OPTIMIZATION_LEVEL = NONE
+ FASTDEBUG_OPTIMIZATION_LEVEL = NONE
+endif
+
#
# Include path.
#
diff --git a/jdk/make/java/instrument/Makefile b/jdk/make/java/instrument/Makefile
index b0889ef..0ff0534 100644
--- a/jdk/make/java/instrument/Makefile
+++ b/jdk/make/java/instrument/Makefile
@@ -106,6 +106,16 @@ ifeq ($(PLATFORM), windows)
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
else
+ifneq (,$(findstring $(PLATFORM), macosx))
+ ifneq ($(ARCH), universal)
+ LDFLAGS += -Wl,-all_load
+ endif
+ LDFLAGS += $(OUTPUTDIR)/tmp/java/jli/$(OBJDIRNAME)/static/libjli.a
+ OTHER_LDLIBS += -liconv
+ ifeq ($(SYSTEM_ZLIB), true)
+ OTHER_LDLIBS += -lz
+ endif
+else
LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
OTHER_LDLIBS += -ljli
OTHER_LDLIBS += -ldl
@@ -118,6 +128,11 @@ else
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
endif
endif
+endif
+
+ifeq ($(PLATFORM), macosx)
+ LDFLAGS += -framework Cocoa -framework Security -framework ApplicationServices
+endif
#
# Library to compile.
diff --git a/jdk/make/java/java/FILES_java.gmk b/jdk/make/java/java/FILES_java.gmk
index e93bcc9..d5ed89b 100644
--- a/jdk/make/java/java/FILES_java.gmk
+++ b/jdk/make/java/java/FILES_java.gmk
@@ -474,6 +474,7 @@ JAVA_JAVA_java = \
sun/misc/MessageUtils.java \
sun/misc/GC.java \
sun/misc/Service.java \
+ sun/misc/JavaAWTAccess.java \
sun/misc/SharedSecrets.java \
sun/misc/JavaLangAccess.java \
sun/misc/JavaIOAccess.java \
diff --git a/jdk/make/java/java/Makefile b/jdk/make/java/java/Makefile
index 10fc688..e201c84 100644
--- a/jdk/make/java/java/Makefile
+++ b/jdk/make/java/java/Makefile
@@ -98,6 +98,15 @@ INIT += $(GENSRCDIR)/java/lang/UNIXProcess.java
endif # PLATFORM
+ifeq ($(PLATFORM), macosx)
+FILES_c += java_props_macosx.c
+FILES_java += java/util/prefs/MacOSXPreferences.java \
+ java/util/prefs/MacOSXPreferencesFile.java \
+ java/util/prefs/MacOSXPreferencesFactory.java
+
+CFLAGS_$(VARIANT)/java_props_md.o = -Os -x objective-c
+endif
+
#
# Make sure first rule does 'all'
#
@@ -170,8 +179,10 @@ OTHER_INCLUDES += -I$(PLATFORM_SRC)/native/java/util
# Is the altzone extern documented in ctime(3C) available?
#
ifneq ($(PLATFORM), windows)
+ifneq ($(PLATFORM), macosx)
HAVE_ALTZONE=true
endif
+endif
ifeq ($(HAVE_ALTZONE),true)
OTHER_CPPFLAGS += -DHAVE_ALTZONE
@@ -210,8 +221,14 @@ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlib
-libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \
shell32.lib delayimp.lib /DELAYLOAD:shell32.dll
else
-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) -ldl \
+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBSCF) $(LIBDL) \
-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
+ifeq ($(PLATFORM), macosx)
+OTHER_LDLIBS += \
+ -framework CoreFoundation \
+ -framework Security \
+ -framework SystemConfiguration
+endif
endif
#
@@ -248,8 +265,15 @@ ifneq ($(PLATFORM),windows)
# UNIXProcess.java is different for solaris and linux. We need to copy
# the correct UNIXProcess.java over to $(GENSRCDIR)/java/lang/.
-$(GENSRCDIR)/java/lang/UNIXProcess.java: \
+ifeq ($(PLATFORM), macosx)
+PLATFORM_UNIX_PROCESS = \
+ $(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.bsd
+else
+PLATFORM_UNIX_PROCESS = \
$(PLATFORM_SRC)/classes/java/lang/UNIXProcess.java.$(PLATFORM)
+endif
+
+$(GENSRCDIR)/java/lang/UNIXProcess.java: $(PLATFORM_UNIX_PROCESS)
$(install-non-module-file)
clean::
diff --git a/jdk/make/java/java/genlocales.gmk b/jdk/make/java/java/genlocales.gmk
index b08239c..41cf00f 100644
--- a/jdk/make/java/java/genlocales.gmk
+++ b/jdk/make/java/java/genlocales.gmk
@@ -73,6 +73,26 @@ LocaleDataMetaInfo_Dest=$(GENSRCDIR)/sun/util/LocaleDataMetaInfo.java
LOCALEGEN_SH=localegen.sh
RESOURCE_NAMES="FormatData CollationData TimeZoneNames LocaleNames CurrencyNames CalendarData"
+
+# On MacOSX sed does not enter a newline as it does on other platforms with the same pattern
+# Using awk instead
+
+ifeq ($(PLATFORM), macosx)
+
+$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
+ @$(prep-target)
+ @$(ECHO) $(Euro_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.euro;
+ @$(ECHO) $(Euro_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.euro;
+ @$(ECHO) $(NonEuro_Resources_properties) | $(NAWK) 'gsub(/.properties/,"\n") {print}' > $@.tmp.noneuro;
+ @$(ECHO) $(NonEuro_Resources_java) | $(NAWK) 'gsub(/.java/,"\n") {print}' >> $@.tmp.noneuro;
+ NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
+ $(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
+ $@.tmp.noneuro $< $@
+ @$(RM) $@.tmp.euro $@.tmp.noneuro;
+
+else
+
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@$(RM) $@.tmp.euro $@.tmp.noneuro;
@$(prep-target)
@@ -84,6 +104,7 @@ $(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
@$(RM) $@.tmp.euro $@.tmp.noneuro;
+endif
genlocales : $(LocaleDataMetaInfo_Dest)
diff --git a/jdk/make/java/java/localegen.sh b/jdk/make/java/java/localegen.sh
index 2ce98c9..e6c0c5f 100644
--- a/jdk/make/java/java/localegen.sh
+++ b/jdk/make/java/java/localegen.sh
@@ -55,9 +55,9 @@ sed_script="$SED -e \"s@^#warn .*@// -- This file was mechanically generated: Do
for FILE in $RESOURCE_NAMES
do
getlocalelist $FILE $EURO_FILES_LIST
- sed_script=$sed_script"-e \"s/#"$FILE"_EuroLocales#/$localelist/g\" "
+ sed_script=$sed_script"-e \"s@#"$FILE"_EuroLocales#@$localelist at g\" "
getlocalelist $FILE $NONEURO_FILES_LIST
- sed_script=$sed_script"-e \"s/#"$FILE"_NonEuroLocales#/$localelist/g\" "
+ sed_script=$sed_script"-e \"s@#"$FILE"_NonEuroLocales#@$localelist at g\" "
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
diff --git a/jdk/make/java/java_hprof_demo/Makefile b/jdk/make/java/java_hprof_demo/Makefile
index ee05bb7..26e8ea6 100644
--- a/jdk/make/java/java_hprof_demo/Makefile
+++ b/jdk/make/java/java_hprof_demo/Makefile
@@ -84,7 +84,7 @@ OTHER_INCLUDES = -I$(SRCDIR) \
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS += wsock32.lib winmm.lib
else
- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl
+ OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBDL)
endif
#
diff --git a/jdk/make/java/jli/Makefile b/jdk/make/java/jli/Makefile
index b938d32..ecf5d05 100644
--- a/jdk/make/java/jli/Makefile
+++ b/jdk/make/java/jli/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -45,92 +45,121 @@ MS_RUNTIME_STATIC = true
include $(BUILDDIR)/common/Defs.gmk
-ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ifneq ($(SYSTEM_ZLIB),true)
+ ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+endif #SYSTEM_ZLIB
LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
-LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
-ifeq ($(ZERO_BUILD), true)
-ERGO_FAMILY=zero
-else
-ifeq ($(ARCH_FAMILY), amd64)
-ERGO_FAMILY=i586
-else
-ERGO_FAMILY=$(ARCH_FAMILY)
-endif
-endif
+# set the platform specific directory for macosx, also this platform shares
+# substantial family ties with its siblings (solaris and linux), thus we add
+# solaris src path to its compilation dependencies.
+ifeq ($(PLATFORM), macosx)
+ LAUNCHER_PLATFORM_SRC = $(BUILDDIR)/../src/macosx/bin
+ LAUNCHER_SOLARIS_PLATFORM_SRC = $(BUILDDIR)/../src/solaris/bin
+else # !MACOSX
+ LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
+endif #PLATFORM
+ifeq ($(ZERO_BUILD), true)
+ ERGO_FAMILY=zero
+else # !ZERO_BUILD
+ ifneq (,$(findstring $(ARCH_FAMILY), amd64 x86_64))
+ ERGO_FAMILY=i586
+ else # !X86 FAMILY
+ ERGO_FAMILY=$(ARCH_FAMILY)
+ endif #ARCH_FAMILY
+endif # ZERO_BUILD
#
# Files to compile.
#
-FILES_c = \
- java.c \
- splashscreen_stubs.c \
- java_md.c \
- parse_manifest.c \
- version_comp.c \
- wildcard.c \
- jli_util.c \
- inflate.c \
- inftrees.c \
- inffast.c \
- zadler32.c \
- zcrc32.c \
- zutil.c
-
-ifneq ($(PLATFORM), windows)
- FILES_c += ergo.c
- ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
- # if the architecture specific ergo file exists then
- # use it, else use the generic definitions from ergo.c
- ifneq ($(wildcard $(LAUNCHER_PLATFORM_SRC)/$(ERGO_ARCH_FILE)),)
- FILES_c += $(ERGO_ARCH_FILE)
- else
- OTHER_CPPFLAGS += -DUSE_GENERIC_ERGO
- endif
-endif
+FILES_c = java.c \
+ splashscreen_stubs.c \
+ parse_manifest.c \
+ version_comp.c \
+ wildcard.c \
+ jli_util.c
+
+ifneq ($(SYSTEM_ZLIB),true)
+ FILES_c += inflate.c \
+ inftrees.c \
+ inffast.c \
+ zadler32.c \
+ zcrc32.c \
+ zutil.c
+endif # SYSTEM_ZLIB
+
+# add platform specific files
+ifeq ($(PLATFORM), windows)
+ FILES_c += java_md.c
+else # NIXES
+ FILES_c += java_md_common.c
+ ifeq ($(PLATFORM), macosx)
+ FILES_c += java_md_macosx.c
+ else # SOLARIS/LINUX
+ FILES_c += java_md_solinux.c
+ FILES_c += ergo.c
+ ERGO_ARCH_FILE = ergo_$(ERGO_FAMILY).c
+ # if the architecture specific ergo file exists then
+ # use it, else use the generic definitions from ergo.c
+ ifneq ($(wildcard $(LAUNCHER_PLATFORM_SRC)/$(ERGO_ARCH_FILE)),)
+ FILES_c += $(ERGO_ARCH_FILE)
+ else # !ERGO_ARCH_FILE
+ OTHER_CPPFLAGS += -DUSE_GENERIC_ERGO
+ endif # ERGO_ARCH_FILE
+ endif #MACOSX
+endif #WINDOWS
# Names of arch directories
LIBARCH_DEFINES = -DLIBARCHNAME='"$(LIBARCH)"'
ifeq ($(PLATFORM), solaris)
LIBARCH_DEFINES += -DLIBARCH32NAME='"$(LIBARCH32)"'
LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
-endif
-
-OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
+endif # PLATFORM
+ifeq ($(PLATFORM), macosx)
+ OTHER_CPPFLAGS += $(LIBARCH_DEFINES) -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+else # ! MACOSX
+ OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
+endif #PLATFORM
ifneq ($(PLATFORM), windows) # UNIX systems
- LD_RUNPATH_EXTRAS += ..
- LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
- # Note: its important to keep this order meaning -lc is the
- # last library otherwise it could cause compatibility issues
- # by pulling in SUNW_private symbols from libc
- LDLIBS = -ldl -lc
-ifeq ($(USE_PTHREADS),true)
- LDLIBS += -lpthread
-endif # USE_PTHREADS
+ ifeq ($(PLATFORM), macosx)
+ LIB_LOCATION = $(LIBDIR)/jli
+ else # SOLARIS/LINUX
+ LD_RUNPATH_EXTRAS += ..
+ LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
+ # Note: it is important to keep this order, meaning -lc as the
+ # last library, otherwise it could cause compatibility issues
+ # by pulling in SUNW_private symbols from libc
+ LDLIBS = -ldl -lc
+ ifeq ($(USE_PTHREADS),true)
+ LDLIBS += -lpthread
+ endif # USE_PTHREADS
+ endif # PLATFORM
endif # PLATFORM
ifeq ($(PLATFORM), windows)
- EXTRA_LIBS = advapi32.lib \
- comctl32.lib \
- user32.lib
-
- JAVALIB =
- OTHER_LCF = -export:JLI_Launch \
- -export:JLI_ManifestIterate \
- -export:JLI_SetTraceLauncher \
- -export:JLI_ReportErrorMessage \
- -export:JLI_ReportErrorMessageSys \
- -export:JLI_ReportMessage \
- -export:JLI_ReportExceptionDescription
-
-endif
+ EXTRA_LIBS = advapi32.lib \
+ comctl32.lib \
+ user32.lib
+ JAVALIB =
+ OTHER_LCF = -export:JLI_Launch \
+ -export:JLI_ManifestIterate \
+ -export:JLI_SetTraceLauncher \
+ -export:JLI_ReportErrorMessage \
+ -export:JLI_ReportErrorMessageSys \
+ -export:JLI_ReportMessage \
+ -export:JLI_ReportExceptionDescription
+endif # PLATFORM
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
-OTHER_INCLUDES += -I$(ZIP_SRC)
+ifneq ($(SYSTEM_ZLIB),true)
+ OTHER_INCLUDES += -I$(ZIP_SRC)
+else # !SYSTEM_ZLIB
+ LDLIBS += -lz
+endif # SYSTEM_ZLIB
#
# Library to compile.
@@ -151,18 +180,52 @@ include $(BUILDDIR)/common/Library.gmk
# library.
#
ifeq ($(PLATFORM), windows)
+ STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib
-STATIC_LIBRARY = $(OBJDIR)/static/$(LIBPREFIX)$(LIBRARY).lib
-
-$(STATIC_LIBRARY): $(FILES_o)
+ $(STATIC_LIBRARY): $(FILES_o)
@$(prep-target)
$(LIBEXE) -nologo -out:$@ $(FILES_o)
-library:: $(STATIC_LIBRARY)
+ library:: $(STATIC_LIBRARY)
+endif # PLATFORM
-endif # PLATFORM
+ifeq ($(PLATFORM), macosx)
+ # Some Obj-C code is embedded in java_md_macosx.c, we stipulate so, using
+ # "-x" option. Not doing so will cause the compiler to choose the language
+ # based on the filename suffix, also "-Os" optimizes the file for size.
+ CFLAGS_$(VARIANT)/java_md_macosx.o = -Os -x objective-c
+ # Needed for linking the various launchers
+ LDFLAGS += -framework Cocoa -framework Security \
+ -framework ApplicationServices
+ # Add solaris sources containing common logic to the header path
+ OTHER_INCLUDES += -I$(LAUNCHER_SOLARIS_PLATFORM_SRC)
+endif # PLATFORM
-#
-# Add to ambient vpath so we pick up the library files
-#
-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
+STATIC_LIBRARY_DIR = $(OBJDIR)/static
+STATIC_LIBRARY_NAME = lib$(LIBRARY).a
+STATIC_LIBRARY = $(STATIC_LIBRARY_DIR)/$(STATIC_LIBRARY_NAME)
+
+$(STATIC_LIBRARY_DIR): | $(OBJDIR)
+ @$(MKDIR) $(STATIC_LIBRARY_DIR)
+
+$(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
+ @$(prep-target)
+ $(AR) $(ARFLAGS) $@ $(FILES_o)
+
+library:: $(STATIC_LIBRARY)
+
+vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
+ifneq ($(SYSTEM_ZLIB),true)
+ vpath %.c $(ZIP_SRC)
+else # !SYSTEM_ZLIB
+ #
+ # Add to ambient vpath so we pick up the library files, for macos we add
+ # solaris sources which contains the common logic for all nixes
+ #
+ ifeq ($(PLATFORM), macosx)
+ vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC) \
+ $(LAUNCHER_SOLARIS_PLATFORM_SRC)
+ else # !MACOSX
+ vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
+ endif # MACOSX
+endif # SYSTEM_LIB
diff --git a/jdk/make/java/jvm/Makefile b/jdk/make/java/jvm/Makefile
index b08ea41..7421d41 100644
--- a/jdk/make/java/jvm/Makefile
+++ b/jdk/make/java/jvm/Makefile
@@ -44,7 +44,6 @@ $(INCLUDEDIR)/%.h: $(SHARE_SRC)/javavm/export/%.h
$(PLATFORM_INCLUDE)/%.h: $(PLATFORM_SRC)/javavm/export/%.h
$(install-include-file)
-JVMCFG_DIR = $(LIBDIR)/$(LIBARCH)
JVMCFG = $(JVMCFG_DIR)/jvm.cfg
#
@@ -56,6 +55,14 @@ else
JVMCFG_ARCH = $(ARCH)
endif
+ifeq ($(PLATFORM),macosx)
+ JVMCFG_SRC=$(PLATFORM_SRC_MACOS)/bin/$(JVMCFG_ARCH)/jvm.cfg
+ JVMCFG_DIR = $(LIBDIR)
+else
+ JVMCFG_SRC=$(PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
+ JVMCFG_DIR = $(LIBDIR)/$(LIBARCH)
+endif
+
ifdef BUILD_CLIENT_ONLY
$(JVMCFG)::
$(MKDIR) -p $(JVMCFG_DIR)
@@ -68,7 +75,7 @@ $(JVMCFG)::
$(ECHO) "-native ERROR">>$(JVMCFG)
$(ECHO) "-green ERROR">>$(JVMCFG)
else
-$(JVMCFG): $(PLATFORM_SRC)/bin/$(JVMCFG_ARCH)/jvm.cfg
+$(JVMCFG): $(JVMCFG_SRC)
$(install-file)
endif
diff --git a/jdk/make/java/management/Makefile b/jdk/make/java/management/Makefile
index 32af777..5ff24b8 100644
--- a/jdk/make/java/management/Makefile
+++ b/jdk/make/java/management/Makefile
@@ -78,6 +78,12 @@ FILES_c += LinuxOperatingSystem.c
endif # PLATFORM linux
+ifeq ($(PLATFORM),macosx)
+
+FILES_c += MacosxOperatingSystem.c
+
+endif # PLATFORM macosx
+
endif # PLATFORM
#
diff --git a/jdk/make/java/management/mapfile-vers b/jdk/make/java/management/mapfile-vers
index ccb6513..21b92d4 100644
--- a/jdk/make/java/management/mapfile-vers
+++ b/jdk/make/java/management/mapfile-vers
@@ -54,9 +54,6 @@ SUNWprivate_1.1 {
Java_sun_management_GcInfoBuilder_getLastGcInfo0;
Java_sun_management_GcInfoBuilder_getNumGcExtAttributes;
Java_sun_management_HotSpotDiagnostic_dumpHeap;
- Java_sun_management_HotSpotDiagnostic_executeDiagnosticCommand0;
- Java_sun_management_HotSpotDiagnostic_getDiagnosticCommandInfo0;
- Java_sun_management_HotSpotDiagnostic_getDiagnosticCommands0;
Java_sun_management_HotspotThread_getInternalThreadCount;
Java_sun_management_HotspotThread_getInternalThreadTimes0;
Java_sun_management_MemoryImpl_getMemoryManagers0;
diff --git a/jdk/make/java/net/FILES_c.gmk b/jdk/make/java/net/FILES_c.gmk
index 4b7d005..a4bbb40 100644
--- a/jdk/make/java/net/FILES_c.gmk
+++ b/jdk/make/java/net/FILES_c.gmk
@@ -43,6 +43,10 @@ ifeq ($(PLATFORM), linux)
FILES_c += linux_close.c
endif
+ifeq ($(PLATFORM), macosx)
+ FILES_c += bsd_close.c
+endif
+
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
diff --git a/jdk/make/java/net/Makefile b/jdk/make/java/net/Makefile
index fd0b64f..2a81cd8 100644
--- a/jdk/make/java/net/Makefile
+++ b/jdk/make/java/net/Makefile
@@ -95,16 +95,23 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
+ifeq ($(PLATFORM), macosx)
+ifdef DONT_ENABLE_IPV6
+ OTHER_CFLAGS += -DDONT_ENABLE_IPV6
+endif
+ OTHER_LDLIBS = $(JVMLIB) -pthread
+else
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \
secur32.lib iphlpapi.lib delayimp.lib \
/DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll
else
- OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) -ldl $(JVMLIB)
+ OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(LIBDL) $(JVMLIB)
endif
ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += -lpthread
endif
+endif # PLATFORM
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
diff --git a/jdk/make/java/nio/Makefile b/jdk/make/java/nio/Makefile
index 79c9058..90d8863 100644
--- a/jdk/make/java/nio/Makefile
+++ b/jdk/make/java/nio/Makefile
@@ -261,6 +261,91 @@ FILES_gen += \
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
+ifeq ($(PLATFORM), macosx)
+FILES_java += \
+ sun/nio/ch/AbstractPollSelectorImpl.java \
+ sun/nio/ch/BsdAsynchronousChannelProvider.java \
+ sun/nio/ch/InheritedChannel.java \
+ sun/nio/ch/KQueue.java \
+ sun/nio/ch/KQueuePort.java \
+ sun/nio/ch/PollSelectorProvider.java \
+ sun/nio/ch/PollSelectorImpl.java \
+ sun/nio/ch/Port.java \
+ sun/nio/ch/SimpleAsynchronousFileChannelImpl.java \
+ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
+ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
+ \
+ sun/nio/fs/GnomeFileTypeDetector.java \
+ sun/nio/fs/BsdFileStore.java \
+ sun/nio/fs/BsdFileSystem.java \
+ sun/nio/fs/BsdFileSystemProvider.java \
+ sun/nio/fs/BsdNativeDispatcher.java \
+ sun/nio/fs/PollingWatchService.java \
+ sun/nio/fs/UnixChannelFactory.java \
+ sun/nio/fs/UnixCopyFile.java \
+ sun/nio/fs/UnixDirectoryStream.java \
+ sun/nio/fs/UnixException.java \
+ sun/nio/fs/UnixFileAttributeViews.java \
+ sun/nio/fs/UnixFileAttributes.java \
+ sun/nio/fs/UnixFileKey.java \
+ sun/nio/fs/UnixFileModeAttribute.java \
+ sun/nio/fs/UnixFileStore.java \
+ sun/nio/fs/UnixFileStoreAttributes.java \
+ sun/nio/fs/UnixFileSystem.java \
+ sun/nio/fs/UnixFileSystemProvider.java \
+ sun/nio/fs/UnixMountEntry.java \
+ sun/nio/fs/UnixNativeDispatcher.java \
+ sun/nio/fs/UnixPath.java \
+ sun/nio/fs/UnixSecureDirectoryStream.java \
+ sun/nio/fs/UnixUriUtils.java \
+ sun/nio/fs/UnixUserPrincipals.java
+
+FILES_c += \
+ InheritedChannel.c \
+ NativeThread.c \
+ PollArrayWrapper.c \
+ UnixAsynchronousServerSocketChannelImpl.c \
+ UnixAsynchronousSocketChannelImpl.c \
+ \
+ GnomeFileTypeDetector.c \
+ BsdNativeDispatcher.c \
+ UnixCopyFile.c \
+ UnixNativeDispatcher.c \
+ \
+ KQueue.c \
+ KQueuePort.c
+
+FILES_export += \
+ sun/nio/ch/InheritedChannel.java \
+ sun/nio/ch/KQueue.java \
+ sun/nio/ch/KQueuePort.java \
+ sun/nio/ch/NativeThread.java \
+ sun/nio/ch/UnixAsynchronousServerSocketChannelImpl.java \
+ sun/nio/ch/UnixAsynchronousSocketChannelImpl.java \
+ \
+ sun/nio/fs/GnomeFileTypeDetector.java \
+ sun/nio/fs/BsdNativeDispatcher.java \
+ sun/nio/fs/UnixCopyFile.java \
+ sun/nio/fs/UnixNativeDispatcher.java
+
+FILES_gen += \
+ sun/nio/fs/UnixConstants.java
+endif # PLATFORM = bsd, macosx
+
+ifeq ($(PLATFORM), macosx)
+FILES_java += \
+ sun/nio/ch/KQueueSelectorProvider.java \
+ sun/nio/ch/KQueueSelectorImpl.java \
+ sun/nio/ch/KQueueArrayWrapper.java
+
+FILES_c += \
+ KQueueArrayWrapper.c
+
+vpath %.c $(call NativeSrcDirList,,native/sun/nio/fs)
+vpath %.c $(call NativeSrcDirList,,native/sun/nio/ch)
+
+else
+
#
# Find platform-specific C source files
#
@@ -268,6 +353,8 @@ vpath %.c $(PLATFORM_SRC)/native/sun/nio/fs
vpath %.c $(PLATFORM_SRC)/native/sun/nio/ch
vpath %.c $(SHARE_SRC)/native/sun/nio/ch
+endif # PLATFORM = macosx
+
#
# Various variables
#
@@ -293,10 +380,13 @@ ifeq ($(PLATFORM),windows)
$(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj
endif
ifeq ($(PLATFORM), linux)
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
+endif
+ifeq ($(PLATFORM), macosx)
+OTHER_LDLIBS += -L$(LIBDIR) -ljava -lnet -pthread
endif
ifeq ($(PLATFORM), solaris)
-OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl -lsendfile \
+OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
-L$(LIBDIR)/$(LIBARCH) -ljava -lnet
endif # PLATFORM
@@ -317,6 +407,9 @@ endif
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
endif
+ifeq ($(PLATFORM), macosx)
+FILES_m = mapfile-bsd
+endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
@@ -819,9 +912,15 @@ SOR_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSOR_SRC) | \
$(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC)
$(install-non-module-file)
+ifeq ($(PLATFORM), macosx)
+ NIO_CC=$(HOST_CC)
+else
+ NIO_CC=$(CC)
+endif
+
$(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC)
$(prep-target)
- ($(CD) $(TEMPDIR); $(CC) $(CPPFLAGS) $(LDDFLAGS) \
+ ($(CD) $(TEMPDIR); $(NIO_CC) $(CPPFLAGS) $(LDDFLAGS) \
-o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC))
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
@@ -850,6 +949,7 @@ $(FILES_gensbcs_out): $(GENCSSRC)/SingleByte-X.java.template $(GENCSSRC)/sbcs
GENUC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genUnixConstants.c
+GENUC_OBJ = $(TEMPDIR)/genUnixConstants.o
GENUC_EXE = $(TEMPDIR)/genUnixConstants
GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
@@ -857,7 +957,8 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \
$(GENUC_EXE) : $(GENUC_SRC)
$(prep-target)
- $(CC) $(CPPFLAGS) -o $@ $(GENUC_SRC)
+ $(CC) $(CPPFLAGS) -c -o $(GENUC_OBJ) $(GENUC_SRC)
+ $(CC) $(CPPFLAGS) -o $@ $(GENUC_OBJ)
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
$(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java
@@ -872,6 +973,7 @@ endif
GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c
+GENSC_OBJ = $(TEMPDIR)/genSolarisConstants.o
GENSC_EXE = $(TEMPDIR)/genSolarisConstants
GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
@@ -879,7 +981,8 @@ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \
$(GENSC_EXE) : $(GENSC_SRC)
$(prep-target)
- $(CC) $(CPPFLAGS) -o $@ $(GENSC_SRC)
+ $(CC) $(CPPFLAGS) -c -o $(GENSC_OBJ) $(GENSC_SRC)
+ $(CC) $(CPPFLAGS) -o $@ $(GENSC_OBJ)
ifdef NIO_PLATFORM_CLASSES_ROOT_DIR
$(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java
diff --git a/jdk/make/java/npt/Makefile b/jdk/make/java/npt/Makefile
index 562099b..bbcccc4 100644
--- a/jdk/make/java/npt/Makefile
+++ b/jdk/make/java/npt/Makefile
@@ -68,6 +68,11 @@ ifeq ($(PLATFORM), windows)
OTHER_LCF += -export:nptInitialize -export:nptTerminate
endif
+# Add location of iconv header
+ifeq ($(PLATFORM), macosx))
+ OTHER_LDLIBS += -liconv
+endif
+
#
# Add to ambient vpath so we pick up the library files
#
diff --git a/jdk/make/java/redist/Makefile b/jdk/make/java/redist/Makefile
index 5bcb502..2e042b3 100644
--- a/jdk/make/java/redist/Makefile
+++ b/jdk/make/java/redist/Makefile
@@ -47,6 +47,8 @@ DTRACE_SUFFIX = _dtrace
ifeq ($(PLATFORM), windows)
LIB_LOCATION = $(BINDIR)
+else ifeq ($(PLATFORM), macosx)
+ LIB_LOCATION = $(LIBDIR)
else
LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
endif
diff --git a/jdk/make/java/redist/sajdi/Makefile b/jdk/make/java/redist/sajdi/Makefile
index 38559d1..56bba44 100644
--- a/jdk/make/java/redist/sajdi/Makefile
+++ b/jdk/make/java/redist/sajdi/Makefile
@@ -30,6 +30,8 @@ include $(BUILDDIR)/common/Defs.gmk
ifeq ($(PLATFORM), windows)
LIB_LOCATION = $(BINDIR)
+else ifeq ($(PLATFORM), macosx)
+ LIB_LOCATION = $(LIBDIR)
else
LIB_LOCATION = $(LIBDIR)/$(LIBARCH)
endif
diff --git a/jdk/make/java/security/Makefile b/jdk/make/java/security/Makefile
index 8be9e97..a7133a4 100644
--- a/jdk/make/java/security/Makefile
+++ b/jdk/make/java/security/Makefile
@@ -46,13 +46,20 @@ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security
ifeq ($(PLATFORM), solaris)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-solaris
-else # PLATFORM
+else # NOT_SOLARIS
# Register Microsoft CryptoAPI provider only on Windows platform.
ifeq ($(PLATFORM), windows)
PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
-endif
-endif # PLATFORM
+
+else # NOT_WINDOWS
+
+ifeq ($(PLATFORM), macosx)
+ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-macosx
+endif # MACOSX
+
+endif # NOT_WINDOWS
+endif # NOT_SOLARIS
PROPS_BUILD = $(LIBDIR)/security/java.security
diff --git a/jdk/make/java/zip/FILES_c.gmk b/jdk/make/java/zip/FILES_c.gmk
index a1d5e93..b6496b9 100644
--- a/jdk/make/java/zip/FILES_c.gmk
+++ b/jdk/make/java/zip/FILES_c.gmk
@@ -29,7 +29,10 @@ FILES_c = \
Deflater.c \
Inflater.c \
ZipFile.c \
- zip_util.c \
+ zip_util.c
+
+ifneq ($(SYSTEM_ZLIB),true)
+FILES_c += \
compress.c \
deflate.c \
gzclose.c \
@@ -44,4 +47,5 @@ FILES_c = \
uncompr.c \
zadler32.c \
zcrc32.c \
- zutil.c
+ zutil.c
+endif
diff --git a/jdk/make/java/zip/Makefile b/jdk/make/java/zip/Makefile
index 269b4df..b7eb30d 100644
--- a/jdk/make/java/zip/Makefile
+++ b/jdk/make/java/zip/Makefile
@@ -75,16 +75,24 @@ else
CPPFLAGS += -UDEBUG
endif
-CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
CPPFLAGS += -I$(SHARE_SRC)/native/java/io
CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
+ifneq ($(SYSTEM_ZLIB),true)
+CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+
#
# Add to ambient vpath so we pick up the library files
#
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/zlib-$(ZLIB_VERSION)
+endif
#
# Link to JVM library for JVM_Zip* functions
#
+ifeq ($(SYSTEM_ZLIB),true)
+OTHER_LDLIBS = -lz
+else
OTHER_LDLIBS = $(JVMLIB)
+endif
+
diff --git a/jdk/make/javax/sound/FILES_c.gmk b/jdk/make/javax/sound/FILES_c.gmk
index 9a5e5f2..3646393 100644
--- a/jdk/make/javax/sound/FILES_c.gmk
+++ b/jdk/make/javax/sound/FILES_c.gmk
@@ -34,6 +34,18 @@ FILES_solaris = \
FILES_linux =
+FILES_bsd =
+
+FILES_macosx = \
+ PLATFORM_API_MacOSX_MidiIn.c \
+ PLATFORM_API_MacOSX_MidiOut.c \
+ PLATFORM_API_MacOSX_MidiUtils.c
+
+FILES_cpp_macosx = \
+ PLATFORM_API_MacOSX_Utils.cpp \
+ PLATFORM_API_MacOSX_PCM.cpp \
+ PLATFORM_API_MacOSX_Ports.cpp
+
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
diff --git a/jdk/make/javax/sound/Makefile b/jdk/make/javax/sound/Makefile
index 2661d16..294b559 100644
--- a/jdk/make/javax/sound/Makefile
+++ b/jdk/make/javax/sound/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
# 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,11 @@ MODULE = sound
PACKAGE = javax.sound
LIBRARY = jsound
PRODUCT = sun
+
+ifeq ($(PLATFORM),macosx)
+CPLUSPLUSLIBRARY = true
+endif
+
include $(BUILDDIR)/common/Defs.gmk
# include defines for sound
@@ -78,6 +83,7 @@ FILES_copydirs = \
$(FILES_mkdirs)
FILES_c += $(FILES_$(PLATFORM))
+FILES_cpp += $(FILES_cpp_$(PLATFORM))
#
@@ -106,6 +112,22 @@ ifeq ($(PLATFORM), linux)
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
+ifeq ($(PLATFORM), macosx)
+ CPPFLAGS += -DUSE_PORTS=TRUE \
+ -DUSE_DAUDIO=TRUE \
+ -DUSE_PLATFORM_MIDI_OUT=TRUE \
+ -DUSE_PLATFORM_MIDI_IN=TRUE
+
+ INCLUDE_PORTS = TRUE
+ INCLUDE_DAUDIO = TRUE
+ INCLUDE_MIDI = TRUE
+
+ LDFLAGS += -framework CoreAudio -framework CoreFoundation \
+ -framework CoreServices -framework AudioUnit -lstdc++ \
+ -framework CoreMIDI -framework AudioToolbox
+ CXXFLAGS += -I`xcode-select -print-path`/Extras/CoreAudio/PublicUtility
+endif
+
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
@@ -145,6 +167,11 @@ endif
CPPFLAGS += \
-I$(SHARE_SRC)/native/com/sun/media/sound
+ifeq ($(PLATFORM), macosx)
+vpath %.c $(call NativeSrcDirList,,native/com/sun/media/sound)
+vpath %.cpp $(call NativeSrcDirList,,native/com/sun/media/sound)
+
+else
#
# Add to the ambient VPATH.
#
@@ -152,6 +179,7 @@ vpath %.c $(SHARE_SRC)/native/com/sun/media/sound
vpath %.c $(PLATFORM_SRC)/native/com/sun/media/sound
vpath %.cpp $(PLATFORM_SRC)/native/com/sun/media/sound
+endif
#
# Include rules
diff --git a/jdk/make/javax/sound/SoundDefs.gmk b/jdk/make/javax/sound/SoundDefs.gmk
index 557c773..06c0af8 100644
--- a/jdk/make/javax/sound/SoundDefs.gmk
+++ b/jdk/make/javax/sound/SoundDefs.gmk
@@ -40,6 +40,10 @@ ifeq ($(PLATFORM), linux)
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
+ifeq ($(PLATFORM), macosx)
+ CPPFLAGS += -DX_PLATFORM=X_MACOSX
+endif # PLATFORM macosx
+
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
diff --git a/jdk/make/jpda/back/Makefile b/jdk/make/jpda/back/Makefile
index 5bfc7cd..0ed10ba 100644
--- a/jdk/make/jpda/back/Makefile
+++ b/jdk/make/jpda/back/Makefile
@@ -50,7 +50,7 @@ OTHER_INCLUDES = -I$(SHARE_SRC)/transport/export \
-I$(GENNATIVESRCDIR)/jdwp
ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS += -ldl
+ OTHER_LDLIBS += $(LIBDL)
endif # PLATFORM
#
diff --git a/jdk/make/jpda/transport/socket/Makefile b/jdk/make/jpda/transport/socket/Makefile
index 11432a9..623eeb0 100644
--- a/jdk/make/jpda/transport/socket/Makefile
+++ b/jdk/make/jpda/transport/socket/Makefile
@@ -41,6 +41,11 @@ ifeq ($(PLATFORM), linux)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
endif
+ifeq ($(PLATFORM), macosx))
+ LIBSOCKET =
+ OTHER_LDLIBS += -pthread
+endif
+
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET)
endif
diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties
index 47db658..e55acb2 100644
--- a/jdk/make/jprt.properties
+++ b/jdk/make/jprt.properties
@@ -39,6 +39,7 @@ jprt.build.targets= \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
+ macosx_x64_10.7-{product|fastdebug}, \
windows_i586_5.1-{product|fastdebug}, \
windows_x64_5.2-{product|fastdebug}
@@ -53,6 +54,7 @@ jprt.my.test.target.set= \
solaris_x64_5.10-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
+ macosx_x64_10.7-product-c2-TESTNAME, \
windows_i586_5.1-product-c1-TESTNAME, \
windows_x64_5.2-product-c2-TESTNAME
@@ -62,19 +64,33 @@ jprt.vm.default.test.targets= \
# Default jdk test targets (testset=default)
jprt.make.rule.default.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_math}
+
+# Default vm test targets (testset=core)
+jprt.vm.core.test.targets= \
+ ${jprt.vm.default.test.targets}
+
+# Core jdk test targets (testset=core)
+jprt.make.rule.core.test.targets= \
+ ${jprt.make.rule.default.test.targets}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_jigsaw}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_math}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_misc}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_util}
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_misc}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
@@ -84,19 +100,13 @@ jprt.vm.all.test.targets= \
# All jdk test targets (testset=all)
jprt.make.rule.all.test.targets= \
- ${jprt.make.rule.default.test.targets}, \
+ ${jprt.make.rule.core.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_swing}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools2}
+ ${jprt.my.test.target.set:TESTNAME=jdk_swing}
# JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \
diff --git a/jdk/make/launchers/Makefile b/jdk/make/launchers/Makefile
index d9c2eb5..67177c8 100644
--- a/jdk/make/launchers/Makefile
+++ b/jdk/make/launchers/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,6 @@ endif
define make-all-launchers
$(make-gui-tools)
-$(call make-launcher, apt, com.sun.tools.apt.Main, -J-Xmode:legacy, , jdk.apt)
$(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , , $(TOOLS_MODULE))
$(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , , $(TOOLS_MODULE))
$(call make-launcher, jar, sun.tools.jar.Main, , , $(BASE_TOOLS_MODULE))
diff --git a/jdk/make/launchers/Makefile.launcher b/jdk/make/launchers/Makefile.launcher
index 0908d61..4e32af5 100644
--- a/jdk/make/launchers/Makefile.launcher
+++ b/jdk/make/launchers/Makefile.launcher
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -47,10 +47,6 @@ ifndef MAIN_CLASS
endif
# Some tools need the wildcard expansion option
-ifeq ($(PROGRAM),apt)
- WILDCARDS=true
- NEVER_ACT_AS_SERVER_CLASS_MACHINE=true
-endif
ifeq ($(PROGRAM),javac)
WILDCARDS=true
MAIN_JAVA_ARGS += -J-Xss4m -J-ea:com.sun.tools...
@@ -86,12 +82,15 @@ ifeq ($(PROGRAM),jstack)
endif
ifeq ($(PROGRAM),jsadebugd)
SA_TOOL=true
+ INFO_PLIST_FILE=Info-privileged.plist
endif
ifeq ($(PROGRAM),jinfo)
SA_TOOL=true
+ INFO_PLIST_FILE=Info-privileged.plist
endif
ifeq ($(PROGRAM),jmap)
SA_TOOL=true
+ INFO_PLIST_FILE=Info-privileged.plist
endif
# special idlj launcher
diff --git a/jdk/make/mkdemo/jvmti/hprof/Makefile b/jdk/make/mkdemo/jvmti/hprof/Makefile
index e252919..fca8ec4 100644
--- a/jdk/make/mkdemo/jvmti/hprof/Makefile
+++ b/jdk/make/mkdemo/jvmti/hprof/Makefile
@@ -37,12 +37,11 @@ DEMO_OBJECTS = java_crw_demo.$(OBJECT_SUFFIX)
ifeq ($(PLATFORM), windows)
EXTRA_LIBS += wsock32.lib winmm.lib
-endif
-ifeq ($(PLATFORM), solaris)
- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl
-endif
+else
+ OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBDL)
ifeq ($(PLATFORM), linux)
- OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) -ldl -lpthread
+ OTHER_LDLIBS += -lpthread
+endif
endif
#
diff --git a/jdk/make/mksample/Makefile b/jdk/make/mksample/Makefile
index aa4e31d..aa0f748 100644
--- a/jdk/make/mksample/Makefile
+++ b/jdk/make/mksample/Makefile
@@ -47,6 +47,11 @@ ifeq ($(PLATFORM), solaris)
SUBDIRS += dtrace
endif
+# and Mac OS X too
+ifeq ($(PLATFORM), macosx)
+ SUBDIRS += dtrace
+endif
+
include $(BUILDDIR)/common/Subdirs.gmk
TOPLEVEL_FILES = \
diff --git a/jdk/make/modules/modules.config b/jdk/make/modules/modules.config
index 47376f5..55c58e2 100644
--- a/jdk/make/modules/modules.config
+++ b/jdk/make/modules/modules.config
@@ -108,8 +108,13 @@ module base {
include com.oracle.net.*;
include com.oracle.util.*;
+ // MAC
+ include apple.launcher.*;
+ include apple.security.*;
+ include com.apple.concurrent.**;
+ include com.apple.eio.**;
+
include sun.nio.fs.*, sun.nio.ch.*, sun.nio.ByteBuffered;
- exclude sun.nio.ch.Sctp*;
exclude META-INF/services/java.nio.file.spi.FileSystemProvider;
// security APIs
@@ -393,6 +398,11 @@ module management {
include javax.management.**, com.sun.jmx.**;
}
+module jfr {
+ include com.oracle.jrockit.**;
+ include oracle.jrockit.**;
+}
+
/**************************************************************************/
module servicetag {
@@ -650,6 +660,9 @@ module scripting {
// supporting classes for scripting engines
include com.sun.script.util.**;
+
+ // MAC
+ include apple.applescript.*;
}
module scripting-rhino {
@@ -665,7 +678,7 @@ module httpserver {
/**************************************************************************/
module sctp {
- include com.sun.nio.sctp.**, sun.nio.ch.Sctp*;
+ include com.sun.nio.sctp.**, sun.nio.ch.sctp.*;
}
module zipfs {
@@ -838,7 +851,15 @@ module applet {
module awt {
include java.awt.**,
sun.awt.**,
+
+ // MAC
+ sun.lwawt.**,
+ com.apple.**,
+ apple.laf.**,
com.sun.awt.**;
+
+ exclude com.apple.concurrent.**;
+ exclude com.apple.eio.**;
}
module font {
@@ -967,10 +988,6 @@ module jdk.compiler {
javax.annotation.processing.**;
}
-module jdk.mirror {
- include com.sun.mirror.**;
-}
-
module tools.javac {
include com.sun.tools.javac.**,
com.sun.source.**;
@@ -978,12 +995,6 @@ module tools.javac {
class com.sun.tools.javac.Main;
}
-// EOL in jdk 8
-module tools.apt {
- include com.sun.tools.apt.**;
- class com.sun.tools.apt.Main;
-}
-
module tools.javadoc {
include com.sun.tools.doclets.**;
include com.sun.tools.javadoc.**,
diff --git a/jdk/make/modules/modules.group b/jdk/make/modules/modules.group
index a4eaf52..e7bfd19 100644
--- a/jdk/make/modules/modules.group
+++ b/jdk/make/modules/modules.group
@@ -58,6 +58,14 @@ module jdk.base {
requires optional sun.resources;
requires optional sun.localedata;
+ // ## workaround for reflection
+ //
+ // ## reflection generated code is a subclass of sun.reflect.MethodAccessorImpl
+ // ## ConstructorAccessorImpl, or SerializationConstructorAccessorImpl
+ // ## The generated code is defined by a new loader that delegates to
+ // ## the defining loader of the declaring class
+ exports sun.reflect;
+
view jdk.base.oracle {
exports com.oracle.nio;
exports com.oracle.net;
@@ -139,6 +147,16 @@ module jdk.management {
include management;
requires optional jdk.management.iiop;
+
+ // ## temporary: need discussion with JFR team
+ // ## this adds a dependency on jaxp
+ include jfr;
+
+ view oracle.jfr {
+ exports com.oracle.jrockit.jfr;
+ exports com.oracle.jrockit.jfr.client;
+ exports com.oracle.jrockit.jfr.management;
+ }
}
// JMX RMI-IIOP connector
@@ -417,10 +435,6 @@ module jdk.httpserver {
include httpserver;
}
-module jdk.apt {
- include tools.apt;
-}
-
module jdk.devtools {
include tools.javac;
include tools.javah;
@@ -639,6 +653,7 @@ module jdk.jre {
requires public jdk.sctp;
requires public jdk.security.acl;
requires public jdk.smartcardio;
+ requires public jdk.snmp;
requires public jdk.sunec;
requires public jdk.sunpkcs11;
requires public jdk.sunmscapi;
diff --git a/jdk/make/modules/modules.properties b/jdk/make/modules/modules.properties
index 45ddcb6..d30e195 100644
--- a/jdk/make/modules/modules.properties
+++ b/jdk/make/modules/modules.properties
@@ -312,10 +312,6 @@ exported.packages = \
com.sun.jdi.connect.spi \
com.sun.jdi.event \
com.sun.jdi.request \
- com.sun.mirror.apt \
- com.sun.mirror.declaration \
- com.sun.mirror.type \
- com.sun.mirror.util \
com.sun.javadoc \
com.sun.tools.doclets \
com.sun.source.tree \
diff --git a/jdk/make/sun/Makefile b/jdk/make/sun/Makefile
index c3a8f18..9d58d54 100644
--- a/jdk/make/sun/Makefile
+++ b/jdk/make/sun/Makefile
@@ -58,9 +58,17 @@ ifneq ($(PLATFORM), windows)
XAWT_SUBDIR = xawt
endif
+ifeq ($(PLATFORM), macosx)
+ LWAWT_PRE_SUBDIR = osxapp
+ LWAWT_SUBDIR = lwawt
+endif
+
ifndef OPENJDK
+ifneq ($(PLATFORM), macosx)
JDBC_SUBDIR = jdbc
endif
+endif
+
ifdef OPENJDK
RENDER_SUBDIR = pisces
else
@@ -78,7 +86,7 @@ else
DISPLAY_TOOLS = applet
endif
SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \
- $(DISPLAY_LIBS) $(DGA_SUBDIR) \
+ $(LWAWT_PRE_SUBDIR) $(DISPLAY_LIBS) $(DGA_SUBDIR) $(LWAWT_SUBDIR) \
jawt font jpeg cmm $(DISPLAY_TOOLS) beans
SUBDIRS_management = management
SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing
diff --git a/jdk/make/sun/awt/Makefile b/jdk/make/sun/awt/Makefile
index 0fddcaf..a9a2bc4 100644
--- a/jdk/make/sun/awt/Makefile
+++ b/jdk/make/sun/awt/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -94,7 +94,7 @@ AUTO_JAVA_PRUNE += X11 AWTCharset.java
ifeq ($(PLATFORM), solaris)
FILES_c = $(FILES_2D_c)
FILES_c += awt_LoadLibrary.c
-OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
+OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
ifeq ($(CC_VER), 5.8)
ifndef REMOVE_ALL_WORKAROUNDS
ifeq ($(ARCH_FAMILY), i586)
@@ -121,14 +121,42 @@ ifeq ($(PLATFORM), linux)
FILES_c = $(FILES_2D_c)
FILES_c += awt_LoadLibrary.c
OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
-OTHER_LDLIBS = $(JVMLIB) $(LIBM) -ldl
+OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
endif
FILES_c += initIDs.c
+ifeq ($(PLATFORM), macosx)
+FILES_c = $(FILES_2D_c)
+FILES_c += awt_LoadLibrary.c
+OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
+OTHER_LDLIBS = $(JVMLIB) $(LIBM)
+endif
+
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS/LINUX
endif # PLATFORM
+ifeq ($(PLATFORM), macosx)
+# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
+
+#
+# Files
+#
+include FILES_c_macosx.gmk
+include FILES_export_macosx.gmk
+
+FILES_objc = $(FILES_AWT_objc)
+OTHER_LDLIBS = -lmlib_image $(JVMLIB) $(LIBM) \
+ -framework Cocoa \
+ -framework OpenGL \
+ -framework JavaNativeFoundation \
+ -framework JavaRuntimeSupport \
+ -framework ApplicationServices \
+ -framework AudioToolbox
+
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X
+endif # PLATFORM
+
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv SOLARIS-SPARC
# solaris-sparc and solaris-sparcv9 both build 'vis'
ifeq ("$(PLATFORM)-$(ARCH_FAMILY)", "solaris-sparc")
@@ -241,7 +269,7 @@ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
endif # PLATFORM
-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
@@ -250,6 +278,12 @@ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../font
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LINUX
endif # PLATFORM
+ifeq ($(PLATFORM), macosx)
+# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
+vpath %.m $(call NativeSrcDirList,,native/com/apple/resources)
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X
+endif # PLATFORM
+
ifeq ($(PLATFORM), windows)
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv WINDOWS
OTHER_LDLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \
@@ -392,6 +426,19 @@ FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
endif # PLATFORM
+
+ifeq ($(PLATFORM), macosx)
+# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv MAC OS X
+
+FONTCONFIGS_SRC = $(JDK_TOPDIR)/src/macosx/classes/sun/awt/fontconfigs
+_FONTCONFIGS = \
+ fontconfig.properties
+
+FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+
+# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MAC OS X
+endif # PLATFORM
+
FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
diff --git a/jdk/make/sun/awt/mawt.gmk b/jdk/make/sun/awt/mawt.gmk
index cdb740b..cbf22d0 100644
--- a/jdk/make/sun/awt/mawt.gmk
+++ b/jdk/make/sun/awt/mawt.gmk
@@ -137,7 +137,7 @@ ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux macosx))
OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
# XXX what is this define below? Isn't it motif-related?
OTHER_CFLAGS += -DXMSTRINGDEFINES=1
@@ -148,7 +148,7 @@ endif
# !HEADLESS
OTHER_LDLIBS += $(JVMLIB) $(LIBCXX) \
- -lawt $(LIBM) -ldl
+ -lawt $(LIBM) $(LIBDL)
#
# Sun CC with -Xa misdefines __STDC__ to 0 (zero).
@@ -191,16 +191,35 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)
+ifeq ($(PLATFORM), macosx)
+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+
+ifndef HEADLESS
+CPPFLAGS += -I$(MOTIF_DIR)/include \
+ -I$(OPENWIN_HOME)/include
+LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB)
+
+endif # !HEADLESS
+endif # PLATFORM
+
ifeq ($(PLATFORM), linux)
# Checking for the X11/extensions headers at the additional location
CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
$(wildcard /usr/include/X11/extensions))
endif
+ifeq ($(PLATFORM), macosx))
+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+ -I$(OPENWIN_HOME)/include
+endif
+
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
endif
+ifeq ($(PLATFORM), macosx)
+ CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+endif
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
diff --git a/jdk/make/sun/cmm/lcms/Makefile b/jdk/make/sun/cmm/lcms/Makefile
index d98a553..bc386fd 100644
--- a/jdk/make/sun/cmm/lcms/Makefile
+++ b/jdk/make/sun/cmm/lcms/Makefile
@@ -94,7 +94,11 @@ res.clean:
$(RM) $(OBJDIR)/cmm.h
else
-OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt
+ifeq ($(PLATFORM), macosx)
+OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/xawt
+else
+OTHER_LDLIBS = $(LIBM) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt
+endif
CPPFLAGS += -I$(SHARE_SRC)/native/sun/java2d \
-I$(SHARE_SRC)/native/sun/awt/debug
endif
diff --git a/jdk/make/sun/font/Makefile b/jdk/make/sun/font/Makefile
index 3229f38..af94743 100644
--- a/jdk/make/sun/font/Makefile
+++ b/jdk/make/sun/font/Makefile
@@ -174,21 +174,35 @@ else # PLATFORM
# Libraries to link, and other C flags.
#
+ifeq ($(PLATFORM), macosx))
+OTHER_INCLUDES += -I$(X11_PATH)/include
+OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
+ ifeq ($(OS_VENDOR),Apple)
+ # XXXDARWIN Match BSD/Linux behavior -- the mawt.dylib symbols will
+ # be available at runtime.
+ OTHER_LDLIBS += -undefined dynamic_lookup
+ endif
+else
ifeq ($(PLATFORM), solaris)
# Note that on Solaris, fontmanager is built against the headless library.
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless
- OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -lc $(LIBM) $(LIBCXX)
+ OTHER_LDLIBS += -lawt -lawt_xawt -lc $(LIBM) $(LIBCXX)
else # PLATFORM is linux
OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX)
ifeq ("$(CC_VER_MAJOR)", "3")
OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
endif
endif
+endif
endif # PLATFORM
# set up compile flags..
+ifeq ($(PLATFORM), macosx))
+CPPFLAGS += -I$(CLASSHDRDIR)
+endif
+
CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR) \
-I$(SHARE_SRC)/native/$(PKGDIR)/layout \
-I$(SHARE_SRC)/native/sun/awt/image/cvutils \
diff --git a/jdk/make/sun/font/t2k/Makefile b/jdk/make/sun/font/t2k/Makefile
index 2bbed52..1fc62b5 100644
--- a/jdk/make/sun/font/t2k/Makefile
+++ b/jdk/make/sun/font/t2k/Makefile
@@ -100,7 +100,7 @@ ifneq ($(PLATFORM), windows)
endif
else
ifeq ($(PLATFORM), solaris)
- OTHER_LDLIBS += -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
+ OTHER_LDLIBS += -lawt -lawt_xawt
endif
endif
endif
diff --git a/jdk/make/sun/headless/Makefile b/jdk/make/sun/headless/Makefile
index 8ca72ef..169dc3d 100644
--- a/jdk/make/sun/headless/Makefile
+++ b/jdk/make/sun/headless/Makefile
@@ -28,12 +28,10 @@ HEADLESS = true
NO_ROBOT = true
MOTIF_VERSION = none
MOTIF_VERSION_STRING=none
-LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/headless
MODULE = awt
PACKAGE = sun.awt
-LIBRARY = mawt
-LIBRARY_OUTPUT = headless
+LIBRARY = awt_headless
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
diff --git a/jdk/make/sun/image/generic/Makefile b/jdk/make/sun/image/generic/Makefile
index aeab44b..d161330 100644
--- a/jdk/make/sun/image/generic/Makefile
+++ b/jdk/make/sun/image/generic/Makefile
@@ -71,6 +71,6 @@ CPPFLAGS += \
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = $(LIBM) -ldl
+ OTHER_LDLIBS = $(LIBM) $(LIBDL)
endif
diff --git a/jdk/make/sun/image/vis/Makefile b/jdk/make/sun/image/vis/Makefile
index 8f41cdc..2515bd0 100644
--- a/jdk/make/sun/image/vis/Makefile
+++ b/jdk/make/sun/image/vis/Makefile
@@ -69,5 +69,5 @@ INLINE = $(PLATFORM_SRC)/native/sun/awt/medialib/vis_$(ARCH_DATA_MODEL).il
CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
-OTHER_LDLIBS = $(LIBM) -ldl
+OTHER_LDLIBS = $(LIBM) $(LIBDL)
diff --git a/jdk/make/sun/jawt/Makefile b/jdk/make/sun/jawt/Makefile
index 811a0da..7de995d 100644
--- a/jdk/make/sun/jawt/Makefile
+++ b/jdk/make/sun/jawt/Makefile
@@ -36,6 +36,8 @@ include $(BUILDDIR)/common/Defs.gmk
#
ifeq ($(PLATFORM), windows)
FILES_cpp = jawt.cpp
+else ifeq ($(PLATFORM), macosx) # PLATFORM
+FILES_objc = jawt.m
else # PLATFORM
FILES_c = jawt.c
endif # PLATFORM
@@ -109,28 +111,34 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include \
-I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
$(EVENT_MODEL)
+
#
# Libraries to link in.
#
ifeq ($(PLATFORM), solaris)
ifndef BUILD_HEADLESS_ONLY
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_xawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
else
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/headless -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -lawt_headless -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
endif
endif # PLATFORM
ifeq ($(PLATFORM), linux)
ifndef BUILD_HEADLESS_ONLY
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_xawt
else
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/headless -lmawt
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -lawt_headless
CFLAGS += -DHEADLESS
endif
endif # PLATFORM
+ifeq ($(PLATFORM), macosx)
+vpath %.m $(call NativeSrcDirList,,native/sun/awt)
+OTHER_LDLIBS = -lawt_lwawt -L$(LIBDIR) -Xlinker -rpath -Xlinker @loader_path \
+ -framework Cocoa
endif # PLATFORM
+endif # PLATFORM
#
# Lets not remove any class files.
diff --git a/jdk/make/sun/jdga/Makefile b/jdk/make/sun/jdga/Makefile
index 1ca132c..d5fa756 100644
--- a/jdk/make/sun/jdga/Makefile
+++ b/jdk/make/sun/jdga/Makefile
@@ -56,7 +56,7 @@ include $(BUILDDIR)/common/Library.gmk
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
ifneq ($(PLATFORM), windows)
- LDLIBS = -ldga -lX11 -ldl -lc
+ LDLIBS = -ldga -lX11 $(LIBDL) -lc
CPPFLAGS += \
-I$(SHARE_SRC)/javavm/export \
diff --git a/jdk/make/sun/rmi/cgi/Makefile b/jdk/make/sun/rmi/cgi/Makefile
index 571bbc6..657f24a 100644
--- a/jdk/make/sun/rmi/cgi/Makefile
+++ b/jdk/make/sun/rmi/cgi/Makefile
@@ -28,8 +28,9 @@
#
BUILDDIR = ../../..
-# java-rmi.cgi is a JDK tool but 6512052 states
-# that it should not be included in the jdk
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
+# java-rmi.cgi is a JDK tool
MODULE = deprecated.tools
PACKAGE = sun.rmi
PRODUCT = sun
diff --git a/jdk/make/sun/rmi/registry/Makefile b/jdk/make/sun/rmi/registry/Makefile
index f5599f0..b9ef215 100644
--- a/jdk/make/sun/rmi/registry/Makefile
+++ b/jdk/make/sun/rmi/registry/Makefile
@@ -28,6 +28,9 @@
#
BUILDDIR = ../../..
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
+JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
MODULE = rmi
PACKAGE = sun.rmi.registry
PRODUCT = sun
diff --git a/jdk/make/sun/rmi/rmi/Makefile b/jdk/make/sun/rmi/rmi/Makefile
index 4c277bd..ce7b84d 100644
--- a/jdk/make/sun/rmi/rmi/Makefile
+++ b/jdk/make/sun/rmi/rmi/Makefile
@@ -28,6 +28,9 @@
#
BUILDDIR = ../../..
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
+JAVAC_LINT_OPTIONS = -Xlint:all,-deprecation
MODULE = rmi
PACKAGE = sun.rmi
PRODUCT = sun
diff --git a/jdk/make/sun/rmi/rmid/Makefile b/jdk/make/sun/rmi/rmid/Makefile
index efac77f..1d467d2 100644
--- a/jdk/make/sun/rmi/rmid/Makefile
+++ b/jdk/make/sun/rmi/rmid/Makefile
@@ -29,6 +29,8 @@
#
BUILDDIR = ../../..
+JAVAC_MAX_WARNINGS = true
+JAVAC_WARNINGS_FATAL = true
MODULE = rmi
PACKAGE = sun.rmi.activation
PRODUCT = sun
diff --git a/jdk/make/sun/security/ec/Makefile b/jdk/make/sun/security/ec/Makefile
index b0f7e21..f3754e7 100644
--- a/jdk/make/sun/security/ec/Makefile
+++ b/jdk/make/sun/security/ec/Makefile
@@ -160,7 +160,9 @@ ifeq ($(NATIVE_ECC_AVAILABLE), true)
$(PKGDIR)/ECDSASignature.java \
$(PKGDIR)/ECKeyPairGenerator.java
- JAVAHFLAGS += -Xbootclasspath/p:$(CLASSDESTDIR)
+ JAVAHFLAGS = -bootclasspath \
+ "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
+
#
# C and C++ files
diff --git a/jdk/make/sun/security/jgss/wrapper/Makefile b/jdk/make/sun/security/jgss/wrapper/Makefile
index 48d5a32..f57194e 100644
--- a/jdk/make/sun/security/jgss/wrapper/Makefile
+++ b/jdk/make/sun/security/jgss/wrapper/Makefile
@@ -73,6 +73,6 @@ include $(BUILDDIR)/common/Library.gmk
# Libraries to link
#
ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = -ldl
+ OTHER_LDLIBS = $(LIBDL)
endif
diff --git a/jdk/make/sun/security/krb5/Makefile b/jdk/make/sun/security/krb5/Makefile
index bd16d71..f958009 100644
--- a/jdk/make/sun/security/krb5/Makefile
+++ b/jdk/make/sun/security/krb5/Makefile
@@ -34,6 +34,12 @@ include $(BUILDDIR)/common/Defs.gmk
#
AUTO_FILES_JAVA_DIRS = sun/security/krb5
+ifeq ($(PLATFORM), macosx)
+FILES_export = sun/security/krb5/Credentials.java
+FILES_c = nativeccache.c
+LIBRARY = osxkrb5
+endif # PLATFORM
+
ifeq ($(PLATFORM), windows)
#
# Java files that define native methods
@@ -53,8 +59,12 @@ endif # PLATFORM
#
# Find native code
#
-vpath %.c \
- $(PLATFORM_SRC)/native/sun/security/krb5
+ifeq ($PLATFORM), macosx)
+ vpath %.c $(call NativeSrcDirList,,native/sun/security/krb5)
+else
+ vpath %.c \
+ $(PLATFORM_SRC)/native/sun/security/krb5
+endif
JGSS_NATIVE_SRC=$(PLATFORM_SRC)/native/sun/security/krb5
JGSS_NATIVE_DIR_EXISTS := $(shell if [ -d $(JGSS_NATIVE_SRC) ] ; then echo true; else echo false; fi)
@@ -66,10 +76,20 @@ ifeq ($(PLATFORM), windows)
ifeq ($(JGSS_NATIVE_DIR_EXISTS), true)
include $(BUILDDIR)/common/Library.gmk
endif
+else ifeq ($(PLATFORM), macosx)
+ include $(BUILDDIR)/common/Library.gmk
else
include $(BUILDDIR)/common/Classes.gmk
endif # PLATFORM
+ifneq ($(PLATFORM), windows)
+ ifeq ($(PLATFORM), macosx)
+ OTHER_LDLIBS = $(LIBDL) -framework Kerberos
+ else
+ OTHER_LDLIBS = $(LIBDL)
+ endif
+endif
+
build:
ifeq ($(PLATFORM),windows)
$(call make-launcher, kinit, sun.security.krb5.internal.tools.Kinit, , , $(KERBEROS_TOOLS_MODULE))
diff --git a/jdk/make/sun/security/mscapi/Makefile b/jdk/make/sun/security/mscapi/Makefile
index ba7e530..077b294 100644
--- a/jdk/make/sun/security/mscapi/Makefile
+++ b/jdk/make/sun/security/mscapi/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -154,7 +154,8 @@ OTHER_INCLUDES += \
# Rules
#
CLASSDESTDIR = $(TEMPDIR)/classes
-JAVAHFLAGS += -Xbootclasspath/p:$(CLASSDESTDIR)
+JAVAHFLAGS = -bootclasspath \
+ "$(CLASSDESTDIR)$(CLASSPATH_SEPARATOR)$(CLASSBINDIR)"
include $(BUILDDIR)/common/Mapfile-vers.gmk
diff --git a/jdk/make/sun/security/pkcs11/Makefile b/jdk/make/sun/security/pkcs11/Makefile
index 691ac8e..7c4de84 100644
--- a/jdk/make/sun/security/pkcs11/Makefile
+++ b/jdk/make/sun/security/pkcs11/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -162,7 +162,7 @@ include $(BUILDDIR)/common/Library.gmk
# Libraries to link
#
ifneq ($(PLATFORM), windows)
- OTHER_LDLIBS = -ldl
+ OTHER_LDLIBS = $(LIBDL)
endif
# Other config files
diff --git a/jdk/make/sun/security/smartcardio/Makefile b/jdk/make/sun/security/smartcardio/Makefile
index 426fb99..b115ca8 100644
--- a/jdk/make/sun/security/smartcardio/Makefile
+++ b/jdk/make/sun/security/smartcardio/Makefile
@@ -76,6 +76,6 @@ include $(BUILDDIR)/common/Library.gmk
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = winscard.lib
else
- OTHER_LDLIBS = -ldl
+ OTHER_LDLIBS = $(LIBDL)
OTHER_CFLAGS = -D__sun_jdk
endif
diff --git a/jdk/make/sun/splashscreen/FILES_c.gmk b/jdk/make/sun/splashscreen/FILES_c.gmk
index b6e234f..f55b8d7 100644
--- a/jdk/make/sun/splashscreen/FILES_c.gmk
+++ b/jdk/make/sun/splashscreen/FILES_c.gmk
@@ -49,21 +49,6 @@ FILES_c = \
dgif_lib.c \
gif_err.c \
gifalloc.c \
- compress.c \
- deflate.c \
- gzclose.c \
- gzlib.c \
- gzread.c \
- gzwrite.c \
- infback.c \
- inffast.c \
- inflate.c \
- inftrees.c \
- trees.c \
- uncompr.c \
- zadler32.c \
- zcrc32.c \
- zutil.c \
jcomapi.c \
jdapimin.c \
jdapistd.c \
@@ -109,3 +94,21 @@ FILES_c = \
jfdctfst.c \
jfdctint.c
+ifneq ($(SYSTEM_ZLIB),true)
+ FILES_c += \
+ compress.c \
+ deflate.c \
+ gzclose.c \
+ gzlib.c \
+ gzread.c \
+ gzwrite.c \
+ infback.c \
+ inffast.c \
+ inflate.c \
+ inftrees.c \
+ trees.c \
+ uncompr.c \
+ zadler32.c \
+ zcrc32.c \
+ zutil.c
+endif
diff --git a/jdk/make/sun/splashscreen/Makefile b/jdk/make/sun/splashscreen/Makefile
index ffcb3c9..593f777 100644
--- a/jdk/make/sun/splashscreen/Makefile
+++ b/jdk/make/sun/splashscreen/Makefile
@@ -62,10 +62,37 @@ JAVALIB=
CFLAGS += -DSPLASHSCREEN
-ifneq ($(PLATFORM), windows)
+ifeq ($(PLATFORM), macosx)
+ CFLAGS += -DWITH_MACOSX
+
+ # CFLAGS and CPPFLAGS are added when linking as well, so we use VARIANT
+ # instead to specify that we're actually compiling objective-c code here
+ CFLAGS_$(VARIANT)/java_awt_SplashScreen.o = -x objective-c
+ CFLAGS_$(VARIANT)/splashscreen_gfx_impl.o = -x objective-c
+ CFLAGS_$(VARIANT)/splashscreen_gif.o = -x objective-c
+ CFLAGS_$(VARIANT)/splashscreen_impl.o = -x objective-c
+ CFLAGS_$(VARIANT)/splashscreen_jpeg.o = -x objective-c
+ CFLAGS_$(VARIANT)/splashscreen_png.o = -x objective-c
+ CFLAGS_$(VARIANT)/splashscreen_sys.o = -x objective-c
+
+ OTHER_CFLAGS += -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
+ CPPFLAGS += -I/System/Library/Frameworks/AppKit.framework/Versions/C/Headers
+ OTHER_LDLIBS += $(LIBM) -lpthread -liconv -losxapp \
+ -framework ApplicationServices \
+ -framework Foundation \
+ -framework Cocoa \
+ -framework JavaNativeFoundation
+else ifneq ($(PLATFORM), windows)
CFLAGS += -DWITH_X11
- CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
- OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
+ ifeq ($(PLATFORM), macosx))
+ OTHER_LDLIBS += -liconv
+ CPPFLAGS += -I$(OPENWIN_HOME)/include \
+ -I$(OPENWIN_HOME)/include/X11/extensions
+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -pthread
+ else
+ CPPFLAGS += -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
+ OTHER_LDLIBS += -L$(OPENWIN_LIB) -lX11 -lXext $(LIBM) -lpthread
+ endif
else # PLATFORM
CFLAGS += -DWITH_WIN32
OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
@@ -78,13 +105,30 @@ endif # PLATFORM
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib
-vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ifneq ($(SYSTEM_ZLIB),true)
+ vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+endif
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
-vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
+ifneq ($(PLATFORM), macosx)
+ vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
+else
+ vpath %.m $(call NativeSrcDirList,,native/$(PKGDIR)/splashscreen)
+endif
-CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+ifneq ($(PLATFORM), macosx)
+ CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
+else
+ CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
+ CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
+endif
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+ifneq ($(SYSTEM_ZLIB),true)
+ CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+else
+ OTHER_LDLIBS += -lz
+endif
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
diff --git a/jdk/make/sun/tracing/dtrace/Makefile b/jdk/make/sun/tracing/dtrace/Makefile
index 30cb0e1..8412f05 100644
--- a/jdk/make/sun/tracing/dtrace/Makefile
+++ b/jdk/make/sun/tracing/dtrace/Makefile
@@ -56,7 +56,7 @@ FILES_java = \
FILES_export = $(FILES_java)
ifeq ($(PLATFORM), linux)
-OTHER_LDLIBS += -ldl
+OTHER_LDLIBS += $(LIBDL)
endif
#
diff --git a/jdk/make/sun/xawt/Makefile b/jdk/make/sun/xawt/Makefile
index 704664f..001062b 100644
--- a/jdk/make/sun/xawt/Makefile
+++ b/jdk/make/sun/xawt/Makefile
@@ -26,9 +26,7 @@
BUILDDIR = ../..
MODULE = awt
PACKAGE = sun.awt.X11
-LIBRARY = mawt
-LIBRARY_OUTPUT = xawt
-LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/xawt
+LIBRARY = awt_xawt
PRODUCT = sun
include $(BUILDDIR)/common/Defs.gmk
@@ -59,6 +57,11 @@ LDFLAGS += -lpthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif
+ifeq ($(PLATFORM), macosx))
+LDFLAGS += -pthread
+dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
+endif
+
# Since this library will be living in a subdirectory below the other libraries
# we need to add an extra runpath so that libraries in the upper directory
# are found at runtime.
@@ -93,7 +96,7 @@ vpath %.c $(SHARE_SRC)/native/sun/java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
-OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender -ldl \
+OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) \
$(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
ifeq ($(PLATFORM), solaris)
@@ -164,6 +167,10 @@ ifeq ($(PLATFORM), solaris)
endif
endif
+ifeq ($(PLATFORM), macosx)
+ CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\"
+endif
+
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
@@ -208,6 +215,13 @@ endif # sparcv9
else # !solaris
+ifeq ($(PLATFORM), macosx)
+CFLAGS_32=-arch i386
+SIZERS = $(SIZER).32 $(SIZER).64
+SIZERS_C = $(SIZER_32_C) $(SIZER_64_C)
+SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.32 $(WRAPPER_GENERATOR_DIR)/sizes.64
+CFLAGS_64=-arch x86_64
+else # !macosx
ifeq ($(ARCH_DATA_MODEL), 32)
SIZERS = $(SIZER).32
SIZERS_C = $(SIZER_32_C)
@@ -217,7 +231,7 @@ SIZERS = $(SIZER).64
SIZERS_C = $(SIZER_64_C)
SIZES = $(WRAPPER_GENERATOR_DIR)/sizes.64
endif # 32
-
+endif # !macosx
endif # solaris
# XXX Hack for 6185483 - use hard-coded sizes.
@@ -254,9 +268,11 @@ XLIBTYPES=$(PLATFORM_SRC)/classes/sun/awt/X11/generator/xlibtypes.txt
$(SIZERS): $(SIZERS_C)
$(prep-target)
ifndef CROSS_COMPILE_ARCH
- $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
+ $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
+ $(CC) $(CFLAGS_$(subst .,,$(suffix $@))) -o $@ $(CPPFLAGS) $(SIZER)$(suffix $@).o
else
- $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).c
+ $(HOST_CC) $(CPPFLAGS) -c -o $(SIZER)$(suffix $@).o $(SIZER)$(suffix $@).c
+ $(HOST_CC) $(CPPFLAGS) -o $@ $(SIZER)$(suffix $@).o
endif
$(WRAPPER_GENERATOR_CLASS): $(WRAPPER_GENERATOR_JAVA)
diff --git a/jdk/make/tools/classanalyzer/classanalyzer.html b/jdk/make/tools/classanalyzer/classanalyzer.html
index 0d79a77..12ef2d7 100644
--- a/jdk/make/tools/classanalyzer/classanalyzer.html
+++ b/jdk/make/tools/classanalyzer/classanalyzer.html
@@ -28,10 +28,44 @@
<html>
<head>
- <title>ClassAnalyzer</title>
+ <title>ClassAnalyzer and ShowDeps</title>
</head>
<body>
+<h1>ShowDeps</h1>
+ShowDeps is a simple tool to print out the static dependenices
+for a given set of JAR, class files, or combinations of. This
+tool supports a <b>-id</b> option to specify the given module identifier
+and it will generate the module declaration (<code>module-info</code>).
+It also supports an <b>-ignore</b> option to ignore references to classes
+listed in the file (including .classlists created by the ClassAnalyzer tool).
+
+<pre>
+java ShowDeps [-L <module-lib>] [-id <moduleId>] file...
+ where <file> is a class or JAR file, or a directory
+If -id option is specified, it will generate the module declaration.
+
+Example usages:
+ java ShowDeps Foo.jar
+ java ShowDeps -id "foo at 1.0" Foo.jar
+ java ShowDeps -L modulelibrary Foo.jar
+ java ShowDeps -ignore base.classlist Foo.jar
+ java ShowDeps -ignore base.classlist -ignore jaxp-parsers.classlist <dir>
+</pre>
+
+For example, to generate module declaration for SwingSet3:
+<pre>
+$ java ShowDeps -id "swingset3 @ 1.0" swingx.jar swing-worker.jar AnimatedTransitions.jar TimingFramework.jar AppFramework.jar
+module swingset3 @ 1.0 {
+ requires jdk.base;
+ requires jdk.desktop;
+ requires jdk.jdbc;
+ requires jdk.jndi;
+ requires jdk.logging;
+ requires jdk.prefs;
+}
+</pre>
+
<h1>ClassAnalyzer</h1>
The ClassAnalyzer tool analyzes the class dependencies among
the input class files. It parses the class files, finds
@@ -39,7 +73,9 @@ all class references, assigns classes to modules per the
specified configuration files and then generates a set
of reports for each module, including the list of classes,
the list of resource files, and its dependencies on
-classes from another module.
+classes from another module. This tool supports a <b>-config</b>
+option to group classes in more than one modules and also
+a <b>-moduleinfo</b> option to generate module-info.java source files.
<p>
<em>Input:</em>
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java
index f7b910b..86cabee 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/JigsawModuleBuilder.java
@@ -28,6 +28,8 @@ import java.io.IOException;
import java.util.*;
import java.lang.module.ModuleId;
+import java.lang.module.ModuleInfo;
+import java.lang.module.ModuleView;
import org.openjdk.jigsaw.*;
/**
@@ -37,12 +39,11 @@ import org.openjdk.jigsaw.*;
* from the jigsaw build.
*/
public class JigsawModuleBuilder extends ClassListReader {
- private static JigsawFactory factory = new JigsawFactory();
private static String DEFAULT_VERSION = "8-ea";
private final File path;
public JigsawModuleBuilder(File path) {
- super(factory, path, DEFAULT_VERSION);
+ super(JigsawFactory.factory, path, DEFAULT_VERSION);
this.path = path;
}
@@ -55,16 +56,19 @@ public class JigsawModuleBuilder extends ClassListReader {
// create modules from the input class lists
super.run();
}
- return factory.getAllModules();
+ return JigsawFactory.factory.jigsawModules();
}
private void loadModulesFromLibrary() throws IOException {
Library lib = SimpleLibrary.open(path);
List<ModuleId> mids = lib.listLocalModuleIds();
for (ModuleId mid : mids) {
- java.lang.module.ModuleInfo minfo = lib.readLocalModuleInfo(mid);
- Module m = factory.newModule(mid.name(), mid.version().toString());
- factory.addModule(m);
+ ModuleInfo minfo = lib.readLocalModuleInfo(mid);
+ // skip non-default views
+ if (!minfo.id().equals(mid)) {
+ continue;
+ }
+ Module m = JigsawFactory.newModule(minfo);
// ## probably list only exported classes??
for (String cn : lib.listLocalClasses(mid, true)) {
@@ -78,8 +82,27 @@ public class JigsawModuleBuilder extends ClassListReader {
}
}
-
private static class JigsawFactory extends Factory {
+ static JigsawFactory factory = new JigsawFactory();
+
+ static Module newModule(ModuleInfo mi) {
+ JigsawModule m = new JigsawModule(mi);
+ factory.addModule(m);
+
+ for (ModuleView mv : mi.views()) {
+ Set<String> exports = mv.exports();
+ if (mv == mi.defaultView()) {
+ m.defaultView().addExports(exports);
+ } else if (mv.permits().isEmpty()) {
+ // only add the views with no permits
+ m.addView(mv.id().name()).addExports(exports);
+ }
+ }
+ return m;
+ }
+ Set<Module> jigsawModules() {
+ return new LinkedHashSet<>(modules.values());
+ }
@Override
public Module newModule(String name, String version) {
@@ -93,37 +116,14 @@ public class JigsawModuleBuilder extends ClassListReader {
};
private static class JigsawModule extends Module {
- Module altgroup;
+ JigsawModule(ModuleInfo mi) {
+ this(new ModuleConfig(mi.id().name(), mi.id().version().toString()));
+ }
JigsawModule(ModuleConfig config) {
super(config);
}
- /*
- * Only present the "jdk." modules for application
- * to use.
- */
- @Override
- public synchronized Module group() {
- if (altgroup == null) {
- altgroup = this;
- String n = name();
- if (n.startsWith("sun.")) {
- String mn = "jdk." + n.substring(4);
- Module pm = factory.findModule(mn);
- if (pm != null) {
- altgroup = pm;
- }
- } else if (n.equals("jdk.boot")) {
- altgroup = factory.findModule("jdk.base");
- if (altgroup == null) {
- throw new RuntimeException("jdk.base not found");
- }
- }
- }
- return altgroup;
- }
-
@Override
boolean allowsEmpty() {
// jdk.* module that reexports sun.* module is empty
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java
index 7b23983..8f7a5b4 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/Module.java
@@ -112,14 +112,12 @@ public class Module implements Comparable<Module> {
this.views = new LinkedHashMap<>();
for (ModuleConfig.View mcv : config.viewForName.values()) {
- View v = new View(this, mcv, mcv.name);
- views.put(mcv.name, v);
+ addView(mcv.name, mcv);
}
this.defaultView = views.get(name);
// create an internal view
- this.internalView = View.getInternalView(this, name + ".internal");
- views.put(internalView.name, internalView);
+ this.internalView = addView(name + ".internal");
}
String name() {
@@ -174,25 +172,44 @@ public class Module implements Comparable<Module> {
return views.values();
}
+ View addView(String name) {
+ View v = new View(this, name);
+ views.put(name, v);
+ return v;
+ }
+
+ private View addView(String name, ModuleConfig.View mcv) {
+ View v = new View(this, mcv, name);
+ views.put(name, v);
+ return v;
+ }
+
Module.View getView(String name) {
return views.get(name);
}
Module.View getView(Klass k) {
String pn = k.getPackageName();
+ View view = internalView;
for (View v : views.values()) {
- if (v.exports.contains(pn))
- return v;
+ if (v.exports.contains(pn)) {
+ view = v;
+ break;
+ }
}
+ // make sure a package referenced by other modules
+ // is exported either in the default view or internal view
PackageInfo pinfo = packageForClass.get(pn);
- if (contains(k) && !pinfo.isExported) {
- internalView.exports.add(pn);
- return internalView;
+ if (contains(k) && !defaultView.exports.contains(pn)) {
+ if (!pinfo.isExported && !internalView.exports.contains(pn)) {
+ internalView.exports.add(pn);
+ }
}
+ assert view.exports.contains(pn);
+
+ return view;
+
- throw new RuntimeException("No view found for " + k +
- (contains(k) ? " exists" : " does not exists") +
- " in " + name);
}
boolean contains(Klass k) {
@@ -441,7 +458,7 @@ public class Module implements Comparable<Module> {
}
}
- public static class View {
+ public static class View implements Comparable<View> {
final Module module;
final String name;
private final Set<String> exports;
@@ -449,15 +466,10 @@ public class Module implements Comparable<Module> {
private final Set<String> aliases;
private String mainClass;
private final Set<Module> permits;
- private int refCount;
-
- static View getInternalView(Module m, String name) {
- View v = new View(m, null, name);
- v.refCount = -1; // internal view is initialized to be -1
- return v;
- }
+ int refCount;
- public View(Module m, ModuleConfig.View mcv, String name) {
+ // specified in modules.config; always include it in module-info.java
+ View(Module m, ModuleConfig.View mcv, String name) {
this.module = m;
this.name = name;
this.refCount = 0;
@@ -473,6 +485,17 @@ public class Module implements Comparable<Module> {
}
}
+ // only show up in module-info.java if there is a reference to it.
+ View(Module m, String name) {
+ this.module = m;
+ this.name = name;
+ this.refCount = -1;
+ this.exports = new HashSet<>();
+ this.permits = new HashSet<>();
+ this.permitNames = new HashSet<>();
+ this.aliases = new HashSet<>();
+ }
+
boolean isEmpty() {
// Internal view may have non-empty exports but it's only
// non-empty if any module requires it
@@ -502,6 +525,10 @@ public class Module implements Comparable<Module> {
permits.add(m);
}
+ void addExports(Set<String> packages) {
+ exports.addAll(packages);
+ }
+
void merge(View v) {
// main class is not propagated to the default view
this.aliases.addAll(v.aliases);
@@ -525,6 +552,17 @@ public class Module implements Comparable<Module> {
public String toString() {
return id();
}
+
+ public int compareTo(Module.View o) {
+ if (o == null) {
+ return -1;
+ }
+ int rc = module.compareTo(o.module);
+ if (rc == 0) {
+ return name.compareTo(o.name);
+ }
+ return rc;
+ }
}
private static Factory INSTANCE = new Factory();
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java
index 61e2e8f..15a2051 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ModuleBuilder.java
@@ -297,7 +297,7 @@ public class ModuleBuilder {
} else {
d.addView(dm.getView(d.module));
}
- addDependence(requires, d);
+ addDependence(m, requires, d);
}
}
@@ -305,7 +305,7 @@ public class ModuleBuilder {
if (!m.isBase() && base != null && requiresBase) {
Dependence d = new Dependence(base.name(), false);
d.addView(base.defaultView());
- addDependence(requires, d);
+ addDependence(m, requires, d);
}
// add static dependences
@@ -314,7 +314,7 @@ public class ModuleBuilder {
if (m.requiresModuleDependence(to)) {
// is this dependence overridden as optional?
boolean optional = OptionalDependency.isOptional(from, to);
- addDependence(requires, to, optional);
+ addDependence(m, requires, to, optional);
}
}
}
@@ -323,14 +323,14 @@ public class ModuleBuilder {
for (Dependence d : AnnotatedDependency.getDependencies(m)) {
// filter optional dependencies to the base module
if (!m.isBase() || !d.isOptional())
- addDependence(requires, d);
+ addDependence(m, requires, d);
}
// add dependency due to the main class
for (Module.View v : m.views()) {
Klass k = v.mainClass();
if (k != null && m.requiresModuleDependence(k)) {
- addDependence(requires, k, false);
+ addDependence(m, requires, k, false);
}
for (String name : v.permitNames()) {
@@ -371,7 +371,8 @@ public class ModuleBuilder {
return mi;
}
- private void addDependence(Map<Module, Dependence> requires, Klass k, boolean optional) {
+ private void addDependence(Module m, Map<Module, Dependence> requires,
+ Klass k, boolean optional) {
Module dm = k.getModule().group();
Dependence dep = requires.get(dm);
if (dep == null) {
@@ -388,7 +389,7 @@ public class ModuleBuilder {
dep.addView(view);
}
- private void addDependence(Map<Module, Dependence> requires, Dependence d) {
+ private void addDependence(Module m, Map<Module, Dependence> requires, Dependence d) {
Module dm = getFactory().getModuleForView(d.module);
// not a dependence if it's an empty module and not aggregating modules
if (!dm.isTopLevel())
@@ -398,15 +399,19 @@ public class ModuleBuilder {
if (dep == null) {
requires.put(dm, d);
} else if (!dep.equals(d)) {
- if (dep.module.equals(d.module) &&
- !dep.isOptional() &&
- !d.isLocal() && !d.isPublic() &&
- dep.views.containsAll(d.views)) {
- // the static dependence can override the optional dependence
- return;
+ if (dep.module.equals(d.module) && !dep.isOptional()) {
+ if (!d.isLocal() && !d.isPublic()) {
+ // the static dependence can override the optional dependence
+ if (dep.views.containsAll(d.views))
+ return;
+ if (d.views.size() == 1 &&
+ d.views.contains(dm.defaultView()) &&
+ dep.views.contains(dm.internalView()))
+ return;
+ }
}
- throw new RuntimeException("mismatch input requires: "
- + dep + " and " + d);
+ throw new RuntimeException("Add dependence " + d + " to module " +
+ m.name() + " " + dep);
}
}
}
diff --git a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java
index b3d39ee..d36c03e 100644
--- a/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java
+++ b/jdk/make/tools/classanalyzer/src/com/sun/classanalyzer/ShowDeps.java
@@ -34,17 +34,19 @@ import java.util.*;
public class ShowDeps {
private final ClassPath cpath;
- private final Set<String> classes = new TreeSet<String>();
+ private final Set<String> classes = new TreeSet<>();
+ private final Set<Module.View> requires = new TreeSet<>();
+ private final Map<String, Module> packages = new TreeMap<>();
public ShowDeps(ClassPath cpath) {
this.cpath = cpath;
}
- public void run() throws IOException {
+ public void run(Set<Module> modules, boolean showClassDeps) throws IOException {
cpath.parse();
// find the classes that don't exist
- Set<Klass> unresolved = new TreeSet<Klass>();
+ Set<Klass> unresolved = new TreeSet<>();
for (Klass k : Klass.getAllClasses()) {
if (k.getFileSize() == 0) {
unresolved.add(k);
@@ -55,49 +57,112 @@ public class ShowDeps {
for (Klass k : Klass.getAllClasses()) {
for (Klass other : k.getReferencedClasses()) {
if (unresolved.contains(other)) {
- String name = other.toString();
- if (!ignore.contains(name)) {
- System.out.format("%s -> %s\n", k, other);
+ String cn = other.getClassName();
+ String pn = other.getPackageName();
+ Module m = other.getModule();
+ Module sm = packages.get(pn);
+ if (m == null) {
+ m = Module.getFactory().unknownModule();
+ }
+ if (!packages.containsKey(pn)) {
+ packages.put(pn, m);
+ } else if (sm != m) {
+ String mn = m == null ? "?" : m.name();
+ String pn1 = pn + " (" + mn + ")";
+ packages.put(pn1, m);
+ }
+ Module.View mv = null;
+ if (m.defaultView().exports().contains(pn)) {
+ mv = m.defaultView();
+ } else {
+ for (Module.View v : m.views()) {
+ if (v.exports().contains(pn)) {
+ mv = v;
+ break;
+ }
+ }
+ }
+ if (mv != null) {
+ requires.add(mv);
+ } else if (m != Module.getFactory().unknownModule()) {
+ System.out.format("Non-exported: %s -> %s (%s)%n",
+ k, other, m);
+ }
+ if (!ignore.contains(cn) && showClassDeps) {
+ System.out.format("%s -> %s (%s)%n", k, other, m);
}
}
}
}
}
+ public void printPackageDeps(PrintStream out) {
+ out.format("%-40s %s%n", "package", "from module");
+ out.format("%-40s %s%n", "-------", "-----------");
+ for (Map.Entry<String,Module> e : packages.entrySet()) {
+ String pn = e.getKey();
+ Module m = e.getValue();
+ out.format("%-40s %s%n", pn, m);
+ }
+ }
+
+ public void printModuleInfo(PrintStream out, String mid) {
+ out.format("module %s {%n", mid);
+ for (Module.View mv : requires) {
+ out.format(" requires %s;%n", mv.name);
+ }
+ out.println("}");
+ }
+
static void usage() {
- System.out.println("java ShowDeps [-ignore <classlist>] file...");
+ System.out.println("java ShowDeps [-L <module-lib>] [-id <moduleId>] [-v] file...");
System.out.println(" where <file> is a class or JAR file, or a directory");
- System.out.println();
+ System.out.println("By default, it shows the packages dependencies and class");
+ System.out.println("dependencies if -v option is specified. If the id option");
+ System.out.println("is specified, it will print the module declaration instead.");
+ System.out.println("");
System.out.println("Example usages:");
System.out.println(" java ShowDeps Foo.jar");
+ System.out.println(" java ShowDeps -id \"foo at 1.0\" Foo.jar");
+ System.out.println(" java ShowDeps -L modulelibrary Foo.jar");
System.out.println(" java ShowDeps -ignore base.classlist Foo.jar");
System.out.println(" java ShowDeps -ignore base.classlist -ignore " +
"jaxp-parsers.classlist <dir>");
System.exit(-1);
}
- private static Set<String> ignore = new HashSet<String>();
+ private static Set<String> ignore = new HashSet<>();
public static void main(String[] args) throws IOException {
- // process -ignore options
int argi = 0;
- while (argi < args.length && args[argi].equals("-ignore")) {
- argi++;
- Scanner s = new Scanner(new File(args[argi++]));
- try {
- while (s.hasNextLine()) {
- String line = s.nextLine();
- if (!line.endsWith(".class")) {
- continue;
+ File lib = null;
+ String mid = null;
+ boolean verbose = false;
+ while (argi < args.length) {
+ String arg = args[argi];
+ if (arg.equals("-ignore")) {
+ // process -ignore options
+ try (Scanner s = new Scanner(new File(args[++argi]))) {
+ while (s.hasNextLine()) {
+ String line = s.nextLine();
+ if (!line.endsWith(".class")) {
+ continue;
+ }
+ int len = line.length();
+ // convert to class names
+ String clazz = line.replace('\\', '.').replace('/', '.').substring(0, len - 6);
+ ignore.add(clazz);
}
- int len = line.length();
- // convert to class names
- String clazz = line.replace('\\', '.').replace('/', '.')
- .substring(0, len - 6);
- ignore.add(clazz);
}
- } finally {
- s.close();
+ } else if (arg.equals("-id")) {
+ mid = args[++argi];
+ } else if (arg.equals("-L")) {
+ lib = new File(args[++argi]);
+ } else if (arg.equals("-v")) {
+ verbose = true;
+ } else {
+ break;
}
+ argi++;
}
if (argi >= args.length) {
@@ -107,6 +172,27 @@ public class ShowDeps {
// parse all classes
ClassPath cpath = new ClassPath(Arrays.copyOfRange(args, argi, args.length));
ShowDeps instance = new ShowDeps(cpath);
- instance.run();
+ instance.run(getPlatformModules(lib), verbose);
+
+ if (mid == null) {
+ if (!verbose)
+ instance.printPackageDeps(System.out);
+ } else {
+ instance.printModuleInfo(System.out, mid);
+ }
+ }
+
+ static Set<Module> getPlatformModules(File lib) throws IOException {
+ String javahome = System.getProperty("java.home");
+ if (lib == null) {
+ lib = new File(new File(javahome,"lib"), "modules");
+ }
+
+ if (lib.exists()) {
+ JigsawModuleBuilder mb = new JigsawModuleBuilder(lib);
+ return mb.run();
+ } else {
+ return Collections.emptySet();
+ }
}
}
diff --git a/jdk/make/tools/freetypecheck/Makefile b/jdk/make/tools/freetypecheck/Makefile
index 101542f..0b18de0 100644
--- a/jdk/make/tools/freetypecheck/Makefile
+++ b/jdk/make/tools/freetypecheck/Makefile
@@ -47,12 +47,15 @@ else
FT_OPTIONS = $(CFLAGS)
FT_LD_OPTIONS = -L$(FREETYPE_LIB_PATH)
# Add runtime lib search path to ensure test will be runnable
- ifeq ($(PLATFORM), linux)
- FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH)
- else # other unix
- FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH)
+ ifeq ($(PLATFORM), solaris)
+ FT_LD_OPTIONS += -R $(FREETYPE_LIB_PATH) -lfreetype
+ else
+ ifeq ($(PLATFORM), macosx)
+ FT_LD_OPTIONS += -lfreetype -lz
+ else # linux
+ FT_LD_OPTIONS += -Wl,-rpath -Wl,$(FREETYPE_LIB_PATH) -lfreetype
+ endif
endif
- FT_LD_OPTIONS += -lfreetype
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)/freetype2
diff --git a/jdk/make/tools/reorder/Makefile b/jdk/make/tools/reorder/Makefile
index 5e8efc3..38a758b 100644
--- a/jdk/make/tools/reorder/Makefile
+++ b/jdk/make/tools/reorder/Makefile
@@ -187,11 +187,11 @@ $(OBJDIR)/%.o : %.c tools/util-$(ARCH).il
# This library 'libmcount.so' also used by hotspot reordering.
$(OBJDIR)/libmcount.so : $(MCOUNT_OBJ)
- $(CC) -G -mt -zdefs -o $@ $^ -ldl -lelf $(EXTRA_LIBS)
+ $(CC) -G -mt -zdefs -o $@ $^ $(LIBDL) -lelf $(EXTRA_LIBS)
# This library 'libmcount.so' also used by hotspot reordering.
$(OBJDIR)/remove_mcount : remove_mcount.c
- $(CC) -g -o $@ $^ -ldl -lelf $(EXTRA_LIBS)
+ $(CC) -g -o $@ $^ $(LIBDL) -lelf $(EXTRA_LIBS)
# Reorder libraries.
diff --git a/jdk/make/tools/src/build/tools/javazic/Mappings.java b/jdk/make/tools/src/build/tools/javazic/Mappings.java
index 5e5498a..885b9a0 100644
--- a/jdk/make/tools/src/build/tools/javazic/Mappings.java
+++ b/jdk/make/tools/src/build/tools/javazic/Mappings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,7 @@
package build.tools.javazic;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -162,6 +163,20 @@ class Mappings {
for (String key : toBeRemoved) {
aliases.remove(key);
}
+ // Eliminate any alias-to-alias mappings. For example, if
+ // there are A->B and B->C, A->B is changed to A->C.
+ Map<String, String> newMap = new HashMap<String, String>();
+ for (String key : aliases.keySet()) {
+ String realid = aliases.get(key);
+ String leaf = realid;
+ while (aliases.get(leaf) != null) {
+ leaf = aliases.get(leaf);
+ }
+ if (!realid.equals(leaf)) {
+ newMap.put(key, leaf);
+ }
+ }
+ aliases.putAll(newMap);
}
Map<String,String> getAliases() {
diff --git a/jdk/src/linux/doc/man/apt.1 b/jdk/src/linux/doc/man/apt.1
deleted file mode 100644
index 2d77108..0000000
--- a/jdk/src/linux/doc/man/apt.1
+++ /dev/null
@@ -1,153 +0,0 @@
-." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-." 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.
-."
-.TH apt 1 "10 May 2011"
-
-.LP
-.SH "NAME"
-.LP
-.LP
-\f2apt\fP \- annotation processing tool
-.LP
-.SH "SYNOPSIS"
-.LP
-.LP
-\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files]
-.LP
-.SH "PARAMETERS"
-.LP
-.LP
-Options may be in any order. For a discussion of parameters which apply to a specific option, see OPTIONS below.
-.LP
-.RS 3
-.TP 3
-sourcefiles
-Zero or more source files to be processed.
-.TP 3
- at files
-One or more files that list source files or other options
-.RE
-
-.LP
-.SH "DESCRIPTION"
-.LP
-.LP
-\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
-.LP
-.LP
-The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP.
-.LP
-.LP
-A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in
-.na
-\f4Getting Started with \fP\f4apt\fP. @
-.fi
-http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
-.LP
-.SH "OPTIONS"
-.LP
-.SS
-apt specific options
-.LP
-.RS 3
-.TP 3
-\-s dir
-Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace.
-.TP 3
-\-nocompile
-Do not compile source files to class files.
-.TP 3
-\-print
-Print out textual representation of specified types; perform no annotation processing or compilation.
-.TP 3
-\-A[key[=val]]
-Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors
-.TP 3
-\-factorypath path
-Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories.
-.TP 3
-\-factory classname
-Name of annotation processor factory to use; bypasses default discovery process
-.TP 3
-\-version
-Print version information.
-.TP 3
-\-X
-Display information about non\-standard options.
-.RE
-
-.LP
-.SS
-Options shared with javac
-.LP
-.RS 3
-.TP 3
-\-d dir
-Specify where to place processor and javac generated class files
-.TP 3
-\-cp path or \-classpath path
-Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories.
-.RE
-
-.LP
-.LP
-Consult the javac(1) man page for information on \f2javac\fP options.
-.LP
-.SS
-Non\-Standard Options
-.LP
-.RS 3
-.TP 3
-\-XListAnnotationTypes
-List found annotation types.
-.TP 3
-\-XListDeclarations
-List specified and included declarations.
-.TP 3
-\-XPrintAptRounds
-Print information about initial and recursive \f2apt\fP rounds.
-.TP 3
-\-XPrintFactoryInfo
-Print information about which annotations a factory is asked to process.
-.TP 3
-\-XclassesAsDecls
-Treat both class and source files as declarations to process.
-.RE
-
-.LP
-.LP
-\f3Note\fP: Because these options are non\-standard, they are subject to change without notice.
-.LP
-.SH "NOTES"
-.LP
-.LP
-The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
-.LP
-.SH "SEE ALSO"
-.LP
-.RS 3
-.TP 2
-o
-javac(1), java(1)
-.RE
-
-.LP
-
diff --git a/jdk/src/linux/doc/man/ja/apt.1 b/jdk/src/linux/doc/man/ja/apt.1
deleted file mode 100644
index bd78898..0000000
--- a/jdk/src/linux/doc/man/ja/apt.1
+++ /dev/null
@@ -1,153 +0,0 @@
-." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-." 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.
-."
-.TH apt 1 "07 May 2011"
-
-.LP
-.SH "NAME"
-.LP
-.LP
-\f2apt\fP \- Ãí¼á½èÍý¥Ä¡¼¥ë
-.LP
-.SH "·Á¼°"
-.LP
-.LP
-\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files]
-.LP
-.SH "¥Ñ¥é¥á¡¼¥¿"
-.LP
-.LP
-¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£ÆÃÄê¤Î¥ª¥×¥·¥ç¥ó¤ËŬÍѤµ¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢²¼µ¤Î¡Ö¥ª¥×¥·¥ç¥ó¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.RS 3
-.TP 3
-sourcefiles
-¥¼¥í¡¢1 ¤Ä¡¢¤Þ¤¿¤ÏÊ£¿ô¤Î½èÍýÂоݤΥ½¡¼¥¹¥Õ¥¡¥¤¥ë
-.TP 3
- at files
-¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¾¤Î¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë 1 ¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë
-.RE
-
-.LP
-.SH "ÀâÌÀ"
-.LP
-.LP
-\f3Ãí\fP: \f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.LP
-Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
-.LP
-.LP
-¥Ä¡¼¥ë¤Îµ¡Ç½¤Ë´Ø¤¹¤ë¾ÜºÙ¤È¡¢\f2apt\fP ¤ò»ÈÍѤ·¤¿³«È¯ÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-.na
-\f4¡Öapt ÆþÌç¡×\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.SH "¥ª¥×¥·¥ç¥ó"
-.LP
-.SS
-apt ¸ÇͤΥª¥×¥·¥ç¥ó
-.LP
-.RS 3
-.TP 3
-\-s dir
-¥×¥í¥»¥Ã¥µ¤ÎÀ¸À®¤¹¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¥Ç¥£¥ì¥¯¥È¥ê¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¶õ´Ö¤Ë´ð¤Å¤¤¤Æ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹¡£
-.TP 3
-\-nocompile
-¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤»¤ó¡£
-.TP 3
-\-print
-»ØÄꤷ¤¿¥¿¥¤¥×¤Î¥Æ¥¥¹¥Èɽ¸½¤ò½ÐÎϤ·¤Þ¤¹¡£ Ãí¼á½èÍý¤Þ¤¿¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
-.TP 3
-\-A[key[=val]]
-Ãí¼á¥×¥í¥»¥Ã¥µ¤ØÅϤ¹¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2apt\fP ¤¬Ä¾Àܲò¼á¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢¤½¤ì¤¾¤ì¤Î¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ»ÈÍѤǤ¤ë¤è¤¦¤ËÊѤ¨¤é¤ì¤Þ¤¹¡£
-.TP 3
-\-factorypath path
-Ãí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£
-.TP 3
-\-factory classname
-»ÈÍѤ¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤Î̾Á°¤Ç¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Î¸¡½Ð¥×¥í¥»¥¹¤ò¾Êά¤·¤Þ¤¹¡£
-.TP 3
-\-version
-¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
-.TP 3
-\-X
-Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
-.RE
-
-.LP
-.SS
-javac ¤È¶¦ÍѤ¹¤ë¥ª¥×¥·¥ç¥ó
-.LP
-.RS 3
-.TP 3
-\-d dir
-¥×¥í¥»¥Ã¥µ¤È javac À¸À®¤Î¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
-.TP 3
-\-cp path ¤Þ¤¿¤Ï \-classpath path
-¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤ÈÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£\f2\-factorypath\fP ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£
-.RE
-
-.LP
-.LP
-\f2javac\fP ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢javac(1) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.SS
-Èóɸ½à¥ª¥×¥·¥ç¥ó
-.LP
-.RS 3
-.TP 3
-\-XListAnnotationTypes
-Ãí¼á¤Î·¿¤Ë¸¡½Ð¤µ¤ì¤ë¥ê¥¹¥È.
-.TP 3
-\-XListDeclarations
-»ØÄꤪ¤è¤ÓÀë¸À¤¬¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤ë¥ê¥¹¥È.
-.TP 3
-\-XPrintAptRounds
-½é´ü¤ª¤è¤ÓºÆµ¢Åª¤Ê \f2apt\fP ¥é¥¦¥ó¥É¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë.
-.TP 3
-\-XPrintFactoryInfo
-½èÍý¤òÍ׵᤹¤ë¥Õ¥¡¥¯¥È¥ê¤ÎÃí¼á¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë.
-.TP 3
-\-XclassesAsDecls
-¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¡¢½èÍýÂоݤÎÀë¸À¤È¤·¤Æ½èÍý¤·¤Þ¤¹¡£
-.RE
-
-.LP
-.LP
-\f3Ãí\fP: ¤³¤ì¤é¤ÏÈóɸ½à¥ª¥×¥·¥ç¥ó¤Ê¤Î¤Ç¡¢Í½¹ð¤Ê¤¯Êѹ¹¤µ¤ì¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
-.LP
-.SH "Ãí"
-.LP
-.LP
-\f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.SH "´ØÏ¢¹àÌÜ"
-.LP
-.RS 3
-.TP 2
-o
-javac(1), java(1)
-.RE
-
-.LP
-
diff --git a/jdk/src/share/back/commonRef.c b/jdk/src/share/back/commonRef.c
index c63fd74..94da8f1 100644
--- a/jdk/src/share/back/commonRef.c
+++ b/jdk/src/share/back/commonRef.c
@@ -23,6 +23,10 @@
* questions.
*/
+#if defined(_ALLBSD_SOURCE)
+#include <stdint.h> /* for uintptr_t */
+#endif
+
#include "util.h"
#include "commonRef.h"
diff --git a/jdk/src/share/bin/emessages.h b/jdk/src/share/bin/emessages.h
index e48d566..caf060f 100644
--- a/jdk/src/share/bin/emessages.h
+++ b/jdk/src/share/bin/emessages.h
@@ -93,6 +93,7 @@
#define JRE_ERROR10 "Error: Unable to resolve current executable"
#define JRE_ERROR11 "Error: Path length exceeds maximum length (PATH_MAX)"
#define JRE_ERROR12 "Error: Exec of %s failed"
+#define JRE_ERROR13 "Error: String processing operation failed"
#define DLL_ERROR1 "Error: dl failure on line %d"
#define DLL_ERROR2 "Error: failed %s, because %s"
diff --git a/jdk/src/share/bin/java.c b/jdk/src/share/bin/java.c
index 37f13c8..1a3a04e 100644
--- a/jdk/src/share/bin/java.c
+++ b/jdk/src/share/bin/java.c
@@ -151,7 +151,6 @@ static int knownVMsLimit = 0;
static void GrowKnownVMs();
static int KnownVMIndex(const char* name);
static void FreeKnownVMs();
-static void ShowSplashScreen();
static jboolean IsWildCardEnabled();
#define ARG_CHECK(n, f, a) if (n < 1) { \
@@ -195,14 +194,6 @@ enum LaunchMode { // cf. sun.launcher.LauncherHelper
static const char *launchModeNames[]
= { "Unknown", "Main class", "JAR file", "Module" };
-typedef struct {
- int argc;
- char **argv;
- int mode;
- char *what;
- InvocationFunctions ifn;
-} JavaMainArgs;
-
/*
* Entry point.
*/
@@ -232,6 +223,7 @@ JLI_Launch(int argc, char ** argv, /* main argc, argc */
jlong start, end;
char jvmpath[MAXPATHLEN];
char jrepath[MAXPATHLEN];
+ char jvmcfg[MAXPATHLEN];
_fVersion = fullversion;
_dVersion = dotversion;
@@ -276,7 +268,8 @@ JLI_Launch(int argc, char ** argv, /* main argc, argc */
CreateExecutionEnvironment(&argc, &argv,
jrepath, sizeof(jrepath),
- jvmpath, sizeof(jvmpath));
+ jvmpath, sizeof(jvmpath),
+ jvmcfg, sizeof(jvmcfg));
ifn.CreateJavaVM = 0;
ifn.GetDefaultJavaVMInitArgs = 0;
@@ -356,11 +349,7 @@ JLI_Launch(int argc, char ** argv, /* main argc, argc */
/* set the -Dsun.java.launcher.* platform properties */
SetJavaLauncherPlatformProps();
- /* Show the splash screen if needed */
- ShowSplashScreen();
-
- return ContinueInNewThread(&ifn, argc, argv, mode, what, ret);
-
+ return JVMInit(&ifn, threadStackSize, argc, argv, mode, what, ret);
}
/*
* Always detach the main thread so that it appears to have ended when
@@ -419,6 +408,8 @@ JavaMain(void * _args)
int ret = 0;
jlong start, end;
+ RegisterThread();
+
/* Initialize the virtual machine */
start = CounterGet();
if (!InitializeJVM(&vm, &env, &ifn)) {
@@ -488,7 +479,7 @@ JavaMain(void * _args)
*/
mainClass = LoadMainClass(env, mode, what);
CHECK_EXCEPTION_NULL_LEAVE(mainClass);
-
+ PostJVMInit(env, mainClass, vm);
/*
* The LoadMainClass not only loads the main class, it will also ensure
* that the main method's signature is correct, therefore further checking
@@ -1206,7 +1197,9 @@ ParseArguments(int *pargc, char ***pargv,
legacy = JNI_FALSE;
} else
ARG_FAIL1(ARG_ERROR9, arg);
- } else if (RemovableOption(arg) ) {
+ } else if (ProcessPlatformOption(arg)) {
+ ; /* Processing of platform dependent options */
+ } else if (RemovableOption(arg)) {
; /* Do not pass option to vm. */
} else {
AddOption(arg, NULL);
@@ -1330,17 +1323,6 @@ InitializeJVM(JavaVM **pvm, JNIEnv **penv, InvocationFunctions *ifn)
return r == JNI_OK;
}
-
-#define NULL_CHECK0(e) if ((e) == 0) { \
- JLI_ReportErrorMessage(JNI_ERROR); \
- return 0; \
- }
-
-#define NULL_CHECK(e) if ((e) == 0) { \
- JLI_ReportErrorMessage(JNI_ERROR); \
- return; \
- }
-
static jclass helperClass = NULL;
static jclass
@@ -1850,10 +1832,9 @@ PrintUsage(JNIEnv* env, jboolean doXUsage)
* mechanism.
*/
jint
-ReadKnownVMs(const char *jrepath, const char * arch, jboolean speculative)
+ReadKnownVMs(const char *jvmCfgName, jboolean speculative)
{
FILE *jvmCfg;
- char jvmCfgName[MAXPATHLEN+20];
char line[MAXPATHLEN+20];
int cnt = 0;
int lineno = 0;
@@ -1866,8 +1847,6 @@ ReadKnownVMs(const char *jrepath, const char * arch, jboolean speculative)
if (JLI_IsTraceLauncher()) {
start = CounterGet();
}
- JLI_Snprintf(jvmCfgName, sizeof(jvmCfgName), "%s%slib%s%s%sjvm.cfg",
- jrepath, FILESEP, FILESEP, arch, FILESEP);
jvmCfg = fopen(jvmCfgName, "r");
if (jvmCfg == NULL) {
@@ -2027,7 +2006,7 @@ FreeKnownVMs()
* Displays the splash screen according to the jar file name
* and image file names stored in environment variables
*/
-static void
+void
ShowSplashScreen()
{
const char *jar_name = getenv(SPLASH_JAR_ENV_ENTRY);
@@ -2116,8 +2095,9 @@ IsWildCardEnabled()
return _wc_enabled;
}
-static int
-ContinueInNewThread(InvocationFunctions* ifn, int argc, char **argv,
+int
+ContinueInNewThread(InvocationFunctions* ifn, jlong threadStackSize,
+ int argc, char **argv,
int mode, char *what, int ret)
{
diff --git a/jdk/src/share/bin/java.h b/jdk/src/share/bin/java.h
index 2351510..daea9d5 100644
--- a/jdk/src/share/bin/java.h
+++ b/jdk/src/share/bin/java.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -79,10 +79,12 @@
*/
typedef jint (JNICALL *CreateJavaVM_t)(JavaVM **pvm, void **env, void *args);
typedef jint (JNICALL *GetDefaultJavaVMInitArgs_t)(void *args);
+typedef jint (JNICALL *GetCreatedJavaVMs_t)(JavaVM **vmBuf, jsize bufLen, jsize *nVMs);
typedef struct {
CreateJavaVM_t CreateJavaVM;
GetDefaultJavaVMInitArgs_t GetDefaultJavaVMInitArgs;
+ GetCreatedJavaVMs_t GetCreatedJavaVMs;
} InvocationFunctions;
int
@@ -127,7 +129,8 @@ GetApplicationHome(char *buf, jint bufsize);
*/
void CreateExecutionEnvironment(int *argc, char ***argv,
char *jrepath, jint so_jrepath,
- char *jvmpath, jint so_jvmpath);
+ char *jvmpath, jint so_jvmpath,
+ char *jvmcfg, jint so_jvmcfg);
/* Reports an error message to stderr or a window as appropriate. */
void JLI_ReportErrorMessage(const char * message, ...);
@@ -165,7 +168,7 @@ void SetModuleBootProp(char *bpath);
/*
* Functions defined in java.c and used in java_md.c.
*/
-jint ReadKnownVMs(const char *jrepath, const char * arch, jboolean speculative);
+jint ReadKnownVMs(const char *jvmcfg, jboolean speculative);
char *CheckJvmType(int *argc, char ***argv, jboolean speculative);
void AddOption(char *str, void *info);
@@ -184,9 +187,13 @@ jint GetErgoPolicy();
jboolean ServerClassMachine();
-static int ContinueInNewThread(InvocationFunctions* ifn,
- int argc, char** argv,
- int mode, char *what, int ret);
+int ContinueInNewThread(InvocationFunctions* ifn, jlong threadStackSize,
+ int argc, char** argv,
+ int mode, char *what, int ret);
+
+int JVMInit(InvocationFunctions* ifn, jlong threadStackSize,
+ int argc, char** argv,
+ int mode, char *what, int ret);
/*
* Initialize platform specific settings
@@ -194,6 +201,21 @@ static int ContinueInNewThread(InvocationFunctions* ifn,
void InitLauncher(jboolean javaw);
/*
+ * For MacOSX and Windows/Unix compatibility we require these
+ * entry points, some of them may be stubbed out on Windows/Unixes.
+ */
+void PostJVMInit(JNIEnv *env, jstring mainClass, JavaVM *vm);
+void ShowSplashScreen();
+void RegisterThread();
+/*
+ * this method performs additional platform specific processing and
+ * should return JNI_TRUE to indicate the argument has been consumed,
+ * otherwise returns JNI_FALSE to allow the calling logic to further
+ * process the option.
+ */
+jboolean ProcessPlatformOption(const char *arg);
+
+/*
* This allows for finding classes from the VM's bootstrap class loader directly,
* FindClass uses the application class loader internally, this will cause
* unnecessary searching of the classpath for the required classes.
@@ -202,4 +224,25 @@ void InitLauncher(jboolean javaw);
typedef jclass (JNICALL FindClassFromBootLoader_t(JNIEnv *env,
const char *name));
jclass FindBootStrapClass(JNIEnv *env, const char *classname);
+
+int JNICALL JavaMain(void * args); /* entry point */
+
+#define NULL_CHECK0(e) if ((e) == 0) { \
+ JLI_ReportErrorMessage(JNI_ERROR); \
+ return 0; \
+ }
+
+#define NULL_CHECK(e) if ((e) == 0) { \
+ JLI_ReportErrorMessage(JNI_ERROR); \
+ return; \
+ }
+
+typedef struct {
+ int argc;
+ char **argv;
+ int mode;
+ char *what;
+ InvocationFunctions ifn;
+} JavaMainArgs;
+
#endif /* _JAVA_H_ */
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
index 82f51f7..b69875d 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@ import java.security.InvalidKeyException;
import java.security.Key;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
+import java.security.ProviderException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.InvalidKeySpecException;
import javax.crypto.KeyAgreementSpi;
@@ -234,31 +235,14 @@ extends KeyAgreementSpi {
protected byte[] engineGenerateSecret()
throws IllegalStateException
{
- if (generateSecret == false) {
- throw new IllegalStateException
- ("Key agreement has not been completed yet");
- }
-
- // Reset the key agreement here (in case anything goes wrong)
- generateSecret = false;
-
- // get the modulus
- BigInteger modulus = init_p;
-
- BigInteger tmpResult = y.modPow(x, modulus);
- byte[] secret = tmpResult.toByteArray();
-
- /*
- * BigInteger.toByteArray will sometimes put a sign byte up front, but
- * we NEVER want one.
- */
- if ((tmpResult.bitLength() % 8) == 0) {
- byte retval[] = new byte[secret.length - 1];
- System.arraycopy(secret, 1, retval, 0, retval.length);
- return retval;
- } else {
- return secret;
+ int expectedLen = (init_p.bitLength() + 7) >>> 3;
+ byte[] result = new byte[expectedLen];
+ try {
+ engineGenerateSecret(result, 0);
+ } catch (ShortBufferException sbe) {
+ // should never happen since length are identical
}
+ return result;
}
/**
@@ -301,39 +285,51 @@ extends KeyAgreementSpi {
}
BigInteger modulus = init_p;
- byte[] secret = this.y.modPow(this.x, modulus).toByteArray();
-
- // BigInteger.toByteArray will sometimes put a sign byte up front,
- // but we NEVER want one.
- if ((secret.length << 3) != modulus.bitLength()) {
- if ((sharedSecret.length - offset) < (secret.length - 1)) {
- throw new ShortBufferException
+ int expectedLen = (modulus.bitLength() + 7) >>> 3;
+ if ((sharedSecret.length - offset) < expectedLen) {
+ throw new ShortBufferException
("Buffer too short for shared secret");
- }
- System.arraycopy(secret, 1, sharedSecret, offset,
- secret.length - 1);
-
- // Reset the key agreement here (not earlier!), so that people
- // can recover from ShortBufferException above without losing
- // internal state
- generateSecret = false;
+ }
- return secret.length - 1;
+ // Reset the key agreement after checking for ShortBufferException
+ // above, so user can recover w/o losing internal state
+ generateSecret = false;
+ /*
+ * NOTE: BigInteger.toByteArray() returns a byte array containing
+ * the two's-complement representation of this BigInteger with
+ * the most significant byte is in the zeroth element. This
+ * contains the minimum number of bytes required to represent
+ * this BigInteger, including at least one sign bit whose value
+ * is always 0.
+ *
+ * Keys are always positive, and the above sign bit isn't
+ * actually used when representing keys. (i.e. key = new
+ * BigInteger(1, byteArray)) To obtain an array containing
+ * exactly expectedLen bytes of magnitude, we strip any extra
+ * leading 0's, or pad with 0's in case of a "short" secret.
+ */
+ byte[] secret = this.y.modPow(this.x, modulus).toByteArray();
+ if (secret.length == expectedLen) {
+ System.arraycopy(secret, 0, sharedSecret, offset,
+ secret.length);
} else {
- if ((sharedSecret.length - offset) < secret.length) {
- throw new ShortBufferException
- ("Buffer too short to hold shared secret");
+ // Array too short, pad it w/ leading 0s
+ if (secret.length < expectedLen) {
+ System.arraycopy(secret, 0, sharedSecret,
+ offset + (expectedLen - secret.length),
+ secret.length);
+ } else {
+ // Array too long, check and trim off the excess
+ if ((secret.length == (expectedLen+1)) && secret[0] == 0) {
+ // ignore the leading sign byte
+ System.arraycopy(secret, 1, sharedSecret, offset, expectedLen);
+ } else {
+ throw new ProviderException("Generated secret is out-of-range");
+ }
}
- System.arraycopy(secret, 0, sharedSecret, offset, secret.length);
-
- // Reset the key agreement here (not earlier!), so that people
- // can recover from ShortBufferException above without losing
- // internal state
- generateSecret = false;
-
- return secret.length;
}
+ return expectedLen;
}
/**
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PBEKey.java b/jdk/src/share/classes/com/sun/crypto/provider/PBEKey.java
index a650133..22a315e 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PBEKey.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PBEKey.java
@@ -55,9 +55,12 @@ final class PBEKey implements SecretKey {
// Should allow an empty password.
passwd = new char[0];
}
- for (int i=0; i<passwd.length; i++) {
- if ((passwd[i] < '\u0020') || (passwd[i] > '\u007E')) {
- throw new InvalidKeySpecException("Password is not ASCII");
+ // Accept "\0" to signify "zero-length password with no terminator".
+ if (!(passwd.length == 1 && passwd[0] == 0)) {
+ for (int i=0; i<passwd.length; i++) {
+ if ((passwd[i] < '\u0020') || (passwd[i] > '\u007E')) {
+ throw new InvalidKeySpecException("Password is not ASCII");
+ }
}
}
this.key = new byte[passwd.length];
diff --git a/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java b/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
index e091e90..7c15de2 100644
--- a/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
+++ b/jdk/src/share/classes/com/sun/crypto/provider/PKCS12PBECipherCore.java
@@ -60,11 +60,16 @@ final class PKCS12PBECipherCore {
static byte[] derive(char[] chars, byte[] salt,
int ic, int n, int type) {
- // Add in trailing NULL terminator.
+ // Add in trailing NULL terminator. Special case:
+ // no terminator if password is "\0".
int length = chars.length*2;
- if (length != 0) {
+ if (length == 2 && chars[0] == 0) {
+ chars = new char[0];
+ length = 0;
+ } else {
length += 2;
}
+
byte[] passwd = new byte[length];
for (int i = 0, j = 0; i < chars.length; i++, j+=2) {
passwd[j] = (byte) ((chars[i] >>> 8) & 0xFF);
@@ -133,6 +138,9 @@ final class PKCS12PBECipherCore {
}
private static void concat(byte[] src, byte[] dst, int start, int len) {
+ if (src.length == 0) {
+ return;
+ }
int loop = len / src.length;
int off, i;
for (i = 0, off = 0; i < loop; i++, off += src.length)
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
index 27918c0..fd304e0 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java
@@ -477,6 +477,10 @@ class Metacity implements SynthConstants {
String[] dirs = new String[] {
userHome + sep + ".themes",
System.getProperty("swing.metacitythemedir"),
+ "/usr/X11R6/share/themes",
+ "/usr/X11R6/share/gnome/themes",
+ "/usr/local/share/themes",
+ "/usr/local/share/gnome/themes",
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
index b872303..6fe38ab 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java
@@ -55,7 +55,6 @@ import javax.swing.text.DefaultEditorKit;
import java.awt.Font;
import java.awt.Color;
-import java.awt.event.KeyEvent;
import java.awt.event.ActionEvent;
import java.security.AccessController;
@@ -523,6 +522,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
Object ScrollbarBackgroundColor = new DesktopProperty(
"win.scrollbar.backgroundColor",
table.get("scrollbar"));
+ Object buttonFocusColor = new FocusColorProperty();
Object TextBackground = new XPColorValue(Part.EP_EDIT, null, Prop.FILLCOLOR,
WindowBackgroundColor);
@@ -629,7 +629,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
"Button.highlight", ControlHighlightColor,
"Button.disabledForeground", InactiveTextColor,
"Button.disabledShadow", ControlHighlightColor,
- "Button.focus", black,
+ "Button.focus", buttonFocusColor,
"Button.dashedRectGapX", new XPValue(Integer.valueOf(3), Integer.valueOf(5)),
"Button.dashedRectGapY", new XPValue(Integer.valueOf(3), Integer.valueOf(4)),
"Button.dashedRectGapWidth", new XPValue(Integer.valueOf(6), Integer.valueOf(10)),
@@ -652,7 +652,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
"CheckBox.darkShadow", ControlDarkShadowColor,
"CheckBox.light", ControlLightColor,
"CheckBox.highlight", ControlHighlightColor,
- "CheckBox.focus", black,
+ "CheckBox.focus", buttonFocusColor,
"CheckBox.focusInputMap",
new UIDefaults.LazyInputMap(new Object[] {
"SPACE", "pressed",
@@ -1007,7 +1007,7 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
"RadioButton.darkShadow", ControlDarkShadowColor,
"RadioButton.light", ControlLightColor,
"RadioButton.highlight", ControlHighlightColor,
- "RadioButton.focus", black,
+ "RadioButton.focus", buttonFocusColor,
"RadioButton.focusInputMap",
new UIDefaults.LazyInputMap(new Object[] {
"SPACE", "pressed",
@@ -2614,4 +2614,19 @@ public class WindowsLookAndFeel extends BasicLookAndFeel
}
}
+ private static class FocusColorProperty extends DesktopProperty {
+ public FocusColorProperty () {
+ // Fallback value is never used bacause of the configureValue method doesn't return null
+ super("win.3d.backgroundColor", Color.BLACK);
+ }
+
+ @Override
+ protected Object configureValue(Object value) {
+ if (! ((Boolean)Toolkit.getDefaultToolkit().getDesktopProperty("win.highContrast.on")).booleanValue()){
+ return Color.BLACK;
+ }
+ return Color.BLACK.equals(value) ? Color.WHITE : Color.BLACK;
+ }
+ }
+
}
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
index 8fb15f9..302b6bc 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsProgressBarUI.java
@@ -137,6 +137,11 @@ public class WindowsProgressBarUI extends BasicProgressBarUI
g.setColor(progressBar.getForeground());
barRectHeight -= 2;
barRectWidth -= 2;
+
+ if (barRectWidth <= 0 || barRectHeight <= 0) {
+ return;
+ }
+
Graphics2D g2 = (Graphics2D)g;
g2.setStroke(new BasicStroke((float)(vertical ? barRectWidth : barRectHeight),
BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
diff --git a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
index 56214ac..81c97f4 100644
--- a/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
+++ b/jdk/src/share/classes/com/sun/java/swing/plaf/windows/WindowsRadioButtonUI.java
@@ -89,6 +89,11 @@ public class WindowsRadioButtonUI extends BasicRadioButtonUI
}
}
+ protected void uninstallDefaults(AbstractButton b) {
+ super.uninstallDefaults(b);
+ initialized = false;
+ }
+
protected Color getFocusColor() {
return focusColor;
}
diff --git a/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java b/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java
index 65db51e..33d69ec 100644
--- a/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java
+++ b/jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -622,11 +622,7 @@ public class DnsClient {
//-------------------------------------------------------------------------
- private static boolean debug = false;
-
- public static void setDebug(boolean flag) {
- debug = flag;
- }
+ private static final boolean debug = false;
private static void dprint(String mess) {
if (debug) {
diff --git a/jdk/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java b/jdk/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java
index 0f6c1d5..2e5858b 100644
--- a/jdk/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java
+++ b/jdk/src/share/classes/com/sun/jndi/toolkit/url/UrlUtil.java
@@ -27,6 +27,7 @@ package com.sun.jndi.toolkit.url;
import java.net.MalformedURLException;
import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
/**
* Utilities for dealing with URLs.
@@ -61,29 +62,14 @@ final public class UrlUtil {
* The string is subsequently converted using the specified encoding
*/
public static final String decode(String s, String enc)
- throws MalformedURLException, UnsupportedEncodingException {
-
- int length = s.length();
- byte[] bytes = new byte[length];
- int j = 0;
-
- for (int i = 0; i < length; i++) {
- if (s.charAt(i) == '%') {
- i++; // skip %
- try {
- bytes[j++] = (byte)
- Integer.parseInt(s.substring(i, i + 2), 16);
-
- } catch (Exception e) {
- throw new MalformedURLException("Invalid URI encoding: " + s);
- }
- i++; // skip first hex char; for loop will skip second one
- } else {
- bytes[j++] = (byte) s.charAt(i);
- }
+ throws MalformedURLException, UnsupportedEncodingException {
+ try {
+ return URLDecoder.decode(s, enc);
+ } catch (IllegalArgumentException iae) {
+ MalformedURLException mue = new MalformedURLException("Invalid URI encoding: " + s);
+ mue.initCause(iae);
+ throw mue;
}
-
- return new String(bytes, 0, j, enc);
}
/**
diff --git a/jdk/src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java b/jdk/src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java
deleted file mode 100644
index e42bff6..0000000
--- a/jdk/src/share/classes/com/sun/management/DiagnosticCommandArgumentInfo.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.management;
-
-import java.beans.ConstructorProperties;
-
-/**
- * Diagnostic Command Argument information. It contains the description
- * of one parameter of the diagnostic command. A parameter can either be an
- * option or an argument. Options are identified by the option name while
- * arguments are identified by their position in the command line. The generic
- * syntax of a diagnostic command is:
- * <blockquote>
- * <command name> [<option>=<value>] [<argument_value>]
- * </blockquote>
- * Example:
- * <blockquote>
- * command_name option1=value1 option2=value argumentA argumentB argumentC
- * </blockquote>
- * In this command line, the diagnostic command receives five parameters, two
- * options named {@code option1} and {@code option2}, and three arguments.
- * argumentA's position is 0, argumentB's position is 1 and argumentC's
- * position is 2.
- *
- * @author Frederic Parain
- * @since 7u4
- */
-
-public class DiagnosticCommandArgumentInfo {
- private final String name;
- private final String description;
- private final String type;
- private final String defaultValue;
- private final boolean mandatory;
- private final boolean option;
- private final int position;
-
- /**
- * Returns the argument name
- *
- * @return the argument name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the argument description
- *
- * @return the argument description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Returns the argument type
- *
- * @return the argument type
- */
- public String getType() {
- return type;
- }
-
- /**
- * Returns the default value as a String if a default value
- * is defined, null otherwise.
- *
- * @return the default value as a String if a default value
- * is defined, null otherwise.
- */
- public String getDefault() {
- return defaultValue;
- }
-
- /**
- * Returns {@code true} if the argument is mandatory,
- * {@code false} otherwise
- *
- * @return {@code true} if the argument is mandatory,
- * {@code false} otherwise
- */
- public boolean isMandatory() {
- return mandatory;
- }
-
- /**
- * Returns {@code true} if the argument is an option,
- * {@code false} otherwise. Options have to be specified using the
- * <key>=<value> syntax on the command line, while other
- * arguments are specified with a single <value> field and are
- * identified by their position on command line.
- *
- * @return {@code true} if the argument is an option,
- * {@code false} otherwise
- */
- public boolean isOption() {
- return option;
- }
-
- /**
- * Returns the expected position of this argument if it is not an option,
- * -1 otherwise. Argument position if defined from left to right,
- * starting at zero and ignoring the diagnostic command name and
- * options.
- *
- * @return the expected position of this argument if it is not an option,
- * -1 otherwise.
- */
- public int getPosition() {
- return position;
- }
-
- @ConstructorProperties({"name","description","type","default",
- "mandatory","option","position"})
- public DiagnosticCommandArgumentInfo(String name, String description,
- String type, String defaultValue,
- boolean mandatory, boolean option,
- int position) {
- this.name = name;
- this.description = description;
- this.type = type;
- this.defaultValue = defaultValue;
- this.mandatory = mandatory;
- this.option = option;
- this.position = position;
- }
-}
diff --git a/jdk/src/share/classes/com/sun/management/DiagnosticCommandInfo.java b/jdk/src/share/classes/com/sun/management/DiagnosticCommandInfo.java
deleted file mode 100644
index 4ce56c1..0000000
--- a/jdk/src/share/classes/com/sun/management/DiagnosticCommandInfo.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.management;
-
-import java.beans.ConstructorProperties;
-import java.util.List;
-
-/**
- * Diagnostic command information. It contains the description of a
- * diagnostic command.
- *
- * @author Frederic Parain
- * @since 7u4
- */
-
-public class DiagnosticCommandInfo {
- private final String name;
- private final String description;
- private final String impact;
- private final boolean enabled;
- private final List<DiagnosticCommandArgumentInfo> arguments;
-
- /**
- * Returns the diagnostic command name
- *
- * @return the diagnostic command name
- */
- public String getName() {
- return name;
- }
-
- /**
- * Returns the diagnostic command description
- *
- * @return the diagnostic command description
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Returns the potential impact of the diagnostic command execution
- * on the Java virtual machine behavior
- *
- * @return the potential impact of the diagnostic command execution
- * on the Java virtual machine behavior
- */
- public String getImpact() {
- return impact;
- }
-
- /**
- * Returns {@code true} if the diagnostic command is enabled,
- * {@code false} otherwise. The enabled/disabled
- * status of a diagnostic command can evolve during
- * the lifetime of the Java virtual machine.
- *
- * @return {@code true} if the diagnostic command is enabled,
- * {@code false} otherwise
- */
- public boolean isEnabled() {
- return enabled;
- }
-
- /**
- * Returns the list of the diagnostic command arguments description.
- * If the diagnostic command has no arguments, it returns an empty list.
- *
- * @return a list of the diagnostic command arguments description
- */
- public List<DiagnosticCommandArgumentInfo> getArgumentsInfo() {
- return arguments;
- }
-
- @ConstructorProperties({"name", "description","impact","enabled",
- "argumentsInfo"})
- public DiagnosticCommandInfo(String name, String description,
- String impact, boolean enabled,
- List<DiagnosticCommandArgumentInfo> arguments)
- {
- this.name = name;
- this.description = description;
- this.impact = impact;
- this.enabled = enabled;
- this.arguments = arguments;
- }
-}
diff --git a/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java b/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
index 63b813f..2fe8835 100644
--- a/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
+++ b/jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,11 +31,6 @@ import java.lang.management.PlatformManagedObject;
/**
* Diagnostic management interface for the HotSpot Virtual Machine.
*
- * <p>{@linkplain #getDiagnosticCommands Diagnostic commands}
- * are actions that can be invoked dynamically and
- * executed in a target Java virtual machine, mainly for troubleshooting
- * and diagnosis.
- *
* <p>The diagnostic MBean is registered to the platform MBeanServer
* as are other platform MBeans.
*
@@ -116,108 +111,4 @@ public interface HotSpotDiagnosticMXBean extends PlatformManagedObject {
* ManagementPermission("control").
*/
public void setVMOption(String name, String value);
-
- /**
- * Returns the {@linkplain DiagnosticCommandInfo#getName() names}
- * of all diagnostic commands.
- * A diagnostic command is an action that can be invoked dynamically
- * mainly for troubleshooting and diagnosis. The list of diagnostic
- * commands may change at runtime. A diagnostic command may be
- * {@linkplain DiagnosticCommandInfo#isEnabled disabled} but will
- * not be removed from a previously returned list.
- *
- * @return the names of all diagnostic commands.
- *
- * @since 7u4
- */
- public List<String> getDiagnosticCommands();
-
- /**
- * Returns a {@code DiagnosticCommandInfo} object describing the
- * diagnostic command of the specified name {@code command}
- *
- * @param command a diagnostic command name
- * @return a {@code DiagnosticCommandInfo} object
- * @throws java.lang.IllegalArgumentException if the {@code command}
- * doesn't match any diagnostic command registered in the
- * targeted Java virtual machine.
- *
- * @since 7u4
- */
- public DiagnosticCommandInfo getDiagnosticCommandInfo(String command);
-
- /**
- * Returns a list of {@code DiagnosticCommandInfo} object describing
- * all diagnostic commands available on the targeted Java virtual machine
- *
- * @return a list of {@code DiagnosticCommandInfo} objects
- *
- * @since 7u4
- */
- public List<DiagnosticCommandInfo> getDiagnosticCommandInfo();
-
- /**
- * Returns a list of {@code DiagnosticCommandInfo} object describing
- * all diagnostic commands specified in the {@code commands} list.
- *
- * @param commands {@code List} of {@code String} containing diagnostic
- * command names
- * @return a {@code List} of {@code DiagnosticCommandInfo} objects
- *
- * @throws java.lang.IllegalArgumentException if at least one
- * command specified in the {@code commands } list
- * doesn't match any diagnostic command registered in the
- * targeted Java virtual machine.
- *
- * @since 7u4
- */
- public List<DiagnosticCommandInfo> getDiagnosticCommandInfo(List<String> commands);
-
- /**
- * Executes the command line {@code commandLine}. The command line must
- * start with a diagnostic command name, optionally followed by parameters.
- * Each command has its own syntax but the generic syntax for a diagnostic
- * command line is:
- * <blockquote>
- * <command name> [<option>=<value>] [<argument_value>]
- * </blockquote>
- *
- * @param commandLine command line to execute
- * @return a {@code String} object containing the diagnostic command
- * output.
- *
- * @throws java.lang.IllegalArgumentException if the command line doesn't
- * match any diagnostic command registered in the virtual machine
- * of if the parameters don't match the diagnostic command syntax.
- * @throws java.lang.SecurityException
- * if a security manager exists and the caller does not have
- * ManagementPermission("control").
- *
- * @since 7u4
- */
- public String execute(String commandLine);
-
- /**
- * Invokes the diagnostic command named {@code cmd} with the parameters
- * specified in {@code args}. Each command has its own syntax but
- * the generic syntax for parameters is:
- * <blockquote>
- * [<option>=<value>] [<argument_value>]
- * </blockquote>
- *
- * @param cmd a diagnostic command name
- * @param args the command parameters
- * @return a {@code String} object containing the diagnostic command
- * output.
- *
- * @throws java.lang.IllegalArgumentException if the command line doesn't
- * match any diagnostic command registered in the virtual machine
- * of if the parameters don't match the diagnostic command syntax.
- * @throws java.lang.SecurityException
- * if a security manager exists and the caller does not have
- * ManagementPermission("control").
- *
- * @since 7u4
- */
- public String execute(String cmd, String... args);
}
diff --git a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java b/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java
index c9d57c6..7b5e533 100644
--- a/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java
+++ b/jdk/src/share/classes/com/sun/media/sound/DirectAudioDevice.java
@@ -736,7 +736,7 @@ class DirectAudioDevice extends AbstractMixer {
if (off < 0) {
throw new ArrayIndexOutOfBoundsException(off);
}
- if (off + len > b.length) {
+ if ((long)off + (long)len > (long)b.length) {
throw new ArrayIndexOutOfBoundsException(b.length);
}
@@ -964,7 +964,7 @@ class DirectAudioDevice extends AbstractMixer {
if (off < 0) {
throw new ArrayIndexOutOfBoundsException(off);
}
- if (off + len > b.length) {
+ if ((long)off + (long)len > (long)b.length) {
throw new ArrayIndexOutOfBoundsException(b.length);
}
if (!isActive() && doIO) {
diff --git a/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java b/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java
index 9912e08..2f7cdba 100644
--- a/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java
+++ b/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java
@@ -130,6 +130,12 @@ public class SoftMixingSourceDataLine extends SoftMixingDataLine implements
if (len % framesize != 0)
throw new IllegalArgumentException(
"Number of bytes does not represent an integral number of sample frames.");
+ if (off < 0) {
+ throw new ArrayIndexOutOfBoundsException(off);
+ }
+ if ((long)off + (long)len > (long)b.length) {
+ throw new ArrayIndexOutOfBoundsException(b.length);
+ }
byte[] buff = cycling_buffer;
int buff_len = cycling_buffer.length;
diff --git a/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java b/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
index 7b5c053..02ede0b 100644
--- a/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
+++ b/jdk/src/share/classes/com/sun/net/httpserver/spi/HttpServerProvider.java
@@ -76,7 +76,7 @@ public abstract class HttpServerProvider {
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link RuntimePermission}{@code("httpServerProvider")}
+ * {@link RuntimePermission}{@code ("httpServerProvider")}
*/
protected HttpServerProvider() {
SecurityManager sm = System.getSecurityManager();
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java b/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
index b851b77..85cac09 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/MessageInfo.java
@@ -94,7 +94,7 @@ public abstract class MessageInfo {
if (streamNumber < 0 || streamNumber > 65536)
throw new IllegalArgumentException("Invalid stream number");
- return new sun.nio.ch.SctpMessageInfoImpl(null, address, streamNumber);
+ return new sun.nio.ch.sctp.MessageInfoImpl(null, address, streamNumber);
}
/**
* Creates a {@code MessageInfo} instance suitable for use when
@@ -133,8 +133,8 @@ public abstract class MessageInfo {
if (streamNumber < 0 || streamNumber > 65536)
throw new IllegalArgumentException("Invalid stream number");
- return new sun.nio.ch.SctpMessageInfoImpl(association, address,
- streamNumber);
+ return new sun.nio.ch.sctp.MessageInfoImpl(association,
+ address, streamNumber);
}
/**
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
index d040a7a..2766698 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpChannel.java
@@ -162,7 +162,7 @@ public abstract class SctpChannel
*/
public static SctpChannel open() throws
IOException {
- return new sun.nio.ch.SctpChannelImpl((SelectorProvider)null);
+ return new sun.nio.ch.sctp.SctpChannelImpl((SelectorProvider)null);
}
/**
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
index 229d18e..e1df42e 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpMultiChannel.java
@@ -162,7 +162,7 @@ public abstract class SctpMultiChannel
*/
public static SctpMultiChannel open() throws
IOException {
- return new sun.nio.ch.SctpMultiChannelImpl((SelectorProvider)null);
+ return new sun.nio.ch.sctp.SctpMultiChannelImpl((SelectorProvider)null);
}
/**
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
index 3867fc9..49bb0bc 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpServerChannel.java
@@ -98,7 +98,7 @@ public abstract class SctpServerChannel
*/
public static SctpServerChannel open() throws
IOException {
- return new sun.nio.ch.SctpServerChannelImpl((SelectorProvider)null);
+ return new sun.nio.ch.sctp.SctpServerChannelImpl((SelectorProvider)null);
}
/**
diff --git a/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java b/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
index 22c5f4a..82d70be 100644
--- a/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
+++ b/jdk/src/share/classes/com/sun/nio/sctp/SctpStandardSocketOptions.java
@@ -25,7 +25,7 @@
package com.sun.nio.sctp;
import java.net.SocketAddress;
-import sun.nio.ch.SctpStdSocketOption;
+import sun.nio.ch.sctp.SctpStdSocketOption;
/**
* SCTP channels supports the socket options defined by this class
@@ -50,7 +50,7 @@ public class SctpStandardSocketOptions {
*/
public static final SctpSocketOption<Boolean> SCTP_DISABLE_FRAGMENTS = new
SctpStdSocketOption<Boolean>("SCTP_DISABLE_FRAGMENTS", Boolean.class,
- sun.nio.ch.SctpStdSocketOption.SCTP_DISABLE_FRAGMENTS);
+ sun.nio.ch.sctp.SctpStdSocketOption.SCTP_DISABLE_FRAGMENTS);
/**
* Enables or disables explicit message completion.
@@ -69,7 +69,7 @@ public class SctpStandardSocketOptions {
*/
public static final SctpSocketOption<Boolean> SCTP_EXPLICIT_COMPLETE = new
SctpStdSocketOption<Boolean>("SCTP_EXPLICIT_COMPLETE", Boolean.class,
- sun.nio.ch.SctpStdSocketOption.SCTP_EXPLICIT_COMPLETE);
+ sun.nio.ch.sctp.SctpStdSocketOption.SCTP_EXPLICIT_COMPLETE);
/**
* Fragmented interleave controls how the presentation of messages occur
@@ -120,7 +120,7 @@ public class SctpStandardSocketOptions {
public static final SctpSocketOption<Integer> SCTP_FRAGMENT_INTERLEAVE =
new SctpStdSocketOption<Integer>("SCTP_FRAGMENT_INTERLEAVE",
Integer.class,
- sun.nio.ch.SctpStdSocketOption.SCTP_FRAGMENT_INTERLEAVE);
+ sun.nio.ch.sctp.SctpStdSocketOption.SCTP_FRAGMENT_INTERLEAVE);
/**
* The maximum number of streams requested by the local endpoint during
@@ -171,7 +171,7 @@ public class SctpStandardSocketOptions {
*/
public static final SctpSocketOption<Boolean> SCTP_NODELAY =
new SctpStdSocketOption<Boolean>("SCTP_NODELAY", Boolean.class,
- sun.nio.ch.SctpStdSocketOption.SCTP_NODELAY);
+ sun.nio.ch.sctp.SctpStdSocketOption.SCTP_NODELAY);
/**
* Requests that the local SCTP stack use the given peer address as
@@ -246,7 +246,7 @@ public class SctpStandardSocketOptions {
*/
public static final SctpSocketOption<Integer> SO_SNDBUF =
new SctpStdSocketOption<Integer>("SO_SNDBUF", Integer.class,
- sun.nio.ch.SctpStdSocketOption.SO_SNDBUF);
+ sun.nio.ch.sctp.SctpStdSocketOption.SO_SNDBUF);
/**
* The size of the socket receive buffer.
@@ -273,7 +273,7 @@ public class SctpStandardSocketOptions {
*/
public static final SctpSocketOption<Integer> SO_RCVBUF =
new SctpStdSocketOption<Integer>("SO_RCVBUF", Integer.class,
- sun.nio.ch.SctpStdSocketOption.SO_RCVBUF);
+ sun.nio.ch.sctp.SctpStdSocketOption.SO_RCVBUF);
/**
* Linger on close if data is present.
@@ -304,7 +304,7 @@ public class SctpStandardSocketOptions {
*/
public static final SctpSocketOption<Integer> SO_LINGER =
new SctpStdSocketOption<Integer>("SO_LINGER", Integer.class,
- sun.nio.ch.SctpStdSocketOption.SO_LINGER);
+ sun.nio.ch.sctp.SctpStdSocketOption.SO_LINGER);
/**
* This class is used to set the maximum number of inbound/outbound streams
diff --git a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
index d58453c..2d805d1 100644
--- a/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
+++ b/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/implementations/TransformXPath2Filter.java
@@ -148,8 +148,8 @@ public class TransformXPath2Filter extends TransformSpi {
}
- input.addNodeFilter(new XPath2NodeFilter(convertNodeListToSet(unionNodes),
- convertNodeListToSet(substractNodes),convertNodeListToSet(intersectNodes)));
+ input.addNodeFilter(new XPath2NodeFilter(unionNodes, substractNodes,
+ intersectNodes));
input.setNodeSet(true);
return input;
} catch (TransformerException ex) {
@@ -170,32 +170,20 @@ public class TransformXPath2Filter extends TransformSpi {
throw new TransformationException("empty", ex);
}
}
- static Set<Node> convertNodeListToSet(List<NodeList> l){
- Set<Node> result=new HashSet<Node>();
-
- for (NodeList rootNodes : l) {
- int length = rootNodes.getLength();
- for (int i = 0; i < length; i++) {
- Node rootNode = rootNodes.item(i);
- result.add(rootNode);
- }
- }
- return result;
- }
}
class XPath2NodeFilter implements NodeFilter {
- boolean hasUnionNodes;
- boolean hasSubstractNodes;
- boolean hasIntersectNodes;
- XPath2NodeFilter(Set<Node> unionNodes, Set<Node> substractNodes,
- Set<Node> intersectNodes) {
- this.unionNodes=unionNodes;
- hasUnionNodes=!unionNodes.isEmpty();
- this.substractNodes=substractNodes;
- hasSubstractNodes=!substractNodes.isEmpty();
- this.intersectNodes=intersectNodes;
- hasIntersectNodes=!intersectNodes.isEmpty();
+ boolean hasUnionFilter;
+ boolean hasSubstractFilter;
+ boolean hasIntersectFilter;
+ XPath2NodeFilter(List<NodeList> unionNodes, List<NodeList> substractNodes,
+ List<NodeList> intersectNodes) {
+ hasUnionFilter=!unionNodes.isEmpty();
+ this.unionNodes=convertNodeListToSet(unionNodes);
+ hasSubstractFilter=!substractNodes.isEmpty();
+ this.substractNodes=convertNodeListToSet(substractNodes);
+ hasIntersectFilter=!intersectNodes.isEmpty();
+ this.intersectNodes=convertNodeListToSet(intersectNodes);
}
Set<Node> unionNodes;
Set<Node> substractNodes;
@@ -208,16 +196,16 @@ class XPath2NodeFilter implements NodeFilter {
public int isNodeInclude(Node currentNode) {
int result=1;
- if (hasSubstractNodes && rooted(currentNode, substractNodes)) {
+ if (hasSubstractFilter && rooted(currentNode, substractNodes)) {
result = -1;
- } else if (hasIntersectNodes && !rooted(currentNode, intersectNodes)) {
+ } else if (hasIntersectFilter && !rooted(currentNode, intersectNodes)) {
result = 0;
}
//TODO OPTIMIZE
if (result==1)
return 1;
- if (hasUnionNodes) {
+ if (hasUnionFilter) {
if (rooted(currentNode, unionNodes)) {
return 1;
}
@@ -231,7 +219,7 @@ class XPath2NodeFilter implements NodeFilter {
int inUnion=-1;
public int isNodeIncludeDO(Node n, int level) {
int result=1;
- if (hasSubstractNodes) {
+ if (hasSubstractFilter) {
if ((inSubstract==-1) || (level<=inSubstract)) {
if (inList(n, substractNodes)) {
inSubstract=level;
@@ -244,7 +232,7 @@ class XPath2NodeFilter implements NodeFilter {
}
}
if (result!=-1){
- if (hasIntersectNodes) {
+ if (hasIntersectFilter) {
if ((inIntersect==-1) || (level<=inIntersect)) {
if (!inList(n, intersectNodes)) {
inIntersect=-1;
@@ -260,7 +248,7 @@ class XPath2NodeFilter implements NodeFilter {
inUnion=-1;
if (result==1)
return 1;
- if (hasUnionNodes) {
+ if (hasUnionFilter) {
if ((inUnion==-1) && inList(n, unionNodes)) {
inUnion=level;
}
@@ -280,6 +268,9 @@ class XPath2NodeFilter implements NodeFilter {
* @return if rooted bye the rootnodes
*/
static boolean rooted(Node currentNode, Set<Node> nodeList ) {
+ if (nodeList.isEmpty()) {
+ return false;
+ }
if (nodeList.contains(currentNode)) {
return true;
}
@@ -302,4 +293,17 @@ class XPath2NodeFilter implements NodeFilter {
static boolean inList(Node currentNode, Set<Node> nodeList ) {
return nodeList.contains(currentNode);
}
+
+ private static Set<Node> convertNodeListToSet(List<NodeList> l){
+ Set<Node> result=new HashSet<Node>();
+
+ for (NodeList rootNodes : l) {
+ int length = rootNodes.getLength();
+ for (int i = 0; i < length; i++) {
+ Node rootNode = rootNodes.item(i);
+ result.add(rootNode);
+ }
+ }
+ return result;
+ }
}
diff --git a/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java b/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
index 75fe0a2..fd6f50c 100644
--- a/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
+++ b/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java
@@ -223,7 +223,7 @@ public final class ExecOptionPermission extends Permission
implements java.io.Serializable
{
- private Hashtable permissions;
+ private Hashtable<String, Permission> permissions;
private boolean all_allowed; // true if "*" is in the collection
private static final long serialVersionUID = -1242475729790124375L;
@@ -231,7 +231,7 @@ public final class ExecOptionPermission extends Permission
* Create an empty ExecOptionPermissionCollection.
*/
public ExecOptionPermissionCollection() {
- permissions = new Hashtable(11);
+ permissions = new Hashtable<>(11);
all_allowed = false;
}
@@ -291,7 +291,7 @@ public final class ExecOptionPermission extends Permission
String pname = p.getName();
- Permission x = (Permission) permissions.get(pname);
+ Permission x = permissions.get(pname);
if (x != null)
// we have a direct hit!
@@ -306,7 +306,7 @@ public final class ExecOptionPermission extends Permission
while ((last = pname.lastIndexOf(".", offset)) != -1) {
pname = pname.substring(0, last+1) + "*";
- x = (Permission) permissions.get(pname);
+ x = permissions.get(pname);
if (x != null) {
return x.implies(permission);
@@ -321,7 +321,7 @@ public final class ExecOptionPermission extends Permission
while ((last = pname.lastIndexOf("=", offset)) != -1) {
pname = pname.substring(0, last+1) + "*";
- x = (Permission) permissions.get(pname);
+ x = permissions.get(pname);
if (x != null) {
return x.implies(permission);
@@ -341,7 +341,7 @@ public final class ExecOptionPermission extends Permission
* @return an enumeration of all the ExecOptionPermission objects.
*/
- public Enumeration elements()
+ public Enumeration<Permission> elements()
{
return permissions.elements();
}
diff --git a/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java b/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
index 45674fe..067b9db 100644
--- a/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
+++ b/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java
@@ -227,7 +227,7 @@ public final class ExecPermission extends Permission
extends PermissionCollection
implements java.io.Serializable
{
- private Vector permissions;
+ private Vector<Permission> permissions;
private static final long serialVersionUID = -3352558508888368273L;
@@ -235,7 +235,7 @@ public final class ExecPermission extends Permission
* Create an empty ExecPermissionCollection.
*/
public ExecPermissionCollection() {
- permissions = new Vector();
+ permissions = new Vector<>();
}
/**
@@ -274,10 +274,10 @@ public final class ExecPermission extends Permission
if (! (permission instanceof ExecPermission))
return false;
- Enumeration e = permissions.elements();
+ Enumeration<Permission> e = permissions.elements();
while (e.hasMoreElements()) {
- ExecPermission x = (ExecPermission) e.nextElement();
+ ExecPermission x = (ExecPermission)e.nextElement();
if (x.implies(permission)) {
return true;
}
@@ -291,7 +291,7 @@ public final class ExecPermission extends Permission
*
* @return an enumeration of all the ExecPermission objects.
*/
- public Enumeration elements()
+ public Enumeration<Permission> elements()
{
return permissions.elements();
}
diff --git a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
index 9b46705..6987537 100644
--- a/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
+++ b/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
@@ -6431,7 +6431,8 @@ public class CachedRowSetImpl extends BaseRowSet implements RowSet, RowSetIntern
* @see #setKeyColumns
*/
public int[] getKeyColumns() throws SQLException {
- return keyCols;
+ int[]keyColumns = this.keyCols;
+ return (keyColumns == null) ? null : Arrays.copyOf(keyColumns, keyColumns.length);
}
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/BaseRow.java b/jdk/src/share/classes/com/sun/rowset/internal/BaseRow.java
index 49fce70..814e745 100644
--- a/jdk/src/share/classes/com/sun/rowset/internal/BaseRow.java
+++ b/jdk/src/share/classes/com/sun/rowset/internal/BaseRow.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@ package com.sun.rowset.internal;
import java.sql.*;
import java.io.*;
+import java.util.Arrays;
/**
* The abstract base class from which the classes <code>Row</code>
@@ -65,7 +66,8 @@ public abstract class BaseRow implements Serializable, Cloneable {
* original values
*/
public Object[] getOrigRow() {
- return origVals;
+ Object[] origRow = this.origVals;
+ return (origRow == null) ? null: Arrays.copyOf(origRow, origRow.length);
}
/**
diff --git a/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java b/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java
index 41737b7..3b04d1c 100644
--- a/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java
+++ b/jdk/src/share/classes/com/sun/rowset/internal/WebRowSetXmlWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -48,7 +48,7 @@ public class WebRowSetXmlWriter implements XmlWriter, Serializable {
* for this field is set with the <code>java.io.Writer</code> object given
* as the second argument to the <code>writeXML</code> method.
*/
- private java.io.Writer writer;
+ private transient java.io.Writer writer;
/**
* The <code>java.util.Stack</code> object that this <code>WebRowSetXmlWriter</code>
@@ -205,16 +205,11 @@ public class WebRowSetXmlWriter implements XmlWriter, Serializable {
//Changed to beginSection and endSection for maps for proper indentation
beginSection("map");
- java.util.Map<?,?> typeMap = caller.getTypeMap();
- if (typeMap != null) {
- Iterator<?> i = typeMap.keySet().iterator();
- Class<?> c;
- String type;
- while (i.hasNext()) {
- type = (String)i.next();
- c = (Class)typeMap.get(type);
- propString("type", type);
- propString("class", c.getName());
+ Map<String, Class<?>> typeMap = caller.getTypeMap();
+ if(typeMap != null) {
+ for(Map.Entry<String, Class<?>> mm : typeMap.entrySet()) {
+ propString("type", mm.getKey());
+ propString("class", mm.getValue().getName());
}
}
endSection("map");
diff --git a/jdk/src/share/classes/java/awt/Component.java b/jdk/src/share/classes/java/awt/Component.java
index 22c3801..63fe2a8 100644
--- a/jdk/src/share/classes/java/awt/Component.java
+++ b/jdk/src/share/classes/java/awt/Component.java
@@ -10070,11 +10070,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
}
Window window = getContainingWindow();
if (window != null) {
- if (!window.hasHeavyweightDescendants() || !window.hasLightweightDescendants()) {
+ if (!window.hasHeavyweightDescendants() || !window.hasLightweightDescendants() || window.isDisposing()) {
if (mixingLog.isLoggable(PlatformLogger.FINE)) {
mixingLog.fine("containing window = " + window +
"; has h/w descendants = " + window.hasHeavyweightDescendants() +
- "; has l/w descendants = " + window.hasLightweightDescendants());
+ "; has l/w descendants = " + window.hasLightweightDescendants() +
+ "; disposing = " + window.isDisposing());
}
return false;
}
diff --git a/jdk/src/share/classes/java/awt/EventDispatchThread.java b/jdk/src/share/classes/java/awt/EventDispatchThread.java
index c707f02..427ad7e 100644
--- a/jdk/src/share/classes/java/awt/EventDispatchThread.java
+++ b/jdk/src/share/classes/java/awt/EventDispatchThread.java
@@ -107,6 +107,34 @@ class EventDispatchThread extends Thread {
}
}
+ // MacOSX change:
+ // This was added because this class (and java.awt.Conditional) are package private.
+ // There are certain instances where classes in other packages need to block the
+ // AWTEventQueue while still allowing it to process events. This uses reflection
+ // to call back into the caller in order to remove dependencies.
+ //
+ // NOTE: This uses reflection in its implementation, so it is not for performance critical code.
+ //
+ // cond is an instance of sun.lwawt.macosx.EventDispatchAccess
+ //
+ private Conditional _macosxGetConditional(final Object cond) {
+ try {
+ return new Conditional() {
+ final Method evaluateMethod = Class.forName("sun.lwawt.macosx.EventDispatchAccess").getMethod("evaluate", null);
+ public boolean evaluate() {
+ try {
+ return ((Boolean)evaluateMethod.invoke(cond, null)).booleanValue();
+ } catch (Exception e) {
+ return false;
+ }
+ }
+ };
+ } catch (Exception e) {
+ return new Conditional() { public boolean evaluate() { return false; } };
+ }
+ }
+
+
void pumpEvents(Conditional cond) {
pumpEvents(ANY_EVENT, cond);
}
diff --git a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java b/jdk/src/share/classes/java/awt/GraphicsEnvironment.java
index cf3f1e5..2ca335a 100644
--- a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java
+++ b/jdk/src/share/classes/java/awt/GraphicsEnvironment.java
@@ -170,10 +170,20 @@ public abstract class GraphicsEnvironment {
if (System.getProperty("javaplugin.version") != null) {
headless = defaultHeadless = Boolean.FALSE;
} else {
- String osName = System.getProperty("os.name");
- headless = defaultHeadless =
- Boolean.valueOf(("Linux".equals(osName) || "SunOS".equals(osName)) &&
- (System.getenv("DISPLAY") == null));
+ if ("sun.awt.HeadlessGraphicsEnvironment".equals(
+ System.getProperty("java.awt.graphicsenv")))
+ {
+ headless = defaultHeadless = Boolean.TRUE;
+ } else {
+ String osName = System.getProperty("os.name");
+ headless = defaultHeadless =
+ Boolean.valueOf(("Linux".equals(osName) ||
+ "SunOS".equals(osName) ||
+ "FreeBSD".equals(osName) ||
+ "NetBSD".equals(osName) ||
+ "OpenBSD".equals(osName)) &&
+ (System.getenv("DISPLAY") == null));
+ }
}
} else if (nm.equals("true")) {
headless = Boolean.TRUE;
diff --git a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java
index 5438064..3ccf5b7 100644
--- a/jdk/src/share/classes/java/awt/KeyboardFocusManager.java
+++ b/jdk/src/share/classes/java/awt/KeyboardFocusManager.java
@@ -145,6 +145,9 @@ public abstract class KeyboardFocusManager
public void setMostRecentFocusOwner(Window window, Component component) {
KeyboardFocusManager.setMostRecentFocusOwner(window, component);
}
+ public KeyboardFocusManager getCurrentKeyboardFocusManager(AppContext ctx) {
+ return KeyboardFocusManager.getCurrentKeyboardFocusManager(ctx);
+ }
}
);
}
diff --git a/jdk/src/share/classes/java/awt/List.java b/jdk/src/share/classes/java/awt/List.java
index 917977b..d5b60ae 100644
--- a/jdk/src/share/classes/java/awt/List.java
+++ b/jdk/src/share/classes/java/awt/List.java
@@ -115,7 +115,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @see #addItem(String)
* @see #getItem(int)
*/
- Vector items = new Vector();
+ Vector<String> items = new Vector<>();
/**
* This field will represent the number of visible rows in the
@@ -306,7 +306,7 @@ public class List extends Component implements ItemSelectable, Accessible {
// to insure that it cannot be overridden by client subclasses.
// DO NOT INVOKE CLIENT CODE ON THIS THREAD!
final String getItemImpl(int index) {
- return (String)items.elementAt(index);
+ return items.elementAt(index);
}
/**
@@ -415,7 +415,7 @@ public class List extends Component implements ItemSelectable, Accessible {
if (peer != null) {
peer.removeAll();
}
- items = new Vector();
+ items = new Vector<>();
selected = new int[0];
}
@@ -490,9 +490,9 @@ public class List extends Component implements ItemSelectable, Accessible {
public synchronized int[] getSelectedIndexes() {
ListPeer peer = (ListPeer)this.peer;
if (peer != null) {
- selected = ((ListPeer)peer).getSelectedIndexes();
+ selected = peer.getSelectedIndexes();
}
- return (int[])selected.clone();
+ return selected.clone();
}
/**
@@ -908,7 +908,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @since 1.4
*/
public synchronized ItemListener[] getItemListeners() {
- return (ItemListener[])(getListeners(ItemListener.class));
+ return getListeners(ItemListener.class);
}
/**
@@ -975,7 +975,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @since 1.4
*/
public synchronized ActionListener[] getActionListeners() {
- return (ActionListener[])(getListeners(ActionListener.class));
+ return getListeners(ActionListener.class);
}
/**
diff --git a/jdk/src/share/classes/java/awt/Window.java b/jdk/src/share/classes/java/awt/Window.java
index d2c97db..1e2ee59 100644
--- a/jdk/src/share/classes/java/awt/Window.java
+++ b/jdk/src/share/classes/java/awt/Window.java
@@ -226,6 +226,7 @@ public class Window extends Container implements Accessible {
static boolean systemSyncLWRequests = false;
boolean syncLWRequests = false;
transient boolean beforeFirstShow = true;
+ private transient boolean disposing = false;
static final int OPENED = 0x01;
@@ -398,10 +399,10 @@ public class Window extends Container implements Accessible {
initIDs();
}
- String s = (String) java.security.AccessController.doPrivileged(
+ String s = java.security.AccessController.doPrivileged(
new GetPropertyAction("java.awt.syncLWRequests"));
systemSyncLWRequests = (s != null && s.equals("true"));
- s = (String) java.security.AccessController.doPrivileged(
+ s = java.security.AccessController.doPrivileged(
new GetPropertyAction("java.awt.Window.locationByPlatform"));
locationByPlatformProp = (s != null && s.equals("true"));
}
@@ -1162,36 +1163,41 @@ public class Window extends Container implements Accessible {
void doDispose() {
class DisposeAction implements Runnable {
public void run() {
- // Check if this window is the fullscreen window for the
- // device. Exit the fullscreen mode prior to disposing
- // of the window if that's the case.
- GraphicsDevice gd = getGraphicsConfiguration().getDevice();
- if (gd.getFullScreenWindow() == Window.this) {
- gd.setFullScreenWindow(null);
- }
+ disposing = true;
+ try {
+ // Check if this window is the fullscreen window for the
+ // device. Exit the fullscreen mode prior to disposing
+ // of the window if that's the case.
+ GraphicsDevice gd = getGraphicsConfiguration().getDevice();
+ if (gd.getFullScreenWindow() == Window.this) {
+ gd.setFullScreenWindow(null);
+ }
- Object[] ownedWindowArray;
- synchronized(ownedWindowList) {
- ownedWindowArray = new Object[ownedWindowList.size()];
- ownedWindowList.copyInto(ownedWindowArray);
- }
- for (int i = 0; i < ownedWindowArray.length; i++) {
- Window child = (Window) (((WeakReference)
- (ownedWindowArray[i])).get());
- if (child != null) {
- child.disposeImpl();
+ Object[] ownedWindowArray;
+ synchronized(ownedWindowList) {
+ ownedWindowArray = new Object[ownedWindowList.size()];
+ ownedWindowList.copyInto(ownedWindowArray);
}
- }
- hide();
- beforeFirstShow = true;
- removeNotify();
- synchronized (inputContextLock) {
- if (inputContext != null) {
- inputContext.dispose();
- inputContext = null;
+ for (int i = 0; i < ownedWindowArray.length; i++) {
+ Window child = (Window) (((WeakReference)
+ (ownedWindowArray[i])).get());
+ if (child != null) {
+ child.disposeImpl();
+ }
+ }
+ hide();
+ beforeFirstShow = true;
+ removeNotify();
+ synchronized (inputContextLock) {
+ if (inputContext != null) {
+ inputContext.dispose();
+ inputContext = null;
+ }
}
+ clearCurrentFocusCycleRootOnHide();
+ } finally {
+ disposing = false;
}
- clearCurrentFocusCycleRootOnHide();
}
}
DisposeAction action = new DisposeAction();
@@ -1378,7 +1384,7 @@ public class Window extends Container implements Accessible {
// make sure the privileged action is only
// for getting the property! We don't want the
// above checkTopLevelWindow call to always succeed!
- warningString = (String) AccessController.doPrivileged(
+ warningString = AccessController.doPrivileged(
new GetPropertyAction("awt.appletWarning",
"Java Applet Window"));
}
@@ -2734,6 +2740,10 @@ public class Window extends Container implements Accessible {
return visible;
}
+ boolean isDisposing() {
+ return disposing;
+ }
+
/**
* @deprecated As of J2SE 1.4, replaced by
* {@link Component#applyComponentOrientation Component.applyComponentOrientation}.
diff --git a/jdk/src/share/classes/java/awt/color/ICC_Profile.java b/jdk/src/share/classes/java/awt/color/ICC_Profile.java
index 81212fb..c06ddf6 100644
--- a/jdk/src/share/classes/java/awt/color/ICC_Profile.java
+++ b/jdk/src/share/classes/java/awt/color/ICC_Profile.java
@@ -921,9 +921,9 @@ public class ICC_Profile implements Serializable {
*/
private static ICC_Profile getStandardProfile(final String name) {
- return (ICC_Profile) AccessController.doPrivileged(
- new PrivilegedAction() {
- public Object run() {
+ return AccessController.doPrivileged(
+ new PrivilegedAction<ICC_Profile>() {
+ public ICC_Profile run() {
ICC_Profile p = null;
try {
p = getInstance (name);
diff --git a/jdk/src/share/classes/java/awt/datatransfer/MimeType.java b/jdk/src/share/classes/java/awt/datatransfer/MimeType.java
index f58cffb..3ed00b7 100644
--- a/jdk/src/share/classes/java/awt/datatransfer/MimeType.java
+++ b/jdk/src/share/classes/java/awt/datatransfer/MimeType.java
@@ -30,6 +30,7 @@ import java.io.ObjectOutput;
import java.io.ObjectInput;
import java.io.IOException;
import java.util.Enumeration;
+import java.util.Locale;
/**
@@ -93,14 +94,14 @@ class MimeType implements Externalizable, Cloneable {
MimeTypeParseException {
// check to see if primary is valid
if(isValidToken(primary)) {
- primaryType = primary.toLowerCase();
+ primaryType = primary.toLowerCase(Locale.ENGLISH);
} else {
throw new MimeTypeParseException("Primary type is invalid.");
}
// check to see if sub is valid
if(isValidToken(sub)) {
- subType = sub.toLowerCase();
+ subType = sub.toLowerCase(Locale.ENGLISH);
} else {
throw new MimeTypeParseException("Sub type is invalid.");
}
@@ -158,17 +159,17 @@ MimeTypeParseException {
throw new MimeTypeParseException("Unable to find a sub type.");
} else if((slashIndex >= 0) && (semIndex < 0)) {
// we have a primary and sub type but no parameter list
- primaryType = rawdata.substring(0,
-slashIndex).trim().toLowerCase();
- subType = rawdata.substring(slashIndex +
-1).trim().toLowerCase();
+ primaryType = rawdata.substring(0,slashIndex).
+ trim().toLowerCase(Locale.ENGLISH);
+ subType = rawdata.substring(slashIndex + 1).
+ trim().toLowerCase(Locale.ENGLISH);
parameters = new MimeTypeParameterList();
} else if (slashIndex < semIndex) {
// we have all three items in the proper sequence
- primaryType = rawdata.substring(0,
-slashIndex).trim().toLowerCase();
+ primaryType = rawdata.substring(0, slashIndex).
+ trim().toLowerCase(Locale.ENGLISH);
subType = rawdata.substring(slashIndex + 1,
-semIndex).trim().toLowerCase();
+ semIndex).trim().toLowerCase(Locale.ENGLISH);
parameters = new
MimeTypeParameterList(rawdata.substring(semIndex));
} else {
diff --git a/jdk/src/share/classes/java/awt/event/InputEvent.java b/jdk/src/share/classes/java/awt/event/InputEvent.java
index c98c872..f645c3a 100644
--- a/jdk/src/share/classes/java/awt/event/InputEvent.java
+++ b/jdk/src/share/classes/java/awt/event/InputEvent.java
@@ -321,14 +321,15 @@ public abstract class InputEvent extends ComponentEvent {
* @param when a long int that gives the time the event occurred.
* Passing negative or zero value
* is not recommended
- * @param modifiers the modifier keys down during event (e.g. shift, ctrl,
- * alt, meta)
- * Passing negative parameter is not recommended.
- * Zero value means no modifiers.
- * Either extended _DOWN_MASK or old _MASK modifiers
- * should be used, but both models should not be mixed
- * in one event. Use of the extended modifiers is
- * preferred
+ * @param modifiers a modifier mask describing the modifier keys and mouse
+ * buttons (for example, shift, ctrl, alt, and meta) that
+ * are down during the event.
+ * Only extended modifiers are allowed to be used as a
+ * value for this parameter (see the {@link InputEvent#getModifiersEx}
+ * class for the description of extended modifiers).
+ * Passing negative parameter
+ * is not recommended.
+ * Zero value means that no modifiers were passed
* @throws IllegalArgumentException if <code>source</code> is null
* @see #getSource()
* @see #getID()
@@ -416,9 +417,13 @@ public abstract class InputEvent extends ComponentEvent {
/**
* Returns the extended modifier mask for this event.
+ * <P>
+ * Extended modifiers are the modifiers that ends with the _DOWN_MASK suffix,
+ * such as ALT_DOWN_MASK, BUTTON1_DOWN_MASK, and others.
+ * <P>
* Extended modifiers represent the state of all modal keys,
* such as ALT, CTRL, META, and the mouse buttons just after
- * the event occurred
+ * the event occurred.
* <P>
* For example, if the user presses <b>button 1</b> followed by
* <b>button 2</b>, and then releases them in the same order,
diff --git a/jdk/src/share/classes/java/awt/event/MouseEvent.java b/jdk/src/share/classes/java/awt/event/MouseEvent.java
index 440467f..15cb6ee 100644
--- a/jdk/src/share/classes/java/awt/event/MouseEvent.java
+++ b/jdk/src/share/classes/java/awt/event/MouseEvent.java
@@ -488,14 +488,15 @@ public class MouseEvent extends InputEvent {
* @param when A long integer that gives the time the event occurred.
* Passing negative or zero value
* is not recommended
- * @param modifiers The modifier keys down during event (e.g. shift, ctrl,
- * alt, meta)
+ * @param modifiers a modifier mask describing the modifier keys and mouse
+ * buttons (for example, shift, ctrl, alt, and meta) that
+ * are down during the event.
+ * Only extended modifiers are allowed to be used as a
+ * value for this parameter (see the {@link InputEvent#getModifiersEx}
+ * class for the description of extended modifiers).
* Passing negative parameter
* is not recommended.
- * Zero value means that no modifiers were passed.
- * Use either an extended _DOWN_MASK or old _MASK modifiers,
- * however do not mix models in the one event.
- * The extended modifiers are preferred for using
+ * Zero value means that no modifiers were passed
* @param x The horizontal x coordinate for the mouse location.
* It is allowed to pass negative values
* @param y The vertical y coordinate for the mouse location.
@@ -586,14 +587,15 @@ public class MouseEvent extends InputEvent {
* @param when A long integer that gives the time the event occurred.
* Passing negative or zero value
* is not recommended
- * @param modifiers The modifier keys down during event (e.g. shift, ctrl,
- * alt, meta)
+ * @param modifiers a modifier mask describing the modifier keys and mouse
+ * buttons (for example, shift, ctrl, alt, and meta) that
+ * are down during the event.
+ * Only extended modifiers are allowed to be used as a
+ * value for this parameter (see the {@link InputEvent#getModifiersEx}
+ * class for the description of extended modifiers).
* Passing negative parameter
* is not recommended.
- * Zero value means that no modifiers were passed.
- * Use either an extended _DOWN_MASK or old _MASK modifiers,
- * however do not mix models in the one event.
- * The extended modifiers are preferred for using
+ * Zero value means that no modifiers were passed
* @param x The horizontal x coordinate for the mouse location.
* It is allowed to pass negative values
* @param y The vertical y coordinate for the mouse location.
@@ -657,14 +659,15 @@ public class MouseEvent extends InputEvent {
* @param when A long integer that gives the time the event occurred.
* Passing negative or zero value
* is not recommended
- * @param modifiers The modifier keys down during event (e.g. shift, ctrl,
- * alt, meta)
+ * @param modifiers a modifier mask describing the modifier keys and mouse
+ * buttons (for example, shift, ctrl, alt, and meta) that
+ * are down during the event.
+ * Only extended modifiers are allowed to be used as a
+ * value for this parameter (see the {@link InputEvent#getModifiersEx}
+ * class for the description of extended modifiers).
* Passing negative parameter
* is not recommended.
- * Zero value means that no modifiers were passed.
- * Use either an extended _DOWN_MASK or old _MASK modifiers,
- * however do not mix models in the one event.
- * The extended modifiers are preferred for using
+ * Zero value means that no modifiers were passed
* @param x The horizontal x coordinate for the mouse location.
* It is allowed to pass negative values
* @param y The vertical y coordinate for the mouse location.
@@ -758,7 +761,6 @@ public class MouseEvent extends InputEvent {
if (getModifiersEx() != 0) { //There is at least one more button in a pressed state.
if (id == MouseEvent.MOUSE_RELEASED || id == MouseEvent.MOUSE_CLICKED){
- System.out.println("MEvent. CASE!");
shouldExcludeButtonFromExtModifiers = true;
}
}
diff --git a/jdk/src/share/classes/java/beans/BeanInfo.java b/jdk/src/share/classes/java/beans/BeanInfo.java
index e584264..bb43f2f 100644
--- a/jdk/src/share/classes/java/beans/BeanInfo.java
+++ b/jdk/src/share/classes/java/beans/BeanInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,134 +25,134 @@
package java.beans;
+import java.awt.Image;
+
/**
- * A bean implementor who wishes to provide explicit information about
- * their bean may provide a BeanInfo class that implements this BeanInfo
- * interface and provides explicit information about the methods,
- * properties, events, etc, of their bean.
+ * Use the {@code BeanInfo} interface
+ * to create a {@code BeanInfo} class
+ * and provide explicit information about the methods,
+ * properties, events, and other features of your beans.
* <p>
- * A bean implementor doesn't need to provide a complete set of
- * explicit information. You can pick and choose which information
- * you want to provide and the rest will be obtained by automatic
- * analysis using low-level reflection of the bean classes' methods
+ * When developing your bean, you can implement
+ * the bean features required for your application task
+ * omitting the rest of the {@code BeanInfo} features.
+ * They will be obtained through the automatic analysis
+ * by using the low-level reflection of the bean methods
* and applying standard design patterns.
+ * You have an opportunity to provide additional bean information
+ * through various descriptor classes.
+ * <p>
+ * See the {@link SimpleBeanInfo} class that is
+ * a convenient basic class for {@code BeanInfo} classes.
+ * You can override the methods and properties of
+ * the {@code SimpleBeanInfo} class to define specific information.
* <p>
- * You get the opportunity to provide lots and lots of different
- * information as part of the various XyZDescriptor classes. But
- * don't panic, you only really need to provide the minimal core
- * information required by the various constructors.
- * <P>
- * See also the SimpleBeanInfo class which provides a convenient
- * "noop" base class for BeanInfo classes, which you can override
- * for those specific places where you want to return explicit info.
- * <P>
- * To learn about all the behaviour of a bean see the Introspector class.
+ * See also the {@link Introspector} class to learn more about bean behavior.
*/
-
public interface BeanInfo {
/**
- * Gets the beans <code>BeanDescriptor</code>.
+ * Returns the bean descriptor
+ * that provides overall information about the bean,
+ * such as its display name or its customizer.
*
- * @return A BeanDescriptor providing overall information about
- * the bean, such as its displayName, its customizer, etc. May
- * return null if the information should be obtained by automatic
- * analysis.
+ * @return a {@link BeanDescriptor} object,
+ * or {@code null} if the information is to
+ * be obtained through the automatic analysis
*/
BeanDescriptor getBeanDescriptor();
/**
- * Gets the beans <code>EventSetDescriptor</code>s.
+ * Returns the event descriptors of the bean
+ * that define the types of events fired by this bean.
*
- * @return An array of EventSetDescriptors describing the kinds of
- * events fired by this bean. May return null if the information
- * should be obtained by automatic analysis.
+ * @return an array of {@link EventSetDescriptor} objects,
+ * or {@code null} if the information is to
+ * be obtained through the automatic analysis
*/
EventSetDescriptor[] getEventSetDescriptors();
/**
- * A bean may have a "default" event that is the event that will
- * mostly commonly be used by humans when using the bean.
- * @return Index of default event in the EventSetDescriptor array
- * returned by getEventSetDescriptors.
- * <P> Returns -1 if there is no default event.
+ * A bean may have a default event typically applied when this bean is used.
+ *
+ * @return index of the default event in the {@code EventSetDescriptor} array
+ * returned by the {@code getEventSetDescriptors} method,
+ * or -1 if there is no default event
*/
int getDefaultEventIndex();
/**
* Returns descriptors for all properties of the bean.
- * May return {@code null} if the information
- * should be obtained by automatic analysis.
* <p>
* If a property is indexed, then its entry in the result array
- * will belong to the {@link IndexedPropertyDescriptor} subclass
+ * belongs to the {@link IndexedPropertyDescriptor} subclass
* of the {@link PropertyDescriptor} class.
* A client of the {@code getPropertyDescriptors} method
- * can use "{@code instanceof}" to check
+ * can use the {@code instanceof} operator to check
* whether a given {@code PropertyDescriptor}
* is an {@code IndexedPropertyDescriptor}.
*
- * @return an array of {@code PropertyDescriptor}s
- * describing all properties supported by the bean
- * or {@code null}
+ * @return an array of {@code PropertyDescriptor} objects,
+ * or {@code null} if the information is to
+ * be obtained through the automatic analysis
*/
PropertyDescriptor[] getPropertyDescriptors();
/**
- * A bean may have a "default" property that is the property that will
- * mostly commonly be initially chosen for update by human's who are
- * customizing the bean.
- * @return Index of default property in the PropertyDescriptor array
- * returned by getPropertyDescriptors.
- * <P> Returns -1 if there is no default property.
+ * A bean may have a default property commonly updated when this bean is customized.
+ *
+ * @return index of the default property in the {@code PropertyDescriptor} array
+ * returned by the {@code getPropertyDescriptors} method,
+ * or -1 if there is no default property
*/
int getDefaultPropertyIndex();
/**
- * Gets the beans <code>MethodDescriptor</code>s.
+ * Returns the method descriptors of the bean
+ * that define the externally visible methods supported by this bean.
*
- * @return An array of MethodDescriptors describing the externally
- * visible methods supported by this bean. May return null if
- * the information should be obtained by automatic analysis.
+ * @return an array of {@link MethodDescriptor} objects,
+ * or {@code null} if the information is to
+ * be obtained through the automatic analysis
*/
MethodDescriptor[] getMethodDescriptors();
/**
- * This method allows a BeanInfo object to return an arbitrary collection
- * of other BeanInfo objects that provide additional information on the
- * current bean.
- * <P>
- * If there are conflicts or overlaps between the information provided
- * by different BeanInfo objects, then the current BeanInfo takes precedence
- * over the getAdditionalBeanInfo objects, and later elements in the array
- * take precedence over earlier ones.
+ * This method enables the current {@code BeanInfo} object
+ * to return an arbitrary collection of other {@code BeanInfo} objects
+ * that provide additional information about the current bean.
+ * <p>
+ * If there are conflicts or overlaps between the information
+ * provided by different {@code BeanInfo} objects,
+ * the current {@code BeanInfo} object takes priority
+ * over the additional {@code BeanInfo} objects.
+ * Array elements with higher indices take priority
+ * over the elements with lower indices.
*
- * @return an array of BeanInfo objects. May return null.
+ * @return an array of {@code BeanInfo} objects,
+ * or {@code null} if there are no additional {@code BeanInfo} objects
*/
BeanInfo[] getAdditionalBeanInfo();
/**
- * This method returns an image object that can be used to
- * represent the bean in toolboxes, toolbars, etc. Icon images
- * will typically be GIFs, but may in future include other formats.
- * <p>
- * Beans aren't required to provide icons and may return null from
- * this method.
+ * Returns an image that can be used to represent the bean in toolboxes or toolbars.
* <p>
- * There are four possible flavors of icons (16x16 color,
- * 32x32 color, 16x16 mono, 32x32 mono). If a bean choses to only
- * support a single icon we recommend supporting 16x16 color.
- * <p>
- * We recommend that icons have a "transparent" background
- * so they can be rendered onto an existing background.
+ * There are four possible types of icons:
+ * 16 x 16 color, 32 x 32 color, 16 x 16 mono, and 32 x 32 mono.
+ * If you implement a bean so that it supports a single icon,
+ * it is recommended to use 16 x 16 color.
+ * Another recommendation is to set a transparent background for the icons.
+ *
+ * @param iconKind the kind of icon requested
+ * @return an image object representing the requested icon,
+ * or {@code null} if no suitable icon is available
*
- * @param iconKind The kind of icon requested. This should be
- * one of the constant values ICON_COLOR_16x16, ICON_COLOR_32x32,
- * ICON_MONO_16x16, or ICON_MONO_32x32.
- * @return An image object representing the requested icon. May
- * return null if no suitable icon is available.
+ * @see #ICON_COLOR_16x16
+ * @see #ICON_COLOR_32x32
+ * @see #ICON_MONO_16x16
+ * @see #ICON_MONO_32x32
*/
- java.awt.Image getIcon(int iconKind);
+ Image getIcon(int iconKind);
/**
* Constant to indicate a 16 x 16 color icon.
diff --git a/jdk/src/share/classes/java/beans/ChangeListenerMap.java b/jdk/src/share/classes/java/beans/ChangeListenerMap.java
index e623d9b..fa8be47 100644
--- a/jdk/src/share/classes/java/beans/ChangeListenerMap.java
+++ b/jdk/src/share/classes/java/beans/ChangeListenerMap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -237,12 +237,5 @@ abstract class ChangeListenerMap<L extends EventListener> {
*
* @return a real listener
*/
- public final L extract(L listener) {
- while (listener instanceof EventListenerProxy) {
- @SuppressWarnings("unchecked")
- EventListenerProxy<L> proxy = (EventListenerProxy<L>) listener;
- listener = proxy.getListener();
- }
- return listener;
- }
+ public abstract L extract(L listener);
}
diff --git a/jdk/src/share/classes/java/beans/Introspector.java b/jdk/src/share/classes/java/beans/Introspector.java
index 5734208..476adf0 100644
--- a/jdk/src/share/classes/java/beans/Introspector.java
+++ b/jdk/src/share/classes/java/beans/Introspector.java
@@ -473,7 +473,7 @@ public class Introspector {
// Now analyze each method.
for (int i = 0; i < methodList.length; i++) {
Method method = methodList[i];
- if (method == null || method.isSynthetic()) {
+ if (method == null) {
continue;
}
// skip static methods.
diff --git a/jdk/src/share/classes/java/beans/PropertyChangeSupport.java b/jdk/src/share/classes/java/beans/PropertyChangeSupport.java
index 1ea326e..c3c7317 100644
--- a/jdk/src/share/classes/java/beans/PropertyChangeSupport.java
+++ b/jdk/src/share/classes/java/beans/PropertyChangeSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -533,5 +533,15 @@ public class PropertyChangeSupport implements Serializable {
protected PropertyChangeListener newProxy(String name, PropertyChangeListener listener) {
return new PropertyChangeListenerProxy(name, listener);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public final PropertyChangeListener extract(PropertyChangeListener listener) {
+ while (listener instanceof PropertyChangeListenerProxy) {
+ listener = ((PropertyChangeListenerProxy) listener).getListener();
+ }
+ return listener;
+ }
}
}
diff --git a/jdk/src/share/classes/java/beans/PropertyDescriptor.java b/jdk/src/share/classes/java/beans/PropertyDescriptor.java
index 6abe8a0..5d54830 100644
--- a/jdk/src/share/classes/java/beans/PropertyDescriptor.java
+++ b/jdk/src/share/classes/java/beans/PropertyDescriptor.java
@@ -559,7 +559,7 @@ public class PropertyDescriptor extends FeatureDescriptor {
// Normally give priority to y's readMethod.
try {
- if (yr != null && yr.getDeclaringClass() == getClass0()) {
+ if (isAssignable(xr, yr)) {
setReadMethod(yr);
} else {
setReadMethod(xr);
@@ -713,4 +713,37 @@ public class PropertyDescriptor extends FeatureDescriptor {
appendTo(sb, "readMethod", this.readMethodRef);
appendTo(sb, "writeMethod", this.writeMethodRef);
}
+
+ private boolean isAssignable(Method m1, Method m2) {
+ if (m1 == null) {
+ return true; // choose second method
+ }
+ if (m2 == null) {
+ return false; // choose first method
+ }
+ if (!m1.getName().equals(m2.getName())) {
+ return true; // choose second method by default
+ }
+ Class<?> type1 = m1.getDeclaringClass();
+ Class<?> type2 = m2.getDeclaringClass();
+ if (!type1.isAssignableFrom(type2)) {
+ return false; // choose first method: it declared later
+ }
+ type1 = getReturnType(getClass0(), m1);
+ type2 = getReturnType(getClass0(), m2);
+ if (!type1.isAssignableFrom(type2)) {
+ return false; // choose first method: it overrides return type
+ }
+ Class<?>[] args1 = getParameterTypes(getClass0(), m1);
+ Class<?>[] args2 = getParameterTypes(getClass0(), m2);
+ if (args1.length != args2.length) {
+ return true; // choose second method by default
+ }
+ for (int i = 0; i < args1.length; i++) {
+ if (!args1[i].isAssignableFrom(args2[i])) {
+ return false; // choose first method: it overrides parameter
+ }
+ }
+ return true; // choose second method
+ }
}
diff --git a/jdk/src/share/classes/java/beans/VetoableChangeSupport.java b/jdk/src/share/classes/java/beans/VetoableChangeSupport.java
index 318abd2..6b7e268 100644
--- a/jdk/src/share/classes/java/beans/VetoableChangeSupport.java
+++ b/jdk/src/share/classes/java/beans/VetoableChangeSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -522,5 +522,15 @@ public class VetoableChangeSupport implements Serializable {
protected VetoableChangeListener newProxy(String name, VetoableChangeListener listener) {
return new VetoableChangeListenerProxy(name, listener);
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public final VetoableChangeListener extract(VetoableChangeListener listener) {
+ while (listener instanceof VetoableChangeListenerProxy) {
+ listener = ((VetoableChangeListenerProxy) listener).getListener();
+ }
+ return listener;
+ }
}
}
diff --git a/jdk/src/share/classes/java/io/DataInput.java b/jdk/src/share/classes/java/io/DataInput.java
index e4b7e83..1480c9f 100644
--- a/jdk/src/share/classes/java/io/DataInput.java
+++ b/jdk/src/share/classes/java/io/DataInput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,12 +26,12 @@
package java.io;
/**
- * The <code>DataInput</code> interface provides
+ * The {@code DataInput} interface provides
* for reading bytes from a binary stream and
* reconstructing from them data in any of
* the Java primitive types. There is also
* a
- * facility for reconstructing a <code>String</code>
+ * facility for reconstructing a {@code String}
* from data in
* <a href="#modified-utf-8">modified UTF-8</a>
* format.
@@ -39,12 +39,12 @@ package java.io;
* It is generally true of all the reading
* routines in this interface that if end of
* file is reached before the desired number
- * of bytes has been read, an <code>EOFException</code>
- * (which is a kind of <code>IOException</code>)
+ * of bytes has been read, an {@code EOFException}
+ * (which is a kind of {@code IOException})
* is thrown. If any byte cannot be read for
- * any reason other than end of file, an <code>IOException</code>
- * other than <code>EOFException</code> is
- * thrown. In particular, an <code>IOException</code>
+ * any reason other than end of file, an {@code IOException}
+ * other than {@code EOFException} is
+ * thrown. In particular, an {@code IOException}
* may be thrown if the input stream has been
* closed.
*
@@ -58,8 +58,8 @@ package java.io;
* Note that in the following tables, the most significant bit appears in the
* far left-hand column.
* <p>
- * All characters in the range <code>'\u0001'</code> to
- * <code>'\u007F'</code> are represented by a single byte:
+ * All characters in the range {@code '\u005Cu0001'} to
+ * {@code '\u005Cu007F'} are represented by a single byte:
*
* <blockquote>
* <table border="1" cellspacing="0" cellpadding="8" width="50%"
@@ -83,8 +83,8 @@ package java.io;
* </blockquote>
*
* <p>
- * The null character <code>'\u0000'</code> and characters in the
- * range <code>'\u0080'</code> to <code>'\u07FF'</code> are
+ * The null character {@code '\u005Cu0000'} and characters in the
+ * range {@code '\u005Cu0080'} to {@code '\u005Cu07FF'} are
* represented by a pair of bytes:
*
* <blockquote>
@@ -123,8 +123,8 @@ package java.io;
* </blockquote>
*
* <br>
- * <code>char</code> values in the range <code>'\u0800'</code> to
- * <code>'\uFFFF'</code> are represented by three bytes:
+ * {@code char} values in the range {@code '\u005Cu0800'} to
+ * {@code '\u005CuFFFF'} are represented by three bytes:
*
* <blockquote>
* <table border="1" cellspacing="0" cellpadding="8" width="50%"
@@ -178,7 +178,7 @@ package java.io;
* The differences between this format and the
* standard UTF-8 format are the following:
* <ul>
- * <li>The null byte <code>'\u0000'</code> is encoded in 2-byte format
+ * <li>The null byte {@code '\u005Cu0000'} is encoded in 2-byte format
* rather than 1-byte, so that the encoded strings never have
* embedded nulls.
* <li>Only the 1-byte, 2-byte, and 3-byte formats are used.
@@ -195,36 +195,36 @@ interface DataInput {
/**
* Reads some bytes from an input
* stream and stores them into the buffer
- * array <code>b</code>. The number of bytes
+ * array {@code b}. The number of bytes
* read is equal
- * to the length of <code>b</code>.
+ * to the length of {@code b}.
* <p>
* This method blocks until one of the
* following conditions occurs:<p>
* <ul>
- * <li><code>b.length</code>
+ * <li>{@code b.length}
* bytes of input data are available, in which
* case a normal return is made.
*
* <li>End of
- * file is detected, in which case an <code>EOFException</code>
+ * file is detected, in which case an {@code EOFException}
* is thrown.
*
* <li>An I/O error occurs, in
- * which case an <code>IOException</code> other
- * than <code>EOFException</code> is thrown.
+ * which case an {@code IOException} other
+ * than {@code EOFException} is thrown.
* </ul>
* <p>
- * If <code>b</code> is <code>null</code>,
- * a <code>NullPointerException</code> is thrown.
- * If <code>b.length</code> is zero, then
+ * If {@code b} is {@code null},
+ * a {@code NullPointerException} is thrown.
+ * If {@code b.length} is zero, then
* no bytes are read. Otherwise, the first
- * byte read is stored into element <code>b[0]</code>,
- * the next one into <code>b[1]</code>, and
+ * byte read is stored into element {@code b[0]},
+ * the next one into {@code b[1]}, and
* so on.
* If an exception is thrown from
* this method, then it may be that some but
- * not all bytes of <code>b</code> have been
+ * not all bytes of {@code b} have been
* updated with data from the input stream.
*
* @param b the buffer into which the data is read.
@@ -236,7 +236,7 @@ interface DataInput {
/**
*
- * Reads <code>len</code>
+ * Reads {@code len}
* bytes from
* an input stream.
* <p>
@@ -244,32 +244,32 @@ interface DataInput {
* blocks until one of the following conditions
* occurs:<p>
* <ul>
- * <li><code>len</code> bytes
+ * <li>{@code len} bytes
* of input data are available, in which case
* a normal return is made.
*
* <li>End of file
- * is detected, in which case an <code>EOFException</code>
+ * is detected, in which case an {@code EOFException}
* is thrown.
*
* <li>An I/O error occurs, in
- * which case an <code>IOException</code> other
- * than <code>EOFException</code> is thrown.
+ * which case an {@code IOException} other
+ * than {@code EOFException} is thrown.
* </ul>
* <p>
- * If <code>b</code> is <code>null</code>,
- * a <code>NullPointerException</code> is thrown.
- * If <code>off</code> is negative, or <code>len</code>
- * is negative, or <code>off+len</code> is
- * greater than the length of the array <code>b</code>,
- * then an <code>IndexOutOfBoundsException</code>
+ * If {@code b} is {@code null},
+ * a {@code NullPointerException} is thrown.
+ * If {@code off} is negative, or {@code len}
+ * is negative, or {@code off+len} is
+ * greater than the length of the array {@code b},
+ * then an {@code IndexOutOfBoundsException}
* is thrown.
- * If <code>len</code> is zero,
+ * If {@code len} is zero,
* then no bytes are read. Otherwise, the first
- * byte read is stored into element <code>b[off]</code>,
- * the next one into <code>b[off+1]</code>,
+ * byte read is stored into element {@code b[off]},
+ * the next one into {@code b[off+1]},
* and so on. The number of bytes read is,
- * at most, equal to <code>len</code>.
+ * at most, equal to {@code len}.
*
* @param b the buffer into which the data is read.
* @param off an int specifying the offset into the data.
@@ -282,7 +282,7 @@ interface DataInput {
/**
* Makes an attempt to skip over
- * <code>n</code> bytes
+ * {@code n} bytes
* of data from the input
* stream, discarding the skipped bytes. However,
* it may skip
@@ -290,10 +290,10 @@ interface DataInput {
* bytes, possibly zero. This may result from
* any of a
* number of conditions; reaching
- * end of file before <code>n</code> bytes
+ * end of file before {@code n} bytes
* have been skipped is
* only one possibility.
- * This method never throws an <code>EOFException</code>.
+ * This method never throws an {@code EOFException}.
* The actual
* number of bytes skipped is returned.
*
@@ -305,13 +305,13 @@ interface DataInput {
/**
* Reads one input byte and returns
- * <code>true</code> if that byte is nonzero,
- * <code>false</code> if that byte is zero.
+ * {@code true} if that byte is nonzero,
+ * {@code false} if that byte is zero.
* This method is suitable for reading
- * the byte written by the <code>writeBoolean</code>
- * method of interface <code>DataOutput</code>.
+ * the byte written by the {@code writeBoolean}
+ * method of interface {@code DataOutput}.
*
- * @return the <code>boolean</code> value read.
+ * @return the {@code boolean} value read.
* @exception EOFException if this stream reaches the end before reading
* all the bytes.
* @exception IOException if an I/O error occurs.
@@ -321,11 +321,11 @@ interface DataInput {
/**
* Reads and returns one input byte.
* The byte is treated as a signed value in
- * the range <code>-128</code> through <code>127</code>,
+ * the range {@code -128} through {@code 127},
* inclusive.
* This method is suitable for
- * reading the byte written by the <code>writeByte</code>
- * method of interface <code>DataOutput</code>.
+ * reading the byte written by the {@code writeByte}
+ * method of interface {@code DataOutput}.
*
* @return the 8-bit value read.
* @exception EOFException if this stream reaches the end before reading
@@ -336,16 +336,16 @@ interface DataInput {
/**
* Reads one input byte, zero-extends
- * it to type <code>int</code>, and returns
+ * it to type {@code int}, and returns
* the result, which is therefore in the range
- * <code>0</code>
- * through <code>255</code>.
+ * {@code 0}
+ * through {@code 255}.
* This method is suitable for reading
- * the byte written by the <code>writeByte</code>
- * method of interface <code>DataOutput</code>
- * if the argument to <code>writeByte</code>
+ * the byte written by the {@code writeByte}
+ * method of interface {@code DataOutput}
+ * if the argument to {@code writeByte}
* was intended to be a value in the range
- * <code>0</code> through <code>255</code>.
+ * {@code 0} through {@code 255}.
*
* @return the unsigned 8-bit value read.
* @exception EOFException if this stream reaches the end before reading
@@ -356,8 +356,8 @@ interface DataInput {
/**
* Reads two input bytes and returns
- * a <code>short</code> value. Let <code>a</code>
- * be the first byte read and <code>b</code>
+ * a {@code short} value. Let {@code a}
+ * be the first byte read and {@code b}
* be the second byte. The value
* returned
* is:
@@ -365,8 +365,8 @@ interface DataInput {
* </code></pre>
* This method
* is suitable for reading the bytes written
- * by the <code>writeShort</code> method of
- * interface <code>DataOutput</code>.
+ * by the {@code writeShort} method of
+ * interface {@code DataOutput}.
*
* @return the 16-bit value read.
* @exception EOFException if this stream reaches the end before reading
@@ -377,19 +377,19 @@ interface DataInput {
/**
* Reads two input bytes and returns
- * an <code>int</code> value in the range <code>0</code>
- * through <code>65535</code>. Let <code>a</code>
+ * an {@code int} value in the range {@code 0}
+ * through {@code 65535}. Let {@code a}
* be the first byte read and
- * <code>b</code>
+ * {@code b}
* be the second byte. The value returned is:
* <p><pre><code>(((a & 0xff) << 8) | (b & 0xff))
* </code></pre>
* This method is suitable for reading the bytes
- * written by the <code>writeShort</code> method
- * of interface <code>DataOutput</code> if
- * the argument to <code>writeShort</code>
+ * written by the {@code writeShort} method
+ * of interface {@code DataOutput} if
+ * the argument to {@code writeShort}
* was intended to be a value in the range
- * <code>0</code> through <code>65535</code>.
+ * {@code 0} through {@code 65535}.
*
* @return the unsigned 16-bit value read.
* @exception EOFException if this stream reaches the end before reading
@@ -399,19 +399,19 @@ interface DataInput {
int readUnsignedShort() throws IOException;
/**
- * Reads two input bytes and returns a <code>char</code> value.
- * Let <code>a</code>
- * be the first byte read and <code>b</code>
+ * Reads two input bytes and returns a {@code char} value.
+ * Let {@code a}
+ * be the first byte read and {@code b}
* be the second byte. The value
* returned is:
* <p><pre><code>(char)((a << 8) | (b & 0xff))
* </code></pre>
* This method
* is suitable for reading bytes written by
- * the <code>writeChar</code> method of interface
- * <code>DataOutput</code>.
+ * the {@code writeChar} method of interface
+ * {@code DataOutput}.
*
- * @return the <code>char</code> value read.
+ * @return the {@code char} value read.
* @exception EOFException if this stream reaches the end before reading
* all the bytes.
* @exception IOException if an I/O error occurs.
@@ -420,18 +420,17 @@ interface DataInput {
/**
* Reads four input bytes and returns an
- * <code>int</code> value. Let <code>a-d</code>
+ * {@code int} value. Let {@code a-d}
* be the first through fourth bytes read. The value returned is:
- * <p><pre>
- * <code>
+ * <p><pre><code>
* (((a & 0xff) << 24) | ((b & 0xff) << 16) |
* ((c & 0xff) << 8) | (d & 0xff))
* </code></pre>
* This method is suitable
- * for reading bytes written by the <code>writeInt</code>
- * method of interface <code>DataOutput</code>.
+ * for reading bytes written by the {@code writeInt}
+ * method of interface {@code DataOutput}.
*
- * @return the <code>int</code> value read.
+ * @return the {@code int} value read.
* @exception EOFException if this stream reaches the end before reading
* all the bytes.
* @exception IOException if an I/O error occurs.
@@ -440,10 +439,10 @@ interface DataInput {
/**
* Reads eight input bytes and returns
- * a <code>long</code> value. Let <code>a-h</code>
+ * a {@code long} value. Let {@code a-h}
* be the first through eighth bytes read.
* The value returned is:
- * <p><pre> <code>
+ * <p><pre><code>
* (((long)(a & 0xff) << 56) |
* ((long)(b & 0xff) << 48) |
* ((long)(c & 0xff) << 40) |
@@ -455,10 +454,10 @@ interface DataInput {
* </code></pre>
* <p>
* This method is suitable
- * for reading bytes written by the <code>writeLong</code>
- * method of interface <code>DataOutput</code>.
+ * for reading bytes written by the {@code writeLong}
+ * method of interface {@code DataOutput}.
*
- * @return the <code>long</code> value read.
+ * @return the {@code long} value read.
* @exception EOFException if this stream reaches the end before reading
* all the bytes.
* @exception IOException if an I/O error occurs.
@@ -467,18 +466,18 @@ interface DataInput {
/**
* Reads four input bytes and returns
- * a <code>float</code> value. It does this
- * by first constructing an <code>int</code>
+ * a {@code float} value. It does this
+ * by first constructing an {@code int}
* value in exactly the manner
- * of the <code>readInt</code>
- * method, then converting this <code>int</code>
- * value to a <code>float</code> in
- * exactly the manner of the method <code>Float.intBitsToFloat</code>.
+ * of the {@code readInt}
+ * method, then converting this {@code int}
+ * value to a {@code float} in
+ * exactly the manner of the method {@code Float.intBitsToFloat}.
* This method is suitable for reading
- * bytes written by the <code>writeFloat</code>
- * method of interface <code>DataOutput</code>.
+ * bytes written by the {@code writeFloat}
+ * method of interface {@code DataOutput}.
*
- * @return the <code>float</code> value read.
+ * @return the {@code float} value read.
* @exception EOFException if this stream reaches the end before reading
* all the bytes.
* @exception IOException if an I/O error occurs.
@@ -487,18 +486,18 @@ interface DataInput {
/**
* Reads eight input bytes and returns
- * a <code>double</code> value. It does this
- * by first constructing a <code>long</code>
+ * a {@code double} value. It does this
+ * by first constructing a {@code long}
* value in exactly the manner
- * of the <code>readlong</code>
- * method, then converting this <code>long</code>
- * value to a <code>double</code> in exactly
- * the manner of the method <code>Double.longBitsToDouble</code>.
+ * of the {@code readlong}
+ * method, then converting this {@code long}
+ * value to a {@code double} in exactly
+ * the manner of the method {@code Double.longBitsToDouble}.
* This method is suitable for reading
- * bytes written by the <code>writeDouble</code>
- * method of interface <code>DataOutput</code>.
+ * bytes written by the {@code writeDouble}
+ * method of interface {@code DataOutput}.
*
- * @return the <code>double</code> value read.
+ * @return the {@code double} value read.
* @exception EOFException if this stream reaches the end before reading
* all the bytes.
* @exception IOException if an I/O error occurs.
@@ -512,35 +511,35 @@ interface DataInput {
* until it encounters a line terminator or
* end of
* file; the characters read are then
- * returned as a <code>String</code>. Note
+ * returned as a {@code String}. Note
* that because this
* method processes bytes,
* it does not support input of the full Unicode
* character set.
* <p>
* If end of file is encountered
- * before even one byte can be read, then <code>null</code>
+ * before even one byte can be read, then {@code null}
* is returned. Otherwise, each byte that is
- * read is converted to type <code>char</code>
- * by zero-extension. If the character <code>'\n'</code>
+ * read is converted to type {@code char}
+ * by zero-extension. If the character {@code '\n'}
* is encountered, it is discarded and reading
- * ceases. If the character <code>'\r'</code>
+ * ceases. If the character {@code '\r'}
* is encountered, it is discarded and, if
* the following byte converts to the
- * character <code>'\n'</code>, then that is
+ * character {@code '\n'}, then that is
* discarded also; reading then ceases. If
* end of file is encountered before either
- * of the characters <code>'\n'</code> and
- * <code>'\r'</code> is encountered, reading
- * ceases. Once reading has ceased, a <code>String</code>
+ * of the characters {@code '\n'} and
+ * {@code '\r'} is encountered, reading
+ * ceases. Once reading has ceased, a {@code String}
* is returned that contains all the characters
* read and not discarded, taken in order.
* Note that every character in this string
- * will have a value less than <code>\u0100</code>,
- * that is, <code>(char)256</code>.
+ * will have a value less than {@code \u005Cu0100},
+ * that is, {@code (char)256}.
*
* @return the next line of text from the input stream,
- * or <CODE>null</CODE> if the end of file is
+ * or {@code null} if the end of file is
* encountered before a byte can be read.
* @exception IOException if an I/O error occurs.
*/
@@ -550,15 +549,15 @@ interface DataInput {
* Reads in a string that has been encoded using a
* <a href="#modified-utf-8">modified UTF-8</a>
* format.
- * The general contract of <code>readUTF</code>
+ * The general contract of {@code readUTF}
* is that it reads a representation of a Unicode
* character string encoded in modified
* UTF-8 format; this string of characters
- * is then returned as a <code>String</code>.
+ * is then returned as a {@code String}.
* <p>
* First, two bytes are read and used to
* construct an unsigned 16-bit integer in
- * exactly the manner of the <code>readUnsignedShort</code>
+ * exactly the manner of the {@code readUnsignedShort}
* method . This integer value is called the
* <i>UTF length</i> and specifies the number
* of additional bytes to be read. These bytes
@@ -570,58 +569,58 @@ interface DataInput {
* next group.
* <p>
* If the first byte of a group
- * matches the bit pattern <code>0xxxxxxx</code>
- * (where <code>x</code> means "may be <code>0</code>
- * or <code>1</code>"), then the group consists
+ * matches the bit pattern {@code 0xxxxxxx}
+ * (where {@code x} means "may be {@code 0}
+ * or {@code 1}"), then the group consists
* of just that byte. The byte is zero-extended
* to form a character.
* <p>
* If the first byte
- * of a group matches the bit pattern <code>110xxxxx</code>,
- * then the group consists of that byte <code>a</code>
- * and a second byte <code>b</code>. If there
- * is no byte <code>b</code> (because byte
- * <code>a</code> was the last of the bytes
- * to be read), or if byte <code>b</code> does
- * not match the bit pattern <code>10xxxxxx</code>,
- * then a <code>UTFDataFormatException</code>
+ * of a group matches the bit pattern {@code 110xxxxx},
+ * then the group consists of that byte {@code a}
+ * and a second byte {@code b}. If there
+ * is no byte {@code b} (because byte
+ * {@code a} was the last of the bytes
+ * to be read), or if byte {@code b} does
+ * not match the bit pattern {@code 10xxxxxx},
+ * then a {@code UTFDataFormatException}
* is thrown. Otherwise, the group is converted
* to the character:<p>
* <pre><code>(char)(((a& 0x1F) << 6) | (b & 0x3F))
* </code></pre>
* If the first byte of a group
- * matches the bit pattern <code>1110xxxx</code>,
- * then the group consists of that byte <code>a</code>
- * and two more bytes <code>b</code> and <code>c</code>.
- * If there is no byte <code>c</code> (because
- * byte <code>a</code> was one of the last
+ * matches the bit pattern {@code 1110xxxx},
+ * then the group consists of that byte {@code a}
+ * and two more bytes {@code b} and {@code c}.
+ * If there is no byte {@code c} (because
+ * byte {@code a} was one of the last
* two of the bytes to be read), or either
- * byte <code>b</code> or byte <code>c</code>
- * does not match the bit pattern <code>10xxxxxx</code>,
- * then a <code>UTFDataFormatException</code>
+ * byte {@code b} or byte {@code c}
+ * does not match the bit pattern {@code 10xxxxxx},
+ * then a {@code UTFDataFormatException}
* is thrown. Otherwise, the group is converted
* to the character:<p>
* <pre><code>
* (char)(((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F))
* </code></pre>
* If the first byte of a group matches the
- * pattern <code>1111xxxx</code> or the pattern
- * <code>10xxxxxx</code>, then a <code>UTFDataFormatException</code>
+ * pattern {@code 1111xxxx} or the pattern
+ * {@code 10xxxxxx}, then a {@code UTFDataFormatException}
* is thrown.
* <p>
* If end of file is encountered
* at any time during this entire process,
- * then an <code>EOFException</code> is thrown.
+ * then an {@code EOFException} is thrown.
* <p>
* After every group has been converted to
* a character by this process, the characters
* are gathered, in the same order in which
* their corresponding groups were read from
- * the input stream, to form a <code>String</code>,
+ * the input stream, to form a {@code String},
* which is returned.
* <p>
- * The <code>writeUTF</code>
- * method of interface <code>DataOutput</code>
+ * The {@code writeUTF}
+ * method of interface {@code DataOutput}
* may be used to write data that is suitable
* for reading by this method.
* @return a Unicode string.
diff --git a/jdk/src/share/classes/java/io/File.java b/jdk/src/share/classes/java/io/File.java
index fba80c2..0dbb307 100644
--- a/jdk/src/share/classes/java/io/File.java
+++ b/jdk/src/share/classes/java/io/File.java
@@ -153,7 +153,7 @@ public class File
/**
* The FileSystem object representing the platform's local file system.
*/
- static private FileSystem fs = FileSystem.getFileSystem();
+ private static final FileSystem fs = FileSystem.getFileSystem();
/**
* This abstract pathname's normalized pathname string. A normalized
@@ -162,13 +162,13 @@ public class File
*
* @serial
*/
- private String path;
+ private final String path;
/**
* The length of this abstract pathname's prefix, or zero if it has no
* prefix.
*/
- private transient int prefixLength;
+ private final transient int prefixLength;
/**
* Returns the length of this abstract pathname's prefix.
@@ -2023,10 +2023,28 @@ public class File
char sep = s.readChar(); // read the previous separator char
if (sep != separatorChar)
pathField = pathField.replace(sep, separatorChar);
- this.path = fs.normalize(pathField);
- this.prefixLength = fs.prefixLength(this.path);
+ String path = fs.normalize(pathField);
+ UNSAFE.putObject(this, PATH_OFFSET, path);
+ UNSAFE.putIntVolatile(this, PREFIX_LENGTH_OFFSET, fs.prefixLength(path));
+ }
+
+ private static final long PATH_OFFSET;
+ private static final long PREFIX_LENGTH_OFFSET;
+ private static final sun.misc.Unsafe UNSAFE;
+ static {
+ try {
+ sun.misc.Unsafe unsafe = sun.misc.Unsafe.getUnsafe();
+ PATH_OFFSET = unsafe.objectFieldOffset(
+ File.class.getDeclaredField("path"));
+ PREFIX_LENGTH_OFFSET = unsafe.objectFieldOffset(
+ File.class.getDeclaredField("prefixLength"));
+ UNSAFE = unsafe;
+ } catch (ReflectiveOperationException e) {
+ throw new Error(e);
+ }
}
+
/** use serialVersionUID from JDK 1.0.2 for interoperability */
private static final long serialVersionUID = 301077366599181567L;
diff --git a/jdk/src/share/classes/java/io/LineNumberInputStream.java b/jdk/src/share/classes/java/io/LineNumberInputStream.java
index 11cfdf8..1f37a98 100644
--- a/jdk/src/share/classes/java/io/LineNumberInputStream.java
+++ b/jdk/src/share/classes/java/io/LineNumberInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,13 +30,13 @@ package java.io;
* functionality of keeping track of the current line number.
* <p>
* A line is a sequence of bytes ending with a carriage return
- * character (<code>'\r'</code>), a newline character
- * (<code>'\n'</code>), or a carriage return character followed
+ * character ({@code '\u005Cr'}), a newline character
+ * ({@code '\u005Cn'}), or a carriage return character followed
* immediately by a linefeed character. In all three cases, the line
* terminating character(s) are returned as a single newline character.
* <p>
- * The line number begins at <code>0</code>, and is incremented by
- * <code>1</code> when a <code>read</code> returns a newline character.
+ * The line number begins at {@code 0}, and is incremented by
+ * {@code 1} when a {@code read} returns a newline character.
*
* @author Arthur van Hoff
* @see java.io.LineNumberReader
@@ -66,22 +66,22 @@ class LineNumberInputStream extends FilterInputStream {
/**
* Reads the next byte of data from this input stream. The value
- * byte is returned as an <code>int</code> in the range
- * <code>0</code> to <code>255</code>. If no byte is available
+ * byte is returned as an {@code int} in the range
+ * {@code 0} to {@code 255}. If no byte is available
* because the end of the stream has been reached, the value
- * <code>-1</code> is returned. This method blocks until input data
+ * {@code -1} is returned. This method blocks until input data
* is available, the end of the stream is detected, or an exception
* is thrown.
* <p>
- * The <code>read</code> method of
- * <code>LineNumberInputStream</code> calls the <code>read</code>
+ * The {@code read} method of
+ * {@code LineNumberInputStream} calls the {@code read}
* method of the underlying input stream. It checks for carriage
* returns and newline characters in the input, and modifies the
* current line number as appropriate. A carriage-return character or
* a carriage return followed by a newline character are both
* converted into a single newline character.
*
- * @return the next byte of data, or <code>-1</code> if the end of this
+ * @return the next byte of data, or {@code -1} if the end of this
* stream is reached.
* @exception IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -111,18 +111,18 @@ class LineNumberInputStream extends FilterInputStream {
}
/**
- * Reads up to <code>len</code> bytes of data from this input stream
+ * Reads up to {@code len} bytes of data from this input stream
* into an array of bytes. This method blocks until some input is available.
* <p>
- * The <code>read</code> method of
- * <code>LineNumberInputStream</code> repeatedly calls the
- * <code>read</code> method of zero arguments to fill in the byte array.
+ * The {@code read} method of
+ * {@code LineNumberInputStream} repeatedly calls the
+ * {@code read} method of zero arguments to fill in the byte array.
*
* @param b the buffer into which the data is read.
* @param off the start offset of the data.
* @param len the maximum number of bytes read.
* @return the total number of bytes read into the buffer, or
- * <code>-1</code> if there is no more data because the end of
+ * {@code -1} if there is no more data because the end of
* this stream has been reached.
* @exception IOException if an I/O error occurs.
* @see java.io.LineNumberInputStream#read()
@@ -160,15 +160,15 @@ class LineNumberInputStream extends FilterInputStream {
}
/**
- * Skips over and discards <code>n</code> bytes of data from this
- * input stream. The <code>skip</code> method may, for a variety of
+ * Skips over and discards {@code n} bytes of data from this
+ * input stream. The {@code skip} method may, for a variety of
* reasons, end up skipping over some smaller number of bytes,
- * possibly <code>0</code>. The actual number of bytes skipped is
- * returned. If <code>n</code> is negative, no bytes are skipped.
+ * possibly {@code 0}. The actual number of bytes skipped is
+ * returned. If {@code n} is negative, no bytes are skipped.
* <p>
- * The <code>skip</code> method of <code>LineNumberInputStream</code> creates
+ * The {@code skip} method of {@code LineNumberInputStream} creates
* a byte array and then repeatedly reads into it until
- * <code>n</code> bytes have been read or the end of the stream has
+ * {@code n} bytes have been read or the end of the stream has
* been reached.
*
* @param n the number of bytes to be skipped.
@@ -225,12 +225,12 @@ class LineNumberInputStream extends FilterInputStream {
* <p>
* Note that if the underlying input stream is able to supply
* <i>k</i> input characters without blocking, the
- * <code>LineNumberInputStream</code> can guarantee only to provide
+ * {@code LineNumberInputStream} can guarantee only to provide
* <i>k</i>/2 characters without blocking, because the
* <i>k</i> characters from the underlying input stream might
- * consist of <i>k</i>/2 pairs of <code>'\r'</code> and
- * <code>'\n'</code>, which are converted to just
- * <i>k</i>/2 <code>'\n'</code> characters.
+ * consist of <i>k</i>/2 pairs of {@code '\u005Cr'} and
+ * {@code '\u005Cn'}, which are converted to just
+ * <i>k</i>/2 {@code '\u005Cn'} characters.
*
* @return the number of bytes that can be read from this input stream
* without blocking.
@@ -243,12 +243,12 @@ class LineNumberInputStream extends FilterInputStream {
/**
* Marks the current position in this input stream. A subsequent
- * call to the <code>reset</code> method repositions this stream at
+ * call to the {@code reset} method repositions this stream at
* the last marked position so that subsequent reads re-read the same bytes.
* <p>
- * The <code>mark</code> method of
- * <code>LineNumberInputStream</code> remembers the current line
- * number in a private variable, and then calls the <code>mark</code>
+ * The {@code mark} method of
+ * {@code LineNumberInputStream} remembers the current line
+ * number in a private variable, and then calls the {@code mark}
* method of the underlying input stream.
*
* @param readlimit the maximum limit of bytes that can be read before
@@ -264,12 +264,12 @@ class LineNumberInputStream extends FilterInputStream {
/**
* Repositions this stream to the position at the time the
- * <code>mark</code> method was last called on this input stream.
+ * {@code mark} method was last called on this input stream.
* <p>
- * The <code>reset</code> method of
- * <code>LineNumberInputStream</code> resets the line number to be
- * the line number at the time the <code>mark</code> method was
- * called, and then calls the <code>reset</code> method of the
+ * The {@code reset} method of
+ * {@code LineNumberInputStream} resets the line number to be
+ * the line number at the time the {@code mark} method was
+ * called, and then calls the {@code reset} method of the
* underlying input stream.
* <p>
* Stream marks are intended to be used in
diff --git a/jdk/src/share/classes/java/io/ObjectStreamClass.java b/jdk/src/share/classes/java/io/ObjectStreamClass.java
index 1a03b6b..41b116d 100644
--- a/jdk/src/share/classes/java/io/ObjectStreamClass.java
+++ b/jdk/src/share/classes/java/io/ObjectStreamClass.java
@@ -123,14 +123,39 @@ public class ObjectStreamClass implements Serializable {
*/
private boolean hasBlockExternalData = true;
+ /**
+ * Contains information about InvalidClassException instances to be thrown
+ * when attempting operations on an invalid class. Note that instances of
+ * this class are immutable and are potentially shared among
+ * ObjectStreamClass instances.
+ */
+ private static class ExceptionInfo {
+ private final String className;
+ private final String message;
+
+ ExceptionInfo(String cn, String msg) {
+ className = cn;
+ message = msg;
+ }
+
+ /**
+ * Returns (does not throw) an InvalidClassException instance created
+ * from the information in this object, suitable for being thrown by
+ * the caller.
+ */
+ InvalidClassException newInvalidClassException() {
+ return new InvalidClassException(className, message);
+ }
+ }
+
/** exception (if any) thrown while attempting to resolve class */
private ClassNotFoundException resolveEx;
/** exception (if any) to throw if non-enum deserialization attempted */
- private InvalidClassException deserializeEx;
+ private ExceptionInfo deserializeEx;
/** exception (if any) to throw if non-enum serialization attempted */
- private InvalidClassException serializeEx;
+ private ExceptionInfo serializeEx;
/** exception (if any) to throw if default serialization attempted */
- private InvalidClassException defaultSerializeEx;
+ private ExceptionInfo defaultSerializeEx;
/** serializable fields */
private ObjectStreamField[] fields;
@@ -444,7 +469,8 @@ public class ObjectStreamClass implements Serializable {
fields = getSerialFields(cl);
computeFieldOffsets();
} catch (InvalidClassException e) {
- serializeEx = deserializeEx = e;
+ serializeEx = deserializeEx =
+ new ExceptionInfo(e.classname, e.getMessage());
fields = NO_FIELDS;
}
@@ -483,15 +509,14 @@ public class ObjectStreamClass implements Serializable {
if (deserializeEx == null) {
if (isEnum) {
- deserializeEx = new InvalidClassException(name, "enum type");
+ deserializeEx = new ExceptionInfo(name, "enum type");
} else if (cons == null) {
- deserializeEx = new InvalidClassException(
- name, "no valid constructor");
+ deserializeEx = new ExceptionInfo(name, "no valid constructor");
}
}
for (int i = 0; i < fields.length; i++) {
if (fields[i].getField() == null) {
- defaultSerializeEx = new InvalidClassException(
+ defaultSerializeEx = new ExceptionInfo(
name, "unmatched serializable field(s) declared");
}
}
@@ -601,8 +626,8 @@ public class ObjectStreamClass implements Serializable {
(externalizable != localDesc.externalizable) ||
!(serializable || externalizable))
{
- deserializeEx = new InvalidClassException(localDesc.name,
- "class invalid for deserialization");
+ deserializeEx = new ExceptionInfo(
+ localDesc.name, "class invalid for deserialization");
}
}
@@ -727,11 +752,7 @@ public class ObjectStreamClass implements Serializable {
*/
void checkDeserialize() throws InvalidClassException {
if (deserializeEx != null) {
- InvalidClassException ice =
- new InvalidClassException(deserializeEx.classname,
- deserializeEx.getMessage());
- ice.initCause(deserializeEx);
- throw ice;
+ throw deserializeEx.newInvalidClassException();
}
}
@@ -742,11 +763,7 @@ public class ObjectStreamClass implements Serializable {
*/
void checkSerialize() throws InvalidClassException {
if (serializeEx != null) {
- InvalidClassException ice =
- new InvalidClassException(serializeEx.classname,
- serializeEx.getMessage());
- ice.initCause(serializeEx);
- throw ice;
+ throw serializeEx.newInvalidClassException();
}
}
@@ -759,11 +776,7 @@ public class ObjectStreamClass implements Serializable {
*/
void checkDefaultSerialize() throws InvalidClassException {
if (defaultSerializeEx != null) {
- InvalidClassException ice =
- new InvalidClassException(defaultSerializeEx.classname,
- defaultSerializeEx.getMessage());
- ice.initCause(defaultSerializeEx);
- throw ice;
+ throw defaultSerializeEx.newInvalidClassException();
}
}
diff --git a/jdk/src/share/classes/java/io/RandomAccessFile.java b/jdk/src/share/classes/java/io/RandomAccessFile.java
index 893fc94..cf1e5c7 100644
--- a/jdk/src/share/classes/java/io/RandomAccessFile.java
+++ b/jdk/src/share/classes/java/io/RandomAccessFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,16 +41,16 @@ import sun.nio.ch.FileChannelImpl;
* the file pointer past the bytes written. Output operations that write
* past the current end of the implied array cause the array to be
* extended. The file pointer can be read by the
- * <code>getFilePointer</code> method and set by the <code>seek</code>
+ * {@code getFilePointer} method and set by the {@code seek}
* method.
* <p>
* It is generally true of all the reading routines in this class that
* if end-of-file is reached before the desired number of bytes has been
- * read, an <code>EOFException</code> (which is a kind of
- * <code>IOException</code>) is thrown. If any byte cannot be read for
- * any reason other than end-of-file, an <code>IOException</code> other
- * than <code>EOFException</code> is thrown. In particular, an
- * <code>IOException</code> may be thrown if the stream has been closed.
+ * read, an {@code EOFException} (which is a kind of
+ * {@code IOException}) is thrown. If any byte cannot be read for
+ * any reason other than end-of-file, an {@code IOException} other
+ * than {@code EOFException} is thrown. In particular, an
+ * {@code IOException} may be thrown if the stream has been closed.
*
* @author unascribed
* @since JDK1.0
@@ -82,12 +82,12 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* href="#mode"><tt>RandomAccessFile(File,String)</tt></a> constructor.
*
* <p>
- * If there is a security manager, its <code>checkRead</code> method
- * is called with the <code>name</code> argument
+ * If there is a security manager, its {@code checkRead} method
+ * is called with the {@code name} argument
* as its argument to see if read access to the file is allowed.
* If the mode allows writing, the security manager's
- * <code>checkWrite</code> method
- * is also called with the <code>name</code> argument
+ * {@code checkWrite} method
+ * is also called with the {@code name} argument
* as its argument to see if write access to the file is allowed.
*
* @param name the system-dependent filename
@@ -103,9 +103,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* that name cannot be created, or if some other error occurs
* while opening or creating the file
* @exception SecurityException if a security manager exists and its
- * <code>checkRead</code> method denies read access to the file
+ * {@code checkRead} method denies read access to the file
* or the mode is "rw" and the security manager's
- * <code>checkWrite</code> method denies write access to the file
+ * {@code checkWrite} method denies write access to the file
* @see java.lang.SecurityException
* @see java.lang.SecurityManager#checkRead(java.lang.String)
* @see java.lang.SecurityManager#checkWrite(java.lang.String)
@@ -164,10 +164,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* updates to both the file's content and its metadata to be written, which
* generally requires at least one more low-level I/O operation.
*
- * <p> If there is a security manager, its <code>checkRead</code> method is
- * called with the pathname of the <code>file</code> argument as its
+ * <p> If there is a security manager, its {@code checkRead} method is
+ * called with the pathname of the {@code file} argument as its
* argument to see if read access to the file is allowed. If the mode
- * allows writing, the security manager's <code>checkWrite</code> method is
+ * allows writing, the security manager's {@code checkWrite} method is
* also called with the path argument to see if write access to the file is
* allowed.
*
@@ -185,9 +185,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* that name cannot be created, or if some other error occurs
* while opening or creating the file
* @exception SecurityException if a security manager exists and its
- * <code>checkRead</code> method denies read access to the file
+ * {@code checkRead} method denies read access to the file
* or the mode is "rw" and the security manager's
- * <code>checkWrite</code> method denies write access to the file
+ * {@code checkWrite} method denies write access to the file
* @see java.lang.SecurityManager#checkRead(java.lang.String)
* @see java.lang.SecurityManager#checkWrite(java.lang.String)
* @see java.nio.channels.FileChannel#force(boolean)
@@ -253,7 +253,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* object associated with this file.
*
* <p> The {@link java.nio.channels.FileChannel#position()
- * </code>position<code>} of the returned channel will always be equal to
+ * position} of the returned channel will always be equal to
* this object's file-pointer offset as returned by the {@link
* #getFilePointer getFilePointer} method. Changing this object's
* file-pointer offset, whether explicitly or by reading or writing bytes,
@@ -277,9 +277,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
/**
* Opens a file and returns the file descriptor. The file is
- * opened in read-write mode if the O_RDWR bit in <code>mode</code>
+ * opened in read-write mode if the O_RDWR bit in {@code mode}
* is true, else the file is opened as read-only.
- * If the <code>name</code> refers to a directory, an IOException
+ * If the {@code name} refers to a directory, an IOException
* is thrown.
*
* @param name the name of the file
@@ -293,15 +293,15 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
/**
* Reads a byte of data from this file. The byte is returned as an
- * integer in the range 0 to 255 (<code>0x00-0x0ff</code>). This
+ * integer in the range 0 to 255 ({@code 0x00-0x0ff}). This
* method blocks if no input is yet available.
* <p>
- * Although <code>RandomAccessFile</code> is not a subclass of
- * <code>InputStream</code>, this method behaves in exactly the same
+ * Although {@code RandomAccessFile} is not a subclass of
+ * {@code InputStream}, this method behaves in exactly the same
* way as the {@link InputStream#read()} method of
- * <code>InputStream</code>.
+ * {@code InputStream}.
*
- * @return the next byte of data, or <code>-1</code> if the end of the
+ * @return the next byte of data, or {@code -1} if the end of the
* file has been reached.
* @exception IOException if an I/O error occurs. Not thrown if
* end-of-file has been reached.
@@ -318,59 +318,59 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
private native int readBytes(byte b[], int off, int len) throws IOException;
/**
- * Reads up to <code>len</code> bytes of data from this file into an
+ * Reads up to {@code len} bytes of data from this file into an
* array of bytes. This method blocks until at least one byte of input
* is available.
* <p>
- * Although <code>RandomAccessFile</code> is not a subclass of
- * <code>InputStream</code>, this method behaves in exactly the
+ * Although {@code RandomAccessFile} is not a subclass of
+ * {@code InputStream}, this method behaves in exactly the
* same way as the {@link InputStream#read(byte[], int, int)} method of
- * <code>InputStream</code>.
+ * {@code InputStream}.
*
* @param b the buffer into which the data is read.
- * @param off the start offset in array <code>b</code>
+ * @param off the start offset in array {@code b}
* at which the data is written.
* @param len the maximum number of bytes read.
* @return the total number of bytes read into the buffer, or
- * <code>-1</code> if there is no more data because the end of
+ * {@code -1} if there is no more data because the end of
* the file has been reached.
* @exception IOException If the first byte cannot be read for any reason
* other than end of file, or if the random access file has been closed, or if
* some other I/O error occurs.
- * @exception NullPointerException If <code>b</code> is <code>null</code>.
- * @exception IndexOutOfBoundsException If <code>off</code> is negative,
- * <code>len</code> is negative, or <code>len</code> is greater than
- * <code>b.length - off</code>
+ * @exception NullPointerException If {@code b} is {@code null}.
+ * @exception IndexOutOfBoundsException If {@code off} is negative,
+ * {@code len} is negative, or {@code len} is greater than
+ * {@code b.length - off}
*/
public int read(byte b[], int off, int len) throws IOException {
return readBytes(b, off, len);
}
/**
- * Reads up to <code>b.length</code> bytes of data from this file
+ * Reads up to {@code b.length} bytes of data from this file
* into an array of bytes. This method blocks until at least one byte
* of input is available.
* <p>
- * Although <code>RandomAccessFile</code> is not a subclass of
- * <code>InputStream</code>, this method behaves in exactly the
+ * Although {@code RandomAccessFile} is not a subclass of
+ * {@code InputStream}, this method behaves in exactly the
* same way as the {@link InputStream#read(byte[])} method of
- * <code>InputStream</code>.
+ * {@code InputStream}.
*
* @param b the buffer into which the data is read.
* @return the total number of bytes read into the buffer, or
- * <code>-1</code> if there is no more data because the end of
+ * {@code -1} if there is no more data because the end of
* this file has been reached.
* @exception IOException If the first byte cannot be read for any reason
* other than end of file, or if the random access file has been closed, or if
* some other I/O error occurs.
- * @exception NullPointerException If <code>b</code> is <code>null</code>.
+ * @exception NullPointerException If {@code b} is {@code null}.
*/
public int read(byte b[]) throws IOException {
return readBytes(b, 0, b.length);
}
/**
- * Reads <code>b.length</code> bytes from this file into the byte
+ * Reads {@code b.length} bytes from this file into the byte
* array, starting at the current file pointer. This method reads
* repeatedly from the file until the requested number of bytes are
* read. This method blocks until the requested number of bytes are
@@ -386,7 +386,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Reads exactly <code>len</code> bytes from this file into the byte
+ * Reads exactly {@code len} bytes from this file into the byte
* array, starting at the current file pointer. This method reads
* repeatedly from the file until the requested number of bytes are
* read. This method blocks until the requested number of bytes are
@@ -410,15 +410,15 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Attempts to skip over <code>n</code> bytes of input discarding the
+ * Attempts to skip over {@code n} bytes of input discarding the
* skipped bytes.
* <p>
*
* This method may skip over some smaller number of bytes, possibly zero.
* This may result from any of a number of conditions; reaching end of
- * file before <code>n</code> bytes have been skipped is only one
- * possibility. This method never throws an <code>EOFException</code>.
- * The actual number of bytes skipped is returned. If <code>n</code>
+ * file before {@code n} bytes have been skipped is only one
+ * possibility. This method never throws an {@code EOFException}.
+ * The actual number of bytes skipped is returned. If {@code n}
* is negative, no bytes are skipped.
*
* @param n the number of bytes to be skipped.
@@ -451,7 +451,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* Writes the specified byte to this file. The write starts at
* the current file pointer.
*
- * @param b the <code>byte</code> to be written.
+ * @param b the {@code byte} to be written.
* @exception IOException if an I/O error occurs.
*/
public native void write(int b) throws IOException;
@@ -467,7 +467,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
private native void writeBytes(byte b[], int off, int len) throws IOException;
/**
- * Writes <code>b.length</code> bytes from the specified byte array
+ * Writes {@code b.length} bytes from the specified byte array
* to this file, starting at the current file pointer.
*
* @param b the data.
@@ -478,8 +478,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Writes <code>len</code> bytes from the specified byte array
- * starting at offset <code>off</code> to this file.
+ * Writes {@code len} bytes from the specified byte array
+ * starting at offset {@code off} to this file.
*
* @param b the data.
* @param off the start offset in the data.
@@ -512,8 +512,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* @param pos the offset position, measured in bytes from the
* beginning of the file, at which to set the file
* pointer.
- * @exception IOException if <code>pos</code> is less than
- * <code>0</code> or if an I/O error occurs.
+ * @exception IOException if {@code pos} is less than
+ * {@code 0} or if an I/O error occurs.
*/
public native void seek(long pos) throws IOException;
@@ -529,14 +529,14 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* Sets the length of this file.
*
* <p> If the present length of the file as returned by the
- * <code>length</code> method is greater than the <code>newLength</code>
+ * {@code length} method is greater than the {@code newLength}
* argument then the file will be truncated. In this case, if the file
- * offset as returned by the <code>getFilePointer</code> method is greater
- * than <code>newLength</code> then after this method returns the offset
- * will be equal to <code>newLength</code>.
+ * offset as returned by the {@code getFilePointer} method is greater
+ * than {@code newLength} then after this method returns the offset
+ * will be equal to {@code newLength}.
*
* <p> If the present length of the file as returned by the
- * <code>length</code> method is smaller than the <code>newLength</code>
+ * {@code length} method is smaller than the {@code newLength}
* argument then the file will be extended. In this case, the contents of
* the extended portion of the file are not defined.
*
@@ -584,14 +584,14 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
//
/**
- * Reads a <code>boolean</code> from this file. This method reads a
+ * Reads a {@code boolean} from this file. This method reads a
* single byte from the file, starting at the current file pointer.
- * A value of <code>0</code> represents
- * <code>false</code>. Any other value represents <code>true</code>.
+ * A value of {@code 0} represents
+ * {@code false}. Any other value represents {@code true}.
* This method blocks until the byte is read, the end of the stream
* is detected, or an exception is thrown.
*
- * @return the <code>boolean</code> value read.
+ * @return the {@code boolean} value read.
* @exception EOFException if this file has reached the end.
* @exception IOException if an I/O error occurs.
*/
@@ -605,7 +605,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
/**
* Reads a signed eight-bit value from this file. This method reads a
* byte from the file, starting from the current file pointer.
- * If the byte read is <code>b</code>, where
+ * If the byte read is {@code b}, where
* <code>0 <= b <= 255</code>,
* then the result is:
* <blockquote><pre>
@@ -616,7 +616,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* is detected, or an exception is thrown.
*
* @return the next byte of this file as a signed eight-bit
- * <code>byte</code>.
+ * {@code byte}.
* @exception EOFException if this file has reached the end.
* @exception IOException if an I/O error occurs.
*/
@@ -651,8 +651,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* Reads a signed 16-bit number from this file. The method reads two
* bytes from this file, starting at the current file pointer.
* If the two bytes read, in order, are
- * <code>b1</code> and <code>b2</code>, where each of the two values is
- * between <code>0</code> and <code>255</code>, inclusive, then the
+ * {@code b1} and {@code b2}, where each of the two values is
+ * between {@code 0} and {@code 255}, inclusive, then the
* result is equal to:
* <blockquote><pre>
* (short)((b1 << 8) | b2)
@@ -679,7 +679,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* Reads an unsigned 16-bit number from this file. This method reads
* two bytes from the file, starting at the current file pointer.
* If the bytes read, in order, are
- * <code>b1</code> and <code>b2</code>, where
+ * {@code b1} and {@code b2}, where
* <code>0 <= b1, b2 <= 255</code>,
* then the result is equal to:
* <blockquote><pre>
@@ -707,7 +707,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* Reads a character from this file. This method reads two
* bytes from the file, starting at the current file pointer.
* If the bytes read, in order, are
- * <code>b1</code> and <code>b2</code>, where
+ * {@code b1} and {@code b2}, where
* <code>0 <= b1, b2 <= 255</code>,
* then the result is equal to:
* <blockquote><pre>
@@ -718,7 +718,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* stream is detected, or an exception is thrown.
*
* @return the next two bytes of this file, interpreted as a
- * <code>char</code>.
+ * {@code char}.
* @exception EOFException if this file reaches the end before reading
* two bytes.
* @exception IOException if an I/O error occurs.
@@ -734,8 +734,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
/**
* Reads a signed 32-bit integer from this file. This method reads 4
* bytes from the file, starting at the current file pointer.
- * If the bytes read, in order, are <code>b1</code>,
- * <code>b2</code>, <code>b3</code>, and <code>b4</code>, where
+ * If the bytes read, in order, are {@code b1},
+ * {@code b2}, {@code b3}, and {@code b4}, where
* <code>0 <= b1, b2, b3, b4 <= 255</code>,
* then the result is equal to:
* <blockquote><pre>
@@ -746,7 +746,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* stream is detected, or an exception is thrown.
*
* @return the next four bytes of this file, interpreted as an
- * <code>int</code>.
+ * {@code int}.
* @exception EOFException if this file reaches the end before reading
* four bytes.
* @exception IOException if an I/O error occurs.
@@ -765,9 +765,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* Reads a signed 64-bit integer from this file. This method reads eight
* bytes from the file, starting at the current file pointer.
* If the bytes read, in order, are
- * <code>b1</code>, <code>b2</code>, <code>b3</code>,
- * <code>b4</code>, <code>b5</code>, <code>b6</code>,
- * <code>b7</code>, and <code>b8,</code> where:
+ * {@code b1}, {@code b2}, {@code b3},
+ * {@code b4}, {@code b5}, {@code b6},
+ * {@code b7}, and {@code b8,} where:
* <blockquote><pre>
* 0 <= b1, b2, b3, b4, b5, b6, b7, b8 <=255,
* </pre></blockquote>
@@ -784,7 +784,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* stream is detected, or an exception is thrown.
*
* @return the next eight bytes of this file, interpreted as a
- * <code>long</code>.
+ * {@code long}.
* @exception EOFException if this file reaches the end before reading
* eight bytes.
* @exception IOException if an I/O error occurs.
@@ -794,18 +794,18 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Reads a <code>float</code> from this file. This method reads an
- * <code>int</code> value, starting at the current file pointer,
- * as if by the <code>readInt</code> method
- * and then converts that <code>int</code> to a <code>float</code>
- * using the <code>intBitsToFloat</code> method in class
- * <code>Float</code>.
+ * Reads a {@code float} from this file. This method reads an
+ * {@code int} value, starting at the current file pointer,
+ * as if by the {@code readInt} method
+ * and then converts that {@code int} to a {@code float}
+ * using the {@code intBitsToFloat} method in class
+ * {@code Float}.
* <p>
* This method blocks until the four bytes are read, the end of the
* stream is detected, or an exception is thrown.
*
* @return the next four bytes of this file, interpreted as a
- * <code>float</code>.
+ * {@code float}.
* @exception EOFException if this file reaches the end before reading
* four bytes.
* @exception IOException if an I/O error occurs.
@@ -817,18 +817,18 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Reads a <code>double</code> from this file. This method reads a
- * <code>long</code> value, starting at the current file pointer,
- * as if by the <code>readLong</code> method
- * and then converts that <code>long</code> to a <code>double</code>
- * using the <code>longBitsToDouble</code> method in
- * class <code>Double</code>.
+ * Reads a {@code double} from this file. This method reads a
+ * {@code long} value, starting at the current file pointer,
+ * as if by the {@code readLong} method
+ * and then converts that {@code long} to a {@code double}
+ * using the {@code longBitsToDouble} method in
+ * class {@code Double}.
* <p>
* This method blocks until the eight bytes are read, the end of the
* stream is detected, or an exception is thrown.
*
* @return the next eight bytes of this file, interpreted as a
- * <code>double</code>.
+ * {@code double}.
* @exception EOFException if this file reaches the end before reading
* eight bytes.
* @exception IOException if an I/O error occurs.
@@ -849,7 +849,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* therefore, support the full Unicode character set.
*
* <p> A line of text is terminated by a carriage-return character
- * (<code>'\r'</code>), a newline character (<code>'\n'</code>), a
+ * ({@code '\u005Cr'}), a newline character ({@code '\u005Cn'}), a
* carriage-return character immediately followed by a newline character,
* or the end of the file. Line-terminating characters are discarded and
* are not included as part of the string returned.
@@ -901,7 +901,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* <p>
* The first two bytes are read, starting from the current file
* pointer, as if by
- * <code>readUnsignedShort</code>. This value gives the number of
+ * {@code readUnsignedShort}. This value gives the number of
* following bytes that are in the encoded string, not
* the length of the resulting string. The following bytes are then
* interpreted as bytes encoding characters in the modified UTF-8 format
@@ -923,13 +923,13 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Writes a <code>boolean</code> to the file as a one-byte value. The
- * value <code>true</code> is written out as the value
- * <code>(byte)1</code>; the value <code>false</code> is written out
- * as the value <code>(byte)0</code>. The write starts at
+ * Writes a {@code boolean} to the file as a one-byte value. The
+ * value {@code true} is written out as the value
+ * {@code (byte)1}; the value {@code false} is written out
+ * as the value {@code (byte)0}. The write starts at
* the current position of the file pointer.
*
- * @param v a <code>boolean</code> value to be written.
+ * @param v a {@code boolean} value to be written.
* @exception IOException if an I/O error occurs.
*/
public final void writeBoolean(boolean v) throws IOException {
@@ -938,10 +938,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Writes a <code>byte</code> to the file as a one-byte value. The
+ * Writes a {@code byte} to the file as a one-byte value. The
* write starts at the current position of the file pointer.
*
- * @param v a <code>byte</code> value to be written.
+ * @param v a {@code byte} value to be written.
* @exception IOException if an I/O error occurs.
*/
public final void writeByte(int v) throws IOException {
@@ -950,10 +950,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Writes a <code>short</code> to the file as two bytes, high byte first.
+ * Writes a {@code short} to the file as two bytes, high byte first.
* The write starts at the current position of the file pointer.
*
- * @param v a <code>short</code> to be written.
+ * @param v a {@code short} to be written.
* @exception IOException if an I/O error occurs.
*/
public final void writeShort(int v) throws IOException {
@@ -963,11 +963,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Writes a <code>char</code> to the file as a two-byte value, high
+ * Writes a {@code char} to the file as a two-byte value, high
* byte first. The write starts at the current position of the
* file pointer.
*
- * @param v a <code>char</code> value to be written.
+ * @param v a {@code char} value to be written.
* @exception IOException if an I/O error occurs.
*/
public final void writeChar(int v) throws IOException {
@@ -977,10 +977,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Writes an <code>int</code> to the file as four bytes, high byte first.
+ * Writes an {@code int} to the file as four bytes, high byte first.
* The write starts at the current position of the file pointer.
*
- * @param v an <code>int</code> to be written.
+ * @param v an {@code int} to be written.
* @exception IOException if an I/O error occurs.
*/
public final void writeInt(int v) throws IOException {
@@ -992,10 +992,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Writes a <code>long</code> to the file as eight bytes, high byte first.
+ * Writes a {@code long} to the file as eight bytes, high byte first.
* The write starts at the current position of the file pointer.
*
- * @param v a <code>long</code> to be written.
+ * @param v a {@code long} to be written.
* @exception IOException if an I/O error occurs.
*/
public final void writeLong(long v) throws IOException {
@@ -1011,13 +1011,13 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Converts the float argument to an <code>int</code> using the
- * <code>floatToIntBits</code> method in class <code>Float</code>,
- * and then writes that <code>int</code> value to the file as a
+ * Converts the float argument to an {@code int} using the
+ * {@code floatToIntBits} method in class {@code Float},
+ * and then writes that {@code int} value to the file as a
* four-byte quantity, high byte first. The write starts at the
* current position of the file pointer.
*
- * @param v a <code>float</code> value to be written.
+ * @param v a {@code float} value to be written.
* @exception IOException if an I/O error occurs.
* @see java.lang.Float#floatToIntBits(float)
*/
@@ -1026,13 +1026,13 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
}
/**
- * Converts the double argument to a <code>long</code> using the
- * <code>doubleToLongBits</code> method in class <code>Double</code>,
- * and then writes that <code>long</code> value to the file as an
+ * Converts the double argument to a {@code long} using the
+ * {@code doubleToLongBits} method in class {@code Double},
+ * and then writes that {@code long} value to the file as an
* eight-byte quantity, high byte first. The write starts at the current
* position of the file pointer.
*
- * @param v a <code>double</code> value to be written.
+ * @param v a {@code double} value to be written.
* @exception IOException if an I/O error occurs.
* @see java.lang.Double#doubleToLongBits(double)
*/
@@ -1060,10 +1060,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
/**
* Writes a string to the file as a sequence of characters. Each
* character is written to the data output stream as if by the
- * <code>writeChar</code> method. The write starts at the current
+ * {@code writeChar} method. The write starts at the current
* position of the file pointer.
*
- * @param s a <code>String</code> value to be written.
+ * @param s a {@code String} value to be written.
* @exception IOException if an I/O error occurs.
* @see java.io.RandomAccessFile#writeChar(int)
*/
@@ -1087,7 +1087,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* <p>
* First, two bytes are written to the file, starting at the
* current file pointer, as if by the
- * <code>writeShort</code> method giving the number of bytes to
+ * {@code writeShort} method giving the number of bytes to
* follow. This value is the number of bytes actually written out,
* not the length of the string. Following the length, each character
* of the string is output, in sequence, using the modified UTF-8 encoding
diff --git a/jdk/src/share/classes/java/io/StreamTokenizer.java b/jdk/src/share/classes/java/io/StreamTokenizer.java
index 81ec5d5..3c7c7cc 100644
--- a/jdk/src/share/classes/java/io/StreamTokenizer.java
+++ b/jdk/src/share/classes/java/io/StreamTokenizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +28,7 @@ package java.io;
import java.util.Arrays;
/**
- * The <code>StreamTokenizer</code> class takes an input stream and
+ * The {@code StreamTokenizer} class takes an input stream and
* parses it into "tokens", allowing the tokens to be
* read one at a time. The parsing process is controlled by a table
* and a number of flags that can be set to various states. The
@@ -36,7 +36,7 @@ import java.util.Arrays;
* strings, and various comment styles.
* <p>
* Each byte read from the input stream is regarded as a character
- * in the range <code>'\u0000'</code> through <code>'\u00FF'</code>.
+ * in the range {@code '\u005Cu0000'} through {@code '\u005Cu00FF'}.
* The character value is used to look up five possible attributes of
* the character: <i>white space</i>, <i>alphabetic</i>,
* <i>numeric</i>, <i>string quote</i>, and <i>comment character</i>.
@@ -53,8 +53,8 @@ import java.util.Arrays;
* <p>
* A typical application first constructs an instance of this class,
* sets up the syntax tables, and then repeatedly loops calling the
- * <code>nextToken</code> method in each iteration of the loop until
- * it returns the value <code>TT_EOF</code>.
+ * {@code nextToken} method in each iteration of the loop until
+ * it returns the value {@code TT_EOF}.
*
* @author James Gosling
* @see java.io.StreamTokenizer#nextToken()
@@ -99,19 +99,19 @@ public class StreamTokenizer {
private static final byte CT_COMMENT = 16;
/**
- * After a call to the <code>nextToken</code> method, this field
+ * After a call to the {@code nextToken} method, this field
* contains the type of the token just read. For a single character
* token, its value is the single character, converted to an integer.
* For a quoted string token, its value is the quote character.
* Otherwise, its value is one of the following:
* <ul>
- * <li><code>TT_WORD</code> indicates that the token is a word.
- * <li><code>TT_NUMBER</code> indicates that the token is a number.
- * <li><code>TT_EOL</code> indicates that the end of line has been read.
+ * <li>{@code TT_WORD} indicates that the token is a word.
+ * <li>{@code TT_NUMBER} indicates that the token is a number.
+ * <li>{@code TT_EOL} indicates that the end of line has been read.
* The field can only have this value if the
- * <code>eolIsSignificant</code> method has been called with the
- * argument <code>true</code>.
- * <li><code>TT_EOF</code> indicates that the end of the input stream
+ * {@code eolIsSignificant} method has been called with the
+ * argument {@code true}.
+ * <li>{@code TT_EOF} indicates that the end of the input stream
* has been reached.
* </ul>
* <p>
@@ -160,8 +160,8 @@ public class StreamTokenizer {
* the string.
* <p>
* The current token is a word when the value of the
- * <code>ttype</code> field is <code>TT_WORD</code>. The current token is
- * a quoted string token when the value of the <code>ttype</code> field is
+ * {@code ttype} field is {@code TT_WORD}. The current token is
+ * a quoted string token when the value of the {@code ttype} field is
* a quote character.
* <p>
* The initial value of this field is null.
@@ -175,7 +175,7 @@ public class StreamTokenizer {
/**
* If the current token is a number, this field contains the value
* of that number. The current token is a number when the value of
- * the <code>ttype</code> field is <code>TT_NUMBER</code>.
+ * the {@code ttype} field is {@code TT_NUMBER}.
* <p>
* The initial value of this field is 0.0.
*
@@ -201,14 +201,14 @@ public class StreamTokenizer {
* stream. The stream tokenizer is initialized to the following
* default state:
* <ul>
- * <li>All byte values <code>'A'</code> through <code>'Z'</code>,
- * <code>'a'</code> through <code>'z'</code>, and
- * <code>'\u00A0'</code> through <code>'\u00FF'</code> are
+ * <li>All byte values {@code 'A'} through {@code 'Z'},
+ * {@code 'a'} through {@code 'z'}, and
+ * {@code '\u005Cu00A0'} through {@code '\u005Cu00FF'} are
* considered to be alphabetic.
- * <li>All byte values <code>'\u0000'</code> through
- * <code>'\u0020'</code> are considered to be white space.
- * <li><code>'/'</code> is a comment character.
- * <li>Single quote <code>'\''</code> and double quote <code>'"'</code>
+ * <li>All byte values {@code '\u005Cu0000'} through
+ * {@code '\u005Cu0020'} are considered to be white space.
+ * <li>{@code '/'} is a comment character.
+ * <li>Single quote {@code '\u005C''} and double quote {@code '"'}
* are string quote characters.
* <li>Numbers are parsed.
* <li>Ends of lines are treated as white space, not as separate tokens.
@@ -252,7 +252,7 @@ public class StreamTokenizer {
/**
* Resets this tokenizer's syntax table so that all characters are
- * "ordinary." See the <code>ordinaryChar</code> method
+ * "ordinary." See the {@code ordinaryChar} method
* for more information on a character being ordinary.
*
* @see java.io.StreamTokenizer#ordinaryChar(int)
@@ -305,7 +305,7 @@ public class StreamTokenizer {
* Specifies that all characters <i>c</i> in the range
* <code>low <= <i>c</i> <= high</code>
* are "ordinary" in this tokenizer. See the
- * <code>ordinaryChar</code> method for more information on a
+ * {@code ordinaryChar} method for more information on a
* character being ordinary.
*
* @param low the low end of the range.
@@ -327,12 +327,12 @@ public class StreamTokenizer {
* character has as a comment character, word component, string
* delimiter, white space, or number character. When such a character
* is encountered by the parser, the parser treats it as a
- * single-character token and sets <code>ttype</code> field to the
+ * single-character token and sets {@code ttype} field to the
* character value.
*
* <p>Making a line terminator character "ordinary" may interfere
- * with the ability of a <code>StreamTokenizer</code> to count
- * lines. The <code>lineno</code> method may no longer reflect
+ * with the ability of a {@code StreamTokenizer} to count
+ * lines. The {@code lineno} method may no longer reflect
* the presence of such terminator characters in its line count.
*
* @param ch the character.
@@ -361,9 +361,9 @@ public class StreamTokenizer {
* Specifies that matching pairs of this character delimit string
* constants in this tokenizer.
* <p>
- * When the <code>nextToken</code> method encounters a string
- * constant, the <code>ttype</code> field is set to the string
- * delimiter and the <code>sval</code> field is set to the body of
+ * When the {@code nextToken} method encounters a string
+ * constant, the {@code ttype} field is set to the string
+ * delimiter and the {@code sval} field is set to the body of
* the string.
* <p>
* If a string quote character is encountered, then a string is
@@ -371,7 +371,7 @@ public class StreamTokenizer {
* the string quote character, up to (but not including) the next
* occurrence of that same string quote character, or a line
* terminator, or end of file. The usual escape sequences such as
- * <code>"\n"</code> and <code>"\t"</code> are recognized and
+ * {@code "\u005Cn"} and {@code "\u005Ct"} are recognized and
* converted to single characters as the string is parsed.
*
* <p>Any other attribute settings for the specified character are cleared.
@@ -398,9 +398,9 @@ public class StreamTokenizer {
* <p>
* When the parser encounters a word token that has the format of a
* double precision floating-point number, it treats the token as a
- * number rather than a word, by setting the <code>ttype</code>
- * field to the value <code>TT_NUMBER</code> and putting the numeric
- * value of the token into the <code>nval</code> field.
+ * number rather than a word, by setting the {@code ttype}
+ * field to the value {@code TT_NUMBER} and putting the numeric
+ * value of the token into the {@code nval} field.
*
* @see java.io.StreamTokenizer#nval
* @see java.io.StreamTokenizer#TT_NUMBER
@@ -416,21 +416,21 @@ public class StreamTokenizer {
/**
* Determines whether or not ends of line are treated as tokens.
* If the flag argument is true, this tokenizer treats end of lines
- * as tokens; the <code>nextToken</code> method returns
- * <code>TT_EOL</code> and also sets the <code>ttype</code> field to
+ * as tokens; the {@code nextToken} method returns
+ * {@code TT_EOL} and also sets the {@code ttype} field to
* this value when an end of line is read.
* <p>
* A line is a sequence of characters ending with either a
- * carriage-return character (<code>'\r'</code>) or a newline
- * character (<code>'\n'</code>). In addition, a carriage-return
+ * carriage-return character ({@code '\u005Cr'}) or a newline
+ * character ({@code '\u005Cn'}). In addition, a carriage-return
* character followed immediately by a newline character is treated
* as a single end-of-line token.
* <p>
- * If the <code>flag</code> is false, end-of-line characters are
+ * If the {@code flag} is false, end-of-line characters are
* treated as white space and serve only to separate tokens.
*
- * @param flag <code>true</code> indicates that end-of-line characters
- * are separate tokens; <code>false</code> indicates that
+ * @param flag {@code true} indicates that end-of-line characters
+ * are separate tokens; {@code false} indicates that
* end-of-line characters are white space.
* @see java.io.StreamTokenizer#nextToken()
* @see java.io.StreamTokenizer#ttype
@@ -442,14 +442,14 @@ public class StreamTokenizer {
/**
* Determines whether or not the tokenizer recognizes C-style comments.
- * If the flag argument is <code>true</code>, this stream tokenizer
+ * If the flag argument is {@code true}, this stream tokenizer
* recognizes C-style comments. All text between successive
- * occurrences of <code>/*</code> and <code>*/</code> are discarded.
+ * occurrences of {@code /*} and <code>*/</code> are discarded.
* <p>
- * If the flag argument is <code>false</code>, then C-style comments
+ * If the flag argument is {@code false}, then C-style comments
* are not treated specially.
*
- * @param flag <code>true</code> indicates to recognize and ignore
+ * @param flag {@code true} indicates to recognize and ignore
* C-style comments.
*/
public void slashStarComments(boolean flag) {
@@ -458,15 +458,15 @@ public class StreamTokenizer {
/**
* Determines whether or not the tokenizer recognizes C++-style comments.
- * If the flag argument is <code>true</code>, this stream tokenizer
+ * If the flag argument is {@code true}, this stream tokenizer
* recognizes C++-style comments. Any occurrence of two consecutive
- * slash characters (<code>'/'</code>) is treated as the beginning of
+ * slash characters ({@code '/'}) is treated as the beginning of
* a comment that extends to the end of the line.
* <p>
- * If the flag argument is <code>false</code>, then C++-style
+ * If the flag argument is {@code false}, then C++-style
* comments are not treated specially.
*
- * @param flag <code>true</code> indicates to recognize and ignore
+ * @param flag {@code true} indicates to recognize and ignore
* C++-style comments.
*/
public void slashSlashComments(boolean flag) {
@@ -475,16 +475,16 @@ public class StreamTokenizer {
/**
* Determines whether or not word token are automatically lowercased.
- * If the flag argument is <code>true</code>, then the value in the
- * <code>sval</code> field is lowercased whenever a word token is
- * returned (the <code>ttype</code> field has the
- * value <code>TT_WORD</code> by the <code>nextToken</code> method
+ * If the flag argument is {@code true}, then the value in the
+ * {@code sval} field is lowercased whenever a word token is
+ * returned (the {@code ttype} field has the
+ * value {@code TT_WORD} by the {@code nextToken} method
* of this tokenizer.
* <p>
- * If the flag argument is <code>false</code>, then the
- * <code>sval</code> field is not modified.
+ * If the flag argument is {@code false}, then the
+ * {@code sval} field is not modified.
*
- * @param fl <code>true</code> indicates that all word tokens should
+ * @param fl {@code true} indicates that all word tokens should
* be lowercased.
* @see java.io.StreamTokenizer#nextToken()
* @see java.io.StreamTokenizer#ttype
@@ -506,9 +506,9 @@ public class StreamTokenizer {
/**
* Parses the next token from the input stream of this tokenizer.
- * The type of the next token is returned in the <code>ttype</code>
+ * The type of the next token is returned in the {@code ttype}
* field. Additional information about the token may be in the
- * <code>nval</code> field or the <code>sval</code> field of this
+ * {@code nval} field or the {@code sval} field of this
* tokenizer.
* <p>
* Typical clients of this
@@ -516,7 +516,7 @@ public class StreamTokenizer {
* calling nextToken to parse successive tokens until TT_EOF
* is returned.
*
- * @return the value of the <code>ttype</code> field.
+ * @return the value of the {@code ttype} field.
* @exception IOException if an I/O error occurs.
* @see java.io.StreamTokenizer#nval
* @see java.io.StreamTokenizer#sval
@@ -752,10 +752,10 @@ public class StreamTokenizer {
}
/**
- * Causes the next call to the <code>nextToken</code> method of this
- * tokenizer to return the current value in the <code>ttype</code>
- * field, and not to modify the value in the <code>nval</code> or
- * <code>sval</code> field.
+ * Causes the next call to the {@code nextToken} method of this
+ * tokenizer to return the current value in the {@code ttype}
+ * field, and not to modify the value in the {@code nval} or
+ * {@code sval} field.
*
* @see java.io.StreamTokenizer#nextToken()
* @see java.io.StreamTokenizer#nval
diff --git a/jdk/src/share/classes/java/lang/AbstractStringBuilder.java b/jdk/src/share/classes/java/lang/AbstractStringBuilder.java
index 3605343..eb38da2 100644
--- a/jdk/src/share/classes/java/lang/AbstractStringBuilder.java
+++ b/jdk/src/share/classes/java/lang/AbstractStringBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -91,10 +91,10 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* array is allocated with greater capacity. The new capacity is the
* larger of:
* <ul>
- * <li>The <code>minimumCapacity</code> argument.
- * <li>Twice the old capacity, plus <code>2</code>.
+ * <li>The {@code minimumCapacity} argument.
+ * <li>Twice the old capacity, plus {@code 2}.
* </ul>
- * If the <code>minimumCapacity</code> argument is nonpositive, this
+ * If the {@code minimumCapacity} argument is nonpositive, this
* method takes no action and simply returns.
*
* @param minimumCapacity the minimum desired capacity.
@@ -147,26 +147,26 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* Sets the length of the character sequence.
* The sequence is changed to a new character sequence
* whose length is specified by the argument. For every nonnegative
- * index <i>k</i> less than <code>newLength</code>, the character at
+ * index <i>k</i> less than {@code newLength}, the character at
* index <i>k</i> in the new character sequence is the same as the
* character at index <i>k</i> in the old sequence if <i>k</i> is less
* than the length of the old character sequence; otherwise, it is the
- * null character <code>'\u0000'</code>.
+ * null character {@code '\u005Cu0000'}.
*
- * In other words, if the <code>newLength</code> argument is less than
+ * In other words, if the {@code newLength} argument is less than
* the current length, the length is changed to the specified length.
* <p>
- * If the <code>newLength</code> argument is greater than or equal
+ * If the {@code newLength} argument is greater than or equal
* to the current length, sufficient null characters
- * (<code>'\u0000'</code>) are appended so that
- * length becomes the <code>newLength</code> argument.
+ * ({@code '\u005Cu0000'}) are appended so that
+ * length becomes the {@code newLength} argument.
* <p>
- * The <code>newLength</code> argument must be greater than or equal
- * to <code>0</code>.
+ * The {@code newLength} argument must be greater than or equal
+ * to {@code 0}.
*
* @param newLength the new length
* @throws IndexOutOfBoundsException if the
- * <code>newLength</code> argument is negative.
+ * {@code newLength} argument is negative.
*/
public void setLength(int newLength) {
if (newLength < 0)
@@ -182,21 +182,21 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
}
/**
- * Returns the <code>char</code> value in this sequence at the specified index.
- * The first <code>char</code> value is at index <code>0</code>, the next at index
- * <code>1</code>, and so on, as in array indexing.
+ * Returns the {@code char} value in this sequence at the specified index.
+ * The first {@code char} value is at index {@code 0}, the next at index
+ * {@code 1}, and so on, as in array indexing.
* <p>
* The index argument must be greater than or equal to
- * <code>0</code>, and less than the length of this sequence.
+ * {@code 0}, and less than the length of this sequence.
*
- * <p>If the <code>char</code> value specified by the index is a
+ * <p>If the {@code char} value specified by the index is a
* <a href="Character.html#unicode">surrogate</a>, the surrogate
* value is returned.
*
- * @param index the index of the desired <code>char</code> value.
- * @return the <code>char</code> value at the specified index.
- * @throws IndexOutOfBoundsException if <code>index</code> is
- * negative or greater than or equal to <code>length()</code>.
+ * @param index the index of the desired {@code char} value.
+ * @return the {@code char} value at the specified index.
+ * @throws IndexOutOfBoundsException if {@code index} is
+ * negative or greater than or equal to {@code length()}.
*/
public char charAt(int index) {
if ((index < 0) || (index >= count))
@@ -206,22 +206,22 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Returns the character (Unicode code point) at the specified
- * index. The index refers to <code>char</code> values
- * (Unicode code units) and ranges from <code>0</code> to
- * {@link #length()}<code> - 1</code>.
+ * index. The index refers to {@code char} values
+ * (Unicode code units) and ranges from {@code 0} to
+ * {@link #length()}{@code - 1}.
*
- * <p> If the <code>char</code> value specified at the given index
+ * <p> If the {@code char} value specified at the given index
* is in the high-surrogate range, the following index is less
* than the length of this sequence, and the
- * <code>char</code> value at the following index is in the
+ * {@code char} value at the following index is in the
* low-surrogate range, then the supplementary code point
* corresponding to this surrogate pair is returned. Otherwise,
- * the <code>char</code> value at the given index is returned.
+ * the {@code char} value at the given index is returned.
*
- * @param index the index to the <code>char</code> values
+ * @param index the index to the {@code char} values
* @return the code point value of the character at the
- * <code>index</code>
- * @exception IndexOutOfBoundsException if the <code>index</code>
+ * {@code index}
+ * @exception IndexOutOfBoundsException if the {@code index}
* argument is negative or not less than the length of this
* sequence.
*/
@@ -234,22 +234,22 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Returns the character (Unicode code point) before the specified
- * index. The index refers to <code>char</code> values
- * (Unicode code units) and ranges from <code>1</code> to {@link
+ * index. The index refers to {@code char} values
+ * (Unicode code units) and ranges from {@code 1} to {@link
* #length()}.
*
- * <p> If the <code>char</code> value at <code>(index - 1)</code>
- * is in the low-surrogate range, <code>(index - 2)</code> is not
- * negative, and the <code>char</code> value at <code>(index -
- * 2)</code> is in the high-surrogate range, then the
+ * <p> If the {@code char} value at {@code (index - 1)}
+ * is in the low-surrogate range, {@code (index - 2)} is not
+ * negative, and the {@code char} value at {@code (index -
+ * 2)} is in the high-surrogate range, then the
* supplementary code point value of the surrogate pair is
- * returned. If the <code>char</code> value at <code>index -
- * 1</code> is an unpaired low-surrogate or a high-surrogate, the
+ * returned. If the {@code char} value at {@code index -
+ * 1} is an unpaired low-surrogate or a high-surrogate, the
* surrogate value is returned.
*
* @param index the index following the code point that should be returned
* @return the Unicode code point value before the given index.
- * @exception IndexOutOfBoundsException if the <code>index</code>
+ * @exception IndexOutOfBoundsException if the {@code index}
* argument is less than 1 or greater than the length
* of this sequence.
*/
@@ -264,22 +264,22 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Returns the number of Unicode code points in the specified text
* range of this sequence. The text range begins at the specified
- * <code>beginIndex</code> and extends to the <code>char</code> at
- * index <code>endIndex - 1</code>. Thus the length (in
- * <code>char</code>s) of the text range is
- * <code>endIndex-beginIndex</code>. Unpaired surrogates within
+ * {@code beginIndex} and extends to the {@code char} at
+ * index {@code endIndex - 1}. Thus the length (in
+ * {@code char}s) of the text range is
+ * {@code endIndex-beginIndex}. Unpaired surrogates within
* this sequence count as one code point each.
*
- * @param beginIndex the index to the first <code>char</code> of
+ * @param beginIndex the index to the first {@code char} of
* the text range.
- * @param endIndex the index after the last <code>char</code> of
+ * @param endIndex the index after the last {@code char} of
* the text range.
* @return the number of Unicode code points in the specified text
* range
* @exception IndexOutOfBoundsException if the
- * <code>beginIndex</code> is negative, or <code>endIndex</code>
+ * {@code beginIndex} is negative, or {@code endIndex}
* is larger than the length of this sequence, or
- * <code>beginIndex</code> is larger than <code>endIndex</code>.
+ * {@code beginIndex} is larger than {@code endIndex}.
*/
public int codePointCount(int beginIndex, int endIndex) {
if (beginIndex < 0 || endIndex > count || beginIndex > endIndex) {
@@ -290,22 +290,22 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Returns the index within this sequence that is offset from the
- * given <code>index</code> by <code>codePointOffset</code> code
+ * given {@code index} by {@code codePointOffset} code
* points. Unpaired surrogates within the text range given by
- * <code>index</code> and <code>codePointOffset</code> count as
+ * {@code index} and {@code codePointOffset} count as
* one code point each.
*
* @param index the index to be offset
* @param codePointOffset the offset in code points
* @return the index within this sequence
- * @exception IndexOutOfBoundsException if <code>index</code>
+ * @exception IndexOutOfBoundsException if {@code index}
* is negative or larger then the length of this sequence,
- * or if <code>codePointOffset</code> is positive and the subsequence
- * starting with <code>index</code> has fewer than
- * <code>codePointOffset</code> code points,
- * or if <code>codePointOffset</code> is negative and the subsequence
- * before <code>index</code> has fewer than the absolute value of
- * <code>codePointOffset</code> code points.
+ * or if {@code codePointOffset} is positive and the subsequence
+ * starting with {@code index} has fewer than
+ * {@code codePointOffset} code points,
+ * or if {@code codePointOffset} is negative and the subsequence
+ * before {@code index} has fewer than the absolute value of
+ * {@code codePointOffset} code points.
*/
public int offsetByCodePoints(int index, int codePointOffset) {
if (index < 0 || index > count) {
@@ -317,12 +317,12 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Characters are copied from this sequence into the
- * destination character array <code>dst</code>. The first character to
- * be copied is at index <code>srcBegin</code>; the last character to
- * be copied is at index <code>srcEnd-1</code>. The total number of
- * characters to be copied is <code>srcEnd-srcBegin</code>. The
- * characters are copied into the subarray of <code>dst</code> starting
- * at index <code>dstBegin</code> and ending at index:
+ * destination character array {@code dst}. The first character to
+ * be copied is at index {@code srcBegin}; the last character to
+ * be copied is at index {@code srcEnd-1}. The total number of
+ * characters to be copied is {@code srcEnd-srcBegin}. The
+ * characters are copied into the subarray of {@code dst} starting
+ * at index {@code dstBegin} and ending at index:
* <p><blockquote><pre>
* dstbegin + (srcEnd-srcBegin) - 1
* </pre></blockquote>
@@ -330,19 +330,19 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* @param srcBegin start copying at this offset.
* @param srcEnd stop copying at this offset.
* @param dst the array to copy the data into.
- * @param dstBegin offset into <code>dst</code>.
- * @throws NullPointerException if <code>dst</code> is
- * <code>null</code>.
+ * @param dstBegin offset into {@code dst}.
+ * @throws NullPointerException if {@code dst} is
+ * {@code null}.
* @throws IndexOutOfBoundsException if any of the following is true:
* <ul>
- * <li><code>srcBegin</code> is negative
- * <li><code>dstBegin</code> is negative
- * <li>the <code>srcBegin</code> argument is greater than
- * the <code>srcEnd</code> argument.
- * <li><code>srcEnd</code> is greater than
- * <code>this.length()</code>.
- * <li><code>dstBegin+srcEnd-srcBegin</code> is greater than
- * <code>dst.length</code>
+ * <li>{@code srcBegin} is negative
+ * <li>{@code dstBegin} is negative
+ * <li>the {@code srcBegin} argument is greater than
+ * the {@code srcEnd} argument.
+ * <li>{@code srcEnd} is greater than
+ * {@code this.length()}.
+ * <li>{@code dstBegin+srcEnd-srcBegin} is greater than
+ * {@code dst.length}
* </ul>
*/
public void getChars(int srcBegin, int srcEnd, char[] dst, int dstBegin)
@@ -357,18 +357,18 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
}
/**
- * The character at the specified index is set to <code>ch</code>. This
+ * The character at the specified index is set to {@code ch}. This
* sequence is altered to represent a new character sequence that is
* identical to the old character sequence, except that it contains the
- * character <code>ch</code> at position <code>index</code>.
+ * character {@code ch} at position {@code index}.
* <p>
* The index argument must be greater than or equal to
- * <code>0</code>, and less than the length of this sequence.
+ * {@code 0}, and less than the length of this sequence.
*
* @param index the index of the character to modify.
* @param ch the new character.
- * @throws IndexOutOfBoundsException if <code>index</code> is
- * negative or greater than or equal to <code>length()</code>.
+ * @throws IndexOutOfBoundsException if {@code index} is
+ * negative or greater than or equal to {@code length()}.
*/
public void setCharAt(int index, char ch) {
if ((index < 0) || (index >= count))
@@ -741,21 +741,21 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
}
/**
- * Removes the <code>char</code> at the specified position in this
- * sequence. This sequence is shortened by one <code>char</code>.
+ * Removes the {@code char} at the specified position in this
+ * sequence. This sequence is shortened by one {@code char}.
*
* <p>Note: If the character at the given index is a supplementary
* character, this method does not remove the entire character. If
* correct handling of supplementary characters is required,
- * determine the number of <code>char</code>s to remove by calling
- * <code>Character.charCount(thisSequence.codePointAt(index))</code>,
- * where <code>thisSequence</code> is this sequence.
+ * determine the number of {@code char}s to remove by calling
+ * {@code Character.charCount(thisSequence.codePointAt(index))},
+ * where {@code thisSequence} is this sequence.
*
- * @param index Index of <code>char</code> to remove
+ * @param index Index of {@code char} to remove
* @return This object.
- * @throws StringIndexOutOfBoundsException if the <code>index</code>
+ * @throws StringIndexOutOfBoundsException if the {@code index}
* is negative or greater than or equal to
- * <code>length()</code>.
+ * {@code length()}.
*/
public AbstractStringBuilder deleteCharAt(int index) {
if ((index < 0) || (index >= count))
@@ -767,12 +767,12 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Replaces the characters in a substring of this sequence
- * with characters in the specified <code>String</code>. The substring
- * begins at the specified <code>start</code> and extends to the character
- * at index <code>end - 1</code> or to the end of the
+ * with characters in the specified {@code String}. The substring
+ * begins at the specified {@code start} and extends to the character
+ * at index {@code end - 1} or to the end of the
* sequence if no such character exists. First the
* characters in the substring are removed and then the specified
- * <code>String</code> is inserted at <code>start</code>. (This
+ * {@code String} is inserted at {@code start}. (This
* sequence will be lengthened to accommodate the
* specified String if necessary.)
*
@@ -780,9 +780,9 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* @param end The ending index, exclusive.
* @param str String that will replace previous contents.
* @return This object.
- * @throws StringIndexOutOfBoundsException if <code>start</code>
- * is negative, greater than <code>length()</code>, or
- * greater than <code>end</code>.
+ * @throws StringIndexOutOfBoundsException if {@code start}
+ * is negative, greater than {@code length()}, or
+ * greater than {@code end}.
*/
public AbstractStringBuilder replace(int start, int end, String str) {
if (start < 0)
@@ -805,14 +805,14 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
}
/**
- * Returns a new <code>String</code> that contains a subsequence of
+ * Returns a new {@code String} that contains a subsequence of
* characters currently contained in this character sequence. The
* substring begins at the specified index and extends to the end of
* this sequence.
*
* @param start The beginning index, inclusive.
* @return The new string.
- * @throws StringIndexOutOfBoundsException if <code>start</code> is
+ * @throws StringIndexOutOfBoundsException if {@code start} is
* less than zero, or greater than the length of this object.
*/
public String substring(int start) {
@@ -850,18 +850,18 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
}
/**
- * Returns a new <code>String</code> that contains a subsequence of
+ * Returns a new {@code String} that contains a subsequence of
* characters currently contained in this sequence. The
- * substring begins at the specified <code>start</code> and
- * extends to the character at index <code>end - 1</code>.
+ * substring begins at the specified {@code start} and
+ * extends to the character at index {@code end - 1}.
*
* @param start The beginning index, inclusive.
* @param end The ending index, exclusive.
* @return The new string.
- * @throws StringIndexOutOfBoundsException if <code>start</code>
- * or <code>end</code> are negative or greater than
- * <code>length()</code>, or <code>start</code> is
- * greater than <code>end</code>.
+ * @throws StringIndexOutOfBoundsException if {@code start}
+ * or {@code end} are negative or greater than
+ * {@code length()}, or {@code start} is
+ * greater than {@code end}.
*/
public String substring(int start, int end) {
if (start < 0)
@@ -1254,15 +1254,15 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* <blockquote><pre>
* this.toString().startsWith(str, <i>k</i>)
* </pre></blockquote>
- * is <code>true</code>.
+ * is {@code true}.
*
* @param str any string.
* @return if the string argument occurs as a substring within this
* object, then the index of the first character of the first
* such substring is returned; if it does not occur as a
- * substring, <code>-1</code> is returned.
- * @throws java.lang.NullPointerException if <code>str</code> is
- * <code>null</code>.
+ * substring, {@code -1} is returned.
+ * @throws java.lang.NullPointerException if {@code str} is
+ * {@code null}.
*/
public int indexOf(String str) {
return indexOf(str, 0);
@@ -1282,8 +1282,8 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* @param fromIndex the index from which to start the search.
* @return the index within this string of the first occurrence of the
* specified substring, starting at the specified index.
- * @throws java.lang.NullPointerException if <code>str</code> is
- * <code>null</code>.
+ * @throws java.lang.NullPointerException if {@code str} is
+ * {@code null}.
*/
public int indexOf(String str, int fromIndex) {
return String.indexOf(value, 0, count,
@@ -1293,7 +1293,7 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Returns the index within this string of the rightmost occurrence
* of the specified substring. The rightmost empty string "" is
- * considered to occur at the index value <code>this.length()</code>.
+ * considered to occur at the index value {@code this.length()}.
* The returned index is the largest value <i>k</i> such that
* <blockquote><pre>
* this.toString().startsWith(str, k)
@@ -1304,9 +1304,9 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* @return if the string argument occurs one or more times as a substring
* within this object, then the index of the first character of
* the last such substring is returned. If it does not occur as
- * a substring, <code>-1</code> is returned.
- * @throws java.lang.NullPointerException if <code>str</code> is
- * <code>null</code>.
+ * a substring, {@code -1} is returned.
+ * @throws java.lang.NullPointerException if {@code str} is
+ * {@code null}.
*/
public int lastIndexOf(String str) {
return lastIndexOf(str, count);
@@ -1326,8 +1326,8 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* @param fromIndex the index to start the search from.
* @return the index within this sequence of the last occurrence of the
* specified substring.
- * @throws java.lang.NullPointerException if <code>str</code> is
- * <code>null</code>.
+ * @throws java.lang.NullPointerException if {@code str} is
+ * {@code null}.
*/
public int lastIndexOf(String str, int fromIndex) {
return String.lastIndexOf(value, 0, count,
@@ -1342,8 +1342,8 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* is never reversed.
*
* Let <i>n</i> be the character length of this character sequence
- * (not the length in <code>char</code> values) just prior to
- * execution of the <code>reverse</code> method. Then the
+ * (not the length in {@code char} values) just prior to
+ * execution of the {@code reverse} method. Then the
* character at index <i>k</i> in the new character sequence is
* equal to the character at index <i>n-k-1</i> in the old
* character sequence.
@@ -1351,7 +1351,7 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
* <p>Note that the reverse operation may result in producing
* surrogate pairs that were unpaired low-surrogates and
* high-surrogates before the operation. For example, reversing
- * "\uDC00\uD800" produces "\uD800\uDC00" which is
+ * "\u005CuDC00\u005CuD800" produces "\u005CuD800\u005CuDC00" which is
* a valid surrogate pair.
*
* @return a reference to this object.
@@ -1387,11 +1387,11 @@ abstract class AbstractStringBuilder implements Appendable, CharSequence {
/**
* Returns a string representing the data in this sequence.
- * A new <code>String</code> object is allocated and initialized to
+ * A new {@code String} object is allocated and initialized to
* contain the character sequence currently represented by this
- * object. This <code>String</code> is then returned. Subsequent
+ * object. This {@code String} is then returned. Subsequent
* changes to this sequence do not affect the contents of the
- * <code>String</code>.
+ * {@code String}.
*
* @return a string representation of this sequence of characters.
*/
diff --git a/jdk/src/share/classes/java/lang/Byte.java b/jdk/src/share/classes/java/lang/Byte.java
index 4c0b1c2..799936f 100644
--- a/jdk/src/share/classes/java/lang/Byte.java
+++ b/jdk/src/share/classes/java/lang/Byte.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -110,8 +110,8 @@ public final class Byte extends Number implements Comparable<Byte> {
* determined by whether {@link java.lang.Character#digit(char,
* int)} returns a nonnegative value) except that the first
* character may be an ASCII minus sign {@code '-'}
- * (<code>'\u002D'</code>) to indicate a negative value or an
- * ASCII plus sign {@code '+'} (<code>'\u002B'</code>) to
+ * ({@code '\u005Cu002D'}) to indicate a negative value or an
+ * ASCII plus sign {@code '+'} ({@code '\u005Cu002B'}) to
* indicate a positive value. The resulting {@code byte} value is
* returned.
*
@@ -127,8 +127,8 @@ public final class Byte extends Number implements Comparable<Byte> {
*
* <li> Any character of the string is not a digit of the
* specified radix, except that the first character may be a minus
- * sign {@code '-'} (<code>'\u002D'</code>) or plus sign
- * {@code '+'} (<code>'\u002B'</code>) provided that the
+ * sign {@code '-'} ({@code '\u005Cu002D'}) or plus sign
+ * {@code '+'} ({@code '\u005Cu002B'}) provided that the
* string is longer than length 1.
*
* <li> The value represented by the string is not a value of type
@@ -157,9 +157,9 @@ public final class Byte extends Number implements Comparable<Byte> {
* Parses the string argument as a signed decimal {@code
* byte}. The characters in the string must all be decimal digits,
* except that the first character may be an ASCII minus sign
- * {@code '-'} (<code>'\u002D'</code>) to indicate a negative
+ * {@code '-'} ({@code '\u005Cu002D'}) to indicate a negative
* value or an ASCII plus sign {@code '+'}
- * (<code>'\u002B'</code>) to indicate a positive value. The
+ * ({@code '\u005Cu002B'}) to indicate a positive value. The
* resulting {@code byte} value is returned, exactly as if the
* argument and the radix 10 were given as arguments to the {@link
* #parseByte(java.lang.String, int)} method.
@@ -446,6 +446,47 @@ public final class Byte extends Number implements Comparable<Byte> {
}
/**
+ * Converts the argument to an {@code int} by an unsigned
+ * conversion. In an unsigned conversion to an {@code int}, the
+ * high-order 24 bits of the {@code int} are zero and the
+ * low-order 8 bits are equal to the bits of the {@code byte} argument.
+ *
+ * Consequently, zero and positive {@code byte} values are mapped
+ * to a numerically equal {@code int} value and negative {@code
+ * byte} values are mapped to an {@code int} value equal to the
+ * input plus 2<sup>8</sup>.
+ *
+ * @param x the value to convert to an unsigned {@code int}
+ * @return the argument converted to {@code int} by an unsigned
+ * conversion
+ * @since 1.8
+ */
+ public static int toUnsignedInt(byte x) {
+ return ((int) x) & 0xff;
+ }
+
+ /**
+ * Converts the argument to a {@code long} by an unsigned
+ * conversion. In an unsigned conversion to a {@code long}, the
+ * high-order 56 bits of the {@code long} are zero and the
+ * low-order 8 bits are equal to the bits of the {@code byte} argument.
+ *
+ * Consequently, zero and positive {@code byte} values are mapped
+ * to a numerically equal {@code long} value and negative {@code
+ * byte} values are mapped to a {@code long} value equal to the
+ * input plus 2<sup>8</sup>.
+ *
+ * @param x the value to convert to an unsigned {@code long}
+ * @return the argument converted to {@code long} by an unsigned
+ * conversion
+ * @since 1.8
+ */
+ public static long toUnsignedLong(byte x) {
+ return ((long) x) & 0xffL;
+ }
+
+
+ /**
* The number of bits used to represent a {@code byte} value in two's
* complement binary form.
*
diff --git a/jdk/src/share/classes/java/lang/Double.java b/jdk/src/share/classes/java/lang/Double.java
index 8bf9853..5e1afae 100644
--- a/jdk/src/share/classes/java/lang/Double.java
+++ b/jdk/src/share/classes/java/lang/Double.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -140,7 +140,7 @@ public final class Double extends Number implements Comparable<Double> {
* <li>Otherwise, the result is a string that represents the sign and
* magnitude (absolute value) of the argument. If the sign is negative,
* the first character of the result is '{@code -}'
- * (<code>'\u002D'</code>); if the sign is positive, no sign character
+ * ({@code '\u005Cu002D'}); if the sign is positive, no sign character
* appears in the result. As for the magnitude <i>m</i>:
* <ul>
* <li>If <i>m</i> is infinity, it is represented by the characters
@@ -156,7 +156,7 @@ public final class Double extends Number implements Comparable<Double> {
* <li>If <i>m</i> is greater than or equal to 10<sup>-3</sup> but less
* than 10<sup>7</sup>, then it is represented as the integer part of
* <i>m</i>, in decimal form with no leading zeroes, followed by
- * '{@code .}' (<code>'\u002E'</code>), followed by one or
+ * '{@code .}' ({@code '\u005Cu002E'}), followed by one or
* more decimal digits representing the fractional part of <i>m</i>.
*
* <li>If <i>m</i> is less than 10<sup>-3</sup> or greater than or
@@ -168,9 +168,9 @@ public final class Double extends Number implements Comparable<Double> {
* 10<sup><i>n</i></sup> so that 1 ≤ <i>a</i> {@literal <} 10. The
* magnitude is then represented as the integer part of <i>a</i>,
* as a single decimal digit, followed by '{@code .}'
- * (<code>'\u002E'</code>), followed by decimal digits
+ * ({@code '\u005Cu002E'}), followed by decimal digits
* representing the fractional part of <i>a</i>, followed by the
- * letter '{@code E}' (<code>'\u0045'</code>), followed
+ * letter '{@code E}' ({@code '\u005Cu0045'}), followed
* by a representation of <i>n</i> as a decimal integer, as
* produced by the method {@link Integer#toString(int)}.
* </ul>
@@ -208,7 +208,7 @@ public final class Double extends Number implements Comparable<Double> {
* <li>Otherwise, the result is a string that represents the sign
* and magnitude of the argument. If the sign is negative, the
* first character of the result is '{@code -}'
- * (<code>'\u002D'</code>); if the sign is positive, no sign
+ * ({@code '\u005Cu002D'}); if the sign is positive, no sign
* character appears in the result. As for the magnitude <i>m</i>:
*
* <ul>
diff --git a/jdk/src/share/classes/java/lang/Float.java b/jdk/src/share/classes/java/lang/Float.java
index 65a230a..4e73507 100644
--- a/jdk/src/share/classes/java/lang/Float.java
+++ b/jdk/src/share/classes/java/lang/Float.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -138,7 +138,7 @@ public final class Float extends Number implements Comparable<Float> {
* <li>Otherwise, the result is a string that represents the sign and
* magnitude (absolute value) of the argument. If the sign is
* negative, the first character of the result is
- * '{@code -}' (<code>'\u002D'</code>); if the sign is
+ * '{@code -}' ({@code '\u005Cu002D'}); if the sign is
* positive, no sign character appears in the result. As for
* the magnitude <i>m</i>:
* <ul>
@@ -154,7 +154,7 @@ public final class Float extends Number implements Comparable<Float> {
* less than 10<sup>7</sup>, then it is represented as the
* integer part of <i>m</i>, in decimal form with no leading
* zeroes, followed by '{@code .}'
- * (<code>'\u002E'</code>), followed by one or more
+ * ({@code '\u005Cu002E'}), followed by one or more
* decimal digits representing the fractional part of
* <i>m</i>.
* <li> If <i>m</i> is less than 10<sup>-3</sup> or greater than or
@@ -166,10 +166,10 @@ public final class Float extends Number implements Comparable<Float> {
* 10<sup><i>n</i></sup> so that 1 ≤ <i>a</i> {@literal <} 10.
* The magnitude is then represented as the integer part of
* <i>a</i>, as a single decimal digit, followed by
- * '{@code .}' (<code>'\u002E'</code>), followed by
+ * '{@code .}' ({@code '\u005Cu002E'}), followed by
* decimal digits representing the fractional part of
* <i>a</i>, followed by the letter '{@code E}'
- * (<code>'\u0045'</code>), followed by a representation
+ * ({@code '\u005Cu0045'}), followed by a representation
* of <i>n</i> as a decimal integer, as produced by the
* method {@link java.lang.Integer#toString(int)}.
*
@@ -210,7 +210,7 @@ public final class Float extends Number implements Comparable<Float> {
* <li>Otherwise, the result is a string that represents the sign and
* magnitude (absolute value) of the argument. If the sign is negative,
* the first character of the result is '{@code -}'
- * (<code>'\u002D'</code>); if the sign is positive, no sign character
+ * ({@code '\u005Cu002D'}); if the sign is positive, no sign character
* appears in the result. As for the magnitude <i>m</i>:
*
* <ul>
diff --git a/jdk/src/share/classes/java/lang/Integer.java b/jdk/src/share/classes/java/lang/Integer.java
index dee52ae..88acdfa 100644
--- a/jdk/src/share/classes/java/lang/Integer.java
+++ b/jdk/src/share/classes/java/lang/Integer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,13 +93,13 @@ public final class Integer extends Number implements Comparable<Integer> {
*
* <p>If the first argument is negative, the first element of the
* result is the ASCII minus character {@code '-'}
- * (<code>'\u002D'</code>). If the first argument is not
+ * ({@code '\u005Cu002D'}). If the first argument is not
* negative, no sign character appears in the result.
*
* <p>The remaining characters of the result represent the magnitude
* of the first argument. If the magnitude is zero, it is
* represented by a single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
+ * ({@code '\u005Cu0030'}); otherwise, the first character of
* the representation of the magnitude will not be the zero
* character. The following ASCII characters are used as digits:
*
@@ -107,9 +107,9 @@ public final class Integer extends Number implements Comparable<Integer> {
* {@code 0123456789abcdefghijklmnopqrstuvwxyz}
* </blockquote>
*
- * These are <code>'\u0030'</code> through
- * <code>'\u0039'</code> and <code>'\u0061'</code> through
- * <code>'\u007A'</code>. If {@code radix} is
+ * These are {@code '\u005Cu0030'} through
+ * {@code '\u005Cu0039'} and {@code '\u005Cu0061'} through
+ * {@code '\u005Cu007A'}. If {@code radix} is
* <var>N</var>, then the first <var>N</var> of these characters
* are used as radix-<var>N</var> digits in the order shown. Thus,
* the digits for hexadecimal (radix 16) are
@@ -128,7 +128,6 @@ public final class Integer extends Number implements Comparable<Integer> {
* @see java.lang.Character#MIN_RADIX
*/
public static String toString(int i, int radix) {
-
if (radix < Character.MIN_RADIX || radix > Character.MAX_RADIX)
radix = 10;
@@ -159,6 +158,36 @@ public final class Integer extends Number implements Comparable<Integer> {
}
/**
+ * Returns a string representation of the first argument as an
+ * unsigned integer value in the radix specified by the second
+ * argument.
+ *
+ * <p>If the radix is smaller than {@code Character.MIN_RADIX}
+ * or larger than {@code Character.MAX_RADIX}, then the radix
+ * {@code 10} is used instead.
+ *
+ * <p>Note that since the first argument is treated as an unsigned
+ * value, no leading sign character is printed.
+ *
+ * <p>If the magnitude is zero, it is represented by a single zero
+ * character {@code '0'} ({@code '\u005Cu0030'}); otherwise,
+ * the first character of the representation of the magnitude will
+ * not be the zero character.
+ *
+ * <p>The behavior of radixes and the characters used as digits
+ * are the same as {@link #toString(int, int) toString}.
+ *
+ * @param i an integer to be converted to an unsigned string.
+ * @param radix the radix to use in the string representation.
+ * @return an unsigned string representation of the argument in the specified radix.
+ * @see #toString(int, int)
+ * @since 1.8
+ */
+ public static String toUnsignedString(int i, int radix) {
+ return Long.toString(toUnsignedLong(i), radix);
+ }
+
+ /**
* Returns a string representation of the integer argument as an
* unsigned integer in base 16.
*
@@ -166,20 +195,26 @@ public final class Integer extends Number implements Comparable<Integer> {
* if the argument is negative; otherwise, it is equal to the
* argument. This value is converted to a string of ASCII digits
* in hexadecimal (base 16) with no extra leading
- * {@code 0}s. If the unsigned magnitude is zero, it is
- * represented by a single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
- * the representation of the unsigned magnitude will not be the
- * zero character. The following characters are used as
- * hexadecimal digits:
+ * {@code 0}s.
+ *
+ * <p>The value of the argument can be recovered from the returned
+ * string {@code s} by calling {@link
+ * Integer#parseUnsignedInt(String, int)
+ * Integer.parseUnsignedInt(s, 16)}.
+ *
+ * <p>If the unsigned magnitude is zero, it is represented by a
+ * single zero character {@code '0'} ({@code '\u005Cu0030'});
+ * otherwise, the first character of the representation of the
+ * unsigned magnitude will not be the zero character. The
+ * following characters are used as hexadecimal digits:
*
* <blockquote>
* {@code 0123456789abcdef}
* </blockquote>
*
- * These are the characters <code>'\u0030'</code> through
- * <code>'\u0039'</code> and <code>'\u0061'</code> through
- * <code>'\u0066'</code>. If uppercase letters are
+ * These are the characters {@code '\u005Cu0030'} through
+ * {@code '\u005Cu0039'} and {@code '\u005Cu0061'} through
+ * {@code '\u005Cu0066'}. If uppercase letters are
* desired, the {@link java.lang.String#toUpperCase()} method may
* be called on the result:
*
@@ -190,10 +225,12 @@ public final class Integer extends Number implements Comparable<Integer> {
* @param i an integer to be converted to a string.
* @return the string representation of the unsigned integer value
* represented by the argument in hexadecimal (base 16).
+ * @see #parseUnsignedInt(String, int)
+ * @see #toUnsignedString(int, int)
* @since JDK1.0.2
*/
public static String toHexString(int i) {
- return toUnsignedString(i, 4);
+ return toUnsignedString0(i, 4);
}
/**
@@ -205,27 +242,33 @@ public final class Integer extends Number implements Comparable<Integer> {
* argument. This value is converted to a string of ASCII digits
* in octal (base 8) with no extra leading {@code 0}s.
*
+ * <p>The value of the argument can be recovered from the returned
+ * string {@code s} by calling {@link
+ * Integer#parseUnsignedInt(String, int)
+ * Integer.parseUnsignedInt(s, 8)}.
+ *
* <p>If the unsigned magnitude is zero, it is represented by a
- * single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
- * the representation of the unsigned magnitude will not be the
- * zero character. The following characters are used as octal
- * digits:
+ * single zero character {@code '0'} ({@code '\u005Cu0030'});
+ * otherwise, the first character of the representation of the
+ * unsigned magnitude will not be the zero character. The
+ * following characters are used as octal digits:
*
* <blockquote>
* {@code 01234567}
* </blockquote>
*
- * These are the characters <code>'\u0030'</code> through
- * <code>'\u0037'</code>.
+ * These are the characters {@code '\u005Cu0030'} through
+ * {@code '\u005Cu0037'}.
*
* @param i an integer to be converted to a string.
* @return the string representation of the unsigned integer value
* represented by the argument in octal (base 8).
+ * @see #parseUnsignedInt(String, int)
+ * @see #toUnsignedString(int, int)
* @since JDK1.0.2
*/
public static String toOctalString(int i) {
- return toUnsignedString(i, 3);
+ return toUnsignedString0(i, 3);
}
/**
@@ -236,27 +279,34 @@ public final class Integer extends Number implements Comparable<Integer> {
* if the argument is negative; otherwise it is equal to the
* argument. This value is converted to a string of ASCII digits
* in binary (base 2) with no extra leading {@code 0}s.
- * If the unsigned magnitude is zero, it is represented by a
- * single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
- * the representation of the unsigned magnitude will not be the
- * zero character. The characters {@code '0'}
- * (<code>'\u0030'</code>) and {@code '1'}
- * (<code>'\u0031'</code>) are used as binary digits.
+ *
+ * <p>The value of the argument can be recovered from the returned
+ * string {@code s} by calling {@link
+ * Integer#parseUnsignedInt(String, int)
+ * Integer.parseUnsignedInt(s, 2)}.
+ *
+ * <p>If the unsigned magnitude is zero, it is represented by a
+ * single zero character {@code '0'} ({@code '\u005Cu0030'});
+ * otherwise, the first character of the representation of the
+ * unsigned magnitude will not be the zero character. The
+ * characters {@code '0'} ({@code '\u005Cu0030'}) and {@code
+ * '1'} ({@code '\u005Cu0031'}) are used as binary digits.
*
* @param i an integer to be converted to a string.
* @return the string representation of the unsigned integer value
* represented by the argument in binary (base 2).
+ * @see #parseUnsignedInt(String, int)
+ * @see #toUnsignedString(int, int)
* @since JDK1.0.2
*/
public static String toBinaryString(int i) {
- return toUnsignedString(i, 1);
+ return toUnsignedString0(i, 1);
}
/**
* Convert the integer to an unsigned number.
*/
- private static String toUnsignedString(int i, int shift) {
+ private static String toUnsignedString0(int i, int shift) {
char[] buf = new char[32];
int charPos = 32;
int radix = 1 << shift;
@@ -335,6 +385,24 @@ public final class Integer extends Number implements Comparable<Integer> {
}
/**
+ * Returns a string representation of the argument as an unsigned
+ * decimal value.
+ *
+ * The argument is converted to unsigned decimal representation
+ * and returned as a string exactly as if the argument and radix
+ * 10 were given as arguments to the {@link #toUnsignedString(int,
+ * int)} method.
+ *
+ * @param i an integer to be converted to an unsigned string.
+ * @return an unsigned string representation of the argument.
+ * @see #toUnsignedString(int, int)
+ * @since 1.8
+ */
+ public static String toUnsignedString(int i) {
+ return Long.toString(toUnsignedLong(i));
+ }
+
+ /**
* Places characters representing the integer i into the
* character array buf. The characters are placed into
* the buffer backwards starting with the least significant
@@ -393,9 +461,9 @@ public final class Integer extends Number implements Comparable<Integer> {
* must all be digits of the specified radix (as determined by
* whether {@link java.lang.Character#digit(char, int)} returns a
* nonnegative value), except that the first character may be an
- * ASCII minus sign {@code '-'} (<code>'\u002D'</code>) to
+ * ASCII minus sign {@code '-'} ({@code '\u005Cu002D'}) to
* indicate a negative value or an ASCII plus sign {@code '+'}
- * (<code>'\u002B'</code>) to indicate a positive value. The
+ * ({@code '\u005Cu002B'}) to indicate a positive value. The
* resulting integer value is returned.
*
* <p>An exception of type {@code NumberFormatException} is
@@ -410,8 +478,8 @@ public final class Integer extends Number implements Comparable<Integer> {
*
* <li>Any character of the string is not a digit of the specified
* radix, except that the first character may be a minus sign
- * {@code '-'} (<code>'\u002D'</code>) or plus sign
- * {@code '+'} (<code>'\u002B'</code>) provided that the
+ * {@code '-'} ({@code '\u005Cu002D'}) or plus sign
+ * {@code '+'} ({@code '\u005Cu002B'}) provided that the
* string is longer than length 1.
*
* <li>The value represented by the string is not a value of type
@@ -511,8 +579,8 @@ public final class Integer extends Number implements Comparable<Integer> {
* Parses the string argument as a signed decimal integer. The
* characters in the string must all be decimal digits, except
* that the first character may be an ASCII minus sign {@code '-'}
- * (<code>'\u002D'</code>) to indicate a negative value or an
- * ASCII plus sign {@code '+'} (<code>'\u002B'</code>) to
+ * ({@code '\u005Cu002D'}) to indicate a negative value or an
+ * ASCII plus sign {@code '+'} ({@code '\u005Cu002B'}) to
* indicate a positive value. The resulting integer value is
* returned, exactly as if the argument and the radix 10 were
* given as arguments to the {@link #parseInt(java.lang.String,
@@ -529,6 +597,102 @@ public final class Integer extends Number implements Comparable<Integer> {
}
/**
+ * Parses the string argument as an unsigned integer in the radix
+ * specified by the second argument. An unsigned integer maps the
+ * values usually associated with negative numbers to positive
+ * numbers larger than {@code MAX_VALUE}.
+ *
+ * The characters in the string must all be digits of the
+ * specified radix (as determined by whether {@link
+ * java.lang.Character#digit(char, int)} returns a nonnegative
+ * value), except that the first character may be an ASCII plus
+ * sign {@code '+'} ({@code '\u005Cu002B'}). The resulting
+ * integer value is returned.
+ *
+ * <p>An exception of type {@code NumberFormatException} is
+ * thrown if any of the following situations occurs:
+ * <ul>
+ * <li>The first argument is {@code null} or is a string of
+ * length zero.
+ *
+ * <li>The radix is either smaller than
+ * {@link java.lang.Character#MIN_RADIX} or
+ * larger than {@link java.lang.Character#MAX_RADIX}.
+ *
+ * <li>Any character of the string is not a digit of the specified
+ * radix, except that the first character may be a plus sign
+ * {@code '+'} ({@code '\u005Cu002B'}) provided that the
+ * string is longer than length 1.
+ *
+ * <li>The value represented by the string is larger than the
+ * largest unsigned {@code int}, 2<sup>32</sup>-1.
+ *
+ * </ul>
+ *
+ *
+ * @param s the {@code String} containing the unsigned integer
+ * representation to be parsed
+ * @param radix the radix to be used while parsing {@code s}.
+ * @return the integer represented by the string argument in the
+ * specified radix.
+ * @throws NumberFormatException if the {@code String}
+ * does not contain a parsable {@code int}.
+ * @since 1.8
+ */
+ public static int parseUnsignedInt(String s, int radix)
+ throws NumberFormatException {
+ if (s == null) {
+ throw new NumberFormatException("null");
+ }
+
+ int len = s.length();
+ if (len > 0) {
+ char firstChar = s.charAt(0);
+ if (firstChar == '-') {
+ throw new
+ NumberFormatException(String.format("Illegal leading minus sign " +
+ "on unsigned string %s.", s));
+ } else {
+ if (len <= 5 || // Integer.MAX_VALUE in Character.MAX_RADIX is 6 digits
+ (radix == 10 && len <= 9) ) { // Integer.MAX_VALUE in base 10 is 10 digits
+ return parseInt(s, radix);
+ } else {
+ long ell = Long.parseLong(s, radix);
+ if ((ell & 0xffff_ffff_0000_0000L) == 0) {
+ return (int) ell;
+ } else {
+ throw new
+ NumberFormatException(String.format("String value %s exceeds " +
+ "range of unsigned int.", s));
+ }
+ }
+ }
+ } else {
+ throw NumberFormatException.forInputString(s);
+ }
+ }
+
+ /**
+ * Parses the string argument as an unsigned decimal integer. The
+ * characters in the string must all be decimal digits, except
+ * that the first character may be an an ASCII plus sign {@code
+ * '+'} ({@code '\u005Cu002B'}). The resulting integer value
+ * is returned, exactly as if the argument and the radix 10 were
+ * given as arguments to the {@link
+ * #parseUnsignedInt(java.lang.String, int)} method.
+ *
+ * @param s a {@code String} containing the unsigned {@code int}
+ * representation to be parsed
+ * @return the unsigned integer value represented by the argument in decimal.
+ * @throws NumberFormatException if the string does not contain a
+ * parsable unsigned integer.
+ * @since 1.8
+ */
+ public static int parseUnsignedInt(String s) throws NumberFormatException {
+ return parseUnsignedInt(s, 10);
+ }
+
+ /**
* Returns an {@code Integer} object holding the value
* extracted from the specified {@code String} when parsed
* with the radix given by the second argument. The first argument
@@ -1030,6 +1194,83 @@ public final class Integer extends Number implements Comparable<Integer> {
return (x < y) ? -1 : ((x == y) ? 0 : 1);
}
+ /**
+ * Compares two {@code int} values numerically treating the values
+ * as unsigned.
+ *
+ * @param x the first {@code int} to compare
+ * @param y the second {@code int} to compare
+ * @return the value {@code 0} if {@code x == y}; a value less
+ * than {@code 0} if {@code x < y} as unsigned values; and
+ * a value greater than {@code 0} if {@code x > y} as
+ * unsigned values
+ * @since 1.8
+ */
+ public static int compareUnsigned(int x, int y) {
+ return compare(x + MIN_VALUE, y + MIN_VALUE);
+ }
+
+ /**
+ * Converts the argument to a {@code long} by an unsigned
+ * conversion. In an unsigned conversion to a {@code long}, the
+ * high-order 32 bits of the {@code long} are zero and the
+ * low-order 32 bits are equal to the bits of the integer
+ * argument.
+ *
+ * Consequently, zero and positive {@code int} values are mapped
+ * to a numerically equal {@code long} value and negative {@code
+ * int} values are mapped to a {@code long} value equal to the
+ * input plus 2<sup>32</sup>.
+ *
+ * @param x the value to convert to an unsigned {@code long}
+ * @return the argument converted to {@code long} by an unsigned
+ * conversion
+ * @since 1.8
+ */
+ public static long toUnsignedLong(int x) {
+ return ((long) x) & 0xffffffffL;
+ }
+
+ /**
+ * Returns the unsigned quotient of dividing the first argument by
+ * the second where each argument and the result is interpreted as
+ * an unsigned value.
+ *
+ * <p>Note that in two's complement arithmetic, the three other
+ * basic arithmetic operations of add, subtract, and multiply are
+ * bit-wise identical if the two operands are regarded as both
+ * being signed or both being unsigned. Therefore separate {@code
+ * addUnsigned}, etc. methods are not provided.
+ *
+ * @param dividend the value to be divided
+ * @param divisor the value doing the dividing
+ * @return the unsigned quotient of the first argument divided by
+ * the second argument
+ * @see #remainderUnsigned
+ * @since 1.8
+ */
+ public static int divideUnsigned(int dividend, int divisor) {
+ // In lieu of tricky code, for now just use long arithmetic.
+ return (int)(toUnsignedLong(dividend) / toUnsignedLong(divisor));
+ }
+
+ /**
+ * Returns the unsigned remainder from dividing the first argument
+ * by the second where each argument and the result is interpreted
+ * as an unsigned value.
+ *
+ * @param dividend the value to be divided
+ * @param divisor the value doing the dividing
+ * @return the unsigned remainder of the first argument divided by
+ * the second argument
+ * @see #divideUnsigned
+ * @since 1.8
+ */
+ public static int remainderUnsigned(int dividend, int divisor) {
+ // In lieu of tricky code, for now just use long arithmetic.
+ return (int)(toUnsignedLong(dividend) % toUnsignedLong(divisor));
+ }
+
// Bit twiddling
diff --git a/jdk/src/share/classes/java/lang/Long.java b/jdk/src/share/classes/java/lang/Long.java
index a87f409..f4dc32d 100644
--- a/jdk/src/share/classes/java/lang/Long.java
+++ b/jdk/src/share/classes/java/lang/Long.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
package java.lang;
+import java.math.*;
+
/**
* The {@code Long} class wraps a value of the primitive type {@code
* long} in an object. An object of type {@code Long} contains a
@@ -79,13 +81,13 @@ public final class Long extends Number implements Comparable<Long> {
*
* <p>If the first argument is negative, the first element of the
* result is the ASCII minus sign {@code '-'}
- * (<code>'\u002d'</code>). If the first argument is not
+ * ({@code '\u005Cu002d'}). If the first argument is not
* negative, no sign character appears in the result.
*
* <p>The remaining characters of the result represent the magnitude
* of the first argument. If the magnitude is zero, it is
* represented by a single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
+ * ({@code '\u005Cu0030'}); otherwise, the first character of
* the representation of the magnitude will not be the zero
* character. The following ASCII characters are used as digits:
*
@@ -93,9 +95,9 @@ public final class Long extends Number implements Comparable<Long> {
* {@code 0123456789abcdefghijklmnopqrstuvwxyz}
* </blockquote>
*
- * These are <code>'\u0030'</code> through
- * <code>'\u0039'</code> and <code>'\u0061'</code> through
- * <code>'\u007a'</code>. If {@code radix} is
+ * These are {@code '\u005Cu0030'} through
+ * {@code '\u005Cu0039'} and {@code '\u005Cu0061'} through
+ * {@code '\u005Cu007a'}. If {@code radix} is
* <var>N</var>, then the first <var>N</var> of these characters
* are used as radix-<var>N</var> digits in the order shown. Thus,
* the digits for hexadecimal (radix 16) are
@@ -140,6 +142,88 @@ public final class Long extends Number implements Comparable<Long> {
}
/**
+ * Returns a string representation of the first argument as an
+ * unsigned integer value in the radix specified by the second
+ * argument.
+ *
+ * <p>If the radix is smaller than {@code Character.MIN_RADIX}
+ * or larger than {@code Character.MAX_RADIX}, then the radix
+ * {@code 10} is used instead.
+ *
+ * <p>Note that since the first argument is treated as an unsigned
+ * value, no leading sign character is printed.
+ *
+ * <p>If the magnitude is zero, it is represented by a single zero
+ * character {@code '0'} ({@code '\u005Cu0030'}); otherwise,
+ * the first character of the representation of the magnitude will
+ * not be the zero character.
+ *
+ * <p>The behavior of radixes and the characters used as digits
+ * are the same as {@link #toString(long, int) toString}.
+ *
+ * @param i an integer to be converted to an unsigned string.
+ * @param radix the radix to use in the string representation.
+ * @return an unsigned string representation of the argument in the specified radix.
+ * @see #toString(long, int)
+ * @since 1.8
+ */
+ public static String toUnsignedString(long i, int radix) {
+ if (i >= 0)
+ return toString(i, radix);
+ else {
+ switch (radix) {
+ case 2:
+ return toBinaryString(i);
+
+ case 4:
+ return toUnsignedString0(i, 2);
+
+ case 8:
+ return toOctalString(i);
+
+ case 10:
+ /*
+ * We can get the effect of an unsigned division by 10
+ * on a long value by first shifting right, yielding a
+ * positive value, and then dividing by 5. This
+ * allows the last digit and preceding digits to be
+ * isolated more quickly than by an initial conversion
+ * to BigInteger.
+ */
+ long quot = (i >>> 1) / 5;
+ long rem = i - quot * 10;
+ return toString(quot) + rem;
+
+ case 16:
+ return toHexString(i);
+
+ case 32:
+ return toUnsignedString0(i, 5);
+
+ default:
+ return toUnsignedBigInteger(i).toString(radix);
+ }
+ }
+ }
+
+ /**
+ * Return a BigInteger equal to the unsigned value of the
+ * argument.
+ */
+ private static BigInteger toUnsignedBigInteger(long i) {
+ if (i >= 0L)
+ return BigInteger.valueOf(i);
+ else {
+ int upper = (int) (i >>> 32);
+ int lower = (int) i;
+
+ // return (upper << 32) + lower
+ return (BigInteger.valueOf(Integer.toUnsignedLong(upper))).shiftLeft(32).
+ add(BigInteger.valueOf(Integer.toUnsignedLong(lower)));
+ }
+ }
+
+ /**
* Returns a string representation of the {@code long}
* argument as an unsigned integer in base 16.
*
@@ -147,20 +231,26 @@ public final class Long extends Number implements Comparable<Long> {
* 2<sup>64</sup> if the argument is negative; otherwise, it is
* equal to the argument. This value is converted to a string of
* ASCII digits in hexadecimal (base 16) with no extra
- * leading {@code 0}s. If the unsigned magnitude is zero, it
- * is represented by a single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
- * the representation of the unsigned magnitude will not be the
- * zero character. The following characters are used as
- * hexadecimal digits:
+ * leading {@code 0}s.
+ *
+ * <p>The value of the argument can be recovered from the returned
+ * string {@code s} by calling {@link
+ * Long#parseUnsignedLong(String, int) Long.parseUnsignedLong(s,
+ * 16)}.
+ *
+ * <p>If the unsigned magnitude is zero, it is represented by a
+ * single zero character {@code '0'} ({@code '\u005Cu0030'});
+ * otherwise, the first character of the representation of the
+ * unsigned magnitude will not be the zero character. The
+ * following characters are used as hexadecimal digits:
*
* <blockquote>
* {@code 0123456789abcdef}
* </blockquote>
*
- * These are the characters <code>'\u0030'</code> through
- * <code>'\u0039'</code> and <code>'\u0061'</code> through
- * <code>'\u0066'</code>. If uppercase letters are desired,
+ * These are the characters {@code '\u005Cu0030'} through
+ * {@code '\u005Cu0039'} and {@code '\u005Cu0061'} through
+ * {@code '\u005Cu0066'}. If uppercase letters are desired,
* the {@link java.lang.String#toUpperCase()} method may be called
* on the result:
*
@@ -172,10 +262,12 @@ public final class Long extends Number implements Comparable<Long> {
* @return the string representation of the unsigned {@code long}
* value represented by the argument in hexadecimal
* (base 16).
+ * @see #parseUnsignedLong(String, int)
+ * @see #toUnsignedString(long, int)
* @since JDK 1.0.2
*/
public static String toHexString(long i) {
- return toUnsignedString(i, 4);
+ return toUnsignedString0(i, 4);
}
/**
@@ -188,27 +280,33 @@ public final class Long extends Number implements Comparable<Long> {
* ASCII digits in octal (base 8) with no extra leading
* {@code 0}s.
*
+ * <p>The value of the argument can be recovered from the returned
+ * string {@code s} by calling {@link
+ * Long#parseUnsignedLong(String, int) Long.parseUnsignedLong(s,
+ * 8)}.
+ *
* <p>If the unsigned magnitude is zero, it is represented by a
- * single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
- * the representation of the unsigned magnitude will not be the
- * zero character. The following characters are used as octal
- * digits:
+ * single zero character {@code '0'} ({@code '\u005Cu0030'});
+ * otherwise, the first character of the representation of the
+ * unsigned magnitude will not be the zero character. The
+ * following characters are used as octal digits:
*
* <blockquote>
* {@code 01234567}
* </blockquote>
*
- * These are the characters <code>'\u0030'</code> through
- * <code>'\u0037'</code>.
+ * These are the characters {@code '\u005Cu0030'} through
+ * {@code '\u005Cu0037'}.
*
* @param i a {@code long} to be converted to a string.
* @return the string representation of the unsigned {@code long}
* value represented by the argument in octal (base 8).
+ * @see #parseUnsignedLong(String, int)
+ * @see #toUnsignedString(long, int)
* @since JDK 1.0.2
*/
public static String toOctalString(long i) {
- return toUnsignedString(i, 3);
+ return toUnsignedString0(i, 3);
}
/**
@@ -219,27 +317,35 @@ public final class Long extends Number implements Comparable<Long> {
* 2<sup>64</sup> if the argument is negative; otherwise, it is
* equal to the argument. This value is converted to a string of
* ASCII digits in binary (base 2) with no extra leading
- * {@code 0}s. If the unsigned magnitude is zero, it is
- * represented by a single zero character {@code '0'}
- * (<code>'\u0030'</code>); otherwise, the first character of
- * the representation of the unsigned magnitude will not be the
- * zero character. The characters {@code '0'}
- * (<code>'\u0030'</code>) and {@code '1'}
- * (<code>'\u0031'</code>) are used as binary digits.
+ * {@code 0}s.
+ *
+ * <p>The value of the argument can be recovered from the returned
+ * string {@code s} by calling {@link
+ * Long#parseUnsignedLong(String, int) Long.parseUnsignedLong(s,
+ * 2)}.
+ *
+ * <p>If the unsigned magnitude is zero, it is represented by a
+ * single zero character {@code '0'} ({@code '\u005Cu0030'});
+ * otherwise, the first character of the representation of the
+ * unsigned magnitude will not be the zero character. The
+ * characters {@code '0'} ({@code '\u005Cu0030'}) and {@code
+ * '1'} ({@code '\u005Cu0031'}) are used as binary digits.
*
* @param i a {@code long} to be converted to a string.
* @return the string representation of the unsigned {@code long}
* value represented by the argument in binary (base 2).
+ * @see #parseUnsignedLong(String, int)
+ * @see #toUnsignedString(long, int)
* @since JDK 1.0.2
*/
public static String toBinaryString(long i) {
- return toUnsignedString(i, 1);
+ return toUnsignedString0(i, 1);
}
/**
* Convert the integer to an unsigned number.
*/
- private static String toUnsignedString(long i, int shift) {
+ private static String toUnsignedString0(long i, int shift) {
char[] buf = new char[64];
int charPos = 64;
int radix = 1 << shift;
@@ -271,6 +377,24 @@ public final class Long extends Number implements Comparable<Long> {
}
/**
+ * Returns a string representation of the argument as an unsigned
+ * decimal value.
+ *
+ * The argument is converted to unsigned decimal representation
+ * and returned as a string exactly as if the argument and radix
+ * 10 were given as arguments to the {@link #toUnsignedString(long,
+ * int)} method.
+ *
+ * @param i an integer to be converted to an unsigned string.
+ * @return an unsigned string representation of the argument.
+ * @see #toUnsignedString(long, int)
+ * @since 1.8
+ */
+ public static String toUnsignedString(long i) {
+ return toUnsignedString(i, 10);
+ }
+
+ /**
* Places characters representing the integer i into the
* character array buf. The characters are placed into
* the buffer backwards starting with the least significant
@@ -343,14 +467,14 @@ public final class Long extends Number implements Comparable<Long> {
* string must all be digits of the specified radix (as determined
* by whether {@link java.lang.Character#digit(char, int)} returns
* a nonnegative value), except that the first character may be an
- * ASCII minus sign {@code '-'} (<code>'\u002D'</code>) to
+ * ASCII minus sign {@code '-'} ({@code '\u005Cu002D'}) to
* indicate a negative value or an ASCII plus sign {@code '+'}
- * (<code>'\u002B'</code>) to indicate a positive value. The
+ * ({@code '\u005Cu002B'}) to indicate a positive value. The
* resulting {@code long} value is returned.
*
* <p>Note that neither the character {@code L}
- * (<code>'\u004C'</code>) nor {@code l}
- * (<code>'\u006C'</code>) is permitted to appear at the end
+ * ({@code '\u005Cu004C'}) nor {@code l}
+ * ({@code '\u005Cu006C'}) is permitted to appear at the end
* of the string as a type indicator, as would be permitted in
* Java programming language source code - except that either
* {@code L} or {@code l} may appear as a digit for a
@@ -369,8 +493,8 @@ public final class Long extends Number implements Comparable<Long> {
*
* <li>Any character of the string is not a digit of the specified
* radix, except that the first character may be a minus sign
- * {@code '-'} (<code>'\u002d'</code>) or plus sign {@code
- * '+'} (<code>'\u002B'</code>) provided that the string is
+ * {@code '-'} ({@code '\u005Cu002d'}) or plus sign {@code
+ * '+'} ({@code '\u005Cu002B'}) provided that the string is
* longer than length 1.
*
* <li>The value represented by the string is not a value of type
@@ -460,16 +584,16 @@ public final class Long extends Number implements Comparable<Long> {
* Parses the string argument as a signed decimal {@code long}.
* The characters in the string must all be decimal digits, except
* that the first character may be an ASCII minus sign {@code '-'}
- * (<code>\u002D'</code>) to indicate a negative value or an
- * ASCII plus sign {@code '+'} (<code>'\u002B'</code>) to
+ * ({@code \u005Cu002D'}) to indicate a negative value or an
+ * ASCII plus sign {@code '+'} ({@code '\u005Cu002B'}) to
* indicate a positive value. The resulting {@code long} value is
* returned, exactly as if the argument and the radix {@code 10}
* were given as arguments to the {@link
* #parseLong(java.lang.String, int)} method.
*
* <p>Note that neither the character {@code L}
- * (<code>'\u004C'</code>) nor {@code l}
- * (<code>'\u006C'</code>) is permitted to appear at the end
+ * ({@code '\u005Cu004C'}) nor {@code l}
+ * ({@code '\u005Cu006C'}) is permitted to appear at the end
* of the string as a type indicator, as would be permitted in
* Java programming language source code.
*
@@ -485,6 +609,121 @@ public final class Long extends Number implements Comparable<Long> {
}
/**
+ * Parses the string argument as an unsigned {@code long} in the
+ * radix specified by the second argument. An unsigned integer
+ * maps the values usually associated with negative numbers to
+ * positive numbers larger than {@code MAX_VALUE}.
+ *
+ * The characters in the string must all be digits of the
+ * specified radix (as determined by whether {@link
+ * java.lang.Character#digit(char, int)} returns a nonnegative
+ * value), except that the first character may be an ASCII plus
+ * sign {@code '+'} ({@code '\u005Cu002B'}). The resulting
+ * integer value is returned.
+ *
+ * <p>An exception of type {@code NumberFormatException} is
+ * thrown if any of the following situations occurs:
+ * <ul>
+ * <li>The first argument is {@code null} or is a string of
+ * length zero.
+ *
+ * <li>The radix is either smaller than
+ * {@link java.lang.Character#MIN_RADIX} or
+ * larger than {@link java.lang.Character#MAX_RADIX}.
+ *
+ * <li>Any character of the string is not a digit of the specified
+ * radix, except that the first character may be a plus sign
+ * {@code '+'} ({@code '\u005Cu002B'}) provided that the
+ * string is longer than length 1.
+ *
+ * <li>The value represented by the string is larger than the
+ * largest unsigned {@code long}, 2<sup>64</sup>-1.
+ *
+ * </ul>
+ *
+ *
+ * @param s the {@code String} containing the unsigned integer
+ * representation to be parsed
+ * @param radix the radix to be used while parsing {@code s}.
+ * @return the unsigned {@code long} represented by the string
+ * argument in the specified radix.
+ * @throws NumberFormatException if the {@code String}
+ * does not contain a parsable {@code long}.
+ * @since 1.8
+ */
+ public static long parseUnsignedLong(String s, int radix)
+ throws NumberFormatException {
+ if (s == null) {
+ throw new NumberFormatException("null");
+ }
+
+ int len = s.length();
+ if (len > 0) {
+ char firstChar = s.charAt(0);
+ if (firstChar == '-') {
+ throw new
+ NumberFormatException(String.format("Illegal leading minus sign " +
+ "on unsigned string %s.", s));
+ } else {
+ if (len <= 12 || // Long.MAX_VALUE in Character.MAX_RADIX is 13 digits
+ (radix == 10 && len <= 18) ) { // Long.MAX_VALUE in base 10 is 19 digits
+ return parseLong(s, radix);
+ }
+
+ // No need for range checks on len due to testing above.
+ long first = parseLong(s.substring(0, len - 1), radix);
+ int second = Character.digit(s.charAt(len - 1), radix);
+ if (second < 0) {
+ throw new NumberFormatException("Bad digit at end of " + s);
+ }
+ long result = first * radix + second;
+ if (compareUnsigned(result, first) < 0) {
+ /*
+ * The maximum unsigned value, (2^64)-1, takes at
+ * most one more digit to represent than the
+ * maximum signed value, (2^63)-1. Therefore,
+ * parsing (len - 1) digits will be appropriately
+ * in-range of the signed parsing. In other
+ * words, if parsing (len -1) digits overflows
+ * signed parsing, parsing len digits will
+ * certainly overflow unsigned parsing.
+ *
+ * The compareUnsigned check above catches
+ * situations where an unsigned overflow occurs
+ * incorporating the contribution of the final
+ * digit.
+ */
+ throw new NumberFormatException(String.format("String value %s exceeds " +
+ "range of unsigned long.", s));
+ }
+ return result;
+ }
+ } else {
+ throw NumberFormatException.forInputString(s);
+ }
+ }
+
+ /**
+ * Parses the string argument as an unsigned decimal {@code long}. The
+ * characters in the string must all be decimal digits, except
+ * that the first character may be an an ASCII plus sign {@code
+ * '+'} ({@code '\u005Cu002B'}). The resulting integer value
+ * is returned, exactly as if the argument and the radix 10 were
+ * given as arguments to the {@link
+ * #parseUnsignedLong(java.lang.String, int)} method.
+ *
+ * @param s a {@code String} containing the unsigned {@code long}
+ * representation to be parsed
+ * @return the unsigned {@code long} value represented by the decimal string argument
+ * @throws NumberFormatException if the string does not contain a
+ * parsable unsigned integer.
+ * @since 1.8
+ */
+ public static long parseUnsignedLong(String s) throws NumberFormatException {
+ return parseUnsignedLong(s, 10);
+ }
+
+ /**
* Returns a {@code Long} object holding the value
* extracted from the specified {@code String} when parsed
* with the radix given by the second argument. The first
@@ -909,8 +1148,8 @@ public final class Long extends Number implements Comparable<Long> {
* </ul>
*
* <p>Note that, in every case, neither {@code L}
- * (<code>'\u004C'</code>) nor {@code l}
- * (<code>'\u006C'</code>) is permitted to appear at the end
+ * ({@code '\u005Cu004C'}) nor {@code l}
+ * ({@code '\u005Cu006C'}) is permitted to appear at the end
* of the property value as a type indicator, as would be
* permitted in Java programming language source code.
*
@@ -977,6 +1216,85 @@ public final class Long extends Number implements Comparable<Long> {
return (x < y) ? -1 : ((x == y) ? 0 : 1);
}
+ /**
+ * Compares two {@code long} values numerically treating the values
+ * as unsigned.
+ *
+ * @param x the first {@code long} to compare
+ * @param y the second {@code long} to compare
+ * @return the value {@code 0} if {@code x == y}; a value less
+ * than {@code 0} if {@code x < y} as unsigned values; and
+ * a value greater than {@code 0} if {@code x > y} as
+ * unsigned values
+ * @since 1.8
+ */
+ public static int compareUnsigned(long x, long y) {
+ return compare(x + MIN_VALUE, y + MIN_VALUE);
+ }
+
+
+ /**
+ * Returns the unsigned quotient of dividing the first argument by
+ * the second where each argument and the result is interpreted as
+ * an unsigned value.
+ *
+ * <p>Note that in two's complement arithmetic, the three other
+ * basic arithmetic operations of add, subtract, and multiply are
+ * bit-wise identical if the two operands are regarded as both
+ * being signed or both being unsigned. Therefore separate {@code
+ * addUnsigned}, etc. methods are not provided.
+ *
+ * @param dividend the value to be divided
+ * @param divisor the value doing the dividing
+ * @return the unsigned quotient of the first argument divided by
+ * the second argument
+ * @see #remainderUnsigned
+ * @since 1.8
+ */
+ public static long divideUnsigned(long dividend, long divisor) {
+ if (divisor < 0L) { // signed comparison
+ // Answer must be 0 or 1 depending on relative magnitude
+ // of dividend and divisor.
+ return (compareUnsigned(dividend, divisor)) < 0 ? 0L :1L;
+ }
+
+ if (dividend > 0) // Both inputs non-negative
+ return dividend/divisor;
+ else {
+ /*
+ * For simple code, leveraging BigInteger. Longer and faster
+ * code written directly in terms of operations on longs is
+ * possible; see "Hacker's Delight" for divide and remainder
+ * algorithms.
+ */
+ return toUnsignedBigInteger(dividend).
+ divide(toUnsignedBigInteger(divisor)).longValue();
+ }
+ }
+
+ /**
+ * Returns the unsigned remainder from dividing the first argument
+ * by the second where each argument and the result is interpreted
+ * as an unsigned value.
+ *
+ * @param dividend the value to be divided
+ * @param divisor the value doing the dividing
+ * @return the unsigned remainder of the first argument divided by
+ * the second argument
+ * @see #divideUnsigned
+ * @since 1.8
+ */
+ public static long remainderUnsigned(long dividend, long divisor) {
+ if (dividend > 0 && divisor > 0) { // signed comparisons
+ return dividend % divisor;
+ } else {
+ if (compareUnsigned(dividend, divisor) < 0) // Avoid explicit check for 0 divisor
+ return dividend;
+ else
+ return toUnsignedBigInteger(dividend).
+ remainder(toUnsignedBigInteger(divisor)).longValue();
+ }
+ }
// Bit Twiddling
diff --git a/jdk/src/share/classes/java/lang/Math.java b/jdk/src/share/classes/java/lang/Math.java
index 5453010..353464b 100644
--- a/jdk/src/share/classes/java/lang/Math.java
+++ b/jdk/src/share/classes/java/lang/Math.java
@@ -81,6 +81,22 @@ import sun.misc.DoubleConsts;
* floating-point approximation. Not all approximations that have 1
* ulp accuracy will automatically meet the monotonicity requirements.
*
+ * <p>
+ * The platform uses signed two's complement integer arithmetic with
+ * int and long primitive types. The developer should choose
+ * the primitive type to ensure that arithmetic operations consistently
+ * produce correct results, which in some cases means the operations
+ * will not overflow the range of values of the computation.
+ * The best practice is to choose the primitive type and algorithm to avoid
+ * overflow. In cases where the size is {@code int} or {@code long} and
+ * overflow errors need to be detected, the methods {@code addExact},
+ * {@code subtractExact}, {@code multiplyExact}, and {@code toIntExact}
+ * throw an {@code ArithmeticException} when the results overflow.
+ * For other arithmetic operations such as divide, absolute value,
+ * increment, decrement, and negation overflow occurs only with
+ * a specific minimum or maximum value and should be checked against
+ * the minimum or maximum as appropriate.
+ *
* @author unascribed
* @author Joseph D. Darcy
* @since JDK1.0
@@ -719,6 +735,137 @@ public final class Math {
}
/**
+ * Returns the sum of its arguments,
+ * throwing an exception if the result overflows an {@code int}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows an int
+ */
+ public static int addExact(int x, int y) {
+ int r = x + y;
+ // HD 2-12 Overflow iff both arguments have the opposite sign of the result
+ if (((x ^ r) & (y ^ r)) < 0) {
+ throw new ArithmeticException("integer overflow");
+ }
+ return r;
+ }
+
+ /**
+ * Returns the sum of its arguments,
+ * throwing an exception if the result overflows a {@code long}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows a long
+ */
+ public static long addExact(long x, long y) {
+ long r = x + y;
+ // HD 2-12 Overflow iff both arguments have the opposite sign of the result
+ if (((x ^ r) & (y ^ r)) < 0) {
+ throw new ArithmeticException("long overflow");
+ }
+ return r;
+ }
+
+ /**
+ * Returns the difference of the arguments,
+ * throwing an exception if the result overflows an {@code int}.
+ *
+ * @param x the first value
+ * @param y the second value to subtract from the first
+ * @return the result
+ * @throws ArithmeticException if the result overflows an int
+ */
+ public static int subtractExact(int x, int y) {
+ int r = x - y;
+ // HD 2-12 Overflow iff the arguments have different signs and
+ // the sign of the result is different than the sign of x
+ if (((x ^ y) & (x ^ r)) < 0) {
+ throw new ArithmeticException("integer overflow");
+ }
+ return r;
+ }
+
+ /**
+ * Returns the difference of the arguments,
+ * throwing an exception if the result overflows a {@code long}.
+ *
+ * @param x the first value
+ * @param y the second value to subtract from the first
+ * @return the result
+ * @throws ArithmeticException if the result overflows a long
+ */
+ public static long subtractExact(long x, long y) {
+ long r = x - y;
+ // HD 2-12 Overflow iff the arguments have different signs and
+ // the sign of the result is different than the sign of x
+ if (((x ^ y) & (x ^ r)) < 0) {
+ throw new ArithmeticException("long overflow");
+ }
+ return r;
+ }
+
+ /**
+ * Returns the product of the arguments,
+ * throwing an exception if the result overflows an {@code int}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows an int
+ */
+ public static int multiplyExact(int x, int y) {
+ long r = (long)x * (long)y;
+ if ((int)r != r) {
+ throw new ArithmeticException("long overflow");
+ }
+ return (int)r;
+ }
+
+ /**
+ * Returns the product of the arguments,
+ * throwing an exception if the result overflows a {@code long}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows a long
+ */
+ public static long multiplyExact(long x, long y) {
+ long r = x * y;
+ long ax = Math.abs(x);
+ long ay = Math.abs(y);
+ if (((ax | ay) >>> 31 != 0)) {
+ // Some bits greater than 2^31 that might cause overflow
+ // Check the result using the divide operator
+ // and check for the special case of Long.MIN_VALUE * -1
+ if (((y != 0) && (r / y != x)) ||
+ (x == Long.MIN_VALUE && y == -1)) {
+ throw new ArithmeticException("long overflow");
+ }
+ }
+ return r;
+ }
+
+ /**
+ * Returns the value of the {@code long} argument;
+ * throwing an exception if the value overflows an {@code int}.
+ *
+ * @param value the long value
+ * @return the argument as an int
+ * @throws ArithmeticException if the {@code argument} overflows an int
+ */
+ public static int toIntExact(long value) {
+ if ((int)value != value) {
+ throw new ArithmeticException("integer overflow");
+ }
+ return (int)value;
+ }
+
+ /**
* Returns the absolute value of an {@code int} value.
* If the argument is not negative, the argument is returned.
* If the argument is negative, the negation of the argument is returned.
@@ -1737,7 +1884,7 @@ public final class Math {
}
/**
- * Return {@code d} ×
+ * Returns {@code d} ×
* 2<sup>{@code scaleFactor}</sup> rounded as if performed
* by a single correctly rounded floating-point multiply to a
* member of the double value set. See the Java
@@ -1844,7 +1991,7 @@ public final class Math {
}
/**
- * Return {@code f} ×
+ * Returns {@code f} ×
* 2<sup>{@code scaleFactor}</sup> rounded as if performed
* by a single correctly rounded floating-point multiply to a
* member of the float value set. See the Java
diff --git a/jdk/src/share/classes/java/lang/Short.java b/jdk/src/share/classes/java/lang/Short.java
index 6509039..2a1d8b5 100644
--- a/jdk/src/share/classes/java/lang/Short.java
+++ b/jdk/src/share/classes/java/lang/Short.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,8 @@ public final class Short extends Number implements Comparable<Short> {
* determined by whether {@link java.lang.Character#digit(char,
* int)} returns a nonnegative value) except that the first
* character may be an ASCII minus sign {@code '-'}
- * (<code>'\u002D'</code>) to indicate a negative value or an
- * ASCII plus sign {@code '+'} (<code>'\u002B'</code>) to
+ * ({@code '\u005Cu002D'}) to indicate a negative value or an
+ * ASCII plus sign {@code '+'} ({@code '\u005Cu002B'}) to
* indicate a positive value. The resulting {@code short} value
* is returned.
*
@@ -97,8 +97,8 @@ public final class Short extends Number implements Comparable<Short> {
*
* <li> Any character of the string is not a digit of the
* specified radix, except that the first character may be a minus
- * sign {@code '-'} (<code>'\u002D'</code>) or plus sign
- * {@code '+'} (<code>'\u002B'</code>) provided that the
+ * sign {@code '-'} ({@code '\u005Cu002D'}) or plus sign
+ * {@code '+'} ({@code '\u005Cu002B'}) provided that the
* string is longer than length 1.
*
* <li> The value represented by the string is not a value of type
@@ -126,9 +126,9 @@ public final class Short extends Number implements Comparable<Short> {
* Parses the string argument as a signed decimal {@code
* short}. The characters in the string must all be decimal
* digits, except that the first character may be an ASCII minus
- * sign {@code '-'} (<code>'\u002D'</code>) to indicate a
+ * sign {@code '-'} ({@code '\u005Cu002D'}) to indicate a
* negative value or an ASCII plus sign {@code '+'}
- * (<code>'\u002B'</code>) to indicate a positive value. The
+ * ({@code '\u005Cu002B'}) to indicate a positive value. The
* resulting {@code short} value is returned, exactly as if the
* argument and the radix 10 were given as arguments to the {@link
* #parseShort(java.lang.String, int)} method.
@@ -469,6 +469,47 @@ public final class Short extends Number implements Comparable<Short> {
return (short) (((i & 0xFF00) >> 8) | (i << 8));
}
+
+ /**
+ * Converts the argument to an {@code int} by an unsigned
+ * conversion. In an unsigned conversion to an {@code int}, the
+ * high-order 16 bits of the {@code int} are zero and the
+ * low-order 16 bits are equal to the bits of the {@code short} argument.
+ *
+ * Consequently, zero and positive {@code short} values are mapped
+ * to a numerically equal {@code int} value and negative {@code
+ * short} values are mapped to an {@code int} value equal to the
+ * input plus 2<sup>16</sup>.
+ *
+ * @param x the value to convert to an unsigned {@code int}
+ * @return the argument converted to {@code int} by an unsigned
+ * conversion
+ * @since 1.8
+ */
+ public static int toUnsignedInt(short x) {
+ return ((int) x) & 0xffff;
+ }
+
+ /**
+ * Converts the argument to a {@code long} by an unsigned
+ * conversion. In an unsigned conversion to a {@code long}, the
+ * high-order 48 bits of the {@code long} are zero and the
+ * low-order 16 bits are equal to the bits of the {@code short} argument.
+ *
+ * Consequently, zero and positive {@code short} values are mapped
+ * to a numerically equal {@code long} value and negative {@code
+ * short} values are mapped to a {@code long} value equal to the
+ * input plus 2<sup>16</sup>.
+ *
+ * @param x the value to convert to an unsigned {@code long}
+ * @return the argument converted to {@code long} by an unsigned
+ * conversion
+ * @since 1.8
+ */
+ public static long toUnsignedLong(short x) {
+ return ((long) x) & 0xffffL;
+ }
+
/** use serialVersionUID from JDK 1.1. for interoperability */
private static final long serialVersionUID = 7515723908773894738L;
}
diff --git a/jdk/src/share/classes/java/lang/StrictMath.java b/jdk/src/share/classes/java/lang/StrictMath.java
index e1c4895..1a06f76 100644
--- a/jdk/src/share/classes/java/lang/StrictMath.java
+++ b/jdk/src/share/classes/java/lang/StrictMath.java
@@ -56,6 +56,22 @@ import sun.misc.DoubleConsts;
* {@code sinh}, {@code cosh}, {@code tanh},
* {@code hypot}, {@code expm1}, and {@code log1p}.
*
+ * <p>
+ * The platform uses signed two's complement integer arithmetic with
+ * int and long primitive types. The developer should choose
+ * the primitive type to ensure that arithmetic operations consistently
+ * produce correct results, which in some cases means the operations
+ * will not overflow the range of values of the computation.
+ * The best practice is to choose the primitive type and algorithm to avoid
+ * overflow. In cases where the size is {@code int} or {@code long} and
+ * overflow errors need to be detected, the methods {@code addExact},
+ * {@code subtractExact}, {@code multiplyExact}, and {@code toIntExact}
+ * throw an {@code ArithmeticException} when the results overflow.
+ * For other arithmetic operations such as divide, absolute value,
+ * increment, decrement, and negation overflow occurs only with
+ * a specific minimum or maximum value and should be checked against
+ * the minimum or maximum as appropriate.
+ *
* @author unascribed
* @author Joseph D. Darcy
* @since 1.3
@@ -699,7 +715,111 @@ public final class StrictMath {
}
/**
- * Returns the absolute value of an {@code int} value..
+ * Returns the sum of its arguments,
+ * throwing an exception if the result overflows an {@code int}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows an int
+ * @see Math#addExact(int,int)
+ * @since 1.8
+ */
+ public static int addExact(int x, int y) {
+ return Math.addExact(x, y);
+ }
+
+ /**
+ * Returns the sum of its arguments,
+ * throwing an exception if the result overflows a {@code long}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows a long
+ * @see Math#addExact(long,long)
+ * @since 1.8
+ */
+ public static long addExact(long x, long y) {
+ return Math.addExact(x, y);
+ }
+
+ /**
+ * Return the difference of the arguments,
+ * throwing an exception if the result overflows an {@code int}.
+ *
+ * @param x the first value
+ * @param y the second value to subtract from the first
+ * @return the result
+ * @throws ArithmeticException if the result overflows an int
+ * @see Math#subtractExact(int,int)
+ * @since 1.8
+ */
+ public static int subtractExact(int x, int y) {
+ return Math.subtractExact(x, y);
+ }
+
+ /**
+ * Return the difference of the arguments,
+ * throwing an exception if the result overflows a {@code long}.
+ *
+ * @param x the first value
+ * @param y the second value to subtract from the first
+ * @return the result
+ * @throws ArithmeticException if the result overflows a long
+ * @see Math#subtractExact(long,long)
+ * @since 1.8
+ */
+ public static long subtractExact(long x, long y) {
+ return Math.subtractExact(x, y);
+ }
+
+ /**
+ * Return the product of the arguments,
+ * throwing an exception if the result overflows an {@code int}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows an int
+ * @see Math#multiplyExact(int,int)
+ * @since 1.8
+ */
+ public static int multiplyExact(int x, int y) {
+ return Math.multiplyExact(x, y);
+ }
+
+ /**
+ * Return the product of the arguments,
+ * throwing an exception if the result overflows a {@code long}.
+ *
+ * @param x the first value
+ * @param y the second value
+ * @return the result
+ * @throws ArithmeticException if the result overflows a long
+ * @see Math#multiplyExact(long,long)
+ * @since 1.8
+ */
+ public static long multiplyExact(long x, long y) {
+ return Math.multiplyExact(x, y);
+ }
+
+ /**
+ * Return the value of the {@code long} argument;
+ * throwing an exception if the value overflows an {@code int}.
+ *
+ * @param value the long value
+ * @return the argument as an int
+ * @throws ArithmeticException if the {@code argument} overflows an int
+ * @see Math#toIntExact(int)
+ * @since 1.8
+ */
+ public static int toIntExact(long value) {
+ return Math.toIntExact(value);
+ }
+
+ /**
+ * Returns the absolute value of an {@code int} value.
* If the argument is not negative, the argument is returned.
* If the argument is negative, the negation of the argument is returned.
*
diff --git a/jdk/src/share/classes/java/lang/String.java b/jdk/src/share/classes/java/lang/String.java
index 50b3f7b..79c71d1 100644
--- a/jdk/src/share/classes/java/lang/String.java
+++ b/jdk/src/share/classes/java/lang/String.java
@@ -39,8 +39,8 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
/**
- * The <code>String</code> class represents character strings. All
- * string literals in Java programs, such as <code>"abc"</code>, are
+ * The {@code String} class represents character strings. All
+ * string literals in Java programs, such as {@code "abc"}, are
* implemented as instances of this class.
* <p>
* Strings are constant; their values cannot be changed after they
@@ -63,7 +63,7 @@ import java.util.regex.PatternSyntaxException;
* String d = cde.substring(1, 2);
* </pre></blockquote>
* <p>
- * The class <code>String</code> includes methods for examining
+ * The class {@code String} includes methods for examining
* individual characters of the sequence, for comparing strings, for
* searching strings, for extracting substrings, and for creating a
* copy of a string with all characters translated to uppercase or to
@@ -73,10 +73,10 @@ import java.util.regex.PatternSyntaxException;
* The Java language provides special support for the string
* concatenation operator ( + ), and for conversion of
* other objects to strings. String concatenation is implemented
- * through the <code>StringBuilder</code>(or <code>StringBuffer</code>)
- * class and its <code>append</code> method.
+ * through the {@code StringBuilder}(or {@code StringBuffer})
+ * class and its {@code append} method.
* String conversions are implemented through the method
- * <code>toString</code>, defined by <code>Object</code> and
+ * {@code toString}, defined by {@code Object} and
* inherited by all classes in Java. For additional information on
* string concatenation and conversion, see Gosling, Joy, and Steele,
* <i>The Java Language Specification</i>.
@@ -85,16 +85,16 @@ import java.util.regex.PatternSyntaxException;
* or method in this class will cause a {@link NullPointerException} to be
* thrown.
*
- * <p>A <code>String</code> represents a string in the UTF-16 format
+ * <p>A {@code String} represents a string in the UTF-16 format
* in which <em>supplementary characters</em> are represented by <em>surrogate
* pairs</em> (see the section <a href="Character.html#unicode">Unicode
- * Character Representations</a> in the <code>Character</code> class for
+ * Character Representations</a> in the {@code Character} class for
* more information).
- * Index values refer to <code>char</code> code units, so a supplementary
- * character uses two positions in a <code>String</code>.
- * <p>The <code>String</code> class provides methods for dealing with
+ * Index values refer to {@code char} code units, so a supplementary
+ * character uses two positions in a {@code String}.
+ * <p>The {@code String} class provides methods for dealing with
* Unicode code points (i.e., characters), in addition to those for
- * dealing with Unicode code units (i.e., <code>char</code> values).
+ * dealing with Unicode code units (i.e., {@code char} values).
*
* @author Lee Boynton
* @author Arthur van Hoff
@@ -131,9 +131,9 @@ public final class String
* A String instance is written initially into an ObjectOutputStream in the
* following format:
* <pre>
- * <code>TC_STRING</code> (utf String)
+ * {@code TC_STRING} (utf String)
* </pre>
- * The String is written by method <code>DataOutput.writeUTF</code>.
+ * The String is written by method {@code DataOutput.writeUTF}.
* A new handle is generated to refer to all future references to the
* string instance within the stream.
*/
@@ -673,20 +673,20 @@ public final class String
}
/**
- * Returns the <code>char</code> value at the
- * specified index. An index ranges from <code>0</code> to
- * <code>length() - 1</code>. The first <code>char</code> value of the sequence
- * is at index <code>0</code>, the next at index <code>1</code>,
+ * Returns the {@code char} value at the
+ * specified index. An index ranges from {@code 0} to
+ * {@code length() - 1}. The first {@code char} value of the sequence
+ * is at index {@code 0}, the next at index {@code 1},
* and so on, as for array indexing.
*
- * <p>If the <code>char</code> value specified by the index is a
+ * <p>If the {@code char} value specified by the index is a
* <a href="Character.html#unicode">surrogate</a>, the surrogate
* value is returned.
*
- * @param index the index of the <code>char</code> value.
- * @return the <code>char</code> value at the specified index of this string.
- * The first <code>char</code> value is at index <code>0</code>.
- * @exception IndexOutOfBoundsException if the <code>index</code>
+ * @param index the index of the {@code char} value.
+ * @return the {@code char} value at the specified index of this string.
+ * The first {@code char} value is at index {@code 0}.
+ * @exception IndexOutOfBoundsException if the {@code index}
* argument is negative or not less than the length of this
* string.
*/
@@ -699,22 +699,22 @@ public final class String
/**
* Returns the character (Unicode code point) at the specified
- * index. The index refers to <code>char</code> values
- * (Unicode code units) and ranges from <code>0</code> to
- * {@link #length()}<code> - 1</code>.
+ * index. The index refers to {@code char} values
+ * (Unicode code units) and ranges from {@code 0} to
+ * {@link #length()}{@code - 1}.
*
- * <p> If the <code>char</code> value specified at the given index
+ * <p> If the {@code char} value specified at the given index
* is in the high-surrogate range, the following index is less
- * than the length of this <code>String</code>, and the
- * <code>char</code> value at the following index is in the
+ * than the length of this {@code String}, and the
+ * {@code char} value at the following index is in the
* low-surrogate range, then the supplementary code point
* corresponding to this surrogate pair is returned. Otherwise,
- * the <code>char</code> value at the given index is returned.
+ * the {@code char} value at the given index is returned.
*
- * @param index the index to the <code>char</code> values
+ * @param index the index to the {@code char} values
* @return the code point value of the character at the
- * <code>index</code>
- * @exception IndexOutOfBoundsException if the <code>index</code>
+ * {@code index}
+ * @exception IndexOutOfBoundsException if the {@code index}
* argument is negative or not less than the length of this
* string.
* @since 1.5
@@ -728,22 +728,22 @@ public final class String
/**
* Returns the character (Unicode code point) before the specified
- * index. The index refers to <code>char</code> values
- * (Unicode code units) and ranges from <code>1</code> to {@link
+ * index. The index refers to {@code char} values
+ * (Unicode code units) and ranges from {@code 1} to {@link
* CharSequence#length() length}.
*
- * <p> If the <code>char</code> value at <code>(index - 1)</code>
- * is in the low-surrogate range, <code>(index - 2)</code> is not
- * negative, and the <code>char</code> value at <code>(index -
- * 2)</code> is in the high-surrogate range, then the
+ * <p> If the {@code char} value at {@code (index - 1)}
+ * is in the low-surrogate range, {@code (index - 2)} is not
+ * negative, and the {@code char} value at {@code (index -
+ * 2)} is in the high-surrogate range, then the
* supplementary code point value of the surrogate pair is
- * returned. If the <code>char</code> value at <code>index -
- * 1</code> is an unpaired low-surrogate or a high-surrogate, the
+ * returned. If the {@code char} value at {@code index -
+ * 1} is an unpaired low-surrogate or a high-surrogate, the
* surrogate value is returned.
*
* @param index the index following the code point that should be returned
* @return the Unicode code point value before the given index.
- * @exception IndexOutOfBoundsException if the <code>index</code>
+ * @exception IndexOutOfBoundsException if the {@code index}
* argument is less than 1 or greater than the length
* of this string.
* @since 1.5
@@ -758,23 +758,23 @@ public final class String
/**
* Returns the number of Unicode code points in the specified text
- * range of this <code>String</code>. The text range begins at the
- * specified <code>beginIndex</code> and extends to the
- * <code>char</code> at index <code>endIndex - 1</code>. Thus the
- * length (in <code>char</code>s) of the text range is
- * <code>endIndex-beginIndex</code>. Unpaired surrogates within
+ * range of this {@code String}. The text range begins at the
+ * specified {@code beginIndex} and extends to the
+ * {@code char} at index {@code endIndex - 1}. Thus the
+ * length (in {@code char}s) of the text range is
+ * {@code endIndex-beginIndex}. Unpaired surrogates within
* the text range count as one code point each.
*
- * @param beginIndex the index to the first <code>char</code> of
+ * @param beginIndex the index to the first {@code char} of
* the text range.
- * @param endIndex the index after the last <code>char</code> of
+ * @param endIndex the index after the last {@code char} of
* the text range.
* @return the number of Unicode code points in the specified text
* range
* @exception IndexOutOfBoundsException if the
- * <code>beginIndex</code> is negative, or <code>endIndex</code>
- * is larger than the length of this <code>String</code>, or
- * <code>beginIndex</code> is larger than <code>endIndex</code>.
+ * {@code beginIndex} is negative, or {@code endIndex}
+ * is larger than the length of this {@code String}, or
+ * {@code beginIndex} is larger than {@code endIndex}.
* @since 1.5
*/
public int codePointCount(int beginIndex, int endIndex) {
@@ -785,23 +785,23 @@ public final class String
}
/**
- * Returns the index within this <code>String</code> that is
- * offset from the given <code>index</code> by
- * <code>codePointOffset</code> code points. Unpaired surrogates
- * within the text range given by <code>index</code> and
- * <code>codePointOffset</code> count as one code point each.
+ * Returns the index within this {@code String} that is
+ * offset from the given {@code index} by
+ * {@code codePointOffset} code points. Unpaired surrogates
+ * within the text range given by {@code index} and
+ * {@code codePointOffset} count as one code point each.
*
* @param index the index to be offset
* @param codePointOffset the offset in code points
- * @return the index within this <code>String</code>
- * @exception IndexOutOfBoundsException if <code>index</code>
+ * @return the index within this {@code String}
+ * @exception IndexOutOfBoundsException if {@code index}
* is negative or larger then the length of this
- * <code>String</code>, or if <code>codePointOffset</code> is positive
- * and the substring starting with <code>index</code> has fewer
- * than <code>codePointOffset</code> code points,
- * or if <code>codePointOffset</code> is negative and the substring
- * before <code>index</code> has fewer than the absolute value
- * of <code>codePointOffset</code> code points.
+ * {@code String}, or if {@code codePointOffset} is positive
+ * and the substring starting with {@code index} has fewer
+ * than {@code codePointOffset} code points,
+ * or if {@code codePointOffset} is negative and the substring
+ * before {@code index} has fewer than the absolute value
+ * of {@code codePointOffset} code points.
* @since 1.5
*/
public int offsetByCodePoints(int index, int codePointOffset) {
@@ -824,11 +824,11 @@ public final class String
* Copies characters from this string into the destination character
* array.
* <p>
- * The first character to be copied is at index <code>srcBegin</code>;
- * the last character to be copied is at index <code>srcEnd-1</code>
+ * The first character to be copied is at index {@code srcBegin};
+ * the last character to be copied is at index {@code srcEnd-1}
* (thus the total number of characters to be copied is
- * <code>srcEnd-srcBegin</code>). The characters are copied into the
- * subarray of <code>dst</code> starting at index <code>dstBegin</code>
+ * {@code srcEnd-srcBegin}). The characters are copied into the
+ * subarray of {@code dst} starting at index {@code dstBegin}
* and ending at index:
* <p><blockquote><pre>
* dstbegin + (srcEnd-srcBegin) - 1
@@ -842,13 +842,13 @@ public final class String
* @param dstBegin the start offset in the destination array.
* @exception IndexOutOfBoundsException If any of the following
* is true:
- * <ul><li><code>srcBegin</code> is negative.
- * <li><code>srcBegin</code> is greater than <code>srcEnd</code>
- * <li><code>srcEnd</code> is greater than the length of this
+ * <ul><li>{@code srcBegin} is negative.
+ * <li>{@code srcBegin} is greater than {@code srcEnd}
+ * <li>{@code srcEnd} is greater than the length of this
* string
- * <li><code>dstBegin</code> is negative
- * <li><code>dstBegin+(srcEnd-srcBegin)</code> is larger than
- * <code>dst.length</code></ul>
+ * <li>{@code dstBegin} is negative
+ * <li>{@code dstBegin+(srcEnd-srcBegin)} is larger than
+ * {@code dst.length}</ul>
*/
public void getChars(int srcBegin, int srcEnd, char dst[], int dstBegin) {
if (srcBegin < 0) {
@@ -1135,14 +1135,14 @@ public final class String
* Compares two strings lexicographically.
* The comparison is based on the Unicode value of each character in
* the strings. The character sequence represented by this
- * <code>String</code> object is compared lexicographically to the
+ * {@code String} object is compared lexicographically to the
* character sequence represented by the argument string. The result is
- * a negative integer if this <code>String</code> object
+ * a negative integer if this {@code String} object
* lexicographically precedes the argument string. The result is a
- * positive integer if this <code>String</code> object lexicographically
+ * positive integer if this {@code String} object lexicographically
* follows the argument string. The result is zero if the strings
- * are equal; <code>compareTo</code> returns <code>0</code> exactly when
- * the {@link #equals(Object)} method would return <code>true</code>.
+ * are equal; {@code compareTo} returns {@code 0} exactly when
+ * the {@link #equals(Object)} method would return {@code true}.
* <p>
* This is the definition of lexicographic ordering. If two strings are
* different, then either they have different characters at some index
@@ -1151,25 +1151,25 @@ public final class String
* positions, let <i>k</i> be the smallest such index; then the string
* whose character at position <i>k</i> has the smaller value, as
* determined by using the < operator, lexicographically precedes the
- * other string. In this case, <code>compareTo</code> returns the
- * difference of the two character values at position <code>k</code> in
+ * other string. In this case, {@code compareTo} returns the
+ * difference of the two character values at position {@code k} in
* the two string -- that is, the value:
* <blockquote><pre>
* this.charAt(k)-anotherString.charAt(k)
* </pre></blockquote>
* If there is no index position at which they differ, then the shorter
* string lexicographically precedes the longer string. In this case,
- * <code>compareTo</code> returns the difference of the lengths of the
+ * {@code compareTo} returns the difference of the lengths of the
* strings -- that is, the value:
* <blockquote><pre>
* this.length()-anotherString.length()
* </pre></blockquote>
*
- * @param anotherString the <code>String</code> to be compared.
- * @return the value <code>0</code> if the argument string is equal to
- * this string; a value less than <code>0</code> if this string
+ * @param anotherString the {@code String} to be compared.
+ * @return the value {@code 0} if the argument string is equal to
+ * this string; a value less than {@code 0} if this string
* is lexicographically less than the string argument; and a
- * value greater than <code>0</code> if this string is
+ * value greater than {@code 0} if this string is
* lexicographically greater than the string argument.
*/
public int compareTo(String anotherString) {
@@ -1205,8 +1205,8 @@ public final class String
}
/**
- * A Comparator that orders <code>String</code> objects as by
- * <code>compareToIgnoreCase</code>. This comparator is serializable.
+ * A Comparator that orders {@code String} objects as by
+ * {@code compareToIgnoreCase}. This comparator is serializable.
* <p>
* Note that this Comparator does <em>not</em> take locale into account,
* and will result in an unsatisfactory ordering for certain locales.
@@ -1253,9 +1253,9 @@ public final class String
/**
* Compares two strings lexicographically, ignoring case
* differences. This method returns an integer whose sign is that of
- * calling <code>compareTo</code> with normalized versions of the strings
+ * calling {@code compareTo} with normalized versions of the strings
* where case differences have been eliminated by calling
- * <code>Character.toLowerCase(Character.toUpperCase(character))</code> on
+ * {@code Character.toLowerCase(Character.toUpperCase(character))} on
* each character.
* <p>
* Note that this method does <em>not</em> take locale into account,
@@ -1263,7 +1263,7 @@ public final class String
* The java.text package provides <em>collators</em> to allow
* locale-sensitive ordering.
*
- * @param str the <code>String</code> to be compared.
+ * @param str the {@code String} to be compared.
* @return a negative integer, zero, or a positive integer as the
* specified String is greater than, equal to, or less
* than this String, ignoring case considerations.
@@ -1301,9 +1301,9 @@ public final class String
* @param ooffset the starting offset of the subregion in the string
* argument.
* @param len the number of characters to compare.
- * @return <code>true</code> if the specified subregion of this string
+ * @return {@code true} if the specified subregion of this string
* exactly matches the specified subregion of the string argument;
- * <code>false</code> otherwise.
+ * {@code false} otherwise.
*/
public boolean regionMatches(int toffset, String other, int ooffset,
int len) {
@@ -1360,7 +1360,7 @@ public final class String
* </pre></blockquote>
* </ul>
*
- * @param ignoreCase if <code>true</code>, ignore case when comparing
+ * @param ignoreCase if {@code true}, ignore case when comparing
* characters.
* @param toffset the starting offset of the subregion in this
* string.
@@ -1368,10 +1368,10 @@ public final class String
* @param ooffset the starting offset of the subregion in the string
* argument.
* @param len the number of characters to compare.
- * @return <code>true</code> if the specified subregion of this string
+ * @return {@code true} if the specified subregion of this string
* matches the specified subregion of the string argument;
- * <code>false</code> otherwise. Whether the matching is exact
- * or case insensitive depends on the <code>ignoreCase</code>
+ * {@code false} otherwise. Whether the matching is exact
+ * or case insensitive depends on the {@code ignoreCase}
* argument.
*/
public boolean regionMatches(boolean ignoreCase, int toffset,
@@ -1420,12 +1420,12 @@ public final class String
*
* @param prefix the prefix.
* @param toffset where to begin looking in this string.
- * @return <code>true</code> if the character sequence represented by the
+ * @return {@code true} if the character sequence represented by the
* argument is a prefix of the substring of this object starting
- * at index <code>toffset</code>; <code>false</code> otherwise.
- * The result is <code>false</code> if <code>toffset</code> is
+ * at index {@code toffset}; {@code false} otherwise.
+ * The result is {@code false} if {@code toffset} is
* negative or greater than the length of this
- * <code>String</code> object; otherwise the result is the same
+ * {@code String} object; otherwise the result is the same
* as the result of the expression
* <pre>
* this.substring(toffset).startsWith(prefix)
@@ -1453,12 +1453,12 @@ public final class String
* Tests if this string starts with the specified prefix.
*
* @param prefix the prefix.
- * @return <code>true</code> if the character sequence represented by the
+ * @return {@code true} if the character sequence represented by the
* argument is a prefix of the character sequence represented by
- * this string; <code>false</code> otherwise.
- * Note also that <code>true</code> will be returned if the
+ * this string; {@code false} otherwise.
+ * Note also that {@code true} will be returned if the
* argument is an empty string or is equal to this
- * <code>String</code> object as determined by the
+ * {@code String} object as determined by the
* {@link #equals(Object)} method.
* @since 1. 0
*/
@@ -1470,11 +1470,11 @@ public final class String
* Tests if this string ends with the specified suffix.
*
* @param suffix the suffix.
- * @return <code>true</code> if the character sequence represented by the
+ * @return {@code true} if the character sequence represented by the
* argument is a suffix of the character sequence represented by
- * this object; <code>false</code> otherwise. Note that the
- * result will be <code>true</code> if the argument is the
- * empty string or is equal to this <code>String</code> object
+ * this object; {@code false} otherwise. Note that the
+ * result will be {@code true} if the argument is the
+ * empty string or is equal to this {@code String} object
* as determined by the {@link #equals(Object)} method.
*/
public boolean endsWith(String suffix) {
@@ -1483,13 +1483,13 @@ public final class String
/**
* Returns a hash code for this string. The hash code for a
- * <code>String</code> object is computed as
+ * {@code String} object is computed as
* <blockquote><pre>
* s[0]*31^(n-1) + s[1]*31^(n-2) + ... + s[n-1]
* </pre></blockquote>
- * using <code>int</code> arithmetic, where <code>s[i]</code> is the
- * <i>i</i>th character of the string, <code>n</code> is the length of
- * the string, and <code>^</code> indicates exponentiation.
+ * using {@code int} arithmetic, where {@code s[i]} is the
+ * <i>i</i>th character of the string, {@code n} is the length of
+ * the string, and {@code ^} indicates exponentiation.
* (The hash value of the empty string is zero.)
*
* @return a hash code value for this object.
@@ -1512,26 +1512,26 @@ public final class String
/**
* Returns the index within this string of the first occurrence of
* the specified character. If a character with value
- * <code>ch</code> occurs in the character sequence represented by
- * this <code>String</code> object, then the index (in Unicode
+ * {@code ch} occurs in the character sequence represented by
+ * this {@code String} object, then the index (in Unicode
* code units) of the first such occurrence is returned. For
- * values of <code>ch</code> in the range from 0 to 0xFFFF
+ * values of {@code ch} in the range from 0 to 0xFFFF
* (inclusive), this is the smallest value <i>k</i> such that:
* <blockquote><pre>
* this.charAt(<i>k</i>) == ch
* </pre></blockquote>
- * is true. For other values of <code>ch</code>, it is the
+ * is true. For other values of {@code ch}, it is the
* smallest value <i>k</i> such that:
* <blockquote><pre>
* this.codePointAt(<i>k</i>) == ch
* </pre></blockquote>
* is true. In either case, if no such character occurs in this
- * string, then <code>-1</code> is returned.
+ * string, then {@code -1} is returned.
*
* @param ch a character (Unicode code point).
* @return the index of the first occurrence of the character in the
* character sequence represented by this object, or
- * <code>-1</code> if the character does not occur.
+ * {@code -1} if the character does not occur.
*/
public int indexOf(int ch) {
return indexOf(ch, 0);
@@ -1541,39 +1541,39 @@ public final class String
* Returns the index within this string of the first occurrence of the
* specified character, starting the search at the specified index.
* <p>
- * If a character with value <code>ch</code> occurs in the
- * character sequence represented by this <code>String</code>
- * object at an index no smaller than <code>fromIndex</code>, then
+ * If a character with value {@code ch} occurs in the
+ * character sequence represented by this {@code String}
+ * object at an index no smaller than {@code fromIndex}, then
* the index of the first such occurrence is returned. For values
- * of <code>ch</code> in the range from 0 to 0xFFFF (inclusive),
+ * of {@code ch} in the range from 0 to 0xFFFF (inclusive),
* this is the smallest value <i>k</i> such that:
* <blockquote><pre>
* (this.charAt(<i>k</i>) == ch) && (<i>k</i> >= fromIndex)
* </pre></blockquote>
- * is true. For other values of <code>ch</code>, it is the
+ * is true. For other values of {@code ch}, it is the
* smallest value <i>k</i> such that:
* <blockquote><pre>
* (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> >= fromIndex)
* </pre></blockquote>
* is true. In either case, if no such character occurs in this
- * string at or after position <code>fromIndex</code>, then
- * <code>-1</code> is returned.
+ * string at or after position {@code fromIndex}, then
+ * {@code -1} is returned.
*
* <p>
- * There is no restriction on the value of <code>fromIndex</code>. If it
+ * There is no restriction on the value of {@code fromIndex}. If it
* is negative, it has the same effect as if it were zero: this entire
* string may be searched. If it is greater than the length of this
* string, it has the same effect as if it were equal to the length of
- * this string: <code>-1</code> is returned.
+ * this string: {@code -1} is returned.
*
- * <p>All indices are specified in <code>char</code> values
+ * <p>All indices are specified in {@code char} values
* (Unicode code units).
*
* @param ch a character (Unicode code point).
* @param fromIndex the index to start the search from.
* @return the index of the first occurrence of the character in the
* character sequence represented by this object that is greater
- * than or equal to <code>fromIndex</code>, or <code>-1</code>
+ * than or equal to {@code fromIndex}, or {@code -1}
* if the character does not occur.
*/
public int indexOf(int ch, int fromIndex) {
@@ -1622,26 +1622,26 @@ public final class String
/**
* Returns the index within this string of the last occurrence of
- * the specified character. For values of <code>ch</code> in the
+ * the specified character. For values of {@code ch} in the
* range from 0 to 0xFFFF (inclusive), the index (in Unicode code
* units) returned is the largest value <i>k</i> such that:
* <blockquote><pre>
* this.charAt(<i>k</i>) == ch
* </pre></blockquote>
- * is true. For other values of <code>ch</code>, it is the
+ * is true. For other values of {@code ch}, it is the
* largest value <i>k</i> such that:
* <blockquote><pre>
* this.codePointAt(<i>k</i>) == ch
* </pre></blockquote>
* is true. In either case, if no such character occurs in this
- * string, then <code>-1</code> is returned. The
- * <code>String</code> is searched backwards starting at the last
+ * string, then {@code -1} is returned. The
+ * {@code String} is searched backwards starting at the last
* character.
*
* @param ch a character (Unicode code point).
* @return the index of the last occurrence of the character in the
* character sequence represented by this object, or
- * <code>-1</code> if the character does not occur.
+ * {@code -1} if the character does not occur.
*/
public int lastIndexOf(int ch) {
return lastIndexOf(ch, count - 1);
@@ -1650,27 +1650,27 @@ public final class String
/**
* Returns the index within this string of the last occurrence of
* the specified character, searching backward starting at the
- * specified index. For values of <code>ch</code> in the range
+ * specified index. For values of {@code ch} in the range
* from 0 to 0xFFFF (inclusive), the index returned is the largest
* value <i>k</i> such that:
* <blockquote><pre>
* (this.charAt(<i>k</i>) == ch) && (<i>k</i> <= fromIndex)
* </pre></blockquote>
- * is true. For other values of <code>ch</code>, it is the
+ * is true. For other values of {@code ch}, it is the
* largest value <i>k</i> such that:
* <blockquote><pre>
* (this.codePointAt(<i>k</i>) == ch) && (<i>k</i> <= fromIndex)
* </pre></blockquote>
* is true. In either case, if no such character occurs in this
- * string at or before position <code>fromIndex</code>, then
- * <code>-1</code> is returned.
+ * string at or before position {@code fromIndex}, then
+ * {@code -1} is returned.
*
- * <p>All indices are specified in <code>char</code> values
+ * <p>All indices are specified in {@code char} values
* (Unicode code units).
*
* @param ch a character (Unicode code point).
* @param fromIndex the index to start the search from. There is no
- * restriction on the value of <code>fromIndex</code>. If it is
+ * restriction on the value of {@code fromIndex}. If it is
* greater than or equal to the length of this string, it has
* the same effect as if it were equal to one less than the
* length of this string: this entire string may be searched.
@@ -1678,7 +1678,7 @@ public final class String
* -1 is returned.
* @return the index of the last occurrence of the character in the
* character sequence represented by this object that is less
- * than or equal to <code>fromIndex</code>, or <code>-1</code>
+ * than or equal to {@code fromIndex}, or {@code -1}
* if the character does not occur before that point.
*/
public int lastIndexOf(int ch, int fromIndex) {
@@ -1921,8 +1921,8 @@ public final class String
* @param beginIndex the beginning index, inclusive.
* @return the specified substring.
* @exception IndexOutOfBoundsException if
- * <code>beginIndex</code> is negative or larger than the
- * length of this <code>String</code> object.
+ * {@code beginIndex} is negative or larger than the
+ * length of this {@code String} object.
*/
public String substring(int beginIndex) {
return substring(beginIndex, count);
@@ -1930,9 +1930,9 @@ public final class String
/**
* Returns a new string that is a substring of this string. The
- * substring begins at the specified <code>beginIndex</code> and
- * extends to the character at index <code>endIndex - 1</code>.
- * Thus the length of the substring is <code>endIndex-beginIndex</code>.
+ * substring begins at the specified {@code beginIndex} and
+ * extends to the character at index {@code endIndex - 1}.
+ * Thus the length of the substring is {@code endIndex-beginIndex}.
* <p>
* Examples:
* <blockquote><pre>
@@ -1944,11 +1944,11 @@ public final class String
* @param endIndex the ending index, exclusive.
* @return the specified substring.
* @exception IndexOutOfBoundsException if the
- * <code>beginIndex</code> is negative, or
- * <code>endIndex</code> is larger than the length of
- * this <code>String</code> object, or
- * <code>beginIndex</code> is larger than
- * <code>endIndex</code>.
+ * {@code beginIndex} is negative, or
+ * {@code endIndex} is larger than the length of
+ * this {@code String} object, or
+ * {@code beginIndex} is larger than
+ * {@code endIndex}.
*/
public String substring(int beginIndex, int endIndex) {
if (beginIndex < 0) {
@@ -1999,11 +1999,11 @@ public final class String
/**
* Concatenates the specified string to the end of this string.
* <p>
- * If the length of the argument string is <code>0</code>, then this
- * <code>String</code> object is returned. Otherwise, a new
- * <code>String</code> object is created, representing a character
+ * If the length of the argument string is {@code 0}, then this
+ * {@code String} object is returned. Otherwise, a new
+ * {@code String} object is created, representing a character
* sequence that is the concatenation of the character sequence
- * represented by this <code>String</code> object and the character
+ * represented by this {@code String} object and the character
* sequence represented by the argument string.<p>
* Examples:
* <blockquote><pre>
@@ -2011,8 +2011,8 @@ public final class String
* "to".concat("get").concat("her") returns "together"
* </pre></blockquote>
*
- * @param str the <code>String</code> that is concatenated to the end
- * of this <code>String</code>.
+ * @param str the {@code String} that is concatenated to the end
+ * of this {@code String}.
* @return a string that represents the concatenation of this object's
* characters followed by the string argument's characters.
*/
@@ -2029,16 +2029,16 @@ public final class String
/**
* Returns a new string resulting from replacing all occurrences of
- * <code>oldChar</code> in this string with <code>newChar</code>.
+ * {@code oldChar} in this string with {@code newChar}.
* <p>
- * If the character <code>oldChar</code> does not occur in the
- * character sequence represented by this <code>String</code> object,
- * then a reference to this <code>String</code> object is returned.
- * Otherwise, a new <code>String</code> object is created that
+ * If the character {@code oldChar} does not occur in the
+ * character sequence represented by this {@code String} object,
+ * then a reference to this {@code String} object is returned.
+ * Otherwise, a new {@code String} object is created that
* represents a character sequence identical to the character sequence
- * represented by this <code>String</code> object, except that every
- * occurrence of <code>oldChar</code> is replaced by an occurrence
- * of <code>newChar</code>.
+ * represented by this {@code String} object, except that every
+ * occurrence of {@code oldChar} is replaced by an occurrence
+ * of {@code newChar}.
* <p>
* Examples:
* <blockquote><pre>
@@ -2054,7 +2054,7 @@ public final class String
* @param oldChar the old character.
* @param newChar the new character.
* @return a string derived from this string by replacing every
- * occurrence of <code>oldChar</code> with <code>newChar</code>.
+ * occurrence of {@code oldChar} with {@code newChar}.
*/
public String replace(char oldChar, char newChar) {
if (oldChar != newChar) {
@@ -2119,8 +2119,8 @@ public final class String
* sequence of char values.
*
* @param s the sequence to search for
- * @return true if this string contains <code>s</code>, false otherwise
- * @throws NullPointerException if <code>s</code> is <code>null</code>
+ * @return true if this string contains {@code s}, false otherwise
+ * @throws NullPointerException if {@code s} is {@code null}
* @since 1.5
*/
public boolean contains(CharSequence s) {
@@ -2223,8 +2223,8 @@ public final class String
* @param target The sequence of char values to be replaced
* @param replacement The replacement sequence of char values
* @return The resulting string
- * @throws NullPointerException if <code>target</code> or
- * <code>replacement</code> is <code>null</code>.
+ * @throws NullPointerException if {@code target} or
+ * {@code replacement} is {@code null}.
* @since 1.5
*/
public String replace(CharSequence target, CharSequence replacement) {
@@ -2407,11 +2407,11 @@ public final class String
}
/**
- * Converts all of the characters in this <code>String</code> to lower
- * case using the rules of the given <code>Locale</code>. Case mapping is based
+ * Converts all of the characters in this {@code String} to lower
+ * case using the rules of the given {@code Locale}. Case mapping is based
* on the Unicode Standard version specified by the {@link java.lang.Character Character}
* class. Since case mappings are not always 1:1 char mappings, the resulting
- * <code>String</code> may be a different length than the original <code>String</code>.
+ * {@code String} may be a different length than the original {@code String}.
* <p>
* Examples of lowercase mappings are in the following table:
* <table border="1" summary="Lowercase mapping examples showing language code of locale, upper case, lower case, and description">
@@ -2452,7 +2452,7 @@ public final class String
* </table>
*
* @param locale use the case transformation rules for this locale
- * @return the <code>String</code>, converted to lowercase.
+ * @return the {@code String}, converted to lowercase.
* @see java.lang.String#toLowerCase()
* @see java.lang.String#toUpperCase()
* @see java.lang.String#toUpperCase(Locale)
@@ -2553,22 +2553,22 @@ public final class String
}
/**
- * Converts all of the characters in this <code>String</code> to lower
+ * Converts all of the characters in this {@code String} to lower
* case using the rules of the default locale. This is equivalent to calling
- * <code>toLowerCase(Locale.getDefault())</code>.
+ * {@code toLowerCase(Locale.getDefault())}.
* <p>
* <b>Note:</b> This method is locale sensitive, and may produce unexpected
* results if used for strings that are intended to be interpreted locale
* independently.
* Examples are programming language identifiers, protocol keys, and HTML
* tags.
- * For instance, <code>"TITLE".toLowerCase()</code> in a Turkish locale
- * returns <code>"t\u005Cu0131tle"</code>, where '\u005Cu0131' is the
+ * For instance, {@code "TITLE".toLowerCase()} in a Turkish locale
+ * returns {@code "t\u005Cu0131tle"}, where '\u005Cu0131' is the
* LATIN SMALL LETTER DOTLESS I character.
* To obtain correct results for locale insensitive strings, use
- * <code>toLowerCase(Locale.ENGLISH)</code>.
+ * {@code toLowerCase(Locale.ENGLISH)}.
* <p>
- * @return the <code>String</code>, converted to lowercase.
+ * @return the {@code String}, converted to lowercase.
* @see java.lang.String#toLowerCase(Locale)
*/
public String toLowerCase() {
@@ -2576,11 +2576,11 @@ public final class String
}
/**
- * Converts all of the characters in this <code>String</code> to upper
- * case using the rules of the given <code>Locale</code>. Case mapping is based
+ * Converts all of the characters in this {@code String} to upper
+ * case using the rules of the given {@code Locale}. Case mapping is based
* on the Unicode Standard version specified by the {@link java.lang.Character Character}
* class. Since case mappings are not always 1:1 char mappings, the resulting
- * <code>String</code> may be a different length than the original <code>String</code>.
+ * {@code String} may be a different length than the original {@code String}.
* <p>
* Examples of locale-sensitive and 1:M case mappings are in the following table.
* <p>
@@ -2617,7 +2617,7 @@ public final class String
* </tr>
* </table>
* @param locale use the case transformation rules for this locale
- * @return the <code>String</code>, converted to uppercase.
+ * @return the {@code String}, converted to uppercase.
* @see java.lang.String#toUpperCase()
* @see java.lang.String#toLowerCase()
* @see java.lang.String#toLowerCase(Locale)
@@ -2716,22 +2716,22 @@ public final class String
}
/**
- * Converts all of the characters in this <code>String</code> to upper
+ * Converts all of the characters in this {@code String} to upper
* case using the rules of the default locale. This method is equivalent to
- * <code>toUpperCase(Locale.getDefault())</code>.
+ * {@code toUpperCase(Locale.getDefault())}.
* <p>
* <b>Note:</b> This method is locale sensitive, and may produce unexpected
* results if used for strings that are intended to be interpreted locale
* independently.
* Examples are programming language identifiers, protocol keys, and HTML
* tags.
- * For instance, <code>"title".toUpperCase()</code> in a Turkish locale
- * returns <code>"T\u005Cu0130TLE"</code>, where '\u005Cu0130' is the
+ * For instance, {@code "title".toUpperCase()} in a Turkish locale
+ * returns {@code "T\u005Cu0130TLE"}, where '\u005Cu0130' is the
* LATIN CAPITAL LETTER I WITH DOT ABOVE character.
* To obtain correct results for locale insensitive strings, use
- * <code>toUpperCase(Locale.ENGLISH)</code>.
+ * {@code toUpperCase(Locale.ENGLISH)}.
* <p>
- * @return the <code>String</code>, converted to uppercase.
+ * @return the {@code String}, converted to uppercase.
* @see java.lang.String#toUpperCase(Locale)
*/
public String toUpperCase() {
@@ -2742,21 +2742,21 @@ public final class String
* Returns a copy of the string, with leading and trailing whitespace
* omitted.
* <p>
- * If this <code>String</code> object represents an empty character
+ * If this {@code String} object represents an empty character
* sequence, or the first and last characters of character sequence
- * represented by this <code>String</code> object both have codes
- * greater than <code>'\u0020'</code> (the space character), then a
- * reference to this <code>String</code> object is returned.
+ * represented by this {@code String} object both have codes
+ * greater than {@code '\u005Cu0020'} (the space character), then a
+ * reference to this {@code String} object is returned.
* <p>
* Otherwise, if there is no character with a code greater than
- * <code>'\u0020'</code> in the string, then a new
- * <code>String</code> object representing an empty string is created
+ * {@code '\u005Cu0020'} in the string, then a new
+ * {@code String} object representing an empty string is created
* and returned.
* <p>
* Otherwise, let <i>k</i> be the index of the first character in the
- * string whose code is greater than <code>'\u0020'</code>, and let
+ * string whose code is greater than {@code '\u005Cu0020'}, and let
* <i>m</i> be the index of the last character in the string whose code
- * is greater than <code>'\u0020'</code>. A new <code>String</code>
+ * is greater than {@code '\u005Cu0020'}. A new {@code String}
* object is created, representing the substring of this string that
* begins with the character at index <i>k</i> and ends with the
* character at index <i>m</i>-that is, the result of
@@ -2893,12 +2893,12 @@ public final class String
}
/**
- * Returns the string representation of the <code>Object</code> argument.
+ * Returns the string representation of the {@code Object} argument.
*
- * @param obj an <code>Object</code>.
- * @return if the argument is <code>null</code>, then a string equal to
- * <code>"null"</code>; otherwise, the value of
- * <code>obj.toString()</code> is returned.
+ * @param obj an {@code Object}.
+ * @return if the argument is {@code null}, then a string equal to
+ * {@code "null"}; otherwise, the value of
+ * {@code obj.toString()} is returned.
* @see java.lang.Object#toString()
*/
public static String valueOf(Object obj) {
@@ -2906,12 +2906,12 @@ public final class String
}
/**
- * Returns the string representation of the <code>char</code> array
+ * Returns the string representation of the {@code char} array
* argument. The contents of the character array are copied; subsequent
* modification of the character array does not affect the newly
* created string.
*
- * @param data a <code>char</code> array.
+ * @param data a {@code char} array.
* @return a newly allocated string representing the same sequence of
* characters contained in the character array argument.
*/
@@ -2921,24 +2921,24 @@ public final class String
/**
* Returns the string representation of a specific subarray of the
- * <code>char</code> array argument.
+ * {@code char} array argument.
* <p>
- * The <code>offset</code> argument is the index of the first
- * character of the subarray. The <code>count</code> argument
+ * The {@code offset} argument is the index of the first
+ * character of the subarray. The {@code count} argument
* specifies the length of the subarray. The contents of the subarray
* are copied; subsequent modification of the character array does not
* affect the newly created string.
*
* @param data the character array.
* @param offset the initial offset into the value of the
- * <code>String</code>.
- * @param count the length of the value of the <code>String</code>.
+ * {@code String}.
+ * @param count the length of the value of the {@code String}.
* @return a string representing the sequence of characters contained
* in the subarray of the character array argument.
- * @exception IndexOutOfBoundsException if <code>offset</code> is
- * negative, or <code>count</code> is negative, or
- * <code>offset+count</code> is larger than
- * <code>data.length</code>.
+ * @exception IndexOutOfBoundsException if {@code offset} is
+ * negative, or {@code count} is negative, or
+ * {@code offset+count} is larger than
+ * {@code data.length}.
*/
public static String valueOf(char data[], int offset, int count) {
return new String(data, offset, count);
@@ -2951,7 +2951,7 @@ public final class String
* @param data the character array.
* @param offset initial offset of the subarray.
* @param count length of the subarray.
- * @return a <code>String</code> that contains the characters of the
+ * @return a {@code String} that contains the characters of the
* specified subarray of the character array.
*/
public static String copyValueOf(char data[], int offset, int count) {
@@ -2964,7 +2964,7 @@ public final class String
* array specified.
*
* @param data the character array.
- * @return a <code>String</code> that contains the characters of the
+ * @return a {@code String} that contains the characters of the
* character array.
*/
public static String copyValueOf(char data[]) {
@@ -2972,24 +2972,24 @@ public final class String
}
/**
- * Returns the string representation of the <code>boolean</code> argument.
+ * Returns the string representation of the {@code boolean} argument.
*
- * @param b a <code>boolean</code>.
- * @return if the argument is <code>true</code>, a string equal to
- * <code>"true"</code> is returned; otherwise, a string equal to
- * <code>"false"</code> is returned.
+ * @param b a {@code boolean}.
+ * @return if the argument is {@code true}, a string equal to
+ * {@code "true"} is returned; otherwise, a string equal to
+ * {@code "false"} is returned.
*/
public static String valueOf(boolean b) {
return b ? "true" : "false";
}
/**
- * Returns the string representation of the <code>char</code>
+ * Returns the string representation of the {@code char}
* argument.
*
- * @param c a <code>char</code>.
- * @return a string of length <code>1</code> containing
- * as its single character the argument <code>c</code>.
+ * @param c a {@code char}.
+ * @return a string of length {@code 1} containing
+ * as its single character the argument {@code c}.
*/
public static String valueOf(char c) {
char data[] = {c};
@@ -2997,13 +2997,13 @@ public final class String
}
/**
- * Returns the string representation of the <code>int</code> argument.
+ * Returns the string representation of the {@code int} argument.
* <p>
* The representation is exactly the one returned by the
- * <code>Integer.toString</code> method of one argument.
+ * {@code Integer.toString} method of one argument.
*
- * @param i an <code>int</code>.
- * @return a string representation of the <code>int</code> argument.
+ * @param i an {@code int}.
+ * @return a string representation of the {@code int} argument.
* @see java.lang.Integer#toString(int, int)
*/
public static String valueOf(int i) {
@@ -3011,13 +3011,13 @@ public final class String
}
/**
- * Returns the string representation of the <code>long</code> argument.
+ * Returns the string representation of the {@code long} argument.
* <p>
* The representation is exactly the one returned by the
- * <code>Long.toString</code> method of one argument.
+ * {@code Long.toString} method of one argument.
*
- * @param l a <code>long</code>.
- * @return a string representation of the <code>long</code> argument.
+ * @param l a {@code long}.
+ * @return a string representation of the {@code long} argument.
* @see java.lang.Long#toString(long)
*/
public static String valueOf(long l) {
@@ -3025,13 +3025,13 @@ public final class String
}
/**
- * Returns the string representation of the <code>float</code> argument.
+ * Returns the string representation of the {@code float} argument.
* <p>
* The representation is exactly the one returned by the
- * <code>Float.toString</code> method of one argument.
+ * {@code Float.toString} method of one argument.
*
- * @param f a <code>float</code>.
- * @return a string representation of the <code>float</code> argument.
+ * @param f a {@code float}.
+ * @return a string representation of the {@code float} argument.
* @see java.lang.Float#toString(float)
*/
public static String valueOf(float f) {
@@ -3039,13 +3039,13 @@ public final class String
}
/**
- * Returns the string representation of the <code>double</code> argument.
+ * Returns the string representation of the {@code double} argument.
* <p>
* The representation is exactly the one returned by the
- * <code>Double.toString</code> method of one argument.
+ * {@code Double.toString} method of one argument.
*
- * @param d a <code>double</code>.
- * @return a string representation of the <code>double</code> argument.
+ * @param d a {@code double}.
+ * @return a string representation of the {@code double} argument.
* @see java.lang.Double#toString(double)
*/
public static String valueOf(double d) {
@@ -3056,17 +3056,17 @@ public final class String
* Returns a canonical representation for the string object.
* <p>
* A pool of strings, initially empty, is maintained privately by the
- * class <code>String</code>.
+ * class {@code String}.
* <p>
* When the intern method is invoked, if the pool already contains a
- * string equal to this <code>String</code> object as determined by
+ * string equal to this {@code String} object as determined by
* the {@link #equals(Object)} method, then the string from the pool is
- * returned. Otherwise, this <code>String</code> object is added to the
- * pool and a reference to this <code>String</code> object is returned.
+ * returned. Otherwise, this {@code String} object is added to the
+ * pool and a reference to this {@code String} object is returned.
* <p>
- * It follows that for any two strings <code>s</code> and <code>t</code>,
- * <code>s.intern() == t.intern()</code> is <code>true</code>
- * if and only if <code>s.equals(t)</code> is <code>true</code>.
+ * It follows that for any two strings {@code s} and {@code t},
+ * {@code s.intern() == t.intern()} is {@code true}
+ * if and only if {@code s.equals(t)} is {@code true}.
* <p>
* All literal strings and string-valued constant expressions are
* interned. String literals are defined in section 3.10.5 of the
diff --git a/jdk/src/share/classes/java/lang/System.java b/jdk/src/share/classes/java/lang/System.java
index 9574b30..973771a 100644
--- a/jdk/src/share/classes/java/lang/System.java
+++ b/jdk/src/share/classes/java/lang/System.java
@@ -1101,6 +1101,19 @@ public final class System {
public static native String mapLibraryName(String libname);
/**
+ * Create PrintStream for stdout/err based on encoding.
+ */
+ private static PrintStream newPrintStream(FileOutputStream fos, String enc) {
+ if (enc != null) {
+ try {
+ return new PrintStream(new BufferedOutputStream(fos, 128), true, enc);
+ } catch (UnsupportedEncodingException uee) {}
+ }
+ return new PrintStream(new BufferedOutputStream(fos, 128), true);
+ }
+
+
+ /**
* Initialize the system class. Called after thread initialization.
*/
private static void initializeSystemClass() {
@@ -1140,8 +1153,9 @@ public final class System {
FileOutputStream fdOut = new FileOutputStream(FileDescriptor.out);
FileOutputStream fdErr = new FileOutputStream(FileDescriptor.err);
setIn0(new BufferedInputStream(fdIn));
- setOut0(new PrintStream(new BufferedOutputStream(fdOut, 128), true));
- setErr0(new PrintStream(new BufferedOutputStream(fdErr, 128), true));
+ setOut0(newPrintStream(fdOut, props.getProperty("sun.stdout.encoding")));
+ setErr0(newPrintStream(fdErr, props.getProperty("sun.stderr.encoding")));
+
// Load the zip library now in order to keep java.util.zip.ZipFile
// from trying to use itself to load this library later.
loadLibrary("zip");
@@ -1155,11 +1169,6 @@ public final class System {
// classes are used.
sun.misc.VM.initializeOSEnvironment();
- // Subsystems that are invoked during initialization can invoke
- // sun.misc.VM.isBooted() in order to avoid doing things that should
- // wait until the application class loader has been set up.
- sun.misc.VM.booted();
-
// The main thread is not added to its thread group in the same
// way as other threads; we must do it ourselves here.
Thread current = Thread.currentThread();
@@ -1167,6 +1176,12 @@ public final class System {
// register shared secrets
setJavaLangAccess();
+
+ // Subsystems that are invoked during initialization can invoke
+ // sun.misc.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();
}
private static void setJavaLangAccess() {
diff --git a/jdk/src/share/classes/java/lang/Thread.java b/jdk/src/share/classes/java/lang/Thread.java
index b3d2e39..474dbfc 100644
--- a/jdk/src/share/classes/java/lang/Thread.java
+++ b/jdk/src/share/classes/java/lang/Thread.java
@@ -1136,6 +1136,9 @@ class Thread implements Runnable {
public final void setName(String name) {
checkAccess();
this.name = name.toCharArray();
+ if (threadStatus != 0) {
+ setNativeName(name);
+ }
}
/**
@@ -2032,4 +2035,5 @@ class Thread implements Runnable {
private native void suspend0();
private native void resume0();
private native void interrupt0();
+ private native void setNativeName(String name);
}
diff --git a/jdk/src/share/classes/java/lang/management/ManagementFactory.java b/jdk/src/share/classes/java/lang/management/ManagementFactory.java
index 98f2e40..20906a1 100644
--- a/jdk/src/share/classes/java/lang/management/ManagementFactory.java
+++ b/jdk/src/share/classes/java/lang/management/ManagementFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@ import javax.management.StandardMBean;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import java.util.TreeSet;
+import java.util.HashSet;
import java.security.AccessController;
import java.security.Permission;
import java.security.PrivilegedAction;
@@ -787,7 +787,7 @@ public class ManagementFactory {
getPlatformManagementInterfaces()
{
Set<Class<? extends PlatformManagedObject>> result =
- new TreeSet<>();
+ new HashSet<>();
for (PlatformComponent component: PlatformComponent.values()) {
result.add(component.getMXBeanInterface());
}
diff --git a/jdk/src/share/classes/java/lang/management/ManagementPermission.java b/jdk/src/share/classes/java/lang/management/ManagementPermission.java
index bf27f1d..6df6f1e 100644
--- a/jdk/src/share/classes/java/lang/management/ManagementPermission.java
+++ b/jdk/src/share/classes/java/lang/management/ManagementPermission.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,12 +46,17 @@ at the permission allows, and associated risks">
* <tr>
* <td>control</td>
* <td>Ability to control the runtime characteristics of the Java virtual
- * machine, for example, setting the -verbose:gc and -verbose:class flag,
- * setting the threshold of a memory pool, and enabling and disabling
- * the thread contention monitoring support.
+ * machine, for example, enabling and disabling the verbose output for
+ * the class loading or memory system, setting the threshold of a memory
+ * pool, and enabling and disabling the thread contention monitoring
+ * support. Some actions controlled by this permission can disclose
+ * information about the running application, like the -verbose:class
+ * flag.
* </td>
* <td>This allows an attacker to control the runtime characteristics
- * of the Java virtual machine and cause the system to misbehave.
+ * of the Java virtual machine and cause the system to misbehave. An
+ * attacker can also access some information related to the running
+ * application.
* </td>
* </tr>
* <tr>
diff --git a/jdk/src/share/classes/java/lang/reflect/Executable.java b/jdk/src/share/classes/java/lang/reflect/Executable.java
index 915918b..5e9adea 100644
--- a/jdk/src/share/classes/java/lang/reflect/Executable.java
+++ b/jdk/src/share/classes/java/lang/reflect/Executable.java
@@ -180,7 +180,7 @@ public abstract class Executable extends AccessibleObject
/**
* Returns the {@code Class} object representing the class or interface
- * that declares the method represented by this executable object.
+ * that declares the executable represented by this object.
*/
public abstract Class<?> getDeclaringClass();
@@ -215,18 +215,18 @@ public abstract class Executable extends AccessibleObject
* Returns an array of {@code Class} objects that represent the formal
* parameter types, in declaration order, of the executable
* represented by this object. Returns an array of length
- * 0 if the underlying method takes no parameters.
+ * 0 if the underlying executable takes no parameters.
*
- * @return the parameter types for the method this object
+ * @return the parameter types for the executable this object
* represents
*/
public abstract Class<?>[] getParameterTypes();
/**
* Returns an array of {@code Type} objects that represent the formal
- * parameter types, in declaration order, of the method represented by
- * this executable object. Returns an array of length 0 if the
- * underlying method takes no parameters.
+ * parameter types, in declaration order, of the executable represented by
+ * this object. Returns an array of length 0 if the
+ * underlying executable takes no parameters.
*
* <p>If a formal parameter type is a parameterized type,
* the {@code Type} object returned for it must accurately reflect
@@ -236,16 +236,16 @@ public abstract class Executable extends AccessibleObject
* type, it is created. Otherwise, it is resolved.
*
* @return an array of {@code Type}s that represent the formal
- * parameter types of the underlying method, in declaration order
+ * parameter types of the underlying executable, in declaration order
* @throws GenericSignatureFormatError
* if the generic method signature does not conform to the format
* specified in
* <cite>The Java™ Virtual Machine Specification</cite>
* @throws TypeNotPresentException if any of the parameter
- * types of the underlying method refers to a non-existent type
+ * types of the underlying executable refers to a non-existent type
* declaration
* @throws MalformedParameterizedTypeException if any of
- * the underlying method's parameter types refer to a parameterized
+ * the underlying executable's parameter types refer to a parameterized
* type that cannot be instantiated for any reason
*/
public Type[] getGenericParameterTypes() {
@@ -277,15 +277,15 @@ public abstract class Executable extends AccessibleObject
* type, it is created. Otherwise, it is resolved.
*
* @return an array of Types that represent the exception types
- * thrown by the underlying method
+ * thrown by the underlying executable
* @throws GenericSignatureFormatError
* if the generic method signature does not conform to the format
* specified in
* <cite>The Java™ Virtual Machine Specification</cite>
- * @throws TypeNotPresentException if the underlying method's
+ * @throws TypeNotPresentException if the underlying executable's
* {@code throws} clause refers to a non-existent type declaration
* @throws MalformedParameterizedTypeException if
- * the underlying method's {@code throws} clause refers to a
+ * the underlying executable's {@code throws} clause refers to a
* parameterized type that cannot be instantiated for any reason
*/
public Type[] getGenericExceptionTypes() {
@@ -330,7 +330,7 @@ public abstract class Executable extends AccessibleObject
* Returns an array of arrays that represent the annotations on
* the formal parameters, in declaration order, of the executable
* represented by this object. (Returns an array of length zero if
- * the underlying method is parameterless. If the executable has
+ * the underlying executable is parameterless. If the executable has
* one or more parameters, a nested array of length zero is
* returned for each parameter with no annotations.) The
* annotation objects contained in the returned arrays are
@@ -339,7 +339,7 @@ public abstract class Executable extends AccessibleObject
* to other callers.
*
* @return an array of arrays that represent the annotations on the formal
- * parameters, in declaration order, of the exectuable represented by this
+ * parameters, in declaration order, of the executable represented by this
* object
*/
public abstract Annotation[][] getParameterAnnotations();
diff --git a/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java b/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
index f1a4995..71e329a 100644
--- a/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
+++ b/jdk/src/share/classes/java/net/AbstractPlainDatagramSocketImpl.java
@@ -26,6 +26,7 @@ package java.net;
import java.io.FileDescriptor;
import java.io.IOException;
+import java.security.AccessController;
import sun.net.ResourceManager;
/**
@@ -52,6 +53,15 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
private boolean loopbackMode = true;
private int ttl = -1;
+ private static final String os = AccessController.doPrivileged(
+ new sun.security.action.GetPropertyAction("os.name")
+ );
+
+ /**
+ * flag set if the native connect() call not to be used
+ */
+ private final static boolean connectDisabled = os.startsWith("Mac OS");
+
/**
* Load net library into runtime.
*/
@@ -349,4 +359,7 @@ abstract class AbstractPlainDatagramSocketImpl extends DatagramSocketImpl
protected abstract void connect0(InetAddress address, int port) throws SocketException;
protected abstract void disconnect0(int family);
+ protected boolean nativeConnectDisabled() {
+ return connectDisabled;
+ }
}
diff --git a/jdk/src/share/classes/java/net/DatagramSocket.java b/jdk/src/share/classes/java/net/DatagramSocket.java
index 9c9dec1..9e3bec3 100644
--- a/jdk/src/share/classes/java/net/DatagramSocket.java
+++ b/jdk/src/share/classes/java/net/DatagramSocket.java
@@ -133,7 +133,8 @@ class DatagramSocket implements java.io.Closeable {
bind(new InetSocketAddress(0));
// old impls do not support connect/disconnect
- if (oldImpl) {
+ if (oldImpl || (impl instanceof AbstractPlainDatagramSocketImpl &&
+ ((AbstractPlainDatagramSocketImpl)impl).nativeConnectDisabled())) {
connectState = ST_CONNECTED_NO_IMPL;
} else {
try {
@@ -752,9 +753,19 @@ class DatagramSocket implements java.io.Closeable {
// via the impl failed.
boolean stop = false;
while (!stop) {
+ InetAddress peekAddress = null;
+ int peekPort = -1;
// peek at the packet to see who it is from.
- InetAddress peekAddress = new InetAddress();
- int peekPort = getImpl().peek(peekAddress);
+ if (!oldImpl) {
+ // We can use the new peekData() API
+ DatagramPacket peekPacket = new DatagramPacket(new byte[1], 1);
+ peekPort = getImpl().peekData(peekPacket);
+ peekAddress = peekPacket.getAddress();
+ } else {
+ // this api only works for IPv4
+ peekAddress = new InetAddress();
+ peekPort = getImpl().peek(peekAddress);
+ }
if ((!connectedAddress.equals(peekAddress)) ||
(connectedPort != peekPort)) {
// throw the packet away and silently continue
diff --git a/jdk/src/share/classes/java/net/InMemoryCookieStore.java b/jdk/src/share/classes/java/net/InMemoryCookieStore.java
index e885cdd..66cb04e 100644
--- a/jdk/src/share/classes/java/net/InMemoryCookieStore.java
+++ b/jdk/src/share/classes/java/net/InMemoryCookieStore.java
@@ -207,6 +207,9 @@ class InMemoryCookieStore implements CookieStore {
public boolean removeAll() {
lock.lock();
try {
+ if (cookieJar.isEmpty()) {
+ return false;
+ }
cookieJar.clear();
domainIndex.clear();
uriIndex.clear();
diff --git a/jdk/src/share/classes/java/net/MulticastSocket.java b/jdk/src/share/classes/java/net/MulticastSocket.java
index 0171315..0038829 100644
--- a/jdk/src/share/classes/java/net/MulticastSocket.java
+++ b/jdk/src/share/classes/java/net/MulticastSocket.java
@@ -81,6 +81,13 @@ import java.util.Enumeration;
*/
public
class MulticastSocket extends DatagramSocket {
+
+ /**
+ * Used on some platforms to record if an outgoing interface
+ * has been set for this socket.
+ */
+ private boolean interfaceSet;
+
/**
* Create a multicast socket.
*
@@ -303,6 +310,16 @@ class MulticastSocket extends DatagramSocket {
throw new SocketException("Not a multicast address");
}
+ /**
+ * required for some platforms where it's not possible to join
+ * a group without setting the interface first.
+ */
+ NetworkInterface defaultInterface = NetworkInterface.getDefault();
+
+ if (!interfaceSet && defaultInterface != null) {
+ setNetworkInterface(defaultInterface);
+ }
+
getImpl().join(mcastaddr);
}
@@ -453,6 +470,7 @@ class MulticastSocket extends DatagramSocket {
synchronized (infLock) {
getImpl().setOption(SocketOptions.IP_MULTICAST_IF, inf);
infAddress = inf;
+ interfaceSet = true;
}
}
@@ -535,6 +553,7 @@ class MulticastSocket extends DatagramSocket {
synchronized (infLock) {
getImpl().setOption(SocketOptions.IP_MULTICAST_IF2, netIf);
infAddress = null;
+ interfaceSet = true;
}
}
diff --git a/jdk/src/share/classes/java/net/NetworkInterface.java b/jdk/src/share/classes/java/net/NetworkInterface.java
index 229f113..6314d15 100644
--- a/jdk/src/share/classes/java/net/NetworkInterface.java
+++ b/jdk/src/share/classes/java/net/NetworkInterface.java
@@ -49,10 +49,18 @@ public final class NetworkInterface {
private NetworkInterface childs[];
private NetworkInterface parent = null;
private boolean virtual = false;
+ private static final NetworkInterface defaultInterface;
+ private static final int defaultIndex; /* index of defaultInterface */
static {
AccessController.doPrivileged(new LoadLibraryAction("net"));
init();
+ defaultInterface = DefaultInterface.getDefault();
+ if (defaultInterface != null) {
+ defaultIndex = defaultInterface.getIndex();
+ } else {
+ defaultIndex = 0;
+ }
}
/**
@@ -551,4 +559,13 @@ public final class NetworkInterface {
}
private static native void init();
+
+ /**
+ * Returns the default network interface of this system
+ *
+ * @return the default interface
+ */
+ static NetworkInterface getDefault() {
+ return defaultInterface;
+ }
}
diff --git a/jdk/src/share/classes/java/text/SimpleDateFormat.java b/jdk/src/share/classes/java/text/SimpleDateFormat.java
index 85bf158..7cbed98 100644
--- a/jdk/src/share/classes/java/text/SimpleDateFormat.java
+++ b/jdk/src/share/classes/java/text/SimpleDateFormat.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1646,8 +1646,7 @@ public class SimpleDateFormat extends DateFormat {
// determine the local time. (6645292)
int dstAmount = (nameIndex >= 3) ? tz.getDSTSavings() : 0;
if (!(useSameName || (nameIndex >= 3 && dstAmount == 0))) {
- calb.set(Calendar.ZONE_OFFSET, tz.getRawOffset())
- .set(Calendar.DST_OFFSET, dstAmount);
+ calb.set(Calendar.DST_OFFSET, dstAmount);
}
return (start + zoneNames[nameIndex].length());
}
diff --git a/jdk/src/share/classes/java/util/Calendar.java b/jdk/src/share/classes/java/util/Calendar.java
index 51ec6be..21de734 100644
--- a/jdk/src/share/classes/java/util/Calendar.java
+++ b/jdk/src/share/classes/java/util/Calendar.java
@@ -2705,7 +2705,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
* removed from the serialization stream; this will probably happen in the
* near future.
*/
- private void writeObject(ObjectOutputStream stream)
+ private synchronized void writeObject(ObjectOutputStream stream)
throws IOException
{
// Try to compute the time correctly, for the future (stream
diff --git a/jdk/src/share/classes/java/util/Collections.java b/jdk/src/share/classes/java/util/Collections.java
index 04e642e..d18d568 100644
--- a/jdk/src/share/classes/java/util/Collections.java
+++ b/jdk/src/share/classes/java/util/Collections.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1489,6 +1489,8 @@ public class Collections {
}
public int hashCode() {return e.hashCode();}
public boolean equals(Object o) {
+ if (this == o)
+ return true;
if (!(o instanceof Map.Entry))
return false;
Map.Entry t = (Map.Entry)o;
@@ -1709,6 +1711,8 @@ public class Collections {
}
public boolean equals(Object o) {
+ if (this == o)
+ return true;
synchronized (mutex) {return c.equals(o);}
}
public int hashCode() {
@@ -1863,6 +1867,8 @@ public class Collections {
}
public boolean equals(Object o) {
+ if (this == o)
+ return true;
synchronized (mutex) {return list.equals(o);}
}
public int hashCode() {
@@ -2073,6 +2079,8 @@ public class Collections {
}
public boolean equals(Object o) {
+ if (this == o)
+ return true;
synchronized (mutex) {return m.equals(o);}
}
public int hashCode() {
diff --git a/jdk/src/share/classes/java/util/Currency.java b/jdk/src/share/classes/java/util/Currency.java
index 87b7e01..e475bbb 100644
--- a/jdk/src/share/classes/java/util/Currency.java
+++ b/jdk/src/share/classes/java/util/Currency.java
@@ -34,6 +34,8 @@ import java.io.IOException;
import java.io.Serializable;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
@@ -99,7 +101,7 @@ public final class Currency implements Serializable {
// class data: instance map
- private static HashMap<String, Currency> instances = new HashMap<String, Currency>(7);
+ private static ConcurrentMap<String, Currency> instances = new ConcurrentHashMap<>(7);
private static HashSet<Currency> available;
@@ -284,7 +286,6 @@ public final class Currency implements Serializable {
private static Currency getInstance(String currencyCode, int defaultFractionDigits,
int numericCode) {
- synchronized (instances) {
// Try to look up the currency code in the instances table.
// This does the null pointer check as a side effect.
// Also, if there already is an entry, the currencyCode must be valid.
@@ -322,10 +323,9 @@ public final class Currency implements Serializable {
}
}
- instance = new Currency(currencyCode, defaultFractionDigits, numericCode);
- instances.put(currencyCode, instance);
- return instance;
- }
+ instance = instances.putIfAbsent(currencyCode,
+ new Currency(currencyCode, defaultFractionDigits, numericCode));
+ return (instance != null ? instance : instances.get(currencyCode));
}
/**
diff --git a/jdk/src/share/classes/java/util/CurrencyData.properties b/jdk/src/share/classes/java/util/CurrencyData.properties
index b943993..8cd8831 100644
--- a/jdk/src/share/classes/java/util/CurrencyData.properties
+++ b/jdk/src/share/classes/java/util/CurrencyData.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -26,10 +26,9 @@
formatVersion=1
# Version of the currency code information in this class.
-# It is a serial number that accompanies with each amendment, such as
-# 'MAxxx.doc'
+# It is a serial number that accompanies with each amendment.
-dataVersion=151
+dataVersion=153
# List of all valid ISO 4217 currency codes.
# To ensure compatibility, do not remove codes.
@@ -49,7 +48,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
+ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\
UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
@@ -463,6 +462,8 @@ VC=XCD
WS=WST
# SAN MARINO
SM=EUR
+# SOUTH SUDAN
+SS=SSP
# SAO TOME AND PRINCIPE
ST=STD
# SAUDI ARABIA
@@ -583,7 +584,7 @@ ZW=ZWL
minor0=\
ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\
GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\
- TPE-TRL-VUV-XAF-XOF-XPF
+ TPE-TRL-VND-VUV-XAF-XOF-XPF
minor1=
minor3=\
BHD-IQD-JOD-KWD-LYD-OMR-TND
diff --git a/jdk/src/share/classes/java/util/EnumMap.java b/jdk/src/share/classes/java/util/EnumMap.java
index 6d1202c..a7c248f 100644
--- a/jdk/src/share/classes/java/util/EnumMap.java
+++ b/jdk/src/share/classes/java/util/EnumMap.java
@@ -106,7 +106,15 @@ public class EnumMap<K extends Enum<K>, V> extends AbstractMap<K, V>
/**
* Distinguished non-null value for representing null values.
*/
- private static final Object NULL = new Integer(0);
+ private static final Object NULL = new Object() {
+ public int hashCode() {
+ return 0;
+ }
+
+ public String toString() {
+ return "java.util.EnumMap.NULL";
+ }
+ };
private Object maskNull(Object value) {
return (value == null ? NULL : value);
diff --git a/jdk/src/share/classes/java/util/LocaleISOData.java b/jdk/src/share/classes/java/util/LocaleISOData.java
index 6330c34..170fef6 100644
--- a/jdk/src/share/classes/java/util/LocaleISOData.java
+++ b/jdk/src/share/classes/java/util/LocaleISOData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -433,6 +433,7 @@ class LocaleISOData {
+ "SN" + "SEN" // Senegal, Republic of
+ "SO" + "SOM" // Somalia, Somali Republic
+ "SR" + "SUR" // Suriname, Republic of
+ + "SS" + "SSD" // South Sudan
+ "ST" + "STP" // Sao Tome and Principe, Democratic Republic of
+ "SV" + "SLV" // El Salvador, Republic of
+ "SX" + "SXM" // Sint Maarten (Dutch part)
diff --git a/jdk/src/share/classes/java/util/Properties.java b/jdk/src/share/classes/java/util/Properties.java
index 50eb436..8446077 100644
--- a/jdk/src/share/classes/java/util/Properties.java
+++ b/jdk/src/share/classes/java/util/Properties.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,8 +39,8 @@ import java.lang.module.RequireOptionalModule;
import java.lang.module.ModuleNotPresentException;
/**
- * The <code>Properties</code> class represents a persistent set of
- * properties. The <code>Properties</code> can be saved to a stream
+ * The {@code Properties} class represents a persistent set of
+ * properties. The {@code Properties} can be saved to a stream
* or loaded from a stream. Each key and its corresponding value in
* the property list is a string.
* <p>
@@ -48,17 +48,17 @@ import java.lang.module.ModuleNotPresentException;
* "defaults"; this second property list is searched if
* the property key is not found in the original property list.
* <p>
- * Because <code>Properties</code> inherits from <code>Hashtable</code>, the
- * <code>put</code> and <code>putAll</code> methods can be applied to a
- * <code>Properties</code> object. Their use is strongly discouraged as they
+ * Because {@code Properties} inherits from {@code Hashtable}, the
+ * {@code put} and {@code putAll} methods can be applied to a
+ * {@code Properties} object. Their use is strongly discouraged as they
* allow the caller to insert entries whose keys or values are not
- * <code>Strings</code>. The <code>setProperty</code> method should be used
- * instead. If the <code>store</code> or <code>save</code> method is called
- * on a "compromised" <code>Properties</code> object that contains a
- * non-<code>String</code> key or value, the call will fail. Similarly,
- * the call to the <code>propertyNames</code> or <code>list</code> method
- * will fail if it is called on a "compromised" <code>Properties</code>
- * object that contains a non-<code>String</code> key.
+ * {@code Strings}. The {@code setProperty} method should be used
+ * instead. If the {@code store} or {@code save} method is called
+ * on a "compromised" {@code Properties} object that contains a
+ * non-{@code String} key or value, the call will fail. Similarly,
+ * the call to the {@code propertyNames} or {@code list} method
+ * will fail if it is called on a "compromised" {@code Properties}
+ * object that contains a non-{@code String} key.
*
* <p>
* The {@link #load(java.io.Reader) load(Reader)} <tt>/</tt>
@@ -148,15 +148,15 @@ class Properties extends Hashtable<Object,Object> {
}
/**
- * Calls the <tt>Hashtable</tt> method <code>put</code>. Provided for
+ * Calls the <tt>Hashtable</tt> method {@code put}. Provided for
* parallelism with the <tt>getProperty</tt> method. Enforces use of
* strings for property keys and values. The value returned is the
- * result of the <tt>Hashtable</tt> call to <code>put</code>.
+ * result of the <tt>Hashtable</tt> call to {@code put}.
*
* @param key the key to be placed into this property list.
* @param value the value corresponding to <tt>key</tt>.
* @return the previous value of the specified key in this property
- * list, or <code>null</code> if it did not have one.
+ * list, or {@code null} if it did not have one.
* @see #getProperty
* @since 1.2
*/
@@ -173,13 +173,13 @@ class Properties extends Hashtable<Object,Object> {
* kinds of line, <i>natural lines</i> and <i>logical lines</i>.
* A natural line is defined as a line of
* characters that is terminated either by a set of line terminator
- * characters (<code>\n</code> or <code>\r</code> or <code>\r\n</code>)
+ * characters ({@code \n} or {@code \r} or {@code \r\n})
* or by the end of the stream. A natural line may be either a blank line,
* a comment line, or hold all or some of a key-element pair. A logical
* line holds all the data of a key-element pair, which may be spread
* out across several adjacent natural lines by escaping
* the line terminator sequence with a backslash character
- * <code>\</code>. Note that a comment line cannot be extended
+ * {@code \}. Note that a comment line cannot be extended
* in this manner; every natural line that is a comment must have
* its own comment indicator, as described below. Lines are read from
* input until the end of the stream is reached.
@@ -187,13 +187,13 @@ class Properties extends Hashtable<Object,Object> {
* <p>
* A natural line that contains only white space characters is
* considered blank and is ignored. A comment line has an ASCII
- * <code>'#'</code> or <code>'!'</code> as its first non-white
+ * {@code '#'} or {@code '!'} as its first non-white
* space character; comment lines are also ignored and do not
* encode key-element information. In addition to line
* terminators, this format considers the characters space
- * (<code>' '</code>, <code>'\u0020'</code>), tab
- * (<code>'\t'</code>, <code>'\u0009'</code>), and form feed
- * (<code>'\f'</code>, <code>'\u000C'</code>) to be white
+ * ({@code ' '}, {@code '\u005Cu0020'}), tab
+ * ({@code '\t'}, {@code '\u005Cu0009'}), and form feed
+ * ({@code '\f'}, {@code '\u005Cu000C'}) to be white
* space.
*
* <p>
@@ -217,31 +217,31 @@ class Properties extends Hashtable<Object,Object> {
* <p>
* The key contains all of the characters in the line starting
* with the first non-white space character and up to, but not
- * including, the first unescaped <code>'='</code>,
- * <code>':'</code>, or white space character other than a line
+ * including, the first unescaped {@code '='},
+ * {@code ':'}, or white space character other than a line
* terminator. All of these key termination characters may be
* included in the key by escaping them with a preceding backslash
* character; for example,<p>
*
- * <code>\:\=</code><p>
+ * {@code \:\=}<p>
*
- * would be the two-character key <code>":="</code>. Line
- * terminator characters can be included using <code>\r</code> and
- * <code>\n</code> escape sequences. Any white space after the
+ * would be the two-character key {@code ":="}. Line
+ * terminator characters can be included using {@code \r} and
+ * {@code \n} escape sequences. Any white space after the
* key is skipped; if the first non-white space character after
- * the key is <code>'='</code> or <code>':'</code>, then it is
+ * the key is {@code '='} or {@code ':'}, then it is
* ignored and any white space characters after it are also
* skipped. All remaining characters on the line become part of
* the associated element string; if there are no remaining
* characters, the element is the empty string
- * <code>""</code>. Once the raw character sequences
+ * {@code ""}. Once the raw character sequences
* constituting the key and element are identified, escape
* processing is performed as described above.
*
* <p>
* As an example, each of the following three lines specifies the key
- * <code>"Truth"</code> and the associated element value
- * <code>"Beauty"</code>:
+ * {@code "Truth"} and the associated element value
+ * {@code "Beauty"}:
* <p>
* <pre>
* Truth = Beauty
@@ -256,11 +256,11 @@ class Properties extends Hashtable<Object,Object> {
* cantaloupe, watermelon, \
* kiwi, mango
* </pre>
- * The key is <code>"fruits"</code> and the associated element is:
+ * The key is {@code "fruits"} and the associated element is:
* <p>
* <pre>"apple, banana, pear, cantaloupe, watermelon, kiwi, mango"</pre>
- * Note that a space appears before each <code>\</code> so that a space
- * will appear after each comma in the final result; the <code>\</code>,
+ * Note that a space appears before each {@code \} so that a space
+ * will appear after each comma in the final result; the {@code \},
* line terminator, and leading white space on the continuation line are
* merely discarded and are <i>not</i> replaced by one or more other
* characters.
@@ -269,8 +269,8 @@ class Properties extends Hashtable<Object,Object> {
* <p>
* <pre>cheeses
* </pre>
- * specifies that the key is <code>"cheeses"</code> and the associated
- * element is the empty string <code>""</code>.<p>
+ * specifies that the key is {@code "cheeses"} and the associated
+ * element is the empty string {@code ""}.<p>
* <p>
*
* <a name="unicodeescapes"></a>
@@ -285,17 +285,17 @@ class Properties extends Hashtable<Object,Object> {
* <ul>
* <li> Octal escapes are not recognized.
*
- * <li> The character sequence <code>\b</code> does <i>not</i>
+ * <li> The character sequence {@code \b} does <i>not</i>
* represent a backspace character.
*
* <li> The method does not treat a backslash character,
- * <code>\</code>, before a non-valid escape character as an
+ * {@code \}, before a non-valid escape character as an
* error; the backslash is silently dropped. For example, in a
- * Java string the sequence <code>"\z"</code> would cause a
+ * Java string the sequence {@code "\z"} would cause a
* compile time error. In contrast, this method silently drops
* the backslash. Therefore, this method treats the two character
- * sequence <code>"\b"</code> as equivalent to the single
- * character <code>'b'</code>.
+ * sequence {@code "\b"} as equivalent to the single
+ * character {@code 'b'}.
*
* <li> Escapes are not necessary for single and double quotes;
* however, by the rule above, single and double quote characters
@@ -691,20 +691,20 @@ class Properties extends Hashtable<Object,Object> {
}
/**
- * Calls the <code>store(OutputStream out, String comments)</code> method
+ * Calls the {@code store(OutputStream out, String comments)} method
* and suppresses IOExceptions that were thrown.
*
* @deprecated This method does not throw an IOException if an I/O error
* occurs while saving the property list. The preferred way to save a
- * properties list is via the <code>store(OutputStream out,
- * String comments)</code> method or the
- * <code>storeToXML(OutputStream os, String comment)</code> method.
+ * properties list is via the {@code store(OutputStream out,
+ * String comments)} method or the
+ * {@code storeToXML(OutputStream os, String comment)} method.
*
* @param out an output stream.
* @param comments a description of the property list.
- * @exception ClassCastException if this <code>Properties</code> object
+ * @exception ClassCastException if this {@code Properties} object
* contains any keys or values that are not
- * <code>Strings</code>.
+ * {@code Strings}.
*/
@Deprecated
public void save(OutputStream out, String comments) {
@@ -716,37 +716,37 @@ class Properties extends Hashtable<Object,Object> {
/**
* Writes this property list (key and element pairs) in this
- * <code>Properties</code> table to the output character stream in a
+ * {@code Properties} table to the output character stream in a
* format suitable for using the {@link #load(java.io.Reader) load(Reader)}
* method.
* <p>
- * Properties from the defaults table of this <code>Properties</code>
+ * Properties from the defaults table of this {@code Properties}
* table (if any) are <i>not</i> written out by this method.
* <p>
- * If the comments argument is not null, then an ASCII <code>#</code>
+ * If the comments argument is not null, then an ASCII {@code #}
* character, the comments string, and a line separator are first written
- * to the output stream. Thus, the <code>comments</code> can serve as an
+ * to the output stream. Thus, the {@code comments} can serve as an
* identifying comment. Any one of a line feed ('\n'), a carriage
* return ('\r'), or a carriage return followed immediately by a line feed
- * in comments is replaced by a line separator generated by the <code>Writer</code>
- * and if the next character in comments is not character <code>#</code> or
- * character <code>!</code> then an ASCII <code>#</code> is written out
+ * in comments is replaced by a line separator generated by the {@code Writer}
+ * and if the next character in comments is not character {@code #} or
+ * character {@code !} then an ASCII {@code #} is written out
* after that line separator.
* <p>
* Next, a comment line is always written, consisting of an ASCII
- * <code>#</code> character, the current date and time (as if produced
- * by the <code>toString</code> method of <code>Date</code> for the
- * current time), and a line separator as generated by the <code>Writer</code>.
+ * {@code #} character, the current date and time (as if produced
+ * by the {@code toString} method of {@code Date} for the
+ * current time), and a line separator as generated by the {@code Writer}.
* <p>
- * Then every entry in this <code>Properties</code> table is
+ * Then every entry in this {@code Properties} table is
* written out, one per line. For each entry the key string is
- * written, then an ASCII <code>=</code>, then the associated
+ * written, then an ASCII {@code =}, then the associated
* element string. For the key, all space characters are
- * written with a preceding <code>\</code> character. For the
+ * written with a preceding {@code \} character. For the
* element, leading space characters, but not embedded or trailing
- * space characters, are written with a preceding <code>\</code>
- * character. The key and element characters <code>#</code>,
- * <code>!</code>, <code>=</code>, and <code>:</code> are written
+ * space characters, are written with a preceding {@code \}
+ * character. The key and element characters {@code #},
+ * {@code !}, {@code =}, and {@code :} are written
* with a preceding backslash to ensure that they are properly loaded.
* <p>
* After the entries have been written, the output stream is flushed.
@@ -757,9 +757,9 @@ class Properties extends Hashtable<Object,Object> {
* @param comments a description of the property list.
* @exception IOException if writing this property list to the specified
* output stream throws an <tt>IOException</tt>.
- * @exception ClassCastException if this <code>Properties</code> object
- * contains any keys or values that are not <code>Strings</code>.
- * @exception NullPointerException if <code>writer</code> is null.
+ * @exception ClassCastException if this {@code Properties} object
+ * contains any keys or values that are not {@code Strings}.
+ * @exception NullPointerException if {@code writer} is null.
* @since 1.6
*/
public void store(Writer writer, String comments)
@@ -773,11 +773,11 @@ class Properties extends Hashtable<Object,Object> {
/**
* Writes this property list (key and element pairs) in this
- * <code>Properties</code> table to the output stream in a format suitable
- * for loading into a <code>Properties</code> table using the
+ * {@code Properties} table to the output stream in a format suitable
+ * for loading into a {@code Properties} table using the
* {@link #load(InputStream) load(InputStream)} method.
* <p>
- * Properties from the defaults table of this <code>Properties</code>
+ * Properties from the defaults table of this {@code Properties}
* table (if any) are <i>not</i> written out by this method.
* <p>
* This method outputs the comments, properties keys and values in
@@ -788,12 +788,12 @@ class Properties extends Hashtable<Object,Object> {
* <li>The stream is written using the ISO 8859-1 character encoding.
*
* <li>Characters not in Latin-1 in the comments are written as
- * <code>\u</code><i>xxxx</i> for their appropriate unicode
+ * {@code \u005Cu}<i>xxxx</i> for their appropriate unicode
* hexadecimal value <i>xxxx</i>.
*
- * <li>Characters less than <code>\u0020</code> and characters greater
- * than <code>\u007E</code> in property keys or values are written
- * as <code>\u</code><i>xxxx</i> for the appropriate hexadecimal
+ * <li>Characters less than {@code \u005Cu0020} and characters greater
+ * than {@code \u005Cu007E} in property keys or values are written
+ * as {@code \u005Cu}<i>xxxx</i> for the appropriate hexadecimal
* value <i>xxxx</i>.
* </ul>
* <p>
@@ -804,9 +804,9 @@ class Properties extends Hashtable<Object,Object> {
* @param comments a description of the property list.
* @exception IOException if writing this property list to the specified
* output stream throws an <tt>IOException</tt>.
- * @exception ClassCastException if this <code>Properties</code> object
- * contains any keys or values that are not <code>Strings</code>.
- * @exception NullPointerException if <code>out</code> is null.
+ * @exception ClassCastException if this {@code Properties} object
+ * contains any keys or values that are not {@code Strings}.
+ * @exception NullPointerException if {@code out} is null.
* @since 1.2
*/
public void store(OutputStream out, String comments)
@@ -859,7 +859,7 @@ class Properties extends Hashtable<Object,Object> {
* results in an <tt>IOException</tt>.
* @throws InvalidPropertiesFormatException Data on input stream does not
* constitute a valid XML document with the mandated document type.
- * @throws NullPointerException if <code>in</code> is null.
+ * @throws NullPointerException if {@code in} is null.
* @throws ModuleNotPresentException if XML module is not present.
* @see #storeToXML(OutputStream, String, String)
* @since 1.5
@@ -885,14 +885,14 @@ class Properties extends Hashtable<Object,Object> {
* <tt>props.storeToXML(os, comment, "UTF-8");</tt>.
*
* @param os the output stream on which to emit the XML document.
- * @param comment a description of the property list, or <code>null</code>
+ * @param comment a description of the property list, or {@code null}
* if no comment is desired.
* @throws IOException if writing to the specified output stream
* results in an <tt>IOException</tt>.
- * @throws NullPointerException if <code>os</code> is null.
- * @throws ClassCastException if this <code>Properties</code> object
+ * @throws NullPointerException if {@code os} is null.
+ * @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not
- * <code>Strings</code>.
+ * {@code Strings}.
* @throws ModuleNotPresentException if XML module is not present.
* @see #loadFromXML(InputStream)
* @since 1.5
@@ -917,13 +917,13 @@ class Properties extends Hashtable<Object,Object> {
* <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
* </pre>
*
- *<p>If the specified comment is <code>null</code> then no comment
+ *<p>If the specified comment is {@code null} then no comment
* will be stored in the document.
*
* <p>The specified stream remains open after this method returns.
*
* @param os the output stream on which to emit the XML document.
- * @param comment a description of the property list, or <code>null</code>
+ * @param comment a description of the property list, or {@code null}
* if no comment is desired.
* @param encoding the name of a supported
* <a href="../lang/package-summary.html#charenc">
@@ -931,11 +931,11 @@ class Properties extends Hashtable<Object,Object> {
*
* @throws IOException if writing to the specified output stream
* results in an <tt>IOException</tt>.
- * @throws NullPointerException if <code>os</code> is <code>null</code>,
- * or if <code>encoding</code> is <code>null</code>.
- * @throws ClassCastException if this <code>Properties</code> object
+ * @throws NullPointerException if {@code os} is {@code null},
+ * or if {@code encoding} is {@code null}.
+ * @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not
- * <code>Strings</code>.
+ * {@code Strings}.
* @throws ModuleNotPresentException if XML module is not present.
* @see #loadFromXML(InputStream)
* @since 1.5
@@ -955,7 +955,7 @@ class Properties extends Hashtable<Object,Object> {
* Searches for the property with the specified key in this property list.
* If the key is not found in this property list, the default property list,
* and its defaults, recursively, are then checked. The method returns
- * <code>null</code> if the property is not found.
+ * {@code null} if the property is not found.
*
* @param key the property key.
* @return the value in this property list with the specified key value.
diff --git a/jdk/src/share/classes/java/util/TimeZone.java b/jdk/src/share/classes/java/util/TimeZone.java
index 2da2de2..e9d6cef 100644
--- a/jdk/src/share/classes/java/util/TimeZone.java
+++ b/jdk/src/share/classes/java/util/TimeZone.java
@@ -43,6 +43,8 @@ import java.lang.ref.SoftReference;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.concurrent.ConcurrentHashMap;
+import sun.misc.SharedSecrets;
+import sun.misc.JavaAWTAccess;
import sun.security.action.GetPropertyAction;
import sun.util.TimeZoneNameUtility;
import sun.util.calendar.ZoneInfo;
@@ -615,7 +617,7 @@ abstract public class TimeZone implements Serializable, Cloneable {
* method doesn't create a clone.
*/
static TimeZone getDefaultRef() {
- TimeZone defaultZone = defaultZoneTL.get();
+ TimeZone defaultZone = getDefaultInAppContext();
if (defaultZone == null) {
defaultZone = defaultTimeZone;
if (defaultZone == null) {
@@ -706,10 +708,65 @@ abstract public class TimeZone implements Serializable, Cloneable {
if (hasPermission()) {
synchronized (TimeZone.class) {
defaultTimeZone = zone;
- defaultZoneTL.set(null);
+ setDefaultInAppContext(null);
}
} else {
- defaultZoneTL.set(zone);
+ setDefaultInAppContext(zone);
+ }
+ }
+
+ /**
+ * Returns the default TimeZone in an AppContext if any AppContext
+ * has ever used. null is returned if any AppContext hasn't been
+ * used or if the AppContext doesn't have the default TimeZone.
+ */
+ private synchronized static TimeZone getDefaultInAppContext() {
+ // JavaAWTAccess provides access implementation-private methods without using reflection.
+ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
+
+ // Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
+ // been loaded. If so, it implies that AWTSecurityManager is not our
+ // SecurityManager and we can use a local static variable.
+ // This works around a build time issue.
+ if (javaAWTAccess == null) {
+ return mainAppContextDefault;
+ } else {
+ if (!javaAWTAccess.isDisposed()) {
+ TimeZone tz = (TimeZone)
+ javaAWTAccess.get(TimeZone.class);
+ if (tz == null && javaAWTAccess.isMainAppContext()) {
+ return mainAppContextDefault;
+ } else {
+ return tz;
+ }
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Sets the default TimeZone in the AppContext to the given
+ * tz. null is handled special: do nothing if any AppContext
+ * hasn't been used, remove the default TimeZone in the
+ * AppContext otherwise.
+ */
+ private synchronized static void setDefaultInAppContext(TimeZone tz) {
+ // JavaAWTAccess provides access implementation-private methods without using reflection.
+ JavaAWTAccess javaAWTAccess = SharedSecrets.getJavaAWTAccess();
+
+ // Note that javaAWTAccess may be null if sun.awt.AppContext class hasn't
+ // been loaded. If so, it implies that AWTSecurityManager is not our
+ // SecurityManager and we can use a local static variable.
+ // This works around a build time issue.
+ if (javaAWTAccess == null) {
+ mainAppContextDefault = tz;
+ } else {
+ if (!javaAWTAccess.isDisposed()) {
+ javaAWTAccess.put(TimeZone.class, tz);
+ if (javaAWTAccess.isMainAppContext()) {
+ mainAppContextDefault = null;
+ }
+ }
}
}
@@ -760,12 +817,13 @@ abstract public class TimeZone implements Serializable, Cloneable {
*/
private String ID;
private static volatile TimeZone defaultTimeZone;
- private static final InheritableThreadLocal<TimeZone> defaultZoneTL
- = new InheritableThreadLocal<TimeZone>();
static final String GMT_ID = "GMT";
private static final int GMT_ID_LENGTH = 3;
+ // a static TimeZone we can reference if no AppContext is in place
+ private static TimeZone mainAppContextDefault;
+
/**
* Parses a custom time zone identifier and returns a corresponding zone.
* This method doesn't support the RFC 822 time zone format. (e.g., +hhmm)
diff --git a/jdk/src/share/classes/java/util/concurrent/FutureTask.java b/jdk/src/share/classes/java/util/concurrent/FutureTask.java
index 45c91d0..e9b6e05 100644
--- a/jdk/src/share/classes/java/util/concurrent/FutureTask.java
+++ b/jdk/src/share/classes/java/util/concurrent/FutureTask.java
@@ -34,51 +34,111 @@
*/
package java.util.concurrent;
-import java.util.concurrent.locks.*;
+import java.util.concurrent.locks.LockSupport;
/**
* A cancellable asynchronous computation. This class provides a base
* implementation of {@link Future}, with methods to start and cancel
* a computation, query to see if the computation is complete, and
* retrieve the result of the computation. The result can only be
- * retrieved when the computation has completed; the <tt>get</tt>
- * method will block if the computation has not yet completed. Once
+ * retrieved when the computation has completed; the {@code get}
+ * methods will block if the computation has not yet completed. Once
* the computation has completed, the computation cannot be restarted
- * or cancelled.
+ * or cancelled (unless the computation is invoked using
+ * {@link #runAndReset}).
*
- * <p>A <tt>FutureTask</tt> can be used to wrap a {@link Callable} or
- * {@link java.lang.Runnable} object. Because <tt>FutureTask</tt>
- * implements <tt>Runnable</tt>, a <tt>FutureTask</tt> can be
- * submitted to an {@link Executor} for execution.
+ * <p>A {@code FutureTask} can be used to wrap a {@link Callable} or
+ * {@link Runnable} object. Because {@code FutureTask} implements
+ * {@code Runnable}, a {@code FutureTask} can be submitted to an
+ * {@link Executor} for execution.
*
* <p>In addition to serving as a standalone class, this class provides
- * <tt>protected</tt> functionality that may be useful when creating
+ * {@code protected} functionality that may be useful when creating
* customized task classes.
*
* @since 1.5
* @author Doug Lea
- * @param <V> The result type returned by this FutureTask's <tt>get</tt> method
+ * @param <V> The result type returned by this FutureTask's {@code get} methods
*/
public class FutureTask<V> implements RunnableFuture<V> {
- /** Synchronization control for FutureTask */
- private final Sync sync;
+ /*
+ * Revision notes: This differs from previous versions of this
+ * class that relied on AbstractQueuedSynchronizer, mainly to
+ * avoid surprising users about retaining interrupt status during
+ * cancellation races. Sync control in the current design relies
+ * on a "state" field updated via CAS to track completion, along
+ * with a simple Treiber stack to hold waiting threads.
+ *
+ * Style note: As usual, we bypass overhead of using
+ * AtomicXFieldUpdaters and instead directly use Unsafe intrinsics.
+ */
+
+ /**
+ * The run state of this task, initially NEW. The run state
+ * transitions to a terminal state only in methods set,
+ * setException, and cancel. During completion, state may take on
+ * transient values of COMPLETING (while outcome is being set) or
+ * INTERRUPTING (only while interrupting the runner to satisfy a
+ * cancel(true)). Transitions from these intermediate to final
+ * states use cheaper ordered/lazy writes because values are unique
+ * and cannot be further modified.
+ *
+ * Possible state transitions:
+ * NEW -> COMPLETING -> NORMAL
+ * NEW -> COMPLETING -> EXCEPTIONAL
+ * NEW -> CANCELLED
+ * NEW -> INTERRUPTING -> INTERRUPTED
+ */
+ private volatile int state;
+ private static final int NEW = 0;
+ private static final int COMPLETING = 1;
+ private static final int NORMAL = 2;
+ private static final int EXCEPTIONAL = 3;
+ private static final int CANCELLED = 4;
+ private static final int INTERRUPTING = 5;
+ private static final int INTERRUPTED = 6;
+
+ /** The underlying callable; nulled out after running */
+ private Callable<V> callable;
+ /** The result to return or exception to throw from get() */
+ private Object outcome; // non-volatile, protected by state reads/writes
+ /** The thread running the callable; CASed during run() */
+ private volatile Thread runner;
+ /** Treiber stack of waiting threads */
+ private volatile WaitNode waiters;
+
+ /**
+ * Returns result or throws exception for completed task.
+ *
+ * @param s completed state value
+ */
+ @SuppressWarnings("unchecked")
+ private V report(int s) throws ExecutionException {
+ Object x = outcome;
+ if (s == NORMAL)
+ return (V)x;
+ if (s >= CANCELLED)
+ throw new CancellationException();
+ throw new ExecutionException((Throwable)x);
+ }
/**
- * Creates a <tt>FutureTask</tt> that will, upon running, execute the
- * given <tt>Callable</tt>.
+ * Creates a {@code FutureTask} that will, upon running, execute the
+ * given {@code Callable}.
*
* @param callable the callable task
- * @throws NullPointerException if callable is null
+ * @throws NullPointerException if the callable is null
*/
public FutureTask(Callable<V> callable) {
if (callable == null)
throw new NullPointerException();
- sync = new Sync(callable);
+ this.callable = callable;
+ this.state = NEW; // ensure visibility of callable
}
/**
- * Creates a <tt>FutureTask</tt> that will, upon running, execute the
- * given <tt>Runnable</tt>, and arrange that <tt>get</tt> will return the
+ * Creates a {@code FutureTask} that will, upon running, execute the
+ * given {@code Runnable}, and arrange that {@code get} will return the
* given result on successful completion.
*
* @param runnable the runnable task
@@ -86,29 +146,46 @@ public class FutureTask<V> implements RunnableFuture<V> {
* you don't need a particular result, consider using
* constructions of the form:
* {@code Future<?> f = new FutureTask<Void>(runnable, null)}
- * @throws NullPointerException if runnable is null
+ * @throws NullPointerException if the runnable is null
*/
public FutureTask(Runnable runnable, V result) {
- sync = new Sync(Executors.callable(runnable, result));
+ this.callable = Executors.callable(runnable, result);
+ this.state = NEW; // ensure visibility of callable
}
public boolean isCancelled() {
- return sync.innerIsCancelled();
+ return state >= CANCELLED;
}
public boolean isDone() {
- return sync.innerIsDone();
+ return state != NEW;
}
public boolean cancel(boolean mayInterruptIfRunning) {
- return sync.innerCancel(mayInterruptIfRunning);
+ if (state != NEW)
+ return false;
+ if (mayInterruptIfRunning) {
+ if (!UNSAFE.compareAndSwapInt(this, stateOffset, NEW, INTERRUPTING))
+ return false;
+ Thread t = runner;
+ if (t != null)
+ t.interrupt();
+ UNSAFE.putOrderedInt(this, stateOffset, INTERRUPTED); // final state
+ }
+ else if (!UNSAFE.compareAndSwapInt(this, stateOffset, NEW, CANCELLED))
+ return false;
+ finishCompletion();
+ return true;
}
/**
* @throws CancellationException {@inheritDoc}
*/
public V get() throws InterruptedException, ExecutionException {
- return sync.innerGet();
+ int s = state;
+ if (s <= COMPLETING)
+ s = awaitDone(false, 0L);
+ return report(s);
}
/**
@@ -116,12 +193,18 @@ public class FutureTask<V> implements RunnableFuture<V> {
*/
public V get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
- return sync.innerGet(unit.toNanos(timeout));
+ if (unit == null)
+ throw new NullPointerException();
+ int s = state;
+ if (s <= COMPLETING &&
+ (s = awaitDone(true, unit.toNanos(timeout))) <= COMPLETING)
+ throw new TimeoutException();
+ return report(s);
}
/**
* Protected method invoked when this task transitions to state
- * <tt>isDone</tt> (whether normally or via cancellation). The
+ * {@code isDone} (whether normally or via cancellation). The
* default implementation does nothing. Subclasses may override
* this method to invoke completion callbacks or perform
* bookkeeping. Note that you can query status inside the
@@ -131,230 +214,269 @@ public class FutureTask<V> implements RunnableFuture<V> {
protected void done() { }
/**
- * Sets the result of this Future to the given value unless
+ * Sets the result of this future to the given value unless
* this future has already been set or has been cancelled.
- * This method is invoked internally by the <tt>run</tt> method
+ *
+ * <p>This method is invoked internally by the {@link #run} method
* upon successful completion of the computation.
+ *
* @param v the value
*/
protected void set(V v) {
- sync.innerSet(v);
+ if (UNSAFE.compareAndSwapInt(this, stateOffset, NEW, COMPLETING)) {
+ outcome = v;
+ UNSAFE.putOrderedInt(this, stateOffset, NORMAL); // final state
+ finishCompletion();
+ }
}
/**
- * Causes this future to report an <tt>ExecutionException</tt>
- * with the given throwable as its cause, unless this Future has
+ * Causes this future to report an {@link ExecutionException}
+ * with the given throwable as its cause, unless this future has
* already been set or has been cancelled.
- * This method is invoked internally by the <tt>run</tt> method
+ *
+ * <p>This method is invoked internally by the {@link #run} method
* upon failure of the computation.
+ *
* @param t the cause of failure
*/
protected void setException(Throwable t) {
- sync.innerSetException(t);
+ if (UNSAFE.compareAndSwapInt(this, stateOffset, NEW, COMPLETING)) {
+ outcome = t;
+ UNSAFE.putOrderedInt(this, stateOffset, EXCEPTIONAL); // final state
+ finishCompletion();
+ }
}
- // The following (duplicated) doc comment can be removed once
- //
- // 6270645: Javadoc comments should be inherited from most derived
- // superinterface or superclass
- // is fixed.
- /**
- * Sets this Future to the result of its computation
- * unless it has been cancelled.
- */
public void run() {
- sync.innerRun();
+ if (state != NEW ||
+ !UNSAFE.compareAndSwapObject(this, runnerOffset,
+ null, Thread.currentThread()))
+ return;
+ try {
+ Callable<V> c = callable;
+ if (c != null && state == NEW) {
+ V result;
+ boolean ran;
+ try {
+ result = c.call();
+ ran = true;
+ } catch (Throwable ex) {
+ result = null;
+ ran = false;
+ setException(ex);
+ }
+ if (ran)
+ set(result);
+ }
+ } finally {
+ // runner must be non-null until state is settled to
+ // prevent concurrent calls to run()
+ runner = null;
+ // state must be re-read after nulling runner to prevent
+ // leaked interrupts
+ int s = state;
+ if (s >= INTERRUPTING)
+ handlePossibleCancellationInterrupt(s);
+ }
}
/**
* Executes the computation without setting its result, and then
- * resets this Future to initial state, failing to do so if the
+ * resets this future to initial state, failing to do so if the
* computation encounters an exception or is cancelled. This is
* designed for use with tasks that intrinsically execute more
* than once.
+ *
* @return true if successfully run and reset
*/
protected boolean runAndReset() {
- return sync.innerRunAndReset();
+ if (state != NEW ||
+ !UNSAFE.compareAndSwapObject(this, runnerOffset,
+ null, Thread.currentThread()))
+ return false;
+ boolean ran = false;
+ int s = state;
+ try {
+ Callable<V> c = callable;
+ if (c != null && s == NEW) {
+ try {
+ c.call(); // don't set result
+ ran = true;
+ } catch (Throwable ex) {
+ setException(ex);
+ }
+ }
+ } finally {
+ // runner must be non-null until state is settled to
+ // prevent concurrent calls to run()
+ runner = null;
+ // state must be re-read after nulling runner to prevent
+ // leaked interrupts
+ s = state;
+ if (s >= INTERRUPTING)
+ handlePossibleCancellationInterrupt(s);
+ }
+ return ran && s == NEW;
}
/**
- * Synchronization control for FutureTask. Note that this must be
- * a non-static inner class in order to invoke the protected
- * <tt>done</tt> method. For clarity, all inner class support
- * methods are same as outer, prefixed with "inner".
- *
- * Uses AQS sync state to represent run status
+ * Ensures that any interrupt from a possible cancel(true) is only
+ * delivered to a task while in run or runAndReset.
*/
- private final class Sync extends AbstractQueuedSynchronizer {
- private static final long serialVersionUID = -7828117401763700385L;
-
- /** State value representing that task is ready to run */
- private static final int READY = 0;
- /** State value representing that task is running */
- private static final int RUNNING = 1;
- /** State value representing that task ran */
- private static final int RAN = 2;
- /** State value representing that task was cancelled */
- private static final int CANCELLED = 4;
-
- /** The underlying callable */
- private final Callable<V> callable;
- /** The result to return from get() */
- private V result;
- /** The exception to throw from get() */
- private Throwable exception;
-
- /**
- * The thread running task. When nulled after set/cancel, this
- * indicates that the results are accessible. Must be
- * volatile, to ensure visibility upon completion.
- */
- private volatile Thread runner;
-
- Sync(Callable<V> callable) {
- this.callable = callable;
- }
-
- private boolean ranOrCancelled(int state) {
- return (state & (RAN | CANCELLED)) != 0;
- }
-
- /**
- * Implements AQS base acquire to succeed if ran or cancelled
- */
- protected int tryAcquireShared(int ignore) {
- return innerIsDone() ? 1 : -1;
- }
-
- /**
- * Implements AQS base release to always signal after setting
- * final done status by nulling runner thread.
- */
- protected boolean tryReleaseShared(int ignore) {
- runner = null;
- return true;
- }
-
- boolean innerIsCancelled() {
- return getState() == CANCELLED;
- }
-
- boolean innerIsDone() {
- return ranOrCancelled(getState()) && runner == null;
- }
-
- V innerGet() throws InterruptedException, ExecutionException {
- acquireSharedInterruptibly(0);
- if (getState() == CANCELLED)
- throw new CancellationException();
- if (exception != null)
- throw new ExecutionException(exception);
- return result;
- }
+ private void handlePossibleCancellationInterrupt(int s) {
+ // It is possible for our interrupter to stall before getting a
+ // chance to interrupt us. Let's spin-wait patiently.
+ if (s == INTERRUPTING)
+ while (state == INTERRUPTING)
+ Thread.yield(); // wait out pending interrupt
+
+ // assert state == INTERRUPTED;
+
+ // We want to clear any interrupt we may have received from
+ // cancel(true). However, it is permissible to use interrupts
+ // as an independent mechanism for a task to communicate with
+ // its caller, and there is no way to clear only the
+ // cancellation interrupt.
+ //
+ // Thread.interrupted();
+ }
- V innerGet(long nanosTimeout) throws InterruptedException, ExecutionException, TimeoutException {
- if (!tryAcquireSharedNanos(0, nanosTimeout))
- throw new TimeoutException();
- if (getState() == CANCELLED)
- throw new CancellationException();
- if (exception != null)
- throw new ExecutionException(exception);
- return result;
- }
+ /**
+ * Simple linked list nodes to record waiting threads in a Treiber
+ * stack. See other classes such as Phaser and SynchronousQueue
+ * for more detailed explanation.
+ */
+ static final class WaitNode {
+ volatile Thread thread;
+ volatile WaitNode next;
+ WaitNode() { thread = Thread.currentThread(); }
+ }
- void innerSet(V v) {
- for (;;) {
- int s = getState();
- if (s == RAN)
- return;
- if (s == CANCELLED) {
- // aggressively release to set runner to null,
- // in case we are racing with a cancel request
- // that will try to interrupt runner
- releaseShared(0);
- return;
- }
- if (compareAndSetState(s, RAN)) {
- result = v;
- releaseShared(0);
- done();
- return;
+ /**
+ * Removes and signals all waiting threads, invokes done(), and
+ * nulls out callable.
+ */
+ private void finishCompletion() {
+ // assert state > COMPLETING;
+ for (WaitNode q; (q = waiters) != null;) {
+ if (UNSAFE.compareAndSwapObject(this, waitersOffset, q, null)) {
+ for (;;) {
+ Thread t = q.thread;
+ if (t != null) {
+ q.thread = null;
+ LockSupport.unpark(t);
+ }
+ WaitNode next = q.next;
+ if (next == null)
+ break;
+ q.next = null; // unlink to help gc
+ q = next;
}
+ break;
}
}
- void innerSetException(Throwable t) {
- for (;;) {
- int s = getState();
- if (s == RAN)
- return;
- if (s == CANCELLED) {
- // aggressively release to set runner to null,
- // in case we are racing with a cancel request
- // that will try to interrupt runner
- releaseShared(0);
- return;
- }
- if (compareAndSetState(s, RAN)) {
- exception = t;
- releaseShared(0);
- done();
- return;
- }
+ done();
+
+ callable = null; // to reduce footprint
+ }
+
+ /**
+ * Awaits completion or aborts on interrupt or timeout.
+ *
+ * @param timed true if use timed waits
+ * @param nanos time to wait, if timed
+ * @return state upon completion
+ */
+ private int awaitDone(boolean timed, long nanos)
+ throws InterruptedException {
+ final long deadline = timed ? System.nanoTime() + nanos : 0L;
+ WaitNode q = null;
+ boolean queued = false;
+ for (;;) {
+ if (Thread.interrupted()) {
+ removeWaiter(q);
+ throw new InterruptedException();
}
- }
- boolean innerCancel(boolean mayInterruptIfRunning) {
- for (;;) {
- int s = getState();
- if (ranOrCancelled(s))
- return false;
- if (compareAndSetState(s, CANCELLED))
- break;
+ int s = state;
+ if (s > COMPLETING) {
+ if (q != null)
+ q.thread = null;
+ return s;
}
- if (mayInterruptIfRunning) {
- Thread r = runner;
- if (r != null)
- r.interrupt();
+ else if (s == COMPLETING) // cannot time out yet
+ Thread.yield();
+ else if (q == null)
+ q = new WaitNode();
+ else if (!queued)
+ queued = UNSAFE.compareAndSwapObject(this, waitersOffset,
+ q.next = waiters, q);
+ else if (timed) {
+ nanos = deadline - System.nanoTime();
+ if (nanos <= 0L) {
+ removeWaiter(q);
+ return state;
+ }
+ LockSupport.parkNanos(this, nanos);
}
- releaseShared(0);
- done();
- return true;
+ else
+ LockSupport.park(this);
}
+ }
- void innerRun() {
- if (!compareAndSetState(READY, RUNNING))
- return;
-
- runner = Thread.currentThread();
- if (getState() == RUNNING) { // recheck after setting thread
- V result;
- try {
- result = callable.call();
- } catch (Throwable ex) {
- setException(ex);
- return;
+ /**
+ * Tries to unlink a timed-out or interrupted wait node to avoid
+ * accumulating garbage. Internal nodes are simply unspliced
+ * without CAS since it is harmless if they are traversed anyway
+ * by releasers. To avoid effects of unsplicing from already
+ * removed nodes, the list is retraversed in case of an apparent
+ * race. This is slow when there are a lot of nodes, but we don't
+ * expect lists to be long enough to outweigh higher-overhead
+ * schemes.
+ */
+ private void removeWaiter(WaitNode node) {
+ if (node != null) {
+ node.thread = null;
+ retry:
+ for (;;) { // restart on removeWaiter race
+ for (WaitNode pred = null, q = waiters, s; q != null; q = s) {
+ s = q.next;
+ if (q.thread != null)
+ pred = q;
+ else if (pred != null) {
+ pred.next = s;
+ if (pred.thread == null) // check for race
+ continue retry;
+ }
+ else if (!UNSAFE.compareAndSwapObject(this, waitersOffset,
+ q, s))
+ continue retry;
}
- set(result);
- } else {
- releaseShared(0); // cancel
+ break;
}
}
+ }
- boolean innerRunAndReset() {
- if (!compareAndSetState(READY, RUNNING))
- return false;
- try {
- runner = Thread.currentThread();
- if (getState() == RUNNING)
- callable.call(); // don't set result
- runner = null;
- return compareAndSetState(RUNNING, READY);
- } catch (Throwable ex) {
- setException(ex);
- return false;
- }
+ // Unsafe mechanics
+ private static final sun.misc.Unsafe UNSAFE;
+ private static final long stateOffset;
+ private static final long runnerOffset;
+ private static final long waitersOffset;
+ static {
+ try {
+ UNSAFE = sun.misc.Unsafe.getUnsafe();
+ Class<?> k = FutureTask.class;
+ stateOffset = UNSAFE.objectFieldOffset
+ (k.getDeclaredField("state"));
+ runnerOffset = UNSAFE.objectFieldOffset
+ (k.getDeclaredField("runner"));
+ waitersOffset = UNSAFE.objectFieldOffset
+ (k.getDeclaredField("waiters"));
+ } catch (Exception e) {
+ throw new Error(e);
}
}
+
}
diff --git a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
index d92bdb5..8459e7c 100644
--- a/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
+++ b/jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceArray.java
@@ -34,8 +34,10 @@
*/
package java.util.concurrent.atomic;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
import sun.misc.Unsafe;
-import java.util.*;
/**
* An array of object references in which elements may be updated
@@ -49,13 +51,23 @@ import java.util.*;
public class AtomicReferenceArray<E> implements java.io.Serializable {
private static final long serialVersionUID = -6209656149925076980L;
- private static final Unsafe unsafe = Unsafe.getUnsafe();
- private static final int base = unsafe.arrayBaseOffset(Object[].class);
+ private static final Unsafe unsafe;
+ private static final int base;
private static final int shift;
- private final Object[] array;
+ private static final long arrayFieldOffset;
+ private final Object[] array; // must have exact type Object[]
static {
- int scale = unsafe.arrayIndexScale(Object[].class);
+ int scale;
+ try {
+ unsafe = Unsafe.getUnsafe();
+ arrayFieldOffset = unsafe.objectFieldOffset
+ (AtomicReferenceArray.class.getDeclaredField("array"));
+ base = unsafe.arrayBaseOffset(Object[].class);
+ scale = unsafe.arrayIndexScale(Object[].class);
+ } catch (Exception e) {
+ throw new Error(e);
+ }
if ((scale & (scale - 1)) != 0)
throw new Error("data type scale not a power of two");
shift = 31 - Integer.numberOfLeadingZeros(scale);
@@ -91,7 +103,7 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
*/
public AtomicReferenceArray(E[] array) {
// Visibility guaranteed by final field guarantees
- this.array = array.clone();
+ this.array = Arrays.copyOf(array, array.length, Object[].class);
}
/**
@@ -197,7 +209,7 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
* @return the String representation of the current values of array
*/
public String toString() {
- int iMax = array.length - 1;
+ int iMax = array.length - 1;
if (iMax == -1)
return "[]";
@@ -211,4 +223,19 @@ public class AtomicReferenceArray<E> implements java.io.Serializable {
}
}
+ /**
+ * Reconstitutes the instance from a stream (that is, deserializes it).
+ * @param s the stream
+ */
+ private void readObject(java.io.ObjectInputStream s)
+ throws java.io.IOException, ClassNotFoundException {
+ // Note: This must be changed if any additional fields are defined
+ Object a = s.readFields().get("array", null);
+ if (a == null || !a.getClass().isArray())
+ throw new java.io.InvalidObjectException("Not array type");
+ if (a.getClass() != Object[].class)
+ a = Arrays.copyOf((Object[])a, Array.getLength(a), Object[].class);
+ unsafe.putObjectVolatile(this, arrayFieldOffset, a);
+ }
+
}
diff --git a/jdk/src/share/classes/java/util/jar/Attributes.java b/jdk/src/share/classes/java/util/jar/Attributes.java
index e090711..1eb28d4 100644
--- a/jdk/src/share/classes/java/util/jar/Attributes.java
+++ b/jdk/src/share/classes/java/util/jar/Attributes.java
@@ -71,7 +71,7 @@ public class Attributes implements Map<Object,Object>, Cloneable {
* @param size the initial number of attributes
*/
public Attributes(int size) {
- map = new HashMap(size);
+ map = new HashMap<>(size);
}
/**
@@ -81,7 +81,7 @@ public class Attributes implements Map<Object,Object>, Cloneable {
* @param attr the specified Attributes
*/
public Attributes(Attributes attr) {
- map = new HashMap(attr);
+ map = new HashMap<>(attr);
}
@@ -296,9 +296,9 @@ public class Attributes implements Map<Object,Object>, Cloneable {
* XXX Need to handle UTF8 values and break up lines longer than 72 bytes
*/
void write(DataOutputStream os) throws IOException {
- Iterator it = entrySet().iterator();
+ Iterator<Map.Entry<Object, Object>> it = entrySet().iterator();
while (it.hasNext()) {
- Map.Entry e = (Map.Entry)it.next();
+ Map.Entry<Object, Object> e = it.next();
StringBuffer buffer = new StringBuffer(
((Name)e.getKey()).toString());
buffer.append(": ");
@@ -340,9 +340,9 @@ public class Attributes implements Map<Object,Object>, Cloneable {
// write out all attributes except for the version
// we wrote out earlier
- Iterator it = entrySet().iterator();
+ Iterator<Map.Entry<Object, Object>> it = entrySet().iterator();
while (it.hasNext()) {
- Map.Entry e = (Map.Entry)it.next();
+ Map.Entry<Object, Object> e = it.next();
String name = ((Name)e.getKey()).toString();
if ((version != null) && ! (name.equalsIgnoreCase(vername))) {
@@ -499,7 +499,7 @@ public class Attributes implements Map<Object,Object>, Cloneable {
*/
public boolean equals(Object o) {
if (o instanceof Name) {
- Comparator c = ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER;
+ Comparator<String> c = ASCIICaseInsensitiveComparator.CASE_INSENSITIVE_ORDER;
return c.compare(name, ((Name)o).name) == 0;
} else {
return false;
diff --git a/jdk/src/share/classes/java/util/jar/JarOutputStream.java b/jdk/src/share/classes/java/util/jar/JarOutputStream.java
index 843b16a..3694277 100644
--- a/jdk/src/share/classes/java/util/jar/JarOutputStream.java
+++ b/jdk/src/share/classes/java/util/jar/JarOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -135,7 +135,7 @@ class JarOutputStream extends ZipOutputStream {
* The bytes are assumed to be in Intel (little-endian) byte order.
*/
private static int get16(byte[] b, int off) {
- return (b[off] & 0xff) | ((b[off+1] & 0xff) << 8);
+ return Byte.toUnsignedInt(b[off]) | ( Byte.toUnsignedInt(b[off+1]) << 8);
}
/*
diff --git a/jdk/src/share/classes/java/util/jar/JarVerifier.java b/jdk/src/share/classes/java/util/jar/JarVerifier.java
index 6a9a8b5..5c80d50 100644
--- a/jdk/src/share/classes/java/util/jar/JarVerifier.java
+++ b/jdk/src/share/classes/java/util/jar/JarVerifier.java
@@ -48,21 +48,21 @@ class JarVerifier {
/* a table mapping names to code signers, for jar entries that have
had their actual hashes verified */
- private Hashtable verifiedSigners;
+ private Hashtable<String, CodeSigner[]> verifiedSigners;
/* a table mapping names to code signers, for jar entries that have
passed the .SF/.DSA/.EC -> MANIFEST check */
- private Hashtable sigFileSigners;
+ private Hashtable<String, CodeSigner[]> sigFileSigners;
/* a hash table to hold .SF bytes */
- private Hashtable sigFileData;
+ private Hashtable<String, byte[]> sigFileData;
/** "queue" of pending PKCS7 blocks that we couldn't parse
* until we parsed the .SF file */
- private ArrayList pendingBlocks;
+ private ArrayList<SignatureFileVerifier> pendingBlocks;
/* cache of CodeSigner objects */
- private ArrayList signerCache;
+ private ArrayList<CodeSigner[]> signerCache;
/* Are we parsing a block? */
private boolean parsingBlockOrSF = false;
@@ -94,10 +94,10 @@ class JarVerifier {
public JarVerifier(byte rawBytes[]) {
manifestRawBytes = rawBytes;
- sigFileSigners = new Hashtable();
- verifiedSigners = new Hashtable();
- sigFileData = new Hashtable(11);
- pendingBlocks = new ArrayList();
+ sigFileSigners = new Hashtable<>();
+ verifiedSigners = new Hashtable<>();
+ sigFileData = new Hashtable<>(11);
+ pendingBlocks = new ArrayList<>();
baos = new ByteArrayOutputStream();
manifestDigests = new ArrayList<>();
}
@@ -248,10 +248,9 @@ class JarVerifier {
sigFileData.put(key, bytes);
// check pending blocks, we can now process
// anyone waiting for this .SF file
- Iterator it = pendingBlocks.iterator();
+ Iterator<SignatureFileVerifier> it = pendingBlocks.iterator();
while (it.hasNext()) {
- SignatureFileVerifier sfv =
- (SignatureFileVerifier) it.next();
+ SignatureFileVerifier sfv = it.next();
if (sfv.needSignatureFile(key)) {
if (debug != null) {
debug.println(
@@ -270,7 +269,7 @@ class JarVerifier {
String key = uname.substring(0, uname.lastIndexOf("."));
if (signerCache == null)
- signerCache = new ArrayList();
+ signerCache = new ArrayList<>();
if (manDig == null) {
synchronized(manifestRawBytes) {
@@ -287,7 +286,7 @@ class JarVerifier {
if (sfv.needSignatureFileBytes()) {
// see if we have already parsed an external .SF file
- byte[] bytes = (byte[]) sigFileData.get(key);
+ byte[] bytes = sigFileData.get(key);
if (bytes == null) {
// put this block on queue for later processing
@@ -343,7 +342,7 @@ class JarVerifier {
*/
public CodeSigner[] getCodeSigners(String name)
{
- return (CodeSigner[])verifiedSigners.get(name);
+ return verifiedSigners.get(name);
}
public CodeSigner[] getCodeSigners(JarFile jar, JarEntry entry)
@@ -376,15 +375,14 @@ class JarVerifier {
CodeSigner[] signers) {
if (signers != null) {
- ArrayList certChains = new ArrayList();
+ ArrayList<java.security.cert.Certificate> certChains = new ArrayList<>();
for (int i = 0; i < signers.length; i++) {
certChains.addAll(
signers[i].getSignerCertPath().getCertificates());
}
// Convert into a Certificate[]
- return (java.security.cert.Certificate[])
- certChains.toArray(
+ return certChains.toArray(
new java.security.cert.Certificate[certChains.size()]);
}
return null;
@@ -418,8 +416,8 @@ class JarVerifier {
// MANIFEST.MF is always treated as signed and verified,
// move its signers from sigFileSigners to verifiedSigners.
if (sigFileSigners.containsKey(JarFile.MANIFEST_NAME)) {
- verifiedSigners.put(JarFile.MANIFEST_NAME,
- sigFileSigners.remove(JarFile.MANIFEST_NAME));
+ CodeSigner[] codeSigners = sigFileSigners.remove(JarFile.MANIFEST_NAME);
+ verifiedSigners.put(JarFile.MANIFEST_NAME, codeSigners);
}
}
@@ -493,10 +491,10 @@ class JarVerifier {
// Extended JavaUtilJarAccess CodeSource API Support
- private Map urlToCodeSourceMap = new HashMap();
- private Map signerToCodeSource = new HashMap();
+ private Map<URL, Map<CodeSigner[], CodeSource>> urlToCodeSourceMap = new HashMap<>();
+ private Map<CodeSigner[], CodeSource> signerToCodeSource = new HashMap<>();
private URL lastURL;
- private Map lastURLMap;
+ private Map<CodeSigner[], CodeSource> lastURLMap;
/*
* Create a unique mapping from codeSigner cache entries to CodeSource.
@@ -504,19 +502,19 @@ class JarVerifier {
* and shared JAR file although in practice there will be a single URL in use.
*/
private synchronized CodeSource mapSignersToCodeSource(URL url, CodeSigner[] signers) {
- Map map;
+ Map<CodeSigner[], CodeSource> map;
if (url == lastURL) {
map = lastURLMap;
} else {
- map = (Map) urlToCodeSourceMap.get(url);
+ map = urlToCodeSourceMap.get(url);
if (map == null) {
- map = new HashMap();
+ map = new HashMap<>();
urlToCodeSourceMap.put(url, map);
}
lastURLMap = map;
lastURL = url;
}
- CodeSource cs = (CodeSource) map.get(signers);
+ CodeSource cs = map.get(signers);
if (cs == null) {
cs = new VerifierCodeSource(csdomain, url, signers);
signerToCodeSource.put(signers, cs);
@@ -524,16 +522,16 @@ class JarVerifier {
return cs;
}
- private CodeSource[] mapSignersToCodeSources(URL url, List signers, boolean unsigned) {
- List sources = new ArrayList();
+ private CodeSource[] mapSignersToCodeSources(URL url, List<CodeSigner[]> signers, boolean unsigned) {
+ List<CodeSource> sources = new ArrayList<>();
for (int i = 0; i < signers.size(); i++) {
- sources.add(mapSignersToCodeSource(url, (CodeSigner[]) signers.get(i)));
+ sources.add(mapSignersToCodeSource(url, signers.get(i)));
}
if (unsigned) {
sources.add(mapSignersToCodeSource(url, null));
}
- return (CodeSource[]) sources.toArray(new CodeSource[sources.size()]);
+ return sources.toArray(new CodeSource[sources.size()]);
}
private CodeSigner[] emptySigner = new CodeSigner[0];
@@ -553,7 +551,7 @@ class JarVerifier {
* but this handles a CodeSource of any type, just in case.
*/
CodeSource[] sources = mapSignersToCodeSources(cs.getLocation(), getJarCodeSigners(), true);
- List sourceList = new ArrayList();
+ List<CodeSource> sourceList = new ArrayList<>();
for (int i = 0; i < sources.length; i++) {
sourceList.add(sources[i]);
}
@@ -574,6 +572,7 @@ class JarVerifier {
* signing data that can be compared by object reference identity.
*/
private static class VerifierCodeSource extends CodeSource {
+ private static final long serialVersionUID = -9047366145967768825L;
URL vlocation;
CodeSigner[] vsigners;
@@ -641,16 +640,16 @@ class JarVerifier {
return vcerts;
}
}
- private Map signerMap;
+ private Map<String, CodeSigner[]> signerMap;
- private synchronized Map signerMap() {
+ private synchronized Map<String, CodeSigner[]> signerMap() {
if (signerMap == null) {
/*
* Snapshot signer state so it doesn't change on us. We care
* only about the asserted signatures. Verification of
* signature validity happens via the JarEntry apis.
*/
- signerMap = new HashMap(verifiedSigners.size() + sigFileSigners.size());
+ signerMap = new HashMap<>(verifiedSigners.size() + sigFileSigners.size());
signerMap.putAll(verifiedSigners);
signerMap.putAll(sigFileSigners);
}
@@ -658,15 +657,15 @@ class JarVerifier {
}
public synchronized Enumeration<String> entryNames(JarFile jar, final CodeSource[] cs) {
- final Map map = signerMap();
- final Iterator itor = map.entrySet().iterator();
+ final Map<String, CodeSigner[]> map = signerMap();
+ final Iterator<Map.Entry<String, CodeSigner[]>> itor = map.entrySet().iterator();
boolean matchUnsigned = false;
/*
* Grab a single copy of the CodeSigner arrays. Check
* to see if we can optimize CodeSigner equality test.
*/
- List req = new ArrayList(cs.length);
+ List<CodeSigner[]> req = new ArrayList<>(cs.length);
for (int i = 0; i < cs.length; i++) {
CodeSigner[] match = findMatchingSigners(cs[i]);
if (match != null) {
@@ -678,8 +677,8 @@ class JarVerifier {
}
}
- final List signersReq = req;
- final Enumeration enum2 = (matchUnsigned) ? unsignedEntryNames(jar) : emptyEnumeration;
+ final List<CodeSigner[]> signersReq = req;
+ final Enumeration<String> enum2 = (matchUnsigned) ? unsignedEntryNames(jar) : emptyEnumeration;
return new Enumeration<String>() {
@@ -691,14 +690,14 @@ class JarVerifier {
}
while (itor.hasNext()) {
- Map.Entry e = (Map.Entry) itor.next();
- if (signersReq.contains((CodeSigner[]) e.getValue())) {
- name = (String) e.getKey();
+ Map.Entry<String, CodeSigner[]> e = itor.next();
+ if (signersReq.contains(e.getValue())) {
+ name = e.getKey();
return true;
}
}
while (enum2.hasMoreElements()) {
- name = (String) enum2.nextElement();
+ name = enum2.nextElement();
return true;
}
return false;
@@ -719,13 +718,13 @@ class JarVerifier {
* Like entries() but screens out internal JAR mechanism entries
* and includes signed entries with no ZIP data.
*/
- public Enumeration<JarEntry> entries2(final JarFile jar, Enumeration e) {
- final Map map = new HashMap();
+ public Enumeration<JarEntry> entries2(final JarFile jar, Enumeration<? extends ZipEntry> e) {
+ final Map<String, CodeSigner[]> map = new HashMap<>();
map.putAll(signerMap());
- final Enumeration enum_ = e;
+ final Enumeration<? extends ZipEntry> enum_ = e;
return new Enumeration<JarEntry>() {
- Enumeration signers = null;
+ Enumeration<String> signers = null;
JarEntry entry;
public boolean hasMoreElements() {
@@ -733,7 +732,7 @@ class JarVerifier {
return true;
}
while (enum_.hasMoreElements()) {
- ZipEntry ze = (ZipEntry) enum_.nextElement();
+ ZipEntry ze = enum_.nextElement();
if (JarVerifier.isSigningRelated(ze.getName())) {
continue;
}
@@ -744,7 +743,7 @@ class JarVerifier {
signers = Collections.enumeration(map.keySet());
}
while (signers.hasMoreElements()) {
- String name = (String) signers.nextElement();
+ String name = signers.nextElement();
entry = jar.newEntry(new ZipEntry(name));
return true;
}
@@ -764,7 +763,7 @@ class JarVerifier {
}
};
}
- private Enumeration emptyEnumeration = new Enumeration<String>() {
+ private Enumeration<String> emptyEnumeration = new Enumeration<String>() {
public boolean hasMoreElements() {
return false;
@@ -797,8 +796,8 @@ class JarVerifier {
}
private Enumeration<String> unsignedEntryNames(JarFile jar) {
- final Map map = signerMap();
- final Enumeration entries = jar.entries();
+ final Map<String, CodeSigner[]> map = signerMap();
+ final Enumeration<JarEntry> entries = jar.entries();
return new Enumeration<String>() {
String name;
@@ -813,7 +812,7 @@ class JarVerifier {
}
while (entries.hasMoreElements()) {
String value;
- ZipEntry e = (ZipEntry) entries.nextElement();
+ ZipEntry e = entries.nextElement();
value = e.getName();
if (e.isDirectory() || isSigningRelated(value)) {
continue;
@@ -836,14 +835,14 @@ class JarVerifier {
}
};
}
- private List jarCodeSigners;
+ private List<CodeSigner[]> jarCodeSigners;
- private synchronized List getJarCodeSigners() {
+ private synchronized List<CodeSigner[]> getJarCodeSigners() {
CodeSigner[] signers;
if (jarCodeSigners == null) {
- HashSet set = new HashSet();
+ HashSet<CodeSigner[]> set = new HashSet<>();
set.addAll(signerMap().values());
- jarCodeSigners = new ArrayList();
+ jarCodeSigners = new ArrayList<>();
jarCodeSigners.addAll(set);
}
return jarCodeSigners;
@@ -858,7 +857,7 @@ class JarVerifier {
public CodeSource getCodeSource(URL url, String name) {
CodeSigner[] signers;
- signers = (CodeSigner[]) signerMap().get(name);
+ signers = signerMap().get(name);
return mapSignersToCodeSource(url, signers);
}
diff --git a/jdk/src/share/classes/java/util/jar/Manifest.java b/jdk/src/share/classes/java/util/jar/Manifest.java
index 3bb5671..b25165b 100644
--- a/jdk/src/share/classes/java/util/jar/Manifest.java
+++ b/jdk/src/share/classes/java/util/jar/Manifest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -339,7 +339,7 @@ public class Manifest implements Cloneable {
return -1;
}
}
- return buf[pos++] & 0xff;
+ return Byte.toUnsignedInt(buf[pos++]);
}
public int read(byte[] b, int off, int len) throws IOException {
@@ -400,6 +400,8 @@ public class Manifest implements Cloneable {
public byte peek() throws IOException {
if (pos == count)
fill();
+ if (pos == count)
+ return -1; // nothing left in buffer
return buf[pos];
}
diff --git a/jdk/src/share/classes/java/util/prefs/Preferences.java b/jdk/src/share/classes/java/util/prefs/Preferences.java
index b95423e..5945d56 100644
--- a/jdk/src/share/classes/java/util/prefs/Preferences.java
+++ b/jdk/src/share/classes/java/util/prefs/Preferences.java
@@ -292,10 +292,15 @@ public abstract class Preferences {
}
// 3. Use platform-specific system-wide default
- String platformFactory =
- System.getProperty("os.name").startsWith("Windows")
- ? "java.util.prefs.WindowsPreferencesFactory"
- : "java.util.prefs.FileSystemPreferencesFactory";
+ String osName = System.getProperty("os.name");
+ String platformFactory;
+ if (osName.startsWith("Windows")) {
+ platformFactory = "java.util.prefs.WindowsPreferencesFactory";
+ } else if (osName.startsWith("Mac OS X")) {
+ platformFactory = "java.util.prefs.MacOSXPreferencesFactory";
+ } else {
+ platformFactory = "java.util.prefs.FileSystemPreferencesFactory";
+ }
try {
return (PreferencesFactory)
Class.forName(platformFactory, false, null).newInstance();
diff --git a/jdk/src/share/classes/java/util/zip/InflaterInputStream.java b/jdk/src/share/classes/java/util/zip/InflaterInputStream.java
index 53e16ee..b948905 100644
--- a/jdk/src/share/classes/java/util/zip/InflaterInputStream.java
+++ b/jdk/src/share/classes/java/util/zip/InflaterInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -119,7 +119,7 @@ class InflaterInputStream extends FilterInputStream {
*/
public int read() throws IOException {
ensureOpen();
- return read(singleByteBuf, 0, 1) == -1 ? -1 : singleByteBuf[0] & 0xff;
+ return read(singleByteBuf, 0, 1) == -1 ? -1 : Byte.toUnsignedInt(singleByteBuf[0]);
}
/**
diff --git a/jdk/src/share/classes/java/util/zip/ZipInputStream.java b/jdk/src/share/classes/java/util/zip/ZipInputStream.java
index a60adb8..7076f9b 100644
--- a/jdk/src/share/classes/java/util/zip/ZipInputStream.java
+++ b/jdk/src/share/classes/java/util/zip/ZipInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -435,7 +435,7 @@ class ZipInputStream extends InflaterInputStream implements ZipConstants {
* The bytes are assumed to be in Intel (little-endian) byte order.
*/
private static final int get16(byte b[], int off) {
- return (b[off] & 0xff) | ((b[off+1] & 0xff) << 8);
+ return Byte.toUnsignedInt(b[off]) | (Byte.toUnsignedInt(b[off+1]) << 8);
}
/*
diff --git a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java b/jdk/src/share/classes/javax/accessibility/AccessibleContext.java
index 5741ec9..32a80b6 100644
--- a/jdk/src/share/classes/javax/accessibility/AccessibleContext.java
+++ b/jdk/src/share/classes/javax/accessibility/AccessibleContext.java
@@ -394,6 +394,8 @@ public abstract class AccessibleContext {
private AccessibleRelationSet relationSet
= new AccessibleRelationSet();
+ private Object nativeAXResource;
+
/**
* Gets the accessibleName property of this object. The accessibleName
* property of an object is a localized String that designates the purpose
diff --git a/jdk/src/share/classes/javax/crypto/Cipher.java b/jdk/src/share/classes/javax/crypto/Cipher.java
index 8aa8b18..408d9b9 100644
--- a/jdk/src/share/classes/javax/crypto/Cipher.java
+++ b/jdk/src/share/classes/javax/crypto/Cipher.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,8 @@
package javax.crypto;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.regex.*;
@@ -389,16 +391,15 @@ public class Cipher {
return matches(regexp, value) ? S_YES : S_NO;
}
- // Map<String,Pattern> for previously compiled patterns
- // XXX use ConcurrentHashMap once available
- private final static Map<String, Pattern> patternCache =
- Collections.synchronizedMap(new HashMap<String, Pattern>());
+ // ConcurrentMap<String,Pattern> for previously compiled patterns
+ private final static ConcurrentMap<String, Pattern> patternCache =
+ new ConcurrentHashMap<String, Pattern>();
private static boolean matches(String regexp, String str) {
Pattern pattern = patternCache.get(regexp);
if (pattern == null) {
pattern = Pattern.compile(regexp);
- patternCache.put(regexp, pattern);
+ patternCache.putIfAbsent(regexp, pattern);
}
return pattern.matcher(str.toUpperCase(Locale.ENGLISH)).matches();
}
diff --git a/jdk/src/share/classes/javax/crypto/CipherSpi.java b/jdk/src/share/classes/javax/crypto/CipherSpi.java
index c3442ea..e563e92 100644
--- a/jdk/src/share/classes/javax/crypto/CipherSpi.java
+++ b/jdk/src/share/classes/javax/crypto/CipherSpi.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -775,7 +775,7 @@ public abstract class CipherSpi {
int outOfs = output.arrayOffset() + outPos;
byte[] inArray = new byte[getTempArraySize(inLen)];
int total = 0;
- while (inLen > 0) {
+ do {
int chunk = Math.min(inLen, inArray.length);
input.get(inArray, 0, chunk);
int n;
@@ -787,7 +787,7 @@ public abstract class CipherSpi {
total += n;
outOfs += n;
inLen -= chunk;
- }
+ } while (inLen > 0);
output.position(outPos + total);
return total;
} else { // output is not backed by an accessible byte[]
@@ -804,7 +804,7 @@ public abstract class CipherSpi {
int outSize = outArray.length;
int total = 0;
boolean resized = false;
- while (inLen > 0) {
+ do {
int chunk = Math.min(inLen, outSize);
if ((a1 == false) && (resized == false)) {
input.get(inArray, 0, chunk);
@@ -834,7 +834,7 @@ public abstract class CipherSpi {
int newOut = engineGetOutputSize(chunk);
outArray = new byte[newOut];
}
- }
+ } while (inLen > 0);
input.position(inLimit);
return total;
}
diff --git a/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java b/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
index a9a5ed2..8afd963 100644
--- a/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
+++ b/jdk/src/share/classes/javax/net/ssl/ExtendedSSLSession.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ public abstract class ExtendedSSLSession implements SSLSession {
* The signature algorithm name must be a standard Java Security
* name (such as "SHA1withRSA", "SHA256withECDSA", and so on).
* See Appendix A in the <a href=
- * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA">
+ * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA">
* Java Cryptography Architecture API Specification & Reference </a>
* for information about standard algorithm names.
* <p>
@@ -71,7 +71,7 @@ public abstract class ExtendedSSLSession implements SSLSession {
* The signature algorithm name must be a standard Java Security
* name (such as "SHA1withRSA", "SHA256withECDSA", and so on).
* See Appendix A in the <a href=
- * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA">
+ * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA">
* Java Cryptography Architecture API Specification & Reference </a>
* for information about standard algorithm names.
*
diff --git a/jdk/src/share/classes/javax/net/ssl/SSLParameters.java b/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
index 4bb20a1..0cb5b7d 100644
--- a/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
+++ b/jdk/src/share/classes/javax/net/ssl/SSLParameters.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -242,7 +242,7 @@ public class SSLParameters {
*
* @param algorithm The standard string name of the endpoint
* identification algorithm (or null). See Appendix A in the <a href=
- * "../../../technotes/guides/security/crypto/CryptoSpec.html#AppA">
+ * "{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html#AppA">
* Java Cryptography Architecture API Specification & Reference </a>
* for information about standard algorithm names.
*
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java b/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java
index f49210d..339be36 100644
--- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java
+++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterStateReasons.java
@@ -180,8 +180,7 @@ public final class PrinterStateReasons
if (severity == null) {
throw new NullPointerException("severity is null");
}
- return super.put((PrinterStateReason) reason,
- (Severity) severity);
+ return super.put(reason, severity);
}
/**
diff --git a/jdk/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/jdk/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
index 70d0951..b52b2ab 100644
--- a/jdk/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
+++ b/jdk/src/share/classes/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
@@ -141,7 +141,7 @@ public class ReferenceUriSchemesSupported
* Returns the string table for class ReferenceUriSchemesSupported.
*/
protected String[] getStringTable() {
- return (String[])myStringTable.clone();
+ return myStringTable.clone();
}
/**
diff --git a/jdk/src/share/classes/javax/script/ScriptEngineManager.java b/jdk/src/share/classes/javax/script/ScriptEngineManager.java
index bb43053..c7932a8 100644
--- a/jdk/src/share/classes/javax/script/ScriptEngineManager.java
+++ b/jdk/src/share/classes/javax/script/ScriptEngineManager.java
@@ -37,7 +37,7 @@ import sun.security.util.SecurityConstants;
* collection of key/value pairs storing state shared by all engines created
* by the Manager. This class uses the <a href="../../../technotes/guides/jar/jar.html#Service%20Provider">service provider</a> mechanism to enumerate all the
* implementations of <code>ScriptEngineFactory</code>. <br><br>
- * The <code>ScriptEngineManager</code> provides a method to return an array of all these factories
+ * The <code>ScriptEngineManager</code> provides a method to return a list of all these factories
* as well as utility methods which look up factories on the basis of language name, file extension
* and mime type.
* <p>
@@ -202,7 +202,7 @@ public class ScriptEngineManager {
* The algorithm first searches for a <code>ScriptEngineFactory</code> that has been
* registered as a handler for the specified name using the <code>registerEngineName</code>
* method.
- * <br><br> If one is not found, it searches the array of <code>ScriptEngineFactory</code> instances
+ * <br><br> If one is not found, it searches the set of <code>ScriptEngineFactory</code> instances
* stored by the constructor for one with the specified name. If a <code>ScriptEngineFactory</code>
* is found by either method, it is used to create instance of <code>ScriptEngine</code>.
* @param shortName The short name of the <code>ScriptEngine</code> implementation.
@@ -351,7 +351,7 @@ public class ScriptEngineManager {
}
/**
- * Returns an array whose elements are instances of all the <code>ScriptEngineFactory</code> classes
+ * Returns a list whose elements are instances of all the <code>ScriptEngineFactory</code> classes
* found by the discovery mechanism.
* @return List of all discovered <code>ScriptEngineFactory</code>s.
*/
diff --git a/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java b/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
index 64a54f1..4a50719 100644
--- a/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
+++ b/jdk/src/share/classes/javax/security/auth/x500/X500Principal.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -107,10 +107,17 @@ public final class X500Principal implements Principal, java.io.Serializable {
* defined in RFC 1779 and RFC 2253
* (and listed in {@link #getName(String format) getName(String format)}),
* as well as the T, DNQ or DNQUALIFIER, SURNAME, GIVENNAME, INITIALS,
- * GENERATION, EMAILADDRESS, and SERIALNUMBER keywords whose OIDs are
- * defined in RFC 3280 and its successor.
+ * GENERATION, EMAILADDRESS, and SERIALNUMBER keywords whose Object
+ * Identifiers (OIDs) are defined in RFC 3280 and its successor.
* Any other attribute type must be specified as an OID.
*
+ * <p>This implementation enforces a more restrictive OID syntax than
+ * defined in RFC 1779 and 2253. It uses the more correct syntax defined in
+ * <a href="http://www.ietf.org/rfc/rfc4512.txt">RFC 4512</a>, which
+ * specifies that OIDs contain at least 2 digits:
+ *
+ * <p>{@code numericoid = number 1*( DOT number ) }
+ *
* @param name an X.500 distinguished name in RFC 1779 or RFC 2253 format
* @exception NullPointerException if the <code>name</code>
* is <code>null</code>
@@ -135,10 +142,17 @@ public final class X500Principal implements Principal, java.io.Serializable {
* keywords recognized by <code>X500Principal(String)</code>. Keywords
* MUST be specified in all upper-case, otherwise they will be ignored.
* Improperly specified keywords are ignored; however if a keyword in the
- * name maps to an improperly specified OID, an
+ * name maps to an improperly specified Object Identifier (OID), an
* <code>IllegalArgumentException</code> is thrown. It is permissible to
* have 2 different keywords that map to the same OID.
*
+ * <p>This implementation enforces a more restrictive OID syntax than
+ * defined in RFC 1779 and 2253. It uses the more correct syntax defined in
+ * <a href="http://www.ietf.org/rfc/rfc4512.txt">RFC 4512</a>, which
+ * specifies that OIDs contain at least 2 digits:
+ *
+ * <p>{@code numericoid = number 1*( DOT number ) }
+ *
* @param name an X.500 distinguished name in RFC 1779 or RFC 2253 format
* @param keywordMap an attribute type keyword map, where each key is a
* keyword String that maps to a corresponding object identifier in String
diff --git a/jdk/src/share/classes/javax/security/auth/x500/package.html b/jdk/src/share/classes/javax/security/auth/x500/package.html
index 508380f..46a9203 100644
--- a/jdk/src/share/classes/javax/security/auth/x500/package.html
+++ b/jdk/src/share/classes/javax/security/auth/x500/package.html
@@ -2,7 +2,7 @@
<html>
<head>
<!--
-Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
@@ -30,17 +30,26 @@ questions.
<body bgcolor="white">
This package contains the classes that should be used to store
- X500 Principal and X500 Private Crendentials in a
+ X500 Principal and X500 Private Credentials in a
<i>Subject</i>.
-<!--
<h2>Package Specification</h2>
-##### FILL IN ANY SPECS NEEDED BY JAVA COMPATIBILITY KIT #####
<ul>
- <li><a href="">##### REFER TO ANY FRAMEMAKER SPECIFICATION HERE #####</a>
+ <li><a href="http://www.ietf.org/rfc/rfc1779.txt">
+ RFC 1779: A String Representation of Distinguished Names</a></li>
+ <li><a href="http://www.ietf.org/rfc/rfc2253.txt">
+ RFC 2253: Lightweight Directory Access Protocol (v3):
+ UTF-8 String Representation of Distinguished Names</a></li>
+ <li><a href="http://www.ietf.org/rfc/rfc3280.txt">
+ RFC 3280: Internet X.509 Public Key Infrastructure
+ Certificate and Certificate Revocation List (CRL) Profile</a></li>
+ <li><a href="http://www.ietf.org/rfc/rfc4512.txt">
+ RFC 4512: Lightweight Directory Access Protocol (LDAP):
+ Directory Information Models</a></li>
</ul>
+<!--
<h2>Related Documentation</h2>
For overviews, tutorials, examples, guides, and tool documentation, please see:
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java b/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java
index c4b1e4d..f05be51 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
package javax.sql.rowset.serial;
import java.sql.*;
+import java.util.Arrays;
import java.util.Map;
/**
@@ -119,7 +120,7 @@ public class SQLInputImpl implements SQLInput {
"object with null parameters");
}
// assign our local reference to the attribute stream
- attrib = attributes;
+ attrib = Arrays.copyOf(attributes, attributes.length);
// init the index point before the head of the stream
idx = -1;
// set the map
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java b/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
index 2217e4e..b46a880 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -25,11 +25,10 @@
package javax.sql.rowset.serial;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.sql.*;
-import javax.sql.*;
-import java.io.*;
-import java.lang.String;
-import java.math.*;
import java.util.Map;
import java.util.Vector;
@@ -444,16 +443,15 @@ public class SQLOutputImpl implements SQLOutput {
* will need to track if a field is SQL null for itself
*/
if (x == null) {
- attribs.add(x);
- return;
+ attribs.add(null);
+ } else {
+ /*
+ * We have to write out a SerialStruct that contains
+ * the name of this class otherwise we don't know
+ * what to re-instantiate during readSQL()
+ */
+ attribs.add(new SerialStruct(x, map));
}
-
- /*
- * We have to write out a SerialStruct that contains
- * the name of this class otherwise we don't know
- * what to re-instantiate during readSQL()
- */
- attribs.add(new SerialStruct(x, map));
}
/**
@@ -470,10 +468,10 @@ public class SQLOutputImpl implements SQLOutput {
@SuppressWarnings("unchecked")
public void writeRef(Ref x) throws SQLException {
if (x == null) {
- attribs.add(x);
- return;
+ attribs.add(null);
+ } else {
+ attribs.add(new SerialRef(x));
}
- attribs.add(new SerialRef(x));
}
/**
@@ -490,10 +488,10 @@ public class SQLOutputImpl implements SQLOutput {
@SuppressWarnings("unchecked")
public void writeBlob(Blob x) throws SQLException {
if (x == null) {
- attribs.add(x);
- return;
+ attribs.add(null);
+ } else {
+ attribs.add(new SerialBlob(x));
}
- attribs.add(new SerialBlob(x));
}
/**
@@ -510,10 +508,10 @@ public class SQLOutputImpl implements SQLOutput {
@SuppressWarnings("unchecked")
public void writeClob(Clob x) throws SQLException {
if (x == null) {
- attribs.add(x);
- return;
+ attribs.add(null);
+ } else {
+ attribs.add(new SerialClob(x));
}
- attribs.add(new SerialClob(x));
}
/**
@@ -554,10 +552,10 @@ public class SQLOutputImpl implements SQLOutput {
@SuppressWarnings("unchecked")
public void writeArray(Array x) throws SQLException {
if (x == null) {
- attribs.add(x);
- return;
+ attribs.add(null);
+ } else {
+ attribs.add(new SerialArray(x, map));
}
- attribs.add(new SerialArray(x, map));
}
/**
@@ -574,11 +572,10 @@ public class SQLOutputImpl implements SQLOutput {
@SuppressWarnings("unchecked")
public void writeURL(java.net.URL url) throws SQLException {
if (url == null) {
- attribs.add(url);
- return;
+ attribs.add(null);
+ } else {
+ attribs.add(new SerialDatalink(url));
}
- attribs.add(new SerialDatalink(url));
-
}
diff --git a/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java b/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java
index a9462eb..74d54bb 100644
--- a/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java
+++ b/jdk/src/share/classes/javax/sql/rowset/serial/SerialStruct.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ import java.sql.*;
import javax.sql.*;
import java.io.*;
import java.math.*;
+import java.util.Arrays;
import java.util.Map;
import java.util.Vector;
@@ -174,7 +175,8 @@ public class SerialStruct implements Struct, Serializable, Cloneable {
* @throws SerialException if an error occurs
*/
public Object[] getAttributes() throws SerialException {
- return attribs;
+ Object[] val = this.attribs;
+ return (val == null) ? null : Arrays.copyOf(val, val.length);
}
/**
@@ -197,7 +199,8 @@ public class SerialStruct implements Struct, Serializable, Cloneable {
public Object[] getAttributes(Map<String,Class<?>> map)
throws SerialException
{
- return attribs;
+ Object[] val = this.attribs;
+ return (val == null) ? null : Arrays.copyOf(val, val.length);
}
diff --git a/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java b/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java
index cec3131..57fb5d7 100644
--- a/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java
+++ b/jdk/src/share/classes/javax/swing/DefaultListSelectionModel.java
@@ -252,6 +252,10 @@ public class DefaultListSelectionModel implements ListSelectionModel, Cloneable,
// Updates first and last change indices
private void markAsDirty(int r) {
+ if (r == -1) {
+ return;
+ }
+
firstAdjustedIndex = Math.min(firstAdjustedIndex, r);
lastAdjustedIndex = Math.max(lastAdjustedIndex, r);
}
@@ -358,16 +362,12 @@ public class DefaultListSelectionModel implements ListSelectionModel, Cloneable,
private void updateLeadAnchorIndices(int anchorIndex, int leadIndex) {
if (leadAnchorNotificationEnabled) {
if (this.anchorIndex != anchorIndex) {
- if (this.anchorIndex != -1) { // The unassigned state.
- markAsDirty(this.anchorIndex);
- }
+ markAsDirty(this.anchorIndex);
markAsDirty(anchorIndex);
}
if (this.leadIndex != leadIndex) {
- if (this.leadIndex != -1) { // The unassigned state.
- markAsDirty(this.leadIndex);
- }
+ markAsDirty(this.leadIndex);
markAsDirty(leadIndex);
}
}
diff --git a/jdk/src/share/classes/javax/swing/JOptionPane.java b/jdk/src/share/classes/javax/swing/JOptionPane.java
index 9849c37..c532cf6 100644
--- a/jdk/src/share/classes/javax/swing/JOptionPane.java
+++ b/jdk/src/share/classes/javax/swing/JOptionPane.java
@@ -34,7 +34,6 @@ import java.awt.KeyboardFocusManager;
import java.awt.Frame;
import java.awt.Point;
import java.awt.HeadlessException;
-import java.awt.Toolkit;
import java.awt.Window;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -994,8 +993,7 @@ public class JOptionPane extends JComponent implements Accessible
// if the user closed the window without selecting a button
// (newValue = null in that case). Otherwise, close the dialog.
if (dialog.isVisible() && event.getSource() == JOptionPane.this &&
- (event.getPropertyName().equals(VALUE_PROPERTY) ||
- event.getPropertyName().equals(INPUT_VALUE_PROPERTY)) &&
+ (event.getPropertyName().equals(VALUE_PROPERTY)) &&
event.getNewValue() != null &&
event.getNewValue() != JOptionPane.UNINITIALIZED_VALUE) {
dialog.setVisible(false);
diff --git a/jdk/src/share/classes/javax/swing/JViewport.java b/jdk/src/share/classes/javax/swing/JViewport.java
index c1b1e9a..51975d7 100644
--- a/jdk/src/share/classes/javax/swing/JViewport.java
+++ b/jdk/src/share/classes/javax/swing/JViewport.java
@@ -27,9 +27,7 @@ package javax.swing;
import java.awt.*;
import java.awt.event.*;
-import java.awt.image.VolatileImage;
import java.awt.peer.ComponentPeer;
-import java.applet.Applet;
import java.beans.Transient;
import javax.swing.plaf.ViewportUI;
@@ -265,6 +263,14 @@ public class JViewport extends JComponent implements Accessible
*/
private boolean hasHadValidView;
+ /**
+ * When view is changed we have to synchronize scrollbar values
+ * with viewport (see the BasicScrollPaneUI#syncScrollPaneWithViewport method).
+ * This flag allows to invoke that method while ScrollPaneLayout#layoutContainer
+ * is running.
+ */
+ private boolean viewChanged;
+
/** Creates a <code>JViewport</code>. */
public JViewport() {
super();
@@ -830,7 +836,9 @@ public class JViewport extends JComponent implements Accessible
backingStoreImage = null;
}
super.reshape(x, y, w, h);
- if (sizeChanged) {
+ if (sizeChanged || viewChanged) {
+ viewChanged = false;
+
fireStateChanged();
}
}
@@ -967,6 +975,8 @@ public class JViewport extends JComponent implements Accessible
hasHadValidView = true;
}
+ viewChanged = true;
+
revalidate();
repaint();
}
diff --git a/jdk/src/share/classes/javax/swing/SwingUtilities.java b/jdk/src/share/classes/javax/swing/SwingUtilities.java
index 6566444..ecbe32e 100644
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java
+++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java
@@ -792,7 +792,8 @@ public class SwingUtilities implements SwingConstants
* @return true if the left mouse button was active
*/
public static boolean isLeftMouseButton(MouseEvent anEvent) {
- return (anEvent.getButton() == MouseEvent.BUTTON1);
+ return ((anEvent.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) != 0 ||
+ anEvent.getButton() == MouseEvent.BUTTON1);
}
/**
@@ -802,7 +803,8 @@ public class SwingUtilities implements SwingConstants
* @return true if the middle mouse button was active
*/
public static boolean isMiddleMouseButton(MouseEvent anEvent) {
- return (anEvent.getButton() == MouseEvent.BUTTON2);
+ return ((anEvent.getModifiersEx() & InputEvent.BUTTON2_DOWN_MASK) != 0 ||
+ anEvent.getButton() == MouseEvent.BUTTON2);
}
/**
@@ -812,7 +814,8 @@ public class SwingUtilities implements SwingConstants
* @return true if the right mouse button was active
*/
public static boolean isRightMouseButton(MouseEvent anEvent) {
- return (anEvent.getButton() == MouseEvent.BUTTON3);
+ return ((anEvent.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK) != 0 ||
+ anEvent.getButton() == MouseEvent.BUTTON3);
}
/**
diff --git a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java
index ce8e6ce..c3199d5 100644
--- a/jdk/src/share/classes/javax/swing/UIManager.java
+++ b/jdk/src/share/classes/javax/swing/UIManager.java
@@ -379,6 +379,9 @@ public class UIManager implements Serializable
"com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel"));
}
}
+ else if (osType == OSInfo.OSType.MACOSX) {
+ iLAFs.add(new LookAndFeelInfo("Mac OS X", "com.apple.laf.AquaLookAndFeel"));
+ }
else {
// GTK is not shipped on Windows.
iLAFs.add(new LookAndFeelInfo("GTK+",
@@ -608,6 +611,12 @@ public class UIManager implements Serializable
// May be set on Linux and Solaris boxs.
return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
}
+ if (osType == OSInfo.OSType.MACOSX) {
+ if (toolkit.getClass() .getName()
+ .equals("sun.lwawt.macosx.LWCToolkit")) {
+ return "com.apple.laf.AquaLookAndFeel";
+ }
+ }
if (osType == OSInfo.OSType.SOLARIS) {
return "com.sun.java.swing.plaf.motif.MotifLookAndFeel";
}
@@ -1214,6 +1223,11 @@ public class UIManager implements Serializable
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Object>() {
public Object run() {
+ OSInfo.OSType osType = AccessController.doPrivileged(OSInfo.getOSTypeAction());
+ if (osType == OSInfo.OSType.MACOSX) {
+ props.put(defaultLAFKey, getSystemLookAndFeelClassName());
+ }
+
try {
File file = new File(makeSwingPropertiesFilename());
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
index 40e79e8..940e7cf 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonListener.java
@@ -139,9 +139,9 @@ public class BasicButtonListener implements MouseListener, MouseMotionListener,
JComponent.WHEN_IN_FOCUSED_WINDOW, map);
}
map.clear();
- map.put(KeyStroke.getKeyStroke(m, InputEvent.ALT_MASK, false),
+ map.put(KeyStroke.getKeyStroke(m, BasicLookAndFeel.getFocusAcceleratorKeyMask(), false),
"pressed");
- map.put(KeyStroke.getKeyStroke(m, InputEvent.ALT_MASK, true),
+ map.put(KeyStroke.getKeyStroke(m, BasicLookAndFeel.getFocusAcceleratorKeyMask(), true),
"released");
map.put(KeyStroke.getKeyStroke(m, 0, true), "released");
}
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
index c735fe8..4bbb2eb 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLabelUI.java
@@ -363,8 +363,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
JComponent.WHEN_IN_FOCUSED_WINDOW, inputMap);
}
inputMap.clear();
- inputMap.put(KeyStroke.getKeyStroke(dka, ActionEvent.ALT_MASK,
- false), "press");
+ inputMap.put(KeyStroke.getKeyStroke(dka, BasicLookAndFeel.getFocusAcceleratorKeyMask(), false), "press");
}
else {
InputMap inputMap = SwingUtilities.getUIInputMap
@@ -454,7 +453,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
SwingUtilities.replaceUIInputMap(label, JComponent.WHEN_FOCUSED, inputMap);
}
int dka = label.getDisplayedMnemonic();
- inputMap.put(KeyStroke.getKeyStroke(dka, ActionEvent.ALT_MASK, true), RELEASE);
+ inputMap.put(KeyStroke.getKeyStroke(dka, BasicLookAndFeel.getFocusAcceleratorKeyMask(), true), RELEASE);
// Need this when the sticky keys are enabled
inputMap.put(KeyStroke.getKeyStroke(dka, 0, true), RELEASE);
// Need this if ALT is released before the accelerator
@@ -470,7 +469,7 @@ public class BasicLabelUI extends LabelUI implements PropertyChangeListener
if (inputMap != null) {
// inputMap should never be null.
int dka = label.getDisplayedMnemonic();
- inputMap.remove(KeyStroke.getKeyStroke(dka, ActionEvent.ALT_MASK, true));
+ inputMap.remove(KeyStroke.getKeyStroke(dka, BasicLookAndFeel.getFocusAcceleratorKeyMask(), true));
inputMap.remove(KeyStroke.getKeyStroke(dka, 0, true));
inputMap.remove(KeyStroke.getKeyStroke(KeyEvent.VK_ALT, 0, true));
}
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
index 207284b..437704a 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
@@ -47,6 +47,7 @@ import java.lang.reflect.*;
import javax.sound.sampled.*;
import sun.awt.AppContext;
+import sun.awt.SunToolkit;
import sun.swing.SwingLazyValue;
import sun.swing.SwingUtilities2;
@@ -1910,6 +1911,15 @@ public abstract class BasicLookAndFeel extends LookAndFeel implements Serializab
table.putDefaults(defaults);
}
+ static int getFocusAcceleratorKeyMask() {
+ Toolkit tk = Toolkit.getDefaultToolkit();
+ if (tk instanceof SunToolkit) {
+ return ((SunToolkit)tk).getFocusAcceleratorKeyMask();
+ }
+ return ActionEvent.ALT_MASK;
+ }
+
+
/**
* Returns the ui that is of type <code>klass</code>, or null if
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
index 6a0b024..444b903 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
@@ -1236,6 +1236,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
int index = list.locationToIndex(e.getPoint());
optionPane.setInputValue(list.getModel().getElementAt(index));
+ optionPane.setValue(JOptionPane.OK_OPTION);
}
}
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
index af90179..3d80e12 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTabbedPaneUI.java
@@ -545,7 +545,7 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants {
if (mnemonicToIndexMap == null) {
initMnemonics();
}
- mnemonicInputMap.put(KeyStroke.getKeyStroke(mnemonic, Event.ALT_MASK),
+ mnemonicInputMap.put(KeyStroke.getKeyStroke(mnemonic, BasicLookAndFeel.getFocusAcceleratorKeyMask()),
"setSelectedIndex");
mnemonicToIndexMap.put(Integer.valueOf(mnemonic), Integer.valueOf(index));
}
@@ -1115,9 +1115,8 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants {
protected int getTabLabelShiftY(int tabPlacement, int tabIndex, boolean isSelected) {
Rectangle tabRect = rects[tabIndex];
- String propKey = (isSelected ? "selectedLabelShift" : "labelShift");
- int nudge = DefaultLookup.getInt(
- tabPane, this, "TabbedPane." + propKey, 1);
+ int nudge = (isSelected ? DefaultLookup.getInt(tabPane, this, "TabbedPane.selectedLabelShift", -1) :
+ DefaultLookup.getInt(tabPane, this, "TabbedPane.labelShift", 1));
switch (tabPlacement) {
case BOTTOM:
diff --git a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
index ba87d53..3cfedb8 100644
--- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
@@ -497,9 +497,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory {
if (km != null) {
km.clear();
if (accelerator != '\0') {
- km.put(KeyStroke.getKeyStroke(accelerator,
- ActionEvent.ALT_MASK),
- "requestFocus");
+ km.put(KeyStroke.getKeyStroke(accelerator, BasicLookAndFeel.getFocusAcceleratorKeyMask()), "requestFocus");
}
}
}
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java b/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
index e9ca8ca..37f0c85 100644
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -447,11 +447,21 @@ public class SynthComboBoxUI extends BasicComboBoxUI implements
private class SynthComboBoxRenderer extends JLabel implements ListCellRenderer<Object>, UIResource {
public SynthComboBoxRenderer() {
super();
- setName("ComboBox.renderer");
setText(" ");
}
@Override
+ public String getName() {
+ // SynthComboBoxRenderer should have installed Name while constructor is working.
+ // The setName invocation in the SynthComboBoxRenderer() constructor doesn't work
+ // because of the opaque property is installed in the constructor based on the
+ // component name (see GTKStyle.isOpaque())
+ String name = super.getName();
+
+ return name == null ? "ComboBox.renderer" : name;
+ }
+
+ @Override
public Component getListCellRendererComponent(JList<?> list, Object value,
int index, boolean isSelected, boolean cellHasFocus) {
setName("ComboBox.listRenderer");
diff --git a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
index e7a684e..f1a9b15 100644
--- a/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
+++ b/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
@@ -434,6 +434,8 @@ public class SynthTreeUI extends BasicTreeUI
// Empty out the renderer pane, allowing renderers to be gc'ed.
rendererPane.removeAll();
+
+ paintContext = null;
}
private void configureRenderer(SynthContext context) {
diff --git a/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
index ed4e00d..d8b261c 100644
--- a/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/jdk/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -156,7 +156,7 @@ public class DefaultTreeCellRenderer extends JLabel implements TreeCellRenderer
protected Color borderSelectionColor;
private boolean isDropCell;
- private boolean fillBackground = true;
+ private boolean fillBackground;
/**
* Set to true after the constructor has run.
diff --git a/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java b/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
index 717df87..4a813ea 100644
--- a/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
+++ b/jdk/src/share/classes/org/openjdk/jigsaw/SimpleLibrary.java
@@ -861,10 +861,10 @@ public final class SimpleLibrary
throws IOException
{
Object o = contentForModule.get(mid);
- if (o != null)
- return o;
if (o == NONE)
return null;
+ if (o != null)
+ return o;
File md = findModuleDir(mid);
if (md == null) {
contentForModule.put(mid, NONE);
diff --git a/jdk/src/share/classes/sun/awt/AWTAccessor.java b/jdk/src/share/classes/sun/awt/AWTAccessor.java
index e8f5ca1..f804779 100644
--- a/jdk/src/share/classes/sun/awt/AWTAccessor.java
+++ b/jdk/src/share/classes/sun/awt/AWTAccessor.java
@@ -28,6 +28,7 @@ package sun.awt;
import sun.misc.Unsafe;
import java.awt.*;
+import java.awt.KeyboardFocusManager;
import java.awt.event.InputEvent;
import java.awt.geom.Point2D;
import java.awt.peer.ComponentPeer;
@@ -396,6 +397,11 @@ public final class AWTAccessor {
* Sets the most recent focus owner in the window.
*/
void setMostRecentFocusOwner(Window window, Component component);
+
+ /*
+ * Returns current KFM of the specified AppContext.
+ */
+ KeyboardFocusManager getCurrentKeyboardFocusManager(AppContext ctx);
}
/*
diff --git a/jdk/src/share/classes/sun/awt/AppContext.java b/jdk/src/share/classes/sun/awt/AppContext.java
index b42078a..1d882fb 100644
--- a/jdk/src/share/classes/sun/awt/AppContext.java
+++ b/jdk/src/share/classes/sun/awt/AppContext.java
@@ -787,6 +787,27 @@ public final class AppContext {
}
return changeSupport.getPropertyChangeListeners(propertyName);
}
+
+ // Set up JavaAWTAccess in SharedSecrets
+ static {
+ sun.misc.SharedSecrets.setJavaAWTAccess(new sun.misc.JavaAWTAccess() {
+ public Object get(Object key) {
+ return getAppContext().get(key);
+ }
+ public void put(Object key, Object value) {
+ getAppContext().put(key, value);
+ }
+ public void remove(Object key) {
+ getAppContext().remove(key);
+ }
+ public boolean isDisposed() {
+ return getAppContext().isDisposed();
+ }
+ public boolean isMainAppContext() {
+ return (numAppContexts == 1);
+ }
+ });
+ }
}
final class MostRecentKeyValue {
diff --git a/jdk/src/share/classes/sun/awt/OSInfo.java b/jdk/src/share/classes/sun/awt/OSInfo.java
index c8cce59..58dd6cc 100644
--- a/jdk/src/share/classes/sun/awt/OSInfo.java
+++ b/jdk/src/share/classes/sun/awt/OSInfo.java
@@ -39,6 +39,7 @@ public class OSInfo {
WINDOWS,
LINUX,
SOLARIS,
+ MACOSX,
UNKNOWN
}
@@ -100,6 +101,10 @@ public class OSInfo {
return SOLARIS;
}
+ if (osName.startsWith("Mac OS X")) {
+ return MACOSX;
+ }
+
// determine another OS here
}
diff --git a/jdk/src/share/classes/sun/awt/SunToolkit.java b/jdk/src/share/classes/sun/awt/SunToolkit.java
index 95ff33a..132c1d6 100644
--- a/jdk/src/share/classes/sun/awt/SunToolkit.java
+++ b/jdk/src/share/classes/sun/awt/SunToolkit.java
@@ -35,6 +35,7 @@ import java.awt.event.KeyEvent;
import java.awt.image.*;
import java.awt.TrayIcon;
import java.awt.SystemTray;
+import java.awt.event.InputEvent;
import java.net.URL;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -578,7 +579,7 @@ public abstract class SunToolkit extends Toolkit
postEvent(targetToAppContext(e.getSource()), pe);
}
- private static final Lock flushLock = new ReentrantLock();
+ protected static final Lock flushLock = new ReentrantLock();
private static boolean isFlushingPendingEvents = false;
/*
@@ -1118,6 +1119,13 @@ public abstract class SunToolkit extends Toolkit
}
/**
+ * Returns key modifiers used by Swing to set up a focus accelerator key stroke.
+ */
+ public int getFocusAcceleratorKeyMask() {
+ return InputEvent.ALT_MASK;
+ }
+
+ /**
* Returns a new input method window, with behavior as specified in
* {@link java.awt.im.spi.InputMethodContext#createInputMethodWindow}.
* If the inputContext is not null, the window should return it from its
diff --git a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java
index 5910c4b..61be62f 100644
--- a/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java
+++ b/jdk/src/share/classes/sun/awt/image/BufImgSurfaceData.java
@@ -39,6 +39,7 @@ import java.awt.image.DataBuffer;
import sun.java2d.SurfaceData;
import sun.java2d.SunGraphics2D;
import sun.java2d.StateTrackable;
+import sun.java2d.StateTrackable.*;
import sun.java2d.StateTracker;
import sun.java2d.loops.SurfaceType;
import sun.java2d.loops.CompositeType;
@@ -355,6 +356,10 @@ public class BufImgSurfaceData extends SurfaceData {
this.bufImg = bufImg;
}
+ protected BufImgSurfaceData(SurfaceType surfaceType, ColorModel cm) {
+ super(surfaceType, cm);
+ }
+
public void initSolidLoops() {
this.solidloops = getSolidLoops(getSurfaceType());
}
diff --git a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java b/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
index 2b85b6b..c1b0453 100644
--- a/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
+++ b/jdk/src/share/classes/sun/awt/image/OffScreenImageSource.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -185,6 +185,7 @@ public class OffScreenImageSource implements ImageProducer {
theConsumer.setDimensions(image.getWidth(), image.getHeight());
theConsumer.setProperties(properties);
sendPixels();
+ theConsumer.imageComplete(ImageConsumer.SINGLEFRAMEDONE);
theConsumer.imageComplete(ImageConsumer.STATICIMAGEDONE);
} catch (NullPointerException e) {
if (theConsumer != null) {
diff --git a/jdk/src/share/classes/sun/beans/infos/ComponentBeanInfo.java b/jdk/src/share/classes/sun/beans/infos/ComponentBeanInfo.java
index e16511f..ae6631f 100644
--- a/jdk/src/share/classes/sun/beans/infos/ComponentBeanInfo.java
+++ b/jdk/src/share/classes/sun/beans/infos/ComponentBeanInfo.java
@@ -32,7 +32,7 @@ import java.beans.*;
*/
public class ComponentBeanInfo extends SimpleBeanInfo {
- private static final Class beanClass = java.awt.Component.class;
+ private static final Class<java.awt.Component> beanClass = java.awt.Component.class;
public PropertyDescriptor[] getPropertyDescriptors() {
try {
diff --git a/jdk/src/share/classes/sun/font/FileFont.java b/jdk/src/share/classes/sun/font/FileFont.java
index adce6d9..ae68003 100644
--- a/jdk/src/share/classes/sun/font/FileFont.java
+++ b/jdk/src/share/classes/sun/font/FileFont.java
@@ -121,6 +121,13 @@ public abstract class FileFont extends PhysicalFont {
new CreatedFontFileDisposerRecord(file, tracker));
}
+ // MACOSX begin -- Make this static so that we can pass in CFont
+ static void setFileToRemove(Object font, File file, CreatedFontTracker tracker) {
+ Disposer.addObjectRecord(font,
+ new CreatedFontFileDisposerRecord(file, tracker));
+ }
+ // MACOSX - end
+
/* This is called when a font scaler is determined to
* be unusable (ie bad).
* We want to replace current scaler with NullFontScaler, so
@@ -163,7 +170,9 @@ public abstract class FileFont extends PhysicalFont {
}
}
}
- scaler.dispose();
+ if (scaler != null) {
+ scaler.dispose();
+ }
scaler = FontScaler.getNullScaler();
}
diff --git a/jdk/src/share/classes/sun/font/FontManagerFactory.java b/jdk/src/share/classes/sun/font/FontManagerFactory.java
index b9b7b3a..0db11c0 100644
--- a/jdk/src/share/classes/sun/font/FontManagerFactory.java
+++ b/jdk/src/share/classes/sun/font/FontManagerFactory.java
@@ -51,10 +51,13 @@ public final class FontManagerFactory {
private static final String DEFAULT_CLASS;
static {
- if (FontUtilities.isWindows)
+ if (FontUtilities.isWindows) {
DEFAULT_CLASS = "sun.awt.Win32FontManager";
- else
+ } else if (FontUtilities.isMacOSX) {
+ DEFAULT_CLASS = "sun.font.CFontManager";
+ } else {
DEFAULT_CLASS = "sun.awt.X11FontManager";
+ }
}
/**
diff --git a/jdk/src/share/classes/sun/font/FontUtilities.java b/jdk/src/share/classes/sun/font/FontUtilities.java
index 7c70ff2..fd1adcc 100644
--- a/jdk/src/share/classes/sun/font/FontUtilities.java
+++ b/jdk/src/share/classes/sun/font/FontUtilities.java
@@ -48,6 +48,8 @@ public final class FontUtilities {
public static boolean isLinux;
+ public static boolean isMacOSX;
+
public static boolean isSolaris8;
public static boolean isSolaris9;
@@ -76,6 +78,8 @@ public final class FontUtilities {
isLinux = osName.startsWith("Linux");
+ isMacOSX = osName.startsWith("Mac OS X"); // TODO: MacOSX
+
String t2kStr = System.getProperty("sun.java2d.font.scaler");
if (t2kStr != null) {
useT2K = "t2k".equals(t2kStr);
@@ -407,12 +411,12 @@ public final class FontUtilities {
}
FontManager fm = FontManagerFactory.getInstance();
- CompositeFont dialog2D =
- (CompositeFont) fm.findFont2D("dialog", font.getStyle(),
- FontManager.NO_FALLBACK);
- if (dialog2D == null) { /* shouldn't happen */
+ Font2D dialog = fm.findFont2D("dialog", font.getStyle(), FontManager.NO_FALLBACK);
+ // Should never be null, but MACOSX fonts are not CompositeFonts
+ if (dialog == null || !(dialog instanceof CompositeFont)) {
return fuir;
}
+ CompositeFont dialog2D = (CompositeFont)dialog;
PhysicalFont physicalFont = (PhysicalFont)font2D;
ConcurrentHashMap<PhysicalFont, CompositeFont> compMap = compMapRef.get();
if (compMap == null) { // Its been collected.
diff --git a/jdk/src/share/classes/sun/font/StandardGlyphVector.java b/jdk/src/share/classes/sun/font/StandardGlyphVector.java
index c452dd9..6600168 100644
--- a/jdk/src/share/classes/sun/font/StandardGlyphVector.java
+++ b/jdk/src/share/classes/sun/font/StandardGlyphVector.java
@@ -1740,8 +1740,9 @@ public class StandardGlyphVector extends GlyphVector {
tx,
sgv.font.getStyle(),
aa, fm);
-
- FontStrike strike = sgv.font2D.getStrike(desc); // !!! getStrike(desc, false)
+ // Get the strike via the handle. Shouldn't matter
+ // if we've invalidated the font but its an extra precaution.
+ FontStrike strike = sgv.font2D.handle.font2D.getStrike(desc); // !!! getStrike(desc, false)
return new GlyphStrike(sgv, strike, dx, dy);
}
diff --git a/jdk/src/share/classes/sun/font/SunFontManager.java b/jdk/src/share/classes/sun/font/SunFontManager.java
index bd55f8b..0a822d7 100644
--- a/jdk/src/share/classes/sun/font/SunFontManager.java
+++ b/jdk/src/share/classes/sun/font/SunFontManager.java
@@ -142,9 +142,11 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
* The pool array stores the fonts, rather than directly referencing
* the channels, as the font needs to do the open/close work.
*/
- private static final int CHANNELPOOLSIZE = 20;
+ // MACOSX begin -- need to access these in subclass
+ protected static final int CHANNELPOOLSIZE = 20;
+ protected FileFont fontFileCache[] = new FileFont[CHANNELPOOLSIZE];
+ // MACOSX end
private int lastPoolIndex = 0;
- private FileFont fontFileCache[] = new FileFont[CHANNELPOOLSIZE];
/* Need to implement a simple linked list scheme for fast
* traversal and lookup.
@@ -168,8 +170,10 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
* here in that this contains the content of compositeFonts +
* physicalFonts.
*/
- private ConcurrentHashMap<String, Font2D>
+ // MACOSX begin -- need to access this in subclass
+ protected ConcurrentHashMap<String, Font2D>
fullNameToFont = new ConcurrentHashMap<String, Font2D>();
+ // MACOSX end
/* TrueType fonts have localised names. Support searching all
* of these before giving up on a name.
@@ -735,7 +739,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
* If it returns null means this font was not registered and none
* in that name is registered. The caller must find a substitute
*/
- private PhysicalFont addToFontList(PhysicalFont f, int rank) {
+ // MACOSX begin -- need to access this in subclass
+ protected PhysicalFont addToFontList(PhysicalFont f, int rank) {
+ // MACOSX end
String fontName = f.fullName;
String familyName = f.familyName;
@@ -1233,8 +1239,8 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
return defaultPhysicalFont;
}
- public CompositeFont getDefaultLogicalFont(int style) {
- return (CompositeFont)findFont2D("dialog", style, NO_FALLBACK);
+ public Font2D getDefaultLogicalFont(int style) {
+ return findFont2D("dialog", style, NO_FALLBACK);
}
/*
@@ -2435,7 +2441,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
protected abstract String getFontPath(boolean noType1Fonts);
- private Thread fileCloser = null;
+ // MACOSX begin -- need to access this in subclass
+ protected Thread fileCloser = null;
+ // MACOSX end
Vector<File> tmpFontFiles = null;
public Font2D createFont2D(File fontFile, int fontFormat,
@@ -2619,7 +2627,6 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
physicalFonts.remove(oldFont.fullName);
fullNameToFont.remove(oldFont.fullName.toLowerCase(Locale.ENGLISH));
FontFamily.remove(oldFont);
-
if (localeFullNamesToFont != null) {
Map.Entry[] mapEntries =
(Map.Entry[])localeFullNamesToFont.entrySet().
@@ -3350,7 +3357,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
registerFontsInDir(dirName, true, Font2D.JRE_RANK, true, false);
}
- private void registerFontsInDir(String dirName, boolean useJavaRasterizer,
+ // MACOSX begin -- need to access this in subclass
+ protected void registerFontsInDir(String dirName, boolean useJavaRasterizer,
+ // MACOSX end
int fontRank,
boolean defer, boolean resolveSymLinks) {
File pathFile = new File(dirName);
@@ -3770,6 +3779,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
}
}
+ // Add any native font family names here
+ addNativeFontFamilyNames(familyNames, requestedLocale);
+
String[] retval = new String[familyNames.size()];
Object [] keyNames = familyNames.keySet().toArray();
for (int i=0; i < keyNames.length; i++) {
@@ -3783,6 +3795,9 @@ public abstract class SunFontManager implements FontSupport, FontManagerForSGE {
return retval;
}
+ // Provides an aperture to add native font family names to the map
+ protected void addNativeFontFamilyNames(TreeMap<String, String> familyNames, Locale requestedLocale) { }
+
public void register1dot0Fonts() {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction() {
diff --git a/jdk/src/share/classes/sun/font/TrueTypeFont.java b/jdk/src/share/classes/sun/font/TrueTypeFont.java
index e60a74b..5a3180e 100644
--- a/jdk/src/share/classes/sun/font/TrueTypeFont.java
+++ b/jdk/src/share/classes/sun/font/TrueTypeFont.java
@@ -1037,6 +1037,9 @@ public class TrueTypeFont extends FileFont {
if (head_Table != null && head_Table.capacity() >= 18) {
ShortBuffer sb = head_Table.asShortBuffer();
upem = sb.get(9) & 0xffff;
+ if (upem < 16 || upem > 16384) {
+ upem = 2048;
+ }
}
ByteBuffer os2_Table = getTableBuffer(os_2Tag);
diff --git a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java
index 4571b81..1a5ae17 100644
--- a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java
+++ b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java
@@ -189,7 +189,7 @@ public final class SunGraphics2D
public int renderHint;
public int antialiasHint;
public int textAntialiasHint;
- private int fractionalMetricsHint;
+ protected int fractionalMetricsHint;
/* A gamma adjustment to the colour used in lcd text blitting */
public int lcdTextContrast;
@@ -370,6 +370,17 @@ public final class SunGraphics2D
}
public void validatePipe() {
+ /* This workaround is for the situation when we update the Pipelines
+ * for invalid SurfaceData and run further code when the current
+ * pipeline doesn't support the type of new SurfaceData created during
+ * the current pipeline's work (in place of the invalid SurfaceData).
+ * Usually SurfaceData and Pipelines are repaired (through revalidateAll)
+ * and called again in the exception handlers */
+
+ if (!surfaceData.isValid()) {
+ throw new InvalidPipeException("attempt to validate Pipe with invalid SurfaceData");
+ }
+
surfaceData.validatePipe(this);
}
@@ -1804,7 +1815,12 @@ public final class SunGraphics2D
width += x;
height += y;
}
- if (!getCompClip().intersectsQuickCheckXYXY(x, y, width, height)) {
+
+ try {
+ if (!getCompClip().intersectsQuickCheckXYXY(x, y, width, height)) {
+ return false;
+ }
+ } catch (InvalidPipeException e) {
return false;
}
// REMIND: We could go one step further here and examine the
@@ -1988,8 +2004,8 @@ public final class SunGraphics2D
try {
doCopyArea(x, y, w, h, dx, dy);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
doCopyArea(x, y, w, h, dx, dy);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2120,8 +2136,8 @@ public final class SunGraphics2D
try {
drawpipe.drawLine(this, x1, y1, x2, y2);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
drawpipe.drawLine(this, x1, y1, x2, y2);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2137,8 +2153,8 @@ public final class SunGraphics2D
try {
drawpipe.drawRoundRect(this, x, y, w, h, arcW, arcH);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
drawpipe.drawRoundRect(this, x, y, w, h, arcW, arcH);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2154,8 +2170,8 @@ public final class SunGraphics2D
try {
fillpipe.fillRoundRect(this, x, y, w, h, arcW, arcH);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
fillpipe.fillRoundRect(this, x, y, w, h, arcW, arcH);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2171,8 +2187,8 @@ public final class SunGraphics2D
try {
drawpipe.drawOval(this, x, y, w, h);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
drawpipe.drawOval(this, x, y, w, h);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2188,8 +2204,8 @@ public final class SunGraphics2D
try {
fillpipe.fillOval(this, x, y, w, h);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
fillpipe.fillOval(this, x, y, w, h);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2206,8 +2222,8 @@ public final class SunGraphics2D
try {
drawpipe.drawArc(this, x, y, w, h, startAngl, arcAngl);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
drawpipe.drawArc(this, x, y, w, h, startAngl, arcAngl);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2224,8 +2240,8 @@ public final class SunGraphics2D
try {
fillpipe.fillArc(this, x, y, w, h, startAngl, arcAngl);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
fillpipe.fillArc(this, x, y, w, h, startAngl, arcAngl);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2241,8 +2257,8 @@ public final class SunGraphics2D
try {
drawpipe.drawPolyline(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
drawpipe.drawPolyline(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2258,8 +2274,8 @@ public final class SunGraphics2D
try {
drawpipe.drawPolygon(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
drawpipe.drawPolygon(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2275,8 +2291,8 @@ public final class SunGraphics2D
try {
fillpipe.fillPolygon(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
fillpipe.fillPolygon(this, xPoints, yPoints, nPoints);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2292,8 +2308,8 @@ public final class SunGraphics2D
try {
drawpipe.drawRect(this, x, y, w, h);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
drawpipe.drawRect(this, x, y, w, h);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2309,8 +2325,8 @@ public final class SunGraphics2D
try {
fillpipe.fillRect(this, x, y, w, h);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
fillpipe.fillRect(this, x, y, w, h);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2358,7 +2374,6 @@ public final class SunGraphics2D
Paint p = paint;
setComposite(AlphaComposite.Src);
setColor(getBackground());
- validatePipe();
fillRect(x, y, w, h);
setPaint(p);
setComposite(c);
@@ -2382,8 +2397,8 @@ public final class SunGraphics2D
try {
shapepipe.draw(this, s);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
shapepipe.draw(this, s);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2412,8 +2427,8 @@ public final class SunGraphics2D
try {
shapepipe.fill(this, s);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
shapepipe.fill(this, s);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2560,10 +2575,17 @@ public final class SunGraphics2D
// Include padding for interpolation/antialiasing if necessary
int pad = isIntegerTranslate ? 0 : 3;
+ Region clip;
+ try {
+ clip = getCompClip();
+ } catch (InvalidPipeException e) {
+ return;
+ }
+
// Determine the region of the image that may contribute to
// the clipped drawing area
Rectangle region = getImageRegion(img,
- getCompClip(),
+ clip,
transform,
xform,
pad, pad);
@@ -2806,8 +2828,8 @@ public final class SunGraphics2D
try {
textpipe.drawString(this, str, x, y);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
textpipe.drawString(this, str, x, y);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2835,8 +2857,8 @@ public final class SunGraphics2D
try {
textpipe.drawString(this, str, x, y);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
textpipe.drawString(this, str, x, y);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2881,8 +2903,8 @@ public final class SunGraphics2D
try {
textpipe.drawGlyphVector(this, gv, x, y);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
textpipe.drawGlyphVector(this, gv, x, y);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2914,8 +2936,8 @@ public final class SunGraphics2D
try {
textpipe.drawChars(this, data, offset, length, x, y);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
textpipe.drawChars(this, data, offset, length, x, y);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2951,8 +2973,8 @@ public final class SunGraphics2D
try {
textpipe.drawChars(this, chData, 0, length, x, y);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
textpipe.drawChars(this, chData, 0, length, x, y);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -2988,8 +3010,8 @@ public final class SunGraphics2D
return imagepipe.copyImage(this, img, dx, dy, sx, sy,
width, height, bgcolor, observer);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
return imagepipe.copyImage(this, img, dx, dy, sx, sy,
width, height, bgcolor, observer);
} catch (InvalidPipeException e2) {
@@ -3025,8 +3047,8 @@ public final class SunGraphics2D
return imagepipe.scaleImage(this, img, x, y, width, height,
bg, observer);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
return imagepipe.scaleImage(this, img, x, y, width, height,
bg, observer);
} catch (InvalidPipeException e2) {
@@ -3061,8 +3083,8 @@ public final class SunGraphics2D
try {
return imagepipe.copyImage(this, img, x, y, bg, observer);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
return imagepipe.copyImage(this, img, x, y, bg, observer);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -3138,8 +3160,8 @@ public final class SunGraphics2D
sx1, sy1, sx2, sy2, bgcolor,
observer);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
return imagepipe.scaleImage(this, img, dx1, dy1, dx2, dy2,
sx1, sy1, sx2, sy2, bgcolor,
observer);
@@ -3187,8 +3209,8 @@ public final class SunGraphics2D
try {
return imagepipe.transformImage(this, img, xform, observer);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
return imagepipe.transformImage(this, img, xform, observer);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
@@ -3213,8 +3235,8 @@ public final class SunGraphics2D
try {
imagepipe.transformImage(this, bImg, op, x, y);
} catch (InvalidPipeException e) {
- revalidateAll();
try {
+ revalidateAll();
imagepipe.transformImage(this, bImg, op, x, y);
} catch (InvalidPipeException e2) {
// Still catching the exception; we are not yet ready to
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java b/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java
index de50877..9e6113e 100644
--- a/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLBlitLoops.java
@@ -347,7 +347,7 @@ class OGLBlitLoops {
OGLBufImgOps.disableBufImgOp(rq, biop);
}
- if (rtt && (oglDst.getType() == OGLSurfaceData.WINDOW)) {
+ if (rtt && oglDst.isOnScreen()) {
// we only have to flush immediately when copying from a
// (non-texture) surface to the screen; otherwise Swing apps
// might appear unresponsive until the auto-flush completes
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java b/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java
index e5e2f87..e30795b 100644
--- a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java
@@ -28,6 +28,8 @@ package sun.java2d.opengl;
import sun.java2d.pipe.RenderBuffer;
import sun.java2d.pipe.RenderQueue;
import static sun.java2d.pipe.BufferedOpCodes.*;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
/**
* OGL-specific implementation of RenderQueue. This class provides a
@@ -41,7 +43,19 @@ public class OGLRenderQueue extends RenderQueue {
private final QueueFlusher flusher;
private OGLRenderQueue() {
- flusher = new QueueFlusher();
+ /*
+ * The thread must be a member of a thread group
+ * which will not get GCed before VM exit.
+ */
+ flusher = AccessController.doPrivileged(new PrivilegedAction<QueueFlusher>() {
+ public QueueFlusher run() {
+ ThreadGroup rootThreadGroup = Thread.currentThread().getThreadGroup();
+ while (rootThreadGroup.getParent() != null) {
+ rootThreadGroup = rootThreadGroup.getParent();
+ }
+ return new QueueFlusher(rootThreadGroup);
+ }
+ });
}
/**
@@ -149,8 +163,8 @@ public class OGLRenderQueue extends RenderQueue {
private Runnable task;
private Error error;
- public QueueFlusher() {
- super("Java2D Queue Flusher");
+ public QueueFlusher(ThreadGroup threadGroup) {
+ super(threadGroup, "Java2D Queue Flusher");
setDaemon(true);
setPriority(Thread.MAX_PRIORITY);
start();
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java b/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java
index 935c68c..7eacd53 100644
--- a/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLRenderer.java
@@ -27,6 +27,7 @@ package sun.java2d.opengl;
import java.awt.Transparency;
import java.awt.geom.Path2D;
+import sun.java2d.InvalidPipeException;
import sun.java2d.SunGraphics2D;
import sun.java2d.loops.GraphicsPrimitive;
import sun.java2d.pipe.BufferedRenderPipe;
@@ -46,7 +47,12 @@ class OGLRenderer extends BufferedRenderPipe {
int ctxflags =
sg2d.paint.getTransparency() == Transparency.OPAQUE ?
OGLContext.SRC_IS_OPAQUE : OGLContext.NO_CONTEXT_FLAGS;
- OGLSurfaceData dstData = (OGLSurfaceData)sg2d.surfaceData;
+ OGLSurfaceData dstData;
+ try {
+ dstData = (OGLSurfaceData)sg2d.surfaceData;
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
OGLContext.validateContext(dstData, dstData,
sg2d.getCompClip(), sg2d.composite,
null, sg2d.paint, sg2d, ctxflags);
@@ -55,7 +61,12 @@ class OGLRenderer extends BufferedRenderPipe {
@Override
protected void validateContextAA(SunGraphics2D sg2d) {
int ctxflags = OGLContext.NO_CONTEXT_FLAGS;
- OGLSurfaceData dstData = (OGLSurfaceData)sg2d.surfaceData;
+ OGLSurfaceData dstData;
+ try {
+ dstData = (OGLSurfaceData)sg2d.surfaceData;
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
OGLContext.validateContext(dstData, dstData,
sg2d.getCompClip(), sg2d.composite,
null, sg2d.paint, sg2d, ctxflags);
@@ -69,7 +80,12 @@ class OGLRenderer extends BufferedRenderPipe {
int ctxflags =
sg2d.surfaceData.getTransparency() == Transparency.OPAQUE ?
OGLContext.SRC_IS_OPAQUE : OGLContext.NO_CONTEXT_FLAGS;
- OGLSurfaceData dstData = (OGLSurfaceData)sg2d.surfaceData;
+ OGLSurfaceData dstData;
+ try {
+ dstData = (OGLSurfaceData)sg2d.surfaceData;
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
OGLContext.validateContext(dstData, dstData,
sg2d.getCompClip(), sg2d.composite,
null, null, null, ctxflags);
diff --git a/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java b/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java
index 3968f05..a495f92 100644
--- a/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java
+++ b/jdk/src/share/classes/sun/java2d/opengl/OGLSurfaceData.java
@@ -650,4 +650,14 @@ public abstract class OGLSurfaceData extends SurfaceData
rq.unlock();
}
}
+
+ /**
+ * Returns true if the surface is an on-screen window surface or
+ * a FBO texture attached to an on-screen CALayer.
+ *
+ * Needed by Mac OS X port.
+ */
+ boolean isOnScreen() {
+ return getType() == WINDOW;
+ }
}
diff --git a/jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java b/jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java
index ae7a07c..9d7ebcb 100644
--- a/jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java
+++ b/jdk/src/share/classes/sun/java2d/pipe/BufferedContext.java
@@ -111,6 +111,8 @@ public abstract class BufferedContext {
*
* Note: must be called while the RenderQueue lock is held.
*
+ * It's assumed that the type of surfaces has been checked by the Renderer
+ *
* @throws InvalidPipeException if either src or dest surface is not valid
* or lost
* @see RenderQueue#lock
@@ -135,6 +137,8 @@ public abstract class BufferedContext {
*
* Note: must be called while the RenderQueue lock is held.
*
+ * It's assumed that the type of surfaces has been checked by the Renderer
+ *
* @throws InvalidPipeException if the surface is not valid
* or lost
* @see RenderQueue#lock
@@ -160,6 +164,8 @@ public abstract class BufferedContext {
*
* Note: must be called while the RenderQueue lock is held.
*
+ * It's assumed that the type of surfaces has been checked by the Renderer
+ *
* @throws InvalidPipeException if either src or dest surface is not valid
* or lost
*/
diff --git a/jdk/src/share/classes/sun/launcher/LauncherHelper.java b/jdk/src/share/classes/sun/launcher/LauncherHelper.java
index 77e21aa..15ff8fc 100644
--- a/jdk/src/share/classes/sun/launcher/LauncherHelper.java
+++ b/jdk/src/share/classes/sun/launcher/LauncherHelper.java
@@ -382,6 +382,10 @@ public class LauncherHelper {
PrintStream ostream = (printToStderr) ? System.err : System.out;
ostream.println(getLocalizedMessage("java.launcher.X.usage",
File.pathSeparator));
+ if (System.getProperty("os.name").startsWith("Mac OS")) {
+ ostream.println(getLocalizedMessage("java.launcher.X.macosx.usage",
+ File.pathSeparator));
+ }
}
static String getMainClassFromJar(PrintStream ostream, String jarname) {
diff --git a/jdk/src/share/classes/sun/launcher/resources/launcher.properties b/jdk/src/share/classes/sun/launcher/resources/launcher.properties
index 0a2c148..defd032 100644
--- a/jdk/src/share/classes/sun/launcher/resources/launcher.properties
+++ b/jdk/src/share/classes/sun/launcher/resources/launcher.properties
@@ -113,6 +113,17 @@ java.launcher.X.usage=\
\ show all locale related settings and continue\n\n\
The -X options are non-standard and subject to change without notice.\n
+# Translators please note do not translate the options themselves
+java.launcher.X.macosx.usage=\
+\n\
+The following options are Mac OS X specific:\n\
+\ -XstartOnFirstThread\n\
+\ run the main() method on the first (AppKit) thread\n\
+\ -Xdock:name=<application name>"\n\
+\ override default application name displayed in dock\n\
+\ -Xdock:icon=<path to icon file>\n\
+\ override default icon displayed in dock\n\n
+
java.launcher.cls.error1=\
Error: Could not find or load main class {0}
java.launcher.cls.error2=\
diff --git a/jdk/src/share/classes/sun/management/Agent.java b/jdk/src/share/classes/sun/management/Agent.java
index d590093..7f65e5c 100644
--- a/jdk/src/share/classes/sun/management/Agent.java
+++ b/jdk/src/share/classes/sun/management/Agent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,30 +25,34 @@
package sun.management;
+import java.io.BufferedInputStream;
import java.io.File;
-import java.io.InputStream;
import java.io.FileInputStream;
-import java.io.BufferedInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.InputStream;
+
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.management.ManagementFactory;
+
import java.text.MessageFormat;
+
+import java.util.MissingResourceException;
import java.util.Properties;
import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.lang.management.ManagementFactory;
-import java.lang.reflect.Method;
import javax.management.remote.JMXConnectorServer;
-import sun.management.jmxremote.ConnectorBootstrap;
import static sun.management.AgentConfigurationError.*;
+import sun.management.jmxremote.ConnectorBootstrap;
import sun.misc.VMSupport;
/**
* This Agent is started by the VM when -Dcom.sun.management.snmp
* or -Dcom.sun.management.jmxremote is set. This class will be
- * loaded by the system class loader.
+ * loaded by the system class loader. Also jmx framework could
+ * be started by jcmd
*/
public class Agent {
// management properties
@@ -69,7 +73,33 @@ public class Agent {
"com.sun.management.jmxremote.localConnectorAddress";
private static final String SNMP_ADAPTOR_BOOTSTRAP_CLASS_NAME =
- "sun.management.snmp.AdaptorBootstrap";
+ "sun.management.snmp.AdaptorBootstrap";
+
+ // The only active agent allowed
+ private static JMXConnectorServer jmxServer = null;
+
+ // Parse string com.sun.management.prop=xxx,com.sun.management.prop=yyyy
+ // and return property set if args is null or empty
+ // return empty property set
+ private static Properties parseString(String args){
+ Properties argProps = new Properties();
+ if (args != null) {
+ for (String option : args.split(",")) {
+ String s[] = option.split("=", 2);
+ String name = s[0].trim();
+ String value = (s.length > 1) ? s[1].trim() : "";
+
+ if (!name.startsWith("com.sun.management.")) {
+ error(INVALID_OPTION, name);
+ }
+
+ argProps.setProperty(name, value);
+ }
+ }
+
+ return argProps;
+ }
+
// invoked by -javaagent or -Dcom.sun.management.agent.class
public static void premain(String args) throws Exception {
@@ -82,37 +112,104 @@ public class Agent {
args = JMXREMOTE; // default to local management
}
- // Parse agent options into properties
+ Properties arg_props = parseString(args);
- Properties arg_props = new Properties();
- if (args != null) {
- String[] options = args.split(",");
- for (int i=0; i<options.length; i++) {
- String[] option = options[i].split("=");
- if (option.length >= 1 && option.length <= 2) {
- String name = option[0];
- String value = (option.length == 1) ? "" : option[1];
- if (name != null && name.length() > 0) {
-
- // Assume that any com.sun.management.* options are okay
- if (name.startsWith("com.sun.management.")) {
- arg_props.setProperty(name, value);
- } else {
- error(INVALID_OPTION, name);
- }
- }
- }
+ // Read properties from the config file
+ Properties config_props = new Properties();
+ String fname = arg_props.getProperty(CONFIG_FILE);
+ readConfiguration(fname, config_props);
+
+ // Arguments override config file
+ config_props.putAll(arg_props);
+ startAgent(config_props);
+ }
+
+ // jcmd ManagementAgent.start_local entry point
+ // Also called due to command-line via startAgent()
+ private static synchronized void startLocalManagementAgent(){
+ Properties agentProps = VMSupport.getAgentProperties();
+
+ // start local connector if not started
+ if (agentProps.get(LOCAL_CONNECTOR_ADDRESS_PROP) == null) {
+ JMXConnectorServer cs = ConnectorBootstrap.startLocalConnectorServer();
+ String address = cs.getAddress().toString();
+ // Add the local connector address to the agent properties
+ agentProps.put(LOCAL_CONNECTOR_ADDRESS_PROP, address);
+
+ try {
+ // export the address to the instrumentation buffer
+ ConnectorAddressLink.export(address);
+ } catch (Exception x) {
+ // Connector server started but unable to export address
+ // to instrumentation buffer - non-fatal error.
+ warning(EXPORT_ADDRESS_FAILED, x.getMessage());
}
}
+ }
- // Read properties from the config file
- Properties config_props = new Properties();
- String fname = arg_props.getProperty(CONFIG_FILE);
- readConfiguration(fname, config_props);
+ // jcmd ManagementAgent.start entry point
+ // This method starts the remote JMX agent and starts neither
+ // the local JMX agent nor the SNMP agent
+ // @see #startLocalManagementAgent and also @see #startAgent.
+ private static synchronized void startRemoteManagementAgent(String args) throws Exception {
+ if (jmxServer != null) {
+ throw new RuntimeException(getText(INVALID_STATE, "Agent already started"));
+ }
+
+ Properties argProps = parseString(args);
+ Properties configProps = new Properties();
+
+ // Load the management properties from the config file
+ // if config file is not specified readConfiguration implicitly
+ // reads <java.home>/lib/management/management.properties
- // Arguments override config file
- config_props.putAll(arg_props);
- startAgent(config_props);
+ String fname = System.getProperty(CONFIG_FILE);
+ readConfiguration(fname, configProps);
+
+ // management properties can be overridden by system properties
+ // which take precedence
+ configProps.putAll(System.getProperties());
+
+ // if user specifies config file into command line for either
+ // jcmd utilities or attach command it overrides properties set in
+ // command line at the time of VM start
+ String fnameUser = argProps.getProperty(CONFIG_FILE);
+ if (fnameUser != null) {
+ readConfiguration(fnameUser, configProps);
+ }
+
+ // arguments specified in command line of jcmd utilities
+ // override both system properties and one set by config file
+ // specified in jcmd command line
+ configProps.putAll(argProps);
+
+ // jcmd doesn't allow to change ThreadContentionMonitoring, but user
+ // can specify this property inside config file, so enable optional
+ // monitoring functionality if this property is set
+ final String enableThreadContentionMonitoring =
+ configProps.getProperty(ENABLE_THREAD_CONTENTION_MONITORING);
+
+ if (enableThreadContentionMonitoring != null) {
+ ManagementFactory.getThreadMXBean().
+ setThreadContentionMonitoringEnabled(true);
+ }
+
+ String jmxremotePort = configProps.getProperty(JMXREMOTE_PORT);
+ if (jmxremotePort != null) {
+ jmxServer = ConnectorBootstrap.
+ startRemoteConnectorServer(jmxremotePort, configProps);
+ }
+ }
+
+ private static synchronized void stopRemoteManagementAgent() throws Exception {
+ if (jmxServer != null) {
+ ConnectorBootstrap.unexportRegistry();
+
+ // Attempt to stop already stopped agent
+ // Don't cause any errors.
+ jmxServer.stop();
+ jmxServer = null;
+ }
}
private static void startAgent(Properties props) throws Exception {
@@ -130,7 +227,7 @@ public class Agent {
try {
if (snmpPort != null) {
- loadSnmpAgent(snmpPort, props);
+ loadSnmpAgent(snmpPort, props);
}
/*
@@ -142,31 +239,14 @@ public class Agent {
* of this "local" server is exported as a counter to the jstat
* instrumentation buffer.
*/
- if (jmxremote != null || jmxremotePort != null) {
+ if (jmxremote != null || jmxremotePort != null) {
if (jmxremotePort != null) {
- ConnectorBootstrap.initialize(jmxremotePort, props);
+ jmxServer = ConnectorBootstrap.
+ startRemoteConnectorServer(jmxremotePort, props);
}
+ startLocalManagementAgent();
+ }
- Properties agentProps = VMSupport.getAgentProperties();
- // start local connector if not started
- // System.out.println("local address : " +
- // agentProps.get(LOCAL_CONNECTOR_ADDRESS_PROP));
- if (agentProps.get(LOCAL_CONNECTOR_ADDRESS_PROP) == null) {
- JMXConnectorServer cs = ConnectorBootstrap.startLocalConnectorServer();
- String address = cs.getAddress().toString();
- // Add the local connector address to the agent properties
- agentProps.put(LOCAL_CONNECTOR_ADDRESS_PROP, address);
-
- try {
- // export the address to the instrumentation buffer
- ConnectorAddressLink.export(address);
- } catch (Exception x) {
- // Connector server started but unable to export address
- // to instrumentation buffer - non-fatal error.
- warning(EXPORT_ADDRESS_FAILED, x.getMessage());
- }
- }
- }
} catch (AgentConfigurationError e) {
error(e.getError(), e.getParams());
} catch (Exception e) {
@@ -187,9 +267,9 @@ public class Agent {
props.putAll(System.getProperties());
return props;
- }
+ }
- public static synchronized Properties getManagementProperties() {
+ public static synchronized Properties getManagementProperties() {
if (mgmtProps == null) {
String configFile = System.getProperty(CONFIG_FILE);
String snmpPort = System.getProperty(SNMP_PORT);
diff --git a/jdk/src/share/classes/sun/management/AgentConfigurationError.java b/jdk/src/share/classes/sun/management/AgentConfigurationError.java
index 5037072..601117e 100644
--- a/jdk/src/share/classes/sun/management/AgentConfigurationError.java
+++ b/jdk/src/share/classes/sun/management/AgentConfigurationError.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -53,6 +53,8 @@ public class AgentConfigurationError extends Error {
"agent.err.invalid.agentclass";
public static final String INVALID_JMXREMOTE_PORT =
"agent.err.invalid.jmxremote.port";
+ public static final String INVALID_JMXREMOTE_RMI_PORT =
+ "agent.err.invalid.jmxremote.rmi.port";
public static final String PASSWORD_FILE_NOT_SET =
"agent.err.password.file.notset";
public static final String PASSWORD_FILE_NOT_READABLE =
@@ -105,6 +107,8 @@ public class AgentConfigurationError extends Error {
"agent.err.snmp.adaptor.start.failed";
public static final String SNMP_MIB_INIT_FAILED =
"agent.err.snmp.mib.init.failed";
+ public static final String INVALID_STATE =
+ "agent.err.invalid.state";
private final String error;
private final String[] params;
diff --git a/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java b/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java
index f48d098..a6d3be1 100644
--- a/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java
+++ b/jdk/src/share/classes/sun/management/HotSpotDiagnostic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,9 @@ package sun.management;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import javax.management.ObjectName;
-import com.sun.management.DiagnosticCommandInfo;
-import com.sun.management.DiagnosticCommandArgumentInfo;
import com.sun.management.HotSpotDiagnosticMXBean;
import com.sun.management.VMOption;
@@ -120,54 +116,7 @@ public class HotSpotDiagnostic implements HotSpotDiagnosticMXBean {
}
}
- public List<String> getDiagnosticCommands() {
- String[] commands = getDiagnosticCommands0();
- return commands == null ? Collections.<String>emptyList() :
- Arrays.asList(commands);
- }
-
- public DiagnosticCommandInfo getDiagnosticCommandInfo(String command) {
- String[] array = new String[] { command };
- return getDiagnosticCommandInfo0(array)[0];
- }
-
- public List<DiagnosticCommandInfo> getDiagnosticCommandInfo() {
- String[] commands = getDiagnosticCommands0();
- return Arrays.asList(getDiagnosticCommandInfo0(commands));
- }
-
- public List<DiagnosticCommandInfo> getDiagnosticCommandInfo(
- List<String> commands) {
- return Arrays.asList(getDiagnosticCommandInfo0(
- commands.toArray(new String[commands.size()])));
- }
-
- public String execute(String command) {
- Util.checkControlAccess();
- return executeDiagnosticCommand0(command);
- }
-
- public String execute(String cmd, String... arguments) {
- if(cmd == null) {
- throw new NullPointerException("Missing command name");
- }
- StringBuilder sb = new StringBuilder();
- sb.append(cmd);
- sb.append(" ");
- for(String arg : arguments) {
- sb.append(arg);
- sb.append(" ");
- }
- return execute(sb.toString());
- }
-
public ObjectName getObjectName() {
return Util.newObjectName("com.sun.management:type=HotSpotDiagnostic");
}
-
- private native String[] getDiagnosticCommands0();
- private native DiagnosticCommandInfo[] getDiagnosticCommandInfo0(
- String[] commands) throws IllegalArgumentException;
- private native String executeDiagnosticCommand0(String command)
- throws IllegalArgumentException;
}
diff --git a/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java b/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
index 7101805..a2f0563 100644
--- a/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
+++ b/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,25 +28,22 @@ package sun.management.jmxremote;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
-
+import java.io.InputStream;
+import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
-
import java.rmi.NoSuchObjectException;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.registry.Registry;
-import java.rmi.server.RemoteObject;
import java.rmi.server.RMIClientSocketFactory;
import java.rmi.server.RMIServerSocketFactory;
+import java.rmi.server.RemoteObject;
import java.rmi.server.UnicastRemoteObject;
-
import java.security.KeyStore;
import java.security.Principal;
-
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -55,35 +52,31 @@ import java.util.Properties;
import java.util.Set;
import java.util.StringTokenizer;
-import java.lang.management.ManagementFactory;
-
-import javax.net.ssl.*;
-
import javax.management.MBeanServer;
import javax.management.remote.JMXAuthenticator;
import javax.management.remote.JMXConnectorServer;
import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
import javax.management.remote.rmi.RMIConnectorServer;
-
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
import javax.rmi.ssl.SslRMIClientSocketFactory;
import javax.rmi.ssl.SslRMIServerSocketFactory;
-
import javax.security.auth.Subject;
-import sun.rmi.server.UnicastRef;
-import sun.rmi.server.UnicastServerRef;
-import sun.rmi.server.UnicastServerRef2;
+import com.sun.jmx.remote.internal.RMIExporter;
+import com.sun.jmx.remote.security.JMXPluggableAuthenticator;
+import com.sun.jmx.remote.util.ClassLogger;
import sun.management.Agent;
import sun.management.AgentConfigurationError;
import static sun.management.AgentConfigurationError.*;
import sun.management.ConnectorAddressLink;
import sun.management.FileSystem;
-import com.sun.jmx.remote.util.ClassLogger;
-
-import com.sun.jmx.remote.internal.RMIExporter;
-import com.sun.jmx.remote.security.JMXPluggableAuthenticator;
+import sun.rmi.server.UnicastRef;
+import sun.rmi.server.UnicastServerRef;
+import sun.rmi.server.UnicastServerRef2;
/**
* This class initializes and starts the RMIConnectorServer for JSR 163
@@ -114,6 +107,8 @@ public final class ConnectorBootstrap {
public static final String PORT =
"com.sun.management.jmxremote.port";
+ public static final String RMI_PORT =
+ "com.sun.management.jmxremote.rmi.port";
public static final String CONFIG_FILE_NAME =
"com.sun.management.config.file";
public static final String USE_LOCAL_ONLY =
@@ -266,34 +261,61 @@ public final class ConnectorBootstrap {
private final String accessFile;
}
- /**
- * Initializes and starts the JMX Connector Server.
- * If the com.sun.management.jmxremote.port property is not defined,
- * simply return. Otherwise, attempts to load the config file, and
- * then calls {@link #initialize(java.lang.String, java.util.Properties)}.
- *
- **/
- public static synchronized JMXConnectorServer initialize() {
+ // The variable below is here to support stop functionality
+ // It would be overriten if you call startRemoteCommectionServer second
+ // time. It's OK for now as logic in Agent.java forbids mutiple agents
+ private static Registry registry = null;
- // Load a new management properties
- final Properties props = Agent.loadManagementProperties();
- if (props == null) {
- return null;
+ public static void unexportRegistry() {
+ // Remove the entry from registry
+ try {
+ if (registry != null) {
+ UnicastRemoteObject.unexportObject(registry, true);
+ registry = null;
+ }
+ } catch(NoSuchObjectException ex) {
+ // This exception can appears only if we attempt
+ // to unexportRegistry second time. So it's safe
+ // to ignore it without additional messages.
}
+ }
- final String portStr = props.getProperty(PropertyNames.PORT);
-
+ /**
+ * Initializes and starts the JMX Connector Server.
+ * If the com.sun.management.jmxremote.port property is not defined,
+ * simply return. Otherwise, attempts to load the config file, and
+ * then calls {@link #startRemoteConnectorServer
+ * (java.lang.String, java.util.Properties)}.
+ *
+ * This method is used by some jtreg tests.
+ **/
+ public static synchronized JMXConnectorServer initialize() {
+
+ // Load a new management properties
+ final Properties props = Agent.loadManagementProperties();
+ if (props == null) {
+ return null;
+ }
+
+ final String portStr = props.getProperty(PropertyNames.PORT);
+ return startRemoteConnectorServer(portStr, props);
+ }
- // System.out.println("initializing: {port=" + portStr + ",
- // properties="+props+"}");
- return initialize(portStr, props);
+ /**
+ * This method is used by some jtreg tests.
+ *
+ * @see #startRemoteConnectorServer
+ * (String portStr, Properties props)
+ */
+ public static synchronized JMXConnectorServer initialize(String portStr, Properties props) {
+ return startRemoteConnectorServer(portStr, props);
}
/**
* Initializes and starts a JMX Connector Server for remote
* monitoring and management.
**/
- public static synchronized JMXConnectorServer initialize(String portStr, Properties props) {
+ public static synchronized JMXConnectorServer startRemoteConnectorServer(String portStr, Properties props) {
// Get port number
final int port;
@@ -306,6 +328,22 @@ public final class ConnectorBootstrap {
throw new AgentConfigurationError(INVALID_JMXREMOTE_PORT, portStr);
}
+ // User can specify a port to be used to export rmi object,
+ // in order to simplify firewall rules
+ // if port is not specified random one will be allocated.
+ int rmiPort = 0;
+ String rmiPortStr = props.getProperty(PropertyNames.RMI_PORT);
+ try {
+ if (rmiPortStr != null) {
+ rmiPort = Integer.parseInt(rmiPortStr);
+ }
+ } catch (NumberFormatException x) {
+ throw new AgentConfigurationError(INVALID_JMXREMOTE_RMI_PORT, x, rmiPortStr);
+ }
+ if (rmiPort < 0) {
+ throw new AgentConfigurationError(INVALID_JMXREMOTE_RMI_PORT, rmiPortStr);
+ }
+
// Do we use authentication?
final String useAuthenticationStr =
props.getProperty(PropertyNames.USE_AUTHENTICATION,
@@ -387,9 +425,10 @@ public final class ConnectorBootstrap {
}
if (log.debugOn()) {
- log.debug("initialize",
- Agent.getText("jmxremote.ConnectorBootstrap.initialize") +
+ log.debug("startRemoteConnectorServer",
+ Agent.getText("jmxremote.ConnectorBootstrap.starting") +
"\n\t" + PropertyNames.PORT + "=" + port +
+ "\n\t" + PropertyNames.RMI_PORT + "=" + rmiPort +
"\n\t" + PropertyNames.USE_SSL + "=" + useSsl +
"\n\t" + PropertyNames.USE_REGISTRY_SSL + "=" + useRegistrySsl +
"\n\t" + PropertyNames.SSL_CONFIG_FILE_NAME + "=" + sslConfigFileName +
@@ -404,7 +443,7 @@ public final class ConnectorBootstrap {
(useAuthentication ? (loginConfigName == null ? ("\n\t" + PropertyNames.PASSWORD_FILE_NAME + "=" +
passwordFileName) : ("\n\t" + PropertyNames.LOGIN_CONFIG_NAME + "=" +
loginConfigName)) : "\n\t" +
- Agent.getText("jmxremote.ConnectorBootstrap.initialize.noAuthentication")) +
+ Agent.getText("jmxremote.ConnectorBootstrap.noAuthentication")) +
(useAuthentication ? ("\n\t" + PropertyNames.ACCESS_FILE_NAME + "=" +
accessFileName) : "") +
"");
@@ -415,15 +454,15 @@ public final class ConnectorBootstrap {
JMXServiceURL url = null;
try {
final JMXConnectorServerData data = exportMBeanServer(
- mbs, port, useSsl, useRegistrySsl,
+ mbs, port, rmiPort, useSsl, useRegistrySsl,
sslConfigFileName, enabledCipherSuitesList,
enabledProtocolsList, sslNeedClientAuth,
useAuthentication, loginConfigName,
passwordFileName, accessFileName);
cs = data.jmxConnectorServer;
url = data.jmxRemoteURL;
- log.config("initialize",
- Agent.getText("jmxremote.ConnectorBootstrap.initialize.ready",
+ log.config("startRemoteConnectorServer",
+ Agent.getText("jmxremote.ConnectorBootstrap.ready",
url.toString()));
} catch (Exception e) {
throw new AgentConfigurationError(AGENT_EXCEPTION, e, e.toString());
@@ -442,7 +481,7 @@ public final class ConnectorBootstrap {
// Remote connector server started but unable to export remote
// connector address and associated configuration properties to
// the instrumentation buffer - non-fatal error.
- log.debug("initialize", e);
+ log.debug("startRemoteConnectorServer", e);
}
return cs;
}
@@ -517,9 +556,9 @@ public final class ConnectorBootstrap {
try {
if (fs.supportsFileSecurity(file)) {
if (!fs.isAccessUserOnly(file)) {
- final String msg = Agent.getText("jmxremote.ConnectorBootstrap.initialize.password.readonly",
+ final String msg = Agent.getText("jmxremote.ConnectorBootstrap.password.readonly",
passwordFileName);
- log.config("initialize", msg);
+ log.config("startRemoteConnectorServer", msg);
throw new AgentConfigurationError(PASSWORD_FILE_ACCESS_NOT_RESTRICTED,
passwordFileName);
}
@@ -560,9 +599,9 @@ public final class ConnectorBootstrap {
if (fs.supportsFileSecurity(file)) {
if (!fs.isAccessUserOnly(file)) {
final String msg = Agent.getText(
- "jmxremote.ConnectorBootstrap.initialize.file.readonly",
+ "jmxremote.ConnectorBootstrap.file.readonly",
restrictedFileName);
- log.config("initialize", msg);
+ log.config("startRemoteConnectorServer", msg);
throw new AgentConfigurationError(
FILE_ACCESS_NOT_RESTRICTED, restrictedFileName);
}
@@ -662,6 +701,7 @@ public final class ConnectorBootstrap {
private static JMXConnectorServerData exportMBeanServer(
MBeanServer mbs,
int port,
+ int rmiPort,
boolean useSsl,
boolean useRegistrySsl,
String sslConfigFileName,
@@ -679,7 +719,7 @@ public final class ConnectorBootstrap {
* IDs. */
System.setProperty("java.rmi.server.randomIDs", "true");
- JMXServiceURL url = new JMXServiceURL("rmi", null, 0);
+ JMXServiceURL url = new JMXServiceURL("rmi", null, rmiPort);
Map<String, Object> env = new HashMap<>();
@@ -736,7 +776,6 @@ public final class ConnectorBootstrap {
}
}
- final Registry registry;
if (useRegistrySsl) {
registry =
new SingleEntryRegistry(port, csf, ssf,
@@ -747,10 +786,12 @@ public final class ConnectorBootstrap {
"jmxrmi", exporter.firstExported);
}
- JMXServiceURL remoteURL = new JMXServiceURL(
- "service:jmx:rmi:///jndi/rmi://" + url.getHost() + ":" +
- ((UnicastRef) ((RemoteObject) registry).getRef()).getLiveRef().getPort() +
- "/jmxrmi");
+
+ int registryPort =
+ ((UnicastRef) ((RemoteObject) registry).getRef()).getLiveRef().getPort();
+ String jmxUrlStr = String.format("service:jmx:rmi:///jndi/rmi://%s:%d/jmxrmi",
+ url.getHost(), registryPort);
+ JMXServiceURL remoteURL = new JMXServiceURL(jmxUrlStr);
/* Our exporter remembers the first object it was asked to
export, which will be an RMIServerImpl appropriate for
diff --git a/jdk/src/share/classes/sun/management/resources/agent.properties b/jdk/src/share/classes/sun/management/resources/agent.properties
index 88c3b46..3ca2386 100644
--- a/jdk/src/share/classes/sun/management/resources/agent.properties
+++ b/jdk/src/share/classes/sun/management/resources/agent.properties
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,9 @@ agent.err.agentclass.failed = Management agent class failed
agent.err.premain.notfound = premain(String) does not exist in agent class
agent.err.agentclass.access.denied = Access to premain(String) is denied
agent.err.invalid.agentclass = Invalid com.sun.management.agent.class property value
-
+agent.err.invalid.state = Invalid agent state
agent.err.invalid.jmxremote.port = Invalid com.sun.management.jmxremote.port number
+agent.err.invalid.jmxremote.rmi.port = Invalid com.sun.management.jmxremote.rmi.port number
agent.err.file.not.set = File not specified
agent.err.file.not.readable = File not readable
@@ -78,11 +79,11 @@ agent.err.acl.file.access.notrestricted = Password file read access must be rest
agent.err.snmp.adaptor.start.failed = Failed to start SNMP adaptor with address
agent.err.snmp.mib.init.failed = Failed to initialize SNMP MIB with error
-jmxremote.ConnectorBootstrap.initialize = Starting JMX Connector Server:
-jmxremote.ConnectorBootstrap.initialize.noAuthentication = No Authentication
-jmxremote.ConnectorBootstrap.initialize.ready = JMX Connector ready at: {0}
-jmxremote.ConnectorBootstrap.initialize.password.readonly = Password file read access must be restricted: {0}
-jmxremote.ConnectorBootstrap.initialize.file.readonly = File read access must be restricted: {0}
+jmxremote.ConnectorBootstrap.starting = Starting JMX Connector Server:
+jmxremote.ConnectorBootstrap.noAuthentication = No Authentication
+jmxremote.ConnectorBootstrap.ready = JMX Connector ready at: {0}
+jmxremote.ConnectorBootstrap.password.readonly = Password file read access must be restricted: {0}
+jmxremote.ConnectorBootstrap.file.readonly = File read access must be restricted: {0}
jmxremote.AdaptorBootstrap.getTargetList.processing = Processing ACL
jmxremote.AdaptorBootstrap.getTargetList.adding = Adding target: {0}
diff --git a/jdk/src/share/classes/sun/misc/SharedSecrets.java b/jdk/src/share/classes/sun/misc/SharedSecrets.java
index f03aa93..431315c 100644
--- a/jdk/src/share/classes/sun/misc/SharedSecrets.java
+++ b/jdk/src/share/classes/sun/misc/SharedSecrets.java
@@ -53,6 +53,7 @@ public class SharedSecrets {
private static JavaIOFileDescriptorAccess javaIOFileDescriptorAccess;
private static JavaSecurityProtectionDomainAccess javaSecurityProtectionDomainAccess;
private static JavaSecurityAccess javaSecurityAccess;
+ private static JavaAWTAccess javaAWTAccess;
public static JavaUtilJarAccess javaUtilJarAccess() {
if (javaUtilJarAccess == null) {
@@ -159,4 +160,14 @@ public class SharedSecrets {
}
return javaSecurityAccess;
}
+
+ public static void setJavaAWTAccess(JavaAWTAccess jaa) {
+ javaAWTAccess = jaa;
+ }
+
+ public static JavaAWTAccess getJavaAWTAccess() {
+ // this may return null in which case calling code needs to
+ // provision for.
+ return javaAWTAccess;
+ }
}
diff --git a/jdk/src/share/classes/sun/net/httpserver/Request.java b/jdk/src/share/classes/sun/net/httpserver/Request.java
index f0b56e1..18e1c3c 100644
--- a/jdk/src/share/classes/sun/net/httpserver/Request.java
+++ b/jdk/src/share/classes/sun/net/httpserver/Request.java
@@ -200,6 +200,13 @@ class Request {
v = new String();
else
v = String.copyValueOf(s, keyend, len - keyend);
+
+ if (hdrs.size() >= ServerConfig.getMaxReqHeaders()) {
+ throw new IOException("Maximum number of request headers (" +
+ "sun.net.httpserver.maxReqHeaders) exceeded, " +
+ ServerConfig.getMaxReqHeaders() + ".");
+ }
+
hdrs.add (k,v);
len = 0;
}
diff --git a/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java b/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
index 1b79163..a6b7427 100644
--- a/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
+++ b/jdk/src/share/classes/sun/net/httpserver/ServerConfig.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,32 +35,33 @@ import java.security.PrivilegedAction;
class ServerConfig {
- static int clockTick;
-
- static final int DEFAULT_CLOCK_TICK = 10000 ; // 10 sec.
+ private static final int DEFAULT_CLOCK_TICK = 10000 ; // 10 sec.
/* These values must be a reasonable multiple of clockTick */
- static final long DEFAULT_IDLE_INTERVAL = 30 ; // 5 min
- static final int DEFAULT_MAX_IDLE_CONNECTIONS = 200 ;
-
- static final long DEFAULT_MAX_REQ_TIME = -1; // default: forever
- static final long DEFAULT_MAX_RSP_TIME = -1; // default: forever
- static final long DEFAULT_TIMER_MILLIS = 1000;
-
- static final long DEFAULT_DRAIN_AMOUNT = 64 * 1024;
-
- static long idleInterval;
- static long drainAmount; // max # of bytes to drain from an inputstream
- static int maxIdleConnections;
-
+ private static final long DEFAULT_IDLE_INTERVAL = 30 ; // 5 min
+ private static final int DEFAULT_MAX_IDLE_CONNECTIONS = 200 ;
+
+ private static final long DEFAULT_MAX_REQ_TIME = -1; // default: forever
+ private static final long DEFAULT_MAX_RSP_TIME = -1; // default: forever
+ private static final long DEFAULT_TIMER_MILLIS = 1000;
+ private static final int DEFAULT_MAX_REQ_HEADERS = 200;
+ private static final long DEFAULT_DRAIN_AMOUNT = 64 * 1024;
+
+ private static int clockTick;
+ private static long idleInterval;
+ // The maximum number of bytes to drain from an inputstream
+ private static long drainAmount;
+ private static int maxIdleConnections;
+ // The maximum number of request headers allowable
+ private static int maxReqHeaders;
// max time a request or response is allowed to take
- static long maxReqTime;
- static long maxRspTime;
- static long timerMillis;
- static boolean debug;
+ private static long maxReqTime;
+ private static long maxRspTime;
+ private static long timerMillis;
+ private static boolean debug;
// the value of the TCP_NODELAY socket-level option
- static boolean noDelay;
+ private static boolean noDelay;
static {
java.security.AccessController.doPrivileged(
@@ -80,6 +81,10 @@ class ServerConfig {
drainAmount = Long.getLong("sun.net.httpserver.drainAmount",
DEFAULT_DRAIN_AMOUNT);
+ maxReqHeaders = Integer.getInteger(
+ "sun.net.httpserver.maxReqHeaders",
+ DEFAULT_MAX_REQ_HEADERS);
+
maxReqTime = Long.getLong("sun.net.httpserver.maxReqTime",
DEFAULT_MAX_REQ_TIME);
@@ -99,8 +104,7 @@ class ServerConfig {
}
-
- static void checkLegacyProperties (final Logger logger) {
+ static void checkLegacyProperties(final Logger logger) {
// legacy properties that are no longer used
// print a warning to logger if they are set.
@@ -137,35 +141,39 @@ class ServerConfig {
);
}
- static boolean debugEnabled () {
+ static boolean debugEnabled() {
return debug;
}
- static long getIdleInterval () {
+ static long getIdleInterval() {
return idleInterval;
}
- static int getClockTick () {
+ static int getClockTick() {
return clockTick;
}
- static int getMaxIdleConnections () {
+ static int getMaxIdleConnections() {
return maxIdleConnections;
}
- static long getDrainAmount () {
+ static long getDrainAmount() {
return drainAmount;
}
- static long getMaxReqTime () {
+ static int getMaxReqHeaders() {
+ return maxReqHeaders;
+ }
+
+ static long getMaxReqTime() {
return maxReqTime;
}
- static long getMaxRspTime () {
+ static long getMaxRspTime() {
return maxRspTime;
}
- static long getTimerMillis () {
+ static long getTimerMillis() {
return timerMillis;
}
diff --git a/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java b/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
index 39eadae..d7aa358 100644
--- a/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
+++ b/jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
@@ -111,7 +111,7 @@ public class DefaultProxySelector extends ProxySelector {
static class NonProxyInfo {
// Default value for nonProxyHosts, this provides backward compatibility
// by excluding localhost and its litteral notations.
- static final String defStringVal = "localhost|127.*|[::1]";
+ static final String defStringVal = "localhost|127.*|[::1]|0.0.0.0|[::0]";
String hostsSource;
RegexpPool hostsPool;
@@ -249,6 +249,12 @@ public class DefaultProxySelector extends ProxySelector {
nprop.hostsSource = null;
nprop.hostsPool = null;
}
+ } else if (nphosts.length() != 0) {
+ // add the required default patterns
+ // but only if property no set. If it
+ // is empty, leave empty.
+ nphosts += "|" + NonProxyInfo
+ .defStringVal;
}
if (nphosts != null) {
if (!nphosts.equals(nprop.hostsSource)) {
diff --git a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
index 719ddc4..50cecb0 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
@@ -270,7 +270,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
protected Proxy instProxy;
private CookieHandler cookieHandler;
- private ResponseCache cacheHandler;
+ private final ResponseCache cacheHandler;
// the cached response, and cached response headers and body
protected CacheResponse cachedResponse;
@@ -1579,7 +1579,7 @@ public class HttpURLConnection extends java.net.HttpURLConnection {
if (respCode == 200 || respCode == 203 || respCode == 206 ||
respCode == 300 || respCode == 301 || respCode == 410) {
- if (cacheHandler != null) {
+ if (cacheHandler != null && getUseCaches()) {
// give cache a chance to save response in cache
URI uri = ParseUtil.toURI(url);
if (uri != null) {
diff --git a/jdk/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java b/jdk/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
index b4d0d72..b0f943d 100644
--- a/jdk/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
+++ b/jdk/src/share/classes/sun/nio/ch/AbstractPollArrayWrapper.java
@@ -35,15 +35,15 @@ import sun.misc.*;
* @since 1.4
*/
-abstract class AbstractPollArrayWrapper {
+public abstract class AbstractPollArrayWrapper {
// Event masks
- static final short POLLIN = 0x0001;
- static final short POLLOUT = 0x0004;
- static final short POLLERR = 0x0008;
- static final short POLLHUP = 0x0010;
- static final short POLLNVAL = 0x0020;
- static final short POLLREMOVE = 0x0800;
+ public static final short POLLIN = 0x0001;
+ public static final short POLLOUT = 0x0004;
+ public static final short POLLERR = 0x0008;
+ public static final short POLLHUP = 0x0010;
+ public static final short POLLNVAL = 0x0020;
+ public static final short POLLREMOVE = 0x0800;
// Miscellaneous constants
static final short SIZE_POLLFD = 8;
diff --git a/jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java b/jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
index 8f3a7dc..225ac63 100644
--- a/jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/AbstractPollSelectorImpl.java
@@ -67,7 +67,7 @@ abstract class AbstractPollSelectorImpl
this.channelOffset = offset;
}
- void putEventOps(SelectionKeyImpl sk, int ops) {
+ public void putEventOps(SelectionKeyImpl sk, int ops) {
synchronized (closeLock) {
if (closed)
throw new ClosedSelectorException();
diff --git a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
index bdc5022..466a5db 100644
--- a/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/DatagramChannelImpl.java
@@ -509,8 +509,15 @@ class DatagramChannelImpl
int rem = (pos <= lim ? lim - pos : 0);
boolean preferIPv6 = (family != StandardProtocolFamily.INET);
- int written = send0(preferIPv6, fd, ((DirectBuffer)bb).address() + pos,
+ int written;
+ try {
+ written = send0(preferIPv6, fd, ((DirectBuffer)bb).address() + pos,
rem, target);
+ } catch (PortUnreachableException pue) {
+ if (isConnected())
+ throw pue;
+ written = rem;
+ }
if (written > 0)
bb.position(pos + written);
return written;
diff --git a/jdk/src/share/classes/sun/nio/ch/IOStatus.java b/jdk/src/share/classes/sun/nio/ch/IOStatus.java
index 92b99fe..68802c0 100644
--- a/jdk/src/share/classes/sun/nio/ch/IOStatus.java
+++ b/jdk/src/share/classes/sun/nio/ch/IOStatus.java
@@ -28,16 +28,16 @@ package sun.nio.ch;
// Constants for reporting I/O status
-final class IOStatus {
+public final class IOStatus {
private IOStatus() { }
- static final int EOF = -1; // End of file
- static final int UNAVAILABLE = -2; // Nothing available (non-blocking)
- static final int INTERRUPTED = -3; // System call interrupted
- static final int UNSUPPORTED = -4; // Operation not supported
- static final int THROWN = -5; // Exception thrown in JNI code
- static final int UNSUPPORTED_CASE = -6; // This case not supported
+ public static final int EOF = -1; // End of file
+ public static final int UNAVAILABLE = -2; // Nothing available (non-blocking)
+ public static final int INTERRUPTED = -3; // System call interrupted
+ public static final int UNSUPPORTED = -4; // Operation not supported
+ public static final int THROWN = -5; // Exception thrown in JNI code
+ public static final int UNSUPPORTED_CASE = -6; // This case not supported
// The following two methods are for use in try/finally blocks where a
// status value needs to be normalized before being returned to the invoker
@@ -55,28 +55,28 @@ final class IOStatus {
// }
//
- static int normalize(int n) {
+ public static int normalize(int n) {
if (n == UNAVAILABLE)
return 0;
return n;
}
- static boolean check(int n) {
+ public static boolean check(int n) {
return (n >= UNAVAILABLE);
}
- static long normalize(long n) {
+ public static long normalize(long n) {
if (n == UNAVAILABLE)
return 0;
return n;
}
- static boolean check(long n) {
+ public static boolean check(long n) {
return (n >= UNAVAILABLE);
}
// Return true iff n is not one of the IOStatus values
- static boolean checkAll(long n) {
+ public static boolean checkAll(long n) {
return ((n > EOF) || (n < UNSUPPORTED_CASE));
}
diff --git a/jdk/src/share/classes/sun/nio/ch/IOUtil.java b/jdk/src/share/classes/sun/nio/ch/IOUtil.java
index 559d647..e5320bc 100644
--- a/jdk/src/share/classes/sun/nio/ch/IOUtil.java
+++ b/jdk/src/share/classes/sun/nio/ch/IOUtil.java
@@ -34,7 +34,7 @@ import java.nio.ByteBuffer;
* File-descriptor based I/O utilities that are shared by NIO classes.
*/
-class IOUtil {
+public class IOUtil {
private IOUtil() { } // No instantiation
@@ -309,7 +309,7 @@ class IOUtil {
}
}
- static FileDescriptor newFD(int i) {
+ public static FileDescriptor newFD(int i) {
FileDescriptor fd = new FileDescriptor();
setfdVal(fd, i);
return fd;
@@ -326,10 +326,11 @@ class IOUtil {
static native boolean drain(int fd) throws IOException;
- static native void configureBlocking(FileDescriptor fd, boolean blocking)
+ public static native void configureBlocking(FileDescriptor fd,
+ boolean blocking)
throws IOException;
- static native int fdVal(FileDescriptor fd);
+ public static native int fdVal(FileDescriptor fd);
static native void setfdVal(FileDescriptor fd, int value);
diff --git a/jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java b/jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java
index 51eabbc..8c976ce 100644
--- a/jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java
+++ b/jdk/src/share/classes/sun/nio/ch/NativeThreadSet.java
@@ -44,8 +44,9 @@ class NativeThreadSet {
//
int add() {
long th = NativeThread.current();
- if (th == -1)
- return -1;
+ // 0 and -1 are treated as placeholders, not real thread handles
+ if (th == 0)
+ th = -1;
synchronized (this) {
int start = 0;
if (used >= elts.length) {
@@ -71,8 +72,6 @@ class NativeThreadSet {
// Removes the thread at the given index.
//
void remove(int i) {
- if (i < 0)
- return;
synchronized (this) {
elts[i] = 0;
used--;
@@ -91,7 +90,8 @@ class NativeThreadSet {
long th = elts[i];
if (th == 0)
continue;
- NativeThread.signal(th);
+ if (th != -1)
+ NativeThread.signal(th);
if (--u == 0)
break;
}
diff --git a/jdk/src/share/classes/sun/nio/ch/Net.java b/jdk/src/share/classes/sun/nio/ch/Net.java
index aecbc7b..9f2d1f0 100644
--- a/jdk/src/share/classes/sun/nio/ch/Net.java
+++ b/jdk/src/share/classes/sun/nio/ch/Net.java
@@ -33,7 +33,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
-class Net { // package-private
+public class Net {
private Net() { }
@@ -75,7 +75,7 @@ class Net { // package-private
return canJoin6WithIPv4Group0();
}
- static InetSocketAddress checkAddress(SocketAddress sa) {
+ public static InetSocketAddress checkAddress(SocketAddress sa) {
if (sa == null)
throw new NullPointerException();
if (!(sa instanceof InetSocketAddress))
@@ -330,7 +330,7 @@ class Net { // package-private
// Due to oddities SO_REUSEADDR on windows reuse is ignored
private static native int socket0(boolean preferIPv6, boolean stream, boolean reuse);
- static void bind(FileDescriptor fd, InetAddress addr, int port)
+ public static void bind(FileDescriptor fd, InetAddress addr, int port)
throws IOException
{
bind(UNSPEC, fd, addr, port);
@@ -383,7 +383,7 @@ class Net { // package-private
private static native InetAddress localInetAddress(FileDescriptor fd)
throws IOException;
- static InetSocketAddress localAddress(FileDescriptor fd)
+ public static InetSocketAddress localAddress(FileDescriptor fd)
throws IOException
{
return new InetSocketAddress(localInetAddress(fd), localPort(fd));
diff --git a/jdk/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java b/jdk/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java
deleted file mode 100644
index 676ac9c..0000000
--- a/jdk/src/share/classes/sun/nio/ch/SctpMessageInfoImpl.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.SocketAddress;
-import com.sun.nio.sctp.MessageInfo;
-import com.sun.nio.sctp.Association;
-
-/**
- * An implementation of a MessageInfo.
- */
-public class SctpMessageInfoImpl extends MessageInfo {
- private final SocketAddress address;
- private final int bytes; /* 0 */
-
- private Association association;
- private int assocId;
- private int streamNumber;
- private boolean complete = true;
- private boolean unordered; /* false */
- private long timeToLive; /* 0L */
- private int ppid; /* 0 */
-
- public SctpMessageInfoImpl(Association association,
- SocketAddress address,
- int streamNumber) {
- this.association = association;
- this.address = address;
- this.streamNumber = streamNumber;
- bytes = 0;
- }
-
- /* Invoked from native */
- private SctpMessageInfoImpl(int assocId,
- SocketAddress address,
- int bytes,
- int streamNumber,
- boolean complete,
- boolean unordered,
- int ppid) {
- this.assocId = assocId;
- this.address = address;
- this.bytes = bytes;
- this.streamNumber = streamNumber;
- this.complete = complete;
- this.unordered = unordered;
- this.ppid = ppid;
- }
-
- @Override
- public Association association() {
- return association;
- }
-
- /**
- * SctpMessageInfoImpl instances created from native will need to have their
- * association set from the channel.
- */
- void setAssociation(Association association) {
- this.association = association;
- }
-
- int associationID() {
- return assocId;
- }
-
- @Override
- public SocketAddress address() {
- return address;
- }
-
- @Override
- public int bytes() {
- return bytes;
- }
-
- @Override
- public int streamNumber() {
- return streamNumber;
- }
-
- @Override
- public MessageInfo streamNumber(int streamNumber) {
- if (streamNumber < 0 || streamNumber > 65536)
- throw new IllegalArgumentException("Invalid stream number");
-
- this.streamNumber = streamNumber;
- return this;
- }
-
- @Override
- public int payloadProtocolID() {
- return ppid;
- }
-
- @Override
- public MessageInfo payloadProtocolID(int ppid) {
- this.ppid = ppid;
- return this;
- }
-
- @Override
- public boolean isComplete() {
- return complete;
- }
-
- @Override
- public MessageInfo complete(boolean complete) {
- this.complete = complete;
- return this;
- }
-
- @Override
- public boolean isUnordered() {
- return unordered;
- }
-
- @Override
- public MessageInfo unordered(boolean unordered) {
- this.unordered = unordered;
- return this;
- }
-
- @Override
- public long timeToLive() {
- return timeToLive;
- }
-
- @Override
- public MessageInfo timeToLive(long millis) {
- timeToLive = millis;
- return this;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder(super.toString());
- sb.append( "[Address: ").append(address)
- .append(", Association: ").append(association)
- .append(", Assoc ID: ").append(assocId)
- .append(", Bytes: ").append(bytes)
- .append(", Stream Number: ").append(streamNumber)
- .append(", Complete: ").append(complete)
- .append(", isUnordered: ").append(unordered)
- .append("]");
- return sb.toString();
- }
-}
diff --git a/jdk/src/share/classes/sun/nio/ch/SctpStdSocketOption.java b/jdk/src/share/classes/sun/nio/ch/SctpStdSocketOption.java
deleted file mode 100644
index f94c759..0000000
--- a/jdk/src/share/classes/sun/nio/ch/SctpStdSocketOption.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import com.sun.nio.sctp.SctpSocketOption;
-
-public class SctpStdSocketOption<T>
- implements SctpSocketOption<T>
-{
- /* for native mapping of int options */
- public static final int SCTP_DISABLE_FRAGMENTS = 1;
- public static final int SCTP_EXPLICIT_COMPLETE = 2;
- public static final int SCTP_FRAGMENT_INTERLEAVE = 3;
- public static final int SCTP_NODELAY = 4;
- public static final int SO_SNDBUF = 5;
- public static final int SO_RCVBUF = 6;
- public static final int SO_LINGER = 7;
-
- private final String name;
- private final Class<T> type;
-
- /* for native mapping of int options */
- private int constValue;
-
- public SctpStdSocketOption(String name, Class<T> type) {
- this.name = name;
- this.type = type;
- }
-
- public SctpStdSocketOption(String name, Class<T> type, int constValue) {
- this.name = name;
- this.type = type;
- this.constValue = constValue;
- }
-
- @Override
- public String name() {
- return name;
- }
-
- @Override
- public Class<T> type() {
- return type;
- }
-
- @Override
- public String toString() {
- return name;
- }
-
- int constValue() {
- return constValue;
- }
-}
diff --git a/jdk/src/share/classes/sun/nio/ch/SelChImpl.java b/jdk/src/share/classes/sun/nio/ch/SelChImpl.java
index 580bc33..2f97faf 100644
--- a/jdk/src/share/classes/sun/nio/ch/SelChImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/SelChImpl.java
@@ -36,7 +36,7 @@ import java.io.IOException;
* @since 1.4
*/
-interface SelChImpl extends Channel {
+public interface SelChImpl extends Channel {
FileDescriptor getFD();
diff --git a/jdk/src/share/classes/sun/nio/ch/SelectionKeyImpl.java b/jdk/src/share/classes/sun/nio/ch/SelectionKeyImpl.java
index fd2c28f..ce1783e 100644
--- a/jdk/src/share/classes/sun/nio/ch/SelectionKeyImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/SelectionKeyImpl.java
@@ -34,12 +34,12 @@ import java.nio.channels.spi.*;
* An implementation of SelectionKey for Solaris.
*/
-class SelectionKeyImpl
+public class SelectionKeyImpl
extends AbstractSelectionKey
{
final SelChImpl channel; // package-private
- final SelectorImpl selector; // package-private
+ public final SelectorImpl selector;
// Index for a pollfd array in Selector that this key is registered with
private int index;
@@ -91,15 +91,15 @@ class SelectionKeyImpl
// The nio versions of these operations do not care if a key
// has been invalidated. They are for internal use by nio code.
- void nioReadyOps(int ops) { // package-private
+ public void nioReadyOps(int ops) {
readyOps = ops;
}
- int nioReadyOps() { // package-private
+ public int nioReadyOps() {
return readyOps;
}
- SelectionKey nioInterestOps(int ops) { // package-private
+ public SelectionKey nioInterestOps(int ops) {
if ((ops & ~channel().validOps()) != 0)
throw new IllegalArgumentException();
channel.translateAndSetInterestOps(ops, this);
@@ -107,7 +107,7 @@ class SelectionKeyImpl
return this;
}
- int nioInterestOps() { // package-private
+ public int nioInterestOps() {
return interestOps;
}
diff --git a/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java b/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
index bf93513..c881e3f 100644
--- a/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
+++ b/jdk/src/share/classes/sun/nio/ch/SelectorImpl.java
@@ -36,7 +36,7 @@ import java.util.*;
* Base Selector implementation class.
*/
-abstract class SelectorImpl
+public abstract class SelectorImpl
extends AbstractSelector
{
@@ -118,7 +118,7 @@ abstract class SelectorImpl
protected abstract void implClose() throws IOException;
- void putEventOps(SelectionKeyImpl sk, int ops) { }
+ public void putEventOps(SelectionKeyImpl sk, int ops) { }
protected final SelectionKey register(AbstractSelectableChannel ch,
int ops,
diff --git a/jdk/src/share/classes/sun/nio/ch/Util.java b/jdk/src/share/classes/sun/nio/ch/Util.java
index fafc48f..56aa1f6 100644
--- a/jdk/src/share/classes/sun/nio/ch/Util.java
+++ b/jdk/src/share/classes/sun/nio/ch/Util.java
@@ -40,7 +40,7 @@ import sun.misc.Cleaner;
import sun.security.action.GetPropertyAction;
-class Util {
+public class Util {
// -- Caches --
@@ -158,7 +158,7 @@ class Util {
/**
* Returns a temporary buffer of at least the given size
*/
- static ByteBuffer getTemporaryDirectBuffer(int size) {
+ public static ByteBuffer getTemporaryDirectBuffer(int size) {
BufferCache cache = bufferCache.get();
ByteBuffer buf = cache.get(size);
if (buf != null) {
@@ -178,7 +178,7 @@ class Util {
/**
* Releases a temporary buffer by returning to the cache or freeing it.
*/
- static void releaseTemporaryDirectBuffer(ByteBuffer buf) {
+ public static void releaseTemporaryDirectBuffer(ByteBuffer buf) {
offerFirstTemporaryDirectBuffer(buf);
}
@@ -467,7 +467,7 @@ class Util {
private static boolean loaded = false;
- static void load() {
+ public static void load() {
synchronized (Util.class) {
if (loaded)
return;
diff --git a/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java b/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
index 5c71094..ebf55b2 100644
--- a/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
+++ b/jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java
@@ -1279,7 +1279,8 @@ public class ExtendedCharsets
}
String osName = AccessController.doPrivileged(
new GetPropertyAction("os.name"));
- if ("SunOS".equals(osName) || "Linux".equals(osName)) {
+ if ("SunOS".equals(osName) || "Linux".equals(osName)
+ || osName.startsWith("Mac OS")) {
charset("x-COMPOUND_TEXT", "COMPOUND_TEXT",
new String[] {
"COMPOUND_TEXT", // JDK historical
diff --git a/jdk/src/share/classes/sun/print/PSPrinterJob.java b/jdk/src/share/classes/sun/print/PSPrinterJob.java
index d4a0ffa..49584f2 100644
--- a/jdk/src/share/classes/sun/print/PSPrinterJob.java
+++ b/jdk/src/share/classes/sun/print/PSPrinterJob.java
@@ -1565,7 +1565,9 @@ public class PSPrinterJob extends RasterPrinterJob {
pFlags |= NOSHEET;
ncomps+=1;
}
- if (System.getProperty("os.name").equals("Linux")) {
+
+ String osname = System.getProperty("os.name");
+ if (osname.equals("Linux") || osname.startsWith("Mac OS X")) {
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
diff --git a/jdk/src/share/classes/sun/print/RasterPrinterJob.java b/jdk/src/share/classes/sun/print/RasterPrinterJob.java
index deda8ea..23954ad 100644
--- a/jdk/src/share/classes/sun/print/RasterPrinterJob.java
+++ b/jdk/src/share/classes/sun/print/RasterPrinterJob.java
@@ -240,7 +240,8 @@ public abstract class RasterPrinterJob extends PrinterJob {
* The document to be printed. It is initialized to an
* empty (zero pages) book.
*/
- private Pageable mDocument = new Book();
+// MacOSX - made protected so subclasses can reference it.
+ protected Pageable mDocument = new Book();
/**
* The name of the job being printed.
@@ -251,8 +252,10 @@ public abstract class RasterPrinterJob extends PrinterJob {
/**
* Printing cancellation flags
*/
- private boolean performingPrinting = false;
- private boolean userCancelled = false;
+ // MacOSX - made protected so subclasses can reference it.
+ protected boolean performingPrinting = false;
+ // MacOSX - made protected so subclasses can reference it.
+ protected boolean userCancelled = false;
/**
* Print to file permission variables.
@@ -1241,7 +1244,8 @@ public abstract class RasterPrinterJob extends PrinterJob {
* a DocPrintJob from their service and pass a Doc representing
* the application's printjob
*/
- private void spoolToService(PrintService psvc,
+// MacOSX - made protected so subclasses can reference it.
+ protected void spoolToService(PrintService psvc,
PrintRequestAttributeSet attributes)
throws PrinterException {
@@ -1738,7 +1742,8 @@ public abstract class RasterPrinterJob extends PrinterJob {
/* Called by cancelDoc */
protected abstract void abortDoc();
- private void cancelDoc() throws PrinterAbortException {
+// MacOSX - made protected so subclasses can reference it.
+ protected void cancelDoc() throws PrinterAbortException {
abortDoc();
synchronized (this) {
userCancelled = false;
@@ -2220,7 +2225,8 @@ public abstract class RasterPrinterJob extends PrinterJob {
* color: black.
* clip: <as passed in>
*/
- void initPrinterGraphics(Graphics2D g, Rectangle2D clip) {
+// MacOSX - made protected so subclasses can reference it.
+ protected void initPrinterGraphics(Graphics2D g, Rectangle2D clip) {
g.setClip(clip);
g.setPaint(Color.black);
diff --git a/jdk/src/share/classes/sun/rmi/log/ReliableLog.java b/jdk/src/share/classes/sun/rmi/log/ReliableLog.java
index fe512c2..a247514 100644
--- a/jdk/src/share/classes/sun/rmi/log/ReliableLog.java
+++ b/jdk/src/share/classes/sun/rmi/log/ReliableLog.java
@@ -344,10 +344,9 @@ public class ReliableLog {
return ClassLoader.getSystemClassLoader();
}
});
- Class cl = loader.loadClass(logClassName);
- if (LogFile.class.isAssignableFrom(cl)) {
- return cl.getConstructor(String.class, String.class);
- }
+ Class<? extends LogFile> cl =
+ loader.loadClass(logClassName).asSubclass(LogFile.class);
+ return cl.getConstructor(String.class, String.class);
} catch (Exception e) {
System.err.println("Exception occurred:");
e.printStackTrace();
@@ -595,10 +594,10 @@ public class ReliableLog {
} else {
name = versionFile;
}
- DataOutputStream out =
- new DataOutputStream(new FileOutputStream(fName(name)));
- writeInt(out, version);
- out.close();
+ try (FileOutputStream fos = new FileOutputStream(fName(name));
+ DataOutputStream out = new DataOutputStream(fos)) {
+ writeInt(out, version);
+ }
}
/**
@@ -629,11 +628,9 @@ public class ReliableLog {
* @exception IOException If an I/O error has occurred.
*/
private int readVersion(String name) throws IOException {
- DataInputStream in = new DataInputStream(new FileInputStream(name));
- try {
+ try (DataInputStream in = new DataInputStream
+ (new FileInputStream(name))) {
return in.readInt();
- } finally {
- in.close();
}
}
diff --git a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
index 1257132..34579c2 100644
--- a/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
+++ b/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java
@@ -77,9 +77,9 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
/* indicate compatibility with JDK 1.1.x version of class */
private static final long serialVersionUID = 4666870661827494597L;
private Hashtable<String, Remote> bindings
- = new Hashtable<String, Remote>(101);
+ = new Hashtable<>(101);
private static Hashtable<InetAddress, InetAddress> allowedAccessCache
- = new Hashtable<InetAddress, InetAddress>(3);
+ = new Hashtable<>(3);
private static RegistryImpl registry;
private static ObjID id = new ObjID(ObjID.REGISTRY_ID);
@@ -194,9 +194,9 @@ public class RegistryImpl extends java.rmi.server.RemoteServer
synchronized (bindings) {
int i = bindings.size();
names = new String[i];
- Enumeration enum_ = bindings.keys();
+ Enumeration<String> enum_ = bindings.keys();
while ((--i) >= 0)
- names[i] = (String)enum_.nextElement();
+ names[i] = enum_.nextElement();
}
return names;
}
diff --git a/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java b/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java
index ea93d74..c217abc 100644
--- a/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java
+++ b/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java
@@ -160,7 +160,7 @@ public class BatchEnvironment extends sun.tools.javac.BatchEnvironment {
}
/** list of generated source files created in this environment */
- private Vector generatedFiles = new Vector();
+ private Vector<File> generatedFiles = new Vector<>();
/**
* Remember a generated source file generated so that it
@@ -177,9 +177,9 @@ public class BatchEnvironment extends sun.tools.javac.BatchEnvironment {
*/
public void deleteGeneratedFiles() {
synchronized(generatedFiles) {
- Enumeration enumeration = generatedFiles.elements();
+ Enumeration<File> enumeration = generatedFiles.elements();
while (enumeration.hasMoreElements()) {
- File file = (File) enumeration.nextElement();
+ File file = enumeration.nextElement();
file.delete();
}
generatedFiles.removeAllElements();
diff --git a/jdk/src/share/classes/sun/rmi/rmic/Main.java b/jdk/src/share/classes/sun/rmi/rmic/Main.java
index 562e389..23bdfce 100644
--- a/jdk/src/share/classes/sun/rmi/rmic/Main.java
+++ b/jdk/src/share/classes/sun/rmi/rmic/Main.java
@@ -73,14 +73,15 @@ public class Main implements sun.rmi.rmic.Constants {
File destDir;
int flags;
long tm;
- Vector classes;
+ Vector<String> classes;
boolean nowrite;
boolean nocompile;
boolean keepGenerated;
boolean status;
String[] generatorArgs;
- Vector generators;
- Class environmentClass = BatchEnvironment.class;
+ Vector<Generator> generators;
+ Class<? extends BatchEnvironment> environmentClass =
+ BatchEnvironment.class;
boolean iiopGeneration = false;
/**
@@ -183,7 +184,7 @@ public class Main implements sun.rmi.rmic.Constants {
destDir = null;
flags = F_WARNINGS;
tm = System.currentTimeMillis();
- classes = new Vector();
+ classes = new Vector<>();
nowrite = false;
nocompile = false;
keepGenerated = false;
@@ -191,7 +192,7 @@ public class Main implements sun.rmi.rmic.Constants {
if (generatorArgs == null) {
return false;
}
- generators = new Vector();
+ generators = new Vector<>();
// Pre-process command line for @file arguments
try {
@@ -411,7 +412,7 @@ public class Main implements sun.rmi.rmic.Constants {
// Get the environment required by this generator...
- Class envClass = BatchEnvironment.class;
+ Class<?> envClass = BatchEnvironment.class;
String env = getString("generator.env." + arg);
if (env != null) {
try {
@@ -423,7 +424,7 @@ public class Main implements sun.rmi.rmic.Constants {
// Yes, so switch to the new one...
- environmentClass = envClass;
+ environmentClass = envClass.asSubclass(BatchEnvironment.class);
} else {
@@ -495,8 +496,9 @@ public class Main implements sun.rmi.rmic.Constants {
try {
Class[] ctorArgTypes = {OutputStream.class,ClassPath.class,Main.class};
Object[] ctorArgs = {out,classPath,this};
- Constructor constructor = environmentClass.getConstructor(ctorArgTypes);
- result = (BatchEnvironment) constructor.newInstance(ctorArgs);
+ Constructor<? extends BatchEnvironment> constructor =
+ environmentClass.getConstructor(ctorArgTypes);
+ result = constructor.newInstance(ctorArgs);
result.reset();
}
catch (Exception e) {
@@ -530,7 +532,7 @@ public class Main implements sun.rmi.rmic.Constants {
*/
for (int i = classes.size()-1; i >= 0; i-- ) {
Identifier implClassName =
- Identifier.lookup((String)classes.elementAt(i));
+ Identifier.lookup(classes.elementAt(i));
/*
* Fix bugid 4049354: support using '.' as an inner class
@@ -558,7 +560,7 @@ public class Main implements sun.rmi.rmic.Constants {
try {
ClassDefinition def = decl.getClassDefinition(env);
for (int j = 0; j < generators.size(); j++) {
- Generator gen = (Generator)generators.elementAt(j);
+ Generator gen = generators.elementAt(j);
gen.generate(env, def, destDir);
}
} catch (ClassNotFound ex) {
@@ -673,7 +675,7 @@ public class Main implements sun.rmi.rmic.Constants {
do {
done = true;
- for (Enumeration e = env.getClasses() ; e.hasMoreElements() ; ) {
+ for (Enumeration<?> e = env.getClasses() ; e.hasMoreElements() ; ) {
ClassDeclaration c = (ClassDeclaration)e.nextElement();
done = compileClass(c,buf,env);
}
@@ -682,7 +684,9 @@ public class Main implements sun.rmi.rmic.Constants {
/*
* Compile a single class.
+ * Fallthrough is intentional
*/
+ @SuppressWarnings("fallthrough")
public boolean compileClass (ClassDeclaration c,
ByteArrayOutputStream buf,
BatchEnvironment env)
@@ -879,6 +883,6 @@ public class Main implements sun.rmi.rmic.Constants {
args[1] = (arg1 != null ? arg1.toString() : "null");
args[2] = (arg2 != null ? arg2.toString() : "null");
- return java.text.MessageFormat.format(format, args);
+ return java.text.MessageFormat.format(format, (Object[]) args);
}
}
diff --git a/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java b/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java
index 043ca87..4839036 100644
--- a/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java
+++ b/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java
@@ -61,7 +61,7 @@ import com.sun.corba.se.impl.util.Utility;
*/
public class RMIGenerator implements RMIConstants, Generator {
- private static final Hashtable versionOptions = new Hashtable();
+ private static final Hashtable<String, Integer> versionOptions = new Hashtable<>();
static {
versionOptions.put("-v1.1", new Integer(STUB_VERSION_1_1));
versionOptions.put("-vcompat", new Integer(STUB_VERSION_FAT));
@@ -96,7 +96,7 @@ public class RMIGenerator implements RMIConstants, Generator {
return false;
}
explicitVersion = arg;
- version = ((Integer) versionOptions.get(arg)).intValue();
+ version = versionOptions.get(arg);
argv[i] = null;
}
}
@@ -519,7 +519,7 @@ public class RMIGenerator implements RMIConstants, Generator {
* follows a previous catch of it or of one of its superclasses.
* The following method invocation takes care of these details.
*/
- Vector catchList = computeUniqueCatchList(exceptions);
+ Vector<ClassDefinition> catchList = computeUniqueCatchList(exceptions);
/*
* If we need to catch any particular exceptions (i.e. this method
@@ -615,10 +615,10 @@ public class RMIGenerator implements RMIConstants, Generator {
* UnexpectedException, and end the try block.
*/
if (catchList.size() > 0) {
- for (Enumeration enumeration = catchList.elements();
+ for (Enumeration<ClassDefinition> enumeration = catchList.elements();
enumeration.hasMoreElements();)
{
- ClassDefinition def = (ClassDefinition) enumeration.nextElement();
+ ClassDefinition def = enumeration.nextElement();
p.pOlnI("} catch (" + def.getName() + " e) {");
p.pln("throw e;");
}
@@ -650,8 +650,8 @@ public class RMIGenerator implements RMIConstants, Generator {
* of its superclasses is in the throws clause of the method, indicating
* that no exceptions need to be caught.
*/
- private Vector computeUniqueCatchList(ClassDeclaration[] exceptions) {
- Vector uniqueList = new Vector(); // unique exceptions to catch
+ private Vector<ClassDefinition> computeUniqueCatchList(ClassDeclaration[] exceptions) {
+ Vector<ClassDefinition> uniqueList = new Vector<>(); // unique exceptions to catch
uniqueList.addElement(defRuntimeException);
uniqueList.addElement(defRemoteException);
@@ -682,8 +682,7 @@ public class RMIGenerator implements RMIConstants, Generator {
* exceptions that need to be caught:
*/
for (int j = 0; j < uniqueList.size();) {
- ClassDefinition def =
- (ClassDefinition) uniqueList.elementAt(j);
+ ClassDefinition def = uniqueList.elementAt(j);
if (def.superClassOf(env, decl)) {
/*
* If a superclass of this exception is already on
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Main.java b/jdk/src/share/classes/sun/rmi/rmic/newrmic/Main.java
index d802136..1e59be4 100644
--- a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Main.java
+++ b/jdk/src/share/classes/sun/rmi/rmic/newrmic/Main.java
@@ -455,7 +455,7 @@ public class Main {
BatchEnvironment env;
try {
Constructor<? extends BatchEnvironment> cons =
- batch.envClass.getConstructor(new Class[] { RootDoc.class });
+ batch.envClass.getConstructor(new Class<?>[] { RootDoc.class });
env = cons.newInstance(rootDoc);
} catch (NoSuchMethodException e) {
throw new AssertionError(e);
diff --git a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java b/jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java
index f8ea7fc..6b3ba17 100644
--- a/jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java
+++ b/jdk/src/share/classes/sun/rmi/rmic/newrmic/Resources.java
@@ -69,7 +69,7 @@ public final class Resources {
format = "missing resource key: key = \"" + key + "\", " +
"arguments = \"{0}\", \"{1}\", \"{2}\"";
}
- return MessageFormat.format(format, args);
+ return MessageFormat.format(format, (Object[]) args);
}
/**
diff --git a/jdk/src/share/classes/sun/rmi/server/ActivatableRef.java b/jdk/src/share/classes/sun/rmi/server/ActivatableRef.java
index 9364e0d..29a3529 100644
--- a/jdk/src/share/classes/sun/rmi/server/ActivatableRef.java
+++ b/jdk/src/share/classes/sun/rmi/server/ActivatableRef.java
@@ -80,7 +80,7 @@ public class ActivatableRef implements RemoteRef {
String className = desc.getClassName();
try {
- Class cl =
+ Class<?> cl =
RMIClassLoader.loadClass(desc.getLocation(), className);
RemoteRef clientRef = new ActivatableRef(id, null);
return Util.createProxy(cl, clientRef, false);
@@ -373,8 +373,8 @@ public class ActivatableRef implements RemoteRef {
if (className.equals("")) return;
try {
- Class refClass = Class.forName(RemoteRef.packagePrefix + "." +
- className);
+ Class<?> refClass = Class.forName(RemoteRef.packagePrefix + "." +
+ className);
ref = (RemoteRef)refClass.newInstance();
ref.readExternal(in);
} catch (InstantiationException e) {
diff --git a/jdk/src/share/classes/sun/rmi/server/Activation.java b/jdk/src/share/classes/sun/rmi/server/Activation.java
index 919edb7..c1ec95e 100644
--- a/jdk/src/share/classes/sun/rmi/server/Activation.java
+++ b/jdk/src/share/classes/sun/rmi/server/Activation.java
@@ -138,7 +138,6 @@ public class Activation implements Serializable {
/** indicate compatibility with JDK 1.2 version of class */
private static final long serialVersionUID = 2921265612698155191L;
-
private static final byte MAJOR_VERSION = 1;
private static final byte MINOR_VERSION = 0;
@@ -298,6 +297,7 @@ public class Activation implements Serializable {
private static class SystemRegistryImpl extends RegistryImpl {
private static final String NAME = ActivationSystem.class.getName();
+ private static final long serialVersionUID = 4877330021609408794L;
private final ActivationSystem systemStub;
SystemRegistryImpl(int port,
@@ -804,9 +804,8 @@ public class Activation implements Serializable {
ActivationGroupDesc desc = null;
ActivationGroupID groupID = null;
long incarnation = 0;
- Map<ActivationID,ObjectEntry> objects =
- new HashMap<ActivationID,ObjectEntry>();
- Set<ActivationID> restartSet = new HashSet<ActivationID>();
+ Map<ActivationID,ObjectEntry> objects = new HashMap<>();
+ Set<ActivationID> restartSet = new HashSet<>();
transient ActivationInstantiator group = null;
transient int status = NORMAL;
@@ -1057,6 +1056,11 @@ public class Activation implements Serializable {
}
}
+ /*
+ * Fallthrough from TERMINATE to TERMINATING
+ * is intentional
+ */
+ @SuppressWarnings("fallthrough")
private void await() {
while (true) {
switch (status) {
@@ -1228,14 +1232,13 @@ public class Activation implements Serializable {
PipeWriter.plugTogetherPair
(child.getInputStream(), System.out,
child.getErrorStream(), System.err);
-
- MarshalOutputStream out =
- new MarshalOutputStream(child.getOutputStream());
- out.writeObject(id);
- out.writeObject(desc);
- out.writeLong(incarnation);
- out.flush();
- out.close();
+ try (MarshalOutputStream out =
+ new MarshalOutputStream(child.getOutputStream())) {
+ out.writeObject(id);
+ out.writeObject(desc);
+ out.writeLong(incarnation);
+ out.flush();
+ }
} catch (IOException e) {
@@ -1352,7 +1355,7 @@ public class Activation implements Serializable {
cmdenv = desc.getCommandEnvironment();
// argv is the literal command to exec
- List<String> argv = new ArrayList<String>();
+ List<String> argv = new ArrayList<>();
// Command name/path
argv.add((cmdenv != null && cmdenv.getCommandPath() != null)
@@ -1957,7 +1960,7 @@ public class Activation implements Serializable {
}
String log = null;
- List<String> childArgs = new ArrayList<String>();
+ List<String> childArgs = new ArrayList<>();
/*
* Parse arguments
@@ -2031,8 +2034,7 @@ public class Activation implements Serializable {
}
try {
- Class<?> execPolicyClass =
- RMIClassLoader.loadClass(execPolicyClassName);
+ Class<?> execPolicyClass = getRMIClass(execPolicyClassName);
execPolicy = execPolicyClass.newInstance();
execPolicyMethod =
execPolicyClass.getMethod("checkExecCommand",
@@ -2123,6 +2125,10 @@ public class Activation implements Serializable {
}
}
+ @SuppressWarnings("deprecation")
+ private static Class<?> getRMIClass(String execPolicyClassName) throws Exception {
+ return RMIClassLoader.loadClass(execPolicyClassName);
+ }
/*
* Dijkstra semaphore operations to limit the number of subprocesses
* rmid attempts to make at once.
diff --git a/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java b/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
index 1ee26a5..dd89d51 100644
--- a/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
+++ b/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
@@ -66,10 +66,10 @@ public class ActivationGroupImpl extends ActivationGroup {
/** maps persistent IDs to activated remote objects */
private final Hashtable<ActivationID,ActiveEntry> active =
- new Hashtable<ActivationID,ActiveEntry>();
+ new Hashtable<>();
private boolean groupInactive = false;
private final ActivationGroupID groupID;
- private final List<ActivationID> lockedIDs = new ArrayList<ActivationID>();
+ private final List<ActivationID> lockedIDs = new ArrayList<>();
/**
* Creates a default activation group implementation.
@@ -296,14 +296,9 @@ public class ActivationGroupImpl extends ActivationGroup {
active.put(id, entry);
return entry.mobj;
- } catch (NoSuchMethodException e) {
- /* user forgot to provide activatable constructor? */
- throw new ActivationException
- ("Activatable object must provide an activation"+
- " constructor", e);
-
- } catch (NoSuchMethodError e) {
- /* code recompiled and user forgot to provide
+ } catch (NoSuchMethodException | NoSuchMethodError e) {
+ /* user forgot to provide activatable constructor?
+ * or code recompiled and user forgot to provide
* activatable constructor?
*/
throw new ActivationException
diff --git a/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java b/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
index e7db8c8..956e80b 100644
--- a/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
+++ b/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
@@ -112,11 +112,11 @@ public final class LoaderHandler {
* garbage collected.
*/
private static final HashMap<LoaderKey, LoaderEntry> loaderTable
- = new HashMap<LoaderKey, LoaderEntry>(5);
+ = new HashMap<>(5);
/** reference queue for cleared class loader entries */
private static final ReferenceQueue<Loader> refQueue
- = new ReferenceQueue<Loader>();
+ = new ReferenceQueue<>();
/*
* Disallow anyone from creating one of these.
@@ -149,8 +149,8 @@ public final class LoaderHandler {
* but first try to resolve the named class through the given
* "default loader".
*/
- public static Class loadClass(String codebase, String name,
- ClassLoader defaultLoader)
+ public static Class<?> loadClass(String codebase, String name,
+ ClassLoader defaultLoader)
throws MalformedURLException, ClassNotFoundException
{
if (loaderLog.isLoggable(Log.BRIEF)) {
@@ -170,7 +170,7 @@ public final class LoaderHandler {
if (defaultLoader != null) {
try {
- Class c = Class.forName(name, false, defaultLoader);
+ Class<?> c = Class.forName(name, false, defaultLoader);
if (loaderLog.isLoggable(Log.VERBOSE)) {
loaderLog.log(Log.VERBOSE,
"class \"" + name + "\" found via defaultLoader, " +
@@ -189,7 +189,7 @@ public final class LoaderHandler {
* a class) that RMI will use to annotate the call stream when
* marshalling objects of the given class.
*/
- public static String getClassAnnotation(Class cl) {
+ public static String getClassAnnotation(Class<?> cl) {
String name = cl.getName();
/*
@@ -261,15 +261,13 @@ public final class LoaderHandler {
annotation = urlsToPath(urls);
}
- } catch (SecurityException e) {
+ } catch (SecurityException | IOException e) {
/*
- * If access was denied to the knowledge of the class
- * loader's URLs, fall back to the default behavior.
- */
- } catch (IOException e) {
- /*
- * This shouldn't happen, although it is declared to be
- * thrown by openConnection() and getPermission(). If it
+ * SecurityException: If access was denied to the knowledge of
+ * the class loader's URLs, fall back to the default behavior.
+ *
+ * IOException: This shouldn't happen, although it is declared
+ * to be thrown by openConnection() and getPermission(). If it
* does happen, forget about this class loader's URLs and
* fall back to the default behavior.
*/
@@ -358,7 +356,7 @@ public final class LoaderHandler {
* Load a class from the RMI class loader corresponding to the given
* codebase URL path in the current execution context.
*/
- private static Class loadClass(URL[] urls, String name)
+ private static Class<?> loadClass(URL[] urls, String name)
throws ClassNotFoundException
{
ClassLoader parent = getRMIContextClassLoader();
@@ -375,7 +373,7 @@ public final class LoaderHandler {
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
try {
- Class c = Class.forName(name, false, parent);
+ Class<?> c = Class.forName(name, false, parent);
if (loaderLog.isLoggable(Log.VERBOSE)) {
loaderLog.log(Log.VERBOSE,
"class \"" + name + "\" found via " +
@@ -424,7 +422,7 @@ public final class LoaderHandler {
* resolved without the security-offending codebase anyway;
* if so, return successfully (see bugids 4191926 & 4349670).
*/
- Class c = Class.forName(name, false, parent);
+ Class<?> c = Class.forName(name, false, parent);
if (loaderLog.isLoggable(Log.VERBOSE)) {
loaderLog.log(Log.VERBOSE,
"class \"" + name + "\" found via " +
@@ -450,7 +448,7 @@ public final class LoaderHandler {
}
try {
- Class c = Class.forName(name, false, loader);
+ Class<?> c = Class.forName(name, false, loader);
if (loaderLog.isLoggable(Log.VERBOSE)) {
loaderLog.log(Log.VERBOSE,
"class \"" + name + "\" " + "found via codebase, " +
@@ -472,8 +470,8 @@ public final class LoaderHandler {
* implement interface classes named by the given array of
* interface names.
*/
- public static Class loadProxyClass(String codebase, String[] interfaces,
- ClassLoader defaultLoader)
+ public static Class<?> loadProxyClass(String codebase, String[] interfaces,
+ ClassLoader defaultLoader)
throws MalformedURLException, ClassNotFoundException
{
if (loaderLog.isLoggable(Log.BRIEF)) {
@@ -537,7 +535,7 @@ public final class LoaderHandler {
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
try {
- Class c = loadProxyClass(interfaces, defaultLoader, parent,
+ Class<?> c = loadProxyClass(interfaces, defaultLoader, parent,
false);
if (loaderLog.isLoggable(Log.VERBOSE)) {
loaderLog.log(Log.VERBOSE,
@@ -584,8 +582,8 @@ public final class LoaderHandler {
* resolved without the security-offending codebase anyway;
* if so, return successfully (see bugids 4191926 & 4349670).
*/
- Class c = loadProxyClass(interfaces, defaultLoader, parent,
- false);
+ Class<?> c = loadProxyClass(interfaces, defaultLoader, parent,
+ false);
if (loaderLog.isLoggable(Log.VERBOSE)) {
loaderLog.log(Log.VERBOSE,
"(access to codebase denied) " +
@@ -608,7 +606,7 @@ public final class LoaderHandler {
}
try {
- Class c = loadProxyClass(interfaces, defaultLoader, loader, true);
+ Class<?> c = loadProxyClass(interfaces, defaultLoader, loader, true);
if (loaderLog.isLoggable(Log.VERBOSE)) {
loaderLog.log(Log.VERBOSE,
"proxy class defined by " + c.getClassLoader());
@@ -629,14 +627,14 @@ public final class LoaderHandler {
* class will implement classes which are named in the supplied
* interfaceNames.
*/
- private static Class loadProxyClass(String[] interfaceNames,
- ClassLoader defaultLoader,
- ClassLoader codebaseLoader,
- boolean preferCodebase)
+ private static Class<?> loadProxyClass(String[] interfaceNames,
+ ClassLoader defaultLoader,
+ ClassLoader codebaseLoader,
+ boolean preferCodebase)
throws ClassNotFoundException
{
ClassLoader proxyLoader = null;
- Class[] classObjs = new Class[interfaceNames.length];
+ Class<?>[] classObjs = new Class<?>[interfaceNames.length];
boolean[] nonpublic = { false };
defaultLoaderCase:
@@ -692,7 +690,7 @@ public final class LoaderHandler {
* Define a proxy class in the given class loader. The proxy
* class will implement the given interfaces Classes.
*/
- private static Class loadProxyClass(ClassLoader loader, Class[] interfaces)
+ private static Class<?> loadProxyClass(ClassLoader loader, Class[] interfaces)
throws ClassNotFoundException
{
try {
@@ -727,7 +725,7 @@ public final class LoaderHandler {
ClassLoader nonpublicLoader = null;
for (int i = 0; i < interfaces.length; i++) {
- Class cl =
+ Class<?> cl =
(classObjs[i] = Class.forName(interfaces[i], false, loader));
if (!Modifier.isPublic(cl.getModifiers())) {
@@ -778,7 +776,7 @@ public final class LoaderHandler {
/** map from weak(key=string) to [URL[], soft(key)] */
private static final Map<String, Object[]> pathToURLsCache
- = new WeakHashMap<String, Object[]>(5);
+ = new WeakHashMap<>(5);
/**
* Convert an array of URL objects into a corresponding string
@@ -1171,9 +1169,9 @@ public final class LoaderHandler {
private void checkPermissions() {
SecurityManager sm = System.getSecurityManager();
if (sm != null) { // should never be null?
- Enumeration enum_ = permissions.elements();
+ Enumeration<Permission> enum_ = permissions.elements();
while (enum_.hasMoreElements()) {
- sm.checkPermission((Permission) enum_.nextElement());
+ sm.checkPermission(enum_.nextElement());
}
}
}
diff --git a/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java b/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
index cb32017..daa0f72 100644
--- a/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
+++ b/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java
@@ -65,14 +65,14 @@ public class MarshalInputStream extends ObjectInputStream {
/** table to hold sun classes to which access is explicitly permitted */
protected static Map<String, Class<?>> permittedSunClasses
- = new HashMap<String, Class<?>>(3);
+ = new HashMap<>(3);
/** if true, don't try superclass first in resolveClass() */
private boolean skipDefaultResolveClass = false;
/** callbacks to make when done() called: maps Object to Runnable */
private final Map<Object, Runnable> doneCallbacks
- = new HashMap<Object, Runnable>(3);
+ = new HashMap<>(3);
/**
* if true, load classes (if not available locally) only from the
@@ -168,7 +168,7 @@ public class MarshalInputStream extends ObjectInputStream {
* from which to load the specified class.
* It will find, load, and return the class.
*/
- protected Class resolveClass(ObjectStreamClass classDesc)
+ protected Class<?> resolveClass(ObjectStreamClass classDesc)
throws IOException, ClassNotFoundException
{
/*
@@ -230,7 +230,7 @@ public class MarshalInputStream extends ObjectInputStream {
* resolveProxyClass is extended to acquire (if present) the location
* to determine the class loader to define the proxy class in.
*/
- protected Class resolveProxyClass(String[] interfaces)
+ protected Class<?> resolveProxyClass(String[] interfaces)
throws IOException, ClassNotFoundException
{
/*
@@ -262,7 +262,7 @@ public class MarshalInputStream extends ObjectInputStream {
* Fix for 4179055: Need to assist resolving sun stubs; resolve
* class locally if it is a "permitted" sun class
*/
- private Class checkSunClass(String className, AccessControlException e)
+ private Class<?> checkSunClass(String className, AccessControlException e)
throws AccessControlException
{
// ensure that we are giving out a stub for the correct reason
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastRef.java b/jdk/src/share/classes/sun/rmi/server/UnicastRef.java
index b928cfb..c2f1df1 100644
--- a/jdk/src/share/classes/sun/rmi/server/UnicastRef.java
+++ b/jdk/src/share/classes/sun/rmi/server/UnicastRef.java
@@ -65,6 +65,7 @@ public class UnicastRef implements RemoteRef {
Log.getLog("sun.rmi.client.call", "RMI",
AccessController.doPrivileged(
new GetBooleanAction("sun.rmi.client.logCalls")));
+ private static final long serialVersionUID = 8258372400816541186L;
protected LiveRef ref;
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastRef2.java b/jdk/src/share/classes/sun/rmi/server/UnicastRef2.java
index c2abc1f..2facc1e 100644
--- a/jdk/src/share/classes/sun/rmi/server/UnicastRef2.java
+++ b/jdk/src/share/classes/sun/rmi/server/UnicastRef2.java
@@ -36,6 +36,7 @@ import sun.rmi.transport.LiveRef;
* implementation of javax.management.remote.rmi.RMIConnector.
**/
public class UnicastRef2 extends UnicastRef {
+ private static final long serialVersionUID = 1829537514995881838L;
/**
* Create a new (empty) Unicast remote reference.
diff --git a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java b/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
index fe199a2..5213742 100644
--- a/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
+++ b/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java
@@ -189,7 +189,7 @@ public class UnicastServerRef extends UnicastRef
boolean permanent)
throws RemoteException
{
- Class implClass = impl.getClass();
+ Class<?> implClass = impl.getClass();
Remote stub;
try {
@@ -327,7 +327,7 @@ public class UnicastServerRef extends UnicastRef
// marshal return value
try {
ObjectOutput out = call.getResultStream(true);
- Class rtype = method.getReturnType();
+ Class<?> rtype = method.getReturnType();
if (rtype != void.class) {
marshalValue(rtype, result, out);
}
@@ -537,7 +537,7 @@ public class UnicastServerRef extends UnicastRef
HashToMethod_Maps() {}
protected Map<Long,Method> computeValue(Class<?> remoteClass) {
- Map<Long,Method> map = new HashMap<Long,Method>();
+ Map<Long,Method> map = new HashMap<>();
for (Class<?> cl = remoteClass;
cl != null;
cl = cl.getSuperclass())
diff --git a/jdk/src/share/classes/sun/rmi/server/Util.java b/jdk/src/share/classes/sun/rmi/server/Util.java
index c3b6b4a..2cf01ff 100644
--- a/jdk/src/share/classes/sun/rmi/server/Util.java
+++ b/jdk/src/share/classes/sun/rmi/server/Util.java
@@ -119,12 +119,12 @@ public final class Util {
* @throws StubNotFoundException if problem locating/creating stub or
* creating the dynamic proxy instance
**/
- public static Remote createProxy(Class implClass,
+ public static Remote createProxy(Class<?> implClass,
RemoteRef clientRef,
boolean forceStubUse)
throws StubNotFoundException
{
- Class remoteClass;
+ Class<?> remoteClass;
try {
remoteClass = getRemoteClass(implClass);
@@ -162,7 +162,7 @@ public final class Util {
*
* @param remoteClass the class to obtain remote interfaces from
*/
- private static boolean stubClassExists(Class remoteClass) {
+ private static boolean stubClassExists(Class<?> remoteClass) {
if (!withoutStubs.containsKey(remoteClass)) {
try {
Class.forName(remoteClass.getName() + "_Stub",
@@ -182,11 +182,11 @@ public final class Util {
* @throws ClassNotFoundException if no class is found to have a
* remote interface
*/
- private static Class getRemoteClass(Class cl)
+ private static Class<?> getRemoteClass(Class<?> cl)
throws ClassNotFoundException
{
while (cl != null) {
- Class[] interfaces = cl.getInterfaces();
+ Class<?>[] interfaces = cl.getInterfaces();
for (int i = interfaces.length -1; i >= 0; i--) {
if (Remote.class.isAssignableFrom(interfaces[i]))
return cl; // this class implements remote object
@@ -206,8 +206,8 @@ public final class Util {
* any illegal remote interfaces
* @throws NullPointerException if remoteClass is null
*/
- private static Class[] getRemoteInterfaces(Class remoteClass) {
- ArrayList<Class<?>> list = new ArrayList<Class<?>>();
+ private static Class<?>[] getRemoteInterfaces(Class<?> remoteClass) {
+ ArrayList<Class<?>> list = new ArrayList<>();
getRemoteInterfaces(list, remoteClass);
return list.toArray(new Class<?>[list.size()]);
}
@@ -220,15 +220,15 @@ public final class Util {
* any illegal remote interfaces
* @throws NullPointerException if the specified class or list is null
*/
- private static void getRemoteInterfaces(ArrayList<Class<?>> list, Class cl) {
- Class superclass = cl.getSuperclass();
+ private static void getRemoteInterfaces(ArrayList<Class<?>> list, Class<?> cl) {
+ Class<?> superclass = cl.getSuperclass();
if (superclass != null) {
getRemoteInterfaces(list, superclass);
}
- Class[] interfaces = cl.getInterfaces();
+ Class<?>[] interfaces = cl.getInterfaces();
for (int i = 0; i < interfaces.length; i++) {
- Class intf = interfaces[i];
+ Class<?> intf = interfaces[i];
/*
* If it is a remote interface (if it extends from
* java.rmi.Remote) and is not already in the list,
@@ -272,7 +272,7 @@ public final class Util {
* the stub class is initiated from class loader of the specified class
* (which may be the bootstrap class loader).
**/
- private static RemoteStub createStub(Class remoteClass, RemoteRef ref)
+ private static RemoteStub createStub(Class<?> remoteClass, RemoteRef ref)
throws StubNotFoundException
{
String stubname = remoteClass.getName() + "_Stub";
@@ -285,7 +285,7 @@ public final class Util {
try {
Class<?> stubcl =
Class.forName(stubname, false, remoteClass.getClassLoader());
- Constructor cons = stubcl.getConstructor(stubConsParamTypes);
+ Constructor<?> cons = stubcl.getConstructor(stubConsParamTypes);
return (RemoteStub) cons.newInstance(new Object[] { ref });
} catch (ClassNotFoundException e) {
@@ -315,7 +315,7 @@ public final class Util {
static Skeleton createSkeleton(Remote object)
throws SkeletonNotFoundException
{
- Class cl;
+ Class<?> cl;
try {
cl = getRemoteClass(object.getClass());
} catch (ClassNotFoundException ex ) {
@@ -327,7 +327,7 @@ public final class Util {
// now try to load the skeleton based ont he name of the class
String skelname = cl.getName() + "_Skel";
try {
- Class skelcl = Class.forName(skelname, false, cl.getClassLoader());
+ Class<?> skelcl = Class.forName(skelname, false, cl.getClassLoader());
return (Skeleton)skelcl.newInstance();
} catch (ClassNotFoundException ex) {
@@ -391,12 +391,12 @@ public final class Util {
private static String getMethodNameAndDescriptor(Method m) {
StringBuffer desc = new StringBuffer(m.getName());
desc.append('(');
- Class[] paramTypes = m.getParameterTypes();
+ Class<?>[] paramTypes = m.getParameterTypes();
for (int i = 0; i < paramTypes.length; i++) {
desc.append(getTypeDescriptor(paramTypes[i]));
}
desc.append(')');
- Class returnType = m.getReturnType();
+ Class<?> returnType = m.getReturnType();
if (returnType == void.class) { // optimization: handle void here
desc.append('V');
} else {
@@ -409,7 +409,7 @@ public final class Util {
* Get the descriptor of a particular type, as appropriate for either
* a parameter or return type in a method descriptor.
*/
- private static String getTypeDescriptor(Class type) {
+ private static String getTypeDescriptor(Class<?> type) {
if (type.isPrimitive()) {
if (type == int.class) {
return "I";
@@ -454,7 +454,7 @@ public final class Util {
* top-level type (and perhaps other enclosing types), the
* separator will be '$', etc.
**/
- public static String getUnqualifiedName(Class c) {
+ public static String getUnqualifiedName(Class<?> c) {
String binaryName = c.getName();
return binaryName.substring(binaryName.lastIndexOf('.') + 1);
}
diff --git a/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java b/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java
index 1aff576..734e4ff 100644
--- a/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java
+++ b/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java
@@ -46,8 +46,7 @@ import java.util.WeakHashMap;
**/
public abstract class WeakClassHashMap<V> {
- private Map<Class<?>,ValueCell<V>> internalMap =
- new WeakHashMap<Class<?>,ValueCell<V>>();
+ private Map<Class<?>,ValueCell<V>> internalMap = new WeakHashMap<>();
protected WeakClassHashMap() { }
diff --git a/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java b/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java
index f79482b..2c2a81f 100644
--- a/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java
+++ b/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java
@@ -43,7 +43,7 @@ class ConnectionInputStream extends MarshalInputStream {
private boolean dgcAckNeeded = false;
/** Hashtable mapping Endpoints to lists of LiveRefs to register */
- private Map incomingRefTable = new HashMap(5);
+ private Map<Endpoint, List<LiveRef>> incomingRefTable = new HashMap<>(5);
/** identifier for gc ack*/
private UID ackID;
@@ -70,10 +70,10 @@ class ConnectionInputStream extends MarshalInputStream {
Endpoint ep = ref.getEndpoint();
// check whether endpoint is already in the hashtable
- List refList = (List) incomingRefTable.get(ep);
+ List<LiveRef> refList = incomingRefTable.get(ep);
if (refList == null) {
- refList = new ArrayList();
+ refList = new ArrayList<LiveRef>();
incomingRefTable.put(ep, refList);
}
@@ -89,13 +89,9 @@ class ConnectionInputStream extends MarshalInputStream {
*/
void registerRefs() throws IOException {
if (!incomingRefTable.isEmpty()) {
- Set entrySet = incomingRefTable.entrySet();
- Iterator iter = entrySet.iterator();
- while (iter.hasNext()) {
- Map.Entry entry = (Map.Entry) iter.next();
- Endpoint ep = (Endpoint) entry.getKey();
- List refList = (List) entry.getValue();
- DGCClient.registerRefs(ep, refList);
+ for (Map.Entry<Endpoint, List<LiveRef>> entry :
+ incomingRefTable.entrySet()) {
+ DGCClient.registerRefs(entry.getKey(), entry.getValue());
}
}
}
diff --git a/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java b/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java
index 2735457..7c757dd 100644
--- a/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java
+++ b/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java
@@ -78,7 +78,7 @@ public class DGCAckHandler {
Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>());
private final UID id;
- private List<Object> objList = new ArrayList<Object>(); // null if released
+ private List<Object> objList = new ArrayList<>(); // null if released
private Future<?> task = null;
/**
diff --git a/jdk/src/share/classes/sun/rmi/transport/DGCClient.java b/jdk/src/share/classes/sun/rmi/transport/DGCClient.java
index 039935c..c6e3266 100644
--- a/jdk/src/share/classes/sun/rmi/transport/DGCClient.java
+++ b/jdk/src/share/classes/sun/rmi/transport/DGCClient.java
@@ -125,7 +125,7 @@ final class DGCClient {
* All of the LiveRefs in the list must be for remote objects at the
* given endpoint.
*/
- static void registerRefs(Endpoint ep, List refs) {
+ static void registerRefs(Endpoint ep, List<LiveRef> refs) {
/*
* Look up the given endpoint and register the refs with it.
* The retrieved entry may get removed from the global endpoint
@@ -176,9 +176,9 @@ final class DGCClient {
private DGC dgc;
/** table of refs held for endpoint: maps LiveRef to RefEntry */
- private Map refTable = new HashMap(5);
+ private Map<LiveRef, RefEntry> refTable = new HashMap<>(5);
/** set of RefEntry instances from last (failed) dirty call */
- private Set invalidRefs = new HashSet(5);
+ private Set<RefEntry> invalidRefs = new HashSet<>(5);
/** true if this entry has been removed from the global table */
private boolean removed = false;
@@ -200,12 +200,12 @@ final class DGCClient {
private boolean interruptible = false;
/** reference queue for phantom references */
- private ReferenceQueue refQueue = new ReferenceQueue();
+ private ReferenceQueue<LiveRef> refQueue = new ReferenceQueue<>();
/** set of clean calls that need to be made */
- private Set pendingCleans = new HashSet(5);
+ private Set<CleanRequest> pendingCleans = new HashSet<>(5);
/** global endpoint table: maps Endpoint to EndpointEntry */
- private static Map endpointTable = new HashMap(5);
+ private static Map<Endpoint,EndpointEntry> endpointTable = new HashMap<>(5);
/** handle for GC latency request (for future cancellation) */
private static GC.LatencyRequest gcLatencyRequest = null;
@@ -215,7 +215,7 @@ final class DGCClient {
*/
public static EndpointEntry lookup(Endpoint ep) {
synchronized (endpointTable) {
- EndpointEntry entry = (EndpointEntry) endpointTable.get(ep);
+ EndpointEntry entry = endpointTable.get(ep);
if (entry == null) {
entry = new EndpointEntry(ep);
endpointTable.put(ep, entry);
@@ -260,10 +260,10 @@ final class DGCClient {
*
* This method must NOT be called while synchronized on this entry.
*/
- public boolean registerRefs(List refs) {
+ public boolean registerRefs(List<LiveRef> refs) {
assert !Thread.holdsLock(this);
- Set refsToDirty = null; // entries for refs needing dirty
+ Set<RefEntry> refsToDirty = null; // entries for refs needing dirty
long sequenceNum; // sequence number for dirty call
synchronized (this) {
@@ -271,18 +271,18 @@ final class DGCClient {
return false;
}
- Iterator iter = refs.iterator();
+ Iterator<LiveRef> iter = refs.iterator();
while (iter.hasNext()) {
- LiveRef ref = (LiveRef) iter.next();
+ LiveRef ref = iter.next();
assert ref.getEndpoint().equals(endpoint);
- RefEntry refEntry = (RefEntry) refTable.get(ref);
+ RefEntry refEntry = refTable.get(ref);
if (refEntry == null) {
LiveRef refClone = (LiveRef) ref.clone();
refEntry = new RefEntry(refClone);
refTable.put(refClone, refEntry);
if (refsToDirty == null) {
- refsToDirty = new HashSet(5);
+ refsToDirty = new HashSet<>(5);
}
refsToDirty.add(refEntry);
}
@@ -345,7 +345,7 @@ final class DGCClient {
*
* This method must NOT be called while synchronized on this entry.
*/
- private void makeDirtyCall(Set refEntries, long sequenceNum) {
+ private void makeDirtyCall(Set<RefEntry> refEntries, long sequenceNum) {
assert !Thread.holdsLock(this);
ObjID[] ids;
@@ -443,9 +443,9 @@ final class DGCClient {
* refs, so that clean calls for them in the future
* will be strong.
*/
- Iterator iter = refEntries.iterator();
+ Iterator<RefEntry> iter = refEntries.iterator();
while (iter.hasNext()) {
- RefEntry refEntry = (RefEntry) iter.next();
+ RefEntry refEntry = iter.next();
refEntry.markDirtyFailed();
}
}
@@ -497,7 +497,7 @@ final class DGCClient {
long timeToWait;
RefEntry.PhantomLiveRef phantom = null;
boolean needRenewal = false;
- Set refsToDirty = null;
+ Set<RefEntry> refsToDirty = null;
long sequenceNum = Long.MIN_VALUE;
synchronized (EndpointEntry.this) {
@@ -564,7 +564,7 @@ final class DGCClient {
needRenewal = true;
if (!invalidRefs.isEmpty()) {
refsToDirty = invalidRefs;
- invalidRefs = new HashSet(5);
+ invalidRefs = new HashSet<>(5);
}
sequenceNum = getNextSequenceNum();
}
@@ -594,8 +594,8 @@ final class DGCClient {
private void processPhantomRefs(RefEntry.PhantomLiveRef phantom) {
assert Thread.holdsLock(this);
- Set strongCleans = null;
- Set normalCleans = null;
+ Set<RefEntry> strongCleans = null;
+ Set<RefEntry> normalCleans = null;
do {
RefEntry refEntry = phantom.getRefEntry();
@@ -603,12 +603,12 @@ final class DGCClient {
if (refEntry.isRefSetEmpty()) {
if (refEntry.hasDirtyFailed()) {
if (strongCleans == null) {
- strongCleans = new HashSet(5);
+ strongCleans = new HashSet<>(5);
}
strongCleans.add(refEntry);
} else {
if (normalCleans == null) {
- normalCleans = new HashSet(5);
+ normalCleans = new HashSet<>(5);
}
normalCleans.add(refEntry);
}
@@ -659,9 +659,9 @@ final class DGCClient {
private void makeCleanCalls() {
assert !Thread.holdsLock(this);
- Iterator iter = pendingCleans.iterator();
+ Iterator<CleanRequest> iter = pendingCleans.iterator();
while (iter.hasNext()) {
- CleanRequest request = (CleanRequest) iter.next();
+ CleanRequest request = iter.next();
try {
dgc.clean(request.objIDs, request.sequenceNum, vmid,
request.strong);
@@ -683,11 +683,11 @@ final class DGCClient {
* Create an array of ObjIDs (needed for the DGC remote calls)
* from the ids in the given set of refs.
*/
- private static ObjID[] createObjIDArray(Set refEntries) {
+ private static ObjID[] createObjIDArray(Set<RefEntry> refEntries) {
ObjID[] ids = new ObjID[refEntries.size()];
- Iterator iter = refEntries.iterator();
+ Iterator<RefEntry> iter = refEntries.iterator();
for (int i = 0; i < ids.length; i++) {
- ids[i] = ((RefEntry) iter.next()).getRef().getObjID();
+ ids[i] = iter.next().getRef().getObjID();
}
return ids;
}
@@ -704,7 +704,7 @@ final class DGCClient {
/** LiveRef value for this entry (not a registered instance) */
private LiveRef ref;
/** set of phantom references to registered instances */
- private Set refSet = new HashSet(5);
+ private Set<PhantomLiveRef> refSet = new HashSet<>(5);
/** true if a dirty call containing this ref has failed */
private boolean dirtyFailed = false;
@@ -792,7 +792,7 @@ final class DGCClient {
* used to detect when the LiveRef becomes permanently
* unreachable in this VM.
*/
- private class PhantomLiveRef extends PhantomReference {
+ private class PhantomLiveRef extends PhantomReference<LiveRef> {
public PhantomLiveRef(LiveRef ref) {
super(ref, EndpointEntry.this.refQueue);
diff --git a/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java b/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java
index caaa381..5e59cb1 100644
--- a/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java
+++ b/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java
@@ -84,7 +84,7 @@ final class DGCImpl implements DGC {
/** remote implementation of DGC interface for this VM */
private static DGCImpl dgc;
/** table that maps VMID to LeaseInfo */
- private Map<VMID,LeaseInfo> leaseTable = new HashMap<VMID,LeaseInfo>();
+ private Map<VMID,LeaseInfo> leaseTable = new HashMap<>();
/** checks for lease expiration */
private Future<?> checker = null;
@@ -236,7 +236,7 @@ final class DGCImpl implements DGC {
long time = System.currentTimeMillis();
/* List of vmids that need to be removed from the leaseTable */
- List<LeaseInfo> toUnregister = new ArrayList<LeaseInfo>();
+ List<LeaseInfo> toUnregister = new ArrayList<>();
/* Build a list of leaseInfo objects that need to have
* targets removed from their notifySet. Remove expired
@@ -313,7 +313,7 @@ final class DGCImpl implements DGC {
private static class LeaseInfo {
VMID vmid;
long expiration;
- Set<Target> notifySet = new HashSet<Target>();
+ Set<Target> notifySet = new HashSet<>();
LeaseInfo(VMID vmid, long lease) {
this.vmid = vmid;
diff --git a/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java b/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java
index 8c3e5cf..97956cc 100644
--- a/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java
+++ b/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java
@@ -62,9 +62,9 @@ public final class ObjectTable {
/** tables mapping to Target, keyed from ObjectEndpoint and impl object */
private static final Map<ObjectEndpoint,Target> objTable =
- new HashMap<ObjectEndpoint,Target>();
+ new HashMap<>();
private static final Map<WeakRef,Target> implTable =
- new HashMap<WeakRef,Target>();
+ new HashMap<>();
/**
* lock guarding keepAliveCount, reaper, and gcLatencyRequest.
@@ -79,7 +79,7 @@ public final class ObjectTable {
private static Thread reaper = null;
/** queue notified when weak refs in the table are cleared */
- static final ReferenceQueue reapQueue = new ReferenceQueue();
+ static final ReferenceQueue<Object> reapQueue = new ReferenceQueue<>();
/** handle for GC latency request (for future cancellation) */
private static GC.LatencyRequest gcLatencyRequest = null;
diff --git a/jdk/src/share/classes/sun/rmi/transport/StreamRemoteCall.java b/jdk/src/share/classes/sun/rmi/transport/StreamRemoteCall.java
index f0c3c29..d6d6ee8 100644
--- a/jdk/src/share/classes/sun/rmi/transport/StreamRemoteCall.java
+++ b/jdk/src/share/classes/sun/rmi/transport/StreamRemoteCall.java
@@ -199,6 +199,7 @@ public class StreamRemoteCall implements RemoteCall {
/**
* Do whatever it takes to execute the call.
*/
+ @SuppressWarnings("fallthrough")
public void executeCall() throws Exception {
byte returnType;
@@ -252,6 +253,7 @@ public class StreamRemoteCall implements RemoteCall {
} else {
throw new UnmarshalException("Return type not Exception");
}
+ // Exception is thrown before fallthrough can occur
default:
if (Transport.transportLog.isLoggable(Log.BRIEF)) {
Transport.transportLog.log(Log.BRIEF,
diff --git a/jdk/src/share/classes/sun/rmi/transport/Target.java b/jdk/src/share/classes/sun/rmi/transport/Target.java
index f784064..bd1aded 100644
--- a/jdk/src/share/classes/sun/rmi/transport/Target.java
+++ b/jdk/src/share/classes/sun/rmi/transport/Target.java
@@ -53,9 +53,10 @@ public final class Target {
/** stub for remote object */
private final Remote stub;
/** set of clients that hold references to this target */
- private final Vector refSet = new Vector();
+ private final Vector<VMID> refSet = new Vector<>();
/** table that maps client endpoints to sequence numbers */
- private final Hashtable sequenceTable = new Hashtable(5);
+ private final Hashtable<VMID, SequenceEntry> sequenceTable =
+ new Hashtable<>(5);
/** access control context in which target was created */
private final AccessControlContext acc;
/** context class loader in which target was created */
@@ -241,7 +242,7 @@ public final class Target {
*/
synchronized void referenced(long sequenceNum, VMID vmid) {
// check sequence number for vmid
- SequenceEntry entry = (SequenceEntry) sequenceTable.get(vmid);
+ SequenceEntry entry = sequenceTable.get(vmid);
if (entry == null) {
sequenceTable.put(vmid, new SequenceEntry(sequenceNum));
} else if (entry.sequenceNum < sequenceNum) {
@@ -280,7 +281,7 @@ public final class Target {
synchronized void unreferenced(long sequenceNum, VMID vmid, boolean strong)
{
// check sequence number for vmid
- SequenceEntry entry = (SequenceEntry) sequenceTable.get(vmid);
+ SequenceEntry entry = sequenceTable.get(vmid);
if (entry == null || entry.sequenceNum > sequenceNum) {
// late clean call; ignore
return;
@@ -366,9 +367,9 @@ public final class Target {
*/
unpinImpl();
DGCImpl dgc = DGCImpl.getDGCImpl();
- Enumeration enum_ = refSet.elements();
+ Enumeration<VMID> enum_ = refSet.elements();
while (enum_.hasMoreElements()) {
- VMID vmid = (VMID) enum_.nextElement();
+ VMID vmid = enum_.nextElement();
dgc.unregisterTarget(vmid, this);
}
return true;
diff --git a/jdk/src/share/classes/sun/rmi/transport/Transport.java b/jdk/src/share/classes/sun/rmi/transport/Transport.java
index 82a3fe7..bfafe98 100644
--- a/jdk/src/share/classes/sun/rmi/transport/Transport.java
+++ b/jdk/src/share/classes/sun/rmi/transport/Transport.java
@@ -62,7 +62,7 @@ public abstract class Transport {
Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel);
/** References the current transport when a call is being serviced */
- private static final ThreadLocal currentTransport = new ThreadLocal();
+ private static final ThreadLocal<Transport> currentTransport = new ThreadLocal<>();
/** ObjID for DGCImpl */
private static final ObjID dgcID = new ObjID(ObjID.DGC_ID);
@@ -104,7 +104,7 @@ public abstract class Transport {
* returns null.
**/
static Transport currentTransport() {
- return (Transport) currentTransport.get();
+ return currentTransport.get();
}
/**
diff --git a/jdk/src/share/classes/sun/rmi/transport/WeakRef.java b/jdk/src/share/classes/sun/rmi/transport/WeakRef.java
index 98bd0db..c20a8a1 100644
--- a/jdk/src/share/classes/sun/rmi/transport/WeakRef.java
+++ b/jdk/src/share/classes/sun/rmi/transport/WeakRef.java
@@ -41,7 +41,7 @@ import sun.rmi.runtime.Log;
* @author Ann Wollrath
* @author Peter Jones
*/
-class WeakRef extends WeakReference {
+class WeakRef extends WeakReference<Object> {
/** value of the referent's "identity" hash code */
private int hashValue;
@@ -60,7 +60,7 @@ class WeakRef extends WeakReference {
/**
* Create a new WeakRef to the given object, registered with a queue.
*/
- public WeakRef(Object obj, ReferenceQueue q) {
+ public WeakRef(Object obj, ReferenceQueue<Object> q) {
super(obj, q);
setHashValue(obj); // cache object's "identity" hash code
}
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java b/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
index 25a84fa..918986d 100644
--- a/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
+++ b/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java
@@ -33,6 +33,7 @@ import java.util.Hashtable;
* in a client's request.
*/
class CGIClientException extends Exception {
+ private static final long serialVersionUID = 8147981687059865216L;
public CGIClientException(String s) {
super(s);
@@ -44,6 +45,8 @@ class CGIClientException extends Exception {
*/
class CGIServerException extends Exception {
+ private static final long serialVersionUID = 6928425456704527017L;
+
public CGIServerException(String s) {
super(s);
}
@@ -111,9 +114,9 @@ public final class CGIHandler {
};
/* construct table mapping command strings to handlers */
- private static Hashtable commandLookup;
+ private static Hashtable<String, CGICommandHandler> commandLookup;
static {
- commandLookup = new Hashtable();
+ commandLookup = new Hashtable<>();
for (int i = 0; i < commands.length; ++ i)
commandLookup.put(commands[i].getName(), commands[i]);
}
@@ -140,7 +143,7 @@ public final class CGIHandler {
param = QueryString.substring(delim + 1);
}
CGICommandHandler handler =
- (CGICommandHandler) commandLookup.get(command);
+ commandLookup.get(command);
if (handler != null)
try {
handler.execute(param);
@@ -200,7 +203,7 @@ public final class CGIHandler {
/**
* "forward" command: Forward request body to local port on the server,
- * and send reponse back to client.
+ * and send response back to client.
*/
final class CGIForwardCommand implements CGICommandHandler {
@@ -208,6 +211,11 @@ final class CGIForwardCommand implements CGICommandHandler {
return "forward";
}
+ @SuppressWarnings("deprecation")
+ private String getLine (DataInputStream socketIn) throws IOException {
+ return socketIn.readLine();
+ }
+
public void execute(String param) throws CGIClientException, CGIServerException
{
if (!CGIHandler.RequestMethod.equals("POST"))
@@ -276,7 +284,7 @@ final class CGIForwardCommand implements CGICommandHandler {
int responseContentLength = -1;
do {
try {
- line = socketIn.readLine();
+ line = getLine(socketIn);
} catch (IOException e) {
throw new CGIServerException("error reading from server");
}
@@ -285,8 +293,8 @@ final class CGIForwardCommand implements CGICommandHandler {
"unexpected EOF reading server response");
if (line.toLowerCase().startsWith(key)) {
- if (contentLengthFound)
- ; // what would we want to do in this case??
+ // if contentLengthFound is true
+ // we should probably do something here
responseContentLength =
Integer.parseInt(line.substring(key.length()).trim());
contentLengthFound = true;
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java b/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
index dc320c8..773493e 100644
--- a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
+++ b/jdk/src/share/classes/sun/rmi/transport/proxy/HttpInputStream.java
@@ -70,8 +70,8 @@ class HttpInputStream extends FilterInputStream {
throw new EOFException();
if (line.toLowerCase().startsWith(key)) {
- if (contentLengthFound)
- ; // what would we want to do in this case??
+ // if contentLengthFound is true
+ // we should probably do something here
bytesLeft =
Integer.parseInt(line.substring(key.length()).trim());
contentLengthFound = true;
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java b/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
index b599e1b..0d790d5 100644
--- a/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
+++ b/jdk/src/share/classes/sun/rmi/transport/proxy/HttpSendSocket.java
@@ -203,7 +203,7 @@ class HttpSendSocket extends Socket implements RMISocketInfo {
message += "HttpSendSocket.readNotify: response body: ";
try {
- DataInputStream din = new DataInputStream(in);
+ BufferedReader din = new BufferedReader(new InputStreamReader(in));
String line;
while ((line = din.readLine()) != null)
message += line + lineSeparator;
diff --git a/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java b/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
index 2a2bf2a..2caf6ac 100644
--- a/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
+++ b/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
@@ -74,20 +74,21 @@ public class RMIMasterSocketFactory extends RMISocketFactory {
"sun.rmi.transport.proxy.eagerHttpFallback")).booleanValue();
/** table of hosts successfully connected to and the factory used */
- private Hashtable successTable = new Hashtable();
+ private Hashtable<String, RMISocketFactory> successTable =
+ new Hashtable<>();
/** maximum number of hosts to remember successful connection to */
private static final int MaxRememberedHosts = 64;
/** list of the hosts in successTable in initial connection order */
- private Vector hostList = new Vector(MaxRememberedHosts);
+ private Vector<String> hostList = new Vector<>(MaxRememberedHosts);
- /** default factory to initally use for direct socket connection */
+ /** default factory for initial use for direct socket connection */
protected RMISocketFactory initialFactory = new RMIDirectSocketFactory();
/** ordered list of factories to try as alternate connection
* mechanisms if a direct socket connections fails */
- protected Vector altFactoryList;
+ protected Vector<RMISocketFactory> altFactoryList;
/**
* Create a RMIMasterSocketFactory object. Establish order of
@@ -95,7 +96,7 @@ public class RMIMasterSocketFactory extends RMISocketFactory {
* socket connection fails.
*/
public RMIMasterSocketFactory() {
- altFactoryList = new Vector(2);
+ altFactoryList = new Vector<>(2);
boolean setFactories = false;
try {
@@ -152,7 +153,7 @@ public class RMIMasterSocketFactory extends RMISocketFactory {
* If we remember successfully connecting to this host before,
* use the same factory.
*/
- factory = (RMISocketFactory) successTable.get(host);
+ factory = successTable.get(host);
if (factory != null) {
if (proxyLog.isLoggable(Log.BRIEF)) {
proxyLog.log(Log.BRIEF,
@@ -207,9 +208,7 @@ public class RMIMasterSocketFactory extends RMISocketFactory {
return initialSocket;
- } catch (UnknownHostException e) {
- initialFailure = e;
- } catch (NoRouteToHostException e) {
+ } catch (UnknownHostException | NoRouteToHostException e) {
initialFailure = e;
} catch (SocketException e) {
if (eagerHttpFallback) {
@@ -227,22 +226,20 @@ public class RMIMasterSocketFactory extends RMISocketFactory {
// Finally, try any alternate connection mechanisms.
for (int i = 0; i < altFactoryList.size(); ++ i) {
- factory = (RMISocketFactory) altFactoryList.elementAt(i);
- try {
- if (proxyLog.isLoggable(Log.BRIEF)) {
- proxyLog.log(Log.BRIEF,
- "trying with factory: " + factory);
- }
-
+ factory = altFactoryList.elementAt(i);
+ if (proxyLog.isLoggable(Log.BRIEF)) {
+ proxyLog.log(Log.BRIEF,
+ "trying with factory: " + factory);
+ }
+ try (Socket testSocket =
+ factory.createSocket(host, port)) {
// For HTTP connections, the output (POST request) must
// be sent before we verify a successful connection.
// So, sacrifice a socket for the sake of testing...
// The following sequence should verify a successful
// HTTP connection if no IOException is thrown.
- Socket testSocket = factory.createSocket(host, port);
InputStream in = testSocket.getInputStream();
int b = in.read(); // probably -1 for EOF...
- testSocket.close();
} catch (IOException ex) {
if (proxyLog.isLoggable(Log.BRIEF)) {
proxyLog.log(Log.BRIEF, "factory failed: ", ex);
@@ -276,9 +273,7 @@ public class RMIMasterSocketFactory extends RMISocketFactory {
}
// if connector ever does get socket, it won't be used
connector.notUsed();
- } catch (UnknownHostException e) {
- initialFailure = e;
- } catch (NoRouteToHostException e) {
+ } catch (UnknownHostException | NoRouteToHostException e) {
initialFailure = e;
} catch (SocketException e) {
if (eagerHttpFallback) {
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java b/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
index a3b6696..47b7143 100644
--- a/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
+++ b/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java
@@ -85,7 +85,7 @@ final class ConnectionMultiplexer {
private DataOutputStream dataOut;
/** table holding currently open connection IDs and related info */
- private Hashtable connectionTable = new Hashtable(7);
+ private Hashtable<Integer, MultiplexConnectionInfo> connectionTable = new Hashtable<>(7);
/** number of currently open connections */
private int numConnections = 0;
@@ -131,7 +131,6 @@ final class ConnectionMultiplexer {
{
try {
int op, id, length;
- Integer idObj;
MultiplexConnectionInfo info;
while (true) {
@@ -148,9 +147,7 @@ final class ConnectionMultiplexer {
multiplexLog.log(Log.VERBOSE, "operation OPEN " + id);
}
- idObj = new Integer(id);
- info =
- (MultiplexConnectionInfo) connectionTable.get(idObj);
+ info = connectionTable.get(id);
if (info != null)
throw new IOException(
"OPEN: Connection ID already exists");
@@ -158,7 +155,7 @@ final class ConnectionMultiplexer {
info.in = new MultiplexInputStream(this, info, 2048);
info.out = new MultiplexOutputStream(this, info, 2048);
synchronized (connectionTable) {
- connectionTable.put(idObj, info);
+ connectionTable.put(id, info);
++ numConnections;
}
sun.rmi.transport.Connection conn;
@@ -174,9 +171,7 @@ final class ConnectionMultiplexer {
multiplexLog.log(Log.VERBOSE, "operation CLOSE " + id);
}
- idObj = new Integer(id);
- info =
- (MultiplexConnectionInfo) connectionTable.get(idObj);
+ info = connectionTable.get(id);
if (info == null)
throw new IOException(
"CLOSE: Invalid connection ID");
@@ -185,7 +180,7 @@ final class ConnectionMultiplexer {
if (!info.closed)
sendCloseAck(info);
synchronized (connectionTable) {
- connectionTable.remove(idObj);
+ connectionTable.remove(id);
-- numConnections;
}
break;
@@ -199,9 +194,7 @@ final class ConnectionMultiplexer {
"operation CLOSEACK " + id);
}
- idObj = new Integer(id);
- info =
- (MultiplexConnectionInfo) connectionTable.get(idObj);
+ info = connectionTable.get(id);
if (info == null)
throw new IOException(
"CLOSEACK: Invalid connection ID");
@@ -211,7 +204,7 @@ final class ConnectionMultiplexer {
info.in.disconnect();
info.out.disconnect();
synchronized (connectionTable) {
- connectionTable.remove(idObj);
+ connectionTable.remove(id);
-- numConnections;
}
break;
@@ -219,9 +212,7 @@ final class ConnectionMultiplexer {
// remote endpoint declaring additional bytes receivable
case REQUEST:
id = dataIn.readUnsignedShort();
- idObj = new Integer(id);
- info =
- (MultiplexConnectionInfo) connectionTable.get(idObj);
+ info = connectionTable.get(id);
if (info == null)
throw new IOException(
"REQUEST: Invalid connection ID");
@@ -238,9 +229,7 @@ final class ConnectionMultiplexer {
// remote endpoint transmitting data packet
case TRANSMIT:
id = dataIn.readUnsignedShort();
- idObj = new Integer(id);
- info =
- (MultiplexConnectionInfo) connectionTable.get(idObj);
+ info = connectionTable.get(id);
if (info == null)
throw new IOException("SEND: Invalid connection ID");
length = dataIn.readInt();
@@ -273,7 +262,6 @@ final class ConnectionMultiplexer {
// If all possible 32768 IDs are used,
// this method will block searching for a new ID forever.
int id;
- Integer idObj;
do {
lastID = (++ lastID) & 0x7FFF;
id = lastID;
@@ -283,8 +271,7 @@ final class ConnectionMultiplexer {
// two endpoints.
if (orig)
id |= 0x8000;
- idObj = new Integer(id);
- } while (connectionTable.get(idObj) != null);
+ } while (connectionTable.get(id) != null);
// create multiplexing streams and bookkeeping information
MultiplexConnectionInfo info = new MultiplexConnectionInfo(id);
@@ -298,7 +285,7 @@ final class ConnectionMultiplexer {
if (numConnections >= maxConnections)
throw new IOException("Cannot exceed " + maxConnections +
" simultaneous multiplexed connections");
- connectionTable.put(idObj, info);
+ connectionTable.put(id, info);
++ numConnections;
}
@@ -331,10 +318,10 @@ final class ConnectionMultiplexer {
return;
alive = false;
- Enumeration enum_ = connectionTable.elements();
+ Enumeration<MultiplexConnectionInfo> enum_ =
+ connectionTable.elements();
while (enum_.hasMoreElements()) {
- MultiplexConnectionInfo info =
- (MultiplexConnectionInfo) enum_.nextElement();
+ MultiplexConnectionInfo info = enum_.nextElement();
info.in.disconnect();
info.out.disconnect();
}
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
index e3aa730..7ab872c 100644
--- a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
+++ b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java
@@ -64,7 +64,7 @@ public class TCPChannel implements Channel {
private final TCPTransport tr;
/** list of cached connections */
private final List<TCPConnection> freeList =
- new ArrayList<TCPConnection>();
+ new ArrayList<>();
/** frees cached connections that have expired (guarded by freeList) */
private Future<?> reaper = null;
@@ -480,7 +480,7 @@ class ConnectionAcceptor implements Runnable {
private TCPTransport transport;
/** queue of connections to be accepted */
- private List<Connection> queue = new ArrayList<Connection>();
+ private List<Connection> queue = new ArrayList<>();
/** thread ID counter */
private static int threadNum = 0;
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
index 5897877..4af3405 100644
--- a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
+++ b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java
@@ -148,7 +148,7 @@ public class TCPEndpoint implements Endpoint {
// TBD: should this be a weak hash table?
private static final
Map<TCPEndpoint,LinkedList<TCPEndpoint>> localEndpoints =
- new HashMap<TCPEndpoint,LinkedList<TCPEndpoint>>();
+ new HashMap<>();
/**
* Create an endpoint for a specified host and port.
@@ -623,10 +623,9 @@ public class TCPEndpoint implements Endpoint {
try {
TCPEndpoint.shedConnectionCaches();
// REMIND: should we retry createSocket?
- } catch (OutOfMemoryError mem) {
+ } catch (OutOfMemoryError | Exception mem) {
// don't quit if out of memory
- } catch (Exception ex) {
- // don't quit if shed fails non-catastrophically
+ // or shed fails non-catastrophically
}
throw new ConnectIOException("Exception creating connection to: " +
diff --git a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
index a22c720..e2b9841 100644
--- a/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
+++ b/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java
@@ -119,7 +119,7 @@ public class TCPTransport extends Transport {
/** client host for the current thread's connection */
private static final ThreadLocal<ConnectionHandler>
- threadConnectionHandler = new ThreadLocal<ConnectionHandler>();
+ threadConnectionHandler = new ThreadLocal<>();
/** endpoints for this transport */
private final LinkedList<TCPEndpoint> epList;
@@ -129,7 +129,7 @@ public class TCPTransport extends Transport {
private ServerSocket server = null;
/** table mapping endpoints to channels */
private final Map<TCPEndpoint,Reference<TCPChannel>> channelTable =
- new WeakHashMap<TCPEndpoint,Reference<TCPChannel>>();
+ new WeakHashMap<>();
static final RMISocketFactory defaultSocketFactory =
RMISocketFactory.getDefaultSocketFactory();
diff --git a/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java b/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
index 94edd11..a628012 100644
--- a/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
+++ b/jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java
@@ -90,6 +90,10 @@ public final class SunNativeProvider extends Provider {
"libgssapi_krb5.so",
"libgssapi_krb5.so.2",
};
+ } else if (osname.startsWith("Mac OS X")) {
+ gssLibs = new String[]{
+ "/usr/lib/sasl2/libgssapiv2.2.so",
+ };
}
} else {
gssLibs = new String[]{ defaultLib };
diff --git a/jdk/src/share/classes/sun/security/krb5/Config.java b/jdk/src/share/classes/sun/security/krb5/Config.java
index ff4ae84..8c0cc62 100644
--- a/jdk/src/share/classes/sun/security/krb5/Config.java
+++ b/jdk/src/share/classes/sun/security/krb5/Config.java
@@ -113,6 +113,26 @@ public class Config {
}
+ private static boolean isMacosLionOrBetter() {
+ // split the "10.x.y" version number
+ String osVersion = System.getProperty("os.version");
+ String[] fragments = osVersion.split("\\.");
+
+ // sanity check the "10." part of the version
+ if (!fragments[0].equals("10")) return false;
+ if (fragments.length < 2) return false;
+
+ // check if Mac OS X 10.7(.y)
+ try {
+ int minorVers = Integer.parseInt(fragments[1]);
+ if (minorVers >= 7) return true;
+ } catch (NumberFormatException e) {
+ // was not an integer
+ }
+
+ return false;
+ }
+
/**
* Private constructor - can not be instantiated externally.
*/
@@ -146,7 +166,11 @@ public class Config {
try {
Vector<String> configFile;
configFile = loadConfigFile();
- stanzaTable = parseStanzaTable(configFile);
+ if (configFile == null && isMacosLionOrBetter()) {
+ stanzaTable = SCDynamicStoreConfig.getConfig();
+ } else {
+ stanzaTable = parseStanzaTable(configFile);
+ }
} catch (IOException ioe) {
// No krb5.conf, no problem. We'll use DNS or system property etc.
}
@@ -713,6 +737,9 @@ public class Config {
}
} else if (osname.startsWith("SunOS")) {
name = "/etc/krb5/krb5.conf";
+ } else if (osname.startsWith("Mac")) {
+ if (isMacosLionOrBetter()) return "";
+ name = findMacosConfigFile();
} else {
name = "/etc/krb5.conf";
}
@@ -724,6 +751,30 @@ public class Config {
return name;
}
+ private String getProperty(String property) {
+ return java.security.AccessController.doPrivileged(new sun.security.action.GetPropertyAction(property));
+ }
+
+ private String findMacosConfigFile() {
+ String userHome = getProperty("user.home");
+ final String PREF_FILE = "/Library/Preferences/edu.mit.Kerberos";
+ String userPrefs=userHome + PREF_FILE;
+
+ if (fileExists(userPrefs)) {
+ return userPrefs;
+ }
+
+ if (fileExists(PREF_FILE)) {
+ return PREF_FILE;
+ }
+
+ if (fileExists("/etc/krb5.conf")) {
+ return "/etc/krb5.conf";
+ }
+
+ return "";
+ }
+
private static String trimmed(String s) {
s = s.trim();
if (s.charAt(0) == '"' && s.charAt(s.length()-1) == '"' ||
diff --git a/jdk/src/share/classes/sun/security/krb5/Credentials.java b/jdk/src/share/classes/sun/security/krb5/Credentials.java
index 86dc3a0..15328cd 100644
--- a/jdk/src/share/classes/sun/security/krb5/Credentials.java
+++ b/jdk/src/share/classes/sun/security/krb5/Credentials.java
@@ -285,10 +285,11 @@ public class Credentials {
throws KrbException, IOException {
if (ticketCache == null) {
- // The default ticket cache on Windows is not a file.
+ // The default ticket cache on Windows and Mac is not a file.
String os = java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("os.name"));
- if (os.toUpperCase(Locale.ENGLISH).startsWith("WINDOWS")) {
+ if (os.toUpperCase(Locale.ENGLISH).startsWith("WINDOWS") ||
+ os.toUpperCase(Locale.ENGLISH).startsWith("MAC")) {
Credentials creds = acquireDefaultCreds();
if (creds == null) {
if (DEBUG) {
@@ -470,7 +471,11 @@ public class Credentials {
java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<Void> () {
public Void run() {
- System.loadLibrary("w2k_lsa_auth");
+ if (System.getProperty("os.name").startsWith("Mac")) {
+ System.loadLibrary("osxkrb5");
+ } else {
+ System.loadLibrary("w2k_lsa_auth");
+ }
return null;
}
});
diff --git a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java b/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
index 3ae4afc..b7b1db2 100644
--- a/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
+++ b/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java
@@ -141,7 +141,7 @@ public class KeyTab implements KeyTabConstants {
if (s == null) {
return getInstance();
} else {
- return getInstance0(s);
+ return getInstance0(parse(s));
}
}
diff --git a/jdk/src/share/classes/sun/security/pkcs/PKCS7.java b/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
index a319878..657842c 100644
--- a/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
+++ b/jdk/src/share/classes/sun/security/pkcs/PKCS7.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,16 +72,19 @@ public class PKCS7 {
/*
* Random number generator for creating nonce values
+ * (Lazy initialization)
*/
- private static final SecureRandom RANDOM;
- static {
- SecureRandom tmp = null;
- try {
- tmp = SecureRandom.getInstance("SHA1PRNG");
- } catch (NoSuchAlgorithmException e) {
- // should not happen
+ private static class SecureRandomHolder {
+ static final SecureRandom RANDOM;
+ static {
+ SecureRandom tmp = null;
+ try {
+ tmp = SecureRandom.getInstance("SHA1PRNG");
+ } catch (NoSuchAlgorithmException e) {
+ // should not happen
+ }
+ RANDOM = tmp;
}
- RANDOM = tmp;
}
/*
@@ -862,8 +865,8 @@ public class PKCS7 {
// Generate a nonce
BigInteger nonce = null;
- if (RANDOM != null) {
- nonce = new BigInteger(64, RANDOM);
+ if (SecureRandomHolder.RANDOM != null) {
+ nonce = new BigInteger(64, SecureRandomHolder.RANDOM);
tsQuery.setNonce(nonce);
}
tsQuery.requestCertificate(true);
diff --git a/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java b/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
index 1ebe17b..dd7c329 100644
--- a/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
+++ b/jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -198,8 +198,22 @@ final class P11KeyAgreement extends KeyAgreementSpi {
token.p11.C_GetAttributeValue(session.id(), keyID, attributes);
byte[] secret = attributes[0].getByteArray();
token.p11.C_DestroyObject(session.id(), keyID);
- // trim leading 0x00 bytes per JCE convention
- return P11Util.trimZeroes(secret);
+ // Some vendors, e.g. NSS, trim off the leading 0x00 byte(s) from
+ // the generated secret. Thus, we need to check the secret length
+ // and trim/pad it so the returned value has the same length as
+ // the modulus size
+ if (secret.length == secretLen) {
+ return secret;
+ } else {
+ if (secret.length > secretLen) {
+ // Shouldn't happen; but check just in case
+ throw new ProviderException("generated secret is out-of-range");
+ }
+ byte[] newSecret = new byte[secretLen];
+ System.arraycopy(secret, 0, newSecret, secretLen - secret.length,
+ secret.length);
+ return newSecret;
+ }
} catch (PKCS11Exception e) {
throw new ProviderException("Could not derive key", e);
} finally {
diff --git a/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java b/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
index f6bada9..e4ba425 100644
--- a/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
+++ b/jdk/src/share/classes/sun/security/pkcs12/PKCS12KeyStore.java
@@ -253,11 +253,25 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
}
try {
- // Use JCE
- SecretKey skey = getPBEKey(password);
- Cipher cipher = Cipher.getInstance(algOid.toString());
- cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
- byte[] privateKeyInfo = cipher.doFinal(encryptedKey);
+ byte[] privateKeyInfo;
+ while (true) {
+ try {
+ // Use JCE
+ SecretKey skey = getPBEKey(password);
+ Cipher cipher = Cipher.getInstance(algOid.toString());
+ cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
+ privateKeyInfo = cipher.doFinal(encryptedKey);
+ break;
+ } catch (Exception e) {
+ if (password.length == 0) {
+ // Retry using an empty password
+ // without a NULL terminator.
+ password = new char[1];
+ continue;
+ }
+ throw e;
+ }
+ }
PKCS8EncodedKeySpec kspec = new PKCS8EncodedKeySpec(privateKeyInfo);
@@ -1251,16 +1265,24 @@ public final class PKCS12KeyStore extends KeyStoreSpi {
ObjectIdentifier algOid = in.getOID();
AlgorithmParameters algParams = parseAlgParameters(in);
- try {
- // Use JCE
- SecretKey skey = getPBEKey(password);
- Cipher cipher = Cipher.getInstance(algOid.toString());
- cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
- safeContentsData = cipher.doFinal(safeContentsData);
-
- } catch (Exception e) {
- throw new IOException("failed to decrypt safe"
- + " contents entry: " + e, e);
+ while (true) {
+ try {
+ // Use JCE
+ SecretKey skey = getPBEKey(password);
+ Cipher cipher = Cipher.getInstance(algOid.toString());
+ cipher.init(Cipher.DECRYPT_MODE, skey, algParams);
+ safeContentsData = cipher.doFinal(safeContentsData);
+ break;
+ } catch (Exception e) {
+ if (password.length == 0) {
+ // Retry using an empty password
+ // without a NULL terminator.
+ password = new char[1];
+ continue;
+ }
+ throw new IOException(
+ "failed to decrypt safe contents entry: " + e, e);
+ }
}
} else {
throw new IOException("public key protected PKCS12" +
diff --git a/jdk/src/share/classes/sun/security/provider/PolicyFile.java b/jdk/src/share/classes/sun/security/provider/PolicyFile.java
index c97ad19..70bb8b9 100644
--- a/jdk/src/share/classes/sun/security/provider/PolicyFile.java
+++ b/jdk/src/share/classes/sun/security/provider/PolicyFile.java
@@ -1246,7 +1246,10 @@ public class PolicyFile extends java.security.Policy {
* @return the set of permissions according to the policy.
*/
private PermissionCollection getPermissions(Permissions perms,
- final CodeSource cs) {
+ final CodeSource cs) {
+
+ if (cs == null)
+ return perms;
CodeSource canonCodeSource = AccessController.doPrivileged(
new java.security.PrivilegedAction<CodeSource>(){
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java b/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
index 60d0886..2bcc691 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -661,7 +661,10 @@ class ForwardBuilder extends Builder {
+ "\n Subject: " + cert.getSubjectX500Principal() + ")");
}
- ForwardState currState = (ForwardState) currentState;
+ ForwardState currState = (ForwardState)currentState;
+
+ // Don't bother to verify untrusted certificate more.
+ currState.untrustedChecker.check(cert, Collections.<String>emptySet());
/*
* check for looping - abort a loop if
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java b/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
index 60de904..b2dd884 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ForwardState.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -79,6 +79,9 @@ class ForwardState implements State {
/* the checker used for revocation status */
public CrlRevocationChecker crlChecker;
+ /* the untrusted certificates checker */
+ UntrustedChecker untrustedChecker;
+
/* The list of user-defined checkers that support forward checking */
ArrayList<PKIXCertPathChecker> forwardCheckers;
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java b/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
index 6c075d6..c3aac69 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -314,10 +314,12 @@ public class PKIXCertPathValidator extends CertPathValidatorSpi {
pkixParam.isAnyPolicyInhibited(),
pkixParam.getPolicyQualifiersRejected(),
rootNode);
+ UntrustedChecker untrustedChecker = new UntrustedChecker();
ArrayList<PKIXCertPathChecker> certPathCheckers =
new ArrayList<PKIXCertPathChecker>();
// add standard checkers that we will be using
+ certPathCheckers.add(untrustedChecker);
certPathCheckers.add(algorithmChecker);
certPathCheckers.add(keyChecker);
certPathCheckers.add(constraintsChecker);
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java b/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
index 7bb5ee6..1babd0f 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -347,6 +347,10 @@ class ReverseBuilder extends Builder {
return;
}
+ // Don't bother to verify untrusted certificate more.
+ currentState.untrustedChecker.check(cert,
+ Collections.<String>emptySet());
+
/*
* check for looping - abort a loop if
* ((we encounter the same certificate twice) AND
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java b/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java
index a5e8093..ed4f135 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/ReverseState.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -99,6 +99,9 @@ class ReverseState implements State {
/* the algorithm checker */
AlgorithmChecker algorithmChecker;
+ /* the untrusted certificates checker */
+ UntrustedChecker untrustedChecker;
+
/* the trust anchor used to validate the path */
TrustAnchor trustAnchor;
diff --git a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java b/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
index b4dac76..c88c37b 100644
--- a/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
+++ b/jdk/src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -284,6 +284,7 @@ public final class SunCertPathBuilder extends CertPathBuilderSpi {
Iterator<TrustAnchor> iter = buildParams.getTrustAnchors().iterator();
while (iter.hasNext()) {
TrustAnchor anchor = iter.next();
+
/* check if anchor satisfies target constraints */
if (anchorIsTarget(anchor, targetSel)) {
this.trustAnchor = anchor;
@@ -303,6 +304,7 @@ public final class SunCertPathBuilder extends CertPathBuilderSpi {
currentState.crlChecker =
new CrlRevocationChecker(null, buildParams, null, onlyEECert);
currentState.algorithmChecker = new AlgorithmChecker(anchor);
+ currentState.untrustedChecker = new UntrustedChecker();
try {
depthFirstSearchReverse(null, currentState,
new ReverseBuilder(buildParams, targetSubjectDN), adjacencyList,
@@ -349,6 +351,7 @@ public final class SunCertPathBuilder extends CertPathBuilderSpi {
// init the crl checker
currentState.crlChecker
= new CrlRevocationChecker(null, buildParams, null, onlyEECert);
+ currentState.untrustedChecker = new UntrustedChecker();
depthFirstSearchForward(targetSubjectDN, currentState,
new ForwardBuilder
@@ -645,8 +648,8 @@ public final class SunCertPathBuilder extends CertPathBuilderSpi {
vertex.setIndex(adjList.size() - 1);
/* recursively search for matching certs at next dN */
- depthFirstSearchForward(cert.getIssuerX500Principal(), nextState, builder,
- adjList, certPathList);
+ depthFirstSearchForward(cert.getIssuerX500Principal(),
+ nextState, builder, adjList, certPathList);
/*
* If path has been completed, return ASAP!
diff --git a/jdk/src/share/classes/sun/security/smartcardio/TerminalImpl.java b/jdk/src/share/classes/sun/security/smartcardio/TerminalImpl.java
index 9cef530..7461743 100644
--- a/jdk/src/share/classes/sun/security/smartcardio/TerminalImpl.java
+++ b/jdk/src/share/classes/sun/security/smartcardio/TerminalImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -112,14 +112,17 @@ final class TerminalImpl extends CardTerminal {
if (wantPresent == present) {
return true;
}
- // no match, wait
- status = SCardGetStatusChange(contextId, timeout, status, readers);
- present = (status[0] & SCARD_STATE_PRESENT) != 0;
- // should never happen
- if (wantPresent != present) {
- throw new CardException("wait mismatch");
+ // no match, wait (until timeout expires)
+ long end = System.currentTimeMillis() + timeout;
+ while (wantPresent != present && timeout != 0) {
+ // set remaining timeout
+ if (timeout != TIMEOUT_INFINITE) {
+ timeout = Math.max(end - System.currentTimeMillis(), 0l);
+ }
+ status = SCardGetStatusChange(contextId, timeout, status, readers);
+ present = (status[0] & SCARD_STATE_PRESENT) != 0;
}
- return true;
+ return wantPresent == present;
} catch (PCSCException e) {
if (e.code == SCARD_E_TIMEOUT) {
return false;
diff --git a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
index bbf66ad..49851d8 100644
--- a/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
+++ b/jdk/src/share/classes/sun/security/ssl/CipherSuite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* 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.*;
import java.security.NoSuchAlgorithmException;
import java.security.InvalidKeyException;
import java.security.SecureRandom;
+import java.security.KeyManagementException;
import javax.crypto.SecretKey;
import javax.crypto.spec.IvParameterSpec;
@@ -423,6 +424,17 @@ final class CipherSuite implements Comparable<CipherSuite> {
// Is the cipher algorithm of Cipher Block Chaining (CBC) mode?
final boolean isCBCMode;
+ // The secure random used to detect the cipher availability.
+ private final static SecureRandom secureRandom;
+
+ static {
+ try {
+ secureRandom = JsseJce.getSecureRandom();
+ } catch (KeyManagementException kme) {
+ throw new RuntimeException(kme);
+ }
+ }
+
BulkCipher(String transformation, int keySize,
int expandedKeySize, int ivSize, boolean allowed) {
this.transformation = transformation;
@@ -505,7 +517,7 @@ final class CipherSuite implements Comparable<CipherSuite> {
IvParameterSpec iv =
new IvParameterSpec(new byte[cipher.ivSize]);
cipher.newCipher(ProtocolVersion.DEFAULT,
- key, iv, null, true);
+ key, iv, secureRandom, true);
b = Boolean.TRUE;
} catch (NoSuchAlgorithmException e) {
b = Boolean.FALSE;
diff --git a/jdk/src/share/classes/sun/security/ssl/EngineArgs.java b/jdk/src/share/classes/sun/security/ssl/EngineArgs.java
index f91e8cc..5f89d0c 100644
--- a/jdk/src/share/classes/sun/security/ssl/EngineArgs.java
+++ b/jdk/src/share/classes/sun/security/ssl/EngineArgs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +25,6 @@
package sun.security.ssl;
-import javax.net.ssl.*;
import java.nio.*;
/*
@@ -157,6 +156,7 @@ class EngineArgs {
int amount = Math.min(appData[i].remaining(), spaceLeft);
appData[i].limit(appData[i].position() + amount);
netData.put(appData[i]);
+ appRemaining -= amount;
spaceLeft -= amount;
}
}
@@ -209,10 +209,16 @@ class EngineArgs {
/*
* In the case of Exception, we want to reset the positions
* to appear as though no data has been consumed or produced.
+ *
+ * Currently, this method is only called as we are preparing to
+ * fail out, and thus we don't need to actually recalculate
+ * appRemaining. If that assumption changes, that variable should
+ * be updated here.
*/
void resetPos() {
netData.position(netPos);
for (int i = offset; i < offset + len; i++) {
+ // See comment above about recalculating appRemaining.
appData[i].position(appPoss[i]);
}
}
diff --git a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
index 8616a71..f9b1386 100644
--- a/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/jdk/src/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -1165,7 +1165,7 @@ final public class SSLEngineImpl extends SSLEngine {
ea.resetPos();
fatal(Alerts.alert_internal_error,
- "problem unwrapping net record", e);
+ "problem wrapping app data", e);
return null; // make compiler happy
} finally {
/*
diff --git a/jdk/src/share/classes/sun/security/tools/JarSigner.java b/jdk/src/share/classes/sun/security/tools/JarSigner.java
index fe3944f..31dfbce 100644
--- a/jdk/src/share/classes/sun/security/tools/JarSigner.java
+++ b/jdk/src/share/classes/sun/security/tools/JarSigner.java
@@ -66,7 +66,7 @@ import sun.misc.BASE64Encoder;
* 0: success
* 1: any error that the jar cannot be signed or verified, including:
* keystore loading error
- * TSP communciation error
+ * TSP communication error
* jarsigner command line error...
* otherwise: error codes from -strict
*
@@ -258,8 +258,7 @@ public class JarSigner {
if (hasExpiringCert) {
exitCode |= 2;
}
- if (chainNotValidated) {
- // hasExpiredCert and notYetValidCert included in this case
+ if (chainNotValidated || hasExpiredCert || notYetValidCert) {
exitCode |= 4;
}
if (badKeyUsage || badExtendedKeyUsage || badNetscapeCertType) {
@@ -600,7 +599,6 @@ public class JarSigner {
if (verbose != null) System.out.println();
Enumeration<JarEntry> e = entriesVec.elements();
- long now = System.currentTimeMillis();
String tab = rb.getString("6SPACE");
while (e.hasMoreElements()) {
@@ -648,7 +646,7 @@ public class JarSigner {
// signerInfo() must be called even if -verbose
// not provided. The method updates various
// warning flags.
- String si = signerInfo(signer, tab, now);
+ String si = signerInfo(signer, tab);
if (showcerts) {
sb.append(si);
sb.append('\n');
@@ -837,7 +835,7 @@ public class JarSigner {
* Note: no newline character at the end
*/
String printCert(String tab, Certificate c, boolean checkValidityPeriod,
- long now, boolean checkUsage) {
+ Date timestamp, boolean checkUsage) {
StringBuilder certStr = new StringBuilder();
String space = rb.getString("SPACE");
@@ -862,22 +860,24 @@ public class JarSigner {
certStr.append("\n").append(tab).append("[");
Date notAfter = x509Cert.getNotAfter();
try {
- x509Cert.checkValidity();
- // test if cert will expire within six months
- if (now == 0) {
- now = System.currentTimeMillis();
- }
- if (notAfter.getTime() < now + SIX_MONTHS) {
- hasExpiringCert = true;
-
- if (expiringTimeForm == null) {
- expiringTimeForm = new MessageFormat(
- rb.getString("certificate.will.expire.on"));
+ boolean printValidity = true;
+ if (timestamp == null) {
+ x509Cert.checkValidity();
+ // test if cert will expire within six months
+ if (notAfter.getTime() < System.currentTimeMillis() + SIX_MONTHS) {
+ hasExpiringCert = true;
+ if (expiringTimeForm == null) {
+ expiringTimeForm = new MessageFormat(
+ rb.getString("certificate.will.expire.on"));
+ }
+ Object[] source = { notAfter };
+ certStr.append(expiringTimeForm.format(source));
+ printValidity = false;
}
- Object[] source = { notAfter };
- certStr.append(expiringTimeForm.format(source));
-
} else {
+ x509Cert.checkValidity(timestamp);
+ }
+ if (printValidity) {
if (validityTimeForm == null) {
validityTimeForm = new MessageFormat(
rb.getString("certificate.is.valid.from"));
@@ -1283,7 +1283,7 @@ public class JarSigner {
tsaURI);
}
System.out.println(rb.getString("TSA.certificate.") +
- printCert("", tsaCert, false, 0, false));
+ printCert("", tsaCert, false, null, false));
}
if (signingMechanism != null) {
System.out.println(
@@ -1481,23 +1481,27 @@ public class JarSigner {
/**
* Returns a string of singer info, with a newline at the end
*/
- private String signerInfo(CodeSigner signer, String tab, long now) {
+ private String signerInfo(CodeSigner signer, String tab) {
if (cacheForSignerInfo.containsKey(signer)) {
return cacheForSignerInfo.get(signer);
}
StringBuffer s = new StringBuffer();
List<? extends Certificate> certs = signer.getSignerCertPath().getCertificates();
// display the signature timestamp, if present
- Timestamp timestamp = signer.getTimestamp();
- if (timestamp != null) {
- s.append(printTimestamp(tab, timestamp));
+ Date timestamp;
+ Timestamp ts = signer.getTimestamp();
+ if (ts != null) {
+ s.append(printTimestamp(tab, ts));
s.append('\n');
+ timestamp = ts.getTimestamp();
+ } else {
+ timestamp = null;
}
- // display the certificate(s). The first one is end-enity cert and
+ // display the certificate(s). The first one is end-entity cert and
// its KeyUsage should be checked.
boolean first = true;
for (Certificate c : certs) {
- s.append(printCert(tab, c, true, now, first));
+ s.append(printCert(tab, c, true, timestamp, first));
s.append('\n');
first = false;
}
@@ -1508,9 +1512,15 @@ public class JarSigner {
if (debug) {
e.printStackTrace();
}
- chainNotValidated = true;
- s.append(tab + rb.getString(".CertPath.not.validated.") +
- e.getLocalizedMessage() + "]\n"); // TODO
+ if (e.getCause() != null &&
+ (e.getCause() instanceof CertificateExpiredException ||
+ e.getCause() instanceof CertificateNotYetValidException)) {
+ // No more warning, we alreay have hasExpiredCert or notYetValidCert
+ } else {
+ chainNotValidated = true;
+ s.append(tab + rb.getString(".CertPath.not.validated.") +
+ e.getLocalizedMessage() + "]\n"); // TODO
+ }
}
String result = s.toString();
cacheForSignerInfo.put(signer, result);
@@ -1804,7 +1814,7 @@ public class JarSigner {
// We don't meant to print anything, the next call
// checks validity and keyUsage etc
- printCert("", certChain[0], true, 0, true);
+ printCert("", certChain[0], true, null, true);
try {
CertPath cp = certificateFactory.generateCertPath(Arrays.asList(certChain));
@@ -1813,7 +1823,13 @@ public class JarSigner {
if (debug) {
e.printStackTrace();
}
- chainNotValidated = true;
+ if (e.getCause() != null &&
+ (e.getCause() instanceof CertificateExpiredException ||
+ e.getCause() instanceof CertificateNotYetValidException)) {
+ // No more warning, we alreay have hasExpiredCert or notYetValidCert
+ } else {
+ chainNotValidated = true;
+ }
}
try {
diff --git a/jdk/src/share/classes/sun/security/tools/KeyTool.java b/jdk/src/share/classes/sun/security/tools/KeyTool.java
index 3125f6f..44fb40d 100644
--- a/jdk/src/share/classes/sun/security/tools/KeyTool.java
+++ b/jdk/src/share/classes/sun/security/tools/KeyTool.java
@@ -2117,19 +2117,24 @@ public final class KeyTool {
if (caks != null) {
issuer = verifyCRL(caks, crl);
if (issuer != null) {
- System.out.println("Verified by " + issuer + " in cacerts");
+ out.printf(rb.getString(
+ "verified.by.s.in.s"), issuer, "cacerts");
+ out.println();
}
}
if (issuer == null && keyStore != null) {
issuer = verifyCRL(keyStore, crl);
if (issuer != null) {
- System.out.println("Verified by " + issuer + " in keystore");
+ out.printf(rb.getString(
+ "verified.by.s.in.s"), issuer, "keystore");
+ out.println();
}
}
if (issuer == null) {
out.println(rb.getString
("STAR"));
- out.println("WARNING: not verified. Make sure -keystore and -alias are correct.");
+ out.println(rb.getString
+ ("warning.not.verified.make.sure.keystore.is.correct"));
out.println(rb.getString
("STARNN"));
}
diff --git a/jdk/src/share/classes/sun/security/util/Resources.java b/jdk/src/share/classes/sun/security/util/Resources.java
index 299facc..a7ba9e2 100644
--- a/jdk/src/share/classes/sun/security/util/Resources.java
+++ b/jdk/src/share/classes/sun/security/util/Resources.java
@@ -409,6 +409,10 @@ public class Resources extends java.util.ListResourceBundle {
{"Please.provide.keysize.for.secret.key.generation",
"Please provide -keysize for secret key generation"},
+ {"verified.by.s.in.s", "Verified by %s in %s"},
+ {"warning.not.verified.make.sure.keystore.is.correct",
+ "WARNING: not verified. Make sure -keystore is correct."},
+
{"Extensions.", "Extensions: "},
{".Empty.value.", "(Empty value)"},
{"Extension.Request.", "Extension Request:"},
diff --git a/jdk/src/share/classes/sun/security/validator/SimpleValidator.java b/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
index 850dfa0..9469842 100644
--- a/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
+++ b/jdk/src/share/classes/sun/security/validator/SimpleValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@ import sun.security.util.DerInputStream;
import sun.security.util.ObjectIdentifier;
import sun.security.provider.certpath.AlgorithmChecker;
+import sun.security.provider.certpath.UntrustedChecker;
/**
* A simple validator implementation. It is based on code from the JSSE
@@ -137,6 +138,9 @@ public final class SimpleValidator extends Validator {
date = new Date();
}
+ // create distrusted certificates checker
+ UntrustedChecker untrustedChecker = new UntrustedChecker();
+
// create default algorithm constraints checker
TrustAnchor anchor = new TrustAnchor(chain[chain.length - 1], null);
AlgorithmChecker defaultAlgChecker = new AlgorithmChecker(anchor);
@@ -154,6 +158,17 @@ public final class SimpleValidator extends Validator {
X509Certificate issuerCert = chain[i + 1];
X509Certificate cert = chain[i];
+ // check untrusted certificate
+ try {
+ // Untrusted checker does not care about the unresolved
+ // critical extensions.
+ untrustedChecker.check(cert, Collections.<String>emptySet());
+ } catch (CertPathValidatorException cpve) {
+ throw new ValidatorException(
+ "Untrusted certificate: " + cert.getSubjectX500Principal(),
+ ValidatorException.T_UNTRUSTED_CERT, cert, cpve);
+ }
+
// check certificate algorithm
try {
// Algorithm checker does not care about the unresolved
diff --git a/jdk/src/share/classes/sun/security/validator/ValidatorException.java b/jdk/src/share/classes/sun/security/validator/ValidatorException.java
index 9bd1bae..db4b056 100644
--- a/jdk/src/share/classes/sun/security/validator/ValidatorException.java
+++ b/jdk/src/share/classes/sun/security/validator/ValidatorException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -58,6 +58,9 @@ public class ValidatorException extends CertificateException {
public final static Object T_ALGORITHM_DISABLED =
"Certificate signature algorithm disabled";
+ public final static Object T_UNTRUSTED_CERT =
+ "Untrusted certificate";
+
private Object type;
private X509Certificate cert;
diff --git a/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider b/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
index a355775..100e352 100644
--- a/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
+++ b/jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[macosx]sun.tools.attach.BsdAttachProvider
diff --git a/jdk/src/share/classes/sun/tools/jar/CommandLine.java b/jdk/src/share/classes/sun/tools/jar/CommandLine.java
index acb1308..b9ddeb8 100644
--- a/jdk/src/share/classes/sun/tools/jar/CommandLine.java
+++ b/jdk/src/share/classes/sun/tools/jar/CommandLine.java
@@ -55,7 +55,7 @@ public class CommandLine {
public static String[] parse(String[] args)
throws IOException
{
- ArrayList newArgs = new ArrayList(args.length);
+ List<String> newArgs = new ArrayList<>(args.length);
for (int i = 0; i < args.length; i++) {
String arg = args[i];
if (arg.length() > 1 && arg.charAt(0) == '@') {
@@ -69,10 +69,10 @@ public class CommandLine {
newArgs.add(arg);
}
}
- return (String[])newArgs.toArray(new String[newArgs.size()]);
+ return newArgs.toArray(new String[newArgs.size()]);
}
- private static void loadCmdFile(String name, List args)
+ private static void loadCmdFile(String name, List<String> args)
throws IOException
{
Reader r = new BufferedReader(new FileReader(name));
@@ -83,7 +83,7 @@ public class CommandLine {
st.commentChar('#');
st.quoteChar('"');
st.quoteChar('\'');
- while (st.nextToken() != st.TT_EOF) {
+ while (st.nextToken() != StreamTokenizer.TT_EOF) {
args.add(st.sval);
}
r.close();
diff --git a/jdk/src/share/classes/sun/tools/jar/Manifest.java b/jdk/src/share/classes/sun/tools/jar/Manifest.java
index 370c9ed..b49d1e8 100644
--- a/jdk/src/share/classes/sun/tools/jar/Manifest.java
+++ b/jdk/src/share/classes/sun/tools/jar/Manifest.java
@@ -47,10 +47,10 @@ public class Manifest {
/* list of headers that all pertain to a particular
* file in the archive
*/
- private Vector entries = new Vector();
+ private Vector<MessageHeader> entries = new Vector<>();
private byte[] tmpbuf = new byte[512];
/* a hashtable of entries, for fast lookup */
- private Hashtable tableEntries = new Hashtable();
+ private Hashtable<String, MessageHeader> tableEntries = new Hashtable<>();
static final String[] hashes = {"SHA"};
static final byte[] EOL = {(byte)'\r', (byte)'\n'};
@@ -115,14 +115,14 @@ public class Manifest {
}
public MessageHeader getEntry(String name) {
- return (MessageHeader) tableEntries.get(name);
+ return tableEntries.get(name);
}
public MessageHeader entryAt(int i) {
- return (MessageHeader) entries.elementAt(i);
+ return entries.elementAt(i);
}
- public Enumeration entries() {
+ public Enumeration<MessageHeader> entries() {
return entries.elements();
}
@@ -214,7 +214,7 @@ public class Manifest {
/* the first header in the file should be the global one.
* It should say "Manifest-Version: x.x"; if not add it
*/
- MessageHeader globals = (MessageHeader) entries.elementAt(0);
+ MessageHeader globals = entries.elementAt(0);
if (globals.findValue("Manifest-Version") == null) {
/* Assume this is a user-defined manifest. If it has a Name: <..>
@@ -238,7 +238,7 @@ public class Manifest {
globals.print(ps);
for (int i = 1; i < entries.size(); ++i) {
- MessageHeader mh = (MessageHeader) entries.elementAt(i);
+ MessageHeader mh = entries.elementAt(i);
mh.print(ps);
}
}
diff --git a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java b/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
index 0ce8951..fd67ce1 100644
--- a/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
+++ b/jdk/src/share/classes/sun/tools/jar/SignatureFile.java
@@ -47,7 +47,7 @@ import sun.security.x509.AlgorithmId;
*
* <p>Each entry section contains the name of an entry (which must
* have a counterpart in the manifest). Like the manifest it contains
- * a hash, the hash of the manifest section correspondind to the
+ * a hash, the hash of the manifest section corresponding to the
* name. Since the manifest entry contains the hash of the data, this
* is equivalent to a signature of the data, plus the attributes of
* the manifest entry.
@@ -66,7 +66,7 @@ public class SignatureFile {
/* list of headers that all pertain to a particular file in the
* archive */
- private Vector entries = new Vector();
+ private Vector<MessageHeader> entries = new Vector<>();
/* Right now we only support SHA hashes */
static final String[] hashes = {"SHA"};
@@ -98,7 +98,7 @@ public class SignatureFile {
* character in length. */
private SignatureFile(String name) throws JarException {
- entries = new Vector();
+ entries = new Vector<>();
if (name != null) {
if (name.length() > 8 || name.indexOf('.') != -1) {
@@ -142,9 +142,9 @@ public class SignatureFile {
this(name, true);
this.manifest = manifest;
- Enumeration enum_ = manifest.entries();
+ Enumeration<MessageHeader> enum_ = manifest.entries();
while (enum_.hasMoreElements()) {
- MessageHeader mh = (MessageHeader)enum_.nextElement();
+ MessageHeader mh = enum_.nextElement();
String entryName = mh.findValue("Name");
if (entryName != null) {
add(entryName);
@@ -269,9 +269,9 @@ public class SignatureFile {
*the entry does not exist.
*/
public MessageHeader getEntry(String name) {
- Enumeration enum_ = entries();
+ Enumeration<MessageHeader> enum_ = entries();
while(enum_.hasMoreElements()) {
- MessageHeader mh = (MessageHeader)enum_.nextElement();
+ MessageHeader mh = enum_.nextElement();
if (name.equals(mh.findValue("Name"))) {
return mh;
}
@@ -282,13 +282,13 @@ public class SignatureFile {
/**
* Returns the n-th entry. The global header is a entry 0. */
public MessageHeader entryAt(int n) {
- return (MessageHeader) entries.elementAt(n);
+ return entries.elementAt(n);
}
/**
* Returns an enumeration of the entries.
*/
- public Enumeration entries() {
+ public Enumeration<MessageHeader> entries() {
return entries.elements();
}
@@ -322,11 +322,11 @@ public class SignatureFile {
}
}
- private Hashtable digests = new Hashtable();
+ private Hashtable<String, MessageDigest> digests = new Hashtable<>();
private MessageDigest getDigest(String algorithm)
throws NoSuchAlgorithmException {
- MessageDigest dig = (MessageDigest)digests.get(algorithm);
+ MessageDigest dig = digests.get(algorithm);
if (dig == null) {
dig = MessageDigest.getInstance(algorithm);
digests.put(algorithm, dig);
@@ -344,7 +344,7 @@ public class SignatureFile {
/* the first header in the file should be the global one.
* It should say "SignatureFile-Version: x.x"; barf if not
*/
- MessageHeader globals = (MessageHeader) entries.elementAt(0);
+ MessageHeader globals = entries.elementAt(0);
if (globals.findValue("Signature-Version") == null) {
throw new JarException("Signature file requires " +
"Signature-Version: 1.0 in 1st header");
@@ -354,7 +354,7 @@ public class SignatureFile {
globals.print(ps);
for (int i = 1; i < entries.size(); ++i) {
- MessageHeader mh = (MessageHeader) entries.elementAt(i);
+ MessageHeader mh = entries.elementAt(i);
mh.print(ps);
}
}
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java
index 975e3ed..2838be4 100644
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -79,13 +79,18 @@ public class ZoneInfo extends TimeZone {
private static final int TRANSITION_NSHIFT = 12;
// Flag for supporting JDK backward compatible IDs, such as "EST".
- private static final boolean USE_OLDMAPPING;
+ static final boolean USE_OLDMAPPING;
static {
String oldmapping = AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("sun.timezone.ids.oldmapping", "false")).toLowerCase(Locale.ROOT);
USE_OLDMAPPING = (oldmapping.equals("yes") || oldmapping.equals("true"));
}
+ // IDs having conflicting data between Olson and JDK 1.1
+ static final String[] conflictingIDs = {
+ "EST", "MST", "HST"
+ };
+
private static final CalendarSystem gcal = CalendarSystem.getGregorianCalendar();
/**
@@ -808,32 +813,41 @@ public class ZoneInfo extends TimeZone {
private static SoftReference<Map<String, String>> aliasTable;
- /**
- * Returns a Map from alias time zone IDs to their standard
- * time zone IDs.
- *
- * @return the Map that holds the mappings from alias time zone IDs
- * to their standard time zone IDs, or null if
- * <code>ZoneInfoMappings</code> file is not available.
- */
- public synchronized static Map<String, String> getAliasTable() {
+ static Map<String, String> getCachedAliasTable() {
Map<String, String> aliases = null;
SoftReference<Map<String, String>> cache = aliasTable;
if (cache != null) {
aliases = cache.get();
- if (aliases != null) {
- return aliases;
- }
- }
-
- aliases = ZoneInfoFile.getZoneAliases();
- if (aliases != null) {
- aliasTable = new SoftReference<>(aliases);
}
return aliases;
}
+ /**
+ * Returns a Map from alias time zone IDs to their standard
+ * time zone IDs.
+ *
+ * @return the Map that holds the mappings from alias time zone IDs
+ * to their standard time zone IDs, or null if
+ * <code>ZoneInfoMappings</code> file is not available.
+ */
+ public synchronized static Map<String, String> getAliasTable() {
+ Map<String, String> aliases = getCachedAliasTable();
+ if (aliases == null) {
+ aliases = ZoneInfoFile.getZoneAliases();
+ if (aliases != null) {
+ if (!USE_OLDMAPPING) {
+ // Remove the conflicting IDs from the alias table.
+ for (String key : conflictingIDs) {
+ aliases.remove(key);
+ }
+ }
+ aliasTable = new SoftReference<Map<String, String>>(aliases);
+ }
+ }
+ return aliases;
+ }
+
private void readObject(ObjectInputStream stream)
throws IOException, ClassNotFoundException {
stream.defaultReadObject();
diff --git a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
index 2ad72b0..094c956 100644
--- a/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
+++ b/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -473,6 +473,8 @@ public class ZoneInfoFile {
private static Map<String, ZoneInfo> zoneInfoObjects = null;
+ private static final ZoneInfo GMT = new ZoneInfo("GMT", 0);
+
private static final String ziDir = AccessController.doPrivileged(
new PrivilegedAction<String>() {
public String run() {
@@ -553,8 +555,15 @@ public class ZoneInfoFile {
* id.
*/
public static ZoneInfo getZoneInfo(String id) {
+ //treat GMT zone as special
+ if ("GMT".equals(id))
+ return (ZoneInfo) GMT.clone();
ZoneInfo zi = getFromCache(id);
if (zi == null) {
+ Map<String, String> aliases = ZoneInfo.getCachedAliasTable();
+ if (aliases != null && aliases.get(id) != null) {
+ return null;
+ }
zi = createZoneInfo(id);
if (zi == null) {
return null;
@@ -1031,30 +1040,26 @@ public class ZoneInfoFile {
* @return the buffer, or null if any I/O error occurred.
*/
private static byte[] readZoneInfoFile(final String fileName) {
+ if (fileName.indexOf("..") >= 0) {
+ return null;
+ }
byte[] buffer = null;
try {
buffer = AccessController.doPrivileged(new PrivilegedExceptionAction<byte[]>() {
public byte[] run() throws IOException {
File file = new File(ziDir, fileName);
- if (!file.exists() || !file.isFile()) {
- return null;
- }
- file = file.getCanonicalFile();
- String path = file.getCanonicalPath();
byte[] buf = null;
- if (path != null && path.startsWith(ziDir)) {
- int filesize = (int)file.length();
- if (filesize > 0) {
- FileInputStream fis = new FileInputStream(file);
- buf = new byte[filesize];
- try {
- if (fis.read(buf) != filesize) {
- throw new IOException("read error on " + fileName);
- }
- } finally {
- fis.close();
+ int filesize = (int)file.length();
+ if (filesize > 0) {
+ FileInputStream fis = new FileInputStream(file);
+ buf = new byte[filesize];
+ try {
+ if (fis.read(buf) != filesize) {
+ throw new IOException("read error on " + fileName);
}
+ } finally {
+ fis.close();
}
}
return buf;
diff --git a/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties b/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties
index 1339e05..b8e80a2 100644
--- a/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties
+++ b/jdk/src/share/classes/sun/util/resources/CurrencyNames.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#
# COPYRIGHT AND PERMISSION NOTICE
#
-# Copyright (C) 1991-2011 Unicode, Inc. All rights reserved.
+# Copyright (C) 1991-2012 Unicode, Inc. All rights reserved.
# Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
#
# Permission is hereby granted, free of charge, to any person obtaining
@@ -226,6 +226,7 @@ SLL=SLL
SOS=SOS
SRD=SRD
SRG=SRG
+SSP=SSP
STD=STD
SVC=SVC
SYP=SYP
@@ -443,6 +444,7 @@ sll=Sierra Leonean Leone
sos=Somali Shilling
srd=Surinamese Dollar
srg=Surinamese Guilder
+ssp=South Sudanese Pound
std=S\u00e3o Tom\u00e9 and Pr\u00edncipe Dobra
svc=Salvadoran Col\u00f3n
syp=Syrian Pound
@@ -486,7 +488,9 @@ xof=CFA Franc BCEAO
xpd=Palladium
xpf=CFP Franc
xpt=Platinum
+xsu=Sucre
xts=Testing Currency Code
+xua=ADB Unit of Account
xxx=Unknown Currency
yer=Yemeni Rial
yum=Yugoslavian New Dinar (1994-2002)
diff --git a/jdk/src/share/classes/sun/util/resources/LocaleNames.properties b/jdk/src/share/classes/sun/util/resources/LocaleNames.properties
index 0552c94..9b3fdda 100644
--- a/jdk/src/share/classes/sun/util/resources/LocaleNames.properties
+++ b/jdk/src/share/classes/sun/util/resources/LocaleNames.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -1077,6 +1077,7 @@ SM=San Marino
SN=Senegal
SO=Somalia
SR=Suriname
+SS=South Sudan
ST=Sao Tome And Principe
SV=El Salvador
SX=Sint Maarten (Dutch part)
diff --git a/jdk/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java b/jdk/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java
index fcba7ac..9e93bd2 100644
--- a/jdk/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java
+++ b/jdk/src/share/demo/jfc/TransparentRuler/transparentruler/Ruler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -40,12 +40,9 @@
package transparentruler;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.GraphicsDevice;
+import java.awt.*;
import java.awt.GraphicsDevice.WindowTranslucency;
-import java.awt.GraphicsEnvironment;
+import static java.awt.GraphicsDevice.WindowTranslucency.*;
import java.awt.event.ActionEvent;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
@@ -79,16 +76,32 @@ public class Ruler extends JFrame {
private static final int F_HEIGHT = 400;
private static final int F_WIDTH = (int) (F_HEIGHT * 1.618 + 0.5);
- private static void checkTranslucencyMode(WindowTranslucency arg) {
+ private static boolean translucencySupported;
+ private static boolean transparencySupported;
+
+ private static boolean checkTranslucencyMode(WindowTranslucency arg) {
GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
GraphicsDevice gd = ge.getDefaultScreenDevice();
- if (!gd.isWindowTranslucencySupported(arg)) {
- System.err.println("'" + arg
- + "' translucency mode isn't supported.");
- System.exit(-1);
- }
+ return gd.isWindowTranslucencySupported(arg);
}
+
+ public Shape buildShape() {
+ int h = getHeight();
+ int w = getWidth();
+ float a = (float) Math.hypot(h, w);
+ Float path = new java.awt.geom.Path2D.Float();
+ path.moveTo(0, 0);
+ path.lineTo(w, 0);
+ path.lineTo(0, h);
+ path.closePath();
+ path.moveTo(W, W);
+ path.lineTo(W, h - W * (a + h) / w);
+ path.lineTo(w - W * (a + w) / h, W);
+ path.closePath();
+ return path;
+ }
+
private final ComponentAdapter componentListener = new ComponentAdapter() {
/**
@@ -97,36 +110,32 @@ public class Ruler extends JFrame {
*/
@Override
public void componentResized(ComponentEvent e) {
- int h = getHeight();
- int w = getWidth();
- float a = (float) Math.hypot(h, w);
- Float path = new java.awt.geom.Path2D.Float();
- path.moveTo(0, 0);
- path.lineTo(w, 0);
- path.lineTo(0, h);
- path.closePath();
- path.moveTo(W, W);
- path.lineTo(W, h - W * (a + h) / w);
- path.lineTo(w - W * (a + w) / h, W);
- path.closePath();
- setShape(path);
+
+ // We do apply shape only if PERPIXEL_TRANSPARENT is supported
+ if (transparencySupported) {
+ setShape(buildShape());
+ }
}
};
+
private final Action exitAction = new AbstractAction("Exit") {
{
putValue(Action.MNEMONIC_KEY, KeyEvent.VK_X);
}
+ @Override
public void actionPerformed(ActionEvent e) {
System.exit(0);
}
};
+
private final JPopupMenu jPopupMenu = new JPopupMenu();
{
jPopupMenu.add(new JMenuItem(exitAction));
}
+
/**
* Implements mouse-related behavior: window dragging and popup menu
* invocation
@@ -157,6 +166,7 @@ public class Ruler extends JFrame {
}
}
};
+
/**
* Implements keyboard navigation. Arrows move by 5 pixels, Ctrl + arrows
* move by 50 pixels, Alt + arrows move by 1 pixel.
@@ -201,10 +211,22 @@ public class Ruler extends JFrame {
@Override
protected void paintComponent(Graphics g) {
- Graphics gg = g.create();
+ Graphics2D gg = (Graphics2D) g.create();
int w = getWidth();
int h = getHeight();
int hh = gg.getFontMetrics().getAscent();
+
+ // This is an approach to apply shape when PERPIXEL_TRANSPARENT
+ // isn't supported
+ if (!transparencySupported) {
+ gg.setBackground(new Color(0, 0, 0, 0));
+ gg.clearRect(0, 0, w, h);
+ gg.clip(buildShape());
+
+ gg.setBackground(Ruler.this.getBackground());
+ gg.clearRect(0, 0, w, h);
+ }
+
gg.setColor(FOREGROUND);
for (int x = 0; x < w * (h - 8) / h - 5; x += 5) {
boolean hi = x % 50 == 0;
@@ -216,6 +238,7 @@ public class Ruler extends JFrame {
gg.drawString(number, x + 5 - ww / 2, 20 + hh);
}
}
+
gg.dispose();
}
});
@@ -231,9 +254,17 @@ public class Ruler extends JFrame {
SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
public void run() {
- checkTranslucencyMode(WindowTranslucency.PERPIXEL_TRANSLUCENT);
- checkTranslucencyMode(WindowTranslucency.PERPIXEL_TRANSPARENT);
+ translucencySupported = checkTranslucencyMode(PERPIXEL_TRANSLUCENT);
+ transparencySupported = checkTranslucencyMode(PERPIXEL_TRANSPARENT);
+
+ if (!translucencySupported) {
+ System.err.println("This application requires "
+ + "'PERPIXEL_TRANSLUCENT' translucency mode to "
+ + "be supported.");
+ System.exit(-1);
+ }
Ruler ruler = new Ruler();
ruler.setVisible(true);
diff --git a/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt b/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
index 22e2cec..e214792 100644
--- a/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt b/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
index b14ea70..99fa399 100644
--- a/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt b/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
index 83e7d79..a58f710 100644
--- a/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt
@@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt b/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
index a4e3d71..9f76046 100644
--- a/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt b/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
index 8028cd8..8da8100 100644
--- a/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt
@@ -130,7 +130,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES= -ldl -lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/index.html b/jdk/src/share/demo/jvmti/index.html
index 6ef96bb..b66ac8d 100644
--- a/jdk/src/share/demo/jvmti/index.html
+++ b/jdk/src/share/demo/jvmti/index.html
@@ -308,7 +308,7 @@ For X86:
<code><ul>
gcc -O2 -fPIC -pthread -DLINUX -c <i>*.c</i>
<br>
-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
+gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul>
<br>
For AMD64:
@@ -316,7 +316,7 @@ For AMD64:
<code><ul>
gcc -O2 -fPIC -pthread -DLINUX -D_LP64=1 -c <i>*.c</i>
<br>
-gcc -z defs -static-libgcc -shared -mimpure-text -o <i>libXXX.so *.o</i> -lc
+gcc -z defs -static-libgcc -shared -o <i>libXXX.so *.o</i> -lc
</code></ul>
<br>
</li>
@@ -339,7 +339,7 @@ option.
</li>
<li>
-Library: Use -static-libgcc -mimpure-text.
+Library: Use -static-libgcc.
<br>
When building the shared library (-shared option), this option
allows for maximum portability of the library between different
diff --git a/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt b/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
index 51f0796..a2ec685 100644
--- a/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/java_crw_demo/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/minst/sample.makefile.txt b/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
index be8910b..42da35b 100644
--- a/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/minst/sample.makefile.txt
@@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt b/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
index c75a5e8..b103282 100644
--- a/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt
@@ -94,7 +94,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt b/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
index 3028a85..9b7abd4 100644
--- a/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt
@@ -90,7 +90,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.c=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=-lc
# Building a shared library
diff --git a/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt b/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
index 70d66bd..68ac497 100644
--- a/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
+++ b/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt
@@ -91,7 +91,7 @@ ifeq ($(OSNAME), linux)
OBJECTS=$(SOURCES:%.cpp=%.o)
# Library name and options needed to build it
LIBRARY=lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
# Libraries we are dependent on
LIBRARIES=
# Building a shared library
diff --git a/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java b/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java
index 717e34b..ca6ab6e 100644
--- a/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java
+++ b/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java
@@ -213,10 +213,10 @@ public class MemoryMonitor extends JPanel {
// Calculate remaining size
float ssH = ascent + descent;
- float remainingHeight = (float) (y2 - (ssH*2) - 0.5f);
+ float remainingHeight = y2 - (ssH*2) - 0.5f;
float blockHeight = remainingHeight/10;
float blockWidth = 20.0f;
- float remainingWidth = (float) (x2 - blockWidth - 10);
+ float remainingWidth = x2 - blockWidth - 10;
// .. Memory Free ..
big.setColor(mfColor);
@@ -224,7 +224,7 @@ public class MemoryMonitor extends JPanel {
int i = 0;
for ( ; i < MemUsage ; i++) {
mfRect.setRect(x1+5,(float) y1+ssH+i*blockHeight,
- blockWidth,(float) blockHeight-1);
+ blockWidth, blockHeight-1);
big.fill(mfRect);
}
@@ -232,13 +232,13 @@ public class MemoryMonitor extends JPanel {
big.setColor(Color.green);
for ( ; i < 10; i++) {
muRect.setRect(x1+5,(float) y1 + ssH+i*blockHeight,
- blockWidth,(float) blockHeight-1);
+ blockWidth, blockHeight-1);
big.fill(muRect);
}
// .. Draw History Graph ..
if (remainingWidth <= 30) remainingWidth = (float)30;
- if (remainingHeight <= ssH) remainingHeight = (float)ssH;
+ if (remainingHeight <= ssH) remainingHeight = ssH;
big.setColor(graphColor);
int graphX = x1+30;
int graphY = y1 + (int) ssH;
@@ -347,8 +347,8 @@ public class MemoryMonitor extends JPanel {
big = bimg.createGraphics();
big.setFont(font);
FontMetrics fm = big.getFontMetrics(font);
- ascent = (int) fm.getAscent();
- descent = (int) fm.getDescent();
+ ascent = fm.getAscent();
+ descent = fm.getDescent();
}
repaint();
try {
diff --git a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java
index dd15bf8..0fab957 100644
--- a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java
+++ b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipConstants.java
@@ -185,11 +185,11 @@ class ZipConstants {
*/
///////////////////////////////////////////////////////
static final int CH(byte[] b, int n) {
- return b[n] & 0xff;
+ return Byte.toUnsignedInt(b[n]);
}
static final int SH(byte[] b, int n) {
- return (b[n] & 0xff) | ((b[n + 1] & 0xff) << 8);
+ return Byte.toUnsignedInt(b[n]) | (Byte.toUnsignedInt(b[n + 1]) << 8);
}
static final long LG(byte[] b, int n) {
diff --git a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java
index 996f7cc..5f79218 100644
--- a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java
+++ b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileStore.java
@@ -61,7 +61,7 @@ public class ZipFileStore extends FileStore {
private final ZipFileSystem zfs;
ZipFileStore(ZipPath zpath) {
- this.zfs = (ZipFileSystem)zpath.getFileSystem();
+ this.zfs = zpath.getFileSystem();
}
@Override
diff --git a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
index d09da8e..d68388a 100644
--- a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
+++ b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java
@@ -1609,7 +1609,7 @@ public class ZipFileSystem extends FileSystem {
synchronized (inflaters) {
int size = inflaters.size();
if (size > 0) {
- Inflater inf = (Inflater)inflaters.remove(size - 1);
+ Inflater inf = inflaters.remove(size - 1);
return inf;
} else {
return new Inflater(true);
@@ -1638,7 +1638,7 @@ public class ZipFileSystem extends FileSystem {
synchronized (deflaters) {
int size = deflaters.size();
if (size > 0) {
- Deflater def = (Deflater)deflaters.remove(size - 1);
+ Deflater def = deflaters.remove(size - 1);
return def;
} else {
return new Deflater(Deflater.DEFAULT_COMPRESSION, true);
diff --git a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java
index 49d9ee7..49bb826 100644
--- a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java
+++ b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java
@@ -211,7 +211,7 @@ public class ZipFileSystemProvider extends FileSystemProvider {
public <V extends FileAttributeView> V
getFileAttributeView(Path path, Class<V> type, LinkOption... options)
{
- return (V)ZipFileAttributeView.get(toZipPath(path), type);
+ return ZipFileAttributeView.get(toZipPath(path), type);
}
@Override
diff --git a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java
index 71274e2..a869d3a 100644
--- a/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java
+++ b/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipInfo.java
@@ -78,12 +78,12 @@ public class ZipInfo {
// twice
long len = LOCHDR + CENNAM(cen, pos) + CENEXT(cen, pos) + CENHDR;
if (zfs.readFullyAt(buf, 0, len, locoff(cen, pos)) != len)
- zfs.zerror("read loc header failed");
+ ZipFileSystem.zerror("read loc header failed");
if (LOCEXT(buf) > CENEXT(cen, pos) + CENHDR) {
// have to read the second time;
len = LOCHDR + LOCNAM(buf) + LOCEXT(buf);
if (zfs.readFullyAt(buf, 0, len, locoff(cen, pos)) != len)
- zfs.zerror("read loc header failed");
+ ZipFileSystem.zerror("read loc header failed");
}
printLOC(buf);
pos += CENHDR + CENNAM(cen, pos) + CENEXT(cen, pos) + CENCOM(cen, pos);
diff --git a/jdk/src/share/javavm/export/jawt.h b/jdk/src/share/javavm/export/jawt.h
index ccca08f..d709649 100644
--- a/jdk/src/share/javavm/export/jawt.h
+++ b/jdk/src/share/javavm/export/jawt.h
@@ -288,6 +288,7 @@ jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
#define JAWT_VERSION_1_3 0x00010003
#define JAWT_VERSION_1_4 0x00010004
+#define JAWT_VERSION_1_7 0x00010007
#ifdef __cplusplus
} /* extern "C" */
diff --git a/jdk/src/share/javavm/export/jvm.h b/jdk/src/share/javavm/export/jvm.h
index c867f1b..f2b8bfb 100644
--- a/jdk/src/share/javavm/export/jvm.h
+++ b/jdk/src/share/javavm/export/jvm.h
@@ -269,6 +269,9 @@ JVM_DumpAllStacks(JNIEnv *env, jclass unused);
JNIEXPORT jobjectArray JNICALL
JVM_GetAllThreads(JNIEnv *env, jclass dummy);
+JNIEXPORT void JNICALL
+JVM_SetNativeThreadName(JNIEnv *env, jobject jthread, jstring name);
+
/* getStackTrace() and getAllStackTraces() method */
JNIEXPORT jobjectArray JNICALL
JVM_DumpThreads(JNIEnv *env, jclass threadClass, jobjectArray threads);
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h b/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
index abdaee7..e49cade 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
@@ -32,6 +32,10 @@
#include <unistd.h>
#endif
+#ifndef NO_ZLIB
+#include <zconf.h>
+#endif
+
#ifndef FULL
#define FULL 1 /* Adds <500 bytes to the zipped final product. */
#endif
@@ -89,11 +93,13 @@ extern int assert_failed(const char*);
// bytes and byte arrays
typedef unsigned int uint;
+#if !defined(MACOSX) || (defined(MACOSX) && defined(NO_ZLIB))
#ifdef _LP64
typedef unsigned int uLong; // Historical zlib, should be 32-bit.
#else
typedef unsigned long uLong;
#endif
+#endif
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
diff --git a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
index a23da40..6656720 100644
--- a/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
+++ b/jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
@@ -22,6 +22,13 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+#ifdef _ALLBSD_SOURCE
+#include <stdint.h>
+#define THRTYPE intptr_t
+#else
+#define THRTYPE int
+#endif
+
#include <sys/types.h>
#include <stdio.h>
@@ -35,7 +42,7 @@
#if defined(unix) && !defined(PRODUCT)
#include "pthread.h"
-#define THREAD_SELF ((int)pthread_self())
+#define THREAD_SELF ((THRTYPE)pthread_self())
#endif
#include "defines.h"
@@ -58,9 +65,9 @@ int main(int argc, char **argv) {
// Single-threaded, implementation, not reentrant.
// Includes a weak error check against MT access.
#ifndef THREAD_SELF
-#define THREAD_SELF (0)
+#define THREAD_SELF ((THRTYPE) 0)
#endif
-NOT_PRODUCT(static int uThread = -1;)
+NOT_PRODUCT(static THRTYPE uThread = -1;)
unpacker* unpacker::non_mt_current = null;
unpacker* unpacker::current() {
@@ -69,7 +76,7 @@ unpacker* unpacker::current() {
}
static void set_current_unpacker(unpacker* u) {
unpacker::non_mt_current = u;
- assert(((uThread = (u == null) ? -1 : THREAD_SELF),
+ assert(((uThread = (u == null) ? (THRTYPE) -1 : THREAD_SELF),
true));
}
diff --git a/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c b/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
index 4b38a27..a981c82 100644
--- a/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
+++ b/jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c
@@ -27,13 +27,17 @@
* - move all the conversion code into an own file
*/
-#define USE_TRACE
-#define USE_ERROR
+//#define USE_TRACE
+//#define USE_ERROR
#include <jni.h>
// for malloc
+#ifdef _ALLBSD_SOURCE
+#include <stdlib.h>
+#else
#include <malloc.h>
+#endif
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
@@ -58,22 +62,22 @@ typedef struct {
/* 16 bit signed sample, native endianness, stored in 32-bits */
typedef INT32 MAP_Sample;
-INLINE UINT16 MAP_SWAP16_impl(UINT16 a) {
+static INLINE UINT16 MAP_SWAP16_impl(UINT16 a) {
return (a>>8) | (a<<8);
}
-INLINE UINT32 MAP_SWAP32_impl(UINT32 a) {
+static INLINE UINT32 MAP_SWAP32_impl(UINT32 a) {
return (a>>24)
| ((a>>8) & 0xFF00)
| ((a<<8) & 0xFF0000)
| (a<<24);
}
-INLINE UINT32 MAP_SWAP16BIT(UINT32 sh) {
+static INLINE UINT32 MAP_SWAP16BIT(UINT32 sh) {
return (UINT32) ((sh & 0xFF) << 8) | ((sh & 0xFF00) >> 8);
}
-INLINE INT32 MAP_ClipAndConvertToShort(MAP_Sample sample) {
+static INLINE INT32 MAP_ClipAndConvertToShort(MAP_Sample sample) {
if (sample < -32768) {
return -32768;
}
@@ -84,7 +88,7 @@ INLINE INT32 MAP_ClipAndConvertToShort(MAP_Sample sample) {
}
-INLINE INT32 MAP_ClipAndConvertToShort_Swapped(MAP_Sample sample) {
+static INLINE INT32 MAP_ClipAndConvertToShort_Swapped(MAP_Sample sample) {
if (sample < -32768) {
return 0x0080;
}
@@ -94,7 +98,7 @@ INLINE INT32 MAP_ClipAndConvertToShort_Swapped(MAP_Sample sample) {
return (INT32) (INT16) MAP_SWAP16BIT(sample);
}
-INLINE INT8 MAP_ClipAndConvertToByte(MAP_Sample sample) {
+static INLINE INT8 MAP_ClipAndConvertToByte(MAP_Sample sample) {
if (sample < -32768) {
return -128;
}
@@ -105,7 +109,7 @@ INLINE INT8 MAP_ClipAndConvertToByte(MAP_Sample sample) {
}
-INLINE UINT8 MAP_ClipAndConvertToUByte(MAP_Sample sample) {
+static INLINE UINT8 MAP_ClipAndConvertToUByte(MAP_Sample sample) {
if (sample < -32768) {
return 0;
}
diff --git a/jdk/src/share/native/com/sun/media/sound/Platform.c b/jdk/src/share/native/com/sun/media/sound/Platform.c
index 5b2ee90..863e680 100644
--- a/jdk/src/share/native/com/sun/media/sound/Platform.c
+++ b/jdk/src/share/native/com/sun/media/sound/Platform.c
@@ -99,5 +99,34 @@ JNIEXPORT jint JNICALL Java_com_sun_media_sound_Platform_nGetLibraryForFeature
return com_sun_media_sound_Platform_LIB_ALSA;
}
#endif
+#if (X_PLATFORM == X_MACOSX)
+ switch (feature) {
+ case com_sun_media_sound_Platform_FEATURE_MIDIIO:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ case com_sun_media_sound_Platform_FEATURE_PORTS:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ }
+#endif
+#if (X_PLATFORM == X_BSD)
+ switch (feature) {
+ case com_sun_media_sound_Platform_FEATURE_MIDIIO:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+#ifdef __FreeBSD__
+ case com_sun_media_sound_Platform_FEATURE_PORTS:
+ return com_sun_media_sound_Platform_LIB_ALSA;
+ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+ return com_sun_media_sound_Platform_LIB_ALSA;
+#else
+ case com_sun_media_sound_Platform_FEATURE_PORTS:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+ // XXXBSD: When native Direct Audio support is ported change
+ // this back to returning com_sun_media_sound_Platform_LIB_MAIN
+ return 0;
+#endif
+ }
+#endif
return 0;
}
diff --git a/jdk/src/share/native/com/sun/media/sound/PlatformMidi.h b/jdk/src/share/native/com/sun/media/sound/PlatformMidi.h
index 64989af..df96899 100644
--- a/jdk/src/share/native/com/sun/media/sound/PlatformMidi.h
+++ b/jdk/src/share/native/com/sun/media/sound/PlatformMidi.h
@@ -34,7 +34,7 @@
/* do we need the queue ? */
#if (USE_PLATFORM_MIDI_IN == TRUE) || (USE_PLATFORM_MIDI_OUT == TRUE)
- #if X_PLATFORM == X_WINDOWS
+ #if X_PLATFORM == X_WINDOWS || X_PLATFORM == X_MACOSX
#define USE_MIDI_QUEUE TRUE
#endif
#endif
diff --git a/jdk/src/share/native/com/sun/media/sound/SoundDefs.h b/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
index f141ea6..1e7721f 100644
--- a/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
+++ b/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
@@ -31,6 +31,8 @@
#define X_WINDOWS 1
#define X_SOLARIS 2
#define X_LINUX 3
+#define X_BSD 4
+#define X_MACOSX 5
// types for X_ARCH
#define X_I586 1
@@ -46,13 +48,23 @@
// Make sure you set X_PLATFORM and X_ARCH defines correctly.
// Everything depends upon this flag being setup correctly.
// **********************************
+
+#if (X_PLATFORM == X_MACOSX) && !defined(X_ARCH)
+#if __x86_64__
+#define X_ARCH X_AMD64
+#endif
+#if __i386__
+#define X_ARCH X_I586
+#endif
+#endif
+
#if (!defined(X_PLATFORM) || !defined(X_ARCH))
#error "You need to define X_PLATFORM and X_ARCH outside of the source. Use the types above."
#endif
// following is needed for _LP64
-#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX))
+#if ((X_PLATFORM == X_SOLARIS) || (X_PLATFORM == X_LINUX) || (X_PLATFORM == X_MACOSX))
#include <sys/types.h>
#endif
@@ -132,4 +144,9 @@ typedef char SBYTE;
#endif
+#if (X_PLATFORM == X_BSD) || (X_PLATFORM == X_MACOSX)
+#define INLINE inline
+#endif
+
+
#endif // __SOUNDDEFS_INCLUDED__
diff --git a/jdk/src/share/native/com/sun/media/sound/Utilities.h b/jdk/src/share/native/com/sun/media/sound/Utilities.h
index 0dc190e..c1bde06 100644
--- a/jdk/src/share/native/com/sun/media/sound/Utilities.h
+++ b/jdk/src/share/native/com/sun/media/sound/Utilities.h
@@ -33,11 +33,11 @@ int UTIL_IsBigEndianPlatform();
// ERROR PRINTS
#ifdef USE_ERROR
-#define ERROR0(string) fprintf(stdout, (string)); fflush(stdout);
-#define ERROR1(string, p1) fprintf(stdout, (string), (p1)); fflush(stdout);
-#define ERROR2(string, p1, p2) fprintf(stdout, (string), (p1), (p2)); fflush(stdout);
-#define ERROR3(string, p1, p2, p3) fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout);
-#define ERROR4(string, p1, p2, p3, p4) fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout);
+#define ERROR0(string) { fprintf(stdout, (string)); fflush(stdout); }
+#define ERROR1(string, p1) { fprintf(stdout, (string), (p1)); fflush(stdout); }
+#define ERROR2(string, p1, p2) { fprintf(stdout, (string), (p1), (p2)); fflush(stdout); }
+#define ERROR3(string, p1, p2, p3) { fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout); }
+#define ERROR4(string, p1, p2, p3, p4) { fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout); }
#else
#define ERROR0(string)
#define ERROR1(string, p1)
@@ -49,12 +49,12 @@ int UTIL_IsBigEndianPlatform();
// TRACE PRINTS
#ifdef USE_TRACE
-#define TRACE0(string) fprintf(stdout, (string)); fflush(stdout);
-#define TRACE1(string, p1) fprintf(stdout, (string), (p1)); fflush(stdout);
-#define TRACE2(string, p1, p2) fprintf(stdout, (string), (p1), (p2)); fflush(stdout);
-#define TRACE3(string, p1, p2, p3) fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout);
-#define TRACE4(string, p1, p2, p3, p4) fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout);
-#define TRACE5(string, p1, p2, p3, p4, p5) fprintf(stdout, (string), (p1), (p2), (p3), (p4), (p5)); fflush(stdout);
+#define TRACE0(string) { fprintf(stdout, (string)); fflush(stdout); }
+#define TRACE1(string, p1) { fprintf(stdout, (string), (p1)); fflush(stdout); }
+#define TRACE2(string, p1, p2) { fprintf(stdout, (string), (p1), (p2)); fflush(stdout); }
+#define TRACE3(string, p1, p2, p3) { fprintf(stdout, (string), (p1), (p2), (p3)); fflush(stdout); }
+#define TRACE4(string, p1, p2, p3, p4) { fprintf(stdout, (string), (p1), (p2), (p3), (p4)); fflush(stdout); }
+#define TRACE5(string, p1, p2, p3, p4, p5) { fprintf(stdout, (string), (p1), (p2), (p3), (p4), (p5)); fflush(stdout); }
#else
#define TRACE0(string)
#define TRACE1(string, p1)
@@ -69,7 +69,7 @@ int UTIL_IsBigEndianPlatform();
#ifdef USE_VERBOSE_TRACE
#define VTRACE0(string) fprintf(stdout, (string));
#define VTRACE1(string, p1) fprintf(stdout, (string), (p1));
-#define VTRACE2(string, p1, p2) printf(stdout, (string), (p1), (p2));
+#define VTRACE2(string, p1, p2) fprintf(stdout, (string), (p1), (p2));
#define VTRACE3(string, p1, p2, p3) fprintf(stdout, (string), (p1), (p2), (p3));
#define VTRACE4(string, p1, p2, p3, p4) fprintf(stdout, (string), (p1), (p2), (p3), (p4));
#else
diff --git a/jdk/src/share/native/common/check_code.c b/jdk/src/share/native/common/check_code.c
index c8787b3..a338d83 100644
--- a/jdk/src/share/native/common/check_code.c
+++ b/jdk/src/share/native/common/check_code.c
@@ -1067,7 +1067,7 @@ verify_method(context_type *context, jclass cb, int method_index,
* Make sure that branches don't go into the middle of nowhere.
*/
-static jint ntohl(jint n)
+static jint _ck_ntohl(jint n)
{
unsigned char *p = (unsigned char *)&n;
return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3];
@@ -1146,26 +1146,26 @@ verify_opcode_operands(context_type *context, unsigned int inumber, int offset)
}
}
if (opcode == JVM_OPC_tableswitch) {
- keys = ntohl(lpc[2]) - ntohl(lpc[1]) + 1;
+ keys = _ck_ntohl(lpc[2]) - _ck_ntohl(lpc[1]) + 1;
delta = 1;
} else {
- keys = ntohl(lpc[1]); /* number of pairs */
+ keys = _ck_ntohl(lpc[1]); /* number of pairs */
delta = 2;
/* Make sure that the tableswitch items are sorted */
for (k = keys - 1, lptr = &lpc[2]; --k >= 0; lptr += 2) {
- int this_key = ntohl(lptr[0]); /* NB: ntohl may be unsigned */
- int next_key = ntohl(lptr[2]);
+ int this_key = _ck_ntohl(lptr[0]); /* NB: ntohl may be unsigned */
+ int next_key = _ck_ntohl(lptr[2]);
if (this_key >= next_key) {
CCerror(context, "Unsorted lookup switch");
}
}
}
saved_operand = NEW(int, keys + 2);
- if (!isLegalTarget(context, offset + ntohl(lpc[0])))
+ if (!isLegalTarget(context, offset + _ck_ntohl(lpc[0])))
CCerror(context, "Illegal default target in switch");
- saved_operand[keys + 1] = code_data[offset + ntohl(lpc[0])];
+ saved_operand[keys + 1] = code_data[offset + _ck_ntohl(lpc[0])];
for (k = keys, lptr = &lpc[3]; --k >= 0; lptr += delta) {
- int target = offset + ntohl(lptr[0]);
+ int target = offset + _ck_ntohl(lptr[0]);
if (!isLegalTarget(context, target))
CCerror(context, "Illegal branch in tableswitch");
saved_operand[k + 1] = code_data[target];
@@ -1634,7 +1634,7 @@ static int instruction_length(unsigned char *iptr, unsigned char *end)
if (lpc + 2 >= (int *)end) {
return -1; /* do not read pass the end */
}
- index = ntohl(lpc[2]) - ntohl(lpc[1]);
+ index = _ck_ntohl(lpc[2]) - _ck_ntohl(lpc[1]);
if ((index < 0) || (index > 65535)) {
return -1; /* illegal */
} else {
@@ -1647,7 +1647,7 @@ static int instruction_length(unsigned char *iptr, unsigned char *end)
int npairs;
if (lpc + 1 >= (int *)end)
return -1; /* do not read pass the end */
- npairs = ntohl(lpc[1]);
+ npairs = _ck_ntohl(lpc[1]);
/* There can't be more than 64K labels because of the limit
* on per-method byte code length.
*/
diff --git a/jdk/src/share/native/java/io/io_util.h b/jdk/src/share/native/java/io/io_util.h
index 83eed0d..fd7862a 100644
--- a/jdk/src/share/native/java/io/io_util.h
+++ b/jdk/src/share/native/java/io/io_util.h
@@ -25,11 +25,22 @@
#include "jni.h"
#include "jni_util.h"
+#ifdef MACOSX
+char* convertToNFDIfNeeded(const char *origPath, char *buf, size_t bufsize);
+#endif
extern jfieldID IO_fd_fdID;
extern jfieldID IO_handle_fdID;
-#if !defined(O_DSYNC) || !defined(O_SYNC)
+#ifdef _ALLBSD_SOURCE
+#include <fcntl.h>
+#ifndef O_SYNC
+#define O_SYNC O_FSYNC
+#endif
+#ifndef O_DSYNC
+#define O_DSYNC O_FSYNC
+#endif
+#elif !defined(O_DSYNC) || !defined(O_SYNC)
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
@@ -77,6 +88,35 @@ void throwFileNotFoundException(JNIEnv *env, jstring path);
* declares a unique variable.
*/
+#ifdef MACOSX
+
+#define WITH_PLATFORM_STRING(env, strexp, var) \
+ if (1) { \
+ const char *var; \
+ jstring _##var##str = (strexp); \
+ if (_##var##str == NULL) { \
+ JNU_ThrowNullPointerException((env), NULL); \
+ goto _##var##end; \
+ } \
+ const char *temp_var = JNU_GetStringPlatformChars((env), _##var##str, NULL); \
+ if (temp_var == NULL) goto _##var##end; \
+ char buf[MAXPATHLEN]; \
+ var = convertToNFDIfNeeded(temp_var, buf, sizeof(buf));
+
+#define WITH_FIELD_PLATFORM_STRING(env, object, id, var) \
+ WITH_PLATFORM_STRING(env, \
+ ((object == NULL) \
+ ? NULL \
+ : (*(env))->GetObjectField((env), (object), (id))), \
+ var)
+
+#define END_PLATFORM_STRING(env, var) \
+ JNU_ReleaseStringPlatformChars(env, _##var##str, temp_var); \
+ _##var##end: ; \
+ } else ((void)NULL)
+
+#else
+
#define WITH_PLATFORM_STRING(env, strexp, var) \
if (1) { \
const char *var; \
@@ -100,6 +140,9 @@ void throwFileNotFoundException(JNIEnv *env, jstring path);
_##var##end: ; \
} else ((void)NULL)
+#endif
+
+
/* Macros for transforming Java Strings into native Unicode strings.
* Works analogously to WITH_PLATFORM_STRING.
*/
diff --git a/jdk/src/share/native/java/lang/System.c b/jdk/src/share/native/java/lang/System.c
index 66ccfa9..5c20485 100644
--- a/jdk/src/share/native/java/lang/System.c
+++ b/jdk/src/share/native/java/lang/System.c
@@ -245,13 +245,62 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)
}
PUTPROP(props, "file.encoding", sprops->encoding);
PUTPROP(props, "sun.jnu.encoding", sprops->sun_jnu_encoding);
+ if (sprops->sun_stdout_encoding != NULL) {
+ PUTPROP(props, "sun.stdout.encoding", sprops->sun_stdout_encoding);
+ }
+ if (sprops->sun_stderr_encoding != NULL) {
+ PUTPROP(props, "sun.stderr.encoding", sprops->sun_stderr_encoding);
+ }
PUTPROP(props, "file.encoding.pkg", "sun.io");
+
/* unicode_encoding specifies the default endianness */
PUTPROP(props, "sun.io.unicode.encoding", sprops->unicode_encoding);
PUTPROP(props, "sun.cpu.isalist",
(sprops->cpu_isalist ? sprops->cpu_isalist : ""));
PUTPROP(props, "sun.cpu.endian", sprops->cpu_endian);
+
+#ifdef MACOSX
+ /* Proxy setting properties */
+ if (sprops->httpProxyEnabled) {
+ PUTPROP(props, "http.proxyHost", sprops->httpHost);
+ PUTPROP(props, "http.proxyPort", sprops->httpPort);
+ }
+
+ if (sprops->httpsProxyEnabled) {
+ PUTPROP(props, "https.proxyHost", sprops->httpsHost);
+ PUTPROP(props, "https.proxyPort", sprops->httpsPort);
+ }
+
+ if (sprops->ftpProxyEnabled) {
+ PUTPROP(props, "ftp.proxyHost", sprops->ftpHost);
+ PUTPROP(props, "ftp.proxyPort", sprops->ftpPort);
+ }
+
+ if (sprops->socksProxyEnabled) {
+ PUTPROP(props, "socksProxyHost", sprops->socksHost);
+ PUTPROP(props, "socksProxyPort", sprops->socksPort);
+ }
+
+ if (sprops->gopherProxyEnabled) {
+ // The gopher client is different in that it expects an 'is this set?' flag that the others don't.
+ PUTPROP(props, "gopherProxySet", "true");
+ PUTPROP(props, "gopherProxyHost", sprops->gopherHost);
+ PUTPROP(props, "gopherProxyPort", sprops->gopherPort);
+ } else {
+ PUTPROP(props, "gopherProxySet", "false");
+ }
+
+ // Mac OS X only has a single proxy exception list which applies
+ // to all protocols
+ if (sprops->exceptionList) {
+ PUTPROP(props, "http.nonProxyHosts", sprops->exceptionList);
+ // HTTPS: implementation in jsse.jar uses http.nonProxyHosts
+ PUTPROP(props, "ftp.nonProxyHosts", sprops->exceptionList);
+ PUTPROP(props, "socksNonProxyHosts", sprops->exceptionList);
+ }
+#endif
+
/* !!! DO NOT call PUTPROP_ForPlatformNString before this line !!!
* !!! I18n properties have not been set up yet !!!
*/
diff --git a/jdk/src/share/native/java/lang/Thread.c b/jdk/src/share/native/java/lang/Thread.c
index da3a11e..cfbc7fd 100644
--- a/jdk/src/share/native/java/lang/Thread.c
+++ b/jdk/src/share/native/java/lang/Thread.c
@@ -36,6 +36,7 @@
#define THD "Ljava/lang/Thread;"
#define OBJ "Ljava/lang/Object;"
#define STE "Ljava/lang/StackTraceElement;"
+#define STR "Ljava/lang/String;"
#define ARRAY_LENGTH(a) (sizeof(a)/sizeof(a[0]))
@@ -55,11 +56,13 @@ static JNINativeMethod methods[] = {
{"holdsLock", "(" OBJ ")Z", (void *)&JVM_HoldsLock},
{"getThreads", "()[" THD, (void *)&JVM_GetAllThreads},
{"dumpThreads", "([" THD ")[[" STE, (void *)&JVM_DumpThreads},
+ {"setNativeName", "(" STR ")V", (void *)&JVM_SetNativeThreadName},
};
#undef THD
#undef OBJ
#undef STE
+#undef STR
JNIEXPORT void JNICALL
Java_java_lang_Thread_registerNatives(JNIEnv *env, jclass cls)
diff --git a/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h b/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
index 5d55657..ec943c1 100644
--- a/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
+++ b/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
@@ -24,6 +24,12 @@
* questions.
*/
+#ifdef _ALLBSD_SOURCE
+#include <machine/endian.h>
+#elif __linux__
+#define __USE_BSD 1
+#include <endian.h>
+#endif
#include "jfdlibm.h"
#ifdef __NEWVALID /* special setup for Sun test regime */
diff --git a/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h b/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
index bfbc9b9..3e738ab 100644
--- a/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
+++ b/jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
@@ -61,7 +61,7 @@
#define log1p jlog1p
#define expm1 jexpm1
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_log __j__ieee754_log
diff --git a/jdk/src/share/native/java/lang/java_props.h b/jdk/src/share/native/java/lang/java_props.h
index 89f7671..02cfe1e 100644
--- a/jdk/src/share/native/java/lang/java_props.h
+++ b/jdk/src/share/native/java/lang/java_props.h
@@ -66,6 +66,8 @@ typedef struct {
char *display_variant;
char *encoding;
char *sun_jnu_encoding;
+ char *sun_stdout_encoding;
+ char *sun_stderr_encoding;
char *timezone;
char *printerJob;
@@ -85,6 +87,33 @@ typedef struct {
char *desktop; /* Desktop name. */
+#ifdef MACOSX
+ // These are for proxy-related information.
+ // Note that if these platform-specific extensions get out of hand we should make a new
+ // structure for them and #include it here.
+ int httpProxyEnabled;
+ char *httpHost;
+ char *httpPort;
+
+ int httpsProxyEnabled;
+ char *httpsHost;
+ char *httpsPort;
+
+ int ftpProxyEnabled;
+ char *ftpHost;
+ char *ftpPort;
+
+ int socksProxyEnabled;
+ char *socksHost;
+ char *socksPort;
+
+ int gopherProxyEnabled;
+ char *gopherHost;
+ char *gopherPort;
+
+ char *exceptionList;
+#endif
+
} java_props_t;
java_props_t *GetJavaProperties(JNIEnv *env);
diff --git a/jdk/src/share/native/java/util/zip/zip_util.c b/jdk/src/share/native/java/util/zip/zip_util.c
index f048dc6..991ed5c 100644
--- a/jdk/src/share/native/java/util/zip/zip_util.c
+++ b/jdk/src/share/native/java/util/zip/zip_util.c
@@ -46,6 +46,11 @@
#include "zip_util.h"
#include "zlib.h"
+#ifdef _ALLBSD_SOURCE
+#define off64_t off_t
+#define mmap64 mmap
+#endif
+
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
#include <sys/mman.h>
@@ -521,7 +526,7 @@ countCENHeaders(unsigned char *beg, unsigned char *end)
{
jint count = 0;
ptrdiff_t i;
- for (i = 0; i + CENHDR < end - beg; i += CENSIZE(beg + i))
+ for (i = 0; i + CENHDR <= end - beg; i += CENSIZE(beg + i))
count++;
return count;
}
diff --git a/jdk/src/share/native/sun/awt/debug/debug_util.h b/jdk/src/share/native/sun/awt/debug/debug_util.h
index 676e59e..29ba438 100644
--- a/jdk/src/share/native/sun/awt/debug/debug_util.h
+++ b/jdk/src/share/native/sun/awt/debug/debug_util.h
@@ -50,7 +50,6 @@ typedef void * dmutex_t;
#include <stdio.h>
#include <string.h>
#include <assert.h>
-#include <malloc.h>
#include <limits.h>
/* keep these after the other headers */
diff --git a/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c b/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c
index a986467..3497950 100644
--- a/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c
+++ b/jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c
@@ -24,7 +24,7 @@
*/
#include "BufImgSurfaceData.h"
-#include "malloc.h"
+#include <stdlib.h>
#include "sun_awt_image_BufImgSurfaceData.h"
diff --git a/jdk/src/share/native/sun/awt/image/DataBufferNative.c b/jdk/src/share/native/sun/awt/image/DataBufferNative.c
index 644e393..4bc087b 100644
--- a/jdk/src/share/native/sun/awt/image/DataBufferNative.c
+++ b/jdk/src/share/native/sun/awt/image/DataBufferNative.c
@@ -23,7 +23,7 @@
* questions.
*/
-#include "malloc.h"
+#include <stdlib.h>
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h b/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h
index 05950c5..85f18cd 100644
--- a/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h
@@ -297,7 +297,7 @@ typedef union {
#define SAT32(DST) SAT_32(DST, val0)
/***************************************************************/
-#ifdef MLIB_OS64BIT
+#if defined(MLIB_OS64BIT) || (defined(MACOSX) && defined(_LP64))
#define PBITS 3
#define MLIB_POINTER_SHIFT(P) (((P) >> (MLIB_SHIFT - 3)) &~ 7)
#define MLIB_POINTER_GET(A, P) (*(DTYPE**)((mlib_u8*)(A) + (P)))
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_image.h b/jdk/src/share/native/sun/awt/medialib/mlib_image.h
index 09b01b5..288b0aa 100644
--- a/jdk/src/share/native/sun/awt/medialib/mlib_image.h
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_image.h
@@ -27,6 +27,9 @@
#ifndef MLIB_IMAGE_H
#define MLIB_IMAGE_H
+#ifdef MACOSX
+#include <machine/endian.h>
+#endif
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_sys.c b/jdk/src/share/native/sun/awt/medialib/mlib_sys.c
index 8cbe291..e78e118 100644
--- a/jdk/src/share/native/sun/awt/medialib/mlib_sys.c
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_sys.c
@@ -26,6 +26,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef MACOSX
+#include <unistd.h>
+#include <sys/param.h>
+#endif
#include <mlib_types.h>
#include <mlib_sys_proto.h>
#include "mlib_SysMath.h"
@@ -86,7 +90,9 @@ void *__mlib_malloc(mlib_u32 size)
* alignment. -- from stdlib.h of MS VC++5.0.
*/
return (void *) malloc(size);
-#else /* _MSC_VER */
+#elif defined(MACOSX)
+ return valloc(size);
+#else
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
diff --git a/jdk/src/share/native/sun/awt/medialib/mlib_types.h b/jdk/src/share/native/sun/awt/medialib/mlib_types.h
index b35375b..10c3cd3 100644
--- a/jdk/src/share/native/sun/awt/medialib/mlib_types.h
+++ b/jdk/src/share/native/sun/awt/medialib/mlib_types.h
@@ -62,7 +62,7 @@ typedef double mlib_d64;
#include <stdint.h>
#include <stddef.h>
-#ifdef MLIB_OS64BIT
+#if defined(MLIB_OS64BIT) || (defined(MACOSX) && defined(_LP64))
typedef long mlib_s64;
typedef unsigned long mlib_u64;
diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h
index 61bfe0b..72823a1 100644
--- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h
+++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.h
@@ -94,37 +94,51 @@ typedef struct Splash
pthread_mutex_t lock;
Cursor cursor;
XWMHints* wmHints;
+#elif defined(WITH_MACOSX)
+ pthread_mutex_t lock;
+ int controlpipe[2];
+ NSWindow * window;
#endif
} Splash;
/* various shared and/or platform dependent splash screen functions */
-Splash *SplashGetInstance();
+/*************** Platform-specific ******************/
+
+/* To be implemented in the platform-specific native code. */
-int SplashIsStillLooping(Splash * splash);
-void SplashNextFrame(Splash * splash);
-void SplashStart(Splash * splash);
-void SplashCreateThread(Splash * splash);
-unsigned SplashTime();
-void SplashDone(Splash * splash);
void SplashInitPlatform(Splash * splash);
+void SplashCreateThread(Splash * splash);
+void SplashCleanupPlatform(Splash * splash);
void SplashDonePlatform(Splash * splash);
-void SplashDone(Splash * splash);
-void SplashUpdate(Splash * splash);
-void SplashUpdateScreenData(Splash * splash);
+
+unsigned SplashTime();
+char* SplashConvertStringAlloc(const char* in, int *size);
void SplashLock(Splash * splash);
void SplashUnlock(Splash * splash);
-void SplashCleanup(Splash * splash);
-void SplashCleanupPlatform(Splash * splash);
+void SplashInitFrameShape(Splash * splash, int imageIndex);
-void SplashClosePlatform();
+void SplashUpdate(Splash * splash);
+void SplashReconfigure(Splash * splash);
+void SplashClosePlatform(Splash * splash);
-void SplashReconfigure();
-char* SplashConvertStringAlloc(const char* in, int *size);
+
+/********************* Shared **********************/
+Splash *SplashGetInstance();
+
+int SplashIsStillLooping(Splash * splash);
+void SplashNextFrame(Splash * splash);
+void SplashStart(Splash * splash);
+void SplashDone(Splash * splash);
+
+void SplashUpdateScreenData(Splash * splash);
+
+void SplashCleanup(Splash * splash);
+
typedef struct SplashStream {
int (*read)(void* pStream, void* pData, int nBytes);
@@ -153,8 +167,6 @@ int SplashDecodePngStream(Splash * splash, SplashStream * stream);
int BitmapToYXBandedRectangles(ImageRect * pSrcRect, RECT_T * out);
-void SplashInitFrameShape(Splash * splash, int imageIndex);
-
#define SAFE_TO_ALLOC(c, sz) \
(((c) > 0) && ((sz) > 0) && \
((0xffffffffu / ((unsigned int)(c))) > (unsigned int)(sz)))
diff --git a/jdk/src/share/native/sun/font/AccelGlyphCache.c b/jdk/src/share/native/sun/font/AccelGlyphCache.c
index bc4416f..34cddfc 100644
--- a/jdk/src/share/native/sun/font/AccelGlyphCache.c
+++ b/jdk/src/share/native/sun/font/AccelGlyphCache.c
@@ -23,7 +23,7 @@
* questions.
*/
-#include <malloc.h>
+#include <stdlib.h>
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
diff --git a/jdk/src/share/native/sun/font/DrawGlyphList.c b/jdk/src/share/native/sun/font/DrawGlyphList.c
index a58a9bb..2fcb5d6 100644
--- a/jdk/src/share/native/sun/font/DrawGlyphList.c
+++ b/jdk/src/share/native/sun/font/DrawGlyphList.c
@@ -26,7 +26,7 @@
#include "jlong.h"
#include "math.h"
#include "string.h"
-#include "malloc.h"
+#include "stdlib.h"
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
diff --git a/jdk/src/share/native/sun/font/sunFont.c b/jdk/src/share/native/sun/font/sunFont.c
index 3dd7c3e..e6ce37f 100644
--- a/jdk/src/share/native/sun/font/sunFont.c
+++ b/jdk/src/share/native/sun/font/sunFont.c
@@ -24,7 +24,6 @@
*/
#include "stdlib.h"
-#include "malloc.h"
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
diff --git a/jdk/src/share/native/sun/java2d/SurfaceData.c b/jdk/src/share/native/sun/java2d/SurfaceData.c
index 7e1f8bb..73d43ad 100644
--- a/jdk/src/share/native/sun/java2d/SurfaceData.c
+++ b/jdk/src/share/native/sun/java2d/SurfaceData.c
@@ -28,7 +28,7 @@
#include "jni_util.h"
#include "Disposer.h"
-#include "malloc.h"
+#include "stdlib.h"
#include "string.h"
/**
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c b/jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c
index 97a8b0e..e27604a 100644
--- a/jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c
@@ -743,6 +743,15 @@ OGLBlitLoops_SurfaceToSwBlit(JNIEnv *env, OGLContext *oglc,
j2d_glPixelStorei(GL_PACK_ROW_LENGTH,
dstInfo.scanStride / dstInfo.pixelStride);
j2d_glPixelStorei(GL_PACK_ALIGNMENT, pf.alignment);
+#ifdef MACOSX
+ if (srcOps->isOpaque) {
+ // For some reason Apple's OpenGL implementation will
+ // read back zero values from the alpha channel of an
+ // opaque surface when using glReadPixels(), so here we
+ // force the resulting pixels to be fully opaque.
+ j2d_glPixelTransferf(GL_ALPHA_BIAS, 1.0);
+ }
+#endif
J2dTraceLn4(J2D_TRACE_VERBOSE, " sx=%d sy=%d w=%d h=%d",
srcx, srcy, width, height);
@@ -764,6 +773,12 @@ OGLBlitLoops_SurfaceToSwBlit(JNIEnv *env, OGLContext *oglc,
height--;
}
+#ifdef MACOSX
+ if (srcOps->isOpaque) {
+ j2d_glPixelTransferf(GL_ALPHA_BIAS, 0.0);
+ }
+#endif
+
j2d_glPixelStorei(GL_PACK_SKIP_PIXELS, 0);
j2d_glPixelStorei(GL_PACK_SKIP_ROWS, 0);
j2d_glPixelStorei(GL_PACK_ROW_LENGTH, 0);
@@ -814,11 +829,27 @@ OGLBlitLoops_CopyArea(JNIEnv *env,
SurfaceData_IntersectBlitBounds(&dstBounds, &srcBounds, -dx, -dy);
if (dstBounds.x1 < dstBounds.x2 && dstBounds.y1 < dstBounds.y2) {
+#ifdef MACOSX
+ if (dstOps->isOpaque) {
+ // For some reason Apple's OpenGL implementation will fail
+ // to render glCopyPixels() when the src/dst rectangles are
+ // overlapping and glColorMask() has disabled writes to the
+ // alpha channel. The workaround is to temporarily re-enable
+ // the alpha channel during the glCopyPixels() operation.
+ j2d_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+ }
+#endif
+
OGLBlitSurfaceToSurface(oglc, dstOps, dstOps,
srcBounds.x1, srcBounds.y1,
srcBounds.x2, srcBounds.y2,
dstBounds.x1, dstBounds.y1,
dstBounds.x2, dstBounds.y2);
+#ifdef MACOSX
+ if (dstOps->isOpaque) {
+ j2d_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_FALSE);
+ }
+#endif
}
}
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h b/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h
index 33fbf62..e7872d7 100644
--- a/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
#define OGLFuncs_h_Included
+#ifdef MACOSX
+#include <dlfcn.h>
+#endif
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c b/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c
index c208060..79220bb 100644
--- a/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c
@@ -25,7 +25,7 @@
#ifndef HEADLESS
-#include <malloc.h>
+#include <stdlib.h>
#include "sun_java2d_pipe_BufferedOpCodes.h"
@@ -63,6 +63,7 @@ static OGLSDOps *dstOps = NULL;
extern OGLContext *OGLSD_SetScratchSurface(JNIEnv *env, jlong pConfigInfo);
extern void OGLGC_DestroyOGLGraphicsConfig(jlong pConfigInfo);
extern void OGLSD_SwapBuffers(JNIEnv *env, jlong window);
+extern void OGLSD_Flush(JNIEnv *env);
JNIEXPORT void JNICALL
Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer
@@ -454,7 +455,7 @@ Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer
if (oglsdo != NULL) {
CONTINUE_IF_NULL(oglc);
RESET_PREVIOUS_OP();
- OGLSD_Flush(env, oglsdo);
+ OGLSD_Delete(env, oglsdo);
}
}
break;
@@ -465,7 +466,7 @@ Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer
if (oglsdo != NULL) {
CONTINUE_IF_NULL(oglc);
RESET_PREVIOUS_OP();
- OGLSD_Flush(env, oglsdo);
+ OGLSD_Delete(env, oglsdo);
if (oglsdo->privOps != NULL) {
free(oglsdo->privOps);
}
@@ -707,6 +708,7 @@ Java_sun_java2d_opengl_OGLRenderQueue_flushBuffer
} else {
j2d_glFlush();
}
+ OGLSD_Flush(env);
}
}
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c b/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c
index 6d3e2e8..4b16bff 100644
--- a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.c
@@ -137,7 +137,8 @@ OGLSD_InitTextureObject(OGLSDOps *oglsdo,
jint width, jint height)
{
GLenum texTarget, texProxyTarget;
- GLint format = isOpaque ? GL_RGB : GL_RGBA;
+ GLint format = GL_RGBA;
+ GLint size = GL_UNSIGNED_INT_8_8_8_8;
GLuint texID;
GLsizei texWidth, texHeight, realWidth, realHeight;
GLint texMax;
@@ -191,7 +192,7 @@ OGLSD_InitTextureObject(OGLSDOps *oglsdo,
// the calculated power-of-two dimensions and the given internal format
j2d_glTexImage2D(texProxyTarget, 0, format,
texWidth, texHeight, 0,
- format, GL_UNSIGNED_BYTE, NULL);
+ format, size, NULL);
j2d_glGetTexLevelParameteriv(texProxyTarget, 0,
GL_TEXTURE_WIDTH, &realWidth);
j2d_glGetTexLevelParameteriv(texProxyTarget, 0,
@@ -213,7 +214,7 @@ OGLSD_InitTextureObject(OGLSDOps *oglsdo,
j2d_glBindTexture(texTarget, texID);
j2d_glTexImage2D(texTarget, 0, format,
texWidth, texHeight, 0,
- format, GL_UNSIGNED_BYTE, NULL);
+ format, size, NULL);
oglsdo->isOpaque = isOpaque;
oglsdo->xOffset = 0;
@@ -548,12 +549,12 @@ OGLSD_SetNativeDimensions(JNIEnv *env, OGLSDOps *oglsdo,
}
/**
- * Disposes of all native resources associated with this surface.
+ * Deletes native OpenGL resources associated with this surface.
*/
void
-OGLSD_Flush(JNIEnv *env, OGLSDOps *oglsdo)
+OGLSD_Delete(JNIEnv *env, OGLSDOps *oglsdo)
{
- J2dTraceLn1(J2D_TRACE_INFO, "OGLSD_Flush: type=%d",
+ J2dTraceLn1(J2D_TRACE_INFO, "OGLSD_Delete: type=%d",
oglsdo->drawableType);
if (oglsdo->drawableType == OGLSD_TEXTURE) {
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h b/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h
index e611c98..a859cf4 100644
--- a/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLSurfaceData.h
@@ -286,7 +286,7 @@ void OGLSD_GetRasInfo(JNIEnv *env,
void OGLSD_Unlock(JNIEnv *env,
SurfaceDataOps *ops, SurfaceDataRasInfo *pRasInfo);
void OGLSD_Dispose(JNIEnv *env, SurfaceDataOps *ops);
-void OGLSD_Flush(JNIEnv *env, OGLSDOps *oglsdo);
+void OGLSD_Delete(JNIEnv *env, OGLSDOps *oglsdo);
jint OGLSD_NextPowerOfTwo(jint val, jint max);
jboolean OGLSD_InitFBObject(GLuint *fbobjectID, GLuint *depthID,
GLuint textureID, GLenum textureTarget,
diff --git a/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c b/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
index f0a3488..12e0284 100644
--- a/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
+++ b/jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c
@@ -25,7 +25,7 @@
#ifndef HEADLESS
-#include <malloc.h>
+#include <stdlib.h>
#include <math.h>
#include <jlong.h>
diff --git a/jdk/src/share/native/sun/management/HotSpotDiagnostic.c b/jdk/src/share/native/sun/management/HotSpotDiagnostic.c
index c970dbb..8d48b20 100644
--- a/jdk/src/share/native/sun/management/HotSpotDiagnostic.c
+++ b/jdk/src/share/native/sun/management/HotSpotDiagnostic.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,141 +34,3 @@ Java_sun_management_HotSpotDiagnostic_dumpHeap
{
jmm_interface->DumpHeap0(env, outputfile, live);
}
-
-JNIEXPORT jobjectArray JNICALL
-Java_sun_management_HotSpotDiagnostic_getDiagnosticCommands0
- (JNIEnv *env, jobject dummy)
-{
- if ((jmm_version > JMM_VERSION_1_2_1)
- || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=2))) {
- return jmm_interface->GetDiagnosticCommands(env);
- }
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- "Diagnostic commands are not supported by this VM");
-}
-
-jobject getDiagnosticCommandArgumentInfoArray(JNIEnv *env, jstring command,
- int num_arg) {
- int i;
- jobject obj;
- jobjectArray result;
- dcmdArgInfo* dcmd_arg_info_array;
- jclass dcmdArgInfoCls;
- jclass arraysCls;
- jmethodID mid;
- jobject resultList;
-
- dcmd_arg_info_array = (dcmdArgInfo*) malloc(num_arg * sizeof(dcmdArgInfo));
- if (dcmd_arg_info_array == NULL) {
- return NULL;
- }
- jmm_interface->GetDiagnosticCommandArgumentsInfo(env, command,
- dcmd_arg_info_array);
- dcmdArgInfoCls = (*env)->FindClass(env,
- "com/sun/management/DiagnosticCommandArgumentInfo");
- result = (*env)->NewObjectArray(env, num_arg, dcmdArgInfoCls, NULL);
- if (result == NULL) {
- free(dcmd_arg_info_array);
- return NULL;
- }
- for (i=0; i<num_arg; i++) {
- obj = JNU_NewObjectByName(env,
- "com/sun/management/DiagnosticCommandArgumentInfo",
- "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZI)V",
- (*env)->NewStringUTF(env,dcmd_arg_info_array[i].name),
- (*env)->NewStringUTF(env,dcmd_arg_info_array[i].description),
- (*env)->NewStringUTF(env,dcmd_arg_info_array[i].type),
- dcmd_arg_info_array[i].default_string == NULL ? NULL:
- (*env)->NewStringUTF(env, dcmd_arg_info_array[i].default_string),
- dcmd_arg_info_array[i].mandatory,
- dcmd_arg_info_array[i].option,
- dcmd_arg_info_array[i].position);
- if (obj == NULL) {
- free(dcmd_arg_info_array);
- return NULL;
- }
- (*env)->SetObjectArrayElement(env, result, i, obj);
- }
- free(dcmd_arg_info_array);
- arraysCls = (*env)->FindClass(env, "java/util/Arrays");
- mid = (*env)->GetStaticMethodID(env, arraysCls,
- "asList", "([Ljava/lang/Object;)Ljava/util/List;");
- resultList = (*env)->CallStaticObjectMethod(env, arraysCls, mid, result);
- return resultList;
-}
-
-/* Throws IllegalArgumentException if at least one the diagnostic command
- * passed in argument is not supported by the JVM
- */
-JNIEXPORT jobjectArray JNICALL
-Java_sun_management_HotSpotDiagnostic_getDiagnosticCommandInfo0
-(JNIEnv *env, jobject dummy, jobjectArray commands)
-{
- int i;
- jclass dcmdInfoCls;
- jobject result;
- jobjectArray args;
- jobject obj;
-
- if (commands == NULL) {
- JNU_ThrowNullPointerException(env, "Invalid String Array");
- return NULL;
- }
- if ((jmm_version > JMM_VERSION_1_2_1)
- || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=2))) {
- jsize num_commands = (*env)->GetArrayLength(env, commands);
- dcmdInfo* dcmd_info_array = (dcmdInfo*) malloc(num_commands *
- sizeof(dcmdInfo));
- if (dcmd_info_array == NULL) {
- JNU_ThrowOutOfMemoryError(env, NULL);
- }
- jmm_interface->GetDiagnosticCommandInfo(env, commands, dcmd_info_array);
- dcmdInfoCls = (*env)->FindClass(env,
- "com/sun/management/DiagnosticCommandInfo");
- result = (*env)->NewObjectArray(env, num_commands, dcmdInfoCls, NULL);
- if (result == NULL) {
- free(dcmd_info_array);
- JNU_ThrowOutOfMemoryError(env, 0);
- }
- for (i=0; i<num_commands; i++) {
- args = getDiagnosticCommandArgumentInfoArray(env,
- (*env)->GetObjectArrayElement(env,commands,i),
- dcmd_info_array[i].num_arguments);
- if (args == NULL) {
- free(dcmd_info_array);
- JNU_ThrowOutOfMemoryError(env, 0);
- }
- obj = JNU_NewObjectByName(env,
- "com/sun/management/DiagnosticCommandInfo",
- "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/util/List;)V",
- (*env)->NewStringUTF(env,dcmd_info_array[i].name),
- (*env)->NewStringUTF(env,dcmd_info_array[i].description),
- (*env)->NewStringUTF(env,dcmd_info_array[i].impact),
- dcmd_info_array[i].enabled,
- args);
- if (obj == NULL) {
- free(dcmd_info_array);
- JNU_ThrowOutOfMemoryError(env, 0);
- }
- (*env)->SetObjectArrayElement(env, result, i, obj);
- }
- free(dcmd_info_array);
- return result;
- }
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- "Diagnostic commands are not supported by this VM");
-}
-
-/* Throws IllegalArgumentException if the diagnostic command
- * passed in argument is not supported by the JVM
- */
-JNIEXPORT jstring JNICALL
-Java_sun_management_HotSpotDiagnostic_executeDiagnosticCommand0
-(JNIEnv *env, jobject dummy, jstring command) {
- if((jmm_version > JMM_VERSION_1_2_1 )
- || (jmm_version == JMM_VERSION_1_2 && ((jmm_version&0xFF)>=2))) {
- return jmm_interface->ExecuteDiagnosticCommand(env, command);
- }
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- "Diagnostic commands are not supported by this VM");
-}
diff --git a/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c b/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c
index 1bb2f70..c2b6a0d 100644
--- a/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c
+++ b/jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c
@@ -28,6 +28,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
#else
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h b/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
index 9fb8875..8eaa6e8 100644
--- a/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
+++ b/jdk/src/share/native/sun/security/ec/impl/ecc_impl.h
@@ -57,6 +57,14 @@ typedef unsigned long ulong_t;
typedef enum { B_FALSE, B_TRUE } boolean_t;
#endif /* __linux__ */
+#ifdef _ALLBSD_SOURCE
+#include <stdint.h>
+#define B_FALSE FALSE
+#define B_TRUE TRUE
+typedef unsigned long ulong_t;
+typedef enum boolean { B_FALSE, B_TRUE } boolean_t;
+#endif /* _ALLBSD_SOURCE */
+
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
diff --git a/jdk/src/share/native/sun/security/ec/impl/ecdecode.c b/jdk/src/share/native/sun/security/ec/impl/ecdecode.c
index cd72a02..8e219c4 100644
--- a/jdk/src/share/native/sun/security/ec/impl/ecdecode.c
+++ b/jdk/src/share/native/sun/security/ec/impl/ecdecode.c
@@ -39,9 +39,9 @@
#include <sys/types.h>
#ifndef _WIN32
-#ifndef __linux__
+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
#include <sys/systm.h>
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
#include <sys/param.h>
#endif /* _WIN32 */
diff --git a/jdk/src/share/native/sun/security/ec/impl/oid.c b/jdk/src/share/native/sun/security/ec/impl/oid.c
index 8682025..04e0a9b 100644
--- a/jdk/src/share/native/sun/security/ec/impl/oid.c
+++ b/jdk/src/share/native/sun/security/ec/impl/oid.c
@@ -38,9 +38,9 @@
#include <sys/types.h>
#ifndef _WIN32
-#ifndef __linux__
+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
#include <sys/systm.h>
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
#include <sys/param.h>
#endif /* _WIN32 */
diff --git a/jdk/src/share/native/sun/security/ec/impl/secitem.c b/jdk/src/share/native/sun/security/ec/impl/secitem.c
index f296ce4..48a9996 100644
--- a/jdk/src/share/native/sun/security/ec/impl/secitem.c
+++ b/jdk/src/share/native/sun/security/ec/impl/secitem.c
@@ -43,9 +43,9 @@
#include <sys/types.h>
#ifndef _WIN32
-#ifndef __linux__
+#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
#include <sys/systm.h>
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
#include <sys/param.h>
#endif /* _WIN32 */
diff --git a/jdk/src/share/transport/socket/socketTransport.c b/jdk/src/share/transport/socket/socketTransport.c
index b2a2155..4c04918 100644
--- a/jdk/src/share/transport/socket/socketTransport.c
+++ b/jdk/src/share/transport/socket/socketTransport.c
@@ -65,6 +65,9 @@ static jdwpTransportEnv single_env = (jdwpTransportEnv)&interface;
#define HEADER_SIZE 11
#define MAX_DATA_SIZE 1000
+static jint recv_fully(int, char *, int);
+static jint send_fully(int, char *, int);
+
/*
* Record the last error for this thread.
*/
@@ -155,7 +158,7 @@ handshake(int fd, jlong timeout) {
}
buf = b;
buf += received;
- n = dbgsysRecv(fd, buf, helloLen-received, 0);
+ n = recv_fully(fd, buf, helloLen-received);
if (n == 0) {
setLastError(0, "handshake failed - connection prematurally closed");
return JDWPTRANSPORT_ERROR_IO_ERROR;
@@ -180,7 +183,7 @@ handshake(int fd, jlong timeout) {
return JDWPTRANSPORT_ERROR_IO_ERROR;
}
- if (dbgsysSend(fd, (char*)hello, helloLen, 0) != helloLen) {
+ if (send_fully(fd, (char*)hello, helloLen) != helloLen) {
RETURN_IO_ERROR("send failed during handshake");
}
return JDWPTRANSPORT_ERROR_NONE;
@@ -555,19 +558,19 @@ socketTransport_writePacket(jdwpTransportEnv* env, const jdwpPacket *packet)
/* Do one send for short packets, two for longer ones */
if (data_len <= MAX_DATA_SIZE) {
memcpy(header + HEADER_SIZE, data, data_len);
- if (dbgsysSend(socketFD, (char *)&header, HEADER_SIZE + data_len, 0) !=
+ if (send_fully(socketFD, (char *)&header, HEADER_SIZE + data_len) !=
HEADER_SIZE + data_len) {
RETURN_IO_ERROR("send failed");
}
} else {
memcpy(header + HEADER_SIZE, data, MAX_DATA_SIZE);
- if (dbgsysSend(socketFD, (char *)&header, HEADER_SIZE + MAX_DATA_SIZE, 0) !=
+ if (send_fully(socketFD, (char *)&header, HEADER_SIZE + MAX_DATA_SIZE) !=
HEADER_SIZE + MAX_DATA_SIZE) {
RETURN_IO_ERROR("send failed");
}
/* Send the remaining data bytes right out of the data area. */
- if (dbgsysSend(socketFD, (char *)data + MAX_DATA_SIZE,
- data_len - MAX_DATA_SIZE, 0) != data_len - MAX_DATA_SIZE) {
+ if (send_fully(socketFD, (char *)data + MAX_DATA_SIZE,
+ data_len - MAX_DATA_SIZE) != data_len - MAX_DATA_SIZE) {
RETURN_IO_ERROR("send failed");
}
}
@@ -591,6 +594,22 @@ recv_fully(int f, char *buf, int len)
return nbytes;
}
+jint
+send_fully(int f, char *buf, int len)
+{
+ int nbytes = 0;
+ while (nbytes < len) {
+ int res = dbgsysSend(f, buf + nbytes, len - nbytes, 0);
+ if (res < 0) {
+ return res;
+ } else if (res == 0) {
+ break; /* eof, return nbytes which is less than len */
+ }
+ nbytes += res;
+ }
+ return nbytes;
+}
+
static jdwpTransportError JNICALL
socketTransport_readPacket(jdwpTransportEnv* env, jdwpPacket* packet) {
jint length, data_len;
diff --git a/jdk/src/solaris/back/exec_md.c b/jdk/src/solaris/back/exec_md.c
index 1599e51..d5e9bd1 100644
--- a/jdk/src/solaris/back/exec_md.c
+++ b/jdk/src/solaris/back/exec_md.c
@@ -30,7 +30,7 @@
#include "sys.h"
#include "util.h"
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
/* Linux */
#define FORK() fork()
#else
diff --git a/jdk/src/solaris/back/linker_md.c b/jdk/src/solaris/back/linker_md.c
index 2a9af79..efc09b0 100644
--- a/jdk/src/solaris/back/linker_md.c
+++ b/jdk/src/solaris/back/linker_md.c
@@ -48,6 +48,12 @@
#include "threads_md.h"
#endif
+#ifdef __APPLE__
+#define LIB_SUFFIX "dylib"
+#else
+#define LIB_SUFFIX "so"
+#endif
+
/*
* create a string for the JNI native function name by adding the
* appropriate decorations.
@@ -77,9 +83,9 @@ dbgsysBuildLibName(char *holder, int holderlen, char *pname, char *fname)
}
if (pnamelen == 0) {
- (void)snprintf(holder, holderlen, "lib%s.so", fname);
+ (void)snprintf(holder, holderlen, "lib%s." LIB_SUFFIX, fname);
} else {
- (void)snprintf(holder, holderlen, "%s/lib%s.so", pname, fname);
+ (void)snprintf(holder, holderlen, "%s/lib%s." LIB_SUFFIX, pname, fname);
}
}
diff --git a/jdk/src/solaris/back/util_md.h b/jdk/src/solaris/back/util_md.h
index 7a3bc83..f8521b3 100644
--- a/jdk/src/solaris/back/util_md.h
+++ b/jdk/src/solaris/back/util_md.h
@@ -31,6 +31,11 @@
#include <limits.h>
#include <sys/types.h>
+#ifdef _ALLBSD_SOURCE
+#include <machine/endian.h>
+#elif __linux__
+#include <endian.h>
+#endif
#ifdef _LP64
typedef unsigned long UNSIGNED_JLONG;
diff --git a/jdk/src/solaris/bin/java_md.h b/jdk/src/solaris/bin/java_md.h
index cc72740..ec0615c 100644
--- a/jdk/src/solaris/bin/java_md.h
+++ b/jdk/src/solaris/bin/java_md.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,6 +26,9 @@
#ifndef JAVA_MD_H
#define JAVA_MD_H
+/*
+ * This file contains common defines and includes for Solaris, Linux and MacOSX.
+ */
#include <limits.h>
#include <unistd.h>
#include <sys/param.h>
@@ -40,23 +43,25 @@
#define MAXNAMELEN PATH_MAX
#endif
-#ifdef HAVE_GETHRTIME
/*
- * Support for doing cheap, accurate interval timing.
- */
-#include <sys/time.h>
-#define CounterGet() (gethrtime()/1000)
-#define Counter2Micros(counts) (counts)
-#else
-#define CounterGet() (0)
-#define Counter2Micros(counts) (1)
-#endif /* HAVE_GETHRTIME */
-
-/*
- * Function prototypes.
+ * Common function prototypes and sundries.
*/
char *LocateJRE(manifest_info *info);
void ExecJRE(char *jre, char **argv);
int UnsetEnv(char *name);
+char *FindExecName(char *program);
+const char *SetExecname(char **argv);
+const char *GetExecName();
+static jboolean GetJVMPath(const char *jrepath, const char *jvmtype,
+ char *jvmpath, jint jvmpathsize, const char * arch,
+ int bitsWanted);
+static jboolean GetJREPath(char *path, jint pathsize, const char * arch,
+ jboolean speculative);
-#endif
+#ifdef MACOSX
+#include "java_md_macosx.h"
+#else /* !MACOSX */
+#include "java_md_solinux.h"
+#endif /* MACOSX */
+
+#endif /* JAVA_MD_H */
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
index 972446d..37b096f 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
@@ -105,7 +105,6 @@ class XTextAreaPeer extends XComponentPeer implements TextAreaPeer {
this.target = target;
//ComponentAccessor.enableEvents(target,AWTEvent.MOUSE_WHEEL_EVENT_MASK);
- target.enableInputMethods(true);
firstChangeSkipped = false;
String text = ((TextArea)target).getText();
@@ -113,7 +112,6 @@ class XTextAreaPeer extends XComponentPeer implements TextAreaPeer {
jtext.setWrapStyleWord(true);
jtext.getDocument().addDocumentListener(jtext);
XToolkit.specialPeerMap.put(jtext,this);
- jtext.enableInputMethods(true);
textPane = new AWTTextPane(jtext,this, target.getParent());
setBounds(x, y, width, height, SET_BOUNDS);
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java
index bb7ac17..8a09c90 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XTextFieldPeer.java
@@ -73,8 +73,6 @@ public class XTextFieldPeer extends XComponentPeer implements TextFieldPeer {
xtext = new XAWTTextField(text,this, target.getParent());
xtext.getDocument().addDocumentListener(xtext);
xtext.setCursor(target.getCursor());
- target.enableInputMethods(true);
- xtext.enableInputMethods(true);
XToolkit.specialPeerMap.put(xtext,this);
TextField txt = (TextField) target;
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
index 2d4067a..f25080f 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XWM.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
@@ -101,7 +101,8 @@ final class XWM
ICE_WM = 10,
METACITY_WM = 11,
COMPIZ_WM = 12,
- LG3D_WM = 13;
+ LG3D_WM = 13,
+ CWM_WM = 14;
public String toString() {
switch (WMID) {
case NO_WM:
@@ -128,6 +129,8 @@ final class XWM
return "Compiz";
case LG3D_WM:
return "LookingGlass";
+ case CWM_WM:
+ return "CWM";
case UNDETERMINED_WM:
default:
return "Undetermined WM";
@@ -555,6 +558,10 @@ final class XWM
return isNetWMName("LG3D");
}
+ static boolean isCWM() {
+ return isNetWMName("CWM");
+ }
+
/*
* Is Metacity running?
*/
@@ -567,7 +574,7 @@ final class XWM
}
static boolean isNonReparentingWM() {
- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
}
/*
@@ -743,6 +750,8 @@ final class XWM
awt_wmgr = XWM.COMPIZ_WM;
} else if (isLookingGlass()) {
awt_wmgr = LG3D_WM;
+ } else if (isCWM()) {
+ awt_wmgr = CWM_WM;
} else if (doIsIceWM && isIceWM()) {
awt_wmgr = XWM.ICE_WM;
}
diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
index 9d7daf0..9ce07cd 100644
--- a/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
+++ b/jdk/src/solaris/classes/sun/awt/X11/XWindowPeer.java
@@ -255,6 +255,21 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
}
}
+ if (owner != null || isSimpleWindow()) {
+ XNETProtocol protocol = XWM.getWM().getNETProtocol();
+ if (protocol != null && protocol.active()) {
+ XToolkit.awtLock();
+ try {
+ XAtomList net_wm_state = getNETWMState();
+ net_wm_state.add(protocol.XA_NET_WM_STATE_SKIP_TASKBAR);
+ setNETWMState(net_wm_state);
+ } finally {
+ XToolkit.awtUnlock();
+ }
+
+ }
+ }
+
// Init warning window(for applets)
if (((Window)target).getWarningString() != null) {
// accessSystemTray permission allows to display TrayIcon, TrayIcon tooltip
@@ -480,14 +495,6 @@ class XWindowPeer extends XPanelPeer implements WindowPeer,
bounds.x, bounds.y, bounds.width, bounds.height);
XWM.setMotifDecor(this, false, 0, 0);
- XNETProtocol protocol = XWM.getWM().getNETProtocol();
- if (protocol != null && protocol.active()) {
- XAtomList net_wm_state = getNETWMState();
- net_wm_state.add(protocol.XA_NET_WM_STATE_SKIP_TASKBAR);
- setNETWMState(net_wm_state);
- }
-
-
boolean isResized = !bounds.getSize().equals(oldBounds.getSize());
boolean isMoved = !bounds.getLocation().equals(oldBounds.getLocation());
if (isMoved || isResized) {
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java b/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
index 4d2e425..9767c7c 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java
@@ -50,6 +50,8 @@ public class DefaultAsynchronousChannelProvider {
return new SolarisAsynchronousChannelProvider();
if (osname.equals("Linux"))
return new LinuxAsynchronousChannelProvider();
+ if (osname.startsWith("Mac OS"))
+ return new BsdAsynchronousChannelProvider();
throw new InternalError("platform not recognized");
}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java b/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
index 1badd79..05862e2 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/DevPollSelectorImpl.java
@@ -180,7 +180,7 @@ class DevPollSelectorImpl
((SelChImpl)selch).kill();
}
- void putEventOps(SelectionKeyImpl sk, int ops) {
+ public void putEventOps(SelectionKeyImpl sk, int ops) {
if (closed)
throw new ClosedSelectorException();
int fd = IOUtil.fdVal(sk.channel.getFD());
diff --git a/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java b/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java
index c6a09ba..c186503 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java
@@ -181,7 +181,7 @@ class EPollSelectorImpl
((SelChImpl)selch).kill();
}
- void putEventOps(SelectionKeyImpl sk, int ops) {
+ public void putEventOps(SelectionKeyImpl sk, int ops) {
if (closed)
throw new ClosedSelectorException();
pollWrapper.setInterest(sk.channel, ops);
diff --git a/jdk/src/solaris/classes/sun/nio/ch/NativeThread.java b/jdk/src/solaris/classes/sun/nio/ch/NativeThread.java
index 9684842..574c33d 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/NativeThread.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/NativeThread.java
@@ -37,21 +37,21 @@ package sun.nio.ch;
// always returns -1 and the signal(long) method has no effect.
-class NativeThread {
+public class NativeThread {
// Returns an opaque token representing the native thread underlying the
// invoking Java thread. On systems that do not require signalling, this
// method always returns -1.
//
- static native long current();
+ public static native long current();
// Signals the given native thread so as to release it from a blocking I/O
// operation. On systems that do not require signalling, this method has
// no effect.
//
- static native void signal(long nt);
+ public static native void signal(long nt);
- static native void init();
+ private static native void init();
static {
Util.load();
diff --git a/jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java b/jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java
index 3fe4421..70c189e 100644
--- a/jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java
+++ b/jdk/src/solaris/classes/sun/nio/ch/PollArrayWrapper.java
@@ -41,9 +41,9 @@ import sun.misc.*;
* @since 1.4
*/
-class PollArrayWrapper extends AbstractPollArrayWrapper {
+public class PollArrayWrapper extends AbstractPollArrayWrapper {
- static final short POLLCONN = POLLOUT;
+ public static final short POLLCONN = POLLOUT;
// File descriptor to write for interrupt
int interruptFD;
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpAssocChange.java b/jdk/src/solaris/classes/sun/nio/ch/SctpAssocChange.java
deleted file mode 100644
index fe4c533..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpAssocChange.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.AssociationChangeNotification;
-
-/**
- * An implementation of AssociationChangeNotification
- */
-public class SctpAssocChange extends AssociationChangeNotification
- implements SctpNotification
-{
- /* static final ints so that they can be referenced from native */
- private final static int SCTP_COMM_UP = 1;
- private final static int SCTP_COMM_LOST = 2;
- private final static int SCTP_RESTART = 3;
- private final static int SCTP_SHUTDOWN = 4;
- private final static int SCTP_CANT_START = 5;
-
- private Association association;
-
- /* assocId is used to lookup the association before the notification is
- * returned to user code */
- private int assocId;
- private AssocChangeEvent event;
- private int maxOutStreams;
- private int maxInStreams;
-
- /* Invoked from native */
- private SctpAssocChange(int assocId,
- int intEvent,
- int maxOutStreams,
- int maxInStreams) {
- switch (intEvent) {
- case SCTP_COMM_UP :
- this.event = AssocChangeEvent.COMM_UP;
- break;
- case SCTP_COMM_LOST :
- this.event = AssocChangeEvent.COMM_LOST;
- break;
- case SCTP_RESTART :
- this.event = AssocChangeEvent.RESTART;
- break;
- case SCTP_SHUTDOWN :
- this.event = AssocChangeEvent.SHUTDOWN;
- break;
- case SCTP_CANT_START :
- this.event = AssocChangeEvent.CANT_START;
- break;
- default :
- throw new AssertionError(
- "Unknown Association Change Event type: " + intEvent);
- }
-
- this.assocId = assocId;
- this.maxOutStreams = maxOutStreams;
- this.maxInStreams = maxInStreams;
- }
-
- @Override
- public int assocId() {
- return assocId;
- }
-
- @Override
- public void setAssociation(Association association) {
- this.association = association;
- }
-
- @Override
- public Association association() {
- assert association != null;
- return association;
- }
-
- @Override
- public AssocChangeEvent event() {
- return event;
- }
-
- int maxOutStreams() {
- return maxOutStreams;
- }
-
- int maxInStreams() {
- return maxInStreams;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(super.toString()).append(" [");
- sb.append("Association:").append(association);
- sb.append(", Event: ").append(event).append("]");
- return sb.toString();
- }
-}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java b/jdk/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java
deleted file mode 100644
index c6688c3..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpAssociationImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import com.sun.nio.sctp.Association;
-
-/**
- * An implementation of Association
- */
-public class SctpAssociationImpl extends Association {
- public SctpAssociationImpl(int associationID,
- int maxInStreams,
- int maxOutStreams) {
- super(associationID, maxInStreams, maxOutStreams);
- }
-
- @Override
- public String toString() {
- StringBuffer sb = new StringBuffer(super.toString());
- return sb.append("[associationID:")
- .append(associationID())
- .append(", maxIn:")
- .append(maxInboundStreams())
- .append(", maxOut:")
- .append(maxOutboundStreams())
- .append("]")
- .toString();
- }
-}
-
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java
deleted file mode 100644
index 699f80a..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java
+++ /dev/null
@@ -1,1097 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.InetAddress;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.InetSocketAddress;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Set;
-import java.util.HashSet;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.ConnectionPendingException;
-import java.nio.channels.NoConnectionPendingException;
-import java.nio.channels.AlreadyConnectedException;
-import java.nio.channels.NotYetBoundException;
-import java.nio.channels.NotYetConnectedException;
-import java.nio.channels.spi.SelectorProvider;
-import com.sun.nio.sctp.AbstractNotificationHandler;
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.AssociationChangeNotification;
-import com.sun.nio.sctp.HandlerResult;
-import com.sun.nio.sctp.IllegalReceiveException;
-import com.sun.nio.sctp.InvalidStreamException;
-import com.sun.nio.sctp.IllegalUnbindException;
-import com.sun.nio.sctp.MessageInfo;
-import com.sun.nio.sctp.NotificationHandler;
-import com.sun.nio.sctp.SctpChannel;
-import com.sun.nio.sctp.SctpSocketOption;
-import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
-import static sun.nio.ch.SctpResultContainer.SEND_FAILED;
-import static sun.nio.ch.SctpResultContainer.ASSOCIATION_CHANGED;
-import static sun.nio.ch.SctpResultContainer.PEER_ADDRESS_CHANGED;
-import static sun.nio.ch.SctpResultContainer.SHUTDOWN;
-
-/**
- * An implementation of an SctpChannel
- */
-public class SctpChannelImpl extends SctpChannel
- implements SelChImpl
-{
- private final FileDescriptor fd;
-
- private final int fdVal;
-
- /* IDs of native threads doing send and receivess, for signalling */
- private volatile long receiverThread = 0;
- private volatile long senderThread = 0;
-
- /* Lock held by current receiving or connecting thread */
- private final Object receiveLock = new Object();
-
- /* Lock held by current sending or connecting thread */
- private final Object sendLock = new Object();
-
- private final ThreadLocal<Boolean> receiveInvoked =
- new ThreadLocal<Boolean>() {
- @Override protected Boolean initialValue() {
- return Boolean.FALSE;
- }
- };
-
- /* Lock held by any thread that modifies the state fields declared below
- DO NOT invoke a blocking I/O operation while holding this lock! */
- private final Object stateLock = new Object();
-
- private enum ChannelState {
- UNINITIALIZED,
- UNCONNECTED,
- PENDING,
- CONNECTED,
- KILLPENDING,
- KILLED,
- }
- /* -- The following fields are protected by stateLock -- */
- private ChannelState state = ChannelState.UNINITIALIZED;
-
- /* Binding; Once bound the port will remain constant. */
- int port = -1;
- private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>();
- /* Has the channel been bound to the wildcard address */
- private boolean wildcard; /* false */
- //private InetSocketAddress remoteAddress = null;
-
- /* Input/Output open */
- private boolean readyToConnect;
-
- /* Shutdown */
- private boolean isShutdown;
-
- private Association association;
-
- private Set<SocketAddress> remoteAddresses = Collections.emptySet();
-
- /* -- End of fields protected by stateLock -- */
-
- /**
- * Constructor for normal connecting sockets
- */
- public SctpChannelImpl(SelectorProvider provider) throws IOException {
- //TODO: update provider remove public modifier
- super(provider);
- this.fd = SctpNet.socket(true);
- this.fdVal = IOUtil.fdVal(fd);
- this.state = ChannelState.UNCONNECTED;
- }
-
- /**
- * Constructor for sockets obtained from server sockets
- */
- public SctpChannelImpl(SelectorProvider provider, FileDescriptor fd)
- throws IOException {
- this(provider, fd, null);
- }
-
- /**
- * Constructor for sockets obtained from branching
- */
- public SctpChannelImpl(SelectorProvider provider,
- FileDescriptor fd,
- Association association)
- throws IOException {
- super(provider);
- this.fd = fd;
- this.fdVal = IOUtil.fdVal(fd);
- this.state = ChannelState.CONNECTED;
- port = (Net.localAddress(fd)).getPort();
-
- if (association != null) { /* branched */
- this.association = association;
- } else { /* obtained from server channel */
- /* Receive COMM_UP */
- ByteBuffer buf = Util.getTemporaryDirectBuffer(50);
- try {
- receive(buf, null, null, true);
- } finally {
- Util.releaseTemporaryDirectBuffer(buf);
- }
- }
- }
-
- /**
- * Binds the channel's socket to a local address.
- */
- @Override
- public SctpChannel bind(SocketAddress local) throws IOException {
- synchronized (receiveLock) {
- synchronized (sendLock) {
- synchronized (stateLock) {
- ensureOpenAndUnconnected();
- if (isBound())
- SctpNet.throwAlreadyBoundException();
- InetSocketAddress isa = (local == null) ?
- new InetSocketAddress(0) : Net.checkAddress(local);
- Net.bind(fd, isa.getAddress(), isa.getPort());
- InetSocketAddress boundIsa = Net.localAddress(fd);
- port = boundIsa.getPort();
- localAddresses.add(isa);
- if (isa.getAddress().isAnyLocalAddress())
- wildcard = true;
- }
- }
- }
- return this;
- }
-
- @Override
- public SctpChannel bindAddress(InetAddress address)
- throws IOException {
- bindUnbindAddress(address, true);
- localAddresses.add(new InetSocketAddress(address, port));
- return this;
- }
-
- @Override
- public SctpChannel unbindAddress(InetAddress address)
- throws IOException {
- bindUnbindAddress(address, false);
- localAddresses.remove(new InetSocketAddress(address, port));
- return this;
- }
-
- private SctpChannel bindUnbindAddress(InetAddress address, boolean add)
- throws IOException {
- if (address == null)
- throw new IllegalArgumentException();
-
- synchronized (receiveLock) {
- synchronized (sendLock) {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- throw new NotYetBoundException();
- if (wildcard)
- throw new IllegalStateException(
- "Cannot add or remove addresses from a channel that is bound to the wildcard address");
- if (address.isAnyLocalAddress())
- throw new IllegalArgumentException(
- "Cannot add or remove the wildcard address");
- if (add) {
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- SctpNet.throwAlreadyBoundException();
- }
- }
- } else { /*removing */
- /* Verify that there is more than one address
- * and that address is already bound */
- if (localAddresses.size() <= 1)
- throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound");
- boolean foundAddress = false;
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- foundAddress = true;
- break;
- }
- }
- if (!foundAddress )
- throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address");
- }
-
- SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add);
-
- /* Update our internal Set to reflect the addition/removal */
- if (add)
- localAddresses.add(new InetSocketAddress(address, port));
- else {
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- localAddresses.remove(addr);
- break;
- }
- }
- }
- }
- }
- }
- return this;
- }
-
- private boolean isBound() {
- synchronized (stateLock) {
- return port == -1 ? false : true;
- }
- }
-
- private boolean isConnected() {
- synchronized (stateLock) {
- return (state == ChannelState.CONNECTED);
- }
- }
-
- private void ensureOpenAndUnconnected() throws IOException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (isConnected())
- throw new AlreadyConnectedException();
- if (state == ChannelState.PENDING)
- throw new ConnectionPendingException();
- }
- }
-
- private boolean ensureReceiveOpen() throws ClosedChannelException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isConnected())
- throw new NotYetConnectedException();
- else
- return true;
- }
- }
-
- private void ensureSendOpen() throws ClosedChannelException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (isShutdown)
- throw new ClosedChannelException();
- if (!isConnected())
- throw new NotYetConnectedException();
- }
- }
-
- private void receiverCleanup() throws IOException {
- synchronized (stateLock) {
- receiverThread = 0;
- if (state == ChannelState.KILLPENDING)
- kill();
- }
- }
-
- private void senderCleanup() throws IOException {
- synchronized (stateLock) {
- senderThread = 0;
- if (state == ChannelState.KILLPENDING)
- kill();
- }
- }
-
- @Override
- public Association association() throws ClosedChannelException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isConnected())
- return null;
-
- return association;
- }
- }
-
- @Override
- public boolean connect(SocketAddress endpoint) throws IOException {
- synchronized (receiveLock) {
- synchronized (sendLock) {
- ensureOpenAndUnconnected();
- InetSocketAddress isa = Net.checkAddress(endpoint);
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkConnect(isa.getAddress().getHostAddress(),
- isa.getPort());
- synchronized (blockingLock()) {
- int n = 0;
- try {
- try {
- begin();
- synchronized (stateLock) {
- if (!isOpen()) {
- return false;
- }
- receiverThread = NativeThread.current();
- }
- for (;;) {
- InetAddress ia = isa.getAddress();
- if (ia.isAnyLocalAddress())
- ia = InetAddress.getLocalHost();
- n = SctpNet.connect(fdVal, ia, isa.getPort());
- if ( (n == IOStatus.INTERRUPTED)
- && isOpen())
- continue;
- break;
- }
- } finally {
- receiverCleanup();
- end((n > 0) || (n == IOStatus.UNAVAILABLE));
- assert IOStatus.check(n);
- }
- } catch (IOException x) {
- /* If an exception was thrown, close the channel after
- * invoking end() so as to avoid bogus
- * AsynchronousCloseExceptions */
- close();
- throw x;
- }
-
- if (n > 0) {
- synchronized (stateLock) {
- /* Connection succeeded */
- state = ChannelState.CONNECTED;
- if (!isBound()) {
- InetSocketAddress boundIsa =
- Net.localAddress(fd);
- port = boundIsa.getPort();
- }
-
- /* Receive COMM_UP */
- ByteBuffer buf = Util.getTemporaryDirectBuffer(50);
- try {
- receive(buf, null, null, true);
- } finally {
- Util.releaseTemporaryDirectBuffer(buf);
- }
-
- /* cache remote addresses */
- try {
- remoteAddresses = getRemoteAddresses();
- } catch (IOException unused) { /* swallow exception */ }
-
- return true;
- }
- } else {
- synchronized (stateLock) {
- /* If nonblocking and no exception then connection
- * pending; disallow another invocation */
- if (!isBlocking())
- state = ChannelState.PENDING;
- else
- assert false;
- }
- }
- }
- return false;
- }
- }
- }
-
- @Override
- public boolean connect(SocketAddress endpoint,
- int maxOutStreams,
- int maxInStreams)
- throws IOException {
- ensureOpenAndUnconnected();
- return setOption(SCTP_INIT_MAXSTREAMS, InitMaxStreams.
- create(maxInStreams, maxOutStreams)).connect(endpoint);
-
- }
-
- @Override
- public boolean isConnectionPending() {
- synchronized (stateLock) {
- return (state == ChannelState.PENDING);
- }
- }
-
- @Override
- public boolean finishConnect() throws IOException {
- synchronized (receiveLock) {
- synchronized (sendLock) {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (isConnected())
- return true;
- if (state != ChannelState.PENDING)
- throw new NoConnectionPendingException();
- }
- int n = 0;
- try {
- try {
- begin();
- synchronized (blockingLock()) {
- synchronized (stateLock) {
- if (!isOpen()) {
- return false;
- }
- receiverThread = NativeThread.current();
- }
- if (!isBlocking()) {
- for (;;) {
- n = checkConnect(fd, false, readyToConnect);
- if ( (n == IOStatus.INTERRUPTED)
- && isOpen())
- continue;
- break;
- }
- } else {
- for (;;) {
- n = checkConnect(fd, true, readyToConnect);
- if (n == 0) {
- // Loop in case of
- // spurious notifications
- continue;
- }
- if ( (n == IOStatus.INTERRUPTED)
- && isOpen())
- continue;
- break;
- }
- }
- }
- } finally {
- synchronized (stateLock) {
- receiverThread = 0;
- if (state == ChannelState.KILLPENDING) {
- kill();
- /* poll()/getsockopt() does not report
- * error (throws exception, with n = 0)
- * on Linux platform after dup2 and
- * signal-wakeup. Force n to 0 so the
- * end() can throw appropriate exception */
- n = 0;
- }
- }
- end((n > 0) || (n == IOStatus.UNAVAILABLE));
- assert IOStatus.check(n);
- }
- } catch (IOException x) {
- /* If an exception was thrown, close the channel after
- * invoking end() so as to avoid bogus
- * AsynchronousCloseExceptions */
- close();
- throw x;
- }
-
- if (n > 0) {
- synchronized (stateLock) {
- state = ChannelState.CONNECTED;
- if (!isBound()) {
- InetSocketAddress boundIsa =
- Net.localAddress(fd);
- port = boundIsa.getPort();
- }
-
- /* Receive COMM_UP */
- ByteBuffer buf = Util.getTemporaryDirectBuffer(50);
- try {
- receive(buf, null, null, true);
- } finally {
- Util.releaseTemporaryDirectBuffer(buf);
- }
-
- /* cache remote addresses */
- try {
- remoteAddresses = getRemoteAddresses();
- } catch (IOException unused) { /* swallow exception */ }
-
- return true;
- }
- }
- }
- }
- return false;
- }
-
- @Override
- protected void implConfigureBlocking(boolean block) throws IOException {
- IOUtil.configureBlocking(fd, block);
- }
-
- @Override
- public void implCloseSelectableChannel() throws IOException {
- synchronized (stateLock) {
- SctpNet.preClose(fdVal);
-
- if (receiverThread != 0)
- NativeThread.signal(receiverThread);
-
- if (senderThread != 0)
- NativeThread.signal(senderThread);
-
- if (!isRegistered())
- kill();
- }
- }
-
- @Override
- public FileDescriptor getFD() {
- return fd;
- }
-
- @Override
- public int getFDVal() {
- return fdVal;
- }
-
- /**
- * Translates native poll revent ops into a ready operation ops
- */
- private boolean translateReadyOps(int ops, int initialOps, SelectionKeyImpl sk) {
- int intOps = sk.nioInterestOps();
- int oldOps = sk.nioReadyOps();
- int newOps = initialOps;
-
- if ((ops & PollArrayWrapper.POLLNVAL) != 0) {
- /* This should only happen if this channel is pre-closed while a
- * selection operation is in progress
- * ## Throw an error if this channel has not been pre-closed */
- return false;
- }
-
- if ((ops & (PollArrayWrapper.POLLERR
- | PollArrayWrapper.POLLHUP)) != 0) {
- newOps = intOps;
- sk.nioReadyOps(newOps);
- /* No need to poll again in checkConnect,
- * the error will be detected there */
- readyToConnect = true;
- return (newOps & ~oldOps) != 0;
- }
-
- if (((ops & PollArrayWrapper.POLLIN) != 0) &&
- ((intOps & SelectionKey.OP_READ) != 0) &&
- isConnected())
- newOps |= SelectionKey.OP_READ;
-
- if (((ops & PollArrayWrapper.POLLCONN) != 0) &&
- ((intOps & SelectionKey.OP_CONNECT) != 0) &&
- ((state == ChannelState.UNCONNECTED) || (state == ChannelState.PENDING))) {
- newOps |= SelectionKey.OP_CONNECT;
- readyToConnect = true;
- }
-
- if (((ops & PollArrayWrapper.POLLOUT) != 0) &&
- ((intOps & SelectionKey.OP_WRITE) != 0) &&
- isConnected())
- newOps |= SelectionKey.OP_WRITE;
-
- sk.nioReadyOps(newOps);
- return (newOps & ~oldOps) != 0;
- }
-
- @Override
- public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) {
- return translateReadyOps(ops, sk.nioReadyOps(), sk);
- }
-
- @Override
- @SuppressWarnings("all")
- public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) {
- return translateReadyOps(ops, 0, sk);
- }
-
- @Override
- public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) {
- int newOps = 0;
- if ((ops & SelectionKey.OP_READ) != 0)
- newOps |= PollArrayWrapper.POLLIN;
- if ((ops & SelectionKey.OP_WRITE) != 0)
- newOps |= PollArrayWrapper.POLLOUT;
- if ((ops & SelectionKey.OP_CONNECT) != 0)
- newOps |= PollArrayWrapper.POLLCONN;
- sk.selector.putEventOps(sk, newOps);
- }
-
- @Override
- public void kill() throws IOException {
- synchronized (stateLock) {
- if (state == ChannelState.KILLED)
- return;
- if (state == ChannelState.UNINITIALIZED) {
- state = ChannelState.KILLED;
- return;
- }
- assert !isOpen() && !isRegistered();
-
- /* Postpone the kill if there is a waiting reader
- * or writer thread. */
- if (receiverThread == 0 && senderThread == 0) {
- SctpNet.close(fdVal);
- state = ChannelState.KILLED;
- } else {
- state = ChannelState.KILLPENDING;
- }
- }
- }
-
- @Override
- public <T> SctpChannel setOption(SctpSocketOption<T> name, T value)
- throws IOException {
- if (name == null)
- throw new NullPointerException();
- if (!supportedOptions().contains(name))
- throw new UnsupportedOperationException("'" + name + "' not supported");
-
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
-
- SctpNet.setSocketOption(fdVal, name, value, 0 /*oneToOne*/);
- }
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T> T getOption(SctpSocketOption<T> name) throws IOException {
- if (name == null)
- throw new NullPointerException();
- if (!supportedOptions().contains(name))
- throw new UnsupportedOperationException("'" + name + "' not supported");
-
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
-
- return (T)SctpNet.getSocketOption(fdVal, name, 0 /*oneToOne*/);
- }
- }
-
- private static class DefaultOptionsHolder {
- static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions();
-
- private static Set<SctpSocketOption<?>> defaultOptions() {
- HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(10);
- set.add(SCTP_DISABLE_FRAGMENTS);
- set.add(SCTP_EXPLICIT_COMPLETE);
- set.add(SCTP_FRAGMENT_INTERLEAVE);
- set.add(SCTP_INIT_MAXSTREAMS);
- set.add(SCTP_NODELAY);
- set.add(SCTP_PRIMARY_ADDR);
- set.add(SCTP_SET_PEER_PRIMARY_ADDR);
- set.add(SO_SNDBUF);
- set.add(SO_RCVBUF);
- set.add(SO_LINGER);
- return Collections.unmodifiableSet(set);
- }
- }
-
- @Override
- public final Set<SctpSocketOption<?>> supportedOptions() {
- return DefaultOptionsHolder.defaultOptions;
- }
-
- @Override
- public <T> MessageInfo receive(ByteBuffer buffer,
- T attachment,
- NotificationHandler<T> handler)
- throws IOException {
- return receive(buffer, attachment, handler, false);
- }
-
- private <T> MessageInfo receive(ByteBuffer buffer,
- T attachment,
- NotificationHandler<T> handler,
- boolean fromConnect)
- throws IOException {
- if (buffer == null)
- throw new IllegalArgumentException("buffer cannot be null");
-
- if (buffer.isReadOnly())
- throw new IllegalArgumentException("Read-only buffer");
-
- if (receiveInvoked.get())
- throw new IllegalReceiveException(
- "cannot invoke receive from handler");
- receiveInvoked.set(Boolean.TRUE);
-
- try {
- SctpResultContainer resultContainer = new SctpResultContainer();
- do {
- resultContainer.clear();
- synchronized (receiveLock) {
- if (!ensureReceiveOpen())
- return null;
-
- int n = 0;
- try {
- begin();
-
- synchronized (stateLock) {
- if(!isOpen())
- return null;
- receiverThread = NativeThread.current();
- }
-
- do {
- n = receive(fdVal, buffer, resultContainer, fromConnect);
- } while ((n == IOStatus.INTERRUPTED) && isOpen());
- } finally {
- receiverCleanup();
- end((n > 0) || (n == IOStatus.UNAVAILABLE));
- assert IOStatus.check(n);
- }
-
- if (!resultContainer.isNotification()) {
- /* message or nothing */
- if (resultContainer.hasSomething()) {
- /* Set the association before returning */
- SctpMessageInfoImpl info =
- resultContainer.getMessageInfo();
- synchronized (stateLock) {
- assert association != null;
- info.setAssociation(association);
- }
- return info;
- } else
- /* Non-blocking may return null if nothing available*/
- return null;
- } else { /* notification */
- synchronized (stateLock) {
- handleNotificationInternal(
- resultContainer);
- }
- }
-
- if (fromConnect) {
- /* If we reach here, then it was connect that invoked
- * receive and received the COMM_UP. We have already
- * handled the COMM_UP with the internal notification
- * handler. Simply return. */
- return null;
- }
- } /* receiveLock */
- } while (handler == null ? true :
- (invokeNotificationHandler(resultContainer, handler, attachment)
- == HandlerResult.CONTINUE));
-
- return null;
- } finally {
- receiveInvoked.set(Boolean.FALSE);
- }
- }
-
- private int receive(int fd,
- ByteBuffer dst,
- SctpResultContainer resultContainer,
- boolean peek)
- throws IOException {
- int pos = dst.position();
- int lim = dst.limit();
- assert (pos <= lim);
- int rem = (pos <= lim ? lim - pos : 0);
- if (dst instanceof DirectBuffer && rem > 0)
- return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos, peek);
-
- /* Substitute a native buffer */
- int newSize = Math.max(rem, 1);
- ByteBuffer bb = Util.getTemporaryDirectBuffer(newSize);
- try {
- int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0, peek);
- bb.flip();
- if (n > 0 && rem > 0)
- dst.put(bb);
- return n;
- } finally {
- Util.releaseTemporaryDirectBuffer(bb);
- }
- }
-
- private int receiveIntoNativeBuffer(int fd,
- SctpResultContainer resultContainer,
- ByteBuffer bb,
- int rem,
- int pos,
- boolean peek)
- throws IOException
- {
- int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem, peek);
-
- if (n > 0)
- bb.position(pos + n);
- return n;
- }
-
- private InternalNotificationHandler internalNotificationHandler =
- new InternalNotificationHandler();
-
- private void handleNotificationInternal(SctpResultContainer resultContainer)
- {
- invokeNotificationHandler(resultContainer,
- internalNotificationHandler, null);
- }
-
- private class InternalNotificationHandler
- extends AbstractNotificationHandler<Object>
- {
- @Override
- public HandlerResult handleNotification(
- AssociationChangeNotification not, Object unused) {
- if (not.event().equals(
- AssociationChangeNotification.AssocChangeEvent.COMM_UP) &&
- association == null) {
- SctpAssocChange sac = (SctpAssocChange) not;
- association = new SctpAssociationImpl
- (sac.assocId(), sac.maxInStreams(), sac.maxOutStreams());
- }
- return HandlerResult.CONTINUE;
- }
- }
-
- private <T> HandlerResult invokeNotificationHandler
- (SctpResultContainer resultContainer,
- NotificationHandler<T> handler,
- T attachment) {
- SctpNotification notification = resultContainer.notification();
- synchronized (stateLock) {
- notification.setAssociation(association);
- }
-
- if (!(handler instanceof AbstractNotificationHandler)) {
- return handler.handleNotification(notification, attachment);
- }
-
- /* AbstractNotificationHandler */
- AbstractNotificationHandler<T> absHandler =
- (AbstractNotificationHandler<T>)handler;
- switch(resultContainer.type()) {
- case ASSOCIATION_CHANGED :
- return absHandler.handleNotification(
- resultContainer.getAssociationChanged(), attachment);
- case PEER_ADDRESS_CHANGED :
- return absHandler.handleNotification(
- resultContainer.getPeerAddressChanged(), attachment);
- case SEND_FAILED :
- return absHandler.handleNotification(
- resultContainer.getSendFailed(), attachment);
- case SHUTDOWN :
- return absHandler.handleNotification(
- resultContainer.getShutdown(), attachment);
- default :
- /* implementation specific handlers */
- return absHandler.handleNotification(
- resultContainer.notification(), attachment);
- }
- }
-
- private void checkAssociation(Association sendAssociation) {
- synchronized (stateLock) {
- if (sendAssociation != null && !sendAssociation.equals(association)) {
- throw new IllegalArgumentException(
- "Cannot send to another association");
- }
- }
- }
-
- private void checkStreamNumber(int streamNumber) {
- synchronized (stateLock) {
- if (association != null) {
- if (streamNumber < 0 ||
- streamNumber >= association.maxOutboundStreams())
- throw new InvalidStreamException();
- }
- }
- }
-
- /* TODO: Add support for ttl and isComplete to both 121 12M
- * SCTP_EOR not yet supported on reference platforms
- * TTL support limited...
- */
- @Override
- public int send(ByteBuffer buffer, MessageInfo messageInfo)
- throws IOException {
- if (buffer == null)
- throw new IllegalArgumentException("buffer cannot be null");
-
- if (messageInfo == null)
- throw new IllegalArgumentException("messageInfo cannot be null");
-
- checkAssociation(messageInfo.association());
- checkStreamNumber(messageInfo.streamNumber());
-
- synchronized (sendLock) {
- ensureSendOpen();
-
- int n = 0;
- try {
- begin();
-
- synchronized (stateLock) {
- if(!isOpen())
- return 0;
- senderThread = NativeThread.current();
- }
-
- do {
- n = send(fdVal, buffer, messageInfo);
- } while ((n == IOStatus.INTERRUPTED) && isOpen());
-
- return IOStatus.normalize(n);
- } finally {
- senderCleanup();
- end((n > 0) || (n == IOStatus.UNAVAILABLE));
- assert IOStatus.check(n);
- }
- }
- }
-
- private int send(int fd, ByteBuffer src, MessageInfo messageInfo)
- throws IOException {
- int streamNumber = messageInfo.streamNumber();
- SocketAddress target = messageInfo.address();
- boolean unordered = messageInfo.isUnordered();
- int ppid = messageInfo.payloadProtocolID();
-
- if (src instanceof DirectBuffer)
- return sendFromNativeBuffer(fd, src, target, streamNumber,
- unordered, ppid);
-
- /* Substitute a native buffer */
- int pos = src.position();
- int lim = src.limit();
- assert (pos <= lim && streamNumber >= 0);
-
- int rem = (pos <= lim ? lim - pos : 0);
- ByteBuffer bb = Util.getTemporaryDirectBuffer(rem);
- try {
- bb.put(src);
- bb.flip();
- /* Do not update src until we see how many bytes were written */
- src.position(pos);
-
- int n = sendFromNativeBuffer(fd, bb, target, streamNumber,
- unordered, ppid);
- if (n > 0) {
- /* now update src */
- src.position(pos + n);
- }
- return n;
- } finally {
- Util.releaseTemporaryDirectBuffer(bb);
- }
- }
-
- private int sendFromNativeBuffer(int fd,
- ByteBuffer bb,
- SocketAddress target,
- int streamNumber,
- boolean unordered,
- int ppid)
- throws IOException {
- int pos = bb.position();
- int lim = bb.limit();
- assert (pos <= lim);
- int rem = (pos <= lim ? lim - pos : 0);
-
- int written = send0(fd, ((DirectBuffer)bb).address() + pos,
- rem, target, -1 /*121*/, streamNumber, unordered, ppid);
- if (written > 0)
- bb.position(pos + written);
- return written;
- }
-
- @Override
- public SctpChannel shutdown() throws IOException {
- synchronized(stateLock) {
- if (isShutdown)
- return this;
-
- ensureSendOpen();
- SctpNet.shutdown(fdVal, -1);
- if (senderThread != 0)
- NativeThread.signal(senderThread);
- isShutdown = true;
- }
- return this;
- }
-
- @Override
- public Set<SocketAddress> getAllLocalAddresses()
- throws IOException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- return Collections.emptySet();
-
- return SctpNet.getLocalAddresses(fdVal);
- }
- }
-
- @Override
- public Set<SocketAddress> getRemoteAddresses()
- throws IOException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isConnected() || isShutdown)
- return Collections.emptySet();
-
- try {
- return SctpNet.getRemoteAddresses(fdVal, 0/*unused*/);
- } catch (SocketException unused) {
- /* an open connected channel should always have remote addresses */
- return remoteAddresses;
- }
- }
- }
-
- /* Native */
- private static native void initIDs();
-
- static native int receive0(int fd, SctpResultContainer resultContainer,
- long address, int length, boolean peek) throws IOException;
-
- static native int send0(int fd, long address, int length,
- SocketAddress target, int assocId, int streamNumber,
- boolean unordered, int ppid) throws IOException;
-
- private static native int checkConnect(FileDescriptor fd, boolean block,
- boolean ready) throws IOException;
-
- static {
- Util.load(); /* loads nio & net native libraries */
- java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("sctp"));
- initIDs();
- }
-}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java
deleted file mode 100644
index 8ef16fa..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpMultiChannelImpl.java
+++ /dev/null
@@ -1,985 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.InetAddress;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.InetSocketAddress;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Map.Entry;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.HashMap;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.NotYetBoundException;
-import java.nio.channels.spi.SelectorProvider;
-import com.sun.nio.sctp.AbstractNotificationHandler;
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.AssociationChangeNotification;
-import com.sun.nio.sctp.HandlerResult;
-import com.sun.nio.sctp.IllegalReceiveException;
-import com.sun.nio.sctp.InvalidStreamException;
-import com.sun.nio.sctp.IllegalUnbindException;
-import com.sun.nio.sctp.NotificationHandler;
-import com.sun.nio.sctp.MessageInfo;
-import com.sun.nio.sctp.SctpChannel;
-import com.sun.nio.sctp.SctpMultiChannel;
-import com.sun.nio.sctp.SctpSocketOption;
-import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
-import static sun.nio.ch.SctpResultContainer.*;
-
-/**
- * An implementation of SctpMultiChannel
- */
-public class SctpMultiChannelImpl extends SctpMultiChannel
- implements SelChImpl
-{
- private final FileDescriptor fd;
-
- private final int fdVal;
-
- /* IDs of native threads doing send and receives, for signalling */
- private volatile long receiverThread = 0;
- private volatile long senderThread = 0;
-
- /* Lock held by current receiving thread */
- private final Object receiveLock = new Object();
-
- /* Lock held by current sending thread */
- private final Object sendLock = new Object();
-
- /* Lock held by any thread that modifies the state fields declared below
- * DO NOT invoke a blocking I/O operation while holding this lock! */
- private final Object stateLock = new Object();
-
- private enum ChannelState {
- UNINITIALIZED,
- KILLPENDING,
- KILLED,
- }
-
- /* -- The following fields are protected by stateLock -- */
- private ChannelState state = ChannelState.UNINITIALIZED;
-
- /* Binding: Once bound the port will remain constant. */
- int port = -1;
- private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>();
- /* Has the channel been bound to the wildcard address */
- private boolean wildcard; /* false */
-
- /* Keeps a map of addresses to association, and visa versa */
- private HashMap<SocketAddress, Association> addressMap =
- new HashMap<SocketAddress, Association>();
- private HashMap<Association, Set<SocketAddress>> associationMap =
- new HashMap<Association, Set<SocketAddress>>();
-
- /* -- End of fields protected by stateLock -- */
-
- /* If an association has been shutdown mark it for removal after
- * the user handler has been invoked */
- private final ThreadLocal<Association> associationToRemove =
- new ThreadLocal<Association>() {
- @Override protected Association initialValue() {
- return null;
- }
- };
-
- /* A notification handler cannot invoke receive */
- private final ThreadLocal<Boolean> receiveInvoked =
- new ThreadLocal<Boolean>() {
- @Override protected Boolean initialValue() {
- return Boolean.FALSE;
- }
- };
-
- public SctpMultiChannelImpl(SelectorProvider provider)
- throws IOException {
- //TODO: update provider, remove public modifier
- super(provider);
- this.fd = SctpNet.socket(false /*one-to-many*/);
- this.fdVal = IOUtil.fdVal(fd);
- }
-
- @Override
- public SctpMultiChannel bind(SocketAddress local, int backlog)
- throws IOException {
- synchronized (receiveLock) {
- synchronized (sendLock) {
- synchronized (stateLock) {
- ensureOpen();
- if (isBound())
- SctpNet.throwAlreadyBoundException();
- InetSocketAddress isa = (local == null) ?
- new InetSocketAddress(0) : Net.checkAddress(local);
-
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkListen(isa.getPort());
- Net.bind(fd, isa.getAddress(), isa.getPort());
-
- InetSocketAddress boundIsa = Net.localAddress(fd);
- port = boundIsa.getPort();
- localAddresses.add(isa);
- if (isa.getAddress().isAnyLocalAddress())
- wildcard = true;
-
- SctpNet.listen(fdVal, backlog < 1 ? 50 : backlog);
- }
- }
- }
- return this;
- }
-
- @Override
- public SctpMultiChannel bindAddress(InetAddress address)
- throws IOException {
- return bindUnbindAddress(address, true);
- }
-
- @Override
- public SctpMultiChannel unbindAddress(InetAddress address)
- throws IOException {
- return bindUnbindAddress(address, false);
- }
-
- private SctpMultiChannel bindUnbindAddress(InetAddress address,
- boolean add)
- throws IOException {
- if (address == null)
- throw new IllegalArgumentException();
-
- synchronized (receiveLock) {
- synchronized (sendLock) {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- throw new NotYetBoundException();
- if (wildcard)
- throw new IllegalStateException(
- "Cannot add or remove addresses from a channel that is bound to the wildcard address");
- if (address.isAnyLocalAddress())
- throw new IllegalArgumentException(
- "Cannot add or remove the wildcard address");
- if (add) {
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- SctpNet.throwAlreadyBoundException();
- }
- }
- } else { /*removing */
- /* Verify that there is more than one address
- * and that address is already bound */
- if (localAddresses.size() <= 1)
- throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound");
- boolean foundAddress = false;
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- foundAddress = true;
- break;
- }
- }
- if (!foundAddress )
- throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address");
- }
-
- SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add);
-
- /* Update our internal Set to reflect the addition/removal */
- if (add)
- localAddresses.add(new InetSocketAddress(address, port));
- else {
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- localAddresses.remove(addr);
- break;
- }
- }
- }
- }
- }
- }
- return this;
- }
-
- @Override
- public Set<Association> associations()
- throws ClosedChannelException, NotYetBoundException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- throw new NotYetBoundException();
-
- return Collections.unmodifiableSet(associationMap.keySet());
- }
- }
-
- private boolean isBound() {
- synchronized (stateLock) {
- return port == -1 ? false : true;
- }
- }
-
- private void ensureOpen() throws IOException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- }
- }
-
- private void receiverCleanup() throws IOException {
- synchronized (stateLock) {
- receiverThread = 0;
- if (state == ChannelState.KILLPENDING)
- kill();
- }
- }
-
- private void senderCleanup() throws IOException {
- synchronized (stateLock) {
- senderThread = 0;
- if (state == ChannelState.KILLPENDING)
- kill();
- }
- }
-
- @Override
- protected void implConfigureBlocking(boolean block) throws IOException {
- IOUtil.configureBlocking(fd, block);
- }
-
- @Override
- public void implCloseSelectableChannel() throws IOException {
- synchronized (stateLock) {
- SctpNet.preClose(fdVal);
-
- if (receiverThread != 0)
- NativeThread.signal(receiverThread);
-
- if (senderThread != 0)
- NativeThread.signal(senderThread);
-
- if (!isRegistered())
- kill();
- }
- }
-
- @Override
- public FileDescriptor getFD() {
- return fd;
- }
-
- @Override
- public int getFDVal() {
- return fdVal;
- }
-
- /**
- * Translates native poll revent ops into a ready operation ops
- */
- private boolean translateReadyOps(int ops, int initialOps,
- SelectionKeyImpl sk) {
- int intOps = sk.nioInterestOps();
- int oldOps = sk.nioReadyOps();
- int newOps = initialOps;
-
- if ((ops & PollArrayWrapper.POLLNVAL) != 0) {
- /* This should only happen if this channel is pre-closed while a
- * selection operation is in progress
- * ## Throw an error if this channel has not been pre-closed */
- return false;
- }
-
- if ((ops & (PollArrayWrapper.POLLERR
- | PollArrayWrapper.POLLHUP)) != 0) {
- newOps = intOps;
- sk.nioReadyOps(newOps);
- return (newOps & ~oldOps) != 0;
- }
-
- if (((ops & PollArrayWrapper.POLLIN) != 0) &&
- ((intOps & SelectionKey.OP_READ) != 0))
- newOps |= SelectionKey.OP_READ;
-
- if (((ops & PollArrayWrapper.POLLOUT) != 0) &&
- ((intOps & SelectionKey.OP_WRITE) != 0))
- newOps |= SelectionKey.OP_WRITE;
-
- sk.nioReadyOps(newOps);
- return (newOps & ~oldOps) != 0;
- }
-
- @Override
- public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) {
- return translateReadyOps(ops, sk.nioReadyOps(), sk);
- }
-
- @Override
- public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) {
- return translateReadyOps(ops, 0, sk);
- }
-
- @Override
- public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) {
- int newOps = 0;
- if ((ops & SelectionKey.OP_READ) != 0)
- newOps |= PollArrayWrapper.POLLIN;
- if ((ops & SelectionKey.OP_WRITE) != 0)
- newOps |= PollArrayWrapper.POLLOUT;
- sk.selector.putEventOps(sk, newOps);
- }
-
- @Override
- public void kill() throws IOException {
- synchronized (stateLock) {
- if (state == ChannelState.KILLED)
- return;
- if (state == ChannelState.UNINITIALIZED) {
- state = ChannelState.KILLED;
- return;
- }
- assert !isOpen() && !isRegistered();
-
- /* Postpone the kill if there is a thread sending or receiving. */
- if (receiverThread == 0 && senderThread == 0) {
- SctpNet.close(fdVal);
- state = ChannelState.KILLED;
- } else {
- state = ChannelState.KILLPENDING;
- }
- }
- }
-
- @Override
- public <T> SctpMultiChannel setOption(SctpSocketOption<T> name,
- T value,
- Association association)
- throws IOException {
- if (name == null)
- throw new NullPointerException();
- if (!(supportedOptions().contains(name)))
- throw new UnsupportedOperationException("'" + name + "' not supported");
-
- synchronized (stateLock) {
- if (association != null && (name.equals(SCTP_PRIMARY_ADDR) ||
- name.equals(SCTP_SET_PEER_PRIMARY_ADDR))) {
- checkAssociation(association);
- }
- if (!isOpen())
- throw new ClosedChannelException();
-
- int assocId = association == null ? 0 : association.associationID();
- SctpNet.setSocketOption(fdVal, name, value, assocId);
- }
- return this;
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T> T getOption(SctpSocketOption<T> name, Association association)
- throws IOException {
- if (name == null)
- throw new NullPointerException();
- if (!supportedOptions().contains(name))
- throw new UnsupportedOperationException("'" + name + "' not supported");
-
- synchronized (stateLock) {
- if (association != null && (name.equals(SCTP_PRIMARY_ADDR) ||
- name.equals(SCTP_SET_PEER_PRIMARY_ADDR))) {
- checkAssociation(association);
- }
- if (!isOpen())
- throw new ClosedChannelException();
-
- int assocId = association == null ? 0 : association.associationID();
- return (T)SctpNet.getSocketOption(fdVal, name, assocId);
- }
- }
-
- private static class DefaultOptionsHolder {
- static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions();
-
- private static Set<SctpSocketOption<?>> defaultOptions() {
- HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(10);
- set.add(SCTP_DISABLE_FRAGMENTS);
- set.add(SCTP_EXPLICIT_COMPLETE);
- set.add(SCTP_FRAGMENT_INTERLEAVE);
- set.add(SCTP_INIT_MAXSTREAMS);
- set.add(SCTP_NODELAY);
- set.add(SCTP_PRIMARY_ADDR);
- set.add(SCTP_SET_PEER_PRIMARY_ADDR);
- set.add(SO_SNDBUF);
- set.add(SO_RCVBUF);
- set.add(SO_LINGER);
- return Collections.unmodifiableSet(set);
- }
- }
-
- @Override
- public final Set<SctpSocketOption<?>> supportedOptions() {
- return DefaultOptionsHolder.defaultOptions;
- }
-
- @Override
- public <T> MessageInfo receive(ByteBuffer buffer,
- T attachment,
- NotificationHandler<T> handler)
- throws IOException {
- if (buffer == null)
- throw new IllegalArgumentException("buffer cannot be null");
-
- if (buffer.isReadOnly())
- throw new IllegalArgumentException("Read-only buffer");
-
- if (receiveInvoked.get())
- throw new IllegalReceiveException(
- "cannot invoke receive from handler");
- receiveInvoked.set(Boolean.TRUE);
-
- try {
- SctpResultContainer resultContainer = new SctpResultContainer();
- do {
- resultContainer.clear();
- synchronized (receiveLock) {
- ensureOpen();
- if (!isBound())
- throw new NotYetBoundException();
-
- int n = 0;
- try {
- begin();
-
- synchronized (stateLock) {
- if(!isOpen())
- return null;
- receiverThread = NativeThread.current();
- }
-
- do {
- n = receive(fdVal, buffer, resultContainer);
- } while ((n == IOStatus.INTERRUPTED) && isOpen());
-
- } finally {
- receiverCleanup();
- end((n > 0) || (n == IOStatus.UNAVAILABLE));
- assert IOStatus.check(n);
- }
-
- if (!resultContainer.isNotification()) {
- /* message or nothing */
- if (resultContainer.hasSomething()) {
- /* Set the association before returning */
- SctpMessageInfoImpl info =
- resultContainer.getMessageInfo();
- info.setAssociation(lookupAssociation(info.
- associationID()));
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- InetSocketAddress isa = (InetSocketAddress)info.address();
- if (!addressMap.containsKey(isa)) {
- /* must be a new association */
- try {
- sm.checkAccept(isa.getAddress().getHostAddress(),
- isa.getPort());
- } catch (SecurityException se) {
- buffer.clear();
- throw se;
- }
- }
- }
-
- assert info.association() != null;
- return info;
- } else {
- /* Non-blocking may return null if nothing available*/
- return null;
- }
- } else { /* notification */
- synchronized (stateLock) {
- handleNotificationInternal(
- resultContainer);
- }
- }
- } /* receiveLock */
- } while (handler == null ? true :
- (invokeNotificationHandler(resultContainer, handler, attachment)
- == HandlerResult.CONTINUE));
- } finally {
- receiveInvoked.set(Boolean.FALSE);
- }
-
- return null;
- }
-
- private int receive(int fd,
- ByteBuffer dst,
- SctpResultContainer resultContainer)
- throws IOException {
- int pos = dst.position();
- int lim = dst.limit();
- assert (pos <= lim);
- int rem = (pos <= lim ? lim - pos : 0);
- if (dst instanceof DirectBuffer && rem > 0)
- return receiveIntoNativeBuffer(fd, resultContainer, dst, rem, pos);
-
- /* Substitute a native buffer. */
- int newSize = Math.max(rem, 1);
- ByteBuffer bb = Util.getTemporaryDirectBuffer(newSize);
- try {
- int n = receiveIntoNativeBuffer(fd, resultContainer, bb, newSize, 0);
- bb.flip();
- if (n > 0 && rem > 0)
- dst.put(bb);
- return n;
- } finally {
- Util.releaseTemporaryDirectBuffer(bb);
- }
- }
-
- private int receiveIntoNativeBuffer(int fd,
- SctpResultContainer resultContainer,
- ByteBuffer bb,
- int rem,
- int pos)
- throws IOException {
- int n = receive0(fd, resultContainer, ((DirectBuffer)bb).address() + pos, rem);
- if (n > 0)
- bb.position(pos + n);
- return n;
- }
-
- private InternalNotificationHandler internalNotificationHandler =
- new InternalNotificationHandler();
-
- private void handleNotificationInternal(SctpResultContainer resultContainer)
- {
- invokeNotificationHandler(resultContainer,
- internalNotificationHandler, null);
- }
-
- private class InternalNotificationHandler
- extends AbstractNotificationHandler<Object>
- {
- @Override
- public HandlerResult handleNotification(
- AssociationChangeNotification not, Object unused) {
- SctpAssocChange sac = (SctpAssocChange) not;
-
- /* Update map to reflect change in association */
- switch (not.event()) {
- case COMM_UP :
- Association newAssociation = new SctpAssociationImpl
- (sac.assocId(), sac.maxInStreams(), sac.maxOutStreams());
- addAssociation(newAssociation);
- break;
- case SHUTDOWN :
- case COMM_LOST :
- //case RESTART: ???
- /* mark association for removal after user handler invoked*/
- associationToRemove.set(lookupAssociation(sac.assocId()));
- }
- return HandlerResult.CONTINUE;
- }
- }
-
- private <T> HandlerResult invokeNotificationHandler(
- SctpResultContainer resultContainer,
- NotificationHandler<T> handler,
- T attachment) {
- HandlerResult result;
- SctpNotification notification = resultContainer.notification();
- notification.setAssociation(lookupAssociation(notification.assocId()));
-
- if (!(handler instanceof AbstractNotificationHandler)) {
- result = handler.handleNotification(notification, attachment);
- } else { /* AbstractNotificationHandler */
- AbstractNotificationHandler<T> absHandler =
- (AbstractNotificationHandler<T>)handler;
- switch(resultContainer.type()) {
- case ASSOCIATION_CHANGED :
- result = absHandler.handleNotification(
- resultContainer.getAssociationChanged(), attachment);
- break;
- case PEER_ADDRESS_CHANGED :
- result = absHandler.handleNotification(
- resultContainer.getPeerAddressChanged(), attachment);
- break;
- case SEND_FAILED :
- result = absHandler.handleNotification(
- resultContainer.getSendFailed(), attachment);
- break;
- case SHUTDOWN :
- result = absHandler.handleNotification(
- resultContainer.getShutdown(), attachment);
- break;
- default :
- /* implementation specific handlers */
- result = absHandler.handleNotification(
- resultContainer.notification(), attachment);
- }
- }
-
- if (!(handler instanceof InternalNotificationHandler)) {
- /* Only remove associations after user handler
- * has finished with them */
- Association assoc = associationToRemove.get();
- if (assoc != null) {
- removeAssociation(assoc);
- associationToRemove.set(null);
- }
-
- }
-
- return result;
- }
-
- private Association lookupAssociation(int assocId) {
- /* Lookup the association in our internal map */
- synchronized (stateLock) {
- Set<Association> assocs = associationMap.keySet();
- for (Association a : assocs) {
- if (a.associationID() == assocId) {
- return a;
- }
- }
- }
- return null;
- }
-
- private void addAssociation(Association association) {
- synchronized (stateLock) {
- int assocId = association.associationID();
- Set<SocketAddress> addresses = null;
-
- try {
- addresses = SctpNet.getRemoteAddresses(fdVal, assocId);
- } catch (IOException unused) {
- /* OK, determining connected addresses may not be possible
- * shutdown, connection lost, etc */
- }
-
- associationMap.put(association, addresses);
- if (addresses != null) {
- for (SocketAddress addr : addresses)
- addressMap.put(addr, association);
- }
- }
- }
-
- private void removeAssociation(Association association) {
- synchronized (stateLock) {
- int assocId = association.associationID();
- Set<SocketAddress> addresses = null;
-
- try {
- addresses = SctpNet.getRemoteAddresses(fdVal, assocId);
- } catch (IOException unused) {
- /* OK, determining connected addresses may not be possible
- * shutdown, connection lost, etc */
- }
-
- Set<Association> assocs = associationMap.keySet();
- for (Association a : assocs) {
- if (a.associationID() == assocId) {
- associationMap.remove(a);
- break;
- }
- }
- if (addresses != null) {
- for (SocketAddress addr : addresses)
- addressMap.remove(addr);
- } else {
- /* We cannot determine the connected addresses */
- Set<java.util.Map.Entry<SocketAddress, Association>> addrAssocs =
- addressMap.entrySet();
- Iterator<Entry<SocketAddress, Association>> iterator = addrAssocs.iterator();
- while (iterator.hasNext()) {
- Entry<SocketAddress, Association> entry = iterator.next();
- if (entry.getValue().equals(association)) {
- iterator.remove();
- }
- }
- }
- }
- }
-
- /**
- * @throws IllegalArgumentException
- * If the given association is not controlled by this channel
- *
- * @return {@code true} if, and only if, the given association is one
- * of the current associations controlled by this channel
- */
- private boolean checkAssociation(Association messageAssoc) {
- synchronized (stateLock) {
- for (Association association : associationMap.keySet()) {
- if (messageAssoc.equals(association)) {
- return true;
- }
- }
- }
- throw new IllegalArgumentException(
- "Given Association is not controlled by this channel");
- }
-
- private void checkStreamNumber(Association assoc, int streamNumber) {
- synchronized (stateLock) {
- if (streamNumber < 0 || streamNumber >= assoc.maxOutboundStreams())
- throw new InvalidStreamException();
- }
- }
-
- /* TODO: Add support for ttl and isComplete to both 121 12M
- * SCTP_EOR not yet supported on reference platforms
- * TTL support limited...
- */
- @Override
- public int send(ByteBuffer buffer, MessageInfo messageInfo)
- throws IOException {
- if (buffer == null)
- throw new IllegalArgumentException("buffer cannot be null");
-
- if (messageInfo == null)
- throw new IllegalArgumentException("messageInfo cannot be null");
-
- synchronized (sendLock) {
- ensureOpen();
-
- if (!isBound())
- bind(null, 0);
-
- int n = 0;
- try {
- int assocId = -1;
- SocketAddress address = null;
- begin();
-
- synchronized (stateLock) {
- if(!isOpen())
- return 0;
- senderThread = NativeThread.current();
-
- /* Determine what address or association to send to */
- Association assoc = messageInfo.association();
- InetSocketAddress addr = (InetSocketAddress)messageInfo.address();
- if (assoc != null) {
- checkAssociation(assoc);
- checkStreamNumber(assoc, messageInfo.streamNumber());
- assocId = assoc.associationID();
- /* have we also got a preferred address */
- if (addr != null) {
- if (!assoc.equals(addressMap.get(addr)))
- throw new IllegalArgumentException("given preferred address is not part of this association");
- address = addr;
- }
- } else if (addr != null) {
- address = addr;
- Association association = addressMap.get(addr);
- if (association != null) {
- checkStreamNumber(association, messageInfo.streamNumber());
- assocId = association.associationID();
-
- } else { /* must be new association */
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkConnect(addr.getAddress().getHostAddress(),
- addr.getPort());
- }
- } else {
- throw new AssertionError(
- "Both association and address cannot be null");
- }
- }
-
- do {
- n = send(fdVal, buffer, assocId, address, messageInfo);
- } while ((n == IOStatus.INTERRUPTED) && isOpen());
-
- return IOStatus.normalize(n);
- } finally {
- senderCleanup();
- end((n > 0) || (n == IOStatus.UNAVAILABLE));
- assert IOStatus.check(n);
- }
- }
- }
-
- private int send(int fd,
- ByteBuffer src,
- int assocId,
- SocketAddress target,
- MessageInfo messageInfo)
- throws IOException {
- int streamNumber = messageInfo.streamNumber();
- boolean unordered = messageInfo.isUnordered();
- int ppid = messageInfo.payloadProtocolID();
-
- if (src instanceof DirectBuffer)
- return sendFromNativeBuffer(fd, src, target, assocId,
- streamNumber, unordered, ppid);
-
- /* Substitute a native buffer */
- int pos = src.position();
- int lim = src.limit();
- assert (pos <= lim && streamNumber >= 0);
-
- int rem = (pos <= lim ? lim - pos : 0);
- ByteBuffer bb = Util.getTemporaryDirectBuffer(rem);
- try {
- bb.put(src);
- bb.flip();
- /* Do not update src until we see how many bytes were written */
- src.position(pos);
-
- int n = sendFromNativeBuffer(fd, bb, target, assocId,
- streamNumber, unordered, ppid);
- if (n > 0) {
- /* now update src */
- src.position(pos + n);
- }
- return n;
- } finally {
- Util.releaseTemporaryDirectBuffer(bb);
- }
- }
-
- private int sendFromNativeBuffer(int fd,
- ByteBuffer bb,
- SocketAddress target,
- int assocId,
- int streamNumber,
- boolean unordered,
- int ppid)
- throws IOException {
- int pos = bb.position();
- int lim = bb.limit();
- assert (pos <= lim);
- int rem = (pos <= lim ? lim - pos : 0);
-
- int written = send0(fd, ((DirectBuffer)bb).address() + pos,
- rem, target, assocId, streamNumber, unordered, ppid);
- if (written > 0)
- bb.position(pos + written);
- return written;
- }
-
- @Override
- public SctpMultiChannel shutdown(Association association)
- throws IOException {
- synchronized (stateLock) {
- checkAssociation(association);
- if (!isOpen())
- throw new ClosedChannelException();
-
- SctpNet.shutdown(fdVal, association.associationID());
- }
- return this;
- }
-
- @Override
- public Set<SocketAddress> getAllLocalAddresses()
- throws IOException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- return Collections.emptySet();
-
- return SctpNet.getLocalAddresses(fdVal);
- }
- }
-
- @Override
- public Set<SocketAddress> getRemoteAddresses(Association association)
- throws IOException {
- synchronized (stateLock) {
- checkAssociation(association);
- if (!isOpen())
- throw new ClosedChannelException();
-
- try {
- return SctpNet.getRemoteAddresses(fdVal, association.associationID());
- } catch (SocketException se) {
- /* a valid association should always have remote addresses */
- Set<SocketAddress> addrs = associationMap.get(association);
- return addrs != null ? addrs : Collections.<SocketAddress>emptySet();
- }
- }
- }
-
- @Override
- public SctpChannel branch(Association association)
- throws IOException {
- synchronized (stateLock) {
- checkAssociation(association);
- if (!isOpen())
- throw new ClosedChannelException();
-
- FileDescriptor bFd = SctpNet.branch(fdVal,
- association.associationID());
- /* successfully branched, we can now remove it from assoc list */
- removeAssociation(association);
-
- return new SctpChannelImpl(provider(), bFd, association);
- }
- }
-
- /* Use common native implementation shared between
- * one-to-one and one-to-many */
- private static int receive0(int fd,
- SctpResultContainer resultContainer,
- long address,
- int length)
- throws IOException{
- return SctpChannelImpl.receive0(fd, resultContainer, address,
- length, false /*peek */);
- }
-
- private static int send0(int fd,
- long address,
- int length,
- SocketAddress target,
- int assocId,
- int streamNumber,
- boolean unordered,
- int ppid)
- throws IOException {
- return SctpChannelImpl.send0(fd, address, length, target, assocId,
- streamNumber, unordered, ppid);
- }
-
- static {
- Util.load(); /* loads nio & net native libraries */
- java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("sctp"));
- }
-}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java b/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java
deleted file mode 100644
index a275c99..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.nio.channels.AlreadyBoundException;
-import java.util.Set;
-import java.util.HashSet;
-import java.security.AccessController;
-import sun.security.action.GetPropertyAction;
-import com.sun.nio.sctp.SctpSocketOption;
-import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
-
-public class SctpNet {
- static final String osName = AccessController.doPrivileged(
- new GetPropertyAction("os.name"));
-
- /* -- Miscellaneous SCTP utilities -- */
-
- private static boolean IPv4MappedAddresses() {
- if ("SunOS".equals(osName)) {
- /* Solaris supports IPv4Mapped Addresses with bindx */
- return true;
- } /* else { //other OS/implementations */
-
- /* lksctp/linux requires Ipv4 addresses */
- return false;
- }
-
- static boolean throwAlreadyBoundException() throws IOException {
- throw new AlreadyBoundException();
- }
-
- static void listen(int fd, int backlog) throws IOException {
- listen0(fd, backlog);
- }
-
- static int connect(int fd, InetAddress remote, int remotePort)
- throws IOException {
- return connect0(fd, remote, remotePort);
- }
-
- static void close(int fd) throws IOException {
- close0(fd);
- }
-
- static void preClose(int fd) throws IOException {
- preClose0(fd);
- }
-
- /**
- * @param oneToOne
- * if {@code true} returns a one-to-one sctp socket, otherwise
- * returns a one-to-many sctp socket
- */
- static FileDescriptor socket(boolean oneToOne) throws IOException {
- int nativefd = socket0(oneToOne);
- return IOUtil.newFD(nativefd);
- }
-
- static void bindx(int fd, InetAddress[] addrs, int port, boolean add)
- throws IOException {
- bindx(fd, addrs, port, addrs.length, add,
- IPv4MappedAddresses());
- }
-
- static Set<SocketAddress> getLocalAddresses(int fd)
- throws IOException {
- HashSet<SocketAddress> set = null;
- SocketAddress[] saa = getLocalAddresses0(fd);
-
- if (saa != null) {
- set = new HashSet<SocketAddress>(saa.length);
- for (SocketAddress sa : saa)
- set.add(sa);
- }
-
- return set;
- }
-
- static Set<SocketAddress> getRemoteAddresses(int fd, int assocId)
- throws IOException {
- HashSet<SocketAddress> set = null;
- SocketAddress[] saa = getRemoteAddresses0(fd, assocId);
-
- if (saa != null) {
- set = new HashSet<SocketAddress>(saa.length);
- for (SocketAddress sa : saa)
- set.add(sa);
- }
-
- return set;
- }
-
- static <T> void setSocketOption(int fd,
- SctpSocketOption<T> name,
- T value,
- int assocId)
- throws IOException {
- if (value == null)
- throw new IllegalArgumentException("Invalid option value");
-
- if (name.equals(SCTP_INIT_MAXSTREAMS)) {
- InitMaxStreams maxStreamValue = (InitMaxStreams)value;
- SctpNet.setInitMsgOption0(fd,
- maxStreamValue.maxInStreams(), maxStreamValue.maxOutStreams());
- } else if (name.equals(SCTP_PRIMARY_ADDR) ||
- name.equals(SCTP_SET_PEER_PRIMARY_ADDR)) {
-
- SocketAddress addr = (SocketAddress) value;
- if (addr == null)
- throw new IllegalArgumentException("Invalid option value");
-
- Net.checkAddress(addr);
- InetSocketAddress netAddr = (InetSocketAddress)addr;
-
- if (name.equals(SCTP_PRIMARY_ADDR)) {
- setPrimAddrOption0(fd,
- assocId,
- netAddr.getAddress(),
- netAddr.getPort());
- } else {
- setPeerPrimAddrOption0(fd,
- assocId,
- netAddr.getAddress(),
- netAddr.getPort(),
- IPv4MappedAddresses());
- }
- } else if (name.equals(SCTP_DISABLE_FRAGMENTS) ||
- name.equals(SCTP_EXPLICIT_COMPLETE) ||
- name.equals(SCTP_FRAGMENT_INTERLEAVE) ||
- name.equals(SCTP_NODELAY) ||
- name.equals(SO_SNDBUF) ||
- name.equals(SO_RCVBUF) ||
- name.equals(SO_LINGER)) {
- setIntOption(fd, name, value);
- } else {
- throw new AssertionError("Unknown socket option");
- }
- }
-
- static Object getSocketOption(int fd, SctpSocketOption<?> name, int assocId)
- throws IOException {
- if (name.equals(SCTP_SET_PEER_PRIMARY_ADDR)) {
- throw new IllegalArgumentException(
- "SCTP_SET_PEER_PRIMARY_ADDR cannot be retrieved");
- } else if (name.equals(SCTP_INIT_MAXSTREAMS)) {
- /* container for holding maxIn/Out streams */
- int[] values = new int[2];
- SctpNet.getInitMsgOption0(fd, values);
- return InitMaxStreams.create(values[0], values[1]);
- } else if (name.equals(SCTP_PRIMARY_ADDR)) {
- return getPrimAddrOption0(fd, assocId);
- } else if (name.equals(SCTP_DISABLE_FRAGMENTS) ||
- name.equals(SCTP_EXPLICIT_COMPLETE) ||
- name.equals(SCTP_FRAGMENT_INTERLEAVE) ||
- name.equals(SCTP_NODELAY) ||
- name.equals(SO_SNDBUF) ||
- name.equals(SO_RCVBUF) ||
- name.equals(SO_LINGER)) {
- return getIntOption(fd, name);
- } else {
- throw new AssertionError("Unknown socket option");
- }
- }
-
- static void setIntOption(int fd, SctpSocketOption<?> name, Object value)
- throws IOException {
- if (value == null)
- throw new IllegalArgumentException("Invalid option value");
-
- Class<?> type = name.type();
- if (type != Integer.class && type != Boolean.class)
- throw new AssertionError("Should not reach here");
-
- if (name == SO_RCVBUF ||
- name == SO_SNDBUF)
- {
- int i = ((Integer)value).intValue();
- if (i < 0)
- throw new IllegalArgumentException(
- "Invalid send/receive buffer size");
- } else if (name == SO_LINGER) {
- int i = ((Integer)value).intValue();
- if (i < 0)
- value = Integer.valueOf(-1);
- if (i > 65535)
- value = Integer.valueOf(65535);
- } else if (name.equals(SCTP_FRAGMENT_INTERLEAVE)) {
- int i = ((Integer)value).intValue();
- if (i < 0 || i > 2)
- throw new IllegalArgumentException(
- "Invalid value for SCTP_FRAGMENT_INTERLEAVE");
- }
-
- int arg;
- if (type == Integer.class) {
- arg = ((Integer)value).intValue();
- } else {
- boolean b = ((Boolean)value).booleanValue();
- arg = (b) ? 1 : 0;
- }
-
- setIntOption0(fd, ((SctpStdSocketOption)name).constValue(), arg);
- }
-
- static Object getIntOption(int fd, SctpSocketOption<?> name)
- throws IOException {
- Class<?> type = name.type();
-
- if (type != Integer.class && type != Boolean.class)
- throw new AssertionError("Should not reach here");
-
- if (!(name instanceof SctpStdSocketOption))
- throw new AssertionError("Should not reach here");
-
- int value = getIntOption0(fd,
- ((SctpStdSocketOption)name).constValue());
-
- if (type == Integer.class) {
- return Integer.valueOf(value);
- } else {
- return (value == 0) ? Boolean.FALSE : Boolean.TRUE;
- }
- }
-
- static void shutdown(int fd, int assocId)
- throws IOException {
- shutdown0(fd, assocId);
- }
-
- static FileDescriptor branch(int fd, int assocId) throws IOException {
- int nativefd = branch0(fd, assocId);
- return IOUtil.newFD(nativefd);
- }
-
- /* Native Methods */
- static native int socket0(boolean oneToOne) throws IOException;
-
- static native void listen0(int fd, int backlog) throws IOException;
-
- static native int connect0(int fd, InetAddress remote, int remotePort)
- throws IOException;
-
- static native void close0(int fd) throws IOException;
-
- static native void preClose0(int fd) throws IOException;
-
- static native void bindx(int fd, InetAddress[] addrs, int port, int length,
- boolean add, boolean preferIPv6) throws IOException;
-
- static native int getIntOption0(int fd, int opt) throws IOException;
-
- static native void setIntOption0(int fd, int opt, int arg)
- throws IOException;
-
- static native SocketAddress[] getLocalAddresses0(int fd) throws IOException;
-
- static native SocketAddress[] getRemoteAddresses0(int fd, int assocId)
- throws IOException;
-
- static native int branch0(int fd, int assocId) throws IOException;
-
- static native void setPrimAddrOption0(int fd, int assocId, InetAddress ia,
- int port) throws IOException;
-
- static native void setPeerPrimAddrOption0(int fd, int assocId,
- InetAddress ia, int port, boolean preferIPv6) throws IOException;
-
- static native SocketAddress getPrimAddrOption0(int fd, int assocId)
- throws IOException;
-
- /* retVals [0] maxInStreams, [1] maxOutStreams */
- static native void getInitMsgOption0(int fd, int[] retVals) throws IOException;
-
- static native void setInitMsgOption0(int fd, int arg1, int arg2)
- throws IOException;
-
- static native void shutdown0(int fd, int assocId);
-
- static native void init();
-
- static {
- init();
- }
-}
-
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpNotification.java b/jdk/src/solaris/classes/sun/nio/ch/SctpNotification.java
deleted file mode 100644
index d35ea80..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpNotification.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.Notification;
-
-/**
- * All Notification implemenations MUST implement this interface to provide
- * access to the native association identidier.
- */
-interface SctpNotification extends Notification {
- int assocId();
- void setAssociation(Association association);
-}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java b/jdk/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java
deleted file mode 100644
index 1b89f63..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpPeerAddrChange.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.SocketAddress;
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.PeerAddressChangeNotification;
-
-/**
- * An implementation of PeerAddressChangeNotification
- */
-public class SctpPeerAddrChange extends PeerAddressChangeNotification
- implements SctpNotification
-{
- /* static final ints so that they can be referenced from native */
- private final static int SCTP_ADDR_AVAILABLE = 1;
- private final static int SCTP_ADDR_UNREACHABLE = 2;
- private final static int SCTP_ADDR_REMOVED = 3;
- private final static int SCTP_ADDR_ADDED = 4;
- private final static int SCTP_ADDR_MADE_PRIM = 5;
- private final static int SCTP_ADDR_CONFIRMED =6;
-
- private Association association;
-
- /* assocId is used to lookup the association before the notification is
- * returned to user code */
- private int assocId;
- private SocketAddress address;
- private AddressChangeEvent event;
-
- /* Invoked from native */
- private SctpPeerAddrChange(int assocId, SocketAddress address, int intEvent) {
- switch (intEvent) {
- case SCTP_ADDR_AVAILABLE :
- this.event = AddressChangeEvent.ADDR_AVAILABLE;
- break;
- case SCTP_ADDR_UNREACHABLE :
- this.event = AddressChangeEvent.ADDR_UNREACHABLE;
- break;
- case SCTP_ADDR_REMOVED :
- this.event = AddressChangeEvent.ADDR_REMOVED;
- break;
- case SCTP_ADDR_ADDED :
- this.event = AddressChangeEvent.ADDR_ADDED;
- break;
- case SCTP_ADDR_MADE_PRIM :
- this.event = AddressChangeEvent.ADDR_MADE_PRIMARY;
- break;
- case SCTP_ADDR_CONFIRMED :
- this.event = AddressChangeEvent.ADDR_CONFIRMED;
- break;
- default:
- throw new AssertionError("Unknown event type");
- }
- this.assocId = assocId;
- this.address = address;
- }
-
- @Override
- public int assocId() {
- return assocId;
- }
-
- @Override
- public void setAssociation(Association association) {
- this.association = association;
- }
-
- @Override
- public SocketAddress address() {
- assert address != null;
- return address;
- }
-
- @Override
- public Association association() {
- assert association != null;
- return association;
- }
-
- @Override
- public AddressChangeEvent event() {
- assert event != null;
- return event;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(super.toString()).append(" [");
- sb.append("Address: ").append(address);
- sb.append(", Association:").append(association);
- sb.append(", Event: ").append(event).append("]");
- return sb.toString();
- }
-}
-
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpResultContainer.java b/jdk/src/solaris/classes/sun/nio/ch/SctpResultContainer.java
deleted file mode 100644
index f6c09d3..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpResultContainer.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-/**
- * Wraps the actual message or notification so that it can be
- * set and returned from the native receive implementation.
- */
-public class SctpResultContainer {
- /* static final ints so that they can be referenced from native */
- static final int NOTHING = 0;
- static final int MESSAGE = 1;
- static final int SEND_FAILED = 2;
- static final int ASSOCIATION_CHANGED = 3;
- static final int PEER_ADDRESS_CHANGED = 4;
- static final int SHUTDOWN = 5;
-
- private Object value;
- private int type;
-
- int type() {
- return type;
- }
-
- boolean hasSomething() {
- return type() != NOTHING;
- }
-
- boolean isNotification() {
- return type() != MESSAGE && type() != NOTHING ? true : false;
- }
-
- void clear() {
- type = NOTHING;
- value = null;
- }
-
- SctpNotification notification() {
- assert type() != MESSAGE && type() != NOTHING;
-
- return (SctpNotification) value;
- }
-
- SctpMessageInfoImpl getMessageInfo() {
- assert type() == MESSAGE;
-
- if (value instanceof SctpMessageInfoImpl)
- return (SctpMessageInfoImpl) value;
-
- return null;
- }
-
- SctpSendFailed getSendFailed() {
- assert type() == SEND_FAILED;
-
- if (value instanceof SctpSendFailed)
- return (SctpSendFailed) value;
-
- return null;
- }
-
- SctpAssocChange getAssociationChanged() {
- assert type() == ASSOCIATION_CHANGED;
-
- if (value instanceof SctpAssocChange)
- return (SctpAssocChange) value;
-
- return null;
- }
-
- SctpPeerAddrChange getPeerAddressChanged() {
- assert type() == PEER_ADDRESS_CHANGED;
-
- if (value instanceof SctpPeerAddrChange)
- return (SctpPeerAddrChange) value;
-
- return null;
- }
-
- SctpShutdown getShutdown() {
- assert type() == SHUTDOWN;
-
- if (value instanceof SctpShutdown)
- return (SctpShutdown) value;
-
- return null;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("Type: ");
- switch (type) {
- case NOTHING: sb.append("NOTHING"); break;
- case MESSAGE: sb.append("MESSAGE"); break;
- case SEND_FAILED: sb.append("SEND FAILED"); break;
- case ASSOCIATION_CHANGED: sb.append("ASSOCIATION CHANGE"); break;
- case PEER_ADDRESS_CHANGED: sb.append("PEER ADDRESS CHANGE"); break;
- case SHUTDOWN: sb.append("SHUTDOWN"); break;
- default : sb.append("Unknown result type");
- }
- sb.append(", Value: ");
- sb.append((value == null) ? "null" : value.toString());
- return sb.toString();
- }
-}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpSendFailed.java b/jdk/src/solaris/classes/sun/nio/ch/SctpSendFailed.java
deleted file mode 100644
index ff71bdf..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpSendFailed.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.nio.ByteBuffer;
-import java.net.SocketAddress;
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.SendFailedNotification;
-
-/**
- * An implementation of SendFailedNotification
- */
-public class SctpSendFailed extends SendFailedNotification
- implements SctpNotification
-{
- private Association association;
- /* assocId is used to lookup the association before the notification is
- * returned to user code */
- private int assocId;
- private SocketAddress address;
- private ByteBuffer buffer;
- private int errorCode;
- private int streamNumber;
-
- /* Invoked from native */
- private SctpSendFailed(int assocId,
- SocketAddress address,
- ByteBuffer buffer,
- int errorCode,
- int streamNumber) {
- this.assocId = assocId;
- this.errorCode = errorCode;
- this.streamNumber = streamNumber;
- this.address = address;
- this.buffer = buffer;
- }
-
- @Override
- public int assocId() {
- return assocId;
- }
-
- @Override
- public void setAssociation(Association association) {
- this.association = association;
- }
-
- @Override
- public Association association() {
- /* may be null */
- return association;
- }
-
- @Override
- public SocketAddress address() {
- assert address != null;
- return address;
- }
-
- @Override
- public ByteBuffer buffer() {
- assert buffer != null;
- return buffer;
- }
-
- @Override
- public int errorCode() {
- return errorCode;
- }
-
- @Override
- public int streamNumber() {
- return streamNumber;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(super.toString()).append(" [");
- sb.append("Association:").append(association);
- sb.append(", Address: ").append(address);
- sb.append(", buffer: ").append(buffer);
- sb.append(", errorCode: ").append(errorCode);
- sb.append(", streamNumber: ").append(streamNumber);
- sb.append("]");
- return sb.toString();
- }
-}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java b/jdk/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java
deleted file mode 100644
index 85a2d73..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpServerChannelImpl.java
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.SocketAddress;
-import java.net.InetSocketAddress;
-import java.net.InetAddress;
-import java.io.FileDescriptor;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.Set;
-import java.util.HashSet;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.NotYetBoundException;
-import java.nio.channels.spi.SelectorProvider;
-import com.sun.nio.sctp.IllegalUnbindException;
-import com.sun.nio.sctp.SctpChannel;
-import com.sun.nio.sctp.SctpServerChannel;
-import com.sun.nio.sctp.SctpSocketOption;
-import com.sun.nio.sctp.SctpStandardSocketOptions;
-
-/**
- * An implementation of SctpServerChannel
- */
-public class SctpServerChannelImpl extends SctpServerChannel
- implements SelChImpl
-{
- private final FileDescriptor fd;
-
- private final int fdVal;
-
- /* IDs of native thread doing accept, for signalling */
- private volatile long thread = 0;
-
- /* Lock held by thread currently blocked in this channel */
- private final Object lock = new Object();
-
- /* Lock held by any thread that modifies the state fields declared below
- * DO NOT invoke a blocking I/O operation while holding this lock! */
- private final Object stateLock = new Object();
-
- private enum ChannelState {
- UNINITIALIZED,
- INUSE,
- KILLPENDING,
- KILLED,
- }
- /* -- The following fields are protected by stateLock -- */
- private ChannelState state = ChannelState.UNINITIALIZED;
-
- /* Binding: Once bound the port will remain constant. */
- int port = -1;
- private HashSet<InetSocketAddress> localAddresses = new HashSet<InetSocketAddress>();
- /* Has the channel been bound to the wildcard address */
- private boolean wildcard; /* false */
-
- /* -- End of fields protected by stateLock -- */
-
- /**
- * Initializes a new instance of this class.
- */
- public SctpServerChannelImpl(SelectorProvider provider)
- throws IOException {
- //TODO: update provider remove public modifier
- super(provider);
- this.fd = SctpNet.socket(true);
- this.fdVal = IOUtil.fdVal(fd);
- this.state = ChannelState.INUSE;
- }
-
- @Override
- public SctpServerChannel bind(SocketAddress local, int backlog)
- throws IOException {
- synchronized (lock) {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (isBound())
- SctpNet.throwAlreadyBoundException();
-
- InetSocketAddress isa = (local == null) ?
- new InetSocketAddress(0) : Net.checkAddress(local);
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkListen(isa.getPort());
- Net.bind(fd, isa.getAddress(), isa.getPort());
-
- InetSocketAddress boundIsa = Net.localAddress(fd);
- port = boundIsa.getPort();
- localAddresses.add(isa);
- if (isa.getAddress().isAnyLocalAddress())
- wildcard = true;
-
- SctpNet.listen(fdVal, backlog < 1 ? 50 : backlog);
- }
- }
- return this;
- }
-
- @Override
- public SctpServerChannel bindAddress(InetAddress address)
- throws IOException {
- return bindUnbindAddress(address, true);
- }
-
- @Override
- public SctpServerChannel unbindAddress(InetAddress address)
- throws IOException {
- return bindUnbindAddress(address, false);
- }
-
- private SctpServerChannel bindUnbindAddress(InetAddress address, boolean add)
- throws IOException {
- if (address == null)
- throw new IllegalArgumentException();
-
- synchronized (lock) {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- throw new NotYetBoundException();
- if (wildcard)
- throw new IllegalStateException(
- "Cannot add or remove addresses from a channel that is bound to the wildcard address");
- if (address.isAnyLocalAddress())
- throw new IllegalArgumentException(
- "Cannot add or remove the wildcard address");
- if (add) {
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- SctpNet.throwAlreadyBoundException();
- }
- }
- } else { /*removing */
- /* Verify that there is more than one address
- * and that address is already bound */
- if (localAddresses.size() <= 1)
- throw new IllegalUnbindException("Cannot remove address from a channel with only one address bound");
- boolean foundAddress = false;
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- foundAddress = true;
- break;
- }
- }
- if (!foundAddress )
- throw new IllegalUnbindException("Cannot remove address from a channel that is not bound to that address");
- }
-
- SctpNet.bindx(fdVal, new InetAddress[]{address}, port, add);
-
- /* Update our internal Set to reflect the addition/removal */
- if (add)
- localAddresses.add(new InetSocketAddress(address, port));
- else {
- for (InetSocketAddress addr : localAddresses) {
- if (addr.getAddress().equals(address)) {
- localAddresses.remove(addr);
- break;
- }
- }
- }
- }
- }
- return this;
- }
-
- private boolean isBound() {
- synchronized (stateLock) {
- return port == -1 ? false : true;
- }
- }
-
- private void acceptCleanup() throws IOException {
- synchronized (stateLock) {
- thread = 0;
- if (state == ChannelState.KILLPENDING)
- kill();
- }
- }
-
- @Override
- public SctpChannel accept() throws IOException {
- synchronized (lock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- throw new NotYetBoundException();
- SctpChannel sc = null;
-
- int n = 0;
- FileDescriptor newfd = new FileDescriptor();
- InetSocketAddress[] isaa = new InetSocketAddress[1];
-
- try {
- begin();
- if (!isOpen())
- return null;
- thread = NativeThread.current();
- for (;;) {
- n = accept0(fd, newfd, isaa);
- if ((n == IOStatus.INTERRUPTED) && isOpen())
- continue;
- break;
- }
- } finally {
- acceptCleanup();
- end(n > 0);
- assert IOStatus.check(n);
- }
-
- if (n < 1)
- return null;
-
- IOUtil.configureBlocking(newfd, true);
- InetSocketAddress isa = isaa[0];
- sc = new SctpChannelImpl(provider(), newfd);
-
- SecurityManager sm = System.getSecurityManager();
- if (sm != null)
- sm.checkAccept(isa.getAddress().getHostAddress(),
- isa.getPort());
-
- return sc;
- }
- }
-
- @Override
- protected void implConfigureBlocking(boolean block) throws IOException {
- IOUtil.configureBlocking(fd, block);
- }
-
- @Override
- public void implCloseSelectableChannel() throws IOException {
- synchronized (stateLock) {
- SctpNet.preClose(fdVal);
- if (thread != 0)
- NativeThread.signal(thread);
- if (!isRegistered())
- kill();
- }
- }
-
- @Override
- public void kill() throws IOException {
- synchronized (stateLock) {
- if (state == ChannelState.KILLED)
- return;
- if (state == ChannelState.UNINITIALIZED) {
- state = ChannelState.KILLED;
- return;
- }
- assert !isOpen() && !isRegistered();
-
- // Postpone the kill if there is a thread in accept
- if (thread == 0) {
- SctpNet.close(fdVal);
- state = ChannelState.KILLED;
- } else {
- state = ChannelState.KILLPENDING;
- }
- }
- }
-
- @Override
- public FileDescriptor getFD() {
- return fd;
- }
-
- @Override
- public int getFDVal() {
- return fdVal;
- }
-
- /**
- * Translates native poll revent ops into a ready operation ops
- */
- private boolean translateReadyOps(int ops, int initialOps,
- SelectionKeyImpl sk) {
- int intOps = sk.nioInterestOps();
- int oldOps = sk.nioReadyOps();
- int newOps = initialOps;
-
- if ((ops & PollArrayWrapper.POLLNVAL) != 0) {
- /* This should only happen if this channel is pre-closed while a
- * selection operation is in progress
- * ## Throw an error if this channel has not been pre-closed */
- return false;
- }
-
- if ((ops & (PollArrayWrapper.POLLERR
- | PollArrayWrapper.POLLHUP)) != 0) {
- newOps = intOps;
- sk.nioReadyOps(newOps);
- return (newOps & ~oldOps) != 0;
- }
-
- if (((ops & PollArrayWrapper.POLLIN) != 0) &&
- ((intOps & SelectionKey.OP_ACCEPT) != 0))
- newOps |= SelectionKey.OP_ACCEPT;
-
- sk.nioReadyOps(newOps);
- return (newOps & ~oldOps) != 0;
- }
-
- @Override
- public boolean translateAndUpdateReadyOps(int ops, SelectionKeyImpl sk) {
- return translateReadyOps(ops, sk.nioReadyOps(), sk);
- }
-
- @Override
- public boolean translateAndSetReadyOps(int ops, SelectionKeyImpl sk) {
- return translateReadyOps(ops, 0, sk);
- }
-
- @Override
- public void translateAndSetInterestOps(int ops, SelectionKeyImpl sk) {
- int newOps = 0;
-
- /* Translate ops */
- if ((ops & SelectionKey.OP_ACCEPT) != 0)
- newOps |= PollArrayWrapper.POLLIN;
- /* Place ops into pollfd array */
- sk.selector.putEventOps(sk, newOps);
-
- }
-
- @Override
- public <T> SctpServerChannel setOption(SctpSocketOption<T> name, T value)
- throws IOException {
- if (name == null)
- throw new NullPointerException();
- if (!supportedOptions().contains(name))
- throw new UnsupportedOperationException("'" + name + "' not supported");
-
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
-
- SctpNet.setSocketOption(fdVal, name, value, 0 /*oneToOne*/);
- return this;
- }
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public <T> T getOption(SctpSocketOption<T> name) throws IOException {
- if (name == null)
- throw new NullPointerException();
- if (!supportedOptions().contains(name))
- throw new UnsupportedOperationException("'" + name + "' not supported");
-
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
-
- return (T) SctpNet.getSocketOption(fdVal, name, 0 /*oneToOne*/);
- }
- }
-
- private static class DefaultOptionsHolder {
- static final Set<SctpSocketOption<?>> defaultOptions = defaultOptions();
-
- private static Set<SctpSocketOption<?>> defaultOptions() {
- HashSet<SctpSocketOption<?>> set = new HashSet<SctpSocketOption<?>>(1);
- set.add(SctpStandardSocketOptions.SCTP_INIT_MAXSTREAMS);
- return Collections.unmodifiableSet(set);
- }
- }
-
- @Override
- public final Set<SctpSocketOption<?>> supportedOptions() {
- return DefaultOptionsHolder.defaultOptions;
- }
-
- @Override
- public Set<SocketAddress> getAllLocalAddresses()
- throws IOException {
- synchronized (stateLock) {
- if (!isOpen())
- throw new ClosedChannelException();
- if (!isBound())
- return Collections.emptySet();
-
- return SctpNet.getLocalAddresses(fdVal);
- }
- }
-
- /* Native */
- private static native void initIDs();
-
- private static native int accept0(FileDescriptor ssfd,
- FileDescriptor newfd, InetSocketAddress[] isaa) throws IOException;
-
- static {
- Util.load(); // loads nio & net native libraries
- java.security.AccessController.doPrivileged(
- new sun.security.action.LoadLibraryAction("sctp"));
- initIDs();
- }
-}
diff --git a/jdk/src/solaris/classes/sun/nio/ch/SctpShutdown.java b/jdk/src/solaris/classes/sun/nio/ch/SctpShutdown.java
deleted file mode 100644
index 9da2375..0000000
--- a/jdk/src/solaris/classes/sun/nio/ch/SctpShutdown.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.ShutdownNotification;
-
-/**
- * An implementation of ShutdownNotification
- */
-public class SctpShutdown extends ShutdownNotification
- implements SctpNotification
-{
- private Association association;
- /* assocId is used to lookup the association before the notification is
- * returned to user code */
- private int assocId;
-
- /* Invoked from native */
- private SctpShutdown(int assocId) {
- this.assocId = assocId;
- }
-
- @Override
- public int assocId() {
- return assocId;
- }
-
- @Override
- public void setAssociation(Association association) {
- this.association = association;
- }
-
- @Override
- public Association association() {
- assert association != null;
- return association;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(super.toString()).append(" [");
- sb.append("Association:").append(association).append("]");
- return sb.toString();
- }
-}
diff --git a/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java b/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
index 75a4536..2605e1d 100644
--- a/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
+++ b/jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java
@@ -68,6 +68,8 @@ public class DefaultFileSystemProvider {
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
if (osname.equals("Linux"))
return createProvider("sun.nio.fs.LinuxFileSystemProvider");
+ if (osname.equals("Darwin") || osname.startsWith("Mac OS X"))
+ return createProvider("sun.nio.fs.BsdFileSystemProvider");
throw new AssertionError("Platform not recognized");
}
}
diff --git a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
index e607659..c1de9bc 100644
--- a/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
+++ b/jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java
@@ -119,7 +119,8 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
}
static boolean isBSD() {
- return osname.equals("Linux");
+ return (osname.equals("Linux") ||
+ osname.startsWith("Mac OS X"));
}
static final int UNINITIALIZED = -1;
@@ -134,8 +135,8 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
};
String[] lpcAllCom = {
- "/usr/sbin/lpc status | grep : | sed -e 's/://'",
- "/usr/sbin/lpc -a status | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort"
+ "/usr/sbin/lpc status all | grep : | sed -e 's/://'",
+ "/usr/sbin/lpc status all | grep -E '^[ 0-9a-zA-Z_-]*@' | awk -F'@' '{print $1}' | sort"
};
String[] lpcNameCom = {
@@ -145,7 +146,7 @@ public class UnixPrintServiceLookup extends PrintServiceLookup
static int getBSDCommandIndex() {
- String command = "/usr/sbin/lpc status";
+ String command = "/usr/sbin/lpc status all";
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
diff --git a/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java b/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java
index 29ff54c..d6197b9 100644
--- a/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java
+++ b/jdk/src/solaris/classes/sun/security/smartcardio/PlatformPCSC.java
@@ -50,6 +50,7 @@ class PlatformPCSC {
private final static String LIB1 = "/usr/$LIBISA/libpcsclite.so";
private final static String LIB2 = "/usr/local/$LIBISA/libpcsclite.so";
+ private final static String PCSC_FRAMEWORK = "/System/Library/Frameworks/PCSC.framework/Versions/Current/PCSC";
PlatformPCSC() {
// empty
@@ -113,6 +114,11 @@ class PlatformPCSC {
// if LIB2 exists, use that
return lib;
}
+ lib = PCSC_FRAMEWORK;
+ if (new File(lib).isFile()) {
+ // if PCSC.framework exists, use that
+ return lib;
+ }
throw new IOException("No PC/SC library found on this system");
}
diff --git a/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java b/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java
index 632089e..4bf55cd 100644
--- a/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java
+++ b/jdk/src/solaris/classes/sun/tools/attach/LinuxVirtualMachine.java
@@ -37,8 +37,12 @@ import java.util.Properties;
* Linux implementation of HotSpotVirtualMachine
*/
public class LinuxVirtualMachine extends HotSpotVirtualMachine {
- // temp directory for socket file
- private static final String tmpdir = System.getProperty("java.io.tmpdir");
+ // "/tmp" is used as a global well-known location for the files
+ // .java_pid<pid>. and .attach_pid<pid>. It is important that this
+ // location is the same for all processes, otherwise the tools
+ // will not be able to find all Hotspot processes.
+ // Any changes to this needs to be synchronized with HotSpot.
+ private static final String tmpdir = "/tmp";
// Indicates if this machine uses the old LinuxThreads
static boolean isLinuxThreads;
@@ -261,20 +265,12 @@ public class LinuxVirtualMachine extends HotSpotVirtualMachine {
}
// Return the socket file for the given process.
- // Checks working directory of process for .java_pid<pid>. If not
- // found it looks in temp directory.
private String findSocketFile(int pid) {
- // First check for a .java_pid<pid> file in the working directory
- // of the target process
- String fn = ".java_pid" + pid;
- String path = "/proc/" + pid + "/cwd/" + fn;
- File f = new File(path);
+ File f = new File(tmpdir, ".java_pid" + pid);
if (!f.exists()) {
- // Not found, so try temp directory
- f = new File(tmpdir, fn);
- path = f.exists() ? f.getPath() : null;
+ return null;
}
- return path;
+ return f.getPath();
}
// On Solaris/Linux a simple handshake is used to start the attach mechanism
diff --git a/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java b/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java
index d40f8a7..cb8a3f1 100644
--- a/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java
+++ b/jdk/src/solaris/classes/sun/tools/attach/SolarisVirtualMachine.java
@@ -38,11 +38,12 @@ import java.util.Properties;
* Solaris implementation of HotSpotVirtualMachine.
*/
public class SolarisVirtualMachine extends HotSpotVirtualMachine {
- // Use /tmp instead of /var/tmp on Solaris as /tmp is the default used by
- // HotSpot when the property is not set on the command line.
- private static final String tmpdir1 = System.getProperty("java.io.tmpdir");
- private static final String tmpdir =
- (tmpdir1.equals("/var/tmp") || tmpdir1.equals("/var/tmp/")) ? "/tmp" : tmpdir1;
+ // "/tmp" is used as a global well-known location for the files
+ // .java_pid<pid>. and .attach_pid<pid>. It is important that this
+ // location is the same for all processes, otherwise the tools
+ // will not be able to find all Hotspot processes.
+ // Any changes to this needs to be synchronized with HotSpot.
+ private static final String tmpdir = "/tmp";
// door descriptor;
private int fd = -1;
@@ -191,19 +192,10 @@ public class SolarisVirtualMachine extends HotSpotVirtualMachine {
}
}
- // The door is attached to .java_pid<pid> in the target VM's working
- // directory or temporary directory.
+ // The door is attached to .java_pid<pid> in the temporary directory.
private int openDoor(int pid) throws IOException {
- // First check for a .java_pid<pid> file in the working directory
- // of the target process
- String fn = ".java_pid" + pid;
- String path = "/proc/" + pid + "/cwd/" + fn;
- try {
- fd = open(path);
- } catch (FileNotFoundException fnf) {
- path = tmpdir + "/" + fn;
- fd = open(path);
- }
+ String path = tmpdir + "/.java_pid" + pid;;
+ fd = open(path);
// Check that the file owner/permission to avoid attaching to
// bogus process
diff --git a/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c b/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
index d3b8484..1e93bd6 100644
--- a/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
+++ b/jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
@@ -42,7 +42,7 @@
#include <sys/stat.h>
#include <fcntl.h>
-#ifndef LINUX
+#if !defined(LINUX) && !defined(_ALLBSD_SOURCE)
#include <procfs.h>
#endif
@@ -62,6 +62,7 @@
#include <time.h>
#include "jni.h"
+#include "jvm_md.h"
#include "hprof.h"
int
@@ -85,7 +86,7 @@ md_sleep(unsigned seconds)
void
md_init(void)
{
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
/* No Hi-Res timer option? */
#else
if ( gdata->micro_state_accounting ) {
@@ -247,7 +248,7 @@ md_timeofday(void)
jlong
md_get_microsecs(void)
{
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
return (jlong)(md_timeofday() * (jlong)1000); /* Milli to micro */
#else
return (jlong)(gethrtime()/(hrtime_t)1000); /* Nano seconds to micro seconds */
@@ -265,7 +266,7 @@ md_get_timemillis(void)
jlong
md_get_thread_cpu_timemillis(void)
{
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
return md_timeofday();
#else
return (jlong)(gethrvtime()/1000); /* Nano seconds to milli seconds */
@@ -280,7 +281,7 @@ md_get_prelude_path(char *path, int path_len, char *filename)
Dl_info dlinfo;
libdir[0] = 0;
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
addr = (void*)&Agent_OnLoad;
#else
/* Just using &Agent_OnLoad will get the first external symbol with
@@ -308,10 +309,13 @@ md_get_prelude_path(char *path, int path_len, char *filename)
if ( lastSlash != NULL ) {
*lastSlash = '\0';
}
+#ifndef __APPLE__
+ // not sure why other platforms have to go up two levels, but on macos we only need up one
lastSlash = strrchr(libdir, '/');
if ( lastSlash != NULL ) {
*lastSlash = '\0';
}
+#endif /* __APPLE__ */
}
(void)snprintf(path, path_len, "%s/%s", libdir, filename);
}
@@ -388,9 +392,9 @@ md_build_library_name(char *holder, int holderlen, char *pname, char *fname)
/* Construct path to library */
if (pnamelen == 0) {
- (void)snprintf(holder, holderlen, "lib%s.so", fname);
+ (void)snprintf(holder, holderlen, "lib%s" JNI_LIB_SUFFIX, fname);
} else {
- (void)snprintf(holder, holderlen, "%s/lib%s.so", pname, fname);
+ (void)snprintf(holder, holderlen, "%s/lib%s" JNI_LIB_SUFFIX, pname, fname);
}
}
diff --git a/jdk/src/solaris/doc/sun/man/man1/apt.1 b/jdk/src/solaris/doc/sun/man/man1/apt.1
deleted file mode 100644
index 2d77108..0000000
--- a/jdk/src/solaris/doc/sun/man/man1/apt.1
+++ /dev/null
@@ -1,153 +0,0 @@
-." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-." 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.
-."
-.TH apt 1 "10 May 2011"
-
-.LP
-.SH "NAME"
-.LP
-.LP
-\f2apt\fP \- annotation processing tool
-.LP
-.SH "SYNOPSIS"
-.LP
-.LP
-\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files]
-.LP
-.SH "PARAMETERS"
-.LP
-.LP
-Options may be in any order. For a discussion of parameters which apply to a specific option, see OPTIONS below.
-.LP
-.RS 3
-.TP 3
-sourcefiles
-Zero or more source files to be processed.
-.TP 3
- at files
-One or more files that list source files or other options
-.RE
-
-.LP
-.SH "DESCRIPTION"
-.LP
-.LP
-\f3Note\fP: The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
-.LP
-.LP
-The tool \f2apt\fP, annotation processing tool, includes reflective APIs and supporting infrastructure to process program annotations. The \f2apt\fP reflective APIs provide a build\-time, source\-based, read\-only view of program structure. These reflective APIs are designed to cleanly model the Java(TM) programming language's type system after the addition of generics. First, \f2apt\fP runs annotation processors that can produce new source code and other files. Next, \f2apt\fP can cause compilation of both original and generated source files, easing development. The reflective APIs and other APIs used to interact with the tool are subpackages of \f2com.sun.mirror\fP.
-.LP
-.LP
-A fuller discussion of how the tool operates as well as instructions for developing with \f2apt\fP are in
-.na
-\f4Getting Started with \fP\f4apt\fP. @
-.fi
-http://download.oracle.com/javase/7/docs/technotes/guides/apt/GettingStarted.html
-.LP
-.SH "OPTIONS"
-.LP
-.SS
-apt specific options
-.LP
-.RS 3
-.TP 3
-\-s dir
-Specify the directory root under which processor\-generated source files will be placed; files are placed in subdirectories based on package namespace.
-.TP 3
-\-nocompile
-Do not compile source files to class files.
-.TP 3
-\-print
-Print out textual representation of specified types; perform no annotation processing or compilation.
-.TP 3
-\-A[key[=val]]
-Options to pass to annotation processors \-\- these are not interpreted by \f2apt\fP directly, but are made available for use by individual processors
-.TP 3
-\-factorypath path
-Specify where to find annotation processor factories; if this option is used, the classpath is \f2not\fP searched for factories.
-.TP 3
-\-factory classname
-Name of annotation processor factory to use; bypasses default discovery process
-.TP 3
-\-version
-Print version information.
-.TP 3
-\-X
-Display information about non\-standard options.
-.RE
-
-.LP
-.SS
-Options shared with javac
-.LP
-.RS 3
-.TP 3
-\-d dir
-Specify where to place processor and javac generated class files
-.TP 3
-\-cp path or \-classpath path
-Specify where to find user class files and annotation processor factories. If \f2\-factorypath\fP is given, the classpath is not searched for factories.
-.RE
-
-.LP
-.LP
-Consult the javac(1) man page for information on \f2javac\fP options.
-.LP
-.SS
-Non\-Standard Options
-.LP
-.RS 3
-.TP 3
-\-XListAnnotationTypes
-List found annotation types.
-.TP 3
-\-XListDeclarations
-List specified and included declarations.
-.TP 3
-\-XPrintAptRounds
-Print information about initial and recursive \f2apt\fP rounds.
-.TP 3
-\-XPrintFactoryInfo
-Print information about which annotations a factory is asked to process.
-.TP 3
-\-XclassesAsDecls
-Treat both class and source files as declarations to process.
-.RE
-
-.LP
-.LP
-\f3Note\fP: Because these options are non\-standard, they are subject to change without notice.
-.LP
-.SH "NOTES"
-.LP
-.LP
-The \f2apt\fP tool and its associated API contained in the package \f2com.sun.mirror\fP have been deprecated since JDK 7 and are planned to be removed in the next major JDK release. Use the options available in the \f2javac(1)\fP tool and the APIs contained in the packages \f2javax.annotation.processing\fP and \f2javax.lang.model\fP to process annotations.
-.LP
-.SH "SEE ALSO"
-.LP
-.RS 3
-.TP 2
-o
-javac(1), java(1)
-.RE
-
-.LP
-
diff --git a/jdk/src/solaris/doc/sun/man/man1/ja/apt.1 b/jdk/src/solaris/doc/sun/man/man1/ja/apt.1
deleted file mode 100644
index bd78898..0000000
--- a/jdk/src/solaris/doc/sun/man/man1/ja/apt.1
+++ /dev/null
@@ -1,153 +0,0 @@
-." Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-." 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.
-."
-.TH apt 1 "07 May 2011"
-
-.LP
-.SH "NAME"
-.LP
-.LP
-\f2apt\fP \- Ãí¼á½èÍý¥Ä¡¼¥ë
-.LP
-.SH "·Á¼°"
-.LP
-.LP
-\f2apt [\-classpath \fP\f2classpath\fP] [\-sourcepath \f2sourcepath\fP] [\-d \f2directory\fP] [\-s \f2directory\fP] [\-factorypath \f2path\fP] [\-factory \f2class\fP] [\-print] [\-nocompile] [\-A\f2key\fP[\f2=val\fP] ...] [\f2javac option\fP] sourcefiles [@files]
-.LP
-.SH "¥Ñ¥é¥á¡¼¥¿"
-.LP
-.LP
-¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£ÆÃÄê¤Î¥ª¥×¥·¥ç¥ó¤ËŬÍѤµ¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢²¼µ¤Î¡Ö¥ª¥×¥·¥ç¥ó¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.RS 3
-.TP 3
-sourcefiles
-¥¼¥í¡¢1 ¤Ä¡¢¤Þ¤¿¤ÏÊ£¿ô¤Î½èÍýÂоݤΥ½¡¼¥¹¥Õ¥¡¥¤¥ë
-.TP 3
- at files
-¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¾¤Î¥ª¥×¥·¥ç¥ó¤ò°ìÍ÷ɽ¼¨¤¹¤ë 1 ¤Ä¤Þ¤¿¤ÏÊ£¿ô¤Î¥Õ¥¡¥¤¥ë
-.RE
-
-.LP
-.SH "ÀâÌÀ"
-.LP
-.LP
-\f3Ãí\fP: \f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.LP
-Ãí¼á½èÍý¥Ä¡¼¥ë \f2apt\fP ¤Ï¡¢¥ê¥Õ¥ì¥¯¥È API ¤È¥µ¥Ý¡¼¥È¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã¡¼¤«¤é¹½À®¤µ¤ì¡¢¥×¥í¥°¥é¥àÃí¼á¤ò½èÍý¤·¤Þ¤¹¡£\f2apt\fP ¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢ ¹½ÃÛ»þ¤Î¥½¡¼¥¹¥Ù¡¼¥¹¤Ç¡¢¥×¥í¥°¥é¥à¹½Â¤¤Ë´Ø¤¹¤ëÆɤ߼è¤êÀìÍѥӥ塼¤òÄ󶡤·¤Þ¤¹¡£¤³¤ì¤é¤Î¥ê¥Õ¥ì¥¯¥È API ¤Ï¡¢Áí¾Î¤òÄɲä·¤¿¸å¤Ë¡¢Java(TM) ¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Î·¿¥·¥¹¥Æ¥à¤òÀµ¤·¤¯¥â¥Ç¥ë²½¤¹¤ë¤è¤¦¤ËÀ߷פµ¤ì¤Æ¤¤¤Þ¤¹¡£ºÇ½é¤Ë¡¢\f2apt\fP ¤Ï¡¢¿·¤·¤¤¥½¡¼¥¹¥³¡¼¥É¤È¾¤Î¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¤ò¼Â¹Ô¤·¤Þ¤¹¡£¼¡¤Ë¡¢\f2apt\fP ¤Ï¡¢¸µ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÈÀ¸À®¤·¤¿¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¤¿¤á¡¢³«È¯¤¬³Ú¤Ë¤Ê¤ê¤Þ¤¹¡£¥Ä¡¼¥ë¤È¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë»ÈÍѤµ¤ì¤ë¥ê¥Õ¥ì¥¯¥È API ¤Ê¤É¤Î API ¤Ï¡¢\f2com.sun.mirror\fP ¤Î¥µ¥Ö¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹¡£
-.LP
-.LP
-¥Ä¡¼¥ë¤Îµ¡Ç½¤Ë´Ø¤¹¤ë¾ÜºÙ¤È¡¢\f2apt\fP ¤ò»ÈÍѤ·¤¿³«È¯ÊýË¡¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-.na
-\f4¡Öapt ÆþÌç¡×\fP @
-.fi
-http://java.sun.com/javase/6/docs/technotes/guides/apt/GettingStarted.html¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.SH "¥ª¥×¥·¥ç¥ó"
-.LP
-.SS
-apt ¸ÇͤΥª¥×¥·¥ç¥ó
-.LP
-.RS 3
-.TP 3
-\-s dir
-¥×¥í¥»¥Ã¥µ¤ÎÀ¸À®¤¹¤ë¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¥Ç¥£¥ì¥¯¥È¥ê¥ë¡¼¥È¤ò»ØÄꤷ¤Þ¤¹¡£ ¥Õ¥¡¥¤¥ë¤Ï¡¢¥Ñ¥Ã¥±¡¼¥¸¤Î̾Á°¶õ´Ö¤Ë´ð¤Å¤¤¤Æ¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Þ¤¹¡£
-.TP 3
-\-nocompile
-¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤Ë¥³¥ó¥Ñ¥¤¥ë¤·¤Þ¤»¤ó¡£
-.TP 3
-\-print
-»ØÄꤷ¤¿¥¿¥¤¥×¤Î¥Æ¥¥¹¥Èɽ¸½¤ò½ÐÎϤ·¤Þ¤¹¡£ Ãí¼á½èÍý¤Þ¤¿¤Ï¥³¥ó¥Ñ¥¤¥ë¤Ï¹Ô¤¤¤Þ¤»¤ó¡£
-.TP 3
-\-A[key[=val]]
-Ãí¼á¥×¥í¥»¥Ã¥µ¤ØÅϤ¹¥ª¥×¥·¥ç¥ó¤Ç¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢\f2apt\fP ¤¬Ä¾Àܲò¼á¤¹¤ë¤Î¤Ç¤Ï¤Ê¤¯¡¢¤½¤ì¤¾¤ì¤Î¥×¥í¥»¥Ã¥µ¤Ë¤è¤Ã¤Æ»ÈÍѤǤ¤ë¤è¤¦¤ËÊѤ¨¤é¤ì¤Þ¤¹¡£
-.TP 3
-\-factorypath path
-Ãí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£ ¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£
-.TP 3
-\-factory classname
-»ÈÍѤ¹¤ëÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤Î̾Á°¤Ç¤¹¡£ ¥Ç¥Õ¥©¥ë¥È¤Î¸¡½Ð¥×¥í¥»¥¹¤ò¾Êά¤·¤Þ¤¹¡£
-.TP 3
-\-version
-¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤ò½ÐÎϤ·¤Þ¤¹¡£
-.TP 3
-\-X
-Èóɸ½à¥ª¥×¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ðÊó¤òɽ¼¨¤·¤Þ¤¹¡£
-.RE
-
-.LP
-.SS
-javac ¤È¶¦ÍѤ¹¤ë¥ª¥×¥·¥ç¥ó
-.LP
-.RS 3
-.TP 3
-\-d dir
-¥×¥í¥»¥Ã¥µ¤È javac À¸À®¤Î¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤òÃÖ¤¯¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£
-.TP 3
-\-cp path ¤Þ¤¿¤Ï \-classpath path
-¥æ¡¼¥¶¡¼¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤ÈÃí¼á¥×¥í¥»¥Ã¥µ¥Õ¥¡¥¯¥È¥ê¤ò¸¡º÷¤¹¤ë¾ì½ê¤ò»ØÄꤷ¤Þ¤¹¡£\f2\-factorypath\fP ¤¬»ØÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢¥¯¥é¥¹¥Ñ¥¹¤Î¥Õ¥¡¥¯¥È¥ê¤Ï¸¡º÷¤µ¤ì¤Þ¤»¤ó¡£
-.RE
-
-.LP
-.LP
-\f2javac\fP ¥ª¥×¥·¥ç¥ó¤Î¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¡¢javac(1) ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.SS
-Èóɸ½à¥ª¥×¥·¥ç¥ó
-.LP
-.RS 3
-.TP 3
-\-XListAnnotationTypes
-Ãí¼á¤Î·¿¤Ë¸¡½Ð¤µ¤ì¤ë¥ê¥¹¥È.
-.TP 3
-\-XListDeclarations
-»ØÄꤪ¤è¤ÓÀë¸À¤¬¥¤¥ó¥¯¥ë¡¼¥É¤µ¤ì¤ë¥ê¥¹¥È.
-.TP 3
-\-XPrintAptRounds
-½é´ü¤ª¤è¤ÓºÆµ¢Åª¤Ê \f2apt\fP ¥é¥¦¥ó¥É¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë.
-.TP 3
-\-XPrintFactoryInfo
-½èÍý¤òÍ׵᤹¤ë¥Õ¥¡¥¯¥È¥ê¤ÎÃí¼á¤Ë´Ø¤¹¤ë¾ðÊó¤ò½ÐÎϤ¹¤ë.
-.TP 3
-\-XclassesAsDecls
-¥¯¥é¥¹¥Õ¥¡¥¤¥ë¤È¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ÎξÊý¤ò¡¢½èÍýÂоݤÎÀë¸À¤È¤·¤Æ½èÍý¤·¤Þ¤¹¡£
-.RE
-
-.LP
-.LP
-\f3Ãí\fP: ¤³¤ì¤é¤ÏÈóɸ½à¥ª¥×¥·¥ç¥ó¤Ê¤Î¤Ç¡¢Í½¹ð¤Ê¤¯Êѹ¹¤µ¤ì¤ë²ÄǽÀ¤¬¤¢¤ê¤Þ¤¹¡£
-.LP
-.SH "Ãí"
-.LP
-.LP
-\f2apt\fP ¥Ä¡¼¥ë¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2com.sun.mirror\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤½¤ì¤Ë´ØÏ¢¤·¤¿ API ¤Ï¡¢JDK 7 °Ê¹ßÈó¿ä¾©¤Ë¤Ê¤Ã¤Æ¤ª¤ê¡¢JDK ¤Î¼¡¤Î¥á¥¸¥ã¡¼¥ê¥ê¡¼¥¹¤Çºï½ü¤µ¤ì¤ëͽÄê¤Ç¤¹¡£\f2javac(1)\fP ¥Ä¡¼¥ë¤ÇÍøÍѲÄǽ¤Ê¥ª¥×¥·¥ç¥ó¤È¡¢¥Ñ¥Ã¥±¡¼¥¸ \f2javax.annotation.processing\fP ¤ª¤è¤Ó \f2javax.lang.model\fP ¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë API ¤ò»ÈÍѤ·¤Æ¡¢Ãí¼á¤ò½èÍý¤·¤Æ¤¯¤À¤µ¤¤¡£
-.LP
-.SH "´ØÏ¢¹àÌÜ"
-.LP
-.RS 3
-.TP 2
-o
-javac(1), java(1)
-.RE
-
-.LP
-
diff --git a/jdk/src/solaris/javavm/export/jvm_md.h b/jdk/src/solaris/javavm/export/jvm_md.h
index 09213b0..390e89c 100644
--- a/jdk/src/solaris/javavm/export/jvm_md.h
+++ b/jdk/src/solaris/javavm/export/jvm_md.h
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
#define JNI_LIB_PREFIX "lib"
+#ifdef __APPLE__
+#define JNI_LIB_SUFFIX ".dylib"
+#define VERSIONED_JNI_LIB_NAME(NAME, VERSION) JNI_LIB_PREFIX NAME "." VERSION JNI_LIB_SUFFIX
+#else
#define JNI_LIB_SUFFIX ".so"
+#define VERSIONED_JNI_LIB_NAME(NAME, VERSION) JNI_LIB_PREFIX NAME JNI_LIB_SUFFIX "." VERSION
+#endif
+#define JNI_LIB_NAME(NAME) JNI_LIB_PREFIX NAME JNI_LIB_SUFFIX
#define JVM_MAXPATHLEN MAXPATHLEN
diff --git a/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c b/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c
index 0541799..088b3cf 100644
--- a/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c
+++ b/jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c
@@ -32,10 +32,16 @@
#include <sys/types.h>
#include <sys/stat.h>
+#if defined(_ALLBSD_SOURCE)
+#include <sys/sysctl.h>
+#else
#include <sys/swap.h>
+#endif
#include <sys/resource.h>
#include <sys/times.h>
+#ifndef _ALLBSD_SOURCE
#include <sys/sysinfo.h>
+#endif
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
@@ -46,16 +52,22 @@
static jlong page_size = 0;
+#if defined(_ALLBSD_SOURCE)
+#define MB (1024UL * 1024UL)
+#else
+
/* This gets us the new structured proc interfaces of 5.6 & later */
/* - see comment in <sys/procfs.h> */
#define _STRUCTURED_PROC 1
#include <sys/procfs.h>
+#endif /* _ALLBSD_SOURCE */
+
static struct dirent* read_dir(DIR* dirp, struct dirent* entry) {
#ifdef __solaris__
struct dirent* dbuf = readdir(dirp);
return dbuf;
-#else /* __linux__ */
+#else /* __linux__ || _ALLBSD_SOURCE */
struct dirent* p;
if (readdir_r(dirp, entry, &p) == 0) {
return p;
@@ -124,7 +136,7 @@ static jlong get_total_or_available_swap_space_size(JNIEnv* env, jboolean availa
free(strtab);
return available ? ((jlong)avail * page_size) :
((jlong)total * page_size);
-#else /* __linux__ */
+#elif defined(__linux__)
int ret;
FILE *fp;
jlong total = 0, avail = 0;
@@ -138,6 +150,13 @@ static jlong get_total_or_available_swap_space_size(JNIEnv* env, jboolean availa
avail = (jlong)si.freeswap * si.mem_unit;
return available ? avail : total;
+#else /* _ALLBSD_SOURCE */
+ /*
+ * XXXBSD: there's no way available to get swap info in
+ * FreeBSD. Usage of libkvm is not an option here
+ */
+ // throw_internal_error(env, "Unimplemented in FreeBSD");
+ return (0);
#endif
}
@@ -179,7 +198,7 @@ Java_com_sun_management_UnixOperatingSystem_getCommittedVirtualMemorySize
JVM_Close(fd);
return (jlong) psinfo.pr_size * 1024;
-#else /* __linux__ */
+#elif defined(__linux__)
FILE *fp;
unsigned long vsize = 0;
@@ -197,6 +216,12 @@ Java_com_sun_management_UnixOperatingSystem_getCommittedVirtualMemorySize
fclose(fp);
return (jlong)vsize;
+#else /* _ALLBSD_SOURCE */
+ /*
+ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
+ */
+ // throw_internal_error(env, "Unimplemented in FreeBSD");
+ return (64 * MB);
#endif
}
@@ -222,9 +247,13 @@ Java_com_sun_management_UnixOperatingSystem_getProcessCpuTime
jlong cpu_time_ns;
struct tms time;
-#ifdef __solaris__
+ /*
+ * BSDNOTE: FreeBSD implements _SC_CLK_TCK since FreeBSD 5, so
+ * add a magic to handle it
+ */
+#if defined(__solaris__) || defined(_SC_CLK_TCK)
clk_tck = (jlong) sysconf(_SC_CLK_TCK);
-#else /* __linux__ */
+#elif defined(__linux__) || defined(_ALLBSD_SOURCE)
clk_tck = 100;
#endif
if (clk_tck == -1) {
@@ -244,22 +273,51 @@ JNIEXPORT jlong JNICALL
Java_com_sun_management_UnixOperatingSystem_getFreePhysicalMemorySize
(JNIEnv *env, jobject mbean)
{
+#ifdef _ALLBSD_SOURCE
+ /*
+ * XXBSDL no way to do it in FreeBSD
+ */
+ // throw_internal_error(env, "unimplemented in FreeBSD")
+ return (128 * MB);
+#else
jlong num_avail_physical_pages = sysconf(_SC_AVPHYS_PAGES);
return (num_avail_physical_pages * page_size);
+#endif
}
JNIEXPORT jlong JNICALL
Java_com_sun_management_UnixOperatingSystem_getTotalPhysicalMemorySize
(JNIEnv *env, jobject mbean)
{
+#ifdef _ALLBSD_SOURCE
+ jlong result;
+ int mib[2];
+ size_t rlen;
+
+ mib[0] = CTL_HW;
+ mib[1] = HW_PHYSMEM;
+ rlen = sizeof(result);
+ if (sysctl(mib, 2, &result, &rlen, NULL, 0) == -1)
+ result = 256 * MB;
+
+ return (result);
+#else
jlong num_physical_pages = sysconf(_SC_PHYS_PAGES);
return (num_physical_pages * page_size);
+#endif
}
JNIEXPORT jlong JNICALL
Java_com_sun_management_UnixOperatingSystem_getOpenFileDescriptorCount
(JNIEnv *env, jobject mbean)
{
+#ifdef _ALLBSD_SOURCE
+ /*
+ * XXXBSD: there's no way available to do it in FreeBSD, AFAIK.
+ */
+ // throw_internal_error(env, "Unimplemented in FreeBSD");
+ return (100);
+#else /* solaris/linux */
DIR *dirp;
struct dirent dbuf;
struct dirent* dentp;
@@ -282,6 +340,7 @@ Java_com_sun_management_UnixOperatingSystem_getOpenFileDescriptorCount
closedir(dirp);
// subtract by 1 which was the fd open for this implementation
return (fds - 1);
+#endif
}
JNIEXPORT jlong JNICALL
diff --git a/jdk/src/solaris/native/java/io/UnixFileSystem_md.c b/jdk/src/solaris/native/java/io/UnixFileSystem_md.c
index 3735125..5ea55d8 100644
--- a/jdk/src/solaris/native/java/io/UnixFileSystem_md.c
+++ b/jdk/src/solaris/native/java/io/UnixFileSystem_md.c
@@ -41,6 +41,12 @@
#include "java_io_FileSystem.h"
#include "java_io_UnixFileSystem.h"
+#if defined(_ALLBSD_SOURCE)
+#define dirent64 dirent
+#define readdir64_r readdir_r
+#define stat64 stat
+#define statvfs64 statvfs
+#endif
/* -- Field IDs -- */
diff --git a/jdk/src/solaris/native/java/io/canonicalize_md.c b/jdk/src/solaris/native/java/io/canonicalize_md.c
index 6f1c5e0..b78cc2d 100644
--- a/jdk/src/solaris/native/java/io/canonicalize_md.c
+++ b/jdk/src/solaris/native/java/io/canonicalize_md.c
@@ -33,7 +33,9 @@
#include <sys/stat.h>
#include <errno.h>
#include <limits.h>
+#if !defined(_ALLBSD_SOURCE)
#include <alloca.h>
+#endif
/* Note: The comments in this file use the terminology
diff --git a/jdk/src/solaris/native/java/io/io_util_md.c b/jdk/src/solaris/native/java/io/io_util_md.c
index d9fa67c..1d9abff 100644
--- a/jdk/src/solaris/native/java/io/io_util_md.c
+++ b/jdk/src/solaris/native/java/io/io_util_md.c
@@ -30,13 +30,50 @@
#include "io_util_md.h"
#include <string.h>
+#ifdef MACOSX
+
+#include <CoreFoundation/CoreFoundation.h>
+
+static inline char *convertToNFD(const char *path, char *buf, size_t bufsize)
+{
+ CFMutableStringRef mutable = CFStringCreateMutable(NULL, 0);
+ CFStringAppendCString(mutable, path, kCFStringEncodingUTF8);
+ CFStringNormalize(mutable, kCFStringNormalizationFormD);
+
+ CFStringGetCString(mutable, buf, bufsize, kCFStringEncodingUTF8);
+
+ CFRelease(mutable);
+ return buf;
+}
+
+/* Converts the path to NFD form if it was in NFC form. Returns a pointer to
+ * the converting string which could be buf (if the converstion took place) or
+ * origPath if no conversion was needed
+ */
+__private_extern__
+char* convertToNFDIfNeeded(const char *origPath, char *buf, size_t bufsize)
+{
+ const char *current = origPath;
+ int c;
+ for (c = *current; c != 0; current++, c = *current) {
+ if (c < 0) {
+ // Need to convert
+ return convertToNFD(origPath, buf, bufsize);
+ }
+ }
+
+ return (char *)origPath;
+}
+
+#endif
+
void
fileOpen(JNIEnv *env, jobject this, jstring path, jfieldID fid, int flags)
{
WITH_PLATFORM_STRING(env, path, ps) {
FD fd;
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
diff --git a/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c b/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
index c8f9a64..b946663 100644
--- a/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
+++ b/jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
@@ -28,6 +28,11 @@
#include "jni.h"
#include "jni_util.h"
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#endif
+
JNIEXPORT jobjectArray JNICALL
Java_java_lang_ProcessEnvironment_environ(JNIEnv *env, jclass ign)
{
@@ -37,7 +42,9 @@ Java_java_lang_ProcessEnvironment_environ(JNIEnv *env, jclass ign)
* no standard (not even de-facto) header file where the
* declaration is to be found. See:
* http://www.opengroup.org/onlinepubs/007908799/xbd/envvar.html */
+#ifndef __APPLE__
extern char ** environ; /* environ[i] looks like: VAR=VALUE\0 */
+#endif
jsize count = 0;
jsize i, j;
diff --git a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c b/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
index a10e3ac..43077ce 100644
--- a/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+++ b/jdk/src/solaris/native/java/lang/UNIXProcess_md.c
@@ -40,7 +40,7 @@
#include <stdlib.h>
#include <sys/types.h>
#include <ctype.h>
-#include <wait.h>
+#include <sys/wait.h>
#include <signal.h>
#include <string.h>
#include <errno.h>
@@ -49,6 +49,11 @@
#include <fcntl.h>
#include <limits.h>
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#endif
+
/*
* There are 3 possible strategies we might use to "fork":
*
@@ -385,6 +390,14 @@ isAsciiDigit(char c)
return c >= '0' && c <= '9';
}
+#ifdef _ALLBSD_SOURCE
+#define FD_DIR "/dev/fd"
+#define dirent64 dirent
+#define readdir64 readdir
+#else
+#define FD_DIR "/proc/self/fd"
+#endif
+
static int
closeDescriptors(void)
{
@@ -402,7 +415,7 @@ closeDescriptors(void)
restartableClose(from_fd); /* for possible use by opendir() */
restartableClose(from_fd + 1); /* another one for good luck */
- if ((dp = opendir("/proc/self/fd")) == NULL)
+ if ((dp = opendir(FD_DIR)) == NULL)
return 0;
/* We use readdir64 instead of readdir to work around Solaris bug
diff --git a/jdk/src/solaris/native/java/lang/java_props_md.c b/jdk/src/solaris/native/java/lang/java_props_md.c
index 0a24f86..8f931cc 100644
--- a/jdk/src/solaris/native/java/lang/java_props_md.c
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c
@@ -23,7 +23,7 @@
* questions.
*/
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#include <stdio.h>
#include <ctype.h>
#endif
@@ -42,9 +42,21 @@
#include <time.h>
#include <errno.h>
+#ifdef MACOSX
+#include "java_props_macosx.h"
+#endif
+
+#if defined(_ALLBSD_SOURCE)
+#if !defined(P_tmpdir)
+#include <paths.h>
+#define P_tmpdir _PATH_VARTMP
+#endif
+#endif
+
#include "locale_str.h"
#include "java_props.h"
+#if !defined(_ALLBSD_SOURCE)
#ifdef __linux__
#ifndef CODESET
#define CODESET _NL_CTYPE_CODESET_NAME
@@ -54,6 +66,7 @@
#define CODESET ALT_CODESET_KEY
#endif
#endif
+#endif /* !_ALLBSD_SOURCE */
#ifdef JAVASE_EMBEDDED
#include <dlfcn.h>
@@ -131,7 +144,12 @@ static int ParseLocale(int cat, char ** std_language, char ** std_script,
char *lc;
/* Query the locale set for the category */
+
+#ifdef MACOSX
+ lc = setupMacOSXLocale(cat); // malloc'd memory, need to free
+#else
lc = setlocale(cat, NULL);
+#endif
#ifndef __linux__
if (lc == NULL) {
@@ -169,7 +187,9 @@ static int ParseLocale(int cat, char ** std_language, char ** std_script,
*/
strcpy(temp, lc);
-
+#ifdef MACOSX
+ free(lc); // malloced memory
+#endif
/* Parse the language, country, encoding, and variant from the
* locale. Any of the elements may be missing, but they must occur
* in the order language_country.encoding at variant, and must be
@@ -310,7 +330,7 @@ static int ParseLocale(int cat, char ** std_language, char ** std_script,
}
#ifdef JAVASE_EMBEDDED
-/* Determine the default embedded toolkit based on whether lib/xawt/
+/* Determine the default embedded toolkit based on whether libawt_xawt
* exists in the JRE. This can still be overridden by -Dawt.toolkit=XXX
*/
static char* getEmbeddedToolkit() {
@@ -325,8 +345,8 @@ static char* getEmbeddedToolkit() {
realpath((char *)dlinfo.dli_fname, buf);
len = strlen(buf);
p = strrchr(buf, '/');
- /* Default AWT Toolkit on Linux and Solaris is XAWT. */
- strncpy(p, "/xawt/", MAXPATHLEN-len-1);
+ /* Default AWT Toolkit on Linux and Solaris is XAWT (libawt_xawt.so). */
+ strncpy(p, "/libawt_xawt.so", MAXPATHLEN-len-1);
/* Check if it exists */
if (stat(buf, &statbuf) == -1 && errno == ENOENT) {
/* No - this is a reduced-headless-jre so use special HToolkit */
@@ -354,21 +374,62 @@ GetJavaProperties(JNIEnv *env)
/* tmp dir */
sprops.tmp_dir = P_tmpdir;
+#ifdef MACOSX
+ /* darwin has a per-user temp dir */
+ static char tmp_path[PATH_MAX];
+ int pathSize = confstr(_CS_DARWIN_USER_TEMP_DIR, tmp_path, PATH_MAX);
+ if (pathSize > 0 && pathSize <= PATH_MAX) {
+ sprops.tmp_dir = tmp_path;
+ }
+#endif /* MACOSX */
/* Printing properties */
+#ifdef MACOSX
+ sprops.printerJob = "sun.lwawt.macosx.CPrinterJob";
+#else
sprops.printerJob = "sun.print.PSPrinterJob";
+#endif
/* patches/service packs installed */
sprops.patch_level = "unknown";
/* Java 2D properties */
+#ifdef MACOSX
+ PreferredToolkit prefToolkit = getPreferredToolkit();
+ switch (prefToolkit) {
+ case CToolkit:
+ sprops.graphics_env = "sun.awt.CGraphicsEnvironment";
+ break;
+ case XToolkit:
+#endif
sprops.graphics_env = "sun.awt.X11GraphicsEnvironment";
-
+#ifdef MACOSX
+ break;
+ default:
+ sprops.graphics_env = "sun.awt.HeadlessGraphicsEnvironment";
+ break;
+ }
+#endif
+ /* AWT properties */
#ifdef JAVASE_EMBEDDED
sprops.awt_toolkit = getEmbeddedToolkit();
if (sprops.awt_toolkit == NULL) // default as below
#endif
+#ifdef MACOSX
+ switch (prefToolkit) {
+ case CToolkit:
+ sprops.awt_toolkit = "sun.lwawt.macosx.LWCToolkit";
+ break;
+ case XToolkit:
+#endif
sprops.awt_toolkit = "sun.awt.X11.XToolkit";
+#ifdef MACOSX
+ break;
+ default:
+ sprops.awt_toolkit = "sun.awt.HToolkit";
+ break;
+ }
+#endif
/* This is used only for debugging of font problems. */
v = getenv("JAVA2D_FONTPATH");
@@ -396,10 +457,14 @@ GetJavaProperties(JNIEnv *env)
/* os properties */
{
+#ifdef MACOSX
+ setOSNameAndVersion(&sprops);
+#else
struct utsname name;
uname(&name);
sprops.os_name = strdup(name.sysname);
sprops.os_version = strdup(name.release);
+#endif
sprops.os_arch = ARCHPROPNAME;
@@ -437,6 +502,13 @@ GetJavaProperties(JNIEnv *env)
sprops.display_variant = sprops.variant;
sprops.sun_jnu_encoding = sprops.encoding;
+#ifdef _ALLBSD_SOURCE
+#if BYTE_ORDER == _LITTLE_ENDIAN
+ sprops.unicode_encoding = "UnicodeLittle";
+ #else
+ sprops.unicode_encoding = "UnicodeBig";
+ #endif
+#else /* !_ALLBSD_SOURCE */
#ifdef __linux__
#if __BYTE_ORDER == __LITTLE_ENDIAN
sprops.unicode_encoding = "UnicodeLittle";
@@ -446,6 +518,7 @@ GetJavaProperties(JNIEnv *env)
#else
sprops.unicode_encoding = "UnicodeBig";
#endif
+#endif /* _ALLBSD_SOURCE */
/* user properties */
{
@@ -482,12 +555,19 @@ GetJavaProperties(JNIEnv *env)
sprops.path_separator = ":";
sprops.line_separator = "\n";
+#if !defined(_ALLBSD_SOURCE)
/* Append CDE message and resource search path to NLSPATH and
* XFILESEARCHPATH, in order to pick localized message for
* FileSelectionDialog window (Bug 4173641).
*/
setPathEnvironment("NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat");
setPathEnvironment("XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt");
+#endif
+
+
+#ifdef MACOSX
+ setProxyProperties(&sprops);
+#endif
return &sprops;
}
diff --git a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
index e6bd2cc..28e8448 100644
--- a/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
+++ b/jdk/src/solaris/native/java/net/Inet4AddressImpl.c
@@ -36,12 +36,288 @@
#include <stdlib.h>
#include <ctype.h>
+#ifdef _ALLBSD_SOURCE
+#include <unistd.h>
+#include <sys/param.h>
+#endif
+
#include "jvm.h"
#include "jni_util.h"
#include "net_util.h"
#include "java_net_Inet4AddressImpl.h"
+#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104))
+#define HAS_GLIBC_GETHOSTBY_R 1
+#endif
+
+#if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R)
+/* Use getaddrinfo(3), which is thread safe */
+/************************************************************************
+ * Inet4AddressImpl
+ */
+
+/*
+ * Class: java_net_Inet4AddressImpl
+ * Method: getLocalHostName
+ * Signature: ()Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
+ char hostname[NI_MAXHOST+1];
+
+ hostname[0] = '\0';
+ if (JVM_GetHostName(hostname, NI_MAXHOST)) {
+ /* Something went wrong, maybe networking is not setup? */
+ strcpy(hostname, "localhost");
+ } else {
+ struct addrinfo hints, *res;
+ int error;
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_UNSPEC;
+
+ error = getaddrinfo(hostname, NULL, &hints, &res);
+
+ if (error == 0) {
+ /* host is known to name service */
+ error = getnameinfo(res->ai_addr,
+ res->ai_addrlen,
+ hostname,
+ NI_MAXHOST,
+ NULL,
+ 0,
+ NI_NAMEREQD);
+
+ /* if getnameinfo fails hostname is still the value
+ from gethostname */
+
+ freeaddrinfo(res);
+ }
+ }
+ return (*env)->NewStringUTF(env, hostname);
+}
+
+static jclass ni_iacls;
+static jclass ni_ia4cls;
+static jmethodID ni_ia4ctrID;
+static jfieldID ni_iaaddressID;
+static jfieldID ni_iahostID;
+static jfieldID ni_iafamilyID;
+static int initialized = 0;
+
+/*
+ * Find an internet address for a given hostname. Note that this
+ * code only works for addresses of type INET. The translation
+ * of %d.%d.%d.%d to an address (int) occurs in java now, so the
+ * String "host" shouldn't *ever* be a %d.%d.%d.%d string
+ *
+ * Class: java_net_Inet4AddressImpl
+ * Method: lookupAllHostAddr
+ * Signature: (Ljava/lang/String;)[[B
+ */
+
+JNIEXPORT jobjectArray JNICALL
+Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this,
+ jstring host) {
+ const char *hostname;
+ jobject name;
+ jobjectArray ret = 0;
+ int retLen = 0;
+
+ int error=0;
+ struct addrinfo hints, *res, *resNew = NULL;
+
+ if (!initialized) {
+ ni_iacls = (*env)->FindClass(env, "java/net/InetAddress");
+ ni_iacls = (*env)->NewGlobalRef(env, ni_iacls);
+ ni_ia4cls = (*env)->FindClass(env, "java/net/Inet4Address");
+ ni_ia4cls = (*env)->NewGlobalRef(env, ni_ia4cls);
+ ni_ia4ctrID = (*env)->GetMethodID(env, ni_ia4cls, "<init>", "()V");
+ ni_iaaddressID = (*env)->GetFieldID(env, ni_iacls, "address", "I");
+ ni_iafamilyID = (*env)->GetFieldID(env, ni_iacls, "family", "I");
+ ni_iahostID = (*env)->GetFieldID(env, ni_iacls, "hostName", "Ljava/lang/String;");
+ initialized = 1;
+ }
+
+ if (IS_NULL(host)) {
+ JNU_ThrowNullPointerException(env, "host is null");
+ return 0;
+ }
+ hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE);
+ CHECK_NULL_RETURN(hostname, NULL);
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_flags = AI_CANONNAME;
+ hints.ai_family = AF_INET;
+
+ /*
+ * Workaround for Solaris bug 4160367 - if a hostname contains a
+ * white space then 0.0.0.0 is returned
+ */
+ if (isspace((unsigned char)hostname[0])) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
+ (char *)hostname);
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return NULL;
+ }
+
+ error = getaddrinfo(hostname, NULL, &hints, &res);
+
+ if (error) {
+ /* report error */
+ JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException",
+ (char *)hostname);
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ return NULL;
+ } else {
+ int i = 0;
+ struct addrinfo *itr, *last = NULL, *iterator = res;
+ while (iterator != NULL) {
+ int skip = 0;
+ itr = resNew;
+
+ while (itr != NULL) {
+ struct sockaddr_in *addr1, *addr2;
+
+ addr1 = (struct sockaddr_in *)iterator->ai_addr;
+ addr2 = (struct sockaddr_in *)itr->ai_addr;
+ if (addr1->sin_addr.s_addr ==
+ addr2->sin_addr.s_addr) {
+ skip = 1;
+ break;
+ }
+
+ itr = itr->ai_next;
+ }
+
+ if (!skip) {
+ struct addrinfo *next
+ = (struct addrinfo*) malloc(sizeof(struct addrinfo));
+ if (!next) {
+ JNU_ThrowOutOfMemoryError(env, "heap allocation failed");
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+ memcpy(next, iterator, sizeof(struct addrinfo));
+ next->ai_next = NULL;
+ if (resNew == NULL) {
+ resNew = next;
+ } else {
+ last->ai_next = next;
+ }
+ last = next;
+ i++;
+ }
+ iterator = iterator->ai_next;
+ }
+
+ retLen = i;
+ iterator = resNew;
+ i = 0;
+
+ name = (*env)->NewStringUTF(env, hostname);
+ if (IS_NULL(name)) {
+ goto cleanupAndReturn;
+ }
+
+ ret = (*env)->NewObjectArray(env, retLen, ni_iacls, NULL);
+ if (IS_NULL(ret)) {
+ /* we may have memory to free at the end of this */
+ goto cleanupAndReturn;
+ }
+
+ while (iterator != NULL) {
+ /* We need 4 bytes to store ipv4 address; */
+ int len = 4;
+
+ jobject iaObj = (*env)->NewObject(env, ni_ia4cls, ni_ia4ctrID);
+ if (IS_NULL(iaObj)) {
+ /* we may have memory to free at the end of this */
+ ret = NULL;
+ goto cleanupAndReturn;
+ }
+ (*env)->SetIntField(env, iaObj, ni_iaaddressID,
+ ntohl(((struct sockaddr_in*)(iterator->ai_addr))->sin_addr.s_addr));
+ (*env)->SetObjectField(env, iaObj, ni_iahostID, name);
+ (*env)->SetObjectArrayElement(env, ret, retLen - i -1, iaObj);
+ i++;
+ iterator = iterator->ai_next;
+ }
+ }
+
+cleanupAndReturn:
+ {
+ struct addrinfo *iterator, *tmp;
+ iterator = resNew;
+ while (iterator != NULL) {
+ tmp = iterator;
+ iterator = iterator->ai_next;
+ free(tmp);
+ }
+ JNU_ReleaseStringPlatformChars(env, host, hostname);
+ }
+
+ freeaddrinfo(res);
+
+ return ret;
+
+}
+
+/*
+ * Class: java_net_Inet4AddressImpl
+ * Method: getHostByAddr
+ * Signature: (I)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL
+Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this,
+ jbyteArray addrArray) {
+ jstring ret = NULL;
+
+ char host[NI_MAXHOST+1];
+ jfieldID fid;
+ int error = 0;
+ jint family;
+ struct sockaddr *him ;
+ int len = 0;
+ jbyte caddr[4];
+ jint addr;
+
+ struct sockaddr_in him4;
+ struct sockaddr *sa;
+
+ /*
+ * For IPv4 addresses construct a sockaddr_in structure.
+ */
+ (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr);
+ addr = ((caddr[0]<<24) & 0xff000000);
+ addr |= ((caddr[1] <<16) & 0xff0000);
+ addr |= ((caddr[2] <<8) & 0xff00);
+ addr |= (caddr[3] & 0xff);
+ memset((char *) &him4, 0, sizeof(him4));
+ him4.sin_addr.s_addr = (uint32_t) htonl(addr);
+ him4.sin_family = AF_INET;
+ sa = (struct sockaddr *) &him4;
+ len = sizeof(him4);
+
+ error = getnameinfo(sa, len, host, NI_MAXHOST, NULL, 0,
+ NI_NAMEREQD);
+
+ if (!error) {
+ ret = (*env)->NewStringUTF(env, host);
+ }
+
+ if (ret == NULL) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", NULL);
+ }
+
+ return ret;
+
+}
+
+#else /* defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) */
+
/* the initial size of our hostent buffers */
#ifndef NI_MAXHOST
#define NI_MAXHOST 1025
@@ -292,6 +568,8 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this,
return ret;
}
+#endif /* _ALLBSD_SOURCE */
+
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
@@ -430,6 +708,7 @@ Java_java_net_Inet4AddressImpl_isReachable0(JNIEnv *env, jobject this,
memset((char *) caddr, 0, sizeof(caddr));
memset((char *) &him, 0, sizeof(him));
+ memset((char *) &inf, 0, sizeof(inf));
sz = (*env)->GetArrayLength(env, addrArray);
if (sz != 4) {
return JNI_FALSE;
diff --git a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
index 051326b..e612131 100644
--- a/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
+++ b/jdk/src/solaris/native/java/net/Inet6AddressImpl.c
@@ -33,6 +33,9 @@
#include <strings.h>
#include <stdlib.h>
#include <ctype.h>
+#ifdef _ALLBSD_SOURCE
+#include <unistd.h> /* gethostname */
+#endif
#include "jvm.h"
#include "jni_util.h"
@@ -70,8 +73,8 @@ Java_java_net_Inet6AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
} else {
// ensure null-terminated
hostname[NI_MAXHOST] = '\0';
-#ifdef __linux__
- /* On Linux gethostname() says "host.domain.sun.com". On
+#if defined(__linux__) && defined(_ALLBSD_SOURCE)
+ /* On Linux/FreeBSD gethostname() says "host.domain.sun.com". On
* Solaris gethostname() says "host", so extra work is needed.
*/
#else
@@ -107,7 +110,7 @@ Java_java_net_Inet6AddressImpl_getLocalHostName(JNIEnv *env, jobject this) {
freeaddrinfo(res);
}
#endif /* AF_INET6 */
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
}
return (*env)->NewStringUTF(env, hostname);
}
diff --git a/jdk/src/solaris/native/java/net/NetworkInterface.c b/jdk/src/solaris/native/java/net/NetworkInterface.c
index 049b2f8..b952626 100644
--- a/jdk/src/solaris/native/java/net/NetworkInterface.c
+++ b/jdk/src/solaris/native/java/net/NetworkInterface.c
@@ -26,6 +26,9 @@
#include <errno.h>
#include <strings.h>
+#if defined(_ALLBSD_SOURCE) && defined(__OpenBSD__)
+#include <sys/types.h>
+#endif
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
@@ -53,6 +56,19 @@
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#endif
+#if defined(_ALLBSD_SOURCE)
+#include <sys/param.h>
+#include <sys/ioctl.h>
+#include <sys/sockio.h>
+#if defined(__APPLE__)
+#include <net/ethernet.h>
+#include <net/if_var.h>
+#include <net/if_dl.h>
+#include <netinet/in_var.h>
+#include <ifaddrs.h>
+#endif
+#endif
+
#include "jvm.h"
#include "jni_util.h"
#include "net_util.h"
@@ -92,6 +108,7 @@ jfieldID ni_bindsID;
jfieldID ni_virutalID;
jfieldID ni_childsID;
jfieldID ni_parentID;
+jfieldID ni_defaultIndexID;
jmethodID ni_ctrID;
static jclass ni_iacls;
@@ -184,6 +201,7 @@ Java_java_net_NetworkInterface_init(JNIEnv *env, jclass cls) {
ni_ibaddressID = (*env)->GetFieldID(env, ni_ibcls, "address", "Ljava/net/InetAddress;");
ni_ib4broadcastID = (*env)->GetFieldID(env, ni_ibcls, "broadcast", "Ljava/net/Inet4Address;");
ni_ib4maskID = (*env)->GetFieldID(env, ni_ibcls, "maskLength", "S");
+ ni_defaultIndexID = (*env)->GetStaticFieldID(env, ni_class, "defaultIndex", "I");
}
@@ -824,11 +842,11 @@ netif *addif(JNIEnv *env, int sock, const char * if_name, netif *ifs, struct soc
netif *currif = ifs, *parent;
netaddr *addrP;
- #ifdef __solaris__
+#ifdef LIFNAMSIZ
char name[LIFNAMSIZ], vname[LIFNAMSIZ];
- #else
+#else
char name[IFNAMSIZ], vname[IFNAMSIZ];
- #endif
+#endif
char *name_colonP;
int mask;
@@ -1661,3 +1679,307 @@ static int getFlags(int sock, const char *ifname) {
#endif
+/** BSD **/
+#ifdef _ALLBSD_SOURCE
+/* Open socket for further ioct calls, try v4 socket first and
+ * if it falls return v6 socket
+ */
+
+#ifdef AF_INET6
+static int openSocketWithFallback(JNIEnv *env, const char *ifname){
+ int sock;
+ struct ifreq if2;
+
+ if ((sock = JVM_Socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
+ if (errno == EPROTONOSUPPORT){
+ if ( (sock = JVM_Socket(AF_INET6, SOCK_DGRAM, 0)) < 0 ){
+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", "IPV6 Socket creation failed");
+ return -1;
+ }
+ }
+ else{ // errno is not NOSUPPORT
+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException", "IPV4 Socket creation failed");
+ return -1;
+ }
+ }
+
+ return sock;
+}
+
+#else
+static int openSocketWithFallback(JNIEnv *env, const char *ifname){
+ return openSocket(env,AF_INET);
+}
+#endif
+
+/*
+ * Enumerates and returns all IPv4 interfaces
+ */
+static netif *enumIPv4Interfaces(JNIEnv *env, int sock, netif *ifs) {
+ struct ifaddrs *ifa, *origifa;
+
+ if (getifaddrs(&origifa) != 0) {
+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException",
+ "getifaddrs() function failed");
+ return ifs;
+ }
+
+ for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) {
+
+ /*
+ * Skip non-AF_INET entries.
+ */
+ if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET)
+ continue;
+
+ /*
+ * Add to the list.
+ */
+ ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, AF_INET, 0);
+
+ /*
+ * If an exception occurred then free the list.
+ */
+ if ((*env)->ExceptionOccurred(env)) {
+ freeifaddrs(origifa);
+ freeif(ifs);
+ return NULL;
+ }
+ }
+
+ /*
+ * Free socket and buffer
+ */
+ freeifaddrs(origifa);
+ return ifs;
+}
+
+
+/*
+ * Enumerates and returns all IPv6 interfaces on Linux
+ */
+
+#ifdef AF_INET6
+/*
+ * Determines the prefix on BSD for IPv6 interfaces.
+ */
+static
+int prefix(void *val, int size) {
+ u_char *name = (u_char *)val;
+ int byte, bit, plen = 0;
+
+ for (byte = 0; byte < size; byte++, plen += 8)
+ if (name[byte] != 0xff)
+ break;
+ if (byte == size)
+ return (plen);
+ for (bit = 7; bit != 0; bit--, plen++)
+ if (!(name[byte] & (1 << bit)))
+ break;
+ for (; bit != 0; bit--)
+ if (name[byte] & (1 << bit))
+ return (0);
+ byte++;
+ for (; byte < size; byte++)
+ if (name[byte])
+ return (0);
+ return (plen);
+}
+
+/*
+ * Enumerates and returns all IPv6 interfaces on BSD
+ */
+static netif *enumIPv6Interfaces(JNIEnv *env, int sock, netif *ifs) {
+ struct ifaddrs *ifa, *origifa;
+ struct sockaddr_in6 *sin6;
+ struct in6_ifreq ifr6;
+
+ if (getifaddrs(&origifa) != 0) {
+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException",
+ "getifaddrs() function failed");
+ return ifs;
+ }
+
+ for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) {
+
+ /*
+ * Skip non-AF_INET6 entries.
+ */
+ if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6)
+ continue;
+
+ memset(&ifr6, 0, sizeof(ifr6));
+ strlcpy(ifr6.ifr_name, ifa->ifa_name, sizeof(ifr6.ifr_name));
+ memcpy(&ifr6.ifr_addr, ifa->ifa_addr, MIN(sizeof(ifr6.ifr_addr), ifa->ifa_addr->sa_len));
+
+ if (ioctl(sock, SIOCGIFNETMASK_IN6, (caddr_t)&ifr6) < 0) {
+ NET_ThrowByNameWithLastError(env , JNU_JAVANETPKG "SocketException",
+ "ioctl SIOCGIFNETMASK_IN6 failed");
+ freeifaddrs(origifa);
+ freeif(ifs);
+ return NULL;
+ }
+
+ /* Add to the list. */
+ sin6 = (struct sockaddr_in6 *)&ifr6.ifr_addr;
+ ifs = addif(env, sock, ifa->ifa_name, ifs, ifa->ifa_addr, AF_INET6,
+ prefix(&sin6->sin6_addr, sizeof(struct in6_addr)));
+
+ /* If an exception occurred then free the list. */
+ if ((*env)->ExceptionOccurred(env)) {
+ freeifaddrs(origifa);
+ freeif(ifs);
+ return NULL;
+ }
+ }
+
+ /*
+ * Free socket and ifaddrs buffer
+ */
+ freeifaddrs(origifa);
+ return ifs;
+}
+#endif
+
+static int getIndex(int sock, const char *name){
+#ifdef __FreeBSD__
+ /*
+ * Try to get the interface index
+ * (Not supported on Solaris 2.6 or 7)
+ */
+ struct ifreq if2;
+ strcpy(if2.ifr_name, name);
+
+ if (ioctl(sock, SIOCGIFINDEX, (char *)&if2) < 0) {
+ return -1;
+ }
+
+ return if2.ifr_index;
+#else
+ /*
+ * Try to get the interface index using BSD specific if_nametoindex
+ */
+ int index = if_nametoindex(name);
+ return (index == 0) ? -1 : index;
+#endif
+}
+
+/**
+ * Returns the IPv4 broadcast address of a named interface, if it exists.
+ * Returns 0 if it doesn't have one.
+ */
+static struct sockaddr *getBroadcast(JNIEnv *env, int sock, const char *ifname, struct sockaddr *brdcast_store) {
+ struct sockaddr *ret = NULL;
+ struct ifreq if2;
+
+ memset((char *) &if2, 0, sizeof(if2));
+ strcpy(if2.ifr_name, ifname);
+
+ /* Let's make sure the interface does have a broadcast address */
+ if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFFLAGS failed");
+ return ret;
+ }
+
+ if (if2.ifr_flags & IFF_BROADCAST) {
+ /* It does, let's retrieve it*/
+ if (ioctl(sock, SIOCGIFBRDADDR, (char *)&if2) < 0) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFBRDADDR failed");
+ return ret;
+ }
+
+ ret = brdcast_store;
+ memcpy(ret, &if2.ifr_broadaddr, sizeof(struct sockaddr));
+ }
+
+ return ret;
+}
+
+/**
+ * Returns the IPv4 subnet prefix length (aka subnet mask) for the named
+ * interface, if it has one, otherwise return -1.
+ */
+static short getSubnet(JNIEnv *env, int sock, const char *ifname) {
+ unsigned int mask;
+ short ret;
+ struct ifreq if2;
+
+ memset((char *) &if2, 0, sizeof(if2));
+ strcpy(if2.ifr_name, ifname);
+
+ if (ioctl(sock, SIOCGIFNETMASK, (char *)&if2) < 0) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFNETMASK failed");
+ return -1;
+ }
+
+ mask = ntohl(((struct sockaddr_in*)&(if2.ifr_addr))->sin_addr.s_addr);
+ ret = 0;
+ while (mask) {
+ mask <<= 1;
+ ret++;
+ }
+
+ return ret;
+}
+
+/**
+ * Get the Hardware address (usually MAC address) for the named interface.
+ * return puts the data in buf, and returns the length, in byte, of the
+ * MAC address. Returns -1 if there is no hardware address on that interface.
+ */
+static int getMacAddress(JNIEnv *env, int sock, const char* ifname, const struct in_addr* addr, unsigned char *buf) {
+ struct ifaddrs *ifa0, *ifa;
+ struct sockaddr *saddr;
+ int i;
+
+ /* Grab the interface list */
+ if (!getifaddrs(&ifa0)) {
+ /* Cycle through the interfaces */
+ for (i = 0, ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next, i++) {
+ saddr = ifa->ifa_addr;
+ /* Link layer contains the MAC address */
+ if (saddr->sa_family == AF_LINK && !strcmp(ifname, ifa->ifa_name)) {
+ struct sockaddr_dl *sadl = (struct sockaddr_dl *) saddr;
+ /* Check the address is the correct length */
+ if (sadl->sdl_alen == ETHER_ADDR_LEN) {
+ memcpy(buf, (sadl->sdl_data + sadl->sdl_nlen), ETHER_ADDR_LEN);
+ freeifaddrs(ifa0);
+ return ETHER_ADDR_LEN;
+ }
+ }
+ }
+ freeifaddrs(ifa0);
+ }
+
+ return -1;
+}
+
+static int getMTU(JNIEnv *env, int sock, const char *ifname) {
+ struct ifreq if2;
+
+ memset((char *) &if2, 0, sizeof(if2));
+ strcpy(if2.ifr_name, ifname);
+
+ if (ioctl(sock, SIOCGIFMTU, (char *)&if2) < 0) {
+ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "IOCTL SIOCGIFMTU failed");
+ return -1;
+ }
+
+ return if2.ifr_mtu;
+}
+
+static int getFlags(int sock, const char *ifname) {
+ struct ifreq if2;
+ int ret = -1;
+
+ memset((char *) &if2, 0, sizeof(if2));
+ strcpy(if2.ifr_name, ifname);
+
+ if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0){
+ return -1;
+ }
+
+ return (((int) if2.ifr_flags) & 0xffff);
+}
+
+#endif
diff --git a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
index 7a1edc3..cbdacdf 100644
--- a/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
+++ b/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
@@ -83,6 +83,8 @@ static jfieldID pdsi_loopbackID;
static jfieldID pdsi_ttlID;
#endif
+extern void setDefaultScopeID(JNIEnv *env, struct sockaddr *him);
+
/*
* Returns a java.lang.Integer based on 'i'
*/
@@ -240,6 +242,7 @@ Java_java_net_PlainDatagramSocketImpl_bind0(JNIEnv *env, jobject this,
if (NET_InetAddressToSockaddr(env, iaObj, localport, (struct sockaddr *)&him, &len, JNI_TRUE) != 0) {
return;
}
+ setDefaultScopeID(env, (struct sockaddr *)&him);
if (NET_Bind(fd, (struct sockaddr *)&him, len) < 0) {
if (errno == EADDRINUSE || errno == EADDRNOTAVAIL ||
@@ -310,6 +313,7 @@ Java_java_net_PlainDatagramSocketImpl_connect0(JNIEnv *env, jobject this,
setsockopt(fd, SOL_SOCKET, SO_BSDCOMPAT, (char*) &t, sizeof(int));
} else
#endif
+ setDefaultScopeID(env, (struct sockaddr *)&rmtaddr);
{
if (JVM_Connect(fd, (struct sockaddr *)&rmtaddr, len) == -1) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException",
@@ -331,7 +335,7 @@ Java_java_net_PlainDatagramSocketImpl_disconnect0(JNIEnv *env, jobject this, jin
/* The fdObj'fd */
jint fd;
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
SOCKADDR addr;
int len;
#endif
@@ -341,11 +345,13 @@ Java_java_net_PlainDatagramSocketImpl_disconnect0(JNIEnv *env, jobject this, jin
}
fd = (*env)->GetIntField(env, fdObj, IO_fd_fdID);
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#ifdef __linux__
if (isOldKernel) {
int t = 1;
setsockopt(fd, SOL_SOCKET, SO_BSDCOMPAT, (char*) &t, sizeof(int));
} else {
+#endif /* __linux__ */
memset(&addr, 0, sizeof(addr));
#ifdef AF_INET6
if (ipv6_available()) {
@@ -361,6 +367,7 @@ Java_java_net_PlainDatagramSocketImpl_disconnect0(JNIEnv *env, jobject this, jin
}
JVM_Connect(fd, (struct sockaddr *)&addr, len);
+#ifdef __linux__
// After disconnecting a UDP socket, Linux kernel will set
// local port to zero if the port number comes from implicit
// bind. Successive send/recv on the same socket will fail.
@@ -383,6 +390,7 @@ Java_java_net_PlainDatagramSocketImpl_disconnect0(JNIEnv *env, jobject this, jin
NET_Bind(fd, (struct sockaddr *)&addr, len);
}
}
+#endif
#else
JVM_Connect(fd, 0, 0);
#endif
@@ -453,6 +461,7 @@ Java_java_net_PlainDatagramSocketImpl_send(JNIEnv *env, jobject this,
return;
}
}
+ setDefaultScopeID(env, (struct sockaddr *)&rmtaddr);
if (packetBufferLen > MAX_BUFFER_LEN) {
/* When JNI-ifying the JDK's IO routines, we turned
@@ -1052,7 +1061,7 @@ JNIEXPORT void JNICALL
Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env,
jobject this) {
jobject fdObj = (*env)->GetObjectField(env, this, pdsi_fdID);
- int fd, t = 1;
+ int arg, fd, t = 1;
#ifdef AF_INET6
int domain = ipv6_available() ? AF_INET6 : AF_INET;
#else
@@ -1074,7 +1083,7 @@ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env,
#ifdef AF_INET6
/* Disable IPV6_V6ONLY to ensure dual-socket support */
if (domain == AF_INET6) {
- int arg = 0;
+ arg = 0;
if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (char*)&arg,
sizeof(int)) < 0) {
NET_ThrowNew(env, errno, "cannot set IPPROTO_IPV6");
@@ -1084,6 +1093,22 @@ Java_java_net_PlainDatagramSocketImpl_datagramSocketCreate(JNIEnv *env,
}
#endif /* AF_INET6 */
+#ifdef __APPLE__
+ arg = 65507;
+ if (JVM_SetSockOpt(fd, SOL_SOCKET, SO_SNDBUF,
+ (char *)&arg, sizeof(arg)) < 0) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
+ strerror(errno));
+ return;
+ }
+ if (JVM_SetSockOpt(fd, SOL_SOCKET, SO_RCVBUF,
+ (char *)&arg, sizeof(arg)) < 0) {
+ JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
+ strerror(errno));
+ return;
+ }
+#endif /* __APPLE__ */
+
setsockopt(fd, SOL_SOCKET, SO_BROADCAST, (char*) &t, sizeof(int));
#ifdef __linux__
@@ -1324,7 +1349,7 @@ static void setMulticastInterface(JNIEnv *env, jobject this, int fd,
* value is an InetAddress.
*/
#ifdef AF_INET6
-#ifdef __solaris__
+#if defined(__solaris__) || defined(MACOSX)
if (ipv6_available()) {
mcast_set_if_by_addr_v6(env, this, fd, value);
} else {
@@ -1347,7 +1372,7 @@ static void setMulticastInterface(JNIEnv *env, jobject this, int fd,
* value is a NetworkInterface.
*/
#ifdef AF_INET6
-#ifdef __solaris__
+#if defined(__solaris__) || defined(MACOSX)
if (ipv6_available()) {
mcast_set_if_by_if_v6(env, this, fd, value);
} else {
@@ -1430,7 +1455,7 @@ static void mcast_set_loop_v6(JNIEnv *env, jobject this, int fd, jobject value)
static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd,
jint opt, jobject value) {
#ifdef AF_INET6
-#ifdef __solaris__
+#if defined(__solaris__) || defined(MACOSX)
if (ipv6_available()) {
mcast_set_loop_v6(env, this, fd, value);
} else {
@@ -2004,7 +2029,7 @@ Java_java_net_PlainDatagramSocketImpl_setTimeToLive(JNIEnv *env, jobject this,
}
/* setsockopt to be correct ttl */
#ifdef AF_INET6
-#ifdef __solaris__
+#if defined(__solaris__) || defined(MACOSX)
if (ipv6_available()) {
setHopLimit(env, fd, ttl);
} else {
@@ -2400,18 +2425,30 @@ static void mcast_join_leave(JNIEnv *env, jobject this,
mname6.ipv6mr_interface = idx;
}
+#if defined(_ALLBSD_SOURCE)
+#define ADD_MEMBERSHIP IPV6_JOIN_GROUP
+#define DRP_MEMBERSHIP IPV6_LEAVE_GROUP
+#define S_ADD_MEMBERSHIP "IPV6_JOIN_GROUP"
+#define S_DRP_MEMBERSHIP "IPV6_LEAVE_GROUP"
+#else
+#define ADD_MEMBERSHIP IPV6_ADD_MEMBERSHIP
+#define DRP_MEMBERSHIP IPV6_DROP_MEMBERSHIP
+#define S_ADD_MEMBERSHIP "IPV6_ADD_MEMBERSHIP"
+#define S_DRP_MEMBERSHIP "IPV6_DROP_MEMBERSHIP"
+#endif
+
/* Join the multicast group */
- if (JVM_SetSockOpt(fd, IPPROTO_IPV6, (join ? IPV6_ADD_MEMBERSHIP : IPV6_DROP_MEMBERSHIP),
+ if (JVM_SetSockOpt(fd, IPPROTO_IPV6, (join ? ADD_MEMBERSHIP : DRP_MEMBERSHIP),
(char *) &mname6, sizeof (mname6)) < 0) {
if (join) {
- NET_ThrowCurrent(env, "setsockopt IPV6_ADD_MEMBERSHIP failed");
+ NET_ThrowCurrent(env, "setsockopt " S_ADD_MEMBERSHIP " failed");
} else {
if (errno == ENOENT) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
"Not a member of the multicast group");
} else {
- NET_ThrowCurrent(env, "setsockopt IPV6_DROP_MEMBERSHIP failed");
+ NET_ThrowCurrent(env, "setsockopt " S_DRP_MEMBERSHIP " failed");
}
}
}
diff --git a/jdk/src/solaris/native/java/net/PlainSocketImpl.c b/jdk/src/solaris/native/java/net/PlainSocketImpl.c
index 64b6e3c..82616f2 100644
--- a/jdk/src/solaris/native/java/net/PlainSocketImpl.c
+++ b/jdk/src/solaris/native/java/net/PlainSocketImpl.c
@@ -70,6 +70,8 @@ jfieldID psi_serverSocketID;
jfieldID psi_fdLockID;
jfieldID psi_closePendingID;
+extern void setDefaultScopeID(JNIEnv *env, struct sockaddr *him);
+
/*
* file descriptor used for dup2
*/
@@ -115,7 +117,6 @@ static int getMarkerFD()
return sv[0];
}
-
/*
* Return the file descriptor given a PlainSocketImpl
*/
@@ -260,6 +261,9 @@ Java_java_net_PlainSocketImpl_socketConnect(JNIEnv *env, jobject this,
/* fdObj is the FileDescriptor field on this */
jobject fdObj = (*env)->GetObjectField(env, this, psi_fdID);
+
+ jclass clazz = (*env)->GetObjectClass(env, this);
+
jobject fdLock;
jint trafficClass = (*env)->GetIntField(env, this, psi_trafficClassID);
@@ -286,6 +290,7 @@ Java_java_net_PlainSocketImpl_socketConnect(JNIEnv *env, jobject this,
if (NET_InetAddressToSockaddr(env, iaObj, port, (struct sockaddr *)&him, &len, JNI_TRUE) != 0) {
return;
}
+ setDefaultScopeID(env, (struct sockaddr *)&him);
#ifdef AF_INET6
if (trafficClass != 0 && ipv6_available()) {
@@ -483,9 +488,11 @@ Java_java_net_PlainSocketImpl_socketConnect(JNIEnv *env, jobject this,
if (connect_rv == JVM_IO_INTR) {
JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
"operation interrupted");
+#if defined(EPROTO)
} else if (errno == EPROTO) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ProtocolException",
"Protocol error");
+#endif
} else if (errno == ECONNREFUSED) {
NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "ConnectException",
"Connection refused");
@@ -565,6 +572,7 @@ Java_java_net_PlainSocketImpl_socketBind(JNIEnv *env, jobject this,
if (NET_InetAddressToSockaddr(env, iaObj, localport, (struct sockaddr *)&him, &len, JNI_TRUE) != 0) {
return;
}
+ setDefaultScopeID(env, (struct sockaddr *)&him);
if (NET_Bind(fd, (struct sockaddr *)&him, len) < 0) {
if (errno == EADDRINUSE || errno == EADDRNOTAVAIL ||
diff --git a/jdk/src/solaris/native/java/net/net_util_md.c b/jdk/src/solaris/native/java/net/net_util_md.c
index 963ef2e..f7e6d6a 100644
--- a/jdk/src/solaris/native/java/net/net_util_md.c
+++ b/jdk/src/solaris/native/java/net/net_util_md.c
@@ -33,7 +33,17 @@
#include <netdb.h>
#include <stdlib.h>
#include <dlfcn.h>
+
+#ifndef _ALLBSD_SOURCE
#include <values.h>
+#else
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#ifndef MAXINT
+#define MAXINT INT_MAX
+#endif
+#endif
#ifdef __solaris__
#include <sys/sockio.h>
@@ -75,6 +85,30 @@ getnameinfo_f getnameinfo_ptr = NULL;
#define UDP_EXCLBIND 0x0101
#endif
+void setDefaultScopeID(JNIEnv *env, struct sockaddr *him)
+{
+#ifdef MACOSX
+ static jclass ni_class = NULL;
+ static jfieldID ni_defaultIndexID;
+ if (ni_class == NULL) {
+ jclass c = (*env)->FindClass(env, "java/net/NetworkInterface");
+ CHECK_NULL(c);
+ c = (*env)->NewGlobalRef(env, c);
+ CHECK_NULL(c);
+ ni_defaultIndexID = (*env)->GetStaticFieldID(
+ env, c, "defaultIndex", "I");
+ ni_class = c;
+ }
+ int defaultIndex;
+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)him;
+ if (sin6->sin6_family == AF_INET6 && (sin6->sin6_scope_id == 0)) {
+ defaultIndex = (*env)->GetStaticIntField(env, ni_class,
+ ni_defaultIndexID);
+ sin6->sin6_scope_id = defaultIndex;
+ }
+#endif
+}
+
#ifdef __solaris__
static int init_tcp_max_buf, init_udp_max_buf;
static int tcp_max_buf;
@@ -272,6 +306,14 @@ NET_GetFileDescriptorID(JNIEnv *env)
return (*env)->GetFieldID(env, cls, "fd", "I");
}
+#if defined(DONT_ENABLE_IPV6)
+jint IPv6_supported()
+{
+ return JNI_FALSE;
+}
+
+#else /* !DONT_ENABLE_IPV6 */
+
jint IPv6_supported()
{
#ifndef AF_INET6
@@ -385,6 +427,7 @@ jint IPv6_supported()
}
#endif /* AF_INET6 */
}
+#endif /* DONT_ENABLE_IPV6 */
void ThrowUnknownHostExceptionWithGaiError(JNIEnv *env,
const char* hostname,
@@ -747,6 +790,11 @@ NET_InetAddressToSockaddr(JNIEnv *env, jobject iaObj, int port, struct sockaddr
him6->sin6_family = AF_INET6;
*len = sizeof(struct sockaddr_in6) ;
+#if defined(_ALLBSD_SOURCE) && defined(_AF_INET6)
+// XXXBSD: should we do something with scope id here ? see below linux comment
+/* MMM: Come back to this! */
+#endif
+
/*
* On Linux if we are connecting to a link-local address
* we need to specify the interface in the scope_id (2.4 kernel only)
@@ -1168,6 +1216,15 @@ NET_GetSockOpt(int fd, int level, int opt, void *result,
}
#endif
+/* Workaround for Mac OS treating linger value as
+ * signed integer
+ */
+#ifdef MACOSX
+ if (level == SOL_SOCKET && opt == SO_LINGER) {
+ struct linger* to_cast = (struct linger*)result;
+ to_cast->l_linger = (unsigned short)to_cast->l_linger;
+ }
+#endif
return rv;
}
@@ -1195,11 +1252,29 @@ NET_SetSockOpt(int fd, int level, int opt, const void *arg,
#define IPTOS_PREC_MASK 0xe0
#endif
+#if defined(_ALLBSD_SOURCE)
+#if defined(KIPC_MAXSOCKBUF)
+ int mib[3];
+ size_t rlen;
+#endif
+
+ int *bufsize;
+
+#ifdef __APPLE__
+ static int maxsockbuf = -1;
+#else
+ static long maxsockbuf = -1;
+#endif
+
+ int addopt;
+ struct linger *ling;
+#endif
+
/*
* IPPROTO/IP_TOS :-
- * 1. IPv6 on Solaris: no-op and will be set in flowinfo
- * field when connecting TCP socket, or sending
- * UDP packet.
+ * 1. IPv6 on Solaris/Mac OS: no-op and will be set
+ * in flowinfo field when connecting TCP socket,
+ * or sending UDP packet.
* 2. IPv6 on Linux: By default Linux ignores flowinfo
* field so enable IPV6_FLOWINFO_SEND so that flowinfo
* will be examined.
@@ -1209,7 +1284,7 @@ NET_SetSockOpt(int fd, int level, int opt, const void *arg,
if (level == IPPROTO_IP && opt == IP_TOS) {
int *iptos;
-#if defined(AF_INET6) && defined(__solaris__)
+#if defined(AF_INET6) && (defined(__solaris__) || defined(MACOSX))
if (ipv6_available()) {
return 0;
}
@@ -1300,6 +1375,71 @@ NET_SetSockOpt(int fd, int level, int opt, const void *arg,
}
#endif
+#if defined(_ALLBSD_SOURCE)
+ /*
+ * SOL_SOCKET/{SO_SNDBUF,SO_RCVBUF} - On FreeBSD need to
+ * ensure that value is <= kern.ipc.maxsockbuf as otherwise we get
+ * an ENOBUFS error.
+ */
+ if (level == SOL_SOCKET) {
+ if (opt == SO_SNDBUF || opt == SO_RCVBUF) {
+#ifdef KIPC_MAXSOCKBUF
+ if (maxsockbuf == -1) {
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_IPC;
+ mib[2] = KIPC_MAXSOCKBUF;
+ rlen = sizeof(maxsockbuf);
+ if (sysctl(mib, 3, &maxsockbuf, &rlen, NULL, 0) == -1)
+ maxsockbuf = 1024;
+
+#if 1
+ /* XXXBSD: This is a hack to workaround mb_max/mb_max_adj
+ problem. It should be removed when kern.ipc.maxsockbuf
+ will be real value. */
+ maxsockbuf = (maxsockbuf/5)*4;
+#endif
+ }
+#elif defined(__OpenBSD__)
+ maxsockbuf = SB_MAX;
+#else
+ maxsockbuf = 64 * 1024; /* XXX: NetBSD */
+#endif
+
+ bufsize = (int *)arg;
+ if (*bufsize > maxsockbuf) {
+ *bufsize = maxsockbuf;
+ }
+
+ if (opt == SO_RCVBUF && *bufsize < 1024) {
+ *bufsize = 1024;
+ }
+
+ }
+ }
+
+ /*
+ * On Solaris, SO_REUSEADDR will allow multiple datagram
+ * sockets to bind to the same port. The network jck tests
+ * for this "feature", so we need to emulate it by turning on
+ * SO_REUSEPORT as well for that combination.
+ */
+ if (level == SOL_SOCKET && opt == SO_REUSEADDR) {
+ int sotype;
+ socklen_t arglen;
+
+ arglen = sizeof(sotype);
+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, (void *)&sotype, &arglen) < 0) {
+ return -1;
+ }
+
+ if (sotype == SOCK_DGRAM) {
+ addopt = SO_REUSEPORT;
+ setsockopt(fd, level, addopt, arg, len);
+ }
+ }
+
+#endif
+
return setsockopt(fd, level, opt, arg, len);
}
diff --git a/jdk/src/solaris/native/java/net/net_util_md.h b/jdk/src/solaris/native/java/net/net_util_md.h
index 28664ab..8d835b2 100644
--- a/jdk/src/solaris/native/java/net/net_util_md.h
+++ b/jdk/src/solaris/native/java/net/net_util_md.h
@@ -37,7 +37,7 @@
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
diff --git a/jdk/src/solaris/native/java/util/FileSystemPreferences.c b/jdk/src/solaris/native/java/util/FileSystemPreferences.c
index 256a166..7bc1f45 100644
--- a/jdk/src/solaris/native/java/util/FileSystemPreferences.c
+++ b/jdk/src/solaris/native/java/util/FileSystemPreferences.c
@@ -47,8 +47,11 @@ Java_java_util_prefs_FileSystemPreferences_chmod(JNIEnv *env,
return (jint) result;
}
-
+#if defined(_ALLBSD_SOURCE)
+typedef struct flock FLOCK;
+#else
typedef struct flock64 FLOCK;
+#endif
/**
* Try to open a named lock file.
@@ -86,7 +89,11 @@ Java_java_util_prefs_FileSystemPreferences_lockFile0(JNIEnv *env,
if (fd < 0) {
result[0] = 0;
} else {
+#if defined(_ALLBSD_SOURCE)
+ rc = fcntl(fd, F_SETLK, &fl);
+#else
rc = fcntl(fd, F_SETLK64, &fl);
+#endif
result[1] = errno;
if (rc < 0) {
result[0]= 0;
@@ -116,7 +123,11 @@ Java_java_util_prefs_FileSystemPreferences_unlockFile0(JNIEnv *env,
fl.l_start = 0;
fl.l_type = F_UNLCK;
+#if defined(_ALLBSD_SOURCE)
+ rc = fcntl(fd, F_SETLK, &fl);
+#else
rc = fcntl(fd, F_SETLK64, &fl);
+#endif
if (rc < 0) {
close(fd);
diff --git a/jdk/src/solaris/native/java/util/TimeZone_md.c b/jdk/src/solaris/native/java/util/TimeZone_md.c
index 7e95d53..3af5d72 100644
--- a/jdk/src/solaris/native/java/util/TimeZone_md.c
+++ b/jdk/src/solaris/native/java/util/TimeZone_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,8 @@
#define fileclose fclose
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+
static const char *ETC_TIMEZONE_FILE = "/etc/timezone";
static const char *ZONEINFO_DIR = "/usr/share/zoneinfo";
@@ -95,9 +96,9 @@ getPathName(const char *dir, const char *name) {
/*
* Scans the specified directory and its subdirectories to find a
* zoneinfo file which has the same content as /etc/localtime on Linux
- * or /usr/share/lib/zoneinfo/localtime (most likely a symbolic link)
- * on Solaris given in 'buf'. Returns a zone ID if found, otherwise,
- * NULL is returned.
+ * or /usr/share/lib/zoneinfo/localtime on Solaris given in 'buf'.
+ * If file is symbolic link, then the contents it points to are in buf.
+ * Returns a zone ID if found, otherwise, NULL is returned.
*/
static char *
findZoneinfoFile(char *buf, size_t size, const char *dir)
@@ -122,8 +123,8 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
return NULL;
}
-#if defined(__linux__) || (defined(__solaris__) && (defined(_POSIX_PTHREAD_SEMANTICS) || \
- defined(_LP64)))
+#if defined(__linux__) || defined(MACOSX) || (defined(__solaris__) \
+ && (defined(_POSIX_PTHREAD_SEMANTICS) || defined(_LP64)))
while (readdir_r(dirp, entry, &dp) == 0 && dp != NULL) {
#else
while ((dp = readdir_r(dirp, entry)) != NULL) {
@@ -210,7 +211,7 @@ findZoneinfoFile(char *buf, size_t size, const char *dir)
return tz;
}
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
/*
* Performs Linux specific mapping and returns a zone ID
@@ -226,6 +227,7 @@ getPlatformTimeZoneID()
char *buf;
size_t size;
+#ifdef __linux__
/*
* Try reading the /etc/timezone file for Debian distros. There's
* no spec of the file format available. This parsing assumes that
@@ -249,6 +251,7 @@ getPlatformTimeZoneID()
return tz;
}
}
+#endif /* __linux__ */
/*
* Next, try /etc/localtime to find the zone ID.
@@ -277,21 +280,27 @@ getPlatformTimeZoneID()
tz = getZoneName(linkbuf);
if (tz != NULL) {
tz = strdup(tz);
+ return tz;
}
- return tz;
}
/*
* If it's a regular file, we need to find out the same zoneinfo file
* that has been copied as /etc/localtime.
+ * If initial symbolic link resolution failed, we should treat target
+ * file as a regular file.
*/
+ if ((fd = open(DEFAULT_ZONEINFO_FILE, O_RDONLY)) == -1) {
+ return NULL;
+ }
+ if (fstat(fd, &statbuf) == -1) {
+ (void) close(fd);
+ return NULL;
+ }
size = (size_t) statbuf.st_size;
buf = (char *) malloc(size);
if (buf == NULL) {
- return NULL;
- }
- if ((fd = open(DEFAULT_ZONEINFO_FILE, O_RDONLY)) == -1) {
- free((void *) buf);
+ (void) close(fd);
return NULL;
}
@@ -623,7 +632,7 @@ findJavaTZ_md(const char *java_home_dir, const char *country)
tz = getenv("TZ");
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
if (tz == NULL) {
#else
#ifdef __solaris__
@@ -664,10 +673,37 @@ findJavaTZ_md(const char *java_home_dir, const char *country)
}
return javatz;
}
-
/**
* Returns a GMT-offset-based zone ID. (e.g., "GMT-08:00")
*/
+
+#ifdef MACOSX
+
+char *
+getGMTOffsetID()
+{
+ time_t offset;
+ char sign, buf[32];
+ struct tm *local_tm;
+ time_t clock;
+ time_t currenttime;
+
+ clock = time(NULL);
+ tzset();
+ local_tm = localtime(&clock);
+ if (local_tm->tm_gmtoff >= 0) {
+ offset = (time_t) local_tm->tm_gmtoff;
+ sign = "+";
+ } else {
+ offset = (time_t) -local_tm->tm_gmtoff;
+ sign = "-";
+ }
+ sprintf(buf, (const char *)"GMT%c%02d:%02d",
+ sign, (int)(offset/3600), (int)((offset%3600)/60));
+ return strdup(buf);
+}
+#else
+
char *
getGMTOffsetID()
{
@@ -702,3 +738,4 @@ getGMTOffsetID()
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
}
+#endif /* MACOSX */
diff --git a/jdk/src/solaris/native/sun/awt/CUPSfuncs.c b/jdk/src/solaris/native/sun/awt/CUPSfuncs.c
index 2d0d286..a0d51f1 100644
--- a/jdk/src/solaris/native/sun/awt/CUPSfuncs.c
+++ b/jdk/src/solaris/native/sun/awt/CUPSfuncs.c
@@ -25,6 +25,7 @@
#include <jni.h>
#include <jni_util.h>
+#include <jvm_md.h>
#include <dlfcn.h>
#include <cups/cups.h>
#include <cups/ppd.h>
@@ -65,10 +66,11 @@ fn_ppdPageSize j2d_ppdPageSize;
JNIEXPORT jboolean JNICALL
Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env,
jobject printObj) {
- void *handle = dlopen("libcups.so.2", RTLD_LAZY | RTLD_GLOBAL);
+ void *handle = dlopen(VERSIONED_JNI_LIB_NAME("cups", "2"),
+ RTLD_LAZY | RTLD_GLOBAL);
if (handle == NULL) {
- handle = dlopen("libcups.so", RTLD_LAZY | RTLD_GLOBAL);
+ handle = dlopen(JNI_LIB_NAME("cups"), RTLD_LAZY | RTLD_GLOBAL);
if (handle == NULL) {
return JNI_FALSE;
}
diff --git a/jdk/src/solaris/native/sun/awt/VDrawingArea.c b/jdk/src/solaris/native/sun/awt/VDrawingArea.c
index d8735f3..c9ce812 100644
--- a/jdk/src/solaris/native/sun/awt/VDrawingArea.c
+++ b/jdk/src/solaris/native/sun/awt/VDrawingArea.c
@@ -31,7 +31,7 @@
#endif /* !HEADLESS */
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
diff --git a/jdk/src/solaris/native/sun/awt/X11Color.c b/jdk/src/solaris/native/sun/awt/X11Color.c
index 602962a..788c5f2 100644
--- a/jdk/src/solaris/native/sun/awt/X11Color.c
+++ b/jdk/src/solaris/native/sun/awt/X11Color.c
@@ -33,7 +33,6 @@
#include <math.h>
#include <sys/time.h>
#include <sys/resource.h>
-#include <alloca.h>
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
diff --git a/jdk/src/solaris/native/sun/awt/awt_Font.c b/jdk/src/solaris/native/sun/awt/awt_Font.c
index 239ea32..d8372fe 100644
--- a/jdk/src/solaris/native/sun/awt/awt_Font.c
+++ b/jdk/src/solaris/native/sun/awt/awt_Font.c
@@ -260,7 +260,7 @@ loadFont(Display * display, char *name, int32_t pointSize)
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
}
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
diff --git a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
index f6e4b06..2cc122c 100644
--- a/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
+++ b/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
@@ -40,6 +40,7 @@
#include <jni.h>
#include <jni_util.h>
#include <jvm.h>
+#include <jvm_md.h>
#include <jlong.h>
#include <stdlib.h>
@@ -119,7 +120,7 @@ static char *x11GraphicsConfigClassName = "sun/awt/X11GraphicsConfig";
*/
#define MAXFRAMEBUFFERS 16
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
typedef struct {
int screen_number;
short x_org;
@@ -424,6 +425,17 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
{
xrenderLibHandle = dlopen("libXrender.so.1", RTLD_LAZY | RTLD_GLOBAL);
+#ifdef MACOSX
+#define XRENDER_LIB "/usr/X11/lib/libXrender.dylib"
+#else
+#define XRENDER_LIB "libXrender.so"
+#endif
+
+ if (xrenderLibHandle == NULL) {
+ xrenderLibHandle = dlopen(XRENDER_LIB,
+ RTLD_LAZY | RTLD_GLOBAL);
+ }
+
#ifndef __linux__ /* SOLARIS */
if (xrenderLibHandle == NULL) {
xrenderLibHandle = dlopen("/usr/sfw/lib/libXrender.so.1",
@@ -568,19 +580,22 @@ getAllConfigs (JNIEnv *env, int screen, AwtScreenDataPtr screenDataPtr) {
}
#ifndef HEADLESS
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
static void xinerama_init_linux()
{
- void* libHandle = 0;
- char* XineramaLibName= "libXinerama.so.1";
+ void* libHandle = NULL;
int32_t locNumScr = 0;
XineramaScreenInfo *xinInfo;
char* XineramaQueryScreensName = "XineramaQueryScreens";
XineramaQueryScreensFunc* XineramaQueryScreens = NULL;
/* load library */
- libHandle = dlopen(XineramaLibName, RTLD_LAZY | RTLD_GLOBAL);
- if (libHandle != 0) {
+ libHandle = dlopen(VERSIONED_JNI_LIB_NAME("Xinerama", "1"),
+ RTLD_LAZY | RTLD_GLOBAL);
+ if (libHandle == NULL) {
+ libHandle = dlopen(JNI_LIB_NAME("Xinerama"), RTLD_LAZY | RTLD_GLOBAL);
+ }
+ if (libHandle != NULL) {
XineramaQueryScreens = (XineramaQueryScreensFunc*)
dlsym(libHandle, XineramaQueryScreensName);
@@ -616,11 +631,10 @@ static void xinerama_init_linux()
}
}
#endif
-#ifndef __linux__ /* Solaris */
+#if !defined(__linux__) && !defined(MACOSX) /* Solaris */
static void xinerama_init_solaris()
{
- void* libHandle = 0;
- char* XineramaLibName= "libXext.so";
+ void* libHandle = NULL;
unsigned char fbhints[MAXFRAMEBUFFERS];
int32_t locNumScr = 0;
/* load and run XineramaGetInfo */
@@ -629,8 +643,8 @@ static void xinerama_init_solaris()
XineramaGetInfoFunc* XineramaSolarisFunc = NULL;
/* load library */
- libHandle = dlopen(XineramaLibName, RTLD_LAZY | RTLD_GLOBAL);
- if (libHandle != 0) {
+ libHandle = dlopen(JNI_LIB_NAME("Xext"), RTLD_LAZY | RTLD_GLOBAL);
+ if (libHandle != NULL) {
XineramaSolarisFunc = (XineramaGetInfoFunc*)dlsym(libHandle, XineramaGetInfoName);
XineramaSolarisCenterFunc =
(XineramaGetCenterHintFunc*)dlsym(libHandle, XineramaGetCenterHintName);
@@ -677,11 +691,11 @@ static void xineramaInit(void) {
}
DTRACE_PRINTLN("Xinerama extension is available");
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
xinerama_init_linux();
#else /* Solaris */
xinerama_init_solaris();
-#endif /* __linux__ */
+#endif /* __linux__ || MACOSX */
}
#endif /* HEADLESS */
@@ -1562,7 +1576,7 @@ Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint(JNIEnv *env,
{
jobject point = NULL;
#ifndef HEADLESS /* return NULL in HEADLESS, Linux */
-#ifndef __linux__
+#if !defined(__linux__) && !defined(MACOSX)
int x,y;
AWT_LOCK();
@@ -1575,7 +1589,7 @@ Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint(JNIEnv *env,
DTRACE_PRINTLN("unable to call XineramaSolarisCenterFunc: symbol is null");
}
AWT_FLUSH_UNLOCK();
-#endif /* __linux __ */
+#endif /* __linux __ || MACOSX */
#endif /* HEADLESS */
return point;
}
@@ -1645,7 +1659,11 @@ X11GD_InitXrandrFuncs(JNIEnv *env)
{
int rr_maj_ver = 0, rr_min_ver = 0;
- void *pLibRandR = dlopen("libXrandr.so.2", RTLD_LAZY | RTLD_LOCAL);
+ void *pLibRandR = dlopen(VERSIONED_JNI_LIB_NAME("Xrandr", "2"),
+ RTLD_LAZY | RTLD_LOCAL);
+ if (pLibRandR == NULL) {
+ pLibRandR = dlopen(JNI_LIB_NAME("Xrandr"), RTLD_LAZY | RTLD_LOCAL);
+ }
if (pLibRandR == NULL) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
diff --git a/jdk/src/solaris/native/sun/awt/awt_InputMethod.c b/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
index af85e48..80da504 100644
--- a/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
+++ b/jdk/src/solaris/native/sun/awt/awt_InputMethod.c
@@ -53,7 +53,7 @@ static void PreeditDrawCallback(XIC, XPointer,
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
XIMPreeditCaretCallbackStruct *);
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
static void StatusStartCallback(XIC, XPointer, XPointer);
static void StatusDoneCallback(XIC, XPointer, XPointer);
static void StatusDrawCallback(XIC, XPointer,
@@ -67,7 +67,7 @@ static void StatusDrawCallback(XIC, XPointer,
#define PreeditDoneIndex 1
#define PreeditDrawIndex 2
#define PreeditCaretIndex 3
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
#define StatusStartIndex 4
#define StatusDoneIndex 5
#define StatusDrawIndex 6
@@ -85,14 +85,14 @@ static XIMProc callback_funcs[NCALLBACKS] = {
(XIMProc)PreeditDoneCallback,
(XIMProc)PreeditDrawCallback,
(XIMProc)PreeditCaretCallback,
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
(XIMProc)StatusStartCallback,
(XIMProc)StatusDoneCallback,
(XIMProc)StatusDrawCallback,
#endif
};
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
#define MAX_STATUS_LEN 100
typedef struct {
Window w; /*status window id */
@@ -125,7 +125,7 @@ typedef struct _X11InputMethodData {
XIMCallback *callbacks; /* callback parameters */
jobject x11inputmethod; /* global ref to X11InputMethod instance */
/* associated with the XIC */
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
StatusWindow *statusWindow; /* our own status window */
#endif
char *lookup_buf; /* buffer used for XmbLookupString */
@@ -372,7 +372,7 @@ destroyX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
static void
freeX11InputMethodData(JNIEnv *env, X11InputMethodData *pX11IMData)
{
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
if (pX11IMData->statusWindow != NULL){
StatusWindow *sw = pX11IMData->statusWindow;
XFreeGC(awt_display, sw->lightGC);
@@ -475,7 +475,7 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
if (pX11IMData == NULL) {
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
return False;
#else
return result;
@@ -483,7 +483,7 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
}
if ((ic = pX11IMData->current_ic) == (XIC)0){
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
return False;
#else
return result;
@@ -579,7 +579,7 @@ awt_x11inputmethod_lookupString(XKeyPressedEvent *event, KeySym *keysymp)
return result;
}
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
static StatusWindow *createStatusWindow(
Window parent) {
StatusWindow *statusWindow;
@@ -892,7 +892,7 @@ static void adjustStatusWindow(Window shell){
}
}
}
-#endif /*__linux__*/
+#endif /* __linux__ || MACOSX */
/*
* Creates two XICs, one for active clients and the other for passive
* clients. All information on those XICs are stored in the
@@ -936,7 +936,7 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
return FALSE ;
}
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
on_the_spot_styles |= XIMStatusNothing;
/*kinput does not support XIMPreeditCallbacks and XIMStatusArea
@@ -949,9 +949,9 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
break;
}
}
-#else /*! __linux__ */
+#else /*! __linux__ && !MACOSX */
on_the_spot_styles |= XIMStatusNothing;
-#endif /* __linux__ */
+#endif /* __linux__ || MACOSX */
for (i = 0; i < im_styles->count_styles; i++) {
active_styles |= im_styles->supported_styles[i] & on_the_spot_styles;
@@ -999,7 +999,7 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
NULL);
if (preedit == (XVaNestedList)NULL)
goto err;
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
/*always try XIMStatusCallbacks for active client...*/
{
status = (XVaNestedList)XVaCreateNestedList(0,
@@ -1021,7 +1021,7 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
XFree((void *)status);
XFree((void *)preedit);
}
-#else /* !__linux__ */
+#else /* !__linux__ && !MACOSX */
pX11IMData->ic_active = XCreateIC(X11im,
XNClientWindow, w,
XNFocusWindow, w,
@@ -1029,7 +1029,7 @@ createXIC(JNIEnv * env, X11InputMethodData *pX11IMData, Window w)
XNPreeditAttributes, preedit,
NULL);
XFree((void *)preedit);
-#endif /* __linux__ */
+#endif /* __linux__ || MACOSX */
pX11IMData->ic_passive = XCreateIC(X11im,
XNClientWindow, w,
XNFocusWindow, w,
@@ -1188,7 +1188,7 @@ PreeditCaretCallback(XIC ic, XPointer client_data,
}
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
static void
StatusStartCallback(XIC ic, XPointer client_data, XPointer call_data)
{
@@ -1256,7 +1256,7 @@ StatusDrawCallback(XIC ic, XPointer client_data,
finally:
AWT_UNLOCK();
}
-#endif /*__linux__*/
+#endif /* __linux__ || MACOSX */
static void CommitStringCallback(XIC ic, XPointer client_data, XPointer call_data) {
JNIEnv *env = GetJNIEnv();
@@ -1353,14 +1353,14 @@ Java_sun_awt_X11_XInputMethod_openXIMNative(JNIEnv *env,
/* Use IMInstantiate call back only on Linux, as there is a bug in Solaris
(4768335)
*/
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
registered = XRegisterIMInstantiateCallback(dpy, NULL, NULL,
NULL, (XIDProc)OpenXIMCallback, NULL);
if (!registered) {
/* directly call openXIM callback */
#endif
OpenXIMCallback(dpy, NULL, NULL);
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
}
#endif
@@ -1395,9 +1395,9 @@ Java_sun_awt_X11_XInputMethod_createXICNative(JNIEnv *env,
globalRef = (*env)->NewGlobalRef(env, this);
pX11IMData->x11inputmethod = globalRef;
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
pX11IMData->statusWindow = NULL;
-#endif /* __linux__ */
+#endif /* __linux__ || MACOSX */
pX11IMData->lookup_buf = 0;
pX11IMData->lookup_buf_len = 0;
@@ -1444,14 +1444,14 @@ Java_sun_awt_X11_XInputMethod_setXICFocusNative(JNIEnv *env,
setXICFocus(pX11IMData->current_ic, req);
currentX11InputMethodInstance = pX11IMData->x11inputmethod;
currentFocusWindow = w;
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
if (active && pX11IMData->statusWindow && pX11IMData->statusWindow->on)
onoffStatusWindow(pX11IMData, w, True);
#endif
} else {
currentX11InputMethodInstance = NULL;
currentFocusWindow = 0;
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
onoffStatusWindow(pX11IMData, 0, False);
if (pX11IMData->current_ic != NULL)
#endif
@@ -1468,7 +1468,7 @@ JNIEXPORT void JNICALL
Java_sun_awt_X11InputMethod_turnoffStatusWindow(JNIEnv *env,
jobject this)
{
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
X11InputMethodData *pX11IMData;
StatusWindow *statusWindow;
@@ -1636,7 +1636,7 @@ JNIEXPORT jboolean JNICALL Java_sun_awt_X11InputMethod_isCompositionEnabledNativ
JNIEXPORT void JNICALL Java_sun_awt_X11_XInputMethod_adjustStatusWindow
(JNIEnv *env, jobject this, jlong window)
{
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
diff --git a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c b/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
index fa75aa2..cdb0e8f 100644
--- a/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
+++ b/jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
@@ -73,13 +73,29 @@ JNIEXPORT jboolean JNICALL AWTIsHeadless() {
return isHeadless;
}
+/*
+ * Pathnames to the various awt toolkits
+ */
+
+
+#ifdef MACOSX
+ #define XAWT_PATH "/libawt_xawt.dylib"
+ #define LWAWT_PATH "/libawt_lwawt.dylib"
+ #define DEFAULT_PATH LWAWT_PATH
+ #define HEADLESS_PATH "/libawt_headless.dylib"
+#else
+ #define XAWT_PATH "/libawt_xawt.so"
+ #define DEFAULT_PATH XAWT_PATH
+ #define HEADLESS_PATH "/libawt_headless.so"
+#endif
+
jint
AWT_OnLoad(JavaVM *vm, void *reserved)
{
Dl_info dlinfo;
char buf[MAXPATHLEN];
int32_t len;
- char *p;
+ char *p, *tk;
JNI_OnLoad_type *JNI_OnLoad_ptr;
struct utsname name;
JNIEnv *env = (JNIEnv *)JNU_GetEnv(vm, JNI_VERSION_1_2);
@@ -89,6 +105,8 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
int XAWT = 0;
jstring toolkit = NULL;
jstring propname = NULL;
+ jstring fmanager = NULL;
+ jstring fmProp = NULL;
if (awtHandle != NULL) {
/* Avoid several loading attempts */
@@ -105,36 +123,50 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
/*
* The code below is responsible for:
- * 1. Loading appropriate awt library, i.e. xawt/libmawt or headless/libwawt
+ * 1. Loading appropriate awt library, i.e. libawt_xawt or libawt_headless
* 2. Setting "awt.toolkit" system property to use the appropriate Java toolkit class,
* (if user has specified the toolkit in env varialble)
*/
propname = (*env)->NewStringUTF(env, "awt.toolkit");
+ fmProp = (*env)->NewStringUTF(env, "sun.font.fontmanager");
+ tk = DEFAULT_PATH; /* default value, may be changed below */
+
/* Check if toolkit is specified in env variable */
envvar = getenv("AWT_TOOLKIT");
- if (envvar) {
- if (strstr(envvar, "XToolkit")) {
- toolkit = (*env)->NewStringUTF(env, "sun.awt.X11.XToolkit");
- }
- /* If user specified toolkit then set java system property */
- if (toolkit && propname) {
- JNU_CallStaticMethodByName (env,
- NULL,
- "java/lang/System",
- "setProperty",
- "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
- propname,toolkit);
- }
+ if (envvar && (strstr(envvar, "XToolkit"))) {
+ toolkit = (*env)->NewStringUTF(env, "sun.awt.X11.XToolkit");
+ tk = XAWT_PATH;
+ fmanager = (*env)->NewStringUTF(env, "sun.awt.X11FontManager");
+#ifdef MACOSX
+ } else {
+ fmanager = (*env)->NewStringUTF(env, "sun.font.CFontManager");
+ tk = LWAWT_PATH;
+#endif
+ }
+ /* If user specified toolkit then set java system property */
+ if (toolkit && propname) {
+ JNU_CallStaticMethodByName (env,
+ NULL,
+ "java/lang/System",
+ "setProperty",
+ "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
+ propname,toolkit);
+ }
+ if (fmanager && fmProp) {
+ JNU_CallStaticMethodByName (env,
+ NULL,
+ "java/lang/System",
+ "setProperty",
+ "(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;",
+ fmProp, fmanager);
}
/* Calculate library name to load */
if (AWTIsHeadless()) {
- strncpy(p, "/headless/libmawt.so", MAXPATHLEN-len-1);
- } else {
- /* Default AWT Toolkit on Linux and Solaris is XAWT. */
- strncpy(p, "/xawt/libmawt.so", MAXPATHLEN-len-1);
+ tk = HEADLESS_PATH;
}
+ strncpy(p, tk, MAXPATHLEN-len-1);
if (toolkit) {
(*env)->DeleteLocalRef(env, toolkit);
@@ -142,6 +174,12 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
if (propname) {
(*env)->DeleteLocalRef(env, propname);
}
+ if (fmProp) {
+ (*env)->DeleteLocalRef(env, fmProp);
+ }
+ if (fmanager) {
+ (*env)->DeleteLocalRef(env, fmanager);
+ }
JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
"(Ljava/lang/String;)V",
@@ -161,7 +199,7 @@ JNI_OnLoad(JavaVM *vm, void *reserved)
/*
* This entry point must remain in libawt.so as part of a contract
* with the CDE variant of Java Media Framework. (sdtjmplay)
- * Reflect this call over to the correct libmawt.so.
+ * Reflect this call over to the correct libawt_<toolkit>.so.
*/
JNIEXPORT void JNICALL
Java_sun_awt_motif_XsessionWMcommand(JNIEnv *env, jobject this,
@@ -191,7 +229,7 @@ Java_sun_awt_motif_XsessionWMcommand(JNIEnv *env, jobject this,
/*
* This entry point must remain in libawt.so as part of a contract
* with the CDE variant of Java Media Framework. (sdtjmplay)
- * Reflect this call over to the correct libmawt.so.
+ * Reflect this call over to the correct libawt_<toolkit>.so.
*/
JNIEXPORT void JNICALL
Java_sun_awt_motif_XsessionWMcommand_New(JNIEnv *env, jobjectArray jargv)
@@ -250,7 +288,7 @@ return_type name arglist \
/*
* These entry point must remain in libawt.so ***for Java Plugin ONLY***
- * Reflect this call over to the correct libmawt.so.
+ * Reflect this call over to the correct libawt_<toolkit>.so.
*/
REFLECT_VOID_FUNCTION(getAwtLockFunctions,
diff --git a/jdk/src/solaris/native/sun/awt/awt_Mlib.c b/jdk/src/solaris/native/sun/awt/awt_Mlib.c
index 0cfff16..fb00d4d 100644
--- a/jdk/src/solaris/native/sun/awt/awt_Mlib.c
+++ b/jdk/src/solaris/native/sun/awt/awt_Mlib.c
@@ -32,6 +32,7 @@
#include <dlfcn.h>
#include "jni.h"
#include <jni_util.h>
+#include "jvm_md.h"
#include "awt_Mlib.h"
#include "java_awt_image_BufferedImage.h"
@@ -67,11 +68,11 @@ mlib_status awt_getImagingLib(JNIEnv *env, mlibFnS_t *sMlibFns,
((strncmp(name.machine, "sun4v" , 5) == 0) &&
(getenv("USE_VIS_ON_SUN4V") != NULL)))
{
- handle = dlopen("libmlib_image_v.so", RTLD_LAZY);
+ handle = dlopen(JNI_LIB_NAME("mlib_image_v"), RTLD_LAZY);
}
if (handle == NULL) {
- handle = dlopen("libmlib_image.so", RTLD_LAZY);
+ handle = dlopen(JNI_LIB_NAME("mlib_image"), RTLD_LAZY);
}
if (handle == NULL) {
diff --git a/jdk/src/solaris/native/sun/awt/awt_Robot.c b/jdk/src/solaris/native/sun/awt/awt_Robot.c
index a830756..6818b3b 100644
--- a/jdk/src/solaris/native/sun/awt/awt_Robot.c
+++ b/jdk/src/solaris/native/sun/awt/awt_Robot.c
@@ -44,7 +44,7 @@
#include "wsutils.h"
#include "list.h"
#include "multiVis.h"
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
#include <sys/socket.h>
#endif
diff --git a/jdk/src/solaris/native/sun/awt/extutil.h b/jdk/src/solaris/native/sun/awt/extutil.h
index 9576a63..ba9f75a 100644
--- a/jdk/src/solaris/native/sun/awt/extutil.h
+++ b/jdk/src/solaris/native/sun/awt/extutil.h
@@ -58,7 +58,7 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
#ifndef _EXTUTIL_H_
#define _EXTUTIL_H_
@@ -248,4 +248,4 @@ char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \
char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n)
#endif
-#endif /* __linux__ */
+#endif /* __linux__ || MACOSX */
diff --git a/jdk/src/solaris/native/sun/awt/fontpath.c b/jdk/src/solaris/native/sun/awt/fontpath.c
index db6f8fa..e549b4f 100644
--- a/jdk/src/solaris/native/sun/awt/fontpath.c
+++ b/jdk/src/solaris/native/sun/awt/fontpath.c
@@ -23,7 +23,7 @@
* questions.
*/
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
#include <string.h>
#endif /* __linux__ */
#include <stdio.h>
@@ -40,6 +40,7 @@
#include <jni.h>
#include <jni_util.h>
+#include <jvm_md.h>
#include <sun_font_FontManager.h>
#ifndef HEADLESS
#include <X11/Xlib.h>
@@ -58,10 +59,26 @@
extern Display *awt_display;
#endif /* !HEADLESS */
+#ifdef MACOSX
+
+//
+// XXXDARWIN: Hard-code the path to Apple's fontconfig, as it is
+// not included in the dyld search path by default, and 10.4
+// does not support -rpath.
+//
+// This ignores the build time setting of ALT_FREETYPE_LIB_PATH,
+// and should be replaced with -rpath/@rpath support on 10.5 or later,
+// or via support for a the FREETYPE_LIB_PATH define.
+#define FONTCONFIG_DLL_VERSIONED X11_PATH "/lib/" VERSIONED_JNI_LIB_NAME("fontconfig", "1")
+#define FONTCONFIG_DLL X11_PATH "/lib/" JNI_LIB_NAME("fontconfig")
+#else
+#define FONTCONFIG_DLL_VERSIONED VERSIONED_JNI_LIB_NAME("fontconfig", "1")
+#define FONTCONFIG_DLL JNI_LIB_NAME("fontconfig")
+#endif
#define MAXFDIRS 512 /* Max number of directories that contain fonts */
-#ifndef __linux__
+#if !defined(__linux__) && !defined(MACOSX)
/*
* This can be set in the makefile to "/usr/X11" if so desired.
*/
@@ -111,6 +128,22 @@ static char *fullSolarisFontPath[] = {
NULL, /* terminates the list */
};
+#elif MACOSX
+static char *full_MACOSX_X11FontPath[] = {
+ X11_PATH "/lib/X11/fonts/TrueType",
+ X11_PATH "/lib/X11/fonts/truetype",
+ X11_PATH "/lib/X11/fonts/tt",
+ X11_PATH "/lib/X11/fonts/TTF",
+ X11_PATH "/lib/X11/fonts/OTF",
+ PACKAGE_PATH "/share/fonts/TrueType",
+ PACKAGE_PATH "/share/fonts/truetype",
+ PACKAGE_PATH "/share/fonts/tt",
+ PACKAGE_PATH "/share/fonts/TTF",
+ PACKAGE_PATH "/share/fonts/OTF",
+ X11_PATH "/lib/X11/fonts/Type1",
+ PACKAGE_PATH "/share/fonts/Type1",
+ NULL, /* terminates the list */
+};
#else /* __linux */
/* All the known interesting locations we have discovered on
* various flavors of Linux
@@ -362,7 +395,7 @@ static char **getX11FontPath ()
#endif /* !HEADLESS */
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
/* from awt_LoadLibrary.c */
JNIEXPORT jboolean JNICALL AWTIsHeadless();
#endif
@@ -487,8 +520,10 @@ static char *getPlatformFontPathChars(JNIEnv *env, jboolean noType1) {
*/
fcdirs = getFontConfigLocations();
-#ifdef __linux__
+#if defined(__linux__)
knowndirs = fullLinuxFontPath;
+#elif defined(MACOSX)
+ knowndirs = full_MACOSX_X11FontPath;
#else /* IF SOLARIS */
knowndirs = fullSolarisFontPath;
#endif
@@ -499,7 +534,8 @@ static char *getPlatformFontPathChars(JNIEnv *env, jboolean noType1) {
* be initialised.
*/
#ifndef HEADLESS
-#ifdef __linux__ /* There's no headless build on linux ... */
+#if defined(__linux__) || defined(MACOSX)
+ /* There's no headless build on linux ... */
if (!AWTIsHeadless()) { /* .. so need to call a function to check */
#endif
/* Using the X11 font path to locate font files is now a fallback
@@ -514,7 +550,7 @@ static char *getPlatformFontPathChars(JNIEnv *env, jboolean noType1) {
x11dirs = getX11FontPath();
}
AWT_UNLOCK();
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
}
#endif
#endif /* !HEADLESS */
@@ -547,7 +583,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11FontManager_getFontPathNative
}
#include <dlfcn.h>
-#ifndef __linux__ /* i.e. is solaris */
+#if !(defined(__linux__) || defined(MACOSX))
#include <link.h>
#endif
@@ -593,9 +629,9 @@ static void* openFontConfig() {
* certain symbols - and functionality - to be available.
* Also add explicit search for .so.1 in case .so symlink doesn't exist.
*/
- libfontconfig = dlopen("libfontconfig.so.1", RTLD_LOCAL|RTLD_LAZY);
+ libfontconfig = dlopen(FONTCONFIG_DLL_VERSIONED, RTLD_LOCAL|RTLD_LAZY);
if (libfontconfig == NULL) {
- libfontconfig = dlopen("libfontconfig.so", RTLD_LOCAL|RTLD_LAZY);
+ libfontconfig = dlopen(FONTCONFIG_DLL, RTLD_LOCAL|RTLD_LAZY);
if (libfontconfig == NULL) {
return NULL;
}
diff --git a/jdk/src/solaris/native/sun/awt/gtk2_interface.c b/jdk/src/solaris/native/sun/awt/gtk2_interface.c
index 3c0c3cc..cb93366 100644
--- a/jdk/src/solaris/native/sun/awt/gtk2_interface.c
+++ b/jdk/src/solaris/native/sun/awt/gtk2_interface.c
@@ -30,9 +30,12 @@
#include <string.h>
#include "gtk2_interface.h"
#include "java_awt_Transparency.h"
+#include "jvm_md.h"
-#define GTK2_LIB "libgtk-x11-2.0.so.0"
-#define GTHREAD_LIB "libgthread-2.0.so.0"
+#define GTK2_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gtk-x11-2.0", "0")
+#define GTK2_LIB JNI_LIB_NAME("gtk-x11-2.0")
+#define GTHREAD_LIB_VERSIONED VERSIONED_JNI_LIB_NAME("gthread-2.0", "0")
+#define GTHREAD_LIB JNI_LIB_NAME("gthread-2.0")
#define G_TYPE_INVALID G_TYPE_MAKE_FUNDAMENTAL (0)
#define G_TYPE_NONE G_TYPE_MAKE_FUNDAMENTAL (1)
@@ -414,9 +417,12 @@ gboolean gtk2_check_version()
void *lib = NULL;
gboolean result = FALSE;
- lib = dlopen(GTK2_LIB, RTLD_LAZY | RTLD_LOCAL);
+ lib = dlopen(GTK2_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL);
if (lib == NULL) {
- return FALSE;
+ lib = dlopen(GTK2_LIB, RTLD_LAZY | RTLD_LOCAL);
+ if (lib == NULL) {
+ return FALSE;
+ }
}
fp_gtk_check_version = dlsym(lib, "gtk_check_version");
@@ -470,11 +476,19 @@ gboolean gtk2_load()
int (*io_handler)();
char *gtk_modules_env;
- gtk2_libhandle = dlopen(GTK2_LIB, RTLD_LAZY | RTLD_LOCAL);
- gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL);
+ gtk2_libhandle = dlopen(GTK2_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL);
+ if (gtk2_libhandle == NULL) {
+ gtk2_libhandle = dlopen(GTK2_LIB, RTLD_LAZY | RTLD_LOCAL);
+ if (gtk2_libhandle == NULL)
+ return FALSE;
+ }
- if (gtk2_libhandle == NULL || gthread_libhandle == NULL)
- return FALSE;
+ gthread_libhandle = dlopen(GTHREAD_LIB_VERSIONED, RTLD_LAZY | RTLD_LOCAL);
+ if (gthread_libhandle == NULL) {
+ gthread_libhandle = dlopen(GTHREAD_LIB, RTLD_LAZY | RTLD_LOCAL);
+ if (gthread_libhandle == NULL)
+ return FALSE;
+ }
if (setjmp(j) == 0)
{
diff --git a/jdk/src/solaris/native/sun/awt/jawt.c b/jdk/src/solaris/native/sun/awt/jawt.c
index f6f8530..99cdb2a 100644
--- a/jdk/src/solaris/native/sun/awt/jawt.c
+++ b/jdk/src/solaris/native/sun/awt/jawt.c
@@ -42,7 +42,8 @@ JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt)
}
if (awt->version != JAWT_VERSION_1_3
- && awt->version != JAWT_VERSION_1_4) {
+ && awt->version != JAWT_VERSION_1_4
+ && awt->version != JAWT_VERSION_1_7) {
return JNI_FALSE;
}
diff --git a/jdk/src/solaris/native/sun/awt/list.c b/jdk/src/solaris/native/sun/awt/list.c
index f3b2aaa..af3fcb9 100644
--- a/jdk/src/solaris/native/sun/awt/list.c
+++ b/jdk/src/solaris/native/sun/awt/list.c
@@ -66,7 +66,7 @@ from the X Consortium.
----------------------------------------------------------------------- **/
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "list.h"
diff --git a/jdk/src/solaris/native/sun/awt/robot_common.c b/jdk/src/solaris/native/sun/awt/robot_common.c
index 4830b04..c002ebc 100644
--- a/jdk/src/solaris/native/sun/awt/robot_common.c
+++ b/jdk/src/solaris/native/sun/awt/robot_common.c
@@ -27,6 +27,10 @@
#error This file should not be included in headless library
#endif
+#ifdef MACOSX
+#include <stdlib.h>
+#endif
+
#include "robot_common.h"
/*
diff --git a/jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c b/jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
index 403a16e..66dca0d 100644
--- a/jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
+++ b/jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
@@ -171,6 +171,53 @@ static jobjectArray toFilenamesArray(JNIEnv *env, GSList* list)
return array;
}
+/**
+ * Convert a GSList to an array of filenames (with the parent folder)
+ */
+static jobjectArray toPathAndFilenamesArray(JNIEnv *env, GSList* list)
+{
+ jstring str;
+ jclass stringCls;
+ GSList *iterator;
+ jobjectArray array;
+ int i;
+ char* entry;
+
+
+ if (list == NULL) {
+ return NULL;
+ }
+
+ stringCls = (*env)->FindClass(env, "java/lang/String");
+ if (stringCls == NULL) {
+ JNU_ThrowInternalError(env, "Could not get java.lang.String class");
+ return NULL;
+ }
+
+ array = (*env)->NewObjectArray(env, fp_gtk_g_slist_length(list), stringCls,
+ NULL);
+ if (array == NULL) {
+ JNU_ThrowInternalError(env, "Could not instantiate array files array");
+ return NULL;
+ }
+
+ i = 0;
+ for (iterator = list; iterator; iterator = iterator->next) {
+ entry = (char*) iterator->data;
+
+ //check for leading slash.
+ if (entry[0] == '/') {
+ entry++;
+ }
+
+ str = (*env)->NewStringUTF(env, entry);
+ (*env)->SetObjectArrayElement(env, array, i, str);
+ i++;
+ }
+
+ return array;
+}
+
static void handle_response(GtkWidget* aDialog, gint responseId, gpointer obj)
{
JNIEnv *env;
@@ -183,16 +230,25 @@ static void handle_response(GtkWidget* aDialog, gint responseId, gpointer obj)
env = (JNIEnv *) JNU_GetEnv(jvm, JNI_VERSION_1_2);
current_folder = NULL;
filenames = NULL;
+ gboolean full_path_names = FALSE;
if (responseId == GTK_RESPONSE_ACCEPT) {
current_folder = fp_gtk_file_chooser_get_current_folder(
GTK_FILE_CHOOSER(aDialog));
+ if (current_folder == NULL) {
+ full_path_names = TRUE;
+ }
filenames = fp_gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(aDialog));
}
-
- jcurrent_folder = (*env)->NewStringUTF(env, current_folder);
- jfilenames = toFilenamesArray(env, filenames);
-
+ if (full_path_names) {
+ //This is a hack for use with "Recent Folders" in gtk where each
+ //file could have its own directory.
+ jcurrent_folder = (*env)->NewStringUTF(env, "/");
+ jfilenames = toPathAndFilenamesArray(env, filenames);
+ } else {
+ jcurrent_folder = (*env)->NewStringUTF(env, current_folder);
+ jfilenames = toFilenamesArray(env, filenames);
+ }
(*env)->CallVoidMethod(env, obj, setFileInternalMethodID, jcurrent_folder,
jfilenames);
fp_g_free(current_folder);
diff --git a/jdk/src/solaris/native/sun/font/X11FontScaler.c b/jdk/src/solaris/native/sun/font/X11FontScaler.c
index 1867b49..5808da4 100644
--- a/jdk/src/solaris/native/sun/font/X11FontScaler.c
+++ b/jdk/src/solaris/native/sun/font/X11FontScaler.c
@@ -32,7 +32,7 @@
* into X11FontScaler_md.c, which is compiled into another library.
*/
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include <ctype.h>
#include <sys/utsname.h>
diff --git a/jdk/src/solaris/native/sun/font/X11TextRenderer.c b/jdk/src/solaris/native/sun/font/X11TextRenderer.c
index fdce447..381c0b8 100644
--- a/jdk/src/solaris/native/sun/font/X11TextRenderer.c
+++ b/jdk/src/solaris/native/sun/font/X11TextRenderer.c
@@ -39,7 +39,7 @@
#include "GraphicsPrimitiveMgr.h"
#include "glyphblitting.h"
#include "sunfontids.h"
-#include <malloc.h>
+#include <stdlib.h>
JNIEXPORT void JNICALL AWTDrawGlyphList
diff --git a/jdk/src/solaris/native/sun/java2d/j2d_md.h b/jdk/src/solaris/native/sun/java2d/j2d_md.h
index 38b9924..3f5578f 100644
--- a/jdk/src/solaris/native/sun/java2d/j2d_md.h
+++ b/jdk/src/solaris/native/sun/java2d/j2d_md.h
@@ -28,11 +28,11 @@
#include <sys/types.h>
/*
- * Linux version of <sys/types.h> does not define intptr_t
+ * Linux and MACOSX's version of <sys/types.h> does not define intptr_t
*/
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
#include <stdint.h>
-#endif /* __linux__ */
+#endif /* __linux__ || MACOSX */
typedef unsigned char jubyte;
typedef unsigned short jushort;
diff --git a/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c b/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
index e5a1e3d..d9e27f9 100644
--- a/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
+++ b/jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c
@@ -63,6 +63,9 @@
* MLIB_EDGE_SRC_PADDED
*/
+#ifdef MACOSX
+#include <machine/endian.h>
+#endif
#include <mlib_image.h>
#include <mlib_ImageZoom.h>
diff --git a/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c b/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c
index 0bc52cb..0c59e10 100644
--- a/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c
+++ b/jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c
@@ -804,7 +804,7 @@ static AnyFunc* hash_table_vis[HASH_SIZE];
static int initialized;
static int usevis = JNI_TRUE;
-#ifdef __linux__
+#if defined(__linux__) || defined(MACOSX)
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c b/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c
index d389e16..16209e7 100644
--- a/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c
+++ b/jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c
@@ -442,4 +442,10 @@ OGLSD_SwapBuffers(JNIEnv *env, jlong window)
j2d_glXSwapBuffers(awt_display, (Window)window);
}
+// needed by Mac OS X port, no-op on other platforms
+void
+OGLSD_Flush(JNIEnv *env)
+{
+}
+
#endif /* !HEADLESS */
diff --git a/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h b/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h
index e017cf7..14fe6f1 100644
--- a/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h
+++ b/jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
#include <stdlib.h>
+#ifndef MACOSX
#include <link.h>
+#endif
+#include "jvm_md.h"
#include "J2D_GL/glx.h"
#include "OGLFuncMacros.h"
@@ -113,7 +116,7 @@ do { \
{ \
char *libGLPath = getenv("J2D_ALT_LIBGL_PATH"); \
if (libGLPath == NULL) { \
- libGLPath = "libGL.so.1"; \
+ libGLPath = VERSIONED_JNI_LIB_NAME("GL", "1"); \
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
diff --git a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
index a993217..5b8aeb4 100644
--- a/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+++ b/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
@@ -32,6 +32,7 @@
#include "gdefs.h"
#include "jni_util.h"
+#include "jvm_md.h"
#include "awt_Component.h"
#include "awt_GraphicsEnv.h"
@@ -160,7 +161,7 @@ Java_sun_java2d_x11_X11SurfaceData_initIDs(JNIEnv *env, jclass xsd,
if (tryDGA && (getenv("NO_J2D_DGA") == NULL)) {
/* we use RTLD_NOW because of bug 4032715 */
- lib = dlopen("libsunwjdga.so", RTLD_NOW);
+ lib = dlopen(JNI_LIB_NAME("sunwjdga"), RTLD_NOW);
}
if (lib != NULL) {
@@ -540,6 +541,8 @@ XImage* X11SD_CreateSharedImage(X11SDOps *xsdo,
J2dRlsTraceLn1(J2D_TRACE_ERROR,
"X11SD_SetupSharedSegment shmget has failed: %s",
strerror(errno));
+ free((void *)shminfo);
+ XDestroyImage(img);
return NULL;
}
@@ -549,6 +552,8 @@ XImage* X11SD_CreateSharedImage(X11SDOps *xsdo,
J2dRlsTraceLn1(J2D_TRACE_ERROR,
"X11SD_SetupSharedSegment shmat has failed: %s",
strerror(errno));
+ free((void *)shminfo);
+ XDestroyImage(img);
return NULL;
}
@@ -569,6 +574,9 @@ XImage* X11SD_CreateSharedImage(X11SDOps *xsdo,
J2dRlsTraceLn1(J2D_TRACE_ERROR,
"X11SD_SetupSharedSegment XShmAttach has failed: %s",
strerror(errno));
+ shmdt(shminfo->shmaddr);
+ free((void *)shminfo);
+ XDestroyImage(img);
return NULL;
}
@@ -1344,13 +1352,10 @@ void X11SD_DisposeXImage(XImage * image) {
#ifdef MITSHM
if (image->obdata != NULL) {
X11SD_DropSharedSegment((XShmSegmentInfo*)image->obdata);
- } else {
- free(image->data);
+ image->obdata = NULL;
}
-#else
- free(image->data);
#endif /* MITSHM */
- XFree(image);
+ XDestroyImage(image);
}
}
diff --git a/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c b/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
index 5de53ca..b598a22 100644
--- a/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
+++ b/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
@@ -29,7 +29,7 @@
#include "X11SurfaceData.h"
/*#include <xcb/xcb.h>*/
-#include <Xrender.h>
+#include <X11/extensions/Xrender.h>
#ifndef RepeatNone /* added in 0.10 */
#define RepeatNone 0
diff --git a/jdk/src/solaris/native/sun/jdga/dgalock.c b/jdk/src/solaris/native/sun/jdga/dgalock.c
index f412d6f..0e9c400 100644
--- a/jdk/src/solaris/native/sun/jdga/dgalock.c
+++ b/jdk/src/solaris/native/sun/jdga/dgalock.c
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
#include "jni.h"
+#include "jvm_md.h"
#include "jdga.h"
#include "jdgadevice.h"
@@ -84,10 +85,10 @@ Drawable GetVirtualDrawableStub(Display *display, Drawable drawable) {
static GetVirtualDrawableFunc * GetVirtualDrawable = GetVirtualDrawableStub;
static void Solaris_DGA_XineramaInit(Display *display) {
- void * handle = 0;
+ void * handle = NULL;
if (IsXineramaOn == NULL) {
- handle = dlopen("libxinerama.so", RTLD_NOW);
- if (handle != 0) {
+ handle = dlopen(JNI_LIB_NAME("xinerama"), RTLD_NOW);
+ if (handle != NULL) {
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
diff --git a/jdk/src/solaris/native/sun/management/FileSystemImpl.c b/jdk/src/solaris/native/sun/management/FileSystemImpl.c
index 3668cac..1efff52 100644
--- a/jdk/src/solaris/native/sun/management/FileSystemImpl.c
+++ b/jdk/src/solaris/native/sun/management/FileSystemImpl.c
@@ -30,6 +30,10 @@
#include "jni_util.h"
#include "sun_management_FileSystemImpl.h"
+#ifdef _ALLBSD_SOURCE
+#define stat64 stat
+#endif
+
/*
* Class: sun_management_FileSystemImpl
* Method: isAccessUserOnly0
diff --git a/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c b/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
index 47d2199..3d26212 100644
--- a/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
+++ b/jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
@@ -33,7 +33,7 @@
#include <strings.h>
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#include <string.h>
#endif
diff --git a/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c b/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
index 18313bb..6883902 100644
--- a/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
+++ b/jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
@@ -26,11 +26,12 @@
#include "jni.h"
#include "jni_util.h"
#include "jvm.h"
+#include "jvm_md.h"
#include "jlong.h"
#include "sun_net_spi_DefaultProxySelector.h"
#include <dlfcn.h>
#include <stdio.h>
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#include <string.h>
#else
#include <strings.h>
@@ -110,8 +111,9 @@ Java_sun_net_spi_DefaultProxySelector_init(JNIEnv *env, jclass clazz) {
/**
* Let's try to load le GConf-2 library
*/
- if (dlopen("libgconf-2.so", RTLD_GLOBAL | RTLD_LAZY) != NULL ||
- dlopen("libgconf-2.so.4", RTLD_GLOBAL | RTLD_LAZY) != NULL) {
+ if (dlopen(JNI_LIB_NAME("gconf-2"), RTLD_GLOBAL | RTLD_LAZY) != NULL ||
+ dlopen(VERSIONED_JNI_LIB_NAME("gconf-2", "4"),
+ RTLD_GLOBAL | RTLD_LAZY) != NULL) {
gconf_ver = 2;
}
if (gconf_ver > 0) {
diff --git a/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c b/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
index 598159b..7d42d14 100644
--- a/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
+++ b/jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c
@@ -35,7 +35,7 @@
#include <string.h>
#include <errno.h>
-#if __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#include <netinet/in.h>
#endif
@@ -86,7 +86,7 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
rv = connect(fd, 0, 0);
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
{
int len;
SOCKADDR sa;
@@ -96,17 +96,30 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
#ifdef AF_INET6
if (ipv6_available()) {
struct sockaddr_in6 *him6 = (struct sockaddr_in6 *)&sa;
+#if defined(_ALLBSD_SOURCE)
+ him6->sin6_family = AF_INET6;
+#else
him6->sin6_family = AF_UNSPEC;
+#endif
len = sizeof(struct sockaddr_in6);
} else
#endif
{
struct sockaddr_in *him4 = (struct sockaddr_in*)&sa;
+#if defined(_ALLBSD_SOURCE)
+ him4->sin_family = AF_INET;
+#else
him4->sin_family = AF_UNSPEC;
+#endif
len = sizeof(struct sockaddr_in);
}
rv = connect(fd, (struct sockaddr *)&sa, len);
+
+#if defined(_ALLBSD_SOURCE)
+ if (rv < 0 && errno == EADDRNOTAVAIL)
+ rv = errno = 0;
+#endif
}
#endif
diff --git a/jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c b/jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c
index 340e781..c37686b 100644
--- a/jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c
+++ b/jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c
@@ -36,6 +36,7 @@
#include <sys/socket.h>
#include "nio_util.h"
+#include <limits.h>
JNIEXPORT jint JNICALL
Java_sun_nio_ch_DatagramDispatcher_read0(JNIEnv *env, jclass clazz,
@@ -60,23 +61,14 @@ Java_sun_nio_ch_DatagramDispatcher_readv0(JNIEnv *env, jclass clazz,
ssize_t result = 0;
struct iovec *iov = (struct iovec *)jlong_to_ptr(address);
struct msghdr m;
- if (len > 16) {
- len = 16;
+ if (len > IOV_MAX) {
+ len = IOV_MAX;
}
- m.msg_name = NULL;
- m.msg_namelen = 0;
+ // initialize the message
+ memset(&m, 0, sizeof(m));
m.msg_iov = iov;
m.msg_iovlen = len;
-#ifdef __solaris__
- m.msg_accrights = NULL;
- m.msg_accrightslen = 0;
-#endif
-
-#ifdef __linux__
- m.msg_control = NULL;
- m.msg_controllen = 0;
-#endif
result = recvmsg(fd, &m, 0);
if (result < 0 && errno == ECONNREFUSED) {
@@ -108,23 +100,14 @@ Java_sun_nio_ch_DatagramDispatcher_writev0(JNIEnv *env, jclass clazz,
struct iovec *iov = (struct iovec *)jlong_to_ptr(address);
struct msghdr m;
ssize_t result = 0;
- if (len > 16) {
- len = 16;
+ if (len > IOV_MAX) {
+ len = IOV_MAX;
}
- m.msg_name = NULL;
- m.msg_namelen = 0;
+ // initialize the message
+ memset(&m, 0, sizeof(m));
m.msg_iov = iov;
m.msg_iovlen = len;
-#ifdef __solaris__
- m.msg_accrights = NULL;
- m.msg_accrightslen = 0;
-#endif
-
-#ifdef __linux__
- m.msg_control = NULL;
- m.msg_controllen = 0;
-#endif
result = sendmsg(fd, &m, 0);
if (result < 0 && errno == ECONNREFUSED) {
diff --git a/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c b/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c
index 8083914..8e5c0fd 100644
--- a/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c
+++ b/jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c
@@ -26,9 +26,11 @@
#include "jni.h"
#include "jni_util.h"
#include "jvm.h"
+#include "jvm_md.h"
#include "jlong.h"
#include <sys/mman.h>
#include <sys/stat.h>
+#include <fcntl.h>
#include "sun_nio_ch_FileChannelImpl.h"
#include "java_lang_Integer.h"
#include "nio.h"
@@ -37,6 +39,13 @@
#if defined(__linux__) || defined(__solaris__)
#include <sys/sendfile.h>
+#elif defined(_ALLBSD_SOURCE)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+
+#define lseek64 lseek
+#define mmap64 mmap
#endif
static jfieldID chan_fd; /* jobject 'fd' in sun.io.FileChannelImpl */
@@ -192,6 +201,33 @@ Java_sun_nio_ch_FileChannelImpl_transferTo0(JNIEnv *env, jobject this,
return IOS_THROWN;
}
return result;
+#elif defined(__APPLE__)
+ off_t numBytes;
+ int result;
+
+ numBytes = count;
+
+#ifdef __APPLE__
+ result = sendfile(srcFD, dstFD, position, &numBytes, NULL, 0);
+#endif
+
+ if (numBytes > 0)
+ return numBytes;
+
+ if (result == -1) {
+ if (errno == EAGAIN)
+ return IOS_UNAVAILABLE;
+ if (errno == EOPNOTSUPP || errno == ENOTSOCK || errno == ENOTCONN)
+ return IOS_UNSUPPORTED_CASE;
+ if ((errno == EINVAL) && ((ssize_t)count >= 0))
+ return IOS_UNSUPPORTED_CASE;
+ if (errno == EINTR)
+ return IOS_INTERRUPTED;
+ JNU_ThrowIOExceptionWithLastError(env, "Transfer failed");
+ return IOS_THROWN;
+ }
+
+ return result;
#else
return IOS_UNSUPPORTED_CASE;
#endif
diff --git a/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c b/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
index 6468ee9..6808dbe 100644
--- a/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
+++ b/jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c
@@ -33,9 +33,24 @@
#include <sys/socket.h>
#include <fcntl.h>
#include <sys/uio.h>
+#include <unistd.h>
#include "nio.h"
#include "nio_util.h"
+#ifdef _ALLBSD_SOURCE
+#define stat64 stat
+#define flock64 flock
+#define off64_t off_t
+#define F_SETLKW64 F_SETLKW
+#define F_SETLK64 F_SETLK
+
+#define pread64 pread
+#define pwrite64 pwrite
+#define ftruncate64 ftruncate
+#define fstat64 fstat
+
+#define fdatasync fsync
+#endif
static int preCloseFD = -1; /* File descriptor to which we dup other fd's
before closing them for real */
@@ -191,7 +206,7 @@ Java_sun_nio_ch_FileDispatcherImpl_lock0(JNIEnv *env, jobject this, jobject fdo,
}
lockResult = fcntl(fd, cmd, &fl);
if (lockResult < 0) {
- if ((cmd == F_SETLK64) && (errno == EAGAIN))
+ if ((cmd == F_SETLK64) && (errno == EAGAIN || errno == EACCES))
return sun_nio_ch_FileDispatcherImpl_NO_LOCK;
if (errno == EINTR)
return sun_nio_ch_FileDispatcherImpl_INTERRUPTED;
diff --git a/jdk/src/solaris/native/sun/nio/ch/FileKey.c b/jdk/src/solaris/native/sun/nio/ch/FileKey.c
index 4ce5130..85719b2 100644
--- a/jdk/src/solaris/native/sun/nio/ch/FileKey.c
+++ b/jdk/src/solaris/native/sun/nio/ch/FileKey.c
@@ -30,6 +30,12 @@
#include "nio_util.h"
#include "sun_nio_ch_FileKey.h"
+#ifdef _ALLBSD_SOURCE
+#define stat64 stat
+
+#define fstat64 fstat
+#endif
+
static jfieldID key_st_dev; /* id for FileKey.st_dev */
static jfieldID key_st_ino; /* id for FileKey.st_ino */
diff --git a/jdk/src/solaris/native/sun/nio/ch/Net.c b/jdk/src/solaris/native/sun/nio/ch/Net.c
index def9859..45c09c3 100644
--- a/jdk/src/solaris/native/sun/nio/ch/Net.c
+++ b/jdk/src/solaris/native/sun/nio/ch/Net.c
@@ -116,6 +116,47 @@ struct my_group_source_req {
#endif /* __linux__ */
+#ifdef _ALLBSD_SOURCE
+
+#ifndef IP_BLOCK_SOURCE
+
+#define IP_ADD_SOURCE_MEMBERSHIP 70 /* join a source-specific group */
+#define IP_DROP_SOURCE_MEMBERSHIP 71 /* drop a single source */
+#define IP_BLOCK_SOURCE 72 /* block a source */
+#define IP_UNBLOCK_SOURCE 73 /* unblock a source */
+
+#endif /* IP_BLOCK_SOURCE */
+
+#ifndef MCAST_BLOCK_SOURCE
+
+#define MCAST_JOIN_SOURCE_GROUP 82 /* join a source-specific group */
+#define MCAST_LEAVE_SOURCE_GROUP 83 /* leave a single source */
+#define MCAST_BLOCK_SOURCE 84 /* block a source */
+#define MCAST_UNBLOCK_SOURCE 85 /* unblock a source */
+
+#endif /* MCAST_BLOCK_SOURCE */
+
+#ifndef IPV6_ADD_MEMBERSHIP
+
+#define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
+#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
+
+#endif /* IPV6_ADD_MEMBERSHIP */
+
+struct my_ip_mreq_source {
+ struct in_addr imr_multiaddr;
+ struct in_addr imr_interface;
+ struct in_addr imr_sourceaddr;
+};
+
+struct my_group_source_req {
+ uint32_t gsr_interface; /* interface index */
+ struct sockaddr_storage gsr_group; /* group address */
+ struct sockaddr_storage gsr_source; /* source address */
+};
+
+#endif /* _ALLBSD_SOURCE */
+
#define COPY_INET6_ADDRESS(env, source, target) \
(*env)->GetByteArrayRegion(env, source, 0, 16, target)
@@ -157,7 +198,12 @@ Java_sun_nio_ch_Net_isIPv6Available0(JNIEnv* env, jclass cl)
JNIEXPORT jboolean JNICALL
Java_sun_nio_ch_Net_canIPv6SocketJoinIPv4Group0(JNIEnv* env, jclass cl)
{
+#ifdef MACOSX
+ /* for now IPv6 sockets cannot join IPv4 multicast groups */
+ return JNI_FALSE;
+#else
return JNI_TRUE;
+#endif
}
JNIEXPORT jboolean JNICALL
@@ -287,8 +333,30 @@ Java_sun_nio_ch_Net_localPort(JNIEnv *env, jclass clazz, jobject fdo)
SOCKADDR sa;
socklen_t sa_len = SOCKADDR_LEN;
if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
+#ifdef _ALLBSD_SOURCE
+ /*
+ * XXXBSD:
+ * ECONNRESET is specific to the BSDs. We can not return an error,
+ * as the calling Java code with raise a java.lang.Error given the expectation
+ * that getsockname() will never fail. According to the Single UNIX Specification,
+ * it shouldn't fail. As such, we just fill in generic Linux-compatible values.
+ */
+ if (errno == ECONNRESET) {
+ struct sockaddr_in *sin;
+ sin = (struct sockaddr_in *) &sa;
+ bzero(sin, sizeof(*sin));
+ sin->sin_len = sizeof(struct sockaddr_in);
+ sin->sin_family = AF_INET;
+ sin->sin_port = htonl(0);
+ sin->sin_addr.s_addr = INADDR_ANY;
+ } else {
+ handleSocketError(env, errno);
+ return -1;
+ }
+#else /* _ALLBSD_SOURCE */
handleSocketError(env, errno);
return -1;
+#endif /* _ALLBSD_SOURCE */
}
return NET_GetPortFromSockaddr((struct sockaddr *)&sa);
}
@@ -300,8 +368,30 @@ Java_sun_nio_ch_Net_localInetAddress(JNIEnv *env, jclass clazz, jobject fdo)
socklen_t sa_len = SOCKADDR_LEN;
int port;
if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
+#ifdef _ALLBSD_SOURCE
+ /*
+ * XXXBSD:
+ * ECONNRESET is specific to the BSDs. We can not return an error,
+ * as the calling Java code with raise a java.lang.Error with the expectation
+ * that getsockname() will never fail. According to the Single UNIX Specification,
+ * it shouldn't fail. As such, we just fill in generic Linux-compatible values.
+ */
+ if (errno == ECONNRESET) {
+ struct sockaddr_in *sin;
+ sin = (struct sockaddr_in *) &sa;
+ bzero(sin, sizeof(*sin));
+ sin->sin_len = sizeof(struct sockaddr_in);
+ sin->sin_family = AF_INET;
+ sin->sin_port = htonl(0);
+ sin->sin_addr.s_addr = INADDR_ANY;
+ } else {
+ handleSocketError(env, errno);
+ return NULL;
+ }
+#else /* _ALLBSD_SOURCE */
handleSocketError(env, errno);
return NULL;
+#endif /* _ALLBSD_SOURCE */
}
return NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
}
@@ -365,7 +455,8 @@ Java_sun_nio_ch_Net_setIntOption0(JNIEnv *env, jclass clazz, jobject fdo,
struct linger linger;
u_char carg;
void *parg;
- int arglen, n;
+ socklen_t arglen;
+ int n;
/* Option value is an int except for a few specific cases */
@@ -419,12 +510,17 @@ Java_sun_nio_ch_Net_joinOrDrop4(JNIEnv *env, jobject this, jboolean join, jobjec
optval = (void*)&mreq;
optlen = sizeof(mreq);
} else {
+#ifdef MACOSX
+ /* no IPv4 include-mode filtering for now */
+ return IOS_UNAVAILABLE;
+#else
mreq_source.imr_multiaddr.s_addr = htonl(group);
mreq_source.imr_sourceaddr.s_addr = htonl(source);
mreq_source.imr_interface.s_addr = htonl(interf);
opt = (join) ? IP_ADD_SOURCE_MEMBERSHIP : IP_DROP_SOURCE_MEMBERSHIP;
optval = (void*)&mreq_source;
optlen = sizeof(mreq_source);
+#endif
}
n = setsockopt(fdval(env,fdo), IPPROTO_IP, opt, optval, optlen);
@@ -440,6 +536,10 @@ JNIEXPORT jint JNICALL
Java_sun_nio_ch_Net_blockOrUnblock4(JNIEnv *env, jobject this, jboolean block, jobject fdo,
jint group, jint interf, jint source)
{
+#ifdef MACOSX
+ /* no IPv4 exclude-mode filtering for now */
+ return IOS_UNAVAILABLE;
+#else
struct my_ip_mreq_source mreq_source;
int n;
int opt = (block) ? IP_BLOCK_SOURCE : IP_UNBLOCK_SOURCE;
@@ -456,6 +556,7 @@ Java_sun_nio_ch_Net_blockOrUnblock4(JNIEnv *env, jobject this, jboolean block, j
handleSocketError(env, errno);
}
return 0;
+#endif
}
JNIEXPORT jint JNICALL
@@ -475,8 +576,8 @@ Java_sun_nio_ch_Net_joinOrDrop6(JNIEnv *env, jobject this, jboolean join, jobjec
optval = (void*)&mreq6;
optlen = sizeof(mreq6);
} else {
-#ifdef __linux__
- /* Include-mode filtering broken on Linux at least to 2.6.24 */
+#if defined (__linux__) || defined(MACOSX)
+ /* Include-mode filtering broken on Mac OS & Linux at least to 2.6.24 */
return IOS_UNAVAILABLE;
#else
initGroupSourceReq(env, group, index, source, &req);
@@ -504,6 +605,10 @@ Java_sun_nio_ch_Net_blockOrUnblock6(JNIEnv *env, jobject this, jboolean block, j
jbyteArray group, jint index, jbyteArray source)
{
#ifdef AF_INET6
+ #ifdef MACOSX
+ /* no IPv6 exclude-mode filtering for now */
+ return IOS_UNAVAILABLE;
+ #else
struct my_group_source_req req;
int n;
int opt = (block) ? MCAST_BLOCK_SOURCE : MCAST_UNBLOCK_SOURCE;
@@ -518,6 +623,7 @@ Java_sun_nio_ch_Net_blockOrUnblock6(JNIEnv *env, jobject this, jboolean block, j
handleSocketError(env, errno);
}
return 0;
+ #endif
#else
JNU_ThrowInternalError(env, "Should not get here");
return IOS_THROWN;
@@ -528,7 +634,7 @@ JNIEXPORT void JNICALL
Java_sun_nio_ch_Net_setInterface4(JNIEnv* env, jobject this, jobject fdo, jint interf)
{
struct in_addr in;
- int arglen = sizeof(struct in_addr);
+ socklen_t arglen = sizeof(struct in_addr);
int n;
in.s_addr = htonl(interf);
@@ -559,7 +665,7 @@ JNIEXPORT void JNICALL
Java_sun_nio_ch_Net_setInterface6(JNIEnv* env, jobject this, jobject fdo, jint index)
{
int value = (jint)index;
- int arglen = sizeof(value);
+ socklen_t arglen = sizeof(value);
int n;
n = setsockopt(fdval(env, fdo), IPPROTO_IPV6, IPV6_MULTICAST_IF,
@@ -602,9 +708,11 @@ handleSocketError(JNIEnv *env, jint errorValue)
switch (errorValue) {
case EINPROGRESS: /* Non-blocking connect */
return 0;
+#ifdef EPROTO
case EPROTO:
xn = JNU_JAVANETPKG "ProtocolException";
break;
+#endif
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
diff --git a/jdk/src/solaris/native/sun/nio/ch/Sctp.h b/jdk/src/solaris/native/sun/nio/ch/Sctp.h
deleted file mode 100644
index ea5d5a7..0000000
--- a/jdk/src/solaris/native/sun/nio/ch/Sctp.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#ifndef SUN_NIO_CH_SCTP_H
-#define SUN_NIO_CH_SCTP_H
-
-#ifdef __solaris__
-
-#define _XPG4_2
-#define __EXTENSIONS__
-#include <sys/socket.h>
-#include <netinet/sctp.h>
-#include "jni.h"
-
-/* Current Solaris headers don't comply with draft rfc */
-#ifndef SCTP_EOF
-#define SCTP_EOF MSG_EOF
-#endif
-
-#ifndef SCTP_UNORDERED
-#define SCTP_UNORDERED MSG_UNORDERED
-#endif
-
-/* The current version of the socket API extension shipped with Solaris does
- * not define the following options that the Java API (optionally) supports */
-#ifndef SCTP_EXPLICIT_EOR
-#define SCTP_EXPLICIT_EOR -1
-#endif
-#ifndef SCTP_FRAGMENT_INTERLEAVE
-#define SCTP_FRAGMENT_INTERLEAVE -1
-#endif
-#ifndef SCTP_SET_PEER_PRIMARY_ADDR
-#define SCTP_SET_PEER_PRIMARY_ADDR -1
-#endif
-
-/* Function types to support dynamic linking of socket API extension functions
- * for SCTP. This is so that there is no linkage depandancy during build or
- * runtime for libsctp.*/
-typedef int sctp_getladdrs_func(int sock, sctp_assoc_t id, void **addrs);
-typedef int sctp_freeladdrs_func(void* addrs);
-typedef int sctp_getpaddrs_func(int sock, sctp_assoc_t id, void **addrs);
-typedef int sctp_freepaddrs_func(void *addrs);
-typedef int sctp_bindx_func(int sock, void *addrs, int addrcnt, int flags);
-typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
-
-
-
-#else /* __linux__ */
-#include <stdint.h>
-#include <linux/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include "jni.h"
-
-//Causes compiler error if not found, should make warning and uncomment
-/*#include <netinet/sctp.h>*/
-
-#ifndef IPPROTO_SCTP
-#define IPPROTO_SCTP 132
-#endif
-
-/* The current version of lksctp does
- * not define the following option that the Java API (optionally) supports */
-#ifndef SCTP_EXPLICIT_EOR
-#define SCTP_EXPLICIT_EOR -1
-#endif
-
-/* Definitions taken from lksctp-tools-1.0.8/src/include/netinet/sctp.h */
-#ifndef SCTP_INITMSG
-
-enum sctp_optname {
- SCTP_RTOINFO,
-#define SCTP_RTOINFO SCTP_RTOINFO
- SCTP_ASSOCINFO,
-#define SCTP_ASSOCINFO SCTP_ASSOCINFO
- SCTP_INITMSG,
-#define SCTP_INITMSG SCTP_INITMSG
- SCTP_NODELAY, /* Get/set nodelay option. */
-#define SCTP_NODELAY SCTP_NODELAY
- SCTP_AUTOCLOSE,
-#define SCTP_AUTOCLOSE SCTP_AUTOCLOSE
- SCTP_SET_PEER_PRIMARY_ADDR,
-#define SCTP_SET_PEER_PRIMARY_ADDR SCTP_SET_PEER_PRIMARY_ADDR
- SCTP_PRIMARY_ADDR,
-#define SCTP_PRIMARY_ADDR SCTP_PRIMARY_ADDR
- SCTP_ADAPTATION_LAYER,
-#define SCTP_ADAPTATION_LAYER SCTP_ADAPTATION_LAYER
- SCTP_DISABLE_FRAGMENTS,
-#define SCTP_DISABLE_FRAGMENTS SCTP_DISABLE_FRAGMENTS
- SCTP_PEER_ADDR_PARAMS,
-#define SCTP_PEER_ADDR_PARAMS SCTP_PEER_ADDR_PARAMS
- SCTP_DEFAULT_SEND_PARAM,
-#define SCTP_DEFAULT_SEND_PARAM SCTP_DEFAULT_SEND_PARAM
- SCTP_EVENTS,
-#define SCTP_EVENTS SCTP_EVENTS
- SCTP_I_WANT_MAPPED_V4_ADDR, /* Turn on/off mapped v4 addresses */
-#define SCTP_I_WANT_MAPPED_V4_ADDR SCTP_I_WANT_MAPPED_V4_ADDR
- SCTP_MAXSEG, /* Get/set maximum fragment. */
-#define SCTP_MAXSEG SCTP_MAXSEG
- SCTP_STATUS,
-#define SCTP_STATUS SCTP_STATUS
- SCTP_GET_PEER_ADDR_INFO,
-#define SCTP_GET_PEER_ADDR_INFO SCTP_GET_PEER_ADDR_INFO
- SCTP_DELAYED_ACK_TIME,
-#define SCTP_DELAYED_ACK_TIME SCTP_DELAYED_ACK_TIME
- SCTP_CONTEXT, /* Receive Context */
-#define SCTP_CONTEXT SCTP_CONTEXT
- SCTP_FRAGMENT_INTERLEAVE,
-#define SCTP_FRAGMENT_INTERLEAVE SCTP_FRAGMENT_INTERLEAVE
- SCTP_PARTIAL_DELIVERY_POINT, /* Set/Get partial delivery point */
-#define SCTP_PARTIAL_DELIVERY_POINT SCTP_PARTIAL_DELIVERY_POINT
- SCTP_MAX_BURST, /* Set/Get max burst */
-#define SCTP_MAX_BURST SCTP_MAX_BURST
-};
-
-enum sctp_sac_state {
- SCTP_COMM_UP,
- SCTP_COMM_LOST,
- SCTP_RESTART,
- SCTP_SHUTDOWN_COMP,
- SCTP_CANT_STR_ASSOC,
-};
-
-enum sctp_spc_state {
- SCTP_ADDR_AVAILABLE,
- SCTP_ADDR_UNREACHABLE,
- SCTP_ADDR_REMOVED,
- SCTP_ADDR_ADDED,
- SCTP_ADDR_MADE_PRIM,
- SCTP_ADDR_CONFIRMED,
-};
-
-enum sctp_sinfo_flags {
- SCTP_UNORDERED = 1, /* Send/receive message unordered. */
- SCTP_ADDR_OVER = 2, /* Override the primary destination. */
- SCTP_ABORT=4, /* Send an ABORT message to the peer. */
- SCTP_EOF=MSG_FIN, /* Initiate graceful shutdown process. */
-};
-
-enum sctp_sn_type {
- SCTP_SN_TYPE_BASE = (1<<15),
- SCTP_ASSOC_CHANGE,
- SCTP_PEER_ADDR_CHANGE,
- SCTP_SEND_FAILED,
- SCTP_REMOTE_ERROR,
- SCTP_SHUTDOWN_EVENT,
- SCTP_PARTIAL_DELIVERY_EVENT,
- SCTP_ADAPTATION_INDICATION,
-};
-
-typedef enum sctp_cmsg_type {
- SCTP_INIT, /* 5.2.1 SCTP Initiation Structure */
-#define SCTP_INIT SCTP_INIT
- SCTP_SNDRCV, /* 5.2.2 SCTP Header Information Structure */
-#define SCTP_SNDRCV SCTP_SNDRCV
-} sctp_cmsg_t;
-
-enum sctp_msg_flags {
- MSG_NOTIFICATION = 0x8000,
-#define MSG_NOTIFICATION MSG_NOTIFICATION
-};
-
-#define SCTP_BINDX_ADD_ADDR 0x01
-#define SCTP_BINDX_REM_ADDR 0x02
-
-typedef __s32 sctp_assoc_t;
-
-struct sctp_initmsg {
- __u16 sinit_num_ostreams;
- __u16 sinit_max_instreams;
- __u16 sinit_max_attempts;
- __u16 sinit_max_init_timeo;
-};
-
-struct sctp_sndrcvinfo {
- __u16 sinfo_stream;
- __u16 sinfo_ssn;
- __u16 sinfo_flags;
- __u32 sinfo_ppid;
- __u32 sinfo_context;
- __u32 sinfo_timetolive;
- __u32 sinfo_tsn;
- __u32 sinfo_cumtsn;
- sctp_assoc_t sinfo_assoc_id;
-};
-
-struct sctp_event_subscribe {
- __u8 sctp_data_io_event;
- __u8 sctp_association_event;
- __u8 sctp_address_event;
- __u8 sctp_send_failure_event;
- __u8 sctp_peer_error_event;
- __u8 sctp_shutdown_event;
- __u8 sctp_partial_delivery_event;
- __u8 sctp_adaptation_layer_event;
-};
-
-struct sctp_send_failed {
- __u16 ssf_type;
- __u16 ssf_flags;
- __u32 ssf_length;
- __u32 ssf_error;
- struct sctp_sndrcvinfo ssf_info;
- sctp_assoc_t ssf_assoc_id;
- __u8 ssf_data[0];
-};
-
-struct sctp_assoc_change {
- __u16 sac_type;
- __u16 sac_flags;
- __u32 sac_length;
- __u16 sac_state;
- __u16 sac_error;
- __u16 sac_outbound_streams;
- __u16 sac_inbound_streams;
- sctp_assoc_t sac_assoc_id;
- __u8 sac_info[0];
-};
-
-struct sctp_shutdown_event {
- __u16 sse_type;
- __u16 sse_flags;
- __u32 sse_length;
- sctp_assoc_t sse_assoc_id;
-};
-
-struct sctp_paddr_change {
- __u16 spc_type;
- __u16 spc_flags;
- __u32 spc_length;
- struct sockaddr_storage spc_aaddr;
- int spc_state;
- int spc_error;
- sctp_assoc_t spc_assoc_id;
-} __attribute__((packed, aligned(4)));
-
-struct sctp_remote_error {
- __u16 sre_type;
- __u16 sre_flags;
- __u32 sre_length;
- __u16 sre_error;
- sctp_assoc_t sre_assoc_id;
- __u8 sre_data[0];
-};
-
-struct sctp_adaptation_event {
- __u16 sai_type;
- __u16 sai_flags;
- __u32 sai_length;
- __u32 sai_adaptation_ind;
- sctp_assoc_t sai_assoc_id;
-};
-
-struct sctp_setprim {
- sctp_assoc_t ssp_assoc_id;
- struct sockaddr_storage ssp_addr;
-} __attribute__((packed, aligned(4)));
-
-struct sctp_setpeerprim {
- sctp_assoc_t sspp_assoc_id;
- struct sockaddr_storage sspp_addr;
-} __attribute__((packed, aligned(4)));
-
-
-struct sctp_pdapi_event {
- __u16 pdapi_type;
- __u16 pdapi_flags;
- __u32 pdapi_length;
- __u32 pdapi_indication;
- sctp_assoc_t pdapi_assoc_id;
-};
-
-union sctp_notification {
- struct {
- __u16 sn_type; /* Notification type. */
- __u16 sn_flags;
- __u32 sn_length;
- } sn_header;
- struct sctp_assoc_change sn_assoc_change;
- struct sctp_paddr_change sn_paddr_change;
- struct sctp_remote_error sn_remote_error;
- struct sctp_send_failed sn_send_failed;
- struct sctp_shutdown_event sn_shutdown_event;
- struct sctp_adaptation_event sn_adaptation_event;
- struct sctp_pdapi_event sn_pdapi_event;
-};
-
-#endif /* SCTP_INITMSG */
-
-/* Function types to support dynamic linking of socket API extension functions
- * for SCTP. This is so that there is no linkage depandancy during build or
- * runtime for libsctp.*/
-typedef int sctp_getladdrs_func(int sd, sctp_assoc_t id, struct sockaddr **addrs);
-typedef int sctp_freeladdrs_func(struct sockaddr *addrs);
-typedef int sctp_getpaddrs_func(int sd, sctp_assoc_t id, struct sockaddr **addrs);
-typedef int sctp_freepaddrs_func(struct sockaddr *addrs);
-typedef int sctp_bindx_func(int sd, struct sockaddr *addrs, int addrcnt, int flags);
-typedef int sctp_peeloff_func(int sock, sctp_assoc_t id);
-
-
-#endif /* __linux__ */
-
-sctp_getladdrs_func* nio_sctp_getladdrs;
-sctp_freeladdrs_func* nio_sctp_freeladdrs;
-sctp_getpaddrs_func* nio_sctp_getpaddrs;
-sctp_freepaddrs_func* nio_sctp_freepaddrs;
-sctp_bindx_func* nio_sctp_bindx;
-sctp_peeloff_func* nio_sctp_peeloff;
-
-jboolean loadSocketExtensionFuncs(JNIEnv* env);
-
-#endif /* !SUN_NIO_CH_SCTP_H */
diff --git a/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c b/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c
deleted file mode 100644
index 8e40204..0000000
--- a/jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "Sctp.h"
-
-#include "jni.h"
-#include "nio_util.h"
-#include "nio.h"
-#include "net_util.h"
-#include "net_util_md.h"
-#include "sun_nio_ch_SctpNet.h"
-#include "sun_nio_ch_SctpChannelImpl.h"
-#include "sun_nio_ch_SctpAssocChange.h"
-#include "sun_nio_ch_SctpResultContainer.h"
-#include "sun_nio_ch_SctpPeerAddrChange.h"
-
-/* sizeof(union sctp_notification */
-#define NOTIFICATION_BUFFER_SIZE 280
-
-#define MESSAGE_IMPL_CLASS "sun/nio/ch/SctpMessageInfoImpl"
-#define RESULT_CONTAINER_CLASS "sun/nio/ch/SctpResultContainer"
-#define SEND_FAILED_CLASS "sun/nio/ch/SctpSendFailed"
-#define ASSOC_CHANGE_CLASS "sun/nio/ch/SctpAssocChange"
-#define PEER_CHANGE_CLASS "sun/nio/ch/SctpPeerAddrChange"
-#define SHUTDOWN_CLASS "sun/nio/ch/SctpShutdown"
-
-struct controlData {
- int assocId;
- unsigned short streamNumber;
- jboolean unordered;
- unsigned int ppid;
-};
-
-static jclass smi_class; /* sun.nio.ch.SctpMessageInfoImpl */
-static jmethodID smi_ctrID; /* sun.nio.ch.SctpMessageInfoImpl.<init> */
-static jfieldID src_valueID; /* sun.nio.ch.SctpResultContainer.value */
-static jfieldID src_typeID; /* sun.nio.ch.SctpResultContainer.type */
-static jclass ssf_class; /* sun.nio.ch.SctpSendFailed */
-static jmethodID ssf_ctrID; /* sun.nio.ch.SctpSendFailed.<init> */
-static jclass sac_class; /* sun.nio.ch.SctpAssociationChanged */
-static jmethodID sac_ctrID; /* sun.nio.ch.SctpAssociationChanged.<init> */
-static jclass spc_class; /* sun.nio.ch.SctpPeerAddressChanged */
-static jmethodID spc_ctrID; /* sun.nio.ch.SctpPeerAddressChanged.<init> */
-static jclass ss_class; /* sun.nio.ch.SctpShutdown */
-static jmethodID ss_ctrID; /* sun.nio.ch.SctpShutdown.<init> */
-static jfieldID isa_addrID; /* java.net.InetSocketAddress.addr */
-static jfieldID isa_portID; /* java.net.InetSocketAddress.port */
-
-/* defined in SctpNet.c */
-jobject SockAddrToInetSocketAddress(JNIEnv* env, struct sockaddr* addr);
-
-/* use SocketChannelImpl's checkConnect implementation */
-extern jint Java_sun_nio_ch_SocketChannelImpl_checkConnect(JNIEnv* env,
- jobject this, jobject fdo, jboolean block, jboolean ready);
-
-/*
- * Class: sun_nio_ch_SctpChannelImpl
- * Method: initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpChannelImpl_initIDs
- (JNIEnv *env, jclass klass) {
- jclass cls;
-
- /* SctpMessageInfoImpl */
- cls = (*env)->FindClass(env, MESSAGE_IMPL_CLASS);
- CHECK_NULL(cls);
- smi_class = (*env)->NewGlobalRef(env, cls);
- CHECK_NULL(smi_class);
- smi_ctrID = (*env)->GetMethodID(env, cls, "<init>",
- "(ILjava/net/SocketAddress;IIZZI)V");
- CHECK_NULL(smi_ctrID);
-
- /* SctpResultContainer */
- cls = (*env)->FindClass(env, RESULT_CONTAINER_CLASS);
- CHECK_NULL(cls);
- src_valueID = (*env)->GetFieldID(env, cls, "value", "Ljava/lang/Object;");
- CHECK_NULL(src_valueID);
- src_typeID = (*env)->GetFieldID(env, cls, "type", "I");
- CHECK_NULL(src_typeID);
-
- /* SctpSendFailed */
- cls = (*env)->FindClass(env, SEND_FAILED_CLASS);
- CHECK_NULL(cls);
- ssf_class = (*env)->NewGlobalRef(env, cls);
- CHECK_NULL(ssf_class);
- ssf_ctrID = (*env)->GetMethodID(env, cls, "<init>",
- "(ILjava/net/SocketAddress;Ljava/nio/ByteBuffer;II)V");
- CHECK_NULL(ssf_ctrID);
-
- /* SctpAssocChange */
- cls = (*env)->FindClass(env, ASSOC_CHANGE_CLASS);
- CHECK_NULL(cls);
- sac_class = (*env)->NewGlobalRef(env, cls);
- CHECK_NULL(sac_class);
- sac_ctrID = (*env)->GetMethodID(env, cls, "<init>", "(IIII)V");
- CHECK_NULL(sac_ctrID);
-
- /* SctpPeerAddrChange */
- cls = (*env)->FindClass(env, PEER_CHANGE_CLASS);
- CHECK_NULL(cls);
- spc_class = (*env)->NewGlobalRef(env, cls);
- CHECK_NULL(spc_class);
- spc_ctrID = (*env)->GetMethodID(env, cls, "<init>",
- "(ILjava/net/SocketAddress;I)V");
- CHECK_NULL(spc_ctrID);
-
- /* sun.nio.ch.SctpShutdown */
- cls = (*env)->FindClass(env, SHUTDOWN_CLASS);
- CHECK_NULL(cls);
- ss_class = (*env)->NewGlobalRef(env, cls);
- CHECK_NULL(ss_class);
- ss_ctrID = (*env)->GetMethodID(env, cls, "<init>", "(I)V");
- CHECK_NULL(ss_ctrID);
-
- /* InetSocketAddress */
- cls = (*env)->FindClass(env, "java/net/InetSocketAddress");
- CHECK_NULL(cls);
- isa_addrID = (*env)->GetFieldID(env, cls, "addr", "Ljava/net/InetAddress;");
- CHECK_NULL(isa_addrID);
- isa_portID = (*env)->GetFieldID(env, cls, "port", "I");
-}
-
-void getControlData
- (struct msghdr* msg, struct controlData* cdata) {
- struct cmsghdr* cmsg;
-
- for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) {
- if (cmsg->cmsg_level == IPPROTO_SCTP && cmsg->cmsg_type == SCTP_SNDRCV) {
- struct sctp_sndrcvinfo *sri;
-
- sri = (struct sctp_sndrcvinfo *) CMSG_DATA(cmsg);
- cdata->assocId = sri->sinfo_assoc_id;
- cdata->streamNumber = sri->sinfo_stream;
- cdata->unordered = (sri->sinfo_flags & SCTP_UNORDERED) ? JNI_TRUE :
- JNI_FALSE;
- cdata->ppid = ntohl(sri->sinfo_ppid);
-
- return;
- }
- }
- return;
-}
-
-void setControlData
- (struct msghdr* msg, struct controlData* cdata) {
- struct cmsghdr* cmsg;
- struct sctp_sndrcvinfo *sri;
-
- cmsg = CMSG_FIRSTHDR(msg);
- cmsg->cmsg_level = IPPROTO_SCTP;
- cmsg->cmsg_type = SCTP_SNDRCV;
- cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-
- /* Initialize the payload */
- sri = (struct sctp_sndrcvinfo*) CMSG_DATA(cmsg);
- memset(sri, 0, sizeof (*sri));
-
- if (cdata->streamNumber > 0) {
- sri->sinfo_stream = cdata->streamNumber;
- }
- if (cdata->assocId > 0) {
- sri->sinfo_assoc_id = cdata->assocId;
- }
- if (cdata->unordered == JNI_TRUE) {
- sri->sinfo_flags = sri->sinfo_flags | SCTP_UNORDERED;
- }
-
- if (cdata->ppid > 0) {
- sri->sinfo_ppid = htonl(cdata->ppid);
- }
-
- /* Sum of the length of all control messages in the buffer. */
- msg->msg_controllen = cmsg->cmsg_len;
-}
-
-// TODO: test: can create send failed without any data? if so need to
-// update API so that buffer can be null if no data.
-void handleSendFailed
- (JNIEnv* env, int fd, jobject resultContainerObj, struct sctp_send_failed *ssf,
- int read, jboolean isEOR, struct sockaddr* sap) {
- jobject bufferObj = NULL, resultObj, isaObj;
- char *addressP;
- struct sctp_sndrcvinfo *sri;
- int remaining, dataLength;
-
- /* the actual undelivered message data is directly after the ssf */
- int dataOffset = sizeof(struct sctp_send_failed);
-
- sri = (struct sctp_sndrcvinfo*) &ssf->ssf_info;
-
- /* the number of bytes remaining to be read in the sctp_send_failed notif*/
- remaining = ssf->ssf_length - read;
-
- /* the size of the actual undelivered message */
- dataLength = ssf->ssf_length - dataOffset;
-
- /* retrieved address from sockaddr */
- isaObj = SockAddrToInetSocketAddress(env, sap);
-
- /* data retrieved from sff_data */
- if (dataLength > 0) {
- struct iovec iov[1];
- struct msghdr msg[1];
- int rv, alreadyRead;
- char *dataP = (char*) ssf;
- dataP += dataOffset;
-
- if ((addressP = malloc(dataLength)) == NULL) {
- JNU_ThrowOutOfMemoryError(env, "handleSendFailed");
- return;
- }
-
- memset(msg, 0, sizeof (*msg));
- msg->msg_iov = iov;
- msg->msg_iovlen = 1;
-
- bufferObj = (*env)->NewDirectByteBuffer(env, addressP, dataLength);
- CHECK_NULL(bufferObj);
-
- alreadyRead = read - dataOffset;
- if (alreadyRead > 0) {
- memcpy(addressP, /*ssf->ssf_data*/ dataP, alreadyRead);
- iov->iov_base = addressP + alreadyRead;
- iov->iov_len = dataLength - alreadyRead;
- } else {
- iov->iov_base = addressP;
- iov->iov_len = dataLength;
- }
-
- if (remaining > 0) {
- if ((rv = recvmsg(fd, msg, 0)) < 0) {
- handleSocketError(env, errno);
- return;
- }
-
- if (rv != (dataLength - alreadyRead) || !(msg->msg_flags & MSG_EOR)) {
- //TODO: assert false: "should not reach here";
- return;
- }
- // TODO: Set and document (in API) buffers position.
- }
- }
-
- /* create SctpSendFailed */
- resultObj = (*env)->NewObject(env, ssf_class, ssf_ctrID, ssf->ssf_assoc_id,
- isaObj, bufferObj, ssf->ssf_error, sri->sinfo_stream);
- CHECK_NULL(resultObj);
- (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj);
- (*env)->SetIntField(env, resultContainerObj, src_typeID,
- sun_nio_ch_SctpResultContainer_SEND_FAILED);
-}
-
-void handleAssocChange
- (JNIEnv* env, jobject resultContainerObj, struct sctp_assoc_change *sac) {
- jobject resultObj;
- int state = 0;
-
- switch (sac->sac_state) {
- case SCTP_COMM_UP :
- state = sun_nio_ch_SctpAssocChange_SCTP_COMM_UP;
- break;
- case SCTP_COMM_LOST :
- state = sun_nio_ch_SctpAssocChange_SCTP_COMM_LOST;
- break;
- case SCTP_RESTART :
- state = sun_nio_ch_SctpAssocChange_SCTP_RESTART;
- break;
- case SCTP_SHUTDOWN_COMP :
- state = sun_nio_ch_SctpAssocChange_SCTP_SHUTDOWN;
- break;
- case SCTP_CANT_STR_ASSOC :
- state = sun_nio_ch_SctpAssocChange_SCTP_CANT_START;
- }
-
- /* create SctpAssociationChanged */
- resultObj = (*env)->NewObject(env, sac_class, sac_ctrID, sac->sac_assoc_id,
- state, sac->sac_outbound_streams, sac->sac_inbound_streams);
- CHECK_NULL(resultObj);
- (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj);
- (*env)->SetIntField(env, resultContainerObj, src_typeID,
- sun_nio_ch_SctpResultContainer_ASSOCIATION_CHANGED);
-}
-
-void handleShutdown
- (JNIEnv* env, jobject resultContainerObj, struct sctp_shutdown_event* sse) {
- /* create SctpShutdown */
- jobject resultObj = (*env)->NewObject(env, ss_class, ss_ctrID, sse->sse_assoc_id);
- CHECK_NULL(resultObj);
- (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj);
- (*env)->SetIntField(env, resultContainerObj, src_typeID,
- sun_nio_ch_SctpResultContainer_SHUTDOWN);
-}
-
-void handlePeerAddrChange
- (JNIEnv* env, jobject resultContainerObj, struct sctp_paddr_change* spc) {
- int event = 0;
- jobject addressObj, resultObj;
- unsigned int state = spc->spc_state;
-
- switch (state) {
- case SCTP_ADDR_AVAILABLE :
- event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_AVAILABLE;
- break;
- case SCTP_ADDR_UNREACHABLE :
- event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_UNREACHABLE;
- break;
- case SCTP_ADDR_REMOVED :
- event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_REMOVED;
- break;
- case SCTP_ADDR_ADDED :
- event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_ADDED;
- break;
- case SCTP_ADDR_MADE_PRIM :
- event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_MADE_PRIM;
-#ifdef __linux__ /* Solaris currently doesn't support SCTP_ADDR_CONFIRMED */
- break;
- case SCTP_ADDR_CONFIRMED :
- event = sun_nio_ch_SctpPeerAddrChange_SCTP_ADDR_CONFIRMED;
-#endif /* __linux__ */
- }
-
- addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
-
- /* create SctpPeerAddressChanged */
- resultObj = (*env)->NewObject(env, spc_class, spc_ctrID, spc->spc_assoc_id,
- addressObj, event);
- CHECK_NULL(resultObj);
- (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj);
- (*env)->SetIntField(env, resultContainerObj, src_typeID,
- sun_nio_ch_SctpResultContainer_PEER_ADDRESS_CHANGED);
-}
-
-void handleUninteresting
- (union sctp_notification *snp) {
- //fprintf(stdout,"\nNative: handleUninterestingNotification: Receive notification type [%u]", snp->sn_header.sn_type);
-}
-
-/**
- * Handle notifications from the SCTP stack.
- * Returns JNI_TRUE if the notification is one that is of interest to the
- * Java API, otherwise JNI_FALSE.
- */
-jboolean handleNotification
- (JNIEnv* env, int fd, jobject resultContainerObj, union sctp_notification* snp,
- int read, jboolean isEOR, struct sockaddr* sap) {
- switch (snp->sn_header.sn_type) {
- case SCTP_SEND_FAILED:
- handleSendFailed(env, fd, resultContainerObj, &snp->sn_send_failed,
- read, isEOR, sap);
- return JNI_TRUE;
- case SCTP_ASSOC_CHANGE:
- handleAssocChange(env, resultContainerObj, &snp->sn_assoc_change);
- return JNI_TRUE;
- case SCTP_SHUTDOWN_EVENT:
- handleShutdown(env, resultContainerObj, &snp->sn_shutdown_event);
- return JNI_TRUE;
- case SCTP_PEER_ADDR_CHANGE:
- handlePeerAddrChange(env, resultContainerObj, &snp->sn_paddr_change);
- return JNI_TRUE;
- default :
- /* the Java API is not interested in this event, maybe we are? */
- handleUninteresting(snp);
- }
- return JNI_FALSE;
-}
-
-void handleMessage
- (JNIEnv* env, jobject resultContainerObj, struct msghdr* msg,int read,
- jboolean isEOR, struct sockaddr* sap) {
- jobject isa, resultObj;
- struct controlData cdata[1];
-
- if (read == 0) {
- /* we reached EOF */
- read = -1;
- }
-
- isa = SockAddrToInetSocketAddress(env, sap);
- getControlData(msg, cdata);
-
- /* create SctpMessageInfoImpl */
- resultObj = (*env)->NewObject(env, smi_class, smi_ctrID, cdata->assocId,
- isa, read, cdata->streamNumber,
- isEOR ? JNI_TRUE : JNI_FALSE,
- cdata->unordered, cdata->ppid);
- CHECK_NULL(resultObj);
- (*env)->SetObjectField(env, resultContainerObj, src_valueID, resultObj);
- (*env)->SetIntField(env, resultContainerObj, src_typeID,
- sun_nio_ch_SctpResultContainer_MESSAGE);
-}
-
-/*
- * Class: sun_nio_ch_SctpChannelImpl
- * Method: receive0
- * Signature: (ILsun/nio/ch/SctpResultContainer;JIZ)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_receive0
- (JNIEnv *env, jclass klass, jint fd, jobject resultContainerObj,
- jlong address, jint length, jboolean peek) {
- SOCKADDR sa;
- int sa_len = sizeof(sa);
- ssize_t rv = 0;
- jlong *addr = jlong_to_ptr(address);
- struct iovec iov[1];
- struct msghdr msg[1];
- char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))];
- int flags = peek == JNI_TRUE ? MSG_PEEK : 0;
-
- /* Set up the msghdr structure for receiving */
- memset(msg, 0, sizeof (*msg));
- msg->msg_name = &sa;
- msg->msg_namelen = sa_len;
- iov->iov_base = addr;
- iov->iov_len = length;
- msg->msg_iov = iov;
- msg->msg_iovlen = 1;
- msg->msg_control = cbuf;
- msg->msg_controllen = sizeof(cbuf);
- msg->msg_flags = 0;
-
- do {
- if ((rv = recvmsg(fd, msg, flags)) < 0) {
- if (errno == EWOULDBLOCK) {
- return IOS_UNAVAILABLE;
- } else if (errno == EINTR) {
- return IOS_INTERRUPTED;
-
-#ifdef __linux__
- } else if (errno == ENOTCONN) {
- /* ENOTCONN when EOF reached */
- rv = 0;
- /* there will be no control data */
- msg->msg_controllen = 0;
-#endif /* __linux__ */
-
- } else {
- handleSocketError(env, errno);
- return 0;
- }
- }
-
- if (msg->msg_flags & MSG_NOTIFICATION) {
- char *bufp = (char*)addr;
- union sctp_notification *snp;
-
- if (!(msg->msg_flags & MSG_EOR) && length < NOTIFICATION_BUFFER_SIZE) {
- char buf[NOTIFICATION_BUFFER_SIZE];
- int rvSAVE = rv;
- memcpy(buf, addr, rv);
- iov->iov_base = buf + rv;
- iov->iov_len = NOTIFICATION_BUFFER_SIZE - rv;
- if ((rv = recvmsg(fd, msg, flags)) < 0) {
- handleSocketError(env, errno);
- return 0;
- }
- bufp = buf;
- rv += rvSAVE;
- }
- snp = (union sctp_notification *) bufp;
- if (handleNotification(env, fd, resultContainerObj, snp, rv,
- (msg->msg_flags & MSG_EOR),
- (struct sockaddr*)&sa ) == JNI_TRUE) {
- /* We have received a notification that is of interest to
- to the Java API. The appropriate notification will be
- set in the result container. */
- return 0;
- }
-
- // set iov back to addr, and reset msg_controllen
- iov->iov_base = addr;
- iov->iov_len = length;
- msg->msg_control = cbuf;
- msg->msg_controllen = sizeof(cbuf);
- }
- } while (msg->msg_flags & MSG_NOTIFICATION);
-
- handleMessage(env, resultContainerObj, msg, rv,
- (msg->msg_flags & MSG_EOR), (struct sockaddr*)&sa);
- return rv;
-}
-
-/*
- * Class: sun_nio_ch_SctpChannelImpl
- * Method: send0
- * Signature: (IJILjava/net/SocketAddress;IIZI)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_send0
- (JNIEnv *env, jclass klass, jint fd, jlong address, jint length,
- jobject saTarget, jint assocId, jint streamNumber, jboolean unordered,
- jint ppid) {
- SOCKADDR sa;
- int sa_len = sizeof(sa);
- ssize_t rv = 0;
- jlong *addr = jlong_to_ptr(address);
- struct iovec iov[1];
- struct msghdr msg[1];
- int cbuf_size = CMSG_SPACE(sizeof (struct sctp_sndrcvinfo));
- char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))];
- struct controlData cdata[1];
-
- /* SctpChannel:
- * saTarget may contain the preferred address or NULL to use primary,
- * assocId will always be -1
- * SctpMultiChannell:
- * Setup new association, saTarget will contain address, assocId = -1
- * Association already existing, assocId != -1, saTarget = preferred addr
- */
- if (saTarget != NULL /*&& assocId <= 0*/) {
-
- jobject targetAddress = (*env)->GetObjectField(env, saTarget, isa_addrID);
- jint targetPort = (*env)->GetIntField(env, saTarget, isa_portID);
-
- if (NET_InetAddressToSockaddr(env, targetAddress, targetPort,
- (struct sockaddr *)&sa,
- &sa_len, JNI_TRUE) != 0) {
- return IOS_THROWN;
- }
- } else {
- memset(&sa, '\x0', sa_len);
- sa_len = 0;
- }
-
- /* Set up the msghdr structure for sending */
- memset(msg, 0, sizeof (*msg));
- memset(cbuf, 0, cbuf_size);
- msg->msg_name = &sa;
- msg->msg_namelen = sa_len;
- iov->iov_base = addr;
- iov->iov_len = length;
- msg->msg_iov = iov;
- msg->msg_iovlen = 1;
- msg->msg_control = cbuf;
- msg->msg_controllen = cbuf_size;
- msg->msg_flags = 0;
-
- cdata->streamNumber = streamNumber;
- cdata->assocId = assocId;
- cdata->unordered = unordered;
- cdata->ppid = ppid;
- setControlData(msg, cdata);
-
- if ((rv = sendmsg(fd, msg, 0)) < 0) {
- if (errno == EWOULDBLOCK) {
- return IOS_UNAVAILABLE;
- } else if (errno == EINTR) {
- return IOS_INTERRUPTED;
- } else if (errno == EPIPE) {
- JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
- "Socket is shutdown for writing");
- } else {
- handleSocketError(env, errno);
- return 0;
- }
- }
-
- return rv;
-}
-
-/*
- * Class: sun_nio_ch_SctpChannelImpl
- * Method: checkConnect
- * Signature: (Ljava/io/FileDescriptor;ZZ)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpChannelImpl_checkConnect
- (JNIEnv* env, jobject this, jobject fdo, jboolean block, jboolean ready) {
- return Java_sun_nio_ch_SocketChannelImpl_checkConnect(env, this,
- fdo, block, ready);
-}
-
diff --git a/jdk/src/solaris/native/sun/nio/ch/SctpNet.c b/jdk/src/solaris/native/sun/nio/ch/SctpNet.c
deleted file mode 100644
index 3eaf402..0000000
--- a/jdk/src/solaris/native/sun/nio/ch/SctpNet.c
+++ /dev/null
@@ -1,753 +0,0 @@
-/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <dlfcn.h>
-
-#include "Sctp.h"
-#include "jni.h"
-#include "jni_util.h"
-#include "nio_util.h"
-#include "nio.h"
-#include "net_util.h"
-#include "net_util_md.h"
-#include "sun_nio_ch_SctpNet.h"
-#include "sun_nio_ch_SctpStdSocketOption.h"
-
-static jclass isaCls = 0;
-static jmethodID isaCtrID = 0;
-
-static const char* nativeSctpLib = "libsctp.so.1";
-static jboolean funcsLoaded = JNI_FALSE;
-
-JNIEXPORT jint JNICALL JNI_OnLoad
- (JavaVM *vm, void *reserved) {
- return JNI_VERSION_1_2;
-}
-
-static int preCloseFD = -1; /* File descriptor to which we dup other fd's
- before closing them for real */
-
-/**
- * Loads the native sctp library that contains the socket extension
- * functions, as well as locating the individual functions.
- * There will be a pending exception if this method returns false.
- */
-jboolean loadSocketExtensionFuncs
- (JNIEnv* env) {
- if (dlopen(nativeSctpLib, RTLD_GLOBAL | RTLD_LAZY) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
- return JNI_FALSE;
- }
-
- if ((nio_sctp_getladdrs = (sctp_getladdrs_func*)
- dlsym(RTLD_DEFAULT, "sctp_getladdrs")) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
- return JNI_FALSE;
- }
-
- if ((nio_sctp_freeladdrs = (sctp_freeladdrs_func*)
- dlsym(RTLD_DEFAULT, "sctp_freeladdrs")) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
- return JNI_FALSE;
- }
-
- if ((nio_sctp_getpaddrs = (sctp_getpaddrs_func*)
- dlsym(RTLD_DEFAULT, "sctp_getpaddrs")) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
- return JNI_FALSE;
- }
-
- if ((nio_sctp_freepaddrs = (sctp_freepaddrs_func*)
- dlsym(RTLD_DEFAULT, "sctp_freepaddrs")) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
- return JNI_FALSE;
- }
-
- if ((nio_sctp_bindx = (sctp_bindx_func*)
- dlsym(RTLD_DEFAULT, "sctp_bindx")) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
- return JNI_FALSE;
- }
-
- if ((nio_sctp_peeloff = (sctp_peeloff_func*)
- dlsym(RTLD_DEFAULT, "sctp_peeloff")) == NULL) {
- JNU_ThrowByName(env, "java/lang/UnsupportedOperationException",
- dlerror());
- return JNI_FALSE;
- }
-
- funcsLoaded = JNI_TRUE;
- return JNI_TRUE;
-}
-
-jint
-handleSocketError(JNIEnv *env, jint errorValue)
-{
- char *xn;
- switch (errorValue) {
- case EINPROGRESS: /* Non-blocking connect */
- return 0;
- case EPROTO:
- xn= JNU_JAVANETPKG "ProtocolException";
- break;
- case ECONNREFUSED:
- xn = JNU_JAVANETPKG "ConnectException";
- break;
- case ETIMEDOUT:
- xn = JNU_JAVANETPKG "ConnectException";
- break;
- case EHOSTUNREACH:
- xn = JNU_JAVANETPKG "NoRouteToHostException";
- break;
- case EADDRINUSE: /* Fall through */
- case EADDRNOTAVAIL:
- xn = JNU_JAVANETPKG "BindException";
- break;
- default:
- xn = JNU_JAVANETPKG "SocketException";
- break;
- }
- errno = errorValue;
- JNU_ThrowByNameWithLastError(env, xn, "NioSocketError");
- return IOS_THROWN;
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: init
- * Signature: ()V
- */
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_SctpNet_init
- (JNIEnv *env, jclass cl) {
- int sp[2];
- if (socketpair(PF_UNIX, SOCK_STREAM, 0, sp) < 0) {
- JNU_ThrowIOExceptionWithLastError(env, "socketpair failed");
- return;
- }
- preCloseFD = sp[0];
- close(sp[1]);
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: socket0
- * Signature: (Z)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpNet_socket0
- (JNIEnv *env, jclass klass, jboolean oneToOne) {
- int fd;
- struct sctp_event_subscribe event;
-#ifdef AF_INET6
- int domain = ipv6_available() ? AF_INET6 : AF_INET;
-#else
- int domain = AF_INET;
-#endif
-
- /* Try to load the socket API extension functions */
- if (!funcsLoaded && !loadSocketExtensionFuncs(env)) {
- return 0;
- }
-
- fd = socket(domain, (oneToOne ? SOCK_STREAM : SOCK_SEQPACKET), IPPROTO_SCTP);
-
- if (fd < 0) {
- return handleSocketError(env, errno);
- }
-
- /* Enable events */
- memset(&event, 0, sizeof(event));
- event.sctp_data_io_event = 1;
- event.sctp_association_event = 1;
- event.sctp_address_event = 1;
- event.sctp_send_failure_event = 1;
- //event.sctp_peer_error_event = 1;
- event.sctp_shutdown_event = 1;
- //event.sctp_partial_delivery_event = 1;
- //event.sctp_adaptation_layer_event = 1;
- if (setsockopt(fd, IPPROTO_SCTP, SCTP_EVENTS, &event, sizeof(event)) != 0) {
- handleSocketError(env, errno);
- }
- return fd;
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: bindx
- * Signature: (I[Ljava/net/InetAddress;IIZ)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_bindx
- (JNIEnv *env, jclass klass, jint fd, jobjectArray addrs, jint port,
- jint addrsLength, jboolean add, jboolean preferIPv6) {
- SOCKADDR *sap, *tmpSap;
- int i, sa_len = sizeof(SOCKADDR);
- jobject ia;
-
- if (addrsLength < 1)
- return;
-
- if ((sap = calloc(addrsLength, sa_len)) == NULL) {
- JNU_ThrowOutOfMemoryError(env, "heap allocation failure");
- return;
- }
-
- tmpSap = sap;
- for (i=0; i<addrsLength; i++) {
- ia = (*env)->GetObjectArrayElement(env, addrs, i);
- if (NET_InetAddressToSockaddr(env, ia, port, (struct sockaddr*)tmpSap,
- &sa_len, preferIPv6) != 0) {
- free(sap);
- return;
- }
- tmpSap++;
- }
-
- if (nio_sctp_bindx(fd, (void*)sap, addrsLength, add ? SCTP_BINDX_ADD_ADDR :
- SCTP_BINDX_REM_ADDR) != 0) {
- handleSocketError(env, errno);
- }
-
- free(sap);
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: listen0
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_SctpNet_listen0
- (JNIEnv *env, jclass cl, jint fd, jint backlog) {
- if (listen(fd, backlog) < 0)
- handleSocketError(env, errno);
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: connect0
- * Signature: (ILjava/net/InetAddress;I)I
- */
-JNIEXPORT jint JNICALL
-Java_sun_nio_ch_SctpNet_connect0
- (JNIEnv *env, jclass clazz, int fd, jobject iao, jint port) {
- SOCKADDR sa;
- int sa_len = SOCKADDR_LEN;
- int rv;
-
- if (NET_InetAddressToSockaddr(env, iao, port, (struct sockaddr *) &sa,
- &sa_len, JNI_TRUE) != 0) {
- return IOS_THROWN;
- }
-
- rv = connect(fd, (struct sockaddr *)&sa, sa_len);
- if (rv != 0) {
- if (errno == EINPROGRESS) {
- return IOS_UNAVAILABLE;
- } else if (errno == EINTR) {
- return IOS_INTERRUPTED;
- }
- return handleSocketError(env, errno);
- }
- return 1;
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: close0
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_SctpNet_close0
- (JNIEnv *env, jclass clazz, jint fd) {
- if (fd != -1) {
- int rv = close(fd);
- if (rv < 0)
- JNU_ThrowIOExceptionWithLastError(env, "Close failed");
- }
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: preClose0
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_SctpNet_preClose0
- (JNIEnv *env, jclass clazz, jint fd) {
- if (preCloseFD >= 0) {
- if (dup2(preCloseFD, fd) < 0)
- JNU_ThrowIOExceptionWithLastError(env, "dup2 failed");
- }
-}
-
-void initializeISA
- (JNIEnv* env) {
- if (isaCls == 0) {
- jclass c = (*env)->FindClass(env, "java/net/InetSocketAddress");
- CHECK_NULL(c);
- isaCls = (*env)->NewGlobalRef(env, c);
- CHECK_NULL(isaCls);
- (*env)->DeleteLocalRef(env, c);
- isaCtrID = (*env)->GetMethodID(env, isaCls, "<init>",
- "(Ljava/net/InetAddress;I)V");
- }
-}
-
-jobject SockAddrToInetSocketAddress
- (JNIEnv *env, struct sockaddr* sap) {
- int port = 0;
-
- jobject ia = NET_SockaddrToInetAddress(env, sap, &port);
- if (ia == NULL)
- return NULL;
-
- if (isaCls == 0) {
- initializeISA(env);
- CHECK_NULL_RETURN(isaCls, NULL);
- }
-
- return (*env)->NewObject(env, isaCls, isaCtrID, ia, port);
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: getLocalAddresses0
- * Signature: (I)[Ljava/net/SocketAddress;
- */
-JNIEXPORT jobjectArray JNICALL Java_sun_nio_ch_SctpNet_getLocalAddresses0
- (JNIEnv *env, jclass klass, jint fd) {
- void *addr_buf, *laddr;
- struct sockaddr* sap;
- int i, addrCount;
- jobjectArray isaa;
-
-#ifdef __solaris__
- if ((addrCount = nio_sctp_getladdrs(fd, 0, (void **)&addr_buf)) == -1) {
-#else /* __linux__ */
- if ((addrCount = nio_sctp_getladdrs(fd, 0, (struct sockaddr **)&addr_buf)) == -1) {
-#endif
- handleSocketError(env, errno);
- return NULL;
- }
-
- if (addrCount < 1)
- return NULL;
-
- if (isaCls == 0) {
- initializeISA(env);
- CHECK_NULL_RETURN(isaCls, NULL);
- }
-
- isaa = (*env)->NewObjectArray(env, addrCount, isaCls, NULL);
- if (isaa == NULL) {
- nio_sctp_freeladdrs(addr_buf);
- return NULL;
- }
-
- laddr = addr_buf;
- for (i=0; i<addrCount; i++) {
- int port = 0;
- jobject isa = NULL, ia;
- sap = (struct sockaddr*)addr_buf;
- ia = NET_SockaddrToInetAddress(env, sap, &port);
- if (ia != NULL)
- isa = (*env)->NewObject(env, isaCls, isaCtrID, ia, port);
- if (isa != NULL)
- (*env)->SetObjectArrayElement(env, isaa, i, isa);
-
- if (sap->sa_family == AF_INET)
- addr_buf = ((struct sockaddr_in*)addr_buf) + 1;
- else
- addr_buf = ((struct sockaddr_in6*)addr_buf) + 1;
- }
-
- nio_sctp_freeladdrs(laddr);
- return isaa;
-}
-
-jobjectArray getRemoteAddresses
- (JNIEnv *env, jint fd, sctp_assoc_t id) {
- void *addr_buf, *paddr;
- struct sockaddr* sap;
- int i, addrCount;
- jobjectArray isaa;
-
-#if __solaris__
- if ((addrCount = nio_sctp_getpaddrs(fd, id, (void **)&addr_buf)) == -1) {
-#else /* __linux__ */
- if ((addrCount = nio_sctp_getpaddrs(fd, id, (struct sockaddr**)&addr_buf)) == -1) {
-#endif
- handleSocketError(env, errno);
- return NULL;
- }
-
- if (addrCount < 1)
- return NULL;
-
- if (isaCls == 0) {
- initializeISA(env);
- CHECK_NULL_RETURN(isaCls, NULL);
- }
-
- isaa = (*env)->NewObjectArray(env, addrCount, isaCls, NULL);
- if (isaa == NULL) {
- nio_sctp_freepaddrs(addr_buf);
- return NULL;
- }
-
- paddr = addr_buf;
- for (i=0; i<addrCount; i++) {
- jobject ia, isa = NULL;
- int port;
- sap = (struct sockaddr*)addr_buf;
- ia = NET_SockaddrToInetAddress(env, sap, &port);
- if (ia != NULL)
- isa = (*env)->NewObject(env, isaCls, isaCtrID, ia, port);
- if (isa != NULL)
- (*env)->SetObjectArrayElement(env, isaa, i, isa);
-
- if (sap->sa_family == AF_INET)
- addr_buf = ((struct sockaddr_in*)addr_buf) + 1;
- else
- addr_buf = ((struct sockaddr_in6*)addr_buf) + 1;
- }
-
- nio_sctp_freepaddrs(paddr);
-
- return isaa;
-}
-
- /*
- * Class: sun_nio_ch_SctpNet
- * Method: getRemoteAddresses0
- * Signature: (II)[Ljava/net/SocketAddress;
- */
-JNIEXPORT jobjectArray JNICALL Java_sun_nio_ch_SctpNet_getRemoteAddresses0
- (JNIEnv *env, jclass klass, jint fd, jint assocId) {
- return getRemoteAddresses(env, fd, assocId);
-}
-
-/* Map the Java level option to the native level */
-int mapSocketOption
- (jint cmd, int *level, int *optname) {
- static struct {
- jint cmd;
- int level;
- int optname;
- } const opts[] = {
- { sun_nio_ch_SctpStdSocketOption_SCTP_DISABLE_FRAGMENTS, IPPROTO_SCTP, SCTP_DISABLE_FRAGMENTS },
- { sun_nio_ch_SctpStdSocketOption_SCTP_EXPLICIT_COMPLETE, IPPROTO_SCTP, SCTP_EXPLICIT_EOR },
- { sun_nio_ch_SctpStdSocketOption_SCTP_FRAGMENT_INTERLEAVE, IPPROTO_SCTP, SCTP_FRAGMENT_INTERLEAVE },
- { sun_nio_ch_SctpStdSocketOption_SCTP_NODELAY, IPPROTO_SCTP, SCTP_NODELAY },
- { sun_nio_ch_SctpStdSocketOption_SO_SNDBUF, SOL_SOCKET, SO_SNDBUF },
- { sun_nio_ch_SctpStdSocketOption_SO_RCVBUF, SOL_SOCKET, SO_RCVBUF },
- { sun_nio_ch_SctpStdSocketOption_SO_LINGER, SOL_SOCKET, SO_LINGER } };
-
- int i;
- for (i=0; i<(int)(sizeof(opts) / sizeof(opts[0])); i++) {
- if (cmd == opts[i].cmd) {
- *level = opts[i].level;
- *optname = opts[i].optname;
- return 0;
- }
- }
-
- /* not found */
- return -1;
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: setIntOption0
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setIntOption0
- (JNIEnv *env, jclass klass, jint fd, jint opt, int arg) {
- int klevel, kopt;
- int result;
- struct linger linger;
- void *parg;
- int arglen;
-
- if (mapSocketOption(opt, &klevel, &kopt) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "Unsupported socket option");
- return;
- }
-
- if (opt == sun_nio_ch_SctpStdSocketOption_SO_LINGER) {
- parg = (void *)&linger;
- arglen = sizeof(linger);
- if (arg >= 0) {
- linger.l_onoff = 1;
- linger.l_linger = arg;
- } else {
- linger.l_onoff = 0;
- linger.l_linger = 0;
- }
- } else {
- parg = (void *)&arg;
- arglen = sizeof(arg);
- }
-
- if (NET_SetSockOpt(fd, klevel, kopt, parg, arglen) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "sun_nio_ch_SctpNet.setIntOption0");
- }
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: getIntOption0
- * Signature: (II)I
- */
-JNIEXPORT int JNICALL Java_sun_nio_ch_SctpNet_getIntOption0
- (JNIEnv *env, jclass klass, jint fd, jint opt) {
- int klevel, kopt;
- int result;
- struct linger linger;
- void *arg;
- int arglen;
-
- if (mapSocketOption(opt, &klevel, &kopt) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "Unsupported socket option");
- return -1;
- }
-
- if (opt == sun_nio_ch_SctpStdSocketOption_SO_LINGER) {
- arg = (void *)&linger;
- arglen = sizeof(linger);
- } else {
- arg = (void *)&result;
- arglen = sizeof(result);
- }
-
- if (NET_GetSockOpt(fd, klevel, kopt, arg, &arglen) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "sun.nio.ch.Net.getIntOption");
- return -1;
- }
-
- if (opt == sun_nio_ch_SctpStdSocketOption_SO_LINGER)
- return linger.l_onoff ? linger.l_linger : -1;
- else
- return result;
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: getPrimAddrOption0
- * Signature: (II)Ljava/net/SocketAddress;
- */
-JNIEXPORT jobject JNICALL Java_sun_nio_ch_SctpNet_getPrimAddrOption0
- (JNIEnv *env, jclass klass, jint fd, jint assocId) {
- struct sctp_setprim prim;
- unsigned int prim_len = sizeof(prim);
- struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr;
-
- prim.ssp_assoc_id = assocId;
-
- if (getsockopt(fd, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &prim, &prim_len) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "sun.nio.ch.SctpNet.getPrimAddrOption0");
- return NULL;
- }
-
- return SockAddrToInetSocketAddress(env, sap);
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: setPrimAddrOption0
- * Signature: (IILjava/net/InetAddress;I)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setPrimAddrOption0
- (JNIEnv *env, jclass klass, jint fd, jint assocId, jobject iaObj, jint port) {
- struct sctp_setprim prim;
- struct sockaddr* sap = (struct sockaddr*)&prim.ssp_addr;
- int sap_len;
-
- if (NET_InetAddressToSockaddr(env, iaObj, port, sap,
- &sap_len, JNI_TRUE) != 0) {
- return;
- }
-
- prim.ssp_assoc_id = assocId;
-
- if (setsockopt(fd, IPPROTO_SCTP, SCTP_PRIMARY_ADDR, &prim, sizeof(prim)) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "sun.nio.ch.SctpNet.setPrimAddrOption0");
- }
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: setPeerPrimAddrOption0
- * Signature: (IILjava/net/InetAddress;I)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setPeerPrimAddrOption0
- (JNIEnv *env, jclass klass, jint fd, jint assocId,
- jobject iaObj, jint port, jboolean preferIPv6) {
- struct sctp_setpeerprim prim;
- struct sockaddr* sap = (struct sockaddr*)&prim.sspp_addr;
- int sap_len;
-
- if (NET_InetAddressToSockaddr(env, iaObj, port, sap,
- &sap_len, preferIPv6) != 0) {
- return;
- }
-
- prim.sspp_assoc_id = assocId;
-
- if (setsockopt(fd, IPPROTO_SCTP, SCTP_SET_PEER_PRIMARY_ADDR, &prim,
- sizeof(prim)) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "sun.nio.ch.SctpNet.setPeerPrimAddrOption0");
- }
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: getInitMsgOption0
- * Signature: (I[I)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_getInitMsgOption0
- (JNIEnv *env, jclass klass, jint fd, jintArray retVal) {
- struct sctp_initmsg sctp_initmsg;
- unsigned int sim_len = sizeof(sctp_initmsg);
- int vals[2];
-
- if (getsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &sctp_initmsg,
- &sim_len) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "sun.nio.ch.SctpNet.getInitMsgOption0");
- return;
- }
-
- vals[0] = sctp_initmsg.sinit_max_instreams;
- vals[1] = sctp_initmsg.sinit_num_ostreams;
- (*env)->SetIntArrayRegion(env, retVal, 0, 2, vals);
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: setInitMsgOption0
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_setInitMsgOption0
- (JNIEnv *env, jclass klass, jint fd, jint inArg, jint outArg) {
- struct sctp_initmsg sctp_initmsg;
-
- sctp_initmsg.sinit_max_instreams = (unsigned int)inArg;
- sctp_initmsg.sinit_num_ostreams = (unsigned int)outArg;
- sctp_initmsg.sinit_max_attempts = 0; // default
- sctp_initmsg.sinit_max_init_timeo = 0; // default
-
- if (setsockopt(fd, IPPROTO_SCTP, SCTP_INITMSG, &sctp_initmsg,
- sizeof(sctp_initmsg)) < 0) {
- JNU_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException",
- "sun.nio.ch.SctpNet.setInitMsgOption0");
- }
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: shutdown0
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpNet_shutdown0
- (JNIEnv *env, jclass klass, jint fd, jint assocId) {
- int rv;
- struct msghdr msg[1];
- struct iovec iov[1];
- int cbuf_size = CMSG_SPACE(sizeof (struct sctp_sndrcvinfo));
- char cbuf[CMSG_SPACE(sizeof (struct sctp_sndrcvinfo))];
- struct cmsghdr* cmsg;
- struct sctp_sndrcvinfo *sri;
-
- /* SctpSocketChannel */
- if (assocId < 0) {
- shutdown(fd, SHUT_WR);
- return;
- }
-
- memset(msg, 0, sizeof (*msg));
- memset(cbuf, 0, cbuf_size);
- msg->msg_name = NULL;
- msg->msg_namelen = 0;
- iov->iov_base = NULL;
- iov->iov_len = 0;
- msg->msg_iov = iov;
- msg->msg_iovlen = 1;
- msg->msg_control = cbuf;
- msg->msg_controllen = cbuf_size;
- msg->msg_flags = 0;
-
- cmsg = CMSG_FIRSTHDR(msg);
- cmsg->cmsg_level = IPPROTO_SCTP;
- cmsg->cmsg_type = SCTP_SNDRCV;
- cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
-
- /* Initialize the payload: */
- sri = (struct sctp_sndrcvinfo*) CMSG_DATA(cmsg);
- memset(sri, 0, sizeof (*sri));
-
- if (assocId > 0) {
- sri->sinfo_assoc_id = assocId;
- }
-
- sri->sinfo_flags = sri->sinfo_flags | SCTP_EOF;
-
- /* Sum of the length of all control messages in the buffer. */
- msg->msg_controllen = cmsg->cmsg_len;
-
- if ((rv = sendmsg(fd, msg, 0)) < 0) {
- handleSocketError(env, errno);
- }
-}
-
-/*
- * Class: sun_nio_ch_SctpNet
- * Method: branch
- * Signature: (II)I
- */
-JNIEXPORT int JNICALL Java_sun_nio_ch_SctpNet_branch0
- (JNIEnv *env, jclass klass, jint fd, jint assocId) {
- int newfd = 0;
- if ((newfd = nio_sctp_peeloff(fd, assocId)) < 0) {
- handleSocketError(env, errno);
- }
-
- return newfd;
-}
diff --git a/jdk/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c b/jdk/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c
deleted file mode 100644
index 5d23ae1..0000000
--- a/jdk/src/solaris/native/sun/nio/ch/SctpServerChannelImpl.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-#include "sun_nio_ch_SctpServerChannelImpl.h"
-
-extern void Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(JNIEnv* env,
- jclass c);
-
-extern jint Java_sun_nio_ch_ServerSocketChannelImpl_accept0(JNIEnv* env,
- jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa);
-
-/*
- * Class: sun_nio_ch_SctpServerChannelImpl
- * Method: initIDs
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_sun_nio_ch_SctpServerChannelImpl_initIDs
- (JNIEnv* env, jclass c) {
- Java_sun_nio_ch_ServerSocketChannelImpl_initIDs(env, c);
-}
-
-/*
- * Class: sun_nio_ch_SctpServerChannelImpl
- * Method: accept0
- * Signature: (Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;[Ljava/net/InetSocketAddress;)I
- */
-JNIEXPORT jint JNICALL Java_sun_nio_ch_SctpServerChannelImpl_accept0
- (JNIEnv* env, jobject this, jobject ssfdo, jobject newfdo, jobjectArray isaa) {
- return Java_sun_nio_ch_ServerSocketChannelImpl_accept0(env, this,
- ssfdo, newfdo, isaa);
-}
diff --git a/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c b/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c
index 259ae15..535a181 100644
--- a/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c
+++ b/jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c
@@ -30,13 +30,12 @@
#include <stdlib.h>
#include <dlfcn.h>
-#include <link.h>
#ifdef __solaris__
#include <strings.h>
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(__APPLE__)
#include <string.h>
#endif
diff --git a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c b/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
index 57882b6..f921574 100644
--- a/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
+++ b/jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c
@@ -49,6 +49,19 @@
#include <mntent.h>
#endif
+#ifdef _ALLBSD_SOURCE
+#include <string.h>
+
+#define stat64 stat
+#define statvfs64 statvfs
+
+#define open64 open
+#define fstat64 fstat
+#define lstat64 lstat
+#define dirent64 dirent
+#define readdir64_r readdir_r
+#endif
+
#include "jni.h"
#include "jni_util.h"
#include "jlong.h"
@@ -198,7 +211,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
/* system calls that might not be available at run time */
-#if defined(__solaris__) && defined(_LP64)
+#if (defined(__solaris__) && defined(_LP64)) || defined(_ALLBSD_SOURCE)
/* Solaris 64-bit does not have openat64/fstatat64 */
my_openat64_func = (openat64_func*)dlsym(RTLD_DEFAULT, "openat");
my_fstatat64_func = (fstatat64_func*)dlsym(RTLD_DEFAULT, "fstatat");
@@ -552,11 +565,17 @@ Java_sun_nio_fs_UnixNativeDispatcher_futimes(JNIEnv* env, jclass this, jint file
times[1].tv_sec = modificationTime / 1000000;
times[1].tv_usec = modificationTime % 1000000;
- if (my_futimesat_func != NULL) {
- RESTARTABLE((*my_futimesat_func)(filedes, NULL, ×[0]), err);
- if (err == -1) {
- throwUnixException(env, errno);
- }
+#ifdef _ALLBSD_SOURCE
+ RESTARTABLE(futimes(filedes, ×[0]), err);
+#else
+ if (my_futimesat_func == NULL) {
+ JNU_ThrowInternalError(env, "my_ftimesat_func is NULL");
+ return;
+ }
+ RESTARTABLE((*my_futimesat_func)(filedes, NULL, ×[0]), err);
+#endif
+ if (err == -1) {
+ throwUnixException(env, errno);
}
}
@@ -605,9 +624,12 @@ Java_sun_nio_fs_UnixNativeDispatcher_closedir(JNIEnv* env, jclass this, jlong di
JNIEXPORT jbyteArray JNICALL
Java_sun_nio_fs_UnixNativeDispatcher_readdir(JNIEnv* env, jclass this, jlong value) {
- char entry[sizeof(struct dirent64) + PATH_MAX + 1];
- struct dirent64* ptr = (struct dirent64*)&entry;
struct dirent64* result;
+ struct {
+ struct dirent64 buf;
+ char name_extra[PATH_MAX + 1 - sizeof result->d_name];
+ } entry;
+ struct dirent64* ptr = &entry.buf;
int res;
DIR* dirp = jlong_to_ptr(value);
@@ -1068,6 +1090,10 @@ Java_sun_nio_fs_UnixNativeDispatcher_getextmntent(JNIEnv* env, jclass this,
{
#ifdef __solaris__
struct extmnttab ent;
+#elif defined(_ALLBSD_SOURCE)
+ char buf[1024];
+ char *str;
+ char *last;
#else
struct mntent ent;
char buf[1024];
@@ -1096,6 +1122,25 @@ Java_sun_nio_fs_UnixNativeDispatcher_getextmntent(JNIEnv* env, jclass this,
throwUnixException(env, errno);
return -1;
}
+#elif defined(_ALLBSD_SOURCE)
+again:
+ if (!(str = fgets(buf, sizeof(buf), fp)))
+ return -1;
+
+ name = strtok_r(str, " \t\n", &last);
+ if (name == NULL)
+ return -1;
+
+ // skip comments
+ if (*name == '#')
+ goto again;
+
+ dir = strtok_r((char *)NULL, " \t\n", &last);
+ fstype = strtok_r((char *)NULL, " \t\n", &last);
+ options = strtok_r((char *)NULL, " \t\n", &last);
+ if (options == NULL)
+ return -1;
+ dev = 0;
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
diff --git a/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c b/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c
index 7699828..ee46c73 100644
--- a/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c
+++ b/jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c
@@ -63,7 +63,12 @@ int main(int argc, const char* argv[]) {
DEFX(O_EXCL);
DEFX(O_TRUNC);
DEFX(O_SYNC);
+#ifndef O_DSYNC
+ // At least FreeBSD doesn't define O_DSYNC
+ emit("O_DSYNC", O_SYNC);
+#else
DEFX(O_DSYNC);
+#endif
#ifdef O_NOFOLLOW
DEFX(O_NOFOLLOW);
#else
@@ -111,7 +116,12 @@ int main(int argc, const char* argv[]) {
DEF(ENOSYS);
DEF(ELOOP);
DEF(EROFS);
+#ifndef ENODATA
+ // Only used in Linux java source, provide any value so it compiles
+ emit("ENODATA", ELAST);
+#else
DEF(ENODATA);
+#endif
DEF(ERANGE);
DEF(EMFILE);
diff --git a/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c b/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
index 6c4ff32..f46c00a 100644
--- a/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
+++ b/jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <dlfcn.h>
-#include <link.h>
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
diff --git a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c b/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
index b763bc2..a69f12b 100644
--- a/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
+++ b/jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
@@ -28,7 +28,6 @@
#include <string.h>
#include <dlfcn.h>
-#include <link.h>
#include <jni_util.h>
diff --git a/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c b/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
index 72aa02f..277f114 100644
--- a/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
+++ b/jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
@@ -64,7 +64,6 @@
#include <assert.h>
#include <dlfcn.h>
-#include <link.h>
#include <jni.h>
diff --git a/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c b/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
index c737981..4e8199a 100644
--- a/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
+++ b/jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c
@@ -29,7 +29,6 @@
#include <assert.h>
#include <dlfcn.h>
-#include <link.h>
#include <winscard.h>
diff --git a/jdk/src/solaris/native/sun/xawt/XWindow.c b/jdk/src/solaris/native/sun/xawt/XWindow.c
index d33c87f..d801aae 100644
--- a/jdk/src/solaris/native/sun/xawt/XWindow.c
+++ b/jdk/src/solaris/native/sun/xawt/XWindow.c
@@ -867,7 +867,7 @@ handleKeyEventWithNumLockMask(XEvent *event, KeySym *keysym)
{
KeySym originalKeysym = *keysym;
-#ifndef __linux__
+#if !defined(__linux__) && !defined(MACOSX)
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
diff --git a/jdk/src/solaris/native/sun/xawt/awt_Desktop.c b/jdk/src/solaris/native/sun/xawt/awt_Desktop.c
index 77f38f8..b8b250b 100644
--- a/jdk/src/solaris/native/sun/xawt/awt_Desktop.c
+++ b/jdk/src/solaris/native/sun/xawt/awt_Desktop.c
@@ -24,6 +24,7 @@
*/
#include <jni.h>
+#include <jvm_md.h>
#include <dlfcn.h>
typedef int gboolean;
@@ -39,12 +40,15 @@ int init(){
void *gnome_handle;
const char *errmsg;
- vfs_handle = dlopen("libgnomevfs-2.so.0", RTLD_LAZY);
+ vfs_handle = dlopen(VERSIONED_JNI_LIB_NAME("gnomevfs-2", "0"), RTLD_LAZY);
if (vfs_handle == NULL) {
+ vfs_handle = dlopen(JNI_LIB_NAME("gnomevfs-2"), RTLD_LAZY);
+ if (vfs_handle == NULL) {
#ifdef INTERNAL_BUILD
- fprintf(stderr, "can not load libgnomevfs-2.so\n");
+ fprintf(stderr, "can not load libgnomevfs-2.so\n");
#endif
- return 0;
+ return 0;
+ }
}
dlerror(); /* Clear errors */
gnome_vfs_init = (GNOME_VFS_INIT_TYPE*)dlsym(vfs_handle, "gnome_vfs_init");
@@ -63,12 +67,15 @@ int init(){
// call gonme_vfs_init()
(*gnome_vfs_init)();
- gnome_handle = dlopen("libgnome-2.so.0", RTLD_LAZY);
+ gnome_handle = dlopen(VERSIONED_JNI_LIB_NAME("gnome-2", "0"), RTLD_LAZY);
if (gnome_handle == NULL) {
+ gnome_handle = dlopen(JNI_LIB_NAME("gnome-2"), RTLD_LAZY);
+ if (gnome_handle == NULL) {
#ifdef INTERNAL_BUILD
- fprintf(stderr, "can not load libgnome-2.so\n");
+ fprintf(stderr, "can not load libgnome-2.so\n");
#endif
- return 0;
+ return 0;
+ }
}
dlerror(); /* Clear errors */
gnome_url_show = (GNOME_URL_SHOW_TYPE*)dlsym(gnome_handle, "gnome_url_show");
diff --git a/jdk/src/solaris/npt/npt_md.h b/jdk/src/solaris/npt/npt_md.h
index f6da1d6..7a85205 100644
--- a/jdk/src/solaris/npt/npt_md.h
+++ b/jdk/src/solaris/npt/npt_md.h
@@ -32,9 +32,9 @@
#include <string.h>
#include <errno.h>
#include <dlfcn.h>
-#include <link.h>
+#include <jvm_md.h>
-#define NPT_LIBNAME "libnpt.so"
+#define NPT_LIBNAME "npt"
#define NPT_INITIALIZE(pnpt,version,options) \
{ \
@@ -43,7 +43,7 @@
\
if ( (pnpt) == NULL ) NPT_ERROR("NptEnv* is NULL"); \
*(pnpt) = NULL; \
- _handle = dlopen(NPT_LIBNAME, RTLD_LAZY); \
+ _handle = dlopen(JNI_LIB_NAME(NPT_LIBNAME), RTLD_LAZY); \
if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
diff --git a/jdk/src/solaris/transport/socket/socket_md.c b/jdk/src/solaris/transport/socket/socket_md.c
index d897ed4..25973d9 100644
--- a/jdk/src/solaris/transport/socket/socket_md.c
+++ b/jdk/src/solaris/transport/socket/socket_md.c
@@ -36,7 +36,7 @@
#ifdef __solaris__
#include <thread.h>
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#include <pthread.h>
#include <sys/poll.h>
#endif
@@ -52,7 +52,7 @@ dbgsysListen(int fd, int backlog) {
int
dbgsysConnect(int fd, struct sockaddr *name, int namelen) {
int rv = connect(fd, name, namelen);
- if (rv < 0 && errno == EINPROGRESS) {
+ if (rv < 0 && (errno == EINPROGRESS || errno == EINTR)) {
return DBG_EINPROGRESS;
} else {
return rv;
@@ -79,7 +79,7 @@ dbgsysAccept(int fd, struct sockaddr *name, int *namelen) {
if (rv >= 0) {
return rv;
}
- if (errno != ECONNABORTED) {
+ if (errno != ECONNABORTED && errno != EINTR) {
return rv;
}
}
@@ -88,23 +88,43 @@ dbgsysAccept(int fd, struct sockaddr *name, int *namelen) {
int
dbgsysRecvFrom(int fd, char *buf, int nBytes,
int flags, struct sockaddr *from, int *fromlen) {
- return recvfrom(fd, buf, nBytes, flags, from, fromlen);
+ int rv;
+ do {
+ rv = recvfrom(fd, buf, nBytes, flags, from, fromlen);
+ } while (rv == -1 && errno == EINTR);
+
+ return rv;
}
int
dbgsysSendTo(int fd, char *buf, int len,
int flags, struct sockaddr *to, int tolen) {
- return sendto(fd, buf, len, flags, to, tolen);
+ int rv;
+ do {
+ rv = sendto(fd, buf, len, flags, to, tolen);
+ } while (rv == -1 && errno == EINTR);
+
+ return rv;
}
int
dbgsysRecv(int fd, char *buf, int nBytes, int flags) {
- return recv(fd, buf, nBytes, flags);
+ int rv;
+ do {
+ rv = recv(fd, buf, nBytes, flags);
+ } while (rv == -1 && errno == EINTR);
+
+ return rv;
}
int
dbgsysSend(int fd, char *buf, int nBytes, int flags) {
- return send(fd, buf, nBytes, flags);
+ int rv;
+ do {
+ rv = send(fd, buf, nBytes, flags);
+ } while (rv == -1 && errno == EINTR);
+
+ return rv;
}
struct hostent *
@@ -123,7 +143,12 @@ dbgsysSocket(int domain, int type, int protocol) {
}
int dbgsysSocketClose(int fd) {
- return close(fd);
+ int rv;
+ do {
+ rv = close(fd);
+ } while (rv == -1 && errno == EINTR);
+
+ return rv;
}
int
@@ -283,7 +308,7 @@ dbgsysTlsGet(int index) {
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
int
dbgsysTlsAlloc() {
pthread_key_t key;
diff --git a/jdk/src/windows/bin/java_md.c b/jdk/src/windows/bin/java_md.c
index b8665f3..a301ff7 100644
--- a/jdk/src/windows/bin/java_md.c
+++ b/jdk/src/windows/bin/java_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -171,7 +171,8 @@ GetArchPath(int nbits)
void
CreateExecutionEnvironment(int *pargc, char ***pargv,
char *jrepath, jint so_jrepath,
- char *jvmpath, jint so_jvmpath) {
+ char *jvmpath, jint so_jvmpath,
+ char *jvmcfg, jint so_jvmcfg) {
char * jvmtype;
int i = 0;
int running = CURRENT_DATA_MODEL;
@@ -200,8 +201,11 @@ CreateExecutionEnvironment(int *pargc, char ***pargv,
exit(2);
}
+ JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%s%sjvm.cfg",
+ jrepath, FILESEP, FILESEP, (char*)GetArch(), FILESEP);
+
/* Find the specified JVM type */
- if (ReadKnownVMs(jrepath, (char*)GetArch(), JNI_FALSE) < 1) {
+ if (ReadKnownVMs(jvmcfg, JNI_FALSE) < 1) {
JLI_ReportErrorMessage(CFG_ERROR7);
exit(1);
}
@@ -1323,3 +1327,33 @@ void AWTPreloadStop() {
}
#endif /* ENABLE_AWT_PRELOAD */
+
+int
+JVMInit(InvocationFunctions* ifn, jlong threadStackSize,
+ int argc, char **argv,
+ int mode, char *what, int ret)
+{
+ ShowSplashScreen();
+ return ContinueInNewThread(ifn, threadStackSize, argc, argv, mode, what, ret);
+}
+
+void
+PostJVMInit(JNIEnv *env, jstring mainClass, JavaVM *vm)
+{
+ // stubbed out for windows and *nixes.
+}
+
+void
+RegisterThread()
+{
+ // stubbed out for windows and *nixes.
+}
+
+/*
+ * on windows, we return a false to indicate this option is not applicable
+ */
+jboolean
+ProcessPlatformOption(const char *arg)
+{
+ return JNI_FALSE;
+}
diff --git a/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java b/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java
index 1fc4f66..0bdae34 100644
--- a/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java
+++ b/jdk/src/windows/classes/sun/java2d/d3d/D3DRenderer.java
@@ -27,6 +27,7 @@ package sun.java2d.d3d;
import java.awt.Transparency;
import java.awt.geom.Path2D;
+import sun.java2d.InvalidPipeException;
import sun.java2d.SunGraphics2D;
import sun.java2d.loops.GraphicsPrimitive;
import sun.java2d.pipe.BufferedPaints;
@@ -47,7 +48,12 @@ class D3DRenderer extends BufferedRenderPipe {
int ctxflags =
sg2d.paint.getTransparency() == Transparency.OPAQUE ?
D3DContext.SRC_IS_OPAQUE : D3DContext.NO_CONTEXT_FLAGS;
- D3DSurfaceData dstData = (D3DSurfaceData)sg2d.surfaceData;
+ D3DSurfaceData dstData;
+ try {
+ dstData = (D3DSurfaceData)sg2d.surfaceData;
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
D3DContext.validateContext(dstData, dstData,
sg2d.getCompClip(), sg2d.composite,
null, sg2d.paint, sg2d, ctxflags);
@@ -56,7 +62,12 @@ class D3DRenderer extends BufferedRenderPipe {
@Override
protected void validateContextAA(SunGraphics2D sg2d) {
int ctxflags = D3DContext.NO_CONTEXT_FLAGS;
- D3DSurfaceData dstData = (D3DSurfaceData)sg2d.surfaceData;
+ D3DSurfaceData dstData;
+ try {
+ dstData = (D3DSurfaceData)sg2d.surfaceData;
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
D3DContext.validateContext(dstData, dstData,
sg2d.getCompClip(), sg2d.composite,
null, sg2d.paint, sg2d, ctxflags);
@@ -70,7 +81,12 @@ class D3DRenderer extends BufferedRenderPipe {
int ctxflags =
sg2d.surfaceData.getTransparency() == Transparency.OPAQUE ?
D3DContext.SRC_IS_OPAQUE : D3DContext.NO_CONTEXT_FLAGS;
- D3DSurfaceData dstData = (D3DSurfaceData)sg2d.surfaceData;
+ D3DSurfaceData dstData;
+ try {
+ dstData = (D3DSurfaceData)sg2d.surfaceData;
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
D3DContext.validateContext(dstData, dstData,
sg2d.getCompClip(), sg2d.composite,
null, null, null, ctxflags);
diff --git a/jdk/src/windows/classes/sun/java2d/windows/GDIRenderer.java b/jdk/src/windows/classes/sun/java2d/windows/GDIRenderer.java
index b9b8791..bb3e272 100644
--- a/jdk/src/windows/classes/sun/java2d/windows/GDIRenderer.java
+++ b/jdk/src/windows/classes/sun/java2d/windows/GDIRenderer.java
@@ -29,6 +29,7 @@ import java.awt.Composite;
import java.awt.Shape;
import java.awt.geom.Path2D;
import java.awt.geom.PathIterator;
+import sun.java2d.InvalidPipeException;
import sun.java2d.SunGraphics2D;
import sun.java2d.SurfaceData;
import sun.java2d.pipe.Region;
@@ -45,7 +46,7 @@ public class GDIRenderer implements
PixelFillPipe,
ShapeDrawPipe
{
- native void doDrawLine(SurfaceData sData,
+ native void doDrawLine(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x1, int y1, int x2, int y2);
@@ -54,24 +55,32 @@ public class GDIRenderer implements
{
int transx = sg2d.transX;
int transy = sg2d.transY;
- doDrawLine(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x1+transx, y1+transy, x2+transx, y2+transy);
+ try {
+ doDrawLine((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x1+transx, y1+transy, x2+transx, y2+transy);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doDrawRect(SurfaceData sData,
+ native void doDrawRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h);
public void drawRect(SunGraphics2D sg2d,
int x, int y, int width, int height)
{
- doDrawRect(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height);
+ try {
+ doDrawRect((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doDrawRoundRect(SurfaceData sData,
+ native void doDrawRoundRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int arcW, int arcH);
@@ -80,25 +89,33 @@ public class GDIRenderer implements
int x, int y, int width, int height,
int arcWidth, int arcHeight)
{
- doDrawRoundRect(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height,
- arcWidth, arcHeight);
+ try {
+ doDrawRoundRect((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height,
+ arcWidth, arcHeight);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doDrawOval(SurfaceData sData,
+ native void doDrawOval(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h);
public void drawOval(SunGraphics2D sg2d,
int x, int y, int width, int height)
{
- doDrawOval(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height);
+ try {
+ doDrawOval((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doDrawArc(SurfaceData sData,
+ native void doDrawArc(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int angleStart, int angleExtent);
@@ -107,13 +124,17 @@ public class GDIRenderer implements
int x, int y, int width, int height,
int startAngle, int arcAngle)
{
- doDrawArc(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height,
- startAngle, arcAngle);
+ try {
+ doDrawArc((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height,
+ startAngle, arcAngle);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doDrawPoly(SurfaceData sData,
+ native void doDrawPoly(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int transx, int transy,
int[] xpoints, int[] ypoints,
@@ -123,33 +144,45 @@ public class GDIRenderer implements
int xpoints[], int ypoints[],
int npoints)
{
- doDrawPoly(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- sg2d.transX, sg2d.transY, xpoints, ypoints, npoints, false);
+ try {
+ doDrawPoly((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ sg2d.transX, sg2d.transY, xpoints, ypoints, npoints, false);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
public void drawPolygon(SunGraphics2D sg2d,
int xpoints[], int ypoints[],
int npoints)
{
- doDrawPoly(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- sg2d.transX, sg2d.transY, xpoints, ypoints, npoints, true);
+ try {
+ doDrawPoly((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ sg2d.transX, sg2d.transY, xpoints, ypoints, npoints, true);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doFillRect(SurfaceData sData,
+ native void doFillRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h);
public void fillRect(SunGraphics2D sg2d,
int x, int y, int width, int height)
{
- doFillRect(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height);
+ try {
+ doFillRect((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doFillRoundRect(SurfaceData sData,
+ native void doFillRoundRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int arcW, int arcH);
@@ -158,25 +191,33 @@ public class GDIRenderer implements
int x, int y, int width, int height,
int arcWidth, int arcHeight)
{
- doFillRoundRect(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height,
- arcWidth, arcHeight);
+ try {
+ doFillRoundRect((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height,
+ arcWidth, arcHeight);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doFillOval(SurfaceData sData,
+ native void doFillOval(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h);
public void fillOval(SunGraphics2D sg2d,
int x, int y, int width, int height)
{
- doFillOval(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height);
+ try {
+ doFillOval((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doFillArc(SurfaceData sData,
+ native void doFillArc(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int angleStart, int angleExtent);
@@ -185,13 +226,17 @@ public class GDIRenderer implements
int x, int y, int width, int height,
int startAngle, int arcAngle)
{
- doFillArc(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- x+sg2d.transX, y+sg2d.transY, width, height,
- startAngle, arcAngle);
+ try {
+ doFillArc((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ x+sg2d.transX, y+sg2d.transY, width, height,
+ startAngle, arcAngle);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doFillPoly(SurfaceData sData,
+ native void doFillPoly(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int transx, int transy,
int[] xpoints, int[] ypoints,
@@ -201,12 +246,16 @@ public class GDIRenderer implements
int xpoints[], int ypoints[],
int npoints)
{
- doFillPoly(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- sg2d.transX, sg2d.transY, xpoints, ypoints, npoints);
+ try {
+ doFillPoly((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ sg2d.transX, sg2d.transY, xpoints, ypoints, npoints);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
- native void doShape(SurfaceData sData,
+ native void doShape(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int transX, int transY,
Path2D.Float p2df, boolean isfill);
@@ -228,9 +277,13 @@ public class GDIRenderer implements
transX = 0;
transY = 0;
}
- doShape(sg2d.surfaceData,
- sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
- transX, transY, p2df, isfill);
+ try {
+ doShape((GDIWindowSurfaceData)sg2d.surfaceData,
+ sg2d.getCompClip(), sg2d.composite, sg2d.eargb,
+ transX, transY, p2df, isfill);
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
}
// REMIND: This is just a hack to get WIDE lines to honor the
@@ -239,7 +292,12 @@ public class GDIRenderer implements
// method that could be filled by the doShape method more quickly.
public void doFillSpans(SunGraphics2D sg2d, SpanIterator si) {
int box[] = new int[4];
- SurfaceData sd = sg2d.surfaceData;
+ GDIWindowSurfaceData sd;
+ try {
+ sd = (GDIWindowSurfaceData)sg2d.surfaceData;
+ } catch (ClassCastException e) {
+ throw new InvalidPipeException("wrong surface data type: " + sg2d.surfaceData);
+ }
Region clip = sg2d.getCompClip();
Composite comp = sg2d.composite;
int eargb = sg2d.eargb;
@@ -268,7 +326,7 @@ public class GDIRenderer implements
doShape(sg2d, s, true);
}
- public native void devCopyArea(SurfaceData sData,
+ public native void devCopyArea(GDIWindowSurfaceData sData,
int srcx, int srcy,
int dx, int dy,
int w, int h);
@@ -278,21 +336,21 @@ public class GDIRenderer implements
}
public static class Tracer extends GDIRenderer {
- void doDrawLine(SurfaceData sData,
+ void doDrawLine(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x1, int y1, int x2, int y2)
{
GraphicsPrimitive.tracePrimitive("GDIDrawLine");
super.doDrawLine(sData, clip, comp, color, x1, y1, x2, y2);
}
- void doDrawRect(SurfaceData sData,
+ void doDrawRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h)
{
GraphicsPrimitive.tracePrimitive("GDIDrawRect");
super.doDrawRect(sData, clip, comp, color, x, y, w, h);
}
- void doDrawRoundRect(SurfaceData sData,
+ void doDrawRoundRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int arcW, int arcH)
@@ -301,14 +359,14 @@ public class GDIRenderer implements
super.doDrawRoundRect(sData, clip, comp, color,
x, y, w, h, arcW, arcH);
}
- void doDrawOval(SurfaceData sData,
+ void doDrawOval(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h)
{
GraphicsPrimitive.tracePrimitive("GDIDrawOval");
super.doDrawOval(sData, clip, comp, color, x, y, w, h);
}
- void doDrawArc(SurfaceData sData,
+ void doDrawArc(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int angleStart, int angleExtent)
@@ -317,7 +375,7 @@ public class GDIRenderer implements
super.doDrawArc(sData, clip, comp, color, x, y, w, h,
angleStart, angleExtent);
}
- void doDrawPoly(SurfaceData sData,
+ void doDrawPoly(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int transx, int transy,
int[] xpoints, int[] ypoints,
@@ -327,14 +385,14 @@ public class GDIRenderer implements
super.doDrawPoly(sData, clip, comp, color, transx, transy,
xpoints, ypoints, npoints, isclosed);
}
- void doFillRect(SurfaceData sData,
+ void doFillRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h)
{
GraphicsPrimitive.tracePrimitive("GDIFillRect");
super.doFillRect(sData, clip, comp, color, x, y, w, h);
}
- void doFillRoundRect(SurfaceData sData,
+ void doFillRoundRect(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int arcW, int arcH)
@@ -343,14 +401,14 @@ public class GDIRenderer implements
super.doFillRoundRect(sData, clip, comp, color,
x, y, w, h, arcW, arcH);
}
- void doFillOval(SurfaceData sData,
+ void doFillOval(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h)
{
GraphicsPrimitive.tracePrimitive("GDIFillOval");
super.doFillOval(sData, clip, comp, color, x, y, w, h);
}
- void doFillArc(SurfaceData sData,
+ void doFillArc(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int x, int y, int w, int h,
int angleStart, int angleExtent)
@@ -359,7 +417,7 @@ public class GDIRenderer implements
super.doFillArc(sData, clip, comp, color, x, y, w, h,
angleStart, angleExtent);
}
- void doFillPoly(SurfaceData sData,
+ void doFillPoly(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int transx, int transy,
int[] xpoints, int[] ypoints,
@@ -369,7 +427,7 @@ public class GDIRenderer implements
super.doFillPoly(sData, clip, comp, color, transx, transy,
xpoints, ypoints, npoints);
}
- void doShape(SurfaceData sData,
+ void doShape(GDIWindowSurfaceData sData,
Region clip, Composite comp, int color,
int transX, int transY,
Path2D.Float p2df, boolean isfill)
@@ -380,7 +438,7 @@ public class GDIRenderer implements
super.doShape(sData, clip, comp, color,
transX, transY, p2df, isfill);
}
- public void devCopyArea(SurfaceData sData,
+ public void devCopyArea(GDIWindowSurfaceData sData,
int srcx, int srcy,
int dx, int dy,
int w, int h)
diff --git a/jdk/src/windows/classes/sun/nio/ch/NativeThread.java b/jdk/src/windows/classes/sun/nio/ch/NativeThread.java
index 2138ad5..39a9fc6 100644
--- a/jdk/src/windows/classes/sun/nio/ch/NativeThread.java
+++ b/jdk/src/windows/classes/sun/nio/ch/NativeThread.java
@@ -31,7 +31,11 @@ package sun.nio.ch;
class NativeThread {
- static long current() { return -1; }
+ static long current() {
+ // return 0 to ensure that async close of blocking sockets will close
+ // the underlying socket.
+ return 0;
+ }
static void signal(long nt) { }
diff --git a/jdk/src/windows/classes/sun/nio/ch/SctpChannelImpl.java b/jdk/src/windows/classes/sun/nio/ch/SctpChannelImpl.java
deleted file mode 100644
index 562a97f..0000000
--- a/jdk/src/windows/classes/sun/nio/ch/SctpChannelImpl.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.SocketAddress;
-import java.net.InetAddress;
-import java.io.IOException;
-import java.util.Set;
-import java.nio.ByteBuffer;
-import java.nio.channels.spi.SelectorProvider;
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.MessageInfo;
-import com.sun.nio.sctp.NotificationHandler;
-import com.sun.nio.sctp.SctpChannel;
-import com.sun.nio.sctp.SctpSocketOption;
-
-/**
- * Unimplemented.
- */
-public class SctpChannelImpl extends SctpChannel
-{
- private static final String message = "SCTP not supported on this platform";
-
- public SctpChannelImpl(SelectorProvider provider) {
- super(provider);
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Association association() {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpChannel bind(SocketAddress local)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpChannel bindAddress(InetAddress address)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpChannel unbindAddress(InetAddress address)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public boolean connect(SocketAddress remote) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public boolean connect(SocketAddress remote, int maxOutStreams,
- int maxInStreams) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public boolean isConnectionPending() {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public boolean finishConnect() throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SocketAddress> getAllLocalAddresses()
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SocketAddress> getRemoteAddresses()
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpChannel shutdown() throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> T getOption(SctpSocketOption<T> name)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> SctpChannel setOption(SctpSocketOption<T> name, T value)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SctpSocketOption<?>> supportedOptions() {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> MessageInfo receive(ByteBuffer dst, T attachment,
- NotificationHandler<T> handler) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public int send(ByteBuffer src, MessageInfo messageInfo)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- protected void implConfigureBlocking(boolean block) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public void implCloseSelectableChannel() throws IOException {
- throw new UnsupportedOperationException(message);
- }
-}
diff --git a/jdk/src/windows/classes/sun/nio/ch/SctpMultiChannelImpl.java b/jdk/src/windows/classes/sun/nio/ch/SctpMultiChannelImpl.java
deleted file mode 100644
index b2300f9..0000000
--- a/jdk/src/windows/classes/sun/nio/ch/SctpMultiChannelImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.SocketAddress;
-import java.net.InetAddress;
-import java.io.IOException;
-import java.util.Set;
-import java.nio.ByteBuffer;
-import java.nio.channels.spi.SelectorProvider;
-import com.sun.nio.sctp.Association;
-import com.sun.nio.sctp.SctpChannel;
-import com.sun.nio.sctp.MessageInfo;
-import com.sun.nio.sctp.NotificationHandler;
-import com.sun.nio.sctp.SctpMultiChannel;
-import com.sun.nio.sctp.SctpSocketOption;
-
-/**
- * Unimplemented.
- */
-public class SctpMultiChannelImpl extends SctpMultiChannel
-{
- private static final String message = "SCTP not supported on this platform";
-
- public SctpMultiChannelImpl(SelectorProvider provider) {
- super(provider);
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<Association> associations() {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpMultiChannel bind(SocketAddress local,
- int backlog) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpMultiChannel bindAddress(InetAddress address)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpMultiChannel unbindAddress(InetAddress address)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SocketAddress> getAllLocalAddresses()
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SocketAddress> getRemoteAddresses
- (Association association) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpMultiChannel shutdown(Association association)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> T getOption(SctpSocketOption<T> name,
- Association association) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> SctpMultiChannel setOption(SctpSocketOption<T> name,
- T value, Association association) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SctpSocketOption<?>> supportedOptions() {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> MessageInfo receive(ByteBuffer buffer, T attachment,
- NotificationHandler<T> handler) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public int send(ByteBuffer buffer, MessageInfo messageInfo)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpChannel branch(Association association)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- protected void implConfigureBlocking(boolean block) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public void implCloseSelectableChannel() throws IOException {
- throw new UnsupportedOperationException(message);
- }
-}
diff --git a/jdk/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java b/jdk/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java
deleted file mode 100644
index 842e4b0..0000000
--- a/jdk/src/windows/classes/sun/nio/ch/SctpServerChannelImpl.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.nio.ch;
-
-import java.net.SocketAddress;
-import java.net.InetAddress;
-import java.io.IOException;
-import java.util.Set;
-import java.nio.channels.spi.SelectorProvider;
-import com.sun.nio.sctp.SctpChannel;
-import com.sun.nio.sctp.SctpServerChannel;
-import com.sun.nio.sctp.SctpSocketOption;
-
-/**
- * Unimplemented.
- */
-public class SctpServerChannelImpl extends SctpServerChannel
-{
- private static final String message = "SCTP not supported on this platform";
-
- public SctpServerChannelImpl(SelectorProvider provider) {
- super(provider);
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpChannel accept() throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpServerChannel bind(SocketAddress local,
- int backlog) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpServerChannel bindAddress(InetAddress address)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public SctpServerChannel unbindAddress(InetAddress address)
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SocketAddress> getAllLocalAddresses()
- throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> T getOption(SctpSocketOption<T> name) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public <T> SctpServerChannel setOption(SctpSocketOption<T> name,
- T value) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public Set<SctpSocketOption<?>> supportedOptions() {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- protected void implConfigureBlocking(boolean block) throws IOException {
- throw new UnsupportedOperationException(message);
- }
-
- @Override
- public void implCloseSelectableChannel() throws IOException {
- throw new UnsupportedOperationException(message);
- }
-}
diff --git a/jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java b/jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java
index acbab4c..faf9921 100644
--- a/jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java
+++ b/jdk/src/windows/classes/sun/nio/ch/SocketDispatcher.java
@@ -55,10 +55,11 @@ class SocketDispatcher extends NativeDispatcher
return writev0(fd, address, len);
}
- void close(FileDescriptor fd) throws IOException {
+ void preClose(FileDescriptor fd) throws IOException {
+ preClose0(fd);
}
- void preClose(FileDescriptor fd) throws IOException {
+ void close(FileDescriptor fd) throws IOException {
close0(fd);
}
@@ -75,5 +76,7 @@ class SocketDispatcher extends NativeDispatcher
static native long writev0(FileDescriptor fd, long address, int len)
throws IOException;
+ static native void preClose0(FileDescriptor fd) throws IOException;
+
static native void close0(FileDescriptor fd) throws IOException;
}
diff --git a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
index 2011b85..b755e6e 100644
--- a/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
+++ b/jdk/src/windows/classes/sun/nio/ch/WindowsSelectorImpl.java
@@ -585,7 +585,7 @@ final class WindowsSelectorImpl extends SelectorImpl {
((SelChImpl)selch).kill();
}
- void putEventOps(SelectionKeyImpl sk, int ops) {
+ public void putEventOps(SelectionKeyImpl sk, int ops) {
synchronized (closeLock) {
if (pollWrapper == null)
throw new ClosedSelectorException();
diff --git a/jdk/src/windows/native/java/lang/java_props_md.c b/jdk/src/windows/native/java/lang/java_props_md.c
index e27d1ea..bfa3711 100644
--- a/jdk/src/windows/native/java/lang/java_props_md.c
+++ b/jdk/src/windows/native/java/lang/java_props_md.c
@@ -31,6 +31,9 @@
#include <sys/timeb.h>
#include <tchar.h>
+#include <stdlib.h>
+#include <Wincon.h>
+
#include "locale_str.h"
#include "java_props.h"
@@ -123,6 +126,17 @@ getEncodingInternal(LCID lcid)
return ret;
}
+static char* getConsoleEncoding()
+{
+ char* buf = malloc(16);
+ int cp = GetConsoleCP();
+ if (cp >= 874 && cp <= 950)
+ sprintf(buf, "ms%d", cp);
+ else
+ sprintf(buf, "cp%d", cp);
+ return buf;
+}
+
// Exported entries for AWT
DllExport const char *
getEncodingFromLangID(LANGID langID)
@@ -562,6 +576,7 @@ GetJavaProperties(JNIEnv* env)
{
char * display_encoding;
+ HANDLE hStdOutErr;
// Windows UI Language selection list only cares "language"
// information of the UI Language. For example, the list
@@ -606,6 +621,20 @@ GetJavaProperties(JNIEnv* env)
sprops.encoding = "MS950_HKSCS";
sprops.sun_jnu_encoding = "MS950_HKSCS";
}
+
+ hStdOutErr = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (hStdOutErr != INVALID_HANDLE_VALUE &&
+ GetFileType(hStdOutErr) == FILE_TYPE_CHAR) {
+ sprops.sun_stdout_encoding = getConsoleEncoding();
+ }
+ hStdOutErr = GetStdHandle(STD_ERROR_HANDLE);
+ if (hStdOutErr != INVALID_HANDLE_VALUE &&
+ GetFileType(hStdOutErr) == FILE_TYPE_CHAR) {
+ if (sprops.sun_stdout_encoding != NULL)
+ sprops.sun_stderr_encoding = sprops.sun_stdout_encoding;
+ else
+ sprops.sun_stderr_encoding = getConsoleEncoding();
+ }
}
}
diff --git a/jdk/src/windows/native/sun/font/fontpath.c b/jdk/src/windows/native/sun/font/fontpath.c
index 074cdeb..e9edf0e 100644
--- a/jdk/src/windows/native/sun/font/fontpath.c
+++ b/jdk/src/windows/native/sun/font/fontpath.c
@@ -185,6 +185,12 @@ static int CALLBACK CheckFontFamilyProcW(
return 0;
}
+/* This HDC is initialised and released in the populate family map
+ * JNI entry point, and used within the call which would otherwise
+ * create many DCs.
+ */
+static HDC screenDC = NULL;
+
static int DifferentFamily(wchar_t *family, wchar_t* fullName) {
LOGFONTW lfw;
CheckFamilyInfo info;
@@ -202,7 +208,7 @@ static int DifferentFamily(wchar_t *family, wchar_t* fullName) {
memset(&lfw, 0, sizeof(lfw));
wcscpy(lfw.lfFaceName, fullName);
lfw.lfCharSet = DEFAULT_CHARSET;
- EnumFontFamiliesExW(GetDC(NULL), &lfw,
+ EnumFontFamiliesExW(screenDC, &lfw,
(FONTENUMPROCW)CheckFontFamilyProcW,
(LPARAM)(&info), 0L);
@@ -299,7 +305,7 @@ static int CALLBACK EnumFamilyNamesA(
memset(&lfa, 0, sizeof(lfa));
strcpy(lfa.lfFaceName, lpelfe->elfLogFont.lfFaceName);
lfa.lfCharSet = lpelfe->elfLogFont.lfCharSet;
- EnumFontFamiliesExA(GetDC(NULL), &lfa,
+ EnumFontFamiliesExA(screenDC, &lfa,
(FONTENUMPROCA)EnumFontFacesInFamilyProcA,
lParam, 0L);
return 1;
@@ -353,7 +359,7 @@ static int CALLBACK EnumFamilyNamesW(
memset(&lfw, 0, sizeof(lfw));
wcscpy(lfw.lfFaceName, lpelfe->elfLogFont.lfFaceName);
lfw.lfCharSet = lpelfe->elfLogFont.lfCharSet;
- EnumFontFamiliesExW(GetDC(NULL), &lfw,
+ EnumFontFamiliesExW(screenDC, &lfw,
(FONTENUMPROCW)EnumFontFacesInFamilyProcW,
lParam, 0L);
return 1;
@@ -613,13 +619,17 @@ Java_sun_awt_Win32FontManager_populateFontFileNameMap0
return;
}
+ screenDC = GetDC(NULL);
+ if (screenDC == NULL) {
+ return;
+ }
/* Enumerate fonts via GDI to build maps of fonts and families */
if (IS_NT) {
LOGFONTW lfw;
memset(&lfw, 0, sizeof(lfw));
lfw.lfCharSet = DEFAULT_CHARSET; /* all charsets */
wcscpy(lfw.lfFaceName, L""); /* one face per family (CHECK) */
- EnumFontFamiliesExW(GetDC(NULL), &lfw,
+ EnumFontFamiliesExW(screenDC, &lfw,
(FONTENUMPROCW)EnumFamilyNamesW,
(LPARAM)(&fmi), 0L);
} else {
@@ -627,7 +637,7 @@ Java_sun_awt_Win32FontManager_populateFontFileNameMap0
memset(&lfa, 0, sizeof(lfa));
lfa.lfCharSet = DEFAULT_CHARSET; /* all charsets */
strcpy(lfa.lfFaceName, ""); /* one face per family */
- ret = EnumFontFamiliesExA(GetDC(NULL), &lfa,
+ ret = EnumFontFamiliesExA(screenDC, &lfa,
(FONTENUMPROCA)EnumFamilyNamesA,
(LPARAM)(&fmi), 0L);
}
@@ -637,6 +647,8 @@ Java_sun_awt_Win32FontManager_populateFontFileNameMap0
ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
fontKeyName, 0L, KEY_READ, &hkeyFonts);
if (ret != ERROR_SUCCESS) {
+ ReleaseDC(NULL, screenDC);
+ screenDC = NULL;
return;
}
@@ -653,6 +665,8 @@ Java_sun_awt_Win32FontManager_populateFontFileNameMap0
dwMaxValueNameLen >= MAX_BUFFER ||
dwMaxValueDataLen >= MAX_BUFFER) {
RegCloseKey(hkeyFonts);
+ ReleaseDC(NULL, screenDC);
+ screenDC = NULL;
return;
}
for (nval = 0; nval < dwNumValues; nval++ ) {
@@ -692,4 +706,6 @@ Java_sun_awt_Win32FontManager_populateFontFileNameMap0
}
}
RegCloseKey(hkeyFonts);
+ ReleaseDC(NULL, screenDC);
+ screenDC = NULL;
}
diff --git a/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c b/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c
index c08d9a4..cf68feb 100644
--- a/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c
+++ b/jdk/src/windows/native/sun/java2d/opengl/WGLSurfaceData.c
@@ -566,6 +566,12 @@ OGLSD_SwapBuffers(JNIEnv *env, jlong pPeerData)
}
}
+// needed by Mac OS X port, no-op on other platforms
+void
+OGLSD_Flush(JNIEnv *env)
+{
+}
+
/*
* Class: sun_java2d_opengl_WGLSurfaceData
* Method: updateWindowAccelImpl
diff --git a/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp b/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp
index 5fedbbb..27a6a39 100644
--- a/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp
+++ b/jdk/src/windows/native/sun/java2d/windows/GDIRenderer.cpp
@@ -117,7 +117,7 @@ static POINT *TransformPoly(jint *xpoints, jint *ypoints,
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doDrawLine
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doDrawLine
@@ -164,7 +164,7 @@ Java_sun_java2d_windows_GDIRenderer_doDrawLine
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doDrawRect
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doDrawRect
@@ -209,7 +209,7 @@ Java_sun_java2d_windows_GDIRenderer_doDrawRect
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doDrawRoundRect
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doDrawRoundRect
@@ -253,7 +253,7 @@ Java_sun_java2d_windows_GDIRenderer_doDrawRoundRect
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doDrawOval
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doDrawOval
@@ -291,7 +291,7 @@ Java_sun_java2d_windows_GDIRenderer_doDrawOval
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doDrawArc
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doDrawArc
@@ -347,7 +347,7 @@ Java_sun_java2d_windows_GDIRenderer_doDrawArc
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doDrawPoly
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;III[I[IIZ)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;III[I[IIZ)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doDrawPoly
@@ -412,7 +412,7 @@ Java_sun_java2d_windows_GDIRenderer_doDrawPoly
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doFillRect
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doFillRect
@@ -445,7 +445,7 @@ Java_sun_java2d_windows_GDIRenderer_doFillRect
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doFillRoundRect
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doFillRoundRect
@@ -488,7 +488,7 @@ Java_sun_java2d_windows_GDIRenderer_doFillRoundRect
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doFillOval
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doFillOval
@@ -555,7 +555,7 @@ Java_sun_java2d_windows_GDIRenderer_doFillOval
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doFillArc
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;IIIIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doFillArc
@@ -615,7 +615,7 @@ Java_sun_java2d_windows_GDIRenderer_doFillArc
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doFillPoly
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;III[I[II)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;Ljava/awt/Composite;III[I[II)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_doFillPoly
@@ -680,7 +680,7 @@ Java_sun_java2d_windows_GDIRenderer_doFillPoly
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: doShape
- * Signature: (Lsun/java2d/SurfaceData;Lsun/java2d/pipe/Region;
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;Lsun/java2d/pipe/Region;
* Ljava/awt/Composite;IIILjava/awt/geom/Path2D.Float;Z)V
*/
JNIEXPORT void JNICALL
@@ -863,7 +863,7 @@ INLINE BOOL RectInMonitorRect(RECT *rCheck, RECT *rContainer)
/*
* Class: sun_java2d_windows_GDIRenderer
* Method: devCopyArea
- * Signature: (Lsun/awt/windows/SurfaceData;IIIIII)V
+ * Signature: (Lsun/java2d/windows/GDIWindowSurfaceData;IIIIII)V
*/
JNIEXPORT void JNICALL
Java_sun_java2d_windows_GDIRenderer_devCopyArea
diff --git a/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c b/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c
index 2a0ba28..4dc8259 100644
--- a/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c
+++ b/jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c
@@ -238,23 +238,25 @@ Java_sun_nio_ch_SocketDispatcher_writev0(JNIEnv *env, jclass clazz,
}
JNIEXPORT void JNICALL
-Java_sun_nio_ch_SocketDispatcher_close0(JNIEnv *env, jclass clazz,
- jobject fdo)
+Java_sun_nio_ch_SocketDispatcher_preClose0(JNIEnv *env, jclass clazz,
+ jobject fdo)
{
jint fd = fdval(env, fdo);
struct linger l;
int len = sizeof(l);
-
- if (fd != -1) {
- int result = 0;
- if (getsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&l, &len) == 0) {
- if (l.l_onoff == 0) {
- WSASendDisconnect(fd, NULL);
- }
- }
- result = closesocket(fd);
- if (result == SOCKET_ERROR) {
- JNU_ThrowIOExceptionWithLastError(env, "Socket close failed");
+ if (getsockopt(fd, SOL_SOCKET, SO_LINGER, (char *)&l, &len) == 0) {
+ if (l.l_onoff == 0) {
+ WSASendDisconnect(fd, NULL);
}
}
}
+
+JNIEXPORT void JNICALL
+Java_sun_nio_ch_SocketDispatcher_close0(JNIEnv *env, jclass clazz,
+ jobject fdo)
+{
+ jint fd = fdval(env, fdo);
+ if (closesocket(fd) == SOCKET_ERROR) {
+ JNU_ThrowIOExceptionWithLastError(env, "Socket close failed");
+ }
+}
diff --git a/jdk/src/windows/native/sun/windows/awt_Component.cpp b/jdk/src/windows/native/sun/windows/awt_Component.cpp
index 57d1733..b03ea0d 100644
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp
@@ -302,6 +302,7 @@ void AwtComponent::Dispose()
delete m_childList;
DestroyDropTarget();
+ ReleaseDragCapture(0);
if (m_myControlID != 0) {
AwtComponent* parent = GetParent();
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index c118b9a..a8cac77 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -79,6 +79,15 @@ ifeq ($(UNAME_S), Linux)
endif
OS_VERSION := $(shell $(UNAME) -r)
endif
+ifeq ($(UNAME_S), Darwin)
+ OS_NAME = macosx
+ OS_ARCH := $(shell $(UNAME) -m)
+ # Check for unknown arch, try uname -p if uname -m says unknown
+ ifeq ($(OS_ARCH),unknown)
+ OS_ARCH := $(shell $(UNAME) -p)
+ endif
+ OS_VERSION := $(shell $(UNAME) -r)
+endif
ifeq ($(OS_NAME),)
OS_NAME = windows
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
@@ -456,14 +465,14 @@ jdk_awt: $(call TestDirs, com/sun/awt java/awt sun/awt \
javax/imageio javax/print sun/pisces)
$(call RunOthervmBatch)
-# Stable agentvm testruns (minus items from PROBLEM_LIST)
+# Stable othervm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_beans1
JDK_DEFAULT_TARGETS += jdk_beans1
jdk_beans1: $(call TestDirs, \
java/beans/beancontext java/beans/PropertyChangeSupport \
java/beans/Introspector java/beans/Performance \
java/beans/VetoableChangeSupport java/beans/Statement)
- $(call RunAgentvmBatch)
+ $(call RunOthervmBatch)
# Stable othervm testruns (minus items from PROBLEM_LIST)
# Using agentvm has serious problems with these tests
@@ -541,14 +550,14 @@ jdk_nio1: $(call TestDirs, java/nio/file)
JDK_ALL_TARGETS += jdk_nio2
JDK_DEFAULT_TARGETS += jdk_nio2
jdk_nio2: $(call TestDirs, java/nio/Buffer java/nio/ByteOrder \
- java/nio/channels java/nio/MappedByteBuffer)
+ java/nio/channels java/nio/MappedByteBuffer sun/nio/ch)
$(call SharedLibraryPermissions,java/nio/channels)
$(call RunAgentvmBatch)
# Stable agentvm testruns (minus items from PROBLEM_LIST)
JDK_ALL_TARGETS += jdk_nio3
JDK_DEFAULT_TARGETS += jdk_nio3
-jdk_nio3: $(call TestDirs, sun/nio)
+jdk_nio3: $(call TestDirs, java/nio/charset sun/nio/cs)
$(call RunAgentvmBatch)
# All nio tests
@@ -580,7 +589,7 @@ jdk_security2: $(call TestDirs, javax/crypto javax/xml/crypto com/sun/crypto)
JDK_ALL_TARGETS += jdk_security3
jdk_security3: $(call TestDirs, com/sun/security lib/security javax/security \
sun/security com/sun/org/apache/xml/internal/security \
- com/oracle/secrity/ucrypto)
+ com/oracle/security/ucrypto)
$(call SharedLibraryPermissions,sun/security)
$(call RunAgentvmBatch)
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 2f4d91e..70a44d7 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -114,83 +114,10 @@
# jdk_awt
-# None of the awt tests are using samevm, might not be worth the effort due
-# to the vm overhead not being enough to make a difference.
-# In general, the awt tests are problematic with or without samevm, and there
-# are issues with using a Xvfb display.
-
-# Fails on solaris sparc, timedout? in othervm mode
-java/awt/event/MouseEvent/AcceptExtraButton/AcceptExtraButton.java generic-all
-
-# Causes hang in samevm mode??? Solaris 11 i586
-java/awt/FullScreen/SetFSWindow/FSFrame.java generic-all
-
-# Fails on solaris 11 i586, -client, in othervm mode not sure why
-java/awt/Component/PrintAllXcheckJNI/PrintAllXcheckJNI.java generic-all
-java/awt/Focus/CloseDialogActivateOwnerTest/CloseDialogActivateOwnerTest.java generic-all
-java/awt/FontClass/FontAccess.java generic-all
-java/awt/Mixing/HWDisappear.java generic-all
-java/awt/Mixing/MixingInHwPanel.java generic-all
-java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html generic-all
-java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java generic-all
-java/awt/Toolkit/SecurityTest/SecurityTest2.java generic-all
-java/awt/image/mlib/MlibOpsTest.java generic-all
-
-# Fails on windows, othervm mode, various errors
-java/awt/Focus/NonFocusableWindowTest/NonfocusableOwnerTest.java generic-all
-java/awt/Focus/OwnedWindowFocusIMECrashTest/OwnedWindowFocusIMECrashTest.java generic-all
-java/awt/FullScreen/NoResizeEventOnDMChangeTest/NoResizeEventOnDMChangeTest.java generic-all
-java/awt/Mouse/MouseModifiersUnitTest/MouseModifiersUnitTest_Standard.java generic-all
-java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html generic-all
-java/awt/font/Threads/FontThread.java generic-all
-java/awt/print/PrinterJob/PrtException.java generic-all
-
-# Fails with windows X64, othervm, -server
-com/sun/awt/Translucency/WindowOpacity.java generic-all
-java/awt/EventDispatchThread/HandleExceptionOnEDT/HandleExceptionOnEDT.java generic-all
-java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.html generic-all
-java/awt/Focus/AppletInitialFocusTest/AppletInitialFocusTest1.html generic-all
-java/awt/Focus/FocusEmbeddedFrameTest/FocusEmbeddedFrameTest.java generic-all
-java/awt/Frame/LayoutOnMaximizeTest/LayoutOnMaximizeTest.java generic-all
-java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java generic-all
-java/awt/Mixing/MixingOnShrinkingHWButton.java generic-all
-java/awt/Mouse/MouseModifiersUnitTest/ExtraButtonDrag.java generic-all
-
############################################################################
# jdk_beans
-# A large set of the beans tests set the security manager, which would seem
-# to indicate that a large number of them should be "othervm", yet are all
-# very small tests and could greatly benefit from a samevm test run.
-# So a large batch of beans tests are currently run with othervm mode.
-
-# Filed 6986807
-java/beans/Introspector/TestTypeResolver.java generic-all
-
-# Filed 6986813
-java/beans/Introspector/memory/Test4508780.java generic-all
-
-# Linux, some kind of problems with X11 display
-java/beans/PropertyChangeSupport/Test4682386.java generic-all
-java/beans/PropertyChangeSupport/TestSynchronization.java generic-all
-java/beans/Statement/Test4653179.java generic-all
-
-# Runs REALLY slow on Solaris sparc for some reason, both -client and -server
-java/beans/XMLEncoder/Test4625418.java solaris-sparc
-
-# Problems with samevm and setting security manager (speculation partially)
-java/beans/Introspector/4168475/Test4168475.java generic-all
-java/beans/Introspector/4520754/Test4520754.java generic-all
-java/beans/Introspector/6380849/TestBeanInfo.java generic-all
-java/beans/Introspector/Test4144543.java generic-all
-
-# Failed to call method solaris-sparc???
-java/beans/EventHandler/Test6788531.java generic-all
-
-# Jar or class not found???
-java/beans/XMLEncoder/6329581/Test6329581.java generic-all
-
############################################################################
# jdk_lang
@@ -198,91 +125,27 @@ java/beans/XMLEncoder/6329581/Test6329581.java generic-all
# 7123972
java/lang/annotation/loaderLeak/Main.java generic-all
-# 7079093
-java/lang/instrument/ManifestTest.sh windows-all
-
# 6944188
java/lang/management/ThreadMXBean/ThreadStateTest.java generic-all
# 7067973
java/lang/management/MemoryMXBean/CollectionUsageThreshold.java generic-all
+# 7148492
+java/lang/management/MemoryMXBean/ResetPeakMemoryUsage.java generic-all
+
############################################################################
# jdk_management
-# Failing, bug was filed: 6959636
-javax/management/loading/LibraryLoader/LibraryLoaderTest.java generic-all
-
-# Access denied messages on windows/mks, filed 6954450
-sun/management/jmxremote/bootstrap/RmiSslNoKeyStoreTest.sh windows-all
-
-# Fails on linux: KO: StringMonitor notification missed or not emitted
-javax/management/monitor/NonComparableAttributeValueTest.java generic-all
-
-# Port conflict? Fails with communication error
-sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh generic-all
-
-# Fails on Windows 2000, Test failed for iiop java.lang.NullPointerException
-# at org.omg.stub.javax.management.remote.rmi._RMIConnectionImpl_Tie._invoke(Unknown Source)
-# at com.sun.corba.se.impl.protocol.CorbaServerRequestDispatcherImpl.dispatchToServant(CorbaServerRequestDispatcherImpl.java:653)
-javax/management/remote/mandatory/connection/ReconnectTest.java generic-all
-
-# Solaris 10 sparc, NPE from org.omg.stub.javax.management.remote.rmi._RMIConnectionImpl_Tie._invoke
-javax/management/remote/mandatory/threads/ExecutorTest.java generic-all
-
-# Linux 32bit Fedora 9, IllegalStateException
-javax/management/monitor/RuntimeExceptionTest.java generic-all
-
-# Problems with rmi connection, othervm
-javax/management/remote/mandatory/subjectDelegation/SubjectDelegation2Test.java generic-all
-
-# Fails with port already in use
-sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh generic-all
-
-# Fails with port already in use
-sun/management/jmxremote/bootstrap/RmiRegistrySslTest.sh generic-all
-
-# Windows, connection can't last that long
-javax/management/eventService/LeaseTest.java generic-all
-
-# Linux othervm, X64, java.lang.Exception: Failed: ratio=102.4027795593753
-javax/management/remote/mandatory/notif/ListenerScaleTest.java generic-all
-
-# Windows run seems to have triggered a hotspot gc error (see 6801625)
-com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.sh generic-all
-
-# rmi problem? othervm, java.lang.reflect.UndeclaredThrowableException
-javax/management/remote/mandatory/subjectDelegation/SubjectDelegation3Test.java generic-all
-
-# Linux Fedora 9 32bit NPE in rmi server somehere??? othervm
-javax/management/remote/mandatory/notif/NotificationBufferDeadlockTest.java generic-all
-
-# Times out on solaris sparc, with othervm
-javax/management/eventService/AddRemoveListenerTest.java generic-all
-
-# Linux i586 and x64 -server, timed out waiting for threads to expire? othervm
-javax/management/eventService/EventClientThreadTest.java generic-all
-
-# Linux i586 -server, Expected to receive 20, but got 21, othervm
-# Fails on Linux X64 -server 20!=21
-javax/management/eventService/FetchingTest.java generic-all
-
-# NPE on windows 2000 i586 -client and -server
-javax/management/eventService/CustomForwarderTest.java windows-all
-
-# Windows i586 failure, callback did not complete
-javax/management/eventService/LeaseManagerDeadlockTest.java windows-all
+# 6959636
+javax/management/loading/LibraryLoader/LibraryLoaderTest.java windows-all
-# Port already in use
-sun/management/jmxremote/bootstrap/LocalManagementTest.sh generic-all
+# 7144846
+javax/management/remote/mandatory/connection/ReconnectTest.java generic-all
-# Failed to initialize connector (also overflowing jtreg io buffers)
-sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh generic-all
-sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh generic-all
-
-# Windows X64, java.lang.IllegalStateException
-javax/management/monitor/AttributeArbitraryDataTypeTest.java generic-all
+# 7149181
+sun/management/jmxremote/startstop/JMXStartStopTest.sh generic-all
############################################################################
@@ -298,72 +161,6 @@ demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java generic-all
# Need to be marked othervm, or changed to be samevm safe
com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java generic-all
-# Need to be marked othervm, or changed to be samevm safe
-com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all
-
-# Solaris sparc and others, exception in initializer
-javax/imageio/CachePremissionsTest/CachePermissionsTest.java generic-all
-
-# Leaves file rgba_* open, fails with windows samevm
-javax/imageio/plugins/png/PngOutputTypeTest.java generic-all
-
-# Suspect test.png file is left open, windows samevm problems
-javax/imageio/plugins/png/ITXtTest.java generic-all
-
-# Solaris sparc and others, failed to compile testcase
-javax/imageio/metadata/DOML3Node.java generic-all
-
-# One of these tests is leaving file IMGP1001.JPG open, windows samevm
-javax/imageio/plugins/jpeg/ConcurrentReadingTest.java generic-all
-javax/imageio/plugins/jpeg/ReadingInterruptionTest.java generic-all
-
-# One of these files is missing a close on writer_* files, windows samevm
-javax/imageio/plugins/jpeg/ConcurrentWritingTest.java generic-all
-javax/imageio/plugins/jpeg/WritingInterruptionTest.java generic-all
-
-# Leaving file test.jpg open, windows samevm
-javax/imageio/plugins/jpeg/ReadAsGrayTest.java generic-all
-
-# Missing close on file wbmp*, windows samevm
-javax/imageio/plugins/wbmp/CanDecodeTest.java generic-all
-
-# Failures on OpenSolaris, cannot read input files? samevm issues?
-javax/imageio/metadata/BooleanAttributes.java generic-all
-javax/imageio/plugins/bmp/BMPSubsamplingTest.java generic-all
-javax/imageio/plugins/bmp/TopDownTest.java generic-all
-javax/imageio/plugins/gif/EncodeSubImageTest.java generic-all
-javax/imageio/plugins/gif/GifTransparencyTest.java generic-all
-javax/imageio/plugins/png/GrayPngTest.java generic-all
-javax/imageio/plugins/png/ItxtUtf8Test.java generic-all
-javax/imageio/plugins/png/MergeStdCommentTest.java generic-all
-javax/imageio/plugins/png/ShortHistogramTest.java generic-all
-javax/imageio/plugins/shared/BitDepth.java generic-all
-
-# Exclude all javax/print tests, even if they passed, they may need samevm work
-
-# Times out on solaris-sparc, sparcv9, x64 -server, some on i586 -client
-javax/print/attribute/autosense/PrintAutoSenseData.java generic-all
-javax/print/attribute/Chroma.java generic-all
-javax/print/attribute/CollateAttr.java generic-all
-javax/print/attribute/PSCopiesFlavorTest.java generic-all
-javax/print/LookupServices.java generic-all
-javax/print/TestRaceCond.java generic-all
-
-# These tests really require a printer (might all be windows only tests?)
-javax/print/CheckDupFlavor.java generic-all
-javax/print/PrintSE/PrintSE.sh generic-all
-javax/print/attribute/ChromaticityValues.java generic-all
-javax/print/attribute/GetCopiesSupported.java generic-all
-javax/print/attribute/SidesPageRangesTest.java generic-all
-javax/print/attribute/SupportedPrintableAreas.java generic-all
-javax/print/attribute/AttributeTest.java generic-all
-
-# Only print test left, excluding just because all print tests have been
-javax/print/attribute/MediaMappingsTest.java generic-all
-
-# Filed 7058852
-javax/sound/sampled/FileWriter/AlawEncoderSync.java generic-all
-
############################################################################
# jdk_net
@@ -386,6 +183,25 @@ java/net/InetAddress/CheckJNI.java linux-all
# failing on vista 32/64 on nightly
# 7102702
java/net/PortUnreachableException/OneExceptionOnly.java windows-all
+
+# 7148829
+sun/net/InetAddress/nameservice/simple/CacheTest.java generic-all
+sun/net/InetAddress/nameservice/simple/DefaultCaching.java generic-all
+
+# 7122846
+java/net/MulticastSocket/NoLoopbackPackets.java macosx-all
+java/net/MulticastSocket/SetLoopbackMode.java macosx-all
+
+# 7145658
+java/net/MulticastSocket/Test.java macosx-all
+
+#7143960
+java/net/DatagramSocket/SendDatagramToBadAddress.java macosx-all
+
+# 7150552
+sun/net/www/protocol/http/B6299712.java macosx-all
+java/net/CookieHandler/CookieManagerTest.java macosx-all
+
############################################################################
# jdk_io
@@ -396,6 +212,9 @@ java/io/File/MaxPathLength.java windows-all
# 7076644
java/io/File/Basic.java windows-all
+# 7145435 - Test needs AWT window server, does not work headless
+java/io/Serializable/resolveClass/deserializeButton/run.sh macosx-all
+
############################################################################
# jdk_nio
@@ -406,80 +225,40 @@ java/nio/channels/Selector/Wakeup.java windows-all
# 7052549
java/nio/channels/FileChannel/ReleaseOnCloseDeadlock.java windows-all
+# 7133499, 7133497
+java/nio/channels/AsyncCloseAndInterrupt.java macosx-all
+java/nio/channels/AsynchronousFileChannel/Lock.java macosx-all
+java/nio/channels/FileChannel/Transfer.java macosx-all
+
+# 7141822
+java/nio/channels/DatagramChannel/ChangingAddress.java macosx-all
+
+# 7132677
+java/nio/channels/Selector/OutOfBand.java macosx-all
+
############################################################################
# jdk_rmi
-# Port already in use, fails on sparc, othervm
-java/rmi/reliability/benchmark/runRmiBench.sh generic-all
-
-# Already in use port issues? othervm solaris
-java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java generic-all
-java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java generic-all
-
-java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java generic-all
-java/rmi/transport/dgcDeadLock/TestImpl_Stub.java generic-all
-
-# Address already in use, othervm mode, solaris
-java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java generic-all
-java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java generic-all
-
-# Registry already running on port, solaris
-java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java generic-all
-
-# Fails on Linux 32 and 64bit -server?, impl not garbage collected???
-java/rmi/transport/pinLastArguments/PinLastArguments.java generic-all
-
-# Times out on solaris sparc
-java/rmi/server/RemoteServer/AddrInUse.java generic-all
-
-# Connection error on Windows i586 -server
-# Also connection errors in othervm on Solaris 10 sparc, same port???
-sun/rmi/transport/tcp/DeadCachedConnection.java generic-all
-
-# Connection errors in othervm on Solaris 10 sparc, same port???
-java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java generic-all
-java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java generic-all
-java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java generic-all
-java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java generic-all
-java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java generic-all
-java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java generic-all
-java/rmi/activation/Activatable/extLoadedImpl/ext.sh generic-all
-java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java generic-all
-java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java generic-all
-java/rmi/activation/Activatable/nestedActivate/NestedActivate.java generic-all
-java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java generic-all
-java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java generic-all
-java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java generic-all
-java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java generic-all
-java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java generic-all
-java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java generic-all
-java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java generic-all
-java/rmi/reliability/juicer/AppleUserImpl.java generic-all
-java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java generic-all
-java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java generic-all
-java/rmi/transport/handshakeTimeout/HandshakeTimeout.java generic-all
-java/rmi/activation/Activatable/restartService/RestartService.java generic-all
-java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java generic-all
-java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java generic-all
-java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java generic-all
-java/rmi/activation/CommandEnvironment/SetChildEnv.java generic-all
-java/rmi/registry/classPathCodebase/ClassPathCodebase.java generic-all
-java/rmi/registry/reexport/Reexport.java generic-all
+# 7140992
java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java generic-all
-java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java generic-all
-java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java generic-all
-java/rmi/server/useCustomRef/UseCustomRef.java generic-all
-java/rmi/transport/checkFQDN/CheckFQDN.java generic-all
-java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java generic-all
-java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java generic-all
-java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java generic-all
-java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java generic-all
+
+# 6948101
+java/rmi/transport/pinLastArguments/PinLastArguments.java generic-all
+
+# 7146541
+java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java linux-all
+
+# 7132247
+java/rmi/registry/readTest/readTest.sh windows-all
############################################################################
# jdk_security
+# 7147060
+com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all
+
# Failing on Solaris i586, 3/9/2010, not a -samevm issue (jdk_security3)
sun/security/pkcs11/Secmod/AddPrivateKey.java solaris-i586
sun/security/pkcs11/ec/ReadCertificates.java solaris-i586
@@ -520,9 +299,6 @@ sun/security/ssl/sanity/interop/ClientJSSEServerJSSE.java generic-all
# 7079203 sun/security/tools/keytool/printssl.sh fails on solaris with timeout
sun/security/tools/keytool/printssl.sh solaris-all
-# 7081817
-sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java generic-all
-
# 7041639, Solaris DSA keypair generation bug (Note: jdk_util also affected)
java/security/KeyPairGenerator/SolarisShortDSA.java solaris-all
sun/security/tools/jarsigner/onlymanifest.sh solaris-all
@@ -535,25 +311,23 @@ sun/security/tools/keytool/standard.sh solaris-all
############################################################################
-# jdk_swing (not using samevm)
+# jdk_sound
+
+############################################################################
-# Fails on solaris 11 i586, with othervm
-javax/swing/JFileChooser/6570445/bug6570445.java generic-all
-javax/swing/JFileChooser/6738668/bug6738668.java generic-all
-javax/swing/JPopupMenu/6675802/bug6675802.java generic-all
-javax/swing/system/6799345/TestShutdown.java generic-all
+# jdk_swing
############################################################################
# jdk_text
-# Linux x64 occasional errors, no details
-java/text/Bidi/Bug6665028.java linux-x64
-
############################################################################
# jdk_tools
+# 6461635
+com/sun/tools/attach/BasicTests.sh generic-all
+
# Filed 6952105
com/sun/jdi/SuspendThreadTest.java generic-all
@@ -569,32 +343,34 @@ com/sun/jdi/FieldWatchpoints.java generic-all
# Filed 6402201
com/sun/jdi/ProcessAttachTest.sh generic-all
-# Filed 6986875
-sun/tools/jps/jps-Vvml.sh generic-all
-
# Filed 6979016
sun/tools/jconsole/ResourceCheckTest.sh generic-all
+# 7132203
+sun/jvmstat/monitor/MonitoredVm/CR6672135.java generic-all
+
+# Tests take too long, see 7143279
+tools/pack200/CommandLineTests.java generic-all
+tools/pack200/Pack200Test.java generic-all
+
+# 7150569
+tools/launcher/UnicodeTest.java macosx-all
+
############################################################################
# jdk_util
-# Filed 7027061
-java/util/Locale/Bug6989440.java windows-all
-
# Filed 6933803
java/util/concurrent/ThreadPoolExecutor/CoreThreadTimeOut.java generic-all
-# Filed 7022325
-# Fails with assertion error on windows
-# 11 separate stacktraces created... file reuse problem?
-java/util/zip/ZipFile/ReadLongZipFileName.java generic-all
-
# Filed 6772009
java/util/concurrent/locks/ReentrantLock/CancelledLockLoops.java generic-all
# 7041639, Solaris DSA keypair generation bug
java/util/TimeZone/TimeZoneDatePermissionCheck.sh solaris-all
-############################################################################
+# 7150557
+java/util/prefs/RemoveReadOnlyNode.java macosx-all
+java/util/prefs/RemoveUnregedListener.java macosx-all
+############################################################################
diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT
index c48cdec..4e46054 100644
--- a/jdk/test/TEST.ROOT
+++ b/jdk/test/TEST.ROOT
@@ -4,3 +4,9 @@
# The list of keywords supported in the entire test suite
keys=2d dnd i18n modules
+
+# Tests that must run in othervm mode
+othervm.dirs=java/rmi sun/rmi javax/management
+
+# Tests that cannot run concurrently
+exclusiveAccess.dirs=java/rmi sun/rmi sun/management/jmxremote sun/tools/jstatd
diff --git a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
index 563942f..292a8cb 100644
--- a/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
+++ b/jdk/test/com/sun/crypto/provider/KeyAgreement/DHKeyAgreement2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 0000000
+ * @bug 7146728
* @summary DHKeyAgreement2
* @author Jan Luehe
*/
@@ -52,15 +52,12 @@ import sun.misc.HexDumpEncoder;
public class DHKeyAgreement2 {
+ private static final String SUNJCE = "SunJCE";
private DHKeyAgreement2() {}
public static void main(String argv[]) throws Exception {
String mode = "USE_SKIP_DH_PARAMS";
- // Add JCE to the list of providers
- SunJCE jce = new SunJCE();
- Security.addProvider(jce);
-
DHKeyAgreement2 keyAgree = new DHKeyAgreement2();
if (argv.length > 1) {
@@ -86,7 +83,7 @@ public class DHKeyAgreement2 {
// Some central authority creates new DH parameters
System.err.println("Creating Diffie-Hellman parameters ...");
AlgorithmParameterGenerator paramGen
- = AlgorithmParameterGenerator.getInstance("DH");
+ = AlgorithmParameterGenerator.getInstance("DH", SUNJCE);
paramGen.init(512);
AlgorithmParameters params = paramGen.generateParameters();
dhSkipParamSpec = (DHParameterSpec)params.getParameterSpec
@@ -103,7 +100,7 @@ public class DHKeyAgreement2 {
* above
*/
System.err.println("ALICE: Generate DH keypair ...");
- KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH");
+ KeyPairGenerator aliceKpairGen = KeyPairGenerator.getInstance("DH", SUNJCE);
aliceKpairGen.initialize(dhSkipParamSpec);
KeyPair aliceKpair = aliceKpairGen.generateKeyPair();
System.out.println("Alice DH public key:\n" +
@@ -112,14 +109,14 @@ public class DHKeyAgreement2 {
aliceKpair.getPrivate().toString());
DHParameterSpec dhParamSpec =
((DHPublicKey)aliceKpair.getPublic()).getParams();
- AlgorithmParameters algParams = AlgorithmParameters.getInstance("DH");
+ AlgorithmParameters algParams = AlgorithmParameters.getInstance("DH", SUNJCE);
algParams.init(dhParamSpec);
System.out.println("Alice DH parameters:\n"
+ algParams.toString());
// Alice executes Phase1 of her version of the DH protocol
System.err.println("ALICE: Execute PHASE1 ...");
- KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH");
+ KeyAgreement aliceKeyAgree = KeyAgreement.getInstance("DH", SUNJCE);
aliceKeyAgree.init(aliceKpair.getPrivate());
// Alice encodes her public key, and sends it over to Bob.
@@ -130,7 +127,7 @@ public class DHKeyAgreement2 {
* in encoded format.
* He instantiates a DH public key from the encoded key material.
*/
- KeyFactory bobKeyFac = KeyFactory.getInstance("DH");
+ KeyFactory bobKeyFac = KeyFactory.getInstance("DH", SUNJCE);
X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec
(alicePubKeyEnc);
PublicKey alicePubKey = bobKeyFac.generatePublic(x509KeySpec);
@@ -144,7 +141,7 @@ public class DHKeyAgreement2 {
// Bob creates his own DH key pair
System.err.println("BOB: Generate DH keypair ...");
- KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH");
+ KeyPairGenerator bobKpairGen = KeyPairGenerator.getInstance("DH", SUNJCE);
bobKpairGen.initialize(dhParamSpec);
KeyPair bobKpair = bobKpairGen.generateKeyPair();
System.out.println("Bob DH public key:\n" +
@@ -154,7 +151,7 @@ public class DHKeyAgreement2 {
// Bob executes Phase1 of his version of the DH protocol
System.err.println("BOB: Execute PHASE1 ...");
- KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH");
+ KeyAgreement bobKeyAgree = KeyAgreement.getInstance("DH", SUNJCE);
bobKeyAgree.init(bobKpair.getPrivate());
// Bob encodes his public key, and sends it over to Alice.
@@ -166,7 +163,7 @@ public class DHKeyAgreement2 {
* Before she can do so, she has to instanticate a DH public key
* from Bob's encoded key material.
*/
- KeyFactory aliceKeyFac = KeyFactory.getInstance("DH");
+ KeyFactory aliceKeyFac = KeyFactory.getInstance("DH", SUNJCE);
x509KeySpec = new X509EncodedKeySpec(bobPubKeyEnc);
PublicKey bobPubKey = aliceKeyFac.generatePublic(x509KeySpec);
System.err.println("ALICE: Execute PHASE2 ...");
@@ -187,50 +184,33 @@ public class DHKeyAgreement2 {
byte[] aliceSharedSecret = aliceKeyAgree.generateSecret();
int aliceLen = aliceSharedSecret.length;
+ // check if alice's key agreement has been reset afterwards
+ try {
+ aliceKeyAgree.generateSecret();
+ throw new Exception("Error: alice's KeyAgreement not reset");
+ } catch (IllegalStateException e) {
+ System.out.println("EXPECTED: " + e.getMessage());
+ }
+
byte[] bobSharedSecret = new byte[aliceLen];
int bobLen;
try {
// provide output buffer that is too short
bobLen = bobKeyAgree.generateSecret(bobSharedSecret, 1);
-
- /*
- * Gatekeeper's note:
- * We should not be getting here, but every so often, we
- * get a failure, either a "ShortBufferException" or
- * "Key agreement has not been completed yet" in the
- * generateSecret(bobSharedSecret, 0) below.
- *
- * This will help to figure out why we're dropping through
- * and not failing.
- */
- System.out.println("NIGHTLY: Should *NOT* be here!!!\n" +
- "aliceLen = " + aliceLen + "\n" +
- "Alice's shared secret");
-
- try {
- HexDumpEncoder hd = new HexDumpEncoder();
-
- hd.encodeBuffer(
- new ByteArrayInputStream(aliceSharedSecret), System.out);
- } catch (IOException e) { }
-
- System.out.println("bobLen = " + bobLen);
-
- try {
- HexDumpEncoder hd = new HexDumpEncoder();
-
- hd.encodeBuffer(
- new ByteArrayInputStream(bobSharedSecret), System.out);
- } catch (IOException e) { }
-
- throw new Exception("Shouldn't be succeeding.");
} catch (ShortBufferException e) {
System.out.println("EXPECTED: " + e.getMessage());
}
-
- // provide output buffer of required size
+ // retry w/ output buffer of required size
bobLen = bobKeyAgree.generateSecret(bobSharedSecret, 0);
+ // check if bob's key agreement has been reset afterwards
+ try {
+ bobKeyAgree.generateSecret(bobSharedSecret, 0);
+ throw new Exception("Error: bob's KeyAgreement not reset");
+ } catch (IllegalStateException e) {
+ System.out.println("EXPECTED: " + e.getMessage());
+ }
+
System.out.println("Alice secret: " + toHexString(aliceSharedSecret));
System.out.println("Bob secret: " + toHexString(bobSharedSecret));
diff --git a/jdk/test/com/sun/jdi/EarlyReturnTest.java b/jdk/test/com/sun/jdi/EarlyReturnTest.java
index 1de97ca..306ff25 100644
--- a/jdk/test/com/sun/jdi/EarlyReturnTest.java
+++ b/jdk/test/com/sun/jdi/EarlyReturnTest.java
@@ -292,7 +292,9 @@ public class EarlyReturnTest extends TestScaffold {
private String[] excludes = {
"javax.*",
"sun.*",
- "com.sun.*"};
+ "com.sun.*",
+ "com.oracle.*",
+ "oracle.*"};
static VirtualMachineManager vmm ;
ClassType targetClass;
diff --git a/jdk/test/com/sun/jdi/ImmutableResourceTest.sh b/jdk/test/com/sun/jdi/ImmutableResourceTest.sh
index 2e2a666..527de19 100644
--- a/jdk/test/com/sun/jdi/ImmutableResourceTest.sh
+++ b/jdk/test/com/sun/jdi/ImmutableResourceTest.sh
@@ -28,14 +28,14 @@
#
# @run shell ImmutableResourceTest.sh
#
-#
+#
# Beginning of subroutines:
status=1
#Call this from anywhere to fail the test with an error message
# usage: fail "reason why the test failed"
-fail()
+fail()
{ echo "The test failed :-("
echo "$*" 1>&2
echo "exit status was $status"
@@ -44,7 +44,7 @@ fail()
#Call this from anywhere to pass the test with a message
# usage: pass "reason why the test passed if applicable"
-pass()
+pass()
{ echo "The test passed!!!"
echo "$*" 1>&2
exit 0
@@ -56,7 +56,7 @@ pass()
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PATHSEP=":"
;;
@@ -83,7 +83,7 @@ if [ -z "${TESTJAVA}" ] ; then
if [ -n "$1" ] ; then
TESTJAVA=$1
else
- TESTJAVA=$JAVA_HOME
+ TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
diff --git a/jdk/test/com/sun/jdi/JITDebug.sh b/jdk/test/com/sun/jdi/JITDebug.sh
index 6850978..1359780 100644
--- a/jdk/test/com/sun/jdi/JITDebug.sh
+++ b/jdk/test/com/sun/jdi/JITDebug.sh
@@ -40,7 +40,7 @@ status=1
#Call this from anywhere to fail the test with an error message
# usage: fail "reason why the test failed"
-fail()
+fail()
{ echo "The test failed :-("
echo "$*" 1>&2
echo "exit status was $status"
@@ -49,7 +49,7 @@ fail()
#Call this from anywhere to pass the test with a message
# usage: pass "reason why the test passed if applicable"
-pass()
+pass()
{ echo "The test passed!!!"
echo "$*" 1>&2
exit 0
@@ -63,7 +63,7 @@ pass()
OS=`uname -s`
export TRANSPORT_METHOD
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
@@ -80,8 +80,8 @@ case "$OS" in
;;
esac
#
-# Want this test to run standalone as well as in the harness, so do the
-# following to copy the test's directory into the harness's scratch directory
+# Want this test to run standalone as well as in the harness, so do the
+# following to copy the test's directory into the harness's scratch directory
# and set all appropriate variables:
if [ -z "${TESTJAVA}" ] ; then
@@ -95,7 +95,7 @@ if [ -z "${TESTJAVA}" ] ; then
if [ -n "$1" ] ; then
TESTJAVA=$1
else
- TESTJAVA=$JAVA_HOME
+ TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
diff --git a/jdk/test/com/sun/jdi/MethodEntryExitEvents.java b/jdk/test/com/sun/jdi/MethodEntryExitEvents.java
index 5313ea3..8f1ac42 100644
--- a/jdk/test/com/sun/jdi/MethodEntryExitEvents.java
+++ b/jdk/test/com/sun/jdi/MethodEntryExitEvents.java
@@ -114,7 +114,8 @@ public class MethodEntryExitEvents extends TestScaffold {
* http://java.sun.com/javase/technologies/core/toolsapis/jpda/
*/
private String[] excludes = {"java.*", "javax.*", "sun.*",
- "com.sun.*"};
+ "com.sun.*", "com.oracle.*",
+ "oracle.*"};
MethodEntryExitEvents (String args[]) {
super(args);
diff --git a/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java b/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java
index 5df0175..5047e12 100644
--- a/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java
+++ b/jdk/test/com/sun/jdi/MethodExitReturnValuesTest.java
@@ -218,7 +218,9 @@ public class MethodExitReturnValuesTest extends TestScaffold {
private String[] excludes = {
"javax.*",
"sun.*",
- "com.sun.*"};
+ "com.sun.*",
+ "com.oracle.*",
+ "oracle.*"};
static VirtualMachineManager vmm ;
ClassType targetClass;
diff --git a/jdk/test/com/sun/jdi/PrivateTransportTest.sh b/jdk/test/com/sun/jdi/PrivateTransportTest.sh
index 89a306c..868d864 100644
--- a/jdk/test/com/sun/jdi/PrivateTransportTest.sh
+++ b/jdk/test/com/sun/jdi/PrivateTransportTest.sh
@@ -127,6 +127,9 @@ case `uname -s` in
xx=`find ${jreloc}/lib -name libdt_socket.so`
libloc=`dirname ${xx}`
;;
+ Darwin)
+ libloc=${jreloc}/lib
+ ;;
Windows*)
is_windows=true
libloc=${jreloc}/bin
@@ -160,6 +163,19 @@ if [ -f ${libloc}/dt_socket.dll ] ; then
PATH="${PATH}${sep}${libdir}"
export PATH
echo PATH=${PATH}
+elif [ -f ${libloc}/libdt_socket.dylib ]; then
+ fullpath=${libdir}/lib${private_transport}.dylib
+ rm -f ${fullpath}
+ echo cp ${libloc}/libdt_socket.dylib ${fullpath}
+ cp ${libloc}/libdt_socket.dylib ${fullpath}
+ # make sure we can find libraries in current directory
+ if [ "${LD_LIBRARY_PATH}" = "" ] ; then
+ LD_LIBRARY_PATH=${libdir}
+ else
+ LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${libdir}
+ fi
+ export LD_LIBRARY_PATH
+ echo LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
elif [ -f ${libloc}/libdt_socket.so ] ; then
fullpath=${libdir}/lib${private_transport}.so
rm -f ${fullpath}
diff --git a/jdk/test/com/sun/jdi/ShellScaffold.sh b/jdk/test/com/sun/jdi/ShellScaffold.sh
index 03c97bf..4e664c7 100644
--- a/jdk/test/com/sun/jdi/ShellScaffold.sh
+++ b/jdk/test/com/sun/jdi/ShellScaffold.sh
@@ -293,7 +293,7 @@ EOF
psCmd=ps
jstack=jstack.exe
;;
- SunOS | Linux)
+ SunOS | Linux | Darwin)
transport=dt_socket
address=
devnull=/dev/null
diff --git a/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh b/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
index c67a097..457d26c 100644
--- a/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
+++ b/jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh
@@ -41,7 +41,7 @@ status=1
#Call this from anywhere to fail the test with an error message
# usage: fail "reason why the test failed"
-fail()
+fail()
{ echo "The test failed :-("
echo "$*" 1>&2
echo "exit status was $status"
@@ -50,7 +50,7 @@ fail()
#Call this from anywhere to pass the test with a message
# usage: pass "reason why the test passed if applicable"
-pass()
+pass()
{ echo "The test passed!!!"
echo "$*" 1>&2
exit 0
@@ -65,7 +65,7 @@ fi
testName=$1
shift
-#Set appropriate jdk
+#Set appropriate jdk
if [ -z "${TESTJAVA}" ] ; then
# TESTJAVA is not set, so the test is running stand-alone.
@@ -79,7 +79,7 @@ if [ -z "${TESTJAVA}" ] ; then
TESTJAVA=$1
else
echo "no JDK specified on command line so using JAVA_HOME=$JAVA_HOME"
- TESTJAVA=$JAVA_HOME
+ TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
@@ -104,15 +104,15 @@ case "$OS" in
PATHSEP=":"
PTYPE=`uname -p`
if [ -x /usr/bin/isainfo ]; then
- # Instruction set being used by the OS
- ISET=`isainfo -k`
+ # Instruction set being used by the OS
+ ISET=`isainfo -k`
else
- #SunOS 5.6 didn't have "isainfo"
+ #SunOS 5.6 didn't have "isainfo"
pass "This test always passes on $OS/$PTYPE (32-bit ${ISET})"
fi
;;
- Linux )
+ Linux | Darwin )
pass "This test always passes on $OS"
;;
@@ -156,12 +156,12 @@ if [ $? = 1 ]; then
pass "This test always passes on $OS/$PTYPE if 64 bit jdk is not installed"
fi
-# Want this test to run standalone as well as in the harness, so do the
-# following to copy the test's directory into the harness's scratch directory
+# Want this test to run standalone as well as in the harness, so do the
+# following to copy the test's directory into the harness's scratch directory
# and set all appropriate variables:
#Deal with .class files:
-if [ -n "${STANDALONE}" ] ; then
+if [ -n "${STANDALONE}" ] ; then
#if running standalone, compile the support files
${TESTJAVA}/bin/javac -d ${TESTCLASSES} \
-classpath "$TESTJAVA/lib/tools.jar${PATHSEP}${TESTSRC}" \
@@ -177,7 +177,7 @@ filename=$TESTCLASSES/@debuggeeVMOptions
if [ ! -r ${filename} ] ; then
filename=$TESTCLASSES/../@debuggeeVMOptions
fi
-# Remove -d32, -d64 if present, and remove -XX:[+-]UseCompressedOops
+# Remove -d32, -d64 if present, and remove -XX:[+-]UseCompressedOops
# if present since it is illegal in 32 bit mode.
if [ -r ${filename} ] ; then
DEBUGGEEFLAGS=`cat ${filename} | sed \
@@ -204,19 +204,19 @@ for DEBUGGERMODEL in \
DEBUGGERFLAGS="-d${DEBUGGERMODEL} -showversion -DEXPECTED=${TARGETMODEL}"
CONNECTSTRING="-connect 'com.sun.jdi.CommandLineLaunch:options=-d${TARGETMODEL} $DEBUGGEEFLAGS -showversion'"
- for TARGETCLASS in $testName ; do
- echo "--------------------------------------------"
- echo "debugger=${DEBUGGERMODEL} debugee=${TARGETMODEL} class=${TARGETCLASS}"
- echo "--------------------------------------------"
- echo ${TESTJAVA}/bin/java -DHANGINGJAVA_DEB ${DEBUGGERFLAGS} ${CP} ${TARGETCLASS} ${CONNECTSTRING}
- eval ${TESTJAVA}/bin/java -DHANGINGJAVA_DEB ${DEBUGGERFLAGS} ${CP} ${TARGETCLASS} ${CONNECTSTRING}
- status=$?
- if [ $status -ne "0" ];
- then fail "$DEBUGGERMODEL to $TARGETMODEL test failed for class=$TARGETCLASS!"
- fi
- done
+ for TARGETCLASS in $testName ; do
+ echo "--------------------------------------------"
+ echo "debugger=${DEBUGGERMODEL} debugee=${TARGETMODEL} class=${TARGETCLASS}"
+ echo "--------------------------------------------"
+ echo ${TESTJAVA}/bin/java -DHANGINGJAVA_DEB ${DEBUGGERFLAGS} ${CP} ${TARGETCLASS} ${CONNECTSTRING}
+ eval ${TESTJAVA}/bin/java -DHANGINGJAVA_DEB ${DEBUGGERFLAGS} ${CP} ${TARGETCLASS} ${CONNECTSTRING}
+ status=$?
+ if [ $status -ne "0" ];
+ then fail "$DEBUGGERMODEL to $TARGETMODEL test failed for class=$TARGETCLASS!"
+ fi
+ done
done
-done
+done
#
# pass or fail the test based on status of the command
if [ $status -eq "0" ];
diff --git a/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh b/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
index ea16378..f68fc94 100644
--- a/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
+++ b/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
@@ -45,10 +45,7 @@ fi
OS=`uname -s`
case "$OS" in
- SunOS )
- PS=":"
- ;;
- Linux )
+ SunOS | Linux | Darwin )
PS=":"
;;
Windows* | CYGWIN*)
@@ -65,7 +62,7 @@ JAVA="${TESTJAVA}"/bin/java
SOMEOTHERDIR="${TESTCLASSES}"/someotherdir
# Compile test into the classes directory
-# Compile the list connectors class into a directory that isn't on
+# Compile the list connectors class into a directory that isn't on
# any class path.
$JAVAC -d "${TESTCLASSES}" "${TESTSRC}"/JdiLoadedByCustomLoader.java
@@ -74,7 +71,7 @@ mkdir "${SOMEOTHERDIR}"
$JAVAC -d "${SOMEOTHERDIR}" -classpath "${TESTSRC}${PS}${TESTJAVA}/lib/tools.jar" \
"${TESTSRC}"/ListConnectors.java
-# Run the test
+# Run the test
"${JAVA}" -classpath "${TESTCLASSES}" JdiLoadedByCustomLoader \
"${SOMEOTHERDIR}"
diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java
deleted file mode 100644
index da978e6..0000000
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/ExecuteDiagnosticCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * 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 7104647
- * @summary Basic Test for HotSpotDiagnosticMXBean.execute()
- * @author Frederic Parain
- *
- * @run main ExecuteDiagnosticCommand
- */
-
-import com.sun.management.HotSpotDiagnosticMXBean;
-import com.sun.management.VMOption;
-import java.lang.management.ManagementFactory;
-import java.util.List;
-import javax.management.MBeanServer;
-
-public class ExecuteDiagnosticCommand {
- private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME =
- "com.sun.management:type=HotSpotDiagnostic";
-
- public static void main(String[] args) throws Exception {
- HotSpotDiagnosticMXBean mbean =
- ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
- executeDiagnosticCommand(mbean);
-
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- mbean = ManagementFactory.newPlatformMXBeanProxy(mbs,
- HOTSPOT_DIAGNOSTIC_MXBEAN_NAME,
- HotSpotDiagnosticMXBean.class);
- executeDiagnosticCommand(mbean);
- }
-
- private static void executeDiagnosticCommand(HotSpotDiagnosticMXBean mbean) {
- String s = mbean.execute("help help");
- System.out.println(s);
- s = mbean.execute("help", "help");
- System.out.println(s);
- String tab[] = { "help"};
- s = mbean.execute("help", tab);
- System.out.println(s);
- }
-}
diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java
deleted file mode 100644
index 938dfe0..0000000
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommandInfo.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * 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 7104647
- * @summary Basic Test for HotSpotDiagnosticMXBean.getDiagnosticCommandInfo()
- * @author Frederic Parain
- *
- * @run main GetDiagnosticCommandInfo
- */
-
-import com.sun.management.HotSpotDiagnosticMXBean;
-import com.sun.management.DiagnosticCommandInfo;
-import com.sun.management.DiagnosticCommandArgumentInfo;
-import com.sun.management.VMOption;
-import java.lang.management.ManagementFactory;
-import java.util.List;
-import javax.management.MBeanServer;
-
-public class GetDiagnosticCommandInfo {
- private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME =
- "com.sun.management:type=HotSpotDiagnostic";
-
- public static void main(String[] args) throws Exception {
- HotSpotDiagnosticMXBean mbean =
- ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
- checkDiagnosticCommandArguments(mbean);
-
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- mbean = ManagementFactory.newPlatformMXBeanProxy(mbs,
- HOTSPOT_DIAGNOSTIC_MXBEAN_NAME,
- HotSpotDiagnosticMXBean.class);
- checkDiagnosticCommandArguments(mbean);
- }
-
- private static void checkDiagnosticCommandArguments(HotSpotDiagnosticMXBean mbean) {
- // check getDiagnosticCommandInfo()
- StringBuilder sb = new StringBuilder();
- List<DiagnosticCommandInfo> infoList = mbean.getDiagnosticCommandInfo();
- for(DiagnosticCommandInfo info : infoList) {
- printCommandInfo(info,sb);
- }
- // check getDiagnosticCommandInfo(List<String>)
- List<String> commands = mbean.getDiagnosticCommands();
- List<DiagnosticCommandInfo> list2 =
- mbean.getDiagnosticCommandInfo(commands);
- for(DiagnosticCommandInfo info : list2) {
- printCommandInfo(info,sb);
- }
- // check getDiagnosticCommandInfo(String)
- for(String cmd : commands) {
- DiagnosticCommandInfo info2 = mbean.getDiagnosticCommandInfo(cmd);
- printCommandInfo(info2,sb);
- }
- System.out.println(sb.toString());
- }
-
- private static void printCommandInfo(DiagnosticCommandInfo info,
- StringBuilder sb) {
- sb.append("\t").append(info.getName()).append(":\n");
- sb.append("\t\tDescription=").append(info.getDescription()).append("\n");
- sb.append("\t\tImpact=").append(info.getImpact()).append("\n");
- sb.append("\t\tStatus=");
- if (info.isEnabled()) {
- sb.append("Enabled\n");
- } else {
- sb.append("Disbled\n");
- }
- sb.append("\t\tArguments=");
- for(DiagnosticCommandArgumentInfo arg : info.getArgumentsInfo()) {
- printArgumentInfo(arg,sb);
- }
- }
-
- private static void printArgumentInfo(DiagnosticCommandArgumentInfo info,
- StringBuilder sb) {
- sb.append("\t\t\t").append(info.getName()).append(":\n");
- sb.append("\t\t\t\tType=").append(info.getType()).append("\n");
- sb.append("\t\t\t\tDescription=").append(info.getDescription()).append("\n");
- if(info.getDefault() != null) {
- sb.append("\t\t\t\tDefault=").append(info.getDefault()).append("\n");
- }
- if(info.isMandatory()) {
- sb.append("\t\t\t\tMandatory\n");
- } else {
- sb.append("\t\t\t\tOptional\n");
- }
- if(info.isOption()) {
- sb.append("\t\t\t\tIs an option\n");
- } else {
- sb.append("\t\t\t\tIs an argument expected at position");
- sb.append(info.getPosition());
- sb.append("\n");
- }
- }
-}
diff --git a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java
deleted file mode 100644
index 2540727..0000000
--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/GetDiagnosticCommands.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
- * 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 7104647
- * @summary Basic Test for HotSpotDiagnosticMXBean.getDiagnosticCommands()
- * @author Frederic Parain
- *
- * @run main GetDiagnosticCommands
- */
-
-import com.sun.management.HotSpotDiagnosticMXBean;
-import com.sun.management.VMOption;
-import java.lang.management.ManagementFactory;
-import java.util.List;
-import javax.management.MBeanServer;
-
-public class GetDiagnosticCommands {
- private static String HOTSPOT_DIAGNOSTIC_MXBEAN_NAME =
- "com.sun.management:type=HotSpotDiagnostic";
-
- public static void main(String[] args) throws Exception {
- HotSpotDiagnosticMXBean mbean =
- ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
- checkDiagnosticCommands(mbean);
-
- MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
- mbean = ManagementFactory.newPlatformMXBeanProxy(mbs,
- HOTSPOT_DIAGNOSTIC_MXBEAN_NAME,
- HotSpotDiagnosticMXBean.class);
- checkDiagnosticCommands(mbean);
- }
-
- private static void checkDiagnosticCommands(HotSpotDiagnosticMXBean mbean) {
- List<String> commands = mbean.getDiagnosticCommands();
- System.out.println("Commands:");
- for (String cmd : commands) {
- System.out.println(cmd);
- }
- }
-}
diff --git a/jdk/test/com/sun/tools/attach/CommonSetup.sh b/jdk/test/com/sun/tools/attach/CommonSetup.sh
index b05d5d3..a37d0d1 100644
--- a/jdk/test/com/sun/tools/attach/CommonSetup.sh
+++ b/jdk/test/com/sun/tools/attach/CommonSetup.sh
@@ -36,11 +36,7 @@
OS=`uname -s`
case "$OS" in
- SunOS )
- PS=":"
- FS="/"
- ;;
- Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -72,7 +68,7 @@ then
echo "TESTSRC not set. Test cannot execute. Failed."
exit 1
fi
-
+
if [ "${TESTCLASSES}" = "" ]
then
echo "TESTCLASSES not set. Test cannot execute. Failed."
diff --git a/jdk/test/demo/jvmti/DemoRun.java b/jdk/test/demo/jvmti/DemoRun.java
index b83b54d..9038507 100644
--- a/jdk/test/demo/jvmti/DemoRun.java
+++ b/jdk/test/demo/jvmti/DemoRun.java
@@ -123,7 +123,8 @@ public class DemoRun {
String os_arch = System.getProperty("os.arch");
String os_name = System.getProperty("os.name");
String libprefix = os_name.contains("Windows")?"":"lib";
- String libsuffix = os_name.contains("Windows")?".dll":".so";
+ String libsuffix = os_name.contains("Windows")?".dll":
+ os_name.startsWith("Mac OS")?".dylib":".so";
boolean d64 = ( os_name.contains("Solaris") ||
os_name.contains("SunOS") )
&& ( os_arch.equals("sparcv9") ||
diff --git a/jdk/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java b/jdk/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java
index 2c14710..e545b08 100644
--- a/jdk/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java
+++ b/jdk/test/java/awt/Choice/ChoiceMouseWheelTest/ChoiceMouseWheelTest.java
@@ -96,7 +96,10 @@ public class ChoiceMouseWheelTest extends Frame {
// Test mouse wheel over the choice
String name = Toolkit.getDefaultToolkit().getClass().getName();
- if(!name.equals("sun.awt.X11.XToolkit")) { // mouse wheel doesn't work for the choice on X11, so skip it
+
+ // mouse wheel doesn't work for the choice on X11 and Mac, so skip it
+ if(!name.equals("sun.awt.X11.XToolkit")
+ && !name.equals("sun.lwawt.macosx.LWCToolkit")) {
robot.mouseWheel(1);
Util.waitForIdle(robot);
diff --git a/jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java b/jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java
index 294f455..595cfc9 100644
--- a/jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java
+++ b/jdk/test/java/awt/print/PaintSetEnabledDeadlock/PaintSetEnabledDeadlock.java
@@ -54,9 +54,12 @@ public class PaintSetEnabledDeadlock extends Frame {
Util.clickOnComp(frame.button, robot);
}
- frame.panel.stop();
+ boolean ret = frame.panel.stop();
frame.dispose();
+ if (!ret) {
+ throw new RuntimeException("Test failed!");
+ }
System.out.println("Test passed.");
}
@@ -140,17 +143,19 @@ class TestPanel extends Panel implements Runnable {
}
}
- public void stop() {
+ public boolean stop() {
active = false;
try {
- synchronized (sync) {
- sync.notify();
- }
- synchronized (thread) {
- thread.wait();
+ sync();
+ thread.join(1000);
+ if (thread.isAlive()) {
+ thread.interrupt();
+ return false;
}
} catch (InterruptedException ex) {
+ return false;
}
+ return true;
}
public void draw() {
diff --git a/jdk/test/java/io/File/GetXSpace.java b/jdk/test/java/io/File/GetXSpace.java
index 8868b54..9276ef5 100644
--- a/jdk/test/java/io/File/GetXSpace.java
+++ b/jdk/test/java/io/File/GetXSpace.java
@@ -50,7 +50,8 @@ public class GetXSpace {
private static final String name = System.getProperty("os.name");
private static final String dfFormat;
static {
- if (name.equals("SunOS") || name.equals("Linux")) {
+ if (name.equals("SunOS") || name.equals("Linux")
+ || name.startsWith("Mac OS")) {
// FileSystem Total Used Available Use% MountedOn
dfFormat = "([^\\s]+)\\s+(\\d+)\\s+\\d+\\s+(\\d+)\\s+\\d+%\\s+([^\\s]+)";
} else if (name.startsWith("Windows")) {
diff --git a/jdk/test/java/io/File/isDirectory/Applet.html b/jdk/test/java/io/File/isDirectory/Applet.html
deleted file mode 100644
index 69d57f4..0000000
--- a/jdk/test/java/io/File/isDirectory/Applet.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<!---->
-<applet code=Applet.class width=100 height=100></applet>
diff --git a/jdk/test/java/io/File/isDirectory/Applet.java b/jdk/test/java/io/File/isDirectory/Applet.java
deleted file mode 100644
index 03f1d1c..0000000
--- a/jdk/test/java/io/File/isDirectory/Applet.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
- * 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 4054511
- @summary Check that applets don't get a security exception when invoking
- the File.isDirectory method on a non-existent directory
- @author Mark Reinhold
- @run applet Applet.html
- */
-
-import java.io.*;
-
-
-public class Applet extends java.applet.Applet {
-
- void go(String fn) {
- File f = new File(fn);
- System.err.println(fn + ": " + f.isDirectory());
- }
-
- public void init() {
- String nxdir = "non_EX_is_TENT_dir_EC_tory";
- go(nxdir);
- go(nxdir + File.separator + "bar" + File.separator + "baz");
- }
-
-}
diff --git a/jdk/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java b/jdk/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java
index 39d7702..ce78220 100644
--- a/jdk/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java
+++ b/jdk/test/java/io/Serializable/badSubstByReplace/BadSubstByReplace.java
@@ -22,7 +22,6 @@
*/
/* @test
- * @clean A B Container ReplacerObjectOutputStream
* @summary Verify that ClassCastException is thrown when deserializing
* an object and one of its object fields is incompatibly replaced
* by either replaceObject/resolveObject.
diff --git a/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh b/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh
index 8b1ea63..8fdbf2a 100644
--- a/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh
+++ b/jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh
@@ -41,7 +41,7 @@ OS=`uname -s`
# Need to determine the classpath separator and filepath separator based on the
# operating system.
case "$OS" in
-SunOS | Linux )
+SunOS | Linux | Darwin )
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
@@ -55,19 +55,19 @@ JAVAC=${TESTJAVA}/bin/javac
MKDIR=mkdir
RDEL="rm -r"
-if [ -d ${TESTCLASSES}/oclasses ]
+if [ -d ${TESTCLASSES}/oclasses ]
then
- ${RDEL} ${TESTCLASSES}/oclasses
+ ${RDEL} ${TESTCLASSES}/oclasses
fi
-if [ -d ${TESTCLASSES}/nclasses ]
+if [ -d ${TESTCLASSES}/nclasses ]
then
- ${RDEL} ${TESTCLASSES}/nclasses
+ ${RDEL} ${TESTCLASSES}/nclasses
fi
-if [ -d ${TESTCLASSES}/share ]
+if [ -d ${TESTCLASSES}/share ]
then
- ${RDEL} ${TESTCLASSES}/share
+ ${RDEL} ${TESTCLASSES}/share
fi
-if [ -f ${TESTCLASSES}/stream.ser ]
+if [ -f ${TESTCLASSES}/stream.ser ]
then
${RDEL} ${TESTCLASSES}/stream.ser
fi
@@ -77,7 +77,7 @@ mkdir ${TESTCLASSES}/share
mkdir ${TESTCLASSES}/nclasses
# Build sources
-set -e
+set -e
${JAVAC} -d ${TESTCLASSES}/share ${TESTSRC}/extension/ExtendedObjectInputStream.java
CLASSPATH=${TESTCLASSES}/share; export CLASSPATH;
${JAVAC} -d ${TESTCLASSES}/oclasses ${TESTSRC}/test/SerialDriver.java
diff --git a/jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java b/jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java
index ed62874..2c68ce0 100644
--- a/jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java
+++ b/jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 6317435
+ * @bug 6317435 7110700
* @summary Verify that stack trace contains a proper cause of
* InvalidClassException (methods: checkSerialize,
* checkDeserialize or checkDefaultSerialize)
@@ -59,7 +59,7 @@ public class ExpectedStackTrace {
private static final String SER_METHOD_NAME = "checkSerializable";
public static final void main(String[] args) throws Exception {
- System.err.println("\nRegression test for CR6317435");
+ System.err.println("\nRegression test for CRs 6317435, 7110700");
checkSerializable(getObject());
}
@@ -99,9 +99,12 @@ public class ExpectedStackTrace {
}
}
if (found) {
+ if (ex.getCause() != null) {
+ throw new Error("\nTest for CR 7110700 FAILED");
+ }
System.err.println("\nTEST PASSED");
} else {
- throw new Error();
+ throw new Error("\nTest for CR 6317435 FAILED");
}
}
}
diff --git a/jdk/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java b/jdk/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java
index a7b099d..11b2d6d 100644
--- a/jdk/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java
+++ b/jdk/test/java/io/Serializable/replaceStringArray/ReplaceStringArray.java
@@ -22,7 +22,6 @@
*/
/* @test
- * @clean A SubstituteObjectOutputStream SubstituteObjectInputStream
* @bug 4099013
* @summary Enable substitution of String and Array by ObjectStreams.
*/
diff --git a/jdk/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java b/jdk/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java
index 1d7e11e..896900b 100644
--- a/jdk/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java
+++ b/jdk/test/java/io/Serializable/replaceWithNull/ReplaceWithNull.java
@@ -23,7 +23,6 @@
/* @test
* @bug 4065313
- * @clean A ReplaceWithNull MyObjectOutputStream
* @summary Ensure that it is okay to replace an object with null.
*/
import java.io.*;
diff --git a/jdk/test/java/io/Serializable/serialver/classpath/run.sh b/jdk/test/java/io/Serializable/serialver/classpath/run.sh
index 9cfb623..ef762f2 100644
--- a/jdk/test/java/io/Serializable/serialver/classpath/run.sh
+++ b/jdk/test/java/io/Serializable/serialver/classpath/run.sh
@@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
diff --git a/jdk/test/java/io/Serializable/serialver/nested/run.sh b/jdk/test/java/io/Serializable/serialver/nested/run.sh
index 77f8eff..7a0274b 100644
--- a/jdk/test/java/io/Serializable/serialver/nested/run.sh
+++ b/jdk/test/java/io/Serializable/serialver/nested/run.sh
@@ -25,7 +25,7 @@
# @bug 4312217 4785473
# @summary Test the use of the -classpath switch in the serialver application.
# @author Naveen Sanjeeva
-#
+#
# @build Test
# @run shell run.sh
@@ -43,11 +43,11 @@ if [ "${TESTJAVA}" = "" ] ; then
echo "FAILED!!!"
exit 1
fi
-
+
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
diff --git a/jdk/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java b/jdk/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java
index c2046fe..3e8156b 100644
--- a/jdk/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java
+++ b/jdk/test/java/io/Serializable/verifyDynamicObjHandleTable/VerifyDynamicObjHandleTable.java
@@ -22,7 +22,6 @@
*/
/* @test
- * @clean A
* @bug 4146453
* @summary Test that regrow of object/handle table of ObjectOutputStream works.
*/
diff --git a/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
index 87f3a1a..e5170c7 100644
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh
@@ -22,9 +22,9 @@
#
# @test
# @bug 4735126
-# @summary (cl) ClassLoader.loadClass locks all instances in chain
+# @summary (cl) ClassLoader.loadClass locks all instances in chain
# when delegating
-#
+#
# @run shell/timeout=300 TestCrossDelegate.sh
# if running by hand on windows, change TESTSRC and TESTCLASSES to "."
@@ -51,6 +51,9 @@ case "$OS" in
Linux )
FS="/"
;;
+ Darwin )
+ FS="/"
+ ;;
Windows*)
FS="\\"
;;
diff --git a/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh b/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
index acdf9bb..06126d0 100644
--- a/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
+++ b/jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh
@@ -22,9 +22,9 @@
#
# @test
# @bug 4735126
-# @summary (cl) ClassLoader.loadClass locks all instances in chain
+# @summary (cl) ClassLoader.loadClass locks all instances in chain
# when delegating
-#
+#
# @run shell TestOneWayDelegate.sh
# if running by hand on windows, change TESTSRC and TESTCLASSES to "."
@@ -55,6 +55,9 @@ case "$OS" in
Linux )
FS="/"
;;
+ Darwin )
+ FS="/"
+ ;;
Windows* | CYGWIN* )
FS="\\"
;;
diff --git a/jdk/test/java/lang/ProcessBuilder/Basic.java b/jdk/test/java/lang/ProcessBuilder/Basic.java
index a9ba3b3..4397c2c 100644
--- a/jdk/test/java/lang/ProcessBuilder/Basic.java
+++ b/jdk/test/java/lang/ProcessBuilder/Basic.java
@@ -40,6 +40,7 @@ import java.util.*;
import java.util.concurrent.CountDownLatch;
import java.security.*;
import java.util.regex.Pattern;
+import java.util.regex.Matcher;
import static java.lang.System.getenv;
import static java.lang.System.out;
import static java.lang.Boolean.TRUE;
@@ -50,6 +51,9 @@ public class Basic {
/* used for Windows only */
static final String systemRoot = System.getenv("SystemRoot");
+ /* used for Mac OS X only */
+ static final String cfUserTextEncoding = System.getenv("__CF_USER_TEXT_ENCODING");
+
private static String commandOutput(Reader r) throws Throwable {
StringBuilder sb = new StringBuilder();
int c;
@@ -590,6 +594,12 @@ public class Basic {
! osName.equals("Windows Me");
}
+ static class MacOSX {
+ public static boolean is() { return is; }
+ private static final String osName = System.getProperty("os.name");
+ private static final boolean is = osName.startsWith("Mac OS");
+ }
+
static class True {
public static int exitValue() { return 0; }
}
@@ -629,6 +639,32 @@ public class Basic {
return Pattern.compile(regex).matcher(str).find();
}
+ private static String matchAndExtract(String str, String regex) {
+ Matcher matcher = Pattern.compile(regex).matcher(str);
+ if (matcher.find()) {
+ return matcher.group();
+ } else {
+ return "";
+ }
+ }
+
+ /* Only used for Mac OS X --
+ * Mac OS X (may) add the variable __CF_USER_TEXT_ENCODING to an empty
+ * environment. The environment variable JAVA_MAIN_CLASS_<pid> may also
+ * be set in Mac OS X.
+ * Remove them both from the list of env variables
+ */
+ private static String removeMacExpectedVars(String vars) {
+ // Check for __CF_USER_TEXT_ENCODING
+ String cleanedVars = vars.replace("__CF_USER_TEXT_ENCODING="
+ +cfUserTextEncoding+",","");
+ // Check for JAVA_MAIN_CLASS_<pid>
+ String javaMainClassStr
+ = matchAndExtract(cleanedVars,
+ "JAVA_MAIN_CLASS_\\d+=Basic.JavaChild,");
+ return cleanedVars.replace(javaMainClassStr,"");
+ }
+
private static String sortByLinesWindowsly(String text) {
String[] lines = text.split("\n");
Arrays.sort(lines, new WindowsComparator());
@@ -1080,7 +1116,11 @@ public class Basic {
if (Windows.is()) {
pb.environment().put("SystemRoot", systemRoot);
}
- equal(getenvInChild(pb), expected);
+ String result = getenvInChild(pb);
+ if (MacOSX.is()) {
+ result = removeMacExpectedVars(result);
+ }
+ equal(result, expected);
} catch (Throwable t) { unexpected(t); }
//----------------------------------------------------------------
@@ -1594,7 +1634,11 @@ public class Basic {
}
Process p = Runtime.getRuntime().exec(cmdp, envp);
String expected = Windows.is() ? "=C:=\\,SystemRoot="+systemRoot+",=ExitValue=3," : "=C:=\\,";
- equal(commandOutput(p), expected);
+ String commandOutput = commandOutput(p);
+ if (MacOSX.is()) {
+ commandOutput = removeMacExpectedVars(commandOutput);
+ }
+ equal(commandOutput, expected);
if (Windows.is()) {
ProcessBuilder pb = new ProcessBuilder(childArgs);
pb.environment().clear();
@@ -1632,8 +1676,22 @@ public class Basic {
} else {
envp = envpOth;
}
+ System.out.println ("cmdp");
+ for (int i=0; i<cmdp.length; i++) {
+ System.out.printf ("cmdp %d: %s\n", i, cmdp[i]);
+ }
+ System.out.println ("envp");
+ for (int i=0; i<envp.length; i++) {
+ System.out.printf ("envp %d: %s\n", i, envp[i]);
+ }
Process p = Runtime.getRuntime().exec(cmdp, envp);
- check(commandOutput(p).equals(Windows.is() ? "SystemRoot="+systemRoot+",LC_ALL=C," : "LC_ALL=C,"),
+ String commandOutput = commandOutput(p);
+ if (MacOSX.is()) {
+ commandOutput = removeMacExpectedVars(commandOutput);
+ }
+ check(commandOutput.equals(Windows.is()
+ ? "SystemRoot="+systemRoot+",LC_ALL=C,"
+ : "LC_ALL=C,"),
"Incorrect handling of envstrings containing NULs");
} catch (Throwable t) { unexpected(t); }
diff --git a/jdk/test/java/lang/ProcessBuilder/Zombies.java b/jdk/test/java/lang/ProcessBuilder/Zombies.java
index 6e61ec3..210d831 100644
--- a/jdk/test/java/lang/ProcessBuilder/Zombies.java
+++ b/jdk/test/java/lang/ProcessBuilder/Zombies.java
@@ -31,6 +31,12 @@
import java.io.*;
public class Zombies {
+
+ static final String os = System.getProperty("os.name");
+
+ static final String TrueCommand = os.startsWith("Mac OS")?
+ "/usr/bin/true" : "/bin/true";
+
public static void main(String[] args) throws Throwable {
if (! new File("/usr/bin/perl").canExecute() ||
! new File("/bin/ps").canExecute())
@@ -49,11 +55,11 @@ public class Zombies {
} catch (IOException _) {/* OK */}
try {
- rt.exec("/bin/true", null, new File("no-such-dir"));
+ rt.exec(TrueCommand, null, new File("no-such-dir"));
throw new Error("expected IOException not thrown");
} catch (IOException _) {/* OK */}
- rt.exec("/bin/true").waitFor();
+ rt.exec(TrueCommand).waitFor();
// Count all the zombies that are children of this Java process
final String[] zombieCounter = {
diff --git a/jdk/test/java/lang/StringCoding/CheckEncodings.sh b/jdk/test/java/lang/StringCoding/CheckEncodings.sh
index 7862722..95c2419 100644
--- a/jdk/test/java/lang/StringCoding/CheckEncodings.sh
+++ b/jdk/test/java/lang/StringCoding/CheckEncodings.sh
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux ) ;;
+ SunOS | Linux | Darwin) ;;
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
@@ -63,7 +63,7 @@ cat ${TESTSRC}/locales.txt machine_locales.txt | sort | uniq > locale_union.txt
for i in `xargs < locale_union.txt` ; do
runTest ${i}
done
-
+
# random strings
for i in FOO 1234 ZZ; do
runTest ${i}
diff --git a/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh b/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
index 6c53bf5..7322b08 100644
--- a/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
+++ b/jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh
@@ -44,7 +44,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin)
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/java/lang/instrument/ManifestTest.sh b/jdk/test/java/lang/instrument/ManifestTest.sh
index b10e235..4fbd51a 100644
--- a/jdk/test/java/lang/instrument/ManifestTest.sh
+++ b/jdk/test/java/lang/instrument/ManifestTest.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -396,7 +396,7 @@ while read token; do
touch $FAIL_MARKER
fi
- MESG=`cat expect_boot_cp_line`
+ MESG=`cat expect_boot_cp_line | tr -d '\n\r'`
grep -s "$MESG" output.log > /dev/null
result=$?
if [ "$result" = 0 ]; then
@@ -406,7 +406,7 @@ while read token; do
touch $FAIL_MARKER
fi
- MESG=`cat expect_redef_line`
+ MESG=`cat expect_redef_line | tr -d '\n\r'`
grep -s "$MESG" output.log > /dev/null
result=$?
if [ "$result" = 0 ]; then
@@ -416,7 +416,7 @@ while read token; do
touch $FAIL_MARKER
fi
- MESG=`cat expect_retrans_line`
+ MESG=`cat expect_retrans_line | tr -d '\n\r'`
grep -s "$MESG" output.log > /dev/null
result=$?
if [ "$result" = 0 ]; then
@@ -426,7 +426,7 @@ while read token; do
touch $FAIL_MARKER
fi
- MESG=`cat expect_set_nmp_line`
+ MESG=`cat expect_set_nmp_line | tr -d '\n\r'`
grep -s "$MESG" output.log > /dev/null
result=$?
if [ "$result" = 0 ]; then
diff --git a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
index 8b8d8ef..6a72184 100644
--- a/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
+++ b/jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh
@@ -43,6 +43,10 @@ case "$OS" in
PS=":"
FS="/"
;;
+ Darwin )
+ PS=":"
+ FS="/"
+ ;;
Windows*)
PS=";"
OS="Windows"
diff --git a/jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java b/jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java
index ce14c88..882c9b3 100644
--- a/jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java
+++ b/jdk/test/java/lang/management/OperatingSystemMXBean/GetSystemLoadAverage.java
@@ -79,7 +79,11 @@ public class GetSystemLoadAverage {
System.out.println("Test passed.");
}
- private static String LOAD_AVERAGE_TEXT = "load average:";
+ private static String LOAD_AVERAGE_TEXT
+ = System.getProperty("os.name").startsWith("Mac OS")
+ ? "load averages:"
+ : "load average:";
+
private static void checkLoadAvg() throws Exception {
// Obtain load average from OS command
ProcessBuilder pb = new ProcessBuilder("/usr/bin/uptime");
@@ -91,11 +95,13 @@ public class GetSystemLoadAverage {
// verify if two values are close
output = output.substring(output.lastIndexOf(LOAD_AVERAGE_TEXT) +
- LOAD_AVERAGE_TEXT.length());
+ LOAD_AVERAGE_TEXT.length() + 1);
System.out.println("Load average returned from uptime = " + output);
System.out.println("getSystemLoadAverage() returned " + loadavg);
- String[] lavg = output.split(",");
+ String[] lavg = System.getProperty("os.name").startsWith("Mac OS")
+ ? output.split(" ")
+ : output.split(",");
double expected = Double.parseDouble(lavg[0]);
double lowRange = expected * (1 - DELTA);
double highRange = expected * (1 + DELTA);
diff --git a/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh b/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
index f31d5db..7c1a5ae 100644
--- a/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
+++ b/jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh
@@ -21,10 +21,10 @@
# questions.
#
-#
+#
# @test
# @summary Tests OperatingSystemMXBean.getSystemLoadAverage() api.
-# @author Mandy Chung
+# @author Mandy Chung
# @bug 6336608 6367473 6511738
#
# @run build GetSystemLoadAverage
@@ -61,10 +61,7 @@ i=1
while true; do
echo "Run $i: TestSystemLoadAvg"
case `uname -s` in
- SunOS )
- runOne GetSystemLoadAverage
- ;;
- Linux )
+ SunOS | Linux | Darwin )
runOne GetSystemLoadAverage
;;
* )
@@ -81,6 +78,6 @@ while true; do
exit 1
fi
i=`expr $i + 1`
- # sleep for 5 seconds
+ # sleep for 5 seconds
sleep 5
done
diff --git a/jdk/test/java/net/Authenticator/B4933582.sh b/jdk/test/java/net/Authenticator/B4933582.sh
index a7fc1bc..90af3b5 100644
--- a/jdk/test/java/net/Authenticator/B4933582.sh
+++ b/jdk/test/java/net/Authenticator/B4933582.sh
@@ -26,7 +26,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/java/net/CookieHandler/NullUriCookieTest.java b/jdk/test/java/net/CookieHandler/NullUriCookieTest.java
index 60d0550..22ae6c2 100644
--- a/jdk/test/java/net/CookieHandler/NullUriCookieTest.java
+++ b/jdk/test/java/net/CookieHandler/NullUriCookieTest.java
@@ -23,8 +23,9 @@
/*
* @test
- * @bug 6953455
+ * @bug 6953455 7045655
* @summary CookieStore.add() cannot handle null URI parameter
+ * and An empty InMemoryCookieStore should not return true for removeAll
*/
import java.net.CookieManager;
@@ -44,6 +45,11 @@ public class NullUriCookieTest {
static void checkCookieNullUri() throws Exception {
//get a cookie store implementation and add a cookie to the store with null URI
CookieStore cookieStore = (new CookieManager()).getCookieStore();
+ //Check if removeAll() retrurns false on an empty CookieStore
+ if (cookieStore.removeAll()) {
+ fail = true;
+ }
+ checkFail("removeAll on empty store should return false");
HttpCookie cookie = new HttpCookie("MY_COOKIE", "MY_COOKIE_VALUE");
cookie.setDomain("foo.com");
cookieStore.add(null, cookie);
diff --git a/jdk/test/java/net/DatagramSocket/Send12k.java b/jdk/test/java/net/DatagramSocket/Send12k.java
index 4efb2f7..c9d7bc6 100644
--- a/jdk/test/java/net/DatagramSocket/Send12k.java
+++ b/jdk/test/java/net/DatagramSocket/Send12k.java
@@ -33,10 +33,16 @@ import java.io.*;
public class Send12k {
- static final int SEND_SIZE = 16 * 1024;
public static void main(String args[]) throws Exception {
+ int SEND_SIZE=0;
+
+ if(System.getProperty("os.name").contains("Mac")) {
+ SEND_SIZE = 16 * 576;
+ } else {
+ SEND_SIZE = 16 * 1024;
+ }
DatagramSocket s1 = new DatagramSocket();
DatagramSocket s2 = new DatagramSocket();
diff --git a/jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java b/jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java
index e69d790..cfe06b9 100644
--- a/jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java
+++ b/jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java
@@ -45,6 +45,8 @@ public class SendDatagramToBadAddress {
return (true);
if (p.getProperty ("os.name").equals ("Linux"))
return (true);
+ if (p.getProperty ("os.name").startsWith ("Mac OS"))
+ return (true);
// Check for specific Solaris version from here
v = p.getProperty ("os.arch");
if (!v.equalsIgnoreCase ("sparc"))
diff --git a/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh b/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
index c401e9a..092e12d 100644
--- a/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
+++ b/jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh
@@ -27,7 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS )
+ SunOS | Darwin )
PATHSEP=":"
FILESEP="/"
;;
diff --git a/jdk/test/java/net/Socket/OldSocketImpl.sh b/jdk/test/java/net/Socket/OldSocketImpl.sh
index d300e20..09e4092 100644
--- a/jdk/test/java/net/Socket/OldSocketImpl.sh
+++ b/jdk/test/java/net/Socket/OldSocketImpl.sh
@@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -46,10 +46,10 @@ case "$OS" in
;;
esac
-# no need to compile the test. It is already compiled
+# no need to compile the test. It is already compiled
# with 1.3 and in OldStyleImpl.jar
-# run
+# run
${TESTJAVA}${FS}bin${FS}java -cp ${TESTSRC}${FS}OldSocketImpl.jar OldSocketImpl
result=$?
if [ "$result" -ne "0" ]; then
diff --git a/jdk/test/java/net/Socks/SocksServer.java b/jdk/test/java/net/Socks/SocksServer.java
index de2822a..f6720af 100644
--- a/jdk/test/java/net/Socks/SocksServer.java
+++ b/jdk/test/java/net/Socks/SocksServer.java
@@ -22,13 +22,14 @@
*/
import java.net.*;
import java.io.*;
+import java.util.HashMap;
public class SocksServer extends Thread {
// Some useful SOCKS constant
- static final int PROTO_VERS4 = 4;
+ static final int PROTO_VERS4 = 4;
static final int PROTO_VERS = 5;
- static final int DEFAULT_PORT = 1080;
+ static final int DEFAULT_PORT = 1080;
static final int NO_AUTH = 0;
static final int GSSAPI = 1;
@@ -36,28 +37,28 @@ public class SocksServer extends Thread {
static final int NO_METHODS = -1;
static final int CONNECT = 1;
- static final int BIND = 2;
+ static final int BIND = 2;
static final int UDP_ASSOC = 3;
- static final int IPV4 = 1;
- static final int DOMAIN_NAME = 3;
- static final int IPV6 = 4;
+ static final int IPV4 = 1;
+ static final int DOMAIN_NAME = 3;
+ static final int IPV6 = 4;
static final int REQUEST_OK = 0;
static final int GENERAL_FAILURE = 1;
- static final int NOT_ALLOWED = 2;
+ static final int NOT_ALLOWED = 2;
static final int NET_UNREACHABLE = 3;
static final int HOST_UNREACHABLE = 4;
- static final int CONN_REFUSED = 5;
- static final int TTL_EXPIRED = 6;
+ static final int CONN_REFUSED = 5;
+ static final int TTL_EXPIRED = 6;
static final int CMD_NOT_SUPPORTED = 7;
static final int ADDR_TYPE_NOT_SUP = 8;
private int port;
private ServerSocket server;
private boolean useV4 = false;
- private java.util.Hashtable users = new java.util.Hashtable();
- private boolean done = false;
+ private HashMap<String,String> users = new HashMap<>();
+ private volatile boolean done = false;
// Inner class to handle protocol with client
// This is the bulk of the work (protocol handler)
class ClientHandler extends Thread {
@@ -136,7 +137,7 @@ public class SocksServer extends Thread {
System.err.println("User: '" + uname);
System.err.println("PSWD: '" + password);
if (users.containsKey(uname)) {
- String p1 = (String) users.get(uname);
+ String p1 = users.get(uname);
System.err.println("p1 = " + p1);
if (p1.equals(password)) {
out.write(PROTO_VERS);
@@ -492,7 +493,12 @@ public class SocksServer extends Thread {
public SocksServer(int port) throws IOException {
this.port = port;
server = new ServerSocket();
- server.bind(new InetSocketAddress(port));
+ if (port == 0) {
+ server.bind(null);
+ this.port = server.getLocalPort();
+ } else {
+ server.bind(new InetSocketAddress(port));
+ }
}
public SocksServer() throws IOException {
@@ -503,8 +509,13 @@ public class SocksServer extends Thread {
users.put(user, passwd);
}
- public synchronized void terminate() {
+ public int getPort() {
+ return port;
+ }
+
+ public void terminate() {
done = true;
+ try { server.close(); } catch (IOException unused) {}
}
public void run() {
diff --git a/jdk/test/java/net/Socks/SocksV4Test.java b/jdk/test/java/net/Socks/SocksV4Test.java
index 0b7cd9e..d9786a2 100644
--- a/jdk/test/java/net/Socks/SocksV4Test.java
+++ b/jdk/test/java/net/Socks/SocksV4Test.java
@@ -26,23 +26,22 @@
* @bug 4727547
* @summary SocksSocketImpl throws NullPointerException
* @build SocksServer
+ * @run main SocksV4Test
*/
import java.net.*;
-import java.io.*;
public class SocksV4Test {
- public static void main(String[] args) throws IOException {
- // Create a SOCKS V4 proxy on port 8888
- SocksServer srvr = new SocksServer(8888, true);
+ public static void main(String[] args) throws Exception {
+ // Create a SOCKS V4 proxy
+ SocksServer srvr = new SocksServer(0, true);
srvr.start();
- System.setProperty("socksProxyHost", "localhost");
- System.setProperty("socksProxyPort", "8888");
+ Proxy sp = new Proxy(Proxy.Type.SOCKS,
+ new InetSocketAddress("localhost", srvr.getPort()));
// Let's create an unresolved address
InetSocketAddress ad = new InetSocketAddress("doesnt.exist.name", 1234);
- Socket s = new Socket();
- try {
- s.connect(ad,10000);
+ try (Socket s = new Socket(sp)) {
+ s.connect(ad, 10000);
} catch (UnknownHostException ex) {
// OK, that's what we expected
} catch (NullPointerException npe) {
@@ -50,7 +49,6 @@ public class SocksV4Test {
throw new RuntimeException("Got a NUllPointerException");
} finally {
srvr.terminate();
- srvr.interrupt();
}
}
}
diff --git a/jdk/test/java/net/URL/B5086147.sh b/jdk/test/java/net/URL/B5086147.sh
index 95d39f8..75d8946 100644
--- a/jdk/test/java/net/URL/B5086147.sh
+++ b/jdk/test/java/net/URL/B5086147.sh
@@ -26,7 +26,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
exit 0
;;
CYGWIN* )
diff --git a/jdk/test/java/net/URL/OpenStream.java b/jdk/test/java/net/URL/OpenStream.java
index 4f9ee30..2b5b450 100644
--- a/jdk/test/java/net/URL/OpenStream.java
+++ b/jdk/test/java/net/URL/OpenStream.java
@@ -39,7 +39,7 @@ public class OpenStream {
URL u = new URL(badHttp);
try {
InputStream in = u.openStream();
- } catch (UnknownHostException x) {
+ } catch (IOException x) {
return;
}
throw new RuntimeException("Expected UnknownHostException to be thrown");
diff --git a/jdk/test/java/net/URL/runconstructor.sh b/jdk/test/java/net/URL/runconstructor.sh
index dc913fd..04e397a 100644
--- a/jdk/test/java/net/URL/runconstructor.sh
+++ b/jdk/test/java/net/URL/runconstructor.sh
@@ -27,7 +27,7 @@
#
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/java/net/URLClassLoader/B5077773.sh b/jdk/test/java/net/URLClassLoader/B5077773.sh
index fa3a49d..9724ac9 100644
--- a/jdk/test/java/net/URLClassLoader/B5077773.sh
+++ b/jdk/test/java/net/URLClassLoader/B5077773.sh
@@ -34,7 +34,7 @@
OS=`uname -s`
case "$OS" in
- SunOS )
+ SunOS | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh b/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
index 46b522e..80f0adc 100644
--- a/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
+++ b/jdk/test/java/net/URLClassLoader/sealing/checksealed.sh
@@ -27,13 +27,13 @@
OS=`uname -s`
case "$OS" in
- SunOS )
+ SunOS | Darwin )
PS=":"
- FS="/"
+ FS="/"
;;
Linux )
PS=":"
- FS="/"
+ FS="/"
;;
CYGWIN* )
PS=";"
diff --git a/jdk/test/java/net/URLConnection/6212146/test.sh b/jdk/test/java/net/URLConnection/6212146/test.sh
index 740bedc..bc24a5e 100644
--- a/jdk/test/java/net/URLConnection/6212146/test.sh
+++ b/jdk/test/java/net/URLConnection/6212146/test.sh
@@ -33,7 +33,7 @@
OS=`uname -s`
case "$OS" in
- SunOS )
+ SunOS | Darwin )
PS=":"
FS="/"
;;
@@ -67,7 +67,7 @@ ${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}Test.java
WD=`pwd`
ulimit -H -n 300
-${TESTJAVA}${FS}bin${FS}java Test ${WD}/jars/ test.jar
+${TESTJAVA}${FS}bin${FS}java Test ${WD}/jars/ test.jar
result=$?
rm -rf jars
exit $?
diff --git a/jdk/test/java/nio/channels/DatagramChannel/Refused.java b/jdk/test/java/nio/channels/DatagramChannel/Refused.java
index c44dd37..6278804 100644
--- a/jdk/test/java/nio/channels/DatagramChannel/Refused.java
+++ b/jdk/test/java/nio/channels/DatagramChannel/Refused.java
@@ -104,16 +104,9 @@ public class Refused {
Thread.sleep(2000);
inBuf.clear();
server.read(inBuf);
- if (onSolarisOrLinux())
- throw new Exception("Expected PUE not thrown");
} catch (PortUnreachableException pue) {
System.err.println("received PUE");
}
server.close();
}
-
- static boolean onSolarisOrLinux() {
- String osName = System.getProperty("os.name");
- return osName.startsWith("SunOS") || osName.startsWith("Linux");
- }
}
diff --git a/jdk/test/java/nio/channels/FileChannel/Size.java b/jdk/test/java/nio/channels/FileChannel/Size.java
index 09f9eb1..ffa0720 100644
--- a/jdk/test/java/nio/channels/FileChannel/Size.java
+++ b/jdk/test/java/nio/channels/FileChannel/Size.java
@@ -69,7 +69,7 @@ public class Size {
// Windows and Linux can't handle the really large file sizes for a truncate
// or a positional write required by the test for 4563125
String osName = System.getProperty("os.name");
- if (osName.startsWith("SunOS")) {
+ if (osName.startsWith("SunOS") || osName.startsWith("Mac OS")) {
blah = File.createTempFile("blah", null);
long testSize = ((long)Integer.MAX_VALUE) * 2;
initTestFile(blah, 10);
diff --git a/jdk/test/java/nio/channels/FileChannel/Transfer.java b/jdk/test/java/nio/channels/FileChannel/Transfer.java
index 0807ead..0e18f54 100644
--- a/jdk/test/java/nio/channels/FileChannel/Transfer.java
+++ b/jdk/test/java/nio/channels/FileChannel/Transfer.java
@@ -228,9 +228,8 @@ public class Transfer {
// Windows and Linux can't handle the really large file sizes for a
// truncate or a positional write required by the test for 4563125
String osName = System.getProperty("os.name");
- if (!osName.startsWith("SunOS"))
+ if (!(osName.startsWith("SunOS") || osName.startsWith("Mac OS")))
return;
-
File source = File.createTempFile("blah", null);
source.deleteOnExit();
long testSize = ((long)Integer.MAX_VALUE) * 2;
diff --git a/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh b/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
index 3ff5841..8b39428 100644
--- a/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
+++ b/jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh
@@ -34,7 +34,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux ) ;;
+ SunOS | Linux | Darwin ) ;;
# Skip locale test for Windows
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
@@ -67,7 +67,7 @@ runTest() {
expectPass $?
}
-# Run the test in the common Solaris/Linux locales
+# Run the test in the common Solaris/Linux/Mac OS locales
# Tests will simply run in current locale if locale isn't supported
# on the test machine/platform
diff --git a/jdk/test/java/nio/charset/spi/basic.sh b/jdk/test/java/nio/charset/spi/basic.sh
index 2444581..330e4d0 100644
--- a/jdk/test/java/nio/charset/spi/basic.sh
+++ b/jdk/test/java/nio/charset/spi/basic.sh
@@ -47,7 +47,7 @@ JAR=$TESTJAVA/bin/jar
DIR=`pwd`
case `uname` in
- SunOS | Linux ) CPS=':' ;;
+ SunOS | Linux | Darwin ) CPS=':' ;;
Windows* ) CPS=';' ;;
CYGWIN* )
DIR=`/usr/bin/cygpath -a -s -m $DIR`
@@ -80,7 +80,7 @@ if [ $# -gt 0 ]; then
L="$1"
shift
s=`uname -s`
- if [ $s != Linux -a $s != SunOS ]; then
+ if [ $s != Linux -a $s != SunOS -a $s != Darwin ]; then
echo "$L: Locales not supported on this system, skipping..."
exit 0
fi
diff --git a/jdk/test/java/nio/file/FileSystem/Basic.java b/jdk/test/java/nio/file/FileSystem/Basic.java
index 0717d07..a2ff3bf 100644
--- a/jdk/test/java/nio/file/FileSystem/Basic.java
+++ b/jdk/test/java/nio/file/FileSystem/Basic.java
@@ -76,6 +76,8 @@ public class Basic {
checkSupported(fs, "posix", "unix", "owner", "acl", "user");
if (os.equals("Linux"))
checkSupported(fs, "posix", "unix", "owner", "dos", "user");
+ if (os.startsWith("Mac OS"))
+ checkSupported(fs, "posix", "unix", "owner");
if (os.equals("Windows"))
checkSupported(fs, "owner", "dos", "acl", "user");
}
diff --git a/jdk/test/java/nio/file/Files/CopyAndMove.java b/jdk/test/java/nio/file/Files/CopyAndMove.java
index a9cd87b..9ac27af 100644
--- a/jdk/test/java/nio/file/Files/CopyAndMove.java
+++ b/jdk/test/java/nio/file/Files/CopyAndMove.java
@@ -153,13 +153,12 @@ public class CopyAndMove {
// get file attributes of source file
String os = System.getProperty("os.name");
- if (os.equals("SunOS") || os.equals("Linux")) {
- posixAttributes = readAttributes(source, PosixFileAttributes.class, NOFOLLOW_LINKS);
- basicAttributes = posixAttributes;
- }
if (os.startsWith("Windows")) {
dosAttributes = readAttributes(source, DosFileAttributes.class, NOFOLLOW_LINKS);
basicAttributes = dosAttributes;
+ } else {
+ posixAttributes = readAttributes(source, PosixFileAttributes.class, NOFOLLOW_LINKS);
+ basicAttributes = posixAttributes;
}
if (basicAttributes == null)
basicAttributes = readAttributes(source, BasicFileAttributes.class, NOFOLLOW_LINKS);
diff --git a/jdk/test/java/nio/file/Files/CustomOptions.java b/jdk/test/java/nio/file/Files/CustomOptions.java
index a39cc6a..a06b97e 100644
--- a/jdk/test/java/nio/file/Files/CustomOptions.java
+++ b/jdk/test/java/nio/file/Files/CustomOptions.java
@@ -28,6 +28,7 @@
* @author Brandon Passanisi
* @library ..
* @build CustomOptions PassThroughFileSystem
+ * @run main CustomOptions
*/
import java.io.IOException;
diff --git a/jdk/test/java/nio/file/Path/PathOps.java b/jdk/test/java/nio/file/Path/PathOps.java
index 03177f0..6c25213 100644
--- a/jdk/test/java/nio/file/Path/PathOps.java
+++ b/jdk/test/java/nio/file/Path/PathOps.java
@@ -991,8 +991,7 @@ public class PathOps {
String osname = System.getProperty("os.name");
if (osname.startsWith("Windows")) {
doWindowsTests();
- }
- if (osname.equals("SunOS") || osname.equals("Linux")) {
+ } else {
doUnixTests();
}
diff --git a/jdk/test/java/nio/file/WatchService/Basic.java b/jdk/test/java/nio/file/WatchService/Basic.java
index fd1dee4..019ec96 100644
--- a/jdk/test/java/nio/file/WatchService/Basic.java
+++ b/jdk/test/java/nio/file/WatchService/Basic.java
@@ -25,7 +25,7 @@
* @bug 4313887 6838333 7017446
* @summary Unit test for java.nio.file.WatchService
* @library ..
- * @run main/timeout=120 Basic
+ * @run main Basic
*/
import java.nio.file.*;
@@ -281,11 +281,11 @@ public class Basic {
System.out.println("poll with timeout...");
try {
- long start = System.currentTimeMillis();
+ long start = System.nanoTime();
key = watcher.poll(3000, TimeUnit.MILLISECONDS);
if (key != null)
throw new RuntimeException("no keys registered");
- long waited = System.currentTimeMillis() - start;
+ long waited = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
if (waited < 2900)
throw new RuntimeException("poll was too short");
} catch (InterruptedException x) {
@@ -358,14 +358,14 @@ public class Basic {
}
// assume that poll throws exception immediately
- long start = System.currentTimeMillis();
+ long start = System.nanoTime();
try {
watcher.poll(10000, TimeUnit.MILLISECONDS);
throw new RuntimeException("ClosedWatchServiceException not thrown");
} catch (InterruptedException x) {
throw new RuntimeException(x);
} catch (ClosedWatchServiceException x) {
- long waited = System.currentTimeMillis() - start;
+ long waited = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
if (waited > 5000)
throw new RuntimeException("poll was too long");
}
diff --git a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java
index 3027d8d..f990870a 100644
--- a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java
+++ b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java
@@ -23,9 +23,9 @@
/* @test
* @bug 4313887
- * @summary Sanity test for Sun-specific sensitivyt level watch event modifier
+ * @summary Sanity test for Sun-specific sensitivity level watch event modifier
* @library ..
- * @run main/timeout=330 Basic
+ * @run main/timeout=240 SensitivityModifier
*/
import java.nio.file.*;
@@ -96,6 +96,7 @@ public class SensitivityModifier {
// drain events (to avoid interference)
do {
+ key.pollEvents();
key.reset();
key = watcher.poll(1, TimeUnit.SECONDS);
} while (key != null);
diff --git a/jdk/test/java/rmi/registry/readTest/readTest.sh b/jdk/test/java/rmi/registry/readTest/readTest.sh
index 54be1d7..cb600d5 100644
--- a/jdk/test/java/rmi/registry/readTest/readTest.sh
+++ b/jdk/test/java/rmi/registry/readTest/readTest.sh
@@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
FILEURL="file:"
diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
index ab6d609..57af501 100644
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh
@@ -54,6 +54,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
+ Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
@@ -75,17 +79,18 @@ fi
# compile the test program
${TESTJAVA}${FILESEP}bin${FILESEP}javac \
- -d ${TESTCLASSES}${FILESEP} \
- ${TESTSRC}${FILESEP}ClassLoaderDeadlock.java
+ -d ${TESTCLASSES}${FILESEP} \
+ ${TESTSRC}${FILESEP}ClassLoaderDeadlock.java
${TESTJAVA}${FILESEP}bin${FILESEP}javac \
- -d ${TESTCLASSES}${FILESEP}provider${FILESEP} \
- ${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java
+ -d ${TESTCLASSES}${FILESEP}provider${FILESEP} \
+ ${TESTSRC}${FILESEP}provider${FILESEP}HashProvider.java
# run the test
${TESTJAVA}${FILESEP}bin${FILESEP}java \
- -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
- ClassLoaderDeadlock
+ -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}Deadlock.jar" \
+ -Djava.awt.headless=true \
+ ClassLoaderDeadlock
STATUS=$?
diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
index 609843b..7daa237 100644
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh
@@ -42,6 +42,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
+ Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
diff --git a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
index bf25695..53803a6 100644
--- a/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
+++ b/jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh
@@ -62,6 +62,10 @@ case "$OS" in
PATHSEP=";"
FILESEP="/"
;;
+ Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
Windows* )
PATHSEP=";"
FILESEP="\\"
diff --git a/jdk/test/java/security/Security/signedfirst/Dyn.sh b/jdk/test/java/security/Security/signedfirst/Dyn.sh
index 12ed97a..a98e2ff 100644
--- a/jdk/test/java/security/Security/signedfirst/Dyn.sh
+++ b/jdk/test/java/security/Security/signedfirst/Dyn.sh
@@ -54,6 +54,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
+ Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
@@ -74,13 +78,13 @@ rm DynSignedProvFirst.class
# compile the test program
${TESTJAVA}${FILESEP}bin${FILESEP}javac \
- -classpath ${TESTSRC}${FILESEP}exp.jar \
- -d ${TESTCLASSES}${FILESEP} \
- ${TESTSRC}${FILESEP}DynSignedProvFirst.java
+ -classpath ${TESTSRC}${FILESEP}exp.jar \
+ -d ${TESTCLASSES}${FILESEP} \
+ ${TESTSRC}${FILESEP}DynSignedProvFirst.java
# run the test
${TESTJAVA}${FILESEP}bin${FILESEP}java \
- -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
- DynSignedProvFirst
+ -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
+ DynSignedProvFirst
exit $?
diff --git a/jdk/test/java/security/Security/signedfirst/Static.sh b/jdk/test/java/security/Security/signedfirst/Static.sh
index 812d613..ff66308 100644
--- a/jdk/test/java/security/Security/signedfirst/Static.sh
+++ b/jdk/test/java/security/Security/signedfirst/Static.sh
@@ -54,6 +54,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
+ Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
@@ -74,15 +78,15 @@ rm StaticSignedProvFirst.class
# compile the test program
${TESTJAVA}${FILESEP}bin${FILESEP}javac \
- -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
- -d ${TESTCLASSES}${FILESEP} \
- ${TESTSRC}${FILESEP}StaticSignedProvFirst.java
+ -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
+ -d ${TESTCLASSES}${FILESEP} \
+ ${TESTSRC}${FILESEP}StaticSignedProvFirst.java
# run the test
cd ${TESTSRC}${FILESEP}
${TESTJAVA}${FILESEP}bin${FILESEP}java \
- -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
- -Djava.security.properties=file:${TESTSRC}${FILESEP}Static.props \
- StaticSignedProvFirst
+ -classpath "${TESTCLASSES}${PATHSEP}${TESTSRC}${FILESEP}exp.jar" \
+ -Djava.security.properties=file:${TESTSRC}${FILESEP}Static.props \
+ StaticSignedProvFirst
exit $?
diff --git a/jdk/test/java/text/Bidi/Bug6850113.java b/jdk/test/java/text/Bidi/Bug6850113.java
index 91e0742..7046150 100644
--- a/jdk/test/java/text/Bidi/Bug6850113.java
+++ b/jdk/test/java/text/Bidi/Bug6850113.java
@@ -25,6 +25,7 @@
* @bug 6850113
* @summary Verify the return value of digit() for some digits.
* @compile -XDignore.symbol.file=true Bug6850113.java
+ * @run main Bug6850113
*/
import sun.text.normalizer.UCharacter;
diff --git a/jdk/test/java/util/Currency/PropertiesTest.sh b/jdk/test/java/util/Currency/PropertiesTest.sh
index 420e9f9..304d102 100644
--- a/jdk/test/java/util/Currency/PropertiesTest.sh
+++ b/jdk/test/java/util/Currency/PropertiesTest.sh
@@ -30,7 +30,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -65,10 +65,10 @@ fi
# copy the test properties file
COPIED=0
if [ -w $TESTJAVA ]
-then
+then
WRITABLEJDK=$TESTJAVA
else
- WRITABLEJDK=.${FS}testjava
+ WRITABLEJDK=.${FS}testjava
cp -r $TESTJAVA $WRITABLEJDK
COPIED=1
fi
diff --git a/jdk/test/java/util/Currency/tablea1.txt b/jdk/test/java/util/Currency/tablea1.txt
index 8b2e1b5..55ad662 100644
--- a/jdk/test/java/util/Currency/tablea1.txt
+++ b/jdk/test/java/util/Currency/tablea1.txt
@@ -1,12 +1,12 @@
#
#
-# Based on BSi's ISO4217 data - "TABLE A1.doc" + amendments up until MA151.doc
-# (As of 7 April 2011)
+# Amendments up until ISO 4217 AMENDMENT NUMBER 153
+# (As of 12 January 2012)
#
# Version
FILEVERSION=1
-DATAVERSION=151
+DATAVERSION=153
# ISO 4217 currency data
AF AFN 971 2
@@ -227,6 +227,7 @@ SI EUR 978 2
SB SBD 90 2
SO SOS 706 2
ZA ZAR 710 2
+SS SSP 728 2
ES EUR 978 2
LK LKR 144 2
SD SDG 938 2
@@ -267,7 +268,7 @@ UY UYU 858 2
UZ UZS 860 2
VU VUV 548 0
VE VEF 937 2
-VN VND 704 2
+VN VND 704 0
VG USD 840 2
VI USD 840 2
WF XPF 953 0
diff --git a/jdk/test/java/util/Locale/LocaleCategory.sh b/jdk/test/java/util/Locale/LocaleCategory.sh
index ecc6e94..996d687 100644
--- a/jdk/test/java/util/Locale/LocaleCategory.sh
+++ b/jdk/test/java/util/Locale/LocaleCategory.sh
@@ -2,7 +2,7 @@
#
# @test
# @bug 4700857 6997928 7079486
-# @summary tests for Locale.getDefault(Locale.Category) and
+# @summary tests for Locale.getDefault(Locale.Category) and
# Locale.setDefault(Locale.Category, Locale)
# @build LocaleCategory
# @run shell/timeout=600 LocaleCategory.sh
@@ -30,7 +30,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | *BSD | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/java/util/Locale/LocaleTest.java b/jdk/test/java/util/Locale/LocaleTest.java
index 4d269ee..8c9c4f1 100644
--- a/jdk/test/java/util/Locale/LocaleTest.java
+++ b/jdk/test/java/util/Locale/LocaleTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +25,7 @@
* @bug 4052404 4052440 4084688 4092475 4101316 4105828 4107014 4107953 4110613
* 4118587 4118595 4122371 4126371 4126880 4135316 4135752 4139504 4139940 4143951
* 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549
- * 6786276 7066203
+ * 6786276 7066203 7085757
* @summary test Locales
*/
/*
@@ -400,7 +400,7 @@ public class LocaleTest extends LocaleTestFmwk {
}
/**
- * @bug 4106155 4118587 7066203
+ * @bug 4106155 4118587 7066203 7085757
*/
public void TestGetLangsAndCountries() {
// It didn't seem right to just do an exhaustive test of everything here, so I check
@@ -440,8 +440,8 @@ public class LocaleTest extends LocaleTestFmwk {
String[] spotCheck2 = { "US", "CA", "GB", "FR", "DE", "IT", "JP", "KR", "CN", "TW", "TH" };
- if (test.length != 249)
- errln("Expected getISOCountries to return 249 countries; it returned " + test.length);
+ if (test.length != 250)
+ errln("Expected getISOCountries to return 250 countries; it returned " + test.length);
else {
for (int i = 0; i < spotCheck2.length; i++) {
int j;
diff --git a/jdk/test/java/util/PluggableLocale/ExecTest.sh b/jdk/test/java/util/PluggableLocale/ExecTest.sh
index 0e2fdc7..5a12588 100644
--- a/jdk/test/java/util/PluggableLocale/ExecTest.sh
+++ b/jdk/test/java/util/PluggableLocale/ExecTest.sh
@@ -1,21 +1,21 @@
-#
+#
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
# 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.
@@ -27,9 +27,9 @@
# This script is the actual launcher of each locale service provider test.
# fooprovider.jar contains localized object providers and barprovider.jar
# contains localized name providers. This way, we can test providers that
-# can relate to each other (such as, DateFormatSymbolsProvider and
+# can relate to each other (such as, DateFormatSymbolsProvider and
# TimeZoneNameProvider) separately.
-#
+#
# Parameters:
# providersToTest: [foo|bar|foobar]
# java class name: <class name>
@@ -58,7 +58,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -80,7 +80,7 @@ else
EXTDIRS="${TESTJAVA}${FS}jre${FS}lib${FS}ext${PS}${TESTCLASSES}"
fi
-case "$1" in
+case "$1" in
"foo" )
cp ${TESTSRC}${FS}fooprovider.jar ${TESTCLASSES}
CLASSPATHARG=".${PS}${TESTSRC}${PS}${TESTSRC}${FS}fooprovider.jar"
@@ -95,7 +95,7 @@ case "$1" in
CLASSPATHARG=".${PS}${TESTSRC}${PS}${TESTSRC}${FS}fooprovider.jar${PS}${TESTSRC}${PS}${TESTSRC}${FS}barprovider.jar"
;;
esac
-
+
# compile
cp ${TESTSRC}${FS}ProviderTest.java .
cp ${TESTSRC}${FS}$2.java .
@@ -107,7 +107,7 @@ result=$?
if [ $result -eq 0 ]
then
echo "Compilation of the test case was successful."
-else
+else
echo "Compilation of the test case failed."
# Cleanup
rm -f ${TESTCLASSES}${FS}$2*.class
diff --git a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
index 9509864..59128d6 100644
--- a/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
+++ b/jdk/test/java/util/ResourceBundle/Bug6299235Test.sh
@@ -1,21 +1,21 @@
-#
+#
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
# 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.
@@ -31,7 +31,7 @@
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PATHSEP=":"
FILESEP="/"
;;
diff --git a/jdk/test/java/util/ResourceBundle/Control/Bug6530694.java b/jdk/test/java/util/ResourceBundle/Control/Bug6530694.java
index 7f22cc9..7463681 100644
--- a/jdk/test/java/util/ResourceBundle/Control/Bug6530694.java
+++ b/jdk/test/java/util/ResourceBundle/Control/Bug6530694.java
@@ -24,7 +24,7 @@
* @bug 6530694
* @summary Checks that sun.util.CoreResourceBundleControl does not apply
* to the application provided Swing resources.
- * @run main/othervm Bug6530694
+ * @run main/othervm -Djava.awt.headless=true Bug6530694
*/
import java.util.Locale;
diff --git a/jdk/test/java/util/ServiceLoader/basic.sh b/jdk/test/java/util/ServiceLoader/basic.sh
index 7ab184e..dc93051 100644
--- a/jdk/test/java/util/ServiceLoader/basic.sh
+++ b/jdk/test/java/util/ServiceLoader/basic.sh
@@ -42,7 +42,7 @@ JAR="$TESTJAVA/bin/jar"
OS=`uname -s`
case "$OS" in
- SunOS )
+ SunOS | Darwin )
SEP=':' ;;
Linux )
SEP=':' ;;
@@ -63,7 +63,7 @@ if [ \! -d $EXTD ]; then
for n in 2 3; do
rm -rf $JARD/*; mkdir -p $JARD/META-INF/services
echo FooProvider$n \
- >$JARD/META-INF/services/FooService
+ >$JARD/META-INF/services/FooService
cp $TESTCLASSES/FooProvider$n.class $JARD
if [ $n = 3 ]; then
cp $TESTCLASSES/FooService.class $JARD
diff --git a/jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java b/jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java
index 00aed7c..05b3708 100644
--- a/jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java
+++ b/jdk/test/java/util/concurrent/FutureTask/BlockingTaskExecutor.java
@@ -75,10 +75,10 @@ public class BlockingTaskExecutor {
throw new Error("Executor stuck");
// Wait for the invocation thread to complete.
- thread.join(1000);
+ thread.join(5000);
if (thread.isAlive()) {
thread.interrupt();
- thread.join(1000);
+ thread.join(5000);
throw new Error("invokeAll stuck");
}
}
diff --git a/jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java b/jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java
index ac666b6..b05b3e8 100644
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/Custom.java
@@ -100,8 +100,8 @@ public class Custom {
equal(countExecutorThreads(), threadCount);
equal(CustomTask.births.get(), threadCount);
tpe.shutdown();
- tpe.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
- Thread.sleep(10);
+ tpe.awaitTermination(120, TimeUnit.SECONDS);
+ Thread.sleep(1000);
equal(countExecutorThreads(), 0);
CustomSTPE stpe = new CustomSTPE();
@@ -110,8 +110,8 @@ public class Custom {
equal(CustomSTPE.decorations.get(), threadCount);
equal(countExecutorThreads(), threadCount);
stpe.shutdown();
- stpe.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
- Thread.sleep(10);
+ stpe.awaitTermination(120, TimeUnit.SECONDS);
+ Thread.sleep(1000);
equal(countExecutorThreads(), 0);
System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
diff --git a/jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java b/jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java
index 8422c33..7722e84 100644
--- a/jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java
+++ b/jdk/test/java/util/concurrent/locks/Lock/FlakyMutex.java
@@ -86,7 +86,7 @@ public class FlakyMutex implements Lock {
} catch (Throwable t) { unexpected(t); }}});}
barrier.await();
es.shutdown();
- check(es.awaitTermination(10, TimeUnit.SECONDS));
+ check(es.awaitTermination(30, TimeUnit.SECONDS));
}
private static class FlakySync extends AbstractQueuedLongSynchronizer {
diff --git a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java b/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java
index ad0af9e..72b8f8a 100644
--- a/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java
+++ b/jdk/test/java/util/concurrent/locks/Lock/TimedAcquireLeak.java
@@ -28,6 +28,8 @@
* @author Martin Buchholz
*/
+// Note: this file is now out of sync with the jsr166 CVS repository due to the fix for 7092140
+
import java.util.*;
import java.util.regex.*;
import java.util.concurrent.*;
@@ -148,7 +150,7 @@ public class TimedAcquireLeak {
String.valueOf(new Random().nextInt(Integer.MAX_VALUE));
final String[] jobCmd = {
- java, "-Xmx8m",
+ java, "-Xmx8m", "-XX:+UsePerfData",
"-classpath", System.getProperty("test.classes", "."),
childClassName, uniqueID
};
diff --git a/jdk/test/java/util/logging/LoggingDeadlock4.java b/jdk/test/java/util/logging/LoggingDeadlock4.java
index 6dbc00f..3995625 100644
--- a/jdk/test/java/util/logging/LoggingDeadlock4.java
+++ b/jdk/test/java/util/logging/LoggingDeadlock4.java
@@ -27,7 +27,7 @@
* @summary Deadlock between LogManager.<clinit> and Logger.getLogger()
* @author Daniel D. Daugherty
* @build LoggingDeadlock4
- * @run main/timeout=15 LoggingDeadlock4
+ * @run main/othervm/timeout=15 -Djava.awt.headless=true LoggingDeadlock4
*/
import java.awt.Container;
diff --git a/jdk/test/java/util/zip/ZipFile/ManyZipFiles.java b/jdk/test/java/util/zip/ZipFile/ManyZipFiles.java
index 7f64681..fe2da99 100644
--- a/jdk/test/java/util/zip/ZipFile/ManyZipFiles.java
+++ b/jdk/test/java/util/zip/ZipFile/ManyZipFiles.java
@@ -45,7 +45,7 @@ public class ManyZipFiles {
// Windows capability it is much simpler to only run it
// on that platform.
String osName = System.getProperty("os.name");
- if (osName.startsWith("Linux") || osName.startsWith("SunOS")) {
+ if (!(osName.startsWith("Windows"))) {
return;
}
diff --git a/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh b/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
index 3191bdd..01dc34c 100644
--- a/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
+++ b/jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh
@@ -51,7 +51,7 @@ echo "TESTCLASSES=${TESTCLASSES}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh b/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
index 95f0049..1eb3d34 100644
--- a/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
+++ b/jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh
@@ -84,7 +84,7 @@ case "$OS" in
TMP="/tmp"
;;
- Linux )
+ Linux | Darwin )
VAR="A different value for Linux"
DEFAULT_JDK=/usr/local/java/jdk1.4/linux-i386
FILESEP="/"
@@ -123,7 +123,7 @@ if [ -z "${TESTJAVA}" ] ; then
if [ -n "$1" ] ;
then TESTJAVA=$1
else echo "no JDK specified on command line so using default!"
- TESTJAVA=$DEFAULT_JDK
+ TESTJAVA=$DEFAULT_JDK
fi
TESTSRC=.
TESTCLASSES=.
diff --git a/jdk/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java b/jdk/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java
index 80e44b2..520da9d 100644
--- a/jdk/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java
+++ b/jdk/test/javax/naming/spi/DirectoryManager/GetContDirCtx.java
@@ -26,6 +26,7 @@
* @bug 4241676
* @summary getContinuationDirContext() should set CPE environment property.
* @build DummyObjectFactory DummyContext
+ * @run main/othervm GetContDirCtx
*/
import java.util.Hashtable;
diff --git a/jdk/test/javax/script/CommonSetup.sh b/jdk/test/javax/script/CommonSetup.sh
index 54276a6..c604cfb 100644
--- a/jdk/test/javax/script/CommonSetup.sh
+++ b/jdk/test/javax/script/CommonSetup.sh
@@ -36,11 +36,7 @@
OS=`uname -s`
case "$OS" in
- SunOS )
- PS=":"
- FS="/"
- ;;
- Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -72,7 +68,7 @@ then
echo "TESTSRC not set. Test cannot execute. Failed."
exit 1
fi
-
+
if [ "${TESTCLASSES}" = "" ]
then
echo "TESTCLASSES not set. Test cannot execute. Failed."
diff --git a/jdk/test/javax/security/auth/Subject/doAs/Test.sh b/jdk/test/javax/security/auth/Subject/doAs/Test.sh
index 69bdc32..bac3085 100644
--- a/jdk/test/javax/security/auth/Subject/doAs/Test.sh
+++ b/jdk/test/javax/security/auth/Subject/doAs/Test.sh
@@ -25,7 +25,7 @@
# @test 1.1, 02/14/01
# @author Ram Marti
-# @bug 4399067
+# @bug 4399067
# @summary Subject.doAs(null, action) does not clear the executing
#
# ${TESTJAVA} is pointing to the jre
@@ -43,6 +43,11 @@ case "$OS" in
FS="/"
RM="/bin/rm -f"
;;
+ Darwin )
+ PS=":"
+ FS="/"
+ RM="/bin/rm -f"
+ ;;
CYGWIN* )
PS=";"
FS="/"
@@ -69,6 +74,6 @@ echo $WD
${TESTJAVA}${FS}bin${FS}java -classpath "${TESTCLASSES}${FS}" \
-Djava.security.manager \
-Djava.security.policy=${TESTSRC}${FS}policy \
-Test
+Test
exit $?
diff --git a/jdk/test/javax/security/auth/x500/X500Principal/Parse.java b/jdk/test/javax/security/auth/x500/X500Principal/Parse.java
index b4138f4..48bab65 100644
--- a/jdk/test/javax/security/auth/x500/X500Principal/Parse.java
+++ b/jdk/test/javax/security/auth/x500/X500Principal/Parse.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 7024771
+ * @bug 7024771 7024604
* @summary various X500Principal DN parsing tests
*/
@@ -32,12 +32,18 @@ import javax.security.auth.x500.X500Principal;
public class Parse {
private static TestCase[] testCases = {
- new TestCase("CN=prefix\\<>suffix", false)
+ new TestCase("CN=prefix\\<>suffix", false),
+ new TestCase("OID.1=value", false),
+ new TestCase("oid.1=value", false),
+ new TestCase("OID.1.2=value", true),
+ new TestCase("oid.1.2=value", true),
+ new TestCase("1=value", false),
+ new TestCase("1.2=value", true)
};
public static void main(String args[]) throws Exception {
- for (int i = 0; i < testCases.length; i++) {
- testCases[i].run();
+ for (TestCase testCase : testCases) {
+ testCase.run();
}
System.out.println("Test completed ok.");
}
diff --git a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
index 2e244a3..a4df953 100644
--- a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
+++ b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,29 +26,30 @@
* @bug 6396844
* @summary Tests memory leak for 20000 files
* @author Sergey Malenkov
- * @run main/othervm/timeout=1000 -mx256m TwentyThousandTest
+ * @library ../../regtesthelpers
+ * @build Util
+ * @run main/othervm/timeout=1000 -mx128m TwentyThousandTest
*/
+import sun.java2d.Disposer;
+import sun.java2d.DisposerRecord;
+
import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
import java.io.File;
import java.io.FileWriter;
-public class TwentyThousandTest implements ActionListener, Runnable {
+public class TwentyThousandTest {
private static final int FILES = 20000;
- private static final int ATTEMPTS = 100;
+ private static final int ATTEMPTS = 20;
private static final int INTERVAL = 100;
- private static final boolean ALWAYS_NEW_INSTANCE = false;
- private static final boolean UPDATE_UI_EACH_INTERVAL = true;
- private static final boolean AUTO_CLOSE_DIALOG = true;
-
- private static JFileChooser CHOOSER;
-
private static String tmpDir;
+ private static volatile boolean disposerComplete;
+
public static void main(String[] args) throws Exception {
tmpDir = System.getProperty("java.io.tmpdir");
@@ -77,15 +78,13 @@ public class TwentyThousandTest implements ActionListener, Runnable {
System.out.println("Do " + ATTEMPTS + " attempts for " + laf.getClassName());
- for ( int i = 0; i < ATTEMPTS; i++ ) {
+ for (int i = 0; i < ATTEMPTS; i++) {
System.out.print(i + " ");
doAttempt();
}
System.out.println();
-
- CHOOSER = null;
}
System.out.println("Removing " + FILES + " files");
@@ -94,7 +93,7 @@ public class TwentyThousandTest implements ActionListener, Runnable {
getTempFile(i).delete();
}
- System.out.println( "Test passed successfully" );
+ System.out.println("Test passed successfully");
}
private static File getTempFile(int i) {
@@ -104,48 +103,55 @@ public class TwentyThousandTest implements ActionListener, Runnable {
private static void doAttempt() throws Exception {
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
- if ( ALWAYS_NEW_INSTANCE || ( CHOOSER == null ) )
- CHOOSER = new JFileChooser(tmpDir);
-
- if ( UPDATE_UI_EACH_INTERVAL )
- CHOOSER.updateUI();
-
- if ( AUTO_CLOSE_DIALOG ) {
- Thread t = new Thread( new TwentyThousandTest( CHOOSER ) );
- t.start();
- CHOOSER.showOpenDialog( null );
- } else {
- CHOOSER.showOpenDialog( null );
- }
+ final JFileChooser chooser = new JFileChooser(tmpDir);
+
+ chooser.updateUI();
+
+ // Postpone JFileChooser closing until it becomes visible
+ chooser.addHierarchyListener(new HierarchyListener() {
+ @Override
+ public void hierarchyChanged(HierarchyEvent e) {
+ if ((e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0) {
+ if (chooser.isShowing()) {
+ Thread thread = new Thread(new Runnable() {
+ public void run() {
+ try {
+ Thread.sleep(INTERVAL);
+
+ // Close JFileChooser
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ chooser.cancelSelection();
+ }
+ });
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ });
+
+ thread.start();
+ }
+ }
+ }
+ });
+
+ chooser.showOpenDialog(null);
}
});
- // Allow to collect garbage by GC
- Thread.sleep(1000);
-
- System.gc();
- }
+ DisposerRecord disposerRecord = new DisposerRecord() {
+ public void dispose() {
+ disposerComplete = true;
+ }
+ };
- private final JFileChooser chooser;
+ disposerComplete = false;
- TwentyThousandTest( JFileChooser chooser ) {
- this.chooser = chooser;
- }
+ Disposer.addRecord(new Object(), disposerRecord);
- public void run() {
- while ( !this.chooser.isShowing() ) {
- try {
- Thread.sleep( 30 );
- } catch ( InterruptedException exception ) {
- exception.printStackTrace();
- }
+ while (!disposerComplete) {
+ Util.generateOOME();
}
- Timer timer = new Timer( INTERVAL, this );
- timer.setRepeats( false );
- timer.start();
- }
-
- public void actionPerformed( ActionEvent event ) {
- this.chooser.cancelSelection();
}
}
diff --git a/jdk/test/javax/xml/crypto/dsig/KeySelectors.java b/jdk/test/javax/xml/crypto/dsig/KeySelectors.java
index a22e27a..2924d99 100644
--- a/jdk/test/javax/xml/crypto/dsig/KeySelectors.java
+++ b/jdk/test/javax/xml/crypto/dsig/KeySelectors.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,9 @@
*/
import java.io.*;
-import java.security.*;
+import java.security.Key;
+import java.security.KeyException;
+import java.security.PublicKey;
import java.security.cert.*;
import java.util.*;
import javax.crypto.SecretKey;
@@ -76,7 +78,7 @@ class KeySelectors {
}
public byte[] getEncoded() {
- return (byte[]) bytes.clone();
+ return bytes.clone();
}
};
}
@@ -196,9 +198,9 @@ class KeySelectors {
* matching public key.
*/
static class CollectionKeySelector extends KeySelector {
- private CertificateFactory certFac;
+ private CertificateFactory cf;
private File certDir;
- private Vector certs;
+ private Vector<X509Certificate> certs;
private static final int MATCH_SUBJECT = 0;
private static final int MATCH_ISSUER = 1;
private static final int MATCH_SERIAL = 2;
@@ -208,24 +210,24 @@ class KeySelectors {
CollectionKeySelector(File dir) {
certDir = dir;
try {
- certFac = CertificateFactory.getInstance("X509");
+ cf = CertificateFactory.getInstance("X509");
} catch (CertificateException ex) {
// not going to happen
}
- certs = new Vector();
+ certs = new Vector<X509Certificate>();
File[] files = new File(certDir, "certs").listFiles();
for (int i = 0; i < files.length; i++) {
- try {
- certs.add(certFac.generateCertificate
- (new FileInputStream(files[i])));
+ try (FileInputStream fis = new FileInputStream(files[i])) {
+ certs.add((X509Certificate)cf.generateCertificate(fis));
} catch (Exception ex) { }
}
}
- Vector match(int matchType, Object value, Vector pool) {
- Vector matchResult = new Vector();
+ Vector<X509Certificate> match(int matchType, Object value,
+ Vector<X509Certificate> pool) {
+ Vector<X509Certificate> matchResult = new Vector<>();
for (int j=0; j < pool.size(); j++) {
- X509Certificate c = (X509Certificate) pool.get(j);
+ X509Certificate c = pool.get(j);
switch (matchType) {
case MATCH_SUBJECT:
try {
@@ -286,19 +288,18 @@ class KeySelectors {
if (xmlStructure instanceof KeyName) {
String name = ((KeyName)xmlStructure).getName();
PublicKey pk = null;
- try {
+ File certFile = new File(new File(certDir, "certs"),
+ name.toLowerCase() + ".crt");
+ try (FileInputStream fis = new FileInputStream(certFile)) {
// Lookup the public key using the key name 'Xxx',
// i.e. the public key is in "certs/xxx.crt".
- File certFile = new File(new File(certDir, "certs"),
- name.toLowerCase()+".crt");
X509Certificate cert = (X509Certificate)
- certFac.generateCertificate
- (new FileInputStream(certFile));
+ cf.generateCertificate(fis);
pk = cert.getPublicKey();
} catch (FileNotFoundException e) {
// assume KeyName contains subject DN and search
// collection of certs for match
- Vector result =
+ Vector<X509Certificate> result =
match(MATCH_SUBJECT, name, certs);
int numOfMatches = (result==null? 0:result.size());
if (numOfMatches != 1) {
@@ -306,7 +307,7 @@ class KeySelectors {
((numOfMatches==0?"No":"More than one") +
" match found");
}
- pk =((X509Certificate)result.get(0)).getPublicKey();
+ pk = result.get(0).getPublicKey();
}
return new SimpleKSResult(pk);
} else if (xmlStructure instanceof RetrievalMethod) {
@@ -316,10 +317,12 @@ class KeySelectors {
String type = rm.getType();
if (type.equals(X509Data.RAW_X509_CERTIFICATE_TYPE)) {
String uri = rm.getURI();
- X509Certificate cert = (X509Certificate)
- certFac.generateCertificate
- (new FileInputStream(new File(certDir, uri)));
- return new SimpleKSResult(cert.getPublicKey());
+ try (FileInputStream fis =
+ new FileInputStream(new File(certDir, uri))) {
+ X509Certificate cert = (X509Certificate)
+ cf.generateCertificate(fis);
+ return new SimpleKSResult(cert.getPublicKey());
+ }
} else {
throw new KeySelectorException
("Unsupported RetrievalMethod type");
@@ -327,7 +330,7 @@ class KeySelectors {
} else if (xmlStructure instanceof X509Data) {
List content = ((X509Data)xmlStructure).getContent();
int size = content.size();
- Vector result = null;
+ Vector<X509Certificate> result = null;
// Lookup the public key using the information
// specified in X509Data element, i.e. searching
// over the collection of certificate files under
@@ -357,8 +360,7 @@ class KeySelectors {
((numOfMatches==0?"No":"More than one") +
" match found");
}
- return new SimpleKSResult(((X509Certificate)
- result.get(0)).getPublicKey());
+ return new SimpleKSResult(result.get(0).getPublicKey());
}
} catch (Exception ex) {
throw new KeySelectorException(ex);
diff --git a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
index 27d2bb4..4ee123e 100644
--- a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
+++ b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4635230 6365103 6366054 6824440
+ * @bug 4635230 6365103 6366054 6824440 7131084
* @summary Basic unit tests for validating XML Signatures with JSR 105
* @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
* X509KeySelector.java ValidationTests.java
@@ -43,10 +43,6 @@ import javax.xml.crypto.XMLCryptoContext;
import javax.xml.crypto.dsig.XMLSignatureException;
import javax.xml.crypto.dsig.XMLSignatureFactory;
-/**
- * This is a testcase to validate all "merlin-xmldsig-twenty-three"
- * testcases from Baltimore
- */
public class ValidationTests {
private static SignatureValidator validator;
@@ -61,25 +57,14 @@ public class ValidationTests {
private final static String STYLESHEET_B64 =
"http://www.w3.org/Signature/2002/04/xml-stylesheet.b64";
- private final static String[] FILES = {
- "signature-enveloped-dsa.xml",
- "signature-enveloping-b64-dsa.xml",
- "signature-enveloping-dsa.xml",
- "signature-enveloping-rsa.xml",
- "signature-enveloping-hmac-sha1.xml",
- "signature-external-dsa.xml",
- "signature-external-b64-dsa.xml",
- "signature-retrievalmethod-rawx509crt.xml",
- "signature-keyname.xml",
- "signature-x509-crt-crl.xml",
- "signature-x509-crt.xml",
- "signature-x509-is.xml",
- "signature-x509-ski.xml",
- "signature-x509-sn.xml",
-// "signature.xml",
- "exc-signature.xml",
- "sign-spec.xml"
- };
+ static class Test {
+ String file;
+ KeySelector ks;
+ Test(String file, KeySelector ks) {
+ this.file = file;
+ this.ks = ks;
+ }
+ }
static KeySelector skks;
static {
@@ -98,36 +83,44 @@ public class ValidationTests {
private final static KeySelector RXKS =
new KeySelectors.RawX509KeySelector();
private final static KeySelector XKS = null;
- private final static KeySelector[] KEY_SELECTORS = {
- KVKS,
- KVKS,
- KVKS,
- KVKS,
- SKKS,
- KVKS,
- KVKS,
- CKS,
- CKS,
- RXKS,
- RXKS,
- CKS,
- CKS,
- CKS,
-// XKS,
- KVKS,
- RXKS
- };
private static URIDereferencer httpUd = null;
+ private final static Test[] VALID_TESTS = {
+ new Test("signature-enveloped-dsa.xml", KVKS),
+ new Test("signature-enveloping-b64-dsa.xml", KVKS),
+ new Test("signature-enveloping-dsa.xml", KVKS),
+ new Test("signature-enveloping-rsa.xml", KVKS),
+ new Test("signature-enveloping-hmac-sha1.xml", SKKS),
+ new Test("signature-external-dsa.xml", KVKS),
+ new Test("signature-external-b64-dsa.xml", KVKS),
+ new Test("signature-retrievalmethod-rawx509crt.xml", CKS),
+ new Test("signature-keyname.xml", CKS),
+ new Test("signature-x509-crt-crl.xml", RXKS),
+ new Test("signature-x509-crt.xml", RXKS),
+ new Test("signature-x509-is.xml", CKS),
+ new Test("signature-x509-ski.xml", CKS),
+ new Test("signature-x509-sn.xml", CKS),
+ new Test("signature.xml", XKS),
+ new Test("exc-signature.xml", KVKS),
+ new Test("sign-spec.xml", RXKS),
+ new Test("xmldsig-xfilter2.xml", KVKS)
+ };
+
+ private final static Test[] INVALID_TESTS = {
+ new Test("signature-enveloping-hmac-sha1-40.xml", SKKS),
+ new Test("signature-enveloping-hmac-sha1-trunclen-0-attack.xml", SKKS),
+ new Test("signature-enveloping-hmac-sha1-trunclen-8-attack.xml", SKKS)
+ };
+
public static void main(String args[]) throws Exception {
httpUd = new HttpURIDereferencer();
validator = new SignatureValidator(new File(DATA_DIR));
boolean atLeastOneFailed = false;
- for (int i=0; i < FILES.length; i++) {
- System.out.println("Validating " + FILES[i]);
- if (test_signature(FILES[i], KEY_SELECTORS[i])) {
+ for (Test test : VALID_TESTS) {
+ System.out.println("Validating " + test.file);
+ if (test_signature(test)) {
System.out.println("PASSED");
} else {
System.out.println("FAILED");
@@ -136,41 +129,23 @@ public class ValidationTests {
}
// test with reference caching enabled
System.out.println("Validating sign-spec.xml with caching enabled");
- if (test_signature("sign-spec.xml", RXKS, true)) {
+ if (test_signature(new Test("sign-spec.xml", RXKS), true)) {
System.out.println("PASSED");
} else {
System.out.println("FAILED");
atLeastOneFailed = true;
}
- System.out.println("Validating signature-enveloping-hmac-sha1-40.xml");
- try {
- test_signature("signature-enveloping-hmac-sha1-40.xml", SKKS, false);
- System.out.println("FAILED");
- atLeastOneFailed = true;
- } catch (XMLSignatureException xse) {
- System.out.println(xse.getMessage());
- System.out.println("PASSED");
- }
-
- System.out.println("Validating signature-enveloping-hmac-sha1-trunclen-0-attack.xml");
- try {
- test_signature("signature-enveloping-hmac-sha1-trunclen-0-attack.xml", SKKS, false);
- System.out.println("FAILED");
- atLeastOneFailed = true;
- } catch (XMLSignatureException xse) {
- System.out.println(xse.getMessage());
- System.out.println("PASSED");
- }
-
- System.out.println("Validating signature-enveloping-hmac-sha1-trunclen-8-attack.xml");
- try {
- test_signature("signature-enveloping-hmac-sha1-trunclen-8-attack.xml", SKKS, false);
- System.out.println("FAILED");
- atLeastOneFailed = true;
- } catch (XMLSignatureException xse) {
- System.out.println(xse.getMessage());
- System.out.println("PASSED");
+ for (Test test : INVALID_TESTS) {
+ System.out.println("Validating " + test.file);
+ try {
+ test_signature(test);
+ System.out.println("FAILED");
+ atLeastOneFailed = true;
+ } catch (XMLSignatureException xse) {
+ System.out.println(xse.getMessage());
+ System.out.println("PASSED");
+ }
}
if (atLeastOneFailed) {
@@ -179,20 +154,21 @@ public class ValidationTests {
}
}
- public static boolean test_signature(String file, KeySelector ks)
- throws Exception {
- return test_signature(file, ks, false);
+ public static boolean test_signature(Test test) throws Exception {
+ return test_signature(test, false);
}
- public static boolean test_signature(String file, KeySelector ks,
- boolean cache) throws Exception {
- if (ks == null) {
+ public static boolean test_signature(Test test, boolean cache)
+ throws Exception
+ {
+ if (test.ks == null) {
KeyStore keystore = KeyStore.getInstance("JKS");
- keystore.load
- (new FileInputStream(KEYSTORE), "changeit".toCharArray());
- ks = new X509KeySelector(keystore, false);
+ try (FileInputStream fis = new FileInputStream(KEYSTORE)) {
+ keystore.load(fis, "changeit".toCharArray());
+ test.ks = new X509KeySelector(keystore, false);
+ }
}
- return validator.validate(file, ks, httpUd, cache);
+ return validator.validate(test.file, test.ks, httpUd, cache);
}
/**
diff --git a/jdk/test/javax/xml/crypto/dsig/X509KeySelector.java b/jdk/test/javax/xml/crypto/dsig/X509KeySelector.java
index bbe9a7c..a21e429 100644
--- a/jdk/test/javax/xml/crypto/dsig/X509KeySelector.java
+++ b/jdk/test/javax/xml/crypto/dsig/X509KeySelector.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -205,9 +205,9 @@ class X509KeySelector extends KeySelector {
*/
private KeySelectorResult keyStoreSelect(CertSelector cs)
throws KeyStoreException {
- Enumeration aliases = ks.aliases();
+ Enumeration<String> aliases = ks.aliases();
while (aliases.hasMoreElements()) {
- String alias = (String) aliases.nextElement();
+ String alias = aliases.nextElement();
Certificate cert = ks.getCertificate(alias);
if (cert != null && cs.match(cert)) {
return new SimpleKeySelectorResult(cert.getPublicKey());
@@ -301,7 +301,7 @@ class X509KeySelector extends KeySelector {
} catch (IOException ioe) {
throw new KeySelectorException(ioe);
}
- Collection certs = new ArrayList();
+ Collection<X509Certificate> certs = new ArrayList<>();
Iterator xi = xd.getContent().iterator();
while (xi.hasNext()) {
@@ -345,7 +345,7 @@ class X509KeySelector extends KeySelector {
System.arraycopy(ski, 0, encodedSki, 2, ski.length);
subjectcs.setSubjectKeyIdentifier(encodedSki);
} else if (o instanceof X509Certificate) {
- certs.add((X509Certificate) o);
+ certs.add((X509Certificate)o);
// check X509CRL
// not supported: should use CertPath API
} else {
@@ -359,9 +359,7 @@ class X509KeySelector extends KeySelector {
}
if (!certs.isEmpty() && !trusted) {
// try to find public key in certs in X509Data
- Iterator i = certs.iterator();
- while (i.hasNext()) {
- X509Certificate cert = (X509Certificate) i.next();
+ for (X509Certificate cert : certs) {
if (subjectcs.match(cert)) {
return new SimpleKeySelectorResult(cert.getPublicKey());
}
diff --git a/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh b/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
index c10d383..63e60b5 100644
--- a/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
+++ b/jdk/test/lib/security/java.policy/Ext_AllPolicy.sh
@@ -50,7 +50,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
@@ -78,6 +78,6 @@ ${TESTJAVA}${FS}bin${FS}jar -cvf Ext_AllPolicy.jar Ext_AllPolicy.class
rm Ext_AllPolicy.class
${TESTJAVA}${FS}bin${FS}java \
- -Djava.security.manager -Djava.ext.dirs="${TESTCLASSES}" Ext_AllPolicy
+ -Djava.security.manager -Djava.ext.dirs="${TESTCLASSES}" Ext_AllPolicy
exit $?
diff --git a/jdk/test/org/openjdk/jigsaw/_Library.java b/jdk/test/org/openjdk/jigsaw/_Library.java
index 0636661..06555e2 100644
--- a/jdk/test/org/openjdk/jigsaw/_Library.java
+++ b/jdk/test/org/openjdk/jigsaw/_Library.java
@@ -144,9 +144,11 @@ public class _Library {
List<String> pcns = lib.listLocalClasses(foomid, false);
eq(pcns, Arrays.asList("com.foo.bar.Main"));
List<String> acns = lib.listLocalClasses(foomid, true);
- eq(acns, Arrays.asList("com.foo.bar.Main",
- "com.foo.bar.Internal",
- "com.foo.bar.Internal$Secret"));
+ List<String> comFooBarClasses =
+ Arrays.asList("com.foo.bar.Main",
+ "com.foo.bar.Internal",
+ "com.foo.bar.Internal$Secret");
+ eq(acns, comFooBarClasses);
// Load configuration
Configuration<Context> cf = lib.readConfiguration(foomid);
@@ -237,6 +239,12 @@ public class _Library {
eq(lib2.findModuleIds("com.foo.bar"), Arrays.asList(foomid));
eq(lib2.findModuleIds("net.baz.aar"), Arrays.asList(bazmid));
+ // find classes in its parent library
+ for (String cn : comFooBarClasses) {
+ bs = lib2.readClass(foomid, cn);
+ if (bs == null)
+ throw new RuntimeException(cn + " not found through delegration");
+ }
}
}
diff --git a/jdk/test/org/openjdk/jigsaw/hello-native.sh b/jdk/test/org/openjdk/jigsaw/hello-native.sh
index f76e0e7..aa5d617 100644
--- a/jdk/test/org/openjdk/jigsaw/hello-native.sh
+++ b/jdk/test/org/openjdk/jigsaw/hello-native.sh
@@ -63,7 +63,7 @@ case "$OS" in
(cd z.test/native/src;
cc -G -o ../lib/libworld.so -I$TESTJAVA/include -I$TESTJAVA/include/solaris org_astro_World.c -lc)
;;
- Linux )
+ Linux | Darwin )
(cd z.test/native/src;
gcc -o ../lib/libworld.so -I$TESTJAVA/include -I$TESTJAVA/include/linux -shared org_astro_World.c -static -lc)
;;
diff --git a/jdk/test/org/openjdk/jigsaw/library.sh b/jdk/test/org/openjdk/jigsaw/library.sh
index 2dc8e73..962fa13 100644
--- a/jdk/test/org/openjdk/jigsaw/library.sh
+++ b/jdk/test/org/openjdk/jigsaw/library.sh
@@ -106,11 +106,7 @@ EOF
OS=`uname -s`
case "$OS" in
- SunOS )
- PS=":"
- FS="/"
- ;;
- Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -132,4 +128,4 @@ esac
$BIN/javac -source 8 -d z.modules -modulepath z.modules${PS}z.modules.org.multi at 1 \
`find z.src/net.baz.aar -name '*.java'`
-$BIN/java -ea -cp z.classes _Library
+$BIN/java -esa -ea -cp z.classes _Library
diff --git a/jdk/test/org/openjdk/jigsaw/tester.sh b/jdk/test/org/openjdk/jigsaw/tester.sh
index 4b94e1c..fe1f63e 100644
--- a/jdk/test/org/openjdk/jigsaw/tester.sh
+++ b/jdk/test/org/openjdk/jigsaw/tester.sh
@@ -36,6 +36,11 @@ case "$OS" in
PS=":"
FS="/"
;;
+ Darwin )
+ AWK=awk
+ PS=":"
+ FS="/"
+ ;;
Windows* )
AWK=awk
DASH_P=""
diff --git a/jdk/test/sun/management/AgentCheckTest.java b/jdk/test/sun/management/AgentCheckTest.java
index 4f4ba90..1e5a27c 100644
--- a/jdk/test/sun/management/AgentCheckTest.java
+++ b/jdk/test/sun/management/AgentCheckTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -35,10 +35,10 @@ public class AgentCheckTest {
public static void main(String[] args){
String [][] testStrings = {
{"agent.err.error", "", ""},
- {"jmxremote.ConnectorBootstrap.initialize", "", ""},
- {"jmxremote.ConnectorBootstrap.initialize.noAuthentication", "", ""},
- {"jmxremote.ConnectorBootstrap.initialize.ready", "Phony JMXServiceURL", ""},
- {"jmxremote.ConnectorBootstrap.initialize.password.readonly", "Phony passwordFileName", ""},
+ {"jmxremote.ConnectorBootstrap.starting", "", ""},
+ {"jmxremote.ConnectorBootstrap.noAuthentication", "", ""},
+ {"jmxremote.ConnectorBootstrap.ready", "Phony JMXServiceURL", ""},
+ {"jmxremote.ConnectorBootstrap.password.readonly", "Phony passwordFileName", ""},
{"jmxremote.AdaptorBootstrap.getTargetList.processing", "", ""},
{"jmxremote.AdaptorBootstrap.getTargetList.adding", "Phony target", ""},
{"jmxremote.AdaptorBootstrap.getTargetList.starting", "", ""},
diff --git a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java
index b663d95..325ddc6 100644
--- a/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java
+++ b/jdk/test/sun/management/HotspotClassLoadingMBean/GetClassLoadingTime.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,6 +27,7 @@
* @summary Basic unit test of HotspotClassLoadingMBean.getClassLoadingTime()
* @author Steve Bohne
* @build ClassToLoad0
+ * @run main GetClassLoadingTime
*/
/*
@@ -71,10 +72,8 @@ public class GetClassLoadingTime {
}
long time2 = mbean.getClassLoadingTime();
- long count = mbean.getLoadedClassCount();
if (trace) {
- System.out.println("(new count is " + count + ")");
System.out.println("Class loading time2 (ms): " + time2);
}
@@ -93,8 +92,6 @@ public class GetClassLoadingTime {
// so we can avoid delegation and spend lots of time loading the
// same class over and over, to test the class loading timer.
class KlassLoader extends ClassLoader {
- static String klassDir="";
- static int index=0;
public KlassLoader() {
super(null);
@@ -102,14 +99,13 @@ class KlassLoader extends ClassLoader {
protected synchronized Class findClass(String name)
throws ClassNotFoundException {
- String cname = klassDir
- + (klassDir == "" ? "" : "/")
- +name.replace('.', '/')
+ String cname =
+ name.replace('.', '/')
+".class";
FileInputStream in;
try {
- in=new FileInputStream(cname);
+ in = new FileInputStream(new File(System.getProperty("test.classes", "."), cname));
if (in == null) {
throw new ClassNotFoundException("getResourceAsStream("
+cname+")");
diff --git a/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh b/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
index eef07a2..570631d 100644
--- a/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
+++ b/jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
# or .access files from a list of input .in files.
#
# Source in this GeneratePropertyPassword.sh and call the function
-# generatePropertyPasswordFiles.
+# generatePropertyPasswordFiles.
# Call restoreFilePermissions to restore file permissions after the test completes
#
@@ -34,8 +34,15 @@
OS=`uname -s`
UMASK=`umask`
+if [[ $OS == CYGWIN_NT* ]] ; then
+ OS="Windows_NT"
+ if [ -z "$SystemRoot" ] ; then
+ SystemRoot=$SYSTEMROOT
+ fi
+fi
+
case $OS in
-SunOS | Linux)
+SunOS | Linux | Darwin)
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
@@ -60,12 +67,12 @@ EOF
sed -e 's^ZZZZ^\\\\\\\\^g' > ${TMP_FILE}
if [ "$OS" = "Windows_NT" ]; then
- USER=`id -u -n`
- CACLS="$SystemRoot/system32/cacls.exe"
- REVOKEALL="${TESTSRC}/../../windows/revokeall.exe"
- if [ ! -f "$REVOKEALL" ] ; then
- echo "$REVOKEALL missing"
- exit 1
+ USER=`id -u -n`
+ CACLS="$SystemRoot/system32/cacls.exe"
+ REVOKEALL="${TESTSRC}/../../windows/revokeall.exe"
+ if [ ! -f "$REVOKEALL" ] ; then
+ echo "$REVOKEALL missing"
+ exit 1
fi
fi
@@ -77,47 +84,47 @@ EOF
;;
esac
-generatePropertyPasswordFiles()
+generatePropertyPasswordFiles()
{
for f in $@
do
echo processing $f
- suffix=`basename $f .in`
- f2="${TESTCLASSES}${FILESEP}${suffix}"
+ suffix=`basename $f .in`
+ f2="${TESTCLASSES}${FILESEP}${suffix}"
- if [ -f "$f2" ] ; then
- rm -f $f2 || echo WARNING: $f2 already exits - unable to remove old copy
- fi
+ if [ -f "$f2" ] ; then
+ rm -f $f2 || echo WARNING: $f2 already exits - unable to remove old copy
+ fi
- echo creating $f2
+ echo creating $f2
sed -f $TMP_FILE $f > $f2
- if [ "$OS" = "Windows_NT" ]; then
- chown $USER $f2
- # Grant this user full access
- echo Y|$CACLS $f2 \/E \/G $USER:F
- # Revoke everyone else
- $REVOKEALL $f2
- # Display ACLs
- $CACLS $f2
+ if [ "$OS" = "Windows_NT" ]; then
+ chown $USER $f2
+ # Grant this user full access
+ echo Y|$CACLS $f2 \/E \/G $USER:F
+ # Revoke everyone else
+ $REVOKEALL $f2
+ # Display ACLs
+ $CACLS $f2
else
- chmod 600 $f2
+ chmod 600 $f2
fi
done
}
-restoreFilePermissions()
+restoreFilePermissions()
{
for f in $@
do
- suffix=`basename $f .in`
- f2="${TESTCLASSES}${FILESEP}${suffix}"
-
- if [ "$OS" = "Windows_NT" ]; then
- # Grant everyone full control
- $CACLS $f2 \/E \/G Everyone:F
- else
- chmod 777 $f2
+ suffix=`basename $f .in`
+ f2="${TESTCLASSES}${FILESEP}${suffix}"
+
+ if [ "$OS" = "Windows_NT" ]; then
+ # Grant everyone full control
+ $CACLS $f2 \/E \/G Everyone:F
+ else
+ chmod 777 $f2
fi
done
diff --git a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
index 355f267..81daf8b 100644
--- a/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
+++ b/jdk/test/sun/misc/Cleaner/exitOnThrow.sh
@@ -29,6 +29,7 @@
# @summary Ensure that if a cleaner throws an exception then the VM exits
#
# @build ExitOnThrow
+# @run shell exitOnThrow.sh
# Command-line usage: sh exitOnThrow.sh /path/to/build
diff --git a/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh b/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh
index 6325e57..362d6dc 100644
--- a/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh
+++ b/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh
@@ -36,11 +36,7 @@
OS=`uname -s`
case "$OS" in
- SunOS )
- PS=":"
- FS="/"
- ;;
- Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/sun/net/www/MarkResetTest.sh b/jdk/test/sun/net/www/MarkResetTest.sh
index 3745600..20bb6ab 100644
--- a/jdk/test/sun/net/www/MarkResetTest.sh
+++ b/jdk/test/sun/net/www/MarkResetTest.sh
@@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -49,7 +49,7 @@ esac
${TESTJAVA}${FS}bin${FS}javac -d . ${TESTSRC}${FS}MarkResetTest.java
# ftp server used by the test requires the file to be present
-# in this directory
+# in this directory
cp ${TESTSRC}${FS}EncDec.doc .
${TESTJAVA}${FS}bin${FS}java MarkResetTest
diff --git a/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh b/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
index 254c71a..d1b7469 100644
--- a/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
+++ b/jdk/test/sun/net/www/http/HttpClient/RetryPost.sh
@@ -28,7 +28,7 @@
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/sun/net/www/protocol/jar/B5105410.sh b/jdk/test/sun/net/www/protocol/jar/B5105410.sh
index fd15899..66623db 100644
--- a/jdk/test/sun/net/www/protocol/jar/B5105410.sh
+++ b/jdk/test/sun/net/www/protocol/jar/B5105410.sh
@@ -31,11 +31,7 @@
OS=`uname -s`
case "$OS" in
- SunOS )
- PS=":"
- FS="/"
- ;;
- Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh b/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
index 97a1157..0446848 100644
--- a/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
+++ b/jdk/test/sun/net/www/protocol/jar/jarbug/run.sh
@@ -31,11 +31,7 @@ DEST=`pwd`
OS=`uname -s`
case "$OS" in
- SunOS )
- PS=":"
- FS="/"
- ;;
- Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
@@ -58,10 +54,10 @@ case "$OS" in
esac
#
-# build jar1
+# build jar1
#
mkdir -p ${DEST}${FS}jar1
-cd ${TESTSRC}${FS}etc${FS}jar1
+cd ${TESTSRC}${FS}etc${FS}jar1
cp -r . ${DEST}${FS}jar1
${TESTJAVA}${FS}bin${FS}javac -d ${DEST}${FS}jar1 \
${TESTSRC}${FS}src${FS}jar1${FS}LoadResourceBundle.java
diff --git a/jdk/test/sun/nio/ch/SelProvider.java b/jdk/test/sun/nio/ch/SelProvider.java
index 3eba361..53b18cb 100644
--- a/jdk/test/sun/nio/ch/SelProvider.java
+++ b/jdk/test/sun/nio/ch/SelProvider.java
@@ -50,6 +50,8 @@ public class SelProvider {
} else {
throw new RuntimeException("Test does not recognize this operating system");
}
+ } else if (osname.startsWith("Mac OS")) {
+ expected = "sun.nio.ch.PollSelectorProvider";
} else
return;
if (!spName.equals(expected))
diff --git a/jdk/test/sun/nio/cs/OLD/TestIBMDB.java b/jdk/test/sun/nio/cs/OLD/TestIBMDB.java
index 38d4991..571bf0c 100644
--- a/jdk/test/sun/nio/cs/OLD/TestIBMDB.java
+++ b/jdk/test/sun/nio/cs/OLD/TestIBMDB.java
@@ -26,6 +26,7 @@
* @bug 6843578
* @summary Test IBM DB charsets
* @build IBM930_OLD IBM933_OLD IBM935_OLD IBM937_OLD IBM939_OLD IBM942_OLD IBM943_OLD IBM948_OLD IBM949_OLD IBM950_OLD IBM970_OLD IBM942C_OLD IBM943C_OLD IBM949C_OLD IBM1381_OLD IBM1383_OLD EUC_CN_OLD EUC_KR_OLD GBK_OLD Johab_OLD MS932_OLD MS936_OLD MS949_OLD MS950_OLD
+ * @run main TestIBMDB
*/
import java.nio.charset.*;
diff --git a/jdk/test/sun/nio/cs/OLD/TestX11CS.java b/jdk/test/sun/nio/cs/OLD/TestX11CS.java
deleted file mode 100644
index 52b2ef5..0000000
--- a/jdk/test/sun/nio/cs/OLD/TestX11CS.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
- * 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 1234567
- * @summary Test updated X11 charsets
- * @build X11GB2312_OLD X11GBK_OLD X11KSC5601_OLD
- */
-
-import java.nio.charset.*;
-import java.nio.*;
-import java.util.*;
-
-public class TestX11CS {
-
- static char[] decode(byte[] bb, Charset cs)
- throws Exception {
- CharsetDecoder dec = cs.newDecoder();
- ByteBuffer bbf = ByteBuffer.wrap(bb);
- CharBuffer cbf = CharBuffer.allocate(bb.length);
- CoderResult cr = dec.decode(bbf, cbf, true);
- if (cr != CoderResult.UNDERFLOW) {
- System.out.println("DEC-----------------");
- int pos = bbf.position();
- System.out.printf(" cr=%s, bbf.pos=%d, bb[pos]=%x,%x,%x,%x%n",
- cr.toString(), pos,
- bb[pos++]&0xff, bb[pos++]&0xff,bb[pos++]&0xff, bb[pos++]&0xff);
- throw new RuntimeException("Decoding err: " + cs.name());
- }
- char[] cc = new char[cbf.position()];
- cbf.flip(); cbf.get(cc);
- return cc;
-
- }
-
- static byte[] encode(char[] cc, Charset cs)
- throws Exception {
- ByteBuffer bbf = ByteBuffer.allocate(cc.length * 4);
- CharBuffer cbf = CharBuffer.wrap(cc);
- CharsetEncoder enc = cs.newEncoder();
-
- CoderResult cr = enc.encode(cbf, bbf, true);
- if (cr != CoderResult.UNDERFLOW) {
- System.out.println("ENC-----------------");
- int pos = cbf.position();
- System.out.printf(" cr=%s, cbf.pos=%d, cc[pos]=%x%n",
- cr.toString(), pos, cc[pos]&0xffff);
- throw new RuntimeException("Encoding err: " + cs.name());
- }
- byte[] bb = new byte[bbf.position()];
- bbf.flip(); bbf.get(bb);
- return bb;
- }
-
- static char[] getChars(Charset newCS, Charset oldCS) {
- CharsetEncoder enc = oldCS.newEncoder();
- CharsetEncoder encNew = newCS.newEncoder();
- char[] cc = new char[0x10000];
- int pos = 0;
- int i = 0;
- while (i < 0x10000) {
- if (enc.canEncode((char)i) != encNew.canEncode((char)i)) {
- System.out.printf(" Err i=%x%n", i);
- //throw new RuntimeException("canEncode() err!");
- }
- if (enc.canEncode((char)i)) {
- cc[pos++] = (char)i;
- }
- i++;
- }
- return Arrays.copyOf(cc, pos);
- }
-
- static void compare(Charset newCS, Charset oldCS) throws Exception {
- System.out.printf(" Diff <%s> <%s>...%n", newCS.name(), oldCS.name());
- char[] cc = getChars(newCS, oldCS);
-
- byte[] bb1 = encode(cc, newCS);
- byte[] bb2 = encode(cc, oldCS);
-
- if (!Arrays.equals(bb1, bb2)) {
- System.out.printf(" encoding failed!%n");
- }
- char[] cc1 = decode(bb1, newCS);
- char[] cc2 = decode(bb1, oldCS);
- if (!Arrays.equals(cc1, cc2)) {
- for (int i = 0; i < cc1.length; i++) {
- if (cc1[i] != cc2[i]) {
- System.out.printf("i=%d, cc1=%x cc2=%x, bb=<%x%x>%n",
- i,
- cc1[i]&0xffff, cc2[i]&0xffff,
- bb1[i*2]&0xff, bb1[i*2+1]&0xff);
- }
-
- }
-
- System.out.printf(" decoding failed%n");
- }
- }
-
- public static void main(String[] args) throws Exception {
- compare(new sun.awt.motif.X11GBK(),
- new X11GBK_OLD());
-
- compare(new sun.awt.motif.X11GB2312(),
- new X11GB2312_OLD());
-
- compare(new sun.awt.motif.X11KSC5601(),
- new X11KSC5601_OLD());
-
- }
-}
diff --git a/jdk/test/sun/security/krb5/auto/Context.java b/jdk/test/sun/security/krb5/auto/Context.java
index c4c0cbc..ca612ba 100644
--- a/jdk/test/sun/security/krb5/auto/Context.java
+++ b/jdk/test/sun/security/krb5/auto/Context.java
@@ -96,6 +96,15 @@ public class Context {
}
/**
+ * No JAAS login at all, can be used to test JGSS without JAAS
+ */
+ public static Context fromThinAir() throws Exception {
+ Context out = new Context();
+ out.s = new Subject();
+ return out;
+ }
+
+ /**
* Logins with a JAAS login config entry name
*/
public static Context fromJAAS(final String name) throws Exception {
@@ -111,8 +120,10 @@ public class Context {
String user, char[] pass, boolean storeKey) throws Exception {
return fromUserPass(null, user, pass, storeKey);
}
+
/**
* Logins with a username and a password, using Krb5LoginModule directly
+ * @param s existing subject, test multiple princ & creds for single subj
* @param storeKey true if key should be saved, used on acceptor side
*/
public static Context fromUserPass(Subject s,
diff --git a/jdk/test/sun/security/krb5/auto/KDC.java b/jdk/test/sun/security/krb5/auto/KDC.java
index 13cad02..917c56d 100644
--- a/jdk/test/sun/security/krb5/auto/KDC.java
+++ b/jdk/test/sun/security/krb5/auto/KDC.java
@@ -236,80 +236,82 @@ public class KDC {
}
/**
- * Writes or appends KDC keys into a keytab. See doc for writeMultiKtab.
+ * Writes or appends keys into a keytab.
+ * <p>
+ * Attention: This is the most basic one of a series of methods below on
+ * keytab creation or modification. All these methods reference krb5.conf
+ * settings. If you need to modify krb5.conf or switch to another krb5.conf
+ * later, please call <code>Config.refresh()</code> again. For example:
+ * <pre>
+ * kdc.writeKtab("/etc/kdc/ktab", true); // Config is initialized,
+ * System.setProperty("java.security.krb5.conf", "/home/mykrb5.conf");
+ * Config.refresh();
+ * </pre>
+ * Inside this method there are 2 places krb5.conf is used:
+ * <ol>
+ * <li> (Fatal) Generating keys: EncryptionKey.acquireSecretKeys
+ * <li> (Has workaround) Creating PrincipalName
+ * </ol>
+ * @param tab the keytab file name
* @param append true if append, otherwise, overwrite.
+ * @param names the names to write into, write all if names is empty
*/
- private static void writeKtab0(String tab, boolean append, KDC... kdcs)
+ public void writeKtab(String tab, boolean append, String... names)
throws IOException, KrbException {
KeyTab ktab = append ? KeyTab.getInstance(tab) : KeyTab.create(tab);
- for (KDC kdc: kdcs) {
- for (String name : kdc.passwords.keySet()) {
- char[] pass = kdc.passwords.get(name);
- int kvno = 0;
- if (Character.isDigit(pass[pass.length-1])) {
- kvno = pass[pass.length-1] - '0';
- }
- ktab.addEntry(new PrincipalName(name,
- name.indexOf('/') < 0 ?
- PrincipalName.KRB_NT_UNKNOWN :
- PrincipalName.KRB_NT_SRV_HST),
- pass,
- kvno,
- true);
+ Iterable<String> entries =
+ (names.length != 0) ? Arrays.asList(names): passwords.keySet();
+ for (String name : entries) {
+ char[] pass = passwords.get(name);
+ int kvno = 0;
+ if (Character.isDigit(pass[pass.length-1])) {
+ kvno = pass[pass.length-1] - '0';
}
+ ktab.addEntry(new PrincipalName(name,
+ name.indexOf('/') < 0 ?
+ PrincipalName.KRB_NT_UNKNOWN :
+ PrincipalName.KRB_NT_SRV_HST),
+ pass,
+ kvno,
+ true);
}
ktab.save();
}
/**
* Writes all principals' keys from multiple KDCs into one keytab file.
- * Note that the keys for the krbtgt principals will not be written.
- * <p>
- * Attention: This method references krb5.conf settings. If you need to
- * setup krb5.conf later, please call <code>Config.refresh()</code> after
- * the new setting. For example:
- * <pre>
- * KDC.writeKtab("/etc/kdc/ktab", kdc); // Config is initialized,
- * System.setProperty("java.security.krb5.conf", "/home/mykrb5.conf");
- * Config.refresh();
- * </pre>
- *
- * Inside this method there are 2 places krb5.conf is used:
- * <ol>
- * <li> (Fatal) Generating keys: EncryptionKey.acquireSecretKeys
- * <li> (Has workaround) Creating PrincipalName
- * </ol>
- * @param tab The keytab filename to write to.
* @throws java.io.IOException for any file output error
* @throws sun.security.krb5.KrbException for any realm and/or principal
* name error.
*/
public static void writeMultiKtab(String tab, KDC... kdcs)
throws IOException, KrbException {
- writeKtab0(tab, false, kdcs);
+ KeyTab.create(tab).save(); // Empty the old keytab
+ appendMultiKtab(tab, kdcs);
}
/**
* Appends all principals' keys from multiple KDCs to one keytab file.
- * See writeMultiKtab for details.
*/
public static void appendMultiKtab(String tab, KDC... kdcs)
throws IOException, KrbException {
- writeKtab0(tab, true, kdcs);
+ for (KDC kdc: kdcs) {
+ kdc.writeKtab(tab, true);
+ }
}
/**
* Write a ktab for this KDC.
*/
public void writeKtab(String tab) throws IOException, KrbException {
- KDC.writeMultiKtab(tab, this);
+ writeKtab(tab, false);
}
/**
* Appends keys in this KDC to a ktab.
*/
public void appendKtab(String tab) throws IOException, KrbException {
- KDC.appendMultiKtab(tab, this);
+ writeKtab(tab, true);
}
/**
diff --git a/jdk/test/sun/security/krb5/runNameEquals.sh b/jdk/test/sun/security/krb5/runNameEquals.sh
index dca2052..0f0ab17 100644
--- a/jdk/test/sun/security/krb5/runNameEquals.sh
+++ b/jdk/test/sun/security/krb5/runNameEquals.sh
@@ -48,15 +48,14 @@ NATIVE=false
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS )
+ SunOS | Linux )
PATHSEP=":"
FILESEP="/"
NATIVE=true
;;
- Linux )
+ Darwin )
PATHSEP=":"
FILESEP="/"
- NATIVE=true
;;
CYGWIN* )
PATHSEP=";"
diff --git a/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java b/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java
index 95ccf4e..ee93327 100644
--- a/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java
+++ b/jdk/test/sun/security/pkcs11/KeyAgreement/TestShort.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4942494
+ * @bug 4942494 7146728
* @summary KAT test for DH (normal and with secret that has leading a 0x00 byte)
* @author Andreas Sterbenz
* @library ..
@@ -66,7 +66,7 @@ public class TestShort extends PKCS11Test {
("433011588852527167500079509018272713204454720683");
private final static byte[] s2 = parse
- ("19:c7:f1:bb:2e:3d:93:fa:02:d2:e9:9f:75:32:b9:e6:7a:a0:4a:10:45:81:d4:2b:"
+ ("00:19:c7:f1:bb:2e:3d:93:fa:02:d2:e9:9f:75:32:b9:e6:7a:a0:4a:10:45:81:d4:2b:"
+ "e2:77:4c:70:41:39:7c:19:fa:65:64:47:49:8a:ad:0a:fa:9d:e9:62:68:97:c5:52"
+ ":b1:37:03:d9:cd:aa:e1:bd:7e:71:0c:fc:15:a1:95");
@@ -88,31 +88,36 @@ public class TestShort extends PKCS11Test {
System.out.println("DH not supported, skipping");
return;
}
- DHPublicKeySpec publicSpec;
- DHPrivateKeySpec privateSpec;
- KeyFactory kf = KeyFactory.getInstance("DH", provider);
- KeyAgreement ka = KeyAgreement.getInstance("DH", provider);
-// KeyAgreement ka = KeyAgreement.getInstance("DH");
-
- PrivateKey pr1 = kf.generatePrivate(new DHPrivateKeySpec(x1, p, g));
- PublicKey pu2 = kf.generatePublic(new DHPublicKeySpec(y2, p, g));
- PublicKey pu3 = kf.generatePublic(new DHPublicKeySpec(y3, p, g));
-
- ka.init(pr1);
- ka.doPhase(pu2, true);
- byte[] n2 = ka.generateSecret();
- if (Arrays.equals(s2, n2) == false) {
- throw new Exception("mismatch 2");
- }
- System.out.println("short ok");
+ try {
+ DHPublicKeySpec publicSpec;
+ DHPrivateKeySpec privateSpec;
+ KeyFactory kf = KeyFactory.getInstance("DH", provider);
+ KeyAgreement ka = KeyAgreement.getInstance("DH", provider);
+
+ PrivateKey pr1 = kf.generatePrivate(new DHPrivateKeySpec(x1, p, g));
+ PublicKey pu2 = kf.generatePublic(new DHPublicKeySpec(y2, p, g));
+ PublicKey pu3 = kf.generatePublic(new DHPublicKeySpec(y3, p, g));
+
+ ka.init(pr1);
+ ka.doPhase(pu2, true);
+ byte[] n2 = ka.generateSecret();
+ if (Arrays.equals(s2, n2) == false) {
+ throw new Exception("mismatch 2");
+ }
+ System.out.println("short ok");
- ka.init(pr1);
- ka.doPhase(pu3, true);
- byte[] n3 = ka.generateSecret();
- if (Arrays.equals(s3, n3) == false) {
- throw new Exception("mismatch 3");
+ ka.init(pr1);
+ ka.doPhase(pu3, true);
+ byte[] n3 = ka.generateSecret();
+ if (Arrays.equals(s3, n3) == false) {
+ throw new Exception("mismatch 3");
+ }
+ System.out.println("normal ok");
+ } catch (Exception ex) {
+ System.out.println("Unexpected Exception: " + ex);
+ ex.printStackTrace();
+ throw ex;
}
- System.out.println("normal ok");
/*
KeyPairGenerator kpg = KeyPairGenerator.getInstance("DH", provider);
diff --git a/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh b/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh
index 917e90e..bfa08c8 100644
--- a/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh
+++ b/jdk/test/sun/security/pkcs11/KeyStore/SecretKeysBasic.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -99,6 +99,7 @@ RM="rm -rf"
MKDIR="mkdir -p"
CHMOD="chmod"
+
STATUS=0
for token in ${TOKENS}
do
diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
index 3f9a795..2511ff6 100644
--- a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
+++ b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh
@@ -62,6 +62,12 @@ case "$OS" in
CP="${FS}bin${FS}cp"
CHMOD="${FS}bin${FS}chmod"
;;
+ Darwin )
+ FS="/"
+ PS=":"
+ CP="${FS}bin${FS}cp"
+ CHMOD="${FS}bin${FS}chmod"
+ ;;
Windows* )
FS="\\"
PS=";"
@@ -87,18 +93,18 @@ esac
# compile test
${TESTJAVA}${FS}bin${FS}javac \
- -classpath ${TESTSRC}${FS}.. \
- -d ${TESTCLASSES} \
- ${TESTSRC}${FS}ConfigQuotedString.java
+ -classpath ${TESTSRC}${FS}.. \
+ -d ${TESTCLASSES} \
+ ${TESTSRC}${FS}ConfigQuotedString.java
# run test
${TESTJAVA}${FS}bin${FS}java \
- -classpath ${TESTCLASSES} \
- -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}ConfigQuotedString-nss.txt \
- -Dtest.src=${TESTSRC} \
- -Dtest.classes=${TESTCLASSES} \
- ConfigQuotedString
+ -classpath ${TESTCLASSES} \
+ -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}ConfigQuotedString-nss.txt \
+ -Dtest.src=${TESTSRC} \
+ -Dtest.classes=${TESTCLASSES} \
+ ConfigQuotedString
# save error status
status=$?
diff --git a/jdk/test/sun/security/pkcs11/Provider/Login.sh b/jdk/test/sun/security/pkcs11/Provider/Login.sh
index 406b685..6288a8f 100644
--- a/jdk/test/sun/security/pkcs11/Provider/Login.sh
+++ b/jdk/test/sun/security/pkcs11/Provider/Login.sh
@@ -63,6 +63,12 @@ case "$OS" in
CP="${FS}bin${FS}cp"
CHMOD="${FS}bin${FS}chmod"
;;
+ Darwin )
+ FS="/"
+ PS=":"
+ CP="${FS}bin${FS}cp"
+ CHMOD="${FS}bin${FS}chmod"
+ ;;
Windows* )
FS="\\"
PS=";"
@@ -96,24 +102,24 @@ ${CHMOD} +w ${TESTCLASSES}${FS}key3.db
# compile test
${TESTJAVA}${FS}bin${FS}javac \
- -classpath ${TESTSRC}${FS}.. \
- -d ${TESTCLASSES} \
- ${TESTSRC}${FS}Login.java
+ -classpath ${TESTSRC}${FS}.. \
+ -d ${TESTCLASSES} \
+ ${TESTSRC}${FS}Login.java
# run test
${TESTJAVA}${FS}bin${FS}java \
- -classpath ${TESTCLASSES} \
- -DCUSTOM_DB_DIR=${TESTCLASSES} \
- -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}Login-nss.txt \
- -DNO_DEFAULT=true \
- -DNO_DEIMOS=true \
- -Dtest.src=${TESTSRC} \
- -Dtest.classes=${TESTCLASSES} \
- -Djava.security.manager \
- -Djava.security.policy=${TESTSRC}${FS}Login.policy \
- -Djava.security.debug=${DEBUG} \
- Login
+ -classpath ${TESTCLASSES} \
+ -DCUSTOM_DB_DIR=${TESTCLASSES} \
+ -DCUSTOM_P11_CONFIG=${TESTSRC}${FS}Login-nss.txt \
+ -DNO_DEFAULT=true \
+ -DNO_DEIMOS=true \
+ -Dtest.src=${TESTSRC} \
+ -Dtest.classes=${TESTCLASSES} \
+ -Djava.security.manager \
+ -Djava.security.policy=${TESTSRC}${FS}Login.policy \
+ -Djava.security.debug=${DEBUG} \
+ Login
# save error status
status=$?
diff --git a/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh b/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
index a5789b2..6e7442b 100644
--- a/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
+++ b/jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh
@@ -25,8 +25,8 @@
# @test
# @author Ram Marti
-# @bug 4350951
-# @summary 4350951 assumes permission constructor with 2 string params
+# @bug 4350951
+# @summary 4350951 assumes permission constructor with 2 string params
# set a few environment variables so that the shell-script can run stand-alone
# in the source directory
@@ -55,6 +55,10 @@ case "$OS" in
PS=":"
FS="/"
;;
+ Darwin )
+ PS=":"
+ FS="/"
+ ;;
CYGWIN* )
PS=";"
FS="/"
@@ -69,24 +73,24 @@ case "$OS" in
;;
esac
-if [ ! -d ${TESTCLASSES}${FS}boot ]; then
- mkdir -p ${TESTCLASSES}${FS}boot
+if [ ! -d ${TESTCLASSES}${FS}boot ]; then
+ mkdir -p ${TESTCLASSES}${FS}boot
fi
-if [ ! -d ${TESTCLASSES}${FS}app ]; then
- mkdir -p ${TESTCLASSES}${FS}app
+if [ ! -d ${TESTCLASSES}${FS}app ]; then
+ mkdir -p ${TESTCLASSES}${FS}app
fi
cd ${TESTSRC}${FS}
${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES}${FS}boot \
- ${TESTSRC}${FS}NoArgPermission.java
+ ${TESTSRC}${FS}NoArgPermission.java
${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES}${FS}boot \
- ${TESTSRC}${FS}OneArgPermission.java
+ ${TESTSRC}${FS}OneArgPermission.java
${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES}${FS}boot \
- ${TESTSRC}${FS}TwoArgPermission.java
+ ${TESTSRC}${FS}TwoArgPermission.java
${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES}${FS}boot \
- ${TESTSRC}${FS}TwoArgNullActionsPermission.java
+ ${TESTSRC}${FS}TwoArgNullActionsPermission.java
${TESTJAVA}${FS}bin${FS}javac -d ${TESTCLASSES}${FS}app \
- ${TESTSRC}${FS}GetInstance.java
+ ${TESTSRC}${FS}GetInstance.java
${TESTJAVA}${FS}bin${FS}java \
-Xbootclasspath/a:"${TESTCLASSES}${FS}boot" \
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java b/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java
index e0530ed..2bb3b37 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/SSLSecurity/ProviderTest.java
@@ -27,6 +27,7 @@
* @compile JavaxSSLContextImpl.java ComSSLContextImpl.java
* JavaxTrustManagerFactoryImpl.java ComTrustManagerFactoryImpl.java
* JavaxKeyManagerFactoryImpl.java ComKeyManagerFactoryImpl.java
+ * @run main ProviderTest
* @summary brokenness in the com.sun.net.ssl.SSLSecurity wrappers
*/
diff --git a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
index bb4cd8f..aa01dca 100644
--- a/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
+++ b/jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh
@@ -31,31 +31,31 @@
if [ "${TESTJAVA}" = "" ]
then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
fi
if [ "${TESTSRC}" = "" ]
then
- TESTSRC="."
+ TESTSRC="."
fi
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
FILESEP="/"
- PATHSEP=":"
- ;;
+ PATHSEP=":"
+ ;;
CYGWIN* )
FILESEP="/"
- PATHSEP=";"
- ;;
+ PATHSEP=";"
+ ;;
Windows* )
FILESEP="\\"
- PATHSEP=";"
- ;;
+ PATHSEP=";"
+ ;;
esac
set -ex
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
index 6996ca0..cc20b42 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/CookieHttpsClientTest.java
@@ -26,6 +26,11 @@
* @bug 7129083
* @summary Cookiemanager does not store cookies if url is read
* before setting cookiemanager
+ *
+ * SunJSSE does not support dynamic system properties, no way to re-use
+ * system properties in samevm/agentvm mode.
+ *
+ * @run main/othervm CookieHttpsClientTest
*/
import java.net.CookieHandler;
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
index 8853bfa..69bdc6c 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
index 701cd03..c7c9882 100644
--- a/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
+++ b/jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh b/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
index ade1777..35bb1e7 100644
--- a/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
+++ b/jdk/test/sun/security/tools/jarsigner/AlgOptions.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
@@ -84,7 +84,7 @@ RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 1 failed"
failed=1
-else
+else
echo "test 1 passed"
fi
@@ -98,11 +98,11 @@ RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 2 failed"
failed=1
-else
+else
echo "test 2 passed"
fi
-# test BOGUS signature algorithm
+# test BOGUS signature algorithm
${TESTJAVA}${FS}bin${FS}jarsigner \
-keystore ${TESTSRC}${FS}JarSigning.keystore \
-storepass bbbbbb \
@@ -112,11 +112,11 @@ RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 3 failed"
failed=1
-else
+else
echo "test 3 passed"
fi
-# test BOGUS digest algorithm
+# test BOGUS digest algorithm
${TESTJAVA}${FS}bin${FS}jarsigner \
-keystore ${TESTSRC}${FS}JarSigning.keystore \
-storepass bbbbbb \
@@ -126,11 +126,11 @@ RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 4 failed"
failed=1
-else
+else
echo "test 4 passed"
fi
-# test incompatible signature algorithm
+# test incompatible signature algorithm
${TESTJAVA}${FS}bin${FS}jarsigner \
-keystore ${TESTSRC}${FS}JarSigning.keystore \
-storepass bbbbbb \
@@ -140,11 +140,11 @@ RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 5 failed"
failed=1
-else
+else
echo "test 5 passed"
fi
-# test compatible signature algorithm
+# test compatible signature algorithm
${TESTJAVA}${FS}bin${FS}jarsigner \
-keystore ${TESTSRC}${FS}JarSigning.keystore \
-storepass bbbbbb \
@@ -153,22 +153,22 @@ ${TESTJAVA}${FS}bin${FS}jarsigner \
RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 6 passed"
-else
+else
echo "test 6 failed"
failed=1
fi
-# verify it
+# verify it
${TESTJAVA}${FS}bin${FS}jarsigner -verify ${TESTCLASSES}${FS}AlgOptionsTmp.jar
RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 7 passed"
-else
+else
echo "test 7 failed"
failed=1
fi
-# test non-default digest algorithm
+# test non-default digest algorithm
${TESTJAVA}${FS}bin${FS}jarsigner \
-keystore ${TESTSRC}${FS}JarSigning.keystore \
-storepass bbbbbb \
@@ -177,17 +177,17 @@ ${TESTJAVA}${FS}bin${FS}jarsigner \
RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 8 passed"
-else
+else
echo "test 8 failed"
failed=1
fi
-# verify it
+# verify it
${TESTJAVA}${FS}bin${FS}jarsigner -verify ${TESTCLASSES}${FS}AlgOptionsTmp.jar
RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 9 passed"
-else
+else
echo "test 9 failed"
failed=1
fi
@@ -202,17 +202,17 @@ ${TESTJAVA}${FS}bin${FS}jarsigner \
RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 10 passed"
-else
+else
echo "test 10 failed"
failed=1
fi
-# verify it
+# verify it
${TESTJAVA}${FS}bin${FS}jarsigner -verify ${TESTCLASSES}${FS}AlgOptionsTmp.jar
RESULT=$?
if [ $RESULT -eq 0 ]; then
echo "test 11 passed"
-else
+else
echo "test 11 failed"
failed=1
fi
diff --git a/jdk/test/sun/security/tools/jarsigner/PercentSign.sh b/jdk/test/sun/security/tools/jarsigner/PercentSign.sh
index 550801a..b299452 100644
--- a/jdk/test/sun/security/tools/jarsigner/PercentSign.sh
+++ b/jdk/test/sun/security/tools/jarsigner/PercentSign.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/jarsigner/diffend.sh b/jdk/test/sun/security/tools/jarsigner/diffend.sh
index 26a228e..0927b2d 100644
--- a/jdk/test/sun/security/tools/jarsigner/diffend.sh
+++ b/jdk/test/sun/security/tools/jarsigner/diffend.sh
@@ -41,7 +41,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/jarsigner/ec.sh b/jdk/test/sun/security/tools/jarsigner/ec.sh
index 7e400c9..fc66bbc 100644
--- a/jdk/test/sun/security/tools/jarsigner/ec.sh
+++ b/jdk/test/sun/security/tools/jarsigner/ec.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -55,7 +55,8 @@ $JAR cvf $JFILE A
$KT -alias a -dname CN=a -keyalg ec -genkey -validity 300 || exit 11
$KT -alias b -dname CN=b -keyalg ec -genkey -validity 300 || exit 12
-$KT -alias c -dname CN=c -keyalg ec -genkey -validity 300 || exit 13
+# Ensure that key length is sufficient for the intended hash (SHA512withECDSA)
+$KT -alias c -dname CN=c -keyalg ec -genkey -validity 300 -keysize 521 || exit 13
$KT -alias x -dname CN=x -keyalg ec -genkey -validity 300 || exit 14
$JARSIGNER -keystore $KS -storepass changeit $JFILE a -debug -strict || exit 21
diff --git a/jdk/test/sun/security/tools/jarsigner/oldsig.sh b/jdk/test/sun/security/tools/jarsigner/oldsig.sh
index 6bab6c9..a6c7464 100644
--- a/jdk/test/sun/security/tools/jarsigner/oldsig.sh
+++ b/jdk/test/sun/security/tools/jarsigner/oldsig.sh
@@ -1,21 +1,21 @@
#
# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
# 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.
@@ -42,7 +42,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
@@ -70,7 +70,7 @@ esac
${CP} ${TESTSRC}${FS}oldsig${FS}A.jar B.jar
${CP} ${TESTSRC}${FS}oldsig${FS}A.class B.class
-${TESTJAVA}${FS}bin${FS}jar uvf B.jar B.class
+${TESTJAVA}${FS}bin${FS}jar uvf B.jar B.class
${TESTJAVA}${FS}bin${FS}jarsigner \
-keystore ${TESTSRC}${FS}JarSigning.keystore \
-storepass bbbbbb \
diff --git a/jdk/test/sun/security/tools/keytool/AltProviderPath.sh b/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
index f18c3fa..05dc50c 100644
--- a/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
+++ b/jdk/test/sun/security/tools/keytool/AltProviderPath.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
@@ -76,7 +76,7 @@ ${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias dummyTestCA \
-storetype "dks" -provider "org.test.dummy.DummyProvider" \
-providerPath ${TESTCLASSES}
-if [ $? -ne 0 ]; then
+if [ $? -ne 0 ]; then
exit 1
fi
@@ -85,7 +85,7 @@ ${TESTJAVA}${FS}bin${FS}keytool -storepasswd -new storepass2 \
-keystore keystoreCA.dks -storetype "dks" -storepass storepass \
-provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
-if [ $? -ne 0 ]; then
+if [ $? -ne 0 ]; then
exit 1
fi
@@ -96,7 +96,7 @@ ${TESTJAVA}${FS}bin${FS}keytool -keypasswd -alias "dummyTestCA" \
-storetype "dks" -storepass storepass2 \
-provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
-if [ $? -ne 0 ]; then
+if [ $? -ne 0 ]; then
exit 1
fi
@@ -106,7 +106,7 @@ ${TESTJAVA}${FS}bin${FS}keytool -v -export -rfc -alias "dummyTestCA" \
-storepass storepass2 -provider "org.test.dummy.DummyProvider" \
-providerPath ${TESTCLASSES}
-if [ $? -ne 0 ]; then
+if [ $? -ne 0 ]; then
exit 1
fi
@@ -115,7 +115,7 @@ ${TESTJAVA}${FS}bin${FS}keytool -v -list -keystore keystoreCA.dks \
-storetype "dks" -storepass storepass2 \
-provider "org.test.dummy.DummyProvider" -providerPath ${TESTCLASSES}
-if [ $? -ne 0 ]; then
+if [ $? -ne 0 ]; then
exit 1
fi
diff --git a/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh b/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
index 77a7303..bc3a868 100644
--- a/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
+++ b/jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh
@@ -23,7 +23,7 @@
# @test
# @bug 6178366
-# @summary confirm that keytool correctly finds (and clones) a private key
+# @summary confirm that keytool correctly finds (and clones) a private key
# when the user is prompted for the key's password.
#
# @run shell CloneKeyAskPassword.sh
@@ -55,6 +55,10 @@ case "$OS" in
PATHSEP=":"
FILESEP="/"
;;
+ Darwin )
+ PATHSEP=":"
+ FILESEP="/"
+ ;;
CYGWIN* )
PATHSEP=";"
FILESEP="/"
@@ -75,11 +79,11 @@ chmod 644 CloneKeyAskPassword.jks
# run the test: attempt to clone the private key
${TESTJAVA}${FILESEP}bin${FILESEP}keytool \
- -keyclone \
- -alias mykey \
- -dest myclone \
- -keystore CloneKeyAskPassword.jks \
- -storepass test123 <<EOF
+ -keyclone \
+ -alias mykey \
+ -dest myclone \
+ -keystore CloneKeyAskPassword.jks \
+ -storepass test123 <<EOF
test456
EOF
diff --git a/jdk/test/sun/security/tools/keytool/NoExtNPE.sh b/jdk/test/sun/security/tools/keytool/NoExtNPE.sh
index bb79c04..f0af822 100644
--- a/jdk/test/sun/security/tools/keytool/NoExtNPE.sh
+++ b/jdk/test/sun/security/tools/keytool/NoExtNPE.sh
@@ -48,6 +48,9 @@ case "$OS" in
Linux )
FILESEP="/"
;;
+ Darwin )
+ FILESEP="/"
+ ;;
CYGWIN* )
FILESEP="/"
;;
@@ -61,8 +64,8 @@ case "$OS" in
esac
${TESTJAVA}${FILESEP}bin${FILESEP}keytool \
- -list -v \
- -keystore ${TESTSRC}${FILESEP}CloneKeyAskPassword.jks \
- -storepass test123
+ -list -v \
+ -keystore ${TESTSRC}${FILESEP}CloneKeyAskPassword.jks \
+ -storepass test123
exit $?
diff --git a/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh b/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
index fc752ba..98e3df4 100644
--- a/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
+++ b/jdk/test/sun/security/tools/keytool/SecretKeyKS.sh
@@ -24,7 +24,7 @@
# @test
# @bug 4694076
# @summary KeyTool throws ArrayIndexOutOfBoundsException for listing
-# SecretKey entries in non-verbose mode.
+# SecretKey entries in non-verbose mode.
# @author Valerie Peng
#
# @run shell SecretKeyKS.sh
@@ -45,7 +45,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/keytool/StandardAlgName.sh b/jdk/test/sun/security/tools/keytool/StandardAlgName.sh
index bea5f9a..b3d1c51 100644
--- a/jdk/test/sun/security/tools/keytool/StandardAlgName.sh
+++ b/jdk/test/sun/security/tools/keytool/StandardAlgName.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
@@ -72,19 +72,19 @@ esac
${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias pkcs12testCA -keyalg "RsA" -keysize 2048 -sigalg "ShA1wItHRSA" -dname "cn=PKCS12 Test CA, ou=Security SQE, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreCA.jceks.data -storepass storepass -storetype jceKS 2>&1 | egrep 'RsA|ShA1wItHRSA'
RESULT=$?
-if [ $RESULT -eq 0 ]; then
+if [ $RESULT -eq 0 ]; then
exit 1
else
#Lead
${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias pkcs12testLead -keyalg "rSA" -keysize 1024 -sigalg "mD5withRSA" -dname "cn=PKCS12 Test Lead, ou=Security SQE, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreLead.jceks.data -storepass storepass -storetype jCeks 2>&1 | egrep 'rSA|mD5withRSA'
RESULT=$?
- if [ $RESULT -eq 0 ]; then
+ if [ $RESULT -eq 0 ]; then
exit 1
else
#End User 1
${TESTJAVA}${FS}bin${FS}keytool -genkey -v -alias pkcs12testEndUser1 -keyalg "RSa" -keysize 1024 -sigalg "sHa1wIThRSA" -dname "cn=PKCS12 Test End User 1, ou=Security SQE, o=JavaSoft, c=US" -validity 3650 -keypass storepass -keystore keystoreEndUser1.jceks.data -storepass storepass -storetype Jceks 2>&1 | egrep 'RSa|sHa1wIThRSA'
RESULT=$?
- if [ $RESULT -eq 0 ]; then
+ if [ $RESULT -eq 0 ]; then
exit 1
else
exit 0
diff --git a/jdk/test/sun/security/tools/keytool/printssl.sh b/jdk/test/sun/security/tools/keytool/printssl.sh
index b91d5fd..b17113a 100644
--- a/jdk/test/sun/security/tools/keytool/printssl.sh
+++ b/jdk/test/sun/security/tools/keytool/printssl.sh
@@ -37,7 +37,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
FS="/"
;;
CYGWIN* )
diff --git a/jdk/test/sun/security/tools/keytool/resource.sh b/jdk/test/sun/security/tools/keytool/resource.sh
index 55de062..b21cf83 100644
--- a/jdk/test/sun/security/tools/keytool/resource.sh
+++ b/jdk/test/sun/security/tools/keytool/resource.sh
@@ -43,7 +43,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
FS="/"
;;
@@ -65,7 +65,7 @@ esac
${TESTJAVA}${FS}bin${FS}keytool > temp_file_40875602475 2> ${NULL}
grep MissingResourceException temp_file_40875602475
-if [ $? -eq 0 ]; then
+if [ $? -eq 0 ]; then
exit 1
fi
diff --git a/jdk/test/sun/security/tools/keytool/standard.sh b/jdk/test/sun/security/tools/keytool/standard.sh
index a3073e2..98e3b03 100644
--- a/jdk/test/sun/security/tools/keytool/standard.sh
+++ b/jdk/test/sun/security/tools/keytool/standard.sh
@@ -44,7 +44,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows_* )
diff --git a/jdk/test/sun/security/tools/policytool/Alias.sh b/jdk/test/sun/security/tools/policytool/Alias.sh
index cbc0a68..ee00695 100644
--- a/jdk/test/sun/security/tools/policytool/Alias.sh
+++ b/jdk/test/sun/security/tools/policytool/Alias.sh
@@ -23,8 +23,8 @@
# @test
# @bug 4449491
-# @summary policytool should allow principal type to be empty
-# (keystore alias substitution)
+# @summary policytool should allow principal type to be empty
+# (keystore alias substitution)
#
# @run applet/manual=done Alias.html
# @run shell Alias.sh
@@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/policytool/ChangeUI.sh b/jdk/test/sun/security/tools/policytool/ChangeUI.sh
index ce1eb0e..b423c23 100644
--- a/jdk/test/sun/security/tools/policytool/ChangeUI.sh
+++ b/jdk/test/sun/security/tools/policytool/ChangeUI.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/policytool/OpenPolicy.sh b/jdk/test/sun/security/tools/policytool/OpenPolicy.sh
index 7a3016d..34952e0 100644
--- a/jdk/test/sun/security/tools/policytool/OpenPolicy.sh
+++ b/jdk/test/sun/security/tools/policytool/OpenPolicy.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/policytool/SaveAs.sh b/jdk/test/sun/security/tools/policytool/SaveAs.sh
index 3271571..fed21e4 100644
--- a/jdk/test/sun/security/tools/policytool/SaveAs.sh
+++ b/jdk/test/sun/security/tools/policytool/SaveAs.sh
@@ -24,7 +24,7 @@
# @test
# @bug 4252583
# @summary policytool throws FileNotFoundException when user tries to
-# save new policy file
+# save new policy file
#
# @run applet/manual=done SaveAs.html
# @run shell SaveAs.sh
@@ -47,7 +47,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh b/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh
index 4e2f229..81cf1f2 100644
--- a/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh
+++ b/jdk/test/sun/security/tools/policytool/UpdatePermissions.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/policytool/UsePolicy.sh b/jdk/test/sun/security/tools/policytool/UsePolicy.sh
index 4b94670..697f8c4 100644
--- a/jdk/test/sun/security/tools/policytool/UsePolicy.sh
+++ b/jdk/test/sun/security/tools/policytool/UsePolicy.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/security/tools/policytool/i18n.sh b/jdk/test/sun/security/tools/policytool/i18n.sh
index 7b5570f..5a30c02 100644
--- a/jdk/test/sun/security/tools/policytool/i18n.sh
+++ b/jdk/test/sun/security/tools/policytool/i18n.sh
@@ -46,7 +46,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/jdk/test/sun/text/resources/LocaleData b/jdk/test/sun/text/resources/LocaleData
index 039981c..7473dea 100644
--- a/jdk/test/sun/text/resources/LocaleData
+++ b/jdk/test/sun/text/resources/LocaleData
@@ -7019,3 +7019,11 @@ FormatData/bg/DateTimePatterns/4=dd MMMM y, EEEE
FormatData/bg/DateTimePatterns/5=dd MMMM y
FormatData/bg/DateTimePatterns/6=dd.MM.yyyy
FormatData/bg/DateTimePatterns/7=dd.MM.yy
+
+# bug 7085757
+CurrencyNames//SSP=SSP
+CurrencyNames//ssp=South Sudanese Pound
+CurrencyNames//xsu=Sucre
+CurrencyNames//xua=ADB Unit of Account
+LocaleNames//SS=South Sudan
+LocaleNames/en/SS=South Sudan
\ No newline at end of file
diff --git a/jdk/test/sun/text/resources/LocaleDataTest.java b/jdk/test/sun/text/resources/LocaleDataTest.java
index 4f78d16..b78d0d6 100644
--- a/jdk/test/sun/text/resources/LocaleDataTest.java
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,7 +34,7 @@
* 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611
* 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
* 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
- * 7003124
+ * 7003124 7085757
* @summary Verify locale data
*
*/
diff --git a/jdk/test/sun/tools/common/CommonSetup.sh b/jdk/test/sun/tools/common/CommonSetup.sh
index 7853663..7d37dbe 100644
--- a/jdk/test/sun/tools/common/CommonSetup.sh
+++ b/jdk/test/sun/tools/common/CommonSetup.sh
@@ -47,6 +47,7 @@
# isLinux - true if OS is Linux
# isSolaris - true if OS is Solaris
# isWindows - true if OS is Windows
+# isMacos - true if OS is Macos X
if [ -z "${TESTJAVA}" ]; then
@@ -81,6 +82,7 @@ isLinux=false
isSolaris=false
isUnknownOS=false
isWindows=false
+isMacos=false
OS=`uname -s`
@@ -103,6 +105,10 @@ case "$OS" in
OS="Linux"
isLinux=true
;;
+ Darwin )
+ OS="Mac OS X"
+ isMacos=true
+ ;;
SunOS )
OS="Solaris"
isSolaris=true
diff --git a/jdk/test/sun/tools/jcmd/jcmd-Defaults.sh b/jdk/test/sun/tools/jcmd/jcmd-Defaults.sh
index 277c854..cf79135 100644
--- a/jdk/test/sun/tools/jcmd/jcmd-Defaults.sh
+++ b/jdk/test/sun/tools/jcmd/jcmd-Defaults.sh
@@ -28,6 +28,6 @@
JCMD="${TESTJAVA}/bin/jcmd"
-${JCMD} 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
+${JCMD} -J-XX:+UsePerfData 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
-${JCMD} -l 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
+${JCMD} -J-XX:+UsePerfData -l 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
diff --git a/jdk/test/sun/tools/jcmd/jcmd-f.sh b/jdk/test/sun/tools/jcmd/jcmd-f.sh
index acbe0b3..5cbd1b9 100644
--- a/jdk/test/sun/tools/jcmd/jcmd-f.sh
+++ b/jdk/test/sun/tools/jcmd/jcmd-f.sh
@@ -46,7 +46,7 @@ failed=0
# -f <script>
rm -f jcmd.out 2>/dev/null
-${JCMD} $appJavaPid -f ${TESTSRC}/dcmd-script.txt | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData $appJavaPid -f ${TESTSRC}/dcmd-script.txt | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
echo jcmd.out
diff -w jcmd.out ${TESTSRC}/help_help.out
if [ $? != 0 ]; then
diff --git a/jdk/test/sun/tools/jcmd/jcmd-help-help.sh b/jdk/test/sun/tools/jcmd/jcmd-help-help.sh
index b303827..b9545ff 100644
--- a/jdk/test/sun/tools/jcmd/jcmd-help-help.sh
+++ b/jdk/test/sun/tools/jcmd/jcmd-help-help.sh
@@ -46,7 +46,7 @@ failed=0
# help help
rm -f jcmd.out 2>/dev/null
-${JCMD} $appJavaPid help help | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData $appJavaPid help help | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
echo jcmd.out
diff -w jcmd.out ${TESTSRC}/help_help.out
if [ $? != 0 ]; then
diff --git a/jdk/test/sun/tools/jcmd/jcmd-help.sh b/jdk/test/sun/tools/jcmd/jcmd-help.sh
index 32fa226..e822a41 100644
--- a/jdk/test/sun/tools/jcmd/jcmd-help.sh
+++ b/jdk/test/sun/tools/jcmd/jcmd-help.sh
@@ -29,7 +29,7 @@
JCMD="${TESTJAVA}/bin/jcmd"
rm -f jcmd.out 2>/dev/null
-${JCMD} -h > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData -h > jcmd.out 2>&1
diff -w jcmd.out ${TESTSRC}/usage.out
if [ $? != 0 ]
@@ -40,7 +40,7 @@ then
fi
rm -f jcmd.out 2>/dev/null
-${JCMD} -help > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData -help > jcmd.out 2>&1
diff -w jcmd.out ${TESTSRC}/usage.out
if [ $? != 0 ]
diff --git a/jdk/test/sun/tools/jcmd/jcmd-pid.sh b/jdk/test/sun/tools/jcmd/jcmd-pid.sh
index 7cd4548..eda230a 100644
--- a/jdk/test/sun/tools/jcmd/jcmd-pid.sh
+++ b/jdk/test/sun/tools/jcmd/jcmd-pid.sh
@@ -45,11 +45,11 @@ set +e
failed=0
# help command
-${JCMD} $appJavaPid help 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output1.awk
+${JCMD} -J-XX:+UsePerfData $appJavaPid help 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output1.awk
if [ $? != 0 ]; then failed=1; fi
# PerfCounter.list option
-${JCMD} $appJavaPid PerfCounter.print 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output2.awk
+${JCMD} -J-XX:+UsePerfData $appJavaPid PerfCounter.print 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output2.awk
if [ $? != 0 ]; then failed=1; fi
set -e
diff --git a/jdk/test/sun/tools/jcmd/jcmd_Output1.awk b/jdk/test/sun/tools/jcmd/jcmd_Output1.awk
index afa5dd4..92bc9db 100644
--- a/jdk/test/sun/tools/jcmd/jcmd_Output1.awk
+++ b/jdk/test/sun/tools/jcmd/jcmd_Output1.awk
@@ -1,26 +1,31 @@
#
BEGIN {
- totallines=0; matched=0
+ totallines=0; matched=0; current=0
}
# match on a main class name followed by arbitrary arguments
/^[0-9]+ [a-z|A-Z][a-z|A-Z|0-9|\.]*($| .*$)/ {
- matched++;
+ current=1;
}
# or match on a path name to a jar file followed by arbitraty arguments
# - note, jar files ending with ".jar" is only a convention, not a requirement.
#Theoretically, any valid file name could occur here.
/^[0-9]+ .*\.jar($| .*$)/ {
- matched++;
+ current=1;
}
# or match on the condition that the class name is not available
/^[0-9]+ -- process information unavailable$/ {
- matched++;
+ current=1;
}
- { totallines++; print $0 }
+# or match an empty class name
+/^[0-9]+ $/ {
+ current=1;
+ }
+
+ { totallines++; matched+=current; current=0; print $0 }
END {
if ((totallines > 0) && (matched == totallines)) {
diff --git a/jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh b/jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh
index d56e4a0..414d02b 100644
--- a/jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh
+++ b/jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh
@@ -32,7 +32,7 @@ status=1
#Call this from anywhere to fail the test with an error message
# usage: fail "reason why the test failed"
-fail()
+fail()
{ echo "The test failed :-("
echo "$*" 1>&2
echo "exit status was $status"
@@ -41,7 +41,7 @@ fail()
#Call this from anywhere to pass the test with a message
# usage: pass "reason why the test passed if applicable"
-pass()
+pass()
{ echo "The test passed!!!"
echo "$*" 1>&2
exit 0
@@ -53,7 +53,7 @@ pass()
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PATHSEP=":"
;;
@@ -80,7 +80,7 @@ if [ -z "${TESTJAVA}" ] ; then
if [ -n "$1" ] ; then
TESTJAVA=$1
else
- TESTJAVA=$JAVA_HOME
+ TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
diff --git a/jdk/test/sun/tools/jinfo/Basic.sh b/jdk/test/sun/tools/jinfo/Basic.sh
index 432dd62..02ef9be 100644
--- a/jdk/test/sun/tools/jinfo/Basic.sh
+++ b/jdk/test/sun/tools/jinfo/Basic.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-
#
# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,6 +45,10 @@ failed=0
runSA=true
+if [ $isMacos = true ]; then
+ runSA=false
+fi
+
if [ $isLinux = true ]; then
# Some Linux systems disable non-child ptrace (see 7050524)
ptrace_scope=`/sbin/sysctl -n kernel.yama.ptrace_scope`
diff --git a/jdk/test/sun/tools/jps/jps-l_Output1.awk b/jdk/test/sun/tools/jps/jps-l_Output1.awk
index c2afb04..ed90256 100644
--- a/jdk/test/sun/tools/jps/jps-l_Output1.awk
+++ b/jdk/test/sun/tools/jps/jps-l_Output1.awk
@@ -20,6 +20,11 @@ BEGIN {
matched++;
}
+# or match an empty class name
+/^[0-9]+ $/ {
+ matched++;
+ }
+
{ totallines++; print $0 }
END {
diff --git a/jdk/test/sun/tools/jps/jps_Output1.awk b/jdk/test/sun/tools/jps/jps_Output1.awk
index ee94b90..270889e 100644
--- a/jdk/test/sun/tools/jps/jps_Output1.awk
+++ b/jdk/test/sun/tools/jps/jps_Output1.awk
@@ -20,6 +20,11 @@ BEGIN {
matched++;
}
+# or match an empty class name
+/^[0-9]+ $/ {
+ matched++;
+ }
+
{ totallines++; print $0 }
END {
diff --git a/jdk/test/sun/tools/jrunscript/common.sh b/jdk/test/sun/tools/jrunscript/common.sh
index 2b5bfd6..8fd6df5 100644
--- a/jdk/test/sun/tools/jrunscript/common.sh
+++ b/jdk/test/sun/tools/jrunscript/common.sh
@@ -63,4 +63,8 @@ setup() {
JRUNSCRIPT="${TESTJAVA}/bin/jrunscript"
JAVAC="${TESTJAVA}/bin/javac"
JAVA="${TESTJAVA}/bin/java"
+ # needed to get full headless behavior on Mac
+ if [ "$OS" = "Darwin" ]; then
+ export AWT_TOOLKIT=XToolkit
+ fi
}
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh
index 96274e7..68928de 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-argsTest.sh
@@ -41,7 +41,7 @@ fi
# we check whether "excess" args are passed as script arguments
-${JRUNSCRIPT} -f - hello world <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true -f - hello world <<EOF
if (typeof(arguments) == 'undefined') { println("arguments expected"); exit(1); }
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh
index 7291c87..625c6d4 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-eTest.sh
@@ -40,7 +40,7 @@ if [ $? -eq 2 ]; then
fi
rm -f jrunscript-eTest.out 2>/dev/null
-${JRUNSCRIPT} -e "println('hello')" > jrunscript-eTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -e "println('hello')" > jrunscript-eTest.out 2>&1
$golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
if [ $? != 0 ]
@@ -53,7 +53,7 @@ fi
# -e option with JavaScript explicitly choosen as language
rm -f jrunscript-eTest.out 2>/dev/null
-${JRUNSCRIPT} -l js -e "println('hello')" > jrunscript-eTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l js -e "println('hello')" > jrunscript-eTest.out 2>&1
$golden_diff jrunscript-eTest.out ${TESTSRC}/dash-e.out
if [ $? != 0 ]
diff --git a/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh b/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh
index fd2feec..a50d983 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscript-fTest.sh
@@ -40,7 +40,7 @@ if [ $? -eq 2 ]; then
fi
rm -f jrunscript-fTest.out 2>/dev/null
-${JRUNSCRIPT} -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
$golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
if [ $? != 0 ]
@@ -54,7 +54,7 @@ fi
# with -l option
rm -f jrunscript-fTest.out 2>/dev/null
-${JRUNSCRIPT} -l js -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l js -f ${TESTSRC}/hello.js > jrunscript-fTest.out 2>&1
$golden_diff jrunscript-fTest.out ${TESTSRC}/dash-f.out
if [ $? != 0 ]
diff --git a/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh b/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
index a07415b..2d1916a 100644
--- a/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
+++ b/jdk/test/sun/tools/jrunscript/jrunscriptTest.sh
@@ -40,7 +40,7 @@ if [ $? -eq 2 ]; then
fi
rm -f jrunscriptTest.out 2>/dev/null
-${JRUNSCRIPT} > jrunscriptTest.out 2>&1 <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true > jrunscriptTest.out 2>&1 <<EOF
v = 2 + 5;
v *= 5;
v = v + " is the value";
@@ -58,7 +58,7 @@ then
fi
rm -f jrunscriptTest.out 2>/dev/null
-${JRUNSCRIPT} -l js > jrunscriptTest.out 2>&1 <<EOF
+${JRUNSCRIPT} -J-Djava.awt.headless=true -l js > jrunscriptTest.out 2>&1 <<EOF
v = 2 + 5;
v *= 5;
v = v + " is the value";
diff --git a/jdk/test/sun/tools/jstat/jstatClassOutput1.sh b/jdk/test/sun/tools/jstat/jstatClassOutput1.sh
index 798a6f7..fee5b0b 100644
--- a/jdk/test/sun/tools/jstat/jstatClassOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatClassOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -class 0 2>&1 | awk -f ${TESTSRC}/classOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -class 0 2>&1 | awk -f ${TESTSRC}/classOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatClassloadOutput1.sh b/jdk/test/sun/tools/jstat/jstatClassloadOutput1.sh
index 78f483c..7fc3cf1 100644
--- a/jdk/test/sun/tools/jstat/jstatClassloadOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatClassloadOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -classload -J-Djstat.showUnsupported=true 0 2>&1 | awk -f ${TESTSRC}/classloadOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -classload -J-Djstat.showUnsupported=true 0 2>&1 | awk -f ${TESTSRC}/classloadOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatCompilerOutput1.sh b/jdk/test/sun/tools/jstat/jstatCompilerOutput1.sh
index 61cf3a6..c309bd2 100644
--- a/jdk/test/sun/tools/jstat/jstatCompilerOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatCompilerOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -compiler 0 2>&1 | awk -f ${TESTSRC}/compilerOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -compiler 0 2>&1 | awk -f ${TESTSRC}/compilerOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatFileURITest1.sh b/jdk/test/sun/tools/jstat/jstatFileURITest1.sh
index 3687adb..94fad57 100644
--- a/jdk/test/sun/tools/jstat/jstatFileURITest1.sh
+++ b/jdk/test/sun/tools/jstat/jstatFileURITest1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -40,12 +40,12 @@ Windows*)
# characters into forward slash characters in an effort to convert
# TESTSRC into a canonical form useable as URI path.
cp ${TESTSRC}/hsperfdata_3433 .
- ${JSTAT} -J-XX:+UsePerfData -gcutil file:/`pwd`/hsperfdata_3433 2>&1 | awk -f ${TESTSRC}/fileURITest1.awk
+ ${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil file:/`pwd`/hsperfdata_3433 2>&1 | awk -f ${TESTSRC}/fileURITest1.awk
RC=$?
rm -f hsperfdata_3433 2>&1 > /dev/null
;;
*)
- ${JSTAT} -J-XX:+UsePerfData -gcutil file:${TESTSRC}/hsperfdata_3433 2>&1 | awk -f ${TESTSRC}/fileURITest1.awk
+ ${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil file:${TESTSRC}/hsperfdata_3433 2>&1 | awk -f ${TESTSRC}/fileURITest1.awk
RC=$?
;;
esac
diff --git a/jdk/test/sun/tools/jstat/jstatGcCapacityOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcCapacityOutput1.sh
index bc8b10a..9120949 100644
--- a/jdk/test/sun/tools/jstat/jstatGcCapacityOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcCapacityOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gccapacity 0 2>&1 | awk -f ${TESTSRC}/gcCapacityOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gccapacity 0 2>&1 | awk -f ${TESTSRC}/gcCapacityOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatGcCauseOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcCauseOutput1.sh
index e0c0211..8f5b747 100644
--- a/jdk/test/sun/tools/jstat/jstatGcCauseOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcCauseOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -37,4 +37,4 @@ JSTAT="${TESTJAVA}/bin/jstat"
# class machine, ergonomics will automatically use UseParallelGC.
# The UseParallelGC collector does not currently update the gc cause counters.
-${JSTAT} -J-XX:+UsePerfData -J-XX:+UseSerialGC -gccause 0 2>&1 | awk -f ${TESTSRC}/gcCauseOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -J-XX:+UseSerialGC -gccause 0 2>&1 | awk -f ${TESTSRC}/gcCauseOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh
index 59ffd97..e9a58b4 100644
--- a/jdk/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcNewCapacityOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcnewcapacity 0 2>&1 | awk -f ${TESTSRC}/gcNewCapacityOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcnewcapacity 0 2>&1 | awk -f ${TESTSRC}/gcNewCapacityOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatGcNewOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcNewOutput1.sh
index 50aef07..c041490 100644
--- a/jdk/test/sun/tools/jstat/jstatGcNewOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcNewOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcnew 0 2>&1 | awk -f ${TESTSRC}/gcNewOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcnew 0 2>&1 | awk -f ${TESTSRC}/gcNewOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh
index b77737b..d130a1e 100644
--- a/jdk/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcOldCapacityOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcoldcapacity 0 2>&1 | awk -f ${TESTSRC}/gcOldCapacityOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcoldcapacity 0 2>&1 | awk -f ${TESTSRC}/gcOldCapacityOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatGcOldOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcOldOutput1.sh
index 68019be..6dde8f7 100644
--- a/jdk/test/sun/tools/jstat/jstatGcOldOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcOldOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcold 0 2>&1 | awk -f ${TESTSRC}/gcOldOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcold 0 2>&1 | awk -f ${TESTSRC}/gcOldOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatGcOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcOutput1.sh
index 7b338bc..3acdceb 100644
--- a/jdk/test/sun/tools/jstat/jstatGcOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gc 0 2>&1 | awk -f ${TESTSRC}/gcOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gc 0 2>&1 | awk -f ${TESTSRC}/gcOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh b/jdk/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh
index 3f4f55a..04754fe 100644
--- a/jdk/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatGcPermCapacityOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcpermcapacity 0 2>&1 | awk -f ${TESTSRC}/gcPermCapacityOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcpermcapacity 0 2>&1 | awk -f ${TESTSRC}/gcPermCapacityOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts1.sh b/jdk/test/sun/tools/jstat/jstatLineCounts1.sh
index 59c4d5d..f9111ad 100644
--- a/jdk/test/sun/tools/jstat/jstatLineCounts1.sh
+++ b/jdk/test/sun/tools/jstat/jstatLineCounts1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcutil 0 250 5 2>&1 | awk -f ${TESTSRC}/lineCounts1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil 0 250 5 2>&1 | awk -f ${TESTSRC}/lineCounts1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts2.sh b/jdk/test/sun/tools/jstat/jstatLineCounts2.sh
index 0c8b043..d4577d2 100644
--- a/jdk/test/sun/tools/jstat/jstatLineCounts2.sh
+++ b/jdk/test/sun/tools/jstat/jstatLineCounts2.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcutil 0 2>&1 | awk -f ${TESTSRC}/lineCounts2.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil 0 2>&1 | awk -f ${TESTSRC}/lineCounts2.awk
diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts3.sh b/jdk/test/sun/tools/jstat/jstatLineCounts3.sh
index b31139c..7bdd69a 100644
--- a/jdk/test/sun/tools/jstat/jstatLineCounts3.sh
+++ b/jdk/test/sun/tools/jstat/jstatLineCounts3.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcutil -h 10 0 250 10 2>&1 | awk -f ${TESTSRC}/lineCounts3.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil -h 10 0 250 10 2>&1 | awk -f ${TESTSRC}/lineCounts3.awk
diff --git a/jdk/test/sun/tools/jstat/jstatLineCounts4.sh b/jdk/test/sun/tools/jstat/jstatLineCounts4.sh
index 772ccaa..4226abd 100644
--- a/jdk/test/sun/tools/jstat/jstatLineCounts4.sh
+++ b/jdk/test/sun/tools/jstat/jstatLineCounts4.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcutil -h 10 0 250 11 2>&1 | awk -f ${TESTSRC}/lineCounts4.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil -h 10 0 250 11 2>&1 | awk -f ${TESTSRC}/lineCounts4.awk
diff --git a/jdk/test/sun/tools/jstat/jstatOptions1.sh b/jdk/test/sun/tools/jstat/jstatOptions1.sh
index c318998..fa85af3 100644
--- a/jdk/test/sun/tools/jstat/jstatOptions1.sh
+++ b/jdk/test/sun/tools/jstat/jstatOptions1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,8 +33,8 @@ setup
JSTAT="${TESTJAVA}/bin/jstat"
rm -f jstat.out1 jstat.out2 2>/dev/null
-${JSTAT} -J-XX:+UsePerfData -options > jstat.out1 2>&1
-${JSTAT} -J-XX:+UsePerfData -options -J-Djstat.showUnsupported=true > jstat.out2 2>&1
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -options > jstat.out1 2>&1
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -options -J-Djstat.showUnsupported=true > jstat.out2 2>&1
diff -w jstat.out1 ${TESTSRC}/options1.out
diff -w jstat.out2 ${TESTSRC}/options2.out
diff --git a/jdk/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh b/jdk/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh
index 2b763f6..29178fe 100644
--- a/jdk/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh
+++ b/jdk/test/sun/tools/jstat/jstatPrintCompilationOutput1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -35,4 +35,4 @@ JSTAT="${TESTJAVA}/bin/jstat"
# run with -Xcomp as jstat may complete too quickly to assure
# that compilation occurs.
-${JSTAT} -J-XX:+UsePerfData -J-Xcomp -printcompilation 0 2>&1 | awk -f ${TESTSRC}/printCompilationOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -J-Xcomp -printcompilation 0 2>&1 | awk -f ${TESTSRC}/printCompilationOutput1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatSnap1.sh b/jdk/test/sun/tools/jstat/jstatSnap1.sh
index c35abd4..0543248 100644
--- a/jdk/test/sun/tools/jstat/jstatSnap1.sh
+++ b/jdk/test/sun/tools/jstat/jstatSnap1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -snap 0 2>&1 | awk -f ${TESTSRC}/snap1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -snap 0 2>&1 | awk -f ${TESTSRC}/snap1.awk
diff --git a/jdk/test/sun/tools/jstat/jstatSnap2.sh b/jdk/test/sun/tools/jstat/jstatSnap2.sh
index 960bb2d..7233e8c 100644
--- a/jdk/test/sun/tools/jstat/jstatSnap2.sh
+++ b/jdk/test/sun/tools/jstat/jstatSnap2.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -J-Djstat.showUnsupported=true -snap 0 2>&1 | awk -f ${TESTSRC}/snap2.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -J-Djstat.showUnsupported=true -snap 0 2>&1 | awk -f ${TESTSRC}/snap2.awk
diff --git a/jdk/test/sun/tools/jstat/jstatTimeStamp1.sh b/jdk/test/sun/tools/jstat/jstatTimeStamp1.sh
index fce4113..7a69369 100644
--- a/jdk/test/sun/tools/jstat/jstatTimeStamp1.sh
+++ b/jdk/test/sun/tools/jstat/jstatTimeStamp1.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -33,4 +33,4 @@ verify_os
JSTAT="${TESTJAVA}/bin/jstat"
-${JSTAT} -J-XX:+UsePerfData -gcutil -t 0 2>&1 | awk -f ${TESTSRC}/timeStamp1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil -t 0 2>&1 | awk -f ${TESTSRC}/timeStamp1.awk
diff --git a/jdk/test/sun/tools/jstatd/jpsOutput1.awk b/jdk/test/sun/tools/jstatd/jpsOutput1.awk
index eaf133a..289d340 100644
--- a/jdk/test/sun/tools/jstatd/jpsOutput1.awk
+++ b/jdk/test/sun/tools/jstatd/jpsOutput1.awk
@@ -11,6 +11,10 @@ BEGIN {
matched++;
}
+/^[0-9]+ $/ {
+ matched++;
+ }
+
{ totallines++; print $0 }
END {
diff --git a/jdk/test/sun/tools/jstatd/jstatdDefaults.sh b/jdk/test/sun/tools/jstatd/jstatdDefaults.sh
index 61d56e3..02b12cb 100644
--- a/jdk/test/sun/tools/jstatd/jstatdDefaults.sh
+++ b/jdk/test/sun/tools/jstatd/jstatdDefaults.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# 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,7 +60,7 @@ then
exit 1
fi
-${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_PID}@${HOSTNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_PID}@${HOSTNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
RC=$?
if [ ${RC} -ne 0 ]
diff --git a/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh b/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh
index c4d09b5..1773bda 100644
--- a/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh
+++ b/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -73,7 +73,7 @@ then
exit 1
fi
-${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
RC=$?
if [ ${RC} -ne 0 ]
diff --git a/jdk/test/sun/tools/jstatd/jstatdPort.sh b/jdk/test/sun/tools/jstatd/jstatdPort.sh
index 42c9349..0780ae7 100644
--- a/jdk/test/sun/tools/jstatd/jstatdPort.sh
+++ b/jdk/test/sun/tools/jstatd/jstatdPort.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -65,7 +65,7 @@ then
exit 1
fi
-${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_PID}@${HOSTNAME}:${PORT} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
RC=$?
if [ ${RC} -ne 0 ]
diff --git a/jdk/test/sun/tools/jstatd/jstatdServerName.sh b/jdk/test/sun/tools/jstatd/jstatdServerName.sh
index 108826f..50753d6 100644
--- a/jdk/test/sun/tools/jstatd/jstatdServerName.sh
+++ b/jdk/test/sun/tools/jstatd/jstatdServerName.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -86,8 +86,8 @@ then
exit 1
fi
-echo "running: ${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5"
-${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
+echo "running: ${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5"
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_1} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
RC=$?
if [ ${RC} -ne 0 ]
@@ -95,8 +95,8 @@ then
echo "jstat output differs from expected output"
fi
-echo "running: ${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5"
-${JSTAT} -J-XX:+UsePerfData -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
+echo "running: ${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5"
+${JSTAT} -J-XX:+UsePerfData -J-Duser.language=en -gcutil ${JSTATD_1_PID}@${HOSTNAME}:${PORT_2}/${SERVERNAME} 250 5 2>&1 | awk -f ${TESTSRC}/jstatGcutilOutput1.awk
RC=$?
if [ ${RC} -ne 0 ]
diff --git a/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh b/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
index 2e2a666..527de19 100644
--- a/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
+++ b/jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh
@@ -28,14 +28,14 @@
#
# @run shell ImmutableResourceTest.sh
#
-#
+#
# Beginning of subroutines:
status=1
#Call this from anywhere to fail the test with an error message
# usage: fail "reason why the test failed"
-fail()
+fail()
{ echo "The test failed :-("
echo "$*" 1>&2
echo "exit status was $status"
@@ -44,7 +44,7 @@ fail()
#Call this from anywhere to pass the test with a message
# usage: pass "reason why the test passed if applicable"
-pass()
+pass()
{ echo "The test passed!!!"
echo "$*" 1>&2
exit 0
@@ -56,7 +56,7 @@ pass()
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PATHSEP=":"
;;
@@ -83,7 +83,7 @@ if [ -z "${TESTJAVA}" ] ; then
if [ -n "$1" ] ; then
TESTJAVA=$1
else
- TESTJAVA=$JAVA_HOME
+ TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
diff --git a/jdk/test/tools/launcher/Arrrghs.java b/jdk/test/tools/launcher/Arrrghs.java
index f505b7e..6306e2c 100644
--- a/jdk/test/tools/launcher/Arrrghs.java
+++ b/jdk/test/tools/launcher/Arrrghs.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,9 +24,9 @@
/**
* @test
* @bug 5030233 6214916 6356475 6571029 6684582 6742159 4459600 6758881 6753938
- * 6894719 6968053 7067922
+ * 6894719 6968053
* @summary Argument parsing validation.
- * @compile -XDignore.symbol.file Arrrghs.java TestHelper.java
+ * @compile -XDignore.symbol.file Arrrghs.java
* @run main Arrrghs
*/
@@ -38,7 +38,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Map;
-public class Arrrghs {
+public class Arrrghs extends TestHelper {
private Arrrghs(){}
/**
* This class provides various tests for arguments processing.
@@ -62,7 +62,7 @@ public class Arrrghs {
* SIGH, On Windows all strings are quoted, we need to unwrap it
*/
private static String removeExtraQuotes(String in) {
- if (TestHelper.isWindows) {
+ if (isWindows) {
// Trim the string and remove the enclosed quotes if any.
in = in.trim();
if (in.startsWith("\"") && in.endsWith("\"")) {
@@ -82,7 +82,7 @@ public class Arrrghs {
String in = rd.readLine();
while (in != null) {
- if (TestHelper.debug) System.out.println(in);
+ if (debug) System.out.println(in);
if (in.startsWith(Cookie)) {
String detectedArgument = removeExtraQuotes(in.substring(Cookie.length()));
if (expectedArguments.equals(detectedArgument)) {
@@ -94,7 +94,7 @@ public class Arrrghs {
detectedArgument + "'");
}
// Return the value asap if not in debug mode.
- if (!TestHelper.debug) {
+ if (!debug) {
rd.close();
istream.close();
return retval;
@@ -125,7 +125,7 @@ public class Arrrghs {
* Quoting could cause dissimilar testArguments and expected arguments.
*/
static int doTest(String testArguments, String expectedPattern) {
- ProcessBuilder pb = new ProcessBuilder(TestHelper.javaCmd,
+ ProcessBuilder pb = new ProcessBuilder(javaCmd,
VersionStr, testArguments);
Map<String, String> env = pb.environment();
@@ -146,8 +146,7 @@ public class Arrrghs {
* These tests require that a JVM (any JVM) be installed in the system registry.
* If none is installed, skip this test.
*/
- TestHelper.TestResult tr =
- TestHelper.doExec(TestHelper.javaCmd, VersionStr, "-version");
+ TestResult tr = doExec(javaCmd, VersionStr, "-version");
if (!tr.isOK()) {
System.err.println("Warning:Argument Passing Tests were skipped, " +
"no java found in system registry.");
@@ -155,38 +154,38 @@ public class Arrrghs {
}
// Basic test
- TestHelper.testExitValue += doTest("-a -b -c -d");
+ testExitValue += doTest("-a -b -c -d");
// Basic test with many spaces
- TestHelper.testExitValue += doTest("-a -b -c -d");
+ testExitValue += doTest("-a -b -c -d");
// Quoted whitespace does matter ?
- TestHelper.testExitValue += doTest("-a \"\"-b -c\"\" -d");
+ testExitValue += doTest("-a \"\"-b -c\"\" -d");
// Escaped quotes outside of quotes as literals
- TestHelper.testExitValue += doTest("-a \\\"-b -c\\\" -d");
+ testExitValue += doTest("-a \\\"-b -c\\\" -d");
// Check for escaped quotes inside of quotes as literal
- TestHelper.testExitValue += doTest("-a \"-b \\\"stuff\\\"\" -c -d");
+ testExitValue += doTest("-a \"-b \\\"stuff\\\"\" -c -d");
// A quote preceeded by an odd number of slashes is a literal quote
- TestHelper.testExitValue += doTest("-a -b\\\\\\\" -c -d");
+ testExitValue += doTest("-a -b\\\\\\\" -c -d");
// A quote preceeded by an even number of slashes is a literal quote
// see 6214916.
- TestHelper.testExitValue += doTest("-a -b\\\\\\\\\" -c -d");
+ testExitValue += doTest("-a -b\\\\\\\\\" -c -d");
// Make sure that whitespace doesn't interfere with the removal of the
// appropriate tokens. (space-tab-space preceeds -jre-restict-search).
- TestHelper.testExitValue += doTest("-a -b \t -jre-restrict-search -c -d","-a -b -c -d");
+ testExitValue += doTest("-a -b \t -jre-restrict-search -c -d","-a -b -c -d");
// Make sure that the mJRE tokens being stripped, aren't stripped if
// they happen to appear as arguments to the main class.
- TestHelper.testExitValue += doTest("foo -version:1.1+");
+ testExitValue += doTest("foo -version:1.1+");
System.out.println("Completed arguments quoting tests with " +
- TestHelper.testExitValue + " errors");
+ testExitValue + " errors");
}
/*
@@ -194,156 +193,167 @@ public class Arrrghs {
*/
static void runBasicErrorMessageTests() {
// Tests for 5030233
- TestHelper.TestResult tr = TestHelper.doExec(TestHelper.javaCmd, "-cp");
+ TestResult tr = doExec(javaCmd, "-cp");
tr.checkNegative();
tr.isNotZeroOutput();
System.out.println(tr);
- tr = TestHelper.doExec(TestHelper.javaCmd, "-classpath");
+ tr = doExec(javaCmd, "-classpath");
tr.checkNegative();
tr.isNotZeroOutput();
System.out.println(tr);
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar");
+ tr = doExec(javaCmd, "-jar");
tr.checkNegative();
tr.isNotZeroOutput();
System.out.println(tr);
- tr = TestHelper.doExec(TestHelper.javacCmd, "-cp");
+ tr = doExec(javacCmd, "-cp");
tr.checkNegative();
tr.isNotZeroOutput();
System.out.println(tr);
// Test for 6356475 "REGRESSION:"java -X" from cmdline fails"
- tr = TestHelper.doExec(TestHelper.javaCmd, "-X");
+ tr = doExec(javaCmd, "-X");
tr.checkPositive();
tr.isNotZeroOutput();
System.out.println(tr);
- tr = TestHelper.doExec(TestHelper.javaCmd, "-help");
+ tr = doExec(javaCmd, "-help");
tr.checkPositive();
tr.isNotZeroOutput();
System.out.println(tr);
// 6753938, test for non-negative exit value for an incorrectly formed
// command line, '% java'
- tr = TestHelper.doExec(TestHelper.javaCmd);
+ tr = doExec(javaCmd);
tr.checkNegative();
tr.isNotZeroOutput();
System.out.println(tr);
// 6753938, test for non-negative exit value for an incorrectly formed
// command line, '% java -Xcomp'
- tr = TestHelper.doExec(TestHelper.javaCmd, "-Xcomp");
+ tr = doExec(javaCmd, "-Xcomp");
tr.checkNegative();
tr.isNotZeroOutput();
System.out.println(tr);
}
/*
- * A set of tests which tests various dispositions of the main method.
+ * Tests various dispositions of the main method, these tests are limited
+ * to English locales as they check for error messages that are localized.
*/
static void runMainMethodTests() throws FileNotFoundException {
- TestHelper.TestResult tr = null;
+ if (!isEnglishLocale()) {
+ return;
+ }
+
+ TestResult tr = null;
// a missing class
- TestHelper.createJar("MIA", new File("some.jar"), new File("Foo"),
+ createJar("MIA", new File("some.jar"), new File("Foo"),
(String[])null);
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr = doExec(javaCmd, "-jar", "some.jar");
tr.contains("Error: Could not find or load main class MIA");
System.out.println(tr);
// use classpath to check
- tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "MIA");
+ tr = doExec(javaCmd, "-cp", "some.jar", "MIA");
tr.contains("Error: Could not find or load main class MIA");
System.out.println(tr);
// incorrect method access
- TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ createJar(new File("some.jar"), new File("Foo"),
"private static void main(String[] args){}");
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr = doExec(javaCmd, "-jar", "some.jar");
tr.contains("Error: Main method not found in class Foo");
System.out.println(tr);
// use classpath to check
- tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr = doExec(javaCmd, "-cp", "some.jar", "Foo");
tr.contains("Error: Main method not found in class Foo");
System.out.println(tr);
// incorrect return type
- TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ createJar(new File("some.jar"), new File("Foo"),
"public static int main(String[] args){return 1;}");
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr = doExec(javaCmd, "-jar", "some.jar");
tr.contains("Error: Main method must return a value of type void in class Foo");
System.out.println(tr);
// use classpath to check
- tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr = doExec(javaCmd, "-cp", "some.jar", "Foo");
tr.contains("Error: Main method must return a value of type void in class Foo");
System.out.println(tr);
// incorrect parameter type
- TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ createJar(new File("some.jar"), new File("Foo"),
"public static void main(Object[] args){}");
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr = doExec(javaCmd, "-jar", "some.jar");
tr.contains("Error: Main method not found in class Foo");
System.out.println(tr);
// use classpath to check
- tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr = doExec(javaCmd, "-cp", "some.jar", "Foo");
tr.contains("Error: Main method not found in class Foo");
System.out.println(tr);
// incorrect method type - non-static
- TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ createJar(new File("some.jar"), new File("Foo"),
"public void main(String[] args){}");
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr = doExec(javaCmd, "-jar", "some.jar");
tr.contains("Error: Main method is not static in class Foo");
System.out.println(tr);
// use classpath to check
- tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr = doExec(javaCmd, "-cp", "some.jar", "Foo");
tr.contains("Error: Main method is not static in class Foo");
System.out.println(tr);
// amongst a potpourri of kindred main methods, is the right one chosen ?
- TestHelper.createJar(new File("some.jar"), new File("Foo"),
+ createJar(new File("some.jar"), new File("Foo"),
"void main(Object[] args){}",
"int main(Float[] args){return 1;}",
"private void main() {}",
"private static void main(int x) {}",
"public int main(int argc, String[] argv) {return 1;}",
"public static void main(String[] args) {System.out.println(\"THE_CHOSEN_ONE\");}");
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr = doExec(javaCmd, "-jar", "some.jar");
tr.contains("THE_CHOSEN_ONE");
System.out.println(tr);
// use classpath to check
- tr = TestHelper.doExec(TestHelper.javaCmd, "-cp", "some.jar", "Foo");
+ tr = doExec(javaCmd, "-cp", "some.jar", "Foo");
tr.contains("THE_CHOSEN_ONE");
System.out.println(tr);
// test for extraneous whitespace in the Main-Class attribute
- TestHelper.createJar(" Foo ", new File("some.jar"), new File("Foo"),
+ createJar(" Foo ", new File("some.jar"), new File("Foo"),
"public static void main(String... args){}");
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "some.jar");
+ tr = doExec(javaCmd, "-jar", "some.jar");
tr.checkPositive();
System.out.println(tr);
}
- // tests 6968053, ie. we turn on the -Xdiag (for now) flag and check if
- // the suppressed stack traces are exposed.
+ /*
+ * tests 6968053, ie. we turn on the -Xdiag (for now) flag and check if
+ * the suppressed stack traces are exposed, ignore these tests for localized
+ * locales, limiting to English only.
+ */
static void runDiagOptionTests() throws FileNotFoundException {
- TestHelper.TestResult tr = null;
+ if (!isEnglishLocale()) { // only english version
+ return;
+ }
+ TestResult tr = null;
// a missing class
- TestHelper.createJar("MIA", new File("some.jar"), new File("Foo"),
+ createJar("MIA", new File("some.jar"), new File("Foo"),
(String[])null);
- tr = TestHelper.doExec(TestHelper.javaCmd, "-Xdiag", "-jar", "some.jar");
+ tr = doExec(javaCmd, "-Xdiag", "-jar", "some.jar");
tr.contains("Error: Could not find or load main class MIA");
tr.contains("java.lang.ClassNotFoundException: MIA");
System.out.println(tr);
// use classpath to check
- tr = TestHelper.doExec(TestHelper.javaCmd, "-Xdiag", "-cp", "some.jar", "MIA");
+ tr = doExec(javaCmd, "-Xdiag", "-cp", "some.jar", "MIA");
tr.contains("Error: Could not find or load main class MIA");
tr.contains("java.lang.ClassNotFoundException: MIA");
System.out.println(tr);
// a missing class on the classpath
- tr = TestHelper.doExec(TestHelper.javaCmd, "-Xdiag", "NonExistentClass");
+ tr = doExec(javaCmd, "-Xdiag", "NonExistentClass");
tr.contains("Error: Could not find or load main class NonExistentClass");
tr.contains("java.lang.ClassNotFoundException: NonExistentClass");
System.out.println(tr);
@@ -351,43 +361,33 @@ public class Arrrghs {
static void test6894719() {
// test both arguments to ensure they exist
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd,
+ TestResult tr = null;
+ tr = doExec(javaCmd,
"-no-jre-restrict-search", "-version");
tr.checkPositive();
System.out.println(tr);
- tr = TestHelper.doExec(TestHelper.javaCmd,
+ tr = doExec(javaCmd,
"-jre-restrict-search", "-version");
tr.checkPositive();
System.out.println(tr);
}
- static void test7067922() {
- // a missing manifest entry 7067922
- TestHelper.TestResult tr = null;
- TestHelper.createJar("cvf", "missingmainentry.jar", ".");
- tr = TestHelper.doExec(TestHelper.javaCmd, "-jar", "missingmainentry.jar");
- tr.contains("no main manifest attribute");
- System.out.println(tr);
- }
-
/**
* @param args the command line arguments
* @throws java.io.FileNotFoundException
*/
public static void main(String[] args) throws FileNotFoundException {
- if (TestHelper.debug) {
+ if (debug) {
System.out.println("Starting Arrrghs tests");
}
quoteParsingTests();
runBasicErrorMessageTests();
runMainMethodTests();
test6894719();
- test7067922();
runDiagOptionTests();
- if (TestHelper.testExitValue > 0) {
- System.out.println("Total of " + TestHelper.testExitValue + " failed");
+ if (testExitValue > 0) {
+ System.out.println("Total of " + testExitValue + " failed");
System.exit(1);
} else {
System.out.println("All tests pass");
diff --git a/jdk/test/tools/launcher/ChangeDataModel.sh b/jdk/test/tools/launcher/ChangeDataModel.sh
deleted file mode 100644
index f065603..0000000
--- a/jdk/test/tools/launcher/ChangeDataModel.sh
+++ /dev/null
@@ -1,260 +0,0 @@
-#
-# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
-# 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 4894330 4810347 6277269
-# @run shell ChangeDataModel.sh
-# @summary Verify -d32 and -d64 options are accepted(rejected) on all platforms
-# @author Joseph D. Darcy
-
-OS=`uname -s`;
-
-# To remove CR from output, needed for java apps in CYGWIN, harmless otherwise
-SED_CR="sed -e s@\\r@@g"
-
-case "$OS" in
- Windows* | CYGWIN* )
- PATHSEP=";"
- ;;
-
- * )
- PATHSEP=":"
- ;;
-esac
-
-# Verify directory context variables are set
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-# Construct paths to default Java executables
-JAVA="$TESTJAVA/bin/java -classpath $TESTCLASSES${PATHSEP}."
-JAVAC="$TESTJAVA/bin/javac"
-
-
-# Create our little Java test on the fly
-( printf "public class GetDataModel {"
- printf " public static void main(String argv[]) {"
- printf " System.out.println(System.getProperty(\"sun.arch.data.model\", \"none\"));"
- printf " }"
- printf "}"
-) > GetDataModel.java
-
-$JAVAC GetDataModel.java
-
-
-# All preconditions are met; run the tests.
-
-
-# Verify data model flag for default data model is accepted
-
-DM=`$JAVA GetDataModel | ${SED_CR}`
-case "$DM" in
- 32 )
- DM2=`${JAVA} -d32 GetDataModel | ${SED_CR}`
- if [ "${DM2}" != "32" ]
- then
- echo "Data model flag -d32 not accepted or had improper effect."
- exit 1
- fi
- ;;
-
- 64 )
- DM2=`${JAVA} -d64 GetDataModel | ${SED_CR}`
- if [ "${DM2}" != "64" ]
- then
- echo "Data model flag -d64 not accepted or had improper effect."
- exit 1
- fi
- ;;
-
- * )
- echo "Unrecognized data model: $DM"
- exit 1
- ;;
-esac
-
-# Determine if platform might be dual-mode capable.
-
-case "$OS" in
- SunOS )
- # ARCH should be sparc or i386
- ARCH=`uname -p`
- case "${ARCH}" in
- sparc )
- DUALMODE=true
- PATH64=sparcv9
- ;;
-
- i386 )
- DUALMODE=true
- PATH64=amd64
- ;;
-
- * )
- DUALMODE=false
- ;;
- esac
- ;;
-
-
- Linux )
- # ARCH should be ia64, x86_64, or i*86
- ARCH=`uname -m`
- case "${ARCH}" in
- ia64 )
- DUALMODE=false
- ;;
-
- x86_64 )
- DUALMODE=true
- PATH64=amd64
- ;;
-
- * )
- DUALMODE=false;
- ;;
- esac
- ;;
-
- Windows* | CYGWIN* )
- ARCH=`uname -m`
- case "${ARCH}" in
- * )
- DUALMODE=false;
- ;;
- esac
- ;;
-
- * )
- echo "Warning: unknown environment."
- DUALMODE=false
- ;;
-esac
-
-if [ "${DUALMODE}" = "true" ]
-then
- # Construct path to 64-bit Java executable, might not exist
- JAVA64FILE="${TESTJAVA}/bin/${PATH64}/java"
- JAVA64="${JAVA64FILE} -classpath ${TESTCLASSES}${PATHSEP}."
-
- if [ -f ${JAVA64FILE} ]; then
- # Verify that, at least on Solaris, only one exec is
- # used to change data models
- if [ "${OS}" = "SunOS" ]
- then
- rm -f truss.out
- truss -texec ${JAVA} -d64 GetDataModel > /dev/null 2> truss.out
- execCount=`grep -c execve truss.out`
- if [ "${execCount}" -gt 2 ]
- then
- echo "Maximum exec count of 2 exceeded: got $execCount."
- exit 1
- fi
-
- rm -f truss.out
- truss -texec ${JAVA64} -d32 GetDataModel > /dev/null 2> truss.out
- execCount=`grep -c execve truss.out`
- if [ "${execCount}" -gt 2 ]
- then
- echo "Maximum exec count of 2 exceeded: got $execCount."
- exit 1
- fi
- fi
-
- DM2=`${JAVA} -d64 GetDataModel`
- if [ "${DM2}" != "64" ]
- then
- echo "Data model flag -d64 not accepted or had improper effect."
- exit 1
- fi
-
- DM2=`${JAVA64} GetDataModel`
- if [ "${DM2}" != "64" ]
- then
- echo "Improper data model returned."
- exit 1
- fi
-
- DM2=`${JAVA64} -d64 GetDataModel`
- if [ "${DM2}" != "64" ]
- then
- echo "Data model flag -d64 not accepted or had improper effect."
- exit 1
- fi
-
- DM2=`${JAVA64} -d32 GetDataModel`
- if [ "${DM2}" != "32" ]
- then
- echo "Data model flag -d32 not accepted or had improper effect."
- exit 1
- fi
-
- else
- echo "Warning: no 64-bit components found; only one data model tested."
- fi
-else
-# Negative tests for non-dual mode platforms to ensure the other data model is
-# rejected
- DM=`$JAVA GetDataModel | ${SED_CR}`
- case "$DM" in
- 32 )
- DM2=`${JAVA} -d64 GetDataModel | ${SED_CR}`
- if [ "x${DM2}" != "x" ]
- then
- echo "Data model flag -d64 was accepted."
- exit 1
- fi
- ;;
-
- 64 )
- DM2=`${JAVA} -d32 GetDataModel | ${SED_CR}`
- if [ "x${DM2}" != "x" ]
- then
- echo "Data model flag -d32 was accepted."
- exit 1
- fi
- ;;
-
- * )
- echo "Unrecognized data model: $DM"
- exit 1
- ;;
- esac
-fi
-
-exit 0;
diff --git a/jdk/test/tools/launcher/CreatePlatformFile.java b/jdk/test/tools/launcher/CreatePlatformFile.java
deleted file mode 100644
index 1658d47..0000000
--- a/jdk/test/tools/launcher/CreatePlatformFile.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- *
- *
- * This class is used by test i18nTest.sh
- *
- * Class to create various i18n Hello World Java source files using
- * the platform's default encoding of a non-ASCII name; create plain
- * ASCII Hello World if the platform's default is charset is US-ASCII.
- */
-
-import java.io.PrintWriter;
-import java.io.FileOutputStream;
-
-public class CreatePlatformFile {
- public static void main(String argv[]) {
- String fileSep = System.getProperty("file.separator");
- String defaultEncoding = System.getProperty("file.encoding");
-
- if(defaultEncoding == null) {
- System.err.println("Default encoding not found; Error.");
- return;
- }
-
- if (defaultEncoding.equals("Cp1252") ) {
- // "HelloWorld" with an accented e
- String fileName = "i18nH\u00e9lloWorld.java";
- try {
- PrintWriter pw = new PrintWriter(new FileOutputStream("."+fileSep+fileName));
- pw.println("public class i18nH\u00e9lloWorld {");
- pw.println(" public static void main(String [] argv) {");
- pw.println(" System.out.println(\"Hello Cp1252 World\");");
- pw.println(" }");
- pw.println("}");
- pw.flush();
- pw.close();
- }
- catch (java.io.FileNotFoundException e) {
- System.err.println("Problem opening file; test fails");
- }
-
- } else {
- // ASCII "HelloWorld"
- String fileName = "i18nHelloWorld.java";
- try {
- PrintWriter pw = new PrintWriter(new FileOutputStream("."+fileSep+fileName));
- pw.println("public class i18nHelloWorld {");
- pw.println(" public static void main(String [] argv) {");
- pw.println(" System.out.println(\"Warning: US-ASCII assumed; filenames with\");");
- pw.println(" System.out.println(\"non-ASCII characters will not be tested\");");
- pw.println(" }");
- pw.println("}");
- pw.flush();
- pw.close();
- }
- catch (java.io.FileNotFoundException e) {
- System.err.println("Problem opening file; test fails");
- }
- }
- }
-}
diff --git a/jdk/test/tools/launcher/DefaultLocaleTestRun.java b/jdk/test/tools/launcher/DefaultLocaleTestRun.java
index d3c0842..c1183e7 100644
--- a/jdk/test/tools/launcher/DefaultLocaleTestRun.java
+++ b/jdk/test/tools/launcher/DefaultLocaleTestRun.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,23 +31,24 @@
Following 2 testing scenarios are recommended
(1)systemLocale=Japanese, userLocale=English
(2)systemLocale=English, userLocale=Japanese
- * @compile -XDignore.symbol.file DefaultLocaleTest.java TestHelper.java
+ * @compile -XDignore.symbol.file DefaultLocaleTest.java
* @run main DefaultLocaleTestRun
*/
-import java.io.File;
-public class DefaultLocaleTestRun {
+public class DefaultLocaleTestRun extends TestHelper {
public static void main(String... args) {
- if (!TestHelper.isWindows) {
+ if (!isWindows) {
System.out.println("Test passes vacuously on non-windows");
return;
}
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "DefaultLocaleTest", "-w",
- "x.out");
+ TestResult tr = null;
+ tr = doExec(javaCmd,
+ "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
+ "DefaultLocaleTest", "-w", "x.out");
System.out.println(tr.testOutput);
- tr = TestHelper.doExec(TestHelper.javawCmd, "DefaultLocaleTest", "-r",
- "x.out");
+ tr = doExec(javawCmd,
+ "-cp", TEST_CLASSES_DIR.getAbsolutePath(),
+ "DefaultLocaleTest", "-r", "x.out");
System.out.println(tr.testOutput);
if (!tr.isOK()) {
throw new RuntimeException("Test failed");
diff --git a/jdk/test/tools/launcher/ExecutionEnvironment.java b/jdk/test/tools/launcher/ExecutionEnvironment.java
index 720df5e..3b8b7eb 100644
--- a/jdk/test/tools/launcher/ExecutionEnvironment.java
+++ b/jdk/test/tools/launcher/ExecutionEnvironment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +25,7 @@
* @test
* @bug 4780570 4731671 6354700 6367077 6670965 4882974
* @summary Checks for LD_LIBRARY_PATH and execution on *nixes
- * @compile -XDignore.symbol.file ExecutionEnvironment.java TestHelper.java
+ * @compile -XDignore.symbol.file ExecutionEnvironment.java
* @run main ExecutionEnvironment
*/
@@ -60,8 +60,10 @@ import java.util.List;
import java.util.Map;
-public class ExecutionEnvironment {
- static final String LD_LIBRARY_PATH = "LD_LIBRARY_PATH";
+public class ExecutionEnvironment extends TestHelper {
+ static final String LD_LIBRARY_PATH = TestHelper.isMacOSX
+ ? "DYLD_LIBRARY_PATH"
+ : "LD_LIBRARY_PATH";
static final String LD_LIBRARY_PATH_32 = LD_LIBRARY_PATH + "_32";
static final String LD_LIBRARY_PATH_64 = LD_LIBRARY_PATH + "_64";
@@ -70,9 +72,6 @@ public class ExecutionEnvironment {
static final String LD_LIBRARY_PATH_32_VALUE = "/Lawrence/Of/Arabia";
static final String LD_LIBRARY_PATH_64_VALUE = "/A/Passage/To/India";
- static final String JLDEBUG_KEY = "_JAVA_LAUNCHER_DEBUG";
- static final String EXPECTED_MARKER = "TRACER_MARKER:About to EXEC";
-
static final String[] LD_PATH_STRINGS = {
LD_LIBRARY_PATH + "=" + LD_LIBRARY_PATH_VALUE,
LD_LIBRARY_PATH_32 + "=" + LD_LIBRARY_PATH_32_VALUE,
@@ -84,11 +83,13 @@ public class ExecutionEnvironment {
static int errors = 0;
static int passes = 0;
- static final String LIBJVM = TestHelper.isWindows ? "jvm.dll" : "libjvm.so";
+ static final String LIBJVM = TestHelper.isWindows
+ ? "jvm.dll"
+ : "libjvm" + (TestHelper.isMacOSX ? ".dylib" : ".so");
static void createTestJar() {
try {
- List<String> codeList = new ArrayList<String>();
+ List<String> codeList = new ArrayList<>();
codeList.add("static void printValue(String name, boolean property) {\n");
codeList.add(" String value = (property) ? System.getProperty(name) : System.getenv(name);\n");
codeList.add(" System.out.println(name + \"=\" + value);\n");
@@ -105,7 +106,7 @@ public class ExecutionEnvironment {
codeList.add(" printValue(\"" + LD_LIBRARY_PATH_64 + "\", false);\n");
codeList.add("}\n");
String[] clist = new String[codeList.size()];
- TestHelper.createJar(testJarFile, codeList.toArray(clist));
+ createJar(testJarFile, codeList.toArray(clist));
} catch (FileNotFoundException fnfe) {
throw new RuntimeException(fnfe);
}
@@ -117,16 +118,15 @@ public class ExecutionEnvironment {
* environment should be pristine.
*/
private static void ensureEcoFriendly() {
- TestHelper.TestResult tr = null;
+ TestResult tr = null;
- Map<String, String> env = new HashMap<String, String>();
+ Map<String, String> env = new HashMap<>();
for (String x : LD_PATH_STRINGS) {
String pairs[] = x.split("=");
env.put(pairs[0], pairs[1]);
}
- tr = TestHelper.doExec(env, TestHelper.javaCmd, "-jar",
- testJarFile.getAbsolutePath());
+ tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
if (!tr.isNotZeroOutput()) {
System.out.println(tr);
@@ -149,10 +149,9 @@ public class ExecutionEnvironment {
* data model
*/
static void ensureNoExec() {
- Map<String, String> env = new HashMap<String, String>();
+ Map<String, String> env = new HashMap<>();
env.put(JLDEBUG_KEY, "true");
- TestHelper.TestResult tr =
- TestHelper.doExec(env, TestHelper.javaCmd, "-version");
+ TestResult tr = doExec(env, javaCmd, "-version");
if (tr.testOutput.contains(EXPECTED_MARKER)) {
System.out.println("FAIL: EnsureNoExecs: found expected warning <" +
EXPECTED_MARKER +
@@ -176,25 +175,23 @@ public class ExecutionEnvironment {
*/
static void verifyJavaLibraryPath() {
- TestHelper.TestResult tr = null;
+ TestResult tr = null;
- Map<String, String> env = new HashMap<String, String>();
+ Map<String, String> env = new HashMap<>();
- if (TestHelper.isLinux) {
+ if (TestHelper.isLinux || TestHelper.isMacOSX) {
for (String x : LD_PATH_STRINGS) {
String pairs[] = x.split("=");
env.put(pairs[0], pairs[1]);
}
- tr = TestHelper.doExec(env, TestHelper.javaCmd, "-jar",
- testJarFile.getAbsolutePath());
+ tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
verifyJavaLibraryPathGeneric(tr);
} else {
// no override
env.clear();
env.put(LD_LIBRARY_PATH, LD_LIBRARY_PATH_VALUE);
- tr = TestHelper.doExec(env, TestHelper.javaCmd, "-jar",
- testJarFile.getAbsolutePath());
+ tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
verifyJavaLibraryPathGeneric(tr);
env.clear();
@@ -206,53 +203,52 @@ public class ExecutionEnvironment {
// verify the override occurs, since we know the invocation always
// uses by default is 32-bit, therefore we also set the test
// expectation to be the same.
- tr = TestHelper.doExec(env, TestHelper.javaCmd, "-jar",
- testJarFile.getAbsolutePath());
+ tr = doExec(env, javaCmd, "-jar", testJarFile.getAbsolutePath());
verifyJavaLibraryPathOverride(tr, true);
// try changing the model from 32 to 64 bit
- if (TestHelper.dualModePresent() && TestHelper.is32Bit) {
+ if (dualModePresent() && is32Bit) {
// verify the override occurs
env.clear();
for (String x : LD_PATH_STRINGS) {
String pairs[] = x.split("=");
env.put(pairs[0], pairs[1]);
}
- tr = TestHelper.doExec(env, TestHelper.javaCmd, "-d64", "-jar",
+ tr = doExec(env, javaCmd, "-d64", "-jar",
testJarFile.getAbsolutePath());
verifyJavaLibraryPathOverride(tr, false);
// no override
env.clear();
env.put(LD_LIBRARY_PATH, LD_LIBRARY_PATH_VALUE);
- tr = TestHelper.doExec(env, TestHelper.javaCmd, "-jar",
+ tr = doExec(env, javaCmd, "-jar",
testJarFile.getAbsolutePath());
verifyJavaLibraryPathGeneric(tr);
}
// try changing the model from 64 to 32 bit
- if (TestHelper.java64Cmd != null && TestHelper.is64Bit) {
+ if (java64Cmd != null && is64Bit) {
// verify the override occurs
env.clear();
for (String x : LD_PATH_STRINGS) {
String pairs[] = x.split("=");
env.put(pairs[0], pairs[1]);
}
- tr = TestHelper.doExec(env, TestHelper.java64Cmd, "-d32", "-jar",
+ tr = doExec(env, java64Cmd, "-d32", "-jar",
testJarFile.getAbsolutePath());
verifyJavaLibraryPathOverride(tr, true);
// no override
env.clear();
env.put(LD_LIBRARY_PATH, LD_LIBRARY_PATH_VALUE);
- tr = TestHelper.doExec(env, TestHelper.java64Cmd, "-d32", "-jar",
+ tr = doExec(env, java64Cmd, "-d32", "-jar",
testJarFile.getAbsolutePath());
verifyJavaLibraryPathGeneric(tr);
}
}
}
- private static void verifyJavaLibraryPathGeneric(TestHelper.TestResult tr) {
+ private static void verifyJavaLibraryPathGeneric(TestResult tr) {
if (!tr.matches("java.library.path=.*" + LD_LIBRARY_PATH_VALUE + ".*")) {
System.out.print("FAIL: verifyJavaLibraryPath: ");
System.out.println(" java.library.path does not contain " +
@@ -264,7 +260,7 @@ public class ExecutionEnvironment {
}
}
- private static void verifyJavaLibraryPathOverride(TestHelper.TestResult tr,
+ private static void verifyJavaLibraryPathOverride(TestResult tr,
boolean is32Bit) {
// make sure the 32/64 bit value exists
if (!tr.matches("java.library.path=.*" +
@@ -295,10 +291,10 @@ public class ExecutionEnvironment {
*/
static void verifyVmSelection() {
- TestHelper.TestResult tr = null;
+ TestResult tr = null;
- if (TestHelper.is32Bit) {
- tr = TestHelper.doExec(TestHelper.javaCmd, "-client", "-version");
+ if (is32Bit) {
+ tr = doExec(javaCmd, "-client", "-version");
if (!tr.matches(".*Client VM.*")) {
System.out.println("FAIL: the expected vm -client did not launch");
System.out.println(tr);
@@ -307,7 +303,7 @@ public class ExecutionEnvironment {
passes++;
}
}
- tr = TestHelper.doExec(TestHelper.javaCmd, "-server", "-version");
+ tr = doExec(javaCmd, "-server", "-version");
if (!tr.matches(".*Server VM.*")) {
System.out.println("FAIL: the expected vm -server did not launch");
System.out.println(tr);
@@ -321,14 +317,14 @@ public class ExecutionEnvironment {
* checks to see there is no extra libjvm.so than needed
*/
static void verifyNoSymLink() {
- if (TestHelper.is64Bit) {
+ if (is64Bit) {
return;
}
File symLink = null;
- String libPathPrefix = TestHelper.isSDK ? "jre/lib" : "/lib";
- symLink = new File(TestHelper.JAVAHOME, libPathPrefix +
- TestHelper.getJreArch() + "/" + LIBJVM);
+ String libPathPrefix = isSDK ? "jre/lib" : "/lib";
+ symLink = new File(JAVAHOME, libPathPrefix +
+ getJreArch() + "/" + LIBJVM);
if (symLink.exists()) {
System.out.println("FAIL: The symlink exists " +
symLink.getAbsolutePath());
@@ -339,7 +335,7 @@ public class ExecutionEnvironment {
}
public static void main(String... args) throws Exception {
- if (TestHelper.isWindows) {
+ if (isWindows) {
System.out.println("Warning: noop on windows");
return;
}
diff --git a/jdk/test/tools/launcher/I18NJarTest.java b/jdk/test/tools/launcher/I18NJarTest.java
index 7019329..9c033b4 100644
--- a/jdk/test/tools/launcher/I18NJarTest.java
+++ b/jdk/test/tools/launcher/I18NJarTest.java
@@ -26,7 +26,7 @@
* @bug 7125442
* @summary ensures a jar path as well as a class located in a path containing
* unicode characters are launched.
- * @compile -XDignore.symbol.file I18NJarTest.java TestHelper.java
+ * @compile -XDignore.symbol.file I18NJarTest.java
* @run main/othervm I18NJarTest
*/
import java.io.File;
@@ -48,7 +48,7 @@ import java.util.Locale;
* in its own VM (othervm mode), such that the ensuing tests can run unperturbed,
* regardless of the outcome.
*/
-public class I18NJarTest {
+public class I18NJarTest extends TestHelper {
private static final File cwd = new File(".");
private static final File dir = new File("\uFF66\uFF67\uFF68\uFF69");
private static final String encoding = System.getProperty("sun.jnu.encoding", "");
@@ -78,7 +78,7 @@ public class I18NJarTest {
}
dir.mkdir();
File dirfile = new File(dir, "foo.jar");
- TestHelper.createJar(dirfile,
+ createJar(dirfile,
"public static void main(String... args) {",
"System.out.println(\"Hello World\");",
"System.exit(0);",
@@ -86,22 +86,20 @@ public class I18NJarTest {
// remove the class files, to ensure that the class is indeed picked up
// from the jar file and not from ambient classpath.
- File[] classFiles = cwd.listFiles(TestHelper.createFilter(TestHelper.CLASS_FILE_EXT));
+ File[] classFiles = cwd.listFiles(createFilter(CLASS_FILE_EXT));
for (File f : classFiles) {
f.delete();
}
// test with a jar file
- TestHelper.TestResult tr = TestHelper.doExec(TestHelper.javaCmd,
- "-jar", dirfile.getAbsolutePath());
+ TestResult tr = doExec(javaCmd, "-jar", dirfile.getAbsolutePath());
System.out.println(tr);
if (!tr.isOK()) {
throw new RuntimeException("TEST FAILED");
}
// test the same class but by specifying it as a classpath
- tr = TestHelper.doExec(TestHelper.javaCmd, "-cp",
- dirfile.getAbsolutePath(), "Foo");
+ tr = doExec(javaCmd, "-cp", dirfile.getAbsolutePath(), "Foo");
System.out.println(tr);
if (!tr.isOK()) {
throw new RuntimeException("TEST FAILED");
diff --git a/jdk/test/tools/launcher/MiscTests.java b/jdk/test/tools/launcher/MiscTests.java
index 55d3e8b..2546182 100644
--- a/jdk/test/tools/launcher/MiscTests.java
+++ b/jdk/test/tools/launcher/MiscTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +25,7 @@
* @test
* @bug 6856415
* @summary Miscellaneous tests, Exceptions
- * @compile -XDignore.symbol.file MiscTests.java TestHelper.java
+ * @compile -XDignore.symbol.file MiscTests.java
* @run main MiscTests
*/
@@ -33,12 +33,12 @@
import java.io.File;
import java.io.FileNotFoundException;
-public class MiscTests {
+public class MiscTests extends TestHelper {
// 6856415: Checks to ensure that proper exceptions are thrown by java
static void test6856415() {
// No pkcs library on win-x64, so we bail out.
- if (TestHelper.is64Bit && TestHelper.isWindows) {
+ if (is64Bit && isWindows) {
return;
}
StringBuilder sb = new StringBuilder();
@@ -49,11 +49,11 @@ public class MiscTests {
File testJar = new File("Foo.jar");
testJar.delete();
try {
- TestHelper.createJar(testJar, sb.toString());
+ createJar(testJar, sb.toString());
} catch (FileNotFoundException fnfe) {
throw new RuntimeException(fnfe);
}
- TestHelper.TestResult tr = TestHelper.doExec(TestHelper.javaCmd,
+ TestResult tr = doExec(javaCmd,
"-Djava.security.manager", "-jar", testJar.getName(), "foo.bak");
for (String s : tr.testOutput) {
System.out.println(s);
@@ -67,8 +67,8 @@ public class MiscTests {
public static void main(String... args) {
test6856415();
- if (TestHelper.testExitValue != 0) {
- throw new Error(TestHelper.testExitValue + " tests failed");
+ if (testExitValue != 0) {
+ throw new Error(testExitValue + " tests failed");
}
}
}
diff --git a/jdk/test/tools/launcher/Settings.java b/jdk/test/tools/launcher/Settings.java
index de01993..57a9ca6 100644
--- a/jdk/test/tools/launcher/Settings.java
+++ b/jdk/test/tools/launcher/Settings.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@ import java.io.IOException;
* @test
* @bug 6994753 7123582
* @summary tests -XshowSettings options
- * @compile -XDignore.symbol.file Settings.java TestHelper.java
+ * @compile -XDignore.symbol.file Settings.java
* @run main Settings
* @author ksrini
*/
-public class Settings {
+public class Settings extends TestHelper {
private static File testJar = null;
static void init() throws IOException {
@@ -45,17 +45,17 @@ public class Settings {
tsrc.append(" System.out.println(x);\n");
tsrc.append(" }\n");
tsrc.append("}\n");
- TestHelper.createJar(testJar, tsrc.toString());
+ createJar(testJar, tsrc.toString());
}
- static void checkContains(TestHelper.TestResult tr, String str) {
+ static void checkContains(TestResult tr, String str) {
if (!tr.contains(str)) {
System.out.println(tr);
throw new RuntimeException(str + " not found");
}
}
- static void checkNoContains(TestHelper.TestResult tr, String str) {
+ static void checkNoContains(TestResult tr, String str) {
if (tr.contains(str)) {
System.out.println(tr.status);
throw new RuntimeException(str + " found");
@@ -66,23 +66,23 @@ public class Settings {
private static final String PROP_SETTINGS = "Property settings:";
private static final String LOCALE_SETTINGS = "Locale settings:";
- static void containsAllOptions(TestHelper.TestResult tr) {
+ static void containsAllOptions(TestResult tr) {
checkContains(tr, VM_SETTINGS);
checkContains(tr, PROP_SETTINGS);
checkContains(tr, LOCALE_SETTINGS);
}
static void runTestOptionDefault() throws IOException {
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "-Xms64m", "-Xmx512m",
- "-Xss128k", "-XshowSettings", "-jar", testJar.getAbsolutePath());
+ TestResult tr = null;
+ tr = doExec(javaCmd, "-Xms64m", "-Xmx512m",
+ "-Xss256k", "-XshowSettings", "-jar", testJar.getAbsolutePath());
containsAllOptions(tr);
if (!tr.isOK()) {
System.out.println(tr.status);
throw new RuntimeException("test fails");
}
- tr = TestHelper.doExec(TestHelper.javaCmd, "-Xms65536k", "-Xmx712m",
- "-Xss122880", "-XshowSettings", "-jar", testJar.getAbsolutePath());
+ tr = doExec(javaCmd, "-Xms65536k", "-Xmx712m",
+ "-Xss256000", "-XshowSettings", "-jar", testJar.getAbsolutePath());
containsAllOptions(tr);
if (!tr.isOK()) {
System.out.println(tr.status);
@@ -92,38 +92,38 @@ public class Settings {
static void runTestOptionAll() throws IOException {
init();
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "-XshowSettings:all");
+ TestResult tr = null;
+ tr = doExec(javaCmd, "-XshowSettings:all");
containsAllOptions(tr);
}
static void runTestOptionVM() throws IOException {
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "-XshowSettings:vm");
+ TestResult tr = null;
+ tr = doExec(javaCmd, "-XshowSettings:vm");
checkContains(tr, VM_SETTINGS);
checkNoContains(tr, PROP_SETTINGS);
checkNoContains(tr, LOCALE_SETTINGS);
}
static void runTestOptionProperty() throws IOException {
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "-XshowSettings:properties");
+ TestResult tr = null;
+ tr = doExec(javaCmd, "-XshowSettings:properties");
checkNoContains(tr, VM_SETTINGS);
checkContains(tr, PROP_SETTINGS);
checkNoContains(tr, LOCALE_SETTINGS);
}
static void runTestOptionLocale() throws IOException {
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "-XshowSettings:locale");
+ TestResult tr = null;
+ tr = doExec(javaCmd, "-XshowSettings:locale");
checkNoContains(tr, VM_SETTINGS);
checkNoContains(tr, PROP_SETTINGS);
checkContains(tr, LOCALE_SETTINGS);
}
static void runTestBadOptions() throws IOException {
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "-XshowSettingsBadOption");
+ TestResult tr = null;
+ tr = doExec(javaCmd, "-XshowSettingsBadOption");
checkNoContains(tr, VM_SETTINGS);
checkNoContains(tr, PROP_SETTINGS);
checkNoContains(tr, LOCALE_SETTINGS);
@@ -131,8 +131,8 @@ public class Settings {
}
static void runTest7123582() throws IOException {
- TestHelper.TestResult tr = null;
- tr = TestHelper.doExec(TestHelper.javaCmd, "-XshowSettings", "-version");
+ TestResult tr = null;
+ tr = doExec(javaCmd, "-XshowSettings", "-version");
if (!tr.isOK()) {
System.out.println(tr.status);
throw new RuntimeException("test fails");
diff --git a/jdk/test/tools/launcher/SomeException.java b/jdk/test/tools/launcher/SomeException.java
deleted file mode 100644
index 5454e1a..0000000
--- a/jdk/test/tools/launcher/SomeException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/*
- *
- *
- * Used by unresolvedExceptions.sh
- */
-
-public class SomeException extends RuntimeException {
-
-}
diff --git a/jdk/test/tools/launcher/Test7029048.java b/jdk/test/tools/launcher/Test7029048.java
index 69c94d5..aafee36 100644
--- a/jdk/test/tools/launcher/Test7029048.java
+++ b/jdk/test/tools/launcher/Test7029048.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,7 +25,7 @@
* @test
* @bug 7029048
* @summary Checks for LD_LIBRARY_PATH on *nixes
- * @compile -XDignore.symbol.file ExecutionEnvironment.java TestHelper.java Test7029048.java
+ * @compile -XDignore.symbol.file ExecutionEnvironment.java Test7029048.java
* @run main Test7029048
*/
@@ -42,7 +42,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class Test7029048 {
+public class Test7029048 extends TestHelper {
static int passes = 0;
static int errors = 0;
@@ -62,7 +62,7 @@ public class Test7029048 {
private static final File dstLibDir = new File("lib");
private static final File dstLibArchDir =
- new File(dstLibDir, TestHelper.getJreArch());
+ new File(dstLibDir, getJreArch());
private static final File dstServerDir = new File(dstLibArchDir, "server");
private static final File dstServerLibjvm = new File(dstServerDir, LIBJVM);
@@ -78,8 +78,8 @@ public class Test7029048 {
private static final Map<String, String> env = new HashMap<>();
static {
- if (TestHelper.isDualMode) {
- dstOtherArchDir = new File(dstLibDir, TestHelper.getComplementaryJreArch());
+ if (isDualMode) {
+ dstOtherArchDir = new File(dstLibDir, getComplementaryJreArch());
dstOtherServerDir = new File(dstOtherArchDir, "server");
dstOtherServerLibjvm = new File(dstOtherServerDir, LIBJVM);
} else {
@@ -106,10 +106,10 @@ public class Test7029048 {
List<String> cmdsList = new ArrayList<>();
// only for a dual-mode system
- if (want64 && TestHelper.isDualMode) {
- cmdsList.add(TestHelper.java64Cmd);
+ if (want64 && isDualMode) {
+ cmdsList.add(java64Cmd);
} else {
- cmdsList.add(TestHelper.javaCmd); // a 32-bit java command for all
+ cmdsList.add(javaCmd); // a 32-bit java command for all
}
/*
@@ -127,18 +127,18 @@ public class Test7029048 {
cmdsList.add("-jar");
cmdsList.add(ExecutionEnvironment.testJarFile.getAbsolutePath());
String[] cmds = new String[cmdsList.size()];
- TestHelper.TestResult tr = TestHelper.doExec(env, cmdsList.toArray(cmds));
+ TestResult tr = doExec(env, cmdsList.toArray(cmds));
analyze(tr, nLLPComponents, caseID);
}
// no cross launch, ie. no change to the data model.
static void run(Map<String, String> env, int nLLPComponents, String caseID)
throws IOException {
- boolean want32 = TestHelper.is32Bit;
+ boolean want32 = is32Bit;
run(want32, null, env, nLLPComponents, caseID);
}
- static void analyze(TestHelper.TestResult tr, int nLLPComponents, String caseID) {
+ static void analyze(TestResult tr, int nLLPComponents, String caseID) {
String envValue = getValue(LD_LIBRARY_PATH, tr.testOutput);
/*
* the envValue can never be null, since the test code should always
@@ -189,12 +189,12 @@ public class Test7029048 {
switch (v) {
case LLP_SET_WITH_JVM:
// copy the files into the directory structures
- TestHelper.copyFile(srcLibjvmSo, dstServerLibjvm);
+ copyFile(srcLibjvmSo, dstServerLibjvm);
// does not matter if it is client or a server
- TestHelper.copyFile(srcLibjvmSo, dstClientLibjvm);
+ copyFile(srcLibjvmSo, dstClientLibjvm);
// does not matter if the arch do not match either
- if (TestHelper.isDualMode) {
- TestHelper.copyFile(srcLibjvmSo, dstOtherServerLibjvm);
+ if (isDualMode) {
+ copyFile(srcLibjvmSo, dstOtherServerLibjvm);
}
desc = "LD_LIBRARY_PATH should be set";
break;
@@ -211,7 +211,7 @@ public class Test7029048 {
Files.deleteIfExists(dstServerLibjvm.toPath());
}
- if (TestHelper.isDualMode) {
+ if (isDualMode) {
if (!dstOtherServerDir.exists()) {
Files.createDirectories(dstOtherServerDir.toPath());
} else {
@@ -223,7 +223,7 @@ public class Test7029048 {
break;
case LLP_SET_NON_EXISTENT_PATH:
if (dstLibDir.exists()) {
- TestHelper.recursiveDelete(dstLibDir);
+ recursiveDelete(dstLibDir);
}
desc = "LD_LIBRARY_PATH should not be set";
break;
@@ -245,18 +245,18 @@ public class Test7029048 {
env.put(LD_LIBRARY_PATH, dstClientDir.getAbsolutePath());
run(env, v.value + 1, "Case 2: " + desc);
- if (!TestHelper.isDualMode) {
+ if (!isDualMode) {
continue; // nothing more to do for Linux
}
// Tests applicable only to solaris.
// initialize test variables for dual mode operations
- final File dst32ServerDir = TestHelper.is32Bit
+ final File dst32ServerDir = is32Bit
? dstServerDir
: dstOtherServerDir;
- final File dst64ServerDir = TestHelper.is64Bit
+ final File dst64ServerDir = is64Bit
? dstServerDir
: dstOtherServerDir;
@@ -268,7 +268,7 @@ public class Test7029048 {
env.clear();
env.put(LD_LIBRARY_PATH_32, dst32ServerDir.getAbsolutePath());
env.put(LD_LIBRARY_PATH_64, dst64ServerDir.getAbsolutePath());
- run(TestHelper.is32Bit, null, env, v.value + 1, "Case 3: " + desc);
+ run(is32Bit, null, env, v.value + 1, "Case 3: " + desc);
/*
* Case 4: we are in dual mode environment, running 64-bit then
@@ -276,7 +276,7 @@ public class Test7029048 {
* java32 -d64, LLP_64 is relevant, LLP_32 is ignored
* java64 -d32, LLP_32 is relevant, LLP_64 is ignored
*/
- if (TestHelper.dualModePresent()) {
+ if (dualModePresent()) {
run(true, "-d64", env, v.value + 1, "Case 4A: " + desc);
run(false,"-d32", env, v.value + 1, "Case 4B: " + desc);
}
@@ -285,8 +285,8 @@ public class Test7029048 {
}
public static void main(String... args) throws Exception {
- if (TestHelper.isWindows) {
- System.out.println("Warning: noop on windows");
+ if (TestHelper.isWindows || TestHelper.isMacOSX) {
+ System.out.println("Note: applicable on neither Windows nor MacOSX");
return;
}
// create our test jar first
@@ -297,13 +297,13 @@ public class Test7029048 {
if (errors > 0) {
throw new Exception("Test7029048: FAIL: with "
+ errors + " errors and passes " + passes);
- } else if (TestHelper.dualModePresent() && passes < 15) {
+ } else if (dualModePresent() && passes < 15) {
throw new Exception("Test7029048: FAIL: " +
"all tests did not run, expected " + 15 + " got " + passes);
- } else if (TestHelper.isSolaris && passes < 9) {
+ } else if (isSolaris && passes < 9) {
throw new Exception("Test7029048: FAIL: " +
"all tests did not run, expected " + 9 + " got " + passes);
- } else if (TestHelper.isLinux && passes < 6) {
+ } else if (isLinux && passes < 6) {
throw new Exception("Test7029048: FAIL: " +
"all tests did not run, expected " + 6 + " got " + passes);
} else {
diff --git a/jdk/test/tools/launcher/TestHelper.java b/jdk/test/tools/launcher/TestHelper.java
index c0f1119..2c4dedd 100644
--- a/jdk/test/tools/launcher/TestHelper.java
+++ b/jdk/test/tools/launcher/TestHelper.java
@@ -29,6 +29,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
+import java.nio.charset.Charset;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.Files;
import java.nio.file.FileVisitResult;
@@ -36,17 +37,22 @@ import java.nio.file.SimpleFileVisitor;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import javax.tools.JavaCompiler;
import javax.tools.ToolProvider;
import static java.nio.file.StandardCopyOption.*;
+import static java.nio.file.StandardOpenOption.*;
/**
* This class provides some common utilities for the launcher tests.
*/
-public enum TestHelper {
- INSTANCE;
+public class TestHelper {
+ // commonly used jtreg constants
+ static final File TEST_CLASSES_DIR;
+ static final File TEST_SOURCES_DIR;
+
static final String JAVAHOME = System.getProperty("java.home");
static final boolean isSDK = JAVAHOME.endsWith("jre");
static final String javaCmd;
@@ -58,6 +64,8 @@ public enum TestHelper {
static final boolean debug = Boolean.getBoolean("TestHelper.Debug");
static final boolean isWindows =
System.getProperty("os.name", "unknown").startsWith("Windows");
+ static final boolean isMacOSX =
+ System.getProperty("os.name", "unknown").startsWith("Mac");
static final boolean is64Bit =
System.getProperty("sun.arch.data.model").equals("64");
static final boolean is32Bit =
@@ -69,13 +77,30 @@ public enum TestHelper {
static final boolean isDualMode = isSolaris;
static final boolean isSparc = System.getProperty("os.arch").startsWith("sparc");
+ // make a note of the golden default locale
+ static final Locale DefaultLocale = Locale.getDefault();
+
static final String JAVA_FILE_EXT = ".java";
static final String CLASS_FILE_EXT = ".class";
static final String JAR_FILE_EXT = ".jar";
+ static final String JLDEBUG_KEY = "_JAVA_LAUNCHER_DEBUG";
+ static final String EXPECTED_MARKER = "TRACER_MARKER:About to EXEC";
static int testExitValue = 0;
static {
+ String tmp = System.getProperty("test.classes", null);
+ if (tmp == null) {
+ throw new Error("property test.classes not defined ??");
+ }
+ TEST_CLASSES_DIR = new File(tmp).getAbsoluteFile();
+
+ tmp = System.getProperty("test.src", null);
+ if (tmp == null) {
+ throw new Error("property test.src not defined ??");
+ }
+ TEST_SOURCES_DIR = new File(tmp).getAbsoluteFile();
+
if (is64Bit && is32Bit) {
throw new RuntimeException("arch model cannot be both 32 and 64 bit");
}
@@ -181,6 +206,19 @@ public enum TestHelper {
}
/*
+ * A convenience method to compile java files.
+ */
+ static void compile(String... compilerArgs) {
+ if (compiler.run(null, null, null, compilerArgs) != 0) {
+ String sarg = "";
+ for (String x : compilerArgs) {
+ sarg.concat(x + " ");
+ }
+ throw new Error("compilation failed: " + sarg);
+ }
+ }
+
+ /*
* A generic jar file creator to create a java file, compile it
* and jar it up, a specific Main-Class entry name in the
* manifest can be specified or a null to use the sole class file name
@@ -239,6 +277,11 @@ public enum TestHelper {
Files.copy(src.toPath(), dst.toPath(), COPY_ATTRIBUTES, REPLACE_EXISTING);
}
+ static void createFile(File outFile, List<String> content) throws IOException {
+ Files.write(outFile.getAbsoluteFile().toPath(), content,
+ Charset.defaultCharset(), CREATE_NEW);
+ }
+
static void recursiveDelete(File target) throws IOException {
if (!target.exists()) {
return;
@@ -321,6 +364,10 @@ public enum TestHelper {
};
}
+ static boolean isEnglishLocale() {
+ return Locale.getDefault().getLanguage().equals("en");
+ }
+
/*
* A class to encapsulate the test results and stuff, with some ease
* of use methods to check the test results.
diff --git a/jdk/test/tools/launcher/UnicodeCleanup.java b/jdk/test/tools/launcher/UnicodeCleanup.java
deleted file mode 100644
index fc756ad..0000000
--- a/jdk/test/tools/launcher/UnicodeCleanup.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/*
- *
- *
- * Used by UnicodeTest.sh.
- *
- * Recursively deletes the given file/directory and its contents.
- * Equivalent to "rm -rf args...", but on NT-based Windows can
- * handle files with full Unicode names inside the given directories
- * while shells are generally limited to names using the system encoding.
- *
- * @author Norbert Lindenberg
- */
-
-
-
-import java.io.File;
-
-public class UnicodeCleanup {
-
- public static void main(String[] args) {
-
- for (int i = 0; i < args.length; i++) {
- delete(new File(args[i]));
- }
- }
-
- private static void delete(File file) {
- // paranoia is healthy in rm -rf
- String name = file.toString();
- if (name.equals(".") || name.equals("..") ||
- name.endsWith(File.separator + ".") ||
- name.endsWith(File.separator + "..")) {
- throw new RuntimeException("too risky to process: " + name);
- }
- if (file.isDirectory()) {
- File[] contents = file.listFiles();
- for (int i = 0; i < contents.length; i++) {
- delete(contents[i]);
- }
- }
- if (!file.delete()) {
- throw new RuntimeException("Unable to delete " + file);
- }
- }
-}
diff --git a/jdk/test/tools/launcher/UnicodeTest.java b/jdk/test/tools/launcher/UnicodeTest.java
index ffd9520..d44582d 100644
--- a/jdk/test/tools/launcher/UnicodeTest.java
+++ b/jdk/test/tools/launcher/UnicodeTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, 2012 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -21,12 +21,18 @@
* questions.
*/
+/*
+ * @test
+ * @bug 5030265
+ * @compile -XDignore.symbol.file UnicodeTest.java
+ * @run main/othervm UnicodeTest
+ * @summary Verify that the J2RE can handle all legal Unicode characters
+ * in class names unless limited by the file system encoding
+ * or the encoding used for command line arguments.
+ * @author Norbert Lindenberg, ksrini
+ */
/*
- *
- *
- * Used by UnicodeTest.sh.
- *
* This class creates Java source files using Unicode characters
* that test the limits of what's possible
* - in situations where the platform encoding imposes limits
@@ -35,38 +41,126 @@
* (file system access in UTF-8 locales and on Windows 2000++,
* jar file contents)
*
- * @author Norbert Lindenberg
+ * This test needs to be run in othervm as the locale is reset.
*/
-
-
+import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
import java.util.Locale;
-public class UnicodeTest {
+public class UnicodeTest extends TestHelper {
+ static final File UnicodeTestSrc = new File("UnicodeTest-src");
+ static final File UnicodeTestClasses = new File("UnicodeTest-classes");
+ static final String UnicodeTestJarName = "UnicodeTest" + JAR_FILE_EXT;
+ static final File UnicodeTestJar = new File(UnicodeTestJarName);
+ static final File SolarisUnicodeTestJar = new File(TEST_SOURCES_DIR,
+ UnicodeTestJarName);
+
+ /*
+ * the main method is a port of the shell based test to a java, this
+ * eliminates the need for MKS on windows, thus we can rely on consistent
+ * results regardless of the shell being used.
+ */
+ public static void main(String... args) throws Exception {
+ System.out.println("creating test source files");
+ UnicodeTestSrc.mkdirs();
+ UnicodeTestClasses.mkdirs();
+ String classname = generateSources();
+ File javaFile = new File(UnicodeTestSrc, classname + JAVA_FILE_EXT);
+ System.out.println("building test apps");
+ compile("-encoding", "UTF-8",
+ "-sourcepath", UnicodeTestSrc.getAbsolutePath(),
+ "-d", UnicodeTestClasses.getAbsolutePath(),
+ javaFile.getAbsolutePath());
- public static void main(String[] args) throws Exception {
+ createJar("-cvfm", UnicodeTestJar.getAbsolutePath(),
+ new File(UnicodeTestSrc, "MANIFEST.MF").getAbsolutePath(),
+ "-C", UnicodeTestClasses.getAbsolutePath(), ".");
+
+ if (!UnicodeTestJar.exists()) {
+ throw new Error("failed to create " + UnicodeTestJar.getAbsolutePath());
+ }
+
+ System.out.println("running test app using class file");
+ TestResult tr = doExec(javaCmd,
+ "-cp", UnicodeTestClasses.getAbsolutePath(), classname);
+ if (!tr.isOK()) {
+ System.out.println(tr);
+ throw new RuntimeException("test fails");
+ }
+
+ System.out.println("delete generated files with non-ASCII names");
+ recursiveDelete(UnicodeTestSrc);
+ recursiveDelete(UnicodeTestClasses);
+
+ /*
+ * test in whatever the default locale is
+ */
+ runJarTests();
+
+ /*
+ * if the Japanese locale is available, test in that locale as well
+ */
+ if (setLocale(Locale.JAPANESE)) {
+ runJarTests();
+ }
+
+ /*
+ * if we can switch to a C locale, then test whether jar files with
+ * non-ASCII characters in the manifest still work in this crippled
+ * environment
+ */
+ if (setLocale(Locale.ENGLISH)) {
+ runJarTests();
+ }
+ // thats it we are outta here
+ }
+ static void runJarTests() {
+ System.out.println("running test app using newly built jar file in " +
+ Locale.getDefault());
+ runTest(UnicodeTestJar);
+
+ System.out.println("running test app using jar file " +
+ "(built with Solaris UTF-8 locale) in " + Locale.getDefault());
+ runTest(SolarisUnicodeTestJar);
+ }
+
+ static void runTest(File testJar) {
+ TestResult tr = doExec(javaCmd, "-jar", testJar.getAbsolutePath());
+ if (!tr.isOK()) {
+ System.out.println(tr);
+ throw new RuntimeException("test fails");
+ }
+ }
+
+ static boolean setLocale(Locale desired) {
+ if (Locale.getDefault().equals(desired)) {
+ return true; // already set nothing more
+ }
+ for (Locale l : Locale.getAvailableLocales()) {
+ if (l == desired) {
+ Locale.setDefault(l);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ static String generateSources() throws Exception {
String commandLineClassNameSuffix = commandLineClassNameSuffix();
String commandLineClassName = "ClassA" + commandLineClassNameSuffix;
- String manifestClassName;
- if (hasUnicodeFileSystem()) {
- manifestClassName = "ClassB" + unicode;
- } else {
- manifestClassName = "ClassB" + commandLineClassNameSuffix;
- }
+ String manifestClassName = "ClassB" +
+ (hasUnicodeFileSystem() ? unicode : commandLineClassNameSuffix);
generateSource(commandLineClassName, manifestClassName);
generateSource(manifestClassName, commandLineClassName);
generateManifest(manifestClassName);
-
- System.out.println(commandLineClassName);
+ return commandLineClassName;
}
- private static final String fileSeparator = System.getProperty("file.separator");
- private static final String osName = System.getProperty("os.name");
private static final String defaultEncoding = Charset.defaultCharset().name();
// language names taken from java.util.Locale.getDisplayLanguage for the respective language
@@ -132,12 +226,7 @@ public class UnicodeTest {
{ "tis-620", thai, null },
};
- int column;
- if (osName.startsWith("Windows")) {
- column = 2;
- } else {
- column = 1;
- }
+ int column = isWindows ? 2 : 1;
for (int i = 0; i < names.length; i++) {
if (names[i][0].equalsIgnoreCase(defaultEncoding)) {
return names[i][column];
@@ -147,17 +236,12 @@ public class UnicodeTest {
}
private static boolean hasUnicodeFileSystem() {
- if (osName.startsWith("Windows")) {
- return ! osName.startsWith("Windows 9") &&
- ! osName.equals("Windows Me");
- } else {
- return defaultEncoding.equalsIgnoreCase("UTF-8");
- }
+ return (isWindows) ? true : defaultEncoding.equalsIgnoreCase("UTF-8");
}
private static void generateSource(String thisClass, String otherClass) throws Exception {
- String fileName = "UnicodeTest-src" + fileSeparator + thisClass + ".java";
- OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(fileName), "UTF-8");
+ File file = new File(UnicodeTestSrc, thisClass + JAVA_FILE_EXT);
+ OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
out.write("public class " + thisClass + " {\n");
out.write(" public static void main(String[] args) {\n");
out.write(" if (!" + otherClass + "." + otherClass.toLowerCase() + "().equals(\"" + otherClass + "\")) {\n");
@@ -172,8 +256,8 @@ public class UnicodeTest {
}
private static void generateManifest(String mainClass) throws Exception {
- String fileName = "UnicodeTest-src" + fileSeparator + "MANIFEST.MF";
- FileOutputStream out = new FileOutputStream(fileName);
+ File file = new File(UnicodeTestSrc, "MANIFEST.MF");
+ FileOutputStream out = new FileOutputStream(file);
out.write("Manifest-Version: 1.0\n".getBytes("UTF-8"));
// Header lines are limited to 72 bytes.
// The manifest spec doesn't say we have to break at character boundaries,
diff --git a/jdk/test/tools/launcher/UnicodeTest.sh b/jdk/test/tools/launcher/UnicodeTest.sh
deleted file mode 100644
index f64969b..0000000
--- a/jdk/test/tools/launcher/UnicodeTest.sh
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
-# 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 5030265
-# @summary Verify that the J2RE can handle all legal Unicode characters
-# in class names unless limited by the file system encoding
-# or the encoding used for command line arguments.
-# @author Norbert Lindenberg
-
-
-# Verify directory context variables are set
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-JAVAC="${TESTJAVA}"/bin/javac
-JAVA="${TESTJAVA}"/bin/java
-JAR="${TESTJAVA}"/bin/jar
-
-mkdir UnicodeTest-src UnicodeTest-classes
-
-echo "creating test source files"
-"$JAVAC" -d . "${TESTSRC}"/UnicodeTest.java
-if [ "`uname -s | grep CYGWIN`" != "" ] ; then
- CLASS_NAME=`"$JAVA" UnicodeTest | sed -e 's@\\r@@g' `
-else
- CLASS_NAME=`"$JAVA" UnicodeTest`
-fi
-
-if [ "$CLASS_NAME" = "" ]
-then
- echo "CLASS_NAME not generated. Test failed."
- exit 1
-fi
-
-echo "building test apps"
-"$JAVAC" -encoding UTF-8 -sourcepath UnicodeTest-src \
- -d UnicodeTest-classes UnicodeTest-src/"${CLASS_NAME}".java || exit 1
-"$JAR" -cvfm UnicodeTest.jar UnicodeTest-src/MANIFEST.MF \
- -C UnicodeTest-classes . || exit 1
-
-echo "running test app using class file"
-"$JAVA" -classpath UnicodeTest-classes "$CLASS_NAME" || exit 1
-
-echo "delete generated files with non-ASCII names"
-# do it now because on Unix they may not be accessible when locale changes
-# do it in Java because shells on Windows can't handle full Unicode
-"$JAVAC" -d . "${TESTSRC}"/UnicodeCleanup.java || exit 1
-"$JAVA" UnicodeCleanup UnicodeTest-src UnicodeTest-classes || exit 1
-
-echo "running test app using newly built jar file"
-"$JAVA" -jar UnicodeTest.jar || exit 1
-
-echo "running test app using jar file built in Solaris UTF-8 locale"
-"$JAVA" -jar "${TESTSRC}"/UnicodeTest.jar || exit 1
-
-# if we can switch to a C locale, then test whether jar files with
-# non-ASCII characters in the manifest still work in this crippled
-# environment
-if test -n "`locale -a 2>/dev/null | grep '^C$'`"
-then
- LC_ALL=C
- export LC_ALL
-
- echo "running test app using newly built jar file in C locale"
- "$JAVA" -jar UnicodeTest.jar || exit 1
-
- echo "running test app using premade jar file in C locale"
- "$JAVA" -jar "${TESTSRC}"/UnicodeTest.jar || exit 1
-fi
-
-exit 0
-
diff --git a/jdk/test/tools/launcher/UnresolvedExceptions.java b/jdk/test/tools/launcher/UnresolvedExceptions.java
index 70431d4..aa70a8f 100644
--- a/jdk/test/tools/launcher/UnresolvedExceptions.java
+++ b/jdk/test/tools/launcher/UnresolvedExceptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,15 +22,39 @@
*/
/*
- *
- *
- * Used by unresolvedExceptions.sh
+ * @test
+ * @bug 4529320
+ * @compile -XDignore.symbol.file UnresolvedExceptions.java
+ * @run main UnresolvedExceptions
+ * @summary Verifying jvm won't segv if exception not available
+ * @author Joseph D. Darcy, ksrini
*/
-public class UnresolvedExceptions {
- public static void main(String[] argv) throws SomeException {
- // main is invoked from a shell so calling exit won't stop all
- // tests.
- System.exit(0);
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class UnresolvedExceptions extends TestHelper {
+
+ public static void main(String... args) throws Exception {
+ final String fname = "Foo";
+ List<String> buffer = new ArrayList<>();
+ buffer.add("public class " + fname + " {");
+ buffer.add(" public static void main(String[] argv) throws "
+ + "Foo.SomeException {");
+ buffer.add(" System.exit(0);");
+ buffer.add(" }");
+ buffer.add(" static class SomeException extends RuntimeException{}");
+ buffer.add("}");
+
+ File testJavaFile = new File("Foo" + JAVA_FILE_EXT);
+ createFile(testJavaFile, buffer);
+ compile(testJavaFile.getName());
+ TestResult tr = doExec(javaCmd, "-cp", ".", fname);
+ if (!tr.isOK()) {
+ System.out.println(tr);
+ throw new RuntimeException("java -cp ... failed");
}
}
+}
diff --git a/jdk/test/tools/launcher/deleteI18n.sh b/jdk/test/tools/launcher/deleteI18n.sh
deleted file mode 100644
index 1514bdd..0000000
--- a/jdk/test/tools/launcher/deleteI18n.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-#
-#
-# This file is used by test i18nTest.sh; this file is called to use
-# shell globbing to delete Java source and class files whose names
-# include non-ASCII characters.
-
-
-# Verify directory context variables are set
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-rm -f i18n*.java
-rm -f i18n*.class
-
-
diff --git a/jdk/test/tools/launcher/i18nTest.sh b/jdk/test/tools/launcher/i18nTest.sh
deleted file mode 100644
index ea01d59..0000000
--- a/jdk/test/tools/launcher/i18nTest.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
-# 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 4761384
-# @run shell deleteI18n.sh
-# @build CreatePlatformFile
-# @run main CreatePlatformFile
-# @run shell i18nTest.sh
-# @summary Test to see if class files with non-ASCII characters can be run
-# @author Joseph D. Darcy
-
-
-# Verify directory context variables are set
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-JAVAC="${TESTJAVA}/bin/javac -d . "
-JAVA="${TESTJAVA}/bin/java -classpath . "
-
-NAME=`ls i18n*.java | sed s/.java//`
-echo $NAME
-$JAVAC ${NAME}.java
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "Compile of i18n*.java failed."
- exit 1
-esac
-
-$JAVA ${NAME}
-RESULT=$?
-
-case "$RESULT" in
- 0 )
- exit 0;
- ;;
-
- * )
- echo "Class $NAME did not run successfully."
- exit 1
-esac
diff --git a/jdk/test/tools/launcher/unresolvedExceptions.sh b/jdk/test/tools/launcher/unresolvedExceptions.sh
deleted file mode 100644
index 3244bd9..0000000
--- a/jdk/test/tools/launcher/unresolvedExceptions.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
-# 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 4529320
-# @build SomeException
-# @build UnresolvedExceptions
-# @clean SomeException
-# @run shell/timeout=60 unresolvedExceptions.sh
-# @summary Verifying jvm won't segv if exception not available
-# @author Joseph D. Darcy
-
-# Verify directory context variables are set
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-if [ "${TESTSRC}" = "" ]
-then
- echo "TESTSRC not set. Test cannot execute. Failed."
- exit 1
-fi
-
-
-if [ "${TESTCLASSES}" = "" ]
-then
- echo "TESTCLASSES not set. Test cannot execute. Failed."
- exit 1
-fi
-
-JAVA="${TESTJAVA}/bin/java"
-
-$JAVA -classpath ${TESTCLASSES} UnresolvedExceptions
-RESULT=$?
-
-case "$RESULT" in
- 0 | 1 )
- exit 0;
- ;;
-
- * )
- exit 1
-esac
diff --git a/jdk/test/tools/pack200/Pack200Test.java b/jdk/test/tools/pack200/Pack200Test.java
index 888beb8..476ece1 100644
--- a/jdk/test/tools/pack200/Pack200Test.java
+++ b/jdk/test/tools/pack200/Pack200Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@ public class Pack200Test {
private static ArrayList <File> jarList = new ArrayList<File>();
static final MemoryMXBean mmxbean = ManagementFactory.getMemoryMXBean();
static final long m0 = getUsedMemory();
- static final int LEAK_TOLERANCE = 20000; // OS and GC related variations.
+ static final int LEAK_TOLERANCE = 21000; // OS and GC related variations.
/** Creates a new instance of Pack200Test */
private Pack200Test() {}
diff --git a/langtools/.hg/cache/branchheads b/langtools/.hg/cache/branchheads
index 1de4f72..8e163b8 100644
--- a/langtools/.hg/cache/branchheads
+++ b/langtools/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-0e11747978c5635a562b7a7a37e38647e15fb01c 1309
-0e11747978c5635a562b7a7a37e38647e15fb01c default
+e776809a99e19f2f8ba0fed0268ae2578811c318 1360
+e776809a99e19f2f8ba0fed0268ae2578811c318 default
diff --git a/langtools/.hg/dirstate b/langtools/.hg/dirstate
index 1c0d959..eca093e 100644
Binary files a/langtools/.hg/dirstate and b/langtools/.hg/dirstate differ
diff --git a/langtools/.hg/store/00changelog.d b/langtools/.hg/store/00changelog.d
index fc54d1c..a000855 100644
Binary files a/langtools/.hg/store/00changelog.d and b/langtools/.hg/store/00changelog.d differ
diff --git a/langtools/.hg/store/00changelog.i b/langtools/.hg/store/00changelog.i
index 7711477..7e6c465 100644
Binary files a/langtools/.hg/store/00changelog.i and b/langtools/.hg/store/00changelog.i differ
diff --git a/langtools/.hg/store/00manifest.d b/langtools/.hg/store/00manifest.d
index ee8fd69..6ed1f35 100644
Binary files a/langtools/.hg/store/00manifest.d and b/langtools/.hg/store/00manifest.d differ
diff --git a/langtools/.hg/store/00manifest.i b/langtools/.hg/store/00manifest.i
index 9af10cf..a114721 100644
Binary files a/langtools/.hg/store/00manifest.i and b/langtools/.hg/store/00manifest.i differ
diff --git a/langtools/.hg/store/data/make/_makefile-classic.i b/langtools/.hg/store/data/make/_makefile-classic.i
index 034292c..1cf0519 100644
Binary files a/langtools/.hg/store/data/make/_makefile-classic.i and b/langtools/.hg/store/data/make/_makefile-classic.i differ
diff --git a/langtools/.hg/store/data/make/build.properties.i b/langtools/.hg/store/data/make/build.properties.i
index 5ad1ea1..eaccc5d 100644
Binary files a/langtools/.hg/store/data/make/build.properties.i and b/langtools/.hg/store/data/make/build.properties.i differ
diff --git a/langtools/.hg/store/data/make/build.xml.i b/langtools/.hg/store/data/make/build.xml.i
index 1df5dba..9c03ab4 100644
Binary files a/langtools/.hg/store/data/make/build.xml.i and b/langtools/.hg/store/data/make/build.xml.i differ
diff --git a/langtools/.hg/store/data/make/jprt.properties.i b/langtools/.hg/store/data/make/jprt.properties.i
index 00a1088..46bbcf3 100644
Binary files a/langtools/.hg/store/data/make/jprt.properties.i and b/langtools/.hg/store/data/make/jprt.properties.i differ
diff --git a/langtools/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i b/langtools/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i
index 23e2842..b33fc92 100644
Binary files a/langtools/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i and b/langtools/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i differ
diff --git a/langtools/.hg/store/data/make/netbeans/langtools/build.xml.i b/langtools/.hg/store/data/make/netbeans/langtools/build.xml.i
index e8ef21e..12bf902 100644
Binary files a/langtools/.hg/store/data/make/netbeans/langtools/build.xml.i and b/langtools/.hg/store/data/make/netbeans/langtools/build.xml.i differ
diff --git a/langtools/.hg/store/data/make/test/lib/src.gold.txt.i b/langtools/.hg/store/data/make/test/lib/src.gold.txt.i
index 91bd21a..7ddc74c 100644
Binary files a/langtools/.hg/store/data/make/test/lib/src.gold.txt.i and b/langtools/.hg/store/data/make/test/lib/src.gold.txt.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_member_reference_tree.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_member_reference_tree.java.i
index b634621..94ac864 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_member_reference_tree.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/tree/_member_reference_tree.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_javac_task.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_javac_task.java.i
index a3d5a5e..7f275f7 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_javac_task.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/source/util/_javac_task.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/package.html.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/package.html.i
index ade1ace..87acb84 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/package.html.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/doclets/package.html.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_client_code_wrapper.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_client_code_wrapper.java.i
index 40352f8..6edcc8d 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_client_code_wrapper.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_client_code_wrapper.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i
index 964ee28..111dbff 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_task_impl.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i
index 6447ac1..eef6e2b 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/api/_javac_trees.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i
index 9f38c7e..4c0e104 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symbol.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symtab.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symtab.java.i
index 8bc1576..29d5cd2 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symtab.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/code/_symtab.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i
index ea9a9d6..092d5c1 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_attr.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i
index 8094727..9659400 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_check.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i
index e977f32..14d4d34 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_infer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i
index 65cff18..a34ed72 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_member_enter.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i
index 6b123a3..392c7b7 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_modules.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i
index 1b1f1e2..695c2cd 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_resolve.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_trans_types.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_trans_types.java.i
index 17fd1dd..23aab20 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_trans_types.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/comp/_trans_types.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_locations.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_locations.java.i
index 46bda71..7522372 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_locations.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/file/_locations.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i
index 4db4ec7..fc81c2a 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_javac_catalog.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_library_location.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_library_location.java.i
index 42f99d1..04db2b4 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_library_location.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_library_location.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i
index 5c85fe5..17ca999 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jigsaw/_jigsaw_module_resolver.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i
index adb9089..0cd9395 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_reader.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i
index 024cac4..c31bfb1 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/jvm/_class_writer.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i
index 0859be4..8943db0 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_java_compiler.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option.java.i
index 24a063c..b785f22 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/main/_option.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i
index bbb6593..164bd8d 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/processing/_javac_processing_environment.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/javac.properties.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/javac.properties.i
index 9177cfc..3e3eca6 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/javac.properties.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/resources/javac.properties.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i
index 537a08b..b213efb 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/tree/_tree_info.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i
index 276968c..b1094a8 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_debug.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i
index 02c3ab6..908eaf0 100644
Binary files a/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i and b/langtools/.hg/store/data/src/share/classes/com/sun/tools/javac/util/_names.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/javax/lang/model/util/_module_resolver.java.i b/langtools/.hg/store/data/src/share/classes/javax/lang/model/util/_module_resolver.java.i
index 7c0c1d9..a1701a9 100644
Binary files a/langtools/.hg/store/data/src/share/classes/javax/lang/model/util/_module_resolver.java.i and b/langtools/.hg/store/data/src/share/classes/javax/lang/model/util/_module_resolver.java.i differ
diff --git a/langtools/.hg/store/data/src/share/classes/javax/tools/_standard_location.java.i b/langtools/.hg/store/data/src/share/classes/javax/tools/_standard_location.java.i
index 3a21749..11b64bb 100644
Binary files a/langtools/.hg/store/data/src/share/classes/javax/tools/_standard_location.java.i and b/langtools/.hg/store/data/src/share/classes/javax/tools/_standard_location.java.i differ
diff --git a/langtools/.hg/store/data/test/_makefile.i b/langtools/.hg/store/data/test/_makefile.i
index afa58d0..1d8c12e 100644
Binary files a/langtools/.hg/store/data/test/_makefile.i and b/langtools/.hg/store/data/test/_makefile.i differ
diff --git a/langtools/.hg/store/data/test/tools/apt/_basics/apt.sh.i b/langtools/.hg/store/data/test/tools/apt/_basics/apt.sh.i
index cc563c7..ba16114 100644
Binary files a/langtools/.hg/store/data/test/tools/apt/_basics/apt.sh.i and b/langtools/.hg/store/data/test/tools/apt/_basics/apt.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i b/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i
index 4f8769b..6be3fb7 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i and b/langtools/.hg/store/data/test/tools/javac/4846262/_test.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/6302184/_t6302184.sh.i b/langtools/.hg/store/data/test/tools/javac/6302184/_t6302184.sh.i
index 466e05c..160bf09 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/6302184/_t6302184.sh.i and b/langtools/.hg/store/data/test/tools/javac/6302184/_t6302184.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/6758789/_t6758789b.out.i b/langtools/.hg/store/data/test/tools/javac/6758789/_t6758789b.out.i
index ad687ab..a5e3578 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/6758789/_t6758789b.out.i and b/langtools/.hg/store/data/test/tools/javac/6758789/_t6758789b.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/_class_path_test/_class_path_test.sh.i b/langtools/.hg/store/data/test/tools/javac/_class_path_test/_class_path_test.sh.i
index 10b9672..37384a9 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/_class_path_test/_class_path_test.sh.i and b/langtools/.hg/store/data/test/tools/javac/_class_path_test/_class_path_test.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/_ext_dirs/_ext_dirs.sh.i b/langtools/.hg/store/data/test/tools/javac/_ext_dirs/_ext_dirs.sh.i
index 7c61065..de27646 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/_ext_dirs/_ext_dirs.sh.i and b/langtools/.hg/store/data/test/tools/javac/_ext_dirs/_ext_dirs.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/_missing_include.sh.i b/langtools/.hg/store/data/test/tools/javac/_missing_include.sh.i
index 9b29b06..9a72de6 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/_missing_include.sh.i and b/langtools/.hg/store/data/test/tools/javac/_missing_include.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/_protected_inner_class/_protected_inner_class.sh.i b/langtools/.hg/store/data/test/tools/javac/_protected_inner_class/_protected_inner_class.sh.i
index a5c9f10..cb1d1e2 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/_protected_inner_class/_protected_inner_class.sh.i and b/langtools/.hg/store/data/test/tools/javac/_protected_inner_class/_protected_inner_class.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/_t5090006/compiler.sh.i b/langtools/.hg/store/data/test/tools/javac/_t5090006/compiler.sh.i
index fe9d3ba..915e8e7 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/_t5090006/compiler.sh.i and b/langtools/.hg/store/data/test/tools/javac/_t5090006/compiler.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/api/7086261/_t7086261.java.i b/langtools/.hg/store/data/test/tools/javac/api/7086261/_t7086261.java.i
index 7d33edd..0ff6144 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/api/7086261/_t7086261.java.i and b/langtools/.hg/store/data/test/tools/javac/api/7086261/_t7086261.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/const_debug/_const_debug.sh.i b/langtools/.hg/store/data/test/tools/javac/const_debug/_const_debug.sh.i
index fd5b74a..f107f30 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/const_debug/_const_debug.sh.i and b/langtools/.hg/store/data/test/tools/javac/const_debug/_const_debug.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/diags/_check_resource_keys.java.i b/langtools/.hg/store/data/test/tools/javac/diags/_check_resource_keys.java.i
index 1d123c5..0b0249e 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/diags/_check_resource_keys.java.i and b/langtools/.hg/store/data/test/tools/javac/diags/_check_resource_keys.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/fatal_errors/_no_java_lang.sh.i b/langtools/.hg/store/data/test/tools/javac/fatal_errors/_no_java_lang.sh.i
index 96105ec..d5af616 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/fatal_errors/_no_java_lang.sh.i and b/langtools/.hg/store/data/test/tools/javac/fatal_errors/_no_java_lang.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/generics/6723444/_t6723444.out.i b/langtools/.hg/store/data/test/tools/javac/generics/6723444/_t6723444.out.i
index 46208df..06f198a 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/generics/6723444/_t6723444.out.i and b/langtools/.hg/store/data/test/tools/javac/generics/6723444/_t6723444.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/generics/7015430/_t7015430.out.i b/langtools/.hg/store/data/test/tools/javac/generics/7015430/_t7015430.out.i
index 48c3da1..254b6e6 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/generics/7015430/_t7015430.out.i and b/langtools/.hg/store/data/test/tools/javac/generics/7015430/_t7015430.out.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/inner_class_file/_driver.sh.i b/langtools/.hg/store/data/test/tools/javac/inner_class_file/_driver.sh.i
index 13bab3d..5f79385 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/inner_class_file/_driver.sh.i and b/langtools/.hg/store/data/test/tools/javac/inner_class_file/_driver.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i b/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i
index 7dbf3e7..ff2f114 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i and b/langtools/.hg/store/data/test/tools/javac/javazip/_test.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/links/links.sh.i b/langtools/.hg/store/data/test/tools/javac/links/links.sh.i
index 5e1d905..6c2090d 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/links/links.sh.i and b/langtools/.hg/store/data/test/tools/javac/links/links.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/newlines/_newlines.sh.i b/langtools/.hg/store/data/test/tools/javac/newlines/_newlines.sh.i
index 489b1e6..bd9f4cf 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/newlines/_newlines.sh.i and b/langtools/.hg/store/data/test/tools/javac/newlines/_newlines.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/processing/loader/test_close/_test_close.java.i b/langtools/.hg/store/data/test/tools/javac/processing/loader/test_close/_test_close.java.i
index 83edf52..403756d 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/processing/loader/test_close/_test_close.java.i and b/langtools/.hg/store/data/test/tools/javac/processing/loader/test_close/_test_close.java.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/stackmap/_t4955930.sh.i b/langtools/.hg/store/data/test/tools/javac/stackmap/_t4955930.sh.i
index 512904e..ae3f3fa 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/stackmap/_t4955930.sh.i and b/langtools/.hg/store/data/test/tools/javac/stackmap/_t4955930.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javac/unicode/_supplementary_java_i_d6.sh.i b/langtools/.hg/store/data/test/tools/javac/unicode/_supplementary_java_i_d6.sh.i
index 2ce8dbb..b0d5997 100644
Binary files a/langtools/.hg/store/data/test/tools/javac/unicode/_supplementary_java_i_d6.sh.i and b/langtools/.hg/store/data/test/tools/javac/unicode/_supplementary_java_i_d6.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javah/6257087/foo.sh.i b/langtools/.hg/store/data/test/tools/javah/6257087/foo.sh.i
index 1e407fc..d67a054 100644
Binary files a/langtools/.hg/store/data/test/tools/javah/6257087/foo.sh.i and b/langtools/.hg/store/data/test/tools/javah/6257087/foo.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javah/_const_macro_test.sh.i b/langtools/.hg/store/data/test/tools/javah/_const_macro_test.sh.i
index 61515da..56d60c5 100644
Binary files a/langtools/.hg/store/data/test/tools/javah/_const_macro_test.sh.i and b/langtools/.hg/store/data/test/tools/javah/_const_macro_test.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javah/_missing_param_class_test.sh.i b/langtools/.hg/store/data/test/tools/javah/_missing_param_class_test.sh.i
index 4d682d0..565aa07 100644
Binary files a/langtools/.hg/store/data/test/tools/javah/_missing_param_class_test.sh.i and b/langtools/.hg/store/data/test/tools/javah/_missing_param_class_test.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javah/_read_old_class.sh.i b/langtools/.hg/store/data/test/tools/javah/_read_old_class.sh.i
index 7b9f74e..9032c2c 100644
Binary files a/langtools/.hg/store/data/test/tools/javah/_read_old_class.sh.i and b/langtools/.hg/store/data/test/tools/javah/_read_old_class.sh.i differ
diff --git a/langtools/.hg/store/data/test/tools/javap/pathsep.sh.i b/langtools/.hg/store/data/test/tools/javap/pathsep.sh.i
index 9c00425..ee93807 100644
Binary files a/langtools/.hg/store/data/test/tools/javap/pathsep.sh.i and b/langtools/.hg/store/data/test/tools/javap/pathsep.sh.i differ
diff --git a/langtools/.hg/store/data/~2ehgignore.i b/langtools/.hg/store/data/~2ehgignore.i
index 8ac77b9..551d437 100644
Binary files a/langtools/.hg/store/data/~2ehgignore.i and b/langtools/.hg/store/data/~2ehgignore.i differ
diff --git a/langtools/.hg/store/data/~2ehgtags.i b/langtools/.hg/store/data/~2ehgtags.i
index ffba54e..a83bde5 100644
Binary files a/langtools/.hg/store/data/~2ehgtags.i and b/langtools/.hg/store/data/~2ehgtags.i differ
diff --git a/langtools/.hg/store/fncache b/langtools/.hg/store/fncache
index a6e7104..76121cb 100644
--- a/langtools/.hg/store/fncache
+++ b/langtools/.hg/store/fncache
@@ -8,7 +8,7 @@ data/src/share/classes/javax/lang/model/type/ReferenceType.java.i
data/src/share/classes/com/sun/tools/javac/code/TargetType.java.i
data/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java.i
data/test/tools/javac/diags/examples/UnreachableCatch.java.i
-data/test/tools/javac/generics/6245699/T6245699a.java.i
+data/test/tools/javac/generics/GenericAnonCtor.java.i
data/test/tools/javac/generics/diamond/7002837/T7002837.java.i
data/test/tools/javac/multicatch/model/Model01.java.i
data/test/com/sun/javadoc/AccessFrameTitle/AccessFrameTitle.java.i
@@ -18,45 +18,45 @@ data/test/tools/javac/cast/6548436/T6548436b.java.i
data/test/tools/javadoc/6958836/errs/Errors.java.i
data/test/tools/javac/diags/examples/ErrSyntheticNameConflict.java.i
data/test/tools/javac/InterfaceFieldParsing_1.java.i
+data/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java.i
data/test/tools/javac/T5024091/T5024091.java.i
data/test/com/sun/javadoc/testUseOption/UsedInC.java.i
data/src/share/opensource/javac/src/bin/javac.sh.i
data/make/test/lib/apt.sh.i
data/test/com/sun/javadoc/T6735320/SerialFieldTest.java.i
-data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out.i
data/test/tools/javac/typeAnnotations/newlocations/ClassExtends.java.i
data/test/tools/javac/T6247324.out.i
-data/test/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java.i
-data/test/tools/javac/multicatch/model/UnionTypeInfo.java.i
data/test/tools/javap/typeAnnotations/Visibility.java.i
data/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java.i
data/test/tools/apt/mirror/declaration/GetAnno.java.i
data/test/tools/javac/generics/typeargs/ThisArg.java.i
data/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java.i
-data/test/tools/javac/generics/UnsoundInference.java.i
+data/src/share/classes/com/sun/tools/javac/code/Symtab.java.i
data/test/tools/javac/DefiniteAssignment/DUTry.java.i
-data/test/tools/javac/ExtDirs/ext3/pkg2.jar.i
+data/src/share/classes/com/sun/mirror/type/VoidType.java.i
data/test/tools/javac/generics/7007615/acc2/p2/E.java.i
data/test/tools/javac/Diagnostics/7010608/Test.java.i
data/test/tools/javac/diags/examples/LocalEnum.java.i
data/src/share/classes/com/sun/tools/javah/Util.java.i
data/test/tools/javac/4846262/Test.out.i
-data/test/tools/javac/multicatch/Neg02.java.i
+data/test/tools/javac/processing/model/element/TestMissingElement2/Generator.java.i
data/test/tools/javac/danglingDep/DepX.java.i
data/test/tools/javac/api/6598108/T6598108.java.i
+data/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java.i
+data/test/tools/javac/7132880/T7132880.java.i
data/test/tools/javac/cast/6295056/T6295056.java.i
data/test/com/sun/javadoc/testDocRootInlineTag/TestDocRootTag.java.i
data/test/tools/javac/generics/6372782/AdditiveClosure.java.i
-data/test/tools/javah/T6893943.java.i
+data/src/share/classes/com/sun/javadoc/DocErrorReporter.java.i
data/test/tools/javac/diags/examples/WarnProcMessager/processors/AnnoProc.java.i
+data/test/tools/javac/api/T6345974.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest2.java.i
-data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out.i
-data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt.i
+data/test/tools/javac/synthesize/Integer.java.i
data/test/tools/javac/api/ToolProvider/ToolProviderTest1.java.i
data/make/netbeans/langtools/nbproject/standard-ide-actions.ent.i
data/make/tools/Jigsaw/JmodTask.java.i
-data/test/tools/javac/NonStaticFieldExpr1.java.i
-data/test/tools/javac/generics/typevars/T7040883.java.i
+data/test/tools/javac/6400872/C.java.i
+data/test/tools/javac/NullStaticQualifier.java.i
data/test/tools/javac/enum/LocalEnum.java.i
data/test/tools/javac/HexThree.java.i
data/src/share/classes/com/sun/tools/javac/code/TypeTags.java.i
@@ -67,27 +67,23 @@ data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes6.java.i
data/src/share/classes/com/sun/tools/javac/util/Abort.java.i
data/test/tools/javac/T6663588.java.i
data/test/tools/javac/api/6431257/package-info.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java.i
data/test/tools/javac/api/guide/TestMe.java.i
data/test/tools/javac/api/guide/Test.java.i
data/src/share/classes/com/sun/tools/javadoc/SourcePositionImpl.java.i
-data/test/tools/javac/warnings/Deprecation.java.i
-data/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java.i
data/src/share/classes/com/sun/tools/javac/util/Bits.java.i
data/src/share/classes/javax/tools/DiagnosticListener.java.i
-data/test/tools/javadoc/badSuper/BadSuper.java.i
data/test/tools/javac/T6294589.java.i
data/test/tools/javac/generics/inference/6278587/T6278587Neg.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/Test4c.out.i
data/test/com/sun/javadoc/testNestedInlineTag/testtaglets/GreenTaglet.java.i
data/test/tools/javap/NotPackagePrivateInterface.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java.i
-data/test/tools/javac/diags/examples/LongSVUID.java.i
+data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java.i
data/test/tools/javac/processing/model/util/elements/TestGetPackageOf.java.i
data/test/tools/javac/diags/examples/DuplicateCaseLabel.java.i
data/test/com/sun/javadoc/testHtmlStrongTag/TestHtmlStrongTag.java.i
-data/test/tools/javac/boxing/NoBoxingBool.java.i
data/test/tools/javac/processing/werror/WErrorGen.java.i
-data/test/tools/javac/generics/T4784219.java.i
data/test/tools/javac/Paths/Util.sh.i
data/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java.i
data/test/tools/javac/generics/7007615/acc2/p1/D.java.i
@@ -99,32 +95,36 @@ data/test/tools/javac/mandatoryWarnings/deprecated/Test3b.out.i
data/test/tools/javac/generics/inference/6611449/T6611449.out.i
data/make/jprt.config.i
data/src/share/classes/javax/lang/model/overview.html.i
+data/src/share/classes/com/sun/source/tree/MemberSelectTree.java.i
data/test/tools/javac/generics/6227936/Orig.java.i
data/test/tools/javac/api/T6407011.java.i
data/test/com/sun/javadoc/testDupParamWarn/pkg/Foo.java.i
data/test/tools/javac/typeAnnotations/failures/IndexArray.java.i
data/test/tools/javac/diags/examples/KindnameClass.java.i
+data/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java.i
+data/make/test/lib/classes.gold.txt.i
data/test/tools/javac/diags/examples/WarnProcMessager/WarnProcMessager.java.i
-data/test/tools/javadoc/6964914/Test.java.i
-data/test/tools/javac/warnings/FallThrough.lintAll.out.i
+data/test/tools/javac/6917288/GraphicalInstallerTest.java.i
data/test/tools/javac/generics/inference/6650759/T6650759a.java.i
data/test/tools/javac/importContext/anonPackage/bar/Baz.java.i
-data/test/tools/javac/annotations/neg/Cycle2.java.i
+data/test/tools/javac/api/6733837/T6733837.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/MethodWriter.java.i
+data/test/tools/javac/StringAppendAccessMethodOnLHS.java.i
data/test/tools/javac/diags/examples/PkgClashWithClass/p/q/C.java.i
-data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt.i
+data/test/tools/javac/generics/7151802/T7151802.java.i
data/test/tools/javac/api/T6265137.java.i
data/src/share/classes/com/sun/tools/javadoc/ParameterizedTypeImpl.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TaggedMethodFinder.java.i
data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used1/testfile.txt.i
-data/test/com/sun/javadoc/testUnnamedPackage/package.html.i
+data/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java.i
data/test/tools/javac/ConstBoolAppend.java.i
data/test/tools/javac/diags/examples/UnclosedCharLiteral.java.i
data/test/tools/javac/capture/Capture4.java.i
-data/test/tools/javac/T6224167.out.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java.i
data/test/tools/javac/T6227617.out.i
data/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java.i
data/src/share/classes/com/sun/javadoc/ConstructorDoc.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java.i
data/test/tools/javac/typeAnnotations/failures/common/rest/MissingAnnotationValue.out.i
data/test/com/sun/javadoc/testHtmlTableTags/pkg1/package-info.java.i
data/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java.i
@@ -134,6 +134,7 @@ data/test/tools/apt/Compile/golden.txt.i
data/test/tools/javac/diags/examples/OverrideStatic.java.i
data/src/share/classes/com/sun/source/tree/IfTree.java.i
data/test/tools/javadoc/annotations/shortcuts/pkg1/A.java.i
+data/test/tools/javac/T6366196.java.i
data/test/tools/javac/T6759996.java.i
data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface1.java.i
data/test/tools/javac/generics/6985719/T6985719e.java.i
@@ -143,14 +144,12 @@ data/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java.i
data/test/com/sun/javadoc/testHtmlTag/pkg1/C1.java.i
data/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java.i
data/test/tools/javac/T5090006/compiler.sh.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_5.java.i
+data/test/tools/javac/6257443/T6257443.java.i
data/test/tools/javac/T6370653.java.i
data/test/com/sun/javadoc/testCRLineSeparator/pkg/MyClass.java.i
data/test/tools/javac/failover/FailOver09.out.i
data/test/tools/javac/diags/examples/IncompatibleTypes1.java.i
data/test/com/sun/javadoc/testPackageDeprecation/FooDepr.java.i
-data/test/tools/javap/T6716452.java.i
data/test/tools/javac/innerClassFile/y/R2.java.i
data/test/tools/javac/generics/T5011073.java.i
data/test/com/sun/javadoc/testHtmlTableTags/pkg2/C4.java.i
@@ -160,30 +159,31 @@ data/test/tools/javac/diags/examples/CantRefBeforeConstr.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.out.i
data/test/tools/javac/api/T6265137a.java.i
data/test/tools/javac/generics/6294779/T6294779c.java.i
-data/test/tools/javac/processing/T6439826.java.i
+data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java.i
data/test/tools/javac/api/evalexpr/MemoryFileManager.java.i
data/test/tools/javac/6863465/T6863465d.out.i
-data/test/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java.i
data/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/E.java.i
data/test/tools/javac/BadOptimization/Switch1.java.i
data/test/tools/javac/T6180021/AbstractSub.java.i
data/test/tools/javac/SuperNew.java.i
data/src/share/classes/javax/tools/FileObject.java.i
-data/test/tools/javac/varargs/5088429/T5088429Neg02.out.i
+data/test/tools/javac/multicatch/Neg06.out.i
data/test/com/sun/javadoc/testNestedGenerics/TestNestedGenerics.java.i
data/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java.i
-data/test/tools/javac/typeAnnotations/newlocations/ClassParameters.java.i
data/test/tools/javac/quid/T6999438.java.i
data/test/tools/javac/4980495/static/p1/A1.java.i
data/test/tools/javac/modules/ModulePathTest02.java.i
data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes8.java.i
-data/test/tools/javac/generics/diamond/7030687/T7030687.out.i
+data/src/share/classes/javax/lang/model/element/Element.java.i
data/test/tools/javac/protectedAccess/ProtectedMemberAccess2.out.i
data/test/tools/javac/T6410706.java.i
data/src/share/classes/com/sun/tools/javadoc/DocEnv.java.i
data/test/tools/javac/generics/inference/7086586/T7086586b.java.i
data/test/tools/javac/failover/FailOver14.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java.i
+data/test/tools/javac/T6394563.warn.out.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeOptionalMemberWriter.java.i
+data/test/tools/javac/depDocComment/SuppressDeprecation.java.i
data/test/com/sun/javadoc/testDocFileDir/TestDocFileDir.java.i
data/test/tools/javac/generics/wildcards/6886247/T6886247_2.java.i
data/test/tools/javac/cast/6795580/T6795580.out.i
@@ -191,23 +191,21 @@ data/src/share/classes/com/sun/tools/javadoc/Comment.java.i
data/src/share/classes/com/sun/tools/javah/resources/SunOS_sparc.properties.i
data/src/share/classes/com/sun/tools/javac/api/JavacScope.java.i
data/test/tools/javac/generics/typevars/6182630/T6182630c.java.i
-data/test/tools/javac/diags/examples/AnonymousClass.java.i
data/src/share/classes/com/sun/source/tree/StatementTree.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ConstantsSummaryBuilder.java.i
-data/test/tools/javac/TryWithResources/TwrFlow.out.i
+data/src/share/classes/com/sun/tools/javah/TypeSignature.java.i
data/test/tools/javac/quid/QuotedIdent_BAD62.java.i
data/test/tools/javadoc/generics/supertypes/Main.java.i
-data/test/tools/javac/generics/inference/5003431/T5003431.java.i
data/test/tools/javac/diags/examples/ProcCantFindClass/ProcCantFindClass.java.i
data/test/tools/javac/Diagnostics/6862608/T6862608b.out.i
data/test/tools/javah/6572945/TestClass1.java.i
-data/test/tools/javac/generics/inference/5042462/T5042462.java.i
+data/test/tools/javac/generics/bridge1/C.java.i
data/test/tools/javac/TryWithResources/ResourceOutsideTry.out.i
data/test/tools/javac/generics/6372782/State.java.i
-data/test/tools/javac/processing/6634138/ExerciseDependency.java.i
+data/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java.i
data/test/tools/javac/generics/T4784207a.java.i
data/test/tools/javac/DefiniteAssignment/DUAssert.java.i
-data/test/tools/javac/types/CastTest.java.i
+data/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java.i
data/test/tools/javac/generics/6723444/T6723444.java.i
data/test/tools/javac/SynchronizedClass.sh.i
data/test/tools/apt/Options/Marker.java.i
@@ -215,35 +213,37 @@ data/test/tools/javac/enum/forwardRef/TestEnum6.java.i
data/test/tools/javac/generics/typevars/5060485/Pos.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.out.i
data/src/share/classes/javax/lang/model/util/TypeKindVisitor6.java.i
-data/src/share/classes/com/sun/tools/javac/code/Types.java.i
+data/test/tools/javac/CyclicInheritance.java.i
data/test/tools/javac/api/6437349/T6437349.java.i
data/test/tools/javac/ClassCycle/ClassCycle3a.java.i
data/test/tools/javac/MissingInclude.java.i
-data/test/tools/javac/multicatch/Neg01eff_final.java.i
+data/test/tools/javac/annotations/neg/Z11.java.i
data/test/tools/javac/generics/inference/6650759/T6650759f.java.i
-data/test/tools/javac/generics/6677785/T6677785.out.i
data/src/share/classes/sun/tools/javap/TrapData.java.i
data/test/tools/javac/generics/typevars/6569404/T6569404b.out.i
data/test/tools/javac/generics/wildcards/pos/CastTest.java.i
data/test/tools/javac/InnerTruth.java.i
-data/test/tools/javac/binaryCompat/T1.java.i
+data/make/netbeans/apt/build.xml.i
data/test/tools/javac/api/6440528/package-info.java.i
-data/test/tools/javac/diags/examples/DuplicateAnnotation.java.i
-data/test/tools/javadoc/6958836/Test.java.i
+data/test/com/sun/javadoc/testLinkOption/java/lang/StringBuilderChild.java.i
+data/test/tools/javac/generics/inference/6638712/T6638712d.out.i
data/test/tools/javac/generics/6476118/T6476118a.out.i
-data/test/tools/javac/FlatnameClash2.java.i
+data/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java.i
data/test/tools/javac/6304921/T6304921.out.i
data/src/share/classes/com/sun/mirror/type/EnumType.java.i
data/test/tools/javac/generics/Casting4.java.i
+data/test/tools/apt/mirror/type/EnumTyp.java.i
data/test/tools/javac/enum/ExplicitlyAbstractEnum1.java.i
data/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java.i
data/test/tools/javac/Diagnostics/6862608/T6862608a.java.i
data/test/tools/javac/generics/InheritanceConflict3.java.i
data/test/tools/javac/unicode/Unmappable.java.i
+data/test/com/sun/javadoc/AccessAsciiArt/p1/C.java.i
data/test/tools/javac/T5003235/T5003235a.out.i
+data/test/tools/javac/annotations/neg/DupTarget.java.i
+data/test/com/sun/javadoc/testThrowsTag/pkg/T1.java.i
data/test/tools/javac/ConstantValues/test_ff1.java.i
data/test/tools/javac/T5003235/T5003235b.java.i
-data/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java.i
data/test/tools/javac/generics/wildcards/neg/CastWarn8.java.i
data/test/tools/javac/T6326754.out.i
data/test/tools/javac/enum/6384542/T6384542a_5.out.i
@@ -251,8 +251,8 @@ data/test/tools/javac/ClassLit.java.i
data/test/com/sun/javadoc/testThrowsInheritence/I.java.i
data/test/tools/javac/DefiniteAssignment/T4720379.java.i
data/test/tools/javac/7129225/TestImportStar.java.i
-data/test/tools/javac/processing/model/element/TestMissingElement2/Generator.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn3.java.i
+data/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java.i
+data/test/tools/javac/generics/T6557954.java.i
data/test/tools/javac/enum/enumSwitch/EnumSwitch.java.i
data/test/tools/javac/ClassFileModifiers/ClassModifiers.java.i
data/test/tools/javac/generics/inference/T7015715.java.i
@@ -268,9 +268,10 @@ data/test/tools/javac/6521805/T6521805c.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/WriterFactoryImpl.java.i
data/src/share/classes/com/sun/source/tree/VariableTree.java.i
data/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java.i
data/test/tools/javac/Ambig3.java.i
data/src/share/classes/javax/lang/model/element/ModuleElement.java.i
-data/test/tools/javac/generics/wildcards/AssignmentSameType1.java.i
+data/test/tools/javac/HexFloatLiterals.java.i
data/test/tools/javac/multicatch/7030606/T7030606.java.i
data/test/tools/javac/nested/5009484/X.java.i
data/test/tools/javac/generics/6487370/T6487370.java.i
@@ -278,59 +279,59 @@ data/test/tools/javac/generics/syntax/6318240/Bar.java.i
data/test/tools/javac/tree/TreeKindTest.java.i
data/test/tools/javac/annotations/6550655/T6550655.java.i
data/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java.i
-data/test/tools/javac/api/6418694/T6418694.java.i
data/test/tools/javac/protectedAccess/p/SuperClass.java.i
data/test/com/sun/javadoc/AccessSkipNav/AccessSkipNav.java.i
data/src/share/classes/com/sun/tools/javac/comp/Resolve.java.i
data/test/tools/javac/processing/werror/WErrorLast.java.i
data/test/tools/javac/processing/warnings/UseImplicit/C1.java.i
-data/src/share/classes/com/sun/javadoc/DocErrorReporter.java.i
+data/test/tools/javah/T6893943.java.i
data/src/share/classes/javax/lang/model/element/PackageElement.java.i
data/test/tools/javac/processing/environment/TestSourceVersion.java.i
data/test/tools/apt/Compile/src/AndAhTwoClass.java.i
-data/test/tools/javac/diags/examples/MulticatchMustBeFinal.java.i
data/test/com/sun/javadoc/_template/Template.java.i
data/test/tools/javac/6394683/A.java.i
-data/test/tools/javac/generics/inference/6638712/T6638712b.out.i
+data/src/share/classes/com/sun/mirror/type/AnnotationType.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ValueTaglet.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java.i
data/test/tools/javac/generics/RefEqual.java.i
data/src/share/classes/com/sun/source/tree/BinaryTree.java.i
data/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java.i
-data/test/tools/javac/DefiniteAssignment/T4725725.java.i
+data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java.i
data/test/tools/javac/generics/UncheckedConstructor.java.i
data/src/share/classes/com/sun/tools/javac/jigsaw/JigsawModuleResolver.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Q.java.i
data/test/tools/javac/6840059/T6840059.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeRequiredMemberBuilder.java.i
data/test/tools/javac/generics/diamond/neg/Neg02.out.i
-data/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java.i
+data/test/tools/javac/generics/GetClass2.java.i
data/src/share/classes/com/sun/tools/javac/code/ModuleIdQuery.java.i
-data/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java.i
-data/test/tools/javadoc/6964914/TestUserDoclet.java.i
-data/test/tools/javac/generics/inference/7086586/T7086586.out.i
+data/test/tools/javac/varargs/6199075/T6199075.java.i
+data/src/share/classes/sun/tools/javap/AttrData.java.i
+data/test/tools/javac/diags/examples/ExceptAlreadyCaught.java.i
data/test/tools/javac/6734819/T6734819b.out.i
data/test/tools/javac/BadOptimization/Switch2.java.i
-data/test/tools/javac/ProtectedInnerClass/p1/ProtectedInnerClass1.java.i
+data/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java.i
data/test/tools/javac/policy/C.java.i
+data/test/tools/javac/processing/warnings/gold_unsp_warn.out.i
data/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPluralAdditional.java.i
-data/test/tools/javac/synthesize/Integer.java.i
+data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.out.i
data/test/tools/javac/diags/examples/InexactVarargsCall.java.i
data/test/tools/javac/mixedTarget/CompatibleAbstracts3.java.i
-data/test/tools/javac/ImportUnnamed/Dummy.java.i
+data/test/tools/javadoc/generics/throwsGeneric/expected.out.i
data/test/tools/javac/scope/6225935/Estatico4.java.i
data/test/tools/javac/diags/examples/InapplicableSymbols.java.i
-data/test/tools/javac/ClassLiterals/InnerClassLiterals.java.i
+data/test/tools/javac/annotations/neg/NoAnnotationMethods.java.i
data/test/tools/javac/diags/examples/KindnameConstructor.java.i
+data/test/tools/javac/mandatoryWarnings/unchecked/B.java.i
data/test/tools/javac/enum/T5081785.java.i
+data/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java.i
+data/test/tools/javac/generics/syntax/6318240/BarNeg1.java.i
data/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java.i
data/test/tools/javac/generics/wildcards/T5097548.java.i
data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/package-info.java.i
data/test/tools/javac/BadOptimization/DeadCode5.java.i
-data/test/tools/javac/multicatch/Neg02eff_final.out.i
data/test/tools/javac/6341866/A.java.i
data/src/share/classes/com/sun/source/tree/EnhancedForLoopTree.java.i
-data/test/tools/javac/modules/ModulePermitsAttributeTest01.java.i
data/test/tools/javac/diags/examples/EnumLabelUnqualified.java.i
data/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.out.i
data/test/tools/javac/T5048776a.out.i
@@ -340,14 +341,18 @@ data/src/share/classes/javax/lang/model/UnknownEntityException.java.i
data/src/share/classes/com/sun/source/tree/ModuleExportTree.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.out.i
data/test/tools/javac/typeAnnotations/attribution/Scopes.java.i
-data/test/tools/javac/generics/T6481655.java.i
+data/test/tools/javac/foreach/StaticBlock.java.i
data/test/tools/javac/api/T6357331.java.i
data/src/share/classes/com/sun/tools/javac/jvm/Items.java.i
+data/test/tools/javac/typeAnnotations/failures/Scopes.java.i
data/test/tools/javac/cast/7123100/T7123100d.java.i
+data/test/tools/javac/ClassLiterals/LiteralInterfaceImpl.java.i
data/test/tools/javac/generics/inference/6302954/T6476073.java.i
+data/src/share/classes/javax/tools/StandardJavaFileManager.java.i
data/test/tools/javac/modules/ModuleRequiresAttributeTest01.java.i
data/test/tools/javac/generics/diamond/neg/Neg10.out.i
-data/test/tools/javac/processing/messager/6362067/T6362067.java.i
+data/src/share/classes/com/sun/mirror/type/TypeMirror.java.i
+data/test/tools/javac/FinalInitializer_2.java.i
data/test/tools/javac/annotations/pos/Members.java.i
data/test/tools/javac/generics/6910550/T6910550a.java.i
data/src/share/classes/javax/lang/model/type/TypeKind.java.i
@@ -357,8 +362,6 @@ data/test/tools/javac/6402516/CheckIsAccessible.java.i
data/test/com/sun/javadoc/MetaTag/p1/C1.java.i
data/test/tools/javac/generics/T6751514.java.i
data/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java.i
-data/test/tools/javac/api/6437999/Utf8.java.i
-data/test/tools/apt/mirror/declaration/pkg1/AnInterface.java.i
data/src/share/classes/com/sun/source/tree/Tree.java.i
data/test/tools/javac/QualifiedAccess/pack1/P1.java.i
data/test/tools/javac/generics/typevars/6569404/T6569404c.java.i
@@ -367,12 +370,10 @@ data/src/share/classes/com/sun/tools/doclets/formats/html/PackageUseWriter.java.
data/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java.i
data/test/tools/javap/typeAnnotations/NewArray.java.i
data/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.java.i
-data/test/tools/javac/generics/rare/Rare2.java.i
data/test/tools/javac/AccessMethods/ConstructorAccess.java.i
data/test/tools/javac/ForwardReference/T6676362b.java.i
data/test/tools/apt/Discovery/servicesPhantomTouch.i
-data/test/tools/javac/completion/C.out.i
-data/test/tools/javac/processing/6430209/test0.java.i
+data/test/tools/javac/cast/6558559/T6558559b.java.i
data/test/tools/javac/inheritedAccess/P1/pub.java.i
data/test/tools/javac/T6361619.java.i
data/test/tools/javac/generics/diamond/pos/Pos07.java.i
@@ -387,7 +388,6 @@ data/test/tools/javac/implicitThis/WhichImplicitThis4.java.i
data/test/tools/apt/Misc/servicesMisc.i
data/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java.i
data/make/netbeans/doclets/README.i
-data/src/share/classes/com/sun/tools/apt/main/Main.java.i
data/src/share/classes/com/sun/tools/javah/JavahTask.java.i
data/test/tools/javac/7003595/T7003595b.java.i
data/test/tools/javac/api/T6437138.java.i
@@ -395,11 +395,11 @@ data/test/tools/javac/ConditionalArgTypes_1.java.i
data/test/tools/javac/boxing/NoBoxingByte.java.i
data/test/tools/javac/NonStaticFieldExpr2.sh.i
data/src/share/classes/com/sun/tools/javap/Options.java.i
-data/test/tools/javac/miranda/6964669/pkg/B.java.i
+data/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java.i
data/src/share/classes/com/sun/source/tree/AnnotatedTypeTree.java.i
data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C3.java.i
-data/test/tools/javac/generics/6956758/T6956758pos.java.i
-data/test/tools/javac/ConstCharAppend.java.i
+data/test/tools/javac/boxing/NoBoxingFloat.java.i
+data/test/tools/javac/AnonInnerException_2.java.i
data/test/tools/apt/Basics/p1/p2/C1.java.i
data/test/tools/javac/SynthName2.java.i
data/test/tools/javac/annotations/neg/Constant.java.i
@@ -410,32 +410,34 @@ data/test/tools/javac/LabelHiding_1.java.i
data/src/share/classes/com/sun/tools/javac/code/Kinds.java.i
data/src/share/classes/com/sun/source/tree/Scope.java.i
data/test/tools/javac/6330997/T6330997.java.i
-data/test/tools/javadoc/enum/docComments/pkg1/Operation.java.i
data/test/tools/javac/ClassLiterals/LiteralInterface_3.java.i
data/test/tools/javac/util/list/TList.java.i
data/test/com/sun/javadoc/testParamTaglet/pkg/Parent.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletWriter.java.i
data/test/tools/javac/diags/examples/ApplicableMethodFound1.java.i
data/test/tools/javac/rawDiags/Note.java.i
-data/test/tools/javadoc/generics/genericSuper/expected.out.i
data/test/com/sun/javadoc/testBadSourceFile/C1.java.i
+data/test/tools/javac/treepostests/TreePosTest.java.i
+data/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java.i
data/test/tools/javac/diags/examples/ProcPackageDoesNotExist/ProcPackageDoesNotExist.java.i
data/test/tools/javac/diags/examples/EmptyIf.java.i
data/test/tools/javac/InheritedPrivateImpl.java.i
data/src/share/classes/javax/annotation/processing/FilerException.java.i
-data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out.i
+data/test/tools/javac/fatalErrors/NoJavaLang.sh.i
data/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.out.i
-data/make/conf/checkstyle-langtools.xml.i
+data/test/tools/javac/6627362/x/Object.java.i
data/test/tools/javac/InterfaceMemberClassModifiers.java.i
data/test/tools/javac/api/6557752/T6557752.java.i
-data/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java.i
+data/test/tools/javac/generics/inference/7086601/T7086601a.java.i
data/test/tools/javac/generics/inference/6650759/T6650759h.java.i
-data/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java.i
+data/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java.i
+data/src/share/classes/javax/annotation/processing/SupportedOptions.java.i
data/test/tools/javac/generics/GenericMerge.java.i
data/test/tools/javac/typeAnnotations/failures/common/wildcards/InvalidLocation.java.i
+data/test/tools/javac/api/6440333/T6440333.java.i
data/test/tools/javac/util/filemanager/TestName.java.i
data/test/tools/javac/depOverrides/doccomment/R.java.i
-data/test/tools/apt/Compile/Rounds.java.i
+data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out.i
data/test/com/sun/javadoc/testJavascript/TestJavascript.java.i
data/test/tools/javac/diags/examples/ImportRequiresCanonical/p/Base.java.i
data/test/tools/javac/policy/test1/D.java.i
@@ -447,7 +449,6 @@ data/make/test/HelloWorld.java.i
data/src/share/classes/com/sun/tools/javadoc/RootDocImpl.java.i
data/test/tools/javac/generics/odersky/BadTest.java.i
data/test/tools/javac/DivByZero.java.i
-data/test/tools/javap/T7004698.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java.i
data/test/tools/javac/generics/inference/6240565/T6240565.java.i
data/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java.i
@@ -456,22 +457,25 @@ data/test/tools/javac/diags/examples/IllegalNonAsciiDigit.java.i
data/test/tools/javac/processing/errors/TestFatalityOfParseErrors.java.i
data/test/tools/javac/api/6431435/A.java.i
data/test/tools/javac/diags/examples/OperatorCantBeApplied1.java.i
-data/test/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java.i
data/test/tools/javac/annotations/neg/Z15.java.i
data/src/share/classes/com/sun/tools/javac/api/JavacTool.java.i
data/test/com/sun/javadoc/testGroupOption/pkg2/C.java.i
data/test/tools/javac/depOverrides/annotation/I.java.i
+data/test/tools/javac/7132880/T7132880.out.i
data/test/tools/apt/Misc/misc.sh.i
data/test/tools/javac/depOverrides/doccomment/I.java.i
data/test/tools/javac/ExtDirs/ExtDirs.sh.i
-data/test/tools/javac/varargs/T7013865.java.i
+data/test/tools/javac/generics/wildcards/pos/InstanceOf.java.i
+data/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java.i
data/src/share/classes/com/sun/tools/javah/JavahFileManager.java.i
data/test/tools/javac/annotations/neg/Z16.java.i
data/test/tools/javac/processing/options/testPrintProcessorInfo/Test.out.i
data/src/share/classes/com/sun/javadoc/MemberDoc.java.i
+data/test/tools/javac/boxing/NoBoxingLong.java.i
+data/test/tools/javac/failover/FailOver12.java.i
data/src/share/classes/com/sun/tools/javac/util/FatalError.java.i
data/test/tools/javac/diags/examples/DiamondNotSupported.java.i
-data/test/tools/javac/innerClassFile/x/C.java.i
+data/test/tools/javac/OverrideChecks/T4720356b.java.i
data/src/share/classes/javax/tools/OptionChecker.java.i
data/test/tools/javac/diags/examples/UnclosedComment.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java.i
@@ -489,33 +493,31 @@ data/test/tools/javac/cast/6219964/T6219964.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateAnnotationValue.java.i
data/test/tools/javac/StringsInSwitch/StringSwitches.java.i
data/test/tools/javac/ObjectMethodRefFromInterface.java.i
-data/test/tools/javac/links/T.java.i
+data/src/share/classes/com/sun/tools/javac/resources/legacy.properties.i
data/test/com/sun/javadoc/AccessAsciiArt/p1/subpkg/SSC.java.i
data/test/tools/javac/cast/6211853/T6211853.java.i
data/test/tools/javac/generics/wildcards/neg/Capture.java.i
data/test/tools/javac/generics/7007615/T7007615.java.i
data/test/tools/javac/typeAnnotations/newlocations/MethodTypeParameters.java.i
-data/test/tools/javac/diags/examples/InitializerMustComplete.java.i
+data/test/tools/javac/diags/examples/ArrayAndVarargs.java.i
data/test/tools/javac/generics/7034511/T7034511b.out.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test5b.out.i
data/test/tools/javac/generics/compat/OverrideBridge1.java.i
data/test/tools/javac/generics/Multibound1.java.i
+data/test/tools/javac/7079713/TestCircularClassfile.java.i
data/test/tools/javac/diags/examples/OverrideUncheckedThrown.java.i
data/src/share/classes/com/sun/tools/classfile/ModuleMemberTable_attribute.java.i
data/test/tools/javac/processing/errors/TestReturnCode.java.i
-data/test/tools/javac/cast/6558559/T6558559a.java.i
-data/test/tools/javac/TryWithResources/BadTwrSyntax.out.i
data/test/tools/javac/TryWithResources/TwrSuppression.java.i
data/test/tools/javac/generics/typevars/5061359/Base.java.i
-data/test/tools/javac/ClassFileModifiers/MemberModifiers.out.i
data/test/tools/javac/CyclicInheritance6/p1/A.java.i
-data/test/tools/javac/DuplicateClass2.java.i
+data/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java.i
data/test/tools/javac/generics/6245699/T6245699c.java.i
data/test/tools/javac/varargs/7042566/T7042566.java.i
data/test/tools/javac/7023703/T7023703pos.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.out.i
+data/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java.i
data/test/tools/javap/classfile/6888367/T6888367.java.i
-data/test/tools/javac/policy/test1/A.java.i
+data/test/tools/javac/generics/6985719/T6985719b.java.i
data/test/tools/javac/generics/6531075/T6531075.java.i
data/test/com/sun/javadoc/testBadSourceFile/C2.java.i
data/test/tools/javac/diags/examples/ElseWithoutIf.java.i
@@ -527,21 +529,21 @@ data/test/tools/javac/generics/diamond/neg/Neg05.java.i
data/test/tools/javac/Paths/6638501/WsCompileExample.java.i
data/test/tools/javac/diags/examples/BadSourceFileHeader/sourcepath/p/A.java.i
data/test/tools/javac/typeAnnotations/newlocations/ConstructorTypeArgs.java.i
-data/test/tools/javac/processing/filer/TestValidRelativeNames.java.i
-data/test/tools/javac/depOverrides/annotation/B3.java.i
+data/test/com/sun/javadoc/testHref/pkg/C3.java.i
data/src/share/classes/com/sun/mirror/util/TypeVisitor.java.i
data/test/tools/javap/stackmap/T6271292.out.i
data/test/tools/javac/TryWithResources/ResourceOutsideTry.java.i
data/test/com/sun/javadoc/testMemberInheritence/pkg/SubClass.java.i
data/src/share/classes/com/sun/tools/javac/file/ZipFileIndexEntry.java.i
data/test/com/sun/javadoc/testTitleInHref/pkg/Interface.java.i
+data/test/tools/apt/mirror/declaration/PackageDecl.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test4c.out.i
data/src/share/classes/javax/lang/model/element/ElementKind.java.i
data/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java.i
data/test/tools/javac/depOverrides/doccomment/P.java.i
-data/test/tools/apt/mirror/util/Overrides.java.i
+data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.out.i
data/test/tools/javac/generics/CyclicInheritance5.java.i
-data/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out.i
+data/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java.i
data/test/tools/javac/diags/examples/CyclicInheritance.java.i
data/test/tools/javac/6402516/TestLocalElements.java.i
data/test/tools/javac/depOverrides/annotation/A.java.i
@@ -559,43 +561,43 @@ data/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotation
data/src/share/classes/com/sun/tools/classfile/Dependencies.java.i
data/test/tools/javac/api/6400303/T6400303.java.i
data/test/tools/javac/miranda/4711056/T3.java.i
+data/test/tools/javac/InitializerCompletion_3.java.i
data/test/tools/apt/mirror/declaration/pkg1/AnAnnoType.java.i
data/test/tools/javac/FaultySignature.java.i
data/test/com/sun/javadoc/ValidHtml/p1/C.java.i
data/test/tools/javac/InconsistentInheritedSignature.java.i
data/src/share/classes/com/sun/source/tree/TryTree.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn11.java.i
+data/src/share/classes/com/sun/source/tree/LabeledStatementTree.java.i
+data/test/tools/javac/Diagnostics/6722234/T6722234d.java.i
data/test/tools/javac/warnings/6747671/T6747671.java.i
data/make/tools/CompileProperties/CompilePropertiesTask.java.i
data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor7.java.i
data/src/share/classes/com/sun/tools/javac/code/ModuleId.java.i
data/test/tools/apt/mirror/declaration/InterfaceDecl.java.i
data/test/tools/javadoc/annotations/annotateParams/pkg1/A.java.i
+data/src/share/classes/com/sun/source/tree/ImportTree.java.i
data/test/tools/javac/api/TestGetTree.java.i
data/test/tools/javac/enum/forwardRef/T6425594.java.i
data/test/tools/javac/DefiniteAssignment/DALoop1.java.i
data/test/tools/javac/staticImport/Shadow.java.i
-data/test/tools/javac/processing/6350124/Marker.java.i
data/test/tools/javac/CompoundBox.java.i
-data/test/tools/javap/typeAnnotations/Presence.java.i
data/test/tools/apt/Discovery/servicesTweedle.i
data/test/tools/javac/resolve/Candidate.java.i
data/test/tools/javac/diags/examples/KindnameInstanceInit.java.i
data/test/tools/javac/generics/6192945/Neg2.java.i
-data/test/tools/javac/miranda/6964669/pkg/C.java.i
+data/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/ClassBuilder.java.i
-data/test/tools/javac/TryWithResources/T7022711.java.i
-data/test/tools/javac/diags/examples/SunApiFilename.java.i
data/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java.i
data/src/share/classes/javax/lang/model/util/Types.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateAnnotationValue.out.i
+data/test/tools/javac/T5048776.java.i
data/src/share/classes/com/sun/tools/javac/code/Scope.java.i
data/src/share/classes/com/sun/tools/javap/Main.java.i
data/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java.i
data/src/share/classes/com/sun/source/tree/SynchronizedTree.java.i
data/test/tools/javac/diags/examples/TryResourceThrowsInterruptedExc.java.i
-data/test/tools/javac/processing/environment/round/BuriedAnnotations.java.i
+data/test/tools/apt/Compile/servicesRound1.i
data/test/tools/javac/diags/examples/EnumCantBeInstantiated.java.i
data/test/tools/javac/diags/examples/NeitherConditionalSubtype.java.i
data/test/tools/javac/InnerNamedConstant_1.java.i
@@ -609,7 +611,6 @@ data/test/tools/javac/generics/inference/6938454/T6938454b.java.i
data/test/tools/javac/6902720/Test.java.i
data/test/tools/javac/diags/examples/InnerClassCantHaveStatic.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test4b.out.i
-data/src/share/classes/com/sun/tools/javah/Mangle.java.i
data/test/tools/javac/diags/examples/EnumAsIdentifier2.java.i
data/test/com/sun/javadoc/testSupplementary/TestSupplementary.java.i
data/src/share/classes/com/sun/tools/javac/jvm/Pool.java.i
@@ -617,11 +618,12 @@ data/test/com/sun/javadoc/testThrowsInheritence/C.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/TreeWriter.java.i
data/test/tools/javac/6400872/T6400872.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/VarArgs.java.i
-data/test/tools/javac/failover/FailOver11.java.i
+data/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java.i
data/test/tools/javac/DefiniteAssignment/T4718134.java.i
data/make/test/bootstrap/javac.sh.i
data/src/share/classes/com/sun/source/util/package-info.java.i
data/test/tools/javac/diags/examples/CantReturnValueForVoid.java.i
+data/test/tools/javac/annotations/neg/Z1.java.i
data/test/tools/javac/generics/6359951/T6359951.out.i
data/test/tools/javac/varargs/6313164/T6313164.out.i
data/src/share/bin/launcher.sh-template.i
@@ -630,17 +632,18 @@ data/src/share/classes/com/sun/tools/javac/parser/JavacParser.java.i
data/test/tools/javac/diags/examples/UnmatchedProcessorOptions/UnmatchedProcessorOptions.java.i
data/test/com/sun/javadoc/JavascriptWinTitle/package-list.i
data/test/tools/javac/6734819/T6734819a.java.i
+data/test/tools/javac/generics/syntax/6318240/BarNeg2a.java.i
data/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java.i
data/test/tools/javac/6342411/a/Pub.java.i
+data/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java.i
data/test/tools/apt/Discovery/Dee.java.i
-data/test/tools/javac/generics/inference/6838943/T6838943.java.i
-data/test/tools/javac/modules/ModuleProvidesAttributeTest01.java.i
-data/test/tools/javac/annotations/neg/MemberOver.java.i
+data/src/share/classes/com/sun/tools/javac/comp/AttrContext.java.i
+data/test/tools/javac/enum/enumSwitch/Color2.java.i
data/test/tools/javac/danglingDep/Test1.out.i
-data/test/com/sun/javadoc/testBackSlashInLink/C.java.i
+data/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java.i
data/test/tools/javap/T6305779.java.i
+data/test/tools/javadoc/parser/7091528/T7091528.java.i
data/test/tools/javac/generics/diamond/7030150/Pos02.java.i
-data/test/tools/javac/api/T6430241.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/package.html.i
data/test/tools/javac/TryWithResources/TwrLint.out.i
data/test/tools/javac/ClassLiterals/InitializeTarget.java.i
@@ -648,21 +651,20 @@ data/src/share/classes/com/sun/tools/javac/main/Main.java.i
data/src/share/classes/com/sun/mirror/apt/Filer.java.i
data/src/share/classes/com/sun/source/tree/PrimitiveTypeTree.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Wildcards.java.i
-data/test/tools/javac/processing/model/util/Superless.java.i
-data/test/tools/javah/6572945/gold/jni.file.3.i
+data/test/tools/javac/NameClash/a/One.java.i
data/test/com/sun/javadoc/testRelativeLinks/pkg/C.java.i
data/test/tools/javac/enum/FauxSpecialEnum1.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AnnotationTypeBuilder.java.i
-data/test/tools/javac/NonStaticFinalVar.java.i
-data/test/tools/javah/ConstMacroTest.sh.i
+data/test/tools/javac/annotations/neg/ArrayLit.java.i
data/test/tools/javah/6572945/gold/jni.file.2.i
-data/test/tools/javac/protectedInner/mypackage/Superclass.java.i
-data/test/tools/javac/ClassPathTest/ClassPathTest2.java.i
+data/test/tools/javac/fatalErrors/NoJavaLang.out.i
+data/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java.i
data/test/tools/javap/T4501661.java.i
data/test/com/sun/javadoc/testPackagePage/TestPackagePage.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/InheritableTaglet.java.i
+data/test/tools/javac/modules/ModuleAttributeTest01.java.i
data/test/tools/javac/ExtDirs/ext3/pkg1.jar.i
-data/test/com/sun/javadoc/testTaglets/TestTaglets.java.i
+data/src/share/classes/com/sun/tools/javadoc/SerializedForm.java.i
data/test/tools/javac/diags/examples/VarMightAlreadyBeAssigned.java.i
data/test/tools/javac/T6557865.java.i
data/test/com/sun/javadoc/testTagInheritence/firstSentence/B.java.i
@@ -672,12 +674,10 @@ data/test/tools/javac/6440583/T6440583.java.i
data/test/tools/javac/InnerClassesAttribute/Outside.class.i
data/test/tools/javac/typeAnnotations/failures/AnnotationVersion.out.i
data/src/share/classes/com/sun/tools/javah/MainDoclet.java.i
-data/test/tools/javac/cast/6467183/T6467183a.out.i
+data/test/tools/javac/modules/RequiresServiceTest01.java.i
data/test/tools/javac/generics/T4695415.java.i
-data/test/tools/javac/generics/inference/6650759/T6650759e.java.i
data/test/tools/javac/generics/inference/6638712/T6638712e.java.i
-data/test/tools/javac/diags/examples/ProcessorNotFound.java.i
-data/test/tools/apt/Compile/ErrorAPF.java.i
+data/src/share/classes/com/sun/tools/javac/api/Messages.java.i
data/src/share/classes/javax/annotation/processing/Messager.java.i
data/test/tools/javac/LocalClasses_2.sh.i
data/test/tools/javac/staticImport/ImportInherit.java.i
@@ -692,34 +692,37 @@ data/src/share/classes/com/sun/tools/doclets/internal/toolkit/Content.java.i
data/test/tools/javac/generics/6711619/T6711619a.java.i
data/test/tools/javac/generics/inference/6356673/T6365166.java.i
data/test/tools/javac/enum/DA1.java.i
-data/test/tools/javac/diags/examples/MethodDoesNotOverride.java.i
+data/test/tools/apt/Compile/HelloWorld.java.i
data/make/netbeans/apt/README.i
data/make/test/HelloWorld.apt.gold.txt.i
data/test/tools/javac/diags/examples/VarargsPlural/VarargsFilename.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/UsedClass.java.i
data/src/share/classes/javax/lang/model/type/PrimitiveType.java.i
-data/test/tools/javac/classreader/T7031108.java.i
-data/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java.i
+data/test/tools/javap/T4876942.java.i
+data/test/tools/javac/T6356217/T6356217.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java.i
+data/test/tools/javac/6402516/CheckClass.java.i
data/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java.i
data/test/tools/apt/Basics/goldenAggregate.txt.i
data/test/tools/javac/processing/model/element/TestAnonClassNames.java.i
-data/test/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java.i
+data/test/tools/javac/generics/6245699/T6245699a.java.i
data/test/tools/javac/diags/examples/LambdaNotSupported.java.i
-data/test/tools/javac/modules/RequiresServiceTest01.java.i
data/make/test/bootstrap/javadoc.sh.i
-data/test/tools/apt/Compile/WarnAPF.java.i
-data/test/tools/javac/meth/XlintWarn.java.i
+data/src/share/classes/com/sun/source/util/TaskListener.java.i
+data/test/tools/javac/generics/GenLit1.java.i
+data/test/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java.i
+data/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java.i
data/test/tools/javac/varargs/Varargs1.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexFrameWriter.java.i
data/src/share/classes/com/sun/tools/javah/resources/Linux_sparc.properties.i
-data/test/tools/javac/EmptyDocComments.java.i
data/test/tools/javac/T6435291/T.class.i
-data/test/tools/javac/TryWithResources/TwrInference.java.i
data/test/tools/javac/diags/examples/UncheckedFilename.java.i
-data/test/tools/javadoc/dupOk/sp2/p/B.java.i
+data/test/tools/javadoc/dupOk/sp1/p/A.java.i
+data/src/share/classes/com/sun/tools/javac/util/Context.java.i
data/test/tools/javac/processing/filer/foo/bar/package-info.java.i
data/test/tools/javac/api/TestResolveIdent.java.i
data/test/tools/javac/T6247324.java.i
+data/test/tools/javac/T7142672/Test2.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkOutput.java.i
data/test/tools/javac/diags/examples/DiamondRedundantArgs1.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/SplitIndexWriter.java.i
@@ -727,38 +730,33 @@ data/test/tools/javac/annotations/neg/Z4.java.i
data/test/tools/javac/StoreClass.java.i
data/test/tools/javac/cast/6358534/T6358534.java.i
data/test/tools/javac/T6458749.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java.i
-data/src/share/classes/com/sun/source/tree/ModuleQueryTree.java.i
-data/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPlural.java.i
-data/test/tools/javac/generics/inference/6638712/T6638712a.out.i
-data/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java.i
-data/test/tools/javac/diags/examples/ImproperTypeInnerRawParam.java.i
+data/test/tools/javap/T4501660.java.i
+data/test/tools/javac/DefiniteAssignment/DUBeforeDefined2.java.i
data/test/tools/javadoc/generics/wildcards/Main.java.i
-data/src/share/classes/com/sun/source/tree/CatchTree.java.i
data/test/tools/javac/cast/6507317/T6507317.java.i
data/test/tools/javac/annotations/pos/Primitives.java.i
data/test/tools/javac/ImportUnnamed/foo/A.java.i
data/test/tools/javac/api/TestResolveError.java.i
data/test/tools/javac/ArrayCloneCodeGen.java.i
data/test/com/sun/javadoc/testUseOption/C.java.i
+data/test/tools/javac/typeAnnotations/failures/target/Constructor.out.i
data/test/tools/javac/processing/6994946/SyntaxErrorTest.java.i
data/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java.i
data/test/tools/javac/synthesize/Void.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/PackageSummaryBuilder.java.i
-data/test/tools/javac/p1/BS.java.i
+data/test/tools/javac/generics/wildcards/UnboundArray.java.i
data/test/tools/apt/Scanners/Scanner.java.i
data/test/tools/javac/abstract/T3.java.i
data/test/com/sun/javadoc/testSourceTab/SingleTab/C.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/RawHtml.java.i
data/test/tools/javac/InterfaceOverrideFinal.java.i
-data/test/tools/javac/generics/7022054/T7022054neg1.java.i
-data/test/tools/javadoc/annotations/defaults/expected.out.i
+data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded1/testfile.txt.i
data/test/tools/apt/Basics/apt.sh.i
data/src/share/classes/com/sun/tools/javac/util/Filter.java.i
data/test/tools/javac/miranda/T4666866.out.i
data/test/tools/javac/nested/5009484/Y.java.i
data/test/tools/javac/diags/examples/ExceptNeverThrown.java.i
-data/test/tools/javac/InnerNamedConstant_2.out.i
+data/test/tools/javac/BadAnnotation.java.i
data/test/tools/javac/unicode/UnicodeCommentDelimiter.java.i
data/test/tools/apt/Compile/servicesStaticApf.i
data/test/tools/javadoc/generics/tparamCycle/Main.java.i
@@ -769,10 +767,7 @@ data/test/tools/javac/generics/BridgeClash.java.i
data/test/tools/javac/diags/examples/ImportRequiresCanonical/ImportRequiresCanonical.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkInfo.java.i
data/test/tools/javac/ExtendsAccess/p/ExtendsAccess.java.i
-data/test/tools/javap/typeAnnotations/ClassLiterals.java.i
-data/test/tools/javadoc/annotations/annotatePackage/Main.java.i
data/test/tools/javac/IllegallyOptimizedException.java.i
-data/test/tools/javac/modules/DirectiveTest.java.i
data/test/tools/apt/Discovery/Empty.java.i
data/test/tools/javac/diags/examples/WarnSyntheticNameConflict.java.i
data/test/tools/javac/Diagnostics/6799605/T6799605.java.i
@@ -787,10 +782,9 @@ data/test/tools/javac/multicatch/Pos10.java.i
data/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties.i
data/test/tools/javac/multicatch/Pos06.java.i
data/test/tools/javac/NonAmbiguousField/two/Child.java.i
-data/src/share/classes/com/sun/tools/javac/main/Option.java.i
data/src/share/classes/com/sun/tools/javah/LLNI.java.i
data/test/tools/javac/DefiniteAssignment/T4718142.java.i
-data/test/tools/javac/generics/inference/6650759/T6650759l.java.i
+data/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java.i
data/test/tools/javac/6342411/a/Base.java.i
data/test/tools/javac/meth/InvokeDynTrans.out.i
data/test/tools/javac/typeAnnotations/failures/LintCast.out.i
@@ -800,33 +794,35 @@ data/test/tools/javac/ImportCycle/foo/Middle.java.i
data/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java.i
data/test/com/sun/javadoc/testSourceTab/TestSourceTab.java.i
data/test/tools/javadoc/annotations/shortcuts/pkg1/Marker.java.i
+data/test/tools/javac/diags/examples/IllegalComboModifiers.java.i
data/test/tools/javac/meth/MakeNegTests.sh.i
data/test/tools/javac/OverrideChecks/6199153/T6199153.out.i
-data/test/tools/javac/SynthName1.java.i
data/test/com/sun/javadoc/testCmndLineClass/pkg1/C1.java.i
-data/test/tools/javac/SuperMeth.java.i
+data/test/tools/javac/SuperNew2.java.i
+data/test/tools/javac/api/6421756/T6421756.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java.i
data/test/tools/javac/InterfaceInInner.out.i
+data/make/netbeans/apt/nbproject/project.xml.i
data/test/tools/javac/ForwardReference/ForwardReference_4.java.i
data/test/tools/javac/diags/examples/NotWithinBounds.java.i
+data/make/tools/anttasks/GenStubsTask.java.i
data/test/tools/javac/enum/T6675483.java.i
data/make/build.properties.i
data/test/tools/javac/OverrideChecks/T4720359a.java.i
data/test/tools/javac/ExprQualifiedType.java.i
data/test/tools/javac/generics/syntax/6318240/Foo.java.i
-data/test/tools/javac/T5003235/T5003235b.out.i
-data/test/tools/javac/T6873849.java.i
-data/test/tools/javac/generics/6207386/T6207386.java.i
+data/test/tools/javac/6410653/T6410653.java.i
data/test/tools/javac/diags/examples/VarargsNonReifiableType.java.i
data/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java.i
data/test/tools/javac/NonStaticFieldExpr3.sh.i
data/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java.i
data/test/tools/javac/file/T7068451.java.i
data/test/com/sun/javadoc/testRelativeLinks/TestRelativeLinks.java.i
-data/test/tools/javac/cast/6932571/T6932571neg.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java.i
+data/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java.i
data/test/tools/javac/4880220/T4880220.empty.out.i
data/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.java.i
-data/test/tools/javac/cast/5034609/T5034609.java.i
+data/test/com/sun/javadoc/testJavascript/pkg/C.java.i
data/test/tools/javac/Parens2.java.i
data/test/tools/javac/cast/6932571/T6932571b.java.i
data/src/share/classes/com/sun/source/tree/ArrayAccessTree.java.i
@@ -843,44 +839,41 @@ data/src/share/classes/com/sun/tools/doclets/formats/html/package.html.i
data/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java.i
data/test/com/sun/javadoc/testConstantValuesPage/TestConstantValuesPage.java.i
data/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateInterface.java.i
+data/test/tools/javac/nativeHeaders/javahComparison/TestClass1.java.i
data/test/tools/javac/api/6406133/T6406133.java.i
-data/test/com/sun/javadoc/testThrowsInheritence/Foo.java.i
data/test/tools/javac/unit/T6198196.java.i
-data/test/tools/javac/generics/ErasureClashCrash.java.i
-data/test/tools/javac/processing/model/util/elements/doccomments/a/First.java.i
+data/src/share/classes/com/sun/tools/classfile/package.html.i
data/test/tools/javac/6835430/T6835430.java.i
data/test/com/sun/javadoc/testNestedInlineTag/testtaglets/BoldTaglet.java.i
data/src/share/opensource/javac/nbproject/project.xml.i
data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural.java.i
data/test/tools/javap/T6587786.java.i
-data/test/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java.i
data/make/test/lib/src.sh.i
data/src/share/classes/com/sun/tools/javac/code/DeferredLintHandler.java.i
data/test/tools/apt/Scanners/servicesScanner.i
+data/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java.i
data/test/com/sun/javadoc/PackagesHeader/p1/C1.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java.i
data/test/com/sun/javadoc/AuthorDD/p1/C1.java.i
-data/test/tools/javac/generics/wildcards/T5097548b.java.i
-data/test/tools/javac/7086595/T7086595.java.i
+data/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java.i
+data/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java.i
data/test/tools/javac/diags/examples/ProcIllegalFileName/ProcIllegalFileName.java.i
-data/test/tools/javac/ForwardReference/ForwardReference_5.java.i
data/test/tools/javac/generics/inference/6356673/Test.java.i
data/test/tools/javac/diags/examples/NotEnclClass.java.i
-data/test/tools/javac/varargs/warning/Warn5.java.i
+data/test/tools/javac/api/TestJavacTask.java.i
data/test/tools/javac/generics/6182950/T6182950c.java.i
data/test/tools/javac/depOverrides/annotation/R.java.i
-data/test/tools/javac/generics/wildcards/ContraArg.java.i
data/test/tools/javac/generics/6910550/T6910550c.out.i
data/test/tools/javac/api/TestContainTypes.java.i
data/test/tools/javac/expression/ObjectAppend.java.i
data/test/com/sun/javadoc/AccessSummary/AccessSummary.java.i
data/test/tools/javac/generics/compat/CovariantCompat1.java.i
-data/test/tools/javap/classfile/deps/GetDeps.java.i
+data/src/share/classes/com/sun/tools/javac/code/Lint.java.i
data/src/share/classes/com/sun/source/tree/ExpressionStatementTree.java.i
+data/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java.i
data/test/tools/javac/6902720/E1.java.i
data/test/tools/javac/diags/examples/IllegalForwardRef.java.i
data/test/tools/javac/6547131/p/Outer$I.jasm.i
-data/test/tools/javadoc/FlagsTooEarly.java.i
data/test/com/sun/javadoc/testPackagePage/com/pkg/package.html.i
data/test/tools/javac/diags/examples/CantResolveLocationArgsParams.java.i
data/test/tools/javac/diags/examples/ApplicableMethodFound.java.i
@@ -890,21 +883,17 @@ data/test/tools/javac/T6534287.java.i
data/src/share/opensource/javac/Makefile.i
data/test/tools/javac/multicatch/7005371/SubTest.java.i
data/test/tools/javac/api/6731573/T6731573.java.i
-data/test/tools/apt/Compile/WrappedStaticApf.java.i
data/test/com/sun/javadoc/testBadPackageFileInJar/TestBadPackageFileInJar.java.i
data/test/tools/javac/6668794/badSource/Test.out.i
data/test/tools/javac/IllDefinedOrderOfInit.java.i
data/test/tools/javac/Paths/6638501/JarFromManifestFailure.java.i
-data/test/tools/javac/modules/ProvidesModuleTest01.java.i
data/test/tools/javac/diags/examples/ProcCantFindClass/processors/AnnoProc.java.i
data/test/tools/javac/generics/typevars/4856983/T4856983a.java.i
data/test/tools/javac/processing/filer/TestFilerConstraints.java.i
-data/test/tools/javac/annotations/pos/TrailingComma.java.i
-data/test/tools/javac/varargs/5088429/T5088429Neg02.java.i
data/test/tools/javac/generics/diamond/6996914/T6996914b.java.i
data/test/tools/javac/generics/BridgeOrder.java.i
data/test/tools/javac/CloneableProblem.java.i
-data/test/tools/javac/api/TestJavacTaskScanner.java.i
+data/test/tools/javac/api/TestGetElement.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test4d.out.i
data/test/tools/apt/mirror/declaration/AnnoVal.java.i
data/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/B.java.i
@@ -918,7 +907,6 @@ data/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java.i
data/test/com/sun/javadoc/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java.i
data/test/com/sun/javadoc/testTopOption/pkg/Cl.java.i
data/src/share/classes/com/sun/source/tree/ModulePermitsTree.java.i
-data/test/tools/javac/generics/parametricException/J.java.i
data/test/tools/javac/generics/5086027/T5086027pos.java.i
data/test/tools/javac/T5048776b.out.i
data/test/tools/javac/protectedAccess/ProtectedMemberAccess1.java.i
@@ -939,28 +927,32 @@ data/test/com/sun/javadoc/testAbsLinkPath/TestAbsLinkPath.java.i
data/test/tools/javac/enum/FauxEnum1.java.i
data/test/tools/javac/DefiniteAssignment/DUSwitch2.java.i
data/src/share/classes/com/sun/source/tree/ReturnTree.java.i
+data/test/tools/javac/multicatch/Pos04.java.i
data/src/share/classes/com/sun/tools/javac/comp/TransTypes.java.i
data/src/share/classes/javax/tools/ForwardingJavaFileManager.java.i
+data/test/tools/javadoc/generics/genericClass/Main.java.i
data/test/tools/javac/6199662/Tree.java.i
+data/test/tools/javac/generics/odersky/Test2.java.i
data/test/tools/javac/api/6415780/T6415780.java.i
-data/test/tools/javac/generics/inference/4942040/T4942040.java.i
data/test/tools/javac/generics/Casting.java.i
data/test/com/sun/javadoc/testInterface/pkg/Child.java.i
+data/test/com/sun/javadoc/testUseOption/pkg2/C3.java.i
+data/test/tools/javac/T6942649.java.i
data/test/tools/javac/unicode/TripleQuote.java.i
-data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java.i
data/test/tools/javac/javazip/Test.sh.i
data/test/tools/javac/processing/model/element/TestResourceElement.java.i
data/test/tools/javac/Diagnostics/6722234/T6722234d_2.out.i
data/test/tools/javac/diags/examples/RefAmbiguous.java.i
data/test/tools/javac/BadOptimization/DeadCode3.java.i
data/test/tools/javac/api/6410643/T6410643.java.i
-data/test/tools/javac/6668794/badClass/B.java.i
+data/test/tools/javac/6402516/CheckLocalElements.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test.java.i
data/test/tools/javac/file/T7068437.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlAttr.java.i
-data/test/tools/javac/diags/examples/VarargsArgumentMismatch.java.i
-data/test/tools/javac/varargs/5088429/T5088429Neg01.java.i
+data/test/tools/javac/api/7086261/T7086261.java.i
+data/test/tools/javac/diags/examples/DiamondRedundantArgs.java.i
data/test/tools/javac/diags/examples/FinallyWithoutTry.java.i
+data/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java.i
data/test/com/sun/javadoc/testClassTree/pkg/Coin.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTag.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_7.java.i
@@ -969,10 +961,9 @@ data/test/tools/javah/SubClassConsts.out.i
data/test/tools/javac/4917091/Test256b.out.i
data/test/tools/javac/processing/model/element/TestNames.java.i
data/test/tools/javac/typeAnnotations/newlocations/TypeCasts.java.i
-data/test/tools/javac/staticImport/StaticImport2.java.i
-data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java.i
-data/test/com/sun/javadoc/testWarnings/pkg/package.html.i
-data/test/tools/javadoc/annotations/defaults/pkg1/B.java.i
+data/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java.i
+data/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java.i
+data/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java.i
data/test/tools/javac/6400872/A.java.i
data/test/tools/javac/diags/examples/CantInheritDiffArg.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/package.html.i
@@ -980,69 +971,67 @@ data/test/tools/javac/TryWithResources/TwrIntersection.java.i
data/test/tools/apt/Discovery/servicesTouch.i
data/test/tools/javac/enum/FauxEnum2.java.i
data/test/tools/javac/annotations/T7043371.java.i
-data/test/tools/javac/api/6431257/T6431257.java.i
+data/test/tools/javac/implicitThis/WhichImplicitThis11.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_12.java.i
+data/test/tools/javac/generics/typevars/6968793/T6968793.out.i
data/test/tools/javac/lib/JavacTestingAbstractProcessor.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml.i
+data/test/tools/javac/processing/T6920317.java.i
data/src/share/classes/com/sun/javadoc/SourcePosition.java.i
-data/test/tools/javac/generics/wildcards/BoundBug.java.i
+data/test/tools/apt/mirror/declaration/pkg1/AnInterface.java.i
data/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail3.java.i
-data/src/share/classes/javax/annotation/processing/RoundEnvironment.java.i
+data/test/com/sun/javadoc/constantValues/TestConstantValues.java.i
data/test/tools/javac/depOverrides/doccomment/Test1A.out.i
data/test/tools/javac/annotations/6881115/T6881115.out.i
data/test/tools/javac/Diagnostics/6862608/T6862608b.java.i
data/test/tools/javac/processing/model/util/elements/Foo.java.i
-data/test/tools/javac/Diagnostics/6862608/T6862608a.out.i
-data/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.out.i
+data/test/tools/javac/UnreachableVar.java.i
+data/test/tools/javac/cast/7005671/T7005671.out.i
data/test/tools/javac/generics/wildcards/pos/AmbiguousCast2.java.i
data/test/tools/javac/boxing/NoBoxingDouble.java.i
data/ASSEMBLY_EXCEPTION.i
data/test/tools/javac/miranda/6964669/T6964669.java.i
-data/test/tools/javac/multicatch/Neg02eff_final.java.i
+data/test/tools/apt/Compile/HelloAnnotation.java.i
data/test/tools/apt/Basics/foo/bar/Baz.java.i
+data/src/share/classes/com/sun/tools/javah/resources/Linux_ppc.properties.i
data/test/com/sun/javadoc/testDocRootLink/pkg1/C1.java.i
data/test/tools/apt/Basics/ClassAnnotations.java.i
data/test/com/sun/javadoc/testThrowsTag/pkg/T6.java.i
data/test/tools/javac/PrivateLocalConstructor.java.i
data/test/tools/javac/6491592/T6491592.java.i
data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestAnnotationType.java.i
-data/test/tools/javac/generics/6213818/T6213818.java.i
+data/test/tools/javac/TryWithResources/T7022711.out.i
data/test/tools/javac/diags/examples/Location.java.i
-data/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java.i
-data/test/tools/javac/BoundClassError.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java.i
+data/test/tools/apt/Discovery/PhantomUpdate.java.i
data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.java.i
-data/test/tools/javac/generics/rawOverride/6557199/T6557199.java.i
+data/test/tools/javac/file/zip/Utils.java.i
data/src/share/opensource/javac/build.properties.i
data/src/share/classes/javax/lang/model/util/ModuleResolver.java.i
data/test/tools/javac/diags/examples/WarnSelfRef.java.i
data/test/tools/javac/NameCollision.out.i
data/test/tools/javac/6863465/T6863465d.java.i
data/test/tools/javac/DefiniteAssignment/T4721998.java.i
+data/make/netbeans/javah/nbproject/project.xml.i
data/test/com/sun/javadoc/testThrowsInheritence/TestThrowsTagInheritence.java.i
data/test/tools/javac/diags/examples/ErrProcMessager/ErrProcMessager.java.i
data/test/tools/javac/InterfaceMemberClassModifiers.out.i
-data/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java.i
data/test/tools/javac/tree/DocCommentToplevelTest.java.i
-data/test/tools/javac/4980495/std/p2/A2.java.i
data/test/tools/javac/Object2.java.i
data/src/share/classes/com/sun/tools/javac/util/Name.java.i
-data/test/tools/javac/policy/test1/byfile.ACD.out.i
+data/test/com/sun/javadoc/testPackagePage/pkg2/C.java.i
data/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java.i
data/test/tools/javac/diags/examples/OverrideIncompatibleReturn.java.i
data/test/tools/javac/diags/examples/OverrideVarargsMissing.java.i
-data/test/tools/javac/warnings/7090499/T7090499.out.i
data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.out.i
data/test/tools/javac/annotations/6365854/test2.out.i
data/test/tools/javac/6717241/T6717241b.java.i
data/test/tools/javac/TryWithResources/TwrOnNonResource.java.i
data/test/tools/javac/DefiniteAssignment/DABlock.java.i
data/test/com/sun/javadoc/AccessSkipNav/p2/C2.java.i
-data/test/tools/javac/generics/inference/T6835428.java.i
data/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java.i
data/test/tools/javac/AnonClsInIntf.java.i
data/test/tools/javac/typeAnnotations/newlocations/Receivers.java.i
-data/test/tools/javac/processing/6350124/T6350124.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlConstants.java.i
data/src/share/classes/com/sun/source/tree/LineMap.java.i
data/test/tools/javac/importContext/namedPackage/foo/Foo.java.i
@@ -1054,7 +1043,8 @@ data/test/tools/javac/ImportCycle/foo/Bottom2.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/LinkOutputImpl.java.i
data/test/tools/javac/processing/TestWarnErrorCount.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail7.java.i
-data/test/tools/javac/6758789/T6758789a.java.i
+data/test/com/sun/javadoc/DocRootSlash/p2/C2.java.i
+data/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java.i
data/src/share/classes/javax/lang/model/util/SimpleElementVisitor6.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocFinder.java.i
data/test/tools/javac/failover/FailOver13.java.i
@@ -1068,7 +1058,6 @@ data/test/tools/javac/6863465/T6863465a.out.i
data/test/tools/javac/processing/errors/TestOptionSyntaxErrors.java.i
data/test/com/sun/javadoc/testTitleInHref/pkg/Class.java.i
data/test/tools/javac/6979683/TestCast6979683_BAD38.java.errlog.i
-data/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java.i
data/test/tools/javac/diags/examples/CountWarn.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail12.java.i
data/test/tools/javac/generics/6910550/T6910550e.java.i
@@ -1077,7 +1066,9 @@ data/test/tools/javac/limits/StringLength.java.i
data/src/share/classes/com/sun/tools/javac/parser/Scanner.java.i
data/test/tools/javac/diags/examples/AnonClassImplInterfaceNoQualForNew.java.i
data/test/tools/javac/7024568/T7024568.java.i
+data/test/tools/javac/Diagnostics/6799605/T6799605.out.i
data/test/tools/javac/depOverrides/annotation/Test1B.out.i
+data/test/tools/javac/api/6406133/Erroneous.java.i
data/src/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java.i
data/src/share/classes/com/sun/source/tree/ForLoopTree.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo.java.i
@@ -1085,19 +1076,18 @@ data/test/tools/javac/generics/wildcards/pos/Capture.java.i
data/test/tools/javadoc/generics/genericInnerAndOuter/expected.out.i
data/test/tools/javac/diags/examples/UnsupportedBinaryLiteral.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/EnumConstantWriter.java.i
-data/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/C8.java.i
data/test/tools/javac/diags/examples/UncheckedCall.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail20.java.i
data/test/tools/javac/enum/EnumSwitch2.java.i
-data/src/share/classes/javax/lang/model/util/ElementFilter.java.i
data/test/tools/javac/scope/7046348/EagerInterfaceCompletionTest.java.i
data/test/tools/javac/enum/6350057/T6350057.java.i
data/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java.i
data/test/tools/javac/multicatch/Neg07.out.i
data/test/tools/javac/resolve/tests/PrimitiveOverReferenceVarargsAmbiguous.java.i
data/test/com/sun/javadoc/testHref/pkg/C2.java.i
-data/test/tools/javac/modules/ModuleAccessTest01.java.i
+data/test/tools/javac/5017953/T5017953.out.i
data/test/tools/javac/enum/Enum3.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/C4.java.i
data/test/tools/javac/SynchronizedClass.out.i
@@ -1108,50 +1098,53 @@ data/test/tools/javac/generics/5086027/T5086027.java.i
data/test/com/sun/javadoc/AccessAsciiArt/AccessAsciiArt.java.i
data/test/tools/javac/mixedTarget/CompatibleAbstracts1.java.i
data/src/share/classes/javax/annotation/processing/SupportedSourceVersion.java.i
-data/test/com/sun/javadoc/testParamTaglet/pkg/C.java.i
+data/make/test/contents.gold.txt.i
data/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java.i
data/test/tools/javadoc/varArgs/expected.out.i
-data/test/tools/javac/modules/ClassReaderTest01.java.i
+data/test/tools/javac/generics/T4661029.java.i
data/test/tools/javac/T6403466.out.i
data/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java.i
data/test/tools/javac/processing/model/util/BinaryName.java.i
-data/test/tools/javac/generics/rawOverride/Fail1.java.i
data/test/com/sun/javadoc/testRelativeLinks/pkg/package.html.i
data/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java.i
data/test/tools/javac/diags/examples/InaccessibleVarargsType/InaccessibleVarargsType.java.i
data/src/share/classes/com/sun/mirror/apt/Messager.java.i
+data/test/tools/javac/6734819/T6734819a.out.i
data/test/tools/javac/generics/LoadOrder.java.i
-data/test/tools/javap/6937244/T6937244A.java.i
data/test/tools/javac/generics/wildcards/AssignmentSameType8.java.i
data/test/tools/javac/implicitThis/WhichImplicitThis6.java.i
data/test/tools/javac/generics/rare/Rare3.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java.i
data/test/tools/javac/5045412/out.i
+data/test/tools/javac/scope/6225935/Bar.java.i
data/test/com/sun/javadoc/testHeadings/TestHeadings.java.i
data/test/tools/javac/ExtendArray.out.i
-data/test/tools/javac/enum/6384542/T6384542a.java.i
+data/test/tools/javac/stackmap/T4955930.sh.i
data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C2.java.i
data/test/tools/javac/annotations/neg/WrongValue.java.i
data/test/tools/javac/4880220/T4880220.java.i
data/test/tools/javac/diags/examples/UnsafeUseOfVarargsParam.java.i
data/test/com/sun/javadoc/5093723/DocumentedClass.java.i
data/test/tools/javac/ExtDirs/ExtDirTest_3.java.i
-data/test/tools/javac/api/7086261/T7086261.java.i
+data/test/tools/javac/diags/examples/VarargsArgumentMismatch.java.i
data/test/tools/javac/annotations/pos/Z1.java.i
-data/test/tools/javac/generics/diamond/T6939780.java.i
+data/test/tools/javac/enum/NoFinal.java.i
data/test/com/sun/javadoc/testTagHolderMethod/TestTagHolderMethod.java.i
data/test/tools/javac/enum/6350057/TestEnum.java.i
data/test/tools/javac/implicitThis/WhichImplicitThis9.java.i
data/make/tools/SelectTool/SelectToolTask.java.i
-data/test/tools/javac/varargs/VarargsOverride.java.i
+data/make/tools/genstubs/GenStubs.java.i
data/test/tools/javac/diags/examples/DeferredMethodInst.java.i
data/test/tools/javac/warnings/DepAnn.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn6.java.i
-data/test/tools/javac/varargs/6313164/T6313164.java.i
+data/test/tools/javac/NonStaticFieldExpr3.out.i
+data/test/tools/javac/diags/examples/FinalParamCantBeAssigned.java.i
data/test/tools/javac/unicode/UnicodeNewline.java.i
data/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties.i
+data/test/tools/javac/generics/Nonlinear.java.i
data/test/tools/javadoc/6942366/T6942366.java.i
-data/test/tools/javac/UplevelFromAnonInSuperCall.java.i
-data/test/tools/javap/T4075403.java.i
+data/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java.i
+data/test/tools/javac/6390045/T6390045b.java.i
+data/test/tools/javac/lint/NoWarn2.out.i
data/test/tools/javac/generics/wildcards/neg/CastFail16.java.i
data/test/tools/javac/treeannotests/Test.java.i
data/make/netbeans/doclets/build.xml.i
@@ -1161,18 +1154,20 @@ data/test/tools/javac/generics/wildcards/neg/CastFail15.java.i
data/test/tools/javac/policy/bytodo.ABD.out.i
data/test/tools/javac/diags/CheckResourceKeys.java.i
data/test/com/sun/javadoc/testThrowsTag/pkg/T4.java.i
+data/test/tools/javac/implicitThis/NewBeforeOuterConstructed.java.i
data/src/share/classes/javax/lang/model/util/Elements.java.i
data/test/tools/javac/generics/inference/6215213/T6215213.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/Test2.out.i
data/test/com/sun/javadoc/testWarnings/pkg/X.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUsage.java.i
-data/test/tools/javac/limits/ArrayDims5.java.i
+data/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java.i
data/src/share/classes/javax/lang/model/type/ExecutableType.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.out.i
data/src/share/classes/com/sun/tools/javadoc/ClassDocImpl.java.i
-data/test/tools/javac/ImportPackagePrivateInner/Dummy.java.i
+data/make/test/HelloWorld.javap.gold.txt.i
data/test/tools/javac/DefiniteAssignment/DefAssignAfterThis_1.java.i
+data/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java.i
data/src/share/classes/com/sun/source/tree/ClassTree.java.i
data/test/tools/javac/generics/typeargs/Basic.java.i
data/test/tools/javac/warnings/Unchecked.java.i
@@ -1185,45 +1180,47 @@ data/make/test/HelloWorld.gold.h.i
data/test/tools/javac/generics/6359951/T6359951.java.i
data/src/share/classes/com/sun/tools/apt/main/CommandLine.java.i
data/test/tools/javac/generics/typevars/6569404/T6569404b.java.i
-data/test/tools/javac/modules/ModuleVersionQueryTest01.java.i
+data/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java.i
data/src/share/classes/com/sun/mirror/util/SourcePosition.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java.i
+data/test/tools/javac/generics/6985719/T6985719h.out.i
data/test/tools/javac/generics/rawOverride/6557199/T6557199.out.i
data/src/share/classes/com/sun/source/tree/package-info.java.i
data/test/tools/javac/varargs/6313164/p1/B.java.i
-data/test/tools/javadoc/generics/genericClass/expected.out.i
-data/test/tools/javac/diags/examples/DirPathElementNotFound.java.i
-data/test/tools/javac/annotations/pos/AnnotationMethods.java.i
+data/test/tools/javac/proprietary/WarnMethod.java.i
data/test/tools/javac/StringsInSwitch/NonConstantLabel.out.i
data/test/tools/javac/Diagnostics/6864382/T6864382.out.i
data/test/tools/javac/protectedAccess/pkg/SuperClass.java.i
data/test/tools/javac/enum/NoFinal4.java.i
data/test/com/sun/javadoc/testNonFrameWarning/pkg/C.java.i
-data/test/tools/javac/6948381/npe/A.java.i
+data/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java.i
data/src/share/classes/com/sun/tools/classfile/Signature_attribute.java.i
data/make/Makefile.i
data/test/tools/javac/assert/DU2.java.i
data/test/tools/javac/4917091/Test255.java.i
-data/test/tools/javac/mixedTarget/ExtendCovariant1.java.i
+data/test/tools/javac/generics/6182950/T6182950b.out.i
data/src/share/classes/com/sun/tools/javac/comp/Env.java.i
data/test/tools/javac/Parens1.java.i
data/test/tools/javac/importChecks/ImportIsFullyQualified.java.i
-data/test/tools/javac/cast/7005095/T7005095neg.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java.i
data/test/tools/javac/api/6411333/T6411333.java.i
data/test/tools/javac/6304921/T6304921.java.i
+data/test/tools/javac/T7142672/AnnoProcessor.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java.i
data/test/tools/javac/diags/examples/IllegalSelfRef.java.i
data/test/com/sun/javadoc/AccessFrameTitle/p1/C1.java.i
data/test/com/sun/javadoc/ValidHtml/p2/C2.java.i
-data/test/com/sun/javadoc/testOverridenMethods/TestOverridenMethodDocCopy.java.i
-data/test/tools/javac/T6654037.java.i
+data/test/tools/javac/processing/6634138/ExerciseDependency.java.i
data/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.out.i
data/test/tools/javac/nio/compileTest/HelloPathWorld.java.i
data/src/share/classes/sun/tools/javap/ClassData.java.i
data/.hgtags.i
data/test/tools/javac/NameCollision.java.i
-data/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java.i
+data/test/tools/javac/multicatch/Neg05.java.i
data/make/netbeans/doclets/nbproject/project.xml.i
data/test/tools/javac/diags/examples/CantApplyDiamond.java.i
+data/test/tools/javac/api/ToolProvider/ToolProviderTest2.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ImplementedMethods.java.i
data/test/tools/javap/PublicInterfaceTest.sh.i
data/test/tools/javac/diags/examples/IllegalUnicodeEscape.java.i
@@ -1231,24 +1228,25 @@ data/test/tools/javac/DefiniteAssignment/T4717165.java.i
data/test/tools/javac/failover/FailOver07.java.i
data/src/share/classes/com/sun/source/tree/ExpressionTree.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/SuperInterface.java.i
-data/test/tools/javac/diags/examples/UncheckedMethodInvocation.java.i
+data/test/com/sun/javadoc/ValidHtml/overview.html.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_4.java.i
data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPluralAdditional.java.i
data/src/share/classes/com/sun/tools/javah/Main.java.i
-data/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java.i
data/test/tools/javac/diags/examples/ReturnOutsideMethod.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java.i
data/src/share/classes/javax/tools/JavaFileManager.java.i
data/test/tools/javac/api/Sibling.java.i
data/test/com/sun/javadoc/AccessAsciiArt/p1/I.java.i
data/src/share/classes/com/sun/tools/javap/InternalError.java.i
-data/test/tools/javac/annotations/6214965/T6214965.out.i
+data/src/share/classes/com/sun/mirror/util/Declarations.java.i
data/make/netbeans/langtools/nbproject/standard-context-menu-items.ent.i
data/test/tools/javac/depDocComment/DeprecatedDocComment.sh.i
data/src/share/classes/com/sun/source/tree/ThrowTree.java.i
data/test/com/sun/javadoc/AccessSummary/p2/C2.java.i
-data/test/tools/javah/compareTest/CompareTest.java.i
+data/test/com/sun/javadoc/testThrowsInheritence/Foo.java.i
data/test/tools/javac/diags/examples/DoesntExist.java.i
data/src/share/classes/javax/lang/model/type/TypeVisitor.java.i
+data/test/tools/javac/T6435291/T.jcod.i
data/test/com/sun/javadoc/testAnnotationTypes/TestAnnotationTypes.java.i
data/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java.i
data/src/share/classes/com/sun/tools/javac/util/List.java.i
@@ -1268,56 +1266,58 @@ data/test/tools/javac/processing/6499119/package-info.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java.i
data/.jcheck/conf.i
data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E1.java.i
+data/test/tools/javac/Diagnostics/6860795/T6860795.out.i
+data/test/tools/javac/6464451/DeepNestedFinally.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletAbortException.java.i
-data/test/tools/javac/CyclicInheritance.java.i
-data/test/tools/javac/lint/NoWarn1.out.i
+data/src/share/classes/com/sun/tools/javac/code/Types.java.i
+data/test/tools/javac/ClassLiterals/p1/SuperClass.java.i
data/src/share/classes/com/sun/tools/classfile/ModuleExportTable_attribute.java.i
+data/test/tools/javac/SuperNew3.java.i
data/test/tools/javac/cast/6548436/T6548436c.java.i
-data/test/tools/javac/processing/T6920317.java.i
-data/test/tools/javadoc/InlineTagsWithBraces.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclet.xml.i
data/test/tools/javac/enum/EnumSwitch3.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractBuilder.java.i
data/test/tools/javac/depOverrides/annotation/empty.i
data/test/tools/javac/innerClassFile/x/B.java.i
-data/test/tools/javac/generics/5009937/T5009937.out.i
data/test/tools/javac/ClassCycle/ClassCycle1a.java.i
-data/src/share/classes/com/sun/tools/javac/parser/Tokens.java.i
+data/test/tools/javac/resolve/tests/PrimitiveOverload.java.i
data/test/tools/javac/staticImport/Ambig1.java.i
data/test/tools/javac/DeepStringConcat.java.i
data/test/com/sun/javadoc/testCmndLineClass/TestCmndLineClass.java.i
data/test/tools/javac/OverridePosition.java.i
data/test/tools/javac/6394683/B.java.i
+data/test/tools/javac/T6855236.java.i
data/test/tools/javac/processing/environment/round/C1.java.i
data/test/tools/javac/generics/diamond/neg/Neg08.java.i
data/test/tools/javac/ExtendsAccess/ExtendsAccess.java.i
data/test/tools/javac/generics/typevars/5060485/Compatibility02.java.i
data/test/tools/javac/T6180021/Sub.java.i
data/test/tools/javac/Diagnostics/6722234/T6722234a_2.out.i
-data/test/tools/javac/diags/examples/SunApiFilenameAdditional.java.i
data/test/tools/javac/api/TestJavacTask_Multiple.java.i
data/test/tools/apt/verifyVariables.sh.i
-data/test/tools/javac/ForwardReference/UseBeforeDeclaration.java.i
data/test/tools/javac/SuperNew4.java.i
data/test/tools/javac/generics/diamond/neg/Neg07.out.i
data/test/tools/javac/ThrowsIntersection_1.java.i
data/test/tools/javac/StringConversion2.java.i
data/test/tools/javac/ImplicitToString.java.i
+data/test/tools/javac/generics/rawOverride/7062745/T7062745pos.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/C6.java.i
data/test/com/sun/javadoc/testClassCrossReferences/C.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java.i
data/test/tools/javac/depOverrides/doccomment/Test3.out.i
data/src/share/classes/com/sun/tools/javap/TryBlockWriter.java.i
data/test/tools/javac/6302184/T6302184.java.i
-data/test/tools/javac/generics/7034019/T7034019c.java.i
data/test/tools/javac/enum/6424358/T6424358.java.i
data/test/tools/javac/ThrowsIntersection_2.java.i
data/test/tools/javac/overload/T4494762.java.i
data/test/com/sun/javadoc/testHtmlComments/C.java.i
data/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/ProcUnclosedTypeFiles.java.i
data/src/share/classes/com/sun/mirror/declaration/Modifier.java.i
+data/src/share/classes/com/sun/tools/javac/code/Attribute.java.i
data/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java.i
data/test/tools/javac/InitializerCompletion_4.java.i
data/test/tools/javac/api/T6397104.java.i
+data/src/share/classes/com/sun/tools/javah/resources/SunOS_sparcv9.properties.i
data/src/share/classes/com/sun/tools/doclets/formats/html/ConstructorWriterImpl.java.i
data/test/tools/apt/Compile/servicesRound2.i
data/test/tools/javac/Closure6.java.i
@@ -1328,22 +1328,23 @@ data/src/share/classes/javax/tools/Tool.java.i
data/src/share/classes/com/sun/tools/javac/main/OptionName.java.i
data/test/tools/javac/T6224167.java.i
data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename2.java.i
-data/test/tools/javac/generics/diamond/neg/Neg06.out.i
+data/src/share/classes/javax/tools/SimpleJavaFileObject.java.i
data/test/tools/javac/cast/7123100/T7123100d.out.i
-data/test/tools/javac/UnreachableVar.java.i
+data/test/tools/javac/Diagnostics/6862608/T6862608a.out.i
data/test/tools/javac/diags/examples/RecursiveConstrInvocation.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java.i
-data/test/tools/javac/processing/options/TestImplicitNone.java.i
-data/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java.i
+data/test/tools/javac/generics/rawOverride/7062745/T7062745neg.java.i
+data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i
data/test/tools/javap/T6271787.java.i
data/src/share/classes/com/sun/tools/javadoc/SerialFieldTagImpl.java.i
data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C5.java.i
-data/test/tools/javac/cast/7005671/T7005671.out.i
-data/test/tools/javac/processing/6512707/TestEnum.java.i
+data/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.out.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java.i
data/test/tools/javac/BreakAcrossClass.java.i
data/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java.i
data/test/tools/javac/cast/5064736/T5064736.java.i
data/test/tools/javac/limits/NumArgs4.java.i
+data/test/tools/javac/annotations/neg/NoObjectMethods.java.i
data/test/tools/apt/mirror/type/ArrayTyp.java.i
data/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SuperClass.java.i
data/test/com/sun/javadoc/testDocRootInlineTag/package-list.i
@@ -1354,33 +1355,35 @@ data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C5.java.i
data/test/com/sun/javadoc/testWarnBadParamNames/TestWarnBadParamNames.java.i
data/make/tools/CompileProperties/CompileProperties.java.i
data/test/tools/javac/generics/inference/6718364/T6718364.java.i
-data/test/com/sun/javadoc/testLinkOption/java/lang/StringBuilderChild.java.i
+data/test/tools/javac/diags/examples/DuplicateAnnotation.java.i
data/test/tools/javac/generics/inference/5049523/T5049523.java.i
data/test/tools/javac/DeadInnerClass.java.i
data/test/tools/javac/ClassPathTest/foo/pkg/ClassPathTestAux1.java.i
data/test/com/sun/javadoc/testTagInheritence/pkg/TestInterfaceForAbstractClass.java.i
-data/test/tools/javac/generics/inference/6638712/T6638712d.out.i
-data/src/share/classes/com/sun/javadoc/AnnotationDesc.java.i
+data/test/tools/javadoc/6958836/Test.java.i
data/test/tools/javac/typeAnnotations/failures/StaticFields.out.i
data/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java.i
data/test/tools/javac/T6956462/T6956462.java.i
data/test/tools/javac/typeAnnotations/failures/common/parambounds/InvalidLocation.java.i
data/test/tools/javadoc/generics/tparamTagOnType/Main.java.i
+data/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java.i
data/test/tools/javac/typeAnnotations/failures/VoidGenericMethod.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/MethodWriterImpl.java.i
data/test/tools/javac/6521805/T6521805e.out.i
data/test/tools/javac/TryWithResources/ImplicitFinal.out.i
data/test/tools/javac/api/6400303/Test1.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java.i
+data/test/tools/apt/Basics/Lacuna.java.i
data/test/tools/javac/6521805/T6521805b.java.i
+data/test/tools/javac/generics/inference/6468384/T6468384.java.i
data/test/com/sun/javadoc/testPrivateClasses/pkg2/C.java.i
data/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java.i
data/test/tools/javac/synthesize/Number.java.i
data/src/share/classes/javax/lang/model/type/DisjunctiveType.java.i
-data/src/share/classes/com/sun/mirror/declaration/package-info.java.i
+data/src/share/classes/javax/lang/model/element/AnnotationMirror.java.i
data/test/tools/javac/generics/typeargs/Newarg1.java.i
data/test/tools/javac/diags/examples/StaticImportOnlyClassesAndInterfaces/StaticImportOnlyClassesAndInterfaces.java.i
-data/test/tools/javac/unicode/UnicodeNewline.out.i
+data/test/tools/javac/SwitchFence.java.i
+data/src/share/classes/com/sun/tools/javac/jvm/Target.java.i
data/test/tools/javac/synthesize/Boolean.java.i
data/src/share/classes/com/sun/tools/javadoc/ConstructorDocImpl.java.i
data/test/tools/javac/NameClash/b/One.java.i
@@ -1390,10 +1393,9 @@ data/test/tools/javac/quid/QuotedIdent2.java.i
data/test/tools/javac/staticImport/StaticImport.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MemberSummaryBuilder.java.i
data/test/tools/javac/tree/SourceTreeScannerTest.java.i
+data/test/tools/javac/T7142672/Bug.java.i
data/src/share/classes/com/sun/source/tree/RequiresModuleDirectiveTree.java.i
-data/test/tools/javac/diags/examples/EnumAsIdentifier.java.i
data/test/tools/javac/warnings/Unchecked.lintUnchecked.out.i
-data/test/tools/javac/modules/ViewTest01.java.i
data/make/test/README.i
data/test/com/sun/javadoc/testUseOption/TestUseOption.java.i
data/test/tools/javac/failover/FailOver05.out.i
@@ -1403,34 +1405,35 @@ data/test/tools/javac/AnonymousType.java.i
data/test/com/sun/javadoc/testGroupOption/pkg3/C.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseInlineTaglet.java.i
data/test/com/sun/javadoc/testConstructorIndent/TestConstructorIndent.java.i
-data/test/tools/javap/4870651/Test.java.i
+data/src/share/classes/com/sun/javadoc/SeeTag.java.i
data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C2.java.i
data/src/share/classes/com/sun/tools/javadoc/resources/javadoc.properties.i
-data/test/tools/javac/6996626/Main.java.i
+data/test/tools/javac/generics/Varargs2.java.i
+data/test/tools/javac/annotations/6365854/TestCore.java.i
data/test/tools/javac/generics/wildcards/AssignmentSameType2.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_1.java.i
data/test/tools/javac/processing/model/util/elements/doccomments/z/Last.java.i
data/test/tools/javadoc/parser/7091528/p/q/C2.java.i
data/src/share/classes/com/sun/tools/javap/resources/version.properties-template.i
data/test/tools/javac/generics/inference/6650759/T6650759i.java.i
-data/test/tools/javac/api/T6392782.java.i
+data/test/tools/javac/generics/abstract/T4717181c.java.i
data/test/tools/javac/generics/wildcards/6437894/T6437894.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/package.html.i
data/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.java.i
-data/test/tools/javac/api/T6358786.java.i
data/test/tools/javac/AnonymousProtect/P1/pubExposePriv.java.i
data/test/tools/javac/generics/Crash01.java.i
data/test/tools/javac/resolve/tests/PrimitiveReturnTypeInference.java.i
+data/make/tools/compileproperties/CompileProperties.java.i
data/test/tools/javac/diags/examples/Verbose.java.i
data/test/tools/javac/processing/6430209/test1.java.i
-data/test/tools/javac/diags/examples/AnnoNotValidForType.java.i
+data/test/tools/javac/OverrideChecks/6738538/T6738538b.java.i
data/test/tools/javac/generics/rawOverride/T6846972.java.i
-data/test/tools/javac/6979683/TestCast6979683_BAD39.java.i
+data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java.i
data/test/tools/javac/enum/6384542/T6384542a_1_4.out.i
data/test/com/sun/javadoc/AccessH1/p2/C2.java.i
-data/test/tools/javac/annotations/neg/Z13.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java.i
data/test/tools/javac/generics/inference/6273455/T6273455.java.i
-data/test/tools/javac/cast/6665356/T6665356.java.i
+data/test/tools/javac/InnerNamedConstant_2.java.i
data/test/tools/javac/varargs/Warn1.java.i
data/test/tools/javac/generics/diamond/7030150/Neg03.java.i
data/test/tools/javac/generics/inference/5073060/T5073060a.java.i
@@ -1438,24 +1441,25 @@ data/src/share/classes/com/sun/tools/javadoc/WildcardTypeImpl.java.i
data/test/com/sun/javadoc/PackagesHeader/p2/C2.java.i
data/src/share/classes/com/sun/source/tree/IdentifierTree.java.i
data/test/tools/javac/enum/forwardRef/TestEnum3.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java.i
-data/test/tools/javadoc/generics/tparamTagOnMethod/expected.out.i
+data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java.i
data/test/tools/javac/enum/forwardRef/TestEnum2.java.i
data/test/tools/javac/treeannotests/TestProcessor.java.i
data/test/tools/javac/depOverrides/doccomment/Test3.java.i
data/test/tools/javac/annotations/6881115/T6881115.java.i
data/test/com/sun/javadoc/testTagInheritence/firstSentence2/A.java.i
-data/test/tools/javap/typeAnnotations/T6855990.java.i
+data/test/tools/javac/generics/odersky/BadTest3.java.i
data/test/com/sun/javadoc/PackagesHeader/PackagesHeader.java.i
-data/test/tools/javac/TryWithResources/ResourceTypeVar.java.i
-data/test/tools/javac/OverrideChecks/6400189/T6400189a.out.i
+data/test/tools/javac/T6567414.java.i
data/test/tools/javac/enum/EnumPrivateConstructor.java.i
data/src/share/classes/com/sun/source/tree/ArrayTypeTree.java.i
+data/test/tools/apt/Misc/Marked.java.i
data/test/tools/javac/6857948/T6857948.out.i
data/test/tools/javac/limits/NumArgs2.java.i
data/test/com/sun/javadoc/testIndex/NoPackage.java.i
data/test/tools/apt/mirror/declaration/AnnoMirror.java.i
-data/test/tools/javac/diags/examples/InvalidAnnoMemberType.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java.i
+data/test/tools/javac/multicatch/model/UnionTypeInfo.java.i
+data/test/tools/javac/diags/examples/CantResolveArgsParams.java.i
data/test/tools/javac/scope/6225935/T6225935.java.i
data/test/tools/javac/quid/QuotedIdent_BAD63.java.i
data/test/tools/javac/NestedDuplicateLabels.java.i
@@ -1463,21 +1467,26 @@ data/test/tools/javac/4980495/static/p2/A2.java.i
data/make/netbeans/javah/README.i
data/test/tools/javadoc/generics/genericMethod/pkg1/A.java.i
data/test/tools/javac/enum/SynthValues.java.i
+data/test/tools/javac/depOverrides/annotation/Q.java.i
data/src/share/classes/com/sun/tools/javac/api/Formattable.java.i
data/src/share/classes/com/sun/javadoc/LanguageVersion.java.i
-data/test/tools/javac/generics/wildcards/6330931/T6330931.java.i
+data/src/share/classes/com/sun/tools/javac/util/JavacMessages.java.i
data/src/share/classes/com/sun/tools/javac/util/JavacFileManager.java.i
+data/test/tools/javac/InitializerCompletion_2.java.i
data/src/share/classes/com/sun/tools/classfile/ClassReader.java.i
data/test/tools/javadoc/generics/genericSuper/Main.java.i
+data/test/tools/javac/diags/examples/AssertAsIdentifier.java.i
data/test/com/sun/javadoc/testHtmlTableTags/pkg2/C2.java.i
data/test/tools/javac/enum/forwardRef/TestEnum4.java.i
-data/test/tools/javac/processing/options/Xprint.java.i
+data/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java.i
data/test/tools/javac/failover/FailOver03.java.i
data/src/share/classes/com/sun/source/tree/CaseTree.java.i
data/test/tools/javac/boxing/T6348760.java.i
-data/test/com/sun/javadoc/testValueTag/pkg1/Class2.java.i
+data/test/tools/javac/generics/5009937/T5009937.out.i
+data/src/share/classes/com/sun/tools/javac/api/MultiTaskListener.java.i
data/test/tools/javac/synthesize/Short.java.i
data/test/tools/javac/TryWithResources/ImplicitFinal.java.i
+data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java.i
data/test/tools/javac/foreach/ListOfListTest.java.i
data/src/share/classes/javax/annotation/processing/Completion.java.i
data/test/tools/javac/enum/6384542/T6384542.out.i
@@ -1489,11 +1498,11 @@ data/make/netbeans/common/standard-context-menu-items-no-javadoc.ent.i
data/test/tools/javac/generics/typevars/6182630/T6182630b.java.i
data/test/tools/javac/generics/genericAbstract/B.java.i
data/test/com/sun/javadoc/testTitleInHref/package-list.i
+data/test/tools/javac/6491592/T6491592.out.i
data/test/tools/javac/diags/examples/Error.java.i
-data/test/tools/javac/NestedInnerClassNames.java.i
data/src/share/classes/com/sun/tools/javadoc/DocLocale.java.i
data/test/tools/javac/6330920/T6330920.out.i
-data/test/com/sun/javadoc/testModifier/TestModifier.java.i
+data/src/share/classes/javax/lang/model/util/ElementScanner6.java.i
data/test/tools/javac/generics/typeargs/Superarg1.java.i
data/test/tools/javac/links/links.sh.i
data/test/tools/javac/enum/FauxEnum3.java.i
@@ -1503,18 +1512,19 @@ data/test/com/sun/javadoc/testThrowsTag/pkg/T3.java.i
data/test/tools/javac/6402516/A.java.i
data/test/tools/javac/generics/rare/Rare4.java.i
data/test/tools/javac/proprietary/WarnVariable.java.i
-data/test/tools/javadoc/sourceOnly/Test.java.i
+data/test/tools/javac/positions/T6253161a.out.i
data/test/tools/apt/mirror/declaration/MethodDecl.java.i
-data/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java.i
+data/test/tools/javac/diags/examples/SunApiFilenameAdditional.java.i
data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/pkg3/C6.java.i
data/src/share/classes/com/sun/mirror/type/MirroredTypesException.java.i
data/test/tools/javap/T6824493.java.i
-data/test/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java.i
+data/test/tools/javac/api/T6501502.java.i
+data/test/tools/javac/generics/inference/7086601/T7086601a.out.i
data/test/com/sun/javadoc/testCmndLineClass/pkg2/package.html.i
data/test/tools/javac/enum/NoFinal5.java.i
data/test/tools/javac/boxing/T5082929.java.i
data/test/tools/javac/diags/examples/ProcessorCantInstantiate/ProcessorCantInstantiate.java.i
-data/test/tools/javac/implicitThis/NewBeforeOuterConstructed3.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java.i
data/test/com/sun/javadoc/testMemberSummary/pkg/PublicChild.java.i
data/test/tools/javac/generics/inference/5073060/NegHelper.java.i
data/test/tools/javac/boxing/BoxingCaching.java.i
@@ -1526,8 +1536,9 @@ data/test/tools/javac/diags/examples/DoesNotOverride.java.i
data/test/tools/javac/processing/model/type/MirroredTypeEx/NpeTest.java.i
data/test/tools/javac/Diagnostics/6769027/tester.properties.i
data/make/netbeans/javap/nbproject/project.xml.i
-data/src/share/classes/com/sun/tools/classfile/Signature.java.i
+data/test/tools/javac/processing/filer/TestLastRound.out.i
data/test/tools/javac/generics/typevars/5061359/T5061359.java.i
+data/test/tools/javac/BadOptimization/DeadCode1.java.i
data/src/share/classes/com/sun/javadoc/Doclet.java.i
data/test/tools/javac/conditional/Conditional.java.i
data/test/tools/javac/varargs/6730476/T6730476a.java.i
@@ -1537,130 +1548,134 @@ data/test/tools/javac/AccessMethods/AccessMethodsLHS.java.i
data/test/tools/javah/6572945/TestClass3.java.i
data/test/tools/javac/cast/6557182/T6557182.out.i
data/test/tools/javac/annotations/pos/OverrideOK.java.i
-data/test/tools/javac/TestPkgInfo.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java.i
+data/src/share/classes/com/sun/tools/javac/jvm/JNIWriter.java.i
data/test/tools/javah/TestHelpOpts.java.i
-data/test/tools/javac/diags/examples/InheritFromFinal.java.i
-data/test/tools/javac/processing/options/testCommandLineClasses/Test.java.i
+data/src/share/classes/com/sun/javadoc/ProgramElementDoc.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif.i
data/test/tools/javac/generics/6372782/AbstractPlanarVector.java.i
data/test/tools/javac/diags/examples/AnnoNotApplicable.java.i
-data/test/tools/javac/generics/Varargs2.java.i
+data/test/tools/javac/processing/6350124/T6350124.java.i
data/test/tools/javac/protectedInner/pkg2/Sub.java.i
-data/test/tools/javac/NullStaticQualifier.java.i
+data/test/tools/javac/generics/typevars/T7040883.java.i
data/test/tools/javac/T6882235.java.i
data/test/tools/javac/api/6423003/T6423003.java.i
-data/make/netbeans/compiler/README.i
data/test/tools/apt/Basics/print.sh.i
-data/test/tools/javac/5017953/T5017953.out.i
-data/test/tools/javadoc/BreakIteratorWarning.java.i
+data/test/tools/javac/diags/examples/LongSVUID.java.i
+data/test/com/sun/javadoc/testUseOption/pkg1/package.html.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java.i
+data/test/tools/javac/annotations/neg/Scope.java.i
data/test/tools/javac/generics/rawOverride/Warn2.java.i
-data/src/share/classes/com/sun/source/tree/UnaryTree.java.i
-data/test/com/sun/javadoc/testOverridenMethods/pkg2/SubClass.java.i
+data/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java.i
+data/test/com/sun/javadoc/testUnnamedPackage/package.html.i
data/test/tools/javac/generics/classreader/HMember.java.i
data/test/tools/javac/ClassCycle/ClassCycle3b.java.i
data/test/tools/javac/failover/FailOver15.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractIndexWriter.java.i
+data/test/tools/javac/diags/examples/WarnForwardRef.java.i
data/test/tools/javac/generics/typevars/6182630/T6182630a.java.i
data/src/share/classes/com/sun/mirror/apt/package.html.i
data/test/tools/javadoc/XWerror.java.i
data/test/tools/javac/api/6440528/T6440528.java.i
data/test/tools/javac/6889255/T6889255.java.i
-data/test/tools/javac/multicatch/Neg06.out.i
-data/src/share/classes/javax/lang/model/element/Element.java.i
+data/test/tools/javac/varargs/5088429/T5088429Neg02.out.i
+data/test/tools/javac/generics/diamond/7030687/T7030687.out.i
data/test/tools/javac/generics/wildcards/AssignmentSameType6.java.i
data/test/tools/javac/policy/test1/bytodo.ACD.out.i
-data/test/tools/javac/6304921/TestLog.java.i
data/test/tools/javap/T4884240.java.i
data/test/tools/apt/Discovery/servicesBadTouch.i
data/test/tools/javac/T6405099.java.i
data/src/share/classes/javax/lang/model/element/Modifier.java.i
-data/test/tools/javac/processing/model/type/TestTypeKind.java.i
+data/src/share/classes/com/sun/tools/javac/util/AbstractLog.java.i
data/test/tools/javac/diags/examples/ContinueOutsideLoop.java.i
data/src/share/classes/com/sun/source/tree/ModuleIdQueryTree.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties.i
data/test/com/sun/javadoc/testHtmlTag/pkg2/C2.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java.i
-data/test/tools/javac/annotations/neg/Dup.java.i
+data/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java.i
+data/test/tools/javac/T4994049/DeprecatedYES.java.i
+data/test/tools/javac/CyclicInheritance.sh.i
data/test/com/sun/javadoc/testDocRootLink/pkg2/C2.java.i
-data/test/tools/javac/HexFloatLiterals.java.i
+data/test/tools/javac/generics/wildcards/AssignmentSameType1.java.i
data/test/tools/javac/generics/diamond/7030150/Neg01.out.i
+data/test/tools/javac/6547131/T.java.i
data/test/tools/javadoc/completionFailure/CompletionFailure.java.i
-data/test/com/sun/javadoc/testPackageDeprecation/pkg1/Foo2.java.i
+data/test/tools/javac/ProtectedInnerClass/p1/ProtectedInnerClass1.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/A.java.i
-data/test/tools/javac/warnings/T6763518.java.i
-data/test/tools/javac/foreach/T6500701.java.i
+data/test/tools/javac/diags/examples/TryResourceNotSupported.java.i
+data/src/share/classes/com/sun/tools/classfile/Type.java.i
data/test/tools/apt/mirror/declaration/pkg1/pkg2/AnInterface.java.i
data/test/tools/apt/mirror/declaration/pkg1/AnEnum.java.i
data/test/tools/javadoc/T6968833.java.i
-data/src/share/classes/com/sun/mirror/type/TypeMirror.java.i
+data/test/tools/javac/processing/messager/6362067/T6362067.java.i
data/test/tools/javac/diags/examples/DiamondInvalidArgs.java.i
-data/test/tools/javac/generics/wildcards/6437894/T6437894.out.i
data/test/tools/javac/4917091/Test256b.java.i
data/test/tools/javac/generics/7020657/T7020657neg.java.i
-data/test/tools/javac/cast/6558559/T6558559b.java.i
+data/test/tools/javac/completion/C.out.i
data/test/tools/javac/T7042623.out.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/SourceToHTMLConverter.java.i
-data/test/tools/javac/diags/examples/NonStaticCantBeRef.java.i
-data/test/tools/javac/synthesize/Cloneable.java.i
+data/test/tools/javac/generics/7007615/acc1/AccessibilityCheck01.java.i
+data/src/share/classes/javax/lang/model/element/TypeElement.java.i
+data/test/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java.i
data/test/tools/javac/depOverrides/doccomment/B.java.i
data/test/tools/javac/NullQualifiedSuper2.java.i
-data/test/tools/javac/SerialWarn.java.i
data/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java.i
-data/test/tools/javac/6627362/x/Object.java.i
+data/make/conf/checkstyle-langtools.xml.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess2.java.i
data/test/tools/apt/Basics/Misc.java.i
data/test/com/sun/javadoc/testThrowsTag/pkg/T7.java.i
+data/src/share/classes/javax/lang/model/type/WildcardType.java.i
data/test/tools/javac/diags/examples/UndeterminedType1.java.i
data/test/tools/javac/MissingInclude.sh.i
data/test/tools/javac/6948381/T6948381.java.i
-data/test/tools/javac/OverrideChecks/T4720356b.java.i
-data/test/tools/javac/api/6431435/T6431435.java.i
+data/test/tools/javac/innerClassFile/x/C.java.i
data/test/tools/javac/failover/FailOver03.out.i
-data/src/share/classes/com/sun/tools/javac/resources/legacy.properties.i
-data/test/tools/javac/diags/examples/ArrayAndVarargs.java.i
+data/test/tools/javac/links/T.java.i
+data/test/tools/javac/diags/examples/InitializerMustComplete.java.i
data/test/com/sun/javadoc/testIndex/pkg/C.java.i
data/test/tools/javac/modules/ModuleModeTests/DerbyTest.java.i
data/test/tools/javadoc/generics/genericInterface/pkg1/A.java.i
-data/test/tools/javac/generics/inference/6943278/T6943278.java.i
data/src/share/classes/com/sun/tools/javac/file/Old199.java.i
-data/test/com/sun/javadoc/testHref/pkg/C3.java.i
+data/test/tools/javac/depOverrides/annotation/B3.java.i
data/test/tools/javac/versions/check.sh.i
data/test/tools/javac/resolve/tests/BoxedReturnTypeInference.java.i
data/test/tools/javac/Digits.out.i
-data/test/tools/javac/api/TestClientCodeWrapper.java.i
-data/test/tools/javac/generics/WrongNew.java.i
-data/test/tools/javac/modules/ModuleDataTest01.java.i
+data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java.i
data/src/share/classes/com/sun/mirror/type/InterfaceType.java.i
data/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.out.i
data/test/tools/javac/T6306967.java.i
data/test/tools/javac/api/6412656/T6412656.java.i
data/test/tools/javac/missingSuperRecovery/impl.class.i
+data/test/com/sun/javadoc/testSubTitle/TestSubTitle.java.i
data/test/tools/javac/generics/ReverseOrder.java.i
+data/test/tools/javac/accessVirtualInner/c/C.java.i
+data/test/tools/javac/TryWithResources/PlainTry.java.i
data/test/tools/javac/diags/examples/RawClassUse.java.i
data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.out.i
+data/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java.i
data/test/tools/javac/T4994049/T4994049.java.i
-data/src/share/classes/com/sun/tools/javac/comp/AttrContext.java.i
-data/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java.i
+data/test/tools/javac/generics/inference/6838943/T6838943.java.i
+data/test/com/sun/javadoc/testBackSlashInLink/C.java.i
data/src/share/classes/com/sun/javadoc/Tag.java.i
data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z1/Z1.java.i
-data/test/tools/javac/unit/util/list/FromArray.java.i
-data/test/tools/javac/NameClash/a/One.java.i
+data/test/tools/javac/generics/6946618/T6946618c.out.i
+data/test/tools/javac/processing/model/util/Superless.java.i
data/test/tools/javac/diags/examples/IllegalQualNotIcls.java.i
data/test/tools/javac/quid/QuotedIdent_BAD61.java.i
-data/src/share/classes/com/sun/tools/javadoc/SerializedForm.java.i
-data/src/share/classes/com/sun/source/tree/NewClassTree.java.i
+data/test/com/sun/javadoc/testTaglets/TestTaglets.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/FrameOutputWriter.java.i
-data/src/share/classes/com/sun/tools/javac/api/Messages.java.i
+data/test/tools/javac/diags/examples/ProcessorNotFound.java.i
data/test/tools/javac/6402516/TestIsAccessible.java.i
data/test/tools/javac/generics/inference/6611449/T6611449.java.i
data/test/tools/javac/LocalClasses_2.java.i
data/test/tools/javac/failover/FailOver02.out.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/CodeTaglet.java.i
+data/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java.i
data/test/tools/javac/6521805/T6521805d.out.i
data/test/tools/javac/processing/errors/TestParseErrors/ParseErrors.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AbstractDoclet.java.i
data/test/tools/javac/TryWithResources/TwrOnNonResource.out.i
-data/test/tools/javac/DefiniteAssignment/DUBeforeDefined2.java.i
+data/test/tools/javac/diags/examples/ImproperTypeInnerRawParam.java.i
+data/test/tools/javac/generics/wildcards/6651719/T6651719a.java.i
data/test/tools/javac/FinalIntConcatenation.java.i
-data/test/tools/javac/4917091/Test256a.java.i
+data/make/netbeans/langtools/nbproject/project.xml.i
data/src/share/classes/com/sun/source/tree/ErroneousTree.java.i
data/test/tools/javac/BadOptimization/DeadCode6.java.i
data/test/tools/javac/NullQualifiedNew2.java.i
@@ -1670,216 +1685,213 @@ data/test/tools/javac/processing/6511613/DummyProcessor.java.i
data/test/com/sun/javadoc/AuthorDD/AuthorDD.java.i
data/test/tools/javac/generics/rare/Rare9.java.i
data/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperClass.java.i
-data/test/tools/javac/6410653/T6410653.java.i
+data/test/tools/javac/T6873849.java.i
+data/test/tools/javac/6734819/T6734819c.out.i
data/test/tools/javac/generics/Covar4.java.i
data/test/tools/javac/diags/README.examples.txt.i
-data/test/tools/javac/generics/diamond/7030687/ParserTest.java.i
+data/test/tools/javac/completion/C.java.i
data/test/tools/javac/generics/Covar3.java.i
-data/test/tools/javac/diags/examples/OverrideWeakerAccess.java.i
-data/src/share/classes/com/sun/tools/classfile/package.html.i
+data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java.i
+data/test/tools/javac/generics/ErasureClashCrash.java.i
data/test/tools/javac/4241573/T4241573.java.i
data/test/tools/apt/Basics/Indirect.java.i
data/test/com/sun/javadoc/testInterface/TestInterface.java.i
data/make/netbeans/README.i
data/src/share/classes/com/sun/javadoc/FieldDoc.java.i
data/test/tools/javac/T4093617/T4093617.java.i
+data/src/share/classes/sun/tools/javap/FieldData.java.i
data/test/tools/javac/overload/T6776289.java.i
data/test/tools/javac/mixedTarget/CompatibleAbstracts4.java.i
data/test/tools/javac/diags/examples/UncheckedPlural/UncheckedFilename.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/TestNewLanguageFeatures.java.i
-data/test/tools/apt/mirror/util/TypeCreation.java.i
+data/src/share/classes/com/sun/tools/javac/comp/Lower.java.i
data/src/share/classes/com/sun/tools/javac/comp/Flow.java.i
-data/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java.i
+data/test/tools/javac/enum/TrailingComma.java.i
data/test/tools/javac/generics/typevars/6680106/T6680106.out.i
data/make/jprt.properties.i
-data/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java.i
+data/test/tools/javap/4870651/T4870651.java.i
+data/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java.i
data/test/tools/javac/generics/diamond/pos/Pos04.java.i
data/test/tools/javac/6400872/B.java.i
data/test/tools/javac/generics/ExtendedRaw3.java.i
data/test/tools/javadoc/badSuper/p/B.java.i
-data/test/com/sun/javadoc/testLinkOption/testNewLineInLink/C.java.i
+data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass1.java.i
data/src/share/classes/com/sun/source/tree/UnionTypeTree.java.i
data/test/tools/javah/6572945/gold/jni.file.1.i
-data/test/tools/javac/implicitThis/WhichImplicitThis11.java.i
+data/test/tools/javac/api/6431257/T6431257.java.i
data/test/tools/apt/lib/Tester.java.i
data/test/tools/javac/modules/ModuleResolverTest01.java.i
-data/test/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java.i
-data/test/tools/javac/TryWithResources/T7022711.out.i
-data/test/tools/javac/T6231246/T6231246.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java.i
+data/test/tools/javac/generics/6213818/T6213818.java.i
data/test/tools/javac/QualifiedNew.out.i
-data/test/tools/javac/T6595666.java.i
-data/test/tools/javac/varargs/warning/Warn2.java.i
-data/test/com/sun/javadoc/testPackagePage/pkg2/C.java.i
+data/test/tools/javac/limits/ArrayDims3.java.i
+data/test/tools/javac/policy/test1/byfile.ACD.out.i
data/test/tools/javac/generics/wildcards/neg/CastWarn10.java.i
data/test/tools/javac/diags/examples/PrematureEOF.java.i
data/test/com/sun/javadoc/AccessH1/p1/C.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlStyle.java.i
data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.sh.i
+data/test/tools/javac/generics/wildcards/neg/CastFail9.java.i
data/src/share/classes/sun/tools/javap/Tables.java.i
-data/test/tools/javah/4942232/Test.java.i
+data/test/tools/javac/diags/examples/ProcUseImplicit/processors/AnnoProc.java.i
data/test/tools/javac/generics/inference/6650759/T6650759k.java.i
data/test/tools/javac/typeAnnotations/failures/target/IncompleteArray.out.i
data/test/tools/javac/TryWithResources/TwrLint.java.i
data/test/com/sun/javadoc/testClassCrossReferences/TestClassCrossReferences.java.i
data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.java.i
data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/testfile.txt.i
+data/test/tools/javac/generics/6946618/T6946618b.out.i
data/test/com/sun/javadoc/testPackageDeprecation/pkg1/ClassUseTest1.java.i
data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/MissingAnnotationValue.java.i
+data/test/tools/javac/DefiniteAssignment/UncaughtException.java.i
data/test/tools/javac/6403424/B.java.i
-data/test/tools/javap/pathsep.sh.i
-data/test/tools/javac/stackmap/T4955930.sh.i
+data/src/share/classes/com/sun/tools/javac/parser/Keywords.java.i
+data/test/tools/javac/enum/6384542/T6384542a.java.i
+data/test/tools/javac/processing/filer/TestLastRound.java.i
data/test/tools/javac/literals/T6891079.java.i
data/test/tools/javac/diags/examples/InvalidInferredTypes.java.i
-data/test/tools/javac/diags/examples/FinalParamCantBeAssigned.java.i
-data/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java.i
+data/test/tools/javac/varargs/6313164/T6313164.java.i
+data/test/tools/javac/UplevelFromAnonInSuperCall.java.i
data/test/tools/javac/BoolArray.java.i
data/test/tools/javac/processing/options/XprintDocComments.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/B.java.i
-data/test/tools/javac/generics/wildcards/neg/AmbiguousCast.java.i
-data/make/test/HelloWorld.javap.gold.txt.i
+data/test/tools/javac/limits/ArrayDims5.java.i
+data/test/tools/javac/ImportPackagePrivateInner/Dummy.java.i
data/test/tools/javac/generics/6372782/PlanarVector.java.i
data/test/tools/javac/generics/RawClient.java.i
data/test/tools/javac/diags/examples/MissingSVUID.java.i
-data/test/com/sun/javadoc/testOverridenMethods/pkg1/BaseClass.java.i
-data/test/tools/javadoc/annotations/badVals/pkg1/A.java.i
+data/test/tools/javac/modules/ModuleVersionQueryTest01.java.i
data/test/tools/javac/4980495/static/Test.out.i
data/src/share/classes/sun/tools/javap/Constants.java.i
-data/test/tools/javac/generics/6182950/T6182950b.out.i
-data/test/tools/javac/diags/ArgTypeCompilerFactory.java.i
+data/test/tools/javac/mixedTarget/ExtendCovariant1.java.i
data/test/tools/javac/modules/ModuleModeTests/HelloAWTTest.java.i
data/make/test/bootstrap/javah.sh.i
data/test/tools/javac/types/BoxingConversionTest.java.i
data/test/com/sun/javadoc/testPrivateClasses/pkg/PublicChild.java.i
data/test/com/sun/javadoc/testConstructorIndent/C.java.i
-data/test/com/sun/javadoc/ValidHtml/overview.html.i
+data/test/tools/javac/diags/examples/UncheckedMethodInvocation.java.i
data/test/tools/javac/diags/examples/CountError.java.i
-data/src/share/classes/com/sun/mirror/util/Declarations.java.i
+data/test/tools/javac/6835430/A.java.i
+data/test/tools/javac/annotations/6214965/T6214965.out.i
data/test/tools/javac/policy/test1/C.java.i
data/test/tools/javac/diags/examples/DuplicateAnnotationMemberValue.java.i
-data/test/tools/javac/generics/compat/CovariantCompat2.java.i
data/test/tools/javac/cast/5043020/T5043020.java.i
-data/test/tools/javac/modules/EntrypointTest01.java.i
data/src/share/classes/com/sun/source/util/Trees.java.i
data/test/tools/javac/policy/test1/Test1b.java.i
data/test/tools/javac/6302184/T6302184.out.i
data/test/tools/javac/diags/examples/IllegalUnderscore.java.i
data/src/share/classes/com/sun/tools/javac/file/Paths.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java.i
+data/src/share/classes/com/sun/tools/classfile/Attributes.java.i
data/test/tools/javac/6979683/TestCast6979683_BAD34.java.i
data/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties.i
data/test/tools/javac/api/ToolProvider/HelloWorldTest.java.i
data/test/tools/javac/T6397044.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/BuilderFactory.java.i
-data/src/share/classes/javax/tools/SimpleJavaFileObject.java.i
-data/test/tools/javac/generics/rawOverride/7062745/T7062745neg.java.i
+data/test/tools/javac/generics/diamond/neg/Neg06.out.i
+data/test/tools/javac/processing/options/TestImplicitNone.java.i
data/test/tools/javac/miranda/T4711325.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/background.gif.i
data/test/tools/javac/TryWithResources/BadTwr.java.i
data/test/tools/javac/T6265400.java.i
-data/src/share/classes/com/sun/javadoc/ClassDoc.java.i
+data/test/com/sun/javadoc/testLinkOption/TestLinkOption.java.i
data/test/tools/javac/stackmap/UninitThis.java.i
data/test/tools/javac/policy/byfile.ABD.out.i
data/test/tools/javac/enum/NoFinal3.java.i
-data/test/tools/javac/T6458823/MyProcessor.java.i
data/test/tools/javac/generics/Conditional.java.i
data/test/tools/javac/diags/examples/WhereIntersection.java.i
data/test/tools/javac/multicatch/Pos07.java.i
data/test/tools/javac/enum/FauxSpecialEnum2.java.i
data/src/share/classes/sun/tools/javap/JavapEnvironment.java.i
data/src/share/classes/javax/lang/model/package-info.java.i
-data/src/share/classes/com/sun/javadoc/SeeTag.java.i
-data/test/tools/javac/annotations/pos/Parameter.java.i
+data/test/tools/javap/4870651/Test.java.i
data/test/tools/javac/Diagnostics/6860795/T6860795.java.i
data/test/tools/javac/abstract/U2.java.i
-data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C3.java.i
-data/test/tools/javac/generics/typevars/6968793/T6968793.out.i
-data/test/tools/javac/generics/odersky/BadTest3.java.i
+data/test/tools/javadoc/generics/tparamTagOnMethod/expected.out.i
+data/test/tools/javadoc/annotations/defaults/pkg1/B.java.i
+data/test/tools/javap/typeAnnotations/T6855990.java.i
data/test/tools/javac/Object1.java.i
data/test/tools/apt/Scanners/Counter.java.i
data/test/tools/javac/T6397286.java.i
data/test/tools/javac/diags/examples/InferArgsLengthMismatch.java.i
data/test/tools/javac/6558548/T6558548.java.i
-data/test/tools/javac/packone/Secret.java.i
-data/test/tools/javac/enum/T6509042.java.i
+data/test/tools/javac/DepParam.java.i
+data/test/tools/javac/annotations/neg/Recovery1.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/CommentedMethodFinder.java.i
data/test/tools/javac/synthesize/Character.java.i
data/test/tools/javac/typeAnnotations/newlocations/Fields.java.i
data/src/share/classes/javax/lang/model/element/NestingKind.java.i
-data/test/tools/javac/generics/UncheckedArray.java.i
data/test/tools/javac/T4994049/T4994049.out.i
-data/test/com/sun/javadoc/testThrowsTag/pkg/C.java.i
-data/test/tools/javac/positions/T6253161a.out.i
-data/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog.i
+data/test/tools/javadoc/sourceOnly/Test.java.i
+data/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java.i
data/test/tools/javac/T6472751.java.i
data/test/tools/javac/generics/InnerInterface1.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/WriterFactory.java.i
+data/test/tools/javac/implicitThis/NewBeforeOuterConstructed3.java.i
data/src/share/classes/com/sun/source/tree/BreakTree.java.i
data/test/tools/javac/enum/EnumInit.java.i
-data/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java.i
data/src/share/classes/com/sun/tools/classfile/ClassWriter.java.i
data/test/com/sun/javadoc/VersionNumber/VersionNumber.java.i
data/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java.i
-data/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java.i
+data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java.i
data/src/share/classes/com/sun/mirror/apt/package-info.java.i
data/test/tools/javac/generics/odersky/Test3.java.i
data/test/tools/javac/warnings/6747671/T6747671.out.i
data/test/tools/javac/boxing/NoBoxingShort.java.i
data/test/tools/javac/modules/ProvidesServiceTest01.java.i
-data/test/tools/javac/diags/examples/IntfAnnotationMemberClash.java.i
+data/test/tools/javac/6840059/T6840059.out.i
data/test/com/sun/javadoc/testTagInheritence/pkg/TestInterface.java.i
data/test/com/sun/javadoc/lib/JavadocTester.java.i
-data/test/tools/javac/depOverrides/annotation/Test3.java.i
-data/test/com/sun/javadoc/testThrowsHead/C.java.i
-data/test/tools/javac/processing/6512707/T6512707.java.i
-data/test/tools/javac/tree/TreeScannerTest.java.i
+data/test/tools/javac/policy/test1/simple.ABD.out.i
+data/test/tools/javac/diags/examples/DiamondAndExplicitParams.java.i
data/test/tools/apt/mirror/declaration/AnnoTypeDecl.java.i
data/test/tools/javac/generics/inference/6278587/T6278587.java.i
data/test/tools/javac/NonStaticFieldExpr2.java.i
-data/test/tools/javac/generics/6946618/T6946618c.out.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java.i
+data/test/tools/apt/mirror/declaration/ClassDecl.java.i
+data/test/tools/javac/unit/util/list/FromArray.java.i
+data/src/share/classes/com/sun/tools/javadoc/Start.java.i
data/test/tools/javac/generics/6476118/T6476118b.java.i
-data/test/tools/javac/unicode/SupplementaryJavaID4.java.i
+data/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java.i
data/test/tools/javac/generics/typeargs/Newarg2.java.i
data/test/tools/javac/diags/examples/ImproperTypeParamMissing.java.i
-data/test/tools/javap/T6715753.java.i
data/test/tools/javac/inheritedAccess/P1/priv.java.i
data/test/tools/javac/ClassPathTest/ClassPathTest3.java.i
-data/src/share/classes/sun/tools/javap/FieldData.java.i
+data/test/tools/javac/TryWithResources/T7022711.java.i
data/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java.i
-data/test/tools/javap/4870651/T4870651.java.i
-data/test/tools/javac/abstract/T2.java.i
+data/test/com/sun/javadoc/testLinkOption/TestBadLinkOption.java.i
data/test/tools/javac/generics/rawOverride/Warn1.java.i
data/src/share/classes/com/sun/tools/javac/util/DiagnosticFormatter.java.i
data/test/tools/javac/multicatch/Pos03.java.i
data/test/tools/javac/ClassLiterals/InitializeOuter.java.i
+data/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties.i
-data/test/tools/javac/synthesize/Byte.java.i
+data/src/share/classes/com/sun/tools/javac/comp/Modules.java.i
data/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound2.java.i
data/test/tools/javadoc/generics/supertypes/expected.out.i
data/test/tools/javac/diags/examples/DuplicateDefaultLabel.java.i
data/test/tools/javac/diags/examples/StringConstRequired.java.i
data/test/tools/javac/generics/6292765/T6292765.java.i
-data/test/com/sun/javadoc/testLinkOption/TestLinkOption.java.i
+data/src/share/classes/com/sun/javadoc/ClassDoc.java.i
data/src/share/classes/com/sun/tools/classfile/ClassTranslator.java.i
data/test/tools/javac/enum/T5081785b.java.i
data/test/tools/javac/generics/inference/6365166/NewTest.java.i
-data/test/tools/javac/DepParam.java.i
-data/test/com/sun/javadoc/testSimpleTagExclude/DummyClass.java.i
+data/test/tools/javac/packone/Secret.java.i
+data/test/tools/javac/6979683/TestCast6979683_BAD34.java.errlog.i
data/test/tools/javac/tree/T6963934.java.i
-data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/TestSerializedFormDeprecationInfo.java.i
+data/test/com/sun/javadoc/testLinkToSerialForm/pkg/C.java.i
data/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java.i
data/test/tools/javac/generics/inference/5073060/GenericsAndPackages.java.i
-data/src/share/classes/com/sun/tools/javadoc/Start.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/PackageSummaryWriter.java.i
data/test/tools/javac/links/b/B.java.i
data/test/tools/javac/diags/examples/EnumNoFinalize.java.i
+data/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java.i
data/test/tools/javac/generics/SilentUnchecked.java.i
data/test/tools/javac/diags/examples/MissingDeprecatedAnnotation.java.i
data/test/tools/javac/meth/InvokeMHTrans.java.i
+data/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html.i
data/src/share/classes/com/sun/tools/javadoc/AnnotationTypeElementDocImpl.java.i
data/test/com/sun/javadoc/testMemberInheritence/diamond/B.java.i
data/test/tools/javac/generics/inference/5081782/Neg.java.i
data/test/tools/javac/EOI.java.i
-data/test/tools/javac/processing/environment/round/SurfaceAnnotations.java.i
+data/test/tools/javac/generics/rare/Rare8.java.i
data/test/tools/javac/capture/T6594284.java.i
data/test/tools/javadoc/generics/throwsGeneric/Main.java.i
data/test/tools/javadoc/outputRedirect/p/OutputRedirect.java.i
@@ -1900,9 +1912,7 @@ data/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties.i
data/test/tools/javac/generics/wildcards/AssignmentSameType3.java.i
data/src/share/classes/com/sun/tools/javac/api/JavacTrees.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrayclass/MissingAnnotationValue.out.i
-data/test/tools/javac/processing/werror/WError1.java.i
data/test/tools/javac/generics/6294779/T6294779b.java.i
-data/src/share/classes/com/sun/source/tree/NewArrayTree.java.i
data/src/share/classes/com/sun/tools/classfile/Code_attribute.java.i
data/test/tools/javac/6440583/A.java.i
data/test/tools/javac/processing/warnings/UseImplicit/err.out.i
@@ -1914,64 +1924,58 @@ data/src/share/classes/javax/tools/JavaCompiler.java.i
data/test/tools/javac/T6234077.java.i
data/test/tools/javac/diags/examples/PrintRounds/PrintRounds.java.i
data/test/com/sun/javadoc/testDeprecatedDocs/TestDeprecatedDocs.java.i
-data/src/share/classes/com/sun/tools/javac/util/Options.java.i
data/test/tools/javah/6572945/T6572945.java.i
-data/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties.i
-data/test/tools/javac/warnings/6594914/T6594914b.java.i
+data/test/tools/javac/6304921/TestLog.java.i
data/test/tools/javac/enum/UserValue.java.i
-data/test/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java.i
data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsFilename.java.i
data/test/tools/javac/generics/typevars/6569404/T6569404a.java.i
data/src/share/classes/com/sun/javadoc/package.html.i
data/test/tools/javac/generics/inference/6938454/T6938454a.java.i
data/test/tools/javac/CastInterface2Array.java.i
-data/test/tools/javac/NewGeneric.java.i
-data/test/tools/javac/ClassFileModifiers/ClassModifiers.out.i
+data/test/tools/javac/binaryCompat/T1.java.i
data/test/tools/javac/diags/examples/DiamondInvalidArg.java.i
-data/test/tools/javac/generics/wildcards/6437894/A.java.i
+data/test/tools/javac/api/6411310/T6411310.java.i
data/test/tools/javac/proprietary/WarnStaticImport.java.i
data/test/tools/javadoc/annotations/elementTypes/pkg1/A.java.i
data/test/tools/javac/annotations/default/Eerr.java.i
data/src/share/classes/javax/lang/model/util/ElementKindVisitor7.java.i
-data/test/tools/javac/warnings/6594914/DeprecatedClass.java.i
data/test/tools/javac/generics/typevars/6182630/T6182630e.java.i
data/src/share/classes/com/sun/javadoc/PackageDoc.java.i
data/test/com/sun/javadoc/AccessAsciiArt/p1/SC.java.i
data/test/tools/javac/failover/FailOver01.out.i
data/test/tools/javac/diags/examples/CantDeref.java.i
data/test/tools/javac/diags/examples/UnnamedPackage.java.i
-data/make/netbeans/langtools/nbproject/project.xml.i
+data/test/tools/javac/FinallyWarn.java.i
data/test/tools/apt/Basics/Aggregate.java.i
data/test/tools/javadoc/annotations/elementTypes/Main.java.i
data/test/tools/javac/generics/6332204/T6332204.java.i
data/test/tools/javac/generics/7007615/acc1/p1/C.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo3.java.i
+data/test/tools/javac/6402516/Checker.java.i
data/test/tools/javac/6341866/B.java.i
data/test/tools/javac/warnings/DivZero.noLint.out.i
+data/test/tools/javac/6521805/T6521805d.java.i
data/test/tools/javac/typeAnnotations/classfile/DeadCode.java.i
-data/test/tools/javac/depDocComment/DeprecatedDocComment.out.i
data/test/com/sun/javadoc/testThrowsTag/pkg/P.java.i
-data/src/share/classes/com/sun/source/tree/ConditionalExpressionTree.java.i
data/test/tools/javap/T6622216.java.i
data/test/tools/javac/synthesize/Object.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/C1.java.i
data/test/tools/javac/diags/examples/DivZero.java.i
data/test/tools/javac/crossPackageImpl/CrossPackageImplB.java.i
-data/test/tools/javac/processing/model/util/OverridesSpecEx.java.i
data/src/share/classes/com/sun/source/tree/PackageTree.java.i
data/src/share/classes/com/sun/mirror/type/DeclaredType.java.i
-data/test/tools/javac/modules/RequiresModuleTest01.java.i
data/src/share/classes/com/sun/tools/javac/comp/Check.java.i
data/test/tools/javac/generics/wildcards/pos/ParamCast.java.i
-data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out.i
data/test/tools/javac/generics/T4739399.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/inherit.gif.i
-data/test/tools/javac/policy/test2/byfile.BA.out.i
+data/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java.i
data/test/tools/javac/NameCollision2.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java.i
+data/test/tools/javac/modules/DirectiveTest.java.i
+data/test/tools/javac/failover/CheckAttributedTree.java.i
data/test/tools/javac/T6394563.note.out.i
data/test/com/sun/javadoc/testMemberSummary/TestMemberSummary.java.i
data/test/tools/javac/4880220/T4880220.warn.out.i
+data/test/tools/javac/diags/examples/IntfMethodCantHaveBody.java.i
data/test/tools/javac/diags/examples/VarargsFilename.java.i
data/test/tools/javadoc/T4994049/T4994049.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/TagletWriterImpl.java.i
@@ -1982,70 +1986,62 @@ data/src/share/classes/com/sun/tools/javac/parser/JavaTokenizer.java.i
data/test/tools/apt/Compile/src/Round1Class.java.i
data/test/tools/javac/enum/EnumSwitch4.java.i
data/test/tools/javac/jvm/6397652/com/test/Test$Test.java.i
+data/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java.i
data/test/com/sun/javadoc/WindowTitles/p2/C2.java.i
data/test/tools/javac/typeAnnotations/newlocations/BasicTest.java.i
-data/make/netbeans/common/shared.xml.i
-data/test/tools/javadoc/annotations/missing/Main.java.i
data/test/tools/javac/cast/6256789/T6256789.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java.i
data/src/share/classes/com/sun/mirror/declaration/package.html.i
data/src/share/classes/com/sun/tools/javac/zip/ZipFileIndex.java.i
-data/test/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java.i
+data/test/tools/javac/Digits.java.i
data/src/share/classes/com/sun/tools/javac/parser/EndPosTable.java.i
data/src/share/classes/com/sun/tools/javac/util/Old199.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java.i
+data/src/share/classes/com/sun/tools/classfile/Module_attribute.java.i
data/test/tools/javac/varargs/5088429/T5088429Pos02.java.i
data/test/tools/javac/T4906100.java.i
-data/test/tools/javac/expression/NullAppend2.java.i
data/src/share/classes/com/sun/tools/classfile/AccessFlags.java.i
data/test/tools/javac/diags/examples/ThrowsNotAllowedInAnno.java.i
data/test/tools/javac/limits/FinallyNesting.java.i
-data/test/tools/javac/Closure3.java.i
data/test/tools/apt/mirror/type/AnnoTyp.java.i
data/test/tools/javac/stackmap/T4955930.java.i
data/test/com/sun/javadoc/testRecurseSubPackages/TestRecurseSubPackages.java.i
-data/test/tools/javac/unicode/SupplementaryJavaID1.java.i
data/test/tools/javac/6403424/A.java.i
data/test/tools/javac/generics/6910550/T6910550d.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/TagletOutputImpl.java.i
-data/test/tools/javac/sourcePath2/SourcePath2.java.i
-data/test/tools/javac/diags/examples/ExceptAlreadyCaught.java.i
data/test/tools/javac/diags/examples/ProcTypeRecreate/ProcTypeRecreate.java.i
data/test/tools/javac/annotations/neg/Z2.java.i
data/test/tools/javac/typeAnnotations/failures/OldArray.java.i
data/test/tools/javac/generics/ArrayTypearg.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java.i
data/src/share/classes/javax/lang/model/util/ElementKindVisitor6.java.i
-data/test/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java.i
-data/test/tools/javac/generics/inference/4972073/T4972073a.java.i
data/test/tools/javac/staticImport/6695838/T6695838.java.i
-data/test/tools/javac/quid/MakeNegTests.sh.i
+data/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiPlural.java.i
data/test/com/sun/javadoc/DocRootSlash/p1/C1.java.i
data/test/tools/javac/generics/7020657/T7020657neg.out.i
data/test/tools/javac/expression/NullAppend.java.i
data/src/share/classes/com/sun/source/tree/DisjointTypeTree.java.i
data/make/netbeans/compiler/nbproject/project.xml.i
-data/test/tools/javac/multicatch/model/ModelChecker.java.i
+data/test/tools/javac/generics/7034019/T7034019c.java.i
data/test/tools/javac/AnonStaticMember_3.java.i
+data/test/tools/javac/generics/typevars/6968793/T6968793.java.i
data/test/com/sun/javadoc/testPackageDeprecation/pkg/A.java.i
-data/test/tools/javac/QualifiedThisAndSuper_1.java.i
data/test/tools/javac/generics/syntax/6318240/BarNeg2.java.i
data/src/share/classes/javax/annotation/processing/SupportedAnnotationTypes.java.i
data/test/com/sun/javadoc/WindowTitles/p1/C1.java.i
data/test/tools/javac/failover/FailOver15.out.i
data/src/share/classes/com/sun/source/util/TreePathScanner.java.i
-data/test/tools/javac/diags/examples/ForeachNotApplicable.java.i
-data/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java.i
+data/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java.i
+data/test/tools/javac/diags/examples/IdentifierExpected.java.i
data/test/tools/javac/diags/examples/CatchWithoutTry.java.i
data/test/tools/javac/limits/NumArgs3.java.i
data/test/tools/javac/diags/examples/KindnameVariable.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard.properties.i
data/test/tools/javac/annotations/neg/WrongTarget.java.i
data/test/tools/javac/ignored.jtx.i
-data/test/tools/javac/positions/T6253161a.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail13.java.i
-data/test/tools/javadoc/completionFailure/pkg/A.java.i
-data/test/tools/javac/T5003235/T5003235c.out.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java.i
+data/test/tools/javac/QualifiedAccess/QualifiedAccess_1.out.i
data/test/tools/javac/generics/6985719/T6985719g.out.i
+data/src/share/classes/com/sun/mirror/type/WildcardType.java.i
data/test/tools/javac/generics/6372782/PlainPlanarVector.java.i
data/test/tools/javac/AddReferenceThis.java.i
data/test/tools/javac/4980495/static/Test.java.i
@@ -2055,9 +2051,8 @@ data/test/tools/javac/modules/ModuleModeTests/HelloWorldTest.java.i
data/test/tools/javac/ClassPathTest/ClassPathTest1.java.i
data/test/tools/javac/generics/wildcards/6762569/T6762569a.java.i
data/test/tools/javac/policy/test1/Test1a.java.i
-data/test/tools/javac/multicatch/Neg04eff_final.out.i
+data/test/tools/javac/generics/6476118/T6476118c.out.i
data/test/tools/javac/diags/examples/RepeatedModifier.java.i
-data/test/tools/javac/typeAnnotations/failures/IncompleteArray.out.i
data/test/tools/javac/generics/rawOverride/7062745/T7062745neg.out.i
data/test/tools/javac/processing/model/TestSourceVersion.java.i
data/test/tools/apt/Basics/MySimple.java.i
@@ -2071,12 +2066,13 @@ data/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_att
data/src/share/classes/com/sun/tools/javap/ClassWriter.java.i
data/test/tools/javac/generics/7034019/T7034019c.out.i
data/test/tools/javac/InitializerCompletion_1.java.i
+data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java.i
data/test/tools/javac/boxing/T6816548.java.i
data/test/com/sun/javadoc/testUnnamedPackage/TestUnnamedPackage.java.i
data/test/tools/javac/generics/diamond/7030150/Neg03.out.i
data/test/tools/javac/modules/PermitsTest01.java.i
data/test/tools/javac/QualifiedThisAndSuper_3.java.i
-data/test/tools/javac/AccessMethods/BitwiseAssignment.java.i
+data/src/share/classes/com/sun/tools/javah/resources/l10n.properties.i
data/test/tools/javac/diags/examples/AbstractCantBeAccessed.java.i
data/test/tools/javac/Diagnostics/6722234/T6722234b_2.out.i
data/test/com/sun/javadoc/testTypeParams/pkg/C.java.i
@@ -2087,14 +2083,14 @@ data/test/tools/javadoc/nestedClass/NestedClass.java.i
data/test/tools/apt/Misc/Marker.java.i
data/test/tools/javac/4980495/std/Test.java.i
data/test/tools/javac/diags/examples/CannotCreateArrayWithTypeArgs.java.i
-data/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java.i
+data/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java.i
data/src/share/opensource/javac/doc/javac_lifecycle/style.css.i
data/test/tools/javac/diags/examples/AnonClassImplInterfaceNoTypeArgs.java.i
data/src/share/classes/com/sun/source/tree/ExportDirectiveTree.java.i
data/test/tools/javac/diags/examples/InvalidMethodDecl.java.i
data/test/tools/javac/ExtendArray.java.i
data/test/tools/javac/generics/T4695847.java.i
-data/test/tools/javah/ReadOldClass.sh.i
+data/test/tools/javac/generics/6245699/T6245699.java.i
data/test/tools/javac/failover/FailOver06.java.i
data/src/share/classes/com/sun/tools/javac/Main.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/package.html.i
@@ -2106,20 +2102,21 @@ data/src/share/classes/com/sun/source/tree/ModuleIdTree.java.i
data/src/share/classes/com/sun/tools/classfile/Field.java.i
data/test/tools/javac/annotations/pos/OverrideCheck.java.i
data/src/share/classes/com/sun/source/tree/ModuleRequiresTree.java.i
-data/test/tools/javac/Increment.java.i
+data/test/tools/javac/6302184/T6302184.sh.i
data/test/tools/javac/innerClassFile/Driver.java.i
data/test/tools/javac/ClassCycle/ClassCycle2b.java.i
-data/make/test/lib/src.gold.txt.i
+data/test/tools/javac/warnings/6594914/DeprecatedClass.java.i
data/test/tools/javac/T6985181.java.i
data/test/tools/javac/annotations/6214965/CompilerAnnotationTest2.java.i
-data/test/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java.i
+data/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java.i
data/test/tools/javac/generics/wildcards/AssignmentSameType5.java.i
+data/test/tools/javac/PackageClassAmbiguity/Bad.java.i
data/test/tools/javac/api/T6431879.java.i
-data/test/tools/javac/generics/diamond/6996914/T6996914a.java.i
data/src/share/classes/com/sun/source/util/TreePath.java.i
data/test/tools/javac/generics/parametricException/K.java.i
+data/test/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java.i
data/test/tools/javac/ReturnAfterIfThenElse.java.i
-data/test/tools/javac/assert/DU1.java.i
+data/test/tools/javac/generics/6207386/Test.java.i
data/test/tools/javac/7129225/TestImportStar.ref.i
data/src/share/classes/com/sun/tools/javah/Gen.java.i
data/test/tools/javac/generics/MissingCast.java.i
@@ -2139,66 +2136,68 @@ data/test/tools/javac/generics/7034511/T7034511b.java.i
data/test/tools/javac/generics/diamond/7030687/T7030687.java.i
data/test/tools/javac/generics/wildcards/6320612/T6320612.java.i
data/test/tools/javac/6717241/T6717241a.out.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java.i
+data/test/tools/javac/boxing/NoBoxingBool.java.i
data/src/share/classes/com/sun/tools/javac/file/FSInfo.java.i
data/test/tools/javac/implicitThis/WhichImplicitThis7.java.i
data/test/tools/javac/miranda/4686811/p2/B.java.i
data/test/tools/javac/diags/examples/NotApplicableMethodFound.java.i
-data/test/tools/javac/modules/ModuleResolverTest05.java.i
+data/src/share/classes/com/sun/tools/javah/resources/l10n_zh_CN.properties.i
data/test/tools/javac/lib/CompileFail.java.i
+data/test/tools/javac/diags/examples/AlreadyDefinedClinit.java.i
data/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java.i
+data/test/com/sun/javadoc/testLinkOption/package-list.i
data/src/share/opensource/javac/doc/javac_lifecycle/Context.html.i
-data/test/tools/javac/Paths/6638501/test/SayHello.java.i
-data/test/tools/javac/diags/examples/MalformedSupported/MalformedSupported.java.i
data/test/tools/javac/TryWithResources/TwrFlow.java.i
-data/src/share/classes/javax/lang/model/element/package-info.java.i
+data/test/tools/javac/api/T6392782.java.i
data/test/tools/apt/Compile/src/AhOneClass.java.i
data/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java.i
data/src/share/classes/com/sun/source/tree/ProvidesModuleDirectiveTree.java.i
data/test/com/sun/javadoc/testBaseClass/Bar.java.i
-data/test/tools/javac/implicitThis/6541876/T6541876a.java.i
+data/make/netbeans/compiler/README.i
+data/test/tools/javac/literals/BadBinaryLiterals.java.i
data/src/share/classes/com/sun/tools/javadoc/ExecutableMemberDocImpl.java.i
data/test/tools/javac/generics/inference/5044646/p2/A2.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/ClassWriter.java.i
-data/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java.i
data/test/tools/javac/positions/T6264029.java.i
data/test/tools/javac/annotations/neg/WrongTarget2.java.i
+data/test/tools/javac/generics/SuperTypeargs.java.i
data/test/com/sun/javadoc/testEmptyClass/TestEmptyClass.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail8.java.i
data/test/com/sun/javadoc/testTagHolderMethod/pkg/C.java.i
+data/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java.i
data/test/tools/javac/6979683/TestCast6979683_BAD36.java.errlog.i
-data/test/tools/apt/Basics/foo/bar/Quux.java.i
-data/test/tools/javadoc/generics/tparamTagOnMethod/Main.java.i
+data/test/tools/javac/generics/UnsoundInference.java.i
+data/test/tools/javac/generics/inference/5021635/T5021635.java.i
data/test/tools/javac/warnings/Deprecation.lintDeprecation.out.i
-data/test/tools/javac/ClassFileModifiers/MemberModifiers.java.i
+data/test/tools/javac/enum/AbstractEmptyEnum.java.i
+data/src/share/classes/com/sun/tools/javap/JavapFileManager.java.i
data/test/tools/javac/generics/GetClass.java.i
data/test/tools/javac/QualifiedAccess/QualifiedAccess_3.sh.i
data/src/share/classes/com/sun/javadoc/Parameter.java.i
data/test/tools/javac/T6241723.java.i
-data/test/tools/javac/T6326754.java.i
data/test/tools/apt/Discovery/PhantomTouch.java.i
data/test/tools/javac/abstract/U3.java.i
data/src/share/classes/com/sun/tools/classfile/ModuleProvides_attribute.java.i
data/test/tools/javac/proprietary/WarnWildcard.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java.i
data/test/tools/javac/diags/examples/Location1.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/package.html.i
data/test/com/sun/javadoc/testLinkOption/pkg/C.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Extern.java.i
data/test/tools/javadoc/annotations/annotateMethodsFields/Main.java.i
+data/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java.i
data/test/tools/javac/generics/diamond/pos/Pos06.java.i
data/test/com/sun/javadoc/testStylesheet/TestStylesheet.java.i
data/test/tools/javac/generics/ExtendedRaw1.java.i
data/test/tools/javac/processing/loader/testClose/TestClose2.java.i
-data/src/share/classes/com/sun/tools/javap/resources/javap.properties.i
+data/test/tools/javac/generics/inference/6650759/T6650759l.java.i
data/test/tools/javac/InterfaceObjectIncompatibility.java.i
data/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ParamTest.java.i
data/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java.i
data/test/tools/javac/T6379327.java.i
data/src/share/classes/com/sun/tools/classfile/Method.java.i
-data/test/tools/javac/generics/FinalBridge.java.i
-data/test/tools/javac/InvalidIntfCast.java.i
+data/test/com/sun/javadoc/MetaTag/MetaTag.java.i
+data/test/tools/javac/NewGeneric.java.i
data/src/share/classes/com/sun/tools/apt/comp/Apt.java.i
data/test/tools/apt/Basics/annot/AnnotMarker.java.i
data/test/tools/javac/literals/BadBinaryLiterals.7.out.i
@@ -2209,17 +2208,17 @@ data/test/com/sun/javadoc/AccessSummary/p1/C1.java.i
data/src/share/classes/com/sun/mirror/util/Types.java.i
data/src/share/classes/javax/lang/model/type/ArrayType.java.i
data/test/tools/javac/enum/OkFinal.java.i
-data/test/tools/javac/NonStaticFieldExpr4d.java.i
+data/test/tools/javac/generics/6182950/T6182950b.java.i
data/test/tools/javac/diags/examples/ProcTypeRecreate/processors/AnnoProc.java.i
data/test/tools/javac/processing/model/testgetallmembers/Main.java.i
data/test/tools/javac/diags/examples/MissingMethodBody.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LegacyTaglet.java.i
-data/test/tools/javac/ConditionalWithVoid.java.i
+data/test/tools/javac/typeAnnotations/failures/IncompleteArray.out.i
data/test/tools/javac/generics/wildcards/neg/CastFail19.java.i
data/test/com/sun/javadoc/testInterface/pkg/Parent.java.i
data/test/tools/javac/generics/6372782/VariableForm.java.i
data/test/tools/javac/unicode/FirstChar.java.i
-data/test/tools/javac/EmptyBreak.java.i
+data/test/tools/javadoc/generics/genericSuper/expected.out.i
data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.java.i
data/test/tools/javac/ImportCycle/foo/Top2.java.i
data/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java.i
@@ -2238,6 +2237,7 @@ data/test/tools/javac/protectedInner/AnonInnerClass.java.i
data/test/tools/javac/generics/inference/6359106/T6359106.java.i
data/test/tools/apt/Compile/Round2Apf.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg1/A.java.i
+data/test/tools/javac/abstract/T4717181a.java.i
data/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java.i
data/test/tools/javac/incompatibleNoninherited/B.java.i
data/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java.i
@@ -2246,10 +2246,11 @@ data/test/tools/javac/processing/model/util/deprecation/Dep1.java.i
data/test/tools/javac/lint/Unchecked.java.i
data/test/tools/javac/diags/examples/GenericsNotSupported.java.i
data/test/tools/javadoc/generics/genericMethod/expected.out.i
-data/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java.i
+data/src/share/classes/sun/tools/javap/InnerClassData.java.i
data/test/tools/javac/NonAmbiguousField/one/Parent2.java.i
data/src/share/classes/javax/tools/ForwardingJavaFileObject.java.i
-data/test/tools/javac/6521805/T6521805d.java.i
+data/test/tools/apt/Basics/StaticMethodAnnotations.java.i
+data/test/tools/javac/annotations/neg/MemberOver.java.i
data/test/tools/javac/generics/inference/6650759/T6650759m.out.i
data/test/tools/javac/typeAnnotations/failures/target/VoidMethod.out.i
data/test/tools/javac/binaryCompat/T3.java.i
@@ -2257,6 +2258,7 @@ data/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/C7.java.i
data/test/tools/javadoc/generics/genericMethod/Main.java.i
data/src/share/classes/com/sun/tools/javac/file/CompositeLocation.java.i
+data/test/tools/javac/api/T6483788.java.i
data/test/tools/javac/diags/examples/PossibleFallThrough.java.i
data/test/tools/javac/processing/model/util/GetTypeElemBadArg.java.i
data/test/tools/javac/failover/FailOver04.out.i
@@ -2266,13 +2268,13 @@ data/src/share/classes/com/sun/tools/javac/parser/JavadocTokenizer.java.i
data/test/tools/javac/diags/examples/NotDefPublicCantAccess/p/C.java.i
data/test/tools/javac/diags/examples/CountWarnPlural.java.i
data/test/com/sun/javadoc/testNestedGenerics/pkg/NestedGenerics.java.i
-data/test/tools/javac/generics/InnerInterface2.java.i
+data/test/com/sun/javadoc/testMemberInheritence/diamond/C.java.i
data/test/tools/javac/generics/7022054/T7022054neg2.out.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java.i
data/src/share/classes/com/sun/mirror/type/PrimitiveType.java.i
+data/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java.i
data/test/tools/javac/generics/6372782/Element.java.i
data/test/tools/javac/processing/6430209/T6430209.java.i
-data/test/tools/javac/generics/typevars/6182630/T6182630f.java.i
data/test/tools/javac/generics/wildcards/AssignmentSameType4.java.i
data/test/tools/javac/miranda/4686811/p1/C.java.i
data/test/tools/javac/processing/environment/round/AnnotatedElementInfo.java.i
@@ -2286,23 +2288,19 @@ data/make/netbeans/common/standard-ide-actions.ent.i
data/test/tools/javac/varargs/7097436/T7097436.java.i
data/test/com/sun/javadoc/testLinkOption/TestNewLineInLink.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/package.html.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java.i
+data/test/tools/javac/fatalErrors/NoJavaLang.java.i
data/test/tools/javac/7129225/Anno.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/PackageWriterImpl.java.i
-data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java.i
-data/test/tools/javac/generics/classreader/HMethod.java.i
data/test/tools/javac/generics/syntax/6318240/BarNeg1a.java.i
data/make/conf/checkstyle-emacs.xsl.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java.i
-data/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java.i
+data/test/com/sun/javadoc/testTaglets/Parent.java.i
+data/test/tools/javadoc/generics/tparamTagOnMethod/Main.java.i
data/test/tools/javac/TryWithResources/DuplicateResource.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties.i
data/test/tools/javac/diags/examples/RepeatedAnnotationTarget.java.i
data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-used2/testfile.txt.i
-data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out.i
data/src/share/classes/com/sun/javadoc/ParamTag.java.i
data/src/share/opensource/javac/doc/javac_lifecycle/Enter.html.i
-data/test/tools/javac/enum/AbstractEnum1.java.i
data/test/tools/javac/generics/diamond/neg/Neg06.java.i
data/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java.i
data/test/tools/javac/ClassLiterals/ClassLiteralHelperContext.java.i
@@ -2320,7 +2318,8 @@ data/test/tools/javac/foreach/SpecIterable.java.i
data/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties.i
data/test/tools/javac/generics/6985719/T6985719d.java.i
data/test/com/sun/javadoc/5093723/UndocumentedClass.java.i
-data/test/tools/javac/processing/model/TestExceptions.java.i
+data/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java.i
+data/test/tools/javac/6668794/badSource/p/A.java.i
data/test/tools/apt/mirror/declaration/ParameterDecl.java.i
data/src/share/classes/com/sun/tools/javac/code/Type.java.i
data/test/com/sun/javadoc/testHiddenMembers/TestHiddenMembers.java.i
@@ -2334,24 +2333,23 @@ data/test/tools/javac/generics/6372782/Ring.java.i
data/test/tools/javac/generics/PrimitiveVariant.java.i
data/src/share/classes/com/sun/source/tree/DisjunctiveTypeTree.java.i
data/test/tools/javac/diags/examples/UnsupportedFpLit.java.i
-data/test/tools/javadoc/completionFailure/pkg/B.java.i
+data/src/share/classes/com/sun/source/util/SourcePositions.java.i
data/test/tools/javac/FlatnameClash.java.i
-data/test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java.i
+data/test/tools/javac/StringsInSwitch/OneCaseSwitches.java.i
data/test/tools/javac/parser/T4881269.out.i
data/test/tools/javac/generics/inference/6650759/T6650759m.java.i
data/test/tools/javac/ClassLiterals/p1/C.java.i
-data/test/tools/javac/AnonymousProtect/AnonymousProtect.java.i
data/src/share/classes/com/sun/source/tree/EntrypointDirectiveTree.java.i
-data/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java.i
data/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java.i
data/test/tools/javac/processing/filer/foo/Foo.java.i
data/test/tools/javac/typeAnnotations/newlocations/Wildcards.java.i
-data/test/tools/javac/processing/filer/TestLastRound.java.i
+data/test/tools/javac/multicatch/Neg02eff_final.out.i
data/test/tools/javac/incompatibleNoninherited/A.java.i
+data/test/tools/javac/annotations/6365854/T6365854.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/SerializedFormWriter.java.i
data/src/share/classes/com/sun/source/tree/TypeCastTree.java.i
data/test/com/sun/javadoc/testEnclosingClass/TestEnclosingClass.java.i
-data/test/tools/javac/generics/6476118/T6476118b.out.i
+data/test/tools/javac/generics/inference/6638712/T6638712d.java.i
data/test/tools/javac/importChecks/ImportOfOwnClass.java.i
data/test/com/sun/javadoc/AccessAsciiArt/p1/SI.java.i
data/test/tools/javac/diags/examples/CantAssignToFinal.java.i
@@ -2368,147 +2366,145 @@ data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedPlural
data/test/tools/javac/ImportCycle/Dummy.java.i
data/test/tools/javac/api/6437999/T6437999.java.i
data/test/tools/javac/generics/diamond/7030150/Neg02.java.i
-data/test/tools/javac/ClassLiterals/LiteralInterface_1.java.i
data/test/tools/javac/T6882235.out.i
data/test/com/sun/javadoc/testValueTag/TestValueTag.java.i
data/test/tools/javac/T6407066.java.i
data/test/tools/javac/generics/6356636/T6356636.java.i
data/test/tools/javac/DefiniteAssignment/T4721062b.java.i
-data/test/tools/javac/annotations/neg/NoClone.java.i
+data/test/tools/javac/StringConversion.java.i
data/test/tools/javadoc/badSuper/p/A.java.i
-data/test/tools/javac/constDebug/ConstDebug.sh.i
data/test/com/sun/javadoc/testHeadings/pkg2/C2.java.i
-data/test/tools/javac/generics/diamond/T6951833.java.i
+data/src/share/classes/com/sun/source/tree/EmptyStatementTree.java.i
+data/test/tools/javac/ImportCycle/foo/Middle2.java.i
data/src/share/classes/com/sun/source/util/TaskEvent.java.i
-data/test/tools/javac/unicode/UnicodeAtEOL.java.i
+data/test/tools/javac/boxing/T6614974.java.i
data/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java.i
data/test/tools/javac/generics/InheritanceConflict.java.i
data/test/Makefile.i
data/src/share/classes/com/sun/tools/javac/util/Names.java.i
data/test/tools/javap/classfile/deps/p/C1.java.i
+data/src/share/classes/javax/tools/annotation/GenerateNativeHeader.java.i
data/test/tools/javac/policy/test1/byfile.ABD.out.i
data/test/tools/javac/policy/bytodo.ACD.out.i
data/test/tools/javac/diags/examples/InferredDoNotConformToBounds.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.out.i
-data/test/tools/javac/varargs/7043922/T7043922.java.i
data/test/tools/javac/processing/warnings/UseImplicit/warn.out.i
data/test/tools/javac/cast/7005095/T7005095pos.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSuperClass.java.i
+data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java.i
data/test/tools/javac/QualifiedOuterThis.java.i
data/test/tools/javac/generics/Casting5.java.i
-data/test/tools/apt/Compile/goldenWarn.txt.i
-data/test/tools/javac/6917288/GraphicalInstallerTest.java.i
+data/test/com/sun/javadoc/testLegacyTaglet/TestLegacyTaglet.java.i
+data/test/tools/javadoc/6964914/Test.java.i
data/test/tools/javac/sourcePath2/p/SourcePath2A.java.i
data/src/share/classes/com/sun/mirror/type/ArrayType.java.i
data/test/tools/javac/policy/test1/simple.ACD.out.i
-data/test/tools/javac/generics/diamond/neg/Neg12.java.i
-data/test/tools/javac/generics/MultipleInheritance.java.i
+data/test/tools/javac/cast/6665356/T6665356.out.i
data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes7.java.i
data/test/tools/javac/BadBreak.java.i
data/test/tools/javac/diags/examples/VarargsImplement.java.i
data/test/tools/apt/Basics/NullAPF.java.i
data/test/tools/javadoc/6227454/Test.java.i
data/test/tools/javac/diags/examples/FullInstSig.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css.i
data/test/com/sun/javadoc/testCmndLineClass/pkg1/C2.java.i
-data/src/share/classes/com/sun/tools/javah/TypeSignature.java.i
+data/test/tools/javac/TryWithResources/TwrFlow.out.i
data/test/tools/javac/generics/wildcards/neg/CastWarn5.java.i
data/src/share/classes/com/sun/tools/javac/util/Paths.java.i
data/test/tools/apt/Compile/ClassDeclApf.java.i
data/test/tools/javadoc/6176978/T6176978.java.i
-data/src/share/classes/com/sun/tools/javadoc/ProgramElementDocImpl.java.i
+data/test/tools/javac/FlatnameClash2.java.i
data/test/com/sun/javadoc/testTopOption/overview.html.i
data/src/share/classes/com/sun/tools/javap/JavapTask.java.i
data/src/share/classes/com/sun/source/tree/ParenthesizedTree.java.i
data/test/tools/javac/enum/ExplicitlyAbstractEnum2.java.i
data/src/share/classes/com/sun/tools/classfile/ModulePermits_attribute.java.i
data/test/tools/javac/InnerMethSig.java.i
-data/src/share/classes/javax/lang/model/element/AnnotationValue.java.i
data/test/tools/javah/T7126832/java.java.i
-data/test/tools/javac/UncaughtOverflow.java.i
-data/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java.i
-data/test/tools/javac/generics/typeargs/Metharg2.java.i
+data/test/tools/javac/ClassPathTest/bar/pkg/ClassPathTestAux2.java.i
data/test/tools/javac/processing/model/element/TestPackageElement.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateAnnotationValue.out.i
data/test/tools/javac/generics/6985719/T6985719f.java.i
-data/test/tools/javac/7102515/T7102515.out.i
-data/src/share/classes/sun/tools/javap/AttrData.java.i
+data/test/tools/javac/annotations/6214965/T6214965.java.i
+data/test/tools/javac/T6266772.java.i
+data/test/tools/javadoc/6964914/TestUserDoclet.java.i
data/test/tools/javac/ExtDirs/ExtDirTest_1.java.i
data/test/tools/javac/generics/6985719/T6985719c.java.i
-data/test/tools/javac/annotations/neg/NoAnnotationMethods.java.i
+data/test/tools/javac/generics/diamond/neg/Neg12.java.i
data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.out.i
-data/test/tools/javac/foreach/StaticBlock.java.i
+data/test/tools/javac/types/PrimitiveConversionTest.java.i
+data/test/tools/javac/generics/T6481655.java.i
data/test/tools/javac/NoNoClassDefFoundErrorError.java.i
data/test/tools/javac/diags/examples/IllegalChar.java.i
-data/test/tools/javac/generics/rawOverride/AttributeSet.java.i
data/test/tools/javac/processing/model/element/TestMissingElement/InvalidSource.java.i
data/test/tools/javac/generics/typevars/5060485/Neg1.java.i
data/test/tools/javac/unicode/SupplementaryJavaID5.java.i
data/test/tools/javac/6342411/T6342411.java.i
data/test/tools/javac/NonStaticFieldExpr2.out.i
data/test/tools/apt/mirror/declaration/FieldDecl.java.i
-data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h.i
-data/test/tools/javac/AnonInnerException_2.java.i
+data/test/tools/javac/generics/6192945/MethodNeg.out.i
+data/test/tools/javac/ConstCharAppend.java.i
data/test/tools/javac/warnings/6594914/T6594914b.out.i
-data/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java.i
-data/test/com/sun/javadoc/testAnnotationTypes/pkg/AnnotationType.java.i
-data/test/tools/javac/fatalErrors/NoJavaLang.sh.i
-data/test/tools/javadoc/generics/genericClass/pkg1/A.java.i
+data/test/tools/javac/T6326754.java.i
+data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.out.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java.i
data/test/tools/javac/api/6400303/Test2.java.i
-data/test/tools/javac/lambda/LambdaParserTest.java.i
-data/src/share/classes/com/sun/tools/javah/resources/l10n.properties.i
+data/test/tools/javac/OverrideChecks/6400189/T6400189a.out.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DirectoryManager.java.i
data/test/tools/javadoc/parser/7091528/p/C1.java.i
data/test/tools/javac/lint/FallThrough.java.i
data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/packageToExclude/DummyClass.java.i
data/test/tools/javac/depOverrides/annotation/Test2Q.out.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/AbstractMemberBuilder.java.i
-data/test/tools/javadoc/NoStar.java.i
+data/src/share/classes/com/sun/tools/javap/ConstantWriter.java.i
data/test/tools/javac/generics/diamond/7030150/Neg02.out.i
data/test/tools/javac/generics/inference/4972073/T4972073.java.i
data/test/tools/javac/diags/examples/ProcessorCantInstantiate/processors/AnnoProc.java.i
-data/test/com/sun/javadoc/testHrefInDocComment/pkg/I1.java.i
+data/test/tools/javac/DuplicateClass2.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameterSubClass.java.i
-data/test/tools/javac/generics/6985719/T6985719b.java.i
+data/test/tools/javac/policy/test1/A.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/Test4.out.i
+data/test/tools/javac/enum/EnumImplicitPrivateConstructor.java.i
data/test/tools/javac/generics/odersky/BadTest2.java.i
data/test/tools/javac/CyclicInheritance6/Main.java.i
data/test/tools/javac/generics/wildcards/neg/Readonly.java.i
data/test/tools/javadoc/6964914/Error.java.i
data/test/tools/apt/Options/options.sh.i
data/test/tools/apt/Basics/annot/AnnotShangri_la.java.i
-data/src/share/classes/com/sun/source/tree/LabeledStatementTree.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn11.java.i
data/test/tools/javac/generics/GenericOverride.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractExecutableMemberWriter.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.java.i
-data/test/tools/javac/6341866/Anno.java.i
+data/test/tools/javac/generics/6985719/T6985719d.out.i
data/test/tools/javac/generics/T4711694.java.i
data/test/tools/javac/diags/examples/VarMightNotHaveBeenInitialized.java.i
-data/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels1.java.i
+data/test/tools/javac/failover/FailOver11.java.i
data/test/tools/javac/protectedAccess/ProtectedAccess_1.java.i
+data/test/tools/javac/DefiniteAssignment/T4704365.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail6.java.i
-data/test/com/sun/javadoc/testIndex/pkg/Interface.java.i
+data/src/share/classes/com/sun/tools/javah/Mangle.java.i
data/test/tools/javac/generics/UncheckedCovariance.java.i
data/test/tools/javac/modules/ExportsTest01.java.i
-data/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java.i
+data/src/share/classes/com/sun/tools/javac/parser/Parser.java.i
data/test/tools/javac/processing/model/util/directSupersOfErr/DirectSupersOfErr.java.i
data/test/tools/javah/ParamClassTest.java.i
+data/test/tools/javac/diags/examples/NoInterfaceHere.java.i
data/test/tools/javac/7023703/T7023703neg.java.i
data/test/tools/javac/StringsInSwitch/RepeatedStringCaseLabels2.java.i
data/src/share/classes/javax/annotation/processing/package-info.java.i
data/test/tools/javac/packone/Mediator.java.i
-data/test/tools/javac/T6356217/T6356217.java.i
+data/test/tools/javac/classreader/T7031108.java.i
data/test/tools/javac/generics/odersky/Test4.java.i
-data/src/share/classes/com/sun/tools/javac/util/Context.java.i
-data/test/tools/javac/typeAnnotations/failures/OldArray.out.i
+data/test/tools/javadoc/dupOk/sp2/p/B.java.i
data/src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties.i
data/test/tools/javac/generics/wildcards/6762569/T6762569b.java.i
-data/test/tools/javap/T4501660.java.i
+data/src/share/classes/com/sun/tools/javac/parser/UnicodeReader.java.i
data/test/tools/javac/DefiniteAssignment/DASwitch.java.i
data/test/tools/javadoc/annotations/annotatePackage/pkg1/package-info.java.i
data/test/tools/javac/generics/inference/6569789/T6569789.java.i
data/test/tools/javac/warnings/6885255/T6885255.out.i
data/test/tools/javac/ClassModifiers/InterfaceAndInnerClsCtor.java.i
-data/test/tools/javac/BadAnnotation.java.i
+data/test/tools/javac/InnerNamedConstant_2.out.i
data/test/tools/javac/generics/6372782/T6372782.java.i
data/test/tools/javac/lint/Deprecation.java.i
data/test/tools/javac/types/TypeHarness.java.i
@@ -2519,16 +2515,17 @@ data/test/com/sun/javadoc/testSerialVersionUID/TestSerialVersionUID.java.i
data/test/tools/javac/depDocComment/DeprecatedDocComment.java.i
data/test/com/sun/javadoc/testTitleInHref/pkg/Links.java.i
data/test/tools/javac/varargs/T6746184.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_2.java.i
-data/test/com/sun/javadoc/testJavascript/pkg/C.java.i
+data/test/tools/javac/cast/6932571/T6932571neg.java.i
+data/test/tools/javac/cast/5034609/T5034609.java.i
data/test/tools/javac/Closure2.java.i
data/test/tools/javac/7085024/T7085024.out.i
data/test/tools/javac/limits/ArrayDims1.java.i
data/test/tools/javac/api/6421111/T6421111.java.i
-data/test/tools/javac/generics/rawOverride/7062745/GenericOverrideTest.java.i
+data/test/tools/javac/7086595/T7086595.java.i
data/test/tools/javac/miranda/4686811/p1/A.java.i
-data/src/share/classes/com/sun/tools/javac/code/Lint.java.i
-data/test/tools/javac/T6855236.java.i
+data/src/share/classes/javax/tools/overview.html.i
+data/test/tools/javap/classfile/deps/GetDeps.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn6.java.i
data/test/tools/javac/foreach/SuperfluousAbstract.java.i
data/test/tools/javac/diags/MessageFile.java.i
data/test/tools/javac/typeAnnotations/TypeParameterTarget.java.i
@@ -2538,19 +2535,22 @@ data/test/tools/javac/generics/6372782/AbstractVector.java.i
data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericClass2.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/C5.java.i
data/test/tools/javac/6558548/T6558548_6.out.i
-data/test/tools/javac/multicatch/Neg04.java.i
+data/test/tools/javac/diags/examples/WhereCaptured1.java.i
+data/src/share/classes/com/sun/tools/javac/main/JavacOption.java.i
data/test/tools/javac/6330997/T2.java.i
data/test/tools/javac/T6900037.java.i
-data/test/com/sun/javadoc/constantValues/TestConstantValues2.java.i
+data/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java.i
+data/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java.i
data/test/tools/javac/7129225/AnnoProcessor.java.i
-data/test/tools/javac/Diagnostics/6722234/T6722234a_1.out.i
data/src/share/classes/com/sun/source/tree/ModuleClassTree.java.i
-data/test/tools/javac/TryInInstanceInit.java.i
+data/test/tools/javac/FinalInitializer.java.i
data/src/share/classes/com/sun/tools/classfile/Instruction.java.i
+data/test/tools/javadoc/annotations/annotateParams/expected.out.i
data/test/tools/javac/cast/BoxedArray.java.i
-data/test/tools/apt/Compile/HelloAnnotation.java.i
+data/test/tools/javac/multicatch/Neg02eff_final.java.i
data/test/tools/javac/StringsInSwitch/NonConstantLabel.java.i
-data/test/tools/javac/file/zip/Utils.java.i
+data/test/tools/javac/generics/rawOverride/6557199/T6557199.java.i
+data/src/share/classes/com/sun/tools/javadoc/TagImpl.java.i
data/test/tools/javac/generics/inference/4972073/T4972073b.java.i
data/test/tools/javac/HiddenAbstractMethod/one/Parent.java.i
data/test/tools/javac/ForwardReference/ForwardReference_2.java.i
@@ -2558,23 +2558,25 @@ data/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.java.i
data/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java.i
data/src/share/classes/com/sun/tools/javadoc/JavadocTool.java.i
data/test/tools/javac/generics/7007615/T7007615.out.i
+data/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java.i
data/test/com/sun/javadoc/testThrowsTag/pkg/T2.java.i
data/test/tools/javac/cast/6270087/T6270087neg.out.i
data/test/tools/javac/depOverrides/doccomment/B2.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/tab.gif.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/ConstantsSummaryWriter.java.i
+data/test/tools/javac/staticImport/StaticImport2.java.i
+data/src/share/classes/com/sun/tools/javac/file/CloseableURLClassLoader.java.i
+data/test/tools/javac/protectedInner/InnerClass.java.i
data/test/tools/javac/StaticBlockScope.java.i
data/test/tools/javac/generics/wildcards/6651719/T6651719b.java.i
-data/test/tools/javac/generics/SuperTypeargs.java.i
-data/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java.i
+data/test/tools/javac/processing/model/TestExceptions.java.i
+data/test/tools/javac/implicitThis/6541876/T6541876a.java.i
data/test/tools/javac/LabeledDeclaration.java.i
data/test/tools/javac/typeAnnotations/newlocations/MethodReturnType.java.i
data/test/tools/javac/processing/filer/TestInvalidRelativeNames.java.i
data/test/tools/javac/diags/examples/ConstExprRequired.java.i
data/test/tools/javac/javazip/bad/B.java.i
-data/test/tools/javac/T6227617.java.i
data/test/tools/javac/processing/6359313/Foo.java.i
data/test/tools/javac/diags/examples/PartialInstSig.java.i
+data/test/tools/javac/T6231847.java.i
data/test/tools/javac/6521805/T6521805a.java.i
data/test/tools/javac/DefiniteAssignment/DUParam2.java.i
data/src/share/classes/com/sun/tools/javac/file/ZipFileIndexCache.java.i
@@ -2584,116 +2586,116 @@ data/src/share/classes/com/sun/tools/javac/jvm/Gen.java.i
data/test/tools/javac/TryWithResources/TwrIntersection02.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test2.out.i
data/test/tools/javac/foreach/Foreach.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn2.java.i
+data/test/tools/javac/NonAmbiguousField/two/Child2.java.i
data/test/tools/javac/generics/7022054/T7022054pos2.java.i
data/test/tools/javac/T6458823/T6458823.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/TypeParameters.java.i
data/test/tools/apt/Basics/annot/annot2/AnnotMarker2.java.i
-data/test/tools/javac/limits/PoolSize1.java.i
+data/test/tools/javac/generics/InstanceOf2.java.i
data/test/tools/javac/T5105890.java.i
-data/test/tools/javac/generics/6985719/T6985719d.out.i
+data/test/com/sun/javadoc/testHrefInDocComment/pkg/I2.java.i
data/test/tools/javac/generics/6956758/T6956758neg.out.i
-data/test/tools/javac/SuperNew3.java.i
+data/test/tools/javac/processing/6430209/test0.java.i
data/test/tools/javac/generics/T6869075.java.i
data/test/tools/javac/diags/examples/ResourceNotReferenced.java.i
data/test/tools/javadoc/6964914/TestStdDoclet.java.i
data/test/tools/javac/diags/examples/ProcOnlyNoProcs.java.i
-data/test/tools/javac/TryWithResources/BadTwr.out.i
data/test/tools/javap/typeAnnotations/PresenceInner.java.i
data/src/share/classes/javax/lang/model/SourceVersion.java.i
data/test/tools/javac/miranda/6964669/pkg/A.java.i
data/test/tools/javac/processing/model/util/elements/doccomments/TestDocComments.java.i
+data/test/tools/javac/api/taskListeners/TestSimpleAddRemove.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/IndexBuilder.java.i
-data/test/tools/javac/enum/NoFinal.java.i
+data/test/tools/javac/generics/diamond/T6939780.java.i
data/test/tools/javac/processing/model/util/TypesBadArg.java.i
data/test/tools/javac/ClassLiterals/LiteralInterface_2.java.i
data/test/tools/javac/depOverrides/annotation/Test1.java.i
-data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java.i
data/test/tools/javah/VersionTest.java.i
-data/test/tools/apt/Basics/Lacuna.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/Main.java.i
data/test/tools/javac/typeAnnotations/MultipleTargets.java.i
data/test/tools/javac/generics/odersky/BadTest4.java.i
-data/test/tools/javac/SwitchFence.java.i
+data/test/tools/javac/unicode/UnicodeNewline.out.i
data/test/tools/javac/generics/inference/6315770/T6315770.out.i
-data/test/tools/javac/6734819/T6734819b.java.i
+data/src/share/classes/com/sun/tools/classfile/ModuleClass_attribute.java.i
data/test/tools/javac/diags/examples/PossibleLossPrecision.java.i
-data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateTypeAnnotation.java.i
+data/test/tools/javac/6979683/TestCast6979683_BAD39.java.i
data/test/tools/javac/QualifiedAccess/QualifiedAccess_1.sh.i
data/test/tools/javac/generics/6910550/T6910550d.out.i
data/test/tools/javac/modules/ModuleModeTests/TestRunner.java.i
-data/test/tools/javac/generics/T5094318.java.i
data/src/share/classes/com/sun/tools/javadoc/JavadocClassReader.java.i
data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java.i
data/test/tools/javac/TryWithResources/TwrNullTests.java.i
data/test/tools/javac/generics/6985719/T6985719a.java.i
-data/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java.i
-data/test/tools/javac/api/T6483788.java.i
+data/src/share/classes/com/sun/source/tree/LambdaExpressionTree.java.i
+data/test/tools/javac/4980495/std/p2/A2.java.i
data/test/tools/javac/AnonymousNull.java.i
data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.java.i
-data/test/tools/javac/diags/examples/UncheckedGenericArrayCreation.java.i
+data/test/tools/javac/generics/bridge1/D.java.i
data/test/tools/javac/generics/odersky/Cell.java.i
data/test/tools/javac/literals/BadUnderscoreLiterals.7.out.i
-data/test/tools/javac/5045412/Foo.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java.i
+data/test/tools/javac/TestPkgInfo.java.i
data/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java.i
data/test/tools/javac/diags/examples/UncheckedAssign.java.i
-data/test/com/sun/javadoc/testUseOption/pkg1/package.html.i
+data/test/tools/javadoc/BreakIteratorWarning.java.i
data/test/tools/apt/Basics/TestGetPackageApf.java.i
data/test/tools/javadoc/sourceOnly/p/SourceOnly.java.i
-data/test/tools/javac/generics/inference/7086601/T7086601a.java.i
+data/test/tools/javac/api/TestClientCodeWrapper.java.i
data/test/tools/javac/diags/examples/OverrideVarargsExtra.java.i
-data/test/tools/javac/mixedTarget/ExtendCovariant2.java.i
+data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.sh.i
data/test/tools/javac/InstanceInitException_2.java.i
-data/test/tools/javac/T4994049/DeprecatedYES.java.i
+data/test/tools/javac/annotations/neg/Dup.java.i
data/test/tools/javac/versions/CheckClassFileVersion.java.i
-data/test/tools/javac/diags/examples/TryResourceNotSupported.java.i
+data/test/tools/javac/warnings/T6763518.java.i
data/test/tools/apt/Compile/ClassDeclApf2.java.i
-data/src/share/classes/javax/lang/model/element/TypeElement.java.i
+data/test/tools/javac/diags/examples/NonStaticCantBeRef.java.i
data/test/tools/javac/overload/T5090220.java.i
data/test/tools/javac/processing/model/util/directSupersOfErr/C1.java.i
-data/test/tools/javac/processing/filer/TestLastRound.out.i
-data/test/tools/javac/T4906100.out.i
+data/test/tools/javap/pathsep.sh.i
+data/test/com/sun/javadoc/testHref/package-list.i
data/src/share/classes/com/sun/source/tree/SwitchTree.java.i
data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedFilename.java.i
data/test/tools/javac/T6403466.java.i
data/src/share/classes/com/sun/tools/javac/Server.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/markup/Comment.java.i
+data/test/tools/javac/4917091/Test256a.java.i
data/test/tools/javac/diags/examples/UncheckedPlural/UncheckedPlural.java.i
data/test/tools/javac/typeAnnotations/failures/target/Constructor.java.i
-data/test/tools/javac/completion/C.java.i
+data/test/tools/javac/generics/diamond/7030687/ParserTest.java.i
data/test/tools/javac/Null2DArray.java.i
data/test/tools/javac/6199662/TreeScanner.java.i
-data/src/share/classes/com/sun/tools/javac/comp/Lower.java.i
+data/test/tools/apt/mirror/util/TypeCreation.java.i
data/test/tools/javac/meth/InvokeDynTrans.java.i
data/test/tools/javac/OverrideChecks/6400189/T6400189b.java.i
data/test/tools/javac/innerClassFile/y/R3.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestClass.java.i
-data/test/tools/javac/limits/ArrayDims3.java.i
-data/src/share/classes/com/sun/mirror/type/WildcardType.java.i
+data/test/tools/javac/diags/examples/TypeVarMayNotBeFollowedByOtherBounds.java.i
+data/test/tools/javac/varargs/warning/Warn2.java.i
+data/src/share/classes/com/sun/tools/javac/util/Options.java.i
data/test/com/sun/javadoc/testClassTree/pkg/ParentClass.java.i
data/test/tools/javac/failover/FailOver10.out.i
data/test/tools/javac/generics/typevars/5060485/Compatibility02.out.i
data/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java.i
data/test/tools/javac/diags/examples/IllegalBytecodeIdentChar.java.i
data/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateTypeAnnotation.out.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java.i
+data/src/share/classes/javax/lang/model/type/ErrorType.java.i
data/src/share/classes/javax/lang/model/element/UnknownAnnotationValueException.java.i
data/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java.i
+data/test/tools/javac/annotations/pos/ClassA.java.i
data/test/tools/javac/depOverrides/annotation/B2.java.i
-data/test/tools/javac/InitializerCompletion_2.java.i
+data/test/com/sun/javadoc/testThrowsTag/pkg/C.java.i
+data/test/tools/javac/generics/6192945/Neg3.java.i
data/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.out.i
data/src/share/classes/com/sun/source/util/JavacTask.java.i
data/test/tools/javac/ThrowNull.java.i
+data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java.i
data/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass3.java.i
data/test/tools/javac/6403424/T6403424.java.i
data/test/tools/javac/cast/7123100/T7123100c.java.i
data/test/tools/javac/processing/model/element/TypeParamBounds.java.i
-data/test/tools/javac/diags/examples/GenericThrowable.java.i
data/test/tools/javac/T6668802.java.i
data/test/tools/javap/T6868539.java.i
data/test/tools/javac/generics/6268476/T6268476.java.i
data/test/tools/javac/processing/6511613/clss41701.java.i
-data/test/tools/javah/SubClassConsts.win.i
+data/test/tools/javadoc/outputRedirect/Test.java.i
+data/test/tools/javac/diags/examples/AnonClassImplInterfaceNoArgs.java.i
data/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java.i
data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.out.i
data/test/tools/javac/RawCrash.java.i
@@ -2701,33 +2703,33 @@ data/test/tools/javac/generics/6946618/T6946618b.java.i
data/test/tools/javac/depDocComment/DeprecatedDocComment3.java.i
data/test/tools/javac/generics/wildcards/neg/ParamCast.java.i
data/src/share/classes/com/sun/tools/javac/util/ListBuffer.java.i
+data/src/share/classes/sun/tools/javap/JavapPrinter.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java.i
-data/test/tools/javac/7079713/TestCircularClassfile.java.i
+data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseTaglet.java.i
data/test/tools/javac/processing/6378728/T6378728.java.i
-data/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java.i
+data/test/tools/javac/Enum1.java.i
data/test/tools/javac/limits/PoolSize2.java.i
-data/test/tools/javac/failover/CheckAttributedTree.java.i
-data/src/share/classes/javax/lang/model/type/TypeVariable.java.i
-data/test/tools/javac/nested/4903103/T4903103.java.i
+data/test/tools/javac/modules/ViewTest01.java.i
+data/test/tools/javac/GoodCovar.java.i
data/test/tools/javac/diags/examples/OperatorCantBeApplied.java.i
data/test/tools/javadoc/annotations/shortcuts/expected.out.i
data/test/tools/javac/generics/wildcards/AssignmentSameType7.java.i
-data/src/share/classes/com/sun/javadoc/SerialFieldTag.java.i
+data/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java.i
+data/test/tools/javadoc/annotations/annotatePackage/pkg2/package.html.i
data/test/tools/javac/cast/6548436/T6548436a.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.java.i
-data/test/tools/javac/diags/examples/MulticatchNotSupported.java.i
+data/test/tools/apt/Basics/TestGetTypeDeclarationApf.java.i
data/test/tools/javac/miranda/T4279316a.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java.i
-data/test/tools/javac/abstract/T4717181a.java.i
+data/test/tools/javac/quid/MakeNegTests.sh.i
data/test/com/sun/javadoc/testPackagePage/com/pkg/C.java.i
-data/test/tools/javac/diags/examples/EnumAnnoValueMustBeEnumConst.java.i
+data/test/tools/javac/processing/environment/round/TestElementsAnnotatedWith.java.i
data/test/tools/javac/OverrideChecks/6199153/T6199153.java.i
data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateTypeAnnotation.java.i
data/src/share/classes/com/sun/source/tree/ProvidesServiceDirectiveTree.java.i
-data/test/com/sun/javadoc/testSimpleTag/C.java.i
-data/test/tools/javac/generics/6207386/Test.java.i
+data/test/tools/javac/assert/DU1.java.i
data/test/com/sun/javadoc/testPackageDeprecation/TestPackageDeprecation.java.i
-data/test/tools/javac/processing/6365040/ProcBar.java.i
data/test/tools/javac/generics/inference/5034571/T5034571.java.i
data/test/tools/javac/diags/examples/FinallyCannotComplete.java.i
data/test/tools/apt/Discovery/Dum.java.i
@@ -2736,121 +2738,120 @@ data/test/tools/javac/generics/rare/Rare11.java.i
data/test/tools/javac/falseCycle/FalseCycleBase.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/ConstantsSummaryWriterImpl.java.i
data/test/tools/javac/generics/Casting2.java.i
+data/test/tools/javac/AbstractOverride.java.i
data/src/share/classes/javax/lang/model/type/TypeMirror.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateTypeAnnotation.out.i
data/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java.i
data/test/com/sun/javadoc/testLinkTaglet/pkg/C.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/DeprecatedListWriter.java.i
data/test/tools/javac/diags/examples/TypeFoundRequired.java.i
-data/test/tools/javac/diags/examples/NoJavaLang.java.i
-data/test/tools/javac/mandatoryWarnings/deprecated/Test3.out.i
+data/test/tools/javac/6330920/T6330920.java.i
data/test/tools/javac/PackageClassAmbiguity/util.java.i
data/test/tools/javac/depOverrides/annotation/P.java.i
data/src/share/classes/javax/lang/model/element/ExecutableElement.java.i
-data/src/share/classes/sun/tools/javap/InnerClassData.java.i
+data/test/com/sun/javadoc/testPrivateClasses/pkg/PrivateParent.java.i
data/src/share/classes/com/sun/tools/classfile/ModuleExport_attribute.java.i
-data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPlural.java.i
+data/test/tools/javac/annotations/neg/Z9.java.i
data/test/tools/javac/api/T6258271.java.i
-data/test/tools/javac/sourcePath/SourcePath.java.i
-data/test/com/sun/javadoc/testMemberInheritence/diamond/C.java.i
-data/test/tools/javap/classfile/T6887895.java.i
+data/test/tools/javac/diags/Example.java.i
+data/test/tools/javac/generics/InnerInterface2.java.i
+data/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java.i
data/src/share/classes/com/sun/tools/javac/comp/ModuleContext.java.i
-data/test/tools/javac/fatalErrors/NoJavaLang.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/EnumConstantBuilder.java.i
data/test/tools/javac/api/6471599/Main.java.i
data/test/tools/javac/generics/7034019/T7034019b.java.i
data/test/tools/javac/enum/EnumSwitch1.java.i
-data/test/tools/javac/typeAnnotations/newlocations/LocalVariables.java.i
data/test/com/sun/javadoc/testHtmlTableTags/TestHtmlTableTags.java.i
-data/test/tools/javac/StringsInSwitch/OneCaseSwitches.java.i
+data/test/tools/javac/CyclicInheritance2.java.i
+data/test/tools/javac/crossPackageImpl/CrossPackageImplA.java.i
+data/test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java.i
+data/make/test/TEST.ROOT.i
data/test/tools/javac/generics/RelaxedArrays.java.i
-data/test/tools/javac/StringConversion.java.i
-data/src/share/classes/com/sun/source/tree/EmptyStatementTree.java.i
-data/test/tools/javadoc/dupOk/sp1/p/A.java.i
+data/test/tools/javac/annotations/neg/NoClone.java.i
+data/test/tools/javac/generics/diamond/T6951833.java.i
+data/test/tools/javac/QualifiedThisAndSuper_1.java.i
data/test/tools/javac/generics/InstanceOf1.java.i
data/test/tools/javac/6979683/TestCast6979683_BAD35.java.errlog.i
data/test/tools/javac/diags/examples/AttrMustBeConstant.java.i
data/test/tools/javac/varargs/6569633/T6569633.java.i
-data/test/tools/javac/cast/6665356/T6665356.out.i
-data/test/tools/javac/file/T7018098.java.i
+data/test/tools/javac/generics/MultipleInheritance.java.i
data/test/tools/javac/typeAnnotations/newlocations/TypeParameters.java.i
data/src/share/classes/com/sun/tools/javap/overview.html.i
data/test/tools/javac/varargs/Warn2.java.i
data/test/tools/javac/annotations/pos/Enum1.java.i
data/test/tools/javac/diags/examples/DiamondAndAnonClass.java.i
-data/test/tools/javac/generics/odersky/Test2.java.i
+data/test/tools/javadoc/badSuper/BadSuper.java.i
+data/test/tools/javac/capture/Martin.java.i
data/test/tools/javadoc/generics/tparamTagOnType/pkg1/A.java.i
data/test/tools/javadoc/dupOk/sp2/p/A.java.i
-data/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java.i
data/test/tools/javac/UnterminatedLineComment.java.i
-data/test/tools/javac/processing/6413690/src/Super.java.i
+data/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java.i
data/test/tools/javac/annotations/neg/Z5.java.i
-data/src/share/classes/com/sun/mirror/declaration/Declaration.java.i
+data/test/tools/javac/cast/6558559/T6558559a.java.i
data/test/tools/javac/diags/examples/GenericArrayCreation.java.i
data/test/tools/javac/Paths/6638501/test1/SayHelloToo.java.i
data/test/tools/javac/tree/ClassTreeTest.java.i
data/src/share/classes/sun/tools/javap/CPX.java.i
data/test/tools/javac/resolve/TraceResolve.java.i
data/test/tools/javac/generics/typevars/5060485/Compatibility.java.i
-data/test/tools/javac/processing/6994946/SyntaxErrorTest.out.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java.i
+data/test/tools/javac/multicatch/Neg04eff_final.java.i
data/test/tools/javac/capture/Capture1.java.i
+data/make/test/lib/javadoc.sh.i
data/test/tools/javac/StringsInSwitch/BadlyTypedLabel2.out.i
data/test/tools/javac/diags/examples/IllegalEnumStaticRef.java.i
-data/src/share/classes/com/sun/tools/javac/main/JavacOption.java.i
+data/test/tools/javac/multicatch/Neg04.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeWriter.java.i
data/test/tools/javac/T6358024.java.i
data/test/com/sun/javadoc/testMemberSummary/pkg/PrivateParent.java.i
data/test/tools/javac/positions/T6253161.java.i
data/test/tools/javac/diags/examples/InconvertibleTypes.java.i
-data/test/tools/javadoc/imports/MissingImport.java.i
-data/test/tools/javac/NonAmbiguousField/two/Child2.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn2.java.i
data/test/tools/javac/unicode/SupplementaryJavaID6.java.i
data/test/tools/javac/processing/model/6194785/T6194785a.java.i
data/test/com/sun/javadoc/testNonFrameWarning/TestNonFrameWarning.java.i
data/test/tools/javac/T6725036.java.i
-data/test/tools/javac/enum/T6724345.java.i
data/test/tools/javac/generics/inference/7086586/T7086586.java.i
data/src/share/classes/com/sun/tools/classfile/ModuleRequires_attribute.java.i
-data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.sh.i
+data/test/tools/javac/mixedTarget/ExtendCovariant2.java.i
data/test/tools/javac/generics/7034019/T7034019d.out.i
data/test/tools/javac/failover/FailOver02.java.i
data/test/tools/javac/4980495/std/p1/A1.java.i
-data/test/tools/javac/generics/bridge1/E.java.i
data/test/tools/javac/annotations/neg/OverrideNo.java.i
data/test/tools/javac/diags/examples/OverrideDoesntThrow.java.i
-data/src/share/classes/com/sun/source/tree/WildcardTree.java.i
+data/src/share/classes/com/sun/javadoc/ThrowsTag.java.i
data/test/tools/javac/ExtendsAccess/ExtendsAccess.sh.i
-data/test/tools/javac/boxing/NoBoxingFloat.java.i
+data/test/tools/javac/processing/model/util/elements/doccomments/a/First.java.i
data/test/tools/javac/diags/examples/ProcUseProcOrImplicit/ProcUseProcOrImplicit.java.i
data/test/tools/javac/DuplicateImport.java.i
-data/test/tools/javadoc/outputRedirect/Test.java.i
+data/test/tools/javah/SubClassConsts.win.i
data/src/share/classes/javax/annotation/processing/Completions.java.i
data/test/tools/javac/multicatch/Pos08eff_final.java.i
data/test/tools/javac/generics/wildcards/neg/CastWarn4.java.i
-data/test/tools/apt/Basics/TestGetTypeDeclarationApf.java.i
+data/test/tools/javac/diags/examples/MulticatchNotSupported.java.i
data/test/tools/javac/generics/PrimitiveClass.java.i
-data/test/tools/javac/6863465/T6863465b.out.i
-data/test/tools/javac/generics/typevars/6182630/T6182630.java.i
-data/test/tools/javac/annotations/neg/Z9.java.i
+data/test/tools/javac/accessVirtualInner/a/A.java.i
+data/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPlural.java.i
data/test/tools/javac/importContext/namedPackage/Dummy.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java.i
data/test/tools/javac/resolve/tests/ReferenceOverInferred.java.i
data/test/tools/javac/generics/7007615/acc2/p1/C.java.i
-data/test/tools/javac/processing/6348499/A.java.i
-data/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java.i
+data/test/tools/javac/diags/examples/DirPathElementNotFound.java.i
+data/test/tools/javac/processing/6413690/src/Super.java.i
data/test/tools/javac/multicatch/7005371/T7005371.java.i
data/test/tools/javac/processing/6359313/T6359313.java.i
data/test/tools/javac/generics/ParametricException.java.i
data/test/tools/javac/scope/StarImportTest.java.i
-data/test/tools/javac/inheritedAccess/MethodReferenceQualification_1.java.i
-data/test/tools/javac/processing/6634138/Dummy.java.i
+data/test/tools/javac/generics/inference/6650759/T6650759b.java.i
data/test/tools/javac/6199662/TreeInfo.java.i
-data/test/tools/javac/api/T6345974.java.i
+data/test/tools/javadoc/completionFailure/pkg/A.java.i
data/test/tools/javac/danglingDep/NoDepX.java.i
data/src/share/classes/com/sun/tools/javac/model/JavacElements.java.i
data/test/tools/javadoc/varArgs/Main.java.i
data/test/tools/javac/generics/7022054/T7022054pos1.java.i
data/src/share/classes/javax/lang/model/type/DeclaredType.java.i
+data/test/tools/javac/accessVirtualInner/Main.java.i
data/test/tools/javac/DefiniteAssignment/T4718142a.java.i
data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestInterface.java.i
data/test/tools/javap/stackmap/T6271292.java.i
@@ -2859,39 +2860,39 @@ data/src/share/classes/javax/annotation/processing/Processor.java.i
data/test/tools/javac/diags/examples/ProcPackageDoesNotExist/processors/AnnoProc.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationType.java.i
data/test/tools/javac/T6230128.out.i
-data/test/tools/javac/warnings/Unchecked.lintAll.out.i
data/test/com/sun/javadoc/testTagInheritence/firstSentence2/C.java.i
data/test/tools/javac/generics/6192945/Neg.java.i
data/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java.i
data/test/tools/javac/annotations/6359949/T6359949.java.i
data/test/tools/javac/scope/7017664/ImplementationCacheTest.java.i
+data/test/tools/javac/generics/rawOverride/T7148556.java.i
data/test/tools/javac/diags/examples/SunApiPluralAdditional/SunApiFilename.java.i
data/test/tools/javac/generics/6985719/T6985719g.java.i
data/test/tools/javac/varargs/5088429/T5088429Neg01.out.i
-data/test/tools/javac/ClassPathTest/bar/pkg/ClassPathTestAux2.java.i
+data/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java.i
data/test/tools/apt/lib/TestProcessorFactory.java.i
-data/test/tools/javac/mandatoryWarnings/deprecated/P.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java.i
data/src/share/classes/com/sun/tools/classfile/ConstantPool.java.i
data/test/tools/javac/CaptureInSubtype.java.i
data/test/tools/javac/T6956638.java.i
data/test/tools/apt/Basics/annot/annot2/AnnotSimple2.java.i
+data/test/tools/javac/limits/LongName.java.i
data/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java.i
data/test/tools/javac/6457284/T6457284.java.i
data/test/tools/javah/MissingParamClassTest.sh.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest1.java.i
data/test/tools/javac/danglingDep/RefX.java.i
data/test/tools/javac/failover/FailOver11.out.i
-data/test/tools/javac/annotations/pos/Z3.java.i
data/src/share/classes/com/sun/javadoc/Doc.java.i
+data/test/tools/javac/miranda/T4528315.java.i
data/test/tools/javac/constDebug/ConstDebug.java.i
data/test/tools/javac/diags/examples/PackageAnnos.java.i
-data/test/tools/javac/protectedInner/pkg1/Base.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java.i
+data/test/com/sun/javadoc/testNoPackagesFile/C.java.i
data/test/tools/javac/Paths/Help.sh.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/DeprecatedTaglet.java.i
-data/src/share/classes/com/sun/tools/javadoc/JavadocEnter.java.i
+data/test/tools/javac/ExtDirs/ext3/pkg2.jar.i
data/test/tools/javac/policy/byfile.ACD.out.i
-data/test/tools/javac/boxing/NoBoxingInt.java.i
+data/test/tools/javac/Diagnostics/6722234/T6722234a_1.out.i
data/src/share/sample/javac/processing/src/CheckNamesProcessor.java.i
data/test/tools/javac/TryWithResources/WeirdTwr.java.i
data/test/tools/javac/generics/6192945/Method.java.i
@@ -2908,7 +2909,6 @@ data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DocletConstan
data/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java.i
data/src/share/classes/javax/lang/model/type/NullType.java.i
data/test/tools/javac/diags/examples.not-yet.txt.i
-data/test/tools/javah/4942232/ParamClassTest.java.i
data/test/tools/javac/implicitThis/WhichImplicitThis10.java.i
data/test/tools/javac/generics/6946618/T6946618a.out.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java.i
@@ -2918,10 +2918,9 @@ data/test/tools/javac/mandatoryWarnings/unchecked/Test3b.out.i
data/test/tools/javac/ImportPackagePrivateInner/foo/Accessor.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassUseMapper.java.i
data/test/tools/javac/T6180021/Super.java.i
-data/test/tools/javac/unicode/SupplementaryJavaID6.sh.i
-data/test/tools/javac/api/6406133/Erroneous.java.i
+data/src/share/classes/com/sun/tools/javac/parser/Tokens.java.i
data/test/tools/javac/TryWithResources/TwrTests.java.i
-data/test/tools/javap/T6474890.java.i
+data/test/tools/javac/innerClassFile/y/Main.java.i
data/src/share/classes/com/sun/tools/javadoc/AnnotationDescImpl.java.i
data/test/tools/javac/6979683/TestCast6979683_BAD39.java.errlog.i
data/test/tools/javac/processing/filer/TestPackageInfo.java.i
@@ -2930,28 +2929,28 @@ data/test/tools/javac/T6587674.java.i
data/test/tools/javac/staticImport/6665223/pkg/B.java.i
data/src/share/classes/com/sun/source/tree/ViewDeclarationTree.java.i
data/test/tools/apt/mirror/type/PrimitiveTyp.java.i
-data/test/tools/javac/NestedInnerClassNames.sh.i
data/test/tools/javac/QualifiedThisAndSuper_2.java.i
data/test/tools/javac/6589361/T6589361.java.i
data/test/com/sun/javadoc/testIndex/pkg/Coin.java.i
data/test/tools/javac/diags/examples/UnreportedException.java.i
-data/test/tools/javac/generics/diamond/neg/Neg03.out.i
+data/test/tools/javah/compareTest/CompareTest.java.i
data/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java.i
data/src/share/classes/javax/tools/package-info.java.i
data/src/share/classes/com/sun/source/tree/AssertTree.java.i
data/test/tools/javac/api/6852595/T6852595.java.i
data/test/tools/javac/ExtendsAccess/ExtendsAccess.out.i
-data/test/tools/javac/ImportCycle/foo/Bottom.java.i
data/test/com/sun/javadoc/testLegacyTaglet/C.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java.i
data/test/tools/javac/importscope/A.java.i
data/test/tools/javac/typeAnnotations/failures/target/VoidMethod.java.i
-data/test/tools/javac/diags/examples/UnclosedBytecodeIdent.java.i
+data/test/tools/javac/generics/ArrayClone.java.i
+data/test/tools/javac/generics/7151070/T7151070.out.i
data/test/tools/javac/diags/examples/PrintProcessorInfo/PrintProcessorInfo.java.i
data/test/tools/javac/overload/T4723909.java.i
data/test/tools/javac/modules/ModuleClassAttributeTest01.java.i
data/src/share/classes/com/sun/tools/apt/comp/PrintAP.java.i
data/test/tools/javac/TryWithResources/DuplicateResourceDecl.java.i
-data/test/tools/javac/generics/wildcards/7034495/T7034495.java.i
+data/src/share/classes/sun/tools/javap/RuntimeConstants.java.i
data/test/tools/javac/diags/examples/UnreportedExceptionImplicitClose.java.i
data/test/tools/javac/limits/NumArgs1.java.i
data/test/tools/javac/generics/diamond/neg/Neg04.java.i
@@ -2962,10 +2961,11 @@ data/test/tools/javac/NonStaticFieldExpr3.java.i
data/test/tools/javac/parser/T4881269.java.i
data/src/share/classes/com/sun/tools/javah/JavahTool.java.i
data/test/tools/javah/6572945/TestClass2.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java.i
data/test/tools/javac/StandaloneQualifiedSuper.java.i
data/test/tools/javac/6402516/CheckMethod.java.i
data/test/tools/javac/Paths/MineField.sh.i
-data/test/tools/javac/TryWithResources/ResourceInterface.out.i
+data/test/tools/javac/limits/PoolSize1.java.i
data/src/share/classes/javax/tools/StandardLocation.java.i
data/test/tools/javac/Diagnostics/6769027/T6769027.java.i
data/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java.i
@@ -2979,94 +2979,91 @@ data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.j
data/test/com/sun/javadoc/testTagMisuse/TestTagMisuse.java.i
data/test/com/sun/javadoc/testTypeParams/TestTypeParameters.java.i
data/test/tools/javac/generics/inference/6638712/T6638712e.out.i
-data/test/tools/javac/T6435291/T6435291.java.i
-data/test/tools/javap/T6715767.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java.i
data/test/com/sun/javadoc/testEncoding/TestEncoding.java.i
-data/test/tools/javac/generics/typevars/6968793/T6968793.java.i
+data/test/tools/javac/generics/WrongNew.java.i
data/test/tools/javac/BadHexConstant.java.i
-data/test/tools/javac/QualifiedAccess/QualifiedAccess_4.java.i
+data/test/tools/javac/multicatch/model/ModelChecker.java.i
data/test/tools/javac/modules/ModuleModifierTest01.java.i
data/test/tools/javac/generics/diamond/neg/Neg01.out.i
data/test/tools/javac/diags/examples/AssertAsIdentifier2.java.i
data/test/com/sun/javadoc/_template/TemplateComplete.java.i
+data/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java.i
data/test/tools/javap/T6866657.java.i
-data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java.i
data/src/share/classes/com/sun/tools/javac/code/Printer.java.i
data/test/tools/javadoc/6942366/p/Base.java.i
data/test/tools/javap/4111861/T4111861.java.i
data/test/tools/javac/diags/examples/NoSuperclass.java.i
data/test/tools/javac/multicatch/Pos09.java.i
-data/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java.i
-data/test/tools/javac/6521805/p/Outer.java.i
-data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java.i
+data/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.out.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java.i
+data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor8.java.i
data/test/com/sun/javadoc/testHeadings/pkg1/C1.java.i
data/test/com/sun/javadoc/testNavagation/TestNavagation.java.i
data/test/tools/javac/missingClass/A.java.i
data/test/com/sun/javadoc/testTaglets/Child.java.i
data/test/tools/javac/processing/model/util/filter/TestIterables.java.i
data/test/tools/javac/OverrideChecks/6400189/T6400189c.java.i
-data/test/tools/javac/typeAnnotations/newlocations/Throws.java.i
+data/test/tools/javac/processing/6634138/Dummy.java.i
data/test/tools/javac/generics/diamond/7057297/T7057297.java.i
data/src/share/classes/javax/tools/ExtendedLocation.java.i
+data/test/tools/javac/api/6411310/Test.java.i
data/src/share/classes/com/sun/source/tree/ContinueTree.java.i
+data/test/tools/javac/Diagnostics/6722234/T6722234b.java.i
data/test/com/sun/javadoc/testLinkOption/testNewLineInLink/package.html.i
data/test/tools/javadoc/6176978/X.java.i
data/src/share/classes/javax/annotation/processing/ProcessingEnvironment.java.i
data/test/tools/apt/lib/TestProcessor.java.i
-data/test/tools/javac/generics/T4738171.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAnnotation.java.i
data/test/tools/javac/generics/inference/6315770/T6315770.java.i
-data/test/tools/javac/generics/typevars/6199146/T6199146.java.i
data/test/tools/apt/mirror/declaration/ConstructorDecl.java.i
data/test/tools/javac/rawDiags/Error.out.i
data/src/share/classes/com/sun/tools/javac/Launcher.java.i
data/test/tools/javadoc/enum/enumType/expected.out.i
data/test/com/sun/javadoc/testPackageDeprecation/C2.java.i
-data/test/tools/javac/lint/NoWarn2.out.i
-data/test/tools/javac/cast/forum/T654170.java.i
-data/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java.i
+data/test/tools/javac/InnerClassesAttribute/Outside$1$Inside.class.i
+data/test/tools/javac/cast/7005095/T7005095neg.java.i
data/test/com/sun/javadoc/testSerialVersionUID/C.java.i
data/test/tools/javadoc/generics/tparamTagOnMethod/pkg1/A.java.i
data/make/test/lib/javap.sh.i
+data/test/tools/javac/api/TestJavacTask_ParseAttrGen.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/package-info.java.i
data/test/tools/javac/diags/examples/NoExplicitAnnoProcRequested.java.i
data/test/tools/javac/multicatch/Neg01.out.i
data/src/share/classes/com/sun/tools/javap/BasicWriter.java.i
data/test/tools/javac/generics/typevars/4856983/T4856983b.java.i
-data/test/tools/javac/generics/diamond/7030150/Pos01.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java.i
+data/src/share/classes/javax/lang/model/util/ElementFilter.java.i
+data/test/tools/javac/processing/model/element/TestResourceVariable.java.i
data/test/tools/javac/generics/diamond/neg/Neg11.out.i
data/test/tools/javac/implicitThis/6541876/T6541876b.java.i
data/src/share/classes/javax/annotation/processing/Filer.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java.i
+data/test/tools/javac/5045412/Foo.java.i
data/test/tools/javac/T6394563.empty.out.i
-data/test/tools/javac/depOverrides/doccomment/Test2Q.out.i
data/src/share/classes/com/sun/tools/javac/code/Directive.java.i
data/test/tools/javac/file/zip/T6836682.java.i
-data/test/tools/javac/cast/6270087/T6270087.java.i
data/test/com/sun/javadoc/testNavagation/pkg/E.java.i
-data/test/tools/javac/generics/7022054/T7022054neg1.out.i
data/test/tools/javac/generics/InstanceOf3.java.i
+data/test/tools/apt/Compile/Round1Apf.java.i
data/test/com/sun/javadoc/testThrowsHead/TestThrowsHead.java.i
-data/test/tools/javac/generics/GetClass2.java.i
data/test/tools/javac/generics/wildcards/7034495/T7034495.out.i
data/test/com/sun/javadoc/testTaglets/C.java.i
-data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java.i
-data/test/tools/javac/5045412/Bar.java.i
+data/test/tools/javac/modules/ClassReaderTest01.java.i
data/test/tools/javac/policy/test3/Test.java.i
data/test/tools/javac/diags/examples/RedundantCast.java.i
data/src/share/classes/com/sun/tools/javac/file/ZipArchive.java.i
data/test/tools/javac/literals/BinaryLiterals.java.i
-data/src/share/classes/com/sun/tools/javac/code/Attribute.java.i
+data/test/tools/javac/diags/examples/UnclosedBytecodeIdent.java.i
data/test/tools/javac/depOverrides/doccomment/Test1B2.out.i
data/test/tools/javac/diags/examples/VarargsClash.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java.i
+data/test/tools/javac/cast/7123100/T7123100a.java.i
data/src/share/classes/com/sun/mirror/type/package-info.java.i
data/test/tools/javac/generics/6969184/T6969184.out.i
data/test/tools/javac/staticImport/6665223/pkg/A.java.i
data/test/tools/javah/6572945/gold/jni.dir.1/TestClass2.h.i
data/test/tools/javac/6464451/BigFinally.java.i
data/test/com/sun/javadoc/testReturnTag/TestReturnTag.java.i
-data/test/tools/javac/generics/7007615/acc1/p1/D.java.i
data/test/tools/javac/AnonymousProtect/P1/pub.java.i
data/test/tools/javac/diags/examples/InaccessibleVarargsType/p1/A.java.i
data/test/tools/javac/generics/6910550/T6910550a.out.i
@@ -3080,51 +3077,51 @@ data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes5.java.i
data/test/tools/javac/InterfaceAssert.java.i
data/src/share/classes/javax/lang/model/util/AbstractElementVisitor6.java.i
data/test/tools/javac/annotations/neg/Recovery.java.i
+data/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java.i
data/test/tools/javadoc/subpackageIgnore/SubpackageIgnore.java.i
data/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java.i
-data/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java.i
+data/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java.i
data/test/tools/javac/generics/wildcards/6437894/B.java.i
data/test/tools/javac/processing/6359313/package-info.java.i
data/test/tools/javac/generics/6985719/T6985719b.out.i
data/src/share/classes/com/sun/mirror/util/package.html.i
data/test/tools/javadoc/annotations/annotatePackage/pkg2/B.java.i
-data/test/tools/javac/processing/6350124/Marked.java.i
data/test/com/sun/javadoc/testRelativeLinks/pkg2/Foo.java.i
data/test/tools/javac/ConditionalInline.java.i
data/test/tools/javac/6863465/T6863465c.java.i
data/test/tools/javac/T4994049/DeprecatedNOT.java.i
-data/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html.i
+data/src/share/classes/javax/lang/model/element/TypeParameterElement.java.i
data/test/tools/javac/generics/7034511/T7034511a.out.i
data/test/tools/javac/TryWithResources/DuplicateResourceDecl.out.i
+data/test/tools/javac/InterfaceObjectInheritance.java.i
data/test/tools/javac/multicatch/Pos05.java.i
data/test/tools/javac/parser/JavacParserTest.java.i
data/test/tools/javac/rawDiags/Error.java.i
data/test/tools/javac/depDocComment/DeprecatedDocComment4.java.i
data/test/tools/javac/VoidArray.java.i
-data/test/tools/javac/depOverrides/annotation/Test1B2.out.i
+data/test/tools/javac/NameClash/One.java.i
data/test/tools/javac/warnings/FallThrough.noLint.out.i
-data/test/tools/javac/generics/Casting3.java.i
data/test/com/sun/javadoc/testSimpleTag/TestSimpleTag.java.i
-data/test/tools/javac/multicatch/Pos08.java.i
+data/test/tools/javac/annotations/neg/Package.java.i
data/test/com/sun/javadoc/testBaseClass/baz/Foo.java.i
data/test/tools/javac/generics/rare/Rare6.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar_end.gif.i
data/test/com/sun/javadoc/testMemberInheritence/inheritDist/C.java.i
data/test/tools/javac/annotations/neg/Cycle3.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java.i
data/test/tools/javac/ExtraneousEquals.java.i
-data/test/tools/javac/processing/6994946/SemanticErrorTest.java.i
+data/src/share/classes/com/sun/tools/javac/code/Flags.java.i
data/test/com/sun/javadoc/testHref/TestHref.java.i
data/test/com/sun/javadoc/testInlineLinkLabel/TestInlineLinkLabel.java.i
data/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.out.i
data/test/tools/javac/DefiniteAssignment/T4720751.java.i
-data/test/tools/apt/mirror/declaration/PackageDecl.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_9.java.i
data/test/tools/javac/diags/examples/IllegalStartOfExpr.java.i
data/test/tools/javac/generics/inference/6369605/T6369605b.java.i
-data/test/tools/javac/rawDiags/Note.out.i
+data/test/tools/javac/modules/EntrypointTest01.java.i
data/test/tools/javac/generics/inference/6359106/Orig.java.i
data/test/tools/javac/generics/typevars/5060485/T5060485.java.i
data/test/tools/javac/typeAnnotations/failures/IndexArray.out.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java.i
data/test/tools/javap/T4975569.java.i
data/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java.i
data/test/tools/javac/ConstantValues/ConstValInit.java.i
@@ -3134,8 +3131,8 @@ data/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java.i
data/test/tools/javac/miranda/4711056/T4.java.i
data/test/tools/javadoc/annotations/annotateParams/Main.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/links/LinkFactory.java.i
-data/test/tools/apt/Basics/StaticMethodAnnotations.java.i
-data/test/tools/javac/6979683/TestCast6979683_BAD37.java.i
+data/test/tools/javac/cast/forum/T654170.java.i
+data/make/build.xml.i
data/src/share/classes/javax/lang/model/element/AnnotationValueVisitor.java.i
data/test/tools/javadoc/generics/genericSuper/pkg1/A.java.i
data/test/tools/javac/failover/FailOver06.out.i
@@ -3143,7 +3140,7 @@ data/test/tools/javac/depOverrides/annotation/Test2R.out.i
data/test/tools/javac/diags/examples/DeprecatedFilenameAdditional.java.i
data/test/tools/javac/limits/CodeSize.java.i
data/test/tools/javac/T6395974.java.i
-data/test/tools/javac/cast/6557182/T6557182.java.i
+data/test/tools/javac/AnonymousProtect/P1/priv.java.i
data/test/tools/javac/warnings/Deprecation.noLint.out.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignCond.java.i
data/test/tools/javac/6547131/p/Outer.class.i
@@ -3155,7 +3152,7 @@ data/src/share/classes/com/sun/tools/javap/CodeWriter.java.i
data/test/tools/javac/completion/example/B.class.i
data/test/tools/apt/Compile/Dummy1.java.i
data/test/tools/javac/T6230128.java.i
-data/test/tools/javac/diags/examples/UncheckedCast.java.i
+data/test/tools/javac/api/TestDocComments.java.i
data/test/com/sun/javadoc/testBreakIterator/TestBreakIterator.java.i
data/test/tools/javac/jvm/6397652/T6397652.java.i
data/test/tools/javac/processing/filer/TestGetResource2.java.i
@@ -3168,6 +3165,7 @@ data/test/tools/apt/lib/Test.java.i
data/test/tools/javac/treeannotests/DA.java.i
data/test/tools/javac/cast/6467183/T6467183b.java.i
data/test/tools/javac/diags/examples/StaticNotQualifiedByType.java.i
+data/test/tools/javac/Paths/Class-Path2.sh.i
data/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java.i
data/test/tools/javac/generics/7022054/T7022054neg2.java.i
data/test/tools/javac/T5092545.java.i
@@ -3185,116 +3183,119 @@ data/test/tools/javac/generics/T4684378.java.i
data/test/tools/javac/Diagnostics/6722234/T6722234d_1.out.i
data/src/share/classes/com/sun/mirror/util/package-info.java.i
data/test/tools/javac/tree/TreePosRoundsTest.java.i
-data/src/share/classes/javax/lang/model/util/SimpleElementVisitor8.java.i
+data/test/tools/javac/diags/examples/ProcUnclosedTypeFiles/processors/AnnoProc.java.i
data/test/com/sun/javadoc/testInterface/pkg/Interface.java.i
data/test/tools/javac/code/ArrayClone.java.i
data/test/tools/javac/diags/examples/ProcessorWrongType/ProcessorWrongType.java.i
-data/test/tools/javac/processing/6365040/ProcFoo.java.i
+data/test/tools/javac/varargs/warning/Warn4.java.i
data/src/share/classes/com/sun/source/tree/ModuleTree.java.i
data/test/tools/javac/diags/examples/UncheckedClash.java.i
-data/test/tools/javac/6400872/C.java.i
+data/test/tools/javac/NonStaticFieldExpr1.java.i
data/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java.i
data/test/tools/javac/diags/examples/StaticImportNotSupported.java.i
data/test/com/sun/javadoc/testEncoding/EncodeTest.java.i
data/test/tools/javac/cast/6302214/T6302214a.java.i
-data/test/tools/javac/api/TestGetElement.java.i
+data/test/tools/javac/6758789/T6758789a.java.i
data/test/tools/javac/OverrideChecks/6738538/T6738538a.java.i
data/test/tools/javac/quid/QuotedIdent.java.i
-data/src/share/classes/com/sun/tools/classfile/Attributes.java.i
+data/test/tools/javac/generics/T4784219.java.i
data/test/tools/javac/multicatch/Neg03.java.i
-data/test/tools/javac/diags/examples/VerboseResolveMulti1.java.i
-data/test/tools/javadoc/enum/docComments/Main.java.i
+data/test/tools/javac/5005368.java.i
data/test/tools/javac/processing/6350124/HelloWorldAP.java.i
data/test/tools/apt/mirror/type/InterfaceTyp.java.i
data/test/tools/javac/generics/6476118/T6476118d.java.i
data/test/tools/javac/TryWithResources/PlainTry6.out.i
-data/test/tools/javac/capture/Capture5.java.i
data/src/share/classes/com/sun/tools/javac/tree/JCTree.java.i
data/test/tools/javac/boxing/BoxedForeach.java.i
-data/test/tools/javac/T6231847.java.i
-data/test/tools/javac/6257443/T6257443.java.i
+data/test/tools/javac/util/context/T7021650.java.i
+data/test/tools/javac/ImportUnnamed/Dummy.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_3.java.i
data/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java.i
data/test/tools/javadoc/6958836/warns/Warnings.java.i
-data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java.i
+data/test/tools/javac/processing/T6439826.java.i
+data/test/tools/javac/DeclarationStatementInline.java.i
data/make/netbeans/langtools/build.xml.i
data/src/share/classes/com/sun/mirror/util/DeclarationFilter.java.i
-data/test/tools/apt/Compile/compile.sh.i
+data/test/tools/javap/T7004698.java.i
data/src/share/classes/com/sun/javadoc/Type.java.i
-data/test/tools/javac/accessVirtualInner/a/A.java.i
+data/test/tools/javac/generics/inference/5003431/T5003431.java.i
+data/test/tools/javac/diags/examples/LocalVarNeedsFinal.java.i
data/src/share/classes/com/sun/tools/javac/code/Source.java.i
-data/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar.i
-data/test/tools/javac/annotations/neg/Z11.java.i
+data/test/tools/javac/multicatch/Neg01eff_final.java.i
data/test/com/sun/javadoc/testDupParamWarn/TestDupParamWarn.java.i
data/test/tools/javac/types/CastObjectToPrimitiveTest.java.i
data/test/tools/javac/UncaughtOverflow2.java.i
data/test/tools/javac/QualifiedAccess/QualifiedAccess_3.out.i
data/test/tools/javac/generics/rawOverride/T6178365.java.i
data/test/tools/javac/policy/test3/A.java.i
-data/test/com/sun/javadoc/testHtmlTableTags/pkg1/C1.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn3.java.i
data/test/tools/javac/IllegalAnnotation.java.i
data/src/share/classes/com/sun/tools/javac/util/BaseFileManager.java.i
data/test/tools/javap/ListTest.java.i
data/src/share/classes/com/sun/javadoc/AnnotationTypeDoc.java.i
+data/src/share/classes/javax/lang/model/util/ElementScanner8.java.i
data/test/tools/javac/diags/examples/WhereCaptured.java.i
data/test/tools/javac/ObjectIncompatibleInterface.java.i
data/test/tools/javac/api/6420409/T6420409.java.i
data/src/share/classes/com/sun/tools/javah/resources/version.properties-template.i
data/test/tools/javac/versionOpt.sh.i
-data/test/tools/javac/api/TestJavacTask_ParseAttrGen.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/FieldWriter.java.i
-data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/C1.java.i
-data/test/tools/javac/generics/InstanceOf2.java.i
-data/test/tools/javac/varargs/6199075/T6199075.java.i
+data/test/tools/javac/diags/examples/MulticatchMustBeFinal.java.i
+data/test/tools/javac/generics/wildcards/6437894/T6437894.out.i
+data/test/tools/javac/DefiniteAssignment/T4725725.java.i
+data/test/tools/javac/processing/warnings/UseImplicit/TestProcUseImplicitWarning.java.i
+data/test/tools/javac/staticQualifiedNew/StaticQualifiedNew.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_11.java.i
data/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java.i
-data/test/tools/javac/mandatoryWarnings/unchecked/B.java.i
+data/make/test/lib/src.gold.txt.i
data/LICENSE.i
data/test/com/sun/javadoc/testTagInheritence/TestTagInheritence.java.i
data/test/tools/javac/processing/filer/TestGetResource.java.i
data/test/tools/javac/diags/examples/ImproperSVUID.java.i
data/test/com/sun/javadoc/constantValues/TestConstantValuesDriver.java.i
-data/test/tools/javadoc/lib/Tester.java.i
data/test/com/sun/javadoc/testStylesheet/pkg/A.java.i
data/test/tools/javac/AccessMethods/LateAddition.java.i
+data/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java.i
+data/test/tools/javac/T6705935.java.i
data/test/tools/javac/diags/examples/TypeReqClassArray.java.i
data/src/share/classes/com/sun/tools/classfile/Descriptor.java.i
-data/test/tools/javac/typeAnnotations/6967002/T6967002.out.i
+data/test/tools/javac/varargs/6806876/T6806876.out.i
data/test/tools/javac/boxing/NoBoxingChar.java.i
+data/test/tools/javac/DefiniteAssignment/T4721062a.java.i
data/test/tools/javac/T6304128.java.i
+data/test/com/sun/javadoc/testThrowsTag/pkg/T5.java.i
data/test/tools/javac/multicatch/Neg06.java.i
data/test/tools/javac/failover/FailOver04.java.i
-data/src/share/classes/com/sun/source/tree/DoWhileLoopTree.java.i
+data/test/tools/javac/processing/model/type/MirroredTypeEx/OverEager.java.i
data/test/tools/javap/T6879371.java.i
-data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.out.i
+data/test/tools/apt/Compile/Rounds.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/Test4d.out.i
data/test/tools/javac/miranda/T4279316b.java.i
-data/test/tools/javac/generics/wildcards/pos/InstanceOf.java.i
-data/test/tools/javac/failover/FailOver12.java.i
+data/test/tools/javac/varargs/T7013865.java.i
+data/test/tools/javac/generics/7007615/acc1/p1/D.java.i
data/test/tools/javac/6567415/T6567415.java.i
-data/test/tools/javac/ClassLiterals/p1/SuperClass.java.i
+data/test/tools/javac/NonStaticFinalVar.java.i
data/test/tools/javac/generics/Varargs.java.i
data/test/tools/javac/TryWithResources/ResourceInterface.java.i
-data/test/tools/apt/mirror/declaration/EnumDecl.java.i
+data/src/share/classes/com/sun/tools/apt/main/Main.java.i
data/test/tools/javac/policy/Test.java.i
data/test/tools/javac/generics/diamond/neg/Neg09.out.i
data/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateTypeAnnotation.out.i
data/test/com/sun/javadoc/testExternalOverridenMethod/package-list.i
data/test/tools/javac/generics/6985719/T6985719e.out.i
data/test/com/sun/javadoc/testDocRootLink/pkg1/package.html.i
-data/test/tools/javac/6668794/badSource/p/A.java.i
-data/test/tools/javac/6521805/p/Sub.java.i
+data/test/tools/javac/generics/rare/Rare2.java.i
data/test/tools/javac/typeAnnotations/failures/target/NotTypeParameter.java.i
data/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java.i
data/test/tools/javac/failover/FailOver13.out.i
data/test/tools/javac/tree/MakeLiteralTest.java.i
data/test/tools/javac/Parens3.java.i
-data/test/tools/javac/6734819/T6734819a.out.i
+data/test/tools/javac/diags/examples/ProcessorWrongType/processors/AnnoProc.java.i
data/test/tools/javac/diags/examples/IntfAnnotationsCantHaveParams.java.i
data/src/share/classes/com/sun/mirror/type/MirroredTypeException.java.i
-data/test/com/sun/javadoc/testDupParamWarn/pkg/Bar.java.i
-data/test/tools/javac/IllegalAnnotation.out.i
+data/test/tools/javac/miranda/6964669/pkg/C.java.i
data/test/tools/javac/AnonymousProtect/P2/usePub.java.i
-data/test/tools/apt/Compile/servicesRound1.i
+data/test/tools/javac/processing/environment/round/BuriedAnnotations.java.i
data/test/tools/javac/generics/inference/5044646/p1/C.java.i
data/test/com/sun/javadoc/testNestedInlineTag/testtaglets/UnderlineTaglet.java.i
data/test/com/sun/javadoc/testBaseClass/TestBaseClass.java.i
@@ -3305,81 +3306,76 @@ data/test/tools/javadoc/generics/genericInnerAndOuter/Main.java.i
data/test/tools/javac/enum/Enum2.java.i
data/test/tools/javac/boxing/T6369051.java.i
data/test/tools/javac/unicode/UnicodeUnicode.java.i
-data/src/share/classes/com/sun/source/util/AbstractTypeProcessor.java.i
+data/test/tools/javac/ClassPathTest/ClassPathTest2.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/Test1.out.i
data/test/tools/javac/innerClassFile/Driver.sh.i
data/test/tools/javac/TryWithResources/TwrMultiCatch.java.i
-data/test/com/sun/javadoc/testIndex/pkg/AnnotationType.java.i
+data/test/tools/apt/Compile/ErrorAPF.java.i
data/test/tools/javac/T6999210.java.i
data/test/tools/javac/T6232928/package-info.java.i
-data/test/tools/apt/Compile/HelloWorld.java.i
+data/test/tools/javac/diags/examples/MethodDoesNotOverride.java.i
data/test/com/sun/javadoc/testCmndLineClass/pkg2/C4.java.i
data/test/tools/javac/TryWithResources/TwrIntersection02.out.i
data/test/tools/javac/T6423583.java.i
data/test/tools/javac/generics/6413682/T6413682.java.i
-data/test/com/sun/javadoc/testHtmlTableTags/pkg2/package-info.java.i
-data/test/tools/javac/AnonymousProtect/P1/priv.java.i
+data/test/tools/javac/meth/XlintWarn.java.i
+data/test/tools/javac/cast/6557182/T6557182.java.i
data/test/tools/javac/multicatch/Pos02.java.i
-data/test/tools/javac/rawDiags/Warning.out.i
data/test/com/sun/javadoc/testThrowsInheritence/Iface.java.i
-data/test/tools/javac/generics/wildcards/UnboundArray.java.i
-data/test/tools/javac/generics/Nonlinear.java.i
+data/test/tools/javac/p1/BS.java.i
+data/test/tools/javac/ClassLiterals/InnerClassLiterals.java.i
data/test/com/sun/javadoc/testHelpOption/TestHelpOption.java.i
data/test/tools/javac/NonAmbiguousField/Test.i
data/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java.i
data/src/share/classes/javax/lang/model/type/NoType.java.i
data/test/tools/javac/TryWithResources/ArmLint.out.i
data/test/tools/javac/generics/6218229/T6218229.java.i
-data/src/share/classes/com/sun/tools/javac/code/Symtab.java.i
+data/test/tools/javac/diags/examples/PrintRounds/processors/AnnoProc.java.i
data/test/tools/javac/api/TestTrees.java.i
-data/test/tools/javac/api/6421756/T6421756.java.i
+data/test/tools/javac/SuperMeth.java.i
data/test/com/sun/javadoc/testHtmlDocument/testMarkup.html.i
data/test/tools/javac/OverrideChecks/T6399361.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java.i
+data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes2.java.i
data/test/tools/javadoc/T4994049/FileWithTabs.java.i
-data/test/tools/javac/generics/6946618/T6946618c.java.i
+data/test/tools/javac/ExceptionalFinally.java.i
data/test/tools/javac/enum/forwardRef/TestEnum5.java.i
data/test/tools/javac/processing/model/element/TestElement.java.i
data/test/tools/javac/generics/7015430/T7015430.java.i
data/test/tools/javac/p1/AS.java.i
data/test/tools/javac/6863465/T6863465c.out.i
-data/test/tools/javac/diags/examples/HasBeenDeprecated.java.i
+data/make/test/HelloWorld.javadoc.gold.txt.i
data/test/tools/javac/generics/T4784207b.java.i
data/test/tools/javac/annotations/pos/Z2.java.i
-data/test/tools/javac/api/TestJavacTask.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MessageRetriever.java.i
+data/test/tools/javac/generics/7151070/T7151070.java.i
+data/test/tools/javac/varargs/warning/Warn5.java.i
+data/test/tools/javac/ClassLiterals/LiteralInterface_1.java.i
data/test/tools/apt/lib/Ignore.java.i
-data/test/tools/javadoc/annotations/annotateParams/pkg1/C.java.i
+data/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/Test.java.i
-data/test/tools/javac/typeAnnotations/failures/target/Constructor.out.i
-data/test/tools/javac/multicatch/Neg02.out.i
+data/test/tools/javac/api/TestJavacTaskScanner.java.i
data/test/tools/javac/resolve/Pos.java.i
-data/test/tools/javac/generics/GenLit1.java.i
+data/test/tools/javac/generics/diamond/neg/Neg03.out.i
data/test/tools/javac/typeAnnotations/failures/common/receiver/DuplicateAnnotationValue.out.i
-data/test/tools/javac/6491592/T6491592.out.i
-data/src/share/classes/com/sun/javadoc/ThrowsTag.java.i
+data/test/tools/javac/generics/parametricException/J.java.i
+data/test/tools/javac/synthesize/Byte.java.i
data/src/share/classes/javax/tools/ForwardingFileObject.java.i
data/test/com/sun/javadoc/AccessH1/AccessH1.java.i
data/test/tools/javac/diags/examples/AnnotationMissingValues1.java.i
-data/test/tools/apt/Discovery/Touch.java.i
-data/test/com/sun/javadoc/testUseOption/pkg2/C3.java.i
+data/test/tools/javac/cast/6270087/T6270087.java.i
data/test/tools/javac/staticImport/6695838/a/FooInterface.java.i
data/test/tools/javac/CyclicInheritance6/p1/B.java.i
-data/src/share/classes/javax/lang/model/util/ElementKindVisitor8.java.i
+data/test/com/sun/javadoc/testWarnings/pkg/package.html.i
data/test/tools/javac/diags/examples/EmptyCharLiteral.java.i
-data/test/tools/javac/ExceptionalFinally2.java.i
-data/test/tools/javac/diags/examples/VarargsFilenameAdditional.java.i
-data/src/share/classes/com/sun/source/tree/ParameterizedTypeTree.java.i
-data/test/tools/javac/processing/environment/HelloWorld.java.i
-data/test/tools/javac/generics/6711619/T6711619b.out.i
-data/test/tools/javac/diags/examples/IllegalComboModifiers.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/EnumConstantWriterImpl.java.i
+data/test/tools/javac/ClassPathTest/ClassPathTest.sh.i
+data/test/tools/javac/generics/wildcards/BoundBug.java.i
+data/test/tools/javac/diags/examples/SunApiFilename.java.i
data/test/tools/javac/6521805/T6521805e.java.i
data/test/tools/javac/api/TestGetScope.java.i
data/src/share/classes/sun/tools/javap/StackMapTableData.java.i
data/test/tools/javac/DefiniteAssignment/7003744/T7003744a.java.i
data/test/tools/javac/resolve/ResolveHarness.java.i
data/test/tools/javac/Paths/wcMineField.sh.i
-data/src/share/classes/com/sun/tools/javadoc/Messager.java.i
data/test/tools/javac/generics/7007615/acc2/AccessibilityCheck02.java.i
data/test/tools/javac/diags/examples/TypeVarCantBeDeref.java.i
data/test/tools/javac/processing/options/XprintDocComments.out.i
@@ -3387,18 +3383,18 @@ data/test/tools/javac/depOverrides/annotation/Test1A.out.i
data/src/share/opensource/javac/doc/javac_lifecycle/index.html.i
data/test/tools/javac/generics/7034511/T7034511a.java.i
data/test/tools/javac/generics/7015430/T7015430.out.i
-data/test/tools/javac/api/evalexpr/CompileFromString.java.i
data/test/tools/javac/generics/inference/7086601/T7086601b.java.i
+data/test/tools/javac/nativeHeaders/javahComparison/TestClass3.java.i
data/test/tools/javac/warnings/6594914/T6594914a.java.i
data/test/com/sun/javadoc/testTaglets/taglets/Foo.java.i
data/test/tools/javac/generics/odersky/List.java.i
-data/test/tools/javac/processing/6365040/T6365040.java.i
data/test/tools/javac/diags/examples/PrintProcessorInfo/processors/AnnoProc.java.i
-data/test/tools/javac/typeAnnotations/newlocations/BasicTest.out.i
+data/test/tools/javac/ConstantValues/test_ff2.java.i
data/test/tools/javac/cast/7123100/T7123100b.out.i
data/test/tools/javac/DefiniteAssignment/T4721076.java.i
-data/test/tools/javac/cast/7123100/T7123100a.java.i
-data/test/tools/javac/warnings/6594914/T6594914a.out.i
+data/test/tools/javac/varargs/VarargsOverride.java.i
+data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java.i
+data/src/share/classes/com/sun/tools/javadoc/Messager.java.i
data/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java.i
data/test/tools/javac/VerifyDA.java.i
data/test/tools/javadoc/subpackageIgnore/pkg1/not-subpkg/SomeJavaFile.java.i
@@ -3406,17 +3402,16 @@ data/test/tools/javac/warnings/Deprecation.lintAll.out.i
data/test/com/sun/javadoc/testMemberInheritence/inheritDist/A.java.i
data/test/tools/javac/diags/examples/AnnosWithoutProcessors/processors/AnnoProc.java.i
data/test/tools/javac/6979683/TestCast6979683_GOOD.java.i
-data/test/tools/javac/proprietary/WarnMethod.java.i
+data/test/tools/javadoc/generics/genericClass/expected.out.i
data/test/tools/javadoc/LangVers.java.i
data/test/tools/javac/AnonInnerException_3.java.i
-data/test/tools/javac/miranda/T4666866.java.i
data/test/tools/javac/StringsInSwitch/RSCL1.out.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java.i
data/test/tools/javac/generics/6356636/a/Bar.java.i
data/test/tools/javac/ExtDirs/ext2/pkg2.jar.i
data/src/share/classes/com/sun/tools/javap/AnnotationWriter.java.i
data/test/tools/javac/depOverrides/doccomment/Test2.java.i
-data/test/tools/javac/generics/rawOverride/7062745/T7062745pos.java.i
+data/test/com/sun/javadoc/testInlineLinkLabel/pkg/package.html.i
data/test/tools/javac/typeAnnotations/failures/LintCast.java.i
data/src/share/classes/com/sun/mirror/type/package.html.i
data/test/tools/javac/annotations/6214965/CompilerAnnotationTest.java.i
@@ -3425,61 +3420,63 @@ data/test/tools/javac/generics/typeargs/Superarg2.java.i
data/test/tools/javac/processing/werror/WErrorGen.out.i
data/test/tools/javac/ImportPackagePrivateInner/foo/Accessee.java.i
data/test/tools/apt/Options/servicesOptions.i
-data/test/tools/javac/enum/NestedEnum.java.i
-data/test/tools/javac/resolve/tests/PrimitiveOverload.java.i
+data/test/tools/apt/mirror/util/Overrides.java.i
+data/test/tools/javac/T6900149.java.i
data/src/share/classes/com/sun/source/tree/AssignmentTree.java.i
data/test/tools/javac/T6458823/TestClass.java.i
-data/test/tools/javac/diags/examples/DuplicateClass.java.i
data/src/share/classes/javax/lang/model/element/ElementVisitor.java.i
data/test/tools/javac/6464451/ManyExitsInTry.java.i
data/test/tools/javac/modules/ModuleVersionTest01.java.i
data/test/tools/javap/typeAnnotations/ArrayClassLiterals2.java.i
data/test/tools/javac/diags/examples/ArrayDimMissing.java.i
data/src/share/opensource/javac/doc/javac_lifecycle/JavaCompiler.html.i
-data/test/tools/javac/processing/model/util/deprecation/ExpectedDeprecation.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/DeprecatedClassByAnnotation.java.i
data/test/tools/javac/diags/examples/EmptyBytecodeIdent.java.i
data/test/tools/javac/processing/model/6341534/dir/Foo.java.i
-data/test/tools/javac/positions/T6402077.java.i
+data/test/tools/javac/nativeHeaders/NativeHeaderTest.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java.i
data/test/tools/javac/T6665791.java.i
data/test/tools/javac/diags/examples/CantResolve.java.i
data/test/tools/javac/diags/examples/MissingReturnStatement.java.i
-data/src/share/classes/javax/lang/model/element/AnnotationMirror.java.i
+data/src/share/classes/com/sun/mirror/declaration/package-info.java.i
data/test/tools/javac/diags/examples/ExplicitParamsDoNotConformToBounds.java.i
+data/test/tools/javac/generics/6985719/T6985719f.out.i
+data/test/tools/javac/DuplicateClass.java.i
data/test/tools/javac/generics/6192945/Neg.out.i
data/test/tools/javac/QualifiedOuterThis2.java.i
-data/test/tools/javac/generics/abstract/T4717181c.java.i
+data/test/tools/javac/processing/6350124/Marked.java.i
data/test/tools/javac/generics/diamond/neg/Neg07.java.i
data/test/tools/javac/diags/examples/CantResolveArgs.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java.i
-data/test/tools/javac/InnerNamedConstant_2.java.i
+data/test/tools/javac/annotations/neg/Z13.java.i
+data/test/tools/javac/cast/6665356/T6665356.java.i
data/test/tools/javac/BadOptimization/DeadCode4.java.i
data/test/tools/javac/generics/rare/Rare1.java.i
data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingInterface.java.i
data/src/share/classes/com/sun/tools/apt/Main.java.i
-data/test/tools/javac/diags/examples/CantResolveArgsParams.java.i
-data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateAnnotationValue.java.i
-data/src/share/classes/com/sun/tools/javac/util/JavacMessages.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java.i
+data/test/tools/javac/boxing/NoBoxingInt.java.i
+data/test/tools/javac/generics/typeargs/Metharg2.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_5.java.i
data/test/tools/javac/cast/6569057/T6569057.java.i
+data/test/tools/apt/Compile/goldenWarn.txt.i
data/test/tools/javac/generics/inference/5080917/T5080917.java.i
data/test/tools/apt/Compile/Round4Apf.java.i
data/test/tools/javac/annotations/pos/RightTarget.java.i
-data/src/share/classes/javax/lang/model/util/ElementScanner6.java.i
+data/test/com/sun/javadoc/testModifier/TestModifier.java.i
data/test/tools/javac/api/TestJavacTask_Lock.java.i
-data/src/share/classes/com/sun/tools/javac/resources/compiler.properties.i
+data/test/tools/javac/BoundClassError.java.i
data/test/tools/javac/generics/inference/5044646/p1/B.java.i
data/test/tools/javac/warnings/6885255/T6885255.java.i
data/test/tools/apt/Discovery/discovery.sh.i
data/test/tools/javac/generics/5009937/T5009937.java.i
data/test/tools/javac/6668794/badClass/A.java.i
data/test/tools/javac/miranda/4711056/T2.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.out.i
data/test/tools/apt/Basics/com.sun.mirror.apt.AnnotationProcessorFactory.i
data/test/tools/javadoc/annotations/annotatePackage/pkg1/package.html.i
data/test/com/sun/javadoc/testOverridenMethods/pkg3/I1.java.i
-data/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java.i
+data/src/share/classes/com/sun/source/tree/UnaryTree.java.i
data/test/tools/javac/generics/OverrideBridge.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/ClassWriterImpl.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test1.out.i
data/test/tools/javac/6547131/p/Outer.jasm.i
data/test/com/sun/javadoc/5093723/T5093723.java.i
@@ -3487,133 +3484,139 @@ data/test/tools/javac/overrridecrash/B.java.i
data/test/com/sun/javadoc/testRecurseSubPackages/pkg1/pkg2/C4.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/TextTag.java.i
data/src/share/classes/com/sun/tools/javac/tree/Pretty.java.i
-data/test/com/sun/javadoc/testTypeParams/pkg/ParamTest2.java.i
-data/src/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool.i
+data/test/tools/javac/generics/wildcards/ContraArg.java.i
+data/test/tools/javac/ForwardReference/ForwardReference_5.java.i
data/test/tools/javac/failover/FailOver07.out.i
data/test/tools/javac/processing/options/testCommandLineClasses/p/NestedExamples.java.i
data/test/tools/javac/5017953/T5017953.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java.i
data/test/tools/javac/jvm/6397652/com/test/Test$Test$Test.java.i
+data/test/tools/javac/diags/examples/SourceNoBootclasspath.java.i
+data/test/tools/javac/generics/wildcards/neg/CastWarn14.java.i
data/test/tools/javac/ConditionalClass.java.i
data/test/com/sun/javadoc/testBadPackageFileInJar/pkg/C.java.i
-data/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java.i
-data/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java.i
-data/test/tools/javac/generics/6413682/TestPos.java.i
+data/test/tools/javac/modules/ModuleResolverTest05.java.i
+data/test/tools/javac/cast/7005671/T7005671.java.i
data/test/tools/javac/conditional/6500343/T6500343b.java.i
data/test/tools/javac/mandatoryWarnings/unchecked/Test3.out.i
data/test/com/sun/javadoc/testSourceTab/DoubleTab/C.java.i
+data/test/tools/javac/assert/Position.java.i
data/test/tools/javac/warnings/DivZero.java.i
data/test/tools/javac/generics/6192945/Neg2.out.i
-data/test/tools/javac/Paths/Class-Path2.sh.i
+data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateAnnotationValue.out.i
data/src/share/classes/javax/lang/model/type/MirroredTypeException.java.i
data/test/tools/javac/boxing/Boxing1.java.i
-data/test/tools/javac/6402516/Checker.java.i
+data/test/tools/javac/InterfaceOverrideObject.java.i
+data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.out.i
+data/test/tools/javac/generics/inference/4942040/T4942040.java.i
data/test/com/sun/javadoc/ValidHtml/ValidHtml.java.i
-data/test/tools/javac/annotations/neg/Recovery1.java.i
+data/test/tools/javac/enum/T6509042.java.i
data/test/tools/javac/quid/T6999438.out.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java.i
data/make/test/lib/javac.sh.i
data/test/tools/javac/HiddenAbstractMethod/two/Child.java.i
-data/test/tools/javac/6840059/T6840059.out.i
+data/test/tools/javac/diags/examples/IntfAnnotationMemberClash.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/DocType.java.i
-data/test/tools/javac/policy/test1/simple.ABD.out.i
+data/test/tools/javac/processing/6512707/T6512707.java.i
data/test/tools/javac/enum/Def.java.i
-data/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java.i
+data/test/tools/javac/unicode/SupplementaryJavaID4.java.i
data/test/tools/apt/Options/Marked.java.i
-data/src/share/classes/com/sun/tools/javac/comp/Modules.java.i
-data/test/tools/javac/generics/diamond/pos/Pos01.java.i
+data/test/tools/javac/typeAnnotations/newlocations/ClassParameters.java.i
data/test/tools/javac/diags/examples/UnsupportedEncoding.java.i
data/test/tools/javac/processing/environment/round/InheritedAnnotation.java.i
-data/test/com/sun/javadoc/testMemberInheritence/diamond/Z.java.i
+data/test/tools/javac/TryWithResources/ResourceInterface.out.i
data/test/tools/javac/diags/examples/TypeAnnotationsNotSupported.java.i
-data/test/tools/javac/generics/rare/Rare8.java.i
-data/src/share/classes/com/sun/tools/javadoc/TagImpl.java.i
+data/test/tools/javac/processing/environment/round/SurfaceAnnotations.java.i
+data/test/tools/apt/mirror/declaration/EnumDecl.java.i
data/test/tools/javac/cast/6286112/T6286112.java.i
-data/src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java.i
-data/test/tools/javac/DuplicateClass.java.i
+data/test/tools/javac/T7142672/Test3.java.i
+data/src/share/classes/javax/lang/model/element/package-info.java.i
data/test/tools/javac/miranda/T4279316d.java.i
-data/test/tools/javac/diags/examples/DiamondNonGeneric.java.i
+data/test/tools/javac/enum/NestedEnum.java.i
+data/test/tools/javac/4980495/std/Test.out.i
data/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java.i
data/test/tools/javac/enum/EnumPublicConstructor.java.i
data/test/tools/javac/overload/T4743490.java.i
+data/test/tools/javac/generics/diamond/7057297/T7057297.out.i
data/test/tools/apt/mirror/type/TypeVar.java.i
data/test/tools/javac/miranda/4686811/Tryit.java.i
data/test/tools/javac/processing/warnings/gold_0.out.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java.i
data/test/tools/javac/6390045/T6390045a.java.i
+data/test/tools/javac/annotations/pos/package-info.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/A.java.i
-data/test/com/sun/javadoc/testOverridenMethods/TestMultiInheritence.java.i
-data/test/tools/javac/Digits.java.i
-data/test/tools/javac/generics/rawSeparate/RetroLexer.java.i
+data/test/tools/javac/policy/test2/byfile.BA.out.i
+data/test/tools/javac/diags/examples/ProcSuspiciousClassName/processors/AnnoProc.java.i
+data/src/share/classes/javax/lang/model/type/package-info.java.i
data/test/com/sun/javadoc/testHtmlDocument/TestHtmlDocument.java.i
data/test/com/sun/javadoc/testNavagation/pkg/I.java.i
-data/test/tools/javac/annotations/neg/Z1.java.i
+data/test/tools/javac/generics/UncheckedArray.java.i
data/test/tools/javac/varargs/BadSyntax2.java.i
-data/test/tools/javac/diags/examples/IdentifierExpected.java.i
+data/test/tools/javac/processing/model/util/elements/TestGetConstantExpression.java.i
data/test/tools/javac/6402516/TestClass.java.i
-data/test/tools/javac/QualifiedAccess/QualifiedAccess_1.out.i
-data/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java.i
-data/test/tools/javac/SuperNew2.java.i
-data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java.i
+data/test/tools/javac/T5003235/T5003235c.out.i
+data/test/tools/javac/TryWithResources/BadTwrSyntax.out.i
+data/test/tools/javac/multicatch/Neg04eff_final.out.i
data/test/tools/javac/diags/examples/NotDefPublicCantAccess/NotDefPublicCantAccess.java.i
data/test/tools/javac/generics/inference/5081782/Pos.java.i
+data/test/tools/javac/AccessMethods/ChainedAssignment.java.i
+data/test/tools/javac/annotations/default/C.java.i
data/make/test/lib/javah.sh.i
data/test/tools/javac/Paths/Diagnostics.sh.i
-data/test/tools/javac/generics/6245699/T6245699.java.i
+data/test/tools/javah/ReadOldClass.sh.i
data/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java.i
-data/src/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java.i
-data/test/tools/javac/6302184/T6302184.sh.i
+data/test/tools/javac/warnings/6594914/T6594914b.java.i
+data/test/tools/javac/Increment.java.i
data/test/tools/javac/api/T6838467.java.i
-data/test/com/sun/javadoc/JavascriptWinTitle/p1/C.java.i
+data/test/tools/javac/diags/examples/ProcUseImplicit/ProcUseImplicit.java.i
data/test/tools/javac/diags/FileManager.java.i
data/test/com/sun/javadoc/testOverridenMethods/pkg3/I3.java.i
-data/test/tools/javac/api/T6395981.java.i
+data/test/tools/javac/T6881645.java.i
data/test/tools/javac/diags/examples/InvalidBinaryNumber.java.i
data/test/tools/javac/6863465/T6863465a.java.i
-data/test/tools/javac/diags/examples/AlreadyDefinedClinit.java.i
+data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes4.java.i
data/test/tools/javac/generics/6356636/a/AbstractFoo.java.i
data/test/tools/javac/generics/typevars/4856983/T4856983.java.i
-data/test/com/sun/javadoc/testTagInheritence/pkg/TestAbstractClass.java.i
-data/src/share/classes/com/sun/tools/javap/JavapFileManager.java.i
+data/src/share/classes/com/sun/source/tree/WildcardTree.java.i
+data/test/tools/javac/ClassFileModifiers/MemberModifiers.java.i
data/test/tools/javah/compareTest/README.i
data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner1.h.i
data/test/tools/javac/StringsInSwitch/RSCL2.out.i
-data/src/share/classes/com/sun/source/tree/WhileLoopTree.java.i
data/src/share/classes/com/sun/tools/javadoc/PrimitiveType.java.i
data/test/tools/javac/failover/FailOver12.out.i
data/test/tools/javac/generics/GenLit2.java.i
data/test/tools/javac/processing/warnings/gold_sv_warn_0_2.out.i
data/test/tools/javac/miranda/4686148/Test.java.i
-data/test/tools/javac/processing/werror/WErrorLast.out.i
data/src/share/classes/javax/lang/model/element/QualifiedNameable.java.i
data/test/tools/javac/generics/CastCrash.java.i
data/src/share/classes/com/sun/tools/javac/code/Symbol.java.i
data/test/tools/javac/TryWithResources/InterruptedExceptionTest.java.i
data/test/tools/javac/processing/options/testPrintProcessorInfo/TestWithXstdout.java.i
+data/src/share/classes/com/sun/source/tree/ModuleDirectiveTree.java.i
data/test/tools/javac/T6567414.out.i
data/test/tools/javac/api/TestOperators.java.i
-data/test/tools/javac/policy/test2/bytodo.AB.out.i
-data/test/tools/apt/Misc/Marked.java.i
+data/test/tools/javac/ForwardReference/UseBeforeDeclaration.java.i
data/test/tools/javac/diags/examples/MalformedFpLit.java.i
data/test/tools/javac/depOverrides/doccomment/Test1B.out.i
data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C1.java.i
data/test/tools/javac/boxing/Boxing4.java.i
data/test/tools/javac/generics/6910550/T6910550c.java.i
data/test/tools/javadoc/6964914/JavadocWarning.java.i
-data/src/share/classes/com/sun/source/util/SourcePositions.java.i
+data/test/tools/javadoc/completionFailure/pkg/B.java.i
data/test/tools/javac/generics/CatchTyparam.java.i
data/test/tools/javac/processing/environment/round/Part2.java.i
data/test/tools/javac/diags/examples/KindnameStaticInit.java.i
-data/test/com/sun/javadoc/testMemberSummary/pkg2/A.java.i
data/test/tools/javac/literals/UnderscoreLiterals.java.i
-data/test/tools/javac/util/context/T7021650.java.i
+data/src/share/classes/com/sun/tools/classfile/Signature.java.i
data/test/tools/javac/Closure1.java.i
data/test/com/sun/javadoc/testHtmlComments/TestHtmlComments.java.i
-data/test/tools/javac/multicatch/Neg04eff_final.java.i
+data/src/share/classes/javax/lang/model/element/AnnotationValue.java.i
data/test/tools/javac/policy/simple.ABD.out.i
data/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java.i
data/test/tools/javac/generics/inference/6638712/T6638712c.java.i
-data/test/tools/javac/enum/EnumImplicitPrivateConstructor.java.i
+data/test/tools/javac/generics/6476118/T6476118b.out.i
data/test/tools/javac/multicatch/7030606/T7030606.out.i
-data/test/tools/javac/generics/6192945/MethodNeg.out.i
+data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1_Inner2.h.i
data/test/tools/javac/generics/T4695348.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/SerializedFormBuilder.java.i
data/test/tools/javap/T6729471.java.i
@@ -3624,178 +3627,179 @@ data/test/tools/javac/implicitThis/WhichImplicitThis2.java.i
data/test/tools/javac/staticImport/6665223/T6665223.java.i
data/test/tools/javac/AnonStaticMember_2.java.i
data/test/tools/javac/diags/examples/SunApiPlural/SunApiPlural.java.i
-data/make/netbeans/javah/build.xml.i
data/test/tools/javac/NestedFinallyReturn.java.i
-data/test/tools/javac/processing/warnings/gold_unsp_warn.out.i
+data/test/tools/apt/Basics/foo/bar/Quux.java.i
data/test/tools/javac/diags/examples/UnreachableCatch1.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/AnnotationTypeRequiredMemberWriter.java.i
data/test/tools/javac/diags/examples/TypeReqRef.java.i
data/test/tools/javac/danglingDep/DepX.out.i
-data/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java.i
-data/test/tools/javac/FinalInitializer.java.i
+data/test/com/sun/javadoc/constantValues/TestConstantValues2.java.i
+data/test/tools/javac/TryInInstanceInit.java.i
data/test/tools/javac/diags/examples/ProcFileReopening/ProcFileReopening.java.i
data/test/tools/javac/types/GenericTypeWellFormednessTest.java.i
data/test/tools/javac/generics/6182950/T6182950a.out.i
data/test/tools/apt/Basics/MyMarker.java.i
data/test/tools/javac/importChecks/InvalidImportsNoClasses.java.i
-data/test/tools/javac/generics/diamond/neg/Neg04.out.i
+data/test/tools/apt/Compile/compile.sh.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java.i
data/test/tools/javac/varargs/warning/Warn3.java.i
data/test/tools/javac/generics/wildcards/neg/Unbounded.java.i
-data/test/tools/javac/varargs/6806876/T6806876.out.i
-data/test/tools/javac/6402516/CheckClass.java.i
+data/test/tools/javac/processing/6348499/A.java.i
+data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingClass.java.i
data/test/tools/javac/limits/ArrayDims4.java.i
data/test/tools/javac/generics/inference/6650759/T6650759d.java.i
data/test/com/sun/javadoc/testClassTree/pkg/ChildClass.java.i
data/test/tools/javac/cast/6302214/T6302214.java.i
data/test/tools/javac/multicatch/Neg03.out.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test5.out.i
-data/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java.i
-data/test/tools/javac/4980495/std/Test.out.i
+data/test/tools/javac/annotations/6214965/CompilerAnnotationTest2bad.java.i
+data/test/tools/javadoc/generics/genericClass/pkg1/A.java.i
data/test/tools/javac/processing/werror/WError1.out.i
-data/test/tools/javac/processing/model/element/TestTypeParameter.java.i
+data/test/tools/javac/api/T6400207.java.i
data/test/tools/javac/annotations/6365854/test1.out.i
-data/src/share/classes/javax/lang/model/util/ElementScanner8.java.i
+data/test/tools/javac/generics/rawOverride/Fail1.java.i
data/test/tools/javac/6902720/E2.java.i
-data/test/tools/javac/Enum1.java.i
+data/test/com/sun/javadoc/testCmndLineClass/pkg2/C3.java.i
data/test/tools/javac/generics/diamond/neg/Neg08.out.i
data/test/tools/javac/diags/examples/MightBeAssignedInLoop.java.i
data/test/tools/javac/Diagnostics/6722234/T6722234c.out.i
data/make/test/lib/classes.sh.i
data/test/com/sun/javadoc/testIndex/TestIndex.java.i
-data/test/tools/apt/Discovery/PhantomUpdate.java.i
+data/test/tools/javac/generics/7022054/T7022054neg1.java.i
data/test/tools/javac/generics/MissingBridge.java.i
-data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes9.java.i
+data/test/tools/javac/mandatoryWarnings/deprecated/Test3.out.i
data/test/tools/javac/Diagnostics/6722234/T6722234b_1.out.i
-data/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java.i
-data/test/tools/javac/6835430/A.java.i
-data/test/tools/javac/CyclicInheritance2.java.i
-data/test/tools/javac/processing/6348193/T6348193.java.i
-data/test/tools/javac/DefiniteAssignment/UncaughtException.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SeeTaglet.java.i
+data/test/tools/javap/classfile/T6887895.java.i
+data/test/tools/javac/SerialWarn.java.i
+data/test/tools/javac/processing/environment/HelloWorld.java.i
+data/test/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java.i
+data/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java.i
+data/test/tools/javac/processing/6994946/SyntaxErrorTest.out.i
data/src/share/opensource/javac/README-template.html.i
data/test/tools/javac/annotations/default/B.java.i
-data/test/tools/javac/T6554097.out.i
+data/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java.i
data/src/share/classes/com/sun/tools/javadoc/JavadocTodo.java.i
+data/test/tools/javac/generics/6372782/PlainForm.java.i
data/test/tools/javac/staticImport/6695838/a/Foo.java.i
-data/test/tools/javadoc/annotations/annotateParams/expected.out.i
+data/test/tools/javac/6863465/T6863465b.out.i
data/test/tools/javac/EnclosingAccessCheck.java.i
+data/test/tools/apt/Basics/StaticFieldAnnotations.java.i
data/test/tools/javac/generics/rare/6665356/T6665356.out.i
data/test/tools/javac/diags/examples/ResourceMayNotBeAssigned.java.i
data/test/tools/javac/diags/examples/KindnameMethod.java.i
data/test/tools/javac/diags/examples/MissingReturnValue.java.i
data/test/tools/javac/OverrideChecks/T4721069.java.i
-data/test/tools/javac/multicatch/7030606/DisjunctiveTypeWellFormednessTest.java.i
-data/test/tools/javac/miranda/T4528315.java.i
-data/test/com/sun/javadoc/testNoPackagesFile/C.java.i
-data/test/tools/javac/AnonInnerException_1.java.i
-data/test/tools/javac/varargs/warning/Warn4.java.i
+data/test/com/sun/javadoc/testDocFileDir/pkg/doc-files/subdir-excluded2/testfile.txt.i
+data/test/tools/javac/diags/examples/ProcIncompatibleSourceVersion/ProcIncompatibleSourceVersion.java.i
+data/test/tools/javac/protectedInner/pkg1/Base.java.i
+data/test/tools/javac/T6227617.java.i
+data/test/tools/javac/generics/T4711570.java.i
data/test/tools/javac/LocalClasses_2.out.i
data/test/tools/javac/generics/typevars/5060485/Method.java.i
data/test/tools/javac/generics/InterfaceCast1.java.i
-data/test/tools/javac/enum/T5081785c.java.i
data/test/tools/javac/diags/examples/SunProprietary.java.i
data/test/tools/javac/diags/examples/LabelInUse.java.i
data/test/tools/javac/api/lib/ToolTester.java.i
-data/test/tools/javac/api/T6412669.java.i
data/test/tools/javac/generics/typevars/6804733/T6804733.out.i
-data/src/share/classes/sun/tools/javap/RuntimeConstants.java.i
+data/test/tools/javac/generics/wildcards/7034495/T7034495.java.i
data/test/tools/javac/typeAnnotations/failures/StaticMethods.out.i
data/test/tools/javac/generics/bridge1/A.java.i
data/src/share/classes/javax/lang/model/type/MirroredTypesException.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/XMLNode.java.i
+data/test/tools/javac/T6435291/T6435291.java.i
data/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java.i
data/test/tools/javac/OverridePosition.out.i
-data/test/tools/javac/unicode/SupplementaryJavaID3.java.i
data/test/tools/javac/T6351767.java.i
-data/test/tools/javac/api/6440333/T6440333.java.i
+data/test/tools/javac/generics/inference/T6835428.java.i
data/test/tools/javac/depDocComment/DeprecatedDocComment4.out.i
-data/test/tools/javac/T6266772.java.i
+data/test/tools/javac/generics/diamond/7030150/Pos01.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/B.java.i
data/test/tools/javac/generics/6723444/T6723444.out.i
data/test/tools/javac/InstanceInitException_1.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrays/DuplicateAnnotationValue.java.i
-data/test/tools/javac/Diagnostics/6799605/T6799605.out.i
+data/src/share/classes/com/sun/mirror/declaration/Declaration.java.i
data/src/share/classes/com/sun/tools/javac/jvm/Code.java.i
-data/test/tools/javac/processing/6413690/TestMe.java.i
-data/test/com/sun/javadoc/testExternalOverridenMethod/pkg/XReader.java.i
+data/test/tools/javac/generics/forwardSeparateBound/ForwardSeparateBound1.java.i
data/test/tools/javac/newlines/Newlines.sh.i
-data/test/tools/javac/NameClash/One.java.i
-data/test/tools/javac/annotations/neg/Package.java.i
+data/test/tools/javac/depOverrides/annotation/Test1B2.out.i
+data/test/tools/javac/multicatch/Pos08.java.i
data/test/tools/javac/generics/T4711572.java.i
-data/src/share/classes/com/sun/tools/javac/code/Flags.java.i
+data/test/tools/javac/processing/6994946/SemanticErrorTest.java.i
data/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties.i
data/test/tools/javac/TryWithResources/UnusedResourcesTest.java.i
data/test/tools/javac/generics/6729401/T6729401.java.i
-data/test/tools/javac/generics/T4661029.java.i
-data/test/tools/javac/generics/T6557954.java.i
-data/make/build.xml.i
+data/test/tools/javac/generics/diamond/pos/Pos01.java.i
+data/src/share/classes/com/sun/tools/javap/resources/javap.properties.i
+data/test/tools/javac/T6794959.java.i
+data/test/tools/javac/6979683/TestCast6979683_BAD37.java.i
data/test/tools/javac/ClassCycle/ClassCycle2a.java.i
data/test/tools/javac/T6625520.java.i
-data/test/tools/javap/T4876942.java.i
+data/test/tools/javac/modules/RequiresModuleTest01.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Group.java.i
data/test/com/sun/javadoc/testWarnBadParamNames/C.java.i
data/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java.i
data/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java.i
data/src/share/classes/javax/lang/model/util/AbstractElementVisitor8.java.i
-data/test/tools/javac/6464451/DeepNestedFinally.java.i
+data/test/tools/javac/diags/examples/UncheckedGenericArrayCreation.java.i
data/test/tools/javac/6558548/T6558548_latest.out.i
-data/test/tools/javac/5005368.java.i
+data/test/tools/javac/diags/examples/VerboseResolveMulti1.java.i
data/test/com/sun/javadoc/testCmndLineClass/C5.java.i
data/test/tools/javac/unicode/SupplementaryJavaID2.java.i
data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C1.java.i
data/test/tools/javac/generics/inference/4941882/T4941882.java.i
data/test/tools/javac/ThrowsIntersection_4.java.i
-data/test/tools/javac/types/PrimitiveConversionTest.java.i
-data/test/tools/javac/javazip/A.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java.i
-data/test/tools/javac/processing/model/element/TestResourceVariable.java.i
+data/test/tools/javadoc/FlagsTooEarly.java.i
+data/test/tools/javac/typeAnnotations/6967002/T6967002.out.i
+data/test/tools/javac/typeAnnotations/newlocations/Throws.java.i
+data/test/tools/javadoc/annotations/annotatePackage/Main.java.i
data/src/share/opensource/javac/doc/javac_lifecycle/contents.html.i
data/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.out.i
data/test/tools/javac/diags/examples/EnclClassRequired.java.i
+data/test/tools/javac/annotations/default/Derr.java.i
+data/test/tools/javac/danglingDep/NoDepX.out.i
data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C2.java.i
-data/test/tools/javac/generics/inference/7086601/T7086601a.out.i
+data/test/tools/javac/generics/6677785/T6677785.out.i
data/test/tools/javac/warnings/Serial.java.i
-data/test/tools/javac/T6972327.java.i
+data/test/tools/javac/SuperclassConstructorException.java.i
data/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.out.i
-data/src/share/classes/com/sun/javadoc/ExecutableMemberDoc.java.i
+data/test/tools/javadoc/annotations/annotateParams/pkg1/C.java.i
data/test/tools/javac/typeAnnotations/TypeUseTarget.java.i
+data/src/share/classes/com/sun/tools/javac/parser/Token.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/MethodBuilder.java.i
data/test/tools/javac/generics/diamond/neg/Neg03.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties.i
data/test/tools/javac/OverrideChecks/InconsistentReturn.java.i
-data/test/tools/javac/annotations/6365854/T6365854.java.i
+data/test/tools/javac/api/evalexpr/CompileFromString.java.i
data/test/tools/javac/diags/examples/CantResolveLocation.java.i
-data/test/tools/javac/ConstantValues/test_ff2.java.i
+data/test/tools/javac/typeAnnotations/newlocations/BasicTest.out.i
data/test/tools/javac/literals/BadBinaryLiterals.6.out.i
-data/test/tools/javadoc/sourceOption/SourceOption.java.i
data/test/tools/javac/DefiniteAssignment/DUSwitch.java.i
-data/test/tools/javac/enum/AbstractEmptyEnum.java.i
+data/test/tools/javac/generics/Casting3.java.i
data/test/tools/javah/SubClassConsts.java.i
data/test/tools/javac/SuperMethodResolve.java.i
-data/test/tools/javac/depOverrides/annotation/Q.java.i
+data/test/tools/javah/6572945/gold/jni.file.3.i
data/test/tools/javac/OverrideChecks/InterfaceOverride.java.i
data/test/tools/javac/generics/inference/6995200/T6995200.java.i
data/test/tools/javac/generics/inference/6369605/T6369605a.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java.i
+data/test/tools/javac/annotations/pos/Parameter.java.i
data/test/tools/javac/tree/TestAnnotatedAnonClass.java.i
data/test/com/sun/javadoc/testClassCrossReferences/package-list.i
-data/test/tools/javac/T5048776.java.i
+data/test/com/sun/javadoc/testSimpleTag/C.java.i
data/test/tools/javac/diags/examples/EnumNoSubclassing.java.i
data/make/netbeans/common/standard-context-menu-items.ent.i
data/test/tools/javac/varargs/6313164/p1/A.java.i
-data/test/com/sun/javadoc/MetaTag/MetaTag.java.i
-data/test/tools/javac/cast/7005671/T7005671.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/Taglet.java.i
+data/test/tools/javac/typeAnnotations/failures/common/newarray/InvalidLocation.java.i
+data/test/tools/javac/generics/6413682/TestPos.java.i
+data/test/tools/javac/T5003235/T5003235b.out.i
data/src/share/classes/com/sun/tools/classfile/ModuleData_attribute.java.i
-data/test/tools/javac/processing/6994946/SemanticErrorTest.2.out.i
data/test/tools/javac/enum/Enum1.java.i
data/test/tools/javac/generics/rare/Rare10.java.i
-data/src/share/classes/com/sun/tools/javac/parser/Token.java.i
+data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestError.java.i
data/test/tools/javac/processing/messager/MessagerBasics.java.i
data/test/tools/javac/diags/examples/AbstractCantBeInstantiated.java.i
-data/src/share/classes/com/sun/tools/javac/util/Messages.java.i
-data/src/share/classes/javax/lang/model/type/package-info.java.i
+data/test/tools/javac/generics/rawSeparate/RetroLexer.java.i
+data/test/com/sun/javadoc/testSubTitle/pkg/C.java.i
data/test/com/sun/javadoc/testTagInheritence/pkg/TestSuperSuperInterface.java.i
-data/test/tools/javac/T6881645.java.i
+data/test/tools/javac/api/T6395981.java.i
data/test/com/sun/javadoc/testLegacyTaglet/ToDoTaglet.java.i
data/test/tools/javah/T5070898.java.i
data/test/tools/javac/missingSuperRecovery/MissingSuperRecovery.java.i
@@ -3811,9 +3815,9 @@ data/src/share/classes/com/sun/source/tree/ModifiersTree.java.i
data/test/tools/javac/AnonStaticMember_1.java.i
data/test/com/sun/javadoc/testNotifications/TestNotifications.java.i
data/test/tools/javac/InnerNamedConstant_2.sh.i
-data/test/tools/javac/api/T6400207.java.i
-data/test/tools/javac/7129225/NegTest.ref.i
-data/test/tools/javac/diags/examples/MulticatchTypesMustBeDisjoint.java.i
+data/test/tools/javac/processing/model/element/TestTypeParameter.java.i
+data/test/tools/javac/diags/examples/ModifierNotAllowed.java.i
+data/test/tools/javac/processing/6348193/T6348193.java.i
data/test/tools/javac/HiddenAbstractMethod/Test.i
data/test/com/sun/javadoc/testSuperclassInSerialForm/pkg/SubClass.java.i
data/test/tools/javac/generics/inference/6638712/T6638712a.java.i
@@ -3822,31 +3826,31 @@ data/src/share/classes/com/sun/tools/javadoc/Main.java.i
data/test/tools/javac/InnerClassesAttribute/Test.java.i
data/test/tools/javac/Closure5.java.i
data/test/tools/javadoc/annotations/badVals/Main.java.i
-data/test/tools/javac/modules/ModuleAttributeTest01.java.i
+data/test/tools/javac/generics/typevars/6804733/T6804733.java.i
+data/test/tools/javac/capture/Capture5.java.i
data/test/tools/javac/generics/inference/6650759/T6650759g.java.i
-data/test/com/sun/javadoc/testThrowsTag/pkg/T5.java.i
-data/test/tools/javac/SuperclassConstructorException.java.i
+data/test/tools/javac/api/T6358786.java.i
+data/test/tools/javac/T6972327.java.i
data/test/tools/javac/generics/typevars/T6880344.java.i
data/test/tools/javac/generics/7020657/T7020657pos.java.i
-data/test/com/sun/javadoc/testSubTitle/pkg/C.java.i
+data/test/tools/javac/typeAnnotations/failures/common/arrays/MissingAnnotationValue.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/SingleIndexWriter.java.i
data/test/tools/javac/diags/examples/ErrorReadingFile.java.i
data/test/tools/javac/QualifiedNewScope.java.i
+data/src/share/classes/com/sun/tools/javac/comp/Annotate.java.i
data/test/tools/javac/enum/EnumProtectedConstructor.java.i
data/test/tools/javap/classfile/deps/T6907575.java.i
-data/test/tools/javac/T6406771.java.i
data/test/tools/javac/diags/examples/NotDefAccessClassIntfCantAccess/NotDefAccessClassIntfCantAccess.java.i
data/test/tools/javac/policy/simple.ACD.out.i
data/test/tools/javac/generics/6372782/PlanarVectorVariable.java.i
-data/test/tools/javac/typeAnnotations/failures/Scopes.java.i
+data/test/tools/javac/TryWithResources/BadTwr.out.i
data/test/tools/javac/typeAnnotations/failures/common/newarray/MissingAnnotationValue.out.i
data/test/tools/javac/meth/TestCP.java.i
data/test/tools/javac/api/6452876/T6452876.java.i
data/test/tools/javac/diags/examples/NameClashSameErasureNoOverride1.java.i
data/test/tools/javac/DefiniteAssignment/DUParam1.java.i
-data/src/share/classes/com/sun/tools/javac/util/Log.java.i
+data/test/tools/javac/AnonymousProtect/AnonymousProtect.java.i
data/test/tools/javac/synthesize/Main.java.i
-data/test/com/sun/javadoc/testDocErrorReporter/TestDocErrorReporter.java.i
data/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java.i
data/test/tools/javac/6547131/p/Outer$I.class.i
data/test/tools/javac/BadCovar.java.i
@@ -3854,41 +3858,45 @@ data/test/tools/javac/typeAnnotations/failures/common/typeparams/DuplicateTypeAn
data/test/tools/javac/typeAnnotations/newlocations/Expressions.java.i
data/test/tools/javac/scope/6225935/T6214959.java.i
data/test/tools/javac/T6558476.java.i
-data/test/tools/javac/annotations/neg/ArrayLit.java.i
+data/test/tools/javac/lambda/LambdaParserTest.java.i
data/test/tools/javac/generics/7034019/T7034019a.java.i
-data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out.i
+data/test/tools/javac/generics/6956758/T6956758pos.java.i
+data/test/tools/javac/processing/model/6341534/dir/package-info.java.i
data/test/tools/javac/DefiniteAssignment/ConstantInfiniteWhile.java.i
data/test/tools/javac/generics/classreader/HArrayMethod.java.i
+data/test/tools/javac/diags/examples/DotClassExpected.java.i
data/src/share/classes/javax/lang/model/type/UnionType.java.i
data/test/tools/javac/enum/ExplicitlyFinalEnum2.java.i
-data/test/tools/javac/InnerMemberRegression.java.i
+data/test/com/sun/javadoc/testBackSlashInLink/TestBackSlashInLink.java.i
data/test/tools/javac/depDocComment/SuppressDeprecation.out.i
-data/test/tools/javac/diags/examples/AnonClassImplInterfaceNoArgs.java.i
-data/test/tools/javac/T6394563.warn.out.i
-data/test/tools/javac/T6942649.java.i
+data/test/tools/javac/modules/ProvidesModuleTest01.java.i
+data/test/tools/javac/multicatch/Neg02.out.i
+data/test/tools/javac/UncaughtOverflow.java.i
data/test/tools/javac/depOverrides/annotation/Test3.out.i
data/test/tools/javac/T6358168.java.i
data/test/tools/javac/diags/examples/AnnotationsNotSupported.java.i
-data/src/share/classes/com/sun/tools/javac/jvm/Target.java.i
+data/test/com/sun/javadoc/testModifier/ModifierAbstract.java.i
+data/test/tools/javac/failover/FailOver08.java.i
+data/test/tools/javac/Paths/6638501/test/SayHello.java.i
data/src/share/classes/com/sun/tools/javadoc/JavadocMemberEnter.java.i
data/src/share/classes/com/sun/source/tree/TypeParameterTree.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeArgs/MissingAnnotationValue.out.i
data/test/com/sun/javadoc/testNoPackagesFile/TestNoPackagesFile.java.i
+data/test/tools/javap/classfile/deps/T6907575.out.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java.i
+data/src/share/classes/com/sun/source/tree/NewArrayTree.java.i
data/test/com/sun/javadoc/testTopOption/TestTopOption.java.i
data/test/tools/javac/tree/T6993305.java.i
data/test/tools/javac/cast/6302956/T6302956.java.i
-data/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java.i
data/test/tools/javac/javazip/good/B.java.i
data/test/com/sun/javadoc/testLinkOption/pkg2/C2.java.i
-data/test/tools/javadoc/dupOk/DupOk.java.i
+data/test/tools/javac/ConditionalWithVoid.java.i
data/test/tools/javac/diags/examples/IncomparableTypes.java.i
data/test/tools/apt/Compile/StaticApf.java.i
data/test/tools/javac/generics/wildcards/6886247/T6886247_1.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java.i
data/test/tools/javac/diags/examples/ClassPublicInFile.java.i
-data/src/share/classes/javax/tools/JavaFileObject.java.i
+data/test/tools/javac/T6231246/T6231246.java.i
data/test/tools/javac/varargs/6993978/T6993978neg.java.i
data/test/tools/javac/OverrideChecks/T4720356a.java.i
data/test/tools/javac/varargs/7097436/T7097436.out.i
@@ -3902,23 +3910,24 @@ data/test/tools/javac/diags/examples/ImportRequiresCanonical/p/ExtendsBase.java.
data/test/tools/javac/generics/6531090/T6531090b.java.i
data/test/com/sun/javadoc/testLinkTaglet/checkPkg/B.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDoclet.java.i
-data/src/share/classes/com/sun/tools/javac/comp/ConstFold.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ReturnTaglet.java.i
data/test/tools/javac/conditional/6500343/T6500343a.java.i
data/test/tools/javac/nio/compileTest/CompileTest.java.i
data/test/tools/javac/generics/wildcards/neg/CastWarn7.java.i
-data/src/share/classes/com/sun/mirror/type/VoidType.java.i
-data/test/tools/javac/policy/test2/Test.java.i
+data/src/share/classes/com/sun/tools/javac/util/Log.java.i
+data/test/tools/javac/diags/examples/GenericThrowable.java.i
data/test/tools/javac/generics/6182950/T6182950a.java.i
+data/test/tools/javac/generics/6495506/A.java.i
data/test/tools/javac/abstract/U1.java.i
data/test/tools/javac/T5003235/T5003235a.java.i
-data/src/share/classes/javax/lang/model/element/Parameterizable.java.i
+data/test/tools/javac/generics/typevars/6199146/T6199146.java.i
data/test/tools/javac/multicatch/Neg07.java.i
-data/test/tools/javac/diags/examples/StringSwitchNotSupported.java.i
+data/test/tools/apt/Compile/WrappedStaticApf.java.i
data/test/tools/javac/util/T6597678.java.i
-data/test/tools/javac/InterfaceOverrideObject.java.i
+data/test/tools/javac/EmptyBreak.java.i
data/test/tools/javac/varargs/warning/Warn1.java.i
-data/src/share/classes/javax/tools/StandardJavaFileManager.java.i
-data/test/tools/javac/diags/examples/UncheckedFilenameAdditional.java.i
+data/test/tools/javac/generics/classreader/HMethod.java.i
+data/test/tools/javac/NestedInnerClassNames.out.i
data/test/tools/javac/diags/examples/NameClashSameErasureNoHide.java.i
data/test/tools/javac/api/6422327/T6422327.other.i
data/test/tools/javac/T6554097.java.i
@@ -3941,7 +3950,7 @@ data/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java.i
data/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java.i
data/test/tools/javac/diags/examples/IllegalInitializer.java.i
data/test/tools/javac/generics/diamond/T6939780.out.i
-data/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java.i
+data/test/tools/javac/typeAnnotations/failures/common/newarray/DuplicateAnnotationValue.out.i
data/test/tools/javac/VersionOpt.java.i
data/test/com/sun/javadoc/DocRootSlash/p1/package.html.i
data/test/tools/javac/diags/examples/UndefinedLabel.java.i
@@ -3949,38 +3958,39 @@ data/test/tools/javac/generics/inference/5070671/T5070671.java.i
data/src/share/classes/com/sun/source/tree/AnnotationTree.java.i
data/test/tools/javac/generics/6531090/T6531090a.java.i
data/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java.i
-data/src/share/classes/javax/tools/ModuleFileManager.java.i
+data/test/tools/javac/diags/examples/HasBeenDeprecated.java.i
data/test/tools/javac/cast/4916620/T4916620.java.i
data/src/share/classes/sun/tools/javap/LocVarData.java.i
data/test/req.flg.i
data/test/tools/javac/generics/inference/6718364/T6718364.out.i
-data/test/tools/javac/generics/6910550/T6910550e.out.i
+data/test/tools/javac/6996626/Main.java.i
data/test/tools/javac/diags/examples/ProcIllegalFileName/processors/AnnoProc.java.i
-data/test/tools/javac/generics/compat/OverrideBridge3.java.i
+data/test/tools/javac/diags/examples/MulticatchCantBeAssigned.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/StringContent.java.i
data/test/tools/javac/generics/typevars/5060485/Neg2.java.i
-data/test/com/sun/javadoc/testDocRootLink/pkg2/package.html.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MetaKeywords.java.i
data/make/README.i
data/test/tools/javadoc/6964914/JavacWarning.java.i
data/test/tools/javac/6668794/badClass/Test.java.i
data/test/tools/javac/foreach/IntersectIterator.java.i
-data/src/share/classes/sun/tools/javap/CPX2.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java.i
+data/test/tools/javac/depOverrides/doccomment/Test2Q.out.i
+data/test/tools/javac/diags/examples/InferVarargsArgumentMismatch.java.i
data/test/tools/javac/modules/ModuleAnnotsTest01.java.i
-data/src/share/classes/com/sun/source/util/TaskListener.java.i
-data/test/tools/javac/generics/6372782/PlainForm.java.i
+data/test/tools/javac/T6458823/MyProcessor.java.i
+data/test/com/sun/javadoc/testBadPackageFileInJar/badPackageFileInJar.jar.i
data/test/com/sun/javadoc/testUnnamedPackage/BadSource.java.i
data/test/com/sun/javadoc/testUnnamedPackage/C.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractPackageIndexWriter.java.i
+data/test/tools/javac/T6595666.java.i
data/test/tools/javac/T7093325.java.i
data/test/tools/javac/diags/examples/ErrProcMessager/processors/AnnoProc.java.i
data/test/tools/javac/synthesize/Double.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java.i
-data/test/tools/javac/diags/examples/IntfMethodCantHaveBody.java.i
+data/test/tools/javap/6937244/T6937244A.java.i
+data/test/tools/javac/typeAnnotations/failures/common/typeArgs/DuplicateTypeAnnotation.out.i
data/test/tools/javac/warnings/DivZero.lint.out.i
data/src/share/classes/com/sun/tools/javac/util/PropagatedException.java.i
data/src/share/classes/com/sun/tools/javah/resources/win32_x86.properties.i
data/src/share/classes/com/sun/tools/javac/util/Constants.java.i
+data/test/tools/javac/literals/T6891079.out.i
data/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java.i
data/test/tools/javac/6979683/TestCast6979683_BAD38.java.i
data/test/tools/javac/T6341023.java.i
@@ -3989,27 +3999,26 @@ data/test/tools/javah/T6994608.java.i
data/test/tools/javac/QualifiedAccess/pack1/P2.java.i
data/test/tools/javac/T6238612.java.i
data/test/tools/javac/4917091/Test256a.out.i
-data/test/tools/javac/generics/ArrayClone.java.i
+data/test/tools/javadoc/InlineTagsWithBraces.java.i
data/src/share/classes/com/sun/tools/javadoc/MethodDocImpl.java.i
data/test/tools/javac/scope/6225935/a/Named.java.i
data/test/tools/javac/Paths/Class-Path.sh.i
data/test/tools/javac/resolve/tests/ReferenceOverload.java.i
data/test/tools/javac/processing/errors/TestSuppression.java.i
data/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java.i
-data/test/tools/javac/diags/examples/UnsupportedExoticID.java.i
+data/src/share/opensource/javac/doc/javac_lifecycle/ToDo.html.i
data/test/tools/javac/diags/examples/ProcFileCreateLastRound/ProcFileCreateLastRound.java.i
-data/test/tools/javac/generics/bridge1/C.java.i
-data/test/tools/javac/literals/BadUnderscoreLiterals.6.out.i
+data/test/tools/javac/ExceptionalFinally2.java.i
+data/test/tools/javac/nativeHeaders/javahComparison/CompareTest.java.i
data/test/tools/javac/generics/6372782/Vector.java.i
data/test/tools/javac/options/T7022337.java.i
-data/test/com/sun/javadoc/VersionNumber/p1/C.java.i
-data/test/tools/javac/T6900149.java.i
+data/test/tools/javac/varargs/7043922/T7043922.java.i
data/test/tools/javac/diags/examples/UnmatchedProcessorOptions/processors/AnnoProc.java.i
data/test/tools/javah/T7126832/T7126832.java.i
data/test/tools/apt/Scanners/MemberOrderApf.java.i
data/src/share/classes/com/sun/tools/doclets/Taglet.java.i
data/test/tools/javap/T6622232.java.i
-data/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java.i
+data/test/tools/javac/InnerMemberRegression.java.i
data/test/tools/javac/generics/wildcards/AssignmentDifferentTypes3.java.i
data/test/tools/javac/generics/inference/6650759/T6650759c.java.i
data/test/tools/javac/processing/warnings/HelloWorld.java.i
@@ -4018,83 +4027,84 @@ data/test/tools/javac/diags/examples/NoArgs.java.i
data/test/tools/javac/synthesize/Float.java.i
data/src/share/classes/com/sun/tools/javadoc/ThrowsTagImpl.java.i
data/test/com/sun/javadoc/testLinkTaglet/checkPkg/A.java.i
-data/test/tools/javac/typeAnnotations/newlocations/Parameters.java.i
data/test/tools/javac/6734819/T6734819c.java.i
data/test/tools/javac/OverrideChecks/6400189/T6400189d.java.i
-data/test/tools/javac/diags/examples/PkgClashWithClass/p/q.java.i
-data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedFilename1.java.i
+data/test/tools/javac/AnonInnerException_1.java.i
+data/test/com/sun/javadoc/testHiddenMembers/pkg/BaseClass.java.i
data/src/share/classes/javax/lang/model/element/VariableElement.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail1.java.i
-data/test/tools/javac/Diagnostics/6722234/T6722234b.java.i
+data/test/tools/javap/T6715753.java.i
data/test/tools/javac/scope/HashCollisionTest.java.i
data/test/tools/javac/6717241/T6717241b.out.i
data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/DuplicateTypeAnnotation.java.i
-data/test/tools/javac/Diagnostics/6860795/T6860795.out.i
+data/test/tools/javac/multicatch/Neg02.java.i
data/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java.i
data/test/tools/javac/multicatch/Neg05.out.i
data/test/tools/javac/synthesize/Long.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocument.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/builders/LayoutParser.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_10.java.i
+data/test/tools/javac/warnings/Deprecation.java.i
data/test/tools/javac/cast/6270087/T6270087neg.java.i
data/test/tools/javac/generics/diamond/neg/Neg12.out.i
data/test/tools/javac/scope/6225935/a/Private.java.i
data/src/share/classes/com/sun/tools/javac/util/Position.java.i
+data/test/tools/javac/6857948/T6857948.java.i
data/test/tools/javac/diags/examples/UnsupportedUnderscoreLiteral.java.i
-data/test/tools/javac/diags/examples/NameClashSameErasureNoOverride.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/TagletOutput.java.i
+data/src/share/classes/com/sun/tools/javac/main/CommandLine.java.i
+data/test/tools/javac/T6224167.out.i
data/test/tools/javac/processing/warnings/gold_sv_none.out.i
data/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.out.i
data/test/tools/javac/Verify.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/PackageIndexWriter.java.i
+data/test/tools/javac/positions/T6402077.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/HelpWriter.java.i
data/test/tools/javac/ProtectedInnerClass/p2/ProtectedInnerClass2.java.i
data/src/share/classes/javax/lang/model/type/UnknownTypeException.java.i
data/test/com/sun/javadoc/testCmndLineClass/pkg1/package.html.i
data/test/tools/javac/generics/6245699/T6245699b.java.i
-data/test/tools/javac/lambda/MethodReferenceParserTest.java.i
+data/test/tools/javac/diags/examples/FloatNumberTooSmall.java.i
data/test/tools/javac/generics/typevars/6680106/T6680106.java.i
-data/src/share/classes/com/sun/source/tree/ModuleDirectiveTree.java.i
-data/test/tools/javac/depDocComment/SuppressDeprecation.java.i
-data/test/tools/javac/T6705935.java.i
+data/test/tools/javac/diags/examples/DiamondNonGeneric.java.i
+data/test/tools/javah/4942232/Test.java.i
+data/test/tools/javac/diags/examples/AnonymousClass.java.i
data/test/com/sun/javadoc/testTagInheritence/pkg/TestTagInheritence.java.i
-data/test/tools/javac/diags/examples/TryWithoutCatchOrFinallyOrResource.java.i
+data/test/tools/javac/types/CastTest.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties.i
data/test/tools/javac/processing/model/util/filter/Foo1.java.i
-data/test/tools/javac/DefiniteAssignment/T4721062a.java.i
+data/test/tools/javac/generics/wildcards/T5097548b.java.i
data/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java.i
data/test/tools/javac/accessVirtualInner/b/B.java.i
data/test/tools/javap/stackmap/T6271292.sh.i
data/test/tools/javac/4846262/Test.sh.i
+data/test/tools/javac/cast/6548436/T6548436d.java.i
data/test/tools/javac/diags/examples/IntfAnnotationCantHaveTypeParams.java.i
-data/test/tools/javadoc/generics/genericClass/Main.java.i
-data/test/tools/javac/diags/examples/VarargsAndOldArraySyntax.java.i
+data/test/tools/javap/typeAnnotations/Presence.java.i
data/test/tools/javac/generics/diamond/7030150/Neg01.java.i
+data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java.i
data/test/tools/javac/types/CastObjectToPrimitiveTest.out.i
-data/src/share/classes/com/sun/mirror/type/AnnotationType.java.i
-data/src/share/classes/com/sun/tools/javadoc/AnnotationValueImpl.java.i
-data/test/tools/javac/failover/FailOver08.java.i
-data/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java.i
+data/test/tools/javac/generics/inference/6638712/T6638712b.out.i
+data/test/tools/javac/7142086/T7142086.java.i
+data/test/tools/javac/generics/inference/6943278/T6943278.java.i
+data/test/tools/javac/generics/inference/7086586/T7086586.out.i
data/test/tools/javac/varargs/6993978/T6993978neg.out.i
-data/test/tools/javac/generics/diamond/7057297/T7057297.out.i
+data/test/tools/javac/processing/model/type/TestTypeKind.java.i
data/test/tools/javadoc/nestedClass/NestedClassB.java.i
data/test/tools/javac/typeAnnotations/failures/StaticFields.java.i
data/test/tools/javac/processing/6634138/T6634138.java.i
data/test/tools/javac/T4093617/T4093617.out.i
data/test/tools/javac/enum/6384542/T6384542.java.i
data/test/tools/javac/diags/examples/EnumsMustBeStatic.java.i
-data/test/tools/javac/treepostests/TreePosTest.java.i
+data/test/tools/apt/Compile/WarnAPF.java.i
data/src/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor7.java.i
-data/test/tools/javac/scope/6225935/Bar.java.i
-data/test/tools/apt/mirror/declaration/ClassDecl.java.i
-data/test/tools/javac/api/6733837/T6733837.java.i
+data/test/tools/javadoc/enum/docComments/Main.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java.i
+data/test/tools/javac/api/6437999/Utf8.java.i
data/make/Makefile-classic.i
data/test/tools/apt/Misc/Misc.java.i
data/src/share/classes/com/sun/tools/javap/StackMapWriter.java.i
data/test/tools/javac/cast/6586091/T6586091.java.i
-data/test/tools/javac/generics/wildcards/neg/CastFail9.java.i
+data/test/tools/javac/diags/examples/MalformedSupported/MalformedSupported.java.i
data/test/tools/javac/ForwardReference/T6676362a.java.i
-data/test/tools/javac/BadOptimization/DeadCode1.java.i
+data/test/tools/javac/processing/6365040/T6365040.java.i
data/test/tools/javac/OverrideChecks/InterfaceImplements.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_8.java.i
data/test/tools/javac/diags/examples/TrustMeOnReifiableVarargsParam.java.i
@@ -4106,66 +4116,72 @@ data/test/tools/javac/PrivateUplevelConstant.java.i
data/test/tools/javac/parser/StringFoldingTest.java.i
data/test/tools/javac/LocalClasses_1.java.i
data/test/tools/javac/diags/examples/IncompatibleUpperBounds.java.i
-data/test/tools/javac/FinalInitializer_2.java.i
+data/test/tools/javac/typeAnnotations/failures/common/arrayclass/InvalidLocation.java.i
data/test/tools/javac/annotations/pos/Z4.java.i
-data/src/share/classes/sun/tools/javap/JavapPrinter.java.i
+data/test/tools/javac/expression/NullAppend2.java.i
data/test/tools/javadoc/generics/throwsGeneric/pkg1/A.java.i
+data/test/tools/javac/generics/inference/4954546/T4954546.java.i
data/test/tools/javac/TryWithResources/ExplicitFinal.java.i
data/test/tools/javac/6668794/badSource/Test.java.i
-data/test/tools/javac/tree/AbstractTreeScannerTest.java.i
+data/src/share/classes/com/sun/javadoc/AnnotationTypeElementDoc.java.i
data/src/share/classes/javax/tools/Diagnostic.java.i
data/test/tools/javac/ConstantValues/ConstValInlining.java.i
data/test/tools/javap/typeAnnotations/ArrayClassLiterals.java.i
-data/test/tools/javac/diags/examples/WarnForwardRef.java.i
-data/test/tools/javac/cast/6548436/T6548436d.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.out.i
+data/test/tools/javac/diags/examples/NoJavaLang.java.i
data/test/tools/javac/generics/6372782/Scalar.java.i
-data/test/tools/javac/cast/7123100/T7123100a.out.i
data/test/tools/javap/6937244/T6937244.java.i
-data/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java.i
+data/test/tools/javac/typeAnnotations/failures/common/parambounds/MissingAnnotationValue.out.i
+data/test/tools/javac/api/6422327/T6422327.java.i
data/test/tools/javac/typeAnnotations/failures/common/parambounds/DuplicateAnnotationValue.java.i
+data/src/share/classes/com/sun/tools/javah/JNI.java.i
data/test/tools/javac/T5003235/T5003235c.java.i
+data/test/com/sun/javadoc/testSummaryHeading/TestSummaryHeading.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/HtmlSerialMethodWriter.java.i
data/test/tools/javac/annotations/neg/Z14.java.i
-data/test/tools/javac/assert/Position.java.i
+data/test/tools/javac/AccessMethods/UplevelPrivateConstants.java.i
+data/test/tools/javac/generics/T4738171.java.i
data/test/com/sun/javadoc/testModifier/Interface.java.i
-data/test/tools/javac/generics/GenericAnonCtor.java.i
+data/make/netbeans/javah/build.xml.i
data/test/tools/javac/EmptySwitch.java.i
-data/test/tools/javadoc/annotations/defaults/pkg1/A.java.i
+data/test/tools/javac/NestedInnerClassNames.java.i
data/test/tools/javac/implicitThis/WhichImplicitThis5.java.i
-data/test/tools/javac/CyclicInheritance.sh.i
+data/test/tools/javac/processing/6350124/Marker.java.i
data/src/share/classes/com/sun/tools/javadoc/TypeMaker.java.i
data/test/tools/javac/depDocComment/DeprecatedDocComment2.java.i
data/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java.i
data/test/tools/javac/generics/6985719/T6985719a.out.i
-data/test/tools/javac/annotations/pos/package-info.java.i
+data/test/tools/javac/api/T6430241.java.i
data/test/tools/javac/DefiniteAssignment/T4717164.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_16.java.i
-data/test/tools/javac/fatalErrors/NoJavaLang.out.i
-data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java.i
+data/test/tools/javac/annotations/neg/Cycle2.java.i
+data/test/tools/javac/generics/wildcards/neg/CastFail2.java.i
+data/test/tools/javac/protectedInner/mypackage/Superclass.java.i
data/test/tools/javac/mandatoryWarnings/deprecated/Test4.out.i
-data/test/tools/javac/typeAnnotations/failures/common/receiver/MissingAnnotationValue.java.i
+data/test/tools/javac/generics/inference/6650759/T6650759e.java.i
data/test/tools/javac/generics/wildcards/neg/CastWarn9.java.i
data/test/tools/apt/Compile/goldenFactory.txt.i
data/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor8.java.i
data/test/tools/javac/resolve/tests/ReferenceOverVarargs.java.i
-data/test/tools/javac/failover/FailOver10.java.i
data/test/tools/javac/api/6468404/T6468404.java.i
-data/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java.i
+data/src/share/classes/javax/tools/JavaFileObject.java.i
data/test/tools/javac/OverrideChecks/ThrowsConflict.java.i
+data/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java.i
+data/src/share/opensource/javac/build.xml.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/SimpleTaglet.java.i
data/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java.i
data/src/share/classes/com/sun/mirror/type/ReferenceType.java.i
data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethods.java.i
-data/test/tools/javac/generics/6946618/T6946618b.out.i
-data/test/tools/javac/AccessMethods/UplevelPrivateConstants.java.i
+data/test/tools/javac/depDocComment/DeprecatedDocComment.out.i
+data/test/tools/javac/T6654037.java.i
data/test/tools/javac/tree/TreePosTest.java.i
data/test/tools/javap/4111861/A.java.i
data/test/tools/javac/processing/model/element/TestMissingElement2/TestMissingGenericInterface2.java.i
data/test/tools/javac/diags/examples/ConstantSVUID.java.i
data/test/tools/apt/Basics/FreshnessApf.java.i
data/test/tools/javadoc/generics/wildcards/pkg1/A.java.i
+data/test/tools/javac/generics/7151802/T7151802.out.i
data/test/tools/javac/7086595/T7086595.out.i
-data/test/tools/javac/overrridecrash/A.java.i
+data/test/com/sun/javadoc/testSubTitle/pkg/package.html.i
data/test/tools/javac/diags/examples/ProcSuspiciousClassName/ProcSuspiciousClassName.java.i
data/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java.i
data/test/tools/javac/generics/6372782/AdditionDefined.java.i
@@ -4173,18 +4189,16 @@ data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignConstantBoole
data/test/tools/javap/T6980017.java.i
data/test/tools/javac/generics/wildcards/pos/UncheckedCast1.java.i
data/test/tools/javac/generics/rare/6665356/T6665356.java.i
-data/test/com/sun/javadoc/testHiddenMembers/pkg/SubClass.java.i
+data/test/tools/javac/enum/T5081785c.java.i
data/test/tools/javac/tree/T6923080.java.i
data/test/tools/javac/ShiftExpressionTest.java.i
data/test/tools/javap/TestSuperclass.java.i
data/test/tools/javac/diags/examples/Note.java.i
data/test/tools/javac/generics/inference/5044646/T5044646.java.i
-data/test/tools/javac/unicode/NonasciiDigit.java.i
-data/test/tools/javac/T6214885a.out.i
-data/test/tools/javac/api/ToolProvider/ToolProviderTest2.java.i
-data/test/tools/javac/processing/model/6341534/dir/package-info.java.i
+data/test/tools/javadoc/lib/Tester.java.i
+data/test/tools/javac/varargs/5088429/T5088429Neg02.java.i
data/test/tools/javac/processing/model/6194785/T6194785.java.i
-data/test/tools/javac/annotations/pos/ClassA.java.i
+data/test/tools/javac/6521805/p/Outer.java.i
data/test/tools/javac/BadOptimization/DeadCode2.java.i
data/test/tools/javac/generics/6332204/T6346876.java.i
data/test/tools/javac/api/TestTreePath.java.i
@@ -4195,53 +4209,52 @@ data/test/tools/javac/diags/examples/SuperNotAllowedInEnum.java.i
data/src/share/classes/sun/tools/javap/StackMapData.java.i
data/test/tools/javadoc/generics/genericInterface/expected.out.i
data/test/tools/javadoc/annotations/annotatePackage/expected.out.i
-data/test/tools/javac/6402516/CheckLocalElements.java.i
-data/test/tools/javac/diags/examples/DiamondRedundantArgs.java.i
-data/src/share/classes/com/sun/source/tree/MemberReferenceTree.java.i
-data/test/com/sun/javadoc/constantValues/TestConstantValues.java.i
+data/test/tools/javac/6668794/badClass/B.java.i
+data/test/tools/javac/varargs/5088429/T5088429Neg01.java.i
+data/src/share/classes/javax/annotation/processing/RoundEnvironment.java.i
data/test/tools/javac/generics/NameOrder.java.i
-data/test/com/sun/javadoc/testDeprecatedDocs/pkg/TestException.java.i
+data/src/share/classes/com/sun/tools/javac/comp/ConstFold.java.i
data/test/tools/javac/diags/examples/VarargsPlural/VarargsPlural.java.i
data/test/tools/javac/diags/examples/ProcUseProcOrImplicit/sourcepath/p/SomeClass.java.i
data/test/tools/javac/generics/T6660289.java.i
data/test/tools/javac/processing/environment/round/Foo.java.i
-data/test/tools/javac/sourcePath/SourcePathA.java.i
data/test/tools/javac/diags/examples/EnumsNotSupported.java.i
-data/test/tools/javac/PackageClassAmbiguity/Bad.java.i
+data/test/tools/javac/typeAnnotations/newlocations/MethodTypeArgs.java.i
+data/test/tools/javac/diags/examples/DefaultAllowedInIntfAnnotationMember.java.i
data/test/tools/javac/meth/InvokeMH_BAD68.java.i
data/test/com/sun/javadoc/MetaTag/p2/C2.java.i
data/test/tools/javac/diags/examples/RepeatedInterface.java.i
data/test/tools/apt/Scanners/scanner.sh.i
data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractTreeWriter.java.i
-data/test/tools/javac/InterfaceObjectInheritance.java.i
+data/test/tools/javac/modules/ModuleAccessTest01.java.i
data/test/tools/apt/Basics/p1/p2.java.i
-data/test/tools/javac/diags/examples/FloatNumberTooSmall.java.i
-data/make/test/contents.gold.txt.i
-data/make/test/TEST.ROOT.i
+data/test/tools/javac/failover/FailOver10.java.i
+data/test/com/sun/javadoc/testParamTaglet/pkg/C.java.i
+data/test/tools/javac/annotations/pos/AnnotationMethods.java.i
data/test/tools/apt/mirror/declaration/ConstExpr.java.i
data/test/tools/javac/6758789/T6758789a.out.i
data/test/tools/javac/processing/messager/6362067/T6362067.out.i
data/test/tools/javac/T6413876.java.i
+data/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java.i
data/test/tools/apt/Basics/MisMatch.java.i
-data/src/share/classes/com/sun/tools/javac/comp/Annotate.java.i
+data/test/tools/javap/T4075403.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail4.java.i
data/test/tools/javac/CyclicInheritance6/p1/C.java.i
-data/test/tools/javac/GoodCovar.java.i
+data/test/tools/javac/typeAnnotations/failures/common/innertypeparams/InvalidLocation.java.i
data/test/tools/javac/protectedAccess/ProtectedAccess_3.java.i
-data/make/netbeans/apt/nbproject/project.xml.i
-data/test/com/sun/javadoc/AccessFrameTitle/p2/C2.java.i
-data/test/tools/javac/generics/T4711570.java.i
+data/test/tools/javac/ClassFileModifiers/MemberModifiers.out.i
+data/test/tools/javac/processing/werror/WErrorLast.out.i
+data/test/tools/javac/generics/diamond/6996914/T6996914a.java.i
data/test/tools/apt/Basics/NestedClassAnnotations.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_15.java.i
-data/test/com/sun/javadoc/testDocRootInlineTag/pkg/C.java.i
+data/test/tools/javac/6948381/npe/A.java.i
data/src/share/classes/com/sun/mirror/type/ClassType.java.i
-data/test/tools/javac/processing/model/type/MirroredTypeEx/Plurality.java.i
+data/test/tools/javac/typeAnnotations/newlocations/Parameters.java.i
data/test/tools/javac/processing/model/util/filter/ExpectedElementCounts.java.i
data/src/share/classes/com/sun/source/tree/CompoundAssignmentTree.java.i
-data/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java.i
+data/test/tools/javac/QualifiedNew.java.i
data/test/tools/javac/generics/6192945/Neg3.out.i
data/src/share/classes/com/sun/tools/doclets/standard/Standard.java.i
-data/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail17.java.i
data/THIRD_PARTY_README.i
data/test/tools/javac/api/6608214/T6608214.java.i
@@ -4250,45 +4263,44 @@ data/test/tools/javac/T6411379.java.i
data/src/share/classes/com/sun/tools/javap/AttributeWriter.java.i
data/test/com/sun/javadoc/DocRootSlash/p2/package.html.i
data/test/tools/javap/T6715251.java.i
-data/test/tools/javap/classfile/deps/T6907575.out.i
-data/test/tools/javac/T6993301.java.i
+data/test/tools/javadoc/imports/MissingImport.java.i
data/test/tools/javac/diags/examples/InvalidInstanceof.java.i
-data/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html.i
-data/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java.i
+data/test/tools/javac/6341866/Anno.java.i
+data/src/share/classes/javax/lang/model/element/Parameterizable.java.i
data/src/share/classes/com/sun/tools/javac/parser/Lexer.java.i
data/src/share/classes/com/sun/tools/javac/util/Assert.java.i
data/src/share/classes/javax/annotation/processing/AbstractProcessor.java.i
data/test/tools/javac/6341866/T6341866.java.i
-data/src/share/classes/com/sun/tools/javah/resources/SunOS_sparcv9.properties.i
+data/test/tools/javac/DefiniteAssignment/ThrowBeforeTryFinally.java.i
data/test/tools/javac/diags/CheckExamples.java.i
data/test/tools/javac/generics/6372782/Value.java.i
data/test/com/sun/javadoc/testValueTag/pkg2/package.html.i
data/test/jprt.config.i
-data/src/share/classes/com/sun/tools/javah/JNI.java.i
-data/test/tools/javac/generics/6495506/A.java.i
+data/src/share/classes/com/sun/javadoc/AnnotationDesc.java.i
+data/test/tools/javac/diags/examples/StringSwitchNotSupported.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail10.java.i
data/test/tools/javac/scope/7017664/CompoundScopeTest.java.i
data/test/tools/javac/annotations/pos/Local.java.i
-data/test/tools/javac/ImportCycle/foo/Middle2.java.i
+data/test/tools/javac/diags/examples/VarargsAndOldArraySyntax.java.i
data/test/tools/javac/CyclicScoping/CyclicScoping_1.java.i
data/test/tools/javac/diags/examples/InterfaceNotAllowed.java.i
data/test/com/sun/javadoc/DocRootSlash/DocRootSlash.java.i
data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedClass.java.i
data/test/tools/javac/unit/util/convert/EnclosingCandidates.java.i
data/src/share/classes/com/sun/tools/javac/comp/Infer.java.i
-data/test/tools/javac/OverrideChecks/6738538/T6738538b.java.i
+data/test/tools/javac/diags/examples/AnnoNotValidForType.java.i
data/test/tools/javac/meth/InvokeMH.java.i
-data/test/tools/javac/processing/warnings/TestSourceVersionWarnings.java.i
+data/test/tools/javac/diags/examples/DuplicateClass.java.i
data/test/tools/javac/synthesize/Test.java.i
data/test/tools/javac/diags/examples/WarningAndWerror.java.i
-data/test/tools/javac/diags/examples/CannotCreateArrayWithDiamond.java.i
-data/test/tools/javac/protectedAccess/ProtectedMemberAccess2.java.i
+data/test/tools/javac/enum/AbstractEnum1.java.i
+data/test/tools/javac/T6993301.java.i
data/test/tools/javac/protectedInner/Outerclass.java.i
-data/test/tools/javac/cast/6795580/T6795580.java.i
+data/test/tools/javac/diags/examples/DeprecatedPluralAdditional/DeprecatedFilename.java.i
data/test/tools/javadoc/annotations/shortcuts/pkg1/Value.java.i
-data/test/tools/javac/generics/syntax/6318240/BarNeg2a.java.i
+data/test/tools/javac/unicode/NonasciiDigit.java.i
data/test/tools/javac/synthesize/Serializable.java.i
-data/test/com/sun/javadoc/testBreakIterator/pkg/BreakIteratorTest.java.i
+data/test/tools/javac/processing/options/Xprint.java.i
data/test/tools/javac/T6394563.java.i
data/test/tools/javac/6394683/T6394683.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/Foo2.java.i
@@ -4296,49 +4308,53 @@ data/src/share/classes/sun/tools/javap/MethodData.java.i
data/src/share/classes/com/sun/tools/javac/resources/javac.properties.i
data/src/share/classes/com/sun/tools/javadoc/ParamTagImpl.java.i
data/test/tools/javac/generics/TyparamStaticScope2.java.i
-data/test/tools/javac/api/T6501502.java.i
+data/test/tools/javadoc/generics/tparamCycle/pkg1/LikeEnum.java.i
+data/test/tools/javac/generics/6969184/T6969184.java.i
data/test/tools/javac/NullQualifiedNew.java.i
data/test/tools/javac/diags/examples/NativeMethodCantHaveBody.java.i
-data/test/tools/javac/generics/syntax/6318240/BarNeg1.java.i
+data/test/tools/javac/cast/6467183/T6467183a.out.i
data/test/tools/javac/staticImport/PrivateStaticImport.java.i
data/test/tools/javac/annotations/neg/AnnComma.java.i
data/test/tools/javac/enum/T5075242.java.i
-data/src/share/classes/com/sun/javadoc/ProgramElementDoc.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ParamTaglet.java.i
+data/test/tools/javac/diags/examples/InheritFromFinal.java.i
+data/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java.i
data/test/tools/javac/generics/Crash02.java.i
-data/test/tools/javac/annotations/neg/Scope.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/LinkInfoImpl.java.i
data/test/tools/javac/ClassLiterals/evalinit/java/lang/Integer.java.i
data/src/share/classes/com/sun/javadoc/RootDoc.java.i
+data/test/com/sun/javadoc/WindowTitles/WindowTitles.java.i
data/test/com/sun/javadoc/JavascriptWinTitle/overview.html.i
data/test/tools/javac/4880220/T4880220.error.out.i
data/test/tools/javac/T6358166.java.i
-data/src/share/classes/com/sun/tools/classfile/Type.java.i
+data/test/tools/javac/foreach/T6500701.java.i
data/test/tools/javac/modules/ExportTest01.java.i
+data/test/tools/javac/depOverrides/doccomment/Test1.java.i
data/test/tools/javadoc/annotations/defaults/Main.java.i
-data/test/tools/javac/crossPackageImpl/CrossPackageImplA.java.i
+data/test/tools/javac/synthesize/Cloneable.java.i
data/test/tools/javac/api/6420464/T6420464.java.i
data/src/share/classes/com/sun/source/tree/TreeVisitor.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/titlebar.gif.i
data/test/tools/javac/annotations/T7073477.java.i
-data/test/tools/apt/Compile/Round1Apf.java.i
-data/src/share/classes/com/sun/tools/javadoc/ModifierFilter.java.i
+data/test/tools/javac/failover/FailOver08.out.i
+data/test/tools/javac/generics/6946618/T6946618c.java.i
+data/test/tools/javac/diags/examples/InvalidAnnoMemberType.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignNestedArg.java.i
data/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java.i
data/test/com/sun/javadoc/testNestedInlineTag/TestNestedInlineTag.java.i
data/test/tools/javac/warnings/FallThrough.java.i
data/test/tools/javac/InterfaceInInner.java.i
-data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.java.i
+data/test/tools/javac/diags/examples/OverrideWeakerAccess.java.i
data/src/share/classes/com/sun/javadoc/MethodDoc.java.i
data/src/share/classes/com/sun/tools/javac/parser/ScannerFactory.java.i
-data/test/tools/javac/enum/TrailingComma.java.i
+data/test/tools/javac/typeAnnotations/failures/common/receiver/InvalidLocation.java.i
data/src/share/classes/javax/lang/model/util/package-info.java.i
data/test/tools/javac/implicitThis/NewBeforeOuterConstructed2.java.i
-data/src/share/classes/com/sun/tools/javah/resources/Linux_ppc.properties.i
+data/test/tools/javac/sourcePath2/SourcePath2.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/BaseExecutableMemberTaglet.java.i
data/test/com/sun/javadoc/testValueTag/pkg2/Class3.java.i
-data/test/tools/javac/failover/FailOver08.out.i
+data/test/tools/javac/sourcePath/SourcePathA.java.i
data/test/tools/javac/miranda/4686148/ConcreteTest.java.i
-data/test/tools/javac/T6435291/T.jcod.i
+data/test/tools/javac/InvalidIntfCast.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java.i
data/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java.i
data/src/share/classes/com/sun/javadoc/AnnotationValue.java.i
@@ -4347,7 +4363,7 @@ data/test/tools/javac/generics/inference/6302954/T6456971.java.i
data/make/netbeans/javap/build.xml.i
data/test/tools/javac/diags/examples/CallMustBeFirst.java.i
data/test/tools/javac/annotations/neg/Cycle1.java.i
-data/src/share/classes/com/sun/tools/javap/ConstantWriter.java.i
+data/test/tools/javac/processing/options/testCommandLineClasses/Test.java.i
data/test/tools/javac/NonStaticFieldExpr1.out.i
data/test/tools/javac/assert/Attach.java.i
data/test/tools/javac/generics/inference/6838943/T6838943.out.i
@@ -4361,20 +4377,20 @@ data/test/tools/javac/DefiniteAssignment/DUBeforeDefined1.java.i
data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedPlural.java.i
data/test/tools/javac/ImportCycle/foo/Top.java.i
data/test/tools/javac/foreach/T6682380.java.i
-data/test/tools/javac/enum/enumSwitch/Color2.java.i
+data/test/tools/javac/generics/6711619/T6711619b.out.i
data/test/tools/javac/processing/model/util/NoSupers.java.i
data/test/tools/javac/cast/6714835/T6714835.java.i
data/test/com/sun/javadoc/T6735320/T6735320.java.i
data/test/tools/javac/miranda/T4279316c.java.i
-data/test/tools/apt/mirror/type/EnumTyp.java.i
-data/test/tools/javac/meth/InvokeDyn.java.i
+data/test/tools/javac/TryWithResources/TwrInference.java.i
+data/src/share/classes/com/sun/tools/javap/Messages.java.i
data/test/tools/javac/generics/inference/6638712/T6638712c.out.i
data/test/tools/javac/T6214885.java.i
data/test/tools/javac/generics/inference/5044646/p1/A1.java.i
-data/test/tools/javac/api/6411310/T6411310.java.i
+data/test/tools/javac/generics/wildcards/6437894/A.java.i
data/test/tools/javac/T6956462/TestClass.java.i
data/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java.i
-data/test/tools/javac/InitializerCompletion_3.java.i
+data/test/tools/javac/generics/FinalBridge.java.i
data/test/tools/javac/Parens4.java.i
data/test/tools/javap/typeAnnotations/JSR175Annotations.java.i
data/test/tools/javac/6948381/npe/B.java.i
@@ -4383,45 +4399,48 @@ data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/DeprecatedAPI
data/test/tools/javac/treeannotests/TA.java.i
data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/AlreadDefinedStaticImport.java.i
data/test/com/sun/javadoc/testSummaryHeading/C.java.i
-data/test/tools/javac/FinallyWarn.java.i
data/test/tools/javac/generics/typevars/5061359/T5061359b.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail14.java.i
data/test/tools/javac/positions/T6404194.java.i
data/test/tools/javac/typeAnnotations/failures/common/rest/InvalidLocation.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/AbstractMemberWriter.java.i
-data/test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java.i
-data/test/com/sun/javadoc/testHtmlDefinitionListTag/pkg1/C4.java.i
+data/test/tools/javac/diags/examples/ForeachNotApplicable.java.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess4.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/ClassDocCatalog.java.i
+data/make/tools/anttasks/CompilePropertiesTask.java.i
data/test/tools/javac/processing/model/6341534/T6341534.java.i
data/src/share/classes/com/sun/tools/classfile/DescriptorException.java.i
data/test/tools/javac/typeAnnotations/failures/IncompleteVararg.java.i
data/test/tools/javac/processing/errors/TestErrorCount.java.i
-data/src/share/classes/com/sun/source/tree/ImportTree.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java.i
data/test/tools/javac/diags/examples/CountErrorPlural.java.i
-data/test/tools/javac/diags/examples/WhereCaptured1.java.i
-data/test/tools/javac/generics/diamond/neg/Neg10.java.i
-data/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/X.java.i
+data/test/tools/javac/AccessMethods/BitwiseAssignment.java.i
+data/test/com/sun/javadoc/testThrowsHead/C.java.i
+data/test/tools/javac/javazip/A.java.i
+data/test/tools/javac/api/6418694/T6418694.java.i
data/test/com/sun/javadoc/testMemberInheritence/TestMemberInheritence.java.i
data/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java.i
data/test/tools/javah/compareTest/FindNativeFiles.java.i
-data/test/tools/apt/Basics/StaticFieldAnnotations.java.i
-data/test/tools/javac/TryWithResources/PlainTry.java.i
+data/src/share/classes/com/sun/javadoc/SerialFieldTag.java.i
+data/test/tools/javac/annotations/pos/Z3.java.i
data/test/tools/javac/generics/GenericThrowable.java.i
+data/test/tools/javac/generics/6476118/T6476118c.java.i
data/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java.i
-data/make/test/lib/classes.gold.txt.i
+data/test/tools/javac/typeAnnotations/failures/common/wildcards/MissingAnnotationValue.java.i
data/src/share/classes/com/sun/source/tree/MethodTree.java.i
+data/make/test/contents.sh.i
data/test/tools/javac/enum/forwardRef/T6425594.out.i
data/src/share/classes/com/sun/tools/doclets/formats/html/LinkFactoryImpl.java.i
-data/test/tools/javac/generics/6182950/T6182950b.java.i
+data/test/tools/javac/NonStaticFieldExpr4d.java.i
data/test/tools/javac/limits/ArrayDims2.java.i
data/test/tools/javac/6917288/T6917288.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties.i
+data/src/share/classes/com/sun/source/tree/NewClassTree.java.i
data/test/tools/javah/MissingParamClassException.java.i
data/test/tools/javac/diags/examples/NoInterfaceExpected.java.i
data/src/share/classes/com/sun/tools/apt/resources/apt.properties.i
data/test/tools/javac/annotations/TestAnnotationPackageInfo.java.i
data/test/tools/javac/typeAnnotations/failures/common/rest/DuplicateAnnotationValue.out.i
-data/test/tools/javac/QualifiedNew.java.i
+data/test/tools/javac/cast/6795580/T6795580.java.i
data/test/tools/javac/ArrayCast.java.i
data/test/tools/javac/annotations/neg/Z12.java.i
data/src/share/classes/com/sun/mirror/type/TypeVariable.java.i
@@ -4431,49 +4450,51 @@ data/test/com/sun/javadoc/testTopOption/pkg/AnnotationType.java.i
data/test/tools/javac/EarlyAssertWrapper.java.i
data/test/tools/javac/generics/wildcards/neg/CastWarn13.java.i
data/test/tools/javac/diags/examples/IntfAnnotationsCantHaveTypeParams.java.i
-data/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass_2.java.i
+data/test/tools/javac/generics/compat/CovariantCompat2.java.i
data/test/tools/javac/importChecks/ImportCanonical2.java.i
-data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java.i
+data/test/tools/javac/diags/examples/WhereTypeVar.java.i
+data/test/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java.i
data/test/tools/javac/T6977800.java.i
-data/test/tools/javac/generics/6476118/T6476118c.java.i
+data/test/tools/javac/miranda/T4666866.java.i
data/test/tools/javac/generics/6985719/T6985719c.out.i
data/test/tools/javac/generics/compat/VisibleBridge.java.i
data/src/share/classes/javax/lang/model/util/AbstractTypeVisitor8.java.i
data/test/tools/javadoc/generics/genericInnerAndOuter/pkg1/O.java.i
data/test/tools/javac/processing/6413690/T6413690.java.i
-data/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java.i
data/test/tools/javac/processing/6512707/TestAnnotation.java.i
-data/test/tools/javac/boxing/T6614974.java.i
+data/test/tools/javac/unicode/UnicodeAtEOL.java.i
data/test/tools/javac/SuperField.java.i
-data/src/share/classes/com/sun/source/tree/MemberSelectTree.java.i
+data/test/tools/javac/nested/4903103/T4903103.java.i
data/test/tools/javac/diags/examples/TrustMeOnVirtualMethod.java.i
data/test/tools/javac/depOverrides/doccomment/A.java.i
-data/test/tools/javac/T7042623.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/stylesheet.css.i
+data/test/com/sun/javadoc/testThrowsTag/TestThrowsTag.java.i
+data/src/share/classes/com/sun/tools/javadoc/MemberDocImpl.java.i
data/test/tools/javac/generics/typevars/6486430/T6486430.java.i
data/test/tools/javac/cast/6932571/T6932571neg.out.i
-data/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java.i
-data/test/tools/javac/diags/examples/DotClassExpected.java.i
-data/test/tools/javac/annotations/6214965/T6214965.java.i
+data/test/tools/javac/generics/wildcards/6330931/T6330931.java.i
+data/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java.i
+data/test/tools/javac/7102515/T7102515.out.i
data/test/tools/javac/7085024/T7085024.java.i
-data/test/tools/javadoc/parser/7091528/T7091528.java.i
+data/test/tools/javac/generics/rawOverride/AttributeSet.java.i
data/test/tools/javac/T7120266.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest2.java.i
+data/test/tools/javac/generics/typevars/6182630/T6182630f.java.i
data/test/tools/javac/ConditionalArgTypes_2.java.i
data/test/tools/javac/scope/6225935/a/Star.java.i
data/test/tools/javac/T6900037.out.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/Configuration.java.i
+data/test/tools/javadoc/NoStar.java.i
data/test/tools/javac/6257443/package-info.java.i
+data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java.i
data/test/tools/javac/varargs/6730476/T6730476b.java.i
data/test/tools/javac/diags/examples/EnumConstRequired.java.i
-data/test/tools/javac/diags/examples/NoInterfaceHere.java.i
-data/test/tools/javac/accessVirtualInner/c/C.java.i
-data/test/tools/javac/generics/wildcards/6651719/T6651719a.java.i
+data/test/tools/javac/T6554097.out.i
+data/test/tools/javac/constDebug/ConstDebug.sh.i
+data/test/tools/javadoc/sourceOption/SourceOption.java.i
data/test/tools/javac/unicode/SubChar.java.i
data/test/tools/javac/rawDiags/Warning.java.i
data/test/com/sun/javadoc/testUseOption/pkg1/C2.java.i
data/src/share/classes/com/sun/mirror/util/DeclarationScanner.java.i
-data/test/tools/javac/QualifiedAccess/QualifiedAccess_2.java.i
+data/test/com/sun/javadoc/testValueTag/pkg1/Class2.java.i
+data/test/tools/javac/7102515/T7102515.java.i
data/make/tools/Jigsaw/FpkgTask.java.i
data/test/tools/javac/policy/A.java.i
data/test/tools/javac/processing/6994946/TestProcessor.java.i
@@ -4489,82 +4510,81 @@ data/src/share/classes/com/sun/tools/javap/package.html.i
data/test/tools/javac/annotations/6365854/evolve/TestAnnotation.java.i
data/test/com/sun/javadoc/testLeadingSpaces/LeadingSpaces.java.i
data/test/com/sun/javadoc/testHtmlDocument/testLink.html.i
-data/src/share/classes/com/sun/tools/classfile/ModuleClass_attribute.java.i
+data/test/tools/javac/6734819/T6734819b.java.i
data/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java.i
-data/test/tools/javac/diags/examples/SourceNoBootclasspath.java.i
+data/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java.i
data/test/tools/javac/generics/7007615/acc1/p2/E.java.i
-data/test/tools/javac/T6366196.java.i
-data/test/tools/javac/generics/bridge1/D.java.i
+data/src/share/classes/javax/tools/ModuleFileManager.java.i
+data/test/tools/javac/generics/inference/6638712/T6638712a.out.i
data/test/tools/javac/ClassPathTest/pkg/ClassPathTestAux3.java.i
data/test/tools/javac/diags/examples/ProcUseImplicit/sourcepath/p/SomeClass.java.i
-data/test/com/sun/javadoc/testHref/package-list.i
-data/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java.i
+data/test/tools/javac/T4906100.out.i
+data/test/tools/javac/processing/6365040/ProcBar.java.i
data/test/tools/javac/processing/options/testPrintProcessorInfo/Test.java.i
-data/src/share/classes/javax/lang/model/type/ErrorType.java.i
-data/test/tools/javac/InnerClassesAttribute/Outside$1$Inside.class.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_2.java.i
+data/test/tools/javac/SynthName1.java.i
data/test/tools/javadoc/generics/supertypes/pkg1/B.java.i
data/test/tools/javac/typeAnnotations/failures/StaticMethods.java.i
data/test/tools/javac/diags/examples/AnnotationMustBeNameValue.java.i
data/test/com/sun/javadoc/testSuperclassInSerialForm/TestSuperClassInSerialForm.java.i
-data/make/test/HelloWorld.javadoc.gold.txt.i
-data/test/tools/javac/scope/6225935/Baz.java.i
+data/test/tools/javac/enum/T6724345.java.i
+data/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java.i
data/test/tools/javadoc/generics/tparamTagOnType/expected.out.i
data/test/tools/javac/unicode/NonasciiDigit2.java.i
data/src/share/classes/com/sun/javadoc/ParameterizedType.java.i
data/test/tools/javac/T5024091/T5024091.out.i
-data/test/tools/javac/generics/inference/6638712/T6638712d.java.i
+data/test/tools/javac/unicode/SupplementaryJavaID6.sh.i
data/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.java.i
-data/test/tools/javac/diags/examples/WhereTypeVar.java.i
-data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_13.java.i
-data/test/tools/javac/diags/Example.java.i
+data/test/tools/javac/warnings/7090499/T7090499.out.i
+data/test/tools/javac/diags/examples/ProcFileReopening/processors/AnnoProc.java.i
+data/test/tools/javac/sourcePath/SourcePath.java.i
data/test/tools/apt/Compile/servicesRound4.i
-data/test/tools/javac/processing/errors/Foo.java.i
-data/test/com/sun/javadoc/testSerializedFormDeprecationInfo/pkg1/C3.java.i
+data/src/share/classes/com/sun/source/tree/CatchTree.java.i
data/src/share/classes/com/sun/tools/classfile/Attribute.java.i
data/test/tools/javac/generics/wildcards/T6450290.java.i
-data/src/share/classes/javax/tools/overview.html.i
+data/test/tools/javac/processing/errors/TestParseErrors/TestParseErrors.out.i
data/test/tools/javac/diags/RunExamples.java.i
-data/test/tools/javac/depOverrides/doccomment/Test1.java.i
+data/test/tools/javadoc/dupOk/DupOk.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/PackageTreeWriter.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/MultiTypeParameters.java.i
+data/test/tools/javac/generics/6207386/T6207386.java.i
data/test/tools/javadoc/annotations/shortcuts/Main.java.i
-data/test/tools/javac/annotations/neg/DupTarget.java.i
+data/test/tools/javac/unicode/SupplementaryJavaID3.java.i
data/test/tools/javac/diags/MessageInfo.java.i
-data/test/tools/javac/generics/inference/4954546/T4954546.java.i
+data/test/tools/javac/generics/inference/5042462/T5042462.java.i
data/src/share/classes/com/sun/mirror/apt/RoundState.java.i
data/test/tools/javac/innerClassFile/y/R1.java.i
-data/test/tools/javac/literals/BadBinaryLiterals.java.i
-data/test/tools/javac/generics/inference/6650759/T6650759b.java.i
+data/test/tools/javac/T6214885a.out.i
+data/test/tools/javac/inheritedAccess/MethodReferenceQualification_1.java.i
data/test/tools/javac/diags/examples/ClashesWith.java.i
-data/src/share/classes/com/sun/tools/javadoc/PackageDocImpl.java.i
+data/test/tools/javac/6521805/p/Sub.java.i
data/test/tools/javac/AnonStaticMember_2.out.i
-data/src/share/classes/javax/lang/model/util/SimpleTypeVisitor8.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/MethodFinder.java.i
-data/test/tools/javac/accessVirtualInner/Main.java.i
+data/test/tools/javac/modules/ModuleDataTest01.java.i
+data/test/tools/javac/mandatoryWarnings/deprecated/P.java.i
+data/test/tools/javac/policy/test2/Test.java.i
data/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java.i
-data/test/tools/javac/generics/6192945/Neg3.java.i
+data/test/tools/javac/annotations/pos/TrailingComma.java.i
data/test/com/sun/javadoc/testTypeParams/pkg/Foo4.java.i
data/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java.i
data/test/tools/javac/policy/test2/byfile.AB.out.i
data/test/tools/javac/annotations/6359949/T6359949a.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/ThrowsTaglet.java.i
-data/test/tools/javac/innerClassFile/y/Main.java.i
+data/test/tools/javap/T6474890.java.i
data/test/tools/javac/positions/T6264029.out.i
-data/test/tools/javac/diags/examples/LocalVarNeedsFinal.java.i
+data/test/com/sun/javadoc/testDocRootLink/pkg2/package.html.i
data/test/com/sun/javadoc/testHtmlTag/TestHtmlTag.java.i
data/test/tools/javac/generics/wildcards/neg/CastFail11.java.i
-data/test/tools/javac/ClassLiterals/LiteralInterfaceImpl.java.i
-data/test/tools/javac/generics/inference/6468384/T6468384.java.i
+data/test/tools/javac/generics/typevars/6182630/T6182630.java.i
+data/test/tools/javac/rawDiags/Note.out.i
data/test/tools/javac/options/T6900037.java.i
data/test/tools/javac/processing/warnings/UseImplicit/p/C2.java.i
data/test/tools/javac/generics/rare/Rare5.java.i
data/test/tools/javac/ThrowsIntersection_3.java.i
-data/src/share/classes/com/sun/tools/javac/parser/Keywords.java.i
+data/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java.i
data/test/tools/javac/OverrideChecks/StaticOverride.java.i
data/test/tools/javadoc/enum/enumType/Main.java.i
data/test/tools/apt/mirror/type/ClassTyp.java.i
-data/test/tools/javac/diags/examples/FloatNumberTooLarge.java.i
+data/test/tools/javac/diags/examples/PkgClashWithClass/p/q.java.i
data/test/tools/javac/generics/ExtendedRaw2.java.i
data/test/tools/javac/T6873845.java.i
data/test/tools/javac/failover/FailOver14.out.i
@@ -4573,31 +4593,35 @@ data/test/tools/javac/staticQualifiedNew/p2/X.java.i
data/test/com/sun/javadoc/testTypeParams/pkg/ClassUseTest3.java.i
data/test/tools/apt/mirror/declaration/pkg1/AClass.java.i
data/test/tools/javac/diags/examples/Orphaned.java.i
+data/test/tools/javac/generics/6372782/MultiplicationDefined.java.i
data/test/tools/javac/diags/examples/PathElementNotFound.java.i
data/test/com/sun/javadoc/DocRootSlash/overview.html.i
-data/test/tools/javac/api/6422327/T6422327.java.i
-data/test/tools/javac/danglingDep/NoDepX.out.i
+data/test/tools/javac/protectedAccess/ProtectedMemberAccess3.out.i
+data/test/tools/javac/generics/7022054/T7022054neg1.out.i
data/test/tools/javac/generics/wildcards/neg/CastFail5.java.i
data/test/tools/javac/7023703/T7023703neg.out.i
data/test/tools/javac/diags/examples/CyclicAnnoElement.java.i
data/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java.i
-data/test/tools/javac/multicatch/Pos04.java.i
-data/src/share/classes/javax/lang/model/element/TypeParameterElement.java.i
+data/src/share/classes/com/sun/source/tree/ModuleQueryTree.java.i
+data/test/tools/javac/typeAnnotations/newlocations/LocalVariables.java.i
data/test/com/sun/javadoc/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java.i
-data/test/tools/javac/StringsInSwitch/BadlyTypedLabel1.java.i
+data/src/share/classes/sun/tools/javap/CPX2.java.i
data/test/tools/javac/generics/typevars/6486430/T6486430a.java.i
data/test/tools/javac/NonStaticFieldExpr4c.java.i
-data/test/tools/javac/6547131/T.java.i
+data/test/tools/javac/EmptyDocComments.java.i
+data/test/tools/apt/Scanners/TestEnum.java.i
data/test/tools/javac/diags/examples/ResourceNotApplicableToType.java.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java.i
data/test/tools/javac/annotations/6365854/TestAnnotation.java.i
-data/test/tools/javac/api/TestDocComments.java.i
+data/test/tools/javac/diags/examples/UncheckedCast.java.i
data/src/share/classes/com/sun/tools/javac/code/ModuleQuery.java.i
data/test/tools/javac/generics/compat/OverrideBridge2.java.i
data/src/share/classes/com/sun/tools/classfile/Annotation.java.i
-data/test/tools/javac/6330920/T6330920.java.i
+data/test/tools/javac/processing/6365040/ProcFoo.java.i
data/test/com/sun/javadoc/testValueTag/pkg1/Class1.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/FieldWriterImpl.java.i
-data/src/share/classes/com/sun/tools/javac/util/AbstractLog.java.i
+data/test/tools/javac/generics/inference/5073060/T5073060.java.i
+data/test/tools/javac/modules/ModuleProvidesAttributeTest01.java.i
+data/test/tools/javac/tree/AbstractTreeScannerTest.java.i
data/test/tools/javac/processing/loader/testClose/TestClose.java.i
data/test/tools/javap/T4459541.java.i
data/src/share/classes/com/sun/tools/doclets/formats/html/AllClassesFrameWriter.java.i
@@ -4609,93 +4633,95 @@ data/test/tools/javac/TryWithResources/BadTwrSyntax.java.i
data/test/com/sun/javadoc/testGroupOption/pkg1/C.java.i
data/test/tools/javac/diags/examples/NotAStatement.java.i
data/test/tools/javac/scope/6225935/Test.java.i
-data/src/share/classes/javax/annotation/processing/SupportedOptions.java.i
+data/src/share/classes/javax/lang/model/type/TypeVariable.java.i
data/test/tools/javac/annotations/neg/Z8.java.i
-data/test/tools/javac/DeclarationStatementInline.java.i
+data/test/tools/javac/QualifiedAccess/QualifiedAccess_4.java.i
+data/test/tools/javadoc/annotations/defaults/pkg1/A.java.i
data/test/tools/javac/generics/SelfImplement.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignAfterIf_1.java.i
data/test/tools/javac/typeAnnotations/newlocations/ClassLiterals.java.i
data/test/tools/javac/AccessMethods/InternalHandshake.java.i
data/test/tools/javac/multicatch/T6978574.java.i
data/test/tools/javac/InconsistentStack.java.i
-data/test/tools/javac/limits/LongName.java.i
-data/test/com/sun/javadoc/DocRootSlash/p2/C2.java.i
-data/test/tools/javac/ExceptionalFinally.java.i
+data/src/share/classes/com/sun/tools/javac/services/javax.tools.JavaCompilerTool.i
+data/test/tools/javap/T6716452.java.i
+data/test/tools/javac/diags/ArgTypeCompilerFactory.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java.i
data/test/tools/javac/cast/7126754/T7126754.out.i
data/test/tools/javap/T4880663.java.i
data/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java.i
-data/test/tools/javac/Diagnostics/6722234/T6722234d.java.i
-data/test/tools/javac/ClassPathTest/ClassPathTest.sh.i
-data/test/tools/javac/7102515/T7102515.java.i
+data/test/tools/apt/Discovery/Touch.java.i
+data/test/tools/javac/diags/examples/VarargsFilenameAdditional.java.i
+data/test/tools/javac/depOverrides/annotation/Test3.java.i
data/test/tools/javac/processing/completion/TestCompletions.java.i
data/test/tools/javac/StrictAbstract.java.i
data/test/tools/javac/generics/rare/Rare7.java.i
-data/test/tools/javac/diags/examples/DeprecatedPlural/DeprecatedClass.java.i
+data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_6.java.i
data/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java.i
data/test/tools/javac/diags/examples/CantResolveLocationArgs.java.i
data/src/share/classes/com/sun/source/tree/BlockTree.java.i
data/test/tools/apt/Options/OptionChecker.java.i
-data/test/tools/javac/generics/6985719/T6985719h.out.i
+data/test/tools/javac/unicode/SupplementaryJavaID1.java.i
data/test/tools/javac/diags/examples/Expected3.java.i
-data/test/tools/javac/multicatch/Neg05.java.i
+data/test/tools/javac/ClassFileModifiers/ClassModifiers.out.i
data/test/tools/javac/enum/ValueOf.java.i
-data/test/tools/javac/generics/6985719/T6985719f.out.i
+data/test/tools/javac/ImportCycle/foo/Bottom.java.i
data/test/tools/javac/api/6422215/T6422215.java.i
-data/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java.i
data/test/tools/javac/multicatch/model/Check.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java.i
+data/test/tools/javac/warnings/6594914/T6594914a.out.i
data/test/tools/javac/processing/environment/round/Part1.java.i
-data/test/tools/javadoc/generics/throwsGeneric/expected.out.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java.i
data/src/share/classes/com/sun/tools/classfile/Dependency.java.i
+data/test/tools/javac/5045412/Bar.java.i
data/test/tools/javac/generics/TyparamStaticScope.java.i
data/test/tools/javac/diags/examples/PackageInfoAlreadySeen/package-info.java.i
data/test/tools/javac/diags/examples/ArrayRequired.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/taglets/LiteralTaglet.java.i
+data/test/tools/javac/abstract/T2.java.i
data/test/tools/javac/diags/examples/VoidNotAllowed.java.i
data/test/tools/javac/processing/environment/round/TestContext.java.i
data/src/share/classes/com/sun/tools/javac/comp/Attr.java.i
data/test/tools/javac/api/T6358955.java.i
data/test/tools/javac/enum/DA2.java.i
data/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java.i
-data/test/tools/javac/generics/6476118/T6476118c.out.i
+data/src/share/classes/com/sun/source/tree/WhileLoopTree.java.i
data/test/tools/javac/scope/6225935/a/Ambiguous.java.i
-data/src/share/classes/com/sun/tools/classfile/Module_attribute.java.i
-data/test/com/sun/javadoc/testParamTaglet/TestParamTaglet.java.i
+data/test/tools/javac/policy/test2/bytodo.AB.out.i
+data/test/com/sun/javadoc/testTitleInHref/TestTitleInHref.java.i
data/test/tools/javac/QualifiedThisExactMatch.java.i
data/test/tools/javac/generics/wildcards/T6732484.java.i
data/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java.i
-data/test/tools/javac/boxing/NoBoxingLong.java.i
+data/test/com/sun/javadoc/testMemberSummary/pkg2/A.java.i
data/test/tools/javac/depOverrides/annotation/B.java.i
-data/test/tools/javac/diags/examples/AnnotationMissingValue.java.i
data/src/share/classes/com/sun/mirror/overview.html.i
data/src/share/classes/com/sun/source/tree/MethodInvocationTree.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java.i
data/test/tools/javac/T7040104.java.i
data/src/share/classes/com/sun/tools/javac/util/Convert.java.i
-data/src/share/classes/com/sun/tools/doclets/internal/toolkit/MemberSummaryWriter.java.i
-data/src/share/classes/javax/lang/model/type/WildcardType.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/AnnotationTypeWriterImpl.java.i
-data/test/com/sun/javadoc/testLinkToSerialForm/TestLinkToSerialForm.java.i
+data/test/tools/javac/generics/diamond/neg/Neg04.out.i
+data/test/tools/javac/rawDiags/Warning.out.i
+data/test/tools/javac/generics/5066774/T5066774.java.i
+data/test/com/sun/javadoc/testModifier/Test.java.i
+data/test/tools/javac/api/6431435/T6431435.java.i
+data/src/share/classes/com/sun/tools/javadoc/AbstractTypeImpl.java.i
data/test/tools/javac/positions/T6253161.out.i
data/test/tools/javac/diags/HTMLWriter.java.i
-data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java.i
+data/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java.i
data/test/tools/javac/code/ArrayClone.sh.i
-data/src/share/classes/javax/lang/model/util/TypeKindVisitor8.java.i
+data/test/com/sun/javadoc/testIndex/pkg/Interface.java.i
data/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/B.java.i
data/test/tools/javac/diags/examples/ClassCantWrite.java.i
data/test/tools/javac/generics/wildcards/pos/RvalConversion.java.i
data/test/tools/javac/processing/model/type/TestUnionType.java.i
-data/test/com/sun/javadoc/testModifier/ModifierAbstract.java.i
+data/test/tools/javac/api/T6412669.java.i
data/test/tools/javac/processing/errors/TestErrorCount.out.i
data/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java.i
-data/test/tools/javac/diags/examples/DiamondAndExplicitParams.java.i
-data/test/tools/javac/AbstractOverride.java.i
+data/test/tools/javac/tree/TreeScannerTest.java.i
+data/test/tools/javac/processing/6413690/TestMe.java.i
data/test/tools/javac/T6232928.java.i
data/test/tools/javac/diags/examples/QualifiedNewStaticClass.java.i
-data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/AnnotationTypeUndocumented.java.i
-data/test/tools/javac/generics/5066774/T5066774.java.i
-data/test/tools/javac/generics/6372782/MultiplicationDefined.java.i
+data/test/tools/javac/T6406771.java.i
+data/test/tools/javac/generics/bridge1/E.java.i
+data/test/tools/javac/miranda/6964669/pkg/B.java.i
data/test/tools/javac/DefiniteAssignment/T4718708.java.i
data/test/tools/apt/Compile/servicesRound3.i
data/test/tools/javac/diags/examples/ProcUseProcOrImplicit/processors/AnnoProc.java.i
@@ -4703,14 +4729,14 @@ data/test/tools/javac/generics/wildcards/6886247/T6886247_2.out.i
data/src/share/classes/com/sun/tools/javadoc/AnnotationTypeDocImpl.java.i
data/test/com/sun/javadoc/testMemberInheritence/pkg/BaseClass.java.i
data/test/tools/javac/generics/6910550/T6910550b.java.i
-data/test/com/sun/javadoc/testMemberInheritence/pkg/BaseInterface.java.i
+data/test/tools/javac/processing/6994946/SemanticErrorTest.2.out.i
data/test/tools/javac/generics/T4757416.java.i
data/src/share/classes/com/sun/source/tree/PermitsDirectiveTree.java.i
data/test/tools/javac/generics/odersky/Test.java.i
-data/src/share/opensource/javac/build.xml.i
+data/src/share/classes/com/sun/tools/javac/util/Messages.java.i
data/test/tools/javah/compareTest/CompareTest.sh.i
data/test/tools/javac/generics/6372782/AbstractElement.java.i
-data/test/tools/javac/diags/examples/ModifierNotAllowed.java.i
+data/test/tools/javac/7129225/NegTest.ref.i
data/test/tools/javac/processing/6499119/ClassProcessor.java.i
data/test/tools/javac/FoldConditional.java.i
data/test/tools/javac/annotations/neg/MixedSource.java.i
@@ -4719,81 +4745,81 @@ data/test/tools/javac/unicode/FirstChar2.java.i
data/README.i
data/test/bootclasspath-exclude.jtx.i
data/test/tools/javac/diags/examples/IllegalDot.java.i
-data/make/netbeans/apt/build.xml.i
+data/test/tools/javac/positions/T6253161a.java.i
data/test/tools/javac/diags/examples/UnreachableStatement.java.i
data/test/tools/javac/treeannotests/AnnoTreeTests.java.i
-data/test/tools/javac/StringAppendAccessMethodOnLHS.java.i
+data/test/tools/javac/processing/werror/WError1.java.i
data/test/tools/javac/modules/ModuleResolverTest03.java.i
data/test/tools/javac/multicatch/Neg01eff_final.out.i
data/src/share/classes/com/sun/tools/javac/comp/Enter.java.i
data/test/tools/javac/generics/T6657499.java.i
data/test/tools/javadoc/MethodLinks.java.i
data/src/share/opensource/javac/doc/javac_lifecycle/packages.html.i
-data/test/tools/javac/NestedInnerClassNames.out.i
+data/test/tools/javac/diags/examples/UncheckedFilenameAdditional.java.i
data/test/tools/javac/processing/warnings/gold_sv_warn_5_6.out.i
data/test/tools/javac/diags/examples/BreakOutsideSwitchLoop.java.i
-data/test/tools/javac/api/T6400205.java.i
data/test/tools/javac/6508981/TestInferBinaryName.java.i
-data/src/share/classes/com/sun/tools/javac/file/Locations.java.i
-data/test/tools/javac/diags/examples/MulticatchCantBeAssigned.java.i
+data/test/tools/javac/generics/compat/OverrideBridge3.java.i
data/src/share/opensource/javac/doc/javac_lifecycle/Main.html.i
data/test/tools/javac/6979683/TestCast6979683_BAD36.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java.i
+data/test/tools/javac/NestedInnerClassNames.sh.i
data/test/tools/javac/annotations/neg/Z10.java.i
-data/test/tools/javac/literals/T6891079.out.i
+data/src/share/classes/com/sun/tools/javac/zip/ZipFileIndexEntry.java.i
data/test/tools/javac/diags/examples/TryWithoutCatchOrFinally.java.i
data/src/share/classes/com/sun/tools/javac/file/RelativePath.java.i
-data/src/share/opensource/javac/doc/javac_lifecycle/ToDo.html.i
+data/test/tools/javac/diags/examples/UnsupportedExoticID.java.i
data/src/share/classes/com/sun/source/util/SimpleTreeVisitor.java.i
data/test/tools/javac/generics/T6507024.java.i
data/test/tools/javac/6521805/T6521805a_2.out.i
-data/test/tools/javac/annotations/6365854/TestCore.java.i
+data/test/tools/javac/file/T7018098.java.i
data/test/tools/javac/OverrideChecks/Private.java.i
data/test/tools/javac/typeAnnotations/InnerClass.java.i
-data/src/share/classes/com/sun/tools/javac/main/CommandLine.java.i
+data/test/tools/javac/diags/examples/NameClashSameErasureNoOverride.java.i
data/test/tools/apt/Compile/Round3Apf.java.i
data/test/tools/javac/generics/6207386/T6207386.out.i
data/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java.i
data/test/tools/javac/generics/6192945/T6192945.java.i
data/test/com/sun/javadoc/testBaseClass/BaseClass.java.i
data/test/tools/javac/FinalThisReference.java.i
-data/test/tools/javac/protectedInner/InnerClass.java.i
+data/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java.i
data/test/tools/javac/typeAnnotations/failures/common/arrays/InvalidLocation.java.i
data/test/tools/javac/policy/test2/A.java.i
data/test/com/sun/javadoc/testInlineLinkLabel/pkg/C2.java.i
data/test/tools/javac/DefiniteAssignment/DefAssignBoolean/DefAssignBoolean_14.java.i
-data/test/tools/javac/diags/examples/AssertAsIdentifier.java.i
-data/test/com/sun/javadoc/testHtmlTableTags/pkg1/I1.java.i
-data/test/tools/javac/NonStaticFieldExpr3.out.i
+data/test/tools/javac/processing/model/util/deprecation/TestDeprecation.java.i
+data/test/com/sun/javadoc/JavascriptWinTitle/p2/C2.java.i
+data/test/tools/javac/cast/7123100/T7123100a.out.i
data/test/tools/apt/Scanners/VisitOrder.java.i
-data/test/tools/javac/annotations/default/C.java.i
+data/src/share/classes/com/sun/source/tree/MemberReferenceTree.java.i
data/test/com/sun/javadoc/testTagInheritence/firstSentence2/B.java.i
data/test/tools/javac/diags/examples/BadSourceFileHeader/BadSourceFileHeader.java.i
data/test/com/sun/javadoc/testMemberInheritence/inheritDist/B.java.i
-data/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java.i
+data/make/netbeans/common/shared.xml.i
data/src/share/classes/com/sun/tools/javac/code/BoundKind.java.i
-data/test/com/sun/javadoc/testLegacyTaglet/UnderlineTaglet.java.i
-data/test/tools/javac/capture/Martin.java.i
+data/test/tools/javac/generics/diamond/neg/Neg10.java.i
+data/test/tools/javac/processing/filer/TestValidRelativeNames.java.i
data/test/tools/javac/inheritAccess/PvtMbrsNotInherit1.java.i
data/test/tools/javac/typeAnnotations/failures/common/typeArgs/InvalidLocation.out.i
-data/test/com/sun/javadoc/testSubTitle/pkg/package.html.i
+data/test/tools/javac/overrridecrash/A.java.i
data/src/share/classes/com/sun/tools/javadoc/ParameterImpl.java.i
-data/test/com/sun/javadoc/testInlineLinkLabel/pkg/C1.java.i
+data/test/tools/javadoc/annotations/badVals/pkg1/A.java.i
data/test/tools/javac/depOverrides/doccomment/empty.i
-data/test/tools/javac/generics/inference/5073060/T5073060.java.i
+data/test/tools/javac/literals/BadUnderscoreLiterals.6.out.i
data/src/share/classes/javax/lang/model/element/UnknownElementException.java.i
data/test/tools/javac/generics/6946618/T6946618a.java.i
data/test/tools/javac/processing/model/util/elements/VacuousEnum.java.i
-data/test/tools/javac/annotations/neg/NoObjectMethods.java.i
-data/test/com/sun/javadoc/testTaglets/Parent.java.i
+data/test/tools/javac/nativeHeaders/javahComparison/TestClass2.java.i
+data/src/share/classes/com/sun/tools/javac/api/BasicJavacTask.java.i
+data/test/tools/javac/warnings/Unchecked.lintAll.out.i
+data/test/tools/javac/generics/inference/4972073/T4972073a.java.i
data/test/tools/javadoc/annotations/elementTypes/pkg1/B.java.i
data/test/tools/javac/diags/examples/TryResourceTrailingSemi.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg2/ClassUseTest3.java.i
data/test/tools/javac/cast/7123100/T7123100c.out.i
data/test/tools/javah/6572945/gold/jni.dir.1/TestClass1.h.i
-data/test/tools/javac/FloatingPointChanges/BadConstructorModifiers.out.i
-data/test/com/sun/javadoc/AccessAsciiArt/p1/C.java.i
-data/make/test/lib/javadoc.sh.i
+data/test/tools/javac/typeAnnotations/failures/common/typeparams/MissingAnnotationValue.java.i
+data/test/tools/javah/4942232/ParamClassTest.java.i
+data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/PackageListWriter.java.i
data/test/tools/javac/diags/examples/OverrideUncheckedReturn.java.i
data/test/tools/javac/diags/examples/DeprecatedFilename.java.i
data/test/tools/javadoc/T6551367.java.i
@@ -4801,80 +4827,81 @@ data/test/com/sun/javadoc/testTagInheritence/firstSentence/A.java.i
data/test/tools/javap/T6863746.java.i
data/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java.i
data/test/tools/javac/staticImport/ImportPrivate.java.i
-data/test/tools/javac/generics/6969184/T6969184.java.i
+data/test/com/sun/javadoc/VersionNumber/p1/C.java.i
data/test/tools/javac/multicatch/Pos01.java.i
data/test/tools/javac/tree/TestToString.java.i
data/test/com/sun/javadoc/testNewLanguageFeatures/pkg/Coin.java.i
data/test/tools/javac/warnings/Unchecked.noLint.out.i
-data/src/share/classes/com/sun/tools/javac/parser/Parser.java.i
+data/test/tools/javac/lint/NoWarn1.out.i
data/test/tools/javac/cast/5065215/T5065215.java.i
-data/test/tools/javac/generics/wildcards/neg/CastWarn14.java.i
+data/test/tools/javac/processing/model/util/OverridesSpecEx.java.i
data/test/tools/javadoc/varArgs/pkg1/A.java.i
data/test/tools/javac/multicatch/Neg04.out.i
-data/test/tools/javac/generics/typevars/6804733/T6804733.java.i
-data/test/tools/javac/6390045/T6390045b.java.i
-data/test/tools/javac/typeAnnotations/failures/common/typeparams/InvalidLocation.java.i
+data/test/tools/javac/typeAnnotations/failures/target/NotTypeUse.java.i
+data/test/tools/javac/diags/examples/IllegalLineEndInCharLit.java.i
+data/src/share/classes/com/sun/tools/javac/file/Locations.java.i
data/test/tools/javac/mixedTarget/CompatibleAbstracts2.java.i
data/src/share/classes/com/sun/tools/javac/model/JavacTypes.java.i
-data/src/share/classes/com/sun/tools/javap/Messages.java.i
+data/test/tools/javac/meth/InvokeDyn.java.i
data/test/tools/javac/generics/inference/6222762/T6222762.java.i
-data/test/tools/javac/T6567414.java.i
data/test/tools/javac/diags/examples/Expected2.java.i
data/test/tools/javac/CyclicScoping/CyclicScoping_2.java.i
+data/test/tools/javac/diags/examples/FloatNumberTooLarge.java.i
data/test/tools/javac/policy/B.java.i
data/test/tools/javac/generics/PermuteBound.java.i
data/test/tools/javac/EarlyAssert.java.i
-data/test/tools/javac/implicitThis/NewBeforeOuterConstructed.java.i
+data/test/tools/javac/typeAnnotations/failures/OldArray.out.i
data/test/tools/javac/literals/BadUnderscoreLiterals.java.i
-data/make/netbeans/javah/nbproject/project.xml.i
-data/test/com/sun/javadoc/WindowTitles/WindowTitles.java.i
+data/test/tools/javadoc/annotations/defaults/expected.out.i
+data/test/tools/javac/diags/examples/AnnotationMissingValue.java.i
data/test/tools/javac/Capture.java.i
-data/test/tools/javac/ClassLiterals/evalinit/ClassLiteralEvalInit.java.i
+data/test/tools/javac/diags/examples/UncheckedPluralAdditional/UncheckedPluralAdditional.java.i
data/test/tools/apt/Scanners/Order.java.i
-data/src/share/classes/com/sun/tools/doclets/formats/html/SerializedFormWriterImpl.java.i
+data/test/tools/javac/processing/errors/Foo.java.i
data/test/tools/javadoc/imports/I.java.i
data/test/tools/javac/policy/D.java.i
data/test/com/sun/javadoc/testBadSourceFile/TestBadSourceFile.java.i
-data/test/tools/javac/generics/inference/5021635/T5021635.java.i
+data/test/tools/javac/processing/6512707/TestEnum.java.i
data/test/tools/javac/6400383/T6400383.java.i
-data/test/com/sun/javadoc/testValueTag/pkg1/CustomTagUsage.java.i
-data/src/share/classes/javax/lang/model/util/AbstractElementVisitor7.java.i
+data/test/tools/javac/Closure3.java.i
+data/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java.i
data/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java.i
data/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourcePath.java.i
data/test/tools/javac/generics/diamond/neg/Neg05.out.i
data/src/share/classes/com/sun/source/tree/InstanceOfTree.java.i
-data/test/com/sun/javadoc/dupThrowsTags/TestDupThrowsTags.java.i
-data/test/tools/javac/AccessMethods/ChainedAssignment.java.i
+data/test/tools/javac/scope/6225935/Baz.java.i
+data/test/tools/javac/api/T6400205.java.i
data/test/tools/javac/T5090006/broken.jar.i
-data/test/com/sun/javadoc/testSubTitle/TestSubTitle.java.i
+data/test/tools/javac/T7042623.java.i
data/src/share/classes/com/sun/tools/javac/comp/Todo.java.i
data/test/tools/javac/enum/DA3.java.i
-data/make/test/contents.sh.i
+data/test/tools/javap/typeAnnotations/ClassLiterals.java.i
+data/make/tools/anttasks/SelectToolTask.java.i
data/test/tools/javac/processing/model/type/NoTypes.java.i
data/test/tools/javac/Closure4.java.i
-data/test/tools/javadoc/annotations/annotatePackage/pkg2/package.html.i
+data/test/tools/javac/lambda/MethodReferenceParserTest.java.i
data/test/tools/javac/6979683/TestCast6979683_BAD37.java.errlog.i
-data/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java.i
+data/test/tools/javac/diags/examples/EnumAsIdentifier.java.i
data/test/tools/javac/boxing/Boxing2.java.i
data/test/tools/javac/processing/Xprint.java.i
data/test/tools/javac/diags/examples/CantImplement.java.i
data/test/tools/javac/importContext/anonPackage/Foo.java.i
data/test/tools/javac/generics/wildcards/neg/CastWarn12.java.i
-data/test/tools/javac/annotations/default/Derr.java.i
-data/test/tools/javac/api/6411310/Test.java.i
+data/test/tools/javac/modules/ModulePermitsAttributeTest01.java.i
+data/test/tools/javac/typeAnnotations/failures/common/wildcards/DuplicateTypeAnnotation.java.i
data/test/tools/javac/Paths/SameJVM.java.i
-data/test/tools/apt/Scanners/TestEnum.java.i
+data/test/tools/javadoc/annotations/missing/Main.java.i
data/test/tools/javac/importContext/namedPackage/bar/Baz.java.i
data/test/tools/javac/proprietary/WarnImport.java.i
data/test/tools/javac/OuterParameter_1.java.i
data/src/share/classes/com/sun/tools/javadoc/FieldDocImpl.java.i
-data/test/com/sun/javadoc/testModifier/Test.java.i
-data/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java.i
-data/test/tools/javac/T6794959.java.i
-data/test/tools/javac/diags/examples/AnnosWithoutProcessors/AnnosWithoutProcessors.java.i
+data/src/share/classes/com/sun/tools/doclets/formats/html/PackageFrameWriter.java.i
+data/test/tools/javac/diags/examples/AlreadyDefinedStaticImport/p/E2.java.i
+data/test/tools/javac/warnings/FallThrough.lintAll.out.i
+data/test/tools/javadoc/enum/docComments/pkg1/Operation.java.i
data/test/tools/javac/OverrideChecks/6400189/T6400189a.java.i
data/test/tools/javac/multicatch/Neg01.java.i
-data/test/tools/javac/6857948/T6857948.java.i
+data/test/tools/javac/generics/6910550/T6910550e.out.i
data/test/tools/javac/typeAnnotations/failures/common/arrayclass/DuplicateTypeAnnotation.out.i
data/test/tools/javac/typeAnnotations/6967002/T6967002.java.i
data/test/tools/javac/7024568/T7024568.out.i
@@ -4882,17 +4909,18 @@ data/test/tools/javac/diags/examples/AnnoValueMustBeClassLiteral.java.i
data/test/com/sun/javadoc/testDocFileDir/pkg/C.java.i
data/test/tools/javac/processing/model/element/TestAnonSourceNames.java.i
data/test/com/sun/javadoc/testNavagation/pkg/A.java.i
-data/test/tools/javac/scope/6392998/T6392998.java.i
+data/test/tools/javac/generics/typevars/T7148242.java.i
+data/test/tools/javac/meth/InvokeMH_BAD72.java.i
data/test/tools/javac/enum/NoFinal2.java.i
data/test/tools/javac/diags/examples/IntNumberTooLarge.java.i
data/test/tools/javac/cast/7126754/T7126754.java.i
-data/test/tools/javac/typeAnnotations/newlocations/MethodTypeArgs.java.i
-data/test/tools/javac/DefiniteAssignment/T4704365.java.i
+data/test/tools/javah/ConstMacroTest.sh.i
+data/test/tools/javac/TryWithResources/ResourceTypeVar.java.i
data/test/tools/javac/protectedAccess/ProtectedMemberAccess5/z2/Z2.java.i
-data/test/com/sun/javadoc/testLinkOption/package-list.i
+data/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java.i
data/test/tools/javadoc/generics/genericInterface/Main.java.i
data/test/tools/javac/cast/7005095/T7005095neg.out.i
-data/test/com/sun/javadoc/testThrowsTag/pkg/T1.java.i
+data/test/tools/javac/generics/T5094318.java.i
data/test/tools/javah/6257087/foo.java.i
data/test/tools/javac/diags/examples/CantExtendIntfAnno.java.i
data/src/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor7.java.i
@@ -4901,8 +4929,8 @@ data/test/tools/javac/EmptyArray.java.i
data/test/tools/javac/diags/examples/AlreadyDefinedImport.java.i
data/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java.i
data/test/tools/javadoc/annotations/annotateMethodsFields/pkg1/A.java.i
-data/test/tools/javac/meth/InvokeMH_BAD72.java.i
-data/test/tools/javac/generics/wildcards/neg/CastFail2.java.i
-data/src/share/classes/javax/lang/model/util/TypeKindVisitor7.java.i
-data/test/tools/javac/6734819/T6734819c.out.i
+data/test/tools/javac/scope/6392998/T6392998.java.i
+data/src/share/classes/com/sun/tools/javac/main/Option.java.i
+data/test/tools/javac/IllegalAnnotation.out.i
+data/test/tools/javap/T6715767.java.i
data/test/tools/javac/diags/examples/WrongNumberTypeArgs.java.i
diff --git a/langtools/.hg/store/undo b/langtools/.hg/store/undo
index d6676e0..8d22b23 100644
Binary files a/langtools/.hg/store/undo and b/langtools/.hg/store/undo differ
diff --git a/langtools/.hg/undo.desc b/langtools/.hg/undo.desc
index 02e1264..7f5039e 100644
--- a/langtools/.hg/undo.desc
+++ b/langtools/.hg/undo.desc
@@ -1,3 +1,3 @@
-1308
+1310
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/langtools
diff --git a/langtools/.hg/undo.dirstate b/langtools/.hg/undo.dirstate
index a556b44..1c0d959 100644
Binary files a/langtools/.hg/undo.dirstate and b/langtools/.hg/undo.dirstate differ
diff --git a/langtools/.hgignore b/langtools/.hgignore
index 83cef21..e05f093 100644
--- a/langtools/.hgignore
+++ b/langtools/.hgignore
@@ -2,3 +2,4 @@
^dist/
/nbproject/private/
^.hgtip
+.DS_Store
diff --git a/langtools/.hgtags b/langtools/.hgtags
index bd3ee8d..9637074 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -151,3 +151,12 @@ ffd294128a48cbb90ce8f0569f82b61f1f164a18 jdk8-b20
bcb21abf1c4177baf4574f99709513dcd4474727 jdk8-b21
390a7828ae18324030c0546b6452d51093ffa451 jdk8-b22
601ffcc6551d5414ef871be306c3a26396cf16a7 jdk8-b23
+6c9d21ca92c41ff5fcfa76c5b7fafe0f042f4aef jdk8-b24
+520c30f85bb529a3daf5d7623764c2464f00fd19 jdk8-b25
+b556aa8a99c358469861770aebdce884e06fa178 jdk8-b26
+be456f9c64e818161c789252145d4ddc292ae863 jdk8-b27
+5bed623b0c773aa8a8d5f8d4004ce9d3974143cc jdk8-b28
+e974e82abe51ef66dc32bb6ab5d0733753d3c7d7 jdk8-b29
+08a3425f39f829502ca0ddbfb2d051c31710cb19 jdk8-b30
+b28cfbe7e8b196da954bed9a22bfd790e55333aa jdk8-b31
+be069d72dde2bfe6f996c46325a320961ca854c2 jdk8-b32
diff --git a/langtools/make/Makefile-classic b/langtools/make/Makefile-classic
index 90926d4..f73ba0b 100644
--- a/langtools/make/Makefile-classic
+++ b/langtools/make/Makefile-classic
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012 Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -115,7 +115,6 @@ JAVAC_JAR = $(LIB_DIR)/javac.jar
JAVADOC_JAR = $(LIB_DIR)/javadoc.jar
JAVAH_JAR = $(LIB_DIR)/javah.jar
JAVAP_JAR = $(LIB_DIR)/javap.jar
-APT_JAR = $(LIB_DIR)/apt.jar
CLASSES_JAR = $(DIST_DIR)/classes.jar
SRC_ZIP = $(DIST_DIR)/src.zip
@@ -163,7 +162,7 @@ endif
#----- useful macros
-TOOLS = javac javadoc javah javap apt
+TOOLS = javac javadoc javah javap
SOURCE_LEVEL = 5
BOOTSTRAP_TARGET_LEVEL = 5
@@ -319,28 +318,6 @@ $(JAVAP_JAR): $(JAVAP_JAVA_FILES) \
( $(ECHO) Main-Class: sun.tools.javap.Main ) > $(BUILD_DIR)/javap.mf
$(BOOTJAR) -cfm $@ $(BUILD_DIR)/javap.mf $(patsubst %,-C $(CLASSES_DIR) %, $(JAVAP_DIRS))
-#----- apt
-
-APT_DIRS = \
- com/sun/mirror \
- com/sun/tools/apt
-
-APT_RESOURCE_FILES = \
- $(shell find $(patsubst %,$(SRC_CLASSES_DIR)/%,$(APT_DIRS)) -name SCCS -prune -o -name \*.properties -print )
-
-APT_JAVA_FILES = \
- $(shell find $(patsubst %,$(SRC_CLASSES_DIR)/%,$(APT_DIRS)) -name SCCS -prune -o -name \*.java -print ) \
- $(patsubst $(SRC_CLASSES_DIR)/%.properties,$(GENSRC_DIR)/%.java,$(APT_RESOURCE_FILES))
-
-$(APT_JAR): $(APT_JAVA_FILES) $(JAVAC_JAR) \
- $(patsubst $(SRC_CLASSES_DIR)/%.properties,$(GENSRC_DIR)/%.java,$(APT_RESOURCE_FILES))
- $(MKDIR) -p $(CLASSES_DIR) $(@D)
- $(BOOT_JAVAC) -sourcepath "" -classpath $(CLASSES_DIR) -d $(CLASSES_DIR) -target $(TARGET_LEVEL) $(NO_PROPRIETARY_API_WARNINGS) \
- $(APT_JAVA_FILES) \
- $(patsubst $(SRC_CLASSES_DIR)/%.properties,$(GENSRC_DIR)/%.java,$(APT_RESOURCE_FILES))
- ( $(ECHO) Main-Class: com.sun.tools.apt.Main ; $(ECHO) Class-Path: javac.jar ) > $(BUILD_DIR)/apt.mf
- $(BOOTJAR) -cfm $@ $(BUILD_DIR)/apt.mf $(patsubst %,-C $(CLASSES_DIR) %, $(APT_DIRS))
-
#-----
build-tools: $(BUILDTOOLCLASSES_DIR)/CompileProperties/CompileProperties.class
@@ -366,7 +343,7 @@ $(BUILDTOOLCLASSES_DIR)/%.class : $(BUILDTOOLSRC_DIR)/%.java
#----- all classes
-$(DIST_DIR)/%/classes.jar: $(JAVAC_JAR) $(JAVADOC_JAR) $(JAVAH_JAR) $(JAVAP_JAR) $(APT_JAR)
+$(DIST_DIR)/%/classes.jar: $(JAVAC_JAR) $(JAVADOC_JAR) $(JAVAH_JAR) $(JAVAP_JAR)
$(MKDIR) -p $(@D)
$(BOOTJAR) -cf $@ -C $(CLASSES_DIR) .
@@ -401,7 +378,6 @@ quick-check: $(patsubst %, $(DIST_LIB_DIR)/%.jar, $(TOOLS))
- $(TESTJAVA) -jar $(JAVADOC_JAR) -version
$(TESTJAVA) -jar $(JAVAH_JAR) -version
- $(TESTJAVA) -jar $(JAVAP_JAR) -version
- $(TESTJAVA) -jar $(APT_JAR) -version
#-----
diff --git a/langtools/make/build.properties b/langtools/make/build.properties
index bcd70b8..6f9ebf7 100644
--- a/langtools/make/build.properties
+++ b/langtools/make/build.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -195,19 +195,6 @@ javap.tests = \
#
-apt.includes = \
- com/sun/mirror/ \
- com/sun/tools/apt/
-
-apt.tests = \
- tools/apt/
-
-apt.module.name = jdk.apt
-apt.module.includes = \
- com/sun/tools/apt/**
-
-#
-
# The following files require the latest JDK to be available.
# The API can be provided by using a suitable boot.java.home
# or by setting import.jdk
diff --git a/langtools/make/build.xml b/langtools/make/build.xml
index 6309d26..f6aa960 100644
--- a/langtools/make/build.xml
+++ b/langtools/make/build.xml
@@ -83,7 +83,7 @@
- global property definitions
- general top level targets
- general diagnostic/debugging targets
- - groups of targets for each tool: javac, javadoc, doclets, javah, javap, apt
+ - groups of targets for each tool: javac, javadoc, doclets, javah, javap
Within each group, the following targets are provided, where applicable
build-bootstrap-TOOL build the bootstrap version of the tool
build-classes-TOOL build the classes for the tool
@@ -294,11 +294,11 @@
/>
<target name="build-all-tools"
- depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap,build-apt"
+ depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap"
/>
<target name="build-all-classes" depends="build-bootstrap-javac,-create-import-jdk-stubs">
- <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes} ${apt.includes}"/>
+ <build-classes includes="${javac.includes} ${javadoc.includes} ${doclets.includes} ${javah.includes} ${javap.includes}"/>
</target>
<!-- clean -->
@@ -752,73 +752,6 @@
<!--
- **** apt targets.
- -->
-
- <target name="build-bootstrap-classes-apt"
- depends="build-bootstrap-classes-javac">
- <build-bootstrap-classes includes="${apt.includes}"/>
- </target>
-
- <target name="build-bootstrap-module-apt"
- depends="build-bootstrap-classes-apt,build-bootstrap-module-mirror,build-bootstrap-module-langtools"
- if="boot.java.provides.modules">
- <build-bootstrap-module module.name="${apt.module.name}"
- includes="${apt.module.includes}"
- />
- </target>
-
- <target name="build-bootstrap-apt"
- depends="build-bootstrap-classes-apt,build-bootstrap-module-apt,build-bootstrap-javac">
- <build-bootstrap-jar name="apt" includes="${apt.includes}"
- jarclasspath="javac.jar"/>
- <build-bootstrap-tool name="apt"/>
- </target>
-
- <target name="build-classes-apt" depends="build-classes-javac">
- <build-classes includes="${apt.includes}"/>
- </target>
-
- <target name="build-module-apt" depends="build-classes-apt,build-module-mirror,build-module-langtools"
- if="target.java.provides.modules">
- <build-module module.name="${apt.module.name}" includes="${apt.module.includes}"/>
- </target>
-
- <target name="build-apt" depends="build-javac,build-classes-apt,build-module-apt">
- <build-jar name="apt" includes="${apt.includes}" jarclasspath="javac.jar"/>
- <build-tool name="apt"/>
- </target>
-
- <target name="javadoc-apt" depends="build-apt,-def-javadoc-tool">
- <javadoc-tool name="apt" includes="${apt.includes}"/>
- </target>
-
-
- <target name="jtreg-apt" depends="build-apt,-def-jtreg">
- <jtreg-tool name="apt" tests="${apt.tests}"/>
- </target>
-
- <target name="findbugs-apt" depends="build-apt,-def-findbugs">
- <findbugs-tool name="apt"/>
- </target>
-
- <target name="apt" depends="build-apt,jtreg-apt,findbugs-apt"/>
-
- <!-- mirror module targets -->
-
- <target name="build-bootstrap-module-mirror"
- depends="build-bootstrap-classes-javac,-def-build-bootstrap-module"
- if="boot.java.provides.modules">
- <build-bootstrap-module module.name="${mirror.module.name}" includes="${mirror.module.includes}"/>
- </target>
-
- <target name="build-module-mirror" depends="build-classes-javac,-def-build-module"
- if="target.java.provides.modules">
- <build-module module.name="${mirror.module.name}" includes="${mirror.module.includes}"/>
- </target>
-
-
- <!--
**** Create import JDK stubs.
-->
@@ -1103,7 +1036,8 @@
source="${boot.javac.source}"
target="${boot.javac.target}"
executable="${boot.java.home}/bin/javac"
- srcdir="${make.tools.dir}/CompileProperties"
+ srcdir="${make.tools.dir}"
+ includes="compileproperties/* anttasks/CompileProperties*"
destdir="${build.toolclasses.dir}/"
classpath="${ant.core.lib}"
bootclasspath="${boot.java.home}/jre/lib/rt.jar"
@@ -1111,7 +1045,7 @@
<compilerarg line="${javac.lint.opts}"/>
</javac>
<taskdef name="pcompile"
- classname="CompilePropertiesTask"
+ classname="anttasks.CompilePropertiesTask"
classpath="${build.toolclasses.dir}/"/>
</target>
@@ -1121,7 +1055,8 @@
source="${boot.javac.source}"
target="${boot.javac.target}"
executable="${boot.java.home}/bin/javac"
- srcdir="${make.tools.dir}/GenStubs"
+ srcdir="${make.tools.dir}"
+ includes="genstubs/* anttasks/GenStubs*"
destdir="${build.toolclasses.dir}/"
classpath="${ant.core.lib}"
includeantruntime="false">
@@ -1129,7 +1064,7 @@
<compilerarg line="${javac.lint.opts}"/>
</javac>
<taskdef name="genstubs"
- classname="GenStubs$$Ant"
+ classname="anttasks.GenStubsTask"
classpath="${build.toolclasses.dir}/"/>
</target>
@@ -1172,7 +1107,6 @@
<filename name="java/"/>
<filename name="javax/"/>
<filename name="com/sun/javadoc/"/>
- <filename name="com/sun/mirror/"/>
<filename name="com/sun/source/"/>
</or>
</packageset>
@@ -1210,7 +1144,7 @@
samevm="@{samevm}" verbose="@{verbose}"
failonerror="false" resultproperty="jtreg.@{name}.result"
javacoptions="-g"
- vmoptions="${coverage.options} -Xbootclasspath/p:${coverage.classpath}:${build.classes.dir} @{jpda.jvmargs}">
+ vmoptions="${coverage.options} -Xbootclasspath/p:${coverage.classpath}${path.separator}${build.classes.dir} @{jpda.jvmargs}">
<arg line="@{keywords}"/>
<arg line="@{options}"/>
<arg line="@{tests}"/>
diff --git a/langtools/make/jprt.properties b/langtools/make/jprt.properties
index a4ef7fd..a459321 100644
--- a/langtools/make/jprt.properties
+++ b/langtools/make/jprt.properties
@@ -39,6 +39,7 @@ jprt.build.targets= \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
+ macosx_x64_10.7-{product|fastdebug}, \
windows_i586_5.1-{product|fastdebug}, \
windows_x64_5.2-{product|fastdebug}
@@ -50,6 +51,7 @@ jprt.my.test.target.set= \
solaris_x64_5.10-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
+ macosx_x64_10.7-product-c2-TESTNAME, \
windows_i586_5.1-product-c1-TESTNAME, \
windows_x64_5.2-product-c2-TESTNAME
@@ -60,3 +62,18 @@ jprt.make.rule.test.targets= \
# Directories to be excluded from the source bundles
jprt.bundle.exclude.src.dirs=build dist webrev
+# Test target list (no fastdebug & limited c2 testing)
+jprt.my.test.target.set= \
+ solaris_sparc_5.10-product-c1-TESTNAME, \
+ solaris_sparcv9_5.10-product-c2-TESTNAME, \
+ solaris_i586_5.10-product-c1-TESTNAME, \
+ solaris_x64_5.10-product-c2-TESTNAME, \
+ linux_i586_2.6-product-{c1|c2}-TESTNAME, \
+ linux_x64_2.6-product-c2-TESTNAME, \
+ macosx_x64_10.7-product-c2-TESTNAME, \
+ windows_i586_5.1-product-c1-TESTNAME, \
+ windows_x64_5.2-product-c2-TESTNAME
+
+# Default test targets
+jprt.make.rule.test.targets= \
+ ${jprt.my.test.target.set:TESTNAME=jtreg}
diff --git a/langtools/make/netbeans/README b/langtools/make/netbeans/README
index 58cfec0..308e6af 100644
--- a/langtools/make/netbeans/README
+++ b/langtools/make/netbeans/README
@@ -7,7 +7,7 @@ edit, run, test and debug the tools in the OpenJDK langtools
repository.
The repository contains a number of tools:
- apt, javac, javadoc and its doclets, javah and javap.
+ javac, javadoc and its doclets, javah and javap.
Build Properties.
diff --git a/langtools/make/netbeans/langtools/build.xml b/langtools/make/netbeans/langtools/build.xml
index d7e8f37..dd2caf9 100644
--- a/langtools/make/netbeans/langtools/build.xml
+++ b/langtools/make/netbeans/langtools/build.xml
@@ -261,7 +261,8 @@
<target name="-def-select-tool">
<mkdir dir="${build.toolclasses.dir}"/>
- <javac srcdir="${make.tools.dir}/SelectTool"
+ <javac srcdir="${make.tools.dir}"
+ includes="anttasks/SelectTool*"
destdir="${build.toolclasses.dir}/"
classpath="${ant.core.lib}"
includeantruntime="false"
@@ -270,7 +271,7 @@
<compilerarg line="-Xlint"/>
</javac>
<taskdef name="select-tool"
- classname="SelectToolTask"
+ classname="anttasks.SelectToolTask"
classpath="${build.toolclasses.dir}/"/>
</target>
diff --git a/langtools/make/test/lib/apt.sh b/langtools/make/test/lib/apt.sh
deleted file mode 100644
index 52077a1..0000000
--- a/langtools/make/test/lib/apt.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
-# 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
-# @summary Verify the basic execution of the apt classes in classes.jar.
-
-TESTSRC=${TESTSRC:-.}
-TOPDIR=${TESTSRC}/../../..
-TESTJAVAEXE="${TESTJAVA:+${TESTJAVA}/bin/}java"
-
-"${TESTJAVAEXE}" -Xbootclasspath/p:${TOPDIR}/dist/lib/classes.jar \
- com.sun.tools.apt.Main \
- -print "${TESTSRC}"/../HelloWorld.java > apt.tmp
-
-if diff ${TESTSRC}/../HelloWorld.apt.gold.txt apt.tmp ; then
- echo "Test passed."
-else
- echo "Test failed."
- exit 1
-fi
diff --git a/langtools/make/test/lib/src.gold.txt b/langtools/make/test/lib/src.gold.txt
index 921d5e2..84ccb50 100644
--- a/langtools/make/test/lib/src.gold.txt
+++ b/langtools/make/test/lib/src.gold.txt
@@ -1,14 +1,4 @@
com/sun/javadoc/package.html
-com/sun/mirror/apt/package.html
-com/sun/mirror/declaration/package.html
-com/sun/mirror/overview.html
-com/sun/mirror/type/package.html
-com/sun/mirror/util/package.html
-com/sun/tools/apt/Main.java
-com/sun/tools/apt/main/Main.java
-com/sun/tools/apt/resources/apt.properties
-com/sun/tools/apt/resources/apt_ja.properties
-com/sun/tools/apt/resources/apt_zh_CN.properties
com/sun/tools/doclets/formats/html/markup/package.html
com/sun/tools/doclets/formats/html/package.html
com/sun/tools/doclets/formats/html/resources/standard.properties
diff --git a/langtools/make/tools/CompileProperties/CompileProperties.java b/langtools/make/tools/CompileProperties/CompileProperties.java
deleted file mode 100644
index c4654bf..0000000
--- a/langtools/make/tools/CompileProperties/CompileProperties.java
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-
-/** Translates a .properties file into a .java file containing the
- * definition of a java.util.Properties subclass which can then be
- * compiled with javac. <P>
- *
- * Usage: java CompileProperties [path to .properties file] [path to .java file to be output] [super class]
- *
- * Infers the package by looking at the common suffix of the two
- * inputs, eliminating "classes" from it.
- *
- * @author Scott Violet
- * @author Kenneth Russell
- */
-
-public class CompileProperties {
-
- public static void main(String[] args) {
- CompileProperties cp = new CompileProperties();
- boolean ok = cp.run(args);
- if ( !ok ) {
- System.exit(1);
- }
- }
-
- static interface Log {
- void info(String msg);
- void verbose(String msg);
- void error(String msg, Exception e);
- }
-
- private String propfiles[];
- private String outfiles[] ;
- private String supers[] ;
- private int compileCount = 0;
- private boolean quiet = false;
- private Log log;
-
- public void setLog(Log log) {
- this.log = log;
- }
-
- public boolean run(String[] args) {
- if (log == null) {
- log = new Log() {
- public void error(String msg, Exception e) {
- System.err.println("ERROR: CompileProperties: " + msg);
- if ( e != null ) {
- System.err.println("EXCEPTION: " + e.toString());
- e.printStackTrace();
- }
- }
- public void info(String msg) {
- System.out.println(msg);
- }
- public void verbose(String msg) {
- if (!quiet)
- System.out.println(msg);
- }
- };
- }
-
- boolean ok = true;
- /* Original usage */
- if (args.length == 2 && args[0].charAt(0) != '-' ) {
- ok = createFile(args[0], args[1], "java.util.ListResourceBundle");
- } else if (args.length == 3) {
- ok = createFile(args[0], args[1], args[2]);
- } else if (args.length == 0) {
- usage(log);
- ok = false;
- } else {
- /* New batch usage */
- ok = parseOptions(args);
- if ( ok && compileCount == 0 ) {
- log.error("options parsed but no files to compile", null);
- ok = false;
- }
- /* Need at least one file. */
- if ( !ok ) {
- usage(log);
- } else {
- /* Process files */
- for ( int i = 0; i < compileCount && ok ; i++ ) {
- ok = createFile(propfiles[i], outfiles[i], supers[i]);
- }
- }
- }
- return ok;
- }
-
- private boolean parseOptions(String args[]) {
- boolean ok = true;
- if ( compileCount > 0 ) {
- String new_propfiles[] = new String[compileCount + args.length];
- String new_outfiles[] = new String[compileCount + args.length];
- String new_supers[] = new String[compileCount + args.length];
- System.arraycopy(propfiles, 0, new_propfiles, 0, compileCount);
- System.arraycopy(outfiles, 0, new_outfiles, 0, compileCount);
- System.arraycopy(supers, 0, new_supers, 0, compileCount);
- propfiles = new_propfiles;
- outfiles = new_outfiles;
- supers = new_supers;
- } else {
- propfiles = new String[args.length];
- outfiles = new String[args.length];
- supers = new String[args.length];
- }
-
- for ( int i = 0; i < args.length ; i++ ) {
- if ( "-compile".equals(args[i]) && i+3 < args.length ) {
- propfiles[compileCount] = args[++i];
- outfiles[compileCount] = args[++i];
- supers[compileCount] = args[++i];
- compileCount++;
- } else if ( "-optionsfile".equals(args[i]) && i+1 < args.length ) {
- String filename = args[++i];
- FileInputStream finput = null;
- byte contents[] = null;
- try {
- finput = new FileInputStream(filename);
- int byteCount = finput.available();
- if ( byteCount <= 0 ) {
- log.error("The -optionsfile file is empty", null);
- ok = false;
- } else {
- contents = new byte[byteCount];
- int bytesRead = finput.read(contents);
- if ( byteCount != bytesRead ) {
- log.error("Cannot read all of -optionsfile file", null);
- ok = false;
- }
- }
- } catch ( IOException e ) {
- log.error("cannot open " + filename, e);
- ok = false;
- }
- if ( finput != null ) {
- try {
- finput.close();
- } catch ( IOException e ) {
- ok = false;
- log.error("cannot close " + filename, e);
- }
- }
- if ( ok = true && contents != null ) {
- String tokens[] = (new String(contents)).split("\\s+");
- if ( tokens.length > 0 ) {
- ok = parseOptions(tokens);
- }
- }
- if ( !ok ) {
- break;
- }
- } else if ( "-quiet".equals(args[i]) ) {
- quiet = true;
- } else {
- log.error("argument error", null);
- ok = false;
- }
- }
- return ok;
- }
-
- private boolean createFile(String propertiesPath, String outputPath,
- String superClass) {
- boolean ok = true;
- log.verbose("parsing: " + propertiesPath);
- Properties p = new Properties();
- try {
- p.load(new FileInputStream(propertiesPath));
- } catch ( FileNotFoundException e ) {
- ok = false;
- log.error("Cannot find file " + propertiesPath, e);
- } catch ( IOException e ) {
- ok = false;
- log.error("IO error on file " + propertiesPath, e);
- }
- if ( ok ) {
- String packageName = inferPackageName(propertiesPath, outputPath);
- log.verbose("inferred package name: " + packageName);
- List<String> sortedKeys = new ArrayList<String>();
- for ( Object key : p.keySet() ) {
- sortedKeys.add((String)key);
- }
- Collections.sort(sortedKeys);
- Iterator<String> keys = sortedKeys.iterator();
-
- StringBuffer data = new StringBuffer();
-
- while (keys.hasNext()) {
- String key = keys.next();
- data.append(" { \"" + escape(key) + "\", \"" +
- escape((String)p.get(key)) + "\" },\n");
- }
-
- // Get class name from java filename, not the properties filename.
- // (zh_TW properties might be used to create zh_HK files)
- File file = new File(outputPath);
- String name = file.getName();
- int dotIndex = name.lastIndexOf('.');
- String className;
- if (dotIndex == -1) {
- className = name;
- } else {
- className = name.substring(0, dotIndex);
- }
-
- String packageString = "";
- if (packageName != null && !packageName.equals("")) {
- packageString = "package " + packageName + ";\n\n";
- }
-
- Writer writer = null;
- try {
- writer = new BufferedWriter(
- new OutputStreamWriter(new FileOutputStream(outputPath), "8859_1"));
- MessageFormat format = new MessageFormat(FORMAT);
- writer.write(format.format(new Object[] { packageString, className, superClass, data }));
- } catch ( IOException e ) {
- ok = false;
- log.error("IO error writing to file " + outputPath, e);
- }
- if ( writer != null ) {
- try {
- writer.flush();
- } catch ( IOException e ) {
- ok = false;
- log.error("IO error flush " + outputPath, e);
- }
- try {
- writer.close();
- } catch ( IOException e ) {
- ok = false;
- log.error("IO error close " + outputPath, e);
- }
- }
- log.verbose("wrote: " + outputPath);
- }
- return ok;
- }
-
- private static void usage(Log log) {
- log.info("usage:");
- log.info(" java CompileProperties path_to_properties_file path_to_java_output_file [super_class]");
- log.info(" -OR-");
- log.info(" java CompileProperties {-compile path_to_properties_file path_to_java_output_file super_class} -or- -optionsfile filename");
- log.info("");
- log.info("Example:");
- log.info(" java CompileProperties -compile test.properties test.java java.util.ListResourceBundle");
- log.info(" java CompileProperties -optionsfile option_file");
- log.info("option_file contains: -compile test.properties test.java java.util.ListResourceBundle");
- }
-
- private static String escape(String theString) {
- // This is taken from Properties.saveConvert with changes for Java strings
- int len = theString.length();
- StringBuffer outBuffer = new StringBuffer(len*2);
-
- for(int x=0; x<len; x++) {
- char aChar = theString.charAt(x);
- switch(aChar) {
- case '\\':outBuffer.append('\\'); outBuffer.append('\\');
- break;
- case '\t':outBuffer.append('\\'); outBuffer.append('t');
- break;
- case '\n':outBuffer.append('\\'); outBuffer.append('n');
- break;
- case '\r':outBuffer.append('\\'); outBuffer.append('r');
- break;
- case '\f':outBuffer.append('\\'); outBuffer.append('f');
- break;
- default:
- if ((aChar < 0x0020) || (aChar > 0x007e)) {
- outBuffer.append('\\');
- outBuffer.append('u');
- outBuffer.append(toHex((aChar >> 12) & 0xF));
- outBuffer.append(toHex((aChar >> 8) & 0xF));
- outBuffer.append(toHex((aChar >> 4) & 0xF));
- outBuffer.append(toHex( aChar & 0xF));
- } else {
- if (specialSaveChars.indexOf(aChar) != -1) {
- outBuffer.append('\\');
- }
- outBuffer.append(aChar);
- }
- }
- }
- return outBuffer.toString();
- }
-
- private static String inferPackageName(String inputPath, String outputPath) {
- // Normalize file names
- inputPath = new File(inputPath).getPath();
- outputPath = new File(outputPath).getPath();
- // Split into components
- String sep;
- if (File.separatorChar == '\\') {
- sep = "\\\\";
- } else {
- sep = File.separator;
- }
- String[] inputs = inputPath.split(sep);
- String[] outputs = outputPath.split(sep);
- // Match common names, eliminating first "classes" entry from
- // each if present
- int inStart = 0;
- int inEnd = inputs.length - 2;
- int outEnd = outputs.length - 2;
- int i = inEnd;
- int j = outEnd;
- while (i >= 0 && j >= 0) {
- if (!inputs[i].equals(outputs[j]) ||
- (inputs[i].equals("gensrc") && inputs[j].equals("gensrc"))) {
- ++i;
- ++j;
- break;
- }
- --i;
- --j;
- }
- String result;
- if (i < 0 || j < 0 || i >= inEnd || j >= outEnd) {
- result = "";
- } else {
- if (inputs[i].equals("classes") && outputs[j].equals("classes")) {
- ++i;
- }
- inStart = i;
- StringBuffer buf = new StringBuffer();
- for (i = inStart; i <= inEnd; i++) {
- buf.append(inputs[i]);
- if (i < inEnd) {
- buf.append('.');
- }
- }
- result = buf.toString();
- }
- return result;
- }
-
- private static final String FORMAT =
- "{0}" +
- "public final class {1} extends {2} '{'\n" +
- " protected final Object[][] getContents() '{'\n" +
- " return new Object[][] '{'\n" +
- "{3}" +
- " };\n" +
- " }\n" +
- "}\n";
-
- // This comes from Properties
- private static char toHex(int nibble) {
- return hexDigit[(nibble & 0xF)];
- }
-
- // This comes from Properties
- private static final char[] hexDigit = {
- '0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'
- };
-
- // Note: different from that in Properties
- private static final String specialSaveChars = "\"";
-}
diff --git a/langtools/make/tools/CompileProperties/CompilePropertiesTask.java b/langtools/make/tools/CompileProperties/CompilePropertiesTask.java
deleted file mode 100644
index 8bf3303..0000000
--- a/langtools/make/tools/CompileProperties/CompilePropertiesTask.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-
-public class CompilePropertiesTask extends MatchingTask {
- public void setSrcDir(File srcDir) {
- this.srcDir = srcDir;
- }
-
- public void setDestDir(File destDir) {
- this.destDir = destDir;
- }
-
- public void setSuperclass(String superclass) {
- this.superclass = superclass;
- }
-
- @Override
- public void execute() {
- CompileProperties.Log log = new CompileProperties.Log() {
- public void error(String msg, Exception e) {
- log(msg, Project.MSG_ERR);
- }
- public void info(String msg) {
- log(msg, Project.MSG_INFO);
- }
- public void verbose(String msg) {
- log(msg, Project.MSG_VERBOSE);
- }
- };
- List<String> mainOpts = new ArrayList<String>();
- int count = 0;
- DirectoryScanner s = getDirectoryScanner(srcDir);
- for (String path: s.getIncludedFiles()) {
- if (path.endsWith(".properties")) {
- String destPath =
- path.substring(0, path.length() - ".properties".length()) +
- ".java";
- File srcFile = new File(srcDir, path);
- File destFile = new File(destDir, destPath);
- // Arguably, the comparison in the next line should be ">", not ">="
- // but that assumes the resolution of the last modified time is fine
- // grained enough; in practice, it is better to use ">=".
- if (destFile.exists() && destFile.lastModified() >= srcFile.lastModified())
- continue;
- destFile.getParentFile().mkdirs();
- mainOpts.add("-compile");
- mainOpts.add(srcFile.getPath());
- mainOpts.add(destFile.getPath());
- mainOpts.add(superclass);
- count++;
- }
- }
- if (mainOpts.size() > 0) {
- log("Generating " + count + " resource files to " + destDir, Project.MSG_INFO);
- CompileProperties cp = new CompileProperties();
- cp.setLog(log);
- boolean ok = cp.run(mainOpts.toArray(new String[mainOpts.size()]));
- if (!ok)
- throw new BuildException("CompileProperties failed.");
- }
- }
-
- private File srcDir;
- private File destDir;
- private String superclass = "java.util.ListResourceBundle";
-}
diff --git a/langtools/make/tools/GenStubs/GenStubs.java b/langtools/make/tools/GenStubs/GenStubs.java
deleted file mode 100644
index c3c39f3..0000000
--- a/langtools/make/tools/GenStubs/GenStubs.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-import java.io.*;
-import java.util.*;
-import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.taskdefs.MatchingTask;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.Reference;
-
-
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.util.JavacTask;
-import com.sun.tools.javac.api.JavacTool;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.TypeTags;
-import com.sun.tools.javac.tree.JCTree;
-import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
-import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
-import com.sun.tools.javac.tree.JCTree.JCIdent;
-import com.sun.tools.javac.tree.JCTree.JCImport;
-import com.sun.tools.javac.tree.JCTree.JCLiteral;
-import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
-import com.sun.tools.javac.tree.JCTree.JCModifiers;
-import com.sun.tools.javac.tree.JCTree.JCVariableDecl;
-import com.sun.tools.javac.tree.Pretty;
-import com.sun.tools.javac.tree.TreeMaker;
-import com.sun.tools.javac.tree.TreeScanner;
-import com.sun.tools.javac.tree.TreeTranslator;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.ListBuffer;
-import com.sun.tools.javac.util.Name;
-import javax.tools.JavaFileManager;
-
-/**
- * Generate stub source files by removing implementation details from input files.
- *
- * This is a special purpose stub generator, specific to the needs of generating
- * stub files for JDK 7 API that are needed to compile langtools files that depend
- * on that API. The stub generator works by removing as much of the API source code
- * as possible without affecting the public signature, in order to reduce the
- * transitive closure of the API being referenced. The resulting stubs can be
- * put on the langtools sourcepath with -implicit:none to compile the langtools
- * files that depend on the JDK 7 API.
- *
- * Usage:
- * genstubs -s <outdir> -sourcepath <path> <classnames>
- *
- * The specified class names are looked up on the sourcepath, and corresponding
- * stubs are written to the source output directory.
- *
- * Classes are parsed into javac ASTs, then processed with a javac TreeTranslator
- * to remove implementation details, and written out in the source output directory.
- * Documentation comments and annotations are removed. Method bodies are removed
- * and methods are marked native. Private and package-private field definitions
- * have their initializers replace with 0, 0.0, false, null as appropriate.
- *
- * An Ant task, Main$Ant is also provided. Files are specified with an implicit
- * fileset, using srcdir as a base directory. The set of files to be included
- * is specified with an includes attribute or nested <includes> set. However,
- * unlike a normal fileset, an empty includes attribute means "no files" instead
- * of "all files". The Ant task also accepts "fork=true" and classpath attribute
- * or nested <classpath> element to run GenStubs in a separate VM with the specified
- * path. This is likely necessary if a JDK 7 parser is required to read the
- * JDK 7 input files.
- */
-
-public class GenStubs {
- static class Fault extends Exception {
- private static final long serialVersionUID = 0;
- Fault(String message) {
- super(message);
- }
- Fault(String message, Throwable cause) {
- super(message);
- initCause(cause);
- }
- }
-
- public static void main(String[] args) {
- boolean ok = new GenStubs().run(args);
- if (!ok)
- System.exit(1);
- }
-
- boolean run(String... args) {
- File outdir = null;
- String sourcepath = null;
- List<String> classes = new ArrayList<String>();
- for (ListIterator<String> iter = Arrays.asList(args).listIterator(); iter.hasNext(); ) {
- String arg = iter.next();
- if (arg.equals("-s") && iter.hasNext())
- outdir = new File(iter.next());
- else if (arg.equals("-sourcepath") && iter.hasNext())
- sourcepath = iter.next();
- else if (arg.startsWith("-"))
- throw new IllegalArgumentException(arg);
- else {
- classes.add(arg);
- while (iter.hasNext())
- classes.add(iter.next());
- }
- }
-
- return run(sourcepath, outdir, classes);
- }
-
- boolean run(String sourcepath, File outdir, List<String> classes) {
- //System.err.println("run: sourcepath:" + sourcepath + " outdir:" + outdir + " classes:" + classes);
- if (sourcepath == null)
- throw new IllegalArgumentException("sourcepath not set");
- if (outdir == null)
- throw new IllegalArgumentException("source output dir not set");
-
- JavacTool tool = JavacTool.create();
- StandardJavaFileManager fm = tool.getStandardFileManager(null, null, null);
-
- try {
- fm.setLocation(StandardLocation.SOURCE_OUTPUT, Collections.singleton(outdir));
- fm.setLocation(StandardLocation.SOURCE_PATH, splitPath(sourcepath));
- List<JavaFileObject> files = new ArrayList<JavaFileObject>();
- for (String c: classes) {
- JavaFileObject fo = fm.getJavaFileForInput(
- StandardLocation.SOURCE_PATH, c, JavaFileObject.Kind.SOURCE);
- if (fo == null)
- error("class not found: " + c);
- else
- files.add(fo);
- }
-
- JavacTask t = tool.getTask(null, fm, null, null, null, files);
- Iterable<? extends CompilationUnitTree> trees = t.parse();
- for (CompilationUnitTree tree: trees) {
- makeStub(fm, tree);
- }
- } catch (IOException e) {
- error("IO error " + e, e);
- }
-
- return (errors == 0);
- }
-
- void makeStub(StandardJavaFileManager fm, CompilationUnitTree tree) throws IOException {
- CompilationUnitTree tree2 = new StubMaker().translate(tree);
- CompilationUnitTree tree3 = new ImportCleaner(fm).removeRedundantImports(tree2);
-
- String className = fm.inferBinaryName(StandardLocation.SOURCE_PATH, tree.getSourceFile());
- JavaFileObject fo = fm.getJavaFileForOutput(StandardLocation.SOURCE_OUTPUT,
- className, JavaFileObject.Kind.SOURCE, null);
- // System.err.println("Writing " + className + " to " + fo.getName());
- Writer out = fo.openWriter();
- try {
- new Pretty(out, true).printExpr((JCTree) tree3);
- } finally {
- out.close();
- }
- }
-
- List<File> splitPath(String path) {
- List<File> list = new ArrayList<File>();
- for (String p: path.split(File.pathSeparator)) {
- if (p.length() > 0)
- list.add(new File(p));
- }
- return list;
- }
-
- void error(String message) {
- System.err.println(message);
- errors++;
- }
-
- void error(String message, Throwable cause) {
- error(message);
- }
-
- int errors;
-
- class StubMaker extends TreeTranslator {
- CompilationUnitTree translate(CompilationUnitTree tree) {
- return super.translate((JCCompilationUnit) tree);
- }
-
- /**
- * compilation units: remove javadoc comments
- * -- required, in order to remove @deprecated tags, since we
- * (separately) remove all annotations, including @Deprecated
- */
- public void visitTopLevel(JCCompilationUnit tree) {
- super.visitTopLevel(tree);
- tree.docComments = Collections.emptyMap();
- }
-
- /**
- * methods: remove method bodies, make methods native
- */
- @Override
- public void visitMethodDef(JCMethodDecl tree) {
- tree.mods = translate(tree.mods);
- tree.restype = translate(tree.restype);
- tree.typarams = translateTypeParams(tree.typarams);
- tree.params = translateVarDefs(tree.params);
- tree.thrown = translate(tree.thrown);
- if (tree.restype != null && tree.body != null) {
- tree.mods.flags |= Flags.NATIVE;
- tree.body = null;
- }
- result = tree;
- }
-
- /**
- * modifiers: remove annotations
- */
- @Override
- public void visitModifiers(JCModifiers tree) {
- tree.annotations = com.sun.tools.javac.util.List.nil();
- result = tree;
- }
-
- /**
- * field definitions: replace initializers with 0, 0.0, false etc
- * when possible -- i.e. leave public, protected initializers alone
- */
- @Override
- public void visitVarDef(JCVariableDecl tree) {
- tree.mods = translate(tree.mods);
- tree.vartype = translate(tree.vartype);
- if (tree.init != null) {
- if ((tree.mods.flags & (Flags.PUBLIC | Flags.PROTECTED)) != 0)
- tree.init = translate(tree.init);
- else {
- String t = tree.vartype.toString();
- if (t.equals("boolean"))
- tree.init = new JCLiteral(TypeTags.BOOLEAN, 0) { };
- else if (t.equals("byte"))
- tree.init = new JCLiteral(TypeTags.BYTE, 0) { };
- else if (t.equals("char"))
- tree.init = new JCLiteral(TypeTags.CHAR, 0) { };
- else if (t.equals("double"))
- tree.init = new JCLiteral(TypeTags.DOUBLE, 0.d) { };
- else if (t.equals("float"))
- tree.init = new JCLiteral(TypeTags.FLOAT, 0.f) { };
- else if (t.equals("int"))
- tree.init = new JCLiteral(TypeTags.INT, 0) { };
- else if (t.equals("long"))
- tree.init = new JCLiteral(TypeTags.LONG, 0) { };
- else if (t.equals("short"))
- tree.init = new JCLiteral(TypeTags.SHORT, 0) { };
- else
- tree.init = new JCLiteral(TypeTags.BOT, null) { };
- }
- }
- result = tree;
- }
- }
-
- class ImportCleaner extends TreeScanner {
- private Set<Name> names = new HashSet<Name>();
- private TreeMaker m;
-
- ImportCleaner(JavaFileManager fm) {
- // ImportCleaner itself doesn't require a filemanager, but instantiating
- // a TreeMaker does, indirectly (via ClassReader, sigh)
- Context c = new Context();
- c.put(JavaFileManager.class, fm);
- m = TreeMaker.instance(c);
- }
-
- CompilationUnitTree removeRedundantImports(CompilationUnitTree t) {
- JCCompilationUnit tree = (JCCompilationUnit) t;
- tree.accept(this);
- ListBuffer<JCTree> defs = new ListBuffer<JCTree>();
- for (JCTree def: tree.defs) {
- if (def.hasTag(JCTree.Tag.IMPORT)) {
- JCImport imp = (JCImport) def;
- if (imp.qualid.hasTag(JCTree.Tag.SELECT)) {
- JCFieldAccess qualid = (JCFieldAccess) imp.qualid;
- if (!qualid.name.toString().equals("*")
- && !names.contains(qualid.name)) {
- continue;
- }
- }
- }
- defs.add(def);
- }
- return m.TopLevel(defs.toList());
- }
-
- @Override
- public void visitImport(JCImport tree) { } // ignore names found in imports
-
- @Override
- public void visitIdent(JCIdent tree) {
- names.add(tree.name);
- }
-
- @Override
- public void visitSelect(JCFieldAccess tree) {
- super.visitSelect(tree);
- names.add(tree.name);
- }
- }
-
- //---------- Ant Invocation ------------------------------------------------
-
- public static class Ant extends MatchingTask {
- private File srcDir;
- private File destDir;
- private boolean fork;
- private Path classpath;
- private String includes;
-
- public void setSrcDir(File dir) {
- this.srcDir = dir;
- }
-
- public void setDestDir(File dir) {
- this.destDir = dir;
- }
-
- public void setFork(boolean v) {
- this.fork = v;
- }
-
- public void setClasspath(Path cp) {
- if (classpath == null)
- classpath = cp;
- else
- classpath.append(cp);
- }
-
- public Path createClasspath() {
- if (classpath == null) {
- classpath = new Path(getProject());
- }
- return classpath.createPath();
- }
-
- public void setClasspathRef(Reference r) {
- createClasspath().setRefid(r);
- }
-
- public void setIncludes(String includes) {
- super.setIncludes(includes);
- this.includes = includes;
- }
-
- @Override
- public void execute() {
- if (includes != null && includes.trim().isEmpty())
- return;
-
- DirectoryScanner s = getDirectoryScanner(srcDir);
- String[] files = s.getIncludedFiles();
-// System.err.println("Ant.execute: srcDir " + srcDir);
-// System.err.println("Ant.execute: destDir " + destDir);
-// System.err.println("Ant.execute: files " + Arrays.asList(files));
-
- files = filter(srcDir, destDir, files);
- if (files.length == 0)
- return;
- System.out.println("Generating " + files.length + " stub files to " + destDir);
-
- List<String> classNames = new ArrayList<String>();
- for (String file: files) {
- classNames.add(file.replaceAll(".java$", "").replace('/', '.'));
- }
-
- if (!fork) {
- GenStubs m = new GenStubs();
- boolean ok = m.run(srcDir.getPath(), destDir, classNames);
- if (!ok)
- throw new BuildException("genstubs failed");
- } else {
- List<String> cmd = new ArrayList<String>();
- String java_home = System.getProperty("java.home");
- cmd.add(new File(new File(java_home, "bin"), "java").getPath());
- if (classpath != null)
- cmd.add("-Xbootclasspath/p:" + classpath);
- cmd.add(GenStubs.class.getName());
- cmd.add("-sourcepath");
- cmd.add(srcDir.getPath());
- cmd.add("-s");
- cmd.add(destDir.getPath());
- cmd.addAll(classNames);
- //System.err.println("GenStubs exec " + cmd);
- ProcessBuilder pb = new ProcessBuilder(cmd);
- pb.redirectErrorStream(true);
- try {
- Process p = pb.start();
- BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream()));
- try {
- String line;
- while ((line = in.readLine()) != null)
- System.out.println(line);
- } finally {
- in.close();
- }
- int rc = p.waitFor();
- if (rc != 0)
- throw new BuildException("genstubs failed");
- } catch (IOException e) {
- throw new BuildException("genstubs failed", e);
- } catch (InterruptedException e) {
- throw new BuildException("genstubs failed", e);
- }
- }
- }
-
- String[] filter(File srcDir, File destDir, String[] files) {
- List<String> results = new ArrayList<String>();
- for (String f: files) {
- long srcTime = new File(srcDir, f).lastModified();
- long destTime = new File(destDir, f).lastModified();
- if (srcTime > destTime)
- results.add(f);
- }
- return results.toArray(new String[results.size()]);
- }
- }
-}
diff --git a/langtools/make/tools/SelectTool/SelectToolTask.java b/langtools/make/tools/SelectTool/SelectToolTask.java
deleted file mode 100644
index b182b49..0000000
--- a/langtools/make/tools/SelectTool/SelectToolTask.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-
-import javax.swing.SwingUtilities;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-
-/**
- * Task to allow the user to control langtools tools built when using NetBeans.
- *
- * There are two primary modes.
- * 1) Property mode. In this mode, property names are provided to get values
- * that may be specified by the user, either directly in a GUI dialog, or
- * read from a properties file. If the GUI dialog is invoked, values may
- * optionally be set for future use.
- * 2) Setup mode. In this mode, no property names are provided, and the GUI
- * is invoked to allow the user to set or reset values for use in property mode.
- */
-public class SelectToolTask extends Task {
- /**
- * Set the location of the private properties file used to keep the retain
- * user preferences for this repository.
- */
- public void setPropertyFile(File propertyFile) {
- this.propertyFile = propertyFile;
- }
-
- /**
- * Set the name of the property which will be set to the name of the
- * selected tool, if any. If no tool is selected, the property will
- * remain unset.
- */
- public void setToolProperty(String toolProperty) {
- this.toolProperty = toolProperty;
- }
-
- /**
- * Set the name of the property which will be set to the execution args of the
- * selected tool, if any. The args default to an empty string.
- */
- public void setArgsProperty(String argsProperty) {
- this.argsProperty = argsProperty;
- }
-
- /**
- * Specify whether or not to pop up a dialog if the user has not specified
- * a default value for a property.
- */
- public void setAskIfUnset(boolean askIfUnset) {
- this.askIfUnset = askIfUnset;
- }
-
- @Override
- public void execute() {
- Project p = getProject();
-
- Properties props = readProperties(propertyFile);
- toolName = props.getProperty("tool.name");
- if (toolName != null) {
- toolArgs = props.getProperty(toolName + ".args", "");
- }
-
- if (toolProperty == null ||
- askIfUnset && (toolName == null
- || (argsProperty != null && toolArgs == null))) {
- showGUI(props);
- }
-
- // finally, return required values, if any
- if (toolProperty != null && !(toolName == null || toolName.equals(""))) {
- p.setProperty(toolProperty, toolName);
-
- if (argsProperty != null && toolArgs != null)
- p.setProperty(argsProperty, toolArgs);
- }
- }
-
- void showGUI(Properties fileProps) {
- Properties guiProps = new Properties(fileProps);
- JOptionPane p = createPane(guiProps);
- p.createDialog("Select Tool").setVisible(true);
-
- toolName = (String) toolChoice.getSelectedItem();
- toolArgs = argsField.getText();
-
- if (defaultCheck.isSelected()) {
- if (toolName.equals("")) {
- fileProps.remove("tool.name");
- } else {
- fileProps.put("tool.name", toolName);
- fileProps.put(toolName + ".args", toolArgs);
- }
- writeProperties(propertyFile, fileProps);
- }
- }
-
- JOptionPane createPane(final Properties props) {
- JPanel body = new JPanel(new GridBagLayout());
- GridBagConstraints lc = new GridBagConstraints();
- lc.insets.right = 10;
- lc.insets.bottom = 3;
- GridBagConstraints fc = new GridBagConstraints();
- fc.anchor = GridBagConstraints.WEST;
- fc.gridx = 1;
- fc.gridwidth = GridBagConstraints.REMAINDER;
- fc.insets.bottom = 3;
-
- JLabel toolLabel = new JLabel("Tool:");
- body.add(toolLabel, lc);
- String[] toolChoices = { "apt", "javac", "javadoc", "javah", "javap" };
- if (true || toolProperty == null) {
- // include empty value in setup mode
- List<String> l = new ArrayList<String>(Arrays.asList(toolChoices));
- l.add(0, "");
- toolChoices = l.toArray(new String[l.size()]);
- }
- toolChoice = new JComboBox(toolChoices);
- if (toolName != null)
- toolChoice.setSelectedItem(toolName);
- toolChoice.addItemListener(new ItemListener() {
- public void itemStateChanged(ItemEvent e) {
- String tn = (String) e.getItem();
- argsField.setText(getDefaultArgsForTool(props, tn));
- if (toolProperty != null)
- okButton.setEnabled(!tn.equals(""));
- }
- });
- body.add(toolChoice, fc);
-
- argsField = new JTextField(getDefaultArgsForTool(props, toolName), 40);
- if (toolProperty == null || argsProperty != null) {
- JLabel argsLabel = new JLabel("Args:");
- body.add(argsLabel, lc);
- body.add(argsField, fc);
- argsField.addFocusListener(new FocusListener() {
- public void focusGained(FocusEvent e) {
- }
- public void focusLost(FocusEvent e) {
- String toolName = (String) toolChoice.getSelectedItem();
- if (toolName.length() > 0)
- props.put(toolName + ".args", argsField.getText());
- }
- });
- }
-
- defaultCheck = new JCheckBox("Set as default");
- if (toolProperty == null)
- defaultCheck.setSelected(true);
- else
- body.add(defaultCheck, fc);
-
- final JOptionPane p = new JOptionPane(body);
- okButton = new JButton("OK");
- okButton.setEnabled(toolProperty == null || (toolName != null && !toolName.equals("")));
- okButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- JDialog d = (JDialog) SwingUtilities.getAncestorOfClass(JDialog.class, p);
- d.setVisible(false);
- }
- });
- p.setOptions(new Object[] { okButton });
-
- return p;
- }
-
- Properties readProperties(File file) {
- Properties p = new Properties();
- if (file != null && file.exists()) {
- Reader in = null;
- try {
- in = new BufferedReader(new FileReader(file));
- p.load(in);
- in.close();
- } catch (IOException e) {
- throw new BuildException("error reading property file", e);
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException e) {
- throw new BuildException("cannot close property file", e);
- }
- }
- }
- }
- return p;
- }
-
- void writeProperties(File file, Properties p) {
- if (file != null) {
- Writer out = null;
- try {
- File dir = file.getParentFile();
- if (dir != null && !dir.exists())
- dir.mkdirs();
- out = new BufferedWriter(new FileWriter(file));
- p.store(out, "langtools properties");
- out.close();
- } catch (IOException e) {
- throw new BuildException("error writing property file", e);
- } finally {
- if (out != null) {
- try {
- out.close();
- } catch (IOException e) {
- throw new BuildException("cannot close property file", e);
- }
- }
- }
- }
- }
-
- String getDefaultArgsForTool(Properties props, String tn) {
- return (tn == null || tn.equals("")) ? "" : props.getProperty(tn + ".args", "");
- }
-
- // Ant task parameters
- private boolean askIfUnset;
- private String toolProperty;
- private String argsProperty;
- private File propertyFile;
-
- // GUI components
- private JComboBox toolChoice;
- private JTextField argsField;
- private JCheckBox defaultCheck;
- private JButton okButton;
-
- // Result values for the client
- private String toolName;
- private String toolArgs;
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java
deleted file mode 100644
index 27d5eaa..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-
-import java.io.IOException;
-import java.util.Collection;
-
-
-/**
- * An annotation processor, used to examine and process the
- * annotations of program elements. An annotation processor may,
- * for example, create new source files and XML documents to be used
- * in conjunction with the original code.
- *
- * <p> An annotation processor is constructed by a
- * {@linkplain AnnotationProcessorFactory factory}, which provides it with an
- * {@linkplain AnnotationProcessorEnvironment environment} that
- * encapsulates the state it needs.
- * Messages regarding warnings and errors encountered during processing
- * should be directed to the environment's {@link Messager},
- * and new files may be created using the environment's {@link Filer}.
- *
- * <p> Each annotation processor is created to process annotations
- * of a particular annotation type or set of annotation types.
- * It may use its environment to find the program elements with
- * annotations of those types. It may freely examine any other program
- * elements in the course of its processing.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.annotation.processing.Processor}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationProcessor {
-
- /**
- * Process all program elements supported by this annotation processor.
- */
- void process();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java
deleted file mode 100644
index 9eb13b1..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorEnvironment.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-
-import java.util.Collection;
-import java.util.Map;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.*;
-
-
-/**
- * The environment encapsulating the state needed by an annotation processor.
- * An annotation processing tool makes this environment available
- * to all annotation processors.
- *
- * <p> When an annotation processing tool is invoked, it is given a
- * set of type declarations on which to operate. These
- * are refered to as the <i>specified</i> types.
- * The type declarations said to be <i>included</i> in this invocation
- * consist of the specified types and any types nested within them.
- *
- * <p> {@link DeclarationFilter}
- * provides a simple way to select just the items of interest
- * when a method returns a collection of declarations.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.annotation.processing.ProcessingEnvironment}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationProcessorEnvironment {
-
- /**
- * Returns the options passed to the annotation processing tool.
- * Options are returned in the form of a map from option name
- * (such as <tt>"-encoding"</tt>) to option value.
- * For an option with no value (such as <tt>"-help"</tt>), the
- * corresponding value in the map is <tt>null</tt>.
- *
- * <p> Options beginning with <tt>"-A"</tt> are <i>processor-specific.</i>
- * Such options are unrecognized by the tool, but intended to be used by
- * some annotation processor.
- *
- * @return the options passed to the tool
- */
- Map<String,String> getOptions();
-
- /**
- * Returns the messager used to report errors, warnings, and other
- * notices.
- *
- * @return the messager
- */
- Messager getMessager();
-
- /**
- * Returns the filer used to create new source, class, or auxiliary
- * files.
- *
- * @return the filer
- */
- Filer getFiler();
-
-
- /**
- * Returns the declarations of the types specified when the
- * annotation processing tool was invoked.
- *
- * @return the types specified when the tool was invoked, or an
- * empty collection if there were none
- */
- Collection<TypeDeclaration> getSpecifiedTypeDeclarations();
-
- /**
- * Returns the declaration of a package given its fully qualified name.
- *
- * @param name fully qualified package name, or "" for the unnamed package
- * @return the declaration of the named package, or null if it cannot
- * be found
- */
- PackageDeclaration getPackage(String name);
-
- /**
- * Returns the declaration of a type given its fully qualified name.
- *
- * @param name fully qualified type name
- * @return the declaration of the named type, or null if it cannot be
- * found
- */
- TypeDeclaration getTypeDeclaration(String name);
-
- /**
- * A convenience method that returns the declarations of the types
- * {@linkplain AnnotationProcessorEnvironment <i>included</i>}
- * in this invocation of the annotation processing tool.
- *
- * @return the declarations of the types included in this invocation
- * of the tool, or an empty collection if there are none
- */
- Collection<TypeDeclaration> getTypeDeclarations();
-
- /**
- * Returns the declarations annotated with the given annotation type.
- * Only declarations of the types
- * {@linkplain AnnotationProcessorEnvironment <i>included</i>}
- * in this invocation of the annotation processing tool, or
- * declarations of members, parameters, or type parameters
- * declared within those, are returned.
- *
- * @param a annotation type being requested
- * @return the declarations annotated with the given annotation type,
- * or an empty collection if there are none
- */
- Collection<Declaration> getDeclarationsAnnotatedWith(
- AnnotationTypeDeclaration a);
-
- /**
- * Returns an implementation of some utility methods for
- * operating on declarations.
- *
- * @return declaration utilities
- */
- Declarations getDeclarationUtils();
-
- /**
- * Returns an implementation of some utility methods for
- * operating on types.
- *
- * @return type utilities
- */
- Types getTypeUtils();
-
- /**
- * Add a listener. If the listener is currently registered to listen,
- * adding it again will have no effect.
- *
- * @param listener The listener to add.
- * @throws NullPointerException if the listener is null
- */
- void addListener(AnnotationProcessorListener listener);
-
-
- /**
- * Remove a listener. If the listener is not currently listening,
- * the method call does nothing.
- *
- * @param listener The listener to remove.
- * @throws NullPointerException if the listener is null
- */
- void removeListener(AnnotationProcessorListener listener);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java
deleted file mode 100644
index df5d83f..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorFactory.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-
-import java.util.Collection;
-import java.util.Set;
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
-
-/**
- * A factory for creating annotation processors.
- * Each factory is responsible for creating processors for one or more
- * annotation types.
- * The factory is said to <i>support</i> these types.
- *
- * <p> Each implementation of an <tt>AnnotationProcessorFactory</tt>
- * must provide a public no-argument constructor to be used by tools to
- * instantiate the factory.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.annotation.processing.Processor}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationProcessorFactory {
-
- /**
- * Returns the options recognized by this factory or by any of the
- * processors it may create.
- * Only {@linkplain AnnotationProcessorEnvironment#getOptions()
- * processor-specific} options are included, each of which begins
- * with <tt>"-A"</tt>. For example, if this factory recognizes
- * options such as <tt>-Adebug -Aloglevel=3</tt>, it will
- * return the strings <tt>"-Adebug"</tt> and <tt>"-Aloglevel"</tt>.
- *
- * <p> A tool might use this information to determine if any
- * options provided by a user are unrecognized by any processor,
- * in which case it may wish to report an error.
- *
- * @return the options recognized by this factory or by any of the
- * processors it may create, or an empty collection if none
- */
- Collection<String> supportedOptions();
-
- /**
- * Returns the names of the annotation types supported by this factory.
- * An element of the result may be the canonical (fully qualified) name
- * of a supported annotation type. Alternately it may be of the form
- * <tt>"<i>name</i>.*"</tt>
- * representing the set of all annotation types
- * with canonical names beginning with <tt>"<i>name</i>."</tt>
- * Finally, <tt>"*"</tt> by itself represents the set of all
- * annotation types.
- *
- * @return the names of the annotation types supported by this factory
- */
- Collection<String> supportedAnnotationTypes();
-
- /**
- * Returns an annotation processor for a set of annotation
- * types. The set will be empty if the factory supports
- * "<tt>*</tt>" and the specified type declarations have
- * no annotations. Note that the set of annotation types may be
- * empty for other reasons, such as giving the factory an
- * opportunity to register a listener. An
- * <tt>AnnotationProcessorFactory</tt> must gracefully handle an
- * empty set of annotations; an appropriate response to an empty
- * set will often be returning {@link AnnotationProcessors#NO_OP}.
- *
- * @param atds type declarations of the annotation types to be processed
- * @param env environment to use during processing
- * @return an annotation processor for the given annotation types,
- * or <tt>null</tt> if the types are not supported or the
- * processor cannot be created
- */
- AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java
deleted file mode 100644
index 7c9ed0d..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessorListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-/**
- * Superinterface for all annotation processor event listeners.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. This interface has no
- * direct analog in the standardized API because the different round
- * model renders it unnecessary.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationProcessorListener extends java.util.EventListener {}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java b/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java
deleted file mode 100644
index a0fb662..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/AnnotationProcessors.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-import com.sun.mirror.apt.*;
-import java.util.*;
-
-/**
- * Utilities to create specialized annotation processors.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. There is no direct analog
- * of the functionality of this class in the standardized API.
- *
- * @since 1.5
- * @author Joseph D. Darcy
- * @author Scott Seligman
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public class AnnotationProcessors {
- static class NoOpAP implements AnnotationProcessor {
- NoOpAP() {}
- public void process(){}
- }
-
- /**
- * Combines multiple annotation processors into a simple composite
- * processor.
- * The composite processor functions by invoking each of its component
- * processors in sequence.
- */
- static class CompositeAnnotationProcessor implements AnnotationProcessor {
-
- private List<AnnotationProcessor> aps =
- new LinkedList<AnnotationProcessor>();
-
- /**
- * Constructs a new composite annotation processor.
- * @param aps the component annotation processors
- */
- public CompositeAnnotationProcessor(Collection<AnnotationProcessor> aps) {
- this.aps.addAll(aps);
- }
-
- /**
- * Constructs a new composite annotation processor.
- * @param aps the component annotation processors
- */
- public CompositeAnnotationProcessor(AnnotationProcessor... aps) {
- for(AnnotationProcessor ap: aps)
- this.aps.add(ap);
- }
-
- /**
- * Invokes the <tt>process</tt> method of each component processor,
- * in the order in which the processors were passed to the constructor.
- */
- public void process() {
- for(AnnotationProcessor ap: aps)
- ap.process();
- }
- }
-
-
- /**
- * An annotation processor that does nothing and has no state.
- * May be used multiple times.
- *
- * @since 1.5
- */
- public final static AnnotationProcessor NO_OP = new NoOpAP();
-
- /**
- * Constructs a new composite annotation processor. A composite
- * annotation processor combines multiple annotation processors
- * into one and functions by invoking each of its component
- * processors' process methods in sequence.
- *
- * @param aps The processors to create a composite of
- * @since 1.5
- */
- public static AnnotationProcessor getCompositeAnnotationProcessor(AnnotationProcessor... aps) {
- return new CompositeAnnotationProcessor(aps);
- }
-
- /**
- * Constructs a new composite annotation processor. A composite
- * annotation processor combines multiple annotation processors
- * into one and functions by invoking each of its component
- * processors' process methods in the sequence the processors are
- * returned by the collection's iterator.
- *
- * @param aps A collection of processors to create a composite of
- * @since 1.5
- */
- public static AnnotationProcessor getCompositeAnnotationProcessor(Collection<AnnotationProcessor> aps) {
- return new CompositeAnnotationProcessor(aps);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/Filer.java b/langtools/src/share/classes/com/sun/mirror/apt/Filer.java
deleted file mode 100644
index a553c71..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/Filer.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-
-import java.io.*;
-
-
-/**
- * This interface supports the creation of new files by an
- * annotation processor.
- * Files created in this way will be known to the annotation processing
- * tool implementing this interface, better enabling the tool to manage them.
- * Four kinds of files are distinguished:
- * source files, class files, other text files, and other binary files.
- * The latter two are collectively referred to as <i>auxiliary</i> files.
- *
- * <p> There are two distinguished locations (subtrees within the
- * file system) where newly created files are placed:
- * one for new source files, and one for new class files.
- * (These might be specified on a tool's command line, for example,
- * using flags such as <tt>-s</tt> and <tt>-d</tt>.)
- * Auxiliary files may be created in either location.
- *
- * <p> During each run of an annotation processing tool, a file
- * with a given pathname may be created only once. If that file already
- * exists before the first attempt to create it, the old contents will
- * be deleted. Any subsequent attempt to create the same file during
- * a run will fail.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.annotation.processing.Filer}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface Filer {
-
- /**
- * Creates a new source file and returns a writer for it.
- * The file's name and path (relative to the root of all newly created
- * source files) is based on the type to be declared in that file.
- * If more than one type is being declared, the name of the principal
- * top-level type (the public one, for example) should be used.
- *
- * <p> The {@linkplain java.nio.charset.Charset charset} used to
- * encode the file is determined by the implementation.
- * An annotation processing tool may have an <tt>-encoding</tt>
- * flag or the like for specifying this. It will typically use
- * the platform's default encoding if none is specified.
- *
- * @param name canonical (fully qualified) name of the principal type
- * being declared in this file
- * @return a writer for the new file
- * @throws IOException if the file cannot be created
- */
- PrintWriter createSourceFile(String name) throws IOException;
-
- /**
- * Creates a new class file, and returns a stream for writing to it.
- * The file's name and path (relative to the root of all newly created
- * class files) is based on the name of the type being written.
- *
- * @param name canonical (fully qualified) name of the type being written
- * @return a stream for writing to the new file
- * @throws IOException if the file cannot be created
- */
- OutputStream createClassFile(String name) throws IOException;
-
- /**
- * Creates a new text file, and returns a writer for it.
- * The file is located along with either the
- * newly created source or newly created binary files. It may be
- * named relative to some package (as are source and binary files),
- * and from there by an arbitrary pathname. In a loose sense, the
- * pathname of the new file will be the concatenation of
- * <tt>loc</tt>, <tt>pkg</tt>, and <tt>relPath</tt>.
- *
- * <p> A {@linkplain java.nio.charset.Charset charset} for
- * encoding the file may be provided. If none is given, the
- * charset used to encode source files
- * (see {@link #createSourceFile(String)}) will be used.
- *
- * @param loc location of the new file
- * @param pkg package relative to which the file should be named,
- * or the empty string if none
- * @param relPath final pathname components of the file
- * @param charsetName the name of the charset to use, or null if none
- * is being explicitly specified
- * @return a writer for the new file
- * @throws IOException if the file cannot be created
- */
- PrintWriter createTextFile(Location loc,
- String pkg,
- File relPath,
- String charsetName) throws IOException;
-
- /**
- * Creates a new binary file, and returns a stream for writing to it.
- * The file is located along with either the
- * newly created source or newly created binary files. It may be
- * named relative to some package (as are source and binary files),
- * and from there by an arbitrary pathname. In a loose sense, the
- * pathname of the new file will be the concatenation of
- * <tt>loc</tt>, <tt>pkg</tt>, and <tt>relPath</tt>.
- *
- * @param loc location of the new file
- * @param pkg package relative to which the file should be named,
- * or the empty string if none
- * @param relPath final pathname components of the file
- * @return a stream for writing to the new file
- * @throws IOException if the file cannot be created
- */
- OutputStream createBinaryFile(Location loc,
- String pkg,
- File relPath) throws IOException;
-
-
- /**
- * Locations (subtrees within the file system) where new files are created.
- *
- * @deprecated All components of this API have been superseded by
- * the standardized annotation processing API. The replacement
- * for the functionality of this enum is {@link
- * javax.tools.StandardLocation}.
- */
- @Deprecated
- enum Location {
- /** The location of new source files. */
- SOURCE_TREE,
- /** The location of new class files. */
- CLASS_TREE
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/Messager.java b/langtools/src/share/classes/com/sun/mirror/apt/Messager.java
deleted file mode 100644
index 0eb4ec8..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/Messager.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-import com.sun.mirror.util.SourcePosition;
-
-/**
- * A <tt>Messager</tt> provides the way for
- * an annotation processor to report error messages, warnings, and
- * other notices.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.annotation.processing.Messager}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface Messager {
-
- /**
- * Prints an error message.
- * Equivalent to <tt>printError(null, msg)</tt>.
- * @param msg the message, or an empty string if none
- */
- void printError(String msg);
-
- /**
- * Prints an error message.
- * @param pos the position where the error occured, or null if it is
- * unknown or not applicable
- * @param msg the message, or an empty string if none
- */
- void printError(SourcePosition pos, String msg);
-
- /**
- * Prints a warning message.
- * Equivalent to <tt>printWarning(null, msg)</tt>.
- * @param msg the message, or an empty string if none
- */
- void printWarning(String msg);
-
- /**
- * Prints a warning message.
- * @param pos the position where the warning occured, or null if it is
- * unknown or not applicable
- * @param msg the message, or an empty string if none
- */
- void printWarning(SourcePosition pos, String msg);
-
- /**
- * Prints a notice.
- * Equivalent to <tt>printNotice(null, msg)</tt>.
- * @param msg the message, or an empty string if none
- */
- void printNotice(String msg);
-
- /**
- * Prints a notice.
- * @param pos the position where the noticed occured, or null if it is
- * unknown or not applicable
- * @param msg the message, or an empty string if none
- */
- void printNotice(SourcePosition pos, String msg);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java b/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java
deleted file mode 100644
index 49614c5..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteEvent.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-/**
- * Event for the completion of a round of annotation processing.
- *
- * <p>While this class extends the serializable <tt>EventObject</tt>, it
- * cannot meaningfully be serialized because all of the annotation
- * processing tool's internal state would potentially be needed.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. This class has no direct
- * analog in the standardized API because the different round model
- * renders it unnecessary.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public abstract class RoundCompleteEvent extends java.util.EventObject {
- private RoundState rs;
-
- /**
- * The current <tt>AnnotationProcessorEnvironment</tt> is regarded
- * as the source of events.
- *
- * @param source The source of events
- * @param rs The state of the round
- */
- protected RoundCompleteEvent(AnnotationProcessorEnvironment source,
- RoundState rs) {
- super(source);
- this.rs = rs;
- }
-
- /**
- * Return round state.
- */
- public RoundState getRoundState() {
- return rs;
- }
-
- /**
- * Return source.
- */
- public AnnotationProcessorEnvironment getSource() {
- return (AnnotationProcessorEnvironment)super.getSource();
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java b/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java
deleted file mode 100644
index adbac89..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/RoundCompleteListener.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-/**
- * Listener for the completion of a round of annotation processing.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. This interface has no
- * direct analog in the standardized API because the different round
- * model renders it unnecessary.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface RoundCompleteListener extends AnnotationProcessorListener {
- /**
- * Invoked after all processors for a round have run to completion.
- *
- * @param event An event for round completion
- */
- void roundComplete(RoundCompleteEvent event);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/RoundState.java b/langtools/src/share/classes/com/sun/mirror/apt/RoundState.java
deleted file mode 100644
index bab4bcf..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/RoundState.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.apt;
-
-/**
- * Represents the status of a completed round of annotation processing.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.annotation.processing.RoundEnvironment}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface RoundState {
- /**
- * Returns <tt>true</tt> if this was the last round of annotation
- * processing; returns <tt>false</tt> if there will be a subsequent round.
- */
- boolean finalRound();
-
- /**
- * Returns <tt>true</tt> if an error was raised in this round of processing;
- * returns <tt>false</tt> otherwise.
- */
- boolean errorRaised();
-
- /**
- * Returns <tt>true</tt> if new source files were created in this round of
- * processing; returns <tt>false</tt> otherwise.
- */
- boolean sourceFilesCreated();
-
- /**
- * Returns <tt>true</tt> if new class files were created in this round of
- * processing; returns <tt>false</tt> otherwise.
- */
- boolean classFilesCreated();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/apt/package-info.java b/langtools/src/share/classes/com/sun/mirror/apt/package-info.java
deleted file mode 100644
index eb6b3a4..0000000
--- a/langtools/src/share/classes/com/sun/mirror/apt/package-info.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/**
- * Classes used to communicate information between {@linkplain
- * com.sun.mirror.apt.AnnotationProcessor annotation processors} and
- * an annotation processing tool.
- *
- * <p>The {@code apt} tool and its associated API have been superseded
- * by the standardized annotation processing API. The replacement for
- * the functionality in this package is {@link
- * javax.annotation.processing}.
- *
- * @since 1.5
- */
-package com.sun.mirror.apt;
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java
deleted file mode 100644
index beecc53..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationMirror.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-import java.util.Map;
-import com.sun.mirror.type.AnnotationType;
-import com.sun.mirror.util.SourcePosition;
-
-
-/**
- * Represents an annotation. An annotation associates a value with
- * each element of an annotation type.
- *
- * <p> Annotations should not be compared using reference-equality
- * ("<tt>==</tt>"). There is no guarantee that any particular
- * annotation will always be represented by the same object.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.AnnotationMirror}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationMirror {
-
- /**
- * Returns the annotation type of this annotation.
- *
- * @return the annotation type of this annotation
- */
- AnnotationType getAnnotationType();
-
- /**
- * Returns the source position of the beginning of this annotation.
- * Returns null if the position is unknown or not applicable.
- *
- * <p>This source position is intended for use in providing diagnostics,
- * and indicates only approximately where an annotation begins.
- *
- * @return the source position of the beginning of this annotation or
- * null if the position is unknown or not applicable
- */
- SourcePosition getPosition();
-
- /**
- * Returns this annotation's elements and their values.
- * This is returned in the form of a map that associates elements
- * with their corresponding values.
- * Only those elements and values explicitly present in the
- * annotation are included, not those that are implicitly assuming
- * their default values.
- * The order of the map matches the order in which the
- * elements appear in the annotation's source.
- *
- * @return this annotation's elements and their values,
- * or an empty map if there are none
- */
- Map<AnnotationTypeElementDeclaration, AnnotationValue> getElementValues();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java
deleted file mode 100644
index 5630922..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeDeclaration.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.util.Collection;
-
-
-/**
- * Represents the declaration of an annotation type.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.TypeElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationTypeDeclaration extends InterfaceDeclaration {
-
- /**
- * Returns the annotation type elements of this annotation type.
- * These are the methods that are directly declared in the type's
- * declaration.
- *
- * @return the annotation type elements of this annotation type,
- * or an empty collection if there are none
- */
- Collection<AnnotationTypeElementDeclaration> getMethods();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java
deleted file mode 100644
index b591097..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationTypeElementDeclaration.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-/**
- * Represents an element of an annotation type.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.ExecutableElement}.
- *
- * @author Joe Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationTypeElementDeclaration extends MethodDeclaration {
-
- /**
- * Returns the default value of this element.
- *
- * @return the default value of this element, or null if this element
- * has no default.
- */
- AnnotationValue getDefaultValue();
-
- /**
- * {@inheritDoc}
- */
- AnnotationTypeDeclaration getDeclaringType();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java b/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java
deleted file mode 100644
index a764a23..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/AnnotationValue.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-import com.sun.mirror.util.SourcePosition;
-
-/**
- * Represents a value of an annotation type element.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.AnnotationValue}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationValue {
-
- /**
- * Returns the value.
- * The result has one of the following types:
- * <ul><li> a wrapper class (such as {@link Integer}) for a primitive type
- * <li> {@code String}
- * <li> {@code TypeMirror}
- * <li> {@code EnumConstantDeclaration}
- * <li> {@code AnnotationMirror}
- * <li> {@code Collection<AnnotationValue>}
- * (representing the elements, in order, if the value is an array)
- * </ul>
- *
- * @return the value
- */
- Object getValue();
-
- /**
- * Returns the source position of the beginning of this annotation value.
- * Returns null if the position is unknown or not applicable.
- *
- * <p>This source position is intended for use in providing diagnostics,
- * and indicates only approximately where an annotation value begins.
- *
- * @return the source position of the beginning of this annotation value or
- * null if the position is unknown or not applicable
- */
- SourcePosition getPosition();
-
- /**
- * Returns a string representation of this value.
- * This is returned in a form suitable for representing this value
- * in the source code of an annotation.
- *
- * @return a string representation of this value
- */
- String toString();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java
deleted file mode 100644
index 7c9c9f2..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ClassDeclaration.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.type.ClassType;
-
-
-/**
- * Represents the declaration of a class.
- * For the declaration of an interface, see {@link InterfaceDeclaration}.
- * Provides access to information about the class, its members, and
- * its constructors.
- * Note that an {@linkplain EnumDeclaration enum} is a kind of class.
- *
- * <p> While a <tt>ClassDeclaration</tt> represents the <i>declaration</i>
- * of a class, a {@link ClassType} represents a class <i>type</i>.
- * See {@link TypeDeclaration} for more on this distinction.
- *
- * <p> {@link com.sun.mirror.util.DeclarationFilter}
- * provides a simple way to select just the items of interest
- * when a method returns a collection of declarations.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.TypeElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- *
- * @see ClassType
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface ClassDeclaration extends TypeDeclaration {
-
- /**
- * Returns the class type directly extended by this class.
- * The only class with no superclass is <tt>java.lang.Object</tt>,
- * for which this method returns null.
- *
- * @return the class type directly extended by this class, or null
- * if there is none
- */
- ClassType getSuperclass();
-
- /**
- * Returns the constructors of this class.
- * This includes the default constructor if this class has
- * no constructors explicitly declared.
- *
- * @return the constructors of this class
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<ConstructorDeclaration> getConstructors();
-
- /**
- * {@inheritDoc}
- */
- Collection<MethodDeclaration> getMethods();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java
deleted file mode 100644
index c46e018..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ConstructorDeclaration.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-/**
- * Represents a constructor of a class or interface.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.ExecutableElement}.
- *
- * @author Joe Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface ConstructorDeclaration extends ExecutableDeclaration {
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java
deleted file mode 100644
index 596a143..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/Declaration.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-/**
- * Represents the declaration of a program element such as a package,
- * class, or method. Each declaration represents a static, language-level
- * construct (and not, for example, a runtime construct of the virtual
- * machine), and typically corresponds one-to-one with a particular
- * fragment of source code.
- *
- * <p> Declarations should be compared using the {@link #equals(Object)}
- * method. There is no guarantee that any particular declaration will
- * always be represented by the same object.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.Element}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- *
- * @see Declarations
- * @see TypeMirror
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface Declaration {
-
- /**
- * Tests whether an object represents the same declaration as this.
- *
- * @param obj the object to be compared with this declaration
- * @return <tt>true</tt> if the specified object represents the same
- * declaration as this
- */
- boolean equals(Object obj);
-
- /**
- * Returns the text of the documentation ("javadoc") comment of
- * this declaration.
- *
- * @return the documentation comment of this declaration, or <tt>null</tt>
- * if there is none
- */
- String getDocComment();
-
- /**
- * Returns the annotations that are directly present on this declaration.
- *
- * @return the annotations directly present on this declaration;
- * an empty collection if there are none
- */
- Collection<AnnotationMirror> getAnnotationMirrors();
-
- /**
- * Returns the annotation of this declaration having the specified
- * type. The annotation may be either inherited or directly
- * present on this declaration.
- *
- * <p> The annotation returned by this method could contain an element
- * whose value is of type <tt>Class</tt>.
- * This value cannot be returned directly: information necessary to
- * locate and load a class (such as the class loader to use) is
- * not available, and the class might not be loadable at all.
- * Attempting to read a <tt>Class</tt> object by invoking the relevant
- * method on the returned annotation
- * will result in a {@link MirroredTypeException},
- * from which the corresponding {@link TypeMirror} may be extracted.
- * Similarly, attempting to read a <tt>Class[]</tt>-valued element
- * will result in a {@link MirroredTypesException}.
- *
- * <blockquote>
- * <i>Note:</i> This method is unlike
- * others in this and related interfaces. It operates on run-time
- * reflective information -- representations of annotation types
- * currently loaded into the VM -- rather than on the mirrored
- * representations defined by and used throughout these
- * interfaces. It is intended for callers that are written to
- * operate on a known, fixed set of annotation types.
- * </blockquote>
- *
- * @param <A> the annotation type
- * @param annotationType the <tt>Class</tt> object corresponding to
- * the annotation type
- * @return the annotation of this declaration having the specified type
- *
- * @see #getAnnotationMirrors()
- */
- <A extends Annotation> A getAnnotation(Class<A> annotationType);
-
- /**
- * Returns the modifiers of this declaration, excluding annotations.
- * Implicit modifiers, such as the <tt>public</tt> and <tt>static</tt>
- * modifiers of interface members, are included.
- *
- * @return the modifiers of this declaration in undefined order;
- * an empty collection if there are none
- */
- Collection<Modifier> getModifiers();
-
- /**
- * Returns the simple (unqualified) name of this declaration.
- * The name of a generic type does not include any reference
- * to its formal type parameters.
- * For example, the simple name of the interface declaration
- * {@code java.util.Set<E>} is <tt>"Set"</tt>.
- * If this declaration represents the empty package, an empty
- * string is returned.
- * If it represents a constructor, the simple name of its
- * declaring class is returned.
- *
- * @return the simple name of this declaration
- */
- String getSimpleName();
-
- /**
- * Returns the source position of the beginning of this declaration.
- * Returns <tt>null</tt> if the position is unknown or not applicable.
- *
- * <p> This source position is intended for use in providing
- * diagnostics, and indicates only approximately where a declaration
- * begins.
- *
- * @return the source position of the beginning of this declaration,
- * or null if the position is unknown or not applicable
- */
- SourcePosition getPosition();
-
- /**
- * Applies a visitor to this declaration.
- *
- * @param v the visitor operating on this declaration
- */
- void accept(DeclarationVisitor v);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java
deleted file mode 100644
index 9f5c168..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/EnumConstantDeclaration.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-/**
- * Represents an enum constant declaration.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.VariableElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface EnumConstantDeclaration extends FieldDeclaration {
- /**
- * {@inheritDoc}
- */
- EnumDeclaration getDeclaringType();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java
deleted file mode 100644
index 19128f8..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/EnumDeclaration.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.util.Collection;
-
-
-/**
- * Represents the declaration of an enum type.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.TypeElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface EnumDeclaration extends ClassDeclaration {
-
- /**
- * Returns the enum constants defined for this enum.
- *
- * @return the enum constants defined for this enum,
- * or an empty collection if there are none
- */
- Collection<EnumConstantDeclaration> getEnumConstants();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java
deleted file mode 100644
index 2ec5179..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ExecutableDeclaration.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.type.ReferenceType;
-
-
-/**
- * Represents a method or constructor of a class or interface.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.ExecutableElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface ExecutableDeclaration extends MemberDeclaration {
-
- /**
- * Returns <tt>true</tt> if this method or constructor accepts a variable
- * number of arguments.
- *
- * @return <tt>true</tt> if this method or constructor accepts a variable
- * number of arguments
- */
- boolean isVarArgs();
-
- /**
- * Returns the formal type parameters of this method or constructor.
- * They are returned in declaration order.
- *
- * @return the formal type parameters of this method or constructor,
- * or an empty collection if there are none
- */
- Collection<TypeParameterDeclaration> getFormalTypeParameters();
-
- /**
- * Returns the formal parameters of this method or constructor.
- * They are returned in declaration order.
- *
- * @return the formal parameters of this method or constructor,
- * or an empty collection if there are none
- */
- Collection<ParameterDeclaration> getParameters();
-
- /**
- * Returns the exceptions and other throwables listed in this
- * method or constructor's <tt>throws</tt> clause.
- *
- * @return the exceptions and other throwables listed in the
- * <tt>throws</tt> clause, or an empty collection if there are none
- */
- Collection<ReferenceType> getThrownTypes();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java
deleted file mode 100644
index f217ead..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/FieldDeclaration.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import com.sun.mirror.type.TypeMirror;
-
-
-/**
- * Represents a field of a type declaration.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.VariableElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface FieldDeclaration extends MemberDeclaration {
-
- /**
- * Returns the type of this field.
- *
- * @return the type of this field
- */
- TypeMirror getType();
-
- /**
- * Returns the value of this field if this field is a compile-time
- * constant. Returns <tt>null</tt> otherwise.
- * The value will be of a primitive type or <tt>String</tt>.
- * If the value is of a primitive type, it is wrapped in the
- * appropriate wrapper class (such as {@link Integer}).
- *
- * @return the value of this field if this field is a compile-time
- * constant, or <tt>null</tt> otherwise
- */
- Object getConstantValue();
-
- /**
- * Returns the text of a <i>constant expression</i> representing the
- * value of this field if this field is a compile-time constant.
- * Returns <tt>null</tt> otherwise.
- * The value will be of a primitive type or <tt>String</tt>.
- * The text returned is in a form suitable for representing the value
- * in source code.
- *
- * @return the text of a constant expression if this field is a
- * compile-time constant, or <tt>null</tt> otherwise
- */
- String getConstantExpression();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java
deleted file mode 100644
index 2d3d175..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/InterfaceDeclaration.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import com.sun.mirror.type.InterfaceType;
-
-
-/**
- * Represents the declaration of an interface.
- * Provides access to information about the interface and its members.
- * Note that an {@linkplain AnnotationTypeDeclaration annotation type} is
- * a kind of interface.
- *
- * <p> While an <tt>InterfaceDeclaration</tt> represents the
- * <i>declaration</i> of an interface, an {@link InterfaceType}
- * represents an interface <i>type</i>.
- * See {@link TypeDeclaration} for more on this distinction.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.TypeElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- *
- * @see InterfaceType
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface InterfaceDeclaration extends TypeDeclaration {
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java
deleted file mode 100644
index ffabbb4..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/MemberDeclaration.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-/**
- * Represents a declaration that may be a member or constructor of a declared
- * type. This includes fields, constructors, methods, and (since they
- * may be nested) declared types themselves.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.Element}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface MemberDeclaration extends Declaration {
-
- /**
- * Returns the type declaration within which this member or constructor
- * is declared.
- * If this is the declaration of a top-level type (a non-nested class
- * or interface), returns null.
- *
- * @return the type declaration within which this member or constructor
- * is declared, or null if there is none
- */
- TypeDeclaration getDeclaringType();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java
deleted file mode 100644
index 61906d1..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/MethodDeclaration.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.type.VoidType;
-
-
-/**
- * Represents a method of a class or interface.
- * Note that an
- * {@linkplain AnnotationTypeElementDeclaration annotation type element}
- * is a kind of method.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.ExecutableElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface MethodDeclaration extends ExecutableDeclaration {
-
- /**
- * Returns the formal return type of this method.
- * Returns {@link VoidType} if this method does not return a value.
- *
- * @return the formal return type of this method
- */
- TypeMirror getReturnType();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java b/langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java
deleted file mode 100644
index df25ceb..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/Modifier.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-/**
- * Represents a modifier on the declaration of a program element such
- * as a class, method, or field.
- *
- * <p> Not all modifiers are applicable to all kinds of declarations.
- * When two or more modifiers appear in the source code of a declaration,
- * then it is customary, though not required, that they appear in the same
- * order as the constants listed in the detail section below.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this enum is {@link javax.lang.model.element.Modifier}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public enum Modifier {
-
- // See JLS2 sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1.
- // java.lang.reflect.Modifier includes INTERFACE, but that's a VMism.
-
- /** The modifier <tt>public</tt> */ PUBLIC,
- /** The modifier <tt>protected</tt> */ PROTECTED,
- /** The modifier <tt>private</tt> */ PRIVATE,
- /** The modifier <tt>abstract</tt> */ ABSTRACT,
- /** The modifier <tt>static</tt> */ STATIC,
- /** The modifier <tt>final</tt> */ FINAL,
- /** The modifier <tt>transient</tt> */ TRANSIENT,
- /** The modifier <tt>volatile</tt> */ VOLATILE,
- /** The modifier <tt>synchronized</tt> */ SYNCHRONIZED,
- /** The modifier <tt>native</tt> */ NATIVE,
- /** The modifier <tt>strictfp</tt> */ STRICTFP;
-
-
- private String lowercase = null; // modifier name in lowercase
-
- /**
- * Returns this modifier's name in lowercase.
- */
- public String toString() {
- if (lowercase == null) {
- lowercase = name().toLowerCase(java.util.Locale.US);
- }
- return lowercase;
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java
deleted file mode 100644
index 52bbdbf..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/PackageDeclaration.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.util.Collection;
-
-
-/**
- * Represents the declaration of a package. Provides access to information
- * about the package and its members.
- *
- * <p> {@link com.sun.mirror.util.DeclarationFilter}
- * provides a simple way to select just the items of interest
- * when a method returns a collection of declarations.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.PackageElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface PackageDeclaration extends Declaration {
-
- /**
- * Returns the fully qualified name of this package.
- * This is also known as the package's <i>canonical</i> name.
- *
- * @return the fully qualified name of this package, or the
- * empty string if this is the unnamed package
- */
- String getQualifiedName();
-
- /**
- * Returns the declarations of the top-level classes in this package.
- * Interfaces are not included, but enum types are.
- *
- * @return the declarations of the top-level classes in this package
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<ClassDeclaration> getClasses();
-
- /**
- * Returns the declarations of the top-level enum types in this package.
- *
- * @return the declarations of the top-level enum types in this package
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<EnumDeclaration> getEnums();
-
- /**
- * Returns the declarations of the top-level interfaces in this package.
- * Annotation types are included.
- *
- * @return the declarations of the top-level interfaces in this package
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<InterfaceDeclaration> getInterfaces();
-
- /**
- * Returns the declarations of the top-level annotation types in this
- * package.
- *
- * @return the declarations of the top-level annotation types in this
- * package
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<AnnotationTypeDeclaration> getAnnotationTypes();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java
deleted file mode 100644
index 777bf8a..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/ParameterDeclaration.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import com.sun.mirror.type.TypeMirror;
-
-
-/**
- * Represents a formal parameter of a method or constructor.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.VariableElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface ParameterDeclaration extends Declaration {
-
- /**
- * Returns the type of this parameter.
- *
- * @return the type of this parameter
- */
- TypeMirror getType();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java
deleted file mode 100644
index bce5569..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/TypeDeclaration.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.type.*;
-
-
-/**
- * Represents the declaration of a class or interface.
- * Provides access to information about the type and its members.
- * Note that an {@linkplain EnumDeclaration enum} is a kind of class,
- * and an {@linkplain AnnotationTypeDeclaration annotation type} is
- * a kind of interface.
- *
- * <p> <a name="DECL_VS_TYPE"></a>
- * While a <tt>TypeDeclaration</tt> represents the <i>declaration</i>
- * of a class or interface, a {@link DeclaredType} represents a class
- * or interface <i>type</i>, the latter being a use
- * (or <i>invocation</i>) of the former.
- * The distinction is most apparent with generic types,
- * for which a single declaration can define a whole
- * family of types. For example, the declaration of
- * {@code java.util.Set} corresponds to the parameterized types
- * {@code java.util.Set<String>} and {@code java.util.Set<Number>}
- * (and many others), and to the raw type {@code java.util.Set}.
- *
- * <p> {@link com.sun.mirror.util.DeclarationFilter}
- * provides a simple way to select just the items of interest
- * when a method returns a collection of declarations.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.element.TypeElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- *
- * @see DeclaredType
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface TypeDeclaration extends MemberDeclaration {
-
- /**
- * Returns the package within which this type is declared.
- *
- * @return the package within which this type is declared
- */
- PackageDeclaration getPackage();
-
- /**
- * Returns the fully qualified name of this class or interface
- * declaration. More precisely, it returns the <i>canonical</i>
- * name.
- * The name of a generic type does not include any reference
- * to its formal type parameters.
- * For example, the the fully qualified name of the interface declaration
- * {@code java.util.Set<E>} is <tt>"java.util.Set"</tt>.
- *
- * @return the fully qualified name of this class or interface declaration
- */
- String getQualifiedName();
-
- /**
- * Returns the formal type parameters of this class or interface.
- *
- * @return the formal type parameters, or an empty collection
- * if there are none
- */
- Collection<TypeParameterDeclaration> getFormalTypeParameters();
-
- /**
- * Returns the interface types directly implemented by this class
- * or extended by this interface.
- *
- * @return the interface types directly implemented by this class
- * or extended by this interface, or an empty collection if there are none
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<InterfaceType> getSuperinterfaces();
-
- /**
- * Returns the fields that are directly declared by this class or
- * interface. Includes enum constants.
- *
- * @return the fields that are directly declared,
- * or an empty collection if there are none
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<FieldDeclaration> getFields();
-
- /**
- * Returns the methods that are directly declared by this class or
- * interface. Includes annotation type elements. Excludes
- * implicitly declared methods of an interface, such as
- * <tt>toString</tt>, that correspond to the methods of
- * <tt>java.lang.Object</tt>.
- *
- * @return the methods that are directly declared,
- * or an empty collection if there are none
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<? extends MethodDeclaration> getMethods();
-
- /**
- * Returns the declarations of the nested classes and interfaces
- * that are directly declared by this class or interface.
- *
- * @return the declarations of the nested classes and interfaces,
- * or an empty collection if there are none
- *
- * @see com.sun.mirror.util.DeclarationFilter
- */
- Collection<TypeDeclaration> getNestedTypes();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java b/langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java
deleted file mode 100644
index 24e005d..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/TypeParameterDeclaration.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.type.*;
-
-
-/**
- * Represents a formal type parameter of a generic type, method,
- * or constructor declaration.
- * A type parameter declares a {@link TypeVariable}.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.TypeParameterElement}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface TypeParameterDeclaration extends Declaration {
-
- /**
- * Returns the bounds of this type parameter.
- * These are the types given by the <i>extends</i> clause.
- * If there is no explicit <i>extends</i> clause, then
- * <tt>java.lang.Object</tt> is considered to be the sole bound.
- *
- * @return the bounds of this type parameter
- */
- Collection<ReferenceType> getBounds();
-
- /**
- * Returns the type, method, or constructor declaration within which
- * this type parameter is declared.
- *
- * @return the declaration within which this type parameter is declared
- */
- Declaration getOwner();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/declaration/package-info.java b/langtools/src/share/classes/com/sun/mirror/declaration/package-info.java
deleted file mode 100644
index 32e9757..0000000
--- a/langtools/src/share/classes/com/sun/mirror/declaration/package-info.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/**
- * Interfaces used to model program element declarations. A
- * declaration is represented by the appropriate subinterface of
- * {@link com.sun.mirror.declaration.Declaration}, and an annotation
- * is represented as an {@link
- * com.sun.mirror.declaration.AnnotationMirror}.
- *
- * <p>The {@code apt} tool and its associated API have been superseded
- * by the standardized annotation processing API. The replacement for
- * the functionality in this package is {@link
- * javax.lang.model.element}.
- *
- * @since 1.5
- */
-package com.sun.mirror.declaration;
diff --git a/langtools/src/share/classes/com/sun/mirror/overview.html b/langtools/src/share/classes/com/sun/mirror/overview.html
deleted file mode 100644
index f04c317..0000000
--- a/langtools/src/share/classes/com/sun/mirror/overview.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-
-Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-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.
--->
-</head>
-
-<body bgcolor="white">
-
-The Mirror API is used to model the semantic structure of a program.
-It provides representations of the entities
-declared in a program, such as classes, methods, and fields.
-Constructs below the method level, such as
-individual statements and expressions, are not represented.
-
-<p> Also included is support for writing
-{@linkplain com.sun.mirror.apt.AnnotationProcessor annotation processors}
-to examine and process the annotations
-of program elements. An annotation processor may, as an example, create
-new source files and XML documents to be used in conjunction with the
-original code.
-
-
-<h4> Characteristics of the API </h4>
-
-A program is represented at the language level, rather than at the
-level of the virtual machine. Nested classes, for example, are
-handled as first-class constructs,
-rather than in the translated form understood by the VM.
-Both source code and compiled code (class files) may be modeled
-in this way.
-
-<p> Programs are modeled in their static, or build-time, form.
-This differs from the {@linkplain java.lang.reflect reflection} API,
-which provides run-time information about classes and objects.
-
-<p> The API does not provide direct support for generating new code.
-
-
-<h4> Declarations and Types </h4>
-
-The mirror API represents program constructs principally through the
-{@link com.sun.mirror.declaration.Declaration} interface
-and its hierarchy of subinterfaces in the package {@link
-com.sun.mirror.declaration}. A <tt>Declaration</tt> represents a
-program element such as a package, class, or method.
-The interface hierarchy is depicted
-<a href="com/sun/mirror/declaration/package-tree.html"> here</a>.
-
-<p> Types are represented by the {@link com.sun.mirror.type.TypeMirror}
-interface and its hierarchy of subinterfaces in the
-package {@link com.sun.mirror.type}. Types include primitive types,
-class and interface types, array types, type variables, and wildcards.
-The interface hierarchy is depicted
-<a href="com/sun/mirror/type/package-tree.html"> here</a>.
-
-<p> The API makes a clear distinction between declarations and types.
-This is most significant for generic types, where a single declaration
-can define an infinite family of types. For example, the declaration of
-<tt>java.util.Set</tt> defines the raw type <tt>java.util.Set</tt>,
-the parameterized type {@code java.util.Set<String>},
-and much more. Only the declaration can be annotated, for example,
-and only a type can appear in a method signature.
-
-<p> A program being modeled may be incomplete, in that
-it may depend on an unknown class or interface type.
-This may be the result of a processing error such as a missing class file,
-or perhaps the missing type is to be created by an annotation processor.
-See {@link com.sun.mirror.type.DeclaredType} for information on
-how such unknown types are handled.
-
-
-<h4> Utilities and Tool Support </h4>
-
-The {@link com.sun.mirror.util} package provides
-utilities to assist in the processing of declarations and types.
-Included is support for using the visitor design pattern when
-operating on declaration and type objects.
-
-<p> The {@link com.sun.mirror.apt} package supports the writing
-of annotation processors. It provides the mechanism for them to
-interact with an annotation processing tool.
-
-
- at since 1.5
-
-</body>
-</html>
diff --git a/langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java b/langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java
deleted file mode 100644
index 5649993..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/AnnotationType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
-
-/**
- * Represents an annotation type.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.type.DeclaredType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface AnnotationType extends InterfaceType {
-
- /**
- * {@inheritDoc}
- */
- AnnotationTypeDeclaration getDeclaration();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/ArrayType.java b/langtools/src/share/classes/com/sun/mirror/type/ArrayType.java
deleted file mode 100644
index 93327a4..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/ArrayType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-/**
- * Represents an array type.
- * A multidimensional array type is represented as an array type
- * whose component type is also an array type.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.type.ArrayType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface ArrayType extends ReferenceType {
-
- /**
- * Returns the component type of this array type.
- *
- * @return the component type of this array type
- */
- TypeMirror getComponentType();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/ClassType.java b/langtools/src/share/classes/com/sun/mirror/type/ClassType.java
deleted file mode 100644
index 084d37d..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/ClassType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-
-
-/**
- * Represents a class type.
- * Interface types are represented separately by {@link InterfaceType}.
- * Note that an {@linkplain EnumType enum} is a kind of class.
- *
- * <p> While a {@link ClassDeclaration} represents the <i>declaration</i>
- * of a class, a <tt>ClassType</tt> represents a class <i>type</i>.
- * See {@link TypeDeclaration} for more on this distinction.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.type.DeclaredType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface ClassType extends DeclaredType {
-
- /**
- * {@inheritDoc}
- */
- ClassDeclaration getDeclaration();
-
- /**
- * Returns the class type that is a direct supertype of this one.
- * This is the superclass of this type's declaring class, with any
- * type arguments substituted in.
- * The only class with no superclass is <tt>java.lang.Object</tt>,
- * for which this method returns <tt>null</tt>.
- *
- * <p> For example, the class type extended by
- * {@code java.util.TreeSet<String>} is
- * {@code java.util.AbstractSet<String>}.
- *
- * @return the class type that is a direct supertype of this one,
- * or <tt>null</tt> if there is none
- */
- ClassType getSuperclass();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java b/langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java
deleted file mode 100644
index fddd0dd..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/DeclaredType.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.TypeDeclaration;
-
-
-/**
- * Represents a declared type, either a class type or an interface type.
- * This includes parameterized types such as {@code java.util.Set<String>}
- * as well as raw types.
- *
- * <p> While a <tt>TypeDeclaration</tt> represents the <i>declaration</i>
- * of a class or interface, a <tt>DeclaredType</tt> represents a class
- * or interface <i>type</i>, the latter being a use of the former.
- * See {@link TypeDeclaration} for more on this distinction.
- *
- * <p> A <tt>DeclaredType</tt> may represent a type
- * for which details (declaration, supertypes, <i>etc.</i>) are unknown.
- * This may be the result of a processing error, such as a missing class file,
- * and is indicated by {@link #getDeclaration()} returning <tt>null</tt>.
- * Other method invocations on such an unknown type will not, in general,
- * return meaningful results.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.type.DeclaredType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface DeclaredType extends ReferenceType {
-
- /**
- * Returns the declaration of this type.
- *
- * <p> Returns null if this type's declaration is unknown. This may
- * be the result of a processing error, such as a missing class file.
- *
- * @return the declaration of this type, or null if unknown
- */
- TypeDeclaration getDeclaration();
-
- /**
- * Returns the type that contains this type as a member.
- * Returns <tt>null</tt> if this is a top-level type.
- *
- * <p> For example, the containing type of {@code O.I<S>}
- * is the type {@code O}, and the containing type of
- * {@code O<T>.I<S>} is the type {@code O<T>}.
- *
- * @return the type that contains this type,
- * or <tt>null</tt> if this is a top-level type
- */
- DeclaredType getContainingType();
-
- /**
- * Returns (in order) the actual type arguments of this type.
- * For a generic type nested within another generic type
- * (such as {@code Outer<String>.Inner<Number>}), only the type
- * arguments of the innermost type are included.
- *
- * @return the actual type arguments of this type, or an empty collection
- * if there are none
- */
- Collection<TypeMirror> getActualTypeArguments();
-
- /**
- * Returns the interface types that are direct supertypes of this type.
- * These are the interface types implemented or extended
- * by this type's declaration, with any type arguments
- * substituted in.
- *
- * <p> For example, the interface type extended by
- * {@code java.util.Set<String>} is {@code java.util.Collection<String>}.
- *
- * @return the interface types that are direct supertypes of this type,
- * or an empty collection if there are none
- */
- Collection<InterfaceType> getSuperinterfaces();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/EnumType.java b/langtools/src/share/classes/com/sun/mirror/type/EnumType.java
deleted file mode 100644
index 07a019f..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/EnumType.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import com.sun.mirror.declaration.EnumDeclaration;
-
-
-/**
- * Represents an enum type.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.type.DeclaredType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface EnumType extends ClassType {
-
- /**
- * {@inheritDoc}
- */
- EnumDeclaration getDeclaration();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java b/langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java
deleted file mode 100644
index 55440d7..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/InterfaceType.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-
-
-/**
- * Represents an interface type.
- * Note that an {@linkplain AnnotationType annotation type} is
- * a kind of interface.
- *
- * <p> While an {@link InterfaceDeclaration} represents the
- * <i>declaration</i> of an interface, an <tt>InterfaceType</tt>
- * represents an interface <i>type</i>.
- * See {@link TypeDeclaration} for more on this distinction.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.type.DeclaredType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface InterfaceType extends DeclaredType {
-
- /**
- * {@inheritDoc}
- */
- InterfaceDeclaration getDeclaration();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java b/langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java
deleted file mode 100644
index c427950..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypeException.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import java.lang.annotation.Annotation;
-
-import com.sun.mirror.declaration.Declaration;
-
-
-/**
- * Thrown when an application attempts to access the {@link Class} object
- * corresponding to a {@link TypeMirror}.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this exception is {@link
- * javax.lang.model.type.MirroredTypeException}.
- *
- * @see MirroredTypesException
- * @see Declaration#getAnnotation(Class)
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public class MirroredTypeException extends RuntimeException {
-
- private static final long serialVersionUID = 1;
-
- private transient TypeMirror type; // cannot be serialized
- private String name; // type's qualified "name"
-
- /**
- * Constructs a new MirroredTypeException for the specified type.
- *
- * @param type the type being accessed
- */
- public MirroredTypeException(TypeMirror type) {
- super("Attempt to access Class object for TypeMirror " + type);
- this.type = type;
- name = type.toString();
- }
-
- /**
- * Returns the type mirror corresponding to the type being accessed.
- * The type mirror may be unavailable if this exception has been
- * serialized and then read back in.
- *
- * @return the type mirror, or <tt>null</tt> if unavailable
- */
- public TypeMirror getTypeMirror() {
- return type;
- }
-
- /**
- * Returns the fully qualified name of the type being accessed.
- * More precisely, returns the canonical name of a class,
- * interface, array, or primitive, and returns <tt>"void"</tt> for
- * the pseudo-type representing the type of <tt>void</tt>.
- *
- * @return the fully qualified name of the type being accessed
- */
- public String getQualifiedName() {
- return name;
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java b/langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java
deleted file mode 100644
index c6064f7..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/MirroredTypesException.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-import com.sun.mirror.declaration.Declaration;
-
-
-/**
- * Thrown when an application attempts to access a sequence of {@link Class}
- * objects each corresponding to a {@link TypeMirror}.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this exception is {@link
- * javax.lang.model.type.MirroredTypesException}.
- *
- * @see MirroredTypeException
- * @see Declaration#getAnnotation(Class)
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public class MirroredTypesException extends RuntimeException {
-
- private static final long serialVersionUID = 1;
-
- private transient Collection<TypeMirror> types; // cannot be serialized
- private Collection<String> names; // types' qualified "names"
-
- /**
- * Constructs a new MirroredTypesException for the specified types.
- *
- * @param types an ordered collection of the types being accessed
- */
- public MirroredTypesException(Collection<TypeMirror> types) {
- super("Attempt to access Class objects for TypeMirrors " + types);
- this.types = types;
- names = new ArrayList<String>();
- for (TypeMirror t : types) {
- names.add(t.toString());
- }
- }
-
- /**
- * Returns the type mirrors corresponding to the types being accessed.
- * The type mirrors may be unavailable if this exception has been
- * serialized and then read back in.
- *
- * @return the type mirrors in order, or <tt>null</tt> if unavailable
- */
- public Collection<TypeMirror> getTypeMirrors() {
- return (types != null)
- ? Collections.unmodifiableCollection(types)
- : null;
- }
-
- /**
- * Returns the fully qualified names of the types being accessed.
- * More precisely, returns the canonical names of each class,
- * interface, array, or primitive, and <tt>"void"</tt> for
- * the pseudo-type representing the type of <tt>void</tt>.
- *
- * @return the fully qualified names, in order, of the types being
- * accessed
- */
- public Collection<String> getQualifiedNames() {
- return Collections.unmodifiableCollection(names);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java b/langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java
deleted file mode 100644
index 9e0d868..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/PrimitiveType.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-/**
- * Represents a primitive type. These include
- * <tt>boolean</tt>, <tt>byte</tt>, <tt>short</tt>, <tt>int</tt>,
- * <tt>long</tt>, <tt>char</tt>, <tt>float</tt>, and <tt>double</tt>.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.type.PrimitiveType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface PrimitiveType extends TypeMirror {
-
- /**
- * Returns the kind of primitive type that this object represents.
- *
- * @return the kind of primitive type that this object represents
- */
- Kind getKind();
-
- /**
- * An enumeration of the different kinds of primitive types.
- *
- * @deprecated All components of this API have been superseded by
- * the standardized annotation processing API. The replacement
- * for the functionality of this enum is {@link
- * javax.lang.model.type.TypeKind}.
- */
- @Deprecated
- enum Kind {
- /** The primitive type <tt>boolean</tt> */ BOOLEAN,
- /** The primitive type <tt>byte</tt> */ BYTE,
- /** The primitive type <tt>short</tt> */ SHORT,
- /** The primitive type <tt>int</tt> */ INT,
- /** The primitive type <tt>long</tt> */ LONG,
- /** The primitive type <tt>char</tt> */ CHAR,
- /** The primitive type <tt>float</tt> */ FLOAT,
- /** The primitive type <tt>double</tt> */ DOUBLE
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java b/langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java
deleted file mode 100644
index ba997ae..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/ReferenceType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-/**
- * Represents a reference type.
- * These include class and interface types, array types, and type variables.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.type.ReferenceType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface ReferenceType extends TypeMirror {
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java b/langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java
deleted file mode 100644
index 74db855..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/TypeMirror.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.util.Types;
-import com.sun.mirror.util.TypeVisitor;
-
-
-/**
- * Represents a type in the Java programming language.
- * Types include primitive types, class and interface types, array
- * types, and type variables. Wildcard type arguments, and the
- * pseudo-type representing the type of <tt>void</tt>, are represented
- * by type mirrors as well.
- *
- * <p> Types may be compared using the utility methods in
- * {@link Types}.
- * There is no guarantee that any particular type will
- * always be represented by the same object.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.type.TypeMirror}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- *
- * @see Declaration
- * @see Types
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface TypeMirror {
-
- /**
- * Returns a string representation of this type.
- * Any names embedded in the expression are qualified.
- *
- * @return a string representation of this type
- */
- String toString();
-
- /**
- * Tests whether two types represent the same type.
- *
- * @param obj the object to be compared with this type
- * @return <tt>true</tt> if the specified object represents the same
- * type as this.
- */
- boolean equals(Object obj);
-
- /**
- * Applies a visitor to this type.
- *
- * @param v the visitor operating on this type
- */
- void accept(TypeVisitor v);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java b/langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java
deleted file mode 100644
index 33b9e8c..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/TypeVariable.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-
-
-/**
- * Represents a type variable.
- * A type variable is declared by a
- * {@linkplain TypeParameterDeclaration type parameter} of a
- * type, method, or constructor.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.type.TypeVariable}.
- *
- * @author Joe Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface TypeVariable extends ReferenceType {
-
- /**
- * Returns the type parameter that declared this type variable.
- *
- * @return the type parameter that declared this type variable
- */
- TypeParameterDeclaration getDeclaration();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/VoidType.java b/langtools/src/share/classes/com/sun/mirror/type/VoidType.java
deleted file mode 100644
index ed58e35..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/VoidType.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import com.sun.mirror.declaration.MethodDeclaration;
-
-
-/**
- * A pseudo-type representing the type of <tt>void</tt>.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is included in {@link
- * javax.lang.model.type.NoType}.
- *
- * @see MethodDeclaration#getReturnType()
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface VoidType extends TypeMirror {
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/WildcardType.java b/langtools/src/share/classes/com/sun/mirror/type/WildcardType.java
deleted file mode 100644
index b0ed117..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/WildcardType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.type;
-
-
-import java.util.Collection;
-
-
-/**
- * Represents a wildcard type argument.
- * Examples include: <pre><tt>
- * ?
- * ? extends Number
- * ? super T
- * </tt></pre>
- *
- * <p> A wildcard may have its upper bound explicitly set by an
- * <tt>extends</tt> clause, its lower bound explicitly set by a
- * <tt>super</tt> clause, or neither (but not both).
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.type.WildcardType}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface WildcardType extends TypeMirror {
-
- /**
- * Returns the upper bounds of this wildcard.
- * If no upper bound is explicitly declared, then
- * an empty collection is returned.
- *
- * @return the upper bounds of this wildcard
- */
- Collection<ReferenceType> getUpperBounds();
-
- /**
- * Returns the lower bounds of this wildcard.
- * If no lower bound is explicitly declared, then
- * an empty collection is returned.
- *
- * @return the lower bounds of this wildcard
- */
- Collection<ReferenceType> getLowerBounds();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/type/package-info.java b/langtools/src/share/classes/com/sun/mirror/type/package-info.java
deleted file mode 100644
index 578936f..0000000
--- a/langtools/src/share/classes/com/sun/mirror/type/package-info.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/**
- * Interfaces used to model types. A type is represented by the
- * appropriate subinterface of {@link com.sun.mirror.type.TypeMirror}.
- *
- * <p>The {@code apt} tool and its associated API have been
- * superseded by the standardized annotation processing API. The
- * replacement for the functionality in this package is {@link
- * javax.lang.model.type}.
- *
- * @since 1.5
- */
-package com.sun.mirror.type;
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java
deleted file mode 100644
index 1cae606..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationFilter.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import com.sun.mirror.declaration.Declaration;
-import com.sun.mirror.declaration.Modifier;
-
-import static com.sun.mirror.declaration.Modifier.*;
-
-
-/**
- * A filter for selecting just the items of interest
- * from a collection of declarations.
- * The filter is said to <i>select</i> or to <i>match</i> those declarations.
- * Filters can be created in several ways:
- * by the static methods described below,
- * by negating or composing existing filters,
- * or by subclasses that implement arbitrary matching rules.
- *
- * <p> A subclass can create an arbitrary filter simply by implementing
- * the {@link #matches(Declaration)} method.
- *
- * <p> Examples.
- * <p> Selecting the <tt>public</tt> declarations from a collection:
- * <blockquote><pre>
- * result = FILTER_PUBLIC.filter(decls); </pre></blockquote>
- * Selecting class declarations (including enums):
- * <blockquote><pre>
- * classFilter = DeclarationFilter.getFilter(ClassDeclaration.class);
- * result = classFilter.filter(decls); </pre></blockquote>
- * Selecting class declarations but excluding enums:
- * <blockquote><pre>
- * enumFilter = DeclarationFilter.getFilter(EnumDeclaration.class);
- * compoundFilter = classFilter.and(enumFilter.not());
- * result = compoundFilter.filter(decls); </pre></blockquote>
- * Selecting declarations named "Bob":
- * <blockquote><pre>
- * nameFilter = new DeclarationFilter() {
- * public boolean matches(Declaration d) {
- * return d.getSimpleName().equals("Bob");
- * }
- * };
- * result = nameFilter.filter(decls); </pre></blockquote>
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this class is {@link
- * javax.lang.model.util.ElementFilter}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public class DeclarationFilter {
-
- // Predefined filters for convenience.
-
- /**
- * A filter that selects only <tt>public</tt> declarations.
- */
- public static final DeclarationFilter FILTER_PUBLIC =
- new AccessFilter(PUBLIC);
-
- /**
- * A filter that selects only <tt>protected</tt> declarations.
- */
- public static final DeclarationFilter FILTER_PROTECTED =
- new AccessFilter(PROTECTED);
-
- /**
- * A filter that selects only <tt>public</tt> or <tt>protected</tt>
- * declarations.
- */
- public static final DeclarationFilter FILTER_PUBLIC_OR_PROTECTED =
- new AccessFilter(PUBLIC, PROTECTED);
-
- /**
- * A filter that selects only package-private (<i>default</i>)
- * declarations.
- */
- public static final DeclarationFilter FILTER_PACKAGE =
- new AccessFilter();
-
- /**
- * A filter that selects only <tt>private</tt> declarations.
- */
- public static final DeclarationFilter FILTER_PRIVATE =
- new AccessFilter(PRIVATE);
-
-
- /**
- * Constructs an identity filter: one that selects all declarations.
- */
- public DeclarationFilter() {
- }
-
-
-
- // Methods to create a filter.
-
- /**
- * Returns a filter that selects declarations containing all of a
- * collection of modifiers.
- *
- * @param mods the modifiers to match (non-null)
- * @return a filter that matches declarations containing <tt>mods</tt>
- */
- public static DeclarationFilter getFilter(
- final Collection<Modifier> mods) {
- return new DeclarationFilter() {
- public boolean matches(Declaration d) {
- return d.getModifiers().containsAll(mods);
- }
- };
- }
-
- /**
- * Returns a filter that selects declarations of a particular kind.
- * For example, there may be a filter that selects only class
- * declarations, or only fields.
- * The filter will select declarations of the specified kind,
- * and also any subtypes of that kind; for example, a field filter
- * will also select enum constants.
- *
- * @param kind the kind of declarations to select
- * @return a filter that selects declarations of a particular kind
- */
- public static DeclarationFilter getFilter(
- final Class<? extends Declaration> kind) {
- return new DeclarationFilter() {
- public boolean matches(Declaration d) {
- return kind.isInstance(d);
- }
- };
- }
-
- /**
- * Returns a filter that selects those declarations selected
- * by both this filter and another.
- *
- * @param f filter to be composed with this one
- * @return a filter that selects those declarations selected by
- * both this filter and another
- */
- public DeclarationFilter and(DeclarationFilter f) {
- final DeclarationFilter f1 = this;
- final DeclarationFilter f2 = f;
- return new DeclarationFilter() {
- public boolean matches(Declaration d) {
- return f1.matches(d) && f2.matches(d);
- }
- };
- }
-
- /**
- * Returns a filter that selects those declarations selected
- * by either this filter or another.
- *
- * @param f filter to be composed with this one
- * @return a filter that selects those declarations selected by
- * either this filter or another
- */
- public DeclarationFilter or(DeclarationFilter f) {
- final DeclarationFilter f1 = this;
- final DeclarationFilter f2 = f;
- return new DeclarationFilter() {
- public boolean matches(Declaration d) {
- return f1.matches(d) || f2.matches(d);
- }
- };
- }
-
- /**
- * Returns a filter that selects those declarations not selected
- * by this filter.
- *
- * @return a filter that selects those declarations not selected
- * by this filter
- */
- public DeclarationFilter not() {
- return new DeclarationFilter() {
- public boolean matches(Declaration d) {
- return !DeclarationFilter.this.matches(d);
- }
- };
- }
-
-
-
- // Methods to apply a filter.
-
- /**
- * Tests whether this filter matches a given declaration.
- * The default implementation always returns <tt>true</tt>;
- * subclasses should override this.
- *
- * @param decl the declaration to match
- * @return <tt>true</tt> if this filter matches the given declaration
- */
- public boolean matches(Declaration decl) {
- return true;
- }
-
- /**
- * Returns the declarations matched by this filter.
- * The result is a collection of the same type as the argument;
- * the {@linkplain #filter(Collection, Class) two-parameter version}
- * of <tt>filter</tt> offers control over the result type.
- *
- * @param <D> type of the declarations being filtered
- * @param decls declarations being filtered
- * @return the declarations matched by this filter
- */
- public <D extends Declaration> Collection<D> filter(Collection<D> decls) {
- ArrayList<D> res = new ArrayList<D>(decls.size());
- for (D d : decls) {
- if (matches(d)) {
- res.add(d);
- }
- }
- return res;
- }
-
- /**
- * Returns the declarations matched by this filter, with the result
- * being restricted to declarations of a given kind.
- * Similar to the simpler
- * {@linkplain #filter(Collection) single-parameter version}
- * of <tt>filter</tt>, but the result type is specified explicitly.
- *
- * @param <D> type of the declarations being returned
- * @param decls declarations being filtered
- * @param resType type of the declarations being returned --
- * the reflective view of <tt>D</tt>
- * @return the declarations matched by this filter, restricted to those
- * of the specified type
- */
- public <D extends Declaration> Collection<D>
- filter(Collection<? extends Declaration> decls, Class<D> resType) {
- ArrayList<D> res = new ArrayList<D>(decls.size());
- for (Declaration d : decls) {
- if (resType.isInstance(d) && matches(d)) {
- res.add(resType.cast(d));
- }
- }
- return res;
- }
-
-
-
- /*
- * A filter based on access modifiers.
- */
- private static class AccessFilter extends DeclarationFilter {
-
- // The first access modifier to filter on, or null if we're looking
- // for declarations with no access modifiers.
- private Modifier mod1 = null;
-
- // The second access modifier to filter on, or null if none.
- private Modifier mod2 = null;
-
- // Returns a filter that matches declarations with no access
- // modifiers.
- AccessFilter() {
- }
-
- // Returns a filter that matches m.
- AccessFilter(Modifier m) {
- mod1 = m;
- }
-
- // Returns a filter that matches either m1 or m2.
- AccessFilter(Modifier m1, Modifier m2) {
- mod1 = m1;
- mod2 = m2;
- }
-
- public boolean matches(Declaration d) {
- Collection<Modifier> mods = d.getModifiers();
- if (mod1 == null) { // looking for package private
- return !(mods.contains(PUBLIC) ||
- mods.contains(PROTECTED) ||
- mods.contains(PRIVATE));
- }
- return mods.contains(mod1) &&
- (mod2 == null || mods.contains(mod2));
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java
deleted file mode 100644
index 170e964..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationScanner.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-import com.sun.mirror.declaration.*;
-
-/**
- * A visitor for declarations that scans declarations contained within
- * the given declaration. For example, when visiting a class, the
- * methods, fields, constructors, and nested types of the class are
- * also visited.
- *
- * <p> To control the processing done on a declaration, users of this
- * class pass in their own visitors for pre and post processing. The
- * preprocessing visitor is called before the contained declarations
- * are scanned; the postprocessing visitor is called after the
- * contained declarations are scanned.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this class is {@link
- * javax.lang.model.util.ElementScanner6}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-class DeclarationScanner implements DeclarationVisitor {
- protected DeclarationVisitor pre;
- protected DeclarationVisitor post;
-
- DeclarationScanner(DeclarationVisitor pre, DeclarationVisitor post) {
- this.pre = pre;
- this.post = post;
- }
-
- /**
- * Visits a declaration.
- *
- * @param d the declaration to visit
- */
- public void visitDeclaration(Declaration d) {
- d.accept(pre);
- d.accept(post);
- }
-
- /**
- * Visits a package declaration.
- *
- * @param d the declaration to visit
- */
- public void visitPackageDeclaration(PackageDeclaration d) {
- d.accept(pre);
-
- for(ClassDeclaration classDecl: d.getClasses()) {
- classDecl.accept(this);
- }
-
- for(InterfaceDeclaration interfaceDecl: d.getInterfaces()) {
- interfaceDecl.accept(this);
- }
-
- d.accept(post);
- }
-
- /**
- * Visits a member or constructor declaration.
- *
- * @param d the declaration to visit
- */
- public void visitMemberDeclaration(MemberDeclaration d) {
- visitDeclaration(d);
- }
-
- /**
- * Visits a type declaration.
- *
- * @param d the declaration to visit
- */
- public void visitTypeDeclaration(TypeDeclaration d) {
- d.accept(pre);
-
- for(TypeParameterDeclaration tpDecl: d.getFormalTypeParameters()) {
- tpDecl.accept(this);
- }
-
- for(FieldDeclaration fieldDecl: d.getFields()) {
- fieldDecl.accept(this);
- }
-
- for(MethodDeclaration methodDecl: d.getMethods()) {
- methodDecl.accept(this);
- }
-
- for(TypeDeclaration typeDecl: d.getNestedTypes()) {
- typeDecl.accept(this);
- }
-
- d.accept(post);
- }
-
- /**
- * Visits a class declaration.
- *
- * @param d the declaration to visit
- */
- public void visitClassDeclaration(ClassDeclaration d) {
- d.accept(pre);
-
- for(TypeParameterDeclaration tpDecl: d.getFormalTypeParameters()) {
- tpDecl.accept(this);
- }
-
- for(FieldDeclaration fieldDecl: d.getFields()) {
- fieldDecl.accept(this);
- }
-
- for(MethodDeclaration methodDecl: d.getMethods()) {
- methodDecl.accept(this);
- }
-
- for(TypeDeclaration typeDecl: d.getNestedTypes()) {
- typeDecl.accept(this);
- }
-
- for(ConstructorDeclaration ctorDecl: d.getConstructors()) {
- ctorDecl.accept(this);
- }
-
- d.accept(post);
- }
-
- /**
- * Visits an enum declaration.
- *
- * @param d the declaration to visit
- */
- public void visitEnumDeclaration(EnumDeclaration d) {
- visitClassDeclaration(d);
- }
-
- /**
- * Visits an interface declaration.
- *
- * @param d the declaration to visit
- */
- public void visitInterfaceDeclaration(InterfaceDeclaration d) {
- visitTypeDeclaration(d);
- }
-
- /**
- * Visits an annotation type declaration.
- *
- * @param d the declaration to visit
- */
- public void visitAnnotationTypeDeclaration(AnnotationTypeDeclaration d) {
- visitInterfaceDeclaration(d);
- }
-
- /**
- * Visits a field declaration.
- *
- * @param d the declaration to visit
- */
- public void visitFieldDeclaration(FieldDeclaration d) {
- visitMemberDeclaration(d);
- }
-
- /**
- * Visits an enum constant declaration.
- *
- * @param d the declaration to visit
- */
- public void visitEnumConstantDeclaration(EnumConstantDeclaration d) {
- visitFieldDeclaration(d);
- }
-
- /**
- * Visits a method or constructor declaration.
- *
- * @param d the declaration to visit
- */
- public void visitExecutableDeclaration(ExecutableDeclaration d) {
- d.accept(pre);
-
- for(TypeParameterDeclaration tpDecl: d.getFormalTypeParameters()) {
- tpDecl.accept(this);
- }
-
- for(ParameterDeclaration pDecl: d.getParameters()) {
- pDecl.accept(this);
- }
-
- d.accept(post);
- }
-
- /**
- * Visits a constructor declaration.
- *
- * @param d the declaration to visit
- */
- public void visitConstructorDeclaration(ConstructorDeclaration d) {
- visitExecutableDeclaration(d);
- }
-
- /**
- * Visits a method declaration.
- *
- * @param d the declaration to visit
- */
- public void visitMethodDeclaration(MethodDeclaration d) {
- visitExecutableDeclaration(d);
- }
-
- /**
- * Visits an annotation type element declaration.
- *
- * @param d the declaration to visit
- */
- public void visitAnnotationTypeElementDeclaration(
- AnnotationTypeElementDeclaration d) {
- visitMethodDeclaration(d);
- }
-
- /**
- * Visits a parameter declaration.
- *
- * @param d the declaration to visit
- */
- public void visitParameterDeclaration(ParameterDeclaration d) {
- visitDeclaration(d);
- }
-
- /**
- * Visits a type parameter declaration.
- *
- * @param d the declaration to visit
- */
- public void visitTypeParameterDeclaration(TypeParameterDeclaration d) {
- visitDeclaration(d);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java
deleted file mode 100644
index 287b2c4..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitor.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-import com.sun.mirror.declaration.*;
-
-
-/**
- * A visitor for declarations, in the style of the standard visitor
- * design pattern. Classes implementing this interface are used to
- * operate on a declaration when the kind of declaration is unknown at
- * compile time. When a visitor is passed to a declaration's {@link
- * Declaration#accept accept} method, the most specific
- * <tt>visit<i>Xxx</i></tt> method applicable to that declaration is
- * invoked.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.ElementVisitor}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface DeclarationVisitor {
-
- /**
- * Visits a declaration.
- * @param d the declaration to visit
- */
- public void visitDeclaration(Declaration d);
-
- /**
- * Visits a package declaration.
- * @param d the declaration to visit
- */
- public void visitPackageDeclaration(PackageDeclaration d);
-
- /**
- * Visits a member or constructor declaration.
- * @param d the declaration to visit
- */
- public void visitMemberDeclaration(MemberDeclaration d);
-
- /**
- * Visits a type declaration.
- * @param d the declaration to visit
- */
- public void visitTypeDeclaration(TypeDeclaration d);
-
- /**
- * Visits a class declaration.
- * @param d the declaration to visit
- */
- public void visitClassDeclaration(ClassDeclaration d);
-
- /**
- * Visits an enum declaration.
- * @param d the declaration to visit
- */
- public void visitEnumDeclaration(EnumDeclaration d);
-
- /**
- * Visits an interface declaration.
- * @param d the declaration to visit
- */
- public void visitInterfaceDeclaration(InterfaceDeclaration d);
-
- /**
- * Visits an annotation type declaration.
- * @param d the declaration to visit
- */
- public void visitAnnotationTypeDeclaration(AnnotationTypeDeclaration d);
-
- /**
- * Visits a field declaration.
- * @param d the declaration to visit
- */
- public void visitFieldDeclaration(FieldDeclaration d);
-
- /**
- * Visits an enum constant declaration.
- * @param d the declaration to visit
- */
- public void visitEnumConstantDeclaration(EnumConstantDeclaration d);
-
- /**
- * Visits a method or constructor declaration.
- * @param d the declaration to visit
- */
- public void visitExecutableDeclaration(ExecutableDeclaration d);
-
- /**
- * Visits a constructor declaration.
- * @param d the declaration to visit
- */
- public void visitConstructorDeclaration(ConstructorDeclaration d);
-
- /**
- * Visits a method declaration.
- * @param d the declaration to visit
- */
- public void visitMethodDeclaration(MethodDeclaration d);
-
- /**
- * Visits an annotation type element declaration.
- * @param d the declaration to visit
- */
- public void visitAnnotationTypeElementDeclaration(
- AnnotationTypeElementDeclaration d);
-
- /**
- * Visits a parameter declaration.
- * @param d the declaration to visit
- */
- public void visitParameterDeclaration(ParameterDeclaration d);
-
- /**
- * Visits a type parameter declaration.
- * @param d the declaration to visit
- */
- public void visitTypeParameterDeclaration(TypeParameterDeclaration d);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java b/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java
deleted file mode 100644
index b4072ea..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/DeclarationVisitors.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-/**
- * Utilities to create specialized <tt>DeclarationVisitor</tt> instances.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. There is no direct
- * replacement for the functionality of this class in the standardized
- * API due to that API's different visitor structure.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public class DeclarationVisitors {
- private DeclarationVisitors(){} // do not instantiate.
-
- /**
- * A visitor that has no side effects and keeps no state.
- */
- public static final DeclarationVisitor NO_OP = new SimpleDeclarationVisitor();
-
- /**
- * Return a <tt>DeclarationVisitor</tt> that will scan the
- * declaration structure, visiting declarations contained in
- * another declaration. For example, when visiting a class, the
- * fields, methods, constructors, etc. of the class are also
- * visited. The order in which the contained declarations are scanned is
- * not specified.
- *
- * <p>The <tt>pre</tt> and <tt>post</tt>
- * <tt>DeclarationVisitor</tt> parameters specify,
- * respectively, the processing the scanner will do before or
- * after visiting the contained declarations. If only one of pre
- * and post processing is needed, use {@link
- * DeclarationVisitors#NO_OP DeclarationVisitors.NO_OP} for the
- * other parameter.
- *
- * @param pre visitor representing processing to do before
- * visiting contained declarations.
- *
- * @param post visitor representing processing to do after
- * visiting contained declarations.
- */
- public static DeclarationVisitor getDeclarationScanner(DeclarationVisitor pre,
- DeclarationVisitor post) {
- return new DeclarationScanner(pre, post);
- }
-
- /**
- * Return a <tt>DeclarationVisitor</tt> that will scan the
- * declaration structure, visiting declarations contained in
- * another declaration in source code order. For example, when
- * visiting a class, the fields, methods, constructors, etc. of
- * the class are also visited. The order in which the contained
- * declarations are visited is as close to source code order as
- * possible; declaration mirrors created from class files instead
- * of source code will not have source position information.
- *
- * <p>The <tt>pre</tt> and <tt>post</tt>
- * <tt>DeclarationVisitor</tt> parameters specify,
- * respectively, the processing the scanner will do before or
- * after visiting the contained declarations. If only one of pre
- * and post processing is needed, use {@link
- * DeclarationVisitors#NO_OP DeclarationVisitors.NO_OP} for the other parameter.
- *
- * @param pre visitor representing processing to do before
- * visiting contained declarations.
- *
- * @param post visitor representing processing to do after
- * visiting contained declarations.
- */
- public static DeclarationVisitor getSourceOrderDeclarationScanner(DeclarationVisitor pre,
- DeclarationVisitor post) {
- return new SourceOrderDeclScanner(pre, post);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/Declarations.java b/langtools/src/share/classes/com/sun/mirror/util/Declarations.java
deleted file mode 100644
index 8908bd4..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/Declarations.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-
-import com.sun.mirror.declaration.*;
-
-
-/**
- * Utility methods for operating on declarations.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.util.Elements}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface Declarations {
-
- /**
- * Tests whether one type, method, or field declaration hides another.
- *
- * @param sub the first member
- * @param sup the second member
- * @return <tt>true</tt> if and only if the first member hides
- * the second
- */
- boolean hides(MemberDeclaration sub, MemberDeclaration sup);
-
- /**
- * Tests whether one method overrides another. When a
- * non-abstract method overrides an abstract one, the
- * former is also said to <i>implement</i> the latter.
- *
- * @param sub the first method
- * @param sup the second method
- * @return <tt>true</tt> if and only if the first method overrides
- * the second
- */
- boolean overrides(MethodDeclaration sub, MethodDeclaration sup);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java
deleted file mode 100644
index 93a61e4..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/SimpleDeclarationVisitor.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-
-import com.sun.mirror.declaration.*;
-
-
-/**
- * A simple visitor for declarations.
- *
- * <p> The implementations of the methods of this class do nothing but
- * delegate up the declaration hierarchy. A subclass should override the
- * methods that correspond to the kinds of declarations on which it
- * will operate.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this class is {@link
- * javax.lang.model.util.SimpleElementVisitor6}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public class SimpleDeclarationVisitor implements DeclarationVisitor {
-
- /**
- * Creates a new <tt>SimpleDeclarationVisitor</tt>.
- */
- public SimpleDeclarationVisitor(){}
-
- /**
- * Visits a declaration.
- * The implementation does nothing.
- * @param d the declaration to visit
- */
- public void visitDeclaration(Declaration d) {
- }
-
- /**
- * Visits a package declaration.
- * The implementation simply invokes
- * {@link #visitDeclaration visitDeclaration}.
- * @param d the declaration to visit
- */
- public void visitPackageDeclaration(PackageDeclaration d) {
- visitDeclaration(d);
- }
-
- /**
- * Visits a member or constructor declaration.
- * The implementation simply invokes
- * {@link #visitDeclaration visitDeclaration}.
- * @param d the declaration to visit
- */
- public void visitMemberDeclaration(MemberDeclaration d) {
- visitDeclaration(d);
- }
-
- /**
- * Visits a type declaration.
- * The implementation simply invokes
- * {@link #visitMemberDeclaration visitMemberDeclaration}.
- * @param d the declaration to visit
- */
- public void visitTypeDeclaration(TypeDeclaration d) {
- visitMemberDeclaration(d);
- }
-
- /**
- * Visits a class declaration.
- * The implementation simply invokes
- * {@link #visitTypeDeclaration visitTypeDeclaration}.
- * @param d the declaration to visit
- */
- public void visitClassDeclaration(ClassDeclaration d) {
- visitTypeDeclaration(d);
- }
-
- /**
- * Visits an enum declaration.
- * The implementation simply invokes
- * {@link #visitClassDeclaration visitClassDeclaration}.
- * @param d the declaration to visit
- */
- public void visitEnumDeclaration(EnumDeclaration d) {
- visitClassDeclaration(d);
- }
-
- /**
- * Visits an interface declaration.
- * The implementation simply invokes
- * {@link #visitTypeDeclaration visitTypeDeclaration}.
- * @param d the declaration to visit
- */
- public void visitInterfaceDeclaration(InterfaceDeclaration d) {
- visitTypeDeclaration(d);
- }
-
- /**
- * Visits an annotation type declaration.
- * The implementation simply invokes
- * {@link #visitInterfaceDeclaration visitInterfaceDeclaration}.
- * @param d the declaration to visit
- */
- public void visitAnnotationTypeDeclaration(AnnotationTypeDeclaration d) {
- visitInterfaceDeclaration(d);
- }
-
- /**
- * Visits a field declaration.
- * The implementation simply invokes
- * {@link #visitMemberDeclaration visitMemberDeclaration}.
- * @param d the declaration to visit
- */
- public void visitFieldDeclaration(FieldDeclaration d) {
- visitMemberDeclaration(d);
- }
-
- /**
- * Visits an enum constant declaration.
- * The implementation simply invokes
- * {@link #visitFieldDeclaration visitFieldDeclaration}.
- * @param d the declaration to visit
- */
- public void visitEnumConstantDeclaration(EnumConstantDeclaration d) {
- visitFieldDeclaration(d);
- }
-
- /**
- * Visits a method or constructor declaration.
- * The implementation simply invokes
- * {@link #visitMemberDeclaration visitMemberDeclaration}.
- * @param d the declaration to visit
- */
- public void visitExecutableDeclaration(ExecutableDeclaration d) {
- visitMemberDeclaration(d);
- }
-
- /**
- * Visits a constructor declaration.
- * The implementation simply invokes
- * {@link #visitExecutableDeclaration visitExecutableDeclaration}.
- * @param d the declaration to visit
- */
- public void visitConstructorDeclaration(ConstructorDeclaration d) {
- visitExecutableDeclaration(d);
- }
-
- /**
- * Visits a method declaration.
- * The implementation simply invokes
- * {@link #visitExecutableDeclaration visitExecutableDeclaration}.
- * @param d the declaration to visit
- */
- public void visitMethodDeclaration(MethodDeclaration d) {
- visitExecutableDeclaration(d);
- }
-
- /**
- * Visits an annotation type element declaration.
- * The implementation simply invokes
- * {@link #visitMethodDeclaration visitMethodDeclaration}.
- * @param d the declaration to visit
- */
- public void visitAnnotationTypeElementDeclaration(
- AnnotationTypeElementDeclaration d) {
- visitMethodDeclaration(d);
- }
-
- /**
- * Visits a parameter declaration.
- * The implementation simply invokes
- * {@link #visitDeclaration visitDeclaration}.
- * @param d the declaration to visit
- */
- public void visitParameterDeclaration(ParameterDeclaration d) {
- visitDeclaration(d);
- }
-
- /**
- * Visits a type parameter declaration.
- * The implementation simply invokes
- * {@link #visitDeclaration visitDeclaration}.
- * @param d the declaration to visit
- */
- public void visitTypeParameterDeclaration(TypeParameterDeclaration d) {
- visitDeclaration(d);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java
deleted file mode 100644
index 188024c..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/SimpleTypeVisitor.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-
-import com.sun.mirror.type.*;
-
-
-/**
- * A simple visitor for types.
- *
- * <p> The implementations of the methods of this class do nothing but
- * delegate up the type hierarchy. A subclass should override the
- * methods that correspond to the kinds of types on which it will
- * operate.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this class is {@link
- * javax.lang.model.util.SimpleTypeVisitor6}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public class SimpleTypeVisitor implements TypeVisitor {
-
- /**
- * Creates a new <tt>SimpleTypeVisitor</tt>.
- */
- public SimpleTypeVisitor() {}
-
- /**
- * Visits a type mirror.
- * The implementation does nothing.
- * @param t the type to visit
- */
- public void visitTypeMirror(TypeMirror t) {
- }
-
- /**
- * Visits a primitive type.
- * The implementation simply invokes
- * {@link #visitTypeMirror visitTypeMirror}.
- * @param t the type to visit
- */
- public void visitPrimitiveType(PrimitiveType t) {
- visitTypeMirror(t);
- }
-
- /**
- * Visits a void type.
- * The implementation simply invokes
- * {@link #visitTypeMirror visitTypeMirror}.
- * @param t the type to visit
- */
- public void visitVoidType(VoidType t) {
- visitTypeMirror(t);
- }
-
- /**
- * Visits a reference type.
- * The implementation simply invokes
- * {@link #visitTypeMirror visitTypeMirror}.
- * @param t the type to visit
- */
- public void visitReferenceType(ReferenceType t) {
- visitTypeMirror(t);
- }
-
- /**
- * Visits a declared type.
- * The implementation simply invokes
- * {@link #visitReferenceType visitReferenceType}.
- * @param t the type to visit
- */
- public void visitDeclaredType(DeclaredType t) {
- visitReferenceType(t);
- }
-
- /**
- * Visits a class type.
- * The implementation simply invokes
- * {@link #visitDeclaredType visitDeclaredType}.
- * @param t the type to visit
- */
- public void visitClassType(ClassType t) {
- visitDeclaredType(t);
- }
-
- /**
- * Visits an enum type.
- * The implementation simply invokes
- * {@link #visitClassType visitClassType}.
- * @param t the type to visit
- */
- public void visitEnumType(EnumType t) {
- visitClassType(t);
- }
-
- /**
- * Visits an interface type.
- * The implementation simply invokes
- * {@link #visitDeclaredType visitDeclaredType}.
- * @param t the type to visit
- */
- public void visitInterfaceType(InterfaceType t) {
- visitDeclaredType(t);
- }
-
- /**
- * Visits an annotation type.
- * The implementation simply invokes
- * {@link #visitInterfaceType visitInterfaceType}.
- * @param t the type to visit
- */
- public void visitAnnotationType(AnnotationType t) {
- visitInterfaceType(t);
- }
-
- /**
- * Visits an array type.
- * The implementation simply invokes
- * {@link #visitReferenceType visitReferenceType}.
- * @param t the type to visit
- */
- public void visitArrayType(ArrayType t) {
- visitReferenceType(t);
- }
-
- /**
- * Visits a type variable.
- * The implementation simply invokes
- * {@link #visitReferenceType visitReferenceType}.
- * @param t the type to visit
- */
- public void visitTypeVariable(TypeVariable t) {
- visitReferenceType(t);
- }
-
- /**
- * Visits a wildcard.
- * The implementation simply invokes
- * {@link #visitTypeMirror visitTypeMirror}.
- * @param t the type to visit
- */
- public void visitWildcardType(WildcardType t) {
- visitTypeMirror(t);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java b/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java
deleted file mode 100644
index 243de93..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/SourceOrderDeclScanner.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-import com.sun.mirror.declaration.*;
-
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-/**
- * A visitor for declarations that scans declarations contained within
- * the given declaration in source code order. For example, when
- * visiting a class, the methods, fields, constructors, and nested
- * types of the class are also visited.
- *
- * To control the processing done on a declaration, users of this
- * class pass in their own visitors for pre and post processing. The
- * preprocessing visitor is called before the contained declarations
- * are scanned; the postprocessing visitor is called after the
- * contained declarations are scanned.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this class is {@link
- * javax.lang.model.util.SimpleElementVisitor6}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-class SourceOrderDeclScanner extends DeclarationScanner {
- static class SourceOrderComparator implements java.util.Comparator<Declaration> {
- SourceOrderComparator(){}
-
-
- static boolean equals(Declaration d1, Declaration d2) {
- return d1 == d2 || (d1 != null && d1.equals(d2));
- }
-
- private static class DeclPartialOrder extends com.sun.mirror.util.SimpleDeclarationVisitor {
- private int value = 1000;
- private static int staticAdjust(Declaration d) {
- return d.getModifiers().contains(Modifier.STATIC)?0:1;
- }
-
- DeclPartialOrder() {}
-
- public int getValue() { return value; }
-
- @Override
- public void visitTypeParameterDeclaration(TypeParameterDeclaration d) {value = 0;}
-
- @Override
- public void visitEnumConstantDeclaration(EnumConstantDeclaration d) {value = 1;}
-
- @Override
- public void visitClassDeclaration(ClassDeclaration d) {value = 2 + staticAdjust(d);}
-
- @Override
- public void visitInterfaceDeclaration(InterfaceDeclaration d) {value = 4;}
-
- @Override
- public void visitEnumDeclaration(EnumDeclaration d) {value = 6;}
-
- @Override
- public void visitAnnotationTypeDeclaration(AnnotationTypeDeclaration d) {value = 8;}
-
- @Override
- public void visitFieldDeclaration(FieldDeclaration d) {value = 10 + staticAdjust(d);}
-
- @Override
- public void visitConstructorDeclaration(ConstructorDeclaration d) {value = 12;}
-
- @Override
- public void visitMethodDeclaration(MethodDeclaration d) {value = 14 + staticAdjust(d);}
- }
- @SuppressWarnings("cast")
- private int compareEqualPosition(Declaration d1, Declaration d2) {
- assert
- (d1.getPosition() == d2.getPosition()) || // Handles two null positions.
- (d1.getPosition().file().compareTo(d2.getPosition().file()) == 0 &&
- d1.getPosition().line() == d2.getPosition().line() &&
- d1.getPosition().column() == d2.getPosition().column());
-
- DeclPartialOrder dpo1 = new DeclPartialOrder();
- DeclPartialOrder dpo2 = new DeclPartialOrder();
-
- d1.accept(dpo1);
- d2.accept(dpo2);
-
- int difference = dpo1.getValue() - dpo2.getValue();
- if (difference != 0)
- return difference;
- else {
- int result = d1.getSimpleName().compareTo(d2.getSimpleName());
- if (result != 0)
- return result;
- return (int)( Long.signum((long)System.identityHashCode(d1) -
- (long)System.identityHashCode(d2)));
- }
- }
-
- public int compare(Declaration d1, Declaration d2) {
- if (equals(d1, d2))
- return 0;
-
- SourcePosition p1 = d1.getPosition();
- SourcePosition p2 = d2.getPosition();
-
- if (p1 == null && p2 != null)
- return 1;
- else if (p1 != null && p2 == null)
- return -1;
- else if(p1 == null && p2 == null)
- return compareEqualPosition(d1, d2);
- else {
- assert p1 != null && p2 != null;
- int fileComp = p1.file().compareTo(p2.file()) ;
- if (fileComp == 0) {
- long diff = (long)p1.line() - (long)p2.line();
- if (diff == 0) {
- diff = Long.signum((long)p1.column() - (long)p2.column());
- if (diff != 0)
- return (int)diff;
- else {
- // declarations may be two
- // compiler-generated members with the
- // same source position
- return compareEqualPosition(d1, d2);
- }
- } else
- return (diff<0)? -1:1;
- } else
- return fileComp;
- }
- }
- }
-
- final static java.util.Comparator<Declaration> comparator = new SourceOrderComparator();
-
- SourceOrderDeclScanner(DeclarationVisitor pre, DeclarationVisitor post) {
- super(pre, post);
- }
-
- /**
- * Visits a type declaration.
- *
- * @param d the declaration to visit
- */
- public void visitTypeDeclaration(TypeDeclaration d) {
- d.accept(pre);
-
- SortedSet<Declaration> decls = new
- TreeSet<Declaration>(SourceOrderDeclScanner.comparator) ;
-
- for(TypeParameterDeclaration tpDecl: d.getFormalTypeParameters()) {
- decls.add(tpDecl);
- }
-
- for(FieldDeclaration fieldDecl: d.getFields()) {
- decls.add(fieldDecl);
- }
-
- for(MethodDeclaration methodDecl: d.getMethods()) {
- decls.add(methodDecl);
- }
-
- for(TypeDeclaration typeDecl: d.getNestedTypes()) {
- decls.add(typeDecl);
- }
-
- for(Declaration decl: decls )
- decl.accept(this);
-
- d.accept(post);
- }
-
- /**
- * Visits a class declaration.
- *
- * @param d the declaration to visit
- */
- public void visitClassDeclaration(ClassDeclaration d) {
- d.accept(pre);
-
- SortedSet<Declaration> decls = new
- TreeSet<Declaration>(SourceOrderDeclScanner.comparator) ;
-
- for(TypeParameterDeclaration tpDecl: d.getFormalTypeParameters()) {
- decls.add(tpDecl);
- }
-
- for(FieldDeclaration fieldDecl: d.getFields()) {
- decls.add(fieldDecl);
- }
-
- for(MethodDeclaration methodDecl: d.getMethods()) {
- decls.add(methodDecl);
- }
-
- for(TypeDeclaration typeDecl: d.getNestedTypes()) {
- decls.add(typeDecl);
- }
-
- for(ConstructorDeclaration ctorDecl: d.getConstructors()) {
- decls.add(ctorDecl);
- }
-
- for(Declaration decl: decls )
- decl.accept(this);
-
- d.accept(post);
- }
-
- public void visitExecutableDeclaration(ExecutableDeclaration d) {
- d.accept(pre);
-
- SortedSet<Declaration> decls = new
- TreeSet<Declaration>(SourceOrderDeclScanner.comparator) ;
-
- for(TypeParameterDeclaration tpDecl: d.getFormalTypeParameters())
- decls.add(tpDecl);
-
- for(ParameterDeclaration pDecl: d.getParameters())
- decls.add(pDecl);
-
- for(Declaration decl: decls )
- decl.accept(this);
-
- d.accept(post);
- }
-
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java b/langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java
deleted file mode 100644
index 69d2a04..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/SourcePosition.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-
-import java.io.File;
-
-
-/**
- * Represents a position in a source file.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. There is no direct
- * replacement for the functionality of this interface since the
- * standardized {@link javax.annotation.processing.Messager Messager}
- * API implicitly takes a source position argument via any element,
- * annotation mirror, or annotation value passed along with the
- * message.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface SourcePosition {
-
- /**
- * Returns the source file containing this position.
- *
- * @return the source file containing this position; never null
- */
- File file();
-
- /**
- * Returns the line number of this position. Lines are numbered
- * starting with 1.
- *
- * @return the line number of this position, or 0 if the line
- * number is unknown or not applicable
- */
- int line();
-
- /**
- * Returns the column number of this position. Columns are numbered
- * starting with 1.
- *
- * @return the column number of this position, or 0 if the column
- * number is unknown or not applicable
- */
- int column();
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java b/langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java
deleted file mode 100644
index 628ed1f..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/TypeVisitor.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-
-import com.sun.mirror.type.*;
-
-
-/**
- * A visitor for types, in the style of the standard visitor design pattern.
- * This is used to operate on a type when the kind
- * of type is unknown at compile time.
- * When a visitor is passed to a type's
- * {@link TypeMirror#accept accept} method,
- * the most specific <tt>visit<i>Xxx</i></tt> method applicable to
- * that type is invoked.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.element.TypeVisitor}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface TypeVisitor {
-
- /**
- * Visits a type mirror.
- *
- * @param t the type to visit
- */
- public void visitTypeMirror(TypeMirror t);
-
- /**
- * Visits a primitive type.
-
- * @param t the type to visit
- */
- public void visitPrimitiveType(PrimitiveType t);
-
- /**
- * Visits a void type.
- *
- * @param t the type to visit
- */
- public void visitVoidType(VoidType t);
-
- /**
- * Visits a reference type.
- *
- * @param t the type to visit
- */
- public void visitReferenceType(ReferenceType t);
-
- /**
- * Visits a declared type.
- *
- * @param t the type to visit
- */
- public void visitDeclaredType(DeclaredType t);
-
- /**
- * Visits a class type.
- *
- * @param t the type to visit
- */
- public void visitClassType(ClassType t);
-
- /**
- * Visits an enum type.
- *
- * @param t the type to visit
- */
- public void visitEnumType(EnumType t);
-
- /**
- * Visits an interface type.
- *
- * @param t the type to visit
- */
- public void visitInterfaceType(InterfaceType t);
-
- /**
- * Visits an annotation type.
- *
- * @param t the type to visit
- */
- public void visitAnnotationType(AnnotationType t);
-
- /**
- * Visits an array type.
- *
- * @param t the type to visit
- */
- public void visitArrayType(ArrayType t);
-
- /**
- * Visits a type variable.
- *
- * @param t the type to visit
- */
- public void visitTypeVariable(TypeVariable t);
-
- /**
- * Visits a wildcard.
- *
- * @param t the type to visit
- */
- public void visitWildcardType(WildcardType t);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/Types.java b/langtools/src/share/classes/com/sun/mirror/util/Types.java
deleted file mode 100644
index d7c51c0..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/Types.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.mirror.util;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-
-
-/**
- * Utility methods for operating on types.
- *
- * @deprecated All components of this API have been superseded by the
- * standardized annotation processing API. The replacement for the
- * functionality of this interface is {@link
- * javax.lang.model.util.Types}.
- *
- * @author Joseph D. Darcy
- * @author Scott Seligman
- * @since 1.5
- */
- at Deprecated
- at SuppressWarnings("deprecation")
-public interface Types {
-
- /**
- * Tests whether one type is a subtype of the another.
- * Any type is considered to be a subtype of itself.
- *
- * @param t1 the first type
- * @param t2 the second type
- * @return <tt>true</tt> if and only if the first type is a subtype
- * of the second
- */
- boolean isSubtype(TypeMirror t1, TypeMirror t2);
-
- /**
- * Tests whether one type is assignable to another.
- *
- * @param t1 the first type
- * @param t2 the second type
- * @return <tt>true</tt> if and only if the first type is assignable
- * to the second
- */
- boolean isAssignable(TypeMirror t1, TypeMirror t2);
-
- /**
- * Returns the erasure of a type.
- *
- * @param t the type to be erased
- * @return the erasure of the given type
- */
- TypeMirror getErasure(TypeMirror t);
-
- /**
- * Returns a primitive type.
- *
- * @param kind the kind of primitive type to return
- * @return a primitive type
- */
- PrimitiveType getPrimitiveType(PrimitiveType.Kind kind);
-
- /**
- * Returns the pseudo-type representing the type of <tt>void</tt>.
- *
- * @return the pseudo-type representing the type of <tt>void</tt>
- */
- VoidType getVoidType();
-
- /**
- * Returns an array type with the specified component type.
- *
- * @param componentType the component type
- * @return an array type with the specified component type.
- * @throws IllegalArgumentException if the component type is not valid for
- * an array
- */
- ArrayType getArrayType(TypeMirror componentType);
-
- /**
- * Returns the type variable declared by a type parameter.
- *
- * @param tparam the type parameter
- * @return the type variable declared by the type parameter
- */
- TypeVariable getTypeVariable(TypeParameterDeclaration tparam);
-
- /**
- * Returns a new wildcard.
- * Either the wildcards's upper bounds or lower bounds may be
- * specified, or neither, but not both.
- *
- * @param upperBounds the upper bounds of this wildcard,
- * or an empty collection if none
- * @param lowerBounds the lower bounds of this wildcard,
- * or an empty collection if none
- * @return a new wildcard
- * @throws IllegalArgumentException if bounds are not valid
- */
- WildcardType getWildcardType(Collection<ReferenceType> upperBounds,
- Collection<ReferenceType> lowerBounds);
-
- /**
- * Returns the type corresponding to a type declaration and
- * actual type arguments.
- * Given the declaration for <tt>String</tt>, for example, this
- * method may be used to get the <tt>String</tt> type. It may
- * then be invoked a second time, with the declaration for <tt>Set</tt>,
- * to make the parameterized type {@code Set<String>}.
- *
- * <p> The number of type arguments must either equal the
- * number of the declaration's formal type parameters, or must be
- * zero. If zero, and if the declaration is generic,
- * then the declaration's raw type is returned.
- *
- * <p> If a parameterized type is being returned, its declaration
- * must not be contained within a generic outer class.
- * The parameterized type {@code Outer<String>.Inner<Number>},
- * for example, may be constructed by first using this
- * method to get the type {@code Outer<String>}, and then invoking
- * {@link #getDeclaredType(DeclaredType, TypeDeclaration, TypeMirror...)}.
- *
- * @param decl the type declaration
- * @param typeArgs the actual type arguments
- * @return the type corresponding to the type declaration and
- * actual type arguments
- * @throws IllegalArgumentException if too many or too few
- * type arguments are given, or if an inappropriate type
- * argument or declaration is provided
- */
- DeclaredType getDeclaredType(TypeDeclaration decl,
- TypeMirror... typeArgs);
-
- /**
- * Returns the type corresponding to a type declaration
- * and actual arguments, given a
- * {@linkplain DeclaredType#getContainingType() containing type}
- * of which it is a member.
- * The parameterized type {@code Outer<String>.Inner<Number>},
- * for example, may be constructed by first using
- * {@link #getDeclaredType(TypeDeclaration, TypeMirror...)}
- * to get the type {@code Outer<String>}, and then invoking
- * this method.
- *
- * <p> If the containing type is a parameterized type,
- * the number of type arguments must equal the
- * number of the declaration's formal type parameters.
- * If it is not parameterized or if it is <tt>null</tt>, this method is
- * equivalent to <tt>getDeclaredType(decl, typeArgs)</tt>.
- *
- * @param containing the containing type, or <tt>null</tt> if none
- * @param decl the type declaration
- * @param typeArgs the actual type arguments
- * @return the type corresponding to the type declaration and
- * actual type arguments,
- * contained within the given type
- * @throws IllegalArgumentException if too many or too few
- * type arguments are given, or if an inappropriate type
- * argument, declaration, or containing type is provided
- */
- DeclaredType getDeclaredType(DeclaredType containing,
- TypeDeclaration decl,
- TypeMirror... typeArgs);
-}
diff --git a/langtools/src/share/classes/com/sun/mirror/util/package-info.java b/langtools/src/share/classes/com/sun/mirror/util/package-info.java
deleted file mode 100644
index 7e4e3cb..0000000
--- a/langtools/src/share/classes/com/sun/mirror/util/package-info.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-/**
- * Utilities to assist in the processing of {@linkplain
- * com.sun.mirror.declaration declarations} and {@linkplain
- * com.sun.mirror.type types}.
- *
- * <p>The {@code apt} tool and its associated API have been superseded
- * by the standardized annotation processing API. The replacement for
- * the functionality in this package is {@link javax.lang.model.util}.
- *
- * @since 1.5
- */
-package com.sun.mirror.util;
diff --git a/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java b/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java
index 68efd16..c17b96f 100644
--- a/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java
+++ b/langtools/src/share/classes/com/sun/source/tree/MemberReferenceTree.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@ import javax.lang.model.element.Name;
* <em>expression</em> # <em>[ identifier | new ]</em>
* </pre>
*
- * @see JSR 292
+ * @since 1.8
*/
public interface MemberReferenceTree extends ExpressionTree {
diff --git a/langtools/src/share/classes/com/sun/source/util/JavacTask.java b/langtools/src/share/classes/com/sun/source/util/JavacTask.java
index 2f2038f..c1acc05 100644
--- a/langtools/src/share/classes/com/sun/source/util/JavacTask.java
+++ b/langtools/src/share/classes/com/sun/source/util/JavacTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* 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 @@
package com.sun.source.util;
-import com.sun.source.tree.CompilationUnitTree;
-import com.sun.source.tree.Tree;
import java.io.IOException;
+
+import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.Element;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Elements;
@@ -35,6 +35,12 @@ import javax.lang.model.util.Types;
import javax.tools.JavaCompiler.CompilationTask;
import javax.tools.JavaFileObject;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.Tree;
+import com.sun.tools.javac.api.BasicJavacTask;
+import com.sun.tools.javac.processing.JavacProcessingEnvironment;
+import com.sun.tools.javac.util.Context;
+
/**
* Provides access to functionality specific to the JDK Java Compiler, javac.
*
@@ -45,10 +51,29 @@ import javax.tools.JavaFileObject;
public abstract class JavacTask implements CompilationTask {
/**
+ * Get the {@code JavacTask} for a {@code ProcessingEnvironment}.
+ * If the compiler is being invoked using a
+ * {@link javax.tools.JavaCompiler.CompilationTask CompilationTask},
+ * then that task will be returned.
+ * @param processingEnvironment
+ * @return the {@code JavacTask} for a {@code ProcessingEnvironment}
+ * @since 1.8
+ */
+ public static JavacTask instance(ProcessingEnvironment processingEnvironment) {
+ if (!processingEnvironment.getClass().getName().equals(
+ "com.sun.tools.javac.processing.JavacProcessingEnvironment"))
+ throw new IllegalArgumentException();
+ Context c = ((JavacProcessingEnvironment) processingEnvironment).getContext();
+ JavacTask t = c.get(JavacTask.class);
+ return (t != null) ? t : new BasicJavacTask(c, true);
+ }
+
+ /**
* Parse the specified files returning a list of abstract syntax trees.
*
* @return a list of abstract syntax trees
* @throws IOException if an unhandled I/O error occurred in the compiler.
+ * @throws IllegalStateException if the operation cannot be performed at this time.
*/
public abstract Iterable<? extends CompilationUnitTree> parse()
throws IOException;
@@ -58,6 +83,7 @@ public abstract class JavacTask implements CompilationTask {
*
* @return a list of elements that were analyzed
* @throws IOException if an unhandled I/O error occurred in the compiler.
+ * @throws IllegalStateException if the operation cannot be performed at this time.
*/
public abstract Iterable<? extends Element> analyze() throws IOException;
@@ -66,17 +92,51 @@ public abstract class JavacTask implements CompilationTask {
*
* @return a list of files that were generated
* @throws IOException if an unhandled I/O error occurred in the compiler.
+ * @throws IllegalStateException if the operation cannot be performed at this time.
*/
public abstract Iterable<? extends JavaFileObject> generate() throws IOException;
/**
- * The specified listener will receive events describing the progress of
- * this compilation task.
+ * The specified listener will receive notification of events
+ * describing the progress of this compilation task.
+ *
+ * If another listener is receiving notifications as a result of a prior
+ * call of this method, then that listener will no longer receive notifications.
+ *
+ * Informally, this method is equivalent to calling {@code removeTaskListener} for
+ * any listener that has been previously set, followed by {@code addTaskListener}
+ * for the new listener.
+ *
+ * @throws IllegalStateException if the specified listener has already been added.
*/
public abstract void setTaskListener(TaskListener taskListener);
/**
+ * The specified listener will receive notification of events
+ * describing the progress of this compilation task.
+ *
+ * This method may be called at any time before or during the compilation.
+ *
+ * @throws IllegalStateException if the specified listener has already been added.
+ * @since 1.8
+ */
+ public abstract void addTaskListener(TaskListener taskListener);
+
+ /**
+ * The specified listener will no longer receive notification of events
+ * describing the progress of this compilation task.
+ *
+ * This method may be called at any time before or during the compilation.
+ *
+ * @since 1.8
+ */
+ public abstract void removeTaskListener(TaskListener taskListener);
+
+ /**
* Get a type mirror of the tree node determined by the specified path.
+ * This method has been superceded by methods on
+ * {@link com.sun.source.util.Trees Trees}.
+ * @see com.sun.source.util.Trees#getTypeMirror
*/
public abstract TypeMirror getTypeMirror(Iterable<? extends Tree> path);
/**
diff --git a/langtools/src/share/classes/com/sun/tools/apt/Main.java b/langtools/src/share/classes/com/sun/tools/apt/Main.java
deleted file mode 100644
index 0a34498..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/Main.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt;
-
-import java.io.PrintWriter;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-
-/**
- * The main program for the command-line tool apt.
- *
- * <p>Nothing described in this source file is part of any supported
- * API. If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.
- */
-public class Main {
-
- static {
- ClassLoader loader = Main.class.getClassLoader();
- if (loader != null)
- loader.setPackageAssertionStatus("com.sun.tools.apt", true);
- }
-
- /** Command line interface. If args is <tt>null</tt>, a
- * <tt>NullPointerException</tt> is thrown.
- * @param args The command line parameters.
- */
- public static void main(String... args) {
- System.exit(process(args));
- }
-
- /** Programatic interface. If args is <tt>null</tt>, a
- * <tt>NullPointerException</tt> is thrown.
- * Output is directed to <tt>System.err</tt>.
- * @param args The command line parameters.
- */
- public static int process(String... args) {
- return processing(null, null, args);
- }
-
- /** Programmatic interface. If any argument
- * is <tt>null</tt>, a <tt>NullPointerException</tt> is thrown.
- * @param args The command line parameters.
- * @param out Where the tool's output is directed.
- */
- public static int process(PrintWriter out, String... args) {
- if (out == null)
- throw new NullPointerException("Parameter out cannot be null.");
- return processing(null, out, args);
- }
-
- /** Programmatic interface. If <tt>factory</tt> or <tt>args</tt>
- * is <tt>null</tt>, a <tt>NullPointerException</tt> is thrown.
- * The "<tt>-factory</tt>" and "<tt>-factorypath</tt>"
- * command line parameters are ignored by this entry point.
- * Output is directed to <tt>System.err</tt>.
- *
- * @param factory The annotation processor factory to use
- * @param args The command line parameters.
- */
- public static int process(AnnotationProcessorFactory factory, String... args) {
- return process(factory, new PrintWriter(System.err, true), args);
- }
-
- /** Programmatic interface. If any argument
- * is <tt>null</tt>, a <tt>NullPointerException</tt> is thrown.
- * The "<tt>-factory</tt>" and "<tt>-factorypath</tt>"
- * command line parameters are ignored by this entry point.
- *
- * @param factory The annotation processor factory to use
- * @param args The command line parameters.
- * @param out Where the tool's output is directed.
- */
- public static int process(AnnotationProcessorFactory factory, PrintWriter out,
- String... args) {
- if (out == null)
- throw new NullPointerException("Parameter out cannot be null.");
- if (factory == null)
- throw new NullPointerException("Parameter factory cannot be null");
- return processing(factory, out, args);
- }
-
- private static int processing(AnnotationProcessorFactory factory,
- PrintWriter out,
- String... args) {
- if (out == null)
- out = new PrintWriter(System.err, true);
- com.sun.tools.apt.main.Main compiler =
- new com.sun.tools.apt.main.Main("apt", out);
- return compiler.compile(args, factory);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java b/langtools/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java
deleted file mode 100644
index 396cc16..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/AnnotationProcessingError.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.comp;
-
-public class AnnotationProcessingError extends Error {
- private static final long serialVersionUID = 3279196183341719287L;
- AnnotationProcessingError(Throwable cause) {
- super(cause);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java b/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
deleted file mode 100644
index 75d647f..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/Apt.java
+++ /dev/null
@@ -1,509 +0,0 @@
-/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.comp;
-
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.comp.*;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.tree.TreeScanner;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.apt.util.Bark;
-import com.sun.tools.javac.util.Position;
-
-import java.util.*;
-import java.util.regex.*;
-import java.lang.reflect.*;
-import java.lang.reflect.InvocationTargetException;
-import java.io.IOException;
-
-import com.sun.tools.apt.*;
-import com.sun.tools.apt.comp.*;
-import com.sun.tools.javac.code.Symbol.*;
-
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-import com.sun.mirror.apt.*;
-// import com.sun.mirror.apt.AnnotationProcessorFactory;
-import com.sun.mirror.apt.AnnotationProcessors;
-
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.apt.mirror.apt.FilerImpl;
-import com.sun.tools.apt.mirror.apt.AnnotationProcessorEnvironmentImpl;
-
-
-import static com.sun.tools.apt.mirror.declaration.DeclarationMaker.isJavaIdentifier;
-
-/**
- * Apt compiler phase.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b>
- */
- at SuppressWarnings("deprecation")
-public class Apt extends ListBuffer<Env<AttrContext>> {
- java.util.Set<String> genSourceFileNames = new java.util.LinkedHashSet<String>();
- public java.util.Set<String> getSourceFileNames() {
- return genSourceFileNames;
- }
-
- /** List of names of generated class files.
- */
- java.util.Set<String> genClassFileNames = new java.util.LinkedHashSet<String>();
- public java.util.Set<String> getClassFileNames() {
- return genClassFileNames;
- }
-
- /* AptEnvironment */
- AptEnv aptenv;
-
- private Context context;
-
- /** The context key for the todo list. */
-
- protected static final Context.Key<Apt> aptKey =
- new Context.Key<Apt>();
-
- /** Get the Apt instance for this context. */
- public static Apt instance(Context context) {
- Apt instance = context.get(aptKey);
- if (instance == null)
- instance = new Apt(context);
- return instance;
- }
-
- /** Create a new apt list. */
- protected Apt(Context context) {
- this.context = context;
-
- context.put(aptKey, this);
- aptenv = AptEnv.instance(context);
- }
-
- /**
- * Used to scan javac trees to build data structures needed for
- * bootstrapping the apt environment. In particular:
- *
- * <ul>
- *
- * <li> Generate list of canonical names of annotation types that
- * appear in source files given on the command line
- *
- * <li> Collect list of javac symbols representing source files
- * given on the command line
- *
- * </ul>
- */
- static class AptTreeScanner extends TreeScanner {
-
- // Set of fully qualified names of annotation types present in
- // examined source
- private Set<String> annotationSet;
-
- // Symbols to build bootstrapping declaration list
- private Collection<ClassSymbol> specifiedDeclCollection;
- private Collection<ClassSymbol> declCollection;
-
- public Set<String> getAnnotationSet() {
- return annotationSet;
- }
-
- public AptTreeScanner() {
- annotationSet = new LinkedHashSet<String>();
- specifiedDeclCollection = new LinkedHashSet<ClassSymbol>();
- declCollection = new LinkedHashSet<ClassSymbol>();
- }
-
- public void visitTopLevel(JCTree.JCCompilationUnit tree) {
- super.visitTopLevel(tree);
- // Print out contents -- what are we dealing with?
-
- for(JCTree d: tree.defs) {
- if (d instanceof JCTree.JCClassDecl)
- specifiedDeclCollection.add(((JCTree.JCClassDecl) d).sym);
- }
-
- }
-
- public void visitBlock(JCTree.JCBlock tree) {
- ; // Do nothing.
- }
-
-
- // should add nested classes to packages, etc.
- public void visitClassDef(JCTree.JCClassDecl tree) {
- if (tree.sym == null) {
- // could be an anon class w/in an initializer
- return;
- }
-
- super.visitClassDef(tree);
-
- declCollection.add(tree.sym);
- }
-
- public void visitMethodDef(JCTree.JCMethodDecl tree) {
- super.visitMethodDef(tree);
- }
-
- public void visitVarDef(JCTree.JCVariableDecl tree) {
- super.visitVarDef(tree);
- }
-
- public void visitAnnotation(JCTree.JCAnnotation tree) {
- super.visitAnnotation(tree);
- annotationSet.add(tree.type.tsym.toString());
- }
- }
-
- Set<String> computeAnnotationSet(Collection<ClassSymbol> classSymbols) {
- Set<String> annotationSet = new HashSet<String>();
-
- for(ClassSymbol classSymbol: classSymbols) {
- computeAnnotationSet(classSymbol, annotationSet);
- }
- return annotationSet;
- }
-
- void computeAnnotationSet(Symbol symbol, Set<String> annotationSet) {
- if (symbol != null ) {
- if (symbol.getAnnotationMirrors() != null)
- for(Attribute.Compound compound: symbol.getAnnotationMirrors())
- annotationSet.add(compound.type.tsym.toString()); // should fullName be used instead of toString?
-
- if (symbol instanceof Symbol.MethodSymbol) // add parameter annotations
- for(Symbol param: ((MethodSymbol) symbol).params())
- computeAnnotationSet(param, annotationSet);
-
- if (symbol.members() != null) {
- for(Scope.Entry e = symbol.members().elems; e != null; e = e.sibling)
- computeAnnotationSet(e.sym, annotationSet);
- }
- }
- }
-
- public void main(com.sun.tools.javac.util.List<JCTree.JCCompilationUnit> treeList,
- ListBuffer<ClassSymbol> classes,
- Map<String, String> origOptions,
- ClassLoader aptCL,
- AnnotationProcessorFactory providedFactory,
- java.util.Set<Class<? extends AnnotationProcessorFactory> > productiveFactories) {
- Bark bark = Bark.instance(context);
- java.io.PrintWriter out = bark.getWriter(Log.WriterKind.WARNING);
- Options options = Options.instance(context);
-
- Collection<TypeDeclaration> spectypedecls = new LinkedHashSet<TypeDeclaration>();
- Collection<TypeDeclaration> typedecls = new LinkedHashSet<TypeDeclaration>();
- Set<String> unmatchedAnnotations = new LinkedHashSet<String>();
- Set<AnnotationTypeDeclaration> emptyATDS = Collections.emptySet();
- Set<Class<? extends AnnotationProcessorFactory> > currentRoundFactories =
- new LinkedHashSet<Class<? extends AnnotationProcessorFactory> >();
-
- // Determine what annotations are present on the input source
- // files, create collections of specified type declarations,
- // and type declarations.
- AptTreeScanner ats = new AptTreeScanner();
- for(JCTree t: treeList) {
- t.accept(ats);
- }
-
- // Turn collection of ClassSymbols into Collection of apt decls
- for (ClassSymbol cs : ats.specifiedDeclCollection) {
- TypeDeclaration decl = aptenv.declMaker.getTypeDeclaration(cs);
- spectypedecls.add(decl);
- }
-
- for (ClassSymbol cs : ats.declCollection) {
- TypeDeclaration decl = aptenv.declMaker.getTypeDeclaration(cs);
- typedecls.add(decl);
- }
-
- unmatchedAnnotations.addAll(ats.getAnnotationSet());
-
- // Process input class files
- for(ClassSymbol cs : classes) {
- TypeDeclaration decl = aptenv.declMaker.getTypeDeclaration(cs);
- // System.out.println("Adding a class to spectypedecls");
- spectypedecls.add(decl);
- typedecls.add(decl);
- computeAnnotationSet(cs, unmatchedAnnotations);
- }
-
- if (options.get("-XListAnnotationTypes") != null) {
- out.println("Set of annotations found:" +
- (new TreeSet<String>(unmatchedAnnotations)).toString());
- }
-
- AnnotationProcessorEnvironmentImpl trivAPE =
- new AnnotationProcessorEnvironmentImpl(spectypedecls, typedecls, origOptions, context);
-
- if (options.get("-XListDeclarations") != null) {
- out.println("Set of Specified Declarations:" +
- spectypedecls);
-
- out.println("Set of Included Declarations: " +
- typedecls);
- }
-
- if (options.get("-print") != null) {
- if (spectypedecls.size() == 0 )
- throw new UsageMessageNeededException();
-
- // Run the printing processor
- AnnotationProcessor proc = (new BootstrapAPF()).getProcessorFor(new HashSet<AnnotationTypeDeclaration>(),
- trivAPE);
- proc.process();
- } else {
- // Discovery process
-
- // List of annotation processory factory instances
- java.util.Iterator<AnnotationProcessorFactory> providers = null;
- {
- /*
- * If a factory is provided by the user, the
- * "-factory" and "-factorypath" options are not used.
- *
- * Otherwise, if the "-factory" option is used, search
- * the appropriate path for the named class.
- * Otherwise, use sun.misc.Service to implement the
- * default discovery policy.
- */
-
- java.util.List<AnnotationProcessorFactory> list =
- new LinkedList<AnnotationProcessorFactory>();
- String factoryName = options.get("-factory");
-
- if (providedFactory != null) {
- list.add(providedFactory);
- providers = list.iterator();
- } else if (factoryName != null) {
- try {
- AnnotationProcessorFactory factory =
- (AnnotationProcessorFactory) (aptCL.loadClass(factoryName).newInstance());
- list.add(factory);
- } catch (ClassNotFoundException cnfe) {
- bark.aptWarning("FactoryNotFound", factoryName);
- } catch (ClassCastException cce) {
- bark.aptWarning("FactoryWrongType", factoryName);
- } catch (Exception e ) {
- bark.aptWarning("FactoryCantInstantiate", factoryName);
- } catch(Throwable t) {
- throw new AnnotationProcessingError(t);
- }
-
- providers = list.iterator();
- } else {
- @SuppressWarnings("unchecked")
- Iterator<AnnotationProcessorFactory> iter =
- sun.misc.Service.providers(AnnotationProcessorFactory.class, aptCL);
- providers = iter;
-
- }
- }
-
- java.util.Map<AnnotationProcessorFactory, Set<AnnotationTypeDeclaration>> factoryToAnnotation =
- new LinkedHashMap<AnnotationProcessorFactory, Set<AnnotationTypeDeclaration>>();
-
- if (!providers.hasNext() && productiveFactories.size() == 0) {
- if (unmatchedAnnotations.size() > 0)
- bark.aptWarning("NoAnnotationProcessors");
- if (spectypedecls.size() == 0)
- throw new UsageMessageNeededException();
- return; // no processors; nothing else to do
- } else {
- // If there are no annotations, still give
- // processors that match everything a chance to
- // run.
-
- if(unmatchedAnnotations.size() == 0)
- unmatchedAnnotations.add("");
-
- Set<String> emptyStringSet = new HashSet<String>();
- emptyStringSet.add("");
- emptyStringSet = Collections.unmodifiableSet(emptyStringSet);
-
- while (providers.hasNext() ) {
- Object provider = providers.next();
- try {
- Set<String> matchedStrings = new HashSet<String>();
-
- AnnotationProcessorFactory apf = (AnnotationProcessorFactory) provider;
- Collection<String> supportedTypes = apf.supportedAnnotationTypes();
-
- Collection<Pattern> supportedTypePatterns = new LinkedList<Pattern>();
- for(String s: supportedTypes)
- supportedTypePatterns.add(importStringToPattern(s));
-
- for(String s: unmatchedAnnotations) {
- for(Pattern p: supportedTypePatterns) {
- if (p.matcher(s).matches()) {
- matchedStrings.add(s);
- break;
- }
- }
- }
-
- unmatchedAnnotations.removeAll(matchedStrings);
-
- if (options.get("-XPrintFactoryInfo") != null) {
- out.println("Factory " + apf.getClass().getName() +
- " matches " +
- ((matchedStrings.size() == 0)?
- "nothing.": matchedStrings));
- }
-
- if (matchedStrings.size() > 0) {
- // convert annotation names to annotation
- // type decls
- Set<AnnotationTypeDeclaration> atds = new HashSet<AnnotationTypeDeclaration>();
-
- // If a "*" processor is called on the
- // empty string, pass in an empty set of
- // annotation type declarations.
- if (!matchedStrings.equals(emptyStringSet)) {
- for(String s: matchedStrings) {
- TypeDeclaration decl = aptenv.declMaker.getTypeDeclaration(s);
- AnnotationTypeDeclaration annotdecl;
- if (decl == null) {
- bark.aptError("DeclarationCreation", s);
- } else {
- try {
- annotdecl = (AnnotationTypeDeclaration)decl;
- atds.add(annotdecl);
-
- } catch (ClassCastException cce) {
- bark.aptError("BadDeclaration", s);
- }
- }
- }
- }
-
- currentRoundFactories.add(apf.getClass());
- productiveFactories.add(apf.getClass());
- factoryToAnnotation.put(apf, atds);
- } else if (productiveFactories.contains(apf.getClass())) {
- // If a factory provided a processor in a
- // previous round but doesn't match any
- // annotations this round, call it with an
- // empty set of declarations.
- currentRoundFactories.add(apf.getClass());
- factoryToAnnotation.put(apf, emptyATDS );
- }
-
- if (unmatchedAnnotations.size() == 0)
- break;
-
- } catch (ClassCastException cce) {
- bark.aptWarning("BadFactory", cce);
- }
- }
-
- unmatchedAnnotations.remove("");
- }
-
- // If the set difference of productiveFactories and
- // currentRoundFactories is non-empty, call the remaining
- // productive factories with an empty set of declarations.
- {
- java.util.Set<Class<? extends AnnotationProcessorFactory> > neglectedFactories =
- new LinkedHashSet<Class<? extends AnnotationProcessorFactory>>(productiveFactories);
- neglectedFactories.removeAll(currentRoundFactories);
- for(Class<? extends AnnotationProcessorFactory> working : neglectedFactories) {
- try {
- AnnotationProcessorFactory factory = working.newInstance();
- factoryToAnnotation.put(factory, emptyATDS);
- } catch (Exception e ) {
- bark.aptWarning("FactoryCantInstantiate", working.getName());
- } catch(Throwable t) {
- throw new AnnotationProcessingError(t);
- }
- }
- }
-
- if (unmatchedAnnotations.size() > 0)
- bark.aptWarning("AnnotationsWithoutProcessors", unmatchedAnnotations);
-
- Set<AnnotationProcessor> processors = new LinkedHashSet<AnnotationProcessor>();
-
- // If there were no source files AND no factory matching "*",
- // make sure the usage message is printed
- if (spectypedecls.size() == 0 &&
- factoryToAnnotation.keySet().size() == 0 )
- throw new UsageMessageNeededException();
-
- try {
- for(Map.Entry<AnnotationProcessorFactory, Set<AnnotationTypeDeclaration>> entry :
- factoryToAnnotation.entrySet()) {
- AnnotationProcessorFactory apFactory = entry.getKey();
- AnnotationProcessor processor = apFactory.getProcessorFor(entry.getValue(),
- trivAPE);
- if (processor != null)
- processors.add(processor);
- else
- bark.aptWarning("NullProcessor", apFactory.getClass().getName());
- }
- } catch(Throwable t) {
- throw new AnnotationProcessingError(t);
- }
-
- LinkedList<AnnotationProcessor> temp = new LinkedList<AnnotationProcessor>();
- temp.addAll(processors);
-
- AnnotationProcessor proc = AnnotationProcessors.getCompositeAnnotationProcessor(temp);
-
- try {
- proc.process();
- } catch (Throwable t) {
- throw new AnnotationProcessingError(t);
- }
-
- // Invoke listener callback mechanism
- trivAPE.roundComplete();
-
- FilerImpl filerimpl = (FilerImpl)trivAPE.getFiler();
- genSourceFileNames = filerimpl.getSourceFileNames();
- genClassFileNames = filerimpl.getClassFileNames();
- filerimpl.flush(); // Make sure new files are written out
- }
- }
-
- /**
- * Convert import-style string to regex matching that string. If
- * the string is a valid import-style string, return a regex that
- * won't match anything.
- */
- Pattern importStringToPattern(String s) {
- if (com.sun.tools.javac.processing.JavacProcessingEnvironment.isValidImportString(s)) {
- return com.sun.tools.javac.processing.JavacProcessingEnvironment.validImportStringToPattern(s);
- } else {
- Bark bark = Bark.instance(context);
- bark.aptWarning("MalformedSupportedString", s);
- return com.sun.tools.javac.processing.JavacProcessingEnvironment.noMatches;
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java b/langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java
deleted file mode 100644
index 5cb6cc1..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/BootstrapAPF.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.comp;
-
-import java.util.*;
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.AnnotationTypeDeclaration;
-
- at SuppressWarnings("deprecation")
-public class BootstrapAPF implements AnnotationProcessorFactory {
-
- static final Collection<String> supportedOptions =
- Collections.unmodifiableSet(new HashSet<String>());
-
- static Collection<String> supportedAnnotations;
- static {
- Collection<String> c = new HashSet<String>();
- c.add("*");
- supportedAnnotations = Collections.unmodifiableCollection(c);
- }
-
- public BootstrapAPF(){}
-
- public Collection<String> supportedOptions() {
- return BootstrapAPF.supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new PrintAP(env);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java b/langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java
deleted file mode 100644
index b5f663e..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/PrintAP.java
+++ /dev/null
@@ -1,467 +0,0 @@
-/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.comp;
-
-import com.sun.mirror.declaration.*;
-import static com.sun.mirror.declaration.Modifier.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.apt.*;
-
-import java.util.*;
-import com.sun.mirror.util.*;
-
-/**
- * Class used to implement "-print" option.
- */
- at SuppressWarnings("deprecation")
-public class PrintAP implements AnnotationProcessor {
-
-
- static class PrintingVisitors {
- int indentation = 0; // Indentation level;
- AnnotationProcessorEnvironment env;
- Messager out;
- Declaration java_lang_Object;
- Declaration java_lang_annotation_Annotation;
-
- static Set<Modifier> EMPTY_ELIDES = Collections.emptySet();
- static Set<Modifier> INTERFACE_ELIDES = EnumSet.of(ABSTRACT);
- static Set<Modifier> ENUM_ELIDES = EnumSet.of(FINAL, ABSTRACT);
- static Set<Modifier> INTERFACE_MEMBER_ELIDES = EnumSet.of(ABSTRACT, PUBLIC, STATIC, FINAL);
-
- PrintingVisitors(AnnotationProcessorEnvironment env) {
- this.env = env;
- this.out = env.getMessager();
- this.java_lang_Object = env.getTypeDeclaration("java.lang.Object");
- this.java_lang_annotation_Annotation = env.getTypeDeclaration("java.lang.annotation.Annotation");
- }
-
-
- static String [] spaces = {
- "",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " ",
- " "
- };
-
-
- String indent(){
- int indentation = this.indentation;
- if (indentation < 0)
- return "";
- else if (indentation <= 10)
- return spaces[indentation];
- else {
- StringBuilder sb = new StringBuilder();
- while (indentation > 10) {
- sb.append(spaces[indentation]);
- indentation -= 10;
- }
- sb.append(spaces[indentation]);
- return sb.toString();
- }
- }
-
-
- class PrePrinting extends SimpleDeclarationVisitor {
- Map<EnumDeclaration, Integer> enumCardinality = new HashMap<EnumDeclaration, Integer>();
- Map<EnumDeclaration, Integer> enumConstVisited = new HashMap<EnumDeclaration, Integer>();
-
- PrePrinting(){}
-
- public void visitClassDeclaration(ClassDeclaration d) {
- System.out.println();
- printDocComment(d);
- printModifiers(d, EMPTY_ELIDES);
- System.out.print("class " + d.getSimpleName());
- printFormalTypeParameters(d);
-
- // Elide "extends Object"
- ClassType Super = d.getSuperclass();
- if (Super != null && !java_lang_Object.equals(Super.getDeclaration()) )
- System.out.print(" extends " + Super.toString());
-
- printInterfaces(d);
-
- System.out.println(" {");
-
- PrintingVisitors.this.indentation++;
- }
-
- public void visitEnumDeclaration(EnumDeclaration d) {
- enumCardinality.put(d, d.getEnumConstants().size());
- enumConstVisited.put(d, 1);
-
- System.out.println();
- printDocComment(d);
- printModifiers(d, ENUM_ELIDES);
-
- System.out.print("enum " + d.getSimpleName());
- printFormalTypeParameters(d);
- printInterfaces(d);
-
- System.out.println(" {");
-
- PrintingVisitors.this.indentation++;
- }
-
-
- public void visitInterfaceDeclaration(InterfaceDeclaration d) {
- System.out.println();
- printDocComment(d);
- printModifiers(d, INTERFACE_ELIDES);
- System.out.print("interface " + d.getSimpleName());
-
- printFormalTypeParameters(d);
- printInterfaces(d);
-
- System.out.println(" {");
-
- PrintingVisitors.this.indentation++;
- }
-
- public void visitAnnotationTypeDeclaration(AnnotationTypeDeclaration d) {
- System.out.println();
- printDocComment(d);
- printModifiers(d, INTERFACE_ELIDES);
- System.out.print("@interface " + d.getSimpleName());
- printFormalTypeParameters(d);
-
- printInterfaces(d);
-
- System.out.println(" {");
-
- PrintingVisitors.this.indentation++;
- }
-
- public void visitFieldDeclaration(FieldDeclaration d) {
- System.out.println();
- printDocComment(d);
- printModifiers(d,
- (d.getDeclaringType() instanceof InterfaceDeclaration)?
- INTERFACE_MEMBER_ELIDES : EMPTY_ELIDES);
- System.out.print(d.getType().toString() + " " +
- d.getSimpleName() );
- String constantExpr = d.getConstantExpression();
- if (constantExpr != null) {
- System.out.print(" = " + constantExpr);
- }
- System.out.println(";" );
- }
-
- public void visitEnumConstantDeclaration(EnumConstantDeclaration d) {
- EnumDeclaration ed = d.getDeclaringType();
- int enumCard = enumCardinality.get(ed);
- int enumVisit = enumConstVisited.get(ed);
-
- System.out.println();
- printDocComment(d);
- System.out.print(PrintingVisitors.this.indent());
- System.out.print(d.getSimpleName() );
- System.out.println((enumVisit < enumCard )? ",":";" );
-
- enumConstVisited.put(ed, enumVisit+1);
- }
-
- public void visitMethodDeclaration(MethodDeclaration d) {
- System.out.println();
- printDocComment(d);
- printModifiers(d,
- (d.getDeclaringType() instanceof InterfaceDeclaration)?
- INTERFACE_MEMBER_ELIDES : EMPTY_ELIDES);
- printFormalTypeParameters(d);
- System.out.print(d.getReturnType().toString() + " ");
- System.out.print(d.getSimpleName() + "(");
- printParameters(d);
- System.out.print(")");
- printThrows(d);
- System.out.println(";");
- }
-
- public void visitConstructorDeclaration(ConstructorDeclaration d) {
- System.out.println();
- printDocComment(d);
- printModifiers(d, EMPTY_ELIDES);
- printFormalTypeParameters(d);
- System.out.print(d.getSimpleName() + "(");
- printParameters(d);
- System.out.print(")");
- printThrows(d);
- System.out.println(";");
- }
-
-
- }
-
- class PostPrinting extends SimpleDeclarationVisitor {
- PostPrinting(){}
-
- public void visitTypeDeclaration(TypeDeclaration d) {
- PrintingVisitors.this.indentation--;
-
- System.out.print(PrintingVisitors.this.indent());
- System.out.println("}");
- }
- }
-
- private void printAnnotations(Collection<AnnotationMirror> annots) {
-
- for(AnnotationMirror annot: annots) {
- System.out.print(this.indent());
- System.out.print(annot.toString());
- System.out.println();
- }
- }
-
- private void printAnnotationsInline(Collection<AnnotationMirror> annots) {
-
- for(AnnotationMirror annot: annots) {
- System.out.print(annot);
- System.out.print(" ");
- }
- }
-
-
- private void printParameters(ExecutableDeclaration ex) {
-
- Collection<ParameterDeclaration> parameters = ex.getParameters();
- int size = parameters.size();
-
- switch (size) {
- case 0:
- break;
-
- case 1:
- for(ParameterDeclaration parameter: parameters) {
- printModifiers(parameter, EMPTY_ELIDES);
-
- if (ex.isVarArgs() ) {
- System.out.print(((ArrayType)parameter.getType()).getComponentType() );
- System.out.print("...");
- } else
- System.out.print(parameter.getType());
- System.out.print(" " + parameter.getSimpleName());
- }
- break;
-
- default:
- {
- int i = 1;
- for(ParameterDeclaration parameter: parameters) {
- if (i == 2)
- PrintingVisitors.this.indentation++;
-
- if (i > 1)
- System.out.print(PrintingVisitors.this.indent());
-
- printModifiers(parameter, EMPTY_ELIDES);
-
- if (i == size && ex.isVarArgs() ) {
- System.out.print(((ArrayType)parameter.getType()).getComponentType() );
- System.out.print("...");
- } else
- System.out.print(parameter.getType());
- System.out.print(" " + parameter.getSimpleName());
-
- if (i < size)
- System.out.println(",");
-
- i++;
- }
-
- if (parameters.size() >= 2)
- PrintingVisitors.this.indentation--;
- }
- break;
- }
- }
-
- private void printDocComment(Declaration d) {
- String docComment = d.getDocComment();
-
- if (docComment != null) {
- // Break comment into lines
- java.util.StringTokenizer st = new StringTokenizer(docComment,
- "\n\r");
- System.out.print(PrintingVisitors.this.indent());
- System.out.println("/**");
-
- while(st.hasMoreTokens()) {
- System.out.print(PrintingVisitors.this.indent());
- System.out.print(" *");
- System.out.println(st.nextToken());
- }
-
- System.out.print(PrintingVisitors.this.indent());
- System.out.println(" */");
- }
- }
-
- private void printModifiers(Declaration d, Collection<Modifier> elides) {
- printAnnotations(d.getAnnotationMirrors());
-
- System.out.print(PrintingVisitors.this.indent());
-
- for(Modifier m: adjustModifiers(d.getModifiers(), elides) ){
- System.out.print(m.toString() + " ");
- }
- }
-
- private void printModifiers(ParameterDeclaration d, Collection<Modifier> elides) {
- printAnnotationsInline(d.getAnnotationMirrors());
-
- for(Modifier m: adjustModifiers(d.getModifiers(), elides) ) {
- System.out.print(m.toString() + " ");
- }
- }
-
- private Collection<Modifier> adjustModifiers(Collection<Modifier> mods,
- Collection<Modifier> elides) {
- if (elides.isEmpty())
- return mods;
- else {
- Collection<Modifier> newMods = new LinkedHashSet<Modifier>();
- newMods.addAll(mods);
- newMods.removeAll(elides);
- return newMods;
- }
- }
-
- private void printFormalTypeParameters(ExecutableDeclaration e) {
- printFormalTypeParameterSet(e.getFormalTypeParameters(), true);
- }
-
- private void printFormalTypeParameters(TypeDeclaration d) {
- printFormalTypeParameterSet(d.getFormalTypeParameters(), false);
- }
-
- private void printFormalTypeParameterSet(Collection<TypeParameterDeclaration> typeParams, boolean pad) {
- if (typeParams.size() != 0) {
- System.out.print("<");
-
- boolean first = true;
- for(TypeParameterDeclaration tpd: typeParams) {
- if (!first)
- System.out.print(", ");
- System.out.print(tpd.toString());
- }
-
- System.out.print(">");
- if (pad)
- System.out.print(" ");
-
- }
- }
-
- private void printInterfaceSet(Collection<InterfaceType> interfaces,
- boolean classNotInterface) {
- if (interfaces.size() != 0) {
- System.out.print((classNotInterface?" implements" : " extends"));
-
- boolean first = true;
- for(InterfaceType interType: interfaces) {
- if (!first)
- System.out.print(",");
- System.out.print(" ");
- System.out.print(interType.toString());
- first = false;
- }
- }
- }
-
- private void printInterfaces(TypeDeclaration d) {
- printInterfaceSet(d.getSuperinterfaces(), d instanceof ClassDeclaration);
- }
-
- private void printInterfaces(AnnotationTypeDeclaration d) {
- Collection<InterfaceType> interfaces = new HashSet<InterfaceType>(d.getSuperinterfaces());
-
- for(InterfaceType interType: interfaces) {
- if (java_lang_annotation_Annotation.equals(interType.getDeclaration()) )
- interfaces.remove(interType);
- }
-
- printInterfaceSet(interfaces, d instanceof ClassDeclaration);
- }
-
- private void printThrows(ExecutableDeclaration d) {
- Collection<ReferenceType> thrownTypes = d.getThrownTypes();
- final int size = thrownTypes.size();
- if (size != 0) {
- System.out.print(" throws");
-
- int i = 1;
- for(ReferenceType thrownType: thrownTypes) {
- if (i == 1) {
- System.out.print(" ");
- }
-
- if (i == 2)
- PrintingVisitors.this.indentation++;
-
- if (i >= 2)
- System.out.print(PrintingVisitors.this.indent());
-
- System.out.print(thrownType.toString());
-
-
- if (i != size) {
- System.out.println(", ");
- }
- i++;
- }
-
- if (size >= 2)
- PrintingVisitors.this.indentation--;
- }
- }
-
- DeclarationVisitor getPrintingVisitor() {
- return DeclarationVisitors.getSourceOrderDeclarationScanner(new PrePrinting(),
- new PostPrinting());
- }
- }
-
- AnnotationProcessorEnvironment env;
- PrintAP(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
-
- public void process() {
- Collection<TypeDeclaration> typedecls = env.getSpecifiedTypeDeclarations();
-
- for (TypeDeclaration td: typedecls)
- td.accept((new PrintingVisitors(env)).getPrintingVisitor());
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java b/langtools/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java
deleted file mode 100644
index 9eb9f31..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/comp/UsageMessageNeededException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.comp;
-
-
-public class UsageMessageNeededException extends RuntimeException {
- private static final long serialVersionUID = -3265159608992825840L;
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java b/langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java
deleted file mode 100644
index 32d10ab..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/main/AptJavaCompiler.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.main;
-
-import java.io.*;
-import java.util.Map;
-
-import javax.tools.JavaFileManager;
-import javax.tools.JavaFileObject;
-
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.util.*;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.jvm.*;
-
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.tree.JCTree.*;
-
-import com.sun.tools.apt.comp.*;
-import com.sun.tools.apt.util.Bark;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-
-/**
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b>
- */
- at SuppressWarnings("deprecation")
-public class AptJavaCompiler extends com.sun.tools.javac.main.JavaCompiler {
- /** The context key for the compiler. */
- protected static final Context.Key<AptJavaCompiler> compilerKey =
- new Context.Key<AptJavaCompiler>();
-
- /** Get the JavaCompiler instance for this context. */
- public static AptJavaCompiler instance(Context context) {
- AptJavaCompiler instance = context.get(compilerKey);
- if (instance == null)
- instance = new AptJavaCompiler(context);
- return instance;
- }
-
-
- java.util.Set<String> genSourceFileNames;
- java.util.Set<String> genClassFileNames;
-
- public java.util.Set<String> getSourceFileNames() {
- return genSourceFileNames;
- }
-
- /** List of names of generated class files.
- */
- public java.util.Set<String> getClassFileNames() {
- return genClassFileNames;
- }
-
- java.util.Set<java.io.File> aggregateGenFiles = java.util.Collections.emptySet();
-
- public java.util.Set<java.io.File> getAggregateGenFiles() {
- return aggregateGenFiles;
- }
-
- /** The bark to be used for error reporting.
- */
- Bark bark;
-
- /** The log to be used for error reporting.
- */
- Log log;
-
- /** The annotation framework
- */
- Apt apt;
-
- private static Context preRegister(Context context) {
- Bark.preRegister(context);
-
- if (context.get(JavaFileManager.class) == null)
- JavacFileManager.preRegister(context);
-
- return context;
- }
-
- /** Construct a new compiler from a shared context.
- */
- public AptJavaCompiler(Context context) {
- super(preRegister(context));
-
- context.put(compilerKey, this);
- apt = Apt.instance(context);
-
- ClassReader classReader = ClassReader.instance(context);
- classReader.preferSource = true;
-
- // TEMPORARY NOTE: bark==log, but while refactoring, we maintain their
- // original identities, to remember the original intent.
- log = Log.instance(context);
- bark = Bark.instance(context);
-
- Options options = Options.instance(context);
- classOutput = options.get("-retrofit") == null;
- nocompile = options.get("-nocompile") != null;
- print = options.get("-print") != null;
- classesAsDecls= options.get("-XclassesAsDecls") != null;
-
- genSourceFileNames = new java.util.LinkedHashSet<String>();
- genClassFileNames = new java.util.LinkedHashSet<String>();
-
- // this forces a copy of the line map to be kept in the tree,
- // for use by com.sun.mirror.util.SourcePosition.
- lineDebugInfo = true;
- }
-
- /* Switches:
- */
-
- /** Emit class files. This switch is always set, except for the first
- * phase of retrofitting, where signatures are parsed.
- */
- public boolean classOutput;
-
- /** The internal printing annotation processor should be used.
- */
- public boolean print;
-
- /** Compilation should not be done after annotation processing.
- */
- public boolean nocompile;
-
- /** Are class files being treated as declarations
- */
- public boolean classesAsDecls;
-
- /** Try to open input stream with given name.
- * Report an error if this fails.
- * @param filename The file name of the input stream to be opened.
- */
- // PROVIDED FOR EXTREME BACKWARDS COMPATIBILITY
- // There are some very obscure errors that can arise while translating
- // the contents of a file from bytes to characters. In Tiger, these
- // diagnostics were ignored. This method provides compatibility with
- // that behavior. It would be better to honor those diagnostics, in which
- // case, this method can be deleted.
- @Override
- public CharSequence readSource(JavaFileObject filename) {
- try {
- inputFiles.add(filename);
- boolean prev = bark.setDiagnosticsIgnored(true);
- try {
- return filename.getCharContent(false);
- }
- finally {
- bark.setDiagnosticsIgnored(prev);
- }
- } catch (IOException e) {
- bark.error(Position.NOPOS, "cant.read.file", filename);
- return null;
- }
- }
-
- /** Parse contents of input stream.
- * @param filename The name of the file from which input stream comes.
- * @param input The input stream to be parsed.
- */
- // PROVIDED FOR BACKWARDS COMPATIBILITY
- // In Tiger, diagnostics from the scanner and parser were ignored.
- // This method provides compatibility with that behavior.
- // It would be better to honor those diagnostics, in which
- // case, this method can be deleted.
- @Override
- protected JCCompilationUnit parse(JavaFileObject filename, CharSequence content) {
- boolean prev = bark.setDiagnosticsIgnored(true);
- try {
- return super.parse(filename, content);
- }
- finally {
- bark.setDiagnosticsIgnored(prev);
- }
- }
-
- @Override
- protected boolean keepComments() {
- return true; // make doc comments available to mirror API impl.
- }
-
- /** Track when the JavaCompiler has been used to compile something. */
- private boolean hasBeenUsed = false;
-
- /** Main method: compile a list of files, return all compiled classes
- * @param filenames The names of all files to be compiled.
- */
- public List<ClassSymbol> compile(List<String> filenames,
- Map<String, String> origOptions,
- ClassLoader aptCL,
- AnnotationProcessorFactory providedFactory,
- java.util.Set<Class<? extends AnnotationProcessorFactory> > productiveFactories,
- java.util.Set<java.io.File> aggregateGenFiles)
- throws Throwable {
- // as a JavaCompiler can only be used once, throw an exception if
- // it has been used before.
- assert !hasBeenUsed : "attempt to reuse JavaCompiler";
- hasBeenUsed = true;
-
- this.aggregateGenFiles = aggregateGenFiles;
-
- long msec = System.currentTimeMillis();
-
- ListBuffer<ClassSymbol> classes = new ListBuffer<ClassSymbol>();
- try {
- JavacFileManager fm = (JavacFileManager)fileManager;
- //parse all files
- ListBuffer<JCCompilationUnit> trees = new ListBuffer<JCCompilationUnit>();
- for (List<String> l = filenames; l.nonEmpty(); l = l.tail) {
- if (classesAsDecls) {
- if (! l.head.endsWith(".java") ) { // process as class file
- ClassSymbol cs = reader.enterClass(names.fromString(l.head));
- try {
- cs.complete();
- } catch(Symbol.CompletionFailure cf) {
- bark.aptError("CantFindClass", l);
- continue;
- }
-
- classes.append(cs); // add to list of classes
- continue;
- }
- }
- JavaFileObject fo = fm.getJavaFileObjectsFromStrings(List.of(l.head)).iterator().next();
- trees.append(parse(fo));
- }
-
- //enter symbols for all files
- List<JCCompilationUnit> roots = trees.toList();
-
- if (errorCount() == 0) {
- boolean prev = bark.setDiagnosticsIgnored(true);
- try {
- enter.main(roots);
- }
- finally {
- bark.setDiagnosticsIgnored(prev);
- }
- }
-
- if (errorCount() == 0) {
- apt.main(roots,
- classes,
- origOptions, aptCL,
- providedFactory,
- productiveFactories);
- genSourceFileNames.addAll(apt.getSourceFileNames());
- genClassFileNames.addAll(apt.getClassFileNames());
- }
-
- } catch (Abort ex) {
- }
-
- if (verbose)
- log.printVerbose("total", Long.toString(System.currentTimeMillis() - msec));
-
- chk.reportDeferredDiagnostics();
-
- printCount("error", errorCount());
- printCount("warn", warningCount());
-
- return classes.toList();
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java b/langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java
deleted file mode 100644
index 5306830..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/main/CommandLine.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.main;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.io.FileReader;
-import java.io.BufferedReader;
-import java.io.StreamTokenizer;
-import com.sun.tools.javac.util.ListBuffer;
-
-/**
- * Various utility methods for processing Java tool command line arguments.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- */
-public class CommandLine {
- /**
- * Process Win32-style command files for the specified command line
- * arguments and return the resulting arguments. A command file argument
- * is of the form '@file' where 'file' is the name of the file whose
- * contents are to be parsed for additional arguments. The contents of
- * the command file are parsed using StreamTokenizer and the original
- * '@file' argument replaced with the resulting tokens. Recursive command
- * files are not supported. The '@' character itself can be quoted with
- * the sequence '@@'.
- */
- public static String[] parse(String[] args)
- throws IOException
- {
- ListBuffer<String> newArgs = new ListBuffer<String>();
- for (int i = 0; i < args.length; i++) {
- String arg = args[i];
- if (arg.length() > 1 && arg.charAt(0) == '@') {
- arg = arg.substring(1);
- if (arg.charAt(0) == '@') {
- newArgs.append(arg);
- } else {
- loadCmdFile(arg, newArgs);
- }
- } else {
- newArgs.append(arg);
- }
- }
- return newArgs.toList().toArray(new String[newArgs.length()]);
- }
-
- private static void loadCmdFile(String name, ListBuffer<String> args)
- throws IOException
- {
- Reader r = new BufferedReader(new FileReader(name));
- StreamTokenizer st = new StreamTokenizer(r);
- st.resetSyntax();
- st.wordChars(' ', 255);
- st.whitespaceChars(0, ' ');
- st.commentChar('#');
- st.quoteChar('"');
- st.quoteChar('\'');
- while (st.nextToken() != StreamTokenizer.TT_EOF) {
- args.append(st.sval);
- }
- r.close();
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java b/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
deleted file mode 100644
index 0adab92..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/main/Main.java
+++ /dev/null
@@ -1,1281 +0,0 @@
-/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.main;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-import java.util.StringTokenizer;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
-
-import java.net.URLClassLoader;
-import java.net.URL;
-import java.net.MalformedURLException;
-
-import javax.tools.JavaFileManager;
-import javax.tools.StandardLocation;
-
-import com.sun.tools.javac.file.JavacFileManager;
-import com.sun.tools.javac.code.Source;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.jvm.Target;
-import com.sun.tools.javac.util.*;
-
-import com.sun.tools.apt.comp.AnnotationProcessingError;
-import com.sun.tools.apt.comp.UsageMessageNeededException;
-import com.sun.tools.apt.util.Bark;
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-
-import static com.sun.tools.javac.file.Locations.pathToURLs;
-
-/** This class provides a commandline interface to the apt build-time
- * tool.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own
- * risk. This code and its internal interfaces are subject to change
- * or deletion without notice.</b>
- */
- at SuppressWarnings("deprecation")
-public class Main {
-
- /** For testing: enter any options you want to be set implicitly
- * here.
- */
- static String[] forcedOpts = {
- // Preserve parameter names from class files if the class was
- // compiled with debug enabled
- "-XDsave-parameter-names"
- };
-
- /** The name of the compiler, for use in diagnostics.
- */
- String ownName;
-
- /** The writer to use for diagnostic output.
- */
- PrintWriter out;
-
-
- /** Instantiated factory to use in lieu of discovery process.
- */
- AnnotationProcessorFactory providedFactory = null;
-
- /** Map representing original command-line arguments.
- */
- Map<String,String> origOptions = new HashMap<String, String>();
-
- /** Classloader to use for finding factories.
- */
- ClassLoader aptCL = null;
-
- /** Result codes.
- */
- static final int
- EXIT_OK = 0, // Compilation completed with no errors.
- EXIT_ERROR = 1, // Completed but reported errors.
- EXIT_CMDERR = 2, // Bad command-line arguments
- EXIT_SYSERR = 3, // System error or resource exhaustion.
- EXIT_ABNORMAL = 4; // Compiler terminated abnormally
-
- /** This class represents an option recognized by the main program
- */
- private class Option {
- /** Whether or not the option is used only aptOnly.
- */
- boolean aptOnly = false;
-
- /** Option string.
- */
- String name;
-
- /** Documentation key for arguments.
- */
- String argsNameKey;
-
- /** Documentation key for description.
- */
- String descrKey;
-
- /** Suffix option (-foo=bar or -foo:bar)
- */
- boolean hasSuffix;
-
- Option(String name, String argsNameKey, String descrKey) {
- this.name = name;
- this.argsNameKey = argsNameKey;
- this.descrKey = descrKey;
- char lastChar = name.charAt(name.length()-1);
- hasSuffix = lastChar == ':' || lastChar == '=';
- }
- Option(String name, String descrKey) {
- this(name, null, descrKey);
- }
-
- public String toString() {
- return name;
- }
-
- /** Does this option take a (separate) operand?
- */
- boolean hasArg() {
- return argsNameKey != null && !hasSuffix;
- }
-
- /** Does argument string match option pattern?
- * @param arg The command line argument string.
- */
- boolean matches(String arg) {
- return hasSuffix ? arg.startsWith(name) : arg.equals(name);
- }
-
- /** For javac-only options, print nothing.
- */
- void help() {
- }
-
- String helpSynopsis() {
- return name +
- (argsNameKey == null ? "" :
- ((hasSuffix ? "" : " ") +
- getLocalizedString(argsNameKey)));
- }
-
- /** Print a line of documentation describing this option, if non-standard.
- */
- void xhelp() {}
-
- /** Process the option (with arg). Return true if error detected.
- */
- boolean process(String option, String arg) {
- options.put(option, arg);
- return false;
- }
-
- /** Process the option (without arg). Return true if error detected.
- */
- boolean process(String option) {
- if (hasSuffix)
- return process(name, option.substring(name.length()));
- else
- return process(option, option);
- }
- };
-
- private class SharedOption extends Option {
- SharedOption(String name, String argsNameKey, String descrKey) {
- super(name, argsNameKey, descrKey);
- }
-
- SharedOption(String name, String descrKey) {
- super(name, descrKey);
- }
-
- void help() {
- String s = " " + helpSynopsis();
- out.print(s);
- for (int j = s.length(); j < 29; j++) out.print(" ");
- Bark.printRawLines(out, getLocalizedString(descrKey));
- }
-
- }
-
- private class AptOption extends Option {
- AptOption(String name, String argsNameKey, String descrKey) {
- super(name, argsNameKey, descrKey);
- aptOnly = true;
- }
-
- AptOption(String name, String descrKey) {
- super(name, descrKey);
- aptOnly = true;
- }
-
- /** Print a line of documentation describing this option, if standard.
- */
- void help() {
- String s = " " + helpSynopsis();
- out.print(s);
- for (int j = s.length(); j < 29; j++) out.print(" ");
- Bark.printRawLines(out, getLocalizedString(descrKey));
- }
-
- }
-
- /** A nonstandard or extended (-X) option
- */
- private class XOption extends Option {
- XOption(String name, String argsNameKey, String descrKey) {
- super(name, argsNameKey, descrKey);
- }
- XOption(String name, String descrKey) {
- this(name, null, descrKey);
- }
- void help() {}
- void xhelp() {}
- };
-
- /** A nonstandard or extended (-X) option
- */
- private class AptXOption extends Option {
- AptXOption(String name, String argsNameKey, String descrKey) {
- super(name, argsNameKey, descrKey);
- aptOnly = true;
- }
- AptXOption(String name, String descrKey) {
- this(name, null, descrKey);
- }
- void xhelp() {
- String s = " " + helpSynopsis();
- out.print(s);
- for (int j = s.length(); j < 29; j++) out.print(" ");
- Log.printRawLines(out, getLocalizedString(descrKey));
- }
- };
-
- /** A hidden (implementor) option
- */
- private class HiddenOption extends Option {
- HiddenOption(String name) {
- super(name, null, null);
- }
- HiddenOption(String name, String argsNameKey) {
- super(name, argsNameKey, null);
- }
- void help() {}
- void xhelp() {}
- };
-
- private class AptHiddenOption extends HiddenOption {
- AptHiddenOption(String name) {
- super(name);
- aptOnly = true;
- }
- AptHiddenOption(String name, String argsNameKey) {
- super(name, argsNameKey);
- aptOnly = true;
- }
- }
-
- private Option[] recognizedOptions = {
- new Option("-g", "opt.g"),
- new Option("-g:none", "opt.g.none") {
- boolean process(String option) {
- options.put("-g:", "none");
- return false;
- }
- },
-
- new Option("-g:{lines,vars,source}", "opt.g.lines.vars.source") {
- boolean matches(String s) {
- return s.startsWith("-g:");
- }
- boolean process(String option) {
- String suboptions = option.substring(3);
- options.put("-g:", suboptions);
- // enter all the -g suboptions as "-g:suboption"
- for (StringTokenizer t = new StringTokenizer(suboptions, ","); t.hasMoreTokens(); ) {
- String tok = t.nextToken();
- String opt = "-g:" + tok;
- options.put(opt, opt);
- }
- return false;
- }
- },
-
- new XOption("-Xlint", "opt.Xlint"),
- new XOption("-Xlint:{"
- + "all,"
- + "cast,deprecation,divzero,empty,unchecked,fallthrough,path,serial,finally,overrides,"
- + "-cast,-deprecation,-divzero,-empty,-unchecked,-fallthrough,-path,-serial,-finally,-overrides,"
- + "none}",
- "opt.Xlint.suboptlist") {
- boolean matches(String s) {
- return s.startsWith("-Xlint:");
- }
- boolean process(String option) {
- String suboptions = option.substring(7);
- options.put("-Xlint:", suboptions);
- // enter all the -Xlint suboptions as "-Xlint:suboption"
- for (StringTokenizer t = new StringTokenizer(suboptions, ","); t.hasMoreTokens(); ) {
- String tok = t.nextToken();
- String opt = "-Xlint:" + tok;
- options.put(opt, opt);
- }
- return false;
- }
- },
-
- new Option("-nowarn", "opt.nowarn"),
- new Option("-verbose", "opt.verbose"),
-
- // -deprecation is retained for command-line backward compatibility
- new Option("-deprecation", "opt.deprecation") {
- boolean process(String option) {
- options.put("-Xlint:deprecation", option);
- return false;
- }
- },
-
- new SharedOption("-classpath", "opt.arg.path", "opt.classpath"),
- new SharedOption("-cp", "opt.arg.path", "opt.classpath") {
- boolean process(String option, String arg) {
- return super.process("-classpath", arg);
- }
- },
- new Option("-sourcepath", "opt.arg.path", "opt.sourcepath"),
- new Option("-bootclasspath", "opt.arg.path", "opt.bootclasspath") {
- boolean process(String option, String arg) {
- options.remove("-Xbootclasspath/p:");
- options.remove("-Xbootclasspath/a:");
- return super.process(option, arg);
- }
- },
- new XOption("-Xbootclasspath/p:", "opt.arg.path", "opt.Xbootclasspath.p"),
- new XOption("-Xbootclasspath/a:", "opt.arg.path", "opt.Xbootclasspath.a"),
- new XOption("-Xbootclasspath:", "opt.arg.path", "opt.bootclasspath") {
- boolean process(String option, String arg) {
- options.remove("-Xbootclasspath/p:");
- options.remove("-Xbootclasspath/a:");
- return super.process("-bootclasspath", arg);
- }
- },
- new Option("-extdirs", "opt.arg.dirs", "opt.extdirs"),
- new XOption("-Djava.ext.dirs=", "opt.arg.dirs", "opt.extdirs") {
- boolean process(String option, String arg) {
- return super.process("-extdirs", arg);
- }
- },
- new Option("-endorseddirs", "opt.arg.dirs", "opt.endorseddirs"),
- new XOption("-Djava.endorsed.dirs=","opt.arg.dirs", "opt.endorseddirs") {
- boolean process(String option, String arg) {
- return super.process("-endorseddirs", arg);
- }
- },
- new Option("-proc:{none, only}", "opt.proc.none.only") {
- public boolean matches(String s) {
- return s.equals("-proc:none") || s.equals("-proc:only");
- }
- },
- new Option("-processor", "opt.arg.class", "opt.processor"),
- new Option("-processorpath", "opt.arg.path", "opt.processorpath"),
-
- new SharedOption("-d", "opt.arg.path", "opt.d"),
- new SharedOption("-s", "opt.arg.path", "opt.s"),
- new Option("-encoding", "opt.arg.encoding", "opt.encoding"),
- new SharedOption("-source", "opt.arg.release", "opt.source") {
- boolean process(String option, String operand) {
- Source source = Source.lookup(operand);
- if (source == null) {
- error("err.invalid.source", operand);
- return true;
- } else if (source.compareTo(Source.JDK1_5) > 0) {
- error("err.unsupported.source.version", operand);
- return true;
- }
- return super.process(option, operand);
- }
- },
- new Option("-target", "opt.arg.release", "opt.target") {
- boolean process(String option, String operand) {
- Target target = Target.lookup(operand);
- if (target == null) {
- error("err.invalid.target", operand);
- return true;
- } else if (target.compareTo(Target.JDK1_5) > 0) {
- error("err.unsupported.target.version", operand);
- return true;
- }
- return super.process(option, operand);
- }
- },
- new AptOption("-version", "opt.version") {
- boolean process(String option) {
- Bark.printRawLines(out, ownName + " " + AptJavaCompiler.version());
- return super.process(option);
- }
- },
- new HiddenOption("-fullversion"),
- new AptOption("-help", "opt.help") {
- boolean process(String option) {
- Main.this.help();
- return super.process(option);
- }
- },
- new SharedOption("-X", "opt.X") {
- boolean process(String option) {
- Main.this.xhelp();
- return super.process(option);
- }
- },
-
- // This option exists only for the purpose of documenting itself.
- // It's actually implemented by the launcher.
- new AptOption("-J", "opt.arg.flag", "opt.J") {
- String helpSynopsis() {
- hasSuffix = true;
- return super.helpSynopsis();
- }
- boolean process(String option) {
- throw new AssertionError
- ("the -J flag should be caught by the launcher.");
- }
- },
-
-
- new SharedOption("-A", "opt.proc.flag", "opt.A") {
- String helpSynopsis() {
- hasSuffix = true;
- return super.helpSynopsis();
- }
-
- boolean matches(String arg) {
- return arg.startsWith("-A");
- }
-
- boolean hasArg() {
- return false;
- }
-
- boolean process(String option) {
- return process(option, option);
- }
- },
-
- new AptOption("-nocompile", "opt.nocompile"),
-
- new AptOption("-print", "opt.print"),
-
- new AptOption("-factorypath", "opt.arg.path", "opt.factorypath"),
-
- new AptOption("-factory", "opt.arg.class", "opt.factory"),
-
- new AptXOption("-XListAnnotationTypes", "opt.XListAnnotationTypes"),
-
- new AptXOption("-XListDeclarations", "opt.XListDeclarations"),
-
- new AptXOption("-XPrintAptRounds", "opt.XPrintAptRounds"),
-
- new AptXOption("-XPrintFactoryInfo", "opt.XPrintFactoryInfo"),
-
- /*
- * Option to treat both classes and source files as
- * declarations that can be given on the command line and
- * processed as the result of an apt round.
- */
- new AptXOption("-XclassesAsDecls", "opt.XClassesAsDecls"),
-
- // new Option("-moreinfo", "opt.moreinfo") {
- new HiddenOption("-moreinfo") {
- boolean process(String option) {
- Type.moreInfo = true;
- return super.process(option);
- }
- },
-
- // treat warnings as errors
- new HiddenOption("-Werror"),
-
- // use complex inference from context in the position of a method call argument
- new HiddenOption("-complexinference"),
-
- // prompt after each error
- // new Option("-prompt", "opt.prompt"),
- new HiddenOption("-prompt"),
-
- // dump stack on error
- new HiddenOption("-doe"),
-
- // display warnings for generic unchecked and unsafe operations
- new HiddenOption("-warnunchecked") {
- boolean process(String option) {
- options.put("-Xlint:unchecked", option);
- return false;
- }
- },
-
- new HiddenOption("-Xswitchcheck") {
- boolean process(String option) {
- options.put("-Xlint:switchcheck", option);
- return false;
- }
- },
-
- // generate trace output for subtyping operations
- new HiddenOption("-debugsubtyping"),
-
- new XOption("-Xmaxerrs", "opt.arg.number", "opt.maxerrs"),
- new XOption("-Xmaxwarns", "opt.arg.number", "opt.maxwarns"),
- new XOption("-Xstdout", "opt.arg.file", "opt.Xstdout") {
- boolean process(String option, String arg) {
- try {
- out = new PrintWriter(new FileWriter(arg), true);
- } catch (java.io.IOException e) {
- error("err.error.writing.file", arg, e);
- return true;
- }
- return super.process(option, arg);
- }
- },
-
- new XOption("-Xprint", "opt.print"),
-
- new XOption("-XprintRounds", "opt.printRounds"),
-
- new XOption("-XprintProcessorInfo", "opt.printProcessorInfo"),
-
-
- /* -O is a no-op, accepted for backward compatibility. */
- new HiddenOption("-O"),
-
- /* -Xjcov produces tables to support the code coverage tool jcov. */
- new HiddenOption("-Xjcov"),
-
- /* This is a back door to the compiler's option table.
- * -Dx=y sets the option x to the value y.
- * -Dx sets the option x to the value x.
- */
- new HiddenOption("-XD") {
- String s;
- boolean matches(String s) {
- this.s = s;
- return s.startsWith(name);
- }
- boolean process(String option) {
- s = s.substring(name.length());
- int eq = s.indexOf('=');
- String key = (eq < 0) ? s : s.substring(0, eq);
- String value = (eq < 0) ? s : s.substring(eq+1);
- options.put(key, value);
- return false;
- }
- },
-
- new HiddenOption("sourcefile") {
- String s;
- boolean matches(String s) {
- this.s = s;
- return s.endsWith(".java") ||
- (options.get("-XclassesAsDecls") != null);
- }
- boolean process(String option) {
- if (s.endsWith(".java")) {
- if (!sourceFileNames.contains(s))
- sourceFileNames.add(s);
- } else if (options.get("-XclassesAsDecls") != null) {
- classFileNames.add(s);
- }
- return false;
- }
- },
- };
-
- /**
- * Construct a compiler instance.
- */
- public Main(String name) {
- this(name, new PrintWriter(System.err, true));
- }
-
- /**
- * Construct a compiler instance.
- */
- public Main(String name, PrintWriter out) {
- this.ownName = name;
- this.out = out;
- }
-
- /** A table of all options that's passed to the JavaCompiler constructor. */
- private Options options = null;
-
- /** The list of source files to process
- */
- java.util.List<String> sourceFileNames = new java.util.LinkedList<String>();
-
- /** The list of class files to process
- */
- java.util.List<String> classFileNames = new java.util.LinkedList<String>();
-
- /** List of top level names of generated source files from most recent apt round.
- */
- java.util.Set<String> genSourceFileNames = new java.util.LinkedHashSet<String>();
-
- /** List of names of generated class files from most recent apt round.
- */
- java.util.Set<String> genClassFileNames = new java.util.LinkedHashSet<String>();
-
- /**
- * List of all the generated source file names across all apt rounds.
- */
- java.util.Set<String> aggregateGenSourceFileNames = new java.util.LinkedHashSet<String>();
-
- /**
- * List of all the generated class file names across all apt rounds.
- */
- java.util.Set<String> aggregateGenClassFileNames = new java.util.LinkedHashSet<String>();
-
- /**
- * List of all the generated file names across all apt rounds.
- */
- java.util.Set<java.io.File> aggregateGenFiles = new java.util.LinkedHashSet<java.io.File>();
-
- /**
- * Set of all factories that have provided a processor on some apt round.
- */
- java.util.Set<Class<? extends AnnotationProcessorFactory> > productiveFactories =
- new java.util.LinkedHashSet<Class<? extends AnnotationProcessorFactory> >();
-
-
-
- /** Print a string that explains usage.
- */
- void help() {
- Bark.printRawLines(out, getLocalizedString("msg.usage.header", ownName));
- for (int i=0; i < recognizedOptions.length; i++) {
- recognizedOptions[i].help();
- }
- Bark.printRawLines(out, getLocalizedString("msg.usage.footer"));
- out.println();
- }
-
- /** Print a string that explains usage for X options.
- */
- void xhelp() {
- for (int i=0; i<recognizedOptions.length; i++) {
- recognizedOptions[i].xhelp();
- }
- out.println();
- Bark.printRawLines(out, getLocalizedString("msg.usage.nonstandard.footer"));
- }
-
- /** Report a usage error.
- */
- void error(String key, Object... args) {
- warning(key, args);
- help();
- }
-
- /** Report a warning.
- */
- void warning(String key, Object... args) {
- Bark.printRawLines(out, ownName + ": "
- + getLocalizedString(key, args));
- }
-
- /** Process command line arguments: store all command line options
- * in `options' table and return all source filenames.
- * @param args The array of command line arguments.
- */
- protected java.util.List<String> processArgs(String[] flags) {
- int ac = 0;
- while (ac < flags.length) {
- String flag = flags[ac];
- ac++;
-
- int j;
- for (j=0; j < recognizedOptions.length; j++)
- if (recognizedOptions[j].matches(flag))
- break;
-
- if (j == recognizedOptions.length) {
- error("err.invalid.flag", flag);
- return null;
- }
-
- Option option = recognizedOptions[j];
- if (option.hasArg()) {
- if (ac == flags.length) {
- error("err.req.arg", flag);
- return null;
- }
- String operand = flags[ac];
- ac++;
- if (option.process(flag, operand))
- return null;
- } else {
- if (option.process(flag))
- return null;
- }
- }
-
- String sourceString = options.get("-source");
- Source source = (sourceString != null)
- ? Source.lookup(sourceString)
- : Source.JDK1_5; // JDK 5 is the latest supported source version
- String targetString = options.get("-target");
- Target target = (targetString != null)
- ? Target.lookup(targetString)
- : Target.JDK1_5; // JDK 5 is the latest supported source version
- // We don't check source/target consistency for CLDC, as J2ME
- // profiles are not aligned with J2SE targets; moreover, a
- // single CLDC target may have many profiles. In addition,
- // this is needed for the continued functioning of the JSR14
- // prototype.
- if (Character.isDigit(target.name.charAt(0)) &&
- target.compareTo(source.requiredTarget()) < 0) {
- if (targetString != null) {
- if (sourceString == null) {
- warning("warn.target.default.source.conflict",
- targetString,
- source.requiredTarget().name);
- } else {
- warning("warn.source.target.conflict",
- sourceString,
- source.requiredTarget().name);
- }
- return null;
- } else {
- options.put("-target", source.requiredTarget().name);
- }
- }
- return sourceFileNames;
- }
-
- /** Programmatic interface for main function.
- * @param args The command line parameters.
- */
- public int compile(String[] args, AnnotationProcessorFactory factory) {
- int returnCode = 0;
- providedFactory = factory;
-
- Context context = new Context();
- JavacFileManager.preRegister(context);
- options = Options.instance(context);
- Bark bark;
-
- /*
- * Process the command line options to create the intial
- * options data. This processing is at least partially reused
- * by any recursive apt calls.
- */
-
- // For testing: assume all arguments in forcedOpts are
- // prefixed to command line arguments.
- processArgs(forcedOpts);
-
- /*
- * A run of apt only gets passed the most recently generated
- * files; the initial run of apt gets passed the files from
- * the command line.
- */
-
- java.util.List<String> origFilenames;
- try {
- // assign args the result of parse to capture results of
- // '@file' expansion
- origFilenames = processArgs((args=CommandLine.parse(args)));
-
- if (options.get("suppress-tool-api-removal-message") == null) {
- Bark.printRawLines(out, getLocalizedString("misc.Deprecation"));
- }
-
- if (origFilenames == null) {
- return EXIT_CMDERR;
- } else if (origFilenames.size() == 0) {
- // it is allowed to compile nothing if just asking for help
- if (options.get("-help") != null ||
- options.get("-X") != null)
- return EXIT_OK;
- }
- } catch (java.io.FileNotFoundException e) {
- Bark.printRawLines(out, ownName + ": " +
- getLocalizedString("err.file.not.found",
- e.getMessage()));
- return EXIT_SYSERR;
- } catch (IOException ex) {
- ioMessage(ex);
- return EXIT_SYSERR;
- } catch (OutOfMemoryError ex) {
- resourceMessage(ex);
- return EXIT_SYSERR;
- } catch (StackOverflowError ex) {
- resourceMessage(ex);
- return EXIT_SYSERR;
- } catch (FatalError ex) {
- feMessage(ex);
- return EXIT_SYSERR;
- } catch (sun.misc.ServiceConfigurationError sce) {
- sceMessage(sce);
- return EXIT_ABNORMAL;
- } catch (Throwable ex) {
- bugMessage(ex);
- return EXIT_ABNORMAL;
- }
-
-
- boolean firstRound = true;
- boolean needSourcePath = false;
- boolean needClassPath = false;
- boolean classesAsDecls = options.get("-XclassesAsDecls") != null;
-
- /*
- * Create augumented classpath and sourcepath values.
- *
- * If any of the prior apt rounds generated any new source
- * files, the n'th apt round (and any javac invocation) has the
- * source destination path ("-s path") as the last element of
- * the "-sourcepath" to the n'th call.
- *
- * If any of the prior apt rounds generated any new class files,
- * the n'th apt round (and any javac invocation) has the class
- * destination path ("-d path") as the last element of the
- * "-classpath" to the n'th call.
- */
- String augmentedSourcePath = "";
- String augmentedClassPath = "";
- String baseClassPath = "";
-
- try {
- /*
- * Record original options for future annotation processor
- * invocations.
- */
- origOptions = new HashMap<String, String>(options.size());
- for(String s: options.keySet()) {
- String value;
- if (s.equals(value = options.get(s)))
- origOptions.put(s, (String)null);
- else
- origOptions.put(s, value);
- }
- origOptions = Collections.unmodifiableMap(origOptions);
-
- JavacFileManager fm = (JavacFileManager) context.get(JavaFileManager.class);
- {
- // Note: it might be necessary to check for an empty
- // component ("") of the source path or class path
-
- String sourceDest = options.get("-s");
- if (fm.hasLocation(StandardLocation.SOURCE_PATH)) {
- for(File f: fm.getLocation(StandardLocation.SOURCE_PATH))
- augmentedSourcePath += (f + File.pathSeparator);
- augmentedSourcePath += (sourceDest == null)?".":sourceDest;
- } else {
- augmentedSourcePath = ".";
-
- if (sourceDest != null)
- augmentedSourcePath += (File.pathSeparator + sourceDest);
- }
-
- String classDest = options.get("-d");
- if (fm.hasLocation(StandardLocation.CLASS_PATH)) {
- for(File f: fm.getLocation(StandardLocation.CLASS_PATH))
- baseClassPath += (f + File.pathSeparator);
- // put baseClassPath into map to handle any
- // value needed for the classloader
- options.put("-classpath", baseClassPath);
-
- augmentedClassPath = baseClassPath + ((classDest == null)?".":classDest);
- } else {
- baseClassPath = ".";
- if (classDest != null)
- augmentedClassPath = baseClassPath + (File.pathSeparator + classDest);
- }
- assert options.get("-classpath") != null;
- }
-
- /*
- * Create base and augmented class loaders
- */
- ClassLoader augmentedAptCL = null;
- {
- /*
- * Use a url class loader to look for classes on the
- * user-specified class path. Prepend computed bootclass
- * path, which includes extdirs, to the URLClassLoader apt
- * uses.
- */
- String aptclasspath = "";
- String bcp = "";
- Iterable<? extends File> bootclasspath = fm.getLocation(StandardLocation.PLATFORM_CLASS_PATH);
-
- if (bootclasspath != null) {
- for(File f: bootclasspath)
- bcp += (f + File.pathSeparator);
- }
-
- // If the factory path is set, use that path
- if (providedFactory == null)
- aptclasspath = options.get("-factorypath");
- if (aptclasspath == null)
- aptclasspath = options.get("-classpath");
-
- assert aptclasspath != null;
- aptclasspath = (bcp + aptclasspath);
- aptCL = new URLClassLoader(pathToURLs(aptclasspath));
-
- if (providedFactory == null &&
- options.get("-factorypath") != null) // same CL even if new class files written
- augmentedAptCL = aptCL;
- else {
- // Create class loader in case new class files are
- // written
- augmentedAptCL = new URLClassLoader(pathToURLs(augmentedClassPath.
- substring(baseClassPath.length())),
- aptCL);
- }
- }
-
- int round = 0; // For -XPrintAptRounds
- do {
- round++;
-
- Context newContext = new Context();
- Options newOptions = Options.instance(newContext); // creates a new context
- newOptions.putAll(options);
-
- // populate with old options... don't bother reparsing command line, etc.
-
- // if genSource files, must add destination to source path
- if (genSourceFileNames.size() > 0 && !firstRound) {
- newOptions.put("-sourcepath", augmentedSourcePath);
- needSourcePath = true;
- }
- aggregateGenSourceFileNames.addAll(genSourceFileNames);
- sourceFileNames.addAll(genSourceFileNames);
- genSourceFileNames.clear();
-
- // Don't really need to track this; just have to add -d
- // "foo" to class path if any class files are generated
- if (genClassFileNames.size() > 0) {
- newOptions.put("-classpath", augmentedClassPath);
- aptCL = augmentedAptCL;
- needClassPath = true;
- }
- aggregateGenClassFileNames.addAll(genClassFileNames);
- classFileNames.addAll(genClassFileNames);
- genClassFileNames.clear();
-
- options = newOptions;
-
- if (options.get("-XPrintAptRounds") != null) {
- out.println("apt Round : " + round);
- out.println("filenames: " + sourceFileNames);
- if (classesAsDecls)
- out.println("classnames: " + classFileNames);
- out.println("options: " + options);
- }
-
- returnCode = compile(args, newContext);
- firstRound = false;
-
- // Check for reported errors before continuing
- bark = Bark.instance(newContext);
- } while(((genSourceFileNames.size() != 0 ) ||
- (classesAsDecls && genClassFileNames.size() != 0)) &&
- bark.nerrors == 0);
- } catch (UsageMessageNeededException umne) {
- help();
- return EXIT_CMDERR; // will cause usage message to be printed
- }
-
- /*
- * Do not compile if a processor has reported an error or if
- * there are no source files to process. A more sophisticated
- * test would also fail for syntax errors caught by javac.
- */
- if (options.get("-nocompile") == null &&
- options.get("-print") == null &&
- bark.nerrors == 0 &&
- (origFilenames.size() > 0 || aggregateGenSourceFileNames.size() > 0 )) {
- /*
- * Need to create new argument string for calling javac:
- * 1. apt specific arguments (e.g. -factory) must be stripped out
- * 2. proper settings for sourcepath and classpath must be used
- * 3. generated class names must be added
- * 4. class file names as declarations must be removed
- */
-
- int newArgsLength = args.length +
- (needSourcePath?1:0) +
- (needClassPath?1:0) +
- aggregateGenSourceFileNames.size();
-
- // Null out apt-specific options and don't copy over into
- // newArgs. This loop should be a lot faster; the options
- // array should be replaced with a better data structure
- // which includes a map from strings to options.
- //
- // If treating classes as declarations, must strip out
- // class names from the javac argument list
- argLoop:
- for(int i = 0; i < args.length; i++) {
- int matchPosition = -1;
-
- // "-A" by itself is recognized by apt but not javac
- if (args[i] != null && args[i].equals("-A")) {
- newArgsLength--;
- args[i] = null;
- continue argLoop;
- } else {
- optionLoop:
- for(int j = 0; j < recognizedOptions.length; j++) {
- if (args[i] != null && recognizedOptions[j].matches(args[i])) {
- matchPosition = j;
- break optionLoop;
- }
- }
-
- if (matchPosition != -1) {
- Option op = recognizedOptions[matchPosition];
- if (op.aptOnly) {
- newArgsLength--;
- args[i] = null;
- if (op.hasArg()) {
- newArgsLength--;
- args[i+1] = null;
- }
- } else {
- if (op.hasArg()) { // skip over next string
- i++;
- continue argLoop;
- }
-
- if ((options.get("-XclassesAsDecls") != null) &&
- (matchPosition == (recognizedOptions.length-1)) ){
- // Remove class file names from
- // consideration by javac.
- if (! args[i].endsWith(".java")) {
- newArgsLength--;
- args[i] = null;
- }
- }
- }
- }
- }
- }
-
- String newArgs[] = new String[newArgsLength];
-
- int j = 0;
- for(int i=0; i < args.length; i++) {
- if (args[i] != null)
- newArgs[j++] = args[i];
- }
-
- if (needClassPath)
- newArgs[j++] = "-XD-classpath=" + augmentedClassPath;
-
- if (needSourcePath) {
- newArgs[j++] = "-XD-sourcepath=" + augmentedSourcePath;
-
- for(String s: aggregateGenSourceFileNames)
- newArgs[j++] = s;
- }
-
- returnCode = com.sun.tools.javac.Main.compile(newArgs);
- }
-
- return returnCode;
- }
-
- /** Programmatic interface for main function.
- * @param args The command line parameters.
- */
- int compile(String[] args, Context context) {
- boolean assertionsEnabled = false;
- assert assertionsEnabled = true;
- if (!assertionsEnabled) {
- // Bark.printLines(out, "fatal error: assertions must be enabled when running javac");
- // return EXIT_ABNORMAL;
- }
- int exitCode = EXIT_OK;
-
- AptJavaCompiler comp = null;
- try {
- context.put(Bark.outKey, out);
-
- comp = AptJavaCompiler.instance(context);
- if (comp == null)
- return EXIT_SYSERR;
-
- java.util.List<String> nameList = new java.util.LinkedList<String>();
- nameList.addAll(sourceFileNames);
- if (options.get("-XclassesAsDecls") != null)
- nameList.addAll(classFileNames);
-
- List<Symbol.ClassSymbol> cs
- = comp.compile(List.from(nameList.toArray(new String[0])),
- origOptions,
- aptCL,
- providedFactory,
- productiveFactories,
- aggregateGenFiles);
-
- /*
- * If there aren't new source files, we shouldn't bother
- * running javac if there were errors.
- *
- * If there are new files, we should try running javac in
- * case there were typing errors.
- *
- */
-
- if (comp.errorCount() != 0 ||
- options.get("-Werror") != null && comp.warningCount() != 0)
- return EXIT_ERROR;
- } catch (IOException ex) {
- ioMessage(ex);
- return EXIT_SYSERR;
- } catch (OutOfMemoryError ex) {
- resourceMessage(ex);
- return EXIT_SYSERR;
- } catch (StackOverflowError ex) {
- resourceMessage(ex);
- return EXIT_SYSERR;
- } catch (FatalError ex) {
- feMessage(ex);
- return EXIT_SYSERR;
- } catch (UsageMessageNeededException umne) {
- help();
- return EXIT_CMDERR; // will cause usage message to be printed
- } catch (AnnotationProcessingError ex) {
- apMessage(ex);
- return EXIT_ABNORMAL;
- } catch (sun.misc.ServiceConfigurationError sce) {
- sceMessage(sce);
- return EXIT_ABNORMAL;
- } catch (Throwable ex) {
- bugMessage(ex);
- return EXIT_ABNORMAL;
- } finally {
- if (comp != null) {
- comp.close();
- genSourceFileNames.addAll(comp.getSourceFileNames());
- genClassFileNames.addAll(comp.getClassFileNames());
- }
- sourceFileNames = new java.util.LinkedList<String>();
- classFileNames = new java.util.LinkedList<String>();
- }
- return exitCode;
- }
-
- /** Print a message reporting an internal error.
- */
- void bugMessage(Throwable ex) {
- Bark.printRawLines(out, getLocalizedString("msg.bug",
- AptJavaCompiler.version()));
- ex.printStackTrace(out);
- }
-
- /** Print a message reporting an fatal error.
- */
- void apMessage(AnnotationProcessingError ex) {
- Bark.printRawLines(out, getLocalizedString("misc.Problem"));
- ex.getCause().printStackTrace(out);
- }
-
- /** Print a message about sun.misc.Service problem.
- */
- void sceMessage(sun.misc.ServiceConfigurationError ex) {
- Bark.printRawLines(out, getLocalizedString("misc.SunMiscService"));
- ex.printStackTrace(out);
- }
-
- /** Print a message reporting an fatal error.
- */
- void feMessage(Throwable ex) {
- Bark.printRawLines(out, ex.toString());
- }
-
- /** Print a message reporting an input/output error.
- */
- void ioMessage(Throwable ex) {
- Bark.printRawLines(out, getLocalizedString("msg.io"));
- ex.printStackTrace(out);
- }
-
- /** Print a message reporting an out-of-resources error.
- */
- void resourceMessage(Throwable ex) {
- Bark.printRawLines(out, getLocalizedString("msg.resource"));
- ex.printStackTrace(out);
- }
-
- /* ************************************************************************
- * Internationalization
- *************************************************************************/
-
- /** Find a localized string in the resource bundle.
- * @param key The key for the localized string.
- */
- private static String getLocalizedString(String key, Object... args) {
- return getText(key, args);
- }
-
- private static final String javacRB =
- "com.sun.tools.javac.resources.javac";
-
- private static final String aptRB =
- "com.sun.tools.apt.resources.apt";
-
- private static ResourceBundle messageRBjavac;
- private static ResourceBundle messageRBapt;
-
- /** Initialize ResourceBundle.
- */
- private static void initResource() {
- try {
- messageRBapt = ResourceBundle.getBundle(aptRB);
- messageRBjavac = ResourceBundle.getBundle(javacRB);
- } catch (MissingResourceException e) {
- Error x = new FatalError("Fatal Error: Resource for apt or javac is missing");
- x.initCause(e);
- throw x;
- }
- }
-
- /** Get and format message string from resource.
- */
- private static String getText(String key, Object... _args) {
- String[] args = new String[_args.length];
- for (int i=0; i<_args.length; i++) {
- args[i] = "" + _args[i];
- }
- if (messageRBapt == null || messageRBjavac == null )
- initResource();
- try {
- return MessageFormat.format(messageRBapt.getString("apt." + key),
- (Object[]) args);
- } catch (MissingResourceException e) {
- try {
- return MessageFormat.format(messageRBjavac.getString("javac." + key),
- (Object[]) args);
- } catch (MissingResourceException f) {
- String msg = "apt or javac message file broken: key={0} "
- + "arguments={1}, {2}";
- return MessageFormat.format(msg, (Object[]) args);
- }
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java
deleted file mode 100644
index 0786b61..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/AptEnv.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror;
-
-
-import com.sun.tools.apt.mirror.declaration.DeclarationMaker;
-import com.sun.tools.apt.mirror.type.TypeMaker;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.CompletionFailure;
-import com.sun.tools.javac.comp.Attr;
-import com.sun.tools.javac.comp.Enter;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Names;
-
-
-/**
- * The environment for a run of apt.
- */
- at SuppressWarnings("deprecation")
-public class AptEnv {
-
- public Names names; // javac's name table
- public Symtab symtab; // javac's predefined symbols
- public Types jctypes; // javac's type utilities
- public Enter enter; // javac's enter phase
- public Attr attr; // javac's attr phase (to evaluate
- // constant initializers)
- public TypeMaker typeMaker; // apt's internal type utilities
- public DeclarationMaker declMaker; // apt's internal declaration utilities
-
-
- private static final Context.Key<AptEnv> aptEnvKey =
- new Context.Key<AptEnv>();
-
- public static AptEnv instance(Context context) {
- AptEnv instance = context.get(aptEnvKey);
- if (instance == null) {
- instance = new AptEnv(context);
- }
- return instance;
- }
-
- private AptEnv(Context context) {
- context.put(aptEnvKey, this);
-
- names = Names.instance(context);
- symtab = Symtab.instance(context);
- jctypes = Types.instance(context);
- enter = Enter.instance(context);
- attr = Attr.instance(context);
- typeMaker = TypeMaker.instance(context);
- declMaker = DeclarationMaker.instance(context);
- }
-
-
- /**
- * Does a symbol have a given flag? Forces symbol completion.
- */
- public static boolean hasFlag(Symbol sym, long flag) {
- return (getFlags(sym) & flag) != 0;
- }
-
- /**
- * Returns a symbol's flags. Forces completion.
- */
- public static long getFlags(Symbol sym) {
- complete(sym);
- return sym.flags();
- }
-
- /**
- * Completes a symbol, ignoring completion failures.
- */
- private static void complete(Symbol sym) {
- while (true) {
- try {
- sym.complete();
- return;
- } catch (CompletionFailure e) {
- // Should never see two in a row, but loop just to be sure.
- }
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java
deleted file mode 100644
index 049ceba..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/AnnotationProcessorEnvironmentImpl.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.apt;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.*;
-import com.sun.mirror.apt.*;
-import com.sun.tools.apt.mirror.apt.*;
-import com.sun.tools.apt.mirror.declaration.DeclarationMaker;
-import com.sun.tools.apt.mirror.util.*;
-import com.sun.tools.apt.util.Bark;
-import com.sun.tools.javac.util.Context;
-
-import com.sun.tools.apt.mirror.apt.FilerImpl;
-import com.sun.tools.apt.mirror.apt.MessagerImpl;
-import com.sun.tools.apt.mirror.apt.RoundStateImpl;
-import com.sun.tools.apt.mirror.apt.RoundCompleteEventImpl;
-
-import com.sun.tools.javac.util.Context;
-
-import java.util.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Annotation Processor Environment implementation.
- */
- at SuppressWarnings("deprecation")
-public class AnnotationProcessorEnvironmentImpl implements AnnotationProcessorEnvironment {
-
- Collection<TypeDeclaration> spectypedecls;
- Collection<TypeDeclaration> typedecls;
- Map<String, String> origOptions;
- DeclarationMaker declMaker;
- Declarations declUtils;
- Types typeUtils;
- Messager messager;
- FilerImpl filer;
- Bark bark;
- Set<RoundCompleteListener> roundCompleteListeners;
-
- public AnnotationProcessorEnvironmentImpl(Collection<TypeDeclaration> spectypedecls,
- Collection<TypeDeclaration> typedecls,
- Map<String, String> origOptions,
- Context context) {
- // Safer to copy collections before applying unmodifiable
- // wrapper.
- this.spectypedecls = Collections.unmodifiableCollection(spectypedecls);
- this.typedecls = Collections.unmodifiableCollection(typedecls);
- this.origOptions = Collections.unmodifiableMap(origOptions);
-
- declMaker = DeclarationMaker.instance(context);
- declUtils = DeclarationsImpl.instance(context);
- typeUtils = TypesImpl.instance(context);
- messager = MessagerImpl.instance(context);
- filer = FilerImpl.instance(context);
- bark = Bark.instance(context);
- roundCompleteListeners = new LinkedHashSet<RoundCompleteListener>();
- }
-
- public Map<String,String> getOptions() {
- return origOptions;
- }
-
- public Messager getMessager() {
- return messager;
- }
-
- public Filer getFiler() {
- return filer;
- }
-
- public Collection<TypeDeclaration> getSpecifiedTypeDeclarations() {
- return spectypedecls;
- }
-
- public PackageDeclaration getPackage(String name) {
- return declMaker.getPackageDeclaration(name);
- }
-
- public TypeDeclaration getTypeDeclaration(String name) {
- return declMaker.getTypeDeclaration(name);
- }
-
- public Collection<TypeDeclaration> getTypeDeclarations() {
- return typedecls;
- }
-
- public Collection<Declaration> getDeclarationsAnnotatedWith(
- AnnotationTypeDeclaration a) {
- /*
- * create collection of Declarations annotated with a given
- * annotation.
- */
-
- CollectingAP proc = new CollectingAP(this, a);
- proc.process();
- return proc.decls;
- }
-
- private static class CollectingAP implements AnnotationProcessor {
- AnnotationProcessorEnvironment env;
- Collection<Declaration> decls;
- AnnotationTypeDeclaration atd;
- CollectingAP(AnnotationProcessorEnvironment env,
- AnnotationTypeDeclaration atd) {
- this.env = env;
- this.atd = atd;
- decls = new HashSet<Declaration>();
- }
-
- private class CollectingVisitor extends SimpleDeclarationVisitor {
- public void visitDeclaration(Declaration d) {
- for(AnnotationMirror am: d.getAnnotationMirrors()) {
- if (am.getAnnotationType().getDeclaration().equals(CollectingAP.this.atd))
- CollectingAP.this.decls.add(d);
- }
- }
- }
-
- public void process() {
- for(TypeDeclaration d: env.getSpecifiedTypeDeclarations())
- d.accept(getSourceOrderDeclarationScanner(new CollectingVisitor(),
- NO_OP));
- }
- }
-
- public Declarations getDeclarationUtils() {
- return declUtils;
- }
-
- public Types getTypeUtils() {
- return typeUtils;
- }
-
- public void addListener(AnnotationProcessorListener listener) {
- if (listener == null)
- throw new NullPointerException();
- else {
- if (listener instanceof RoundCompleteListener)
- roundCompleteListeners.add((RoundCompleteListener)listener);
- }
- }
-
- public void removeListener(AnnotationProcessorListener listener) {
- if (listener == null)
- throw new NullPointerException();
- else
- roundCompleteListeners.remove(listener);
- }
-
- public void roundComplete() {
- RoundState roundState = new RoundStateImpl(bark.nerrors > 0,
- filer.getSourceFileNames().size() > 0,
- filer.getClassFileNames().size() > 0,
- origOptions);
- RoundCompleteEvent roundCompleteEvent = new RoundCompleteEventImpl(this, roundState);
-
- filer.roundOver();
- for(RoundCompleteListener rcl: roundCompleteListeners)
- rcl.roundComplete(roundCompleteEvent);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java
deleted file mode 100644
index 3a15cc4..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/FilerImpl.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.apt;
-
-
-import java.io.*;
-import java.util.Collection;
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import com.sun.mirror.apt.Filer;
-import com.sun.tools.apt.mirror.declaration.DeclarationMaker;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Options;
-import com.sun.tools.javac.util.Position;
-import com.sun.tools.apt.util.Bark;
-
-import static com.sun.mirror.apt.Filer.Location.*;
-
-
-/**
- * Implementation of Filer.
- */
- at SuppressWarnings("deprecation")
-public class FilerImpl implements Filer {
- /*
- * The Filer class must maintain a number of constraints. First,
- * multiple attempts to open the same path within the same
- * invocation of apt results in an IOException being thrown. For
- * example, trying to open the same source file twice:
- *
- * createSourceFile("foo.Bar")
- * ...
- * createSourceFile("foo.Bar")
- *
- * is disallowed as is opening a text file that happens to have
- * the same name as a source file:
- *
- * createSourceFile("foo.Bar")
- * ...
- * createTextFile(SOURCE_TREE, "foo", new File("Bar"), null)
- *
- * Additionally, creating a source file that corresponds to an
- * already created class file (or vice versa) generates at least a
- * warning. This is an error if -XclassesAsDecls is being used
- * since you can't create the same type twice. However, if the
- * Filer is used to create a text file named *.java that happens
- * to correspond to an existing class file, a warning is *not*
- * generated. Similarly, a warning is not generated for a binary
- * file named *.class and an existing source file.
- *
- * The reason for this difference is that source files and class
- * files are registered with apt and can get passed on as
- * declarations to the next round of processing. Files that are
- * just named *.java and *.class are not processed in that manner;
- * although having extra source files and class files on the
- * source path and class path can alter the behavior of the tool
- * and any final compile.
- */
-
- private enum FileKind {
- SOURCE {
- void register(File file, String name, FilerImpl that) throws IOException {
- // Check for corresponding class file
- if (that.filesCreated.contains(new File(that.locations.get(CLASS_TREE),
- that.nameToPath(name, ".class")))) {
-
- that.bark.aptWarning("CorrespondingClassFile", name);
- if (that.opts.get("-XclassesAsDecls") != null)
- throw new IOException();
- }
- that.sourceFileNames.add(file.getPath());
- }
- },
-
- CLASS {
- void register(File file, String name, FilerImpl that) throws IOException {
- if (that.filesCreated.contains(new File(that.locations.get(SOURCE_TREE),
- that.nameToPath(name, ".java")))) {
- that.bark.aptWarning("CorrespondingSourceFile", name);
- if (that.opts.get("-XclassesAsDecls") != null)
- throw new IOException();
- }
- // Track the binary name instead of the filesystem location
- that.classFileNames.add(name);
- }
- },
-
- OTHER {
- // Nothing special to do
- void register(File file, String name, FilerImpl that) throws IOException {}
- };
-
- abstract void register(File file, String name, FilerImpl that) throws IOException;
- }
-
- private final Options opts;
- private final DeclarationMaker declMaker;
- private final com.sun.tools.apt.main.AptJavaCompiler comp;
-
- // Platform's default encoding
- private final static String DEFAULT_ENCODING =
- new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding();
-
- private String encoding; // name of charset used for source files
-
- private final EnumMap<Location, File> locations; // where new files go
-
-
- private static final Context.Key<FilerImpl> filerKey =
- new Context.Key<FilerImpl>();
-
- // Set of files opened.
- private Collection<Flushable> wc;
-
- private Bark bark;
-
- // All created files.
- private final Set<File> filesCreated;
-
- // Names of newly created source files
- private HashSet<String> sourceFileNames = new HashSet<String>();
-
- // Names of newly created class files
- private HashSet<String> classFileNames = new HashSet<String>();
-
- private boolean roundOver;
-
- public static FilerImpl instance(Context context) {
- FilerImpl instance = context.get(filerKey);
- if (instance == null) {
- instance = new FilerImpl(context);
- }
- return instance;
- }
-
- // flush all output streams;
- public void flush() {
- for(Flushable opendedFile: wc) {
- try {
- opendedFile.flush();
- if (opendedFile instanceof FileOutputStream) {
- try {
- ((FileOutputStream) opendedFile).getFD().sync() ;
- } catch (java.io.SyncFailedException sfe) {}
- }
- } catch (IOException e) { }
- }
- }
-
- private FilerImpl(Context context) {
- context.put(filerKey, this);
- opts = Options.instance(context);
- declMaker = DeclarationMaker.instance(context);
- bark = Bark.instance(context);
- comp = com.sun.tools.apt.main.AptJavaCompiler.instance(context);
- roundOver = false;
- this.filesCreated = comp.getAggregateGenFiles();
-
- // Encoding
- encoding = opts.get("-encoding");
- if (encoding == null) {
- encoding = DEFAULT_ENCODING;
- }
-
- wc = new HashSet<Flushable>();
-
- // Locations
- locations = new EnumMap<Location, File>(Location.class);
- String s = opts.get("-s"); // location for new source files
- String d = opts.get("-d"); // location for new class files
- locations.put(SOURCE_TREE, new File(s != null ? s : "."));
- locations.put(CLASS_TREE, new File(d != null ? d : "."));
- }
-
-
- /**
- * {@inheritDoc}
- */
- public PrintWriter createSourceFile(String name) throws IOException {
- String pathname = nameToPath(name, ".java");
- File file = new File(locations.get(SOURCE_TREE),
- pathname);
- PrintWriter pw = getPrintWriter(file, encoding, name, FileKind.SOURCE);
- return pw;
- }
-
- /**
- * {@inheritDoc}
- */
- public OutputStream createClassFile(String name) throws IOException {
- String pathname = nameToPath(name, ".class");
- File file = new File(locations.get(CLASS_TREE),
- pathname);
- OutputStream os = getOutputStream(file, name, FileKind.CLASS);
- return os;
- }
-
- /**
- * {@inheritDoc}
- */
- public PrintWriter createTextFile(Location loc,
- String pkg,
- File relPath,
- String charsetName) throws IOException {
- File file = (pkg.length() == 0)
- ? relPath
- : new File(nameToPath(pkg), relPath.getPath());
- if (charsetName == null) {
- charsetName = encoding;
- }
- return getPrintWriter(loc, file.getPath(), charsetName, null, FileKind.OTHER);
- }
-
- /**
- * {@inheritDoc}
- */
- public OutputStream createBinaryFile(Location loc,
- String pkg,
- File relPath) throws IOException {
- File file = (pkg.length() == 0)
- ? relPath
- : new File(nameToPath(pkg), relPath.getPath());
- return getOutputStream(loc, file.getPath(), null, FileKind.OTHER);
- }
-
-
- /**
- * Converts the canonical name of a top-level type or package to a
- * pathname. Suffix is ".java" or ".class" or "".
- */
- private String nameToPath(String name, String suffix) throws IOException {
- if (!DeclarationMaker.isJavaIdentifier(name.replace('.', '_'))) {
- bark.aptWarning("IllegalFileName", name);
- throw new IOException();
- }
- return name.replace('.', File.separatorChar) + suffix;
- }
-
- private String nameToPath(String name) throws IOException {
- return nameToPath(name, "");
- }
-
- /**
- * Returns a writer for a text file given its location, its
- * pathname relative to that location, and its encoding.
- */
- private PrintWriter getPrintWriter(Location loc, String pathname,
- String encoding, String name, FileKind kind) throws IOException {
- File file = new File(locations.get(loc), pathname);
- return getPrintWriter(file, encoding, name, kind);
- }
-
- /**
- * Returns a writer for a text file given its encoding.
- */
- private PrintWriter getPrintWriter(File file,
- String encoding, String name, FileKind kind) throws IOException {
- prepareFile(file, name, kind);
- PrintWriter pw =
- new PrintWriter(
- new BufferedWriter(
- new OutputStreamWriter(new FileOutputStream(file),
- encoding)));
- wc.add(pw);
- return pw;
- }
-
- /**
- * Returns an output stream for a binary file given its location
- * and its pathname relative to that location.
- */
- private OutputStream getOutputStream(Location loc, String pathname, String name, FileKind kind)
- throws IOException {
- File file = new File(locations.get(loc), pathname);
- return getOutputStream(file, name, kind);
- }
-
- private OutputStream getOutputStream(File file, String name, FileKind kind) throws IOException {
- prepareFile(file, name, kind);
- OutputStream os = new FileOutputStream(file);
- wc.add(os);
- return os;
-
- }
-
- public Set<String> getSourceFileNames() {
- return sourceFileNames;
- }
-
- public Set<String> getClassFileNames() {
- return classFileNames;
- }
-
- public void roundOver() {
- roundOver = true;
- }
-
- /**
- * Checks that the file has not already been created during this
- * invocation. If not, creates intermediate directories, and
- * deletes the file if it already exists.
- */
- private void prepareFile(File file, String name, FileKind kind) throws IOException {
- if (roundOver) {
- bark.aptWarning("NoNewFilesAfterRound", file.toString());
- throw new IOException();
- }
-
- if (filesCreated.contains(file)) {
- bark.aptWarning("FileReopening", file.toString());
- throw new IOException();
- } else {
- if (file.exists()) {
- file.delete();
- } else {
- File parent = file.getParentFile();
- if (parent != null && !parent.exists()) {
- if(!parent.mkdirs()) {
- bark.aptWarning("BadParentDirectory", file.toString());
- throw new IOException();
- }
- }
- }
-
- kind.register(file, name, this);
- filesCreated.add(file);
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java
deleted file mode 100644
index b4dd25f..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/MessagerImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.apt;
-
-import javax.tools.JavaFileObject;
-import com.sun.mirror.apt.Messager;
-import com.sun.tools.apt.mirror.util.SourcePositionImpl;
-import com.sun.mirror.util.SourcePosition;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Position;
-import com.sun.tools.apt.util.Bark;
-
-
-/**
- * Implementation of Messager.
- */
- at SuppressWarnings("deprecation")
-public class MessagerImpl implements Messager {
- private final Bark bark;
-
- private static final Context.Key<MessagerImpl> messagerKey =
- new Context.Key<MessagerImpl>();
-
- public static MessagerImpl instance(Context context) {
- MessagerImpl instance = context.get(messagerKey);
- if (instance == null) {
- instance = new MessagerImpl(context);
- }
- return instance;
- }
-
- private MessagerImpl(Context context) {
- context.put(messagerKey, this);
- bark = Bark.instance(context);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void printError(String msg) {
- bark.aptError("Messager", msg);
- }
-
- /**
- * {@inheritDoc}
- */
- public void printError(SourcePosition pos, String msg) {
- if (pos instanceof SourcePositionImpl) {
- SourcePositionImpl posImpl = (SourcePositionImpl) pos;
- JavaFileObject prev = bark.useSource(posImpl.getSource());
- bark.aptError(posImpl.getJavacPosition(), "Messager", msg);
- bark.useSource(prev);
- } else
- printError(msg);
- }
-
- /**
- * {@inheritDoc}
- */
- public void printWarning(String msg) {
- bark.aptWarning("Messager", msg);
- }
-
- /**
- * {@inheritDoc}
- */
- public void printWarning(SourcePosition pos, String msg) {
- if (pos instanceof SourcePositionImpl) {
- SourcePositionImpl posImpl = (SourcePositionImpl) pos;
- JavaFileObject prev = bark.useSource(posImpl.getSource());
- bark.aptWarning(posImpl.getJavacPosition(), "Messager", msg);
- bark.useSource(prev);
- } else
- printWarning(msg);
- }
-
- /**
- * {@inheritDoc}
- */
- public void printNotice(String msg) {
- bark.aptNote("Messager", msg);
- }
-
- /**
- * {@inheritDoc}
- */
- public void printNotice(SourcePosition pos, String msg) {
- if (pos instanceof SourcePositionImpl) {
- SourcePositionImpl posImpl = (SourcePositionImpl) pos;
- JavaFileObject prev = bark.useSource(posImpl.getSource());
- bark.aptNote(posImpl.getJavacPosition(), "Messager", msg);
- bark.useSource(prev);
- } else
- printNotice(msg);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
deleted file mode 100644
index b35f277..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundCompleteEventImpl.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.apt;
-
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.RoundCompleteEvent;
-import com.sun.mirror.apt.RoundState;
-
- at SuppressWarnings("deprecation")
-public class RoundCompleteEventImpl extends RoundCompleteEvent {
- private static final long serialVersionUID = 7067621446720784300L;
-
- public RoundCompleteEventImpl(AnnotationProcessorEnvironment source,
- RoundState rs) {
- super(source, rs);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java
deleted file mode 100644
index 1b48504..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/apt/RoundStateImpl.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.apt;
-
-import com.sun.mirror.apt.RoundState;
-import java.util.Map;
-
- at SuppressWarnings("deprecation")
-public class RoundStateImpl implements RoundState {
- private final boolean finalRound;
- private final boolean errorRaised;
- private final boolean sourceFilesCreated;
- private final boolean classFilesCreated;
-
- public RoundStateImpl(boolean errorRaised,
- boolean sourceFilesCreated,
- boolean classFilesCreated,
- Map<String,String> options) {
- /*
- * In the default mode of operation, this round is the final
- * round if an error was raised OR there were no new source
- * files generated. If classes are being treated as
- * declarations, this is the final round if an error was
- * raised OR neither new source files nor new class files were
- * generated.
- */
- this.finalRound =
- errorRaised ||
- (!sourceFilesCreated &&
- !(classFilesCreated && options.keySet().contains("-XclassesAsDecls")) );
- this.errorRaised = errorRaised;
- this.sourceFilesCreated = sourceFilesCreated;
- this.classFilesCreated = classFilesCreated;
- }
-
- public boolean finalRound() {
- return finalRound;
- }
-
- public boolean errorRaised() {
- return errorRaised;
- }
-
- public boolean sourceFilesCreated() {
- return sourceFilesCreated;
- }
-
- public boolean classFilesCreated() {
- return classFilesCreated;
- }
-
- public String toString() {
- return
- "[final round: " + finalRound +
- ", error raised: " + errorRaised +
- ", source files created: " + sourceFilesCreated +
- ", class files created: " + classFilesCreated + "]";
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java
deleted file mode 100644
index 4526b90..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationMirrorImpl.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.AnnotationType;
-import com.sun.mirror.util.SourcePosition;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Attribute;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Pair;
-
-
-/**
- * Implementation of AnnotationMirror
- */
- at SuppressWarnings("deprecation")
-public class AnnotationMirrorImpl implements AnnotationMirror {
-
- protected final AptEnv env;
- protected final Attribute.Compound anno;
- protected final Declaration decl;
-
-
- AnnotationMirrorImpl(AptEnv env, Attribute.Compound anno, Declaration decl) {
- this.env = env;
- this.anno = anno;
- this.decl = decl;
- }
-
-
- /**
- * Returns a string representation of this annotation.
- * String is of one of the forms:
- * @com.example.foo(name1=val1, name2=val2)
- * @com.example.foo(val)
- * @com.example.foo
- * Omit parens for marker annotations, and omit "value=" when allowed.
- */
- public String toString() {
- StringBuilder sb = new StringBuilder("@");
- Constants.Formatter fmtr = Constants.getFormatter(sb);
-
- fmtr.append(anno.type.tsym);
-
- int len = anno.values.length();
- if (len > 0) { // omit parens for marker annotations
- sb.append('(');
- boolean first = true;
- for (Pair<MethodSymbol, Attribute> val : anno.values) {
- if (!first) {
- sb.append(", ");
- }
- first = false;
-
- Name name = val.fst.name;
- if (len > 1 || name != env.names.value) {
- fmtr.append(name);
- sb.append('=');
- }
- sb.append(new AnnotationValueImpl(env, val.snd, this));
- }
- sb.append(')');
- }
- return fmtr.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public AnnotationType getAnnotationType() {
- return (AnnotationType) env.typeMaker.getType(anno.type);
- }
-
- /**
- * {@inheritDoc}
- */
- public Map<AnnotationTypeElementDeclaration, AnnotationValue>
- getElementValues() {
- Map<AnnotationTypeElementDeclaration, AnnotationValue> res =
- new LinkedHashMap<AnnotationTypeElementDeclaration,
- AnnotationValue>(); // whew!
- for (Pair<MethodSymbol, Attribute> val : anno.values) {
- res.put(getElement(val.fst),
- new AnnotationValueImpl(env, val.snd, this));
- }
- return res;
- }
-
- public SourcePosition getPosition() {
- // Return position of the declaration on which this annotation
- // appears.
- return (decl == null) ? null : decl.getPosition();
-
- }
-
- public Declaration getDeclaration() {
- return this.decl;
- }
-
- /**
- * Returns the annotation type element for a symbol.
- */
- private AnnotationTypeElementDeclaration getElement(MethodSymbol m) {
- return (AnnotationTypeElementDeclaration)
- env.declMaker.getExecutableDeclaration(m);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
deleted file mode 100644
index 1849c9a..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationProxyMaker.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.lang.annotation.*;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-import java.util.*;
-import sun.reflect.annotation.*;
-
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.type.MirroredTypeException;
-import com.sun.mirror.type.MirroredTypesException;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Pair;
-
-
-/**
- * A generator of dynamic proxy implementations of
- * java.lang.annotation.Annotation.
- *
- * <p> The "dynamic proxy return form" of an attribute element value is
- * the form used by sun.reflect.annotation.AnnotationInvocationHandler.
- */
- at SuppressWarnings("deprecation")
-class AnnotationProxyMaker {
-
- private final AptEnv env;
- private final Attribute.Compound attrs;
- private final Class<? extends Annotation> annoType;
-
-
- private AnnotationProxyMaker(AptEnv env,
- Attribute.Compound attrs,
- Class<? extends Annotation> annoType) {
- this.env = env;
- this.attrs = attrs;
- this.annoType = annoType;
- }
-
-
- /**
- * Returns a dynamic proxy for an annotation mirror.
- */
- public static <A extends Annotation> A generateAnnotation(
- AptEnv env, Attribute.Compound attrs, Class<A> annoType) {
- AnnotationProxyMaker apm = new AnnotationProxyMaker(env, attrs, annoType);
- return annoType.cast(apm.generateAnnotation());
- }
-
-
- /**
- * Returns a dynamic proxy for an annotation mirror.
- */
- private Annotation generateAnnotation() {
- return AnnotationParser.annotationForMap(annoType,
- getAllReflectedValues());
- }
-
- /**
- * Returns a map from element names to their values in "dynamic
- * proxy return form". Includes all elements, whether explicit or
- * defaulted.
- */
- private Map<String, Object> getAllReflectedValues() {
- Map<String, Object> res = new LinkedHashMap<String, Object>();
-
- for (Map.Entry<MethodSymbol, Attribute> entry :
- getAllValues().entrySet()) {
- MethodSymbol meth = entry.getKey();
- Object value = generateValue(meth, entry.getValue());
- if (value != null) {
- res.put(meth.name.toString(), value);
- } else {
- // Ignore this element. May lead to
- // IncompleteAnnotationException somewhere down the line.
- }
- }
- return res;
- }
-
- /**
- * Returns a map from element symbols to their values.
- * Includes all elements, whether explicit or defaulted.
- */
- private Map<MethodSymbol, Attribute> getAllValues() {
- Map<MethodSymbol, Attribute> res =
- new LinkedHashMap<MethodSymbol, Attribute>();
-
- // First find the default values.
- ClassSymbol sym = (ClassSymbol) attrs.type.tsym;
- for (Scope.Entry e = sym.members().elems; e != null; e = e.sibling) {
- if (e.sym.kind == Kinds.MTH) {
- MethodSymbol m = (MethodSymbol) e.sym;
- Attribute def = m.defaultValue;
- if (def != null) {
- res.put(m, def);
- }
- }
- }
- // Next find the explicit values, possibly overriding defaults.
- for (Pair<MethodSymbol, Attribute> p : attrs.values) {
- res.put(p.fst, p.snd);
- }
- return res;
- }
-
- /**
- * Converts an element value to its "dynamic proxy return form".
- * Returns an exception proxy on some errors, but may return null if
- * a useful exception cannot or should not be generated at this point.
- */
- private Object generateValue(MethodSymbol meth, Attribute attr) {
- ValueVisitor vv = new ValueVisitor(meth);
- return vv.getValue(attr);
- }
-
-
- private class ValueVisitor implements Attribute.Visitor {
-
- private MethodSymbol meth; // annotation element being visited
- private Class<?> runtimeType; // runtime type of annotation element
- private Object value; // value in "dynamic proxy return form"
-
- ValueVisitor(MethodSymbol meth) {
- this.meth = meth;
- }
-
- Object getValue(Attribute attr) {
- Method method; // runtime method of annotation element
- try {
- method = annoType.getMethod(meth.name.toString());
- } catch (NoSuchMethodException e) {
- return null;
- }
- runtimeType = method.getReturnType();
- attr.accept(this);
- if (!(value instanceof ExceptionProxy) &&
- !AnnotationType.invocationHandlerReturnType(runtimeType)
- .isInstance(value)) {
- typeMismatch(method, attr);
- }
- return value;
- }
-
-
- public void visitConstant(Attribute.Constant c) {
- value = Constants.decodeConstant(c.value, c.type);
- }
-
- public void visitClass(Attribute.Class c) {
- value = new MirroredTypeExceptionProxy(
- env.typeMaker.getType(c.type));
- }
-
- public void visitArray(Attribute.Array a) {
- Type elemtype = env.jctypes.elemtype(a.type);
-
- if (elemtype.tsym == env.symtab.classType.tsym) { // Class[]
- // Construct a proxy for a MirroredTypesException
- ArrayList<TypeMirror> elems = new ArrayList<TypeMirror>();
- for (int i = 0; i < a.values.length; i++) {
- Type elem = ((Attribute.Class) a.values[i]).type;
- elems.add(env.typeMaker.getType(elem));
- }
- value = new MirroredTypesExceptionProxy(elems);
-
- } else {
- int len = a.values.length;
- Class<?> runtimeTypeSaved = runtimeType;
- runtimeType = runtimeType.getComponentType();
- try {
- Object res = Array.newInstance(runtimeType, len);
- for (int i = 0; i < len; i++) {
- a.values[i].accept(this);
- if (value == null || value instanceof ExceptionProxy) {
- return;
- }
- try {
- Array.set(res, i, value);
- } catch (IllegalArgumentException e) {
- value = null; // indicates a type mismatch
- return;
- }
- }
- value = res;
- } finally {
- runtimeType = runtimeTypeSaved;
- }
- }
- }
-
- @SuppressWarnings({"unchecked", "rawtypes"})
- public void visitEnum(Attribute.Enum e) {
- if (runtimeType.isEnum()) {
- String constName = e.value.toString();
- try {
- value = Enum.valueOf((Class)runtimeType, constName);
- } catch (IllegalArgumentException ex) {
- value = new EnumConstantNotPresentExceptionProxy(
- (Class<Enum<?>>)runtimeType, constName);
- }
- } else {
- value = null; // indicates a type mismatch
- }
- }
-
- public void visitCompound(Attribute.Compound c) {
- try {
- Class<? extends Annotation> nested =
- runtimeType.asSubclass(Annotation.class);
- value = generateAnnotation(env, c, nested);
- } catch (ClassCastException ex) {
- value = null; // indicates a type mismatch
- }
- }
-
- public void visitError(Attribute.Error e) {
- value = null; // indicates a type mismatch
- }
-
-
- /**
- * Sets "value" to an ExceptionProxy indicating a type mismatch.
- */
- private void typeMismatch(Method method, final Attribute attr) {
- class AnnotationTypeMismatchExceptionProxy extends ExceptionProxy {
- private static final long serialVersionUID = 8473323277815075163L;
- transient final Method method;
- AnnotationTypeMismatchExceptionProxy(Method method) {
- this.method = method;
- }
- public String toString() {
- return "<error>"; // eg: @Anno(value=<error>)
- }
- protected RuntimeException generateException() {
- return new AnnotationTypeMismatchException(method,
- attr.type.toString());
- }
- }
- value = new AnnotationTypeMismatchExceptionProxy(method);
- }
- }
-
-
- /**
- * ExceptionProxy for MirroredTypeException.
- * The toString, hashCode, and equals methods foward to the underlying
- * type.
- */
- private static final class MirroredTypeExceptionProxy extends ExceptionProxy {
- private static final long serialVersionUID = 6662035281599933545L;
-
- private MirroredTypeException ex;
-
- MirroredTypeExceptionProxy(TypeMirror t) {
- // It would be safer if we could construct the exception in
- // generateException(), but there would be no way to do
- // that properly following deserialization.
- ex = new MirroredTypeException(t);
- }
-
- public String toString() {
- return ex.getQualifiedName();
- }
-
- public int hashCode() {
- TypeMirror t = ex.getTypeMirror();
- return (t != null)
- ? t.hashCode()
- : ex.getQualifiedName().hashCode();
- }
-
- public boolean equals(Object obj) {
- TypeMirror t = ex.getTypeMirror();
- return t != null &&
- obj instanceof MirroredTypeExceptionProxy &&
- t.equals(
- ((MirroredTypeExceptionProxy) obj).ex.getTypeMirror());
- }
-
- protected RuntimeException generateException() {
- return (RuntimeException) ex.fillInStackTrace();
- }
- }
-
-
- /**
- * ExceptionProxy for MirroredTypesException.
- * The toString, hashCode, and equals methods foward to the underlying
- * types.
- */
- private static final class MirroredTypesExceptionProxy extends ExceptionProxy {
- private static final long serialVersionUID = -6670822532616693951L;
-
- private MirroredTypesException ex;
-
- MirroredTypesExceptionProxy(Collection<TypeMirror> ts) {
- // It would be safer if we could construct the exception in
- // generateException(), but there would be no way to do
- // that properly following deserialization.
- ex = new MirroredTypesException(ts);
- }
-
- public String toString() {
- return ex.getQualifiedNames().toString();
- }
-
- public int hashCode() {
- Collection<TypeMirror> ts = ex.getTypeMirrors();
- return (ts != null)
- ? ts.hashCode()
- : ex.getQualifiedNames().hashCode();
- }
-
- public boolean equals(Object obj) {
- Collection<TypeMirror> ts = ex.getTypeMirrors();
- return ts != null &&
- obj instanceof MirroredTypesExceptionProxy &&
- ts.equals(
- ((MirroredTypesExceptionProxy) obj).ex.getTypeMirrors());
- }
-
- protected RuntimeException generateException() {
- return (RuntimeException) ex.fillInStackTrace();
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java
deleted file mode 100644
index 544c1ad..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeDeclarationImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of AnnotationTypeDeclaration
- */
- at SuppressWarnings("deprecation")
-public class AnnotationTypeDeclarationImpl extends InterfaceDeclarationImpl
- implements AnnotationTypeDeclaration
-{
- AnnotationTypeDeclarationImpl(AptEnv env, ClassSymbol sym) {
- super(env, sym);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public Collection<AnnotationTypeElementDeclaration> getMethods() {
- return identityFilter.filter(super.getMethods(),
- AnnotationTypeElementDeclaration.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitAnnotationTypeDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java
deleted file mode 100644
index 717e6ac..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationTypeElementDeclarationImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-
-
-/**
- * Implementation of AnnotationTypeElementDeclaration
- */
- at SuppressWarnings("deprecation")
-public class AnnotationTypeElementDeclarationImpl extends MethodDeclarationImpl
- implements AnnotationTypeElementDeclaration {
-
- AnnotationTypeElementDeclarationImpl(AptEnv env, MethodSymbol sym) {
- super(env, sym);
- }
-
- /**
- * {@inheritDoc}
- */
- public AnnotationTypeDeclaration getDeclaringType() {
- return (AnnotationTypeDeclaration) super.getDeclaringType();
- }
-
- /**
- * {@inheritDoc}
- */
- public AnnotationValue getDefaultValue() {
- return (sym.defaultValue == null)
- ? null
- : new AnnotationValueImpl(env, sym.defaultValue, null);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitAnnotationTypeElementDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java
deleted file mode 100644
index a27d675..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/AnnotationValueImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.SourcePosition;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Attribute;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.code.TypeTags;
-
-
-/**
- * Implementation of AnnotationValue
- */
- at SuppressWarnings("deprecation")
-public class AnnotationValueImpl implements AnnotationValue {
-
- protected final AptEnv env;
- protected final Attribute attr;
- protected final AnnotationMirrorImpl annotation;
-
- AnnotationValueImpl(AptEnv env, Attribute attr, AnnotationMirrorImpl annotation) {
- this.env = env;
- this.attr = attr;
- this.annotation = annotation;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- StringBuilder sb = new StringBuilder();
- Constants.Formatter fmtr = Constants.getFormatter(sb);
-
- fmtr.append(getValue());
- return fmtr.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public Object getValue() {
- ValueVisitor vv = new ValueVisitor();
- attr.accept(vv);
- return vv.value;
- }
-
-
- public SourcePosition getPosition() {
- // Imprecise implementation; just return position of enclosing
- // annotation.
- return (annotation == null) ? null : annotation.getPosition();
- }
-
- private class ValueVisitor implements Attribute.Visitor {
-
- public Object value;
-
- public void visitConstant(Attribute.Constant c) {
- value = Constants.decodeConstant(c.value, c.type);
- }
-
- public void visitClass(Attribute.Class c) {
- value = env.typeMaker.getType(
- env.jctypes.erasure(c.type));
- }
-
- public void visitEnum(Attribute.Enum e) {
- value = env.declMaker.getFieldDeclaration(e.value);
- }
-
- public void visitCompound(Attribute.Compound c) {
- value = new AnnotationMirrorImpl(env, c,
- (annotation == null) ?
- null :
- annotation.getDeclaration());
- }
-
- public void visitArray(Attribute.Array a) {
- ArrayList<AnnotationValue> vals =
- new ArrayList<AnnotationValue>(a.values.length);
- for (Attribute elem : a.values) {
- vals.add(new AnnotationValueImpl(env, elem, annotation));
- }
- value = vals;
- }
-
- public void visitError(Attribute.Error e) {
- value = "<error>"; // javac will already have logged an error msg
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java
deleted file mode 100644
index 88032b6..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ClassDeclarationImpl.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Inherited;
-import java.util.ArrayList;
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.ClassType;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of ClassDeclaration
- */
- at SuppressWarnings("deprecation")
-public class ClassDeclarationImpl extends TypeDeclarationImpl
- implements ClassDeclaration {
-
- ClassDeclarationImpl(AptEnv env, ClassSymbol sym) {
- super(env, sym);
- }
-
-
- /**
- * {@inheritDoc}
- * Overridden here to handle @Inherited.
- */
- public <A extends Annotation> A getAnnotation(Class<A> annoType) {
-
- boolean inherited = annoType.isAnnotationPresent(Inherited.class);
- for (Type t = sym.type;
- t.tsym != env.symtab.objectType.tsym && !t.isErroneous();
- t = env.jctypes.supertype(t)) {
-
- A result = getAnnotation(annoType, t.tsym);
- if (result != null || !inherited) {
- return result;
- }
- }
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public ClassType getSuperclass() {
- // java.lang.Object has no superclass
- if (sym == env.symtab.objectType.tsym) {
- return null;
- }
- Type t = env.jctypes.supertype(sym.type);
- return (ClassType) env.typeMaker.getType(t);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<ConstructorDeclaration> getConstructors() {
- ArrayList<ConstructorDeclaration> res =
- new ArrayList<ConstructorDeclaration>();
- for (Symbol s : getMembers(true)) {
- if (s.isConstructor()) {
- MethodSymbol m = (MethodSymbol) s;
- res.add((ConstructorDeclaration)
- env.declMaker.getExecutableDeclaration(m));
- }
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<MethodDeclaration> getMethods() {
- return identityFilter.filter(super.getMethods(),
- MethodDeclaration.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitClassDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java
deleted file mode 100644
index 0aa13da..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/Constants.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.tools.apt.mirror.type.TypeMirrorImpl;
-import com.sun.tools.javac.code.Type;
-
-import static com.sun.tools.javac.code.TypeTags.*;
-
-
-/**
- * Utility class for operating on constant expressions.
- */
- at SuppressWarnings("deprecation")
-class Constants {
-
- /**
- * Converts a constant in javac's internal representation (in which
- * boolean, char, byte, short, and int are each represented by an Integer)
- * into standard representation. Other values (including null) are
- * returned unchanged.
- */
- static Object decodeConstant(Object value, Type type) {
- if (value instanceof Integer) {
- int i = ((Integer) value).intValue();
- switch (type.tag) {
- case BOOLEAN: return Boolean.valueOf(i != 0);
- case CHAR: return Character.valueOf((char) i);
- case BYTE: return Byte.valueOf((byte) i);
- case SHORT: return Short.valueOf((short) i);
- }
- }
- return value;
- }
-
- /**
- * Returns a formatter for generating the text of constant
- * expressions. Equivalent to
- * <tt>getFormatter(new StringBuilder())</tt>.
- */
- static Formatter getFormatter() {
- return new Formatter(new StringBuilder());
- }
-
- /**
- * Returns a formatter for generating the text of constant
- * expressions. Also generates the text of constant
- * "pseudo-expressions" for annotations and array-valued
- * annotation elements.
- *
- * @param buf where the expression is written
- */
- static Formatter getFormatter(StringBuilder buf) {
- return new Formatter(buf);
- }
-
-
- /**
- * Utility class used to generate the text of constant
- * expressions. Also generates the text of constant
- * "pseudo-expressions" for annotations and array-valued
- * annotation elements.
- */
- static class Formatter {
-
- private StringBuilder buf; // where the output goes
-
- private Formatter(StringBuilder buf) {
- this.buf = buf;
- }
-
-
- public String toString() {
- return buf.toString();
- }
-
- /**
- * Appends a constant whose type is not statically known
- * by dispatching to the appropriate overloaded append method.
- */
- void append(Object val) {
- if (val instanceof String) {
- append((String) val);
- } else if (val instanceof Character) {
- append((Character) val);
- } else if (val instanceof Boolean) {
- append((Boolean) val);
- } else if (val instanceof Byte) {
- append((Byte) val);
- } else if (val instanceof Short) {
- append((Short) val);
- } else if (val instanceof Integer) {
- append((Integer) val);
- } else if (val instanceof Long) {
- append((Long) val);
- } else if (val instanceof Float) {
- append((Float) val);
- } else if (val instanceof Double) {
- append((Double) val);
- } else if (val instanceof TypeMirror) {
- append((TypeMirrorImpl) val);
- } else if (val instanceof EnumConstantDeclaration) {
- append((EnumConstantDeclarationImpl) val);
- } else if (val instanceof AnnotationMirror) {
- append((AnnotationMirrorImpl) val);
- } else if (val instanceof Collection<?>) {
- append((Collection<?>) val);
- } else {
- appendUnquoted(val.toString());
- }
- }
-
- /**
- * Appends a string, escaped (as needed) and quoted.
- */
- void append(String val) {
- buf.append('"');
- appendUnquoted(val);
- buf.append('"');
- }
-
- /**
- * Appends a Character, escaped (as needed) and quoted.
- */
- void append(Character val) {
- buf.append('\'');
- appendUnquoted(val.charValue());
- buf.append('\'');
- }
-
- void append(Boolean val) {
- buf.append(val);
- }
-
- void append(Byte val) {
- buf.append(String.format("0x%02x", val));
- }
-
- void append(Short val) {
- buf.append(val);
- }
-
- void append(Integer val) {
- buf.append(val);
- }
-
- void append(Long val) {
- buf.append(val).append('L');
- }
-
- void append(Float val) {
- if (val.isNaN()) {
- buf.append("0.0f/0.0f");
- } else if (val.isInfinite()) {
- if (val.floatValue() < 0) {
- buf.append('-');
- }
- buf.append("1.0f/0.0f");
- } else {
- buf.append(val).append('f');
- }
- }
-
- void append(Double val) {
- if (val.isNaN()) {
- buf.append("0.0/0.0");
- } else if (val.isInfinite()) {
- if (val.doubleValue() < 0) {
- buf.append('-');
- }
- buf.append("1.0/0.0");
- } else {
- buf.append(val);
- }
- }
-
- /**
- * Appends the class literal corresponding to a type. Should
- * only be invoked for types that have an associated literal.
- * e.g: "java.lang.String.class"
- * "boolean.class"
- * "int[].class"
- */
- void append(TypeMirrorImpl t) {
- appendUnquoted(t.type.toString());
- buf.append(".class");
- }
-
- /**
- * Appends the fully qualified name of an enum constant.
- * e.g: "java.math.RoundingMode.UP"
- */
- void append(EnumConstantDeclarationImpl e) {
- appendUnquoted(e.sym.enclClass() + "." + e);
- }
-
- /**
- * Appends the text of an annotation pseudo-expression.
- * e.g: "@pkg.Format(linesep='\n')"
- */
- void append(AnnotationMirrorImpl anno) {
- appendUnquoted(anno.toString());
- }
-
- /**
- * Appends the elements of a collection, enclosed within braces
- * and separated by ", ". Useful for array-valued annotation
- * elements.
- */
- void append(Collection<?> vals) {
- buf.append('{');
- boolean first = true;
- for (Object val : vals) {
- if (first) {
- first = false;
- } else {
- buf.append(", ");
- }
- append(((AnnotationValue) val).getValue());
- }
- buf.append('}');
- }
-
-
- /**
- * For each char of a string, append using appendUnquoted(char).
- */
- private void appendUnquoted(String s) {
- for (char c : s.toCharArray()) {
- appendUnquoted(c);
- }
- }
-
- /**
- * Appends a char (unquoted), using escapes for those that are not
- * printable ASCII. We don't know what is actually printable in
- * the locale in which this result will be used, so ASCII is our
- * best guess as to the least common denominator.
- */
- private void appendUnquoted(char c) {
- switch (c) {
- case '\b': buf.append("\\b"); break;
- case '\t': buf.append("\\t"); break;
- case '\n': buf.append("\\n"); break;
- case '\f': buf.append("\\f"); break;
- case '\r': buf.append("\\r"); break;
- case '\"': buf.append("\\\""); break;
- case '\'': buf.append("\\\'"); break;
- case '\\': buf.append("\\\\"); break;
- default:
- if (isPrintableAscii(c)) {
- buf.append(c);
- } else {
- buf.append(String.format("\\u%04x", (int) c));
- }
- }
- }
-
- /**
- * Is c a printable ASCII character?
- */
- private static boolean isPrintableAscii(char c) {
- return c >= ' ' && c <= '~';
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java
deleted file mode 100644
index be59686..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ConstructorDeclarationImpl.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Flags;
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-
-
-/**
- * Implementation of ConstructorDeclaration
- */
- at SuppressWarnings("deprecation")
-public class ConstructorDeclarationImpl extends ExecutableDeclarationImpl
- implements ConstructorDeclaration {
-
- ConstructorDeclarationImpl(AptEnv env, MethodSymbol sym) {
- super(env, sym);
- }
-
-
- /**
- * {@inheritDoc}
- * Returns the simple name of the declaring class.
- */
- public String getSimpleName() {
- return sym.enclClass().name.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitConstructorDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java
deleted file mode 100644
index 69ff36e..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationImpl.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.Collection;
-import java.util.EnumSet;
-import javax.tools.JavaFileObject;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.*;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.apt.mirror.util.SourcePositionImpl;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.comp.AttrContext;
-import com.sun.tools.javac.comp.Env;
-import com.sun.tools.javac.tree.*;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.util.Position;
-
-import static com.sun.mirror.declaration.Modifier.*;
-import static com.sun.tools.javac.code.Kinds.*;
-
-
-/**
- * Implementation of Declaration
- */
- at SuppressWarnings("deprecation")
-public abstract class DeclarationImpl implements Declaration {
-
- protected final AptEnv env;
- public final Symbol sym;
-
- protected static final DeclarationFilter identityFilter =
- new DeclarationFilter();
-
-
- /**
- * "sym" should be completed before this constructor is called.
- */
- protected DeclarationImpl(AptEnv env, Symbol sym) {
- this.env = env;
- this.sym = sym;
- }
-
-
- /**
- * {@inheritDoc}
- * <p> ParameterDeclarationImpl overrides this implementation.
- */
- public boolean equals(Object obj) {
- if (obj instanceof DeclarationImpl) {
- DeclarationImpl that = (DeclarationImpl) obj;
- return sym == that.sym && env == that.env;
- } else {
- return false;
- }
- }
-
- /**
- * {@inheritDoc}
- * <p> ParameterDeclarationImpl overrides this implementation.
- */
- public int hashCode() {
- return sym.hashCode() + env.hashCode();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getDocComment() {
- // Our doc comment is contained in a map in our toplevel,
- // indexed by our tree. Find our enter environment, which gives
- // us our toplevel. It also gives us a tree that contains our
- // tree: walk it to find our tree. This is painful.
- Env<AttrContext> enterEnv = getEnterEnv();
- if (enterEnv == null)
- return null;
- JCTree tree = TreeInfo.declarationFor(sym, enterEnv.tree);
- return enterEnv.toplevel.docComments.get(tree);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<AnnotationMirror> getAnnotationMirrors() {
- Collection<AnnotationMirror> res =
- new ArrayList<AnnotationMirror>();
- for (Attribute.Compound a : sym.getAnnotationMirrors()) {
- res.add(env.declMaker.getAnnotationMirror(a, this));
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- * Overridden by ClassDeclarationImpl to handle @Inherited.
- */
- public <A extends Annotation> A getAnnotation(Class<A> annoType) {
- return getAnnotation(annoType, sym);
- }
-
- protected <A extends Annotation> A getAnnotation(Class<A> annoType,
- Symbol annotated) {
- if (!annoType.isAnnotation()) {
- throw new IllegalArgumentException(
- "Not an annotation type: " + annoType);
- }
- String name = annoType.getName();
- for (Attribute.Compound attr : annotated.getAnnotationMirrors()) {
- if (name.equals(attr.type.tsym.flatName().toString())) {
- return AnnotationProxyMaker.generateAnnotation(env, attr,
- annoType);
- }
- }
- return null;
- }
-
- // Cache for modifiers.
- private EnumSet<Modifier> modifiers = null;
-
- /**
- * {@inheritDoc}
- */
- public Collection<Modifier> getModifiers() {
- if (modifiers == null) {
- modifiers = EnumSet.noneOf(Modifier.class);
- long flags = AptEnv.getFlags(sym);
-
- if (0 != (flags & Flags.PUBLIC)) modifiers.add(PUBLIC);
- if (0 != (flags & Flags.PROTECTED)) modifiers.add(PROTECTED);
- if (0 != (flags & Flags.PRIVATE)) modifiers.add(PRIVATE);
- if (0 != (flags & Flags.ABSTRACT)) modifiers.add(ABSTRACT);
- if (0 != (flags & Flags.STATIC)) modifiers.add(STATIC);
- if (0 != (flags & Flags.FINAL)) modifiers.add(FINAL);
- if (0 != (flags & Flags.TRANSIENT)) modifiers.add(TRANSIENT);
- if (0 != (flags & Flags.VOLATILE)) modifiers.add(VOLATILE);
- if (0 != (flags & Flags.SYNCHRONIZED)) modifiers.add(SYNCHRONIZED);
- if (0 != (flags & Flags.NATIVE)) modifiers.add(NATIVE);
- if (0 != (flags & Flags.STRICTFP)) modifiers.add(STRICTFP);
- }
- return modifiers;
- }
-
- /**
- * {@inheritDoc}
- * Overridden in some subclasses.
- */
- public String getSimpleName() {
- return sym.name.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public SourcePosition getPosition() {
- // Find the toplevel. From there use a tree-walking utility
- // that finds the tree for our symbol, and with it the position.
- Env<AttrContext> enterEnv = getEnterEnv();
- if (enterEnv == null)
- return null;
- JCTree.JCCompilationUnit toplevel = enterEnv.toplevel;
- JavaFileObject sourcefile = toplevel.sourcefile;
- if (sourcefile == null)
- return null;
- int pos = TreeInfo.positionFor(sym, toplevel);
-
- return new SourcePositionImpl(sourcefile, pos, toplevel.lineMap);
- }
-
- /**
- * Applies a visitor to this declaration.
- *
- * @param v the visitor operating on this declaration
- */
- public void accept(DeclarationVisitor v) {
- v.visitDeclaration(this);
- }
-
-
- private Collection<Symbol> members = null; // cache for getMembers()
-
- /**
- * Returns the symbols of type or package members (and constructors)
- * that are not synthetic or otherwise unwanted.
- * Caches the result if "cache" is true.
- */
- protected Collection<Symbol> getMembers(boolean cache) {
- if (members != null) {
- return members;
- }
- LinkedList<Symbol> res = new LinkedList<Symbol>();
- for (Scope.Entry e = sym.members().elems; e != null; e = e.sibling) {
- if (e.sym != null && !unwanted(e.sym)) {
- res.addFirst(e.sym);
- }
- }
- return cache ? (members = res) : res;
- }
-
- /**
- * Tests whether this is a symbol that should never be seen by clients,
- * such as a synthetic class.
- * Note that a class synthesized by the compiler may not be flagged as
- * synthetic: see bugid 4959932.
- */
- private static boolean unwanted(Symbol s) {
- return AptEnv.hasFlag(s, Flags.SYNTHETIC) ||
- (s.kind == TYP &&
- !DeclarationMaker.isJavaIdentifier(s.name.toString()));
- }
-
- /**
- * Returns this declaration's enter environment, or null if it
- * has none.
- */
- private Env<AttrContext> getEnterEnv() {
- // Get enclosing class of sym, or sym itself if it is a class
- // or package.
- TypeSymbol ts = (sym.kind != PCK)
- ? sym.enclClass()
- : (PackageSymbol) sym;
- return (ts != null)
- ? env.enter.getEnv(ts)
- : null;
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java
deleted file mode 100644
index 8e9f617..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/DeclarationMaker.java
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.sun.mirror.declaration.*;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.Name;
-import com.sun.tools.javac.main.JavaCompiler;
-
-/**
- * Utilities for constructing and caching declarations.
- */
- at SuppressWarnings("deprecation")
-public class DeclarationMaker {
-
- private AptEnv env;
- private Context context;
- private JavaCompiler javacompiler;
- private static final Context.Key<DeclarationMaker> declarationMakerKey =
- new Context.Key<DeclarationMaker>();
-
- public static DeclarationMaker instance(Context context) {
- DeclarationMaker instance = context.get(declarationMakerKey);
- if (instance == null) {
- instance = new DeclarationMaker(context);
- }
- return instance;
- }
-
- private DeclarationMaker(Context context) {
- context.put(declarationMakerKey, this);
- env = AptEnv.instance(context);
- this.context = context;
- this.javacompiler = JavaCompiler.instance(context);
- }
-
-
-
- // Cache of package declarations
- private Map<PackageSymbol, PackageDeclaration> packageDecls =
- new HashMap<PackageSymbol, PackageDeclaration>();
-
- /**
- * Returns the package declaration for a package symbol.
- */
- public PackageDeclaration getPackageDeclaration(PackageSymbol p) {
- PackageDeclaration res = packageDecls.get(p);
- if (res == null) {
- res = new PackageDeclarationImpl(env, p);
- packageDecls.put(p, res);
- }
- return res;
- }
-
- /**
- * Returns the package declaration for the package with the given name.
- * Name is fully-qualified, or "" for the unnamed package.
- * Returns null if package declaration not found.
- */
- public PackageDeclaration getPackageDeclaration(String name) {
- PackageSymbol p = null;
- if (name.equals("") )
- p = env.symtab.unnamedPackage;
- else {
- if (!isJavaName(name))
- return null;
- Symbol s = nameToSymbol(name, false);
- if (s instanceof PackageSymbol) {
- p = (PackageSymbol) s;
- if (!p.exists())
- return null;
- } else
- return null;
- }
- return getPackageDeclaration(p);
- }
-
- // Cache of type declarations
- private Map<ClassSymbol, TypeDeclaration> typeDecls =
- new HashMap<ClassSymbol, TypeDeclaration>();
-
- /**
- * Returns the type declaration for a class symbol.
- * Forces completion, and returns null on error.
- */
- public TypeDeclaration getTypeDeclaration(ClassSymbol c) {
- long flags = AptEnv.getFlags(c); // forces symbol completion
- if (c.kind == Kinds.ERR) {
- return null;
- }
- TypeDeclaration res = typeDecls.get(c);
- if (res == null) {
- if ((flags & Flags.ANNOTATION) != 0) {
- res = new AnnotationTypeDeclarationImpl(env, c);
- } else if ((flags & Flags.INTERFACE) != 0) {
- res = new InterfaceDeclarationImpl(env, c);
- } else if ((flags & Flags.ENUM) != 0) {
- res = new EnumDeclarationImpl(env, c);
- } else {
- res = new ClassDeclarationImpl(env, c);
- }
- typeDecls.put(c, res);
- }
- return res;
- }
-
- /**
- * Returns the type declaration for the type with the given canonical name.
- * Returns null if type declaration not found.
- */
- public TypeDeclaration getTypeDeclaration(String name) {
- if (!isJavaName(name))
- return null;
- Symbol s = nameToSymbol(name, true);
- if (s instanceof ClassSymbol) {
- ClassSymbol c = (ClassSymbol) s;
- return getTypeDeclaration(c);
- } else
- return null;
- }
-
- /**
- * Returns a symbol given the type's or packages's canonical name,
- * or null if the name isn't found.
- */
- private Symbol nameToSymbol(String name, boolean classCache) {
- Symbol s = null;
- Name nameName = env.names.fromString(name);
- if (classCache)
- s = env.symtab.classes.get(nameName);
- else
- s = env.symtab.packages.get(nameName);
-
- if (s != null && s.exists())
- return s;
-
- s = javacompiler.resolveIdent(name);
- if (s.kind == Kinds.ERR )
- return null;
-
- if (s.kind == Kinds.PCK)
- s.complete();
-
- return s;
- }
-
- // Cache of method and constructor declarations
- private Map<MethodSymbol, ExecutableDeclaration> executableDecls =
- new HashMap<MethodSymbol, ExecutableDeclaration>();
-
- /**
- * Returns the method or constructor declaration for a method symbol.
- */
- ExecutableDeclaration getExecutableDeclaration(MethodSymbol m) {
- ExecutableDeclaration res = executableDecls.get(m);
- if (res == null) {
- if (m.isConstructor()) {
- res = new ConstructorDeclarationImpl(env, m);
- } else if (isAnnotationTypeElement(m)) {
- res = new AnnotationTypeElementDeclarationImpl(env, m);
- } else {
- res = new MethodDeclarationImpl(env, m);
- }
- executableDecls.put(m, res);
- }
- return res;
- }
-
- // Cache of field declarations
- private Map<VarSymbol, FieldDeclaration> fieldDecls =
- new HashMap<VarSymbol, FieldDeclaration>();
-
- /**
- * Returns the field declaration for a var symbol.
- */
- FieldDeclaration getFieldDeclaration(VarSymbol v) {
- FieldDeclaration res = fieldDecls.get(v);
- if (res == null) {
- if (hasFlag(v, Flags.ENUM)) {
- res = new EnumConstantDeclarationImpl(env, v);
- } else {
- res = new FieldDeclarationImpl(env, v);
- }
- fieldDecls.put(v, res);
- }
- return res;
- }
-
- /**
- * Returns a parameter declaration.
- */
- ParameterDeclaration getParameterDeclaration(VarSymbol v) {
- return new ParameterDeclarationImpl(env, v);
- }
-
- /**
- * Returns a type parameter declaration.
- */
- public TypeParameterDeclaration getTypeParameterDeclaration(TypeSymbol t) {
- return new TypeParameterDeclarationImpl(env, t);
- }
-
- /**
- * Returns an annotation.
- */
- AnnotationMirror getAnnotationMirror(Attribute.Compound a, Declaration decl) {
- return new AnnotationMirrorImpl(env, a, decl);
- }
-
-
- /**
- * Is a string a valid Java identifier?
- */
- public static boolean isJavaIdentifier(String id) {
- return javax.lang.model.SourceVersion.isIdentifier(id);
- }
-
- public static boolean isJavaName(String name) {
- for(String id: name.split("\\.")) {
- if (! isJavaIdentifier(id))
- return false;
- }
- return true;
- }
-
- /**
- * Is a method an annotation type element?
- * It is if it's declared in an annotation type.
- */
- private static boolean isAnnotationTypeElement(MethodSymbol m) {
- return hasFlag(m.enclClass(), Flags.ANNOTATION);
- }
-
- /**
- * Does a symbol have a given flag?
- */
- private static boolean hasFlag(Symbol s, long flag) {
- return AptEnv.hasFlag(s, flag);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java
deleted file mode 100644
index 2e6b936..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumConstantDeclarationImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
-
-
-/**
- * Implementation of EnumConstantDeclaration
- */
- at SuppressWarnings("deprecation")
-public class EnumConstantDeclarationImpl extends FieldDeclarationImpl
- implements EnumConstantDeclaration {
-
- EnumConstantDeclarationImpl(AptEnv env, VarSymbol sym) {
- super(env, sym);
- }
-
- /**
- * {@inheritDoc}
- */
- public EnumDeclaration getDeclaringType() {
- return (EnumDeclaration) super.getDeclaringType();
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitEnumConstantDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java
deleted file mode 100644
index e5cce78..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/EnumDeclarationImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.*;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of EnumDeclaration
- */
- at SuppressWarnings("deprecation")
-public class EnumDeclarationImpl extends ClassDeclarationImpl
- implements EnumDeclaration {
-
- EnumDeclarationImpl(AptEnv env, ClassSymbol sym) {
- super(env, sym);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public Collection<EnumConstantDeclaration> getEnumConstants() {
- return identityFilter.filter(getFields(),
- EnumConstantDeclaration.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitEnumDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java
deleted file mode 100644
index 5ff1c13..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ExecutableDeclarationImpl.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.ReferenceType;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of ExecutableDeclaration
- */
- at SuppressWarnings("deprecation")
-public abstract class ExecutableDeclarationImpl extends MemberDeclarationImpl
- implements ExecutableDeclaration {
- public MethodSymbol sym;
-
- protected ExecutableDeclarationImpl(AptEnv env, MethodSymbol sym) {
- super(env, sym);
- this.sym = sym;
- }
-
-
- /**
- * Returns type parameters (if any), method name, and signature
- * (value parameter types).
- */
- public String toString() {
- return sym.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isVarArgs() {
- return AptEnv.hasFlag(sym, Flags.VARARGS);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<ParameterDeclaration> getParameters() {
- Collection<ParameterDeclaration> res =
- new ArrayList<ParameterDeclaration>();
- for (VarSymbol param : sym.params())
- res.add(env.declMaker.getParameterDeclaration(param));
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<ReferenceType> getThrownTypes() {
- ArrayList<ReferenceType> res = new ArrayList<ReferenceType>();
- for (Type t : sym.type.getThrownTypes()) {
- res.add((ReferenceType) env.typeMaker.getType(t));
- }
- return res;
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java
deleted file mode 100644
index 5122693..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/FieldDeclarationImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.code.TypeTags;
-
-
-/**
- * Implementation of FieldDeclaration
- */
- at SuppressWarnings("deprecation")
-class FieldDeclarationImpl extends MemberDeclarationImpl
- implements FieldDeclaration {
-
- protected VarSymbol sym;
-
- FieldDeclarationImpl(AptEnv env, VarSymbol sym) {
- super(env, sym);
- this.sym = sym;
- }
-
-
- /**
- * Returns the field's name.
- */
- public String toString() {
- return getSimpleName();
- }
-
- /**
- * {@inheritDoc}
- */
- public TypeMirror getType() {
- return env.typeMaker.getType(sym.type);
- }
-
- /**
- * {@inheritDoc}
- */
- public Object getConstantValue() {
- Object val = sym.getConstValue();
- // val may be null, indicating that this is not a constant.
-
- return Constants.decodeConstant(val, sym.type);
- }
-
- /**
- * {@inheritDoc}
- */
- public String getConstantExpression() {
- Object val = getConstantValue();
- if (val == null) {
- return null;
- }
- Constants.Formatter fmtr = Constants.getFormatter();
- fmtr.append(val);
- return fmtr.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitFieldDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java
deleted file mode 100644
index 5aa2211..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/InterfaceDeclarationImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of InterfaceDeclaration
- */
- at SuppressWarnings("deprecation")
-public class InterfaceDeclarationImpl extends TypeDeclarationImpl
- implements InterfaceDeclaration {
-
- InterfaceDeclarationImpl(AptEnv env, ClassSymbol sym) {
- super(env, sym);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitInterfaceDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java
deleted file mode 100644
index 7a24fd7..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MemberDeclarationImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-import com.sun.tools.javac.code.Type;
-
-
-/**
- * Implementation of MemberDeclaration
- */
- at SuppressWarnings("deprecation")
-public abstract class MemberDeclarationImpl extends DeclarationImpl
- implements MemberDeclaration {
-
- protected MemberDeclarationImpl(AptEnv env, Symbol sym) {
- super(env, sym);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public TypeDeclaration getDeclaringType() {
- ClassSymbol c = getDeclaringClassSymbol();
- return (c == null)
- ? null
- : env.declMaker.getTypeDeclaration(c);
- }
-
- /**
- * {@inheritDoc}
- * For methods, constructors, and types.
- */
- public Collection<TypeParameterDeclaration> getFormalTypeParameters() {
- ArrayList<TypeParameterDeclaration> res =
- new ArrayList<TypeParameterDeclaration>();
- for (Type t : sym.type.getTypeArguments()) {
- res.add(env.declMaker.getTypeParameterDeclaration(t.tsym));
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitMemberDeclaration(this);
- }
-
-
- /**
- * Returns the ClassSymbol of the declaring type,
- * or null if this is a top-level type.
- */
- private ClassSymbol getDeclaringClassSymbol() {
- return sym.owner.enclClass();
- }
-
- /**
- * Returns the formal type parameters of a type, member or constructor
- * as an angle-bracketed string. Each parameter consists of the simple
- * type variable name and any bounds (with no implicit "extends Object"
- * clause added). Type names are qualified.
- * Returns "" if there are no type parameters.
- */
- protected static String typeParamsToString(AptEnv env, Symbol sym) {
- if (sym.type.getTypeArguments().isEmpty()) {
- return "";
- }
- StringBuilder s = new StringBuilder();
- for (Type t : sym.type.getTypeArguments()) {
- Type.TypeVar tv = (Type.TypeVar) t;
- s.append(s.length() == 0 ? "<" : ", ")
- .append(TypeParameterDeclarationImpl.toString(env, tv));
- }
- s.append(">");
- return s.toString();
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java
deleted file mode 100644
index a4c7dcd..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/MethodDeclarationImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.MethodSymbol;
-
-
-/**
- * Implementation of MethodDeclaration
- */
- at SuppressWarnings("deprecation")
-public class MethodDeclarationImpl extends ExecutableDeclarationImpl
- implements MethodDeclaration {
-
- MethodDeclarationImpl(AptEnv env, MethodSymbol sym) {
- super(env, sym);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public TypeMirror getReturnType() {
- return env.typeMaker.getType(sym.type.getReturnType());
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitMethodDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java
deleted file mode 100644
index 0b839f2..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/PackageDeclarationImpl.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.*;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of PackageDeclaration.
- */
- at SuppressWarnings("deprecation")
-public class PackageDeclarationImpl extends DeclarationImpl
- implements PackageDeclaration {
-
- private PackageSymbol sym;
-
-
- public PackageDeclarationImpl(AptEnv env, PackageSymbol sym) {
- super(env, sym);
- this.sym = sym;
- }
-
-
- /**
- * Returns the qualified name.
- */
- public String toString() {
- return getQualifiedName();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getQualifiedName() {
- return sym.getQualifiedName().toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<ClassDeclaration> getClasses() {
- return identityFilter.filter(getAllTypes(),
- ClassDeclaration.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<EnumDeclaration> getEnums() {
- return identityFilter.filter(getAllTypes(),
- EnumDeclaration.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<InterfaceDeclaration> getInterfaces() {
- return identityFilter.filter(getAllTypes(),
- InterfaceDeclaration.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<AnnotationTypeDeclaration> getAnnotationTypes() {
- return identityFilter.filter(getAllTypes(),
- AnnotationTypeDeclaration.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitPackageDeclaration(this);
- }
-
-
- // Cache of all top-level type declarations in this package.
- private Collection<TypeDeclaration> allTypes = null;
-
- /**
- * Caches and returns all top-level type declarations in this package.
- * Omits synthetic types.
- */
- private Collection<TypeDeclaration> getAllTypes() {
- if (allTypes != null) {
- return allTypes;
- }
- allTypes = new ArrayList<TypeDeclaration>();
- for (Symbol s : getMembers(false)) {
- allTypes.add(env.declMaker.getTypeDeclaration((ClassSymbol) s));
- }
- return allTypes;
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java
deleted file mode 100644
index 1d53920..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/ParameterDeclarationImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.TypeMirror;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.VarSymbol;
-
-
-/**
- * Implementation of ParameterDeclaration
- */
- at SuppressWarnings("deprecation")
-public class ParameterDeclarationImpl extends DeclarationImpl
- implements ParameterDeclaration
-{
- protected VarSymbol sym;
-
-
- ParameterDeclarationImpl(AptEnv env, VarSymbol sym) {
- super(env, sym);
- this.sym = sym;
- }
-
-
- /**
- * Returns the simple name of the parameter.
- */
- public String toString() {
- return getType() + " " + sym.name;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean equals(Object obj) {
- // Neither ParameterDeclarationImpl objects nor their symbols
- // are cached by the current implementation, so check symbol
- // owners and names.
-
- if (obj instanceof ParameterDeclarationImpl) {
- ParameterDeclarationImpl that = (ParameterDeclarationImpl) obj;
- return sym.owner == that.sym.owner &&
- sym.name == that.sym.name &&
- env == that.env;
- } else {
- return false;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public int hashCode() {
- return sym.owner.hashCode() + sym.name.hashCode() + env.hashCode();
- }
-
- /**
- * {@inheritDoc}
- */
- public TypeMirror getType() {
- return env.typeMaker.getType(sym.type);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitParameterDeclaration(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java
deleted file mode 100644
index 6f926aa..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeDeclarationImpl.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.Name;
-
-/**
- * Implementation of TypeDeclaration
- */
- at SuppressWarnings("deprecation")
-public class TypeDeclarationImpl extends MemberDeclarationImpl
- implements TypeDeclaration {
-
- public ClassSymbol sym;
-
-
- /**
- * "sym" should be completed before this constructor is called.
- */
- protected TypeDeclarationImpl(AptEnv env, ClassSymbol sym) {
- super(env, sym);
- this.sym = sym;
- }
-
-
- /**
- * Returns the type's name, with any type parameters (including those
- * of outer classes). Type names are qualified.
- */
- public String toString() {
- return toString(env, sym);
- }
-
- /**
- * {@inheritDoc}
- */
- public PackageDeclaration getPackage() {
- return env.declMaker.getPackageDeclaration(sym.packge());
- }
-
- /**
- * {@inheritDoc}
- */
- public String getQualifiedName() {
- return sym.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<InterfaceType> getSuperinterfaces() {
- return env.typeMaker.getTypes(env.jctypes.interfaces(sym.type),
- InterfaceType.class);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<FieldDeclaration> getFields() {
- ArrayList<FieldDeclaration> res = new ArrayList<FieldDeclaration>();
- for (Symbol s : getMembers(true)) {
- if (s.kind == Kinds.VAR) {
- res.add(env.declMaker.getFieldDeclaration((VarSymbol) s));
- }
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<? extends MethodDeclaration> getMethods() {
- ArrayList<MethodDeclaration> res = new ArrayList<MethodDeclaration>();
- for (Symbol s : getMembers(true)) {
- if (s.kind == Kinds.MTH && !s.isConstructor() &&
- !env.names.clinit.equals(s.name) ) { // screen out static initializers
- MethodSymbol m = (MethodSymbol) s;
- res.add((MethodDeclaration)
- env.declMaker.getExecutableDeclaration(m));
- }
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<TypeDeclaration> getNestedTypes() {
- ArrayList<TypeDeclaration> res = new ArrayList<TypeDeclaration>();
- for (Symbol s : getMembers(true)) {
- if (s.kind == Kinds.TYP) {
- res.add(env.declMaker.getTypeDeclaration((ClassSymbol) s));
- }
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitTypeDeclaration(this);
- }
-
-
- /**
- * Returns a type's name, with any type parameters (including those
- * of outer classes). Type names are qualified.
- */
- static String toString(AptEnv env, ClassSymbol c) {
- StringBuilder sb = new StringBuilder();
- if (c.isInner()) {
- // c is an inner class, so include type params of outer.
- ClassSymbol enclosing = c.owner.enclClass();
- sb.append(toString(env, enclosing))
- .append('.')
- .append(c.name);
- } else {
- sb.append(c);
- }
- sb.append(typeParamsToString(env, c));
- return sb.toString();
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java
deleted file mode 100644
index 30563fa..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/declaration/TypeParameterDeclarationImpl.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.declaration;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.ReferenceType;
-import com.sun.mirror.util.DeclarationVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of TypeParameterDeclaration
- */
- at SuppressWarnings("deprecation")
-public class TypeParameterDeclarationImpl extends DeclarationImpl
- implements TypeParameterDeclaration
-{
- protected TypeSymbol sym;
-
-
- TypeParameterDeclarationImpl(AptEnv env, TypeSymbol sym) {
- super(env, sym);
- this.sym = sym;
- }
-
-
- /**
- * Returns the type parameter's name along with any "extends" clause.
- * Class names are qualified. No implicit "extends Object" is added.
- */
- public String toString() {
- return toString(env, (Type.TypeVar) sym.type);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<ReferenceType> getBounds() {
- ArrayList<ReferenceType> res = new ArrayList<ReferenceType>();
- for (Type t : env.jctypes.getBounds((Type.TypeVar) sym.type)) {
- res.add((ReferenceType) env.typeMaker.getType(t));
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public Declaration getOwner() {
- Symbol owner = sym.owner;
- return ((owner.kind & Kinds.TYP) != 0)
- ? env.declMaker.getTypeDeclaration((ClassSymbol) owner)
- : env.declMaker.getExecutableDeclaration((MethodSymbol) owner);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public void accept(DeclarationVisitor v) {
- v.visitTypeParameterDeclaration(this);
- }
-
-
- /**
- * Returns the type parameter's name along with any "extends" clause.
- * See {@link #toString()} for details.
- */
- static String toString(AptEnv env, Type.TypeVar tv) {
- StringBuilder s = new StringBuilder();
- s.append(tv);
- boolean first = true;
- for (Type bound : getExtendsBounds(env, tv)) {
- s.append(first ? " extends " : " & ");
- s.append(env.typeMaker.typeToString(bound));
- first = false;
- }
- return s.toString();
- }
-
- /**
- * Returns the bounds of a type variable, eliding java.lang.Object
- * if it appears alone.
- */
- private static Iterable<Type> getExtendsBounds(AptEnv env,
- Type.TypeVar tv) {
- return (tv.getUpperBound().tsym == env.symtab.objectType.tsym)
- ? com.sun.tools.javac.util.List.<Type>nil()
- : env.jctypes.getBounds(tv);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java
deleted file mode 100644
index b31998b..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/AnnotationTypeImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Type;
-
-
-/**
- * Implementation of AnnotationType
- */
- at SuppressWarnings("deprecation")
-public class AnnotationTypeImpl extends InterfaceTypeImpl
- implements AnnotationType {
-
- AnnotationTypeImpl(AptEnv env, Type.ClassType type) {
- super(env, type);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public AnnotationTypeDeclaration getDeclaration() {
- return (AnnotationTypeDeclaration) super.getDeclaration();
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitAnnotationType(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java
deleted file mode 100644
index 8c4223a..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ArrayTypeImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Type;
-
-
-/**
- * Implementation of ArrayType
- */
- at SuppressWarnings("deprecation")
-public class ArrayTypeImpl extends TypeMirrorImpl implements ArrayType {
-
- protected Type.ArrayType type;
-
-
- ArrayTypeImpl(AptEnv env, Type.ArrayType type) {
- super(env, type);
- this.type = type;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public TypeMirror getComponentType() {
- return env.typeMaker.getType(type.elemtype);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitArrayType(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java
deleted file mode 100644
index 6813a73..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/ClassTypeImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Type;
-
-
-/**
- * Implementation of ClassType
- */
- at SuppressWarnings("deprecation")
-public class ClassTypeImpl extends DeclaredTypeImpl implements ClassType {
-
- ClassTypeImpl(AptEnv env, Type.ClassType type) {
- super(env, type);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public ClassDeclaration getDeclaration() {
- return (ClassDeclaration) super.getDeclaration();
- }
-
- /**
- * {@inheritDoc}
- */
- public ClassType getSuperclass() {
- // java.lang.Object has no superclass
- if (type.tsym == env.symtab.objectType.tsym) {
- return null;
- }
- Type sup = env.jctypes.supertype(type);
- return (ClassType) env.typeMaker.getType(sup);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitClassType(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java
deleted file mode 100644
index 7e0eb34..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/DeclaredTypeImpl.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.TypeDeclaration;
-import com.sun.mirror.type.*;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-
-
-/**
- * Implementation of DeclaredType
- */
- at SuppressWarnings("deprecation")
-abstract class DeclaredTypeImpl extends TypeMirrorImpl
- implements DeclaredType {
-
- protected Type.ClassType type;
-
-
- protected DeclaredTypeImpl(AptEnv env, Type.ClassType type) {
- super(env, type);
- this.type = type;
- }
-
-
- /**
- * Returns a string representation of this declared type.
- * This includes the type's name and any actual type arguments.
- * Type names are qualified.
- */
- public String toString() {
- return toString(env, type);
- }
-
- /**
- * {@inheritDoc}
- */
- public TypeDeclaration getDeclaration() {
- return env.declMaker.getTypeDeclaration((ClassSymbol) type.tsym);
- }
-
- /**
- * {@inheritDoc}
- */
- public DeclaredType getContainingType() {
- if (type.getEnclosingType().tag == TypeTags.CLASS) {
- // This is the type of an inner class.
- return (DeclaredType) env.typeMaker.getType(type.getEnclosingType());
- }
- ClassSymbol enclosing = type.tsym.owner.enclClass();
- if (enclosing != null) {
- // Nested but not inner. Return the raw type of the enclosing
- // class or interface.
- // See java.lang.reflect.ParameterizedType.getOwnerType().
- return (DeclaredType) env.typeMaker.getType(
- env.jctypes.erasure(enclosing.type));
- }
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<TypeMirror> getActualTypeArguments() {
- return env.typeMaker.getTypes(type.getTypeArguments());
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<InterfaceType> getSuperinterfaces() {
- return env.typeMaker.getTypes(env.jctypes.interfaces(type),
- InterfaceType.class);
- }
-
-
- /**
- * Returns a string representation of this declared type.
- * See {@link #toString()} for details.
- */
- static String toString(AptEnv env, Type.ClassType c) {
- return c.toString();
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java
deleted file mode 100644
index 0eec936..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/EnumTypeImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Type;
-
-
-/**
- * Implementation of EnumType
- */
- at SuppressWarnings("deprecation")
-public class EnumTypeImpl extends ClassTypeImpl implements EnumType {
-
- EnumTypeImpl(AptEnv env, Type.ClassType type) {
- super(env, type);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public EnumDeclaration getDeclaration() {
- return (EnumDeclaration) super.getDeclaration();
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitEnumType(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java
deleted file mode 100644
index 3d9cd50..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/InterfaceTypeImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Type;
-
-
-/**
- * Implementation of InterfaceType
- */
- at SuppressWarnings("deprecation")
-public class InterfaceTypeImpl extends DeclaredTypeImpl
- implements InterfaceType {
-
- InterfaceTypeImpl(AptEnv env, Type.ClassType type) {
- super(env, type);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public InterfaceDeclaration getDeclaration() {
- return (InterfaceDeclaration) super.getDeclaration();
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitInterfaceType(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java
deleted file mode 100644
index 973227f..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/PrimitiveTypeImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-
-import com.sun.mirror.type.PrimitiveType;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Type;
-
-import static com.sun.mirror.type.PrimitiveType.Kind.*;
-
-
-/**
- * Implementation of PrimitiveType.
- */
- at SuppressWarnings("deprecation")
-class PrimitiveTypeImpl extends TypeMirrorImpl implements PrimitiveType {
-
- private final Kind kind; // the kind of primitive
-
-
- PrimitiveTypeImpl(AptEnv env, Kind kind) {
- super(env, getType(env, kind));
- this.kind = kind;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public Kind getKind() {
- return kind;
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitPrimitiveType(this);
- }
-
-
- /**
- * Returns the javac type corresponding to a kind of primitive type.
- */
- private static Type getType(AptEnv env, Kind kind) {
- switch (kind) {
- case BOOLEAN: return env.symtab.booleanType;
- case BYTE: return env.symtab.byteType;
- case SHORT: return env.symtab.shortType;
- case INT: return env.symtab.intType;
- case LONG: return env.symtab.longType;
- case CHAR: return env.symtab.charType;
- case FLOAT: return env.symtab.floatType;
- case DOUBLE: return env.symtab.doubleType;
- default: throw new AssertionError();
- }
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java
deleted file mode 100644
index 3fbd391..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMaker.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.type.*;
-import com.sun.mirror.type.PrimitiveType.Kind;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.util.Context;
-
-import static com.sun.tools.javac.code.TypeTags.*;
-
-
-/**
- * Utilities for constructing type objects.
- */
- at SuppressWarnings("deprecation")
-public class TypeMaker {
-
- private final AptEnv env;
- private final VoidType voidType;
- private PrimitiveType[] primTypes = new PrimitiveType[VOID];
- // VOID is past all prim types
-
-
- private static final Context.Key<TypeMaker> typeMakerKey =
- new Context.Key<TypeMaker>();
-
- public static TypeMaker instance(Context context) {
- TypeMaker instance = context.get(typeMakerKey);
- if (instance == null) {
- instance = new TypeMaker(context);
- }
- return instance;
- }
-
- private TypeMaker(Context context) {
- context.put(typeMakerKey, this);
- env = AptEnv.instance(context);
-
- voidType = new VoidTypeImpl(env);
- primTypes[BOOLEAN] = new PrimitiveTypeImpl(env, Kind.BOOLEAN);
- primTypes[BYTE] = new PrimitiveTypeImpl(env, Kind.BYTE);
- primTypes[SHORT] = new PrimitiveTypeImpl(env, Kind.SHORT);
- primTypes[INT] = new PrimitiveTypeImpl(env, Kind.INT);
- primTypes[LONG] = new PrimitiveTypeImpl(env, Kind.LONG);
- primTypes[CHAR] = new PrimitiveTypeImpl(env, Kind.CHAR);
- primTypes[FLOAT] = new PrimitiveTypeImpl(env, Kind.FLOAT);
- primTypes[DOUBLE] = new PrimitiveTypeImpl(env, Kind.DOUBLE);
- }
-
-
- /**
- * Returns the TypeMirror corresponding to a javac Type object.
- */
- public TypeMirror getType(Type t) {
- if (t.isPrimitive()) {
- return primTypes[t.tag];
- }
- switch (t.tag) {
- case ERROR: // fall through
- case CLASS: return getDeclaredType((Type.ClassType) t);
- case WILDCARD: return new WildcardTypeImpl(env, (Type.WildcardType) t);
- case TYPEVAR: return new TypeVariableImpl(env, (Type.TypeVar) t);
- case ARRAY: return new ArrayTypeImpl(env, (Type.ArrayType) t);
- case VOID: return voidType;
- default: throw new AssertionError();
- }
- }
-
- /**
- * Returns the declared type corresponding to a given ClassType.
- */
- public DeclaredType getDeclaredType(Type.ClassType t) {
- return
- hasFlag(t.tsym, Flags.ANNOTATION) ? new AnnotationTypeImpl(env, t) :
- hasFlag(t.tsym, Flags.INTERFACE) ? new InterfaceTypeImpl(env, t) :
- hasFlag(t.tsym, Flags.ENUM) ? new EnumTypeImpl(env, t) :
- new ClassTypeImpl(env, t);
- }
-
- /**
- * Returns a collection of types corresponding to a list of javac Type
- * objects.
- */
- public Collection<TypeMirror> getTypes(Iterable<Type> types) {
- return getTypes(types, TypeMirror.class);
- }
-
- /**
- * Returns a collection of types corresponding to a list of javac Type
- * objects. The element type of the result is specified explicitly.
- */
- public <T extends TypeMirror> Collection<T> getTypes(Iterable<Type> types,
- Class<T> resType) {
- ArrayList<T> res = new ArrayList<T>();
- for (Type t : types) {
- TypeMirror mir = getType(t);
- if (resType.isInstance(mir)) {
- res.add(resType.cast(mir));
- }
- }
- return res;
- }
-
- /**
- * Returns the string representation of a type.
- * Bounds of type variables are not included; bounds of wildcard types are.
- * Type names are qualified.
- */
- public String typeToString(Type t) {
- switch (t.tag) {
- case ARRAY:
- return typeToString(env.jctypes.elemtype(t)) + "[]";
- case CLASS:
- Type.ClassType c = (Type.ClassType) t;
- return DeclaredTypeImpl.toString(env, c);
- case WILDCARD:
- Type.WildcardType a = (Type.WildcardType) t;
- return WildcardTypeImpl.toString(env, a);
- default:
- return t.tsym.toString();
- }
- }
-
-
- /**
- * Does a symbol have a given flag?
- */
- private static boolean hasFlag(Symbol s, long flag) {
- return AptEnv.hasFlag(s, flag);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java
deleted file mode 100644
index 0e9e23d..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeMirrorImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-
-
-/**
- * Implementation of TypeMirror
- */
- at SuppressWarnings("deprecation")
-public abstract class TypeMirrorImpl implements TypeMirror {
-
- protected final AptEnv env;
- public final Type type;
-
-
- protected TypeMirrorImpl(AptEnv env, Type type) {
- this.env = env;
- this.type = type;
- }
-
-
- /**
- * {@inheritDoc}
- */
- public String toString() {
- return type.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean equals(Object obj) {
- if (obj instanceof TypeMirrorImpl) {
- TypeMirrorImpl that = (TypeMirrorImpl) obj;
- return env.jctypes.isSameType(this.type, that.type);
- } else {
- return false;
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public int hashCode() {
- return Types.hashCode(type);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
deleted file mode 100644
index 53a9dc0..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/TypeVariableImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import java.util.Collection;
-import java.util.ArrayList;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.Symbol.TypeSymbol;
-import com.sun.tools.javac.code.Type;
-
-
-/**
- * Implementation of TypeVariable
- */
- at SuppressWarnings("deprecation")
-public class TypeVariableImpl extends TypeMirrorImpl implements TypeVariable {
-
- protected Type.TypeVar type;
-
-
- TypeVariableImpl(AptEnv env, Type.TypeVar type) {
- super(env, type);
- this.type = type;
- }
-
-
- /**
- * Returns the simple name of this type variable. Bounds are
- * not included.
- */
- public String toString() {
- return type.tsym.name.toString();
- }
-
- /**
- * {@inheritDoc}
- */
- public TypeParameterDeclaration getDeclaration() {
- TypeSymbol sym = type.tsym;
- return env.declMaker.getTypeParameterDeclaration(sym);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitTypeVariable(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java
deleted file mode 100644
index 7150f5f..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/VoidTypeImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import com.sun.mirror.type.VoidType;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-
-
-/**
- * Implementation of VoidType.
- */
- at SuppressWarnings("deprecation")
-class VoidTypeImpl extends TypeMirrorImpl implements VoidType {
-
- VoidTypeImpl(AptEnv env) {
- super(env, env.symtab.voidType);
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitVoidType(this);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java
deleted file mode 100644
index fb2d386..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/type/WildcardTypeImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.type;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.TypeVisitor;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-
-
-/**
- * Implementation of WildcardType
- */
- at SuppressWarnings("deprecation")
-public class WildcardTypeImpl extends TypeMirrorImpl implements WildcardType {
-
- protected Type.WildcardType type;
-
- WildcardTypeImpl(AptEnv env, Type.WildcardType type) {
- super(env, type);
- this.type = type;
- }
-
-
- /**
- * Returns the string form of a wildcard type, consisting of "?"
- * and any "extends" or "super" clause.
- * Delimiting brackets are not included. Class names are qualified.
- */
- public String toString() {
- return toString(env, type);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<ReferenceType> getUpperBounds() {
- return type.isSuperBound()
- ? Collections.<ReferenceType>emptyList()
- : typeToCollection(type.type);
- }
-
- /**
- * {@inheritDoc}
- */
- public Collection<ReferenceType> getLowerBounds() {
- return type.isExtendsBound()
- ? Collections.<ReferenceType>emptyList()
- : typeToCollection(type.type);
- }
-
- /**
- * Gets the ReferenceType for a javac Type object, and returns
- * it in a singleton collection. If type is null, returns an empty
- * collection.
- */
- private Collection<ReferenceType> typeToCollection(Type type) {
- ArrayList<ReferenceType> res = new ArrayList<ReferenceType>(1);
- if (type != null) {
- res.add((ReferenceType) env.typeMaker.getType(type));
- }
- return res;
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(TypeVisitor v) {
- v.visitWildcardType(this);
- }
-
-
- /**
- * Returns the string form of a wildcard type, consisting of "?"
- * and any "extends" or "super" clause.
- * See {@link #toString()} for details.
- */
- static String toString(AptEnv env, Type.WildcardType wildThing) {
- return wildThing.toString();
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
deleted file mode 100644
index 02f59ff..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/DeclarationsImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.util;
-
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.Declarations;
-import com.sun.tools.apt.mirror.declaration.DeclarationImpl;
-import com.sun.tools.apt.mirror.declaration.MethodDeclarationImpl;
-import com.sun.tools.apt.mirror.util.DeclarationsImpl;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.javac.code.*;
-import com.sun.tools.javac.code.Symbol.*;
-import com.sun.tools.javac.util.Context;
-
-import static com.sun.tools.javac.code.Kinds.*;
-
-
-/**
- * Implementation of Declarations utility methods for annotation processors
- */
- at SuppressWarnings("deprecation")
-public class DeclarationsImpl implements Declarations {
-
- private final AptEnv env;
-
-
- private static final Context.Key<Declarations> declarationsKey =
- new Context.Key<Declarations>();
-
- public static Declarations instance(Context context) {
- Declarations instance = context.get(declarationsKey);
- if (instance == null) {
- instance = new DeclarationsImpl(context);
- }
- return instance;
- }
-
- private DeclarationsImpl(Context context) {
- context.put(declarationsKey, this);
- env = AptEnv.instance(context);
- }
-
-
- /**
- * {@inheritDoc}
- * See sections 8.3 and 8.4.6 of
- * <cite>The Java™ Language Specification</cite>
- */
- public boolean hides(MemberDeclaration sub, MemberDeclaration sup) {
- Symbol hider = ((DeclarationImpl) sub).sym;
- Symbol hidee = ((DeclarationImpl) sup).sym;
-
- // Fields only hide fields; methods only methods; types only types.
- // Names must match. Nothing hides itself (just try it).
- if (hider == hidee ||
- hider.kind != hidee.kind ||
- hider.name != hidee.name) {
- return false;
- }
-
- // Only static methods can hide other methods.
- // Methods only hide methods with matching signatures.
- if (hider.kind == MTH) {
- if ((hider.flags() & Flags.STATIC) == 0 ||
- !env.jctypes.isSubSignature(hider.type, hidee.type)) {
- return false;
- }
- }
-
- // Hider must be in a subclass of hidee's class.
- // Note that if M1 hides M2, and M2 hides M3, and M3 is accessible
- // in M1's class, then M1 and M2 both hide M3.
- ClassSymbol hiderClass = hider.owner.enclClass();
- ClassSymbol hideeClass = hidee.owner.enclClass();
- if (hiderClass == null || hideeClass == null ||
- !hiderClass.isSubClass(hideeClass, env.jctypes)) {
- return false;
- }
-
- // Hidee must be accessible in hider's class.
- // The method isInheritedIn is poorly named: it checks only access.
- return hidee.isInheritedIn(hiderClass, env.jctypes);
- }
-
- /**
- * {@inheritDoc}
- * See section 8.4.6.1 of
- * <cite>The Java™ Language Specification</cite>
- */
- public boolean overrides(MethodDeclaration sub, MethodDeclaration sup) {
- MethodSymbol overrider = ((MethodDeclarationImpl) sub).sym;
- MethodSymbol overridee = ((MethodDeclarationImpl) sup).sym;
- ClassSymbol origin = (ClassSymbol) overrider.owner;
-
- return overrider.name == overridee.name &&
-
- // not reflexive as per JLS
- overrider != overridee &&
-
- // we don't care if overridee is static, though that wouldn't
- // compile
- !overrider.isStatic() &&
-
- // overrider, whose declaring type is the origin, must be
- // in a subtype of overridee's type
- env.jctypes.asSuper(origin.type, overridee.owner) != null &&
-
- // check access and signatures; don't check return types
- overrider.overrides(overridee, origin, env.jctypes, false);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java
deleted file mode 100644
index cfa673d..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/SourcePositionImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.util;
-
-
-import java.io.File;
-import javax.tools.JavaFileObject;
-
-import com.sun.mirror.util.SourcePosition;
-import com.sun.tools.javac.util.Position;
-
-
-/**
- * Implementation of SourcePosition
- */
- at SuppressWarnings("deprecation")
-public class SourcePositionImpl implements SourcePosition {
-
- private JavaFileObject sourcefile;
- private int pos; // file position, in javac's internal format
- private Position.LineMap linemap;
-
-
- public SourcePositionImpl(JavaFileObject sourcefile, int pos, Position.LineMap linemap) {
- this.sourcefile = sourcefile;
- this.pos = pos;
- this.linemap = linemap;
- assert sourcefile != null;
- assert linemap != null;
- }
-
- public int getJavacPosition() {
- return pos;
- }
-
- public JavaFileObject getSource() {
- return sourcefile;
- }
-
- /**
- * Returns a string representation of this position in the
- * form "sourcefile:line", or "sourcefile" if no line number is available.
- */
- public String toString() {
- int ln = line();
- return (ln == Position.NOPOS)
- ? sourcefile.getName()
- : sourcefile.getName() + ":" + ln;
- }
-
- /**
- * {@inheritDoc}
- */
- public File file() {
- return new File(sourcefile.toUri());
- }
-
- /**
- * {@inheritDoc}
- */
- public int line() {
- return linemap.getLineNumber(pos);
- }
-
- /**
- * {@inheritDoc}
- */
- public int column() {
- return linemap.getColumnNumber(pos);
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java b/langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java
deleted file mode 100644
index 821b3ed..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/mirror/util/TypesImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
- * Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.mirror.util;
-
-
-import java.util.Collection;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.Types;
-import com.sun.tools.apt.mirror.AptEnv;
-import com.sun.tools.apt.mirror.declaration.*;
-import com.sun.tools.apt.mirror.type.TypeMirrorImpl;
-import com.sun.tools.javac.code.BoundKind;
-import com.sun.tools.javac.code.Type;
-import com.sun.tools.javac.code.Symbol.ClassSymbol;
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.ListBuffer;
-
-
-/**
- * Implementation of Types utility methods for annotation processors
- */
- at SuppressWarnings("deprecation")
-public class TypesImpl implements Types {
-
- private final AptEnv env;
-
-
- private static final Context.Key<Types> typesKey =
- new Context.Key<Types>();
-
- public static Types instance(Context context) {
- Types instance = context.get(typesKey);
- if (instance == null) {
- instance = new TypesImpl(context);
- }
- return instance;
- }
-
- private TypesImpl(Context context) {
- context.put(typesKey, this);
- env = AptEnv.instance(context);
- }
-
-
- /**
- * {@inheritDoc}
- */
- public boolean isSubtype(TypeMirror t1, TypeMirror t2) {
- return env.jctypes.isSubtype(((TypeMirrorImpl) t1).type,
- ((TypeMirrorImpl) t2).type);
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isAssignable(TypeMirror t1, TypeMirror t2) {
- return env.jctypes.isAssignable(((TypeMirrorImpl) t1).type,
- ((TypeMirrorImpl) t2).type);
- }
-
- /**
- * {@inheritDoc}
- */
- public TypeMirror getErasure(TypeMirror t) {
- return env.typeMaker.getType(
- env.jctypes.erasure(((TypeMirrorImpl) t).type));
- }
-
- /**
- * {@inheritDoc}
- */
- public PrimitiveType getPrimitiveType(PrimitiveType.Kind kind) {
- Type prim = null;
- switch (kind) {
- case BOOLEAN: prim = env.symtab.booleanType; break;
- case BYTE: prim = env.symtab.byteType; break;
- case SHORT: prim = env.symtab.shortType; break;
- case INT: prim = env.symtab.intType; break;
- case LONG: prim = env.symtab.longType; break;
- case CHAR: prim = env.symtab.charType; break;
- case FLOAT: prim = env.symtab.floatType; break;
- case DOUBLE: prim = env.symtab.doubleType; break;
- default: assert false;
- }
- return (PrimitiveType) env.typeMaker.getType(prim);
- }
-
- /**
- * {@inheritDoc}
- */
- public VoidType getVoidType() {
- return (VoidType) env.typeMaker.getType(env.symtab.voidType);
- }
-
- /**
- * {@inheritDoc}
- */
- public ArrayType getArrayType(TypeMirror componentType) {
- if (componentType instanceof VoidType) {
- throw new IllegalArgumentException("void");
- }
- return (ArrayType) env.typeMaker.getType(
- new Type.ArrayType(((TypeMirrorImpl) componentType).type,
- env.symtab.arrayClass));
- }
-
- /**
- * {@inheritDoc}
- */
- public TypeVariable getTypeVariable(TypeParameterDeclaration tparam) {
- return (TypeVariable) env.typeMaker.getType(
- ((DeclarationImpl) tparam).sym.type);
- }
-
- /**
- * {@inheritDoc}
- */
- public WildcardType getWildcardType(Collection<ReferenceType> upperBounds,
- Collection<ReferenceType> lowerBounds) {
- BoundKind kind;
- Type bound;
- int uppers = upperBounds.size();
- int downers = lowerBounds.size();
-
- if (uppers + downers > 1) {
- throw new IllegalArgumentException("Multiple bounds not allowed");
-
- } else if (uppers + downers == 0) {
- kind = BoundKind.UNBOUND;
- bound = env.symtab.objectType;
-
- } else if (uppers == 1) {
- assert downers == 0;
- kind = BoundKind.EXTENDS;
- bound = ((TypeMirrorImpl) upperBounds.iterator().next()).type;
-
- } else {
- assert uppers == 0 && downers == 1;
- kind = BoundKind.SUPER;
- bound = ((TypeMirrorImpl) lowerBounds.iterator().next()).type;
- }
-
- if (bound instanceof Type.WildcardType)
- throw new IllegalArgumentException(bound.toString());
-
- return (WildcardType) env.typeMaker.getType(
- new Type.WildcardType(bound, kind, env.symtab.boundClass));
- }
-
- /**
- * {@inheritDoc}
- */
- public DeclaredType getDeclaredType(TypeDeclaration decl,
- TypeMirror... typeArgs) {
- ClassSymbol sym = ((TypeDeclarationImpl) decl).sym;
-
- if (typeArgs.length == 0)
- return (DeclaredType) env.typeMaker.getType(
- env.jctypes.erasure(sym.type));
- if (sym.type.getEnclosingType().isParameterized())
- throw new IllegalArgumentException(decl.toString());
-
- return getDeclaredType(sym.type.getEnclosingType(), sym, typeArgs);
- }
-
- /**
- * {@inheritDoc}
- */
- public DeclaredType getDeclaredType(DeclaredType containing,
- TypeDeclaration decl,
- TypeMirror... typeArgs) {
- if (containing == null)
- return getDeclaredType(decl, typeArgs);
-
- ClassSymbol sym = ((TypeDeclarationImpl) decl).sym;
- Type outer = ((TypeMirrorImpl) containing).type;
-
- if (outer.tsym != sym.owner.enclClass())
- throw new IllegalArgumentException(containing.toString());
- if (!outer.isParameterized())
- return getDeclaredType(decl, typeArgs);
-
- return getDeclaredType(outer, sym, typeArgs);
- }
-
- private DeclaredType getDeclaredType(Type outer,
- ClassSymbol sym,
- TypeMirror... typeArgs) {
- if (typeArgs.length != sym.type.getTypeArguments().length())
- throw new IllegalArgumentException(
- "Incorrect number of type arguments");
-
- ListBuffer<Type> targs = new ListBuffer<Type>();
- for (TypeMirror t : typeArgs) {
- if (!(t instanceof ReferenceType || t instanceof WildcardType))
- throw new IllegalArgumentException(t.toString());
- targs.append(((TypeMirrorImpl) t).type);
- }
- //### Need a way to check that type args match formals.
-
- return (DeclaredType) env.typeMaker.getType(
- new Type.ClassType(outer, targs.toList(), sym));
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties b/langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties
deleted file mode 100644
index f2de341..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt.properties
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# Copyright (c) 2004, 2006, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-apt.msg.usage.header=\
-Usage: {0} <apt and javac options> <source files>\n\
-where apt options include:
-
-apt.msg.usage.footer=\
-See javac -help for information on javac options.
-
-apt.msg.usage.nonstandard.footer=\
-These options are non-standard and subject to change without notice, \nas is the format of their output.
-
-apt.msg.bug=\
-An exception has occurred in apt ({0}). \
-Please file a bug at the Java Developer Connection (http://java.sun.com/webapps/bugreport) \
-after checking the Bug Parade for duplicates. \
-Include your program and the following diagnostic in your report. Thank you.
-
-## apt options
-
-apt.opt.A=\
- Options to pass to annotation processors
-apt.opt.arg.class=\
- <class>
-apt.opt.arg.directory=\
- Specify where to place processor and javac generated class files
-apt.opt.classpath=\
- Specify where to find user class files and annotation processor factories
-apt.opt.d=\
- Specify where to place processor and javac generated class files
-apt.opt.factory=\
- Name of AnnotationProcessorFactory to use; bypasses default discovery process
-apt.opt.factorypath=\
- Specify where to find annotation processor factories
-apt.opt.s=\
- Specify where to place processor generated source files
-apt.opt.help=\
- Print a synopsis of standard options; use javac -help for more options
-apt.opt.print=\
- Print out textual representation of specified types
-apt.opt.nocompile=\
- Do not compile source files to class files
-apt.opt.proc.flag=\
- [key[=value]]
-apt.opt.version=\
- Version information
-apt.opt.XListAnnotationTypes=\
- List found annotation types
-apt.opt.XListDeclarations=\
- List specified and included declarations
-apt.opt.XPrintAptRounds=\
- Print information about initial and recursive apt rounds
-apt.opt.XPrintFactoryInfo=\
- Print information about which annotations a factory is asked to process
-apt.opt.XClassesAsDecls=\
- Treat both class and source files as declarations to process
-
-##
-## errors
-##
-
-## All errors which do not refer to a particular line in the source code are
-## preceded by this string.
-
-apt.err.error=\
- error:\u0020
-
-apt.err.unsupported.source.version=\
- Source release {0} is not supported; use release 5 or earlier
-
-apt.err.unsupported.target.version=\
- Target release {0} is not supported; use release 5 or earlier
-
-apt.err.BadDeclaration=\
- Bad declaration created for annotation type {0}
-
-apt.err.CantFindClass=\
- Could not find class file for {0}
-
-apt.err.DeclarationCreation=\
- Could not create declaration for annotation type {0}
-
-# Print an error from the Messager
-apt.err.Messager=\
- {0}
-
-##
-## miscellaneous strings
-##
-
-apt.misc.Deprecation=\
- \nwarning:\u0020The apt tool and its associated API are planned to be\n\
- removed in the next major JDK release. These features have been\n\
- superseded by javac and the standardized annotation processing API,\n\
- javax.annotation.processing and javax.lang.model. Users are\n\
- recommended to migrate to the annotation processing features of\n\
- javac; see the javac man page for more information.\n
-
-apt.misc.Problem=\
- Problem encountered during annotation processing; \nsee stacktrace below for more information.
-
-apt.misc.SunMiscService=\
- Error finding annotation processor factories; \ncheck META-INF/services information.
-
-# Print a notice from the Messager
-apt.note.Messager=\
- {0}
-
-##
-## warnings
-##
-
-## All warning messages are preceded by the following string.
-apt.warn.warning=\
- warning:\u0020
-
-apt.warn.AnnotationsWithoutProcessors=\
- Annotation types without processors: {0}
-
-apt.warn.BadFactory=\
- Bad annotation processor factory: {0}
-
-apt.warn.BadParentDirectory=\
- Failed to create some parent directory of {0}
-
-apt.warn.FactoryCantInstantiate=\
- Could not instantiate an instance of factory ''{0}''.
-
-apt.warn.FactoryWrongType=\
- Specified factory, ''{0}'', is not an AnnotationProcessorFactory.
-
-apt.warn.FactoryNotFound=\
- Specified AnnotationProcessorFactory, ''{0}'', not found on search path.
-
-apt.warn.FileReopening=\
- Attempt to create ''{0}'' multiple times
-
-apt.warn.IllegalFileName=\
- Cannot create file for illegal name ''{0}''.
-
-apt.warn.MalformedSupportedString=\
- Malformed string for annotation support, ''{0}'', returned by factory.
-
-apt.warn.NoNewFilesAfterRound=\
- Cannot create file ''{0}'' after a round has ended.
-
-# Print a warning from the Messager
-apt.warn.Messager=\
- {0}
-
-apt.warn.NoAnnotationProcessors=\
- No annotation processors found but annotations present.
-
-apt.warn.NullProcessor=\
- Factory {0} returned null for an annotation processor.
-
-apt.warn.CorrespondingClassFile=\
- A class file corresponding to source file ''{0}'' has already been created.
-
-apt.warn.CorrespondingSourceFile=\
- A source file corresponding to class file ''{0}'' has already been created.
diff --git a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties
deleted file mode 100644
index 27305c3..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_ja.properties
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-apt.msg.usage.header=\u4F7F\u7528\u65B9\u6CD5: {0} <apt and javac options> <source files>\n\u6B21\u306Eapt\u30AA\u30D7\u30B7\u30E7\u30F3\u304C\u3042\u308A\u307E\u3059:
-
-apt.msg.usage.footer=javac\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3064\u3044\u3066\u306F\u3001javac -help\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-apt.msg.usage.nonstandard.footer=\u3053\u308C\u3089\u306F\u975E\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u3067\u3042\u308A\u3001\u8868\u793A\u5F62\u5F0F\u4E88\u544A\u306A\u3057\u306B\u5909\u66F4\u3055\u308C\u308B\n\u3053\u3068\u304C\u3042\u308A\u307E\u3059\u3002
-
-apt.msg.bug=\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3067\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F({0})\u3002Bug Parade\u306B\u540C\u3058\u30D0\u30B0\u304C\u767B\u9332\u3055\u308C\u3066\u3044\u306A\u3044\u3053\u3068\u3092\u3054\u78BA\u8A8D\u306E\u4E0A\u3001Java Developer Connection(http://java.sun.com/webapps/bugreport)\u3067\u30D0\u30B0\u306E\u767B\u9332\u3092\u304A\u9858\u3044\u3044\u305F\u3057\u307E\u3059\u3002\u30EC\u30DD\u30FC\u30C8\u306B\u306F\u3001\u305D\u306E\u30D7\u30ED\u30B0\u30E9\u30E0\u3068\u4E0B\u8A18\u306E\u8A3A\u65AD\u5185\u5BB9\u3092\u542B\u3081\u3066\u304F\u3060\u3055\u3044\u3002\u3054\u5354\u529B\u3042\u308A\u304C\u3068\u3046\u3054\u3056\u3044\u307E\u3059\u3002
-
-## apt options
-
-apt.opt.A=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306B\u6E21\u3055\u308C\u308B\u30AA\u30D7\u30B7\u30E7\u30F3
-apt.opt.arg.class=<class>
-apt.opt.arg.directory=\u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-apt.opt.classpath=\u30E6\u30FC\u30B6\u30FC\u30FB\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304A\u3088\u3073\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-apt.opt.d=\u30D7\u30ED\u30BB\u30C3\u30B5\u304A\u3088\u3073javac\u304C\u751F\u6210\u3057\u305F\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-apt.opt.factory=\u4F7F\u7528\u3059\u308BAnnotationProcessorFactory\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9
-apt.opt.factorypath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA\u306E\u691C\u7D22\u5834\u6240\u3092\u6307\u5B9A\u3059\u308B
-apt.opt.s=\u30D7\u30ED\u30BB\u30C3\u30B5\u304C\u751F\u6210\u3057\u305F\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u7F6E\u304F\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
-apt.opt.help=\u6A19\u6E96\u30AA\u30D7\u30B7\u30E7\u30F3\u306E\u6982\u8981\u3092\u51FA\u529B\u3059\u308B\u3002\u8A73\u7D30\u30AA\u30D7\u30B7\u30E7\u30F3\u306B\u3064\u3044\u3066\u306Fjavac -help\u3092\u53C2\u7167
-apt.opt.print=\u6307\u5B9A\u3057\u305F\u578B\u306E\u30C6\u30AD\u30B9\u30C8\u8868\u793A\u3092\u51FA\u529B\u3059\u308B
-apt.opt.nocompile=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306B\u30B3\u30F3\u30D1\u30A4\u30EB\u3057\u306A\u3044
-apt.opt.proc.flag=[key[=value]]
-apt.opt.version=\u30D0\u30FC\u30B8\u30E7\u30F3\u60C5\u5831
-apt.opt.XListAnnotationTypes=\u898B\u3064\u304B\u3063\u305F\u6CE8\u91C8\u578B\u3092\u30EA\u30B9\u30C8\u3059\u308B
-apt.opt.XListDeclarations=\u6307\u5B9A\u3055\u308C\u305F\u5BA3\u8A00\u304A\u3088\u3073\u30A4\u30F3\u30AF\u30EB\u30FC\u30C9\u3055\u308C\u305F\u5BA3\u8A00\u3092\u30EA\u30B9\u30C8\u3059\u308B
-apt.opt.XPrintAptRounds=\u521D\u671F\u304A\u3088\u3073\u518D\u5E30apt\u5F80\u5FA9\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
-apt.opt.XPrintFactoryInfo=\u30D5\u30A1\u30AF\u30C8\u30EA\u304C\u51E6\u7406\u3092\u4F9D\u983C\u3055\u308C\u308B\u6CE8\u91C8\u306B\u3064\u3044\u3066\u306E\u60C5\u5831\u3092\u5370\u5237\u3059\u308B
-apt.opt.XClassesAsDecls=\u30AF\u30E9\u30B9\u3068\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4E21\u65B9\u3068\u3082\u51E6\u7406\u3059\u308B\u5BA3\u8A00\u3068\u3057\u3066\u51E6\u7406
-
-##
-## errors
-##
-
-## All errors which do not refer to a particular line in the source code are
-## preceded by this string.
-
-apt.err.error=\u30A8\u30E9\u30FC:\u0020
-
-apt.err.unsupported.source.version=\u30BD\u30FC\u30B9\u30FB\u30EA\u30EA\u30FC\u30B9{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30EA\u30EA\u30FC\u30B95\u4EE5\u524D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-
-apt.err.unsupported.target.version=\u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30EA\u30EA\u30FC\u30B9{0}\u306F\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002\u30EA\u30EA\u30FC\u30B95\u4EE5\u524D\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044
-
-apt.err.BadDeclaration=\u6CE8\u91C8\u578B{0}\u7528\u306B\u4F5C\u6210\u3055\u308C\u305F\u7121\u52B9\u306A\u5BA3\u8A00\u3067\u3059
-
-apt.err.CantFindClass={0}\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093
-
-apt.err.DeclarationCreation=\u6CE8\u91C8\u578B{0}\u7528\u306B\u5BA3\u8A00\u3092\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F
-
-# Print an error from the Messager
-apt.err.Messager={0}
-
-##
-## miscellaneous strings
-##
-
-apt.misc.Deprecation=\n\u8B66\u544A: apt\u30C4\u30FC\u30EB\u3068\u30C4\u30FC\u30EB\u306B\u95A2\u9023\u4ED8\u3051\u3089\u308C\u305FAPI\u306F\u3001\u6B21\u56DE\u306EJDK\n\u30E1\u30B8\u30E3\u30FC\u30FB\u30EA\u30EA\u30FC\u30B9\u3067\u524A\u9664\u3055\u308C\u308B\u4E88\u5B9A\u3067\u3059\u3002\u3053\u308C\u3089\u306E\u6A5F\u80FD\u306Fjavac\u304A\u3088\u3073\n\u6A19\u6E96\u5316\u3055\u308C\u305F\u6CE8\u91C8\u51E6\u7406API\u306Ejavax.annotation.processing\u304A\u3088\u3073javax.lang.model\n\u306B\u3088\u3063\u3066\u7F6E\u304D\u63DB\u3048\u3089\u308C\u307E\u3057\u305F\u3002\u30E6\u30FC\u30B6\u30FC\u306Fjavac\u306E\u6CE8\u91C8\u51E6\u7406\u6A5F\u80FD\u306B\n\u79FB\u884C\u3059\u308B\u3053\u3068\u3092\u304A\u85A6\u3081\u3057\u307E\u3059\u3002\n\u8A73\u7D30\u306F\u3001javac man\u30DA\u30FC\u30B8\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n
-
-apt.misc.Problem=\u6CE8\u91C8\u51E6\u7406\u4E2D\u306B\u554F\u984C\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u3001\u4E0B\u8A18\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3092\u53C2\u7167\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-apt.misc.SunMiscService=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA\u306E\u691C\u7D22\u30A8\u30E9\u30FC\u3067\u3059\u3002\nMETA-INF/services\u5185\u306E\u60C5\u5831\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002
-
-# Print a notice from the Messager
-apt.note.Messager={0}
-
-##
-## warnings
-##
-
-## All warning messages are preceded by the following string.
-apt.warn.warning=\u8B66\u544A:
-
-apt.warn.AnnotationsWithoutProcessors=\u30D7\u30ED\u30BB\u30C3\u30B5\u306A\u3057\u306E\u6CE8\u91C8\u578B\u3067\u3059: {0}
-
-apt.warn.BadFactory=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u30FB\u30D5\u30A1\u30AF\u30C8\u30EA\u304C\u7121\u52B9\u3067\u3059: {0}
-
-apt.warn.BadParentDirectory={0}\u306E\u3044\u304F\u3064\u304B\u306E\u89AA\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u4F5C\u6210\u306B\u5931\u6557\u3057\u307E\u3057\u305F
-
-apt.warn.FactoryCantInstantiate=\u30D5\u30A1\u30AF\u30C8\u30EA''{0}''\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5316\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-
-apt.warn.FactoryWrongType=\u6307\u5B9A\u3057\u305F\u30D5\u30A1\u30AF\u30C8\u30EA''{0}''\u306FAnnotationProcessorFactory\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002
-
-apt.warn.FactoryNotFound=\u6307\u5B9A\u3057\u305FAnnotationProcessorFactory ''{0}''\u306F\u691C\u7D22\u30D1\u30B9\u3067\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002
-
-apt.warn.FileReopening=''{0}''\u3092\u8907\u6570\u56DE\u4F5C\u6210\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307E\u3059
-
-apt.warn.IllegalFileName=\u7121\u52B9\u306A\u540D\u524D''{0}''\u306E\u30D5\u30A1\u30A4\u30EB\u306F\u4F5C\u6210\u3067\u304D\u307E\u305B\u3093\u3002
-
-apt.warn.MalformedSupportedString=\u30D5\u30A1\u30AF\u30C8\u30EA\u304C\u8FD4\u3057\u305F\u6CE8\u91C8\u30B5\u30DD\u30FC\u30C8''{0}''\u306E\u6587\u5B57\u5217\u304C\u4E0D\u6B63\u3067\u3059\u3002
-
-apt.warn.NoNewFilesAfterRound=\u5F80\u5FA9\u306E\u7D42\u4E86\u5F8C\u306B\u30D5\u30A1\u30A4\u30EB''{0}''\u3092\u4F5C\u6210\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002
-
-# Print a warning from the Messager
-apt.warn.Messager={0}
-
-apt.warn.NoAnnotationProcessors=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306F\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u304C\u3001\u6CE8\u91C8\u306F\u5B58\u5728\u3057\u307E\u3059\u3002
-
-apt.warn.NullProcessor=\u30D5\u30A1\u30AF\u30C8\u30EA{0}\u304C\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306Bnull\u3092\u8FD4\u3057\u307E\u3057\u305F\u3002
-
-apt.warn.CorrespondingClassFile=\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB''{0}''\u306B\u5BFE\u5FDC\u3059\u308B\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002
-
-apt.warn.CorrespondingSourceFile=\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB''{0}''\u306B\u5BFE\u5FDC\u3059\u308B\u30BD\u30FC\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u306F\u3059\u3067\u306B\u4F5C\u6210\u3055\u308C\u3066\u3044\u307E\u3059\u3002
diff --git a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties b/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties
deleted file mode 100644
index b2565bc..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/resources/apt_zh_CN.properties
+++ /dev/null
@@ -1,126 +0,0 @@
-#
-# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-apt.msg.usage.header=\u7528\u6CD5: {0} <apt and javac options> <source files>\n\u5176\u4E2D, apt \u9009\u9879\u5305\u62EC:
-
-apt.msg.usage.footer=\u6709\u5173 javac \u9009\u9879\u7684\u4FE1\u606F, \u8BF7\u53C2\u9605 javac -help\u3002
-
-apt.msg.usage.nonstandard.footer=\u8FD9\u4E9B\u9009\u9879\u53CA\u5176\u8F93\u51FA\u683C\u5F0F\u90FD\u4E0D\u662F\u6807\u51C6\u7684, \n\u5982\u6709\u66F4\u6539, \u6055\u4E0D\u53E6\u884C\u901A\u77E5\u3002
-
-apt.msg.bug=apt ({0}) \u4E2D\u51FA\u73B0\u5F02\u5E38\u9519\u8BEF\u3002 \u5982\u679C\u5728 Bug Parade \u4E2D\u6CA1\u6709\u627E\u5230\u8BE5\u9519\u8BEF, \u8BF7\u5728 Java Developer Connection (http://java.sun.com/webapps/bugreport) \u4E2D\u5EFA\u7ACB Bug\u3002\u8BF7\u5728\u62A5\u544A\u4E2D\u9644\u4E0A\u60A8\u7684\u7A0B\u5E8F\u548C\u4EE5\u4E0B\u8BCA\u65AD\u4FE1\u606F\u3002\u8C22\u8C22\u3002
-
-## apt options
-
-apt.opt.A=\u4F20\u9012\u7ED9\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u7684\u9009\u9879
-apt.opt.arg.class=<\u7C7B>
-apt.opt.arg.directory=\u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
-apt.opt.classpath=\u6307\u5B9A\u67E5\u627E\u7528\u6237\u7C7B\u6587\u4EF6\u548C\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u5DE5\u5382\u7684\u4F4D\u7F6E
-apt.opt.d=\u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u548C javac \u751F\u6210\u7684\u7C7B\u6587\u4EF6\u7684\u4F4D\u7F6E
-apt.opt.factory=\u8981\u4F7F\u7528\u7684 AnnotationProcessorFactory \u7684\u540D\u79F0; \u7ED5\u8FC7\u9ED8\u8BA4\u7684\u641C\u7D22\u8FDB\u7A0B
-apt.opt.factorypath=\u6307\u5B9A\u67E5\u627E\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u5DE5\u5382\u7684\u4F4D\u7F6E
-apt.opt.s=\u6307\u5B9A\u653E\u7F6E\u5904\u7406\u7A0B\u5E8F\u751F\u6210\u7684\u6E90\u6587\u4EF6\u7684\u4F4D\u7F6E
-apt.opt.help=\u8F93\u51FA\u6807\u51C6\u9009\u9879\u7684\u63D0\u8981; \u4F7F\u7528 javac -help \u53EF\u4EE5\u5F97\u5230\u66F4\u591A\u9009\u9879
-apt.opt.print=\u8F93\u51FA\u6307\u5B9A\u7C7B\u578B\u7684\u6587\u672C\u8868\u793A
-apt.opt.nocompile=\u8BF7\u52FF\u5C06\u6E90\u6587\u4EF6\u7F16\u8BD1\u4E3A\u7C7B\u6587\u4EF6
-apt.opt.proc.flag=[\u5173\u952E\u5B57[=\u503C]]
-apt.opt.version=\u7248\u672C\u4FE1\u606F
-apt.opt.XListAnnotationTypes=\u5217\u51FA\u627E\u5230\u7684\u6CE8\u91CA\u7C7B\u578B
-apt.opt.XListDeclarations=\u5217\u51FA\u6307\u5B9A\u548C\u5305\u542B\u7684\u58F0\u660E
-apt.opt.XPrintAptRounds=\u8F93\u51FA\u6709\u5173\u521D\u59CB\u548C\u9012\u5F52 apt \u5FAA\u73AF\u7684\u4FE1\u606F
-apt.opt.XPrintFactoryInfo=\u8F93\u51FA\u6709\u5173\u8BF7\u6C42\u5DE5\u5382\u5904\u7406\u54EA\u4E9B\u6CE8\u91CA\u7684\u4FE1\u606F
-apt.opt.XClassesAsDecls=\u5C06\u7C7B\u6587\u4EF6\u548C\u6E90\u6587\u4EF6\u90FD\u89C6\u4E3A\u8981\u5904\u7406\u7684\u58F0\u660E
-
-##
-## errors
-##
-
-## All errors which do not refer to a particular line in the source code are
-## preceded by this string.
-
-apt.err.error=\u9519\u8BEF:\u0020
-
-apt.err.unsupported.source.version=\u4E0D\u652F\u6301\u6E90\u53D1\u884C\u7248 {0}; \u8BF7\u4F7F\u7528\u53D1\u884C\u7248 5 \u6216\u65E9\u671F\u53D1\u884C\u7248
-
-apt.err.unsupported.target.version=\u4E0D\u652F\u6301\u76EE\u6807\u53D1\u884C\u7248 {0}; \u8BF7\u4F7F\u7528\u53D1\u884C\u7248 5 \u6216\u65E9\u671F\u53D1\u884C\u7248
-
-apt.err.BadDeclaration=\u4E3A\u6CE8\u91CA\u7C7B\u578B{0}\u521B\u5EFA\u7684\u58F0\u660E\u51FA\u73B0\u9519\u8BEF
-
-apt.err.CantFindClass=\u627E\u4E0D\u5230{0}\u7684\u7C7B\u6587\u4EF6
-
-apt.err.DeclarationCreation=\u65E0\u6CD5\u4E3A\u6CE8\u91CA\u7C7B\u578B{0}\u521B\u5EFA\u58F0\u660E
-
-# Print an error from the Messager
-apt.err.Messager={0}
-
-##
-## miscellaneous strings
-##
-
-apt.misc.Deprecation=\n\u8B66\u544A:\u0020\u5DF2\u8BA1\u5212\u5728\u4E0B\u4E00\u4E2A JDK \u4E3B\u53D1\u884C\u7248\u4E2D\n\u5220\u9664 apt \u5DE5\u5177\u53CA\u5176\u5173\u8054\u7684 API\u3002\u8FD9\u4E9B\u529F\u80FD\n\u5DF2\u88AB javac \u548C\u6807\u51C6\u6CE8\u91CA\u5904\u7406 API,\njavax.annotation.processing \u548C javax.lang.model \u53D6\u4EE3\u3002\u5EFA\u8BAE\u7528\u6237\n\u79FB\u690D\u5230 javac \u7684\u6CE8\u91CA\u5904\u7406\u529F\u80FD;\n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605 javac \u5E2E\u52A9\u9875\u3002\n
-
-apt.misc.Problem=\u6CE8\u91CA\u5904\u7406\u8FC7\u7A0B\u4E2D\u9047\u5230\u95EE\u9898; \n\u6709\u5173\u8BE6\u7EC6\u4FE1\u606F, \u8BF7\u53C2\u9605\u4E0B\u9762\u7684\u5806\u6808\u8DDF\u8E2A\u3002
-
-apt.misc.SunMiscService=\u67E5\u627E\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u5DE5\u5382\u65F6\u51FA\u9519; \n\u8BF7\u67E5\u770B META-INF/\u670D\u52A1\u4FE1\u606F\u3002
-
-# Print a notice from the Messager
-apt.note.Messager={0}
-
-##
-## warnings
-##
-
-## All warning messages are preceded by the following string.
-apt.warn.warning=\u8B66\u544A:\u0020
-
-apt.warn.AnnotationsWithoutProcessors=\u4E0D\u5E26\u5904\u7406\u7A0B\u5E8F\u7684\u6CE8\u91CA\u7C7B\u578B: {0}
-
-apt.warn.BadFactory=\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F\u5DE5\u5382\u51FA\u73B0\u9519\u8BEF: {0}
-
-apt.warn.BadParentDirectory=\u65E0\u6CD5\u521B\u5EFA{0}\u7684\u67D0\u4E9B\u7236\u76EE\u5F55
-
-apt.warn.FactoryCantInstantiate=\u65E0\u6CD5\u5B9E\u4F8B\u5316\u5DE5\u5382 ''{0}'' \u7684\u5B9E\u4F8B\u3002
-
-apt.warn.FactoryWrongType=\u6307\u5B9A\u7684\u5DE5\u5382 ''{0}'' \u4E0D\u662F AnnotationProcessorFactory\u3002
-
-apt.warn.FactoryNotFound=\u5728\u641C\u7D22\u8DEF\u5F84\u4E2D\u627E\u4E0D\u5230\u6307\u5B9A\u7684 AnnotationProcessorFactory ''{0}''\u3002
-
-apt.warn.FileReopening=\u5C1D\u8BD5\u591A\u6B21\u521B\u5EFA ''{0}''
-
-apt.warn.IllegalFileName=\u65E0\u6CD5\u521B\u5EFA\u5E26\u6709\u975E\u6CD5\u540D\u79F0 ''{0}'' \u7684\u6587\u4EF6\u3002
-
-apt.warn.MalformedSupportedString=\u5DE5\u5382\u8FD4\u56DE\u683C\u5F0F\u9519\u8BEF\u7684\u6CE8\u91CA\u652F\u6301\u5B57\u7B26\u4E32 ''{0}''\u3002
-
-apt.warn.NoNewFilesAfterRound=\u5FAA\u73AF\u7ED3\u675F\u540E\u65E0\u6CD5\u521B\u5EFA\u6587\u4EF6 ''{0}''\u3002
-
-# Print a warning from the Messager
-apt.warn.Messager={0}
-
-apt.warn.NoAnnotationProcessors=\u627E\u4E0D\u5230\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F, \u4F46\u5B58\u5728\u6CE8\u91CA\u3002
-
-apt.warn.NullProcessor=\u5BF9\u4E8E\u67D0\u4E2A\u6CE8\u91CA\u5904\u7406\u7A0B\u5E8F, \u5DE5\u5382{0}\u8FD4\u56DE\u7684\u503C\u4E3A\u7A7A\u503C\u3002
-
-apt.warn.CorrespondingClassFile=\u5DF2\u521B\u5EFA\u4E0E\u6E90\u6587\u4EF6 ''{0}'' \u76F8\u5BF9\u5E94\u7684\u7C7B\u6587\u4EF6\u3002
-
-apt.warn.CorrespondingSourceFile=\u5DF2\u521B\u5EFA\u4E0E\u7C7B\u6587\u4EF6 ''{0}'' \u76F8\u5BF9\u5E94\u7684\u6E90\u6587\u4EF6\u3002
diff --git a/langtools/src/share/classes/com/sun/tools/apt/util/Bark.java b/langtools/src/share/classes/com/sun/tools/apt/util/Bark.java
deleted file mode 100644
index a6c0c23..0000000
--- a/langtools/src/share/classes/com/sun/tools/apt/util/Bark.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.tools.apt.util;
-
-import com.sun.tools.javac.util.Context;
-import com.sun.tools.javac.util.JCDiagnostic;
-import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition;
-import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.JavacMessages;
-import com.sun.tools.javac.util.Position;
-
-/** A subtype of Log for use in APT.
- *
- * <p><b>This is NOT part of any supported API.
- * If you write code that depends on this, you do so at your own risk.
- * This code and its internal interfaces are subject to change or
- * deletion without notice.</b>
- */
-public class Bark extends Log {
- /** The context key for the bark. */
- protected static final Context.Key<Bark> barkKey =
- new Context.Key<Bark>();
-
- /**
- * Preregisters factories to create and use a Bark object for use as
- * both a Log and a Bark.
- */
- public static void preRegister(Context context) {
- context.put(barkKey, new Context.Factory<Bark>() {
- public Bark make(Context c) {
- return new Bark(c);
- }
- });
- context.put(Log.logKey, new Context.Factory<Log>() {
- public Log make(Context c) {
- return Bark.instance(c);
- }
- });
- }
-
- /** Get the Bark instance for this context. */
- public static Bark instance(Context context) {
- Bark instance = context.get(barkKey);
- if (instance == null)
- instance = new Bark(context);
- return instance;
- }
-
- /** Specifies whether or not to ignore any diagnostics that are reported.
- */
- private boolean ignoreDiagnostics;
-
- /**
- * Factory for APT-specific diagnostics.
- */
- private JCDiagnostic.Factory aptDiags;
-
-
- /**
- * Creates a Bark.
- */
- protected Bark(Context context) {
- super(context); // will register this object in context with Log.logKey
- context.put(barkKey, this);
-
- // register additional resource bundle for APT messages.
- JavacMessages aptMessages = JavacMessages.instance(context);
- aptMessages.add("com.sun.tools.apt.resources.apt");
- aptDiags = new JCDiagnostic.Factory(aptMessages, "apt");
-
- multipleErrors = true;
- }
-
- /**
- * Sets a flag indicating whether or not to ignore all diagnostics.
- * When ignored, they are not reported to the output writers, not are they
- * counted in the various counters.
- * @param b If true, subsequent diagnostics will be ignored.
- * @return the previous state of the flag
- */
- public boolean setDiagnosticsIgnored(boolean b) {
- boolean prev = ignoreDiagnostics;
- ignoreDiagnostics = b;
- return prev;
- }
-
- /**
- * Report a diagnostic if they are not currently being ignored.
- */
- @Override
- public void report(JCDiagnostic diagnostic) {
- if (ignoreDiagnostics)
- return;
-
- super.report(diagnostic);
- }
-
- /** Report an error.
- * @param key The key for the localized error message.
- * @param args Fields of the error message.
- */
- public void aptError(String key, Object... args) {
- aptError(Position.NOPOS, key, args);
- }
-
- /** Report an error, unless another error was already reported at same
- * source position.
- * @param pos The source position at which to report the error.
- * @param key The key for the localized error message.
- * @param args Fields of the error message.
- */
- public void aptError(int pos, String key, Object ... args) {
- report(aptDiags.error(source, new SimpleDiagnosticPosition(pos), key, args));
- }
-
- /** Report a warning, unless suppressed by the -nowarn option or the
- * maximum number of warnings has been reached.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void aptWarning(String key, Object... args) {
- aptWarning(Position.NOPOS, key, args);
- }
-
- /** Report a warning, unless suppressed by the -nowarn option or the
- * maximum number of warnings has been reached.
- * @param pos The source position at which to report the warning.
- * @param key The key for the localized warning message.
- * @param args Fields of the warning message.
- */
- public void aptWarning(int pos, String key, Object ... args) {
- report(aptDiags.warning(source, new SimpleDiagnosticPosition(pos), key, args));
- }
-
- /** Report a note, unless suppressed by the -nowarn option.
- * @param key The key for the localized note message.
- * @param args Fields of the note message.
- */
- public void aptNote(String key, Object... args) {
- aptNote(Position.NOPOS, key, args);
- }
-
- /** Report a note, unless suppressed by the -nowarn option.
- * @param pos The source position at which to report the note.
- * @param key The key for the localized note message.
- * @param args Fields of the note message.
- */
- public void aptNote(int pos, String key, Object ... args) {
- report(aptDiags.note(source, new SimpleDiagnosticPosition(pos), key, args));
- }
-}
diff --git a/langtools/src/share/classes/com/sun/tools/doclets/package.html b/langtools/src/share/classes/com/sun/tools/doclets/package.html
index edd8761..bc5abe1 100644
--- a/langtools/src/share/classes/com/sun/tools/doclets/package.html
+++ b/langtools/src/share/classes/com/sun/tools/doclets/package.html
@@ -1,5 +1,5 @@
<!--
- Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,6 @@
</head>
<body bgcolor="white">
As of JDK version 1.5, replaced by
- {@link com.sun.tools.doclets.internal.toolkit.util}.
+ {@code com.sun.tools.doclets.internal.toolkit.util}.
</body>
</html>
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java b/langtools/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
index 7d474bf..997e343 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/ClientCodeWrapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,8 +31,13 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
import java.net.URI;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -41,26 +46,22 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
+import javax.lang.model.element.Modifier;
import javax.lang.model.element.NestingKind;
import javax.tools.Diagnostic;
+import javax.tools.DiagnosticListener;
import javax.tools.FileObject;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileManager.Location;
import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.ModuleFileManager;
import com.sun.source.util.TaskEvent;
import com.sun.source.util.TaskListener;
import com.sun.tools.javac.util.ClientCodeException;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.JCDiagnostic;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import javax.lang.model.element.Modifier;
-import javax.tools.DiagnosticListener;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.ModuleFileManager;
/**
* Wrap objects to enable unchecked exceptions to be caught and handled.
@@ -164,6 +165,20 @@ public class ClientCodeWrapper {
return new WrappedTaskListener(tl);
}
+ TaskListener unwrap(TaskListener l) {
+ if (l instanceof WrappedTaskListener)
+ return ((WrappedTaskListener) l).clientTaskListener;
+ else
+ return l;
+ }
+
+ Collection<TaskListener> unwrap(Collection<? extends TaskListener> listeners) {
+ Collection<TaskListener> c = new ArrayList<TaskListener>(listeners.size());
+ for (TaskListener l: listeners)
+ c.add(unwrap(l));
+ return c;
+ }
+
@SuppressWarnings("unchecked")
private <T> Diagnostic<T> unwrap(final Diagnostic<T> diagnostic) {
if (diagnostic instanceof JCDiagnostic) {
@@ -185,6 +200,10 @@ public class ClientCodeWrapper {
return trusted;
}
+ private String wrappedToString(Class<?> wrapperClass, Object wrapped) {
+ return wrapperClass.getSimpleName() + "[" + wrapped + "]";
+ }
+
// <editor-fold defaultstate="collapsed" desc="Wrapper classes">
// FIXME: all these classes should be converted to use multi-catch when
@@ -365,6 +384,11 @@ public class ClientCodeWrapper {
throw new ClientCodeException(e);
}
}
+
+ @Override
+ public String toString() {
+ return wrappedToString(getClass(), clientJavaFileManager);
+ }
}
protected class WrappedFileObject implements FileObject {
@@ -490,6 +514,11 @@ public class ClientCodeWrapper {
throw new ClientCodeException(e);
}
}
+
+ @Override
+ public String toString() {
+ return wrappedToString(getClass(), clientFileObject);
+ }
}
protected class WrappedModuleFileManager extends WrappedJavaFileManager implements ModuleFileManager {
protected ModuleFileManager clientModuleFileManager;
@@ -603,6 +632,11 @@ public class ClientCodeWrapper {
throw new ClientCodeException(e);
}
}
+
+ @Override
+ public String toString() {
+ return wrappedToString(getClass(), clientFileObject);
+ }
}
protected class WrappedDiagnosticListener<T /*super JavaFileObject*/> implements DiagnosticListener<T> {
@@ -624,6 +658,11 @@ public class ClientCodeWrapper {
throw new ClientCodeException(e);
}
}
+
+ @Override
+ public String toString() {
+ return wrappedToString(getClass(), clientDiagnosticListener);
+ }
}
public class DiagnosticSourceUnwrapper implements Diagnostic<JavaFileObject> {
@@ -707,6 +746,11 @@ public class ClientCodeWrapper {
throw new ClientCodeException(e);
}
}
+
+ @Override
+ public String toString() {
+ return wrappedToString(getClass(), clientTaskListener);
+ }
}
// </editor-fold>
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
index 24a9412..a9661c7 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* 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 @@ import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.comp.*;
import com.sun.tools.javac.file.JavacFileManager;
import com.sun.tools.javac.main.*;
+import com.sun.tools.javac.main.JavaCompiler;
import com.sun.tools.javac.model.*;
import com.sun.tools.javac.parser.Parser;
import com.sun.tools.javac.parser.ParserFactory;
@@ -51,7 +52,6 @@ import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.List;
-import com.sun.tools.javac.main.JavaCompiler;
/**
* Provides access to functionality specific to the JDK Java Compiler, javac.
@@ -64,18 +64,16 @@ import com.sun.tools.javac.main.JavaCompiler;
* @author Peter von der Ahé
* @author Jonathan Gibbons
*/
-public class JavacTaskImpl extends JavacTask {
+public class JavacTaskImpl extends BasicJavacTask {
private ClientCodeWrapper ccw;
private Main compilerMain;
private JavaCompiler compiler;
private Locale locale;
private String[] args;
private String[] classNames;
- private Context context;
private List<JavaFileObject> fileObjects;
private Map<JavaFileObject, JCCompilationUnit> notYetEntered;
private ListBuffer<Env<AttrContext>> genList;
- private TaskListener taskListener;
private AtomicBoolean used = new AtomicBoolean();
private Iterable<? extends Processor> processors;
@@ -86,6 +84,7 @@ public class JavacTaskImpl extends JavacTask {
String[] classNames,
Context context,
List<JavaFileObject> fileObjects) {
+ super(null, false);
this.ccw = ClientCodeWrapper.instance(context);
this.compilerMain = compilerMain;
this.args = args;
@@ -190,11 +189,7 @@ public class JavacTaskImpl extends JavacTask {
}
private void initContext() {
- context.put(JavacTaskImpl.class, this);
- if (context.get(TaskListener.class) != null)
- context.put(TaskListener.class, (TaskListener)null);
- if (taskListener != null)
- context.put(TaskListener.class, ccw.wrap(taskListener));
+ context.put(JavacTask.class, this);
//initialize compiler's default locale
context.put(Locale.class, locale);
}
@@ -224,10 +219,6 @@ public class JavacTaskImpl extends JavacTask {
return fm.getRegularFile(file);
}
- public void setTaskListener(TaskListener taskListener) {
- this.taskListener = taskListener;
- }
-
/**
* Parse the specified files returning a list of abstract syntax trees.
*
diff --git a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
index 4f0df76..6abb947 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/api/JavacTrees.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
package com.sun.tools.javac.api;
import java.io.IOException;
-import java.util.Map;
+
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.AnnotationValue;
@@ -44,13 +44,14 @@ import com.sun.source.tree.CatchTree;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.tree.Scope;
import com.sun.source.tree.Tree;
+import com.sun.source.util.JavacTask;
import com.sun.source.util.SourcePositions;
import com.sun.source.util.TreePath;
import com.sun.source.util.Trees;
import com.sun.tools.javac.code.Flags;
+import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.TypeSymbol;
-import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Type.UnionClassType;
import com.sun.tools.javac.comp.Attr;
import com.sun.tools.javac.comp.AttrContext;
@@ -61,8 +62,8 @@ import com.sun.tools.javac.comp.Resolve;
import com.sun.tools.javac.model.JavacElements;
import com.sun.tools.javac.parser.EndPosTable;
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
-import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.tree.JCTree;
+import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.tree.TreeCopier;
import com.sun.tools.javac.tree.TreeInfo;
import com.sun.tools.javac.tree.TreeMaker;
@@ -95,12 +96,14 @@ public class JavacTrees extends Trees {
private JavacElements elements;
private JavacTaskImpl javacTaskImpl;
+ // called reflectively from Trees.instance(CompilationTask task)
public static JavacTrees instance(JavaCompiler.CompilationTask task) {
if (!(task instanceof JavacTaskImpl))
throw new IllegalArgumentException();
return instance(((JavacTaskImpl)task).getContext());
}
+ // called reflectively from Trees.instance(ProcessingEnvironment env)
public static JavacTrees instance(ProcessingEnvironment env) {
if (!(env instanceof JavacProcessingEnvironment))
throw new IllegalArgumentException();
@@ -131,7 +134,10 @@ public class JavacTrees extends Trees {
resolve = Resolve.instance(context);
treeMaker = TreeMaker.instance(context);
memberEnter = MemberEnter.instance(context);
- javacTaskImpl = context.get(JavacTaskImpl.class);
+
+ JavacTask t = context.get(JavacTask.class);
+ if (t instanceof JavacTaskImpl)
+ javacTaskImpl = (JavacTaskImpl) t;
}
public SourcePositions getSourcePositions() {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
index 8e73ce3..2d584f1 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symbol.java
@@ -1411,7 +1411,7 @@ public abstract class Symbol implements Element {
// if origin is derived from a raw type, we might have missed
// an implementation because we do not know enough about instantiations.
// in this case continue with the supertype as origin.
- if (types.isDerivedRaw(origin.type))
+ if (types.isDerivedRaw(origin.type) && !origin.isInterface())
return implementation(types.supertype(origin.type).tsym, types, checkResult);
else
return null;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
index 394bf6f..e9c2fef 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/code/Symtab.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -134,6 +134,7 @@ public class Symtab {
public final Type cloneableType;
public final Type serializableType;
public final Type methodHandleType;
+ public final Type nativeHeaderType;
public final Type polymorphicSignatureType;
public final Type throwableType;
public final Type errorType;
@@ -493,6 +494,7 @@ public class Symtab {
List.of(exceptionType), methodClass),
autoCloseableType.tsym);
trustMeType = enterClass("java.lang.SafeVarargs");
+ nativeHeaderType = enterClass("javax.tools.annotation.GenerateNativeHeader");
synthesizeEmptyInterfaceIfMissing(autoCloseableType);
synthesizeEmptyInterfaceIfMissing(cloneableType);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
index 91a23eb..e51679e 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -208,16 +208,15 @@ public class Attr extends JCTree.Visitor {
* @param tree The tree whose kind and type is checked
* @param owntype The computed type of the tree
* @param ownkind The computed kind of the tree
- * @param pkind The expected kind (or: protokind) of the tree
- * @param pt The expected type (or: prototype) of the tree
+ * @param resultInfo The expected result of the tree
*/
- Type check(JCTree tree, Type owntype, int ownkind, int pkind, Type pt) {
- if (owntype.tag != ERROR && pt.tag != METHOD && pt.tag != FORALL) {
- if ((ownkind & ~pkind) == 0) {
- owntype = chk.checkType(tree.pos(), owntype, pt, errKey);
+ Type check(JCTree tree, Type owntype, int ownkind, ResultInfo resultInfo) {
+ if (owntype.tag != ERROR && resultInfo.pt.tag != METHOD && resultInfo.pt.tag != FORALL) {
+ if ((ownkind & ~resultInfo.pkind) == 0) {
+ owntype = chk.checkType(tree.pos(), owntype, resultInfo.pt, errKey);
} else {
log.error(tree.pos(), "unexpected.type",
- kindNames(pkind),
+ kindNames(resultInfo.pkind),
kindName(ownkind));
owntype = types.createErrorType(owntype);
}
@@ -342,7 +341,16 @@ public class Attr extends JCTree.Visitor {
public Type attribType(JCTree node, TypeSymbol sym) {
Env<AttrContext> env = enter.typeEnvs.get(sym);
Env<AttrContext> localEnv = env.dup(node, env.info.dup());
- return attribTree(node, localEnv, Kinds.TYP, Type.noType);
+ return attribTree(node, localEnv, unknownTypeInfo);
+ }
+
+ public Type attribImportQualifier(JCImport tree, Env<AttrContext> env) {
+ // Attribute qualifying package or class.
+ JCFieldAccess s = (JCFieldAccess)tree.qualid;
+ return attribTree(s.selected,
+ env,
+ new ResultInfo(tree.staticImport ? TYP : (TYP | PCK),
+ Type.noType));
}
public Env<AttrContext> attribExprToTree(JCTree expr, Env<AttrContext> env, JCTree tree) {
@@ -395,6 +403,28 @@ public class Attr extends JCTree.Visitor {
}
}
+ static class ResultInfo {
+ int pkind;
+ Type pt;
+
+ ResultInfo(int pkind, Type pt) {
+ this.pkind = pkind;
+ this.pt = pt;
+ }
+ }
+
+ private final ResultInfo statInfo = new ResultInfo(NIL, Type.noType);
+ private final ResultInfo varInfo = new ResultInfo(VAR, Type.noType);
+ private final ResultInfo unknownExprInfo = new ResultInfo(VAL, Type.noType);
+ private final ResultInfo unknownTypeInfo = new ResultInfo(TYP, Type.noType);
+
+ Type pt() {
+ return resultInfo.pt;
+ }
+
+ int pkind() {
+ return resultInfo.pkind;
+ }
/* ************************************************************************
* Visitor methods
@@ -404,13 +434,9 @@ public class Attr extends JCTree.Visitor {
*/
Env<AttrContext> env;
- /** Visitor argument: the currently expected proto-kind.
+ /** Visitor argument: the currently expected attribution result.
*/
- int pkind;
-
- /** Visitor argument: the currently expected proto-type.
- */
- Type pt;
+ ResultInfo resultInfo;
/** Visitor argument: the error key to be generated when a type error occurs
*/
@@ -425,22 +451,19 @@ public class Attr extends JCTree.Visitor {
*
* @param tree The tree to be visited.
* @param env The environment visitor argument.
- * @param pkind The protokind visitor argument.
- * @param pt The prototype visitor argument.
+ * @param resultInfo The result info visitor argument.
*/
- Type attribTree(JCTree tree, Env<AttrContext> env, int pkind, Type pt) {
- return attribTree(tree, env, pkind, pt, "incompatible.types");
+ private Type attribTree(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) {
+ return attribTree(tree, env, resultInfo, "incompatible.types");
}
- Type attribTree(JCTree tree, Env<AttrContext> env, int pkind, Type pt, String errKey) {
+ private Type attribTree(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo, String errKey) {
Env<AttrContext> prevEnv = this.env;
- int prevPkind = this.pkind;
- Type prevPt = this.pt;
+ ResultInfo prevResult = this.resultInfo;
String prevErrKey = this.errKey;
try {
this.env = env;
- this.pkind = pkind;
- this.pt = pt;
+ this.resultInfo = resultInfo;
this.errKey = errKey;
tree.accept(this);
if (tree == breakTree)
@@ -451,8 +474,7 @@ public class Attr extends JCTree.Visitor {
return chk.completionError(tree.pos(), ex);
} finally {
this.env = prevEnv;
- this.pkind = prevPkind;
- this.pt = prevPt;
+ this.resultInfo = prevResult;
this.errKey = prevErrKey;
}
}
@@ -460,18 +482,18 @@ public class Attr extends JCTree.Visitor {
/** Derived visitor method: attribute an expression tree.
*/
public Type attribExpr(JCTree tree, Env<AttrContext> env, Type pt) {
- return attribTree(tree, env, VAL, pt.tag != ERROR ? pt : Type.noType);
+ return attribExpr(tree, env, pt, "incompatible.types");
}
public Type attribExpr(JCTree tree, Env<AttrContext> env, Type pt, String key) {
- return attribTree(tree, env, VAL, pt.tag != ERROR ? pt : Type.noType, key);
+ return attribTree(tree, env, new ResultInfo(VAL, pt.tag != ERROR ? pt : Type.noType), key);
}
/** Derived visitor method: attribute an expression tree with
* no constraints on the computed type.
*/
Type attribExpr(JCTree tree, Env<AttrContext> env) {
- return attribTree(tree, env, VAL, Type.noType);
+ return attribTree(tree, env, unknownExprInfo);
}
/** Derived visitor method: attribute a type tree.
@@ -484,14 +506,14 @@ public class Attr extends JCTree.Visitor {
/** Derived visitor method: attribute a type tree.
*/
Type attribType(JCTree tree, Env<AttrContext> env, Type pt) {
- Type result = attribTree(tree, env, TYP, pt);
+ Type result = attribTree(tree, env, new ResultInfo(TYP, pt));
return result;
}
/** Derived visitor method: attribute a statement or definition tree.
*/
public Type attribStat(JCTree tree, Env<AttrContext> env) {
- return attribTree(tree, env, NIL, Type.noType);
+ return attribTree(tree, env, statInfo);
}
/** Attribute a list of expressions, returning a list of types.
@@ -516,7 +538,7 @@ public class Attr extends JCTree.Visitor {
ListBuffer<Type> argtypes = new ListBuffer<Type>();
for (List<JCExpression> l = trees; l.nonEmpty(); l = l.tail)
argtypes.append(chk.checkNonVoid(
- l.head.pos(), types.upperBound(attribTree(l.head, env, VAL, Infer.anyPoly))));
+ l.head.pos(), types.upperBound(attribExpr(l.head, env, Infer.anyPoly))));
return argtypes.toList();
}
@@ -1160,7 +1182,8 @@ public class Attr extends JCTree.Visitor {
void checkAutoCloseable(DiagnosticPosition pos, Env<AttrContext> env, Type resource) {
if (!resource.isErroneous() &&
- types.asSuper(resource, syms.autoCloseableType.tsym) != null) {
+ types.asSuper(resource, syms.autoCloseableType.tsym) != null &&
+ !types.isSameType(resource, syms.autoCloseableType)) { // Don't emit warning for AutoCloseable itself
Symbol close = syms.noSymbol;
boolean prevDeferDiags = log.deferDiagnostics;
Queue<JCDiagnostic> prevDeferredDiags = log.deferredDiagnostics;
@@ -1194,7 +1217,7 @@ public class Attr extends JCTree.Visitor {
result = check(tree,
capture(condType(tree.pos(), tree.cond.type,
tree.truepart.type, tree.falsepart.type)),
- VAL, pkind, pt);
+ VAL, resultInfo);
}
//where
/** Compute the type of a conditional expression, after
@@ -1513,8 +1536,8 @@ public class Attr extends JCTree.Visitor {
// ...and check that it is legal in the current context.
// (this will also set the tree's type)
Type mpt = newMethTemplate(argtypes, typeargtypes);
- checkId(tree.meth, site, sym, localEnv, MTH,
- mpt, tree.varargsElement != null);
+ checkId(tree.meth, site, sym, localEnv, new ResultInfo(MTH, mpt),
+ tree.varargsElement != null);
}
// Otherwise, `site' is an error type and we do nothing
}
@@ -1531,8 +1554,6 @@ public class Attr extends JCTree.Visitor {
Type mpt = newMethTemplate(argtypes, typeargtypes);
localEnv.info.varArgs = false;
Type mtype = attribExpr(tree.meth, localEnv, mpt);
- if (localEnv.info.varArgs)
- Assert.check(mtype.isErroneous() || tree.varargsElement != null);
// Compute the result type.
Type restype = mtype.getReturnType();
@@ -1565,7 +1586,10 @@ public class Attr extends JCTree.Visitor {
// Check that value of resulting type is admissible in the
// current context. Also, capture the return type
- result = check(tree, capture(restype), VAL, pkind, pt);
+ result = check(tree, capture(restype), VAL, resultInfo);
+
+ if (localEnv.info.varArgs)
+ Assert.check(result.isErroneous() || tree.varargsElement != null);
}
chk.validate(tree.typeargs, localEnv);
}
@@ -1640,7 +1664,6 @@ public class Attr extends JCTree.Visitor {
// Attribute clazz expression and store
// symbol + type back into the attributed tree.
Type clazztype = attribType(clazz, env);
- Pair<Scope,Scope> mapping = getSyntheticScopeMapping(clazztype);
clazztype = chk.checkDiamond(tree, clazztype);
chk.validate(clazz, localEnv);
if (tree.encl != null) {
@@ -1667,7 +1690,7 @@ public class Attr extends JCTree.Visitor {
List<Type> typeargtypes = attribTypes(tree.typeargs, localEnv);
if (TreeInfo.isDiamond(tree) && !clazztype.isErroneous()) {
- clazztype = attribDiamond(localEnv, tree, clazztype, mapping, argtypes, typeargtypes);
+ clazztype = attribDiamond(localEnv, tree, clazztype, argtypes, typeargtypes);
clazz.type = clazztype;
} else if (allowDiamondFinder &&
tree.def == null &&
@@ -1684,7 +1707,6 @@ public class Attr extends JCTree.Visitor {
inferred = attribDiamond(localEnv,
tree,
clazztype,
- mapping,
argtypes,
typeargtypes);
}
@@ -1695,7 +1717,7 @@ public class Attr extends JCTree.Visitor {
if (inferred != null &&
!inferred.isErroneous() &&
inferred.tag == CLASS &&
- types.isAssignable(inferred, pt.tag == NONE ? clazztype : pt, Warner.noWarnings)) {
+ types.isAssignable(inferred, pt().tag == NONE ? clazztype : pt(), Warner.noWarnings)) {
String key = types.isSameType(clazztype, inferred) ?
"diamond.redundant.args" :
"diamond.redundant.args.1";
@@ -1745,7 +1767,7 @@ public class Attr extends JCTree.Visitor {
tree.pos(), rsEnv, clazztype, argtypes, typeargtypes);
tree.constructorType = tree.constructor.type.isErroneous() ?
syms.errType :
- checkMethod(clazztype,
+ checkConstructor(clazztype,
tree.constructor,
rsEnv,
tree.args,
@@ -1820,7 +1842,7 @@ public class Attr extends JCTree.Visitor {
tree.constructorType = syms.errType;
}
else {
- tree.constructorType = checkMethod(clazztype,
+ tree.constructorType = checkConstructor(clazztype,
tree.constructor,
localEnv,
tree.args,
@@ -1833,19 +1855,17 @@ public class Attr extends JCTree.Visitor {
if (tree.constructor != null && tree.constructor.kind == MTH)
owntype = clazztype;
}
- result = check(tree, owntype, VAL, pkind, pt);
+ result = check(tree, owntype, VAL, resultInfo);
chk.validate(tree.typeargs, localEnv);
}
Type attribDiamond(Env<AttrContext> env,
JCNewClass tree,
Type clazztype,
- Pair<Scope, Scope> mapping,
List<Type> argtypes,
List<Type> typeargtypes) {
if (clazztype.isErroneous() ||
- clazztype.isInterface() ||
- mapping == erroneousMapping) {
+ clazztype.isInterface()) {
//if the type of the instance creation expression is erroneous,
//or if it's an interface, or if something prevented us to form a valid
//mapping, return the (possibly erroneous) type unchanged
@@ -1854,27 +1874,22 @@ public class Attr extends JCTree.Visitor {
//dup attribution environment and augment the set of inference variables
Env<AttrContext> localEnv = env.dup(tree);
- localEnv.info.tvars = clazztype.tsym.type.getTypeArguments();
+
+ ClassType site = new ClassType(clazztype.getEnclosingType(),
+ clazztype.tsym.type.getTypeArguments(),
+ clazztype.tsym);
//if the type of the instance creation expression is a class type
//apply method resolution inference (JLS 15.12.2.7). The return type
//of the resolved constructor will be a partially instantiated type
- ((ClassSymbol) clazztype.tsym).members_field = mapping.snd;
- Symbol constructor;
- try {
- constructor = rs.resolveDiamond(tree.pos(),
+ Symbol constructor = rs.resolveDiamond(tree.pos(),
localEnv,
- clazztype,
+ site,
argtypes,
typeargtypes);
- } finally {
- ((ClassSymbol) clazztype.tsym).members_field = mapping.fst;
- }
+
if (constructor.kind == MTH) {
- ClassType ct = new ClassType(clazztype.getEnclosingType(),
- clazztype.tsym.type.getTypeArguments(),
- clazztype.tsym);
- clazztype = checkMethod(ct,
+ clazztype = checkMethod(site,
constructor,
localEnv,
tree.args,
@@ -1885,13 +1900,13 @@ public class Attr extends JCTree.Visitor {
clazztype = syms.errType;
}
- if (clazztype.tag == FORALL && !pt.isErroneous()) {
+ if (clazztype.tag == FORALL && !pt().isErroneous()) {
//if the resolved constructor's return type has some uninferred
//type-variables, infer them using the expected type and declared
//bounds (JLS 15.12.2.8).
try {
clazztype = infer.instantiateExpr((ForAll) clazztype,
- pt.tag == NONE ? syms.objectType : pt,
+ pt().tag == NONE ? syms.objectType : pt(),
Warner.noWarnings);
} catch (Infer.InferenceException ex) {
//an error occurred while inferring uninstantiated type-variables
@@ -1906,42 +1921,6 @@ public class Attr extends JCTree.Visitor {
true);
}
- /** Creates a synthetic scope containing fake generic constructors.
- * Assuming that the original scope contains a constructor of the kind:
- * Foo(X x, Y y), where X,Y are class type-variables declared in Foo,
- * the synthetic scope is added a generic constructor of the kind:
- * <X,Y>Foo<X,Y>(X x, Y y). This is crucial in order to enable diamond
- * inference. The inferred return type of the synthetic constructor IS
- * the inferred type for the diamond operator.
- */
- private Pair<Scope, Scope> getSyntheticScopeMapping(Type ctype) {
- if (ctype.tag != CLASS) {
- return erroneousMapping;
- }
-
- Pair<Scope, Scope> mapping =
- new Pair<Scope, Scope>(ctype.tsym.members(), new Scope(ctype.tsym));
-
- //for each constructor in the original scope, create a synthetic constructor
- //whose return type is the type of the class in which the constructor is
- //declared, and insert it into the new scope.
- for (Scope.Entry e = mapping.fst.lookup(names.init);
- e.scope != null;
- e = e.next()) {
- Type synthRestype = new ClassType(ctype.getEnclosingType(),
- ctype.tsym.type.getTypeArguments(),
- ctype.tsym);
- MethodSymbol synhConstr = new MethodSymbol(e.sym.flags(),
- names.init,
- types.createMethodTypeWithReturn(e.sym.type, synthRestype),
- e.sym.owner);
- mapping.snd.enter(synhConstr);
- }
- return mapping;
- }
-
- private final Pair<Scope,Scope> erroneousMapping = new Pair<Scope,Scope>(null, null);
-
/** Make an attributed null check tree.
*/
public JCExpression makeNullCheck(JCExpression arg) {
@@ -1970,14 +1949,14 @@ public class Attr extends JCTree.Visitor {
} else {
// we are seeing an untyped aggregate { ... }
// this is allowed only if the prototype is an array
- if (pt.tag == ARRAY) {
- elemtype = types.elemtype(pt);
+ if (pt().tag == ARRAY) {
+ elemtype = types.elemtype(pt());
} else {
- if (pt.tag != ERROR) {
+ if (pt().tag != ERROR) {
log.error(tree.pos(), "illegal.initializer.for.type",
- pt);
+ pt());
}
- elemtype = types.createErrorType(pt);
+ elemtype = types.createErrorType(pt());
}
}
if (tree.elems != null) {
@@ -1986,7 +1965,7 @@ public class Attr extends JCTree.Visitor {
}
if (!types.isReifiable(elemtype))
log.error(tree.pos(), "generic.array.creation");
- result = check(tree, owntype, VAL, pkind, pt);
+ result = check(tree, owntype, VAL, resultInfo);
}
@Override
@@ -2000,23 +1979,23 @@ public class Attr extends JCTree.Visitor {
}
public void visitParens(JCParens tree) {
- Type owntype = attribTree(tree.expr, env, pkind, pt);
- result = check(tree, owntype, pkind, pkind, pt);
+ Type owntype = attribTree(tree.expr, env, resultInfo);
+ result = check(tree, owntype, pkind(), resultInfo);
Symbol sym = TreeInfo.symbol(tree);
if (sym != null && (sym.kind&(TYP|PCK)) != 0)
log.error(tree.pos(), "illegal.start.of.type");
}
public void visitAssign(JCAssign tree) {
- Type owntype = attribTree(tree.lhs, env.dup(tree), VAR, Type.noType);
+ Type owntype = attribTree(tree.lhs, env.dup(tree), varInfo);
Type capturedType = capture(owntype);
attribExpr(tree.rhs, env, owntype);
- result = check(tree, capturedType, VAL, pkind, pt);
+ result = check(tree, capturedType, VAL, resultInfo);
}
public void visitAssignop(JCAssignOp tree) {
// Attribute arguments.
- Type owntype = attribTree(tree.lhs, env, VAR, Type.noType);
+ Type owntype = attribTree(tree.lhs, env, varInfo);
Type operand = attribExpr(tree.rhs, env);
// Find operator.
Symbol operator = tree.operator = rs.resolveBinaryOperator(
@@ -2036,13 +2015,13 @@ public class Attr extends JCTree.Visitor {
operator.type.getReturnType(),
owntype);
}
- result = check(tree, owntype, VAL, pkind, pt);
+ result = check(tree, owntype, VAL, resultInfo);
}
public void visitUnary(JCUnary tree) {
// Attribute arguments.
Type argtype = (tree.getTag().isIncOrDecUnaryOp())
- ? attribTree(tree.arg, env, VAR, Type.noType)
+ ? attribTree(tree.arg, env, varInfo)
: chk.checkNonVoid(tree.arg.pos(), attribExpr(tree.arg, env));
// Find operator.
@@ -2074,7 +2053,7 @@ public class Attr extends JCTree.Visitor {
}
}
}
- result = check(tree, owntype, VAL, pkind, pt);
+ result = check(tree, owntype, VAL, resultInfo);
}
public void visitBinary(JCBinary tree) {
@@ -2127,7 +2106,7 @@ public class Attr extends JCTree.Visitor {
chk.checkDivZero(tree.rhs.pos(), operator, right);
}
- result = check(tree, owntype, VAL, pkind, pt);
+ result = check(tree, owntype, VAL, resultInfo);
}
public void visitTypeCast(JCTypeCast tree) {
@@ -2140,7 +2119,7 @@ public class Attr extends JCTree.Visitor {
Type owntype = chk.checkCastable(tree.expr.pos(), exprtype, clazztype);
if (exprtype.constValue() != null)
owntype = cfolder.coerce(exprtype, owntype);
- result = check(tree, capture(owntype), VAL, pkind, pt);
+ result = check(tree, capture(owntype), VAL, resultInfo);
}
public void visitTypeTest(JCInstanceOf tree) {
@@ -2150,7 +2129,7 @@ public class Attr extends JCTree.Visitor {
tree.clazz.pos(), attribType(tree.clazz, env));
chk.validate(tree.clazz, env, false);
chk.checkCastable(tree.expr.pos(), exprtype, clazztype);
- result = check(tree, syms.booleanType, VAL, pkind, pt);
+ result = check(tree, syms.booleanType, VAL, resultInfo);
}
public void visitIndexed(JCArrayAccess tree) {
@@ -2161,8 +2140,8 @@ public class Attr extends JCTree.Visitor {
owntype = types.elemtype(atype);
else if (atype.tag != ERROR)
log.error(tree.pos(), "array.req.but.found", atype);
- if ((pkind & VAR) == 0) owntype = capture(owntype);
- result = check(tree, owntype, VAR, pkind, pt);
+ if ((pkind() & VAR) == 0) owntype = capture(owntype);
+ result = check(tree, owntype, VAR, resultInfo);
}
public void visitIdent(JCIdent tree) {
@@ -2170,16 +2149,16 @@ public class Attr extends JCTree.Visitor {
boolean varArgs = false;
// Find symbol
- if (pt.tag == METHOD || pt.tag == FORALL) {
+ if (pt().tag == METHOD || pt().tag == FORALL) {
// If we are looking for a method, the prototype `pt' will be a
// method type with the type of the call's arguments as parameters.
env.info.varArgs = false;
- sym = rs.resolveMethod(tree.pos(), env, tree.name, pt.getParameterTypes(), pt.getTypeArguments());
+ sym = rs.resolveMethod(tree.pos(), env, tree.name, pt().getParameterTypes(), pt().getTypeArguments());
varArgs = env.info.varArgs;
} else if (tree.sym != null && tree.sym.kind != VAR) {
sym = tree.sym;
} else {
- sym = rs.resolveIdent(tree.pos(), env, tree.name, pkind);
+ sym = rs.resolveIdent(tree.pos(), env, tree.name, pkind());
}
tree.sym = sym;
@@ -2226,7 +2205,7 @@ public class Attr extends JCTree.Visitor {
// If we are expecting a variable (as opposed to a value), check
// that the variable is assignable in the current environment.
- if (pkind == VAR)
+ if (pkind() == VAR)
checkAssignable(tree.pos(), v, null, env);
}
@@ -2247,7 +2226,7 @@ public class Attr extends JCTree.Visitor {
while (env1.outer != null && !rs.isAccessible(env, env1.enclClass.sym.type, sym))
env1 = env1.outer;
}
- result = checkId(tree, env1.enclClass.sym.type, sym, env, pkind, pt, varArgs);
+ result = checkId(tree, env1.enclClass.sym.type, sym, env, resultInfo, varArgs);
}
public void visitSelect(JCFieldAccess tree) {
@@ -2258,14 +2237,14 @@ public class Attr extends JCTree.Visitor {
{
skind = TYP;
} else {
- if ((pkind & PCK) != 0) skind = skind | PCK;
- if ((pkind & TYP) != 0) skind = skind | TYP | PCK;
- if ((pkind & (VAL | MTH)) != 0) skind = skind | VAL | TYP;
+ if ((pkind() & PCK) != 0) skind = skind | PCK;
+ if ((pkind() & TYP) != 0) skind = skind | TYP | PCK;
+ if ((pkind() & (VAL | MTH)) != 0) skind = skind | VAL | TYP;
}
// Attribute the qualifier expression, and determine its symbol (if any).
- Type site = attribTree(tree.selected, env, skind, Infer.anyPoly);
- if ((pkind & (PCK | TYP)) == 0)
+ Type site = attribTree(tree.selected, env, new ResultInfo(skind, Infer.anyPoly));
+ if ((pkind() & (PCK | TYP)) == 0)
site = capture(site); // Capture field access
// don't allow T.class T[].class, etc
@@ -2300,10 +2279,10 @@ public class Attr extends JCTree.Visitor {
// Determine the symbol represented by the selection.
env.info.varArgs = false;
- Symbol sym = selectSym(tree, sitesym, site, env, pt, pkind);
- if (sym.exists() && !isType(sym) && (pkind & (PCK | TYP)) != 0) {
+ Symbol sym = selectSym(tree, sitesym, site, env, resultInfo);
+ if (sym.exists() && !isType(sym) && (pkind() & (PCK | TYP)) != 0) {
site = capture(site);
- sym = selectSym(tree, sitesym, site, env, pt, pkind);
+ sym = selectSym(tree, sitesym, site, env, resultInfo);
}
boolean varArgs = env.info.varArgs;
tree.sym = sym;
@@ -2323,7 +2302,7 @@ public class Attr extends JCTree.Visitor {
// If we are expecting a variable (as opposed to a value), check
// that the variable is assignable in the current environment.
- if (pkind == VAR)
+ if (pkind() == VAR)
checkAssignable(tree.pos(), v, tree.selected, env);
}
@@ -2339,8 +2318,8 @@ public class Attr extends JCTree.Visitor {
// Disallow selecting a type from an expression
if (isType(sym) && (sitesym==null || (sitesym.kind&(TYP|PCK)) == 0)) {
- tree.type = check(tree.selected, pt,
- sitesym == null ? VAL : sitesym.kind, TYP|PCK, pt);
+ tree.type = check(tree.selected, pt(),
+ sitesym == null ? VAL : sitesym.kind, new ResultInfo(TYP|PCK, pt()));
}
if (isType(sitesym)) {
@@ -2380,7 +2359,7 @@ public class Attr extends JCTree.Visitor {
}
env.info.selectSuper = selectSuperPrev;
- result = checkId(tree, site, sym, env, pkind, pt, varArgs);
+ result = checkId(tree, site, sym, env, resultInfo, varArgs);
env.info.tvars = List.nil();
}
//where
@@ -2389,34 +2368,25 @@ public class Attr extends JCTree.Visitor {
* @param tree The select tree.
* @param site The type of the selected expression,
* @param env The current environment.
- * @param pt The current prototype.
- * @param pkind The expected kind(s) of the Select expression.
+ * @param resultInfo The current result.
*/
private Symbol selectSym(JCFieldAccess tree,
- Type site,
- Env<AttrContext> env,
- Type pt,
- int pkind) {
- return selectSym(tree, site.tsym, site, env, pt, pkind);
- }
- private Symbol selectSym(JCFieldAccess tree,
Symbol location,
Type site,
Env<AttrContext> env,
- Type pt,
- int pkind) {
+ ResultInfo resultInfo) {
DiagnosticPosition pos = tree.pos();
Name name = tree.name;
switch (site.tag) {
case PACKAGE:
return rs.access(
- rs.findIdentInPackage(env, site.tsym, name, pkind),
+ rs.findIdentInPackage(env, site.tsym, name, resultInfo.pkind),
pos, location, site, name, true);
case ARRAY:
case CLASS:
- if (pt.tag == METHOD || pt.tag == FORALL) {
+ if (resultInfo.pt.tag == METHOD || resultInfo.pt.tag == FORALL) {
return rs.resolveQualifiedMethod(
- pos, env, location, site, name, pt.getParameterTypes(), pt.getTypeArguments());
+ pos, env, location, site, name, resultInfo.pt.getParameterTypes(), resultInfo.pt.getTypeArguments());
} else if (name == names._this || name == names._super) {
return rs.resolveSelf(pos, env, site.tsym, name);
} else if (name == names._class) {
@@ -2431,8 +2401,8 @@ public class Attr extends JCTree.Visitor {
STATIC | PUBLIC | FINAL, names._class, t, site.tsym);
} else {
// We are seeing a plain identifier as selector.
- Symbol sym = rs.findIdentInType(env, site, name, pkind);
- if ((pkind & ERRONEOUS) == 0)
+ Symbol sym = rs.findIdentInType(env, site, name, resultInfo.pkind);
+ if ((resultInfo.pkind & ERRONEOUS) == 0)
sym = rs.access(sym, pos, location, site, name, true);
return sym;
}
@@ -2446,7 +2416,7 @@ public class Attr extends JCTree.Visitor {
// other words, we are seeing this illegal program:
// class B<T> extends A<T.foo> {}
Symbol sym = (site.getUpperBound() != null)
- ? selectSym(tree, location, capture(site.getUpperBound()), env, pt, pkind)
+ ? selectSym(tree, location, capture(site.getUpperBound()), env, resultInfo)
: null;
if (sym == null) {
log.error(pos, "type.var.cant.be.deref");
@@ -2500,17 +2470,15 @@ public class Attr extends JCTree.Visitor {
* expression, otherwise the type of the current class.
* @param sym The symbol representing the identifier.
* @param env The current environment.
- * @param pkind The set of expected kinds.
- * @param pt The expected type.
+ * @param resultInfo The expected result
*/
Type checkId(JCTree tree,
Type site,
Symbol sym,
Env<AttrContext> env,
- int pkind,
- Type pt,
+ ResultInfo resultInfo,
boolean useVarargs) {
- if (pt.isErroneous()) return types.createErrorType(site);
+ if (resultInfo.pt.isErroneous()) return types.createErrorType(site);
Type owntype; // The computed type of this identifier occurrence.
switch (sym.kind) {
case TYP:
@@ -2555,7 +2523,7 @@ public class Attr extends JCTree.Visitor {
// which is being assigned to, issue an unchecked warning if
// its type changes under erasure.
if (allowGenerics &&
- pkind == VAR &&
+ resultInfo.pkind == VAR &&
v.owner.kind == TYP &&
(v.flags() & STATIC) == 0 &&
(site.tag == CLASS || site.tag == TYPEVAR)) {
@@ -2590,14 +2558,14 @@ public class Attr extends JCTree.Visitor {
if (v.getConstValue() != null && isStaticReference(tree))
owntype = owntype.constType(v.getConstValue());
- if (pkind == VAL) {
+ if (resultInfo.pkind == VAL) {
owntype = capture(owntype); // capture "names as expressions"
}
break;
case MTH: {
JCMethodInvocation app = (JCMethodInvocation)env.tree;
owntype = checkMethod(site, sym, env, app.args,
- pt.getParameterTypes(), pt.getTypeArguments(),
+ resultInfo.pt.getParameterTypes(), resultInfo.pt.getTypeArguments(),
env.info.varArgs);
break;
}
@@ -2620,7 +2588,7 @@ public class Attr extends JCTree.Visitor {
// Test (3): if symbol is a variable, check that its type and
// kind are compatible with the prototype and protokind.
- return check(tree, owntype, sym.kind, pkind, pt);
+ return check(tree, owntype, sym.kind, resultInfo);
}
/** Check that variable is initialized and evaluate the variable's
@@ -2733,7 +2701,7 @@ public class Attr extends JCTree.Visitor {
Warner noteWarner = new Warner();
/**
- * Check that method arguments conform to its instantation.
+ * Check that method arguments conform to its instantiation.
**/
public Type checkMethod(Type site,
Symbol sym,
@@ -2770,112 +2738,44 @@ public class Attr extends JCTree.Visitor {
true,
useVarargs,
noteWarner);
- boolean warned = noteWarner.hasNonSilentLint(LintCategory.UNCHECKED);
+
+ boolean unchecked = noteWarner.hasNonSilentLint(LintCategory.UNCHECKED);
// If this fails, something went wrong; we should not have
// found the identifier in the first place.
if (owntype == null) {
- if (!pt.isErroneous())
+ if (!pt().isErroneous())
log.error(env.tree.pos(),
- "internal.error.cant.instantiate",
- sym, site,
- Type.toString(pt.getParameterTypes()));
+ "internal.error.cant.instantiate",
+ sym, site,
+ Type.toString(pt().getParameterTypes()));
owntype = types.createErrorType(site);
+ return types.createErrorType(site);
+ } else if (owntype.getReturnType().tag == FORALL && !unchecked) {
+ return owntype;
} else {
- // System.out.println("call : " + env.tree);
- // System.out.println("method : " + owntype);
- // System.out.println("actuals: " + argtypes);
- List<Type> formals = owntype.getParameterTypes();
- Type last = useVarargs ? formals.last() : null;
- if (sym.name==names.init &&
- sym.owner == syms.enumSym)
- formals = formals.tail.tail;
- List<JCExpression> args = argtrees;
- while (formals.head != last) {
- JCTree arg = args.head;
- Warner warn = chk.convertWarner(arg.pos(), arg.type, formals.head);
- assertConvertible(arg, arg.type, formals.head, warn);
- warned |= warn.hasNonSilentLint(LintCategory.UNCHECKED);
- args = args.tail;
- formals = formals.tail;
- }
- if (useVarargs) {
- Type varArg = types.elemtype(last);
- while (args.tail != null) {
- JCTree arg = args.head;
- Warner warn = chk.convertWarner(arg.pos(), arg.type, varArg);
- assertConvertible(arg, arg.type, varArg, warn);
- warned |= warn.hasNonSilentLint(LintCategory.UNCHECKED);
- args = args.tail;
- }
- } else if ((sym.flags() & VARARGS) != 0 && allowVarargs) {
- // non-varargs call to varargs method
- Type varParam = owntype.getParameterTypes().last();
- Type lastArg = argtypes.last();
- if (types.isSubtypeUnchecked(lastArg, types.elemtype(varParam)) &&
- !types.isSameType(types.erasure(varParam), types.erasure(lastArg)))
- log.warning(argtrees.last().pos(), "inexact.non-varargs.call",
- types.elemtype(varParam),
- varParam);
- }
-
- if (warned && sym.type.tag == FORALL) {
- chk.warnUnchecked(env.tree.pos(),
- "unchecked.meth.invocation.applied",
- kindName(sym),
- sym.name,
- rs.methodArguments(sym.type.getParameterTypes()),
- rs.methodArguments(argtypes),
- kindName(sym.location()),
- sym.location());
- owntype = new MethodType(owntype.getParameterTypes(),
- types.erasure(owntype.getReturnType()),
- types.erasure(owntype.getThrownTypes()),
- syms.methodClass);
- }
- if (useVarargs) {
- JCTree tree = env.tree;
- Type argtype = owntype.getParameterTypes().last();
- if (owntype.getReturnType().tag != FORALL || warned) {
- chk.checkVararg(env.tree.pos(), owntype.getParameterTypes(), sym);
- }
- Type elemtype = types.elemtype(argtype);
- switch (tree.getTag()) {
- case APPLY:
- ((JCMethodInvocation) tree).varargsElement = elemtype;
- break;
- case NEWCLASS:
- ((JCNewClass) tree).varargsElement = elemtype;
- break;
- default:
- throw new AssertionError(""+tree);
- }
- }
+ return chk.checkMethod(owntype, sym, env, argtrees, argtypes, useVarargs, unchecked);
}
- return owntype;
}
- private void assertConvertible(JCTree tree, Type actual, Type formal, Warner warn) {
- if (types.isConvertible(actual, formal, warn))
- return;
-
- if (formal.isCompound()
- && types.isSubtype(actual, types.supertype(formal))
- && types.isSubtypeUnchecked(actual, types.interfaces(formal), warn))
- return;
-
- if (false) {
- // TODO: make assertConvertible work
- chk.typeError(tree.pos(), diags.fragment("incompatible.types"), actual, formal);
- throw new AssertionError("Tree: " + tree
- + " actual:" + actual
- + " formal: " + formal);
- }
+ /**
+ * Check that constructor arguments conform to its instantiation.
+ **/
+ public Type checkConstructor(Type site,
+ Symbol sym,
+ Env<AttrContext> env,
+ final List<JCExpression> argtrees,
+ List<Type> argtypes,
+ List<Type> typeargtypes,
+ boolean useVarargs) {
+ Type owntype = checkMethod(site, sym, env, argtrees, argtypes, typeargtypes, useVarargs);
+ chk.checkType(env.tree.pos(), owntype.getReturnType(), syms.voidType);
+ return owntype;
}
public void visitLiteral(JCLiteral tree) {
result = check(
- tree, litType(tree.typetag).constType(tree.value), VAL, pkind, pt);
+ tree, litType(tree.typetag).constType(tree.value), VAL, resultInfo);
}
//where
/** Return the type of a literal with given type tag.
@@ -2885,13 +2785,13 @@ public class Attr extends JCTree.Visitor {
}
public void visitTypeIdent(JCPrimitiveTypeTree tree) {
- result = check(tree, syms.typeOfTag[tree.typetag], TYP, pkind, pt);
+ result = check(tree, syms.typeOfTag[tree.typetag], TYP, resultInfo);
}
public void visitTypeArray(JCArrayTypeTree tree) {
Type etype = attribType(tree.elemtype, env);
Type type = new ArrayType(etype, syms.arrayClass);
- result = check(tree, type, TYP, pkind, pt);
+ result = check(tree, type, TYP, resultInfo);
}
/** Visitor method for parameterized types.
@@ -2949,7 +2849,7 @@ public class Attr extends JCTree.Visitor {
owntype = types.createErrorType(tree.type);
}
}
- result = check(tree, owntype, TYP, pkind, pt);
+ result = check(tree, owntype, TYP, resultInfo);
}
public void visitTypeUnion(JCTypeUnion tree) {
@@ -2986,7 +2886,7 @@ public class Attr extends JCTree.Visitor {
all_multicatchTypes.append(ctype);
}
}
- Type t = check(tree, types.lub(multicatchTypes.toList()), TYP, pkind, pt);
+ Type t = check(tree, types.lub(multicatchTypes.toList()), TYP, resultInfo);
if (t.tag == CLASS) {
List<Type> alternatives =
((all_multicatchTypes == null) ? multicatchTypes : all_multicatchTypes).toList();
@@ -3072,11 +2972,11 @@ public class Attr extends JCTree.Visitor {
result = check(tree, new WildcardType(chk.checkRefType(tree.pos(), type),
tree.kind.kind,
syms.boundClass),
- TYP, pkind, pt);
+ TYP, resultInfo);
}
public void visitAnnotation(JCAnnotation tree) {
- log.error(tree.pos(), "annotation.not.valid.for.type", pt);
+ log.error(tree.pos(), "annotation.not.valid.for.type", pt());
result = tree.type = syms.errType;
}
@@ -3091,7 +2991,7 @@ public class Attr extends JCTree.Visitor {
@Override
public void visitExports(JCExportDirective tree) {
- TypeSymbol tsym = attribTree(tree.qualid, env, PCK, Type.noType).tsym;
+ TypeSymbol tsym = attribTree(tree.qualid, env, new ResultInfo(PCK, Type.noType)).tsym;
if (tsym.kind == PCK) {
ExportsDirective d = new ExportsDirective((PackageSymbol) tsym);
if (env.info.modcon.getDirectives(Directive.Kind.EXPORTS, d.sym.fullname).isEmpty()) {
@@ -3111,8 +3011,8 @@ public class Attr extends JCTree.Visitor {
@Override
public void visitProvidesService(JCProvidesServiceDirective tree) {
- TypeSymbol srvc = attribTree(tree.serviceName, env, TYP, Type.noType).tsym;
- TypeSymbol impl = attribTree(tree.implName, env, TYP, Type.noType).tsym;
+ TypeSymbol srvc = attribTree(tree.serviceName, env, unknownTypeInfo).tsym;
+ TypeSymbol impl = attribTree(tree.implName, env, unknownTypeInfo).tsym;
if (srvc.kind != ERR && impl.kind != ERR) {
if ((impl.flags() & ABSTRACT) != 0) {
log.error(tree.implName, "service.impl.is.abstract", impl);
@@ -3252,7 +3152,7 @@ public class Attr extends JCTree.Visitor {
public void visitErroneous(JCErroneous tree) {
if (tree.errs != null)
for (JCTree err : tree.errs)
- attribTree(err, env, ERR, pt);
+ attribTree(err, env, new ResultInfo(ERR, pt()));
result = tree.type = syms.errType;
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
index 06a1818..c42a407 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@ public class Check {
private final Names names;
private final Log log;
+ private final Resolve rs;
private final Symtab syms;
private final Enter enter;
private final Infer infer;
@@ -96,6 +97,7 @@ public class Check {
names = Names.instance(context);
log = Log.instance(context);
+ rs = Resolve.instance(context);
syms = Symtab.instance(context);
enter = Enter.instance(context);
infer = Infer.instance(context);
@@ -107,6 +109,7 @@ public class Check {
Source source = Source.instance(context);
allowGenerics = source.allowGenerics();
+ allowVarargs = source.allowVarargs();
allowAnnotations = source.allowAnnotations();
allowCovariantReturns = source.allowCovariantReturns();
allowSimplifiedVarargs = source.allowSimplifiedVarargs();
@@ -138,6 +141,10 @@ public class Check {
*/
boolean allowGenerics;
+ /** Switch: varargs enabled?
+ */
+ boolean allowVarargs;
+
/** Switch: annotations enabled?
*/
boolean allowAnnotations;
@@ -526,16 +533,16 @@ public class Check {
* @param a The type that should be bounded by bs.
* @param bs The bound.
*/
- private boolean checkExtends(Type a, TypeVar bs) {
+ private boolean checkExtends(Type a, Type bound) {
if (a.isUnbound()) {
return true;
} else if (a.tag != WILDCARD) {
a = types.upperBound(a);
- return types.isSubtype(a, bs.bound);
+ return types.isSubtype(a, bound);
} else if (a.isExtendsBound()) {
- return types.isCastable(bs.getUpperBound(), types.upperBound(a), Warner.noWarnings);
+ return types.isCastable(bound, types.upperBound(a), Warner.noWarnings);
} else if (a.isSuperBound()) {
- return !types.notSoftSubtype(types.lowerBound(a), bs.getUpperBound());
+ return !types.notSoftSubtype(types.lowerBound(a), bound);
}
return true;
}
@@ -744,22 +751,103 @@ public class Check {
(s.flags() & (STATIC | FINAL)) != 0);
}
- /**
- * Check that vararg method call is sound
- * @param pos Position to be used for error reporting.
- * @param argtypes Actual arguments supplied to vararg method.
- */
- void checkVararg(DiagnosticPosition pos, List<Type> argtypes, Symbol msym) {
- Type argtype = argtypes.last();
- if (!types.isReifiable(argtype) &&
- (!allowSimplifiedVarargs ||
- msym.attribute(syms.trustMeType.tsym) == null ||
- !isTrustMeAllowedOnMethod(msym))) {
- warnUnchecked(pos,
- "unchecked.generic.array.creation",
- argtype);
- }
+ Type checkMethod(Type owntype,
+ Symbol sym,
+ Env<AttrContext> env,
+ final List<JCExpression> argtrees,
+ List<Type> argtypes,
+ boolean useVarargs,
+ boolean unchecked) {
+ // System.out.println("call : " + env.tree);
+ // System.out.println("method : " + owntype);
+ // System.out.println("actuals: " + argtypes);
+ List<Type> formals = owntype.getParameterTypes();
+ Type last = useVarargs ? formals.last() : null;
+ if (sym.name==names.init &&
+ sym.owner == syms.enumSym)
+ formals = formals.tail.tail;
+ List<JCExpression> args = argtrees;
+ while (formals.head != last) {
+ JCTree arg = args.head;
+ Warner warn = convertWarner(arg.pos(), arg.type, formals.head);
+ assertConvertible(arg, arg.type, formals.head, warn);
+ args = args.tail;
+ formals = formals.tail;
+ }
+ if (useVarargs) {
+ Type varArg = types.elemtype(last);
+ while (args.tail != null) {
+ JCTree arg = args.head;
+ Warner warn = convertWarner(arg.pos(), arg.type, varArg);
+ assertConvertible(arg, arg.type, varArg, warn);
+ args = args.tail;
+ }
+ } else if ((sym.flags() & VARARGS) != 0 && allowVarargs) {
+ // non-varargs call to varargs method
+ Type varParam = owntype.getParameterTypes().last();
+ Type lastArg = argtypes.last();
+ if (types.isSubtypeUnchecked(lastArg, types.elemtype(varParam)) &&
+ !types.isSameType(types.erasure(varParam), types.erasure(lastArg)))
+ log.warning(argtrees.last().pos(), "inexact.non-varargs.call",
+ types.elemtype(varParam), varParam);
+ }
+ if (unchecked) {
+ warnUnchecked(env.tree.pos(),
+ "unchecked.meth.invocation.applied",
+ kindName(sym),
+ sym.name,
+ rs.methodArguments(sym.type.getParameterTypes()),
+ rs.methodArguments(argtypes),
+ kindName(sym.location()),
+ sym.location());
+ owntype = new MethodType(owntype.getParameterTypes(),
+ types.erasure(owntype.getReturnType()),
+ types.erasure(owntype.getThrownTypes()),
+ syms.methodClass);
+ }
+ if (useVarargs) {
+ JCTree tree = env.tree;
+ Type argtype = owntype.getParameterTypes().last();
+ if (!types.isReifiable(argtype) &&
+ (!allowSimplifiedVarargs ||
+ sym.attribute(syms.trustMeType.tsym) == null ||
+ !isTrustMeAllowedOnMethod(sym))) {
+ warnUnchecked(env.tree.pos(),
+ "unchecked.generic.array.creation",
+ argtype);
+ }
+ Type elemtype = types.elemtype(argtype);
+ switch (tree.getTag()) {
+ case APPLY:
+ ((JCMethodInvocation) tree).varargsElement = elemtype;
+ break;
+ case NEWCLASS:
+ ((JCNewClass) tree).varargsElement = elemtype;
+ break;
+ default:
+ throw new AssertionError(""+tree);
+ }
+ }
+ return owntype;
}
+ //where
+ private void assertConvertible(JCTree tree, Type actual, Type formal, Warner warn) {
+ if (types.isConvertible(actual, formal, warn))
+ return;
+
+ if (formal.isCompound()
+ && types.isSubtype(actual, types.supertype(formal))
+ && types.isSubtypeUnchecked(actual, types.interfaces(formal), warn))
+ return;
+
+ if (false) {
+ // TODO: make assertConvertible work
+ typeError(tree.pos(), diags.fragment("incompatible.types"), actual, formal);
+ throw new AssertionError("Tree: " + tree
+ + " actual:" + actual
+ + " formal: " + formal);
+ }
+ }
/**
* Check that type 't' is a valid instantiation of a generic class
@@ -777,18 +865,16 @@ public class Check {
List<Type> actuals = type.allparams();
List<Type> args = type.getTypeArguments();
List<Type> forms = type.tsym.type.getTypeArguments();
- ListBuffer<Type> tvars_buf = new ListBuffer<Type>();
+ ListBuffer<Type> bounds_buf = new ListBuffer<Type>();
// For matching pairs of actual argument types `a' and
// formal type parameters with declared bound `b' ...
while (args.nonEmpty() && forms.nonEmpty()) {
// exact type arguments needs to know their
// bounds (for upper and lower bound
- // calculations). So we create new TypeVars with
- // bounds substed with actuals.
- tvars_buf.append(types.substBound(((TypeVar)forms.head),
- formals,
- actuals));
+ // calculations). So we create new bounds where
+ // type-parameters are replaced with actuals argument types.
+ bounds_buf.append(types.subst(forms.head.getUpperBound(), formals, actuals));
args = args.tail;
forms = forms.tail;
}
@@ -805,32 +891,30 @@ public class Check {
}
args = type.getTypeArguments();
- List<Type> tvars = tvars_buf.toList();
+ List<Type> bounds = bounds_buf.toList();
- while (args.nonEmpty() && tvars.nonEmpty()) {
- Type actual = types.subst(args.head,
- type.tsym.type.getTypeArguments(),
- tvars_buf.toList());
+ while (args.nonEmpty() && bounds.nonEmpty()) {
+ Type actual = args.head;
if (!isTypeArgErroneous(actual) &&
- !tvars.head.getUpperBound().isErroneous() &&
- !checkExtends(actual, (TypeVar)tvars.head)) {
+ !bounds.head.isErroneous() &&
+ !checkExtends(actual, bounds.head)) {
return args.head;
}
args = args.tail;
- tvars = tvars.tail;
+ bounds = bounds.tail;
}
args = type.getTypeArguments();
- tvars = tvars_buf.toList();
+ bounds = bounds_buf.toList();
for (Type arg : types.capture(type).getTypeArguments()) {
if (arg.tag == TYPEVAR &&
arg.getUpperBound().isErroneous() &&
- !tvars.head.getUpperBound().isErroneous() &&
+ !bounds.head.isErroneous() &&
!isTypeArgErroneous(args.head)) {
return args.head;
}
- tvars = tvars.tail;
+ bounds = bounds.tail;
args = args.tail;
}
@@ -2142,25 +2226,26 @@ public class Check {
*/
void checkOverrideClashes(DiagnosticPosition pos, Type site, MethodSymbol sym) {
ClashFilter cf = new ClashFilter(site);
- //for each method m1 that is a member of 'site'...
- for (Symbol s1 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) {
- //...find another method m2 that is overridden (directly or indirectly)
- //by method 'sym' in 'site'
- for (Symbol s2 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) {
- if (s1 == s2 || !sym.overrides(s2, site.tsym, types, false)) continue;
+ //for each method m1 that is overridden (directly or indirectly)
+ //by method 'sym' in 'site'...
+ for (Symbol m1 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) {
+ if (!sym.overrides(m1, site.tsym, types, false)) continue;
+ //...check each method m2 that is a member of 'site'
+ for (Symbol m2 : types.membersClosure(site, false).getElementsByName(sym.name, cf)) {
+ if (m2 == m1) continue;
//if (i) the signature of 'sym' is not a subsignature of m1 (seen as
//a member of 'site') and (ii) m1 has the same erasure as m2, issue an error
- if (!types.isSubSignature(sym.type, types.memberType(site, s1), false) &&
- types.hasSameArgs(s1.erasure(types), s2.erasure(types))) {
+ if (!types.isSubSignature(sym.type, types.memberType(site, m2), false) &&
+ types.hasSameArgs(m2.erasure(types), m1.erasure(types))) {
sym.flags_field |= CLASH;
- String key = s2 == sym ?
+ String key = m1 == sym ?
"name.clash.same.erasure.no.override" :
"name.clash.same.erasure.no.override.1";
log.error(pos,
key,
sym, sym.location(),
- s1, s1.location(),
- s2, s2.location());
+ m2, m2.location(),
+ m1, m1.location());
return;
}
}
@@ -2519,7 +2604,7 @@ public class Check {
if (enableSunApiLintControl)
warnSunApi(pos, "sun.proprietary", s);
else
- log.strictWarning(pos, "sun.proprietary", s);
+ log.mandatoryWarning(pos, "sun.proprietary", s);
}
});
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
index 23e8748..941d2dd 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java
@@ -385,7 +385,6 @@ public class Infer {
final Warner warn) throws InferenceException {
//-System.err.println("instantiateMethod(" + tvars + ", " + mt + ", " + argtypes + ")"); //DEBUG
List<Type> undetvars = Type.map(tvars, fromTypeVarFun);
- //final List<Type> capturedArgs = types.capture(argtypes);
final List<Type> capturedArgs =
rs.checkRawArgumentsAcceptable(env, undetvars, argtypes, mt.getParameterTypes(),
@@ -445,16 +444,20 @@ public class Infer {
return List.nil();
}
@Override
- void check(List<Type> inferred, Types types) throws NoInstanceException {
+ void instantiateReturnType(Type restype, List<Type> inferred, Types types) throws NoInstanceException {
+ Type owntype = new MethodType(types.subst(getParameterTypes(), tvars, inferred),
+ restype,
+ types.subst(getThrownTypes(), tvars, inferred),
+ qtype.tsym);
// check that actuals conform to inferred formals
- checkArgumentsAcceptable(env, capturedArgs, getParameterTypes(), allowBoxing, useVarargs, warn);
+ warn.clear();
+ checkArgumentsAcceptable(env, capturedArgs, owntype.getParameterTypes(), allowBoxing, useVarargs, warn);
// check that inferred bounds conform to their bounds
checkWithinBounds(all_tvars,
types.subst(inferredTypes, tvars, inferred), warn);
- if (useVarargs) {
- chk.checkVararg(env.tree.pos(), getParameterTypes(), msym);
- }
- }};
+ qtype = chk.checkMethod(owntype, msym, env, TreeInfo.args(env.tree), capturedArgs, useVarargs, warn.hasNonSilentLint(Lint.LintCategory.UNCHECKED));
+ }
+ };
}
else {
// check that actuals conform to inferred formals
@@ -520,16 +523,7 @@ public class Infer {
return qtype.map(f);
}
- void instantiateReturnType(Type restype, List<Type> inferred, Types types) throws NoInstanceException {
- //update method type with newly inferred type-arguments
- qtype = new MethodType(types.subst(getParameterTypes(), tvars, inferred),
- restype,
- types.subst(UninferredMethodType.this.getThrownTypes(), tvars, inferred),
- UninferredMethodType.this.qtype.tsym);
- check(inferred, types);
- }
-
- abstract void check(List<Type> inferred, Types types) throws NoInstanceException;
+ abstract void instantiateReturnType(Type restype, List<Type> inferred, Types types);
abstract List<Type> getConstraints(TypeVar tv, ConstraintKind ck);
@@ -544,7 +538,7 @@ public class Infer {
if (rs.verboseResolutionMode.contains(VerboseResolutionMode.DEFERRED_INST)) {
log.note(pos, "deferred.method.inst", msym, UninferredMethodType.this.qtype, newRestype);
}
- return newRestype;
+ return UninferredMethodType.this.qtype.getReturnType();
}
@Override
public List<Type> getConstraints(TypeVar tv, ConstraintKind ck) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
index ff98a10..375b916 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
@@ -542,24 +542,17 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
// process the non-static imports and the static imports of types.
public void visitImport(JCImport tree) {
- JCTree imp = tree.qualid;
+ JCFieldAccess imp = (JCFieldAccess)tree.qualid;
Name name = TreeInfo.name(imp);
- TypeSymbol p;
// Create a local environment pointing to this tree to disable
// effects of other imports in Resolve.findGlobalType
Env<AttrContext> localEnv = env.dup(tree);
- // Attribute qualifying package or class.
- JCFieldAccess s = (JCFieldAccess) imp;
- p = attr.
- attribTree(s.selected,
- localEnv,
- tree.staticImport ? TYP : (TYP | PCK),
- Type.noType).tsym;
+ TypeSymbol p = attr.attribImportQualifier(tree, localEnv).tsym;
if (name == names.asterisk) {
// Import on demand.
- chk.checkCanonical(s.selected);
+ chk.checkCanonical(imp.selected);
if (tree.staticImport)
importStaticAll(tree.pos, p, env);
else
@@ -568,7 +561,7 @@ public class MemberEnter extends JCTree.Visitor implements Completer {
// Named type import.
if (tree.staticImport) {
importNamedStatic(tree.pos(), p, name, localEnv);
- chk.checkCanonical(s.selected);
+ chk.checkCanonical(imp.selected);
} else {
TypeSymbol c = attribImportType(imp, localEnv).tsym;
chk.checkCanonical(imp);
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
index 676e007..c13cd65 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
@@ -40,6 +40,7 @@ import com.sun.tools.javac.api.Formattable.LocalizedString;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Type.*;
import com.sun.tools.javac.code.Symbol.*;
+import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate;
import com.sun.tools.javac.jvm.*;
import com.sun.tools.javac.tree.*;
import com.sun.tools.javac.tree.JCTree.*;
@@ -48,6 +49,10 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
import com.sun.tools.javac.util.JCDiagnostic.DiagnosticType;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.EnumMap;
+import java.util.EnumSet;
import static com.sun.tools.javac.code.Flags.*;
import static com.sun.tools.javac.code.Flags.BLOCK;
import static com.sun.tools.javac.code.Flags.MODULE;
@@ -85,6 +90,58 @@ public class Resolve {
Scope polymorphicSignatureScope;
+ protected Resolve(Context context) {
+ context.put(resolveKey, this);
+ syms = Symtab.instance(context);
+
+ varNotFound = new
+ SymbolNotFoundError(ABSENT_VAR);
+ wrongMethod = new
+ InapplicableSymbolError();
+ wrongMethods = new
+ InapplicableSymbolsError();
+ methodNotFound = new
+ SymbolNotFoundError(ABSENT_MTH);
+ typeNotFound = new
+ SymbolNotFoundError(ABSENT_TYP);
+
+ names = Names.instance(context);
+ log = Log.instance(context);
+ chk = Check.instance(context);
+ infer = Infer.instance(context);
+ reader = ClassReader.instance(context);
+ treeinfo = TreeInfo.instance(context);
+ types = Types.instance(context);
+ diags = JCDiagnostic.Factory.instance(context);
+ Source source = Source.instance(context);
+ boxingEnabled = source.allowBoxing();
+ varargsEnabled = source.allowVarargs();
+ Options options = Options.instance(context);
+ debugResolve = options.isSet("debugresolve");
+ verboseResolutionMode = VerboseResolutionMode.getVerboseResolutionMode(options);
+ Target target = Target.instance(context);
+ allowMethodHandles = target.hasMethodHandles();
+ polymorphicSignatureScope = new Scope(syms.noSymbol);
+
+ inapplicableMethodException = new InapplicableMethodException(diags);
+ }
+
+ /** error symbols, which are returned when resolution fails
+ */
+ private final SymbolNotFoundError varNotFound;
+ private final InapplicableSymbolError wrongMethod;
+ private final InapplicableSymbolsError wrongMethods;
+ private final SymbolNotFoundError methodNotFound;
+ private final SymbolNotFoundError typeNotFound;
+
+ public static Resolve instance(Context context) {
+ Resolve instance = context.get(resolveKey);
+ if (instance == null)
+ instance = new Resolve(context);
+ return instance;
+ }
+
+ // <editor-fold defaultstate="collapsed" desc="Verbose resolution diagnostics support">
enum VerboseResolutionMode {
SUCCESS("success"),
FAILURE("failure"),
@@ -120,56 +177,74 @@ public class Resolve {
}
}
- public static Resolve instance(Context context) {
- Resolve instance = context.get(resolveKey);
- if (instance == null)
- instance = new Resolve(context);
- return instance;
- }
+ void reportVerboseResolutionDiagnostic(DiagnosticPosition dpos, Name name, Type site,
+ List<Type> argtypes, List<Type> typeargtypes, Symbol bestSoFar) {
+ boolean success = bestSoFar.kind < ERRONEOUS;
- protected Resolve(Context context) {
- context.put(resolveKey, this);
- syms = Symtab.instance(context);
+ if (success && !verboseResolutionMode.contains(VerboseResolutionMode.SUCCESS)) {
+ return;
+ } else if (!success && !verboseResolutionMode.contains(VerboseResolutionMode.FAILURE)) {
+ return;
+ }
- varNotFound = new
- SymbolNotFoundError(ABSENT_VAR);
- wrongMethod = new
- InapplicableSymbolError(syms.errSymbol);
- wrongMethods = new
- InapplicableSymbolsError(syms.errSymbol);
- methodNotFound = new
- SymbolNotFoundError(ABSENT_MTH);
- typeNotFound = new
- SymbolNotFoundError(ABSENT_TYP);
+ if (bestSoFar.name == names.init &&
+ bestSoFar.owner == syms.objectType.tsym &&
+ !verboseResolutionMode.contains(VerboseResolutionMode.OBJECT_INIT)) {
+ return; //skip diags for Object constructor resolution
+ } else if (site == syms.predefClass.type &&
+ !verboseResolutionMode.contains(VerboseResolutionMode.PREDEF)) {
+ return; //skip spurious diags for predef symbols (i.e. operators)
+ } else if (currentResolutionContext.internalResolution &&
+ !verboseResolutionMode.contains(VerboseResolutionMode.INTERNAL)) {
+ return;
+ }
- names = Names.instance(context);
- log = Log.instance(context);
- chk = Check.instance(context);
- infer = Infer.instance(context);
- reader = ClassReader.instance(context);
- treeinfo = TreeInfo.instance(context);
- types = Types.instance(context);
- diags = JCDiagnostic.Factory.instance(context);
- Source source = Source.instance(context);
- boxingEnabled = source.allowBoxing();
- varargsEnabled = source.allowVarargs();
- Options options = Options.instance(context);
- debugResolve = options.isSet("debugresolve");
- verboseResolutionMode = VerboseResolutionMode.getVerboseResolutionMode(options);
- Target target = Target.instance(context);
- allowMethodHandles = target.hasMethodHandles();
- polymorphicSignatureScope = new Scope(syms.noSymbol);
+ int pos = 0;
+ int mostSpecificPos = -1;
+ ListBuffer<JCDiagnostic> subDiags = ListBuffer.lb();
+ for (Candidate c : currentResolutionContext.candidates) {
+ if (currentResolutionContext.step != c.step ||
+ (c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.APPLICABLE)) ||
+ (!c.isApplicable() && !verboseResolutionMode.contains(VerboseResolutionMode.INAPPLICABLE))) {
+ continue;
+ } else {
+ subDiags.append(c.isApplicable() ?
+ getVerboseApplicableCandidateDiag(pos, c.sym, c.mtype) :
+ getVerboseInapplicableCandidateDiag(pos, c.sym, c.details));
+ if (c.sym == bestSoFar)
+ mostSpecificPos = pos;
+ pos++;
+ }
+ }
+ String key = success ? "verbose.resolve.multi" : "verbose.resolve.multi.1";
+ JCDiagnostic main = diags.note(log.currentSource(), dpos, key, name,
+ site.tsym, mostSpecificPos, currentResolutionContext.step,
+ methodArguments(argtypes), methodArguments(typeargtypes));
+ JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, subDiags.toList());
+ log.report(d);
+ }
- inapplicableMethodException = new InapplicableMethodException(diags);
+ JCDiagnostic getVerboseApplicableCandidateDiag(int pos, Symbol sym, Type inst) {
+ JCDiagnostic subDiag = null;
+ if (inst.getReturnType().tag == FORALL) {
+ Type diagType = types.createMethodTypeWithReturn(inst.asMethodType(),
+ ((ForAll)inst.getReturnType()).qtype);
+ subDiag = diags.fragment("partial.inst.sig", diagType);
+ } else if (sym.type.tag == FORALL) {
+ subDiag = diags.fragment("full.inst.sig", inst.asMethodType());
+ }
+
+ String key = subDiag == null ?
+ "applicable.method.found" :
+ "applicable.method.found.1";
+
+ return diags.fragment(key, pos, sym, subDiag);
}
- /** error symbols, which are returned when resolution fails
- */
- final SymbolNotFoundError varNotFound;
- final InapplicableSymbolError wrongMethod;
- final InapplicableSymbolsError wrongMethods;
- final SymbolNotFoundError methodNotFound;
- final SymbolNotFoundError typeNotFound;
+ JCDiagnostic getVerboseInapplicableCandidateDiag(int pos, Symbol sym, JCDiagnostic subDiag) {
+ return diags.fragment("not.applicable.method.found", pos, sym, subDiag);
+ }
+ // </editor-fold>
/* ************************************************************************
* Identifier resolution
@@ -818,17 +893,18 @@ public class Resolve {
try {
Type mt = rawInstantiate(env, site, sym, argtypes, typeargtypes,
allowBoxing, useVarargs, Warner.noWarnings);
- if (!operator) addVerboseApplicableCandidateDiag(sym ,mt);
+ if (!operator)
+ currentResolutionContext.addApplicableCandidate(sym, mt);
} catch (InapplicableMethodException ex) {
- if (!operator) addVerboseInapplicableCandidateDiag(sym, ex.getDiagnostic());
+ if (!operator)
+ currentResolutionContext.addInapplicableCandidate(sym, ex.getDiagnostic());
switch (bestSoFar.kind) {
case ABSENT_MTH:
- return wrongMethod.setWrongSym(sym, ex.getDiagnostic());
+ return wrongMethod;
case WRONG_MTH:
if (operator) return bestSoFar;
- wrongMethods.addCandidate(currentStep, wrongMethod.sym, wrongMethod.explanation);
case WRONG_MTHS:
- return wrongMethods.addCandidate(currentStep, sym, ex.getDiagnostic());
+ return wrongMethods;
default:
return bestSoFar;
}
@@ -837,40 +913,12 @@ public class Resolve {
return (bestSoFar.kind == ABSENT_MTH)
? new AccessError(env, site, sym)
: bestSoFar;
- }
+ }
return (bestSoFar.kind > AMBIGUOUS)
? sym
: mostSpecific(sym, bestSoFar, env, site,
allowBoxing && operator, useVarargs);
}
- //where
- void addVerboseApplicableCandidateDiag(Symbol sym, Type inst) {
- if (!verboseResolutionMode.contains(VerboseResolutionMode.APPLICABLE))
- return;
-
- JCDiagnostic subDiag = null;
- if (inst.getReturnType().tag == FORALL) {
- Type diagType = types.createMethodTypeWithReturn(inst.asMethodType(),
- ((ForAll)inst.getReturnType()).qtype);
- subDiag = diags.fragment("partial.inst.sig", diagType);
- } else if (sym.type.tag == FORALL) {
- subDiag = diags.fragment("full.inst.sig", inst.asMethodType());
- }
-
- String key = subDiag == null ?
- "applicable.method.found" :
- "applicable.method.found.1";
-
- verboseResolutionCandidateDiags.put(sym,
- diags.fragment(key, verboseResolutionCandidateDiags.size(), sym, subDiag));
- }
-
- void addVerboseInapplicableCandidateDiag(Symbol sym, JCDiagnostic subDiag) {
- if (!verboseResolutionMode.contains(VerboseResolutionMode.INAPPLICABLE))
- return;
- verboseResolutionCandidateDiags.put(sym,
- diags.fragment("not.applicable.method.found", verboseResolutionCandidateDiags.size(), sym, subDiag));
- }
/* Return the most specific of the two methods for a call,
* given that both are accessible and applicable.
@@ -1068,7 +1116,6 @@ public class Resolve {
boolean allowBoxing,
boolean useVarargs,
boolean operator) {
- verboseResolutionCandidateDiags.clear();
Symbol bestSoFar = methodNotFound;
bestSoFar = findMethod(env,
site,
@@ -1141,37 +1188,6 @@ public class Resolve {
}
return bestSoFar;
}
- //where
- void reportVerboseResolutionDiagnostic(DiagnosticPosition dpos, Name name, Type site, List<Type> argtypes, List<Type> typeargtypes, Symbol bestSoFar) {
- boolean success = bestSoFar.kind < ERRONEOUS;
-
- if (success && !verboseResolutionMode.contains(VerboseResolutionMode.SUCCESS)) {
- return;
- } else if (!success && !verboseResolutionMode.contains(VerboseResolutionMode.FAILURE)) {
- return;
- }
-
- if (bestSoFar.name == names.init &&
- bestSoFar.owner == syms.objectType.tsym &&
- !verboseResolutionMode.contains(VerboseResolutionMode.OBJECT_INIT)) {
- return; //skip diags for Object constructor resolution
- } else if (site == syms.predefClass.type && !verboseResolutionMode.contains(VerboseResolutionMode.PREDEF)) {
- return; //skip spurious diags for predef symbols (i.e. operators)
- } else if (internalResolution && !verboseResolutionMode.contains(VerboseResolutionMode.INTERNAL)) {
- return;
- }
-
- int pos = 0;
- for (Symbol s : verboseResolutionCandidateDiags.keySet()) {
- if (s == bestSoFar) break;
- pos++;
- }
- String key = success ? "verbose.resolve.multi" : "verbose.resolve.multi.1";
- JCDiagnostic main = diags.note(log.currentSource(), dpos, key, name, site.tsym, pos, currentStep,
- methodArguments(argtypes), methodArguments(typeargtypes));
- JCDiagnostic d = new JCDiagnostic.MultilineDiagnostic(main, List.from(verboseResolutionCandidateDiags.values().toArray(new JCDiagnostic[verboseResolutionCandidateDiags.size()])));
- log.report(d);
- }
/** Find unqualified method matching given name, type and value arguments.
* @param env The current environment.
@@ -1605,32 +1621,33 @@ public class Resolve {
Name name,
List<Type> argtypes,
List<Type> typeargtypes) {
- Symbol sym = startResolution();
- List<MethodResolutionPhase> steps = methodResolutionSteps;
- while (steps.nonEmpty() &&
- steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
- sym.kind >= ERRONEOUS) {
- currentStep = steps.head;
- sym = findFun(env, name, argtypes, typeargtypes,
- steps.head.isBoxingRequired,
- env.info.varArgs = steps.head.isVarargsRequired);
- methodResolutionCache.put(steps.head, sym);
- steps = steps.tail;
- }
- if (sym.kind >= AMBIGUOUS) {//if nothing is found return the 'first' error
- MethodResolutionPhase errPhase =
- firstErroneousResolutionPhase();
- sym = access(methodResolutionCache.get(errPhase),
- pos, env.enclClass.sym.type, name, false, argtypes, typeargtypes);
- env.info.varArgs = errPhase.isVarargsRequired;
+ MethodResolutionContext prevResolutionContext = currentResolutionContext;
+ try {
+ currentResolutionContext = new MethodResolutionContext();
+ Symbol sym = methodNotFound;
+ List<MethodResolutionPhase> steps = methodResolutionSteps;
+ while (steps.nonEmpty() &&
+ steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
+ sym.kind >= ERRONEOUS) {
+ currentResolutionContext.step = steps.head;
+ sym = findFun(env, name, argtypes, typeargtypes,
+ steps.head.isBoxingRequired,
+ env.info.varArgs = steps.head.isVarargsRequired);
+ currentResolutionContext.resolutionCache.put(steps.head, sym);
+ steps = steps.tail;
+ }
+ if (sym.kind >= AMBIGUOUS) {//if nothing is found return the 'first' error
+ MethodResolutionPhase errPhase =
+ currentResolutionContext.firstErroneousResolutionPhase();
+ sym = access(currentResolutionContext.resolutionCache.get(errPhase),
+ pos, env.enclClass.sym.type, name, false, argtypes, typeargtypes);
+ env.info.varArgs = errPhase.isVarargsRequired;
+ }
+ return sym;
+ }
+ finally {
+ currentResolutionContext = prevResolutionContext;
}
- return sym;
- }
-
- private Symbol startResolution() {
- wrongMethod.clear();
- wrongMethods.clear();
- return methodNotFound;
}
/** Resolve a qualified method identifier
@@ -1650,40 +1667,53 @@ public class Resolve {
Symbol resolveQualifiedMethod(DiagnosticPosition pos, Env<AttrContext> env,
Symbol location, Type site, Name name, List<Type> argtypes,
List<Type> typeargtypes) {
- Symbol sym = startResolution();
- List<MethodResolutionPhase> steps = methodResolutionSteps;
- while (steps.nonEmpty() &&
- steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
- sym.kind >= ERRONEOUS) {
- currentStep = steps.head;
- sym = findMethod(env, site, name, argtypes, typeargtypes,
- steps.head.isBoxingRequired(),
- env.info.varArgs = steps.head.isVarargsRequired(), false);
- methodResolutionCache.put(steps.head, sym);
- steps = steps.tail;
- }
- if (sym.kind >= AMBIGUOUS) {
- if (site.tsym.isPolymorphicSignatureGeneric()) {
- //polymorphic receiver - synthesize new method symbol
+ return resolveQualifiedMethod(new MethodResolutionContext(), pos, env, location, site, name, argtypes, typeargtypes);
+ }
+ private Symbol resolveQualifiedMethod(MethodResolutionContext resolveContext,
+ DiagnosticPosition pos, Env<AttrContext> env,
+ Symbol location, Type site, Name name, List<Type> argtypes,
+ List<Type> typeargtypes) {
+ MethodResolutionContext prevResolutionContext = currentResolutionContext;
+ try {
+ currentResolutionContext = resolveContext;
+ Symbol sym = methodNotFound;
+ List<MethodResolutionPhase> steps = methodResolutionSteps;
+ while (steps.nonEmpty() &&
+ steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
+ sym.kind >= ERRONEOUS) {
+ currentResolutionContext.step = steps.head;
+ sym = findMethod(env, site, name, argtypes, typeargtypes,
+ steps.head.isBoxingRequired(),
+ env.info.varArgs = steps.head.isVarargsRequired(), false);
+ currentResolutionContext.resolutionCache.put(steps.head, sym);
+ steps = steps.tail;
+ }
+ if (sym.kind >= AMBIGUOUS) {
+ if (site.tsym.isPolymorphicSignatureGeneric()) {
+ //polymorphic receiver - synthesize new method symbol
+ env.info.varArgs = false;
+ sym = findPolymorphicSignatureInstance(env,
+ site, name, null, argtypes);
+ }
+ else {
+ //if nothing is found return the 'first' error
+ MethodResolutionPhase errPhase =
+ currentResolutionContext.firstErroneousResolutionPhase();
+ sym = access(currentResolutionContext.resolutionCache.get(errPhase),
+ pos, location, site, name, true, argtypes, typeargtypes);
+ env.info.varArgs = errPhase.isVarargsRequired;
+ }
+ } else if (allowMethodHandles && sym.isPolymorphicSignatureGeneric()) {
+ //non-instantiated polymorphic signature - synthesize new method symbol
env.info.varArgs = false;
sym = findPolymorphicSignatureInstance(env,
- site, name, null, argtypes);
- }
- else {
- //if nothing is found return the 'first' error
- MethodResolutionPhase errPhase =
- firstErroneousResolutionPhase();
- sym = access(methodResolutionCache.get(errPhase),
- pos, location, site, name, true, argtypes, typeargtypes);
- env.info.varArgs = errPhase.isVarargsRequired;
+ site, name, (MethodSymbol)sym, argtypes);
}
- } else if (allowMethodHandles && sym.isPolymorphicSignatureGeneric()) {
- //non-instantiated polymorphic signature - synthesize new method symbol
- env.info.varArgs = false;
- sym = findPolymorphicSignatureInstance(env,
- site, name, (MethodSymbol)sym, argtypes);
+ return sym;
+ }
+ finally {
+ currentResolutionContext = prevResolutionContext;
}
- return sym;
}
/** Find or create an implicit method of exactly the given type (after erasure).
@@ -1740,19 +1770,14 @@ public class Resolve {
Type site, Name name,
List<Type> argtypes,
List<Type> typeargtypes) {
- boolean prevInternal = internalResolution;
- try {
- internalResolution = true;
- Symbol sym = resolveQualifiedMethod(
- pos, env, site.tsym, site, name, argtypes, typeargtypes);
- if (sym.kind == MTH) return (MethodSymbol)sym;
- else throw new FatalError(
- diags.fragment("fatal.err.cant.locate.meth",
- name));
- }
- finally {
- internalResolution = prevInternal;
- }
+ MethodResolutionContext resolveContext = new MethodResolutionContext();
+ resolveContext.internalResolution = true;
+ Symbol sym = resolveQualifiedMethod(resolveContext, pos, env, site.tsym,
+ site, name, argtypes, typeargtypes);
+ if (sym.kind == MTH) return (MethodSymbol)sym;
+ else throw new FatalError(
+ diags.fragment("fatal.err.cant.locate.meth",
+ name));
}
/** Resolve constructor.
@@ -1769,25 +1794,40 @@ public class Resolve {
Type site,
List<Type> argtypes,
List<Type> typeargtypes) {
- Symbol sym = startResolution();
- List<MethodResolutionPhase> steps = methodResolutionSteps;
- while (steps.nonEmpty() &&
- steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
- sym.kind >= ERRONEOUS) {
- currentStep = steps.head;
- sym = resolveConstructor(pos, env, site, argtypes, typeargtypes,
- steps.head.isBoxingRequired(),
- env.info.varArgs = steps.head.isVarargsRequired());
- methodResolutionCache.put(steps.head, sym);
- steps = steps.tail;
- }
- if (sym.kind >= AMBIGUOUS) {//if nothing is found return the 'first' error
- MethodResolutionPhase errPhase = firstErroneousResolutionPhase();
- sym = access(methodResolutionCache.get(errPhase),
- pos, site, names.init, true, argtypes, typeargtypes);
- env.info.varArgs = errPhase.isVarargsRequired();
+ return resolveConstructor(new MethodResolutionContext(), pos, env, site, argtypes, typeargtypes);
+ }
+ private Symbol resolveConstructor(MethodResolutionContext resolveContext,
+ DiagnosticPosition pos,
+ Env<AttrContext> env,
+ Type site,
+ List<Type> argtypes,
+ List<Type> typeargtypes) {
+ MethodResolutionContext prevResolutionContext = currentResolutionContext;
+ try {
+ currentResolutionContext = resolveContext;
+ Symbol sym = methodNotFound;
+ List<MethodResolutionPhase> steps = methodResolutionSteps;
+ while (steps.nonEmpty() &&
+ steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
+ sym.kind >= ERRONEOUS) {
+ currentResolutionContext.step = steps.head;
+ sym = findConstructor(pos, env, site, argtypes, typeargtypes,
+ steps.head.isBoxingRequired(),
+ env.info.varArgs = steps.head.isVarargsRequired());
+ currentResolutionContext.resolutionCache.put(steps.head, sym);
+ steps = steps.tail;
+ }
+ if (sym.kind >= AMBIGUOUS) {//if nothing is found return the 'first' error
+ MethodResolutionPhase errPhase = currentResolutionContext.firstErroneousResolutionPhase();
+ sym = access(currentResolutionContext.resolutionCache.get(errPhase),
+ pos, site, names.init, true, argtypes, typeargtypes);
+ env.info.varArgs = errPhase.isVarargsRequired();
+ }
+ return sym;
+ }
+ finally {
+ currentResolutionContext = prevResolutionContext;
}
- return sym;
}
/** Resolve constructor using diamond inference.
@@ -1805,38 +1845,82 @@ public class Resolve {
Type site,
List<Type> argtypes,
List<Type> typeargtypes) {
- Symbol sym = startResolution();
- List<MethodResolutionPhase> steps = methodResolutionSteps;
- while (steps.nonEmpty() &&
- steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
- sym.kind >= ERRONEOUS) {
- currentStep = steps.head;
- sym = resolveConstructor(pos, env, site, argtypes, typeargtypes,
- steps.head.isBoxingRequired(),
- env.info.varArgs = steps.head.isVarargsRequired());
- methodResolutionCache.put(steps.head, sym);
- steps = steps.tail;
+ MethodResolutionContext prevResolutionContext = currentResolutionContext;
+ try {
+ currentResolutionContext = new MethodResolutionContext();
+ Symbol sym = methodNotFound;
+ List<MethodResolutionPhase> steps = methodResolutionSteps;
+ while (steps.nonEmpty() &&
+ steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
+ sym.kind >= ERRONEOUS) {
+ currentResolutionContext.step = steps.head;
+ sym = findDiamond(env, site, argtypes, typeargtypes,
+ steps.head.isBoxingRequired(),
+ env.info.varArgs = steps.head.isVarargsRequired());
+ currentResolutionContext.resolutionCache.put(steps.head, sym);
+ steps = steps.tail;
+ }
+ if (sym.kind >= AMBIGUOUS) {
+ final JCDiagnostic details = sym.kind == WRONG_MTH ?
+ currentResolutionContext.candidates.head.details :
+ null;
+ Symbol errSym = new ResolveError(WRONG_MTH, "diamond error") {
+ @Override
+ JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos,
+ Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
+ String key = details == null ?
+ "cant.apply.diamond" :
+ "cant.apply.diamond.1";
+ return diags.create(dkind, log.currentSource(), pos, key,
+ diags.fragment("diamond", site.tsym), details);
+ }
+ };
+ MethodResolutionPhase errPhase = currentResolutionContext.firstErroneousResolutionPhase();
+ sym = access(errSym, pos, site, names.init, true, argtypes, typeargtypes);
+ env.info.varArgs = errPhase.isVarargsRequired();
+ }
+ return sym;
}
- if (sym.kind >= AMBIGUOUS) {
- final JCDiagnostic details = sym.kind == WRONG_MTH ?
- ((InapplicableSymbolError)sym).explanation :
- null;
- Symbol errSym = new ResolveError(WRONG_MTH, "diamond error") {
- @Override
- JCDiagnostic getDiagnostic(DiagnosticType dkind, DiagnosticPosition pos,
- Symbol location, Type site, Name name, List<Type> argtypes, List<Type> typeargtypes) {
- String key = details == null ?
- "cant.apply.diamond" :
- "cant.apply.diamond.1";
- return diags.create(dkind, log.currentSource(), pos, key,
- diags.fragment("diamond", site.tsym), details);
- }
- };
- MethodResolutionPhase errPhase = firstErroneousResolutionPhase();
- sym = access(errSym, pos, site, names.init, true, argtypes, typeargtypes);
- env.info.varArgs = errPhase.isVarargsRequired();
+ finally {
+ currentResolutionContext = prevResolutionContext;
}
- return sym;
+ }
+
+ /** This method scans all the constructor symbol in a given class scope -
+ * assuming that the original scope contains a constructor of the kind:
+ * Foo(X x, Y y), where X,Y are class type-variables declared in Foo,
+ * a method check is executed against the modified constructor type:
+ * <X,Y>Foo<X,Y>(X x, Y y). This is crucial in order to enable diamond
+ * inference. The inferred return type of the synthetic constructor IS
+ * the inferred type for the diamond operator.
+ */
+ private Symbol findDiamond(Env<AttrContext> env,
+ Type site,
+ List<Type> argtypes,
+ List<Type> typeargtypes,
+ boolean allowBoxing,
+ boolean useVarargs) {
+ Symbol bestSoFar = methodNotFound;
+ for (Scope.Entry e = site.tsym.members().lookup(names.init);
+ e.scope != null;
+ e = e.next()) {
+ //- System.out.println(" e " + e.sym);
+ if (e.sym.kind == MTH &&
+ (e.sym.flags_field & SYNTHETIC) == 0) {
+ List<Type> oldParams = e.sym.type.tag == FORALL ?
+ ((ForAll)e.sym.type).tvars :
+ List.<Type>nil();
+ Type constrType = new ForAll(site.tsym.type.getTypeArguments().appendList(oldParams),
+ types.createMethodTypeWithReturn(e.sym.type.asMethodType(), site));
+ bestSoFar = selectBest(env, site, argtypes, typeargtypes,
+ new MethodSymbol(e.sym.flags(), names.init, constrType, site.tsym),
+ bestSoFar,
+ allowBoxing,
+ useVarargs,
+ false);
+ }
+ }
+ return bestSoFar;
}
/** Resolve constructor.
@@ -1855,10 +1939,25 @@ public class Resolve {
List<Type> typeargtypes,
boolean allowBoxing,
boolean useVarargs) {
+ MethodResolutionContext prevResolutionContext = currentResolutionContext;
+ try {
+ currentResolutionContext = new MethodResolutionContext();
+ return findConstructor(pos, env, site, argtypes, typeargtypes, allowBoxing, useVarargs);
+ }
+ finally {
+ currentResolutionContext = prevResolutionContext;
+ }
+ }
+
+ Symbol findConstructor(DiagnosticPosition pos, Env<AttrContext> env,
+ Type site, List<Type> argtypes,
+ List<Type> typeargtypes,
+ boolean allowBoxing,
+ boolean useVarargs) {
Symbol sym = findMethod(env, site,
- names.init, argtypes,
- typeargtypes, allowBoxing,
- useVarargs, false);
+ names.init, argtypes,
+ typeargtypes, allowBoxing,
+ useVarargs, false);
chk.checkDeprecated(pos, env.info.scope.owner, sym);
return sym;
}
@@ -1874,8 +1973,9 @@ public class Resolve {
Type site,
List<Type> argtypes,
List<Type> typeargtypes) {
- Symbol sym = resolveConstructor(
- pos, env, site, argtypes, typeargtypes);
+ MethodResolutionContext resolveContext = new MethodResolutionContext();
+ resolveContext.internalResolution = true;
+ Symbol sym = resolveConstructor(resolveContext, pos, env, site, argtypes, typeargtypes);
if (sym.kind == MTH) return (MethodSymbol)sym;
else throw new FatalError(
diags.fragment("fatal.err.cant.locate.ctor", site));
@@ -1889,15 +1989,21 @@ public class Resolve {
*/
Symbol resolveOperator(DiagnosticPosition pos, JCTree.Tag optag,
Env<AttrContext> env, List<Type> argtypes) {
- startResolution();
- Name name = treeinfo.operatorName(optag);
- Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes,
- null, false, false, true);
- if (boxingEnabled && sym.kind >= WRONG_MTHS)
- sym = findMethod(env, syms.predefClass.type, name, argtypes,
- null, true, false, true);
- return access(sym, pos, env.enclClass.sym.type, name,
- false, argtypes, null);
+ MethodResolutionContext prevResolutionContext = currentResolutionContext;
+ try {
+ currentResolutionContext = new MethodResolutionContext();
+ Name name = treeinfo.operatorName(optag);
+ Symbol sym = findMethod(env, syms.predefClass.type, name, argtypes,
+ null, false, false, true);
+ if (boxingEnabled && sym.kind >= WRONG_MTHS)
+ sym = findMethod(env, syms.predefClass.type, name, argtypes,
+ null, true, false, true);
+ return access(sym, pos, env.enclClass.sym.type, name,
+ false, argtypes, null);
+ }
+ finally {
+ currentResolutionContext = prevResolutionContext;
+ }
}
/** Resolve operator.
@@ -2010,9 +2116,10 @@ public class Resolve {
* ResolveError classes, indicating error situations when accessing symbols
****************************************************************************/
- public void logAccessError(Env<AttrContext> env, JCTree tree, Type type) {
- AccessError error = new AccessError(env, type.getEnclosingType(), type.tsym);
- logResolveError(error, tree.pos(), type.getEnclosingType().tsym, type.getEnclosingType(), null, null, null);
+ //used by TransTypes when checking target type of synthetic cast
+ public void logAccessErrorInternal(Env<AttrContext> env, JCTree tree, Type type) {
+ AccessError error = new AccessError(env, env.enclClass.type, type.tsym);
+ logResolveError(error, tree.pos(), env.enclClass.sym, env.enclClass.type, null, null, null);
}
//where
private void logResolveError(ResolveError error,
@@ -2241,34 +2348,24 @@ public class Resolve {
* (either a method, a constructor or an operand) is not applicable
* given an actual arguments/type argument list.
*/
- class InapplicableSymbolError extends InvalidSymbolError {
+ class InapplicableSymbolError extends ResolveError {
- /** An auxiliary explanation set in case of instantiation errors. */
- JCDiagnostic explanation;
-
- InapplicableSymbolError(Symbol sym) {
- super(WRONG_MTH, sym, "inapplicable symbol error");
+ InapplicableSymbolError() {
+ super(WRONG_MTH, "inapplicable symbol error");
}
- /** Update sym and explanation and return this.
- */
- InapplicableSymbolError setWrongSym(Symbol sym, JCDiagnostic explanation) {
- this.sym = sym;
- if (this.sym == sym && explanation != null)
- this.explanation = explanation; //update the details
- return this;
+ protected InapplicableSymbolError(int kind, String debugName) {
+ super(kind, debugName);
}
- /** Update sym and return this.
- */
- InapplicableSymbolError setWrongSym(Symbol sym) {
- this.sym = sym;
- return this;
+ @Override
+ public String toString() {
+ return super.toString();
}
@Override
- public String toString() {
- return super.toString() + " explanation=" + explanation;
+ public boolean exists() {
+ return true;
}
@Override
@@ -2293,27 +2390,40 @@ public class Resolve {
key, name, first, second);
}
else {
- Symbol ws = sym.asMemberOf(site, types);
+ Candidate c = errCandidate();
+ Symbol ws = c.sym.asMemberOf(site, types);
return diags.create(dkind, log.currentSource(), pos,
- "cant.apply.symbol" + (explanation != null ? ".1" : ""),
+ "cant.apply.symbol" + (c.details != null ? ".1" : ""),
kindName(ws),
ws.name == names.init ? ws.owner.name : ws.name,
methodArguments(ws.type.getParameterTypes()),
methodArguments(argtypes),
kindName(ws.owner),
ws.owner.type,
- explanation);
+ c.details);
}
}
- void clear() {
- explanation = null;
- }
-
@Override
public Symbol access(Name name, TypeSymbol location) {
return types.createErrorType(name, location, syms.errSymbol.type).tsym;
}
+
+ protected boolean shouldReport(Candidate c) {
+ return !c.isApplicable() &&
+ (((c.sym.flags() & VARARGS) != 0 && c.step == VARARITY) ||
+ (c.sym.flags() & VARARGS) == 0 && c.step == (boxingEnabled ? BOX : BASIC));
+ }
+
+ private Candidate errCandidate() {
+ for (Candidate c : currentResolutionContext.candidates) {
+ if (shouldReport(c)) {
+ return c;
+ }
+ }
+ Assert.error();
+ return null;
+ }
}
/**
@@ -2321,11 +2431,9 @@ public class Resolve {
* (either methods, constructors or operands) is not applicable
* given an actual arguments/type argument list.
*/
- class InapplicableSymbolsError extends ResolveError {
+ class InapplicableSymbolsError extends InapplicableSymbolError {
- private List<Candidate> candidates = List.nil();
-
- InapplicableSymbolsError(Symbol sym) {
+ InapplicableSymbolsError() {
super(WRONG_MTHS, "inapplicable symbols");
}
@@ -2337,7 +2445,7 @@ public class Resolve {
Name name,
List<Type> argtypes,
List<Type> typeargtypes) {
- if (candidates.nonEmpty()) {
+ if (currentResolutionContext.candidates.nonEmpty()) {
JCDiagnostic err = diags.create(dkind,
log.currentSource(),
pos,
@@ -2355,68 +2463,24 @@ public class Resolve {
//where
List<JCDiagnostic> candidateDetails(Type site) {
List<JCDiagnostic> details = List.nil();
- for (Candidate c : candidates)
- details = details.prepend(c.getDiagnostic(site));
+ for (Candidate c : currentResolutionContext.candidates) {
+ if (!shouldReport(c)) continue;
+ JCDiagnostic detailDiag = diags.fragment("inapplicable.method",
+ Kinds.kindName(c.sym),
+ c.sym.location(site, types),
+ c.sym.asMemberOf(site, types),
+ c.details);
+ details = details.prepend(detailDiag);
+ }
return details.reverse();
}
- Symbol addCandidate(MethodResolutionPhase currentStep, Symbol sym, JCDiagnostic details) {
- Candidate c = new Candidate(currentStep, sym, details);
- if (c.isValid() && !candidates.contains(c))
- candidates = candidates.append(c);
- return this;
- }
-
- void clear() {
- candidates = List.nil();
- }
-
private Name getName() {
- Symbol sym = candidates.head.sym;
+ Symbol sym = currentResolutionContext.candidates.head.sym;
return sym.name == names.init ?
sym.owner.name :
sym.name;
}
-
- private class Candidate {
-
- final MethodResolutionPhase step;
- final Symbol sym;
- final JCDiagnostic details;
-
- private Candidate(MethodResolutionPhase step, Symbol sym, JCDiagnostic details) {
- this.step = step;
- this.sym = sym;
- this.details = details;
- }
-
- JCDiagnostic getDiagnostic(Type site) {
- return diags.fragment("inapplicable.method",
- Kinds.kindName(sym),
- sym.location(site, types),
- sym.asMemberOf(site, types),
- details);
- }
-
- @Override
- public boolean equals(Object o) {
- if (o instanceof Candidate) {
- Symbol s1 = this.sym;
- Symbol s2 = ((Candidate)o).sym;
- if ((s1 != s2 &&
- (s1.overrides(s2, s1.owner.type.tsym, types, false) ||
- (s2.overrides(s1, s2.owner.type.tsym, types, false)))) ||
- ((s1.isConstructor() || s2.isConstructor()) && s1.owner != s2.owner))
- return true;
- }
- return false;
- }
-
- boolean isValid() {
- return (((sym.flags() & VARARGS) != 0 && step == VARARITY) ||
- (sym.flags() & VARARGS) == 0 && step == (boxingEnabled ? BOX : BASIC));
- }
- }
}
/**
@@ -2577,29 +2641,91 @@ public class Resolve {
}
}
- private Map<MethodResolutionPhase, Symbol> methodResolutionCache =
- new HashMap<MethodResolutionPhase, Symbol>(MethodResolutionPhase.values().length);
+ final List<MethodResolutionPhase> methodResolutionSteps = List.of(BASIC, BOX, VARARITY);
- private Map<Symbol, JCDiagnostic> verboseResolutionCandidateDiags =
- new LinkedHashMap<Symbol, JCDiagnostic>();
+ /**
+ * A resolution context is used to keep track of intermediate results of
+ * overload resolution, such as list of method that are not applicable
+ * (used to generate more precise diagnostics) and so on. Resolution contexts
+ * can be nested - this means that when each overload resolution routine should
+ * work within the resolution context it created.
+ */
+ class MethodResolutionContext {
- final List<MethodResolutionPhase> methodResolutionSteps = List.of(BASIC, BOX, VARARITY);
+ private List<Candidate> candidates = List.nil();
+
+ private Map<MethodResolutionPhase, Symbol> resolutionCache =
+ new EnumMap<MethodResolutionPhase, Symbol>(MethodResolutionPhase.class);
- private MethodResolutionPhase currentStep = null;
+ private MethodResolutionPhase step = null;
- private boolean internalResolution = false;
+ private boolean internalResolution = false;
- private MethodResolutionPhase firstErroneousResolutionPhase() {
- MethodResolutionPhase bestSoFar = BASIC;
- Symbol sym = methodNotFound;
- List<MethodResolutionPhase> steps = methodResolutionSteps;
- while (steps.nonEmpty() &&
- steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
- sym.kind >= WRONG_MTHS) {
- sym = methodResolutionCache.get(steps.head);
- bestSoFar = steps.head;
- steps = steps.tail;
+ private MethodResolutionPhase firstErroneousResolutionPhase() {
+ MethodResolutionPhase bestSoFar = BASIC;
+ Symbol sym = methodNotFound;
+ List<MethodResolutionPhase> steps = methodResolutionSteps;
+ while (steps.nonEmpty() &&
+ steps.head.isApplicable(boxingEnabled, varargsEnabled) &&
+ sym.kind >= WRONG_MTHS) {
+ sym = resolutionCache.get(steps.head);
+ bestSoFar = steps.head;
+ steps = steps.tail;
+ }
+ return bestSoFar;
+ }
+
+ void addInapplicableCandidate(Symbol sym, JCDiagnostic details) {
+ Candidate c = new Candidate(currentResolutionContext.step, sym, details, null);
+ if (!candidates.contains(c))
+ candidates = candidates.append(c);
+ }
+
+ void addApplicableCandidate(Symbol sym, Type mtype) {
+ Candidate c = new Candidate(currentResolutionContext.step, sym, null, mtype);
+ candidates = candidates.append(c);
+ }
+
+ /**
+ * This class represents an overload resolution candidate. There are two
+ * kinds of candidates: applicable methods and inapplicable methods;
+ * applicable methods have a pointer to the instantiated method type,
+ * while inapplicable candidates contain further details about the
+ * reason why the method has been considered inapplicable.
+ */
+ class Candidate {
+
+ final MethodResolutionPhase step;
+ final Symbol sym;
+ final JCDiagnostic details;
+ final Type mtype;
+
+ private Candidate(MethodResolutionPhase step, Symbol sym, JCDiagnostic details, Type mtype) {
+ this.step = step;
+ this.sym = sym;
+ this.details = details;
+ this.mtype = mtype;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof Candidate) {
+ Symbol s1 = this.sym;
+ Symbol s2 = ((Candidate)o).sym;
+ if ((s1 != s2 &&
+ (s1.overrides(s2, s1.owner.type.tsym, types, false) ||
+ (s2.overrides(s1, s2.owner.type.tsym, types, false)))) ||
+ ((s1.isConstructor() || s2.isConstructor()) && s1.owner != s2.owner))
+ return true;
+ }
+ return false;
+ }
+
+ boolean isApplicable() {
+ return mtype != null;
+ }
}
- return bestSoFar;
}
+
+ MethodResolutionContext currentResolutionContext = null;
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
index b69b498..ecd271b 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/comp/TransTypes.java
@@ -107,7 +107,7 @@ public class TransTypes extends TreeTranslator {
make.at(tree.pos);
if (!types.isSameType(tree.type, target)) {
if (!resolve.isAccessible(env, target.tsym))
- resolve.logAccessError(env, tree, target);
+ resolve.logAccessErrorInternal(env, tree, target);
tree = make.TypeCast(make.Type(target), tree).setType(target);
}
make.pos = oldpos;
diff --git a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
index 2439cf7..c09d893 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/file/Locations.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -769,7 +769,8 @@ public class Locations {
new SimpleLocationHandler(StandardLocation.SOURCE_PATH, Option.SOURCEPATH),
new SimpleLocationHandler(StandardLocation.ANNOTATION_PROCESSOR_PATH, Option.PROCESSORPATH),
new OutputLocationHandler((StandardLocation.CLASS_OUTPUT), Option.D),
- new OutputLocationHandler((StandardLocation.SOURCE_OUTPUT), Option.S)
+ new OutputLocationHandler((StandardLocation.SOURCE_OUTPUT), Option.S),
+ new OutputLocationHandler((StandardLocation.NATIVE_HEADER_OUTPUT), Option.H)
};
for (LocationHandler h: handlers) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
index 84648d2..de21faf 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
@@ -1275,7 +1275,7 @@ public class ClassReader implements Completer {
if (viewName != null) {
ViewDeclaration d = new ViewDeclaration(viewName, directives.reverse());
- directives = directives.prepend(d);
+ msym.directives = msym.directives.prepend(d);
}
}
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
index cc44291..b36ccd6 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* 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/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
index 67d4a81..52d963f 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,8 +28,8 @@ package com.sun.tools.javac.main;
import java.io.*;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.LinkedHashSet;
import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.Queue;
@@ -41,13 +41,15 @@ import java.util.logging.Logger;
import javax.annotation.processing.Processor;
import javax.lang.model.SourceVersion;
+import javax.tools.DiagnosticListener;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
-import javax.tools.DiagnosticListener;
+import javax.tools.StandardLocation;
-import com.sun.source.util.TaskEvent;
-import com.sun.source.util.TaskListener;
+import static javax.tools.StandardLocation.CLASS_OUTPUT;
+import com.sun.source.util.TaskEvent;
+import com.sun.tools.javac.api.MultiTaskListener;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Lint.LintCategory;
import com.sun.tools.javac.code.Symbol.*;
@@ -61,7 +63,6 @@ import com.sun.tools.javac.tree.JCTree.*;
import com.sun.tools.javac.util.*;
import com.sun.tools.javac.util.Log.WriterKind;
-import static javax.tools.StandardLocation.CLASS_OUTPUT;
import static com.sun.tools.javac.main.Option.*;
import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
import static com.sun.tools.javac.util.ListBuffer.lb;
@@ -229,6 +230,10 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
*/
protected ClassWriter writer;
+ /** The native header writer.
+ */
+ protected JNIWriter jniWriter;
+
/** The module for the symbol table entry phases.
*/
protected Enter enter;
@@ -289,9 +294,9 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
*/
protected ParserFactory parserFactory;
- /** Optional listener for progress events
+ /** Broadcasting listener for progress events
*/
- protected TaskListener taskListener;
+ protected MultiTaskListener taskListener;
/**
* Annotation processing may require and provide a new instance
@@ -332,6 +337,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
reader = ClassReader.instance(context);
make = TreeMaker.instance(context);
writer = ClassWriter.instance(context);
+ jniWriter = JNIWriter.instance(context);
enter = Enter.instance(context);
todo = Todo.instance(context);
@@ -356,7 +362,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
lower = Lower.instance(context);
annotate = Annotate.instance(context);
types = Types.instance(context);
- taskListener = context.get(TaskListener.class);
+ taskListener = MultiTaskListener.instance(context);
reader.sourceCompleter = this;
@@ -591,7 +597,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
if (verbose) {
log.printVerbose("parsing.started", filename);
}
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.PARSE, filename);
taskListener.started(e);
}
@@ -604,7 +610,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
tree.sourcefile = filename;
- if (content != null && taskListener != null) {
+ if (content != null && !taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.PARSE, tree);
taskListener.finished(e);
}
@@ -746,14 +752,14 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
log.useSource(prev);
}
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.ENTER, tree);
taskListener.started(e);
}
enter.complete(List.of(tree), c);
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.ENTER, tree);
taskListener.finished(e);
}
@@ -931,7 +937,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
*/
public List<JCCompilationUnit> enterTrees(List<JCCompilationUnit> roots) {
//enter symbols for all files
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
for (JCCompilationUnit unit: roots) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.ENTER, unit);
taskListener.started(e);
@@ -940,7 +946,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
enter.main(roots);
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
for (JCCompilationUnit unit: roots) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.ENTER, unit);
taskListener.finished(e);
@@ -1009,7 +1015,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
reader.saveParameterNames = true;
keepComments = true;
genEndPos = true;
- if (taskListener != null)
+ if (!taskListener.isEmpty())
taskListener.started(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING));
log.deferDiagnostics = true;
} else { // free resources
@@ -1024,7 +1030,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
}
/**
- * Process any anotations found in the specifed compilation units.
+ * Process any annotations found in the specified compilation units.
* @param roots a list of compilation units
* @return an instance of the compiler in which to complete the compilation
*/
@@ -1084,7 +1090,9 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
boolean errors = false;
for (String nameStr : classnames) {
Symbol sym = resolveBinaryNameOrIdent(nameStr);
- if (sym == null || (sym.kind == Kinds.PCK && !processPcks)) {
+ if (sym == null ||
+ (sym.kind == Kinds.PCK && !processPcks) ||
+ sym.kind == Kinds.ABSENT_TYP) {
log.error("proc.cant.find.class", nameStr);
errors = true;
continue;
@@ -1181,7 +1189,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
if (verbose)
log.printVerbose("checking.attribution", env.enclClass.sym);
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.ANALYZE, env.toplevel, env.enclClass.sym);
taskListener.started(e);
}
@@ -1264,7 +1272,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
}
}
finally {
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.ANALYZE, env.toplevel, env.enclClass.sym);
taskListener.finished(e);
}
@@ -1445,7 +1453,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
+ " " + cdef.sym + "]");
}
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.GENERATE, env.toplevel, cdef.sym);
taskListener.started(e);
}
@@ -1457,8 +1465,13 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
JavaFileObject file;
if (usePrintSource)
file = printSource(env, cdef);
- else
+ else {
+ if (fileManager.hasLocation(StandardLocation.NATIVE_HEADER_OUTPUT)
+ && jniWriter.needsHeader(cdef.sym)) {
+ jniWriter.write(cdef.sym);
+ }
file = genCode(env, cdef);
+ }
if (results != null && file != null)
results.add(file);
} catch (IOException ex) {
@@ -1469,7 +1482,7 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
log.useSource(prev);
}
- if (taskListener != null) {
+ if (!taskListener.isEmpty()) {
TaskEvent e = new TaskEvent(TaskEvent.Kind.GENERATE, env.toplevel, cdef.sym);
taskListener.finished(e);
}
diff --git a/langtools/src/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/share/classes/com/sun/tools/javac/main/Option.java
index baffcfa..7ed7c2c 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/main/Option.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/main/Option.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -164,6 +164,8 @@ public enum Option {
S("-s", "opt.arg.directory", "opt.sourceDest", STANDARD, FILEMANAGER),
+ H("-h", "opt.arg.directory", "opt.headerDest", STANDARD, FILEMANAGER),
+
IMPLICIT("-implicit:", "opt.implicit", STANDARD, BASIC, ONEOF, "none", "class"),
ENCODING("-encoding", "opt.arg.encoding", "opt.encoding", STANDARD, FILEMANAGER) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
index 93215be..2140e7d 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,34 +25,33 @@
package com.sun.tools.javac.processing;
-import java.lang.reflect.*;
-import java.util.*;
-import java.util.regex.*;
-
-import java.net.URL;
import java.io.Closeable;
import java.io.File;
import java.io.PrintWriter;
-import java.io.IOException;
import java.io.StringWriter;
import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.*;
+import java.util.regex.*;
import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
-import javax.lang.model.element.TypeElement;
import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
import javax.lang.model.util.*;
+import javax.tools.DiagnosticListener;
import javax.tools.JavaFileManager;
-import javax.tools.StandardJavaFileManager;
import javax.tools.JavaFileObject;
-import javax.tools.DiagnosticListener;
+import javax.tools.StandardJavaFileManager;
+import static javax.tools.StandardLocation.*;
+import com.sun.source.util.JavacTask;
import com.sun.source.util.TaskEvent;
-import com.sun.source.util.TaskListener;
import com.sun.tools.javac.api.JavacTaskImpl;
import com.sun.tools.javac.api.JavacTrees;
+import com.sun.tools.javac.api.MultiTaskListener;
import com.sun.tools.javac.code.*;
import com.sun.tools.javac.code.Symbol.*;
import com.sun.tools.javac.file.FSInfo;
@@ -71,19 +70,16 @@ import com.sun.tools.javac.util.Assert;
import com.sun.tools.javac.util.ClientCodeException;
import com.sun.tools.javac.util.Context;
import com.sun.tools.javac.util.Convert;
-import com.sun.tools.javac.util.FatalError;
import com.sun.tools.javac.util.JCDiagnostic;
+import com.sun.tools.javac.util.JavacMessages;
import com.sun.tools.javac.util.List;
import com.sun.tools.javac.util.Log;
-import com.sun.tools.javac.util.JavacMessages;
import com.sun.tools.javac.util.Name;
import com.sun.tools.javac.util.Names;
import com.sun.tools.javac.util.Options;
-
-import static javax.tools.StandardLocation.*;
-import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
-import static com.sun.tools.javac.main.Option.*;
import static com.sun.tools.javac.code.Lint.LintCategory.PROCESSING;
+import static com.sun.tools.javac.main.Option.*;
+import static com.sun.tools.javac.util.JCDiagnostic.DiagnosticFlag.*;
/**
* Objects of this class hold and manage the state needed to support
@@ -157,6 +153,8 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
*/
private JavacMessages messages;
+ private MultiTaskListener taskListener;
+
private Context context;
public JavacProcessingEnvironment(Context context, Iterable<? extends Processor> processors) {
@@ -185,6 +183,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
processorOptions = initProcessorOptions(context);
unmatchedProcessorOptions = initUnmatchedProcessorOptions();
messages = JavacMessages.instance(context);
+ taskListener = MultiTaskListener.instance(context);
initProcessorIterator(context, processors);
}
@@ -976,8 +975,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
void run(boolean lastRound, boolean errorStatus) {
printRoundInfo(lastRound);
- TaskListener taskListener = context.get(TaskListener.class);
- if (taskListener != null)
+ if (!taskListener.isEmpty())
taskListener.started(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING_ROUND));
try {
@@ -993,7 +991,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
discoverAndRunProcs(context, annotationsPresent, topLevelClasses, packageInfoFiles);
}
} finally {
- if (taskListener != null)
+ if (!taskListener.isEmpty())
taskListener.finished(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING_ROUND));
}
@@ -1051,9 +1049,9 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
if (dl != null)
next.put(DiagnosticListener.class, dl);
- TaskListener tl = context.get(TaskListener.class);
- if (tl != null)
- next.put(TaskListener.class, tl);
+ MultiTaskListener mtl = context.get(MultiTaskListener.taskListenerKey);
+ if (mtl != null)
+ next.put(MultiTaskListener.taskListenerKey, mtl);
FSInfo fsInfo = context.get(FSInfo.class);
if (fsInfo != null)
@@ -1086,9 +1084,9 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
elementUtils.setContext(next);
typeUtils.setContext(next);
- JavacTaskImpl task = context.get(JavacTaskImpl.class);
+ JavacTaskImpl task = (JavacTaskImpl) context.get(JavacTask.class);
if (task != null) {
- next.put(JavacTaskImpl.class, task);
+ next.put(JavacTask.class, task);
task.updateContext(next);
}
@@ -1110,8 +1108,6 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
List<JCCompilationUnit> roots,
List<ClassSymbol> classSymbols,
Iterable<? extends PackageSymbol> pckSymbols) {
-
- TaskListener taskListener = context.get(TaskListener.class);
log = Log.instance(context);
Set<PackageSymbol> specifiedPackages = new LinkedHashSet<PackageSymbol>();
@@ -1182,7 +1178,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
// Free resources
this.close();
- if (taskListener != null)
+ if (!taskListener.isEmpty())
taskListener.finished(new TaskEvent(TaskEvent.Kind.ANNOTATION_PROCESSING));
if (errorStatus) {
diff --git a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties b/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
index 436c0e3..1cc6316 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
+++ b/langtools/src/share/classes/com/sun/tools/javac/resources/javac.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,8 @@ javac.opt.d=\
Specify where to place generated class files
javac.opt.sourceDest=\
Specify where to place generated source files
+javac.opt.headerDest=\
+ Specify where to place generated native header files
javac.opt.J=\
Pass <flag> directly to the runtime system
javac.opt.encoding=\
diff --git a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
index 3e0cc17..d8eae3d 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* 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,6 +103,16 @@ public class TreeInfo {
setOpname(MOD, "%", names);
}
+ public static List<JCExpression> args(JCTree t) {
+ switch (t.getTag()) {
+ case APPLY:
+ return ((JCMethodInvocation)t).args;
+ case NEWCLASS:
+ return ((JCNewClass)t).args;
+ default:
+ return null;
+ }
+ }
/** Return name of operator with given tree tag.
*/
diff --git a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java b/langtools/src/share/classes/com/sun/tools/javac/util/Names.java
index 40fb601..01b629a 100644
--- a/langtools/src/share/classes/com/sun/tools/javac/util/Names.java
+++ b/langtools/src/share/classes/com/sun/tools/javac/util/Names.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,132 +47,149 @@ public class Names {
return instance;
}
- public final Name slash;
- public final Name hyphen;
- public final Name T;
- public final Name slashequals;
- public final Name deprecated;
- public final Name init;
- public final Name clinit;
- public final Name error;
- public final Name any;
+ // operators and punctuation
+ public final Name asterisk;
+ public final Name comma;
+ public final Name double_asterisk;
public final Name empty;
+ public final Name hyphen;
public final Name one;
public final Name period;
- public final Name comma;
public final Name semicolon;
- public final Name asterisk;
- public final Name double_asterisk;
- public final Name _this;
- public final Name _super;
- public final Name _default;
+ public final Name slash;
+ public final Name slashequals;
+
+ // keywords
public final Name _class;
- public final Name java_base;
- public final Name jdk_legacy;
- public final Name java_lang;
- public final Name java_lang_Object;
+ public final Name _default;
+ public final Name _public;
+ public final Name _super;
+ public final Name _this;
+ public final Name exports;
+ public final Name local;
+ public final Name main;
+ public final Name module;
+ public final Name optional;
+ public final Name permits;
+ public final Name provides;
+ public final Name requires;
+ public final Name service;
+ public final Name view;
+ public final Name with;
+
+ // field and method names
+ public final Name _name;
+ public final Name addSuppressed;
+ public final Name any;
+ public final Name append;
+ public final Name clinit;
+ public final Name clone;
+ public final Name close;
+ public final Name compareTo;
+ public final Name desiredAssertionStatus;
+ public final Name equals;
+ public final Name error;
+ public final Name family;
+ public final Name finalize;
+ public final Name forName;
+ public final Name getClass;
+ public final Name getClassLoader;
+ public final Name getComponentType;
+ public final Name getDeclaringClass;
+ public final Name getMessage;
+ public final Name hasNext;
+ public final Name hashCode;
+ public final Name init;
+ public final Name initCause;
+ public final Name iterator;
+ public final Name length;
+ public final Name next;
+ public final Name ordinal;
+ public final Name serialVersionUID;
+ public final Name toString;
+ public final Name value;
+ public final Name valueOf;
+ public final Name values;
+
+ // class names
+ public final Name java_io_Serializable;
+ public final Name java_lang_AutoCloseable;
public final Name java_lang_Class;
public final Name java_lang_Cloneable;
- public final Name java_io_Serializable;
- public final Name serialVersionUID;
public final Name java_lang_Enum;
+ public final Name java_lang_Object;
public final Name java_lang_invoke_MethodHandle;
- public final Name module_info;
- public final Name package_info;
- public final Name ConstantValue;
- public final Name LineNumberTable;
- public final Name LocalVariableTable;
- public final Name LocalVariableTypeTable;
+
+ // names of builtin classes
+ public final Name Array;
+ public final Name Bound;
+ public final Name Method;
+
+ // package names
+ public final Name java_lang;
+
+ // module names
+ public final Name java_base;
+ public final Name jdk_legacy;
+
+ // attribute names
+ public final Name Annotation;
+ public final Name AnnotationDefault;
+ public final Name Bridge;
public final Name CharacterRangeTable;
- public final Name StackMap;
- public final Name StackMapTable;
- public final Name SourceID;
- public final Name CompilationID;
public final Name Code;
- public final Name Exceptions;
- public final Name SourceFile;
- public final Name InnerClasses;
- public final Name Synthetic;
- public final Name Bridge;
+ public final Name CompilationID;
+ public final Name ConstantValue;
public final Name Deprecated;
+ public final Name EnclosingMethod;
public final Name Enum;
- public final Name _name;
- public final Name Signature;
- public final Name Varargs;
- public final Name Annotation;
- public final Name RuntimeVisibleAnnotations;
+ public final Name Exceptions;
+ public final Name InnerClasses;
+ public final Name LineNumberTable;
+ public final Name LocalVariableTable;
+ public final Name LocalVariableTypeTable;
+ public final Name Module;
+ public final Name ModuleData;
+ public final Name ModuleProvides;
+ public final Name ModuleRequires;
public final Name RuntimeInvisibleAnnotations;
- public final Name RuntimeVisibleTypeAnnotations;
+ public final Name RuntimeInvisibleParameterAnnotations;
public final Name RuntimeInvisibleTypeAnnotations;
+ public final Name RuntimeVisibleAnnotations;
public final Name RuntimeVisibleParameterAnnotations;
- public final Name RuntimeInvisibleParameterAnnotations;
+ public final Name RuntimeVisibleTypeAnnotations;
+ public final Name Signature;
+ public final Name SourceFile;
+ public final Name SourceID;
+ public final Name StackMap;
+ public final Name StackMapTable;
+ public final Name Synthetic;
public final Name Value;
- public final Name EnclosingMethod;
- public final Name desiredAssertionStatus;
- public final Name append;
- public final Name family;
- public final Name forName;
- public final Name toString;
- public final Name length;
- public final Name valueOf;
- public final Name value;
- public final Name getMessage;
- public final Name getClass;
- public final Name TYPE;
- public final Name TYPE_USE;
- public final Name TYPE_PARAMETER;
- public final Name FIELD;
- public final Name METHOD;
- public final Name PARAMETER;
+ public final Name Varargs;
+
+ // members of java.lang.annotation.ElementType
+ public final Name ANNOTATION_TYPE;
public final Name CONSTRUCTOR;
+ public final Name FIELD;
public final Name LOCAL_VARIABLE;
- public final Name ANNOTATION_TYPE;
+ public final Name METHOD;
public final Name PACKAGE;
- public final Name SOURCE;
+ public final Name PARAMETER;
+ public final Name TYPE;
+ public final Name TYPE_PARAMETER;
+ public final Name TYPE_USE;
+
+ // members of java.lang.annotation.RetentionPolicy
public final Name CLASS;
public final Name RUNTIME;
- public final Name Array;
- public final Name Method;
- public final Name Bound;
- public final Name clone;
- public final Name getComponentType;
- public final Name getClassLoader;
- public final Name initCause;
- public final Name values;
- public final Name iterator;
- public final Name hasNext;
- public final Name next;
- public final Name AnnotationDefault;
- public final Name ordinal;
- public final Name equals;
- public final Name hashCode;
- public final Name compareTo;
- public final Name getDeclaringClass;
+ public final Name SOURCE;
+
+ // other identifiers
+ public final Name T;
+ public final Name deprecated;
public final Name ex;
- public final Name finalize;
- public final Name java_lang_AutoCloseable;
- public final Name close;
- public final Name addSuppressed;
- public final Name module;
- public final Name Module;
- public final Name exports;
- public final Name requires;
- public final Name provides;
- public final Name permits;
- public final Name service;
- public final Name synthetic;
- public final Name view;
- public final Name with;
- public final Name ModuleClass;
- public final Name ModuleData;
- public final Name ModuleExport;
- public final Name ModulePermits;
- public final Name ModuleProvides;
- public final Name ModuleRequires;
- public final Name _public;
- public final Name optional;
- public final Name local;
- public final Name main;
+ public final Name module_info;
+ public final Name package_info;
public final Name.Table table;
@@ -180,141 +197,149 @@ public class Names {
Options options = Options.instance(context);
table = createTable(options);
- slash = fromString("/");
- hyphen = fromString("-");
- T = fromString("T");
- slashequals = fromString("/=");
- deprecated = fromString("deprecated");
-
- init = fromString("<init>");
- clinit = fromString("<clinit>");
- error = fromString("<error>");
- any = fromString("<any>");
+ // operators and punctuation
+ asterisk = fromString("*");
+ comma = fromString(",");
+ double_asterisk = fromString("**");
empty = fromString("");
+ hyphen = fromString("-");
one = fromString("1");
period = fromString(".");
- comma = fromString(",");
semicolon = fromString(";");
- asterisk = fromString("*");
- double_asterisk = fromString("**");
- _this = fromString("this");
- _super = fromString("super");
- _default = fromString("default");
+ slash = fromString("/");
+ slashequals = fromString("/=");
+ // keywords
_class = fromString("class");
- java_base = fromString("jdk.base"); // FIXME: update when alias support working
- jdk_legacy = fromString("jdk"); // FIXME: update when alias support working
- java_lang = fromString("java.lang");
- java_lang_Object = fromString("java.lang.Object");
+ _default = fromString("default");
+ _public = fromString("public");
+ _super = fromString("super");
+ _this = fromString("this");
+ exports = fromString("exports");
+ local = fromString("local");
+ main = fromString("main");
+ module = fromString("module");
+ optional = fromString("optional");
+ permits = fromString("permits");
+ provides = fromString("provides");
+ requires = fromString("requires");
+ service = fromString("service");
+ view = fromString("view");
+ with = fromString("with");
+
+ // field and method names
+ _name = fromString("name");
+ addSuppressed = fromString("addSuppressed");
+ any = fromString("<any>");
+ append = fromString("append");
+ clinit = fromString("<clinit>");
+ clone = fromString("clone");
+ close = fromString("close");
+ compareTo = fromString("compareTo");
+ desiredAssertionStatus = fromString("desiredAssertionStatus");
+ equals = fromString("equals");
+ error = fromString("<error>");
+ family = fromString("family");
+ finalize = fromString("finalize");
+ forName = fromString("forName");
+ getClass = fromString("getClass");
+ getClassLoader = fromString("getClassLoader");
+ getComponentType = fromString("getComponentType");
+ getDeclaringClass = fromString("getDeclaringClass");
+ getMessage = fromString("getMessage");
+ hasNext = fromString("hasNext");
+ hashCode = fromString("hashCode");
+ init = fromString("<init>");
+ initCause = fromString("initCause");
+ iterator = fromString("iterator");
+ length = fromString("length");
+ next = fromString("next");
+ ordinal = fromString("ordinal");
+ serialVersionUID = fromString("serialVersionUID");
+ toString = fromString("toString");
+ value = fromString("value");
+ valueOf = fromString("valueOf");
+ values = fromString("values");
+
+ // class names
+ java_io_Serializable = fromString("java.io.Serializable");
+ java_lang_AutoCloseable = fromString("java.lang.AutoCloseable");
java_lang_Class = fromString("java.lang.Class");
java_lang_Cloneable = fromString("java.lang.Cloneable");
- java_io_Serializable = fromString("java.io.Serializable");
java_lang_Enum = fromString("java.lang.Enum");
+ java_lang_Object = fromString("java.lang.Object");
java_lang_invoke_MethodHandle = fromString("java.lang.invoke.MethodHandle");
- module_info = fromString("module-info");
- package_info = fromString("package-info");
- serialVersionUID = fromString("serialVersionUID");
- ConstantValue = fromString("ConstantValue");
- LineNumberTable = fromString("LineNumberTable");
- LocalVariableTable = fromString("LocalVariableTable");
- LocalVariableTypeTable = fromString("LocalVariableTypeTable");
+
+ // names of builtin classes
+ Array = fromString("Array");
+ Bound = fromString("Bound");
+ Method = fromString("Method");
+
+ // package names
+ java_lang = fromString("java.lang");
+
+ // module names
+ java_base = fromString("jdk.base"); // FIXME: update when alias support working
+ jdk_legacy = fromString("jdk"); // FIXME: update when alias support working
+
+ // attribute names
+ Annotation = fromString("Annotation");
+ AnnotationDefault = fromString("AnnotationDefault");
+ Bridge = fromString("Bridge");
CharacterRangeTable = fromString("CharacterRangeTable");
- StackMap = fromString("StackMap");
- StackMapTable = fromString("StackMapTable");
- SourceID = fromString("SourceID");
- CompilationID = fromString("CompilationID");
Code = fromString("Code");
- Exceptions = fromString("Exceptions");
- SourceFile = fromString("SourceFile");
- InnerClasses = fromString("InnerClasses");
- Synthetic = fromString("Synthetic");
- Bridge = fromString("Bridge");
+ CompilationID = fromString("CompilationID");
+ ConstantValue = fromString("ConstantValue");
Deprecated = fromString("Deprecated");
+ EnclosingMethod = fromString("EnclosingMethod");
Enum = fromString("Enum");
- _name = fromString("name");
- Signature = fromString("Signature");
- Varargs = fromString("Varargs");
- Annotation = fromString("Annotation");
- RuntimeVisibleAnnotations = fromString("RuntimeVisibleAnnotations");
+ Exceptions = fromString("Exceptions");
+ InnerClasses = fromString("InnerClasses");
+ LineNumberTable = fromString("LineNumberTable");
+ LocalVariableTable = fromString("LocalVariableTable");
+ LocalVariableTypeTable = fromString("LocalVariableTypeTable");
+ Module = fromString("Module");
+ ModuleData = fromString("ModuleData");
+ ModuleProvides = fromString("ModuleProvides");
+ ModuleRequires = fromString("ModuleRequires");
RuntimeInvisibleAnnotations = fromString("RuntimeInvisibleAnnotations");
- RuntimeVisibleTypeAnnotations = fromString("RuntimeVisibleTypeAnnotations");
+ RuntimeInvisibleParameterAnnotations = fromString("RuntimeInvisibleParameterAnnotations");
RuntimeInvisibleTypeAnnotations = fromString("RuntimeInvisibleTypeAnnotations");
+ RuntimeVisibleAnnotations = fromString("RuntimeVisibleAnnotations");
RuntimeVisibleParameterAnnotations = fromString("RuntimeVisibleParameterAnnotations");
- RuntimeInvisibleParameterAnnotations = fromString("RuntimeInvisibleParameterAnnotations");
+ RuntimeVisibleTypeAnnotations = fromString("RuntimeVisibleTypeAnnotations");
+ Signature = fromString("Signature");
+ SourceFile = fromString("SourceFile");
+ SourceID = fromString("SourceID");
+ StackMap = fromString("StackMap");
+ StackMapTable = fromString("StackMapTable");
+ Synthetic = fromString("Synthetic");
Value = fromString("Value");
- EnclosingMethod = fromString("EnclosingMethod");
-
- desiredAssertionStatus = fromString("desiredAssertionStatus");
-
- append = fromString("append");
- family = fromString("family");
- forName = fromString("forName");
- toString = fromString("toString");
- length = fromString("length");
- valueOf = fromString("valueOf");
- value = fromString("value");
- getMessage = fromString("getMessage");
- getClass = fromString("getClass");
+ Varargs = fromString("Varargs");
- TYPE = fromString("TYPE");
- TYPE_USE = fromString("TYPE_USE");
- TYPE_PARAMETER = fromString("TYPE_PARAMETER");
- FIELD = fromString("FIELD");
- METHOD = fromString("METHOD");
- PARAMETER = fromString("PARAMETER");
+ // members of java.lang.annotation.ElementType
+ ANNOTATION_TYPE = fromString("ANNOTATION_TYPE");
CONSTRUCTOR = fromString("CONSTRUCTOR");
+ FIELD = fromString("FIELD");
LOCAL_VARIABLE = fromString("LOCAL_VARIABLE");
- ANNOTATION_TYPE = fromString("ANNOTATION_TYPE");
+ METHOD = fromString("METHOD");
PACKAGE = fromString("PACKAGE");
+ PARAMETER = fromString("PARAMETER");
+ TYPE = fromString("TYPE");
+ TYPE_PARAMETER = fromString("TYPE_PARAMETER");
+ TYPE_USE = fromString("TYPE_USE");
- SOURCE = fromString("SOURCE");
+ // members of java.lang.annotation.RetentionPolicy
CLASS = fromString("CLASS");
RUNTIME = fromString("RUNTIME");
+ SOURCE = fromString("SOURCE");
- Array = fromString("Array");
- Method = fromString("Method");
- Bound = fromString("Bound");
- clone = fromString("clone");
- getComponentType = fromString("getComponentType");
- getClassLoader = fromString("getClassLoader");
- initCause = fromString("initCause");
- values = fromString("values");
- iterator = fromString("iterator");
- hasNext = fromString("hasNext");
- next = fromString("next");
- AnnotationDefault = fromString("AnnotationDefault");
- ordinal = fromString("ordinal");
- equals = fromString("equals");
- hashCode = fromString("hashCode");
- compareTo = fromString("compareTo");
- getDeclaringClass = fromString("getDeclaringClass");
+ // other identifiers
+ T = fromString("T");
+ deprecated = fromString("deprecated");
ex = fromString("ex");
- finalize = fromString("finalize");
-
- java_lang_AutoCloseable = fromString("java.lang.AutoCloseable");
- close = fromString("close");
- addSuppressed = fromString("addSuppressed");
- module = fromString("module");
- Module = fromString("Module");
- exports = fromString("exports");
- requires = fromString("requires");
- provides = fromString("provides");
- permits = fromString("permits");
- service = fromString("service");
- synthetic = fromString("synthetic");
- view = fromString("view");
- with = fromString("with");
- ModuleClass = fromString("ModuleClass");
- ModuleData = fromString("ModuleData");
- ModuleExport = fromString("ModuleExport");
- ModulePermits = fromString("ModulePermits");
- ModuleProvides = fromString("ModuleProvides");
- ModuleRequires = fromString("ModuleRequires");
- _public = fromString("public");
- optional = fromString("optional");
- local = fromString("local");
- main = fromString("main");
-
+ module_info = fromString("module-info");
+ package_info = fromString("package-info");
}
protected Name.Table createTable(Options options) {
diff --git a/langtools/src/share/classes/javax/tools/StandardLocation.java b/langtools/src/share/classes/javax/tools/StandardLocation.java
index 5e8cc69..db7cf45 100644
--- a/langtools/src/share/classes/javax/tools/StandardLocation.java
+++ b/langtools/src/share/classes/javax/tools/StandardLocation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -69,6 +69,12 @@ public enum StandardLocation implements Location {
PLATFORM_CLASS_PATH,
/**
+ * Location of new native header files.
+ * @since 1.8
+ */
+ NATIVE_HEADER_OUTPUT,
+
+ /**
* Location to search for existing module class files.
*/
MODULE_PATH;
@@ -102,6 +108,13 @@ public enum StandardLocation implements Location {
public String getName() { return name(); }
public boolean isOutputLocation() {
- return this == CLASS_OUTPUT || this == SOURCE_OUTPUT;
+ switch (this) {
+ case CLASS_OUTPUT:
+ case SOURCE_OUTPUT:
+ case NATIVE_HEADER_OUTPUT:
+ return true;
+ default:
+ return false;
+ }
}
}
diff --git a/langtools/test/Makefile b/langtools/test/Makefile
index 8964a00..c77f564 100644
--- a/langtools/test/Makefile
+++ b/langtools/test/Makefile
@@ -36,6 +36,14 @@ ifeq ($(OSNAME), Linux)
ARCH=i586
endif
endif
+ifeq ($(OSNAME), Darwin)
+ PLATFORM = bsd
+ JT_PLATFORM = linux
+ ARCH = $(shell uname -m)
+ ifeq ($(ARCH), i386)
+ ARCH=i586
+ endif
+endif
ifeq ($(OSNAME), Windows_NT)
# MKS
PLATFORM=windows
@@ -251,6 +259,7 @@ javap: JTREG_TESTDIRS = tools/javap
# JTREG_REFERENCE
# (Optional) reference results (e.g. work, report or summary.txt)
#
+jtreg_tests: jtreg-tests
jtreg-tests: check-jtreg FRC
@rm -f -r $(JTREG_OUTPUT_DIR)/JTwork $(JTREG_OUTPUT_DIR)/JTreport \
$(JTREG_OUTPUT_DIR)/diff.html $(JTREG_OUTPUT_DIR)/status.txt
diff --git a/langtools/test/jprt.config b/langtools/test/jprt.config
deleted file mode 100644
index 3d6c975..0000000
--- a/langtools/test/jprt.config
+++ /dev/null
@@ -1,159 +0,0 @@
-#!echo "This is not a shell script"
-#############################################################################
-# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#############################################################################
-#
-# JPRT shell configuration for testing.
-#
-# Input environment variables:
-# Windows Only:
-# PATH
-# ROOTDIR
-#
-# Output variable settings:
-# make Full path to GNU make
-#
-# Output environment variables:
-# PATH
-#
-#############################################################################
-
-#############################################################################
-# Error
-error() # message
-{
- echo "ERROR: $1"
- exit 6
-}
-# Directory must exist
-dirMustExist() # dir name
-{
- if [ ! -d "$1" ] ; then
- error "Directory for $2 does not exist: $1"
- fi
-}
-# File must exist
-fileMustExist() # dir name
-{
- if [ ! -f "$1" ] ; then
- error "File for $2 does not exist: $1"
- fi
-}
-#############################################################################
-
-# Should be set by JPRT as the 3 basic inputs
-slashjava="${ALT_SLASH_JAVA}"
-if [ "${slashjava}" = "" ] ; then
- slashjava=/java
-fi
-
-# Check input
-dirMustExist "${slashjava}" ALT_SLASH_JAVA
-
-# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
-osname=`uname -s`
-if [ "${osname}" = SunOS ] ; then
-
- # SOLARIS: Sparc or X86
- osarch=`uname -p`
- if [ "${osarch}" = sparc ] ; then
- solaris_arch=sparc
- else
- solaris_arch=i386
- fi
-
- # Add basic solaris system paths
- path4sdk=/usr/ccs/bin:/usr/ccs/lib:/usr/bin:/bin:/usr/sfw/bin
-
- # Find GNU make
- make=/usr/sfw/bin/gmake
- if [ ! -f ${make} ] ; then
- make=/opt/sfw/bin/gmake
- if [ ! -f ${make} ] ; then
- make=${slashjava}/devtools/${solaris_arch}/bin/gnumake
- fi
- fi
- fileMustExist "${make}" make
-
- # File creation mask
- umask 002
-
-elif [ "${osname}" = Linux ] ; then
-
- # Add basic paths
- path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-
- # Find GNU make
- make=/usr/bin/make
- fileMustExist "${make}" make
-
- umask 002
-
-else
-
- # Windows: Differs on CYGWIN vs. MKS.
-
- # We need to determine if we are running a CYGWIN shell or an MKS shell
- # (if uname isn't available, then it will be unix_toolset=unknown)
- unix_toolset=unknown
- if [ "`uname -a | fgrep Cygwin`" = "" -a -d "${ROOTDIR}" ] ; then
- # We kind of assume ROOTDIR is where MKS is and it's ok
- unix_toolset=MKS
- mkshome=`dosname -s "${ROOTDIR}"`
- # Most unix utilities are in the mksnt directory of ROOTDIR
- unixcommand_path="${mkshome}/mksnt"
- path4sdk="${unixcommand_path}"
- devtools_path="${slashjava}/devtools/win32/bin"
- path4sdk="${devtools_path};${path4sdk}"
- # Find GNU make
- make="${devtools_path}/gnumake.exe"
- fileMustExist "${make}" make
- elif [ "`uname -a | fgrep Cygwin`" != "" -a -f /bin/cygpath ] ; then
- # For CYGWIN, uname will have "Cygwin" in it, and /bin/cygpath should exist
- unix_toolset=CYGWIN
- # Most unix utilities are in the /usr/bin
- unixcommand_path="/usr/bin"
- path4sdk="${unixcommand_path}"
- # Find GNU make
- make="${unixcommand_path}/make.exe"
- fileMustExist "${make}" make
- else
- echo "WARNING: Cannot figure out if this is MKS or CYGWIN"
- fi
-
-
- # For windows, it's hard to know where the system is, so we just add this
- # to PATH.
- slash_path="`echo ${path4sdk} | sed -e 's@\\\\@/@g' -e 's@//@/@g' -e 's@/$@@' -e 's@/;@;@g'`"
- path4sdk="${slash_path};${PATH}"
-
- # Convert path4sdk to cygwin style
- if [ "${unix_toolset}" = CYGWIN ] ; then
- path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
- fi
-
-fi
-
-# Export PATH setting
-PATH="${path4sdk}"
-export PATH
-
diff --git a/langtools/test/tools/apt/Basics/Aggregate.java b/langtools/test/tools/apt/Basics/Aggregate.java
deleted file mode 100644
index d74342b..0000000
--- a/langtools/test/tools/apt/Basics/Aggregate.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public class Aggregate {
- static {
- System.out.println("xxyzzy");
- }
-
- private Aggregate() {}
-
- private static double hypot(double Berkeley, double SantaCruz) {
- return 0.0;
- }
-
- public int hashcode() {return 42;}
- public boolean equals(Aggregate a) {return this == a;}
-
- public static void main(String[] argv) {
- System.out.println("Hello World.");
- }
-}
diff --git a/langtools/test/tools/apt/Basics/ClassAnnotations.java b/langtools/test/tools/apt/Basics/ClassAnnotations.java
deleted file mode 100644
index 97d28ca..0000000
--- a/langtools/test/tools/apt/Basics/ClassAnnotations.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import annot.*;
-import annot.annot2.*;
-
- at MySimple("value") @MyMarker
- at AnnotMarker @AnnotSimple("foo")
- at AnnotMarker2 @AnnotSimple2("bar")
-public class ClassAnnotations {
- static double d;
-
- public void foo() {
- return;
- }
-
- private double bar(int baz) {
- @AnnotShangri_la
- int local = 0;
- return (double) baz;
- }
-
- static class NestedClass {
- protected int field;
- }
-}
diff --git a/langtools/test/tools/apt/Basics/FreshnessApf.java b/langtools/test/tools/apt/Basics/FreshnessApf.java
deleted file mode 100644
index 100c4fe..0000000
--- a/langtools/test/tools/apt/Basics/FreshnessApf.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Indirect test of whether source or class files are used to provide
- * declaration information.
- */
-public class FreshnessApf implements AnnotationProcessorFactory {
- // Process any set of annotations
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("*"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new FreshnessAp(env);
- }
-
- private static class FreshnessAp implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- FreshnessAp(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- public void process() {
- System.out.println("Testing for freshness.");
- boolean empty = true;
- for (TypeDeclaration typeDecl : env.getSpecifiedTypeDeclarations()) {
- for (FieldDeclaration fieldDecl: typeDecl.getFields() ) {
- empty = false;
- System.out.println(typeDecl.getQualifiedName() +
- "." + fieldDecl.getSimpleName());
-
- // Verify the declaration for the type of the
- // field is a class with an annotation.
- System.out.println(((DeclaredType) fieldDecl.getType()).getDeclaration().getAnnotationMirrors());
- if (((DeclaredType) fieldDecl.getType()).getDeclaration().getAnnotationMirrors().size() == 0)
- env.getMessager().printError("Expected an annotation.");
- }
- }
-
- if (empty)
- env.getMessager().printError("No fields encountered.");
- }
- }
-}
diff --git a/langtools/test/tools/apt/Basics/GenClass.java b/langtools/test/tools/apt/Basics/GenClass.java
deleted file mode 100644
index ad3a7a2..0000000
--- a/langtools/test/tools/apt/Basics/GenClass.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/*
- * A trivial generic class to test the fix for 5018369.
- */
-
-class GenClass<T> {
-}
diff --git a/langtools/test/tools/apt/Basics/Indirect.java b/langtools/test/tools/apt/Basics/Indirect.java
deleted file mode 100644
index 0f59bef..0000000
--- a/langtools/test/tools/apt/Basics/Indirect.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/*
- * Class that is used to provide a pointer to another class
- * declaration.
- */
-public class Indirect {
- Milk skim = null;
-}
diff --git a/langtools/test/tools/apt/Basics/Lacuna.java b/langtools/test/tools/apt/Basics/Lacuna.java
deleted file mode 100644
index cc0bfd3..0000000
--- a/langtools/test/tools/apt/Basics/Lacuna.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-class Lacuna extends Missing {}
diff --git a/langtools/test/tools/apt/Basics/MethodAnnotations.java b/langtools/test/tools/apt/Basics/MethodAnnotations.java
deleted file mode 100644
index 53aee9e..0000000
--- a/langtools/test/tools/apt/Basics/MethodAnnotations.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import annot.*;
-import annot.annot2.*;
-
-public class MethodAnnotations {
- static double d;
-
- @MySimple("value") @MyMarker
- @AnnotMarker @AnnotSimple("foo")
- @AnnotMarker2 @AnnotSimple2("bar")
- public void foo() {
- return;
- }
-
- private double bar(int baz) {
- @AnnotShangri_la
- int local = 0;
- return (double) baz;
- }
-
- static class NestedClass {
- protected int field;
- }
-}
diff --git a/langtools/test/tools/apt/Basics/Milk.java b/langtools/test/tools/apt/Basics/Milk.java
deleted file mode 100644
index 03bbfcf..0000000
--- a/langtools/test/tools/apt/Basics/Milk.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import java.lang.annotation.*;
-
- at Fresh
-public class Milk {
- // Moo.
-}
-
- at Retention(RetentionPolicy.SOURCE)
- at interface Fresh {
-}
diff --git a/langtools/test/tools/apt/Basics/MisMatch.java b/langtools/test/tools/apt/Basics/MisMatch.java
deleted file mode 100644
index ee942ce..0000000
--- a/langtools/test/tools/apt/Basics/MisMatch.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-
-/**
- * Class that uses constructs whose language and vm interpretation
- * differ.
- */
-public class MisMatch {
- static final int constant = 3;
- static int notConstant = 4;
- private static strictfp class NestedClass {
- }
-
- protected abstract class AbstractNestedClass {
- /**
- * Another doc comment.
- *
- * This one has multiple lines.
- */
- void myMethod() throws RuntimeException , Error {}
-
- abstract void myAbstractMethod();
- }
-
- void VarArgsMethod1(Number... num) {
- ;
- }
-
- void VarArgsMethod2(float f, double d, Number... num) {
- ;
- }
-}
-
- at interface Colors {
-}
-
-interface Inter {
- void interfaceMethod();
-}
-
-enum MyEnum {
- RED,
- GREEN,
- BLUE;
-}
diff --git a/langtools/test/tools/apt/Basics/Misc.java b/langtools/test/tools/apt/Basics/Misc.java
deleted file mode 100644
index a119c03..0000000
--- a/langtools/test/tools/apt/Basics/Misc.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/*
- * Class with miscellaneous structures to exercise printing.
- */
-
-import java.util.Collection;
-
-public final class Misc<T> implements Marker2, Marker3 {
- private static final long longConstant = Long.MAX_VALUE;
-
- private static final String asciispecials = "\t\n\u0007";
-
- public void covar(Collection<? extends T> s) {return;}
-
- public void contravar(Collection<? super T> s) {return;}
-
- public <S> S varUse(int i) {return null;}
-
- Object o = (new Object() {}); // verify fix for 5019108
-}
-
-interface Marker1 {}
-
-interface Marker2 extends Marker1 {}
-
-interface Marker3 {}
diff --git a/langtools/test/tools/apt/Basics/MyMarker.java b/langtools/test/tools/apt/Basics/MyMarker.java
deleted file mode 100644
index 4cec4f1..0000000
--- a/langtools/test/tools/apt/Basics/MyMarker.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-
-public @interface MyMarker {
-}
diff --git a/langtools/test/tools/apt/Basics/MySimple.java b/langtools/test/tools/apt/Basics/MySimple.java
deleted file mode 100644
index 882519e..0000000
--- a/langtools/test/tools/apt/Basics/MySimple.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-
-public @interface MySimple {
- String value() default "default";
-}
diff --git a/langtools/test/tools/apt/Basics/NestedClassAnnotations.java b/langtools/test/tools/apt/Basics/NestedClassAnnotations.java
deleted file mode 100644
index 2e6473a..0000000
--- a/langtools/test/tools/apt/Basics/NestedClassAnnotations.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import annot.*;
-import annot.annot2.*;
-
-public class NestedClassAnnotations {
- static double d;
-
- public void foo() {
- return;
- }
-
- public static void baz() {
- }
-
- private double bar(int baz) {
- @AnnotShangri_la
- int local = 0;
- return (double) baz;
- }
-
- @MySimple("value") @MyMarker
- @AnnotMarker @AnnotSimple("foo")
- @AnnotMarker2 @AnnotSimple2("bar")
- static class NestedClass {
- protected int field;
- }
-}
diff --git a/langtools/test/tools/apt/Basics/ParameterAnnotations.java b/langtools/test/tools/apt/Basics/ParameterAnnotations.java
deleted file mode 100644
index 81907eb..0000000
--- a/langtools/test/tools/apt/Basics/ParameterAnnotations.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import annot.*;
-import annot.annot2.*;
-
-public class ParameterAnnotations {
- static double d;
-
- public void foo() {
- return;
- }
-
- private double bar(@MySimple("value") @MyMarker
- @AnnotMarker @AnnotSimple("foo")
- @AnnotMarker2 @AnnotSimple2("bar")
- int baz) {
- @AnnotShangri_la
- int local = 0;
- return (double) baz;
- }
-
- static class NestedClass {
- protected int field;
- }
-}
diff --git a/langtools/test/tools/apt/Basics/StaticFieldAnnotations.java b/langtools/test/tools/apt/Basics/StaticFieldAnnotations.java
deleted file mode 100644
index 5169ba0..0000000
--- a/langtools/test/tools/apt/Basics/StaticFieldAnnotations.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import annot.*;
-import annot.annot2.*;
-
-public class StaticFieldAnnotations {
- @MySimple("value") @MyMarker
- @AnnotMarker @AnnotSimple("foo")
- @AnnotMarker2 @AnnotSimple2("bar")
- static double d;
-
- public void foo() {
- return;
- }
-
- private double bar(int baz) {
- @AnnotShangri_la
- int local = 0;
- return (double) baz;
- }
-
- static class NestedClass {
- protected int field;
- }
-}
diff --git a/langtools/test/tools/apt/Basics/StaticMethodAnnotations.java b/langtools/test/tools/apt/Basics/StaticMethodAnnotations.java
deleted file mode 100644
index 838c607..0000000
--- a/langtools/test/tools/apt/Basics/StaticMethodAnnotations.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import annot.*;
-import annot.annot2.*;
-
-public class StaticMethodAnnotations {
- static double d;
-
- public void foo() {
- return;
- }
-
- @MySimple("value") @MyMarker
- @AnnotMarker @AnnotSimple("foo")
- @AnnotMarker2 @AnnotSimple2("bar")
- public static void baz() {
- }
-
- private double bar(int baz) {
- @AnnotShangri_la
- int local = 0;
- return (double) baz;
- }
-
- static class NestedClass {
- protected int field;
- }
-}
diff --git a/langtools/test/tools/apt/Basics/TestGetPackageApf.java b/langtools/test/tools/apt/Basics/TestGetPackageApf.java
deleted file mode 100644
index cc169ce..0000000
--- a/langtools/test/tools/apt/Basics/TestGetPackageApf.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * This class is used to test getPackage on classes that are
- * not already loaded.
- */
-public class TestGetPackageApf implements AnnotationProcessorFactory {
- // Process any set of annotations
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("*"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new TestGetPackageAp(env);
- }
-
- private static class TestGetPackageAp implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- TestGetPackageAp(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- public void process() {
- boolean failed = false;
- String packageNames[] = {
- "", // unnamed package
- "java.lang.annotation",
- "java.lang",
- "java.util",
- "java.awt.image.renderable",
- "foo.bar",
- "foo",
- "p1",
- // "p1.p2", // class p1.p2 obscures package p1.p2
- };
-
- for(String packageName: packageNames) {
- PackageDeclaration p = env.getPackage(packageName);
- if (p == null) {
- failed = true;
- System.err.println("ERROR: No declaration found for ``" + packageName + "''.");
- }
- else if (!packageName.equals(p.getQualifiedName())) {
- failed = true;
- System.err.println("ERROR: Unexpected package name; expected " + packageName +
- "got " + p.getQualifiedName());
- }
- }
-
- String notPackageNames[] = {
- "XXYZZY",
- "java.lang.String",
- "1",
- "1.2",
- "3.14159",
- "To be or not to be is a tautology",
- "1+2=3",
- };
-
- for(String notPackageName: notPackageNames) {
- PackageDeclaration p = env.getPackage(notPackageName);
- if (p != null) {
- failed = true;
- System.err.println("ERROR: Unexpected declaration: ``" + p + "''.");
- }
- }
-
- if (failed)
- throw new RuntimeException("Errors found testing getPackage.");
- }
- }
-}
diff --git a/langtools/test/tools/apt/Basics/TestGetTypeDeclarationApf.java b/langtools/test/tools/apt/Basics/TestGetTypeDeclarationApf.java
deleted file mode 100644
index 21d2a7a..0000000
--- a/langtools/test/tools/apt/Basics/TestGetTypeDeclarationApf.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * This class is used to test getTypeDeclaration on classes that are
- * not already loaded.
- */
-public class TestGetTypeDeclarationApf implements AnnotationProcessorFactory {
- // Process any set of annotations
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("*"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new TestGetTypeDeclarationAp(env);
- }
-
- private static class TestGetTypeDeclarationAp implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- TestGetTypeDeclarationAp(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- public void process() {
- String classNames[] = {
- "java.lang.String", // should be already available
- "java.lang.Thread.State", // should be already available
- "java.util.Collection",
- "java.util.Map.Entry",
- "foo.bar.Baz.Xxyzzy.Wombat",
- "foo.bar.Baz.Xxyzzy",
- "foo.bar.Baz",
- "foo.bar.Quux",
- "foo.bar.Quux.Xxyzzy",
- "foo.bar.Quux.Xxyzzy.Wombat",
- "NestedClassAnnotations",
- "NestedClassAnnotations.NestedClass",
- };
-
- for(String className: classNames) {
- TypeDeclaration t = env.getTypeDeclaration(className);
- if (t == null)
- throw new RuntimeException("No declaration found for " + className);
- if (! t.getQualifiedName().equals(className))
- throw new RuntimeException("Class with wrong name found for " + className);
- }
-
- // Test obscuring behavior; i.e. nested class C1 in class
- // p1 where p1 is member of package p2 should be favored
- // over class C1 in package p1.p2.
- String nonuniqueCanonicalNames[] = {
- "p1.p2.C1",
- };
- for(String className: nonuniqueCanonicalNames) {
- ClassDeclaration c1 = (ClassDeclaration) env.getTypeDeclaration(className);
- ClassDeclaration c2 = (ClassDeclaration) c1.getDeclaringType();
- PackageDeclaration p = env.getPackage("p1");
-
- if (!p.equals(c1.getPackage()) ||
- c2 == null ||
- !"C1".equals(c1.getSimpleName())) {
- throw new RuntimeException("Bad class declaration");
- }
- }
-
- String notClassNames[] = {
- "",
- "XXYZZY",
- "java",
- "java.lang",
- "java.lang.Bogogogous",
- "1",
- "1.2",
- "3.14159",
- "To be or not to be is a tautology",
- "1+2=3",
- "foo+.x",
- "foo+x",
- "+",
- "?",
- "***",
- "java.*",
- };
-
- for(String notClassName: notClassNames) {
- Declaration t = env.getTypeDeclaration(notClassName);
- if (t != null) {
- System.err.println("Unexpected declaration:" + t);
- throw new RuntimeException("Declaration found for ``" + notClassName + "''.");
- }
- }
-
- }
- }
-}
diff --git a/langtools/test/tools/apt/Basics/annot/AnnotMarker.java b/langtools/test/tools/apt/Basics/annot/AnnotMarker.java
deleted file mode 100644
index ae6f72e..0000000
--- a/langtools/test/tools/apt/Basics/annot/AnnotMarker.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package annot;
-
-public @interface AnnotMarker {
-}
diff --git a/langtools/test/tools/apt/Basics/annot/AnnotShangri_la.java b/langtools/test/tools/apt/Basics/annot/AnnotShangri_la.java
deleted file mode 100644
index a87ae2f..0000000
--- a/langtools/test/tools/apt/Basics/annot/AnnotShangri_la.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package annot;
-
-/*
- * This annotation is used by the tests only to annotate local
- * variables; therefore, this annotation should not affect the
- * discovery process and should not appear in the list printed by
- * -XListAnnotationTypes.
- */
-public @interface AnnotShangri_la {
-}
diff --git a/langtools/test/tools/apt/Basics/annot/AnnotSimple.java b/langtools/test/tools/apt/Basics/annot/AnnotSimple.java
deleted file mode 100644
index 99ec142..0000000
--- a/langtools/test/tools/apt/Basics/annot/AnnotSimple.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package annot;
-
-public @interface AnnotSimple {
- String value() default "default";
-}
diff --git a/langtools/test/tools/apt/Basics/annot/annot2/AnnotMarker2.java b/langtools/test/tools/apt/Basics/annot/annot2/AnnotMarker2.java
deleted file mode 100644
index cc7dbe0..0000000
--- a/langtools/test/tools/apt/Basics/annot/annot2/AnnotMarker2.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package annot.annot2;
-
-public @interface AnnotMarker2 {
-}
diff --git a/langtools/test/tools/apt/Basics/annot/annot2/AnnotSimple2.java b/langtools/test/tools/apt/Basics/annot/annot2/AnnotSimple2.java
deleted file mode 100644
index abdbcfb..0000000
--- a/langtools/test/tools/apt/Basics/annot/annot2/AnnotSimple2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package annot.annot2;
-
-public @interface AnnotSimple2 {
- String value() default "default";
-}
diff --git a/langtools/test/tools/apt/Basics/apt.sh b/langtools/test/tools/apt/Basics/apt.sh
index e76c5fb..990b7d1 100644
--- a/langtools/test/tools/apt/Basics/apt.sh
+++ b/langtools/test/tools/apt/Basics/apt.sh
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
# 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,11 +24,10 @@
#
# @test
-# @bug 4908512 5024825 4957203 4993280 4996963 6174696 6177059
+# @bug 4908512 5024825 4957203 4993280 4996963 6174696 6177059 7041249
# @run shell ../verifyVariables.sh
-# @build Milk MethodAnnotations NestedClassAnnotations StaticFieldAnnotations StaticMethodAnnotations ParameterAnnotations
# @run shell apt.sh
-# @summary test consistency of annotation discovery
+# @summary Make sure apt is removed and doesn't come back
# @author Joseph D. Darcy
OS=`uname -s`;
@@ -41,136 +40,24 @@ case "${OS}" in
;;
esac
-# Construct path to apt executable
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -XDsuppress-tool-api-removal-message "
-
-printf "%s\n" "-classpath ${TESTCLASSES}" > options
-printf "%s\n" "-factorypath ./nullap.jar" >> options
-printf "%s\n" "-sourcepath ${TESTSRC} " >> options
-printf "%s\n" "-nocompile" >> options
-printf "%s\n" "-XListAnnotationTypes" >> options
-
-printf "%s\n" "-classpath ${TESTCLASSES}" > options1
-printf "%s\n" "-factorypath ./nullap.jar" >> options1
-printf "%s\n" "-sourcepath ${TESTSRC} " >> options1
-printf "%s\n" "-nocompile" >> options1
-printf "%s\n" "-XListAnnotationTypes" >> options1
-printf "%s\n" "-XclassesAsDecls" >> options1
-
+# Verify apt executable does not exist
+if [ -f "${TESTJAVA}/bin/apt" -o -f "${TESTJAVA}/bin/apt.exe" ];then
+ echo "apt executable should not exist."
+ exit 1
+fi
# Construct path to javac executable
JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "
-JAR="${TESTJAVA}/bin/jar "
-$JAVAC ${TESTSRC}/NullAPF.java \
-${TESTSRC}/FreshnessApf.java \
-${TESTSRC}/TestGetTypeDeclarationApf.java \
-${TESTSRC}/TestGetPackageApf.java
+$JAVAC ${TESTSRC}/NullAPF.java
RESULT=$?
case "${RESULT}" in
0 )
- ;;
-
- * )
- echo "Compilation failed."
+ echo "Compilation of apt-using source passed improperly."
exit 1
-esac
-
-echo "Making services directory and copying services information."
-mkdir -p META-INF/services
-cp ${TESTSRC}/com.sun.mirror.apt.AnnotationProcessorFactory ./META-INF/services
-$JAR cvf0 nullap.jar NullAPF*.class META-INF
-
-ANNOTATION_FILES="${TESTSRC}/ClassAnnotations.java \
-${TESTSRC}/MethodAnnotations.java \
-${TESTSRC}/NestedClassAnnotations.java \
-${TESTSRC}/StaticFieldAnnotations.java \
-${TESTSRC}/StaticMethodAnnotations.java \
-${TESTSRC}/ParameterAnnotations.java"
-
-for i in ${ANNOTATION_FILES}
-do
- printf "%s\n" "Testing annotations on source file ${i}"
- ${APT} @options ${i} 2> result.txt
- diff ${DIFFOPTS} ${TESTSRC}/golden.txt result.txt
-
- RESULT=$?
- case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "Unexpected set of annotations on source files found."
- exit 1
- esac
-
- CLASS=`basename ${i} .java`
- printf "%s\n" "Testing annotations on class file ${CLASS}"
- ${APT} @options1 ${CLASS} 2> result2.txt
- diff ${DIFFOPTS} ${TESTSRC}/golden.txt result2.txt
-
- RESULT=$?
- case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "Unexpected set of annotations on class files found."
- exit 1
- esac
-done
-
-# Verify source files are favored over class files
-
-printf "%s\n" "-factorypath ." > options2
-printf "%s\n" "-factory FreshnessApf" >> options2
-printf "%s\n" "-sourcepath ${TESTSRC}" >> options2
-printf "%s\n" "-classpath ${TESTCLASSES}" >> options2
-printf "%s\n" "-nocompile" >> options2
-
-${APT} @options2 ${TESTSRC}/Indirect.java
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- exit 1
-esac
-
-# Verify new classes can be loaded by getTypeDeclaration
-
-printf "%s\n" "-factorypath ." > options3
-printf "%s\n" "-factory TestGetTypeDeclarationApf" >> options3
-printf "%s\n" "-sourcepath ${TESTSRC}" >> options3
-
-# ${APT} @options3
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- exit 1
-esac
-
-# Verify packages can be loaded by getPackage
-
-printf "%s\n" "-factorypath ." > options4
-printf "%s\n" "-factory TestGetPackageApf" >> options4
-printf "%s\n" "-sourcepath ${TESTSRC}" >> options4
-
-${APT} @options4
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
+ ;;
* )
- exit 1
+ ;;
esac
-exit 0
diff --git a/langtools/test/tools/apt/Basics/com.sun.mirror.apt.AnnotationProcessorFactory b/langtools/test/tools/apt/Basics/com.sun.mirror.apt.AnnotationProcessorFactory
deleted file mode 100644
index ba88580..0000000
--- a/langtools/test/tools/apt/Basics/com.sun.mirror.apt.AnnotationProcessorFactory
+++ /dev/null
@@ -1 +0,0 @@
-NullAPF
diff --git a/langtools/test/tools/apt/Basics/foo/bar/Baz.java b/langtools/test/tools/apt/Basics/foo/bar/Baz.java
deleted file mode 100644
index c411a05..0000000
--- a/langtools/test/tools/apt/Basics/foo/bar/Baz.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package foo.bar;
-
-public class Baz {
- public class Xxyzzy {
- public class Wombat {
- }
- }
-
-}
diff --git a/langtools/test/tools/apt/Basics/foo/bar/Quux.java b/langtools/test/tools/apt/Basics/foo/bar/Quux.java
deleted file mode 100644
index 8c4dad6..0000000
--- a/langtools/test/tools/apt/Basics/foo/bar/Quux.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package foo.bar;
-
-public class Quux {
- public class Xxyzzy {
- public class Wombat {
- }
- }
-
-}
diff --git a/langtools/test/tools/apt/Basics/golden.txt b/langtools/test/tools/apt/Basics/golden.txt
deleted file mode 100644
index 9d3f419..0000000
--- a/langtools/test/tools/apt/Basics/golden.txt
+++ /dev/null
@@ -1 +0,0 @@
-Set of annotations found:[MyMarker, MySimple, annot.AnnotMarker, annot.AnnotSimple, annot.annot2.AnnotMarker2, annot.annot2.AnnotSimple2]
diff --git a/langtools/test/tools/apt/Basics/goldenAggregate.txt b/langtools/test/tools/apt/Basics/goldenAggregate.txt
deleted file mode 100644
index 207cc92..0000000
--- a/langtools/test/tools/apt/Basics/goldenAggregate.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-
-public class Aggregate {
-
- private Aggregate();
-
- private static double hypot(double arg0,
- double arg1);
-
- public static void main(java.lang.String[] arg0);
-
- public boolean equals(Aggregate arg0);
-
- public int hashcode();
-}
diff --git a/langtools/test/tools/apt/Basics/p1/p2.java b/langtools/test/tools/apt/Basics/p1/p2.java
deleted file mode 100644
index d447094..0000000
--- a/langtools/test/tools/apt/Basics/p1/p2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package p1;
-
-public class p2 {
- public static class C1 {}
-}
diff --git a/langtools/test/tools/apt/Basics/p1/p2/C1.java b/langtools/test/tools/apt/Basics/p1/p2/C1.java
deleted file mode 100644
index ec56749..0000000
--- a/langtools/test/tools/apt/Basics/p1/p2/C1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package p1.p2;
-
-public class C1 {
-}
diff --git a/langtools/test/tools/apt/Basics/print.sh b/langtools/test/tools/apt/Basics/print.sh
deleted file mode 100644
index c5f168d..0000000
--- a/langtools/test/tools/apt/Basics/print.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
-# 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 5008759 4998341 5018369 5032476 5060121 5096932 5096931
-# @run shell ../verifyVariables.sh
-# @run shell print.sh
-# @summary test availabilty of print option
-# @author Joseph D. Darcy
-
-OS=`uname -s`;
-case "${OS}" in
- CYGWIN* )
- DIFFOPTS="--strip-trailing-cr"
- ;;
-
- * )
- ;;
-esac
-
-# Compile file directly, without TESTJAVACOPTS
-# Don't use @build or @compile as these implicitly use jtreg -javacoption values
-# and it is important that this file be compiled as expected, for later comparison
-# against a golden file.
-"${TESTJAVA}/bin/javac" ${TESTTOOLVMOPTS} -d ${TESTCLASSES} ${TESTSRC}/Aggregate.java
-
-# Construct path to apt executable
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} \
--print "
-
-printf "%s\n" "APT = ${APT}"
-
-PRINT_FILES="${TESTSRC}/MisMatch.java \
-${TESTSRC}/GenClass.java \
-${TESTSRC}/Misc.java \
-${TESTSRC}/Lacuna.java"
-
-for i in ${PRINT_FILES}
-do
- # Delete any existing class file
- FILENAME=`basename $i .java`
- rm -f ${FILENAME}.class
-
- printf "%s\n" "Printing ${i}"
- ${APT} ${i}
-
- RESULT=$?
- case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "Problem printing file ${i}."
- exit 1
- esac
-
- # Verify compilation did not occur
- if [ -f ${FILENAME}.class ]; then
- printf "Improper compilation occured for %s.\n" ${i}
- exit 1
- fi
-
-done
-
-# check for mutliple methods and no static initializer
-
-${APT} -XclassesAsDecls -cp ${TESTCLASSES} -print Aggregate > aggregate.txt
-diff ${DIFFOPTS} aggregate.txt ${TESTSRC}/goldenAggregate.txt
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "Expected output not received"
- exit 1
-esac
-
-exit 0
diff --git a/langtools/test/tools/apt/Compile/ClassDeclApf.java b/langtools/test/tools/apt/Compile/ClassDeclApf.java
deleted file mode 100644
index 9851e06..0000000
--- a/langtools/test/tools/apt/Compile/ClassDeclApf.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import java.io.*;
-
-import static java.util.Collections.*;
-
-/*
- * This class is used to test the ability to store static state across
- * apt rounds.
- */
-public class ClassDeclApf implements AnnotationProcessorFactory {
- static int round = -1;
-
- // Process any set of annotations
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("*"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new ClassDeclAp(env);
- }
-
- private static class ClassDeclAp implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- ClassDeclAp(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- // Simple inefficient drain
- void drain(InputStream is, OutputStream os) {
- try {
- while (is.available() > 0 )
- os.write(is.read());
- } catch (java.io.IOException ioe) {
- throw new RuntimeException(ioe);
- }
-
- }
-
- public void process() {
- int size = env.getSpecifiedTypeDeclarations().size();
-
- try {
- round++;
- switch (size) {
- case 0:
- if (round == 0) {
- drain(new FileInputStream("./tmp/classes/Round1Class.class"),
- env.getFiler().createClassFile("Round1Class"));
- } else
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- break;
-
- case 1:
- if (round == 1) {
- drain(new FileInputStream("./tmp/classes/AhOneClass.class"),
- env.getFiler().createClassFile("AhOneClass"));
-
- drain(new FileInputStream("./tmp/classes/AndAhTwoClass.class"),
- env.getFiler().createClassFile("AndAhTwoClass"));
- } else
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- break;
- case 2:
- if (round != 2) {
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- }
- break;
- }
-
- } catch (java.io.IOException ioe) {
- throw new RuntimeException();
- }
-
- }
-
- }
-}
diff --git a/langtools/test/tools/apt/Compile/ClassDeclApf2.java b/langtools/test/tools/apt/Compile/ClassDeclApf2.java
deleted file mode 100644
index e9e8346..0000000
--- a/langtools/test/tools/apt/Compile/ClassDeclApf2.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import java.io.*;
-
-import static java.util.Collections.*;
-
-/*
- * This class is used to test the the interaction of -XclassesAsDecls
- * with command line options handling.
- */
-public class ClassDeclApf2 implements AnnotationProcessorFactory {
- static int round = -1;
-
- // Process any set of annotations
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("*"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new ClassDeclAp(env);
- }
-
- private static class ClassDeclAp implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- ClassDeclAp(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- // Simple inefficient drain
- void drain(InputStream is, OutputStream os) {
- try {
- while (is.available() > 0 )
- os.write(is.read());
- } catch (java.io.IOException ioe) {
- throw new RuntimeException(ioe);
- }
- }
-
- public void process() {
- int size = env.getSpecifiedTypeDeclarations().size();
- Filer f = env.getFiler();
-
- try {
- round++;
- switch (size) {
- case 3:
- if (round == 0) {
- drain(new FileInputStream("./tmp/classes/Round1Class.class"),
- f.createClassFile("Round1Class"));
- } else
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- break;
-
- case 1:
- if (round == 1) {
- f.createSourceFile("AhOne").println("public class AhOne {}");
- System.out.println("Before writing AndAhTwoClass");
- drain(new FileInputStream("./tmp/classes/AndAhTwoClass.class"),
- f.createClassFile("AndAhTwoClass"));
- System.out.println("After writing AndAhTwoClass");
- } else
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- break;
-
- case 2:
- if (round != 2) {
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- }
- break;
- default:
- throw new RuntimeException("Unexpected number of declarations:" + size +
- "\n Specified:" + env.getSpecifiedTypeDeclarations() +
- "\n Included:" + env.getTypeDeclarations() );
- }
-
- } catch (java.io.IOException ioe) {
- throw new RuntimeException(ioe);
- }
- }
- }
-}
diff --git a/langtools/test/tools/apt/Compile/Dummy1.java b/langtools/test/tools/apt/Compile/Dummy1.java
deleted file mode 100644
index 2ff1e12..0000000
--- a/langtools/test/tools/apt/Compile/Dummy1.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
- at Round1 class Dummy1{}
diff --git a/langtools/test/tools/apt/Compile/ErrorAPF.java b/langtools/test/tools/apt/Compile/ErrorAPF.java
deleted file mode 100644
index 4db5cbd..0000000
--- a/langtools/test/tools/apt/Compile/ErrorAPF.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Construct a processor that does nothing but report an error.
- */
-public class ErrorAPF implements AnnotationProcessorFactory {
- static class ErrorAP implements AnnotationProcessor {
- AnnotationProcessorEnvironment env;
- ErrorAP(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- public void process() {
- Messager messager = env.getMessager();
- messager.printError("It's a mad, mad, mad, mad world");
- messager.printError("Something wicked this way comes");
-
- for(TypeDeclaration typeDecl : env.getSpecifiedTypeDeclarations())
- messager.printError(typeDecl.getPosition(), "Boring class name");
- }
- }
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"*"};
- supportedTypes = unmodifiableCollection(Arrays.asList(types));
- }
-
- static Collection<String> supportedOptions;
- static {
- String options[] = {""};
- supportedOptions = unmodifiableCollection(Arrays.asList(options));
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new ErrorAP(env);
- }
-}
diff --git a/langtools/test/tools/apt/Compile/HelloAnnotation.java b/langtools/test/tools/apt/Compile/HelloAnnotation.java
deleted file mode 100644
index 2350e4c..0000000
--- a/langtools/test/tools/apt/Compile/HelloAnnotation.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/* /nodynamiccopyright/ */
-import java.lang.annotation.*;
- at Target(ElementType.ANNOTATION_TYPE)
- at Retention(RetentionPolicy.RUNTIME)
- at HelloAnnotation
- at interface HelloAnnotation {
- Target value() default @Target(ElementType.METHOD);
-}
diff --git a/langtools/test/tools/apt/Compile/HelloWorld.java b/langtools/test/tools/apt/Compile/HelloWorld.java
deleted file mode 100644
index a6883ce..0000000
--- a/langtools/test/tools/apt/Compile/HelloWorld.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/* /nodynamiccopyright/ */
-public class HelloWorld {
- public static void main(String argv[]) {
- System.out.println("Hello World.");
- }
-}
diff --git a/langtools/test/tools/apt/Compile/Round1Apf.java b/langtools/test/tools/apt/Compile/Round1Apf.java
deleted file mode 100644
index e8d5f28..0000000
--- a/langtools/test/tools/apt/Compile/Round1Apf.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import java.io.File;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Factory to help test updated discovery policy.
- */
-public class Round1Apf implements AnnotationProcessorFactory {
- // Process @Round1
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("Round1"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- private static int round = 0;
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new Round1Ap(env, atds.size() == 0);
- }
-
- private static class Round1Ap implements AnnotationProcessor, RoundCompleteListener {
- private final AnnotationProcessorEnvironment env;
- private final boolean empty;
-
- Round1Ap(AnnotationProcessorEnvironment env, boolean empty) {
- this.env = env;
- this.empty = empty;
- }
-
- public void process() {
- Round1Apf.round++;
- try {
- if (!empty) {
- Filer f = env.getFiler();
- f.createSourceFile("Dummy2").println("@Round2 class Dummy2{}");
- f.createTextFile(Filer.Location.SOURCE_TREE,
- "",
- new File("foo.txt"),
- null).println("xxyzzy");
- f.createClassFile("Vacant");
- f.createBinaryFile(Filer.Location.CLASS_TREE,
- "",
- new File("onezero"));
- }
- } catch (java.io.IOException ioe) {
- throw new RuntimeException(ioe);
- }
-
- System.out.println("Round1Apf: " + round);
- env.addListener(this);
- }
-
- public void roundComplete(RoundCompleteEvent event) {
- RoundState rs = event.getRoundState();
-
- if (event.getSource() != this.env)
- throw new RuntimeException("Wrong source!");
-
- Filer f = env.getFiler();
- try {
- f.createSourceFile("AfterTheBell").println("@Round2 class AfterTheBell{}");
- throw new RuntimeException("Inappropriate source file creation.");
- } catch (java.io.IOException ioe) {}
-
-
- System.out.printf("\t[final round: %b, error raised: %b, "+
- "source files created: %b, class files created: %b]%n",
- rs.finalRound(),
- rs.errorRaised(),
- rs.sourceFilesCreated(),
- rs.classFilesCreated());
-
- System.out.println("Round1Apf: " + round + " complete");
- }
- }
-}
diff --git a/langtools/test/tools/apt/Compile/Round2Apf.java b/langtools/test/tools/apt/Compile/Round2Apf.java
deleted file mode 100644
index 719a735..0000000
--- a/langtools/test/tools/apt/Compile/Round2Apf.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import java.io.IOException;
-import java.io.File;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Factory to help test updated discovery policy.
- */
-public class Round2Apf implements AnnotationProcessorFactory {
- // Process @Round2
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("Round2"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- private static int round = 0;
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new Round2Ap(env, atds.size() == 0);
- }
-
- private static class Round2Ap implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- private final boolean empty;
-
- Round2Ap(AnnotationProcessorEnvironment env, boolean empty) {
- this.env = env;
- this.empty = empty;
- }
-
- public void process() {
- Round2Apf.round++;
- Filer f = env.getFiler();
- try {
- f.createSourceFile("Dummy2").println("@Round2 class Dummy2{}");
- throw new RuntimeException("Duplicate file creation allowed");
- } catch (IOException io) {}
-
- try {
- f.createTextFile(Filer.Location.SOURCE_TREE,
- "",
- new File("foo.txt"),
- null).println("xxyzzy");
- throw new RuntimeException("Duplicate file creation allowed");
- } catch (IOException io) {}
-
- try {
- f.createClassFile("Vacant");
- throw new RuntimeException("Duplicate file creation allowed");
- } catch (IOException io) {}
-
- try {
- f.createBinaryFile(Filer.Location.CLASS_TREE,
- "",
- new File("onezero"));
- throw new RuntimeException("Duplicate file creation allowed");
- } catch (IOException io) {}
-
-
-
- try {
- if (!empty) {
- // Create corresponding files of opposite kind to
- // the files created by Round1Apf; these should
- // only generate warnings
- f.createClassFile("Dummy2");
- f.createSourceFile("Vacant").println("class Vacant{}");
-
- f.createSourceFile("Dummy3").println("@Round3 class Dummy3{}");
-
- // This should generated a warning too
- f.createClassFile("Dummy3");
- }
- } catch (java.io.IOException ioe) {
- throw new RuntimeException(ioe);
- }
-
- System.out.println("Round2Apf: " + round);
- }
- }
-}
diff --git a/langtools/test/tools/apt/Compile/Round3Apf.java b/langtools/test/tools/apt/Compile/Round3Apf.java
deleted file mode 100644
index 65c30a4..0000000
--- a/langtools/test/tools/apt/Compile/Round3Apf.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Factory to help test updated discovery policy.
- */
-public class Round3Apf implements AnnotationProcessorFactory {
- // Process @Round3
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("Round3"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- private static int round = 0;
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new Round3Ap(env, atds.size() == 0);
- }
-
- private static class Round3Ap implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- private final boolean empty;
-
- Round3Ap(AnnotationProcessorEnvironment env, boolean empty) {
- this.env = env;
- this.empty = empty;
- }
-
- public void process() {
- Round3Apf.round++;
- try {
- if (!empty)
- env.getFiler().createSourceFile("Dummy4").println("@Round4 class Dummy4{}");
- } catch (java.io.IOException ioe) {
- throw new RuntimeException(ioe);
- }
-
- System.out.println("Round3Apf: " + round);
- }
- }
-}
diff --git a/langtools/test/tools/apt/Compile/Round4Apf.java b/langtools/test/tools/apt/Compile/Round4Apf.java
deleted file mode 100644
index 425e326..0000000
--- a/langtools/test/tools/apt/Compile/Round4Apf.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Factory to help test updated discovery policy.
- */
-public class Round4Apf implements AnnotationProcessorFactory {
- // Process @Round4
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("Round4"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- private static int round = 0;
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new Round4Ap(env, atds.size() == 0);
- }
-
- private static class Round4Ap implements AnnotationProcessor, RoundCompleteListener {
- private final AnnotationProcessorEnvironment env;
- private final boolean empty;
-
- Round4Ap(AnnotationProcessorEnvironment env, boolean empty) {
- this.env = env;
- this.empty = empty;
- }
-
- public void process() {
- Round4Apf.round++;
- try {
- if (!empty)
- env.getFiler().createSourceFile("Dummy5").println("@Round5 class Dummy5{}");
- } catch (java.io.IOException ioe) {
- throw new RuntimeException(ioe);
- }
-
- System.out.println("Round4Apf: " + round);
- env.addListener(this);
- }
-
- public void roundComplete(RoundCompleteEvent event) {
- RoundState rs = event.getRoundState();
-
- System.out.println("\t" + rs.toString());
-
- System.out.println("Round4Apf: " + round + " complete");
-
- if (rs.finalRound()) {
- System.out.println("Valediction");
- }
- }
- }
-}
diff --git a/langtools/test/tools/apt/Compile/Rounds.java b/langtools/test/tools/apt/Compile/Rounds.java
deleted file mode 100644
index daabd41..0000000
--- a/langtools/test/tools/apt/Compile/Rounds.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
- at interface Round1{}
-
- at interface Round2{}
-
- at interface Round3{}
-
- at interface Round4{}
-
- at interface Round5{}
diff --git a/langtools/test/tools/apt/Compile/StaticApf.java b/langtools/test/tools/apt/Compile/StaticApf.java
deleted file mode 100644
index 7301616..0000000
--- a/langtools/test/tools/apt/Compile/StaticApf.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-
-/*
- * This class is used to test the ability to store static state across
- * apt rounds.
- */
-public class StaticApf implements AnnotationProcessorFactory {
- static int round = -1;
-
- // Process any set of annotations
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("*"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new StaticAp(env);
- }
-
- private static class StaticAp implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- StaticAp(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- public void process() {
- int size = env.getSpecifiedTypeDeclarations().size();
-
- try {
- round++;
- switch (size) {
- case 0:
- if (round == 0) {
- env.getFiler().createSourceFile("Round1").print("class Round1 {}");
- } else
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- break;
-
- case 1:
- if (round == 1) {
- env.getFiler().createSourceFile("AhOne").print("class AhOne {}");
- env.getFiler().createSourceFile("AndAhTwo").print("class AndAhTwo {}");
- env.getFiler().createClassFile("Foo");
- } else
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- break;
- case 2:
- if (round != 2) {
- throw new RuntimeException("Got " + size + " decl's in round " + round);
- }
- break;
- }
-
- } catch (java.io.IOException ioe) {
- throw new RuntimeException();
- }
-
- }
-
- }
-}
diff --git a/langtools/test/tools/apt/Compile/WarnAPF.java b/langtools/test/tools/apt/Compile/WarnAPF.java
deleted file mode 100644
index 0d7b474..0000000
--- a/langtools/test/tools/apt/Compile/WarnAPF.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Map;
-import java.util.Arrays;
-
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Construct a processor that does nothing but report a warning.
- */
-public class WarnAPF implements AnnotationProcessorFactory {
- static class WarnAP implements AnnotationProcessor {
- AnnotationProcessorEnvironment env;
- WarnAP(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- public void process() {
- Messager messager = env.getMessager();
- messager.printWarning("Beware the ides of March!");
-
- for(TypeDeclaration typeDecl : env.getSpecifiedTypeDeclarations()) {
- messager.printNotice(typeDecl.getPosition(), "You are about to be warned");
- messager.printWarning(typeDecl.getPosition(), "Strange class name");
-
- for(AnnotationMirror annotMirror : typeDecl.getAnnotationMirrors()) {
- messager.printNotice("MIRROR " + annotMirror.getPosition().toString());
-
- Map<AnnotationTypeElementDeclaration,AnnotationValue> map =
- annotMirror.getElementValues();
- if (map.keySet().size() > 0)
- for(AnnotationTypeElementDeclaration key : map.keySet() ) {
- AnnotationValue annotValue = map.get(key);
- Object o = annotValue.getValue();
- // asserting getPosition is non-null
- messager.printNotice("VALUE " + annotValue.getPosition().toString());
- }
- else {
- Collection<AnnotationTypeElementDeclaration> ateds =
- annotMirror.getAnnotationType().getDeclaration().getMethods();
- for(AnnotationTypeElementDeclaration ated : ateds ) {
- AnnotationValue annotValue = ated.getDefaultValue();
- Object o = annotValue.getValue();
- messager.printNotice("VALUE " + "HelloAnnotation.java:5");
- }
- }
- }
- }
- }
- }
-
- static final Collection<String> supportedTypes;
- static {
- String types[] = {"*"};
- supportedTypes = unmodifiableCollection(Arrays.asList(types));
- }
- public Collection<String> supportedAnnotationTypes() {return supportedTypes;}
-
- static final Collection<String> supportedOptions;
- static {
- String options[] = {""};
- supportedOptions = unmodifiableCollection(Arrays.asList(options));
- }
- public Collection<String> supportedOptions() {return supportedOptions;}
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new WarnAP(env);
- }
-}
diff --git a/langtools/test/tools/apt/Compile/WrappedStaticApf.java b/langtools/test/tools/apt/Compile/WrappedStaticApf.java
deleted file mode 100644
index d55bc53..0000000
--- a/langtools/test/tools/apt/Compile/WrappedStaticApf.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.AnnotationProcessorFactory;
-
-/*
- * Pass an instantiated StaticApf object to the
- * com.sun.tools.apt.Main.process entry point.
- */
-public class WrappedStaticApf {
- public static void main(String argv[]) {
- AnnotationProcessorFactory factory = new StaticApf();
- System.exit(com.sun.tools.apt.Main.process(factory, argv));
- }
-}
diff --git a/langtools/test/tools/apt/Compile/compile.sh b/langtools/test/tools/apt/Compile/compile.sh
deleted file mode 100644
index bba4130..0000000
--- a/langtools/test/tools/apt/Compile/compile.sh
+++ /dev/null
@@ -1,533 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2004, 2009, Oracle and/or its affiliates. All rights reserved.
-# 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 5033855 4990902 5023880 5043516 5048534 5048535 5041279 5048539 5067261 5068145 5023881 4996963 5095716 6191667 6433634
-# @run shell ../verifyVariables.sh
-# @build ErrorAPF
-# @build WarnAPF
-# @build StaticApf
-# @build ClassDeclApf
-# @build ClassDeclApf2
-# @build Rounds
-# @build Round1Apf Round2Apf Round3Apf Round4Apf
-# @build WrappedStaticApf
-# @run shell compile.sh
-# @summary Test simple usages of apt, including delegating to javac
-# @author Joseph D. Darcy
-
-# If the file *does* exist, exit with an error
-TestNoFile() {
- if [ -f ${1} ]; then
- printf "%s\n" "File ${1} found."
- exit 1
- fi
-}
-
-# If the file does not exist, exit with an error
-TestFile() {
- if [ ! -f ${1} ]; then
- printf "%s\n" "File ${1} not found."
- exit 1
- fi
-}
-
-
-OS=`uname -s`;
-case "${OS}" in
- Windows* )
- SEP=";"
- ;;
-
- CYGWIN* )
- DIFFOPTS="--strip-trailing-cr"
- SEP=";"
- ;;
-
- * )
- SEP=":"
- ;;
-esac
-
-
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -XDsuppress-tool-api-removal-message "
-JAVA="${TESTJAVA}/bin/java ${TESTVMOPTS} "
-JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} "
-
-unset CLASSPATH
-
-
-# ---------------------------------------------------------------
-echo "Verify that source 1.6 is not supported
-rm -f HelloWorld.class
-
-printf "%s\n" "-source 1.6" > options0
-printf "%s\n" "${TESTSRC}/HelloWorld.java" >> options0
-${APT} @options0
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- echo "FAILED: accepted source 1.6"
- exit 1
- ;;
-esac
-
-TestNoFile "HelloWorld.class"
-
-# ---------------------------------------------------------------
-
-echo "Verify that target 1.6 is not supported
-rm -f HelloWorld.class
-
-printf "%s\n" "-target 1.6" > options00
-printf "%s\n" "${TESTSRC}/HelloWorld.java" >> options00
-${APT} @options00
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- echo "FAILED: accepted target 1.6"
- exit 1
- ;;
-esac
-
-TestNoFile "HelloWorld.class"
-
-# ---------------------------------------------------------------
-
-echo "Testing javac pass-through with -A in options file"
-rm -f HelloWorld.class
-
-printf "%s\n" "-A" > options1
-printf "%s\n" "-d ." >> options1
-printf "%s\n" "${TESTSRC}/HelloWorld.java" >> options1
-${APT} @options1
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: javac with -A in options file did not compile"
- exit 1
-esac
-TestFile "HelloWorld.class"
-
-
-# ---------------------------------------------------------------
-
-echo "Verifying reporting an error will prevent compilation"
-rm -f HelloWorld.class
-if [ ! -f HelloWorld.java ]; then
- cp ${TESTSRC}/HelloWorld.java .
-fi
-
-
-printf "%s\n" "-factory ErrorAPF" > options2
-printf "%s\n" "-d ." >> options2
-printf "%s\n" "-cp ${TESTCLASSES}" >> options2
-printf "%s\n" "HelloWorld.java" >> options2
-${APT} @options2 2> output
-
-TestNoFile "HelloWorld.class"
-
-diff ${DIFFOPTS} output ${TESTSRC}/golden.txt
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: did not record expected error messages"
- exit 1
-esac
-
-
-
-# ---------------------------------------------------------------
-
-echo "Verifying reporting a warning *won't* prevent compilation"
-
-rm -f HelloAnnotation.class
-if [ ! -f HelloAnnotation.java ]; then
- cp ${TESTSRC}/HelloAnnotation.java .
-fi
-
-
-printf "%s\n" "-factory WarnAPF" > options3
-printf "%s\n" "-d ." >> options3
-printf "%s\n" "-cp ${TESTCLASSES}" >> options3
-printf "%s\n" "HelloAnnotation.java" >> options3
-${APT} @options3 2> output
-
-diff ${DIFFOPTS} output ${TESTSRC}/goldenWarn.txt
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: did not record expected warning messages"
- exit 1
-esac
-
-TestFile "HelloAnnotation.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying static state is available across apt rounds; -factory, -cp"
-
-mkdir -p ./src
-mkdir -p ./class
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-
-printf "%s\n" "-factory StaticApf" > options4
-printf "%s\n" "-s ./src" >> options4
-printf "%s\n" "-d ./class" >> options4
-printf "%s\n" "-cp ${TESTCLASSES}" >> options4
-# printf "%s\n" "-XPrintAptRounds" >> options4
-${APT} @options4
-
-TestFile "./class/AndAhTwo.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying static state is available across apt rounds; -factory, -factorypath"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-
-printf "%s\n" "-factory StaticApf" > options5
-printf "%s\n" "-s ./src" >> options5
-printf "%s\n" "-d ./class" >> options5
-printf "%s\n" "-factorypath ${TESTCLASSES}" >> options5
-# printf "%s\n" "-XPrintAptRounds" >> options5
-${APT} @options5
-
-TestFile "./class/AndAhTwo.class"
-
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-# Create jar file for StaticApf
-JAR="${TESTJAVA}/bin/jar "
-mkdir -p META-INF/services
-cp ${TESTSRC}/servicesStaticApf META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTCLASSES}/StaticApf*.class .
-${JAR} cf0 staticApf.jar StaticApf*.class META-INF
-
-# ---------------------------------------------------------------
-
-echo "Verifying static state is available across apt rounds; -cp"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-
-printf "%s\n" "-cp staticApf.jar" > options6
-printf "%s\n" "-s ./src" >> options6
-printf "%s\n" "-d ./class" >> options6
-printf "%s\n" "-XPrintAptRounds" >> options6
-${APT} @options6
-
-TestFile "./class/AndAhTwo.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying static state is available across apt rounds; -factorypath"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-
-printf "%s\n" "-factorypath staticApf.jar" > options7
-printf "%s\n" "-s ./src" >> options7
-printf "%s\n" "-d ./class" >> options7
-printf "%s\n" "-XPrintAptRounds" >> options7
-${APT} @options7
-
-TestFile "./class/AndAhTwo.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying -XclassesAsDecls handles class files properly"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-
-mkdir -p ./tmp/classes
-
-${JAVAC} -d ./tmp/classes ${TESTSRC}/src/Round1Class.java ${TESTSRC}/src/AhOneClass.java ${TESTSRC}/src/AndAhTwoClass.java
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: javac failed to succesfully compile."
- exit 1
-esac
-
-printf "%s\n" "-factorypath ${TESTCLASSES}" > options7a
-printf "%s\n" "-factory ClassDeclApf" >> options7a
-printf "%s\n" "-s ./src" >> options7a
-printf "%s\n" "-d ./class" >> options7a
-printf "%s\n" "-XPrintAptRounds" >> options7a
-printf "%s\n" "-XclassesAsDecls" >> options7a
-${APT} @options7a
-
-TestFile "./class/AndAhTwoClass.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying -XclassesAsDecls works with command-line arguments"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-rm -Rf ./tmp/classes
-
-mkdir -p ./tmp/classes
-
-${JAVAC} -d ./tmp/classes ${TESTSRC}/src/Round1Class.java ${TESTSRC}/src/AndAhTwoClass.java
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: javac failed to succesfully compile."
- exit 1
-esac
-
-printf "%s\n" "-factorypath ${TESTCLASSES}" > options7b
-printf "%s\n" "-factory ClassDeclApf2" >> options7b
-printf "%s\n" "-XPrintAptRounds" >> options7b
-printf "%s\n" "-XclassesAsDecls" >> options7b
-printf "%s\n" "-cp ${TESTCLASSES}" >> options7b
-printf "%s\n" "ErrorAPF" >> options7b
-printf "%s\n" "WarnAPF" >> options7b
-printf "%s\n" "-s ./src" >> options7b
-printf "%s\n" "-d ./class" >> options7b
-printf "%s\n" "ClassDeclApf" >> options7b
-${APT} @options7b
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: apt exited with an error code."
- exit 1
-esac
-
-TestFile "./class/AndAhTwoClass.class"
-TestFile "./class/AhOne.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying -XclassesAsDecls works with all source files"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-rm -Rf ./tmp/classes
-
-mkdir -p ./tmp/classes
-
-${JAVAC} -d ./tmp/classes ${TESTSRC}/src/Round1Class.java ${TESTSRC}/src/AndAhTwoClass.java
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: javac failed to succesfully compile."
- exit 1
-esac
-
-printf "%s\n" "-factorypath ${TESTCLASSES}" > options7c
-printf "%s\n" "-factory ClassDeclApf2" >> options7c
-printf "%s\n" "-s ./src" >> options7c
-printf "%s\n" "-d ./class" >> options7c
-printf "%s\n" "-sourcepath ${TESTSRC}" >> options7c
-printf "%s\n" "${TESTSRC}/HelloAnnotation.java" >> options7c
-printf "%s\n" "${TESTSRC}/HelloWorld.java" >> options7c
-printf "%s\n" "${TESTSRC}/Dummy1.java" >> options7c
-printf "%s\n" "-XPrintAptRounds" >> options7c
-printf "%s\n" "-XclassesAsDecls" >> options7c
-printf "%s\n" "-cp ${TESTCLASSES}" >> options7c
-${APT} @options7c
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: apt exited with an error code."
- exit 1
-esac
-
-TestFile "./class/AndAhTwoClass.class"
-TestFile "./class/AhOne.class"
-TestFile "./class/HelloWorld.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying -XclassesAsDecls works with mixed class and source files"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-rm -Rf ./tmp/classes
-
-mkdir -p ./tmp/classes
-
-${JAVAC} -d ./tmp/classes ${TESTSRC}/src/Round1Class.java ${TESTSRC}/src/AndAhTwoClass.java
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: javac failed to succesfully compile."
- exit 1
-esac
-
-printf "%s\n" "-factorypath ${TESTCLASSES}" > options7d
-printf "%s\n" "-factory ClassDeclApf2" >> options7d
-printf "%s\n" "-s ./src" >> options7d
-printf "%s\n" "-XclassesAsDecls" >> options7d
-printf "%s\n" "ClassDeclApf" >> options7d
-printf "%s\n" "-d ./class" >> options7d
-printf "%s\n" "ErrorAPF" >> options7d
-printf "%s\n" "-XPrintAptRounds" >> options7d
-printf "%s\n" "${TESTSRC}/HelloWorld.java" >> options7d
-printf "%s\n" "-cp ${TESTCLASSES}" >> options7d
-${APT} @options7d
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: apt exited with an error code."
- exit 1
-esac
-
-TestFile "./class/AndAhTwoClass.class"
-TestFile "./class/AhOne.class"
-TestFile "./class/HelloWorld.class"
-
-# ---------------------------------------------------------------
-
-echo "Testing productive factories are called on subsequent rounds"
-
-rm -Rf ./src/*
-rm -Rf ./class/*
-
-rm -Rf META-INF/services/*
-cp ${TESTSRC}/servicesRound1 META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTCLASSES}/Round1Apf*.class .
-${JAR} cf0 round1Apf.jar Round1Apf*.class META-INF
-
-rm -Rf META-INF/services/*
-cp ${TESTSRC}/servicesRound2 META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTCLASSES}/Round2Apf*.class .
-${JAR} cf0 round2Apf.jar Round2Apf*.class META-INF
-
-rm -Rf META-INF/services/*
-cp ${TESTSRC}/servicesRound3 META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTCLASSES}/Round3Apf*.class .
-${JAR} cf0 round3Apf.jar Round3Apf*.class META-INF
-
-rm -Rf META-INF/services/*
-cp ${TESTSRC}/servicesRound4 META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTCLASSES}/Round4Apf*.class .
-${JAR} cf0 round4Apf.jar Round4Apf*.class META-INF
-
-cp ${TESTCLASSES}/Round?.class .
-${JAR} cf0 rounds.jar Round?.class
-
-# cleanup file to prevent accidental discovery in current directory
-rm -Rf META-INF/services/*
-
-printf "%s\n" "-factorypath round1Apf.jar${SEP}round2Apf.jar${SEP}round3Apf.jar${SEP}round4Apf.jar" > options8
-printf "%s\n" "-classpath rounds.jar" >> options8
-printf "%s\n" "-s ./src" >> options8
-printf "%s\n" "-d ./class" >> options8
-#printf "%s\n" "-XPrintFactoryInfo" >> options8
-#printf "%s\n" "-XPrintAptRounds" >> options8
-printf "%s\n" "${TESTSRC}/Dummy1.java" >> options8
-${APT} @options8 > multiRoundOutput 2> multiRoundError
-
-diff ${DIFFOPTS} multiRoundOutput ${TESTSRC}/goldenFactory.txt
-
-RESULT=$?
-case "$RESULT" in
- 0 )
- ;;
-
- * )
- echo "FAILED: unexpected factory state"
- exit 1
-esac
-
-TestFile "./class/Dummy5.class"
-
-# ---------------------------------------------------------------
-
-echo "Verifying static state with programmatic apt entry; no factory options"
-rm -Rf ./src/*
-rm -Rf ./class/*
-${JAVA} -cp ${TESTJAVA}/lib/tools.jar${SEP}${TESTCLASSES} WrappedStaticApf -s ./src -d ./class -XPrintAptRounds
-TestFile "./class/AndAhTwo.class"
-
-echo "Verifying static state with programmatic apt entry; -factory"
-rm -Rf ./src/*
-rm -Rf ./class/*
-${JAVA} -cp ${TESTJAVA}/lib/tools.jar${SEP}${TESTCLASSES} WrappedStaticApf -factory ErrorAPF -s ./src -d ./class -XPrintAptRounds
-TestFile "./class/AndAhTwo.class"
-
-echo "Verifying static state with programmatic apt entry; -factorypath"
-rm -Rf ./src/*
-rm -Rf ./class/*
-${JAVA} -cp ${TESTJAVA}/lib/tools.jar${SEP}${TESTCLASSES} WrappedStaticApf -factorypath round1Apf.jar -s ./src -d ./class -XPrintAptRounds
-TestFile "./class/AndAhTwo.class"
-
-echo "Verifying static state with programmatic apt entry; -factory and -factorypath"
-rm -Rf ./src/*
-rm -Rf ./class/*
-${JAVA} -cp ${TESTJAVA}/lib/tools.jar${SEP}${TESTCLASSES} WrappedStaticApf -factorypath round1Apf.jar -factory Round1Apf -s ./src -d ./class -XPrintAptRounds
-TestFile "./class/AndAhTwo.class"
-
-exit 0
diff --git a/langtools/test/tools/apt/Compile/golden.txt b/langtools/test/tools/apt/Compile/golden.txt
deleted file mode 100644
index 180efe2..0000000
--- a/langtools/test/tools/apt/Compile/golden.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-error: It's a mad, mad, mad, mad world
-error: Something wicked this way comes
-HelloWorld.java:2: error: Boring class name
-public class HelloWorld {
- ^
-3 errors
diff --git a/langtools/test/tools/apt/Compile/goldenFactory.txt b/langtools/test/tools/apt/Compile/goldenFactory.txt
deleted file mode 100644
index b849898..0000000
--- a/langtools/test/tools/apt/Compile/goldenFactory.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Round1Apf: 1
- [final round: false, error raised: false, source files created: true, class files created: true]
-Round1Apf: 1 complete
-Round1Apf: 2
-Round2Apf: 1
- [final round: false, error raised: false, source files created: true, class files created: true]
-Round1Apf: 2 complete
-Round1Apf: 3
-Round2Apf: 2
-Round3Apf: 1
- [final round: false, error raised: false, source files created: true, class files created: false]
-Round1Apf: 3 complete
-Round1Apf: 4
-Round2Apf: 3
-Round3Apf: 2
-Round4Apf: 1
- [final round: false, error raised: false, source files created: true, class files created: false]
-Round1Apf: 4 complete
- [final round: false, error raised: false, source files created: true, class files created: false]
-Round4Apf: 1 complete
-Round1Apf: 5
-Round2Apf: 4
-Round3Apf: 3
-Round4Apf: 2
- [final round: true, error raised: false, source files created: false, class files created: false]
-Round1Apf: 5 complete
- [final round: true, error raised: false, source files created: false, class files created: false]
-Round4Apf: 2 complete
-Valediction
diff --git a/langtools/test/tools/apt/Compile/goldenWarn.txt b/langtools/test/tools/apt/Compile/goldenWarn.txt
deleted file mode 100644
index 05544cd..0000000
--- a/langtools/test/tools/apt/Compile/goldenWarn.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-warning: Beware the ides of March!
-HelloAnnotation.java:6: Note: You are about to be warned
- at interface HelloAnnotation {
- ^
-HelloAnnotation.java:6: warning: Strange class name
- at interface HelloAnnotation {
- ^
-Note: MIRROR HelloAnnotation.java:6
-Note: VALUE HelloAnnotation.java:6
-Note: MIRROR HelloAnnotation.java:6
-Note: VALUE HelloAnnotation.java:6
-Note: MIRROR HelloAnnotation.java:6
-Note: VALUE HelloAnnotation.java:5
-2 warnings
diff --git a/langtools/test/tools/apt/Compile/servicesRound1 b/langtools/test/tools/apt/Compile/servicesRound1
deleted file mode 100644
index 91ccf42..0000000
--- a/langtools/test/tools/apt/Compile/servicesRound1
+++ /dev/null
@@ -1 +0,0 @@
-Round1Apf
diff --git a/langtools/test/tools/apt/Compile/servicesRound2 b/langtools/test/tools/apt/Compile/servicesRound2
deleted file mode 100644
index bc27b2b..0000000
--- a/langtools/test/tools/apt/Compile/servicesRound2
+++ /dev/null
@@ -1 +0,0 @@
-Round2Apf
diff --git a/langtools/test/tools/apt/Compile/servicesRound3 b/langtools/test/tools/apt/Compile/servicesRound3
deleted file mode 100644
index ac0b2ee..0000000
--- a/langtools/test/tools/apt/Compile/servicesRound3
+++ /dev/null
@@ -1 +0,0 @@
-Round3Apf
diff --git a/langtools/test/tools/apt/Compile/servicesRound4 b/langtools/test/tools/apt/Compile/servicesRound4
deleted file mode 100644
index ced1da3..0000000
--- a/langtools/test/tools/apt/Compile/servicesRound4
+++ /dev/null
@@ -1 +0,0 @@
-Round4Apf
diff --git a/langtools/test/tools/apt/Compile/servicesStaticApf b/langtools/test/tools/apt/Compile/servicesStaticApf
deleted file mode 100644
index 08cf898..0000000
--- a/langtools/test/tools/apt/Compile/servicesStaticApf
+++ /dev/null
@@ -1 +0,0 @@
-StaticApf
diff --git a/langtools/test/tools/apt/Compile/src/AhOneClass.java b/langtools/test/tools/apt/Compile/src/AhOneClass.java
deleted file mode 100644
index f7d7e7e..0000000
--- a/langtools/test/tools/apt/Compile/src/AhOneClass.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public class AhOneClass {}
diff --git a/langtools/test/tools/apt/Compile/src/AndAhTwoClass.java b/langtools/test/tools/apt/Compile/src/AndAhTwoClass.java
deleted file mode 100644
index be404b0..0000000
--- a/langtools/test/tools/apt/Compile/src/AndAhTwoClass.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public class AndAhTwoClass {}
diff --git a/langtools/test/tools/apt/Compile/src/Round1Class.java b/langtools/test/tools/apt/Compile/src/Round1Class.java
deleted file mode 100644
index 40719d0..0000000
--- a/langtools/test/tools/apt/Compile/src/Round1Class.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public class Round1Class {}
diff --git a/langtools/test/tools/apt/Discovery/Dee.java b/langtools/test/tools/apt/Discovery/Dee.java
deleted file mode 100644
index bbf57a9..0000000
--- a/langtools/test/tools/apt/Discovery/Dee.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class Dee implements AnnotationProcessorFactory {
- static class DeeProc implements AnnotationProcessor {
- DeeProc(AnnotationProcessorEnvironment ape) {}
-
- public void process() {
- return;
- }
- }
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"dum"};
- supportedTypes = Collections.unmodifiableCollection(Arrays.asList(types));
- }
-
- static Collection<String> supportedOptions;
- static {
- String options[] = {""};
- supportedOptions = Collections.unmodifiableCollection(Arrays.asList(options));
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- /*
- * Return the same processor independent of what annotations are
- * present, if any.
- */
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new DeeProc(env);
- }
-}
diff --git a/langtools/test/tools/apt/Discovery/Dum.java b/langtools/test/tools/apt/Discovery/Dum.java
deleted file mode 100644
index e81dd0b..0000000
--- a/langtools/test/tools/apt/Discovery/Dum.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class Dum implements AnnotationProcessorFactory {
- static class DumProc implements AnnotationProcessor {
- DumProc(AnnotationProcessorEnvironment ape) {}
-
- public void process() {
- return;
- }
- }
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"dee"};
- supportedTypes = Collections.unmodifiableCollection(Arrays.asList(types));
- }
-
- static Collection<String> supportedOptions;
- static {
- String options[] = {""};
- supportedOptions = Collections.unmodifiableCollection(Arrays.asList(options));
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- /*
- * Return the same processor independent of what annotations are
- * present, if any.
- */
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new DumProc(env);
- }
-}
diff --git a/langtools/test/tools/apt/Discovery/Empty.java b/langtools/test/tools/apt/Discovery/Empty.java
deleted file mode 100644
index b46f194..0000000
--- a/langtools/test/tools/apt/Discovery/Empty.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public class Empty {
-}
diff --git a/langtools/test/tools/apt/Discovery/PhantomTouch.java b/langtools/test/tools/apt/Discovery/PhantomTouch.java
deleted file mode 100644
index 276c935..0000000
--- a/langtools/test/tools/apt/Discovery/PhantomTouch.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-import java.util.Collections;
-import java.io.*;
-
-public class PhantomTouch implements AnnotationProcessorFactory {
- static class PhantomTouchProc implements AnnotationProcessor {
- AnnotationProcessorEnvironment ape;
- PhantomTouchProc(AnnotationProcessorEnvironment ape) {
- this.ape = ape;
- }
-
- public void process() {
- // Only run the processor on the initial apt invocation
- if (ape.getSpecifiedTypeDeclarations().size() == 0) {
- boolean result;
- try {
- // Create temporary file
- java.io.File f = new java.io.File("touched");
- result = f.createNewFile();
-
- if (result) {
- // Create new source file
- PrintWriter pw = ape.getFiler().createSourceFile("HelloWorld");
- pw.println("public class HelloWorld {");
- pw.println(" // Phantom hello world");
- pw.println(" public static void main(String argv[]) {");
- pw.println(" System.out.println(\"Hello World\");");
- pw.println(" }");
- pw.println("}");
- } else
- throw new RuntimeException("touched file already exists!");
- } catch (java.io.IOException e) {
- result = false;
- }
- }
- }
- }
-
- static final Collection<String> supportedOptions;
- static final Collection<String> supportedTypes;
-
- static {
- String options[] = {""};
- supportedOptions = Collections.unmodifiableCollection(Arrays.asList(options));
-
- String types[] = {"*"};
- supportedTypes = Collections.unmodifiableCollection(Arrays.asList(types));
- }
-
- public Collection<String> supportedAnnotationTypes() {return supportedTypes;}
- public Collection<String> supportedOptions() {return supportedOptions;}
-
-
- /*
- * Return the same processor independent of what annotations are
- * present, if any.
- */
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new PhantomTouchProc(env);
- }
-}
diff --git a/langtools/test/tools/apt/Discovery/PhantomUpdate.java b/langtools/test/tools/apt/Discovery/PhantomUpdate.java
deleted file mode 100644
index 6d92358..0000000
--- a/langtools/test/tools/apt/Discovery/PhantomUpdate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/*
- * JSR 269 annotation processor to test combined apt + JSR 269
- * annotation processor file generation and option passing.
- */
-
-import javax.annotation.processing.*;
-import static javax.lang.model.SourceVersion.*;
-import javax.lang.model.element.*;
-import javax.lang.model.type.*;
-import javax.lang.model.util.*;
-import java.util.*;
-import java.io.*;
-
- at SupportedAnnotationTypes("*") // Process all annotations
- at SupportedSourceVersion(RELEASE_6)
-public class PhantomUpdate extends AbstractProcessor {
- boolean firstRound = true;
-
- public boolean process(Set<? extends TypeElement> annotations,
- RoundEnvironment roundEnv) {
- if (firstRound) {
- verifyOptions();
- printGoodbyeWorld();
- firstRound = false;
- }
- return true; // Claim all annotations
- }
-
- /*
- * Expected options are "foo" and "bar=baz".
- */
- private void verifyOptions() {
- Map<String, String> actualOptions = processingEnv.getOptions();
- Map<String, String> expectedOptions = new LinkedHashMap<String, String>();
- expectedOptions.put("foo", null);
- expectedOptions.put("bar", "baz");
-
- if (!actualOptions.equals(expectedOptions) ) {
- System.err.println("Expected options " + expectedOptions +
- "\n but got " + actualOptions);
- throw new RuntimeException("Options mismatch");
- }
- }
-
- private void printGoodbyeWorld() {
- try {
- // Create new source file
- PrintWriter pw = new PrintWriter(processingEnv.getFiler().createSourceFile("GoodbyeWorld").openWriter());
- pw.println("public class GoodbyeWorld {");
- pw.println(" // PhantomUpdate Goodbye world");
- pw.println(" public static void main(String argv[]) {");
- pw.println(" System.out.println(\"Goodbye World\");");
- pw.println(" }");
- pw.println("}");
- pw.close();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
diff --git a/langtools/test/tools/apt/Discovery/Touch.java b/langtools/test/tools/apt/Discovery/Touch.java
deleted file mode 100644
index 923ba55..0000000
--- a/langtools/test/tools/apt/Discovery/Touch.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-import java.util.Collections;
-import java.io.*;
-
-public class Touch implements AnnotationProcessorFactory {
- static class TouchProc implements AnnotationProcessor {
- AnnotationProcessorEnvironment ape;
- TouchProc(AnnotationProcessorEnvironment ape) {
- this.ape = ape;
- }
-
- public void process() {
- boolean result;
- // Only run the processor on the initial apt invocation
- Collection<TypeDeclaration> tdecls = ape.getSpecifiedTypeDeclarations();
-
- if (tdecls.size() == 1) {
- for(TypeDeclaration decl: tdecls) {
- if (! decl.getSimpleName().equals("Touch") )
- return;
- }
-
- try {
- // Create temporary file
- java.io.File f = new java.io.File("touched");
- result = f.createNewFile();
-
-
- Filer filer = ape.getFiler();
-
- // Create new source file
- PrintWriter pw = filer.createSourceFile("HelloWorld");
- pw.println("public class HelloWorld {");
- pw.println(" public static void main(String argv[]) {");
- pw.println(" System.out.println(\"Hello World\");");
- pw.println(" }");
- pw.println("}");
-
- // Create new class file and copy Empty.class
- OutputStream os = filer.createClassFile("Empty");
- FileInputStream fis = new FileInputStream("Empty.clazz");
- int datum;
- while((datum = fis.read()) != -1)
- os.write(datum);
-
- } catch (java.io.IOException e) {
- result = false;
- }
- if (!result)
- throw new RuntimeException("touched file already exists or other error");
- }
-
- }
-
- }
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"*"};
- supportedTypes = Collections.unmodifiableCollection(Arrays.asList(types));
- }
-
- static Collection<String> supportedOptions;
- static {
- String options[] = {""};
- supportedOptions = Collections.unmodifiableCollection(Arrays.asList(options));
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- /*
- * Return the same processor independent of what annotations are
- * present, if any.
- */
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new TouchProc(env);
- }
-}
diff --git a/langtools/test/tools/apt/Discovery/discovery.sh b/langtools/test/tools/apt/Discovery/discovery.sh
deleted file mode 100644
index 657b273..0000000
--- a/langtools/test/tools/apt/Discovery/discovery.sh
+++ /dev/null
@@ -1,410 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
-# 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 4984412 4985113 4908512 4990905 4998007 4998218 5002340 5023882 6370261 6363481
-# @run shell ../verifyVariables.sh
-# @compile PhantomUpdate.java
-# @run shell discovery.sh
-# @summary Test consistency of annotation discovery
-# @author Joseph D. Darcy
-
-
-# If the file does not exist, exit with an error
-TestFile() {
- if [ ! -f ${1} ]; then
- printf "%s\n" "File ${1} not found."
- exit 1
- fi
-}
-
-OS=`uname -s`;
-case "${OS}" in
- Windows* | CYGWIN* )
- SEP=";"
- ;;
-
- * )
- SEP=":"
- ;;
-esac
-
-TOOLSJAR=${TESTJAVA}/lib/tools.jar
-
-OLDCP=${CLASSPATH}
-
-JARCP=tweedle.jar${SEP}touch.jar${SEP}${TOOLSJAR}
-SOURCEP=${TESTSRC}
-FULLCP=${JARCP}${SEP}${SOURCEP}
-BADCP=tweedle.jar${SEP}badTouch.jar${SEP}${TOOLSJAR}
-
-# Construct path to apt executable
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} "
-
-
-# Construct path to apt executable, no compilation
-APTNC="${APT} -nocompile "
-
-
-printf "%s\n" "APT = ${APT}"
-
-# Construct path to javac executable
-JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TOOLSJAR} -d . "
-JAR="${TESTJAVA}/bin/jar "
-
-$JAVAC ${TESTSRC}/Dee.java ${TESTSRC}/Dum.java ${TESTSRC}/Touch.java ${TESTSRC}/PhantomTouch.java ${TESTSRC}/Empty.java
-RESULT=$?
-
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Compilation failed."
- exit 1
-esac
-
-mv Empty.class Empty.clazz
-
-echo "Making services directory and copying services information."
-mkdir -p META-INF/services
-mkdir -p phantom
-
-rm -f touch.jar
-rm -f badTouch.jar
-
-cp ${TESTSRC}/servicesTweedle META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-${JAR} cf0 tweedle.jar Dee*.class Dum*.class META-INF
-
-rm -f META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTSRC}/servicesTouch ./META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-${JAR} cf0 touch.jar Touch*.class META-INF
-
-rm -f META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTSRC}/servicesPhantomTouch ./META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-${JAR} cf0 phantom/phantom.jar PhantomTouch*.class META-INF
-
-# cleanup file to prevent accidental discovery in current directory
-rm -f META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-# Jar files created; verify right output file is touched
-
-#---------------------------------------------------------
-
-# Test different combinations of classpath, sourcepath, and
-# destination directories
-
-
-#
-# Classpath on commandline; no output directories
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-printf "%s\n" "-classpath ${JARCP}" > options1
-printf "%s\n" "-sourcepath ${SOURCEP}" >> options1
-printf "%s\n" "${TESTSRC}/Touch.java" >> options1
-
-${APTNC} @options1
-
-echo "Testing case 1"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "Empty.class"
-
-#
-# Class path set through environment variable
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-CLASSPATH=${JARCP}
-export CLASSPATH
-printf "%s\n" "-sourcepath ${SOURCEP}" > options2
-printf "%s\n" "${TESTSRC}/Touch.java" >> options2
-
-${APTNC} @options2
-
-echo "Testing case 2"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "Empty.class"
-
-#
-# No explicit source path
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-CLASSPATH=${FULLCP}
-export CLASSPATH
-printf "%s\n" "${TESTSRC}/Touch.java" > options3
-
-${APTNC} @options3
-
-echo "Testing case 3"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "Empty.class"
-
-
-#
-# Classpath on commandline; class output directory
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -Rf classes/Empty.class
-
-unset CLASSPATH
-printf "%s\n" "-classpath ${JARCP}" > options4
-printf "%s\n" "-sourcepath ${SOURCEP}" >> options4
-printf "%s\n" "-d classes" >> options4
-printf "%s\n" "${TESTSRC}/Touch.java" >> options4
-
-${APTNC} @options4
-
-echo "Testing case 4"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "classes/Empty.class"
-
-#
-# Classpath on commandline; source output directory
-#
-
-rm -f touched
-rm -Rf src
-rm -f Empty.class
-
-unset CLASSPATH
-printf "%s\n" "-classpath ${JARCP}" > options5
-printf "%s\n" "-sourcepath ${SOURCEP}" >> options5
-printf "%s\n" "-s src" >> options5
-printf "%s\n" "${TESTSRC}/Touch.java" >> options5
-
-${APTNC} @options5
-
-echo "Testing case 5"
-TestFile "touched"
-TestFile "src/HelloWorld.java"
-TestFile "Empty.class"
-
-
-#
-# Classpath on commandline; class and source output directory
-#
-
-rm -f touched
-rm -Rf src
-rm -Rf classes
-
-unset CLASSPATH
-printf "%s\n" "-classpath ${JARCP}" > options6
-printf "%s\n" "-sourcepath ${SOURCEP}" >> options6
-printf "%s\n" "-d classes" >> options6
-printf "%s\n" "-s src" >> options6
-printf "%s\n" "${TESTSRC}/Touch.java" >> options6
-
-${APTNC} @options6
-
-echo "Testing case 6"
-TestFile "touched"
-TestFile "src/HelloWorld.java"
-TestFile "classes/Empty.class"
-
-#
-# Classpath appended to bootclasspath; no output directories
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-printf "%s\n" "-Xbootclasspath/a:${JARCP}" > options7
-printf "%s\n" "-classpath /dev/null" >> options7
-printf "%s\n" "${TESTSRC}/Touch.java" >> options7
-
-${APTNC} @options7
-
-echo "Testing case 7"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "Empty.class"
-
-#
-# Classpath in extdirs; no output directories
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-printf "%s\n" "-extdirs ." > options8
-printf "%s\n" "-classpath ${TOOLSJAR}" >> options8
-printf "%s\n" "${TESTSRC}/Touch.java" >> options8
-
-${APTNC} @options8
-
-echo "Testing case 8"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "Empty.class"
-
-#
-# Classpath in extdirs, take 2; no output directories
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-printf "%s\n" "-Djava.ext.dirs=." > options9
-printf "%s\n" "-classpath ${TOOLSJAR}" >> options9
-printf "%s\n" "${TESTSRC}/Touch.java" >> options9
-
-${APTNC} @options9
-
-echo "Testing case 9"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "Empty.class"
-
-#
-# Classpath in -endorseddirs; no output directories
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-printf "%s\n" "-endorseddirs ." > options10
-printf "%s\n" "-classpath ${TOOLSJAR}" >> options10
-printf "%s\n" "${TESTSRC}/Touch.java" >> options10
-
-${APTNC} @options10
-
-echo "Testing case 10"
-TestFile "touched"
-TestFile "HelloWorld.java"
-TestFile "Empty.class"
-
-#
-# Testing apt invocation with no command line options
-#
-
-rm -f touched
-rm -f HelloWorld.java
-rm -f Empty.class
-
-unset CLASSPATH
-CLASSPATH=./phantom/phantom.jar
-export CLASSPATH
-
-${APT}
-
-echo "Testing empty command line"
-TestFile "touched"
-TestFile "HelloWorld.java"
-
-
-#
-# Verify apt and JSR 269 annotation processors can be run from same
-# invocation and both use the output directories
-#
-
-rm -f touched
-rm -f src/HelloWorld.java
-rm -f src/GoodbyeWorld.java
-rm -f classes/HelloWorld.class
-rm -f classes/GoodbyeWorld.class
-
-unset CLASSPATH
-
-
-printf "%s\n" "-classpath ./phantom/phantom.jar" > options11
-printf "%s\n" "-sourcepath ${SOURCEP}" >> options11
-printf "%s\n" "-factory PhantomTouch " >> options11
-printf "%s\n" "-s src" >> options11
-printf "%s\n" "-d classes" >> options11
-printf "%s\n" "-A" >> options11
-printf "%s\n" "-Afoo" >> options11
-printf "%s\n" "-Abar=baz" >> options11
-printf "%s\n" "-processorpath $TESTCLASSES" >> options11
-printf "%s\n" "-processor PhantomUpdate" >> options11
-
-${APT} @options11
-
-echo "Testing combined apt and JSR 269 processing"
-TestFile touched
-TestFile "src/HelloWorld.java"
-TestFile "src/GoodbyeWorld.java"
-TestFile "classes/HelloWorld.class"
-TestFile "classes/GoodbyeWorld.class"
-
-#
-# Verify running with badTouch doesn't exit successfully
-#
-
-rm -f ./META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-cp ${TESTSRC}/servicesBadTouch ./META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-${JAR} cf0 badTouch.jar Touch*.class META-INF
-
-
-unset CLASSPATH
-printf "%s\n" "-classpath ${BADCP}" > optionsBad
-printf "%s\n" "-sourcepath ${SOURCEP}" >> optionsBad
-printf "%s\n" "${TESTSRC}/Touch.java" >> optionsBad
-
-${APTNC} @optionsBad 2> /dev/null
-
-RESULT=$?
-
-case "${RESULT}" in
- 0 )
- echo "Improper exit zero with bad services information."
- exit 1
- ;;
-esac
-
-
-exit 0;
diff --git a/langtools/test/tools/apt/Discovery/servicesBadTouch b/langtools/test/tools/apt/Discovery/servicesBadTouch
deleted file mode 100644
index ebb545f..0000000
--- a/langtools/test/tools/apt/Discovery/servicesBadTouch
+++ /dev/null
@@ -1 +0,0 @@
-Touche
diff --git a/langtools/test/tools/apt/Discovery/servicesPhantomTouch b/langtools/test/tools/apt/Discovery/servicesPhantomTouch
deleted file mode 100644
index 2a25069..0000000
--- a/langtools/test/tools/apt/Discovery/servicesPhantomTouch
+++ /dev/null
@@ -1 +0,0 @@
-PhantomTouch
diff --git a/langtools/test/tools/apt/Discovery/servicesTouch b/langtools/test/tools/apt/Discovery/servicesTouch
deleted file mode 100644
index b0d2d43..0000000
--- a/langtools/test/tools/apt/Discovery/servicesTouch
+++ /dev/null
@@ -1 +0,0 @@
-Touch
diff --git a/langtools/test/tools/apt/Discovery/servicesTweedle b/langtools/test/tools/apt/Discovery/servicesTweedle
deleted file mode 100644
index b2e6b8e..0000000
--- a/langtools/test/tools/apt/Discovery/servicesTweedle
+++ /dev/null
@@ -1,2 +0,0 @@
-Dee
-Dum
diff --git a/langtools/test/tools/apt/Misc/Marked.java b/langtools/test/tools/apt/Misc/Marked.java
deleted file mode 100644
index d7f73f0..0000000
--- a/langtools/test/tools/apt/Misc/Marked.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-class Marked {
-
- @Marker
- class marked1 {};
-
-
- class Unmarked1 {};
-
- @Marker
- class marked2 {};
-
-
- class Unmarked2 {};
-
- @Marker
- class marked3 {};
-
-
- class Unmarked3 {};
-
- @Marker
- class marked4 {};
-
-
- class Unmarked4 {};
-
-}
diff --git a/langtools/test/tools/apt/Misc/Marker.java b/langtools/test/tools/apt/Misc/Marker.java
deleted file mode 100644
index 9631bd8..0000000
--- a/langtools/test/tools/apt/Misc/Marker.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public @interface Marker {}
diff --git a/langtools/test/tools/apt/Misc/Misc.java b/langtools/test/tools/apt/Misc/Misc.java
deleted file mode 100644
index f18c4ab..0000000
--- a/langtools/test/tools/apt/Misc/Misc.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class Misc implements AnnotationProcessorFactory {
- static class MiscCheck implements AnnotationProcessor {
- AnnotationProcessorEnvironment ape;
- MiscCheck(AnnotationProcessorEnvironment ape) {
- this.ape = ape;
- }
-
- public void process() {
- Collection<Declaration> decls = ape.
- getDeclarationsAnnotatedWith((AnnotationTypeDeclaration)
- ape.getTypeDeclaration("Marker"));
-
- // Should write more robust test that examines the
- // annotation mirrors for the declaration in question.
- for(Declaration decl: decls) {
- if (!decl.getSimpleName().startsWith("marked") )
- throw new RuntimeException();
- }
- }
- }
-
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"*"};
- supportedTypes = Collections.unmodifiableCollection(Arrays.asList(types));
- }
-
- Collection<String> supportedOptions =
- Collections.unmodifiableCollection(new HashSet<String>());
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- /*
- * Return the same processor independent of what annotations are
- * present, if any.
- */
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment ape) {
- return new MiscCheck(ape);
- }
-}
diff --git a/langtools/test/tools/apt/Misc/misc.sh b/langtools/test/tools/apt/Misc/misc.sh
deleted file mode 100644
index 51303e6..0000000
--- a/langtools/test/tools/apt/Misc/misc.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
-# 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 5007250
-# @run shell ../verifyVariables.sh
-# @run shell misc.sh
-# @summary Miscelleneous tests
-# @author Joseph D. Darcy
-
-OS=`uname -s`;
-case "${OS}" in
- Windows* | CYGWIN* )
- SEP=";"
- ;;
-
- * )
- SEP=":"
- ;;
-esac
-
-JARCP=misc.jar
-SOURCEP=${TESTSRC}
-
-# Construct path to apt executable
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -nocompile "
-
-printf "%s\n" "APT = ${APT}"
-
-# Construct path to javac executable
-JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "
-JAR="${TESTJAVA}/bin/jar "
-
-${JAVAC} ${TESTSRC}/Misc.java ${TESTSRC}/Marked.java
-RESULT=$?
-
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Compilation failed."
- exit 1
-esac
-
-
-echo "Making services directory and copying services information."
-mkdir -p META-INF/services
-
-cp ${TESTSRC}/servicesMisc META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-${JAR} cf0 misc.jar Misc*.class META-INF
-
-# Jar files created; verify options properly present on both initial
-# and recursive apt runs
-
-#---------------------------------------------------------
-
-unset CLASSPATH
-
-printf "%s\n" "-classpath ${JARCP}" > options
-printf "%s\n" "-sourcepath ${SOURCEP}" >> options
-printf "%s\n" "${TESTSRC}/Marked.java" >> options
-
-${APT} @options
-
-RESULT=$?
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Problem with result"
- exit 1
- ;;
-esac
-
-exit 0;
diff --git a/langtools/test/tools/apt/Misc/servicesMisc b/langtools/test/tools/apt/Misc/servicesMisc
deleted file mode 100644
index 62e7db4..0000000
--- a/langtools/test/tools/apt/Misc/servicesMisc
+++ /dev/null
@@ -1,2 +0,0 @@
-Misc
-
diff --git a/langtools/test/tools/apt/Options/Marked.java b/langtools/test/tools/apt/Options/Marked.java
deleted file mode 100644
index ae0e6b5..0000000
--- a/langtools/test/tools/apt/Options/Marked.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
- at Marker
-class Marked {
-}
diff --git a/langtools/test/tools/apt/Options/Marker.java b/langtools/test/tools/apt/Options/Marker.java
deleted file mode 100644
index 9631bd8..0000000
--- a/langtools/test/tools/apt/Options/Marker.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public @interface Marker {}
diff --git a/langtools/test/tools/apt/Options/OptionChecker.java b/langtools/test/tools/apt/Options/OptionChecker.java
deleted file mode 100644
index 9d0a324..0000000
--- a/langtools/test/tools/apt/Options/OptionChecker.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Map;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class OptionChecker implements AnnotationProcessorFactory {
- static class OptionCheck implements AnnotationProcessor {
- AnnotationProcessorEnvironment ape;
- OptionCheck(AnnotationProcessorEnvironment ape) {
- this.ape = ape;
- }
-
- public void process() {
- Map<String, String> options = ape.getOptions();
- if (options.containsKey("-Afoo") &&
- options.containsKey("-Abar") &&
- options.containsKey("-classpath") ) {
- System.out.println("Expected options found.");
- return; // All is well
- } else {
- System.err.println("Unexpected options values: " + options);
- throw new RuntimeException();
- }
- }
- }
-
- static class HelloWorld implements AnnotationProcessor {
- AnnotationProcessorEnvironment ape;
- HelloWorld(AnnotationProcessorEnvironment ape) {
- this.ape = ape;
- }
-
- public void process() {
- java.io.PrintWriter pw;
- try {
- pw = ape.getFiler().createSourceFile("HelloWorld");
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
-
- pw.println("public class HelloWorld {");
- pw.println(" public static void main (String argv[]) {");
- pw.println(" System.out.println(\"Hello apt world.\");");
- pw.println(" }");
- pw.println("}");
- }
- }
-
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"*"};
- supportedTypes = Collections.unmodifiableCollection(Arrays.asList(types));
- }
-
- static Collection<String> supportedOptions;
- static {
- String options[] = {"-Afoo", "-Abar"};
- supportedOptions = Collections.unmodifiableCollection(Arrays.asList(options));
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- /*
- * Return the same processor independent of what annotations are
- * present, if any.
- */
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment ape) {
-
- if (atds.contains(ape.getTypeDeclaration("Marker"))) {
- System.out.println("Returning composite processor.");
- return AnnotationProcessors.getCompositeAnnotationProcessor(new OptionCheck(ape),
- new HelloWorld(ape));
- }
- else {
- System.out.println("Returning single processor.");
- return new OptionCheck(ape);
- }
- }
-}
diff --git a/langtools/test/tools/apt/Options/options.sh b/langtools/test/tools/apt/Options/options.sh
deleted file mode 100644
index 4f1aba1..0000000
--- a/langtools/test/tools/apt/Options/options.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
-# 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 4993950 4993277
-# @run shell ../verifyVariables.sh
-# @run shell options.sh
-# @summary Test availabilty of command line options in processors
-# @author Joseph D. Darcy
-
-OS=`uname -s`;
-case "${OS}" in
- Windows* | CYGWIN* )
- SEP=";"
- ;;
-
- * )
- SEP=":"
- ;;
-esac
-
-JARCP=option.jar
-SOURCEP=${TESTSRC}
-
-
-# Construct path to apt executable
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -nocompile "
-
-printf "%s\n" "APT = ${APT}"
-
-# Construct path to javac executable
-JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "
-JAR="${TESTJAVA}/bin/jar "
-
-${JAVAC} ${TESTSRC}/OptionChecker.java
-RESULT=$?
-
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Compilation failed."
- exit 1
-esac
-
-
-echo "Making services directory and copying services information."
-mkdir -p META-INF/services
-
-cp ${TESTSRC}/servicesOptions META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-${JAR} cf0 option.jar OptionChecker*.class META-INF
-
-# Jar files created; verify options properly present on both initial
-# and recursive apt runs
-
-#---------------------------------------------------------
-
-unset CLASSPATH
-
-printf "%s\n" "-classpath ${JARCP}" > options
-printf "%s\n" "-sourcepath ${SOURCEP}" >> options
-printf "%s\n" "${TESTSRC}/Marked.java" >> options
-
-${APT} @options
-
-RESULT=$?
-case "${RESULT}" in
- 0 )
- echo "Failed to indentify missing options"
- exit 1
- ;;
-
- * )
- ;;
-esac
-
-printf "%s\n" "-Afoo -Abar" >> options
-
-${APT} @options
-
-RESULT=$?
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Options not found properly."
- exit 1
- ;;
-esac
-
-exit 0;
diff --git a/langtools/test/tools/apt/Options/servicesOptions b/langtools/test/tools/apt/Options/servicesOptions
deleted file mode 100644
index 8cf2db2..0000000
--- a/langtools/test/tools/apt/Options/servicesOptions
+++ /dev/null
@@ -1 +0,0 @@
-OptionChecker
diff --git a/langtools/test/tools/apt/Scanners/Counter.java b/langtools/test/tools/apt/Scanners/Counter.java
deleted file mode 100644
index e7b4e69..0000000
--- a/langtools/test/tools/apt/Scanners/Counter.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * Used to verify counts from different kinds of declaration scanners.
- */
-public class Counter implements AnnotationProcessorFactory {
- static class CounterProc implements AnnotationProcessor {
- static class CountingVisitor extends SimpleDeclarationVisitor {
- int count;
- int count() {
- return count;
- }
-
- CountingVisitor() {
- count = 0;
- }
-
- public void visitDeclaration(Declaration d) {
- count++;
- System.out.println(d.getSimpleName());
- }
- }
-
- AnnotationProcessorEnvironment env;
- CounterProc(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- public void process() {
- for(TypeDeclaration td: env.getSpecifiedTypeDeclarations() ) {
- CountingVisitor sourceOrder = new CountingVisitor();
- CountingVisitor someOrder = new CountingVisitor();
-
- System.out.println("Source Order Scanner");
- td.accept(getSourceOrderDeclarationScanner(sourceOrder,
- NO_OP));
-
- System.out.println("\nSome Order Scanner");
- td.accept(getDeclarationScanner(someOrder,
- NO_OP));
-
- if (sourceOrder.count() != someOrder.count() )
- throw new RuntimeException("Counts from different scanners don't agree");
- }
-
- }
- }
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"*"};
- supportedTypes = unmodifiableCollection(Arrays.asList(types));
- }
-
- static Collection<String> supportedOptions;
- static {
- String options[] = {""};
- supportedOptions = unmodifiableCollection(Arrays.asList(options));
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new CounterProc(env);
- }
-
-}
diff --git a/langtools/test/tools/apt/Scanners/MemberOrderApf.java b/langtools/test/tools/apt/Scanners/MemberOrderApf.java
deleted file mode 100644
index 51108ae..0000000
--- a/langtools/test/tools/apt/Scanners/MemberOrderApf.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Arrays;
-
-import static java.util.Collections.*;
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-/*
- * The processor of this factory verifies class members are returned
- * in source-code order.
- */
-public class MemberOrderApf implements AnnotationProcessorFactory {
- // Process any set of annotations
- private static final Collection<String> supportedAnnotations
- = unmodifiableCollection(Arrays.asList("*"));
-
- // No supported options
- private static final Collection<String> supportedOptions = emptySet();
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedAnnotations;
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new MemberOrderAp(env);
- }
-
- private static class MemberOrderAp implements AnnotationProcessor {
- private final AnnotationProcessorEnvironment env;
- MemberOrderAp(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- private void verifyOrder(Collection<? extends Declaration> decls) {
- int count = 0;
- for(Declaration decl: decls) {
- VisitOrder order = decl.getAnnotation(VisitOrder.class);
- if (order.value() <= count)
- throw new RuntimeException("Out of order declarations");
- count = order.value();
- }
- }
-
- public void process() {
- for(TypeDeclaration td: env.getSpecifiedTypeDeclarations()) {
- verifyOrder(td.getFields());
- verifyOrder(td.getMethods());
- }
- }
- }
-}
diff --git a/langtools/test/tools/apt/Scanners/Order.java b/langtools/test/tools/apt/Scanners/Order.java
deleted file mode 100644
index e2a8852..0000000
--- a/langtools/test/tools/apt/Scanners/Order.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-
- at VisitOrder(1)
-public class Order {
- @VisitOrder(2)
- static double d;
-
- @VisitOrder(3)
- private Order() {}
-
- @VisitOrder(4)
- int i;
-
- @VisitOrder(5)
- static class InnerOrder {
- @VisitOrder(6)
- InnerOrder(){}
-
- @VisitOrder(7)
- String toString() {return "";}
- }
-
- @VisitOrder(8)
- String toString() {return "";}
-
- @VisitOrder(9)
- InnerOrder io;
-
- @VisitOrder(10)
- String foo() {return toString();}
-}
diff --git a/langtools/test/tools/apt/Scanners/Scanner.java b/langtools/test/tools/apt/Scanners/Scanner.java
deleted file mode 100644
index f9e8434..0000000
--- a/langtools/test/tools/apt/Scanners/Scanner.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import java.util.Collection;
-import java.util.Set;
-import java.util.Map;
-import java.util.Arrays;
-import java.util.Collections;
-
-
-public class Scanner implements AnnotationProcessorFactory {
- static class ScannerProc implements AnnotationProcessor {
- AnnotationProcessorEnvironment env;
- ScannerProc(AnnotationProcessorEnvironment env) {
- this.env = env;
- }
-
- static class CountingVisitor extends SimpleDeclarationVisitor {
- int count;
- CountingVisitor() {
- count = 0;
- }
-
- public void visitDeclaration(Declaration d) {
- count++;
-
- Collection<AnnotationMirror> ams = d.getAnnotationMirrors();
- if (ams == null)
- throw new RuntimeException("Declaration " + d +
- " not annotated with visit order.");
- else {
- if (ams.size() != 1)
- throw new RuntimeException("Declaration " + d +
- " has wrong number of declarations.");
- else {
- for(AnnotationMirror am: ams) {
- Map<AnnotationTypeElementDeclaration,AnnotationValue> elementValues = am.getElementValues();
- for(AnnotationTypeElementDeclaration atmd: elementValues.keySet()) {
- if (!atmd.getDeclaringType().toString().equals("VisitOrder"))
- throw new RuntimeException("Annotation " + atmd +
- " is the wrong type.");
- else {
- AnnotationValue av =
- elementValues.get(atmd);
- Integer value = (Integer) av.getValue();
- if (value.intValue() != count)
- throw new RuntimeException("Expected declaration " + d +
- " to be in position " + count +
- " instead of " + value.intValue());
-
- System.out.println("Declaration " + d +
- ": visit order " + value.intValue());
- }
- }
-
- }
- }
- }
-
- }
- }
-
- public void process() {
- for(TypeDeclaration td: env.getSpecifiedTypeDeclarations() ) {
- td.accept(DeclarationVisitors.getSourceOrderDeclarationScanner(new CountingVisitor(),
- DeclarationVisitors.NO_OP));
- }
- }
- }
-
-
- static Collection<String> supportedTypes;
- static {
- String types[] = {"*"};
- supportedTypes = Collections.unmodifiableCollection(Arrays.asList(types));
- }
-
- static Collection<String> supportedOptions;
- static {
- String options[] = {""};
- supportedOptions = Collections.unmodifiableCollection(Arrays.asList(options));
- }
-
- public Collection<String> supportedOptions() {
- return supportedOptions;
- }
-
- public Collection<String> supportedAnnotationTypes() {
- return supportedTypes;
- }
-
- public AnnotationProcessor getProcessorFor(Set<AnnotationTypeDeclaration> atds,
- AnnotationProcessorEnvironment env) {
- return new ScannerProc(env);
- }
-
-}
diff --git a/langtools/test/tools/apt/Scanners/TestEnum.java b/langtools/test/tools/apt/Scanners/TestEnum.java
deleted file mode 100644
index 0c61565..0000000
--- a/langtools/test/tools/apt/Scanners/TestEnum.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-public enum TestEnum {
- QUIZ,
- EXAM,
- MIDTERM,
- FINAL,
- QUALIFIER;
-}
diff --git a/langtools/test/tools/apt/Scanners/VisitOrder.java b/langtools/test/tools/apt/Scanners/VisitOrder.java
deleted file mode 100644
index 584b447..0000000
--- a/langtools/test/tools/apt/Scanners/VisitOrder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/*
- * Integer to indicate what order a declaration is expected to be
- * visited in by a DeclarationScanner.
- */
-
- at interface VisitOrder {
- int value();
-}
diff --git a/langtools/test/tools/apt/Scanners/scanner.sh b/langtools/test/tools/apt/Scanners/scanner.sh
deleted file mode 100644
index 71fe799..0000000
--- a/langtools/test/tools/apt/Scanners/scanner.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
-# 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 4989093 5009164 5023880 5029482 6206786
-# @run shell ../verifyVariables.sh
-# @run shell scanner.sh
-# @summary Test source order scanner
-# @author Joseph D. Darcy
-
-OS=`uname -s`;
-case "${OS}" in
- Windows* | CYGWIN* )
- SEP=";"
- ;;
-
- * )
- SEP=":"
- ;;
-esac
-
-JARCP=scanner.jar
-
-# Construct path to apt executable
-APT="${TESTJAVA}/bin/apt ${TESTTOOLVMOPTS} -nocompile "
-
-printf "%s\n" "APT = ${APT}"
-
-# Construct path to javac executable
-JAVAC="${TESTJAVA}/bin/javac ${TESTTOOLVMOPTS} -source 1.5 -sourcepath ${TESTSRC} -classpath ${TESTJAVA}/lib/tools.jar -d . "
-JAR="${TESTJAVA}/bin/jar "
-
-${JAVAC} ${TESTSRC}/Scanner.java ${TESTSRC}/VisitOrder.java ${TESTSRC}/Counter.java ${TESTSRC}/MemberOrderApf.java
-RESULT=$?
-
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Compilation failed."
- exit 1
-esac
-
-
-echo "Making services directory and copying services information."
-mkdir -p META-INF/services
-
-cp ${TESTSRC}/servicesScanner META-INF/services/com.sun.mirror.apt.AnnotationProcessorFactory
-
-${JAR} cf0 scanner.jar Scanner*.class META-INF
-
-# Jar files created; verify options properly present on both initial
-# and recursive apt runs
-
-#---------------------------------------------------------
-
-unset CLASSPATH
-
-printf "%s\n" "-classpath ${JARCP}" > options
-printf "%s\n" "-sourcepath ${TESTSRC}" >> options
-printf "%s\n" "${TESTSRC}/Order.java" >> options
-
-${APT} @options
-
-RESULT=$?
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Program elements visited in wrong order"
- exit 1
- ;;
-esac
-
-#---------------------------------------------------------
-
-# Verify that plain decl' scanner and source order decl' scanner
-# record the same number of elements for an enum
-
-printf "%s\n" "-factorypath ." > options2
-printf "%s\n" "-factory Counter" >> options2
-printf "%s\n" "-sourcepath ${TESTSRC}" >> options2
-printf "%s\n" "${TESTSRC}/TestEnum.java" >> options2
-
-
-$APT @options2
-
-RESULT=$?
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Improper counts"
- exit 1
- ;;
-esac
-
-#---------------------------------------------------------
-
-# Verify that members happen to be returned in source order
-
-printf "%s\n" "-factorypath ." > options3
-printf "%s\n" "-factory MemberOrderApf" >> options3
-printf "%s\n" "-sourcepath ${TESTSRC}" >> options3
-printf "%s\n" "${TESTSRC}/Order.java" >> options3
-
-$APT @options3
-
-RESULT=$?
-case "${RESULT}" in
- 0 )
- ;;
-
- * )
- echo "Improper counts"
- exit 1
- ;;
-esac
-
-
-exit 0;
diff --git a/langtools/test/tools/apt/Scanners/servicesScanner b/langtools/test/tools/apt/Scanners/servicesScanner
deleted file mode 100644
index 6ac6c38..0000000
--- a/langtools/test/tools/apt/Scanners/servicesScanner
+++ /dev/null
@@ -1 +0,0 @@
-Scanner
diff --git a/langtools/test/tools/apt/lib/Ignore.java b/langtools/test/tools/apt/lib/Ignore.java
deleted file mode 100644
index 8aac427..0000000
--- a/langtools/test/tools/apt/lib/Ignore.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import java.lang.annotation.*;
-
-/**
- * An annotation used to indicate that a test -- a method annotated
- * with @Test -- should not be executed.
- *
- * @author Scott Seligman
- */
- at Target(ElementType.METHOD)
- at Retention(RetentionPolicy.RUNTIME)
-public @interface Ignore {
-
- /**
- * Reason for ignoring this test.
- */
- String value() default "";
-}
diff --git a/langtools/test/tools/apt/lib/Test.java b/langtools/test/tools/apt/lib/Test.java
deleted file mode 100644
index 301ae87..0000000
--- a/langtools/test/tools/apt/lib/Test.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import java.lang.annotation.*;
-
-/**
- * An annotation used to indicate that a method constitutes a test,
- * and which provides the expected result. The method must take no parameters.
- *
- * @author Scott Seligman
- */
- at Target(ElementType.METHOD)
- at Retention(RetentionPolicy.RUNTIME)
-public @interface Test {
-
- /**
- * An array containing the method's expected result (or
- * elements of the result if the return type is a Collection).
- * Value is ignored if return type is void.
- * Entries are converted to strings via {@link String#valueOf(Object)}.
- */
- String[] result() default {};
-
- /**
- * True if the order of the elements in result() is significant.
- */
- boolean ordered() default false;
-}
diff --git a/langtools/test/tools/apt/lib/TestProcessor.java b/langtools/test/tools/apt/lib/TestProcessor.java
deleted file mode 100644
index 920d049..0000000
--- a/langtools/test/tools/apt/lib/TestProcessor.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import java.lang.reflect.Method;
-import java.util.*;
-import com.sun.mirror.apt.*;
-
-
-/**
- * Annotation processor for the @Test annotation.
- * Invokes each method so annotated, and verifies the result.
- * Throws an Error on failure.
- *
- * @author Scott Seligman
- */
-public class TestProcessor implements AnnotationProcessor {
-
- AnnotationProcessorEnvironment env;
-
- // The tester that's running.
- Tester tester = Tester.activeTester;
-
- TestProcessor(AnnotationProcessorEnvironment env,
- Tester tester) {
- this.env = env;
- this.tester = tester;
- }
-
-
- /**
- * Reflectively invoke the @Test-annotated methods of the live
- * tester. Those methods perform the actual exercising of the
- * mirror API. Then back here to verify the results by
- * reading the live annotations. Convoluted, you say?
- */
- public void process() {
- System.out.printf("\n> Processing %s\n", tester.getClass());
-
- boolean failed = false; // true if a test returns wrong result
-
- for (Method m : tester.getClass().getDeclaredMethods()) {
- Test anno = m.getAnnotation(Test.class);
- Ignore ignore = m.getAnnotation(Ignore.class);
- if (anno != null) {
- if (ignore == null) {
- System.out.println(">> Invoking test " + m.getName());
- Object result;
- try {
- result = m.invoke(tester);
- } catch (Exception e) {
- throw new Error("Test invocation failed", e);
- }
- boolean ok = true; // result of this test
- if (Collection.class.isAssignableFrom(m.getReturnType())) {
- ok = verifyResults((Collection) result,
- anno.result(), anno.ordered());
- } else if (m.getReturnType() != void.class) {
- ok = verifyResult(result, anno.result());
- }
- if (!ok) {
- System.out.println(">>> Expected: " + anno);
- System.out.println(">>> Got: " + result);
- failed = true;
- }
- } else {
- System.out.println(">> Ignoring test " + m.getName());
- if (ignore.value().length() > 0) {
- System.out.println(">>> Reason: " + ignore.value());
- }
- }
- }
- }
- if (failed) {
- throw new Error("Test(s) returned unexpected result");
- }
- }
-
- /**
- * Verify that a single-valued (non-Collection) result matches
- * its expected value.
- */
- private boolean verifyResult(Object result, String[] expected) {
- assert expected.length == 1 :
- "Single-valued test expecting " + expected.length + " results";
- return expected[0].equals(String.valueOf(result));
- }
-
- /**
- * Verify that a multi-valued result (a Collection) matches
- * its expected values.
- */
- private boolean verifyResults(Collection result,
- String[] expected, boolean ordered) {
- if (result.size() != expected.length) {
- return false;
- }
-
- // Convert result to an array of strings.
- String[] res = new String[result.size()];
- int i = 0;
- for (Object e : result) {
- res[i++] = String.valueOf(e);
- }
-
- if (!ordered) {
- Arrays.sort(res);
- Arrays.sort(expected);
- }
- return Arrays.equals(res, expected);
- }
-}
diff --git a/langtools/test/tools/apt/lib/TestProcessorFactory.java b/langtools/test/tools/apt/lib/TestProcessorFactory.java
deleted file mode 100644
index 4079512..0000000
--- a/langtools/test/tools/apt/lib/TestProcessorFactory.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-import java.util.*;
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.util.*;
-
-
-/**
- * A factory for generating the TestProcessor annotation processor, which
- * processes the @Test annotation.
- *
- * @author Scott Seligman
- */
-public class TestProcessorFactory implements AnnotationProcessorFactory {
-
- public Collection<String> supportedOptions() {
- return new ArrayList<String>();
- }
-
- public Collection<String> supportedAnnotationTypes() {
- ArrayList<String> res = new ArrayList<String>();
- res.add("Test");
- res.add("Ignore");
- return res;
- }
-
- public AnnotationProcessor getProcessorFor(
- Set<AnnotationTypeDeclaration> as,
- AnnotationProcessorEnvironment env) {
- // The tester that's running.
- Tester tester = Tester.activeTester;
-
- try {
- // Find the tester's class declaration.
- ClassDeclaration testerDecl = null;
- for (TypeDeclaration decl : env.getSpecifiedTypeDeclarations()) {
- if (decl.getQualifiedName().equals(
- tester.getClass().getName())) {
- testerDecl = (ClassDeclaration) decl;
- break;
- }
- }
-
- // Give the tester access to its own declaration and to the env.
- tester.thisClassDecl = testerDecl;
- tester.env = env;
-
- // Initializer the tester.
- tester.init();
-
- return new TestProcessor(env, tester);
-
- } catch (Exception e) {
- throw new Error("Couldn't create test annotation processor", e);
- }
- }
-}
diff --git a/langtools/test/tools/apt/lib/Tester.java b/langtools/test/tools/apt/lib/Tester.java
deleted file mode 100644
index 34630c7..0000000
--- a/langtools/test/tools/apt/lib/Tester.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/*
- * A utility used to invoke and test the apt tool.
- * Tests should subclass Tester, and invoke run().
- *
- * @author Scott Seligman
- */
-
-import java.io.*;
-import java.util.*;
-import com.sun.mirror.apt.*;
-import com.sun.mirror.declaration.*;
-
-
-public abstract class Tester {
-
- /**
- * The declaration corresponding to this tester's class. Set by
- * TestProcessorFactory after the constructor completes, and
- * before init() is invoked.
- */
- ClassDeclaration thisClassDecl;
-
- /**
- * The environment for this apt run. Set by TestProcessorFactory
- * after the constructor completes, and before init() is invoked.
- */
- AnnotationProcessorEnvironment env;
-
-
- // TestProcessorFactory looks here to find the tester that's running
- // when it's invoked.
- static Tester activeTester;
-
- private static final String[] DEFAULT_ARGS = {
- "-nocompile",
- "-XPrintAptRounds",
- "-XListDeclarations",
- };
- private static final String[] NO_STRINGS = {};
-
- // Force processor and factory to be compiled
- private static Class dummy = TestProcessorFactory.class;
-
- private final String testSrc = System.getProperty("test.src", ".");
- private final String testClasses = System.getProperty("test.classes", ".");
-
- // apt command-line args
- private String[] args;
-
-
- static {
- // Enable assertions in the unnamed package.
- ClassLoader loader = Tester.class.getClassLoader();
- if (loader != null) {
- loader.setPackageAssertionStatus(null, true);
- }
- }
-
-
- protected Tester(String... additionalArgs) {
- String sourceFile = testSrc + File.separator +
- getClass().getName() + ".java";
-
- ArrayList<String> as = new ArrayList<String>();
- Collections.addAll(as, DEFAULT_ARGS);
- as.add("-sourcepath"); as.add(testSrc);
- as.add("-factory"); as.add(TestProcessorFactory.class.getName());
- Collections.addAll(as, additionalArgs);
- as.add(sourceFile);
- args = as.toArray(NO_STRINGS);
- }
-
- /**
- * Run apt.
- */
- protected void run() {
- activeTester = this;
- if (com.sun.tools.apt.Main.process(args) != 0) {
- throw new Error("apt errors encountered.");
- }
- }
-
- /**
- * Called after thisClassDecl and env have been set, but before any
- * tests are run, to allow the tester subclass to perform any
- * needed initialization.
- */
- protected void init() {
- }
-
- /**
- * Returns the declaration of a named method in this class. If this
- * method name is overloaded, one method is chosen arbitrarily.
- * Returns null if no method is found.
- */
- protected MethodDeclaration getMethod(String methodName) {
- for (MethodDeclaration m : thisClassDecl.getMethods()) {
- if (methodName.equals(m.getSimpleName())) {
- return m;
- }
- }
- return null;
- }
-
- /**
- * Returns the declaration of a named field in this class.
- * Returns null if no field is found.
- */
- protected FieldDeclaration getField(String fieldName) {
- for (FieldDeclaration f : thisClassDecl.getFields()) {
- if (fieldName.equals(f.getSimpleName())) {
- return f;
- }
- }
- return null;
- }
-
- /**
- * Returns the annotation mirror of a given type on a named method
- * in this class. If this method name is overloaded, one method is
- * chosen arbitrarily. Returns null if no appropriate annotation
- * is found.
- */
- protected AnnotationMirror getAnno(String methodName, String annoType) {
- MethodDeclaration m = getMethod(methodName);
- if (m != null) {
- TypeDeclaration at = env.getTypeDeclaration(annoType);
- for (AnnotationMirror a : m.getAnnotationMirrors()) {
- if (at == a.getAnnotationType().getDeclaration()) {
- return a;
- }
- }
- }
- return null;
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/AnnoMirror.java b/langtools/test/tools/apt/mirror/declaration/AnnoMirror.java
deleted file mode 100644
index 42d02e6..0000000
--- a/langtools/test/tools/apt/mirror/declaration/AnnoMirror.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5014539
- * @summary Tests AnnotationMirror and AnnotationValue methods.
- * @library ../../lib
- * @compile -source 1.5 AnnoMirror.java
- * @run main/othervm AnnoMirror
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-
-
-public class AnnoMirror extends Tester {
-
- public static void main(String[] args) {
- (new AnnoMirror()).run();
- }
-
-
- @Test(result={"AT1"})
- @AT1
- AnnotationType getAnnotationType() {
- AnnotationMirror anno = getAnno("getAnnotationType", "AT1");
- return anno.getAnnotationType();
- }
-
- @Test(result={})
- @AT1
- Set getElementValuesNone() {
- AnnotationMirror anno = getAnno("getElementValuesNone", "AT1");
- return anno.getElementValues().entrySet();
- }
-
-
- // The seemingly out-of-place parens in the following "result"
- // entry are needed due to the shortcut of having the test return
- // the entry set directly.
- @Test(result={"i()=2",
- "b()=true",
- "k()=java.lang.Boolean.class",
- "a()=@AT1"})
- @AT2(i = 1+1,
- b = true,
- k = Boolean.class,
- a = @AT1)
- Set getElementValues() {
- AnnotationMirror anno = getAnno("getElementValues", "AT2");
- return anno.getElementValues().entrySet();
- }
-
- @Test(result={"@AT1(\"zax\")",
- "@AT2(i=2, b=true, k=java.lang.Boolean.class, a=@AT1)",
- "@AT3(arr={1})",
- "@AT4({2, 3, 4})"})
- Collection<AnnotationMirror> toStringTests() {
- for (MethodDeclaration m : thisClassDecl.getMethods()) {
- if (m.getSimpleName().equals("toStringTestsHelper")) {
- return m.getAnnotationMirrors();
- }
- }
- throw new AssertionError();
- }
-
- @AT1("zax")
- @AT2(i = 1+1,
- b = true,
- k = Boolean.class,
- a = @AT1)
- @AT3(arr={1})
- @AT4({2,3,4})
- private void toStringTestsHelper() {
- }
-}
-
-
-/*
- * Annotations used for testing.
- */
-
- at interface AT1 {
- String value() default "";
-}
-
- at interface AT2 {
- int i();
- boolean b();
- Class k();
- AT1 a();
-}
-
- at interface AT3 {
- int[] arr();
-}
-
- at interface AT4 {
- int[] value();
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/AnnoTypeDecl.java b/langtools/test/tools/apt/mirror/declaration/AnnoTypeDecl.java
deleted file mode 100644
index 5ee53ce..0000000
--- a/langtools/test/tools/apt/mirror/declaration/AnnoTypeDecl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5014539
- * @summary AnnotationTypeDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 AnnoTypeDecl.java
- * @run main/othervm AnnoTypeDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class AnnoTypeDecl extends Tester {
-
- public static void main(String[] args) {
- (new AnnoTypeDecl()).run();
- }
-
-
- private AnnotationTypeDeclaration at;
-
- protected void init() {
- at = (AnnotationTypeDeclaration) env.getTypeDeclaration("AT");
- }
-
-
- // Declaration methods
-
- @Test(result="annotation type")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- at.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitClassDeclaration(ClassDeclaration c) {
- res.add("class");
- }
- public void visitInterfaceDeclaration(InterfaceDeclaration i) {
- res.add("interface");
- }
- public void visitAnnotationTypeDeclaration(
- AnnotationTypeDeclaration a) {
- res.add("annotation type");
- }
- });
- return res;
- }
-
-
- // AnnotationTypeDeclaration methods
-
- @Test(result={"s()"})
- Collection<AnnotationTypeElementDeclaration> getMethods() {
- return at.getMethods();
- }
-}
-
-
-// An annotation type to use for testing.
-
- at interface AT {
- String s();
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java b/langtools/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java
deleted file mode 100644
index cbbfe4f..0000000
--- a/langtools/test/tools/apt/mirror/declaration/AnnoTypeElemDecl.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 4993299 5010385 5014539
- * @summary AnnotationTypeElementDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 AnnoTypeElemDecl.java
- * @run main/othervm AnnoTypeElemDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class AnnoTypeElemDecl extends Tester {
-
- public static void main(String[] args) {
- (new AnnoTypeElemDecl()).run();
- }
-
-
- // Some annotation type elements to use.
- private AnnotationTypeElementDeclaration elem1 = null; // s()
- private AnnotationTypeElementDeclaration elem2 = null; // i()
- private AnnotationTypeElementDeclaration elem3 = null; // b()
-
- protected void init() {
- for (TypeDeclaration at : thisClassDecl.getNestedTypes()) {
- for (MethodDeclaration meth : at.getMethods()) {
- AnnotationTypeElementDeclaration elem =
- (AnnotationTypeElementDeclaration) meth;
- if (elem.getSimpleName().equals("s")) {
- elem1 = elem; // s()
- } else if (elem.getSimpleName().equals("i")) {
- elem2 = elem; // i()
- } else {
- elem3 = elem; // b()
- }
- }
- }
- }
-
-
- // Declaration methods
-
- @Test(result="anno type element")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- elem1.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitExecutableDeclaration(ExecutableDeclaration e) {
- res.add("executable");
- }
- public void visitMethodDeclaration(MethodDeclaration m) {
- res.add("method");
- }
- public void visitAnnotationTypeElementDeclaration(
- AnnotationTypeElementDeclaration a) {
- res.add("anno type element");
- }
- });
- return res;
- }
-
- @Test(result={"@AnnoTypeElemDecl.AT2"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return elem1.getAnnotationMirrors();
- }
-
- @Test(result=" Sed Quis custodiet ipsos custodes?\n")
- String getDocComment() {
- return elem1.getDocComment();
- }
-
- @Test(result={"public", "abstract"})
- Collection<Modifier> getModifiers() {
- return elem1.getModifiers();
- }
-
- @Test(result="AnnoTypeElemDecl.java")
- String getPosition() {
- return elem1.getPosition().file().getName();
- }
-
- @Test(result="s")
- String getSimpleName() {
- return elem1.getSimpleName();
- }
-
-
- // MemberDeclaration method
-
- @Test(result="AnnoTypeElemDecl.AT1")
- TypeDeclaration getDeclaringType() {
- return elem1.getDeclaringType();
- }
-
-
- // ExecutableDeclaration methods
-
- @Test(result={})
- Collection<TypeParameterDeclaration> getFormalTypeParameters() {
- return elem1.getFormalTypeParameters();
- }
-
- @Test(result={})
- Collection<ParameterDeclaration> getParameters() {
- return elem1.getParameters();
- }
-
- @Test(result={})
- Collection<ReferenceType> getThrownTypes() {
- return elem1.getThrownTypes();
- }
-
- @Test(result="false")
- Boolean isVarArgs() {
- return elem1.isVarArgs();
- }
-
-
- // AnnotationTypeElementDeclaration method
-
- @Test(result="\"default\"")
- AnnotationValue getDefaultValue1() {
- return elem1.getDefaultValue();
- }
-
- @Test(result="null")
- AnnotationValue getDefaultValue2() {
- return elem2.getDefaultValue();
- }
-
- // 5010385: getValue() returns null for boolean type elements
- @Test(result="false")
- Boolean getDefaultValue3() {
- return (Boolean) elem3.getDefaultValue().getValue();
- }
-
-
- // toString
-
- @Test(result="s()")
- String toStringTest() {
- return elem1.toString();
- }
-
-
- // Declarations used by tests.
-
- @interface AT1 {
- /**
- * Sed Quis custodiet ipsos custodes?
- */
- @AT2
- String s() default "default";
-
- int i();
-
- boolean b() default false;
- }
-
- @interface AT2 {
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/AnnoVal.java b/langtools/test/tools/apt/mirror/declaration/AnnoVal.java
deleted file mode 100644
index 0fc796a..0000000
--- a/langtools/test/tools/apt/mirror/declaration/AnnoVal.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5014539 5034991
- * @summary Tests AnnotationValue methods.
- * @library ../../lib
- * @compile -source 1.5 AnnoVal.java
- * @run main/othervm AnnoVal
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-
-
-public class AnnoVal extends Tester {
-
- public static void main(String[] args) {
- (new AnnoVal()).run();
- }
-
- @Test(result={
- "i Integer 2",
- "l Long 4294967296",
- "d Double 3.14",
- "b Boolean true",
- "c Character @",
- "s String sigh",
- // The following results reflect some implementation details.
- "k ClassTypeImpl java.lang.Boolean",
- "kb PrimitiveTypeImpl boolean",
- "ka ArrayTypeImpl java.lang.Boolean[]",
- "kab ArrayTypeImpl int[][]",
- "w ClassTypeImpl java.lang.Long",
- "e EnumConstantDeclarationImpl TYPE",
- "sa ArrayList [\"up\", \"down\"]",
- "a AnnotationMirrorImpl @AT1"})
- @AT2(i = 1 + 1,
- l = 1024 * 1024 * 1024 * 4L,
- d = 3.14,
- b = true,
- c = '@',
- s = "sigh",
- k = Boolean.class,
- kb = boolean.class,
- ka = Boolean[].class, // bugid 5020899
- kab = int[][].class, // "
- w = Long.class,
- e = java.lang.annotation.ElementType.TYPE,
- sa = {"up", "down"},
- a = @AT1)
- Collection<String> getValue() {
- Collection<String> res = new ArrayList<String>();
- AnnotationMirror anno = getAnno("getValue", "AT2");
-
- for (Map.Entry<AnnotationTypeElementDeclaration, AnnotationValue> e :
- anno.getElementValues().entrySet()) {
- Object val = e.getValue().getValue();
- res.add(String.format("%s %s %s",
- e.getKey().getSimpleName(),
- simpleClassName(val),
- val));
- }
- return res;
- }
-
- @Test(result={
- "int i 2",
- "long l 4294967296L",
- "double d 3.14",
- "boolean b true",
- "char c '@'",
- "java.lang.String s \"sigh\"",
- "java.lang.Class k java.lang.Boolean.class",
- "java.lang.Class kb boolean.class",
- "java.lang.Class ka java.lang.Boolean[].class",
- "java.lang.Class kab int[][].class",
- "java.lang.Class<? extends java.lang.Number> w java.lang.Long.class",
- "java.lang.annotation.ElementType e java.lang.annotation.ElementType.TYPE",
- "java.lang.String[] sa {\"up\", \"down\"}",
- "AT1 a @AT1"})
- Collection<String> toStringTests() {
- Collection<String> res = new ArrayList<String>();
- AnnotationMirror anno = getAnno("getValue", "AT2");
-
- for (Map.Entry<AnnotationTypeElementDeclaration,AnnotationValue> e :
- anno.getElementValues().entrySet()) {
- res.add(String.format("%s %s %s",
- e.getKey().getReturnType(),
- e.getKey().getSimpleName(),
- e.getValue().toString()));
- }
- return res;
- }
-
- @Test(result={
- "byte b 0x0b",
- "float f 3.0f",
- "double nan 0.0/0.0",
- "double hi 1.0/0.0",
- "float lo -1.0f/0.0f",
- "char newline '\\n'",
- "char ff '\\u00ff'",
- "java.lang.String s \"\\\"high\\tlow\\\"\"",
- "java.lang.String smiley \"\\u263a\""})
- @AT3(b = 11,
- f = 3,
- nan = 0.0/0.0,
- hi = 1.0/0.0,
- lo = -1.0f/0.0f,
- newline = '\n',
- ff = '\u00FF',
- s = "\"high\tlow\"",
- smiley = "\u263A")
- Collection<String> toStringFancy() {
- Collection<String> res = new ArrayList<String>();
- AnnotationMirror anno = getAnno("toStringFancy", "AT3");
-
- for (Map.Entry<AnnotationTypeElementDeclaration,AnnotationValue> e :
- anno.getElementValues().entrySet()) {
- res.add(String.format("%s %s %s",
- e.getKey().getReturnType(),
- e.getKey().getSimpleName(),
- e.getValue().toString()));
- }
- return res;
- }
-
-
- /**
- * Returns the simple name of an object's class.
- */
- private String simpleClassName(Object o) {
- return (o == null)
- ? "null"
- : o.getClass().getName().replaceFirst(".*\\.", "");
- }
-}
-
-
-/*
- * Annotations used for testing.
- */
-
- at interface AT1 {
- String value() default "";
-}
-
- at interface AT2 {
- int i();
- long l();
- double d();
- boolean b();
- char c();
- String s();
- Class k();
- Class kb();
- Class ka();
- Class kab();
- Class<? extends Number> w();
- java.lang.annotation.ElementType e();
- String[] sa();
- AT1 a();
-}
-
- at interface AT3 {
- byte b();
- float f();
- double nan();
- double hi();
- float lo();
- char newline();
- char ff();
- String s();
- String smiley();
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/ClassDecl.java b/langtools/test/tools/apt/mirror/declaration/ClassDecl.java
deleted file mode 100644
index 7c4c13f..0000000
--- a/langtools/test/tools/apt/mirror/declaration/ClassDecl.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 4997614
- * @summary ClassDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 ClassDecl.java
- * @run main/othervm ClassDecl
- */
-
-
-import java.io.Serializable;
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-/**
- * Sed Quis custodiet ipsos custodes?
- */
- at AT1
- at AT2
-public class ClassDecl extends Tester {
-
- public static void main(String[] args) {
- (new ClassDecl()).run();
- }
-
-
- private ClassDeclaration nested = null; // a nested type
- private ClassDeclaration object = null; // java.lang.object
-
- // A constructor to be found
- private ClassDecl() {
- }
-
- // Another constructor to be found
- private ClassDecl(int i) {
- this();
- }
-
- // An extra field to be found
- static int i;
-
- // Static initializer isn't among this class's methods.
- static {
- i = 7;
- }
-
- // A nested class with some accoutrements
- private static strictfp class NestedClass<T> implements Serializable {
- void m1() {}
- void m2() {}
- void m2(int i) {}
- }
-
- protected void init() {
- nested = (ClassDeclaration)
- thisClassDecl.getNestedTypes().iterator().next();
- object = (ClassDeclaration)
- env.getTypeDeclaration("java.lang.Object");
- }
-
-
- // Declaration methods
-
- @Test(result="class")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- thisClassDecl.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitClassDeclaration(ClassDeclaration c) {
- res.add("class");
- }
- public void visitEnumDeclaration(EnumDeclaration e) {
- res.add("enum");
- }
- });
- return res;
- }
-
- @Test(result={"@AT1", "@AT2"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return thisClassDecl.getAnnotationMirrors();
- }
-
- @Test(result=" Sed Quis custodiet ipsos custodes?\n")
- String getDocComment() {
- return thisClassDecl.getDocComment();
- }
-
- @Test(result={"public"})
- Collection<Modifier> getModifiers1() {
- return thisClassDecl.getModifiers();
- }
-
- // Check that static nested class has "static" modifier, even though
- // the VM doesn't set that bit.
- @Test(result={"private", "static", "strictfp"})
- Collection<Modifier> getModifiers2() {
- return nested.getModifiers();
- }
-
- @Test(result="ClassDecl.java")
- String getPosition() {
- return thisClassDecl.getPosition().file().getName();
- }
-
- @Test(result="ClassDecl")
- String getSimpleName1() {
- return thisClassDecl.getSimpleName();
- }
-
- @Test(result="NestedClass")
- String getSimpleName2() {
- return nested.getSimpleName();
- }
-
-
- // MemberDeclaration method
-
- @Test(result="null")
- TypeDeclaration getDeclaringType1() {
- return thisClassDecl.getDeclaringType();
- }
-
- @Test(result="ClassDecl")
- TypeDeclaration getDeclaringType2() {
- return nested.getDeclaringType();
- }
-
-
- // TypeDeclaration methods
-
- @Test(result={"nested", "object", "i"})
- Collection<FieldDeclaration> getFields() {
- return thisClassDecl.getFields();
- }
-
- @Test(result={})
- Collection<TypeParameterDeclaration> getFormalTypeParameters1() {
- return thisClassDecl.getFormalTypeParameters();
- }
-
- @Test(result="T")
- Collection<TypeParameterDeclaration> getFormalTypeParameters2() {
- return nested.getFormalTypeParameters();
- }
-
- @Test(result="ClassDecl.NestedClass<T>")
- Collection<TypeDeclaration> getNestedTypes() {
- return thisClassDecl.getNestedTypes();
- }
-
- @Test(result="")
- PackageDeclaration getPackage1() {
- return thisClassDecl.getPackage();
- }
-
- @Test(result="java.lang")
- PackageDeclaration getPackage2() {
- return object.getPackage();
- }
-
- @Test(result="ClassDecl")
- String getQualifiedName1() {
- return thisClassDecl.getQualifiedName();
- }
-
- @Test(result="ClassDecl.NestedClass")
- String getQualifiedName2() {
- return nested.getQualifiedName();
- }
-
- @Test(result="java.lang.Object")
- String getQualifiedName3() {
- return object.getQualifiedName();
- }
-
- @Test(result="java.io.Serializable")
- Collection<InterfaceType> getSuperinterfaces() {
- return nested.getSuperinterfaces();
- }
-
-
- // ClassDeclaration methods
-
- @Test(result={"ClassDecl()", "ClassDecl(int)"})
- Collection<ConstructorDeclaration> getConstructors1() {
- return thisClassDecl.getConstructors();
- }
-
- // Check for default constructor.
- // 4997614: visitConstructionDeclaration reports info when there is no ctor
- @Test(result={"NestedClass()"})
- Collection<ConstructorDeclaration> getConstructors2() {
- return nested.getConstructors();
- }
-
- @Test(result={"m1()", "m2()", "m2(int)"})
- Collection<MethodDeclaration> getMethods() {
- return nested.getMethods();
- }
-
- @Test(result={"Tester"})
- ClassType getSuperclass() {
- return thisClassDecl.getSuperclass();
- }
-
- @Test(result={"null"})
- ClassType objectHasNoSuperclass() {
- return object.getSuperclass();
- }
-}
-
-
-// Annotations used for testing.
-
- at interface AT1 {
-}
-
- at interface AT2 {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/ConstExpr.java b/langtools/test/tools/apt/mirror/declaration/ConstExpr.java
deleted file mode 100644
index 400f090..0000000
--- a/langtools/test/tools/apt/mirror/declaration/ConstExpr.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 5027675 5048535
- * @summary Tests FieldDeclaration.getConstantExpression method
- * @library ../../lib
- * @compile -source 1.5 ConstExpr.java
- * @run main/othervm ConstExpr
- */
-
-
-import java.math.RoundingMode;
-import java.util.*;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import static java.math.RoundingMode.UP;
-
-import static com.sun.mirror.util.DeclarationVisitors.*;
-
-
-public class ConstExpr extends Tester {
-
- public static void main(String[] args) {
- (new ConstExpr()).run();
- }
-
-
- // Declarations used by tests
-
- public static final byte B = (byte) 0xBE;
- public static final short S = (short) 32767;
- public static final int I = -4;
- public static final long l = 4294967296L;
- public static final float f = 3.5f;
- public static final double PI = Math.PI;
- public static final char C = 'C';
- public static final String STR = "cheese";
-
- public static final char SMILEY = '\u263A';
- public static final String TWOLINES = "ab\ncd";
-
- public static final double D1 = Double.POSITIVE_INFINITY;
- public static final double D2 = Double.NEGATIVE_INFINITY;
- public static final double D3 = Double.NaN;
- public static final float F1 = Float.POSITIVE_INFINITY;
- public static final float F2 = Float.NEGATIVE_INFINITY;
- public static final float F3 = Float.NaN;
-
- public static final String NOSTR = null; // not a compile-time constant
- public static final RoundingMode R = UP; // not a compile-time constant
-
-
- @Test(result={
- "0xbe",
- "32767",
- "-4",
- "4294967296L",
- "3.5f",
- "3.141592653589793",
- "'C'",
- "\"cheese\"",
-
- "'\\u263a'",
- "\"ab\\ncd\"",
-
- "1.0/0.0",
- "-1.0/0.0",
- "0.0/0.0",
- "1.0f/0.0f",
- "-1.0f/0.0f",
- "0.0f/0.0f",
-
- "null",
- "null"
- },
- ordered=true)
- Collection<String> getConstantExpression() {
- final Collection<String> res = new ArrayList<String>();
-
- thisClassDecl.accept(
- DeclarationVisitors.getSourceOrderDeclarationScanner(
- NO_OP,
- new SimpleDeclarationVisitor() {
- public void visitFieldDeclaration(FieldDeclaration f) {
- res.add(f.getConstantExpression());
- }
- }));
- return res;
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/ConstructorDecl.java b/langtools/test/tools/apt/mirror/declaration/ConstructorDecl.java
deleted file mode 100644
index 065598b..0000000
--- a/langtools/test/tools/apt/mirror/declaration/ConstructorDecl.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 4993299
- * @summary ConstructorDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 ConstructorDecl.java
- * @run main/othervm ConstructorDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class ConstructorDecl extends Tester {
-
- /**
- * Sed Quis custodiet ipsos custodes?
- */
- @AT1
- public ConstructorDecl() {
- }
-
-
- public static void main(String[] args) {
- (new ConstructorDecl()).run();
- }
-
-
- private ConstructorDeclaration ctor = null; // a constructor
- private ConstructorDeclaration ctorDef = null; // a default c'tor
- private ConstructorDeclaration ctorInner = null; // an inner class c'tor
-
- protected void init() {
- ctor = getAConstructor(thisClassDecl);
- ctorDef = getAConstructor((ClassDeclaration)
- env.getTypeDeclaration("C1"));
- ctorInner = getAConstructor((ClassDeclaration)
- env.getTypeDeclaration("C1.C2"));
- }
-
- // Return a constructor of a class.
- private ConstructorDeclaration getAConstructor(ClassDeclaration c) {
- return c.getConstructors().iterator().next();
- }
-
-
- // Declaration methods
-
- @Test(result="constructor")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- ctor.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitExecutableDeclaration(ExecutableDeclaration e) {
- res.add("executable");
- }
- public void visitConstructorDeclaration(ConstructorDeclaration c) {
- res.add("constructor");
- }
- });
- return res;
- }
-
- @Test(result={"@AT1"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return ctor.getAnnotationMirrors();
- }
-
- @Test(result=" Sed Quis custodiet ipsos custodes?\n")
- String getDocComment() {
- return ctor.getDocComment();
- }
-
- @Test(result={"public"})
- Collection<Modifier> getModifiers() {
- return ctor.getModifiers();
- }
-
- @Test(result="ConstructorDecl.java")
- String getPosition() {
- return ctor.getPosition().file().getName();
- }
-
- @Test(result="ConstructorDecl.java")
- String getPositionDefault() {
- return ctorDef.getPosition().file().getName();
- }
-
- @Test(result="ConstructorDecl")
- String getSimpleName() {
- return ctor.getSimpleName();
- }
-
- @Test(result="C2")
- String getSimpleNameInner() {
- return ctorInner.getSimpleName();
- }
-
-
- // MemberDeclaration method
-
- @Test(result="ConstructorDecl")
- TypeDeclaration getDeclaringType() {
- return ctor.getDeclaringType();
- }
-
-
- // ExecutableDeclaration methods
-
- @Test(result={})
- Collection<TypeParameterDeclaration> getFormalTypeParameters1() {
- return ctor.getFormalTypeParameters();
- }
-
- @Test(result={"N extends java.lang.Number"})
- Collection<TypeParameterDeclaration> getFormalTypeParameters2() {
- return ctorInner.getFormalTypeParameters();
- }
-
- @Test(result={})
- Collection<ParameterDeclaration> getParameters1() {
- return ctor.getParameters();
- }
-
- // 4993299: verify synthetic parameters to inner class constructors
- // aren't visible
- @Test(result={"N n1", "N n2", "java.lang.String[] ss"},
- ordered=true)
- Collection<ParameterDeclaration> getParameters2() {
- return ctorInner.getParameters();
- }
-
- @Test(result={"java.lang.Throwable"})
- Collection<ReferenceType> getThrownTypes() {
- return ctorInner.getThrownTypes();
- }
-
- @Test(result="false")
- Boolean isVarArgs1() {
- return ctor.isVarArgs();
- }
-
- @Test(result="true")
- Boolean isVarArgs2() {
- return ctorInner.isVarArgs();
- }
-
-
- // toString
-
- @Test(result="<N extends java.lang.Number> C2(N, N, String...)")
- @Ignore("This is what it would be nice to see.")
- String toStringTest() {
- return ctorInner.toString();
- }
-}
-
-
-// Classes and interfaces used for testing.
-
-class C1 {
- class C2 {
- <N extends Number> C2(N n1, N n2, String... ss) throws Throwable {
- }
- }
-}
-
- at interface AT1 {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/EnumDecl.java b/langtools/test/tools/apt/mirror/declaration/EnumDecl.java
deleted file mode 100644
index 08563a8..0000000
--- a/langtools/test/tools/apt/mirror/declaration/EnumDecl.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 4989987 5010050
- * @summary EnumDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 EnumDecl.java
- * @run main/othervm EnumDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class EnumDecl extends Tester {
-
- public static void main(String[] args) {
- (new EnumDecl()).run();
- }
-
-
- private EnumDeclaration eDecl;
-
- protected void init() {
- eDecl = (EnumDeclaration) env.getTypeDeclaration("E");
- }
-
-
- // Declaration methods
-
- @Test(result="enum")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- eDecl.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitClassDeclaration(ClassDeclaration c) {
- res.add("class");
- }
- public void visitEnumDeclaration(EnumDeclaration e) {
- res.add("enum");
- }
- });
- return res;
- }
-
-
- // ClassDeclaration methods
-
- // 4989987: Verify synthetic enum constructor parameters are not visible
- @Test(result={"E(java.lang.String)"})
- Collection<ConstructorDeclaration> getConstructors() {
- return eDecl.getConstructors();
- }
-
- // 4989987: Verify synthetic enum constructor parameters are not visible
- @Test(result={"java.lang.String color"})
- Collection<ParameterDeclaration> getConstructorParams() {
- return eDecl.getConstructors().iterator().next().getParameters();
- }
-
- @Test(result={"values()", "valueOf(java.lang.String)"})
- Collection<MethodDeclaration> getMethods() {
- return eDecl.getMethods();
- }
-
- // 5010050: Cannot find parameter names for valueOf(String name) method...
- @Test(result={"java.lang.String name"})
- Collection<ParameterDeclaration> getMethodParams() {
- for (MethodDeclaration m : eDecl.getMethods()) {
- if (m.getSimpleName().equals("valueOf")) {
- return m.getParameters();
- }
- }
- throw new AssertionError();
- }
-
-
- // EnumDeclaration methods
-
- @Test(result={"stop", "slow", "go"})
- Collection<EnumConstantDeclaration> getEnumConstants() {
- return eDecl.getEnumConstants();
- }
-}
-
-
-// An enum to use for testing.
-
-enum E {
- stop("red"),
- slow("amber"),
- go("green");
-
- private String color;
- E(String color) {
- this.color = color;
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/FieldDecl.java b/langtools/test/tools/apt/mirror/declaration/FieldDecl.java
deleted file mode 100644
index 321e263..0000000
--- a/langtools/test/tools/apt/mirror/declaration/FieldDecl.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5008309
- * @summary FieldDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 FieldDecl.java
- * @run main/othervm FieldDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class FieldDecl extends Tester {
-
- public static void main(String[] args) {
- (new FieldDecl()).run();
- }
-
-
- private FieldDeclaration f1 = null; // a field
- private FieldDeclaration f2 = null; // a static field
- private FieldDeclaration f3 = null; // a constant field
-
- protected void init() {
- f1 = getField("aField");
- f2 = getField("aStaticField");
- f3 = getField("aConstantField");
- }
-
-
- // Declaration methods
-
- @Test(result="field")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- f1.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitFieldDeclaration(FieldDeclaration f) {
- res.add("field");
- }
- public void visitEnumConstantDeclaration(
- EnumConstantDeclaration e) {
- res.add("enum const");
- }
- });
- return res;
- }
-
- @Test(result={"@FieldDecl.AT1"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return f1.getAnnotationMirrors();
- }
-
- @Test(result=" Sed Quis custodiet ipsos custodes?\n")
- String getDocComment() {
- return f1.getDocComment();
- }
-
- @Test(result={"public"})
- Collection<Modifier> getModifiers() {
- return f1.getModifiers();
- }
-
- @Test(result="FieldDecl.java")
- String getPosition() {
- return f1.getPosition().file().getName();
- }
-
- @Test(result="aField")
- String getSimpleName() {
- return f1.getSimpleName();
- }
-
-
- // MemberDeclaration method
-
- @Test(result="FieldDecl")
- TypeDeclaration getDeclaringType() {
- return f1.getDeclaringType();
- }
-
-
- // FieldDeclaration methods
-
- @Test(result="java.util.List<java.lang.String>")
- TypeMirror getType1() {
- return f1.getType();
- }
-
- @Test(result="int")
- TypeMirror getType2() {
- return f2.getType();
- }
-
- @Test(result="null")
- Object getConstantValue1() {
- return f1.getConstantValue();
- }
-
- // 5008309: FieldDeclaration.getConstantValue() doesn't return anything
- @Test(result="true")
- Object getConstantValue2() {
- return f3.getConstantValue();
- }
-
-
- // toString
-
- @Test(result="aField")
- String toStringTest() {
- return f1.toString();
- }
-
-
- // Declarations used by tests.
-
- /**
- * Sed Quis custodiet ipsos custodes?
- */
- @AT1
- public List<String> aField = new ArrayList<String>();
-
- static int aStaticField;
-
- public static final boolean aConstantField = true;
-
-
- @interface AT1 {
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/GetAnno.java b/langtools/test/tools/apt/mirror/declaration/GetAnno.java
deleted file mode 100644
index f219335..0000000
--- a/langtools/test/tools/apt/mirror/declaration/GetAnno.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4989091 5050782 5051962
- * @summary Tests Declaration.getAnnotation method
- * @library ../../lib
- * @compile -source 1.5 GetAnno.java
- * @run main/othervm GetAnno
- */
-
-
-import java.lang.annotation.*;
-import java.util.*;
-
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-
-import static java.lang.annotation.RetentionPolicy.*;
-
-
-public class GetAnno extends Tester {
-
- public static void main(String[] args) {
- (new GetAnno()).run();
- }
-
-
- // Annotations used by tests
-
- @Retention(RUNTIME)
- @interface AT1 {
- long l();
- String s();
- RetentionPolicy e();
- String[] sa();
- AT2 a();
- }
-
- @Inherited
- @interface AT2 {
- }
-
- @interface AT3 {
- Class value() default String.class;
- }
-
- // Array-valued elements of various kinds.
- @interface AT4 {
- boolean[] bs();
- long[] ls();
- String[] ss();
- RetentionPolicy[] es();
- AT2[] as();
- }
-
-
- @Test(result="@GetAnno$AT1(l=7, s=sigh, e=CLASS, sa=[in, out], " +
- "a=@GetAnno$AT2())")
- @AT1(l=7, s="sigh", e=CLASS, sa={"in", "out"}, a=@AT2)
- public Annotation getAnnotation() {
- MethodDeclaration m = getMethod("getAnnotation");
- AT1 a = m.getAnnotation(AT1.class);
- if (a.l() != 7 || !a.s().equals("sigh") || a.e() != CLASS)
- throw new AssertionError();
- return a;
- }
-
- @Test(result="null")
- public Annotation getAnnotationNotThere() {
- return thisClassDecl.getAnnotation(Deprecated.class);
- }
-
- @Test(result="@GetAnno$AT4(bs=[true, false], " +
- "ls=[9, 8], " +
- "ss=[black, white], " +
- "es=[CLASS, SOURCE], " +
- "as=[@GetAnno$AT2(), @GetAnno$AT2()])")
- @AT4(bs={true, false},
- ls={9, 8},
- ss={"black", "white"},
- es={CLASS, SOURCE},
- as={@AT2, @AT2})
- public AT4 getAnnotationArrayValues() {
- MethodDeclaration m = getMethod("getAnnotationArrayValues");
- return m.getAnnotation(AT4.class);
- }
-
- @Test(result="@GetAnno$AT3(value=java.lang.String)")
- @AT3(String.class)
- public AT3 getAnnotationWithClass1() {
- MethodDeclaration m = getMethod("getAnnotationWithClass1");
- return m.getAnnotation(AT3.class);
- }
-
- @Test(result="java.lang.String")
- public TypeMirror getAnnotationWithClass2() {
- AT3 a = getAnnotationWithClass1();
- try {
- Class c = a.value();
- throw new AssertionError();
- } catch (MirroredTypeException e) {
- return e.getTypeMirror();
- }
- }
-
- @Test(result="boolean")
- @AT3(boolean.class)
- public TypeMirror getAnnotationWithPrim() {
- MethodDeclaration m = getMethod("getAnnotationWithPrim");
- AT3 a = m.getAnnotation(AT3.class);
- try {
- Class c = a.value();
- throw new AssertionError();
- } catch (MirroredTypeException e) {
- return e.getTypeMirror();
- }
- }
-
- // 5050782
- @Test(result="null")
- public AT2 getInheritedAnnotation() {
- return thisClassDecl.getAnnotation(AT2.class);
- }
-
- /**
- * Verify that an annotation created by Declaration.getAnnotation()
- * has the same hash code as a like annotation created by core
- * reflection.
- */
- @Test(result="true")
- @AT1(l=7, s="sigh", e=CLASS, sa={"in", "out"}, a=@AT2)
- public boolean getAnnotationHashCode() {
- MethodDeclaration m1 = getMethod("getAnnotationHashCode");
- AT1 a1 = m1.getAnnotation(AT1.class);
- java.lang.reflect.Method m2 = null;
- try {
- m2 = this.getClass().getMethod("getAnnotationHashCode");
- } catch (NoSuchMethodException e) {
- assert false;
- }
- AT1 a2 = m2.getAnnotation(AT1.class);
- return a1.hashCode() == a2.hashCode();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/InterfaceDecl.java b/langtools/test/tools/apt/mirror/declaration/InterfaceDecl.java
deleted file mode 100644
index f0552f3..0000000
--- a/langtools/test/tools/apt/mirror/declaration/InterfaceDecl.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 4993303 5004618 5010746
- * @summary InterfaceDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 InterfaceDecl.java
- * @run main/othervm InterfaceDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-/**
- * Sed Quis custodiet ipsos custodes?
- */
- at AT1
- at AT2
-public class InterfaceDecl extends Tester {
-
- public static void main(String[] args) {
- (new InterfaceDecl()).run();
- }
-
-
- private InterfaceDeclaration iDecl = null; // an interface
- private InterfaceDeclaration nested = null; // a nested interface
-
- protected void init() {
- iDecl = (InterfaceDeclaration) env.getTypeDeclaration("I");
- nested = (InterfaceDeclaration)
- iDecl.getNestedTypes().iterator().next();
- }
-
-
- // Declaration methods
-
- @Test(result="interface")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- iDecl.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitClassDeclaration(ClassDeclaration c) {
- res.add("class");
- }
- public void visitInterfaceDeclaration(InterfaceDeclaration e) {
- res.add("interface");
- }
- public void visitAnnotationTypeDeclaration(
- AnnotationTypeDeclaration e) {
- res.add("annotation type");
- }
- });
- return res;
- }
-
- @Test(result="true")
- boolean equals1() {
- return iDecl.equals(iDecl);
- }
-
- @Test(result="false")
- boolean equals2() {
- return iDecl.equals(nested);
- }
-
- @Test(result="true")
- boolean equals3() {
- return iDecl.equals(env.getTypeDeclaration("I"));
- }
-
-
- @Test(result={"@AT1", "@AT2"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return iDecl.getAnnotationMirrors();
- }
-
- @Test(result=" Sed Quis custodiet ipsos custodes?\n")
- String getDocComment() {
- return iDecl.getDocComment();
- }
-
- // Check that interface has "abstract" modifier, even though it's implict
- // in the source code.
- @Test(result={"abstract"})
- Collection<Modifier> getModifiers1() {
- return iDecl.getModifiers();
- }
-
- // Check that nested interface has "static" modifier, even though
- // it's implicit in the source code and the VM doesn't set that bit.
- @Test(result={"public", "abstract", "static"})
- Collection<Modifier> getModifiers2() {
- return nested.getModifiers();
- }
-
- @Test(result="InterfaceDecl.java")
- String getPosition() {
- return iDecl.getPosition().file().getName();
- }
-
- @Test(result="I")
- String getSimpleName1() {
- return iDecl.getSimpleName();
- }
-
- @Test(result="Nested")
- String getSimpleName2() {
- return nested.getSimpleName();
- }
-
-
- // MemberDeclaration method
-
- @Test(result="null")
- TypeDeclaration getDeclaringType1() {
- return iDecl.getDeclaringType();
- }
-
- @Test(result="I<T extends java.lang.Number>")
- TypeDeclaration getDeclaringType2() {
- return nested.getDeclaringType();
- }
-
-
- // TypeDeclaration methods
-
- @Test(result={"i"})
- Collection<FieldDeclaration> getFields() {
- return iDecl.getFields();
- }
-
- @Test(result={"T extends java.lang.Number"})
- Collection<TypeParameterDeclaration> getFormalTypeParameters1() {
- return iDecl.getFormalTypeParameters();
- }
-
- @Test(result={})
- Collection<TypeParameterDeclaration> getFormalTypeParameters2() {
- return nested.getFormalTypeParameters();
- }
-
- // 4993303: verify policy on Object methods being visible
- @Test(result={"m()", "toString()"})
- Collection<? extends MethodDeclaration> getMethods() {
- return nested.getMethods();
- }
-
- @Test(result="I.Nested")
- Collection<TypeDeclaration> getNestedTypes() {
- return iDecl.getNestedTypes();
- }
-
- @Test(result="")
- PackageDeclaration getPackage1() {
- return iDecl.getPackage();
- }
-
- @Test(result="java.util")
- PackageDeclaration getPackage2() {
- InterfaceDeclaration set =
- (InterfaceDeclaration) env.getTypeDeclaration("java.util.Set");
- return set.getPackage();
- }
-
- @Test(result="I")
- String getQualifiedName1() {
- return iDecl.getQualifiedName();
- }
-
- @Test(result="I.Nested")
- String getQualifiedName2() {
- return nested.getQualifiedName();
- }
-
- @Test(result="java.util.Set")
- String getQualifiedName3() {
- InterfaceDeclaration set =
- (InterfaceDeclaration) env.getTypeDeclaration("java.util.Set");
- return set.getQualifiedName();
- }
-
- @Test(result="java.lang.Runnable")
- Collection<InterfaceType> getSuperinterfaces() {
- return iDecl.getSuperinterfaces();
- }
-}
-
-
-// Interfaces used for testing.
-
-/**
- * Sed Quis custodiet ipsos custodes?
- */
- at AT1
- at AT2
-interface I<T extends Number> extends Runnable {
- int i = 6;
- void m1();
- void m2();
- void m2(int j);
-
- interface Nested {
- void m();
- String toString();
- }
-}
-
- at interface AT1 {
-}
-
- at interface AT2 {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/MethodDecl.java b/langtools/test/tools/apt/mirror/declaration/MethodDecl.java
deleted file mode 100644
index 9164c76..0000000
--- a/langtools/test/tools/apt/mirror/declaration/MethodDecl.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5010746
- * @summary MethodDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 MethodDecl.java
- * @run main/othervm MethodDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class MethodDecl extends Tester {
-
- public static void main(String[] args) {
- (new MethodDecl()).run();
- }
-
-
- private MethodDeclaration meth1 = null; // a method
- private MethodDeclaration meth2 = null; // another method
-
- protected void init() {
- meth1 = getMethod("m1");
- meth2 = getMethod("m2");
- }
-
-
- // Declaration methods
-
- @Test(result="method")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- meth1.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitExecutableDeclaration(ExecutableDeclaration e) {
- res.add("executable");
- }
- public void visitMethodDeclaration(MethodDeclaration m) {
- res.add("method");
- }
- public void visitAnnotationTypeElementDeclaration(
- AnnotationTypeElementDeclaration a) {
- res.add("anno type element");
- }
- });
- return res;
- }
-
- @Test(result={"@AT1"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return meth1.getAnnotationMirrors();
- }
-
- @Test(result=" Sed Quis custodiet ipsos custodes?\n")
- String getDocComment() {
- return meth1.getDocComment();
- }
-
- @Test(result={"private", "static", "strictfp"})
- Collection<Modifier> getModifiers() {
- return meth1.getModifiers();
- }
-
- // Interface methods are implicitly public and abstract.
- @Test(result={"public", "abstract"})
- Collection<Modifier> getModifiersInterface() {
- for (TypeDeclaration t : thisClassDecl.getNestedTypes()) {
- for (MethodDeclaration m : t.getMethods()) {
- return m.getModifiers();
- }
- }
- throw new AssertionError();
- }
-
- @Test(result="MethodDecl.java")
- String getPosition() {
- return meth1.getPosition().file().getName();
- }
-
- @Test(result="m2")
- String getSimpleName() {
- return meth2.getSimpleName();
- }
-
-
- // MemberDeclaration method
-
- @Test(result="MethodDecl")
- TypeDeclaration getDeclaringType() {
- return meth1.getDeclaringType();
- }
-
-
- // ExecutableDeclaration methods
-
- @Test(result={})
- Collection<TypeParameterDeclaration> getFormalTypeParameters1() {
- return meth1.getFormalTypeParameters();
- }
-
- @Test(result={"T", "N extends java.lang.Number"},
- ordered=true)
- Collection<TypeParameterDeclaration> getFormalTypeParameters2() {
- return meth2.getFormalTypeParameters();
- }
-
- @Test(result={})
- Collection<ParameterDeclaration> getParameters1() {
- return meth1.getParameters();
- }
-
- @Test(result={"N n", "java.lang.String[] ss"},
- ordered=true)
- Collection<ParameterDeclaration> getParameters2() {
- return meth2.getParameters();
- }
-
- @Test(result="true")
- boolean parameterEquals1() {
- ParameterDeclaration p1 =
- getMethod("m3").getParameters().iterator().next();
- ParameterDeclaration p2 =
- getMethod("m3").getParameters().iterator().next();
- return p1.equals(p2);
- }
-
- @Test(result="false")
- boolean parameterEquals2() {
- ParameterDeclaration p1 =
- getMethod("m3").getParameters().iterator().next();
- ParameterDeclaration p2 =
- getMethod("m4").getParameters().iterator().next();
- return p1.equals(p2);
- }
-
- @Test(result="true")
- boolean parameterHashCode() {
- ParameterDeclaration p1 =
- getMethod("m3").getParameters().iterator().next();
- ParameterDeclaration p2 =
- getMethod("m3").getParameters().iterator().next();
- return p1.hashCode() == p2.hashCode();
- }
-
- @Test(result={"java.lang.Throwable"})
- Collection<ReferenceType> getThrownTypes() {
- return meth2.getThrownTypes();
- }
-
- @Test(result="false")
- Boolean isVarArgs1() {
- return meth1.isVarArgs();
- }
-
- @Test(result="true")
- Boolean isVarArgs2() {
- return meth2.isVarArgs();
- }
-
-
- // MethodDeclaration methods
-
- @Test(result="void")
- TypeMirror getReturnType1() {
- return meth1.getReturnType();
- }
-
- @Test(result="N")
- TypeMirror getReturnType2() {
- return meth2.getReturnType();
- }
-
-
- // toString
-
- @Test(result="<T, N extends java.lang.Number> m2(N, java.lang.String...)")
- @Ignore("This is what it would be nice to see.")
- String toStringTest() {
- return meth2.toString();
- }
-
-
- // Declarations used by tests.
-
- /**
- * Sed Quis custodiet ipsos custodes?
- */
- @AT1
- private static strictfp void m1() {
- }
-
- private <T, N extends Number> N m2(N n, String... ss) throws Throwable {
- return null;
- }
-
- private void m3(String s) {
- }
-
- private void m4(String s) {
- }
-
- // A nested interface
- interface I {
- void m();
- }
-}
-
-
-// Annotation type used by tests.
-
- at interface AT1 {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/PackageDecl.java b/langtools/test/tools/apt/mirror/declaration/PackageDecl.java
deleted file mode 100644
index e6755d7..0000000
--- a/langtools/test/tools/apt/mirror/declaration/PackageDecl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5031168
- * @summary PackageDeclaration tests
- * @library ../../lib
- * @compile -source 1.5 PackageDecl.java
- * @run main/othervm PackageDecl
- */
-
-
-import java.io.File;
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import pkg1.pkg2.*;
-
-
-/**
- * Sed Quis custodiet ipsos custodes?
- */
-public class PackageDecl extends Tester {
-
- public PackageDecl() {
- super(System.getProperty("test.src", ".") + File.separator +
- "pkg1" + File.separator + "package-info.java");
- }
-
- public static void main(String[] args) {
- (new PackageDecl()).run();
- }
-
-
- private PackageDeclaration pkg1 = null; // a package
- private PackageDeclaration pkg2 = null; // a subpackage
-
- protected void init() {
- pkg1 = env.getPackage("pkg1");
- pkg2 = env.getPackage("pkg1.pkg2");
- }
-
-
- // Declaration methods
-
- @Test(result="package")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- pkg1.accept(new SimpleDeclarationVisitor() {
- public void visitTypeDeclaration(TypeDeclaration t) {
- res.add("type");
- }
- public void visitPackageDeclaration(PackageDeclaration p) {
- res.add("package");
- }
- });
- return res;
- }
-
- @Test(result={"@pkg1.AnAnnoType"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return pkg1.getAnnotationMirrors();
- }
-
- @Test(result=" Herein lieth the package comment.\n" +
- " A doc comment it be, and wonderous to behold.\n")
- String getDocCommentFromPackageInfoFile() {
- return pkg1.getDocComment();
- }
-
- @Test(result="\nHerein lieth the package comment.\n" +
- "An HTML file it be, and wonderous to behold.\n\n")
- @Ignore("Not yet supported")
- String getDocCommentFromHtmlFile() {
- return pkg2.getDocComment();
- }
-
- @Test(result={})
- Collection<Modifier> getModifiers() {
- return pkg1.getModifiers();
- }
-
- @Test(result="null")
- SourcePosition getPosition() {
- return thisClassDecl.getPackage().getPosition();
- }
-
- @Test(result="package-info.java")
- String getPositionFromPackageInfoFile() {
- return pkg1.getPosition().file().getName();
- }
-
- @Test(result="pkg1/pkg2/package.html")
- @Ignore("Not yet supported")
- String getPositionFromHtmlFile() {
- return pkg2.getPosition().file().getName()
- .replace(File.separatorChar, '/');
- }
-
- @Test(result="pkg1")
- String getSimpleName1() {
- return pkg1.getSimpleName();
- }
-
- @Test(result="pkg2")
- String getSimpleName2() {
- return pkg2.getSimpleName();
- }
-
-
- // PackageDeclaration methods
-
- @Test(result="pkg1.AnAnnoType")
- Collection<AnnotationTypeDeclaration> getAnnotationTypes() {
- return pkg1.getAnnotationTypes();
- }
-
- @Test(result={"pkg1.AClass", "pkg1.AnEnum"})
- Collection<ClassDeclaration> getClasses() {
- return pkg1.getClasses();
- }
-
- @Test(result="pkg1.AnEnum")
- Collection<EnumDeclaration> getEnums() {
- return pkg1.getEnums();
- }
-
- @Test(result={"pkg1.AnInterface", "pkg1.AnAnnoType"})
- Collection<InterfaceDeclaration> getInterfaces() {
- return pkg1.getInterfaces();
- }
-
- @Test(result="pkg1")
- String getQualifiedName1() {
- return pkg1.getQualifiedName();
- }
-
- @Test(result="pkg1.pkg2")
- String getQualifiedName2() {
- return pkg2.getQualifiedName();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/ParameterDecl.java b/langtools/test/tools/apt/mirror/declaration/ParameterDecl.java
deleted file mode 100644
index 16ba605..0000000
--- a/langtools/test/tools/apt/mirror/declaration/ParameterDecl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5031171
- * @summary ParameterDeclaration tests
- * @library ../../lib
- * @run main/othervm ParameterDecl
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class ParameterDecl extends Tester {
-
- public static void main(String[] args) {
- (new ParameterDecl()).run();
- }
-
-
- // Declarations used by tests
-
- @interface AT1 {
- }
-
- @interface AT2 {
- boolean value();
- }
-
- private void m1(@AT1 @AT2(true) final int p1) {
- }
-
- private void m2(int p1) {
- }
-
-
- private ParameterDeclaration p1 = null; // a parameter
-
- protected void init() {
- p1 = getMethod("m1").getParameters().iterator().next();
- }
-
-
- // Declaration methods
-
- @Test(result="param")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- p1.accept(new SimpleDeclarationVisitor() {
- public void visitFieldDeclaration(FieldDeclaration f) {
- res.add("field");
- }
- public void visitParameterDeclaration(ParameterDeclaration p) {
- res.add("param");
- }
- });
- return res;
- }
-
- @Test(result={"@ParameterDecl.AT1", "@ParameterDecl.AT2(true)"})
- Collection<AnnotationMirror> getAnnotationMirrors() {
- return p1.getAnnotationMirrors();
- }
-
- @Test(result={"final"})
- Collection<Modifier> getModifiers() {
- return p1.getModifiers();
- }
-
- @Test(result="ParameterDecl.java")
- String getPosition() {
- return p1.getPosition().file().getName();
- }
-
- @Test(result="p1")
- String getSimpleName() {
- return p1.getSimpleName();
- }
-
-
- // ParameterDeclaration methods
-
- @Test(result="int")
- TypeMirror getType() {
- return p1.getType();
- }
-
-
- // toString, equals
-
- @Test(result="int p1")
- String toStringTest() {
- return p1.toString();
- }
-
- @Test(result="true")
- boolean equalsTest1() {
- ParameterDeclaration p =
- getMethod("m1").getParameters().iterator().next();
- return p1.equals(p);
- }
-
- // Not all p1's are equal.
- @Test(result="false")
- boolean equalsTest2() {
- ParameterDeclaration p2 =
- getMethod("m2").getParameters().iterator().next();
- return p1.equals(p2);
- }
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/pkg1/AClass.java b/langtools/test/tools/apt/mirror/declaration/pkg1/AClass.java
deleted file mode 100644
index 649f225..0000000
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/AClass.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package pkg1;
-
-public class AClass {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/pkg1/AnAnnoType.java b/langtools/test/tools/apt/mirror/declaration/pkg1/AnAnnoType.java
deleted file mode 100644
index 81f9287..0000000
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/AnAnnoType.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-
-package pkg1;
-
-public @interface AnAnnoType {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/pkg1/AnEnum.java b/langtools/test/tools/apt/mirror/declaration/pkg1/AnEnum.java
deleted file mode 100644
index 4981470..0000000
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/AnEnum.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-package pkg1;
-
-enum AnEnum {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/pkg1/AnInterface.java b/langtools/test/tools/apt/mirror/declaration/pkg1/AnInterface.java
deleted file mode 100644
index 8bab6fe..0000000
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/AnInterface.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-
-package pkg1;
-
-public interface AnInterface {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/pkg1/package-info.java b/langtools/test/tools/apt/mirror/declaration/pkg1/package-info.java
deleted file mode 100644
index cb84fa3..0000000
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/package-info.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-
-/**
- * Herein lieth the package comment.
- * A doc comment it be, and wonderous to behold.
- */
- at AnAnnoType
-package pkg1;
diff --git a/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/AnInterface.java b/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/AnInterface.java
deleted file mode 100644
index fcee5d1..0000000
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/AnInterface.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
- * 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.
- */
-
-package pkg1.pkg2;
-
-public interface AnInterface {
-}
diff --git a/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html b/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html
deleted file mode 100644
index f3a82a1..0000000
--- a/langtools/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-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.
--->
-
-</head>
-<body bgcolor="white">
-
-Herein lieth the package comment.
-An HTML file it be, and wonderous to behold.
-
-</body>
-</html>
diff --git a/langtools/test/tools/apt/mirror/type/AnnoTyp.java b/langtools/test/tools/apt/mirror/type/AnnoTyp.java
deleted file mode 100644
index b064b46..0000000
--- a/langtools/test/tools/apt/mirror/type/AnnoTyp.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450
- * @summary AnnotationType tests
- * @library ../../lib
- * @compile -source 1.5 AnnoTyp.java
- * @run main/othervm AnnoTyp
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class AnnoTyp extends Tester {
-
- public static void main(String[] args) {
- (new AnnoTyp()).run();
- }
-
-
- // Declaration used by tests
-
- @interface AT {
- }
-
-
- private AnnotationType at; // an annotation type
-
- @AT
- protected void init() {
- at = getAnno("init", "AnnoTyp.AT").getAnnotationType();
- }
-
-
- // TypeMirror methods
-
- @Test(result="anno type")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- at.accept(new SimpleTypeVisitor() {
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- public void visitClassType(ClassType t) {
- res.add("class");
- }
- public void visitInterfaceType(InterfaceType t) {
- res.add("interface");
- }
- public void visitAnnotationType(AnnotationType t) {
- res.add("anno type");
- }
- });
- return res;
- }
-
-
- // AnnotationType method
-
- @Test(result="AnnoTyp.AT")
- AnnotationTypeDeclaration getDeclaration() {
- return at.getDeclaration();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/type/ArrayTyp.java b/langtools/test/tools/apt/mirror/type/ArrayTyp.java
deleted file mode 100644
index b2cbba7..0000000
--- a/langtools/test/tools/apt/mirror/type/ArrayTyp.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5009357
- * @summary ArrayType tests
- * @library ../../lib
- * @compile -source 1.5 ArrayTyp.java
- * @run main/othervm ArrayTyp
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class ArrayTyp extends Tester {
-
- public static void main(String[] args) {
- (new ArrayTyp()).run();
- }
-
-
- // Declaration used by tests
-
- private boolean[] bs;
- private String[][] bss;
-
-
- private ArrayType arr; // an array type
- private ArrayType arrarr; // a multi-dimensional array type
-
- protected void init() {
- arr = (ArrayType) getField("bs").getType();
- arrarr = (ArrayType) getField("bss").getType();
- }
-
-
- // TypeMirror methods
-
- @Test(result="array")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- arr.accept(new SimpleTypeVisitor() {
- public void visitTypeMirror(TypeMirror t) {
- res.add("type");
- }
- public void visitArrayType(ArrayType t) {
- res.add("array");
- }
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- });
- return res;
- }
-
- @Test(result="boolean[]")
- String toStringTest() {
- return arr.toString();
- }
-
- @Test(result="java.lang.String[][]")
- String toStringTestMulti() {
- return arrarr.toString();
- }
-
-
- // ArrayType method
-
- @Test(result="boolean")
- TypeMirror getComponentType() {
- return (PrimitiveType) arr.getComponentType();
- }
-
- @Test(result="java.lang.String[]")
- TypeMirror getComponentTypeMulti() {
- return (ArrayType) arrarr.getComponentType();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/type/ClassTyp.java b/langtools/test/tools/apt/mirror/type/ClassTyp.java
deleted file mode 100644
index fadafb9..0000000
--- a/langtools/test/tools/apt/mirror/type/ClassTyp.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5009360 5055963
- * @summary ClassType tests
- * @library ../../lib
- * @run main/othervm ClassTyp
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class ClassTyp<T1,T2> extends Tester {
-
- public static void main(String[] args) {
- (new ClassTyp()).run();
- }
-
-
- // Declarations used by tests
-
- static class C1<S> extends AbstractSet<S> implements Set<S> {
- class C2<R> {
- }
-
- static class C3<R> {
- class C4<Q> {
- }
- }
-
- public Iterator<S> iterator() {
- return null;
- }
-
- public int size() {
- return 0;
- }
- }
-
-
- // Generate some class types to test.
- private C1<T1> f0;
- private C1<String> f1;
- private C1 f2;
- private C1.C3<T2> f3;
- private C1<T1>.C2<T2> f4;
- private C1.C2 f5;
- private C1<T1> f6;
- private C1.C3<T2>.C4<T1> f7;
- private static final int NUMTYPES = 8;
-
- // Type mirrors corresponding to the types of the above fields
- private ClassType[] t = new ClassType[NUMTYPES];
-
- // One more type: our own.
- private ClassTyp<T1,T2> me = this;
-
-
- protected void init() {
- for (int i = 0; i < t.length; i++) {
- t[i] = (ClassType) getField("f"+i).getType();
- }
- }
-
-
- // TypeMirror methods
-
- @Test(result="class")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- t[0].accept(new SimpleTypeVisitor() {
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- public void visitClassType(ClassType t) {
- res.add("class");
- }
- public void visitInterfaceType(InterfaceType t) {
- res.add("interface");
- }
- });
- return res;
- }
-
- @Test(result="true")
- boolean equals1() {
- return t[0].equals(t[0]);
- }
-
- @Test(result="false")
- boolean equals2() {
- return t[0].equals(t[1]);
- }
-
- // Raw type is not same as type instantiated with unbounded type var.
- @Test(result="false")
- boolean equals3() {
- return t[0].equals(t[2]);
- }
-
- // C1<T1> is same type as C1<T1>
- @Test(result="true")
- boolean equals4() {
- return t[0].equals(t[6]);
- }
-
- @Test(result={
- "ClassTyp.C1<T1>",
- "ClassTyp.C1<java.lang.String>",
- "ClassTyp.C1",
- "ClassTyp.C1.C3<T2>",
- "ClassTyp.C1<T1>.C2<T2>",
- "ClassTyp.C1.C2",
- "ClassTyp.C1<T1>",
- "ClassTyp.C1.C3<T2>.C4<T1>"
- },
- ordered=true)
- Collection<String> toStringTests() {
- Collection<String> res = new ArrayList<String>();
- for (ClassType c : t) {
- res.add(c.toString());
- }
- return res;
- }
-
-
- // DeclaredType methods
-
- @Test(result={"T1"})
- Collection<TypeMirror> getActualTypeArguments1() {
- return t[0].getActualTypeArguments();
- }
-
- @Test(result={})
- Collection<TypeMirror> getActualTypeArguments2() {
- return t[2].getActualTypeArguments();
- }
-
- @Test(result={"T2"})
- Collection<TypeMirror> getActualTypeArguments3() {
- return t[3].getActualTypeArguments();
- }
-
- @Test(result="null")
- DeclaredType getContainingType1() {
- ClassType thisType = (ClassType) getField("me").getType();
- return thisType.getContainingType();
- }
-
- @Test(result="ClassTyp")
- DeclaredType getContainingType2() {
- return t[0].getContainingType();
- }
-
- @Test(result="ClassTyp.C1")
- DeclaredType getContainingType3() {
- return t[3].getContainingType();
- }
-
- @Test(result="ClassTyp.C1<T1>")
- DeclaredType getContainingType4() {
- return t[4].getContainingType();
- }
-
- @Test(result={"java.util.Set<T1>"})
- Collection<InterfaceType> getSuperinterfaces() {
- return t[0].getSuperinterfaces();
- }
-
-
- // ClassType methods
-
- @Test(result="ClassTyp.C1<S>")
- ClassDeclaration getDeclaration1() {
- return t[0].getDeclaration();
- }
-
- @Test(result="ClassTyp.C1.C3<R>")
- ClassDeclaration getDeclaration2() {
- return t[3].getDeclaration();
- }
-
- @Test(result="ClassTyp.C1<S>.C2<R>")
- ClassDeclaration getDeclaration3a() {
- return t[4].getDeclaration();
- }
-
- @Test(result="ClassTyp.C1<S>.C2<R>")
- ClassDeclaration getDeclaration3b() {
- return t[5].getDeclaration();
- }
-
- @Test(result="true")
- boolean getDeclarationEq() {
- return t[0].getDeclaration() == t[6].getDeclaration();
- }
-
- @Test(result="java.util.AbstractSet<T1>")
- ClassType getSuperclass1() {
- return t[0].getSuperclass();
- }
-
- @Test(result="java.lang.Object")
- ClassType getSuperclass2() {
- return t[4].getSuperclass();
- }
-
- @Test(result="null")
- ClassType getSuperclassOfObject() {
- return t[4].getSuperclass().getSuperclass();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/type/EnumTyp.java b/langtools/test/tools/apt/mirror/type/EnumTyp.java
deleted file mode 100644
index 5eac088..0000000
--- a/langtools/test/tools/apt/mirror/type/EnumTyp.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450
- * @summary EnumType tests
- * @library ../../lib
- * @compile -source 1.5 EnumTyp.java
- * @run main/othervm EnumTyp
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class EnumTyp extends Tester {
-
- public static void main(String[] args) {
- (new EnumTyp()).run();
- }
-
-
- // Declarations used by tests
-
- enum Suit {
- CIVIL,
- CRIMINAL
- }
-
- private Suit s;
-
-
- private EnumType e; // an enum type
-
- protected void init() {
- e = (EnumType) getField("s").getType();
- }
-
-
- // TypeMirror methods
-
- @Test(result="enum")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- e.accept(new SimpleTypeVisitor() {
- public void visitTypeMirror(TypeMirror t) {
- res.add("type");
- }
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- public void visitClassType(ClassType t) {
- res.add("class");
- }
- public void visitEnumType(EnumType t) {
- res.add("enum");
- }
- public void visitInterfaceType(InterfaceType t) {
- res.add("interface");
- }
- });
- return res;
- }
-
-
- // EnumType method
-
- @Test(result="EnumTyp.Suit")
- EnumDeclaration getDeclaration() {
- return e.getDeclaration();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/type/InterfaceTyp.java b/langtools/test/tools/apt/mirror/type/InterfaceTyp.java
deleted file mode 100644
index d001449..0000000
--- a/langtools/test/tools/apt/mirror/type/InterfaceTyp.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5055963
- * @summary InterfaceType tests
- * @library ../../lib
- * @run main/othervm InterfaceTyp
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class InterfaceTyp<T1,T2> extends Tester {
-
- public static void main(String[] args) {
- (new InterfaceTyp()).run();
- }
-
-
- // Declarations used by tests
-
- interface I1<S> extends Set<String> {
- interface I2<R> {
- }
- }
-
-
- // Generate some interface types to test
- private I1<T1> f0;
- private I1<String> f1;
- private I1 f2;
- private I1.I2<String> f3;
- private I1.I2 f4;
- private I1<T1> f5;
- private I3<T1> f6;
- private static final int NUMTYPES = 7;
-
- // Type mirrors corresponding to the types of the above fields
- private InterfaceType[] t = new InterfaceType[NUMTYPES];
-
- protected void init() {
- for (int i = 0; i < t.length; i++) {
- t[i] = (InterfaceType) getField("f"+i).getType();
- }
- }
-
-
- // TypeMirror methods
-
- @Test(result="interface")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- t[0].accept(new SimpleTypeVisitor() {
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- public void visitClassType(ClassType t) {
- res.add("class");
- }
- public void visitInterfaceType(InterfaceType t) {
- res.add("interface");
- }
- });
- return res;
- }
-
- @Test(result="true")
- boolean equals1() {
- return t[0].equals(t[0]);
- }
-
- @Test(result="false")
- boolean equals2() {
- return t[0].equals(t[1]);
- }
-
- // Raw type is not same as type instantiated with unbounded type var.
- @Test(result="false")
- boolean equals3() {
- return t[0].equals(t[2]);
- }
-
- // I1<T1> is same type as I1<T1>
- @Test(result="true")
- boolean equals4() {
- return t[0].equals(t[5]);
- }
-
- @Test(result={
- "InterfaceTyp.I1<T1>",
- "InterfaceTyp.I1<java.lang.String>",
- "InterfaceTyp.I1",
- "InterfaceTyp.I1.I2<java.lang.String>",
- "InterfaceTyp.I1.I2",
- "InterfaceTyp.I1<T1>",
- "I3<T1>"
- },
- ordered=true)
- Collection<String> toStringTests() {
- Collection<String> res = new ArrayList<String>();
- for (InterfaceType i : t) {
- res.add(i.toString());
- }
- return res;
- }
-
-
- // DeclaredType methods
-
- @Test(result={"T1"})
- Collection<TypeMirror> getActualTypeArguments1() {
- return t[0].getActualTypeArguments();
- }
-
- @Test(result={})
- Collection<TypeMirror> getActualTypeArguments2() {
- return t[2].getActualTypeArguments();
- }
-
- @Test(result={"java.lang.String"})
- Collection<TypeMirror> getActualTypeArguments3() {
- return t[3].getActualTypeArguments();
- }
-
- @Test(result="InterfaceTyp")
- DeclaredType getContainingType1() {
- return t[0].getContainingType();
- }
-
- @Test(result="InterfaceTyp.I1")
- DeclaredType getContainingType2() {
- return t[3].getContainingType();
- }
-
- @Test(result="null")
- DeclaredType getContainingTypeTopLevel() {
- return t[6].getContainingType();
- }
-
- @Test(result={"java.util.Set<java.lang.String>"})
- Collection<InterfaceType> getSuperinterfaces() {
- return t[0].getSuperinterfaces();
- }
-
-
-
- // InterfaceType method
-
- @Test(result="InterfaceTyp.I1<S>")
- InterfaceDeclaration getDeclaration1() {
- return t[0].getDeclaration();
- }
-
- @Test(result="InterfaceTyp.I1.I2<R>")
- InterfaceDeclaration getDeclaration2a() {
- return t[3].getDeclaration();
- }
-
- @Test(result="InterfaceTyp.I1.I2<R>")
- InterfaceDeclaration getDeclaration2b() {
- return t[4].getDeclaration();
- }
-
- @Test(result="true")
- boolean getDeclarationCaching() {
- return t[0].getDeclaration() == t[5].getDeclaration();
- }
-}
-
-
-// A top-level interface used by tests.
-
-interface I3<T> {
-}
diff --git a/langtools/test/tools/apt/mirror/type/PrimitiveTyp.java b/langtools/test/tools/apt/mirror/type/PrimitiveTyp.java
deleted file mode 100644
index befb4d8..0000000
--- a/langtools/test/tools/apt/mirror/type/PrimitiveTyp.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450
- * @summary PrimitiveType tests
- * @library ../../lib
- * @compile -source 1.5 PrimitiveTyp.java
- * @run main/othervm PrimitiveTyp
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class PrimitiveTyp extends Tester {
-
- public static void main(String[] args) {
- (new PrimitiveTyp()).run();
- }
-
-
- // Declaration used by tests
-
- private boolean b;
-
-
- private PrimitiveType prim; // a primitive type
-
- protected void init() {
- prim = (PrimitiveType) getField("b").getType();
- }
-
-
- // TypeMirror methods
-
- @Test(result="primitive")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- prim.accept(new SimpleTypeVisitor() {
- public void visitTypeMirror(TypeMirror t) {
- res.add("type");
- }
- public void visitPrimitiveType(PrimitiveType t) {
- res.add("primitive");
- }
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- });
- return res;
- }
-
- @Test(result="boolean")
- String toStringTest() {
- return prim.toString();
- }
-
-
- // PrimitiveType method
-
- @Test(result="BOOLEAN")
- PrimitiveType.Kind getKind() {
- return prim.getKind();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/type/TypeVar.java b/langtools/test/tools/apt/mirror/type/TypeVar.java
deleted file mode 100644
index d2acd33..0000000
--- a/langtools/test/tools/apt/mirror/type/TypeVar.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450
- * @summary TypeVariable tests
- * @library ../../lib
- * @compile -source 1.5 TypeVar.java
- * @run main/othervm TypeVar
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class TypeVar<T, S extends Number & Runnable> extends Tester {
-
- public static void main(String[] args) {
- (new TypeVar()).run();
- }
-
-
- // Declarations used by tests
-
- private T t;
- private S s;
-
-
- private TypeVariable tvT; // type variable T
- private TypeVariable tvS; // type variable S
-
- protected void init() {
- tvT = (TypeVariable) getField("t").getType();
- tvS = (TypeVariable) getField("s").getType();
- }
-
-
- // TypeMirror methods
-
- @Test(result="type var")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- tvT.accept(new SimpleTypeVisitor() {
- public void visitTypeMirror(TypeMirror t) {
- res.add("type");
- }
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- public void visitTypeVariable(TypeVariable t) {
- res.add("type var");
- }
- });
- return res;
- }
-
- @Test(result="T")
- String toStringTest1() {
- return tvT.toString();
- }
-
- @Test(result="S")
- String toStringTest2() {
- return tvS.toString();
- }
-
-
- // TypeVariable method
-
- @Test(result="S extends java.lang.Number & java.lang.Runnable")
- TypeParameterDeclaration getDeclaration() {
- return tvS.getDeclaration();
- }
-}
diff --git a/langtools/test/tools/apt/mirror/type/WildcardTyp.java b/langtools/test/tools/apt/mirror/type/WildcardTyp.java
deleted file mode 100644
index cae97b1..0000000
--- a/langtools/test/tools/apt/mirror/type/WildcardTyp.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 4853450 5009396 5010636 5031156
- * @summary WildcardType tests
- * @library ../../lib
- * @compile -source 1.5 WildcardTyp.java
- * @run main/othervm WildcardTyp
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class WildcardTyp extends Tester {
-
- public static void main(String[] args) {
- (new WildcardTyp()).run();
- }
-
-
- // Declarations to use for testing
-
- interface G<T> {
- }
-
- interface G1<N extends Number & Runnable> {
- }
-
- interface G2<T extends G2<T>> {
- }
-
- // Some wildcard types to test.
- private G<?> f0; // unbound
- private G<? extends Number> f1; // covariant
- private G<? super Number> f2; // contravariant
- private G<? extends Object> f3; // <sigh>
- private G1<?> f4; // "true" upper bound is an intersection type
- private G2<?> f5; // 'true" upper bound is a recursive F-bound and
- // not expressible
- private static final int NUMTYPES = 6;
-
- // Type mirrors corresponding to the wildcard types of the above fields
- private WildcardType[] t = new WildcardType[NUMTYPES];
-
-
- protected void init() {
- for (int i = 0; i < t.length; i++) {
- DeclaredType type = (DeclaredType) getField("f"+i).getType();
- t[i] = (WildcardType)
- type.getActualTypeArguments().iterator().next();
- }
- }
-
- private WildcardType wildcardFor(String field) {
- DeclaredType d = (DeclaredType) getField(field).getType();
- return (WildcardType) d.getActualTypeArguments().iterator().next();
- }
-
-
- // TypeMirror methods
-
- @Test(result="wild thing")
- Collection<String> accept() {
- final Collection<String> res = new ArrayList<String>();
-
- t[0].accept(new SimpleTypeVisitor() {
- public void visitTypeMirror(TypeMirror t) {
- res.add("type");
- }
- public void visitReferenceType(ReferenceType t) {
- res.add("ref type");
- }
- public void visitWildcardType(WildcardType t) {
- res.add("wild thing");
- }
- });
- return res;
- }
-
- @Test(result={
- "?",
- "? extends java.lang.Number",
- "? super java.lang.Number",
- "? extends java.lang.Object",
- "?",
- "?"
- },
- ordered=true)
- Collection<String> toStringTests() {
- Collection<String> res = new ArrayList<String>();
- for (WildcardType w : t) {
- res.add(w.toString());
- }
- return res;
- }
-
-
- // WildcardType methods
-
- @Test(result={
- "null",
- "null",
- "java.lang.Number",
- "null",
- "null",
- "null"
- },
- ordered=true)
- Collection<ReferenceType> getLowerBounds() {
- Collection<ReferenceType> res = new ArrayList<ReferenceType>();
- for (WildcardType w : t) {
- Collection<ReferenceType> bounds = w.getLowerBounds();
- int num = bounds.size();
- if (num > 1) {
- throw new AssertionError("Bounds abound");
- }
- res.add((num > 0) ? bounds.iterator().next() : null);
- }
- return res;
- }
-
- @Test(result={
- "null",
- "java.lang.Number",
- "null",
- "java.lang.Object",
- "null",
- "null"
- },
- ordered=true)
- Collection<ReferenceType> getUpperBounds() {
- Collection<ReferenceType> res = new ArrayList<ReferenceType>();
- for (WildcardType w : t) {
- Collection<ReferenceType> bounds = w.getUpperBounds();
- int num = bounds.size();
- if (num > 1) {
- throw new AssertionError("Bounds abound");
- }
- res.add((num > 0) ? bounds.iterator().next() : null);
- }
- return res;
- }
-}
diff --git a/langtools/test/tools/apt/mirror/util/Overrides.java b/langtools/test/tools/apt/mirror/util/Overrides.java
deleted file mode 100644
index 30ce92c..0000000
--- a/langtools/test/tools/apt/mirror/util/Overrides.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 5037165
- * @summary Test the Declarations.overrides method
- * @library ../../lib
- * @run main/othervm Overrides
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-
-public class Overrides extends Tester {
-
- public static void main(String[] args) {
- (new Overrides()).run();
- }
-
-
- // Declarations used by tests
-
- static class A {
- void m1(int i) {}; // does not override itself
- void m2(int i) {};
- static void m3(int i) {};
- }
-
- static class B extends A {
- void m1(int j) {}; // overrides A.m1
- void m1(String i) {}; // does not override A.m1
- void m4(int i) {}; // does not override A.m1
- }
-
- static class C extends B {
- void m1(int i) {}; // overrides A.m1 and B.m1
- void m2(int i) {}; // overrides A.m2
- }
-
- static class D extends A {
- static void m3(int i) {}; // does not override A.m3
- }
-
- static class E {
- void m1(int i) {}; // does not override A.m1
- }
-
-
-
- private Declarations decls;
-
- private TypeDeclaration A;
- private TypeDeclaration B;
- private TypeDeclaration C;
- private TypeDeclaration D;
- private TypeDeclaration E;
- private MethodDeclaration Am1;
- private MethodDeclaration Am2;
- private MethodDeclaration Am3;
- private MethodDeclaration Bm1;
- private MethodDeclaration Bm1b;
- private MethodDeclaration Bm4;
- private MethodDeclaration Cm1;
- private MethodDeclaration Cm2;
- private MethodDeclaration Dm3;
- private MethodDeclaration Em1;
-
- protected void init() {
- decls = env.getDeclarationUtils();
-
- A = env.getTypeDeclaration("Overrides.A");
- B = env.getTypeDeclaration("Overrides.B");
- C = env.getTypeDeclaration("Overrides.C");
- D = env.getTypeDeclaration("Overrides.D");
- E = env.getTypeDeclaration("Overrides.E");
-
- Am1 = getMethod(A, "m1", "i");
- Am2 = getMethod(A, "m2", "i");
- Am3 = getMethod(A, "m3", "i");
- Bm1 = getMethod(B, "m1", "j");
- Bm1b = getMethod(B, "m1", "i");
- Bm4 = getMethod(B, "m4", "i");
- Cm1 = getMethod(C, "m1", "i");
- Cm2 = getMethod(C, "m2", "i");
- Dm3 = getMethod(D, "m3", "i");
- Em1 = getMethod(E, "m1", "i");
- }
-
- private MethodDeclaration getMethod(TypeDeclaration t,
- String methodName, String paramName) {
- for (MethodDeclaration m : t.getMethods()) {
- if (methodName.equals(m.getSimpleName()) &&
- paramName.equals(m.getParameters().iterator().next()
- .getSimpleName())) {
- return m;
- }
- }
- throw new AssertionError();
- }
-
-
- // Declarations methods
-
- @Test(result={"false",
- "true",
- "false",
- "false",
- "true",
- "true",
- "true",
- "false",
- "false"},
- ordered=true)
- List<Boolean> overrides() {
- return Arrays.asList(
- decls.overrides(Am1, Am1),
- decls.overrides(Bm1, Am1),
- decls.overrides(Bm1b,Am1),
- decls.overrides(Bm4, Am1),
- decls.overrides(Cm1, Am1),
- decls.overrides(Cm1, Bm1),
- decls.overrides(Cm2, Am2),
- decls.overrides(Dm3, Am3),
- decls.overrides(Em1, Am1));
- }
-}
diff --git a/langtools/test/tools/apt/mirror/util/TypeCreation.java b/langtools/test/tools/apt/mirror/util/TypeCreation.java
deleted file mode 100644
index 699e812..0000000
--- a/langtools/test/tools/apt/mirror/util/TypeCreation.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2004, 2008, Oracle and/or its affiliates. All rights reserved.
- * 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 5033381
- * @summary Test the type creation methods in Types.
- * @library ../../lib
- * @run main/othervm TypeCreation
- */
-
-
-import java.util.*;
-import com.sun.mirror.declaration.*;
-import com.sun.mirror.type.*;
-import com.sun.mirror.util.*;
-
-import static com.sun.mirror.type.PrimitiveType.Kind.*;
-
-
-public class TypeCreation extends Tester {
-
- public static void main(String[] args) {
- (new TypeCreation()).run();
- }
-
-
- // Declarations used by tests
-
- class A {
- }
-
- class O<T> {
- class I<S> {
- }
- }
-
-
- private Types types;
-
- private TypeDeclaration A;
- private TypeDeclaration O;
- private TypeDeclaration I;
-
- private DeclaredType AType;
-
- protected void init() {
- types = env.getTypeUtils();
- A = env.getTypeDeclaration("TypeCreation.A");
- O = env.getTypeDeclaration("TypeCreation.O");
- I = env.getTypeDeclaration("TypeCreation.O.I");
-
- AType = types.getDeclaredType(A);
- }
-
-
- @Test(result="boolean")
- PrimitiveType getPrimitiveType() {
- return types.getPrimitiveType(BOOLEAN);
- }
-
- @Test(result="void")
- VoidType getVoidType() {
- return types.getVoidType();
- }
-
- @Test(result="boolean[]")
- ArrayType getArrayType1() {
- return types.getArrayType(
- types.getPrimitiveType(BOOLEAN));
- }
-
- @Test(result="TypeCreation.A[]")
- ArrayType getArrayType2() {
- return types.getArrayType(AType);
- }
-
- @Test(result="? extends TypeCreation.A")
- WildcardType getWildcardType() {
- Collection<ReferenceType> uppers = new ArrayList<ReferenceType>();
- Collection<ReferenceType> downers = new ArrayList<ReferenceType>();
- uppers.add(AType);
- return types.getWildcardType(uppers, downers);
- }
-
- @Test(result="TypeCreation.O<java.lang.String>")
- DeclaredType getDeclaredType1() {
- TypeDeclaration stringDecl = env.getTypeDeclaration("java.lang.String");
- DeclaredType stringType = types.getDeclaredType(stringDecl);
- return types.getDeclaredType(O, stringType);
- }
-
- @Test(result="TypeCreation.O<java.lang.String>.I<java.lang.Number>")
- DeclaredType getDeclaredType2() {
- TypeDeclaration numDecl = env.getTypeDeclaration("java.lang.Number");
- DeclaredType numType = types.getDeclaredType(numDecl);
- DeclaredType OType = getDeclaredType1();
- return types.getDeclaredType(OType, I, numType);
- }
-}
diff --git a/langtools/test/tools/javac/4846262/Test.sh b/langtools/test/tools/javac/4846262/Test.sh
index fd0da0a..26de010 100644
--- a/langtools/test/tools/javac/4846262/Test.sh
+++ b/langtools/test/tools/javac/4846262/Test.sh
@@ -45,7 +45,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
FS="/"
;;
CYGWIN* )
diff --git a/langtools/test/tools/javac/6302184/T6302184.sh b/langtools/test/tools/javac/6302184/T6302184.sh
index c95db5c..5a1c333 100644
--- a/langtools/test/tools/javac/6302184/T6302184.sh
+++ b/langtools/test/tools/javac/6302184/T6302184.sh
@@ -41,7 +41,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
FS="/"
;;
CYGWIN* )
diff --git a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh b/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
index cbf7aa7..e46aef0 100644
--- a/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
+++ b/langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh
@@ -56,7 +56,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows* )
diff --git a/langtools/test/tools/javac/ExtDirs/ExtDirs.sh b/langtools/test/tools/javac/ExtDirs/ExtDirs.sh
index 157a028..00da24e 100644
--- a/langtools/test/tools/javac/ExtDirs/ExtDirs.sh
+++ b/langtools/test/tools/javac/ExtDirs/ExtDirs.sh
@@ -54,7 +54,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/langtools/test/tools/javac/MissingInclude.sh b/langtools/test/tools/javac/MissingInclude.sh
index 3856ac8..f175a50 100644
--- a/langtools/test/tools/javac/MissingInclude.sh
+++ b/langtools/test/tools/javac/MissingInclude.sh
@@ -47,7 +47,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows* )
diff --git a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh b/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
index 33f6922..d06b82a 100644
--- a/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
+++ b/langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh
@@ -52,7 +52,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/langtools/test/tools/javac/T5090006/compiler.sh b/langtools/test/tools/javac/T5090006/compiler.sh
index cb7c3c8..5c913b3 100644
--- a/langtools/test/tools/javac/T5090006/compiler.sh
+++ b/langtools/test/tools/javac/T5090006/compiler.sh
@@ -47,7 +47,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows* )
diff --git a/langtools/test/tools/javac/api/7086261/T7086261.java b/langtools/test/tools/javac/api/7086261/T7086261.java
index ab302bf..a22c5fb 100644
--- a/langtools/test/tools/javac/api/7086261/T7086261.java
+++ b/langtools/test/tools/javac/api/7086261/T7086261.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 20011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
* 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/langtools/test/tools/javac/apt.sh b/langtools/test/tools/javac/apt.sh
deleted file mode 100644
index b06e985..0000000
--- a/langtools/test/tools/javac/apt.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh -f
-
-#
-# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
-# 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.
-#
-
-#
-# Usage:
-# @run apt.sh <apt-args>
-#
-# This script is to run apt for a regression test
-
-if [ "${TESTJAVA}" = "" ]
-then
- echo "TESTJAVA not set. Test cannot execute. Failed."
- exit 1
-fi
-
-# set platform-dependent variables
-OS=`uname -s`
-case "$OS" in
- SunOS | Linux )
- NULL=/dev/null
- PS=":"
- FS="/"
- ;;
- Windows* )
- NULL=NUL
- PS=";"
- FS="\\"
- ;;
- * )
- echo "Unrecognized system!"
- exit 1;
- ;;
-esac
-
-CLASSPATH="${TESTCLASSES}${PS}${TESTJAVA}${FS}lib${FS}tools.jar" "${TESTJAVA}${FS}bin${FS}apt" ${TESTTOOLVMOPTS} $*
-result=$?
-
-if [ $result -eq 0 ]
-then
- echo "Passed"
-else
- echo "Failed"
-fi
-exit $result
-
-
diff --git a/langtools/test/tools/javac/constDebug/ConstDebug.sh b/langtools/test/tools/javac/constDebug/ConstDebug.sh
index a936a30..0a96a47 100644
--- a/langtools/test/tools/javac/constDebug/ConstDebug.sh
+++ b/langtools/test/tools/javac/constDebug/ConstDebug.sh
@@ -47,7 +47,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/langtools/test/tools/javac/diags/CheckResourceKeys.java b/langtools/test/tools/javac/diags/CheckResourceKeys.java
index 742dbbb..ec5cb1e 100644
--- a/langtools/test/tools/javac/diags/CheckResourceKeys.java
+++ b/langtools/test/tools/javac/diags/CheckResourceKeys.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -259,6 +259,7 @@ public class CheckResourceKeys {
"application.home", // in Paths.java
"env.class.path",
"line.separator",
+ "os.name",
"user.dir",
// file names
"ct.sym",
diff --git a/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh b/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh
index 561bfa2..77cc37c 100644
--- a/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh
+++ b/langtools/test/tools/javac/fatalErrors/NoJavaLang.sh
@@ -48,7 +48,7 @@ echo
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
FS="/"
;;
CYGWIN* )
diff --git a/langtools/test/tools/javac/generics/6723444/T6723444.out b/langtools/test/tools/javac/generics/6723444/T6723444.out
index add9485..8fc9df4 100644
--- a/langtools/test/tools/javac/generics/6723444/T6723444.out
+++ b/langtools/test/tools/javac/generics/6723444/T6723444.out
@@ -1,5 +1,5 @@
-T6723444.java:42:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
-T6723444.java:43:9: compiler.err.unreported.exception.need.to.catch.or.throw: X2
+T6723444.java:42:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
+T6723444.java:43:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
T6723444.java:45:32: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
T6723444.java:46:17: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
T6723444.java:48:9: compiler.err.unreported.exception.need.to.catch.or.throw: java.lang.Throwable
diff --git a/langtools/test/tools/javac/innerClassFile/Driver.sh b/langtools/test/tools/javac/innerClassFile/Driver.sh
index f4d89d0..dbe7366 100644
--- a/langtools/test/tools/javac/innerClassFile/Driver.sh
+++ b/langtools/test/tools/javac/innerClassFile/Driver.sh
@@ -53,7 +53,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows* )
diff --git a/langtools/test/tools/javac/javazip/Test.sh b/langtools/test/tools/javac/javazip/Test.sh
index c8a59a6..4fbf874 100644
--- a/langtools/test/tools/javac/javazip/Test.sh
+++ b/langtools/test/tools/javac/javazip/Test.sh
@@ -41,7 +41,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
FS="/"
SCR=`pwd`
;;
diff --git a/langtools/test/tools/javac/links/links.sh b/langtools/test/tools/javac/links/links.sh
index 110497f..83d10c0 100644
--- a/langtools/test/tools/javac/links/links.sh
+++ b/langtools/test/tools/javac/links/links.sh
@@ -53,7 +53,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
NULL=/dev/null
PS=":"
FS="/"
diff --git a/langtools/test/tools/javac/newlines/Newlines.sh b/langtools/test/tools/javac/newlines/Newlines.sh
index 56f250e..ccb30c6 100644
--- a/langtools/test/tools/javac/newlines/Newlines.sh
+++ b/langtools/test/tools/javac/newlines/Newlines.sh
@@ -50,7 +50,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows* )
diff --git a/langtools/test/tools/javac/processing/loader/testClose/TestClose.java b/langtools/test/tools/javac/processing/loader/testClose/TestClose.java
index ac29896..4128a07 100644
--- a/langtools/test/tools/javac/processing/loader/testClose/TestClose.java
+++ b/langtools/test/tools/javac/processing/loader/testClose/TestClose.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
* 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 com.sun.source.util.JavacTask;
import com.sun.source.util.TaskEvent;
import com.sun.source.util.TaskListener;
import com.sun.tools.javac.api.ClientCodeWrapper.Trusted;
+import com.sun.tools.javac.api.BasicJavacTask;
import com.sun.tools.javac.api.JavacTool;
import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import com.sun.tools.javac.util.Context;
@@ -89,10 +90,10 @@ public class TestClose implements TaskListener {
" public void run() {\n" +
" System.out.println(getClass().getName() + \": run()\");\n" +
" try {\n" +
- " cl.loadClass(\"Callback\")\n" +
- " .asSubclass(Runnable.class)\n" +
- " .newInstance()\n" +
- " .run();\n" +
+ " cl.loadClass(\"Callback\")\n" +
+ " .asSubclass(Runnable.class)\n" +
+ " .newInstance()\n" +
+ " .run();\n" +
" } catch (ReflectiveOperationException e) {\n" +
" throw new Error(e);\n" +
" }\n" +
@@ -184,25 +185,24 @@ public class TestClose implements TaskListener {
throw new AssertionError();
}
-
public static void add(ProcessingEnvironment env, Runnable r) {
try {
- Context c = ((JavacProcessingEnvironment) env).getContext();
- Object o = c.get(TaskListener.class);
+ JavacTask task = JavacTask.instance(env);
+ TaskListener l = ((BasicJavacTask) task).getTaskListeners().iterator().next();
// The TaskListener is an instanceof TestClose, but when using the
// default class loaders. the taskListener uses a different
// instance of Class<TestClose> than the anno processor.
// If you try to evaluate
- // TestClose tc = (TestClose) (o).
+ // TestClose tc = (TestClose) (l).
// you get the following somewhat confusing error:
// java.lang.ClassCastException: TestClose cannot be cast to TestClose
// The workaround is to access the fields of TestClose with reflection.
- Field f = o.getClass().getField("runnables");
+ Field f = l.getClass().getField("runnables");
@SuppressWarnings("unchecked")
- List<Runnable> runnables = (List<Runnable>) f.get(o);
+ List<Runnable> runnables = (List<Runnable>) f.get(l);
runnables.add(r);
} catch (Throwable t) {
- System.err.println(t);
+ t.printStackTrace();
}
}
diff --git a/langtools/test/tools/javac/stackmap/T4955930.sh b/langtools/test/tools/javac/stackmap/T4955930.sh
index e87300f..731ce80 100644
--- a/langtools/test/tools/javac/stackmap/T4955930.sh
+++ b/langtools/test/tools/javac/stackmap/T4955930.sh
@@ -41,7 +41,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
diff --git a/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh b/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
index 6c2ac80..9f728bb 100644
--- a/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
+++ b/langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh
@@ -55,7 +55,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
if [ -d /usr/lib/locale/en_US.UTF-8 -o -d /usr/lib/locale/en_US.utf8 ]
then
ENV="env LANG=en_US.UTF-8"
diff --git a/langtools/test/tools/javah/6257087/foo.sh b/langtools/test/tools/javah/6257087/foo.sh
index 40b5458..e141e62 100644
--- a/langtools/test/tools/javah/6257087/foo.sh
+++ b/langtools/test/tools/javah/6257087/foo.sh
@@ -41,7 +41,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/langtools/test/tools/javah/ConstMacroTest.sh b/langtools/test/tools/javah/ConstMacroTest.sh
index 324decc..b8a7a3c 100644
--- a/langtools/test/tools/javah/ConstMacroTest.sh
+++ b/langtools/test/tools/javah/ConstMacroTest.sh
@@ -56,7 +56,7 @@ EXPECTED_JAVAH_OUT_FILE=SubClassConsts.out
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux )
+ SunOS | Linux | Darwin )
PS=":"
FS="/"
;;
diff --git a/langtools/test/tools/javah/MissingParamClassTest.sh b/langtools/test/tools/javah/MissingParamClassTest.sh
index 5b72a68..4796ac7 100644
--- a/langtools/test/tools/javah/MissingParamClassTest.sh
+++ b/langtools/test/tools/javah/MissingParamClassTest.sh
@@ -58,7 +58,7 @@ echo "CLASSPATH=${CLASSPATH}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
PS=":"
FS="/"
;;
diff --git a/langtools/test/tools/javah/ReadOldClass.sh b/langtools/test/tools/javah/ReadOldClass.sh
index 1ad4e55..516c188 100644
--- a/langtools/test/tools/javah/ReadOldClass.sh
+++ b/langtools/test/tools/javah/ReadOldClass.sh
@@ -43,7 +43,7 @@ fi
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
PS=":"
FS="/"
;;
diff --git a/langtools/test/tools/javap/pathsep.sh b/langtools/test/tools/javap/pathsep.sh
index 90b5bdb..f34da2a 100644
--- a/langtools/test/tools/javap/pathsep.sh
+++ b/langtools/test/tools/javap/pathsep.sh
@@ -40,7 +40,7 @@ echo "TESTJAVA=${TESTJAVA}"
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
- SunOS | Linux | CYGWIN* )
+ SunOS | Linux | Darwin | CYGWIN* )
FS="/"
;;
Windows* )
diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk
index 89ca1c1..bc3f32b 100644
--- a/make/Defs-internal.gmk
+++ b/make/Defs-internal.gmk
@@ -79,7 +79,7 @@ endef
# Find all build_time_* files and print their contents in a list sorted
# on the name of the sub repository.
define ReportBuildTimes
-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
+$(PRINTF) -- "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
$1 \
"`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
"`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
diff --git a/make/jprt.properties b/make/jprt.properties
index d92c63e..6304fa4 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -39,6 +39,7 @@ jprt.build.targets= \
solaris_x64_5.10-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
+ macosx_x64_10.7-{product|fastdebug}, \
windows_i586_5.1-{product|fastdebug}, \
windows_x64_5.2-{product|fastdebug}
@@ -53,6 +54,7 @@ jprt.my.test.target.set= \
solaris_x64_5.10-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
+ macosx_x64_10.7-product-c2-TESTNAME, \
windows_i586_5.1-product-c1-TESTNAME, \
windows_x64_5.2-product-c2-TESTNAME
@@ -63,20 +65,36 @@ jprt.vm.default.test.targets= \
# Default jdk test targets (testset=default)
jprt.make.rule.default.test.targets= \
- ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
+ ${jprt.my.test.target.set:TESTNAME=langtools_jtreg}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_math}
+
+# Default vm test targets (testset=core)
+jprt.vm.core.test.targets= \
+ ${jprt.vm.default.test.targets}
+
+# Core jdk test targets (testset=core)
+jprt.make.rule.core.test.targets= \
+ ${jprt.make.rule.default.test.targets}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_util}, \
${jprt.my.test.target.set:TESTNAME=jdk_io}, \
${jprt.my.test.target.set:TESTNAME=jdk_jigsaw}, \
${jprt.my.test.target.set:TESTNAME=jdk_lang}, \
${jprt.my.test.target.set:TESTNAME=jdk_math}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_misc}, \
${jprt.my.test.target.set:TESTNAME=jdk_net}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio1}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio2}, \
${jprt.my.test.target.set:TESTNAME=jdk_nio3}, \
${jprt.my.test.target.set:TESTNAME=jdk_security1}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
${jprt.my.test.target.set:TESTNAME=jdk_text}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_util}
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_tools2}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_misc}
# All vm test targets (testset=all)
jprt.vm.all.test.targets= \
@@ -86,19 +104,13 @@ jprt.vm.all.test.targets= \
# All jdk test targets (testset=all)
jprt.make.rule.all.test.targets= \
- ${jprt.make.rule.default.test.targets}, \
+ ${jprt.make.rule.core.test.targets}, \
${jprt.my.test.target.set:TESTNAME=jdk_awt}, \
+ ${jprt.my.test.target.set:TESTNAME=jdk_beans1}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans2}, \
${jprt.my.test.target.set:TESTNAME=jdk_beans3}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_management2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_rmi}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security2}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_security3}, \
${jprt.my.test.target.set:TESTNAME=jdk_sound}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_swing}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools1}, \
- ${jprt.my.test.target.set:TESTNAME=jdk_tools2}
+ ${jprt.my.test.target.set:TESTNAME=jdk_swing}
# JCK test targets in test/Makefile (no windows)
jprt.my.jck.test.target.set= \
diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk
index fece2a9..544dba1 100644
--- a/make/sanity-rules.gmk
+++ b/make/sanity-rules.gmk
@@ -38,7 +38,7 @@ ifeq ($(BUILD_DEPLOY), true)
endif
ifeq ($(BUILD_JDK), true)
- sanity:: jdk-sanity
+ sanity:: jdk-sanity
endif
# Only need these sanity rules when not doing a debug build
@@ -64,7 +64,7 @@ $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE):
purge-sanity: $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
-@$(RM) $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
-pre-sanity: purge-sanity
+pre-sanity: purge-sanity
# this should be the last rule in any target's sanity rule.
post-sanity post-sanity-hotspot post-sanity-jdk post-sanity-install post-sanity-deploy:
@@ -132,7 +132,7 @@ endif
" $* defined. Please unset it and restart your build. \n" \
"" >> $(ERROR_FILE)
-# Check the environment variables
+# Check the environment variables
environment: $(DO_NOT_SET_LIST:%=%.do_not_set)
ifeq ($(LANGTOOLS_SRC_AVAILABLE), true)
ifneq ($(BUILD_LANGTOOLS), true)
@@ -205,7 +205,15 @@ ifeq ($(SPONSORS_SRC_AVAILABLE), true)
endif
endif
ifeq ($(GENERATE_DOCS),false)
- @$(ECHO) "WARNING: This build does not include running javadoc.\n" \
+ @$(ECHO) "WARNING: This build does not include generating javadoc.\n" \
+ "" >> $(WARNING_FILE)
+endif
+ifdef NO_DEMOS
+ @$(ECHO) "WARNING: This build and any install images will not include demos.\n" \
+ "" >> $(WARNING_FILE)
+endif
+ifdef NO_SAMPLES
+ @$(ECHO) "WARNING: This build and any install images will not include samples.\n" \
"" >> $(WARNING_FILE)
endif
ifdef NO_IMAGES
@@ -231,7 +239,7 @@ ifneq ($(PLATFORM), windows)
HOSTNAME := $(shell hostname)
endif
endif
-settings::
+settings::
@$(ECHO) "Build Machine Information:" >> $(MESSAGE_FILE)
ifeq ($(PLATFORM), windows)
@$(ECHO) " build machine = $(COMPUTERNAME)" >> $(MESSAGE_FILE)
--
jigsaw packaging
More information about the pkg-java-commits
mailing list