From: <ls...@us...> - 2011-01-04 17:04:57
|
Revision: 5780 http://jnode.svn.sourceforge.net/jnode/?rev=5780&view=rev Author: lsantha Date: 2011-01-04 17:04:46 +0000 (Tue, 04 Jan 2011) Log Message: ----------- Integrating OpenJDK 6 b20. Modified Paths: -------------- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/broker/Broker.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/InputObject.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/OutputObject.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientDelegate.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/MessageMediator.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ProtocolHandler.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Acceptor.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ByteBufferPool.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Connection.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ConnectionCache.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoList.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoListIterator.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/EventHandler.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/InboundConnectionCache.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ListenerThread.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/OutboundConnectionCache.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ReaderThread.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ResponseWaitingRoom.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Selector.java classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/TransportManager.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/copyobject/CopierManager.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/copyobject/CopyobjectDefaults.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/copyobject/ObjectCopier.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/copyobject/ObjectCopierFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/copyobject/ReflectiveCopyException.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/encoding/CorbaInputObject.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/encoding/CorbaOutputObject.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/extension/CopyObjectPolicy.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/extension/RequestPartitioningPolicy.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/extension/ServantCachingPolicy.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/extension/ZeroPortPolicy.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/AlternateIIOPAddressComponent.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/CodeSetsComponent.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/GIOPVersion.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/IIOPAddress.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/IIOPFactories.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/IIOPProfile.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/IIOPProfileTemplate.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/JavaCodebaseComponent.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/MaxStreamFormatVersionComponent.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/ORBTypeComponent.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/ior/iiop/RequestPartitioningComponent.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/connection/Connection.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/connection/GetEndPointInfoAgainException.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketEndPointInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/connection/LegacyServerSocketManager.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/connection/ORBSocketFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/interceptor/IORInfoExt.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/interceptor/ORBInitInfoExt.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/interceptor/RequestInfoExt.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/legacy/interceptor/UnknownType.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/logging/CORBALogDomains.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/logging/LogWrapperBase.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/logging/LogWrapperFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/oa/NullServant.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/oa/OADefault.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/oa/OADestroyed.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/oa/OAInvocationInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/oa/ObjectAdapter.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/oa/ObjectAdapterBase.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/oa/ObjectAdapterFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/DataCollector.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ORB.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ORBConfigurator.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ORBData.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ORBVersion.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ORBVersionFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/Operation.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/OperationFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ParserData.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ParserDataFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ParserImplBase.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ParserImplTableBase.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/PropertyParser.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/StringPair.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/closure/Closure.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/closure/ClosureFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/Action.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/ActionBase.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/FSM.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/FSMImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/FSMTest.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/Guard.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/GuardBase.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/Input.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/InputImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/State.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/StateEngine.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/StateEngineFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/fsm/StateImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandler.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/proxy/DelegateInvocationHandlerImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/proxy/InvocationHandlerFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/proxy/LinkedInvocationHandler.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/threadpool/NoSuchThreadPoolException.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/threadpool/NoSuchWorkQueueException.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/threadpool/ThreadPool.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolChooser.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/threadpool/ThreadPoolManager.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/threadpool/Work.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orbutil/threadpool/WorkQueue.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/presentation/rmi/DynamicMethodMarshaller.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/presentation/rmi/DynamicStub.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/presentation/rmi/IDLNameTranslator.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/presentation/rmi/PresentationDefaults.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/presentation/rmi/PresentationManager.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/presentation/rmi/StubAdapter.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/presentation/rmi/StubWrapper.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/ClientDelegateFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/CorbaClientDelegate.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/CorbaMessageMediator.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/CorbaProtocolHandler.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/CorbaServerRequestDispatcher.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/ForwardException.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/InitialServerRequestDispatcher.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcher.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/LocalClientRequestDispatcherFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/PIHandler.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/RequestDispatcherDefault.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/protocol/RequestDispatcherRegistry.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/resolver/LocalResolver.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/resolver/Resolver.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/resolver/ResolverDefault.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/CodeSetServiceContext.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/MaxStreamFormatVersionServiceContext.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/ORBVersionServiceContext.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/SendingContextServiceContext.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/ServiceContext.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/ServiceContextData.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/ServiceContextRegistry.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/ServiceContexts.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/UEInfoServiceContext.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/servicecontext/UnknownServiceContext.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaAcceptor.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaConnection.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaConnectionCache.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaContactInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaContactInfoList.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaContactInfoListFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaContactInfoListIterator.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaResponseWaitingRoom.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/CorbaTransportManager.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/IIOPPrimaryToContactInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/IORToSocketInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/IORTransformer.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/ORBSocketFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/ReadTimeouts.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/ReadTimeoutsFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/SocketInfo.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/SocketOrChannelAcceptor.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/transport/TransportDefault.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/AESCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/AESConstants.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/AESCrypt.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/AESKeyGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/AESParameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/AESWrapCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/ARCFOURCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/BlockCipherParamsCore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/BlowfishCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/BlowfishConstants.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/BlowfishCrypt.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/BlowfishKeyGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/BlowfishParameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/CipherBlockChaining.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/CipherCore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/CipherFeedback.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/CipherTextStealing.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/CipherWithWrappingSpi.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/ConstructKeys.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/CounterMode.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESConstants.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESCrypt.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESKey.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESKeyFactory.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESKeyGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESParameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESedeCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESedeCrypt.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESedeKey.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESedeKeyFactory.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESedeKeyGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESedeParameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DESedeWrapCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DHKeyAgreement.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DHKeyFactory.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DHKeyPairGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DHParameterGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DHParameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DHPrivateKey.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/DHPublicKey.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/ElectronicCodeBook.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/EncryptedPrivateKeyInfo.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/FeedbackCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/HmacCore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/HmacMD5.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/HmacMD5KeyGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/HmacPKCS12PBESHA1.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/HmacSHA1.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/HmacSHA1KeyGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/ISO10126Padding.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/JarVerifier.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/JceKeyStore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/KeyGeneratorCore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/KeyProtector.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/OAEPParameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/OutputFeedback.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBECipherCore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBEKey.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBEKeyFactory.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBEParameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBEWithMD5AndDESCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBEWithMD5AndTripleDESCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBKDF2HmacSHA1Factory.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PBKDF2KeyImpl.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PCBC.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PKCS12PBECipherCore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PKCS5Padding.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/Padding.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/PrivateKeyInfo.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/RC2Cipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/RC2Crypt.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/RC2Parameters.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/RSACipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/SslMacCore.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/SunJCE.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/SymmetricCipher.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/TlsKeyMaterialGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/TlsMasterSecretGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/TlsPrfGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java classlib6/core/src/openjdk/com/com/sun/crypto/provider/ai.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/BogusColorSpace.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/I18N.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/I18NImpl.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/ImageUtil.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/InputStreamAdapter.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/StandardMetadataFormat.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/StandardMetadataFormatResources.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/common/SubImageInputStream.java classlib6/core/src/openjdk/com/com/sun/imageio/spi/FileImageInputStreamSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/spi/FileImageOutputStreamSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/spi/InputStreamImageInputStreamSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/spi/OutputStreamImageOutputStreamSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/spi/RAFImageInputStreamSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/spi/RAFImageOutputStreamSpi.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/indicim/DevanagariInputMethodDescriptor.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/indicim/DevanagariTables.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/indicim/IndicInputMethod.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/indicim/IndicInputMethodImpl.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/thaiim/ThaiInputMethod.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/thaiim/ThaiInputMethodDescriptor.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/thaiim/ThaiInputMethodImpl.java classlib6/core/src/openjdk/com/com/sun/inputmethods/internal/thaiim/ThaiRules.java classlib6/core/src/openjdk/com/com/sun/java_cup/internal/runtime/Scanner.java classlib6/core/src/openjdk/com/com/sun/java_cup/internal/runtime/Symbol.java classlib6/core/src/openjdk/com/com/sun/java_cup/internal/runtime/lr_parser.java classlib6/core/src/openjdk/com/com/sun/java_cup/internal/runtime/virtual_parse_stack.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/protocol/iiop/ClientProvider.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/protocol/iiop/ServerProvider.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/protocol/rmi/ClientProvider.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/protocol/rmi/ServerProvider.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/util/CacheMap.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/util/ClassLoaderWithRepository.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/util/ClassLogger.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/util/EnvHelp.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/util/OrderClassLoaders.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/CNBindingEnumeration.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/CNCtx.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/CNCtxFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/CNNameParser.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/CorbanameUrl.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/ExceptionMapper.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/IiopUrl.java classlib6/core/src/openjdk/com/com/sun/jndi/cosnaming/RemoteToCorba.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsClient.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsContext.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsContextFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsName.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsNameParser.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsUrl.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/Header.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/NameNode.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/Resolver.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/ResourceRecord.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/ResourceRecords.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/ZoneNode.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/ConnectionDesc.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/Connections.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/ConnectionsRef.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/ConnectionsWeakRef.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/Pool.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/PoolCallback.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/PoolCleaner.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/PooledConnection.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/pool/PooledConnectionFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/sasl/DefaultCallbackHandler.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/sasl/LdapSasl.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/sasl/SaslInputStream.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/sasl/SaslOutputStream.java classlib6/core/src/openjdk/com/com/sun/jndi/rmi/registry/ReferenceWrapper.java classlib6/core/src/openjdk/com/com/sun/jndi/rmi/registry/RegistryContext.java classlib6/core/src/openjdk/com/com/sun/jndi/rmi/registry/RegistryContextFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/rmi/registry/RemoteReference.java Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/broker/Broker.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/broker/Broker.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/broker/Broker.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.broker; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/InputObject.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/InputObject.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/InputObject.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.encoding; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/OutputObject.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/OutputObject.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/encoding/OutputObject.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.encoding; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientDelegate.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientDelegate.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientDelegate.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.protocol; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientInvocationInfo.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.protocol; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ClientRequestDispatcher.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.protocol; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/MessageMediator.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/MessageMediator.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/MessageMediator.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.protocol; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ProtocolHandler.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ProtocolHandler.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ProtocolHandler.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.protocol; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/protocol/ServerRequestDispatcher.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.protocol; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Acceptor.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Acceptor.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Acceptor.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ByteBufferPool.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ByteBufferPool.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ByteBufferPool.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Connection.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Connection.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/Connection.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ConnectionCache.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ConnectionCache.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ConnectionCache.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfo.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfo.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfo.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2001-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2001, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoList.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoList.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoList.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoListIterator.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoListIterator.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ContactInfoListIterator.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/EventHandler.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/EventHandler.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/EventHandler.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/InboundConnectionCache.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/InboundConnectionCache.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/InboundConnectionCache.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.corba.se.pept.transport; Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ListenerThread.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ListenerThread.java 2011-01-04 12:49:53 UTC (rev 5779) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/pept/transport/ListenerThread.java 2011-01-04 17:04:46 UTC (rev 5780) @@ -1,12 +1,12 @@ /* - * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * by Oracle in the LICENSE file that accomp... [truncated message content] |
From: <ls...@us...> - 2011-02-28 20:05:27
|
Revision: 5789 http://jnode.svn.sourceforge.net/jnode/?rev=5789&view=rev Author: lsantha Date: 2011-02-28 20:05:14 +0000 (Mon, 28 Feb 2011) Log Message: ----------- Integrating OpenJDK 6 b21. Modified Paths: -------------- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_de.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_es.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_fr.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_it.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_ja.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_ko.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_sv.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_CN.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties classlib6/core/src/openjdk/com/com/sun/corba/se/impl/presentation/rmi/ExceptionHandlerImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/impl/transport/SocketOrChannelAcceptorImpl.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/OperationFactory.java classlib6/core/src/openjdk/com/com/sun/corba/se/spi/orb/ParserImplBase.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPConstants.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageReader.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageReaderSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageWriter.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPImageWriterSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPMetadata.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPMetadataFormat.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/bmp/BMPMetadataFormatResources.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageMetadata.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageMetadataFormat.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageMetadataFormatResources.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageReader.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageReaderSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFImageWriterSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFStreamMetadata.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFStreamMetadataFormat.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/gif/GIFStreamMetadataFormatResources.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageReader.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageReaderSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageWriter.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGImageWriterSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGMetadata.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGMetadataFormat.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/PNGMetadataFormatResources.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/png/RowFilter.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageReader.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageReaderSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageWriter.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPImageWriterSpi.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPMetadata.java classlib6/core/src/openjdk/com/com/sun/imageio/plugins/wbmp/WBMPMetadataFormat.java classlib6/core/src/openjdk/com/com/sun/imageio/stream/StreamCloser.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifBorders.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifButtonListener.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifButtonUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifCheckBoxMenuItemUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifCheckBoxUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifComboBoxUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifDesktopIconUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifDesktopPaneUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifEditorPaneUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifFileChooserUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifIconFactory.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifInternalFrameUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifLabelUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuBarUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuItemUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuMouseListener.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuMouseMotionListener.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifMenuUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifOptionPaneUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifPasswordFieldUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifPopupMenuSeparatorUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifPopupMenuUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifProgressBarUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifRadioButtonMenuItemUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifRadioButtonUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifScrollBarButton.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifScrollBarUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSeparatorUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSliderUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSplitPaneDivider.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifSplitPaneUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTabbedPaneUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextAreaUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextFieldUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextPaneUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTextUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifToggleButtonUI.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTreeCellRenderer.java classlib6/core/src/openjdk/com/com/sun/java/swing/plaf/motif/MotifTreeUI.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ArrayQueue.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ClientCommunicatorAdmin.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ClientListenerInfo.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ClientNotifForwarder.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/NotificationBuffer.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/NotificationBufferFilter.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ProxyInputStream.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ProxyRef.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/RMIExporter.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/ServerNotifForwarder.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/Unmarshal.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/internal/package.html classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/FileLoginModule.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/JMXSubjectDomainCombiner.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/MBeanServerAccessController.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/MBeanServerFileAccessController.java classlib6/core/src/openjdk/com/com/sun/jmx/remote/security/SubjectDelegator.java classlib6/core/src/openjdk/com/com/sun/jndi/dns/DnsContextFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BasicControl.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Ber.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BerDecoder.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BerEncoder.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/BindingWithControls.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ClientId.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Connection.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/DefaultResponseControlFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/DigestClientId.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/EntryChangeResponseControl.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/EventQueue.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/EventSupport.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Filter.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapAttribute.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapBindingEnumeration.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapClient.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapClientFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapCtx.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapCtxFactory.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapEntry.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapName.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapNameParser.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapNamingEnumeration.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapPoolManager.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapReferralContext.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapReferralException.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapRequest.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapResult.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapSchemaCtx.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapSchemaParser.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapSearchEnumeration.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/LdapURL.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ManageReferralControl.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/NameClassPairWithControls.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/NamingEventNotifier.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/NotifierArgs.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/Obj.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/PersistentSearchControl.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ReferralEnumeration.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/SearchResultWithControls.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/ServiceLocator.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/SimpleClientId.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/UnsolicitedResponseImpl.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/VersionHelper.java classlib6/core/src/openjdk/com/com/sun/jndi/ldap/VersionHelper12.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/lib/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xslt/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/TransletException.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/cmdline/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/QName.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/Step.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/AttrImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/DocumentImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/NodeListCache.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/dom/ParentNode.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/Constants.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/PropertyManager.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLScanner.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/validation/ValidationState.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/DOMParser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/SAXParser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/parsers/XMLParser.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/util/SymbolTable.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/xni/QName.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/dtm/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/dtm/ref/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/resolver/Catalog.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/resolver/helpers/FileURL.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/security/algorithms/implementations/IntegrityHmac.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/CharInfo.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/EncodingInfo.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/Encodings.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/Encodings.properties classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/NamespaceMappings.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/serializer/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/utils/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/axes/NodeSequence.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/compiler/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/functions/ObjectFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XBoolean.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XNodeSet.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XNumber.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XObject.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/objects/XRTreeFrag.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java classlib6/core/src/openjdk/com/com/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_de.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_es.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_fr.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_it.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_ja.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_ko.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_sv.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_zh_CN.properties classlib6/core/src/openjdk/com/com/sun/rowset/RowSetResourceBundle_zh_TW.properties classlib6/core/src/openjdk/com/com/sun/rowset/internal/BaseRow.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/CachedRowSetReader.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/CachedRowSetWriter.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/InsertRow.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/Row.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/SyncResolverImpl.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/WebRowSetXmlReader.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/WebRowSetXmlWriter.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/XmlErrorHandler.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/XmlReaderContentHandler.java classlib6/core/src/openjdk/com/com/sun/rowset/internal/XmlResolver.java classlib6/core/src/openjdk/com/com/sun/security/sasl/util/AbstractSaslImpl.java classlib6/core/src/openjdk/com/com/sun/security/sasl/util/PolicyUtils.java classlib6/core/src/openjdk/com/com/sun/tools/corba/se/idl/constExpr/Expression.java Added Paths: ----------- classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java Removed Paths: ------------- classlib6/core/src/openjdk/com/com/sun/corba/se/internal/io/ classlib6/core/src/openjdk/com/com/sun/jmx/remote/util/Service.java classlib6/core/src/openjdk/com/com/sun/org/apache/regexp/internal/REDemo.java classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/client/ classlib6/core/src/openjdk/com/com/sun/org/apache/xalan/internal/xsltc/runtime/AttributeList.java Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java 2011-02-26 21:36:44 UTC (rev 5788) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/IIOPInputStream.java 2011-02-28 20:05:14 UTC (rev 5789) @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -2553,8 +2553,8 @@ bridge.putObject( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetObjectField( e, fieldName, - ObjectUtility.compactObjectToString( o ), - ObjectUtility.compactObjectToString( v )) ; + o.toString(), + v.toString() ) ; } } @@ -2566,7 +2566,7 @@ bridge.putBoolean( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetBooleanField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Boolean(v) ) ; } } @@ -2579,7 +2579,7 @@ bridge.putByte( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetByteField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Byte(v) ) ; } } @@ -2592,7 +2592,7 @@ bridge.putChar( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetCharField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Character(v) ) ; } } @@ -2605,7 +2605,7 @@ bridge.putShort( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetShortField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Short(v) ) ; } } @@ -2618,7 +2618,7 @@ bridge.putInt( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetIntField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Integer(v) ) ; } } @@ -2631,7 +2631,7 @@ bridge.putLong( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetLongField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Long(v) ) ; } } @@ -2644,7 +2644,7 @@ bridge.putFloat( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetFloatField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Float(v) ) ; } } @@ -2657,7 +2657,7 @@ bridge.putDouble( o, key, v ) ; } catch (Exception e) { throw utilWrapper.errorSetDoubleField( e, fieldName, - ObjectUtility.compactObjectToString( o ), + o.toString(), new Double(v) ) ; } } Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2011-02-26 21:36:44 UTC (rev 5788) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/io/ValueHandlerImpl.java 2011-02-28 20:05:14 UTC (rev 5789) @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -32,32 +32,22 @@ package com.sun.corba.se.impl.io; import javax.rmi.CORBA.Util; -import javax.rmi.PortableRemoteObject; import java.util.Hashtable; -import java.util.Stack; import java.io.IOException; -import java.util.EmptyStackException; -import com.sun.corba.se.impl.util.Utility; -import com.sun.corba.se.impl.io.IIOPInputStream; -import com.sun.corba.se.impl.io.IIOPOutputStream; import com.sun.corba.se.impl.util.RepositoryId; import com.sun.corba.se.impl.util.Utility; import org.omg.CORBA.TCKind; -import org.omg.CORBA.MARSHAL; -import org.omg.CORBA.BAD_PARAM; -import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.portable.IndirectionException; import com.sun.org.omg.SendingContext.CodeBase; import com.sun.org.omg.SendingContext.CodeBaseHelper; import java.security.AccessController; import java.security.PrivilegedAction; - -import com.sun.corba.se.impl.io.IIOPInputStream.ActiveRecursionManager; +import java.security.PrivilegedExceptionAction; import com.sun.corba.se.spi.logging.CORBALogDomains; import com.sun.corba.se.impl.logging.OMGSystemException; @@ -809,46 +799,149 @@ return "com.sun.corba.se.impl.io.IIOPOutputStream"; } - private com.sun.corba.se.impl.io.IIOPOutputStream createOutputStream() { - return (com.sun.corba.se.impl.io.IIOPOutputStream)AccessController.doPrivileged( - new StreamFactory(getOutputStreamClassName())); + private IIOPOutputStream createOutputStream() { + final String name = getOutputStreamClassName(); + try { + IIOPOutputStream stream = createOutputStreamBuiltIn(name); + if (stream != null) { + return stream; + } + return createCustom(IIOPOutputStream.class, name); + } catch (Throwable t) { + // Throw exception under the carpet. + InternalError ie = new InternalError( + "Error loading " + name + ); + ie.initCause(t); + throw ie; + } } + /** + * Construct a built in implementation with priveleges. + * Returning null indicates a non-built is specified. + */ + private IIOPOutputStream createOutputStreamBuiltIn( + final String name + ) throws Throwable { + try { + return AccessController.doPrivileged( + new PrivilegedExceptionAction<IIOPOutputStream>() { + public IIOPOutputStream run() throws IOException { + return createOutputStreamBuiltInNoPriv(name); + } + } + ); + } catch (java.security.PrivilegedActionException exc) { + throw exc.getCause(); + } + } + + /** + * Returning null indicates a non-built is specified. + */ + private IIOPOutputStream createOutputStreamBuiltInNoPriv( + final String name + ) throws IOException { + return + name.equals( + IIOPOutputStream + .class.getName() + ) ? + new IIOPOutputStream() : + + name.equals( + com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3 + .class.getName() + ) ? + new com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3() : + + name.equals( + com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3_1 + .class.getName() + ) ? + new com.sun.corba.se.impl.orbutil.IIOPOutputStream_1_3_1() : + + null; + } + protected String getInputStreamClassName() { return "com.sun.corba.se.impl.io.IIOPInputStream"; } - private com.sun.corba.se.impl.io.IIOPInputStream createInputStream() { - return (com.sun.corba.se.impl.io.IIOPInputStream)AccessController.doPrivileged( - new StreamFactory(getInputStreamClassName())); + private IIOPInputStream createInputStream() { + final String name = getInputStreamClassName(); + try { + IIOPInputStream stream = createInputStreamBuiltIn(name); + if (stream != null) { + return stream; + } + return createCustom(IIOPInputStream.class, name); + } catch (Throwable t) { + // Throw exception under the carpet. + InternalError ie = new InternalError( + "Error loading " + name + ); + ie.initCause(t); + throw ie; + } } /** - * Instantiates a class of the given name using the system ClassLoader - * as part of a PrivilegedAction. - * - * It's private final so hopefully people can't grab it outside of - * this class. - * - * If you're worried that someone could subclass ValueHandlerImpl, - * install his own streams, and snoop what's on the wire: - * Someone can do that only if he's allowed to use the feature - * of installing his own javax.rmi.CORBA.Util delegate (via a - * JVM property or orb.properties file, read the first time the - * Util class is used). If he can do that, he can snoop - * anything on the wire, anyway, without abusing the - * StreamFactory class. + * Construct a built in implementation with priveleges. + * Returning null indicates a non-built is specified. */ - private static final class StreamFactory implements PrivilegedAction { - private String className; + private IIOPInputStream createInputStreamBuiltIn( + final String name + ) throws Throwable { + try { + return AccessController.doPrivileged( + new PrivilegedExceptionAction<IIOPInputStream>() { + public IIOPInputStream run() throws IOException { + return createInputStreamBuiltInNoPriv(name); + } + } + ); + } catch (java.security.PrivilegedActionException exc) { + throw exc.getCause(); + } + } + + /** + * Returning null indicates a non-built is specified. + */ + private IIOPInputStream createInputStreamBuiltInNoPriv( + final String name + ) throws IOException { + return + name.equals( + IIOPInputStream + .class.getName() + ) ? + new IIOPInputStream() : + + name.equals( + com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3 + .class.getName() + ) ? + new com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3() : + + name.equals( + com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3_1 + .class.getName() + ) ? + new com.sun.corba.se.impl.orbutil.IIOPInputStream_1_3_1() : - public StreamFactory (String _className) { - className = _className; + null; } - public Object run() { - try { - // Note: We must use the system ClassLoader here + /** + * Create a custom implementation without privileges. + */ + private <T> T createCustom( + final Class<T> type, final String className + ) throws Throwable { + // Note: We use the thread context or system ClassLoader here // since we want to load classes outside of the // core JDK when running J2EE Pure ORB and // talking to Kestrel. @@ -856,18 +949,13 @@ if (cl == null) cl = ClassLoader.getSystemClassLoader(); - Class streamClass = cl.loadClass(className); + Class<?> clazz = cl.loadClass(className); + Class<? extends T> streamClass = clazz.asSubclass(type); // Since the ClassLoader should cache the class, this isn't // as expensive as it looks. return streamClass.newInstance(); - } catch(Throwable t) { - InternalError ie = new InternalError( "Error loading " + className ) ; - ie.initCause( t ) ; - throw ie ; - } - } } /** Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java 2011-02-26 21:36:44 UTC (rev 5788) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orb/PrefixParserAction.java 2011-02-28 20:05:14 UTC (rev 5789) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -110,7 +110,7 @@ throw wrapper.couldNotSetArray( thr, getPropertyName(), new Integer(ctr), componentType, new Integer(size), - ObjectUtility.compactObjectToString( obj )) ; + obj.toString() ) ; } ctr++ ; } Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java 2011-02-26 21:36:44 UTC (rev 5788) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/CorbaResourceUtil.java 2011-02-28 20:05:14 UTC (rev 5789) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 Modified: classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java 2011-02-26 21:36:44 UTC (rev 5788) +++ classlib6/core/src/openjdk/com/com/sun/corba/se/impl/orbutil/ObjectUtility.java 2011-02-28 20:05:14 UTC (rev 5789) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -50,104 +50,9 @@ import java.math.BigDecimal ; public final class ObjectUtility { - private boolean useToString ; - private boolean isIndenting ; - private int initialLevel ; - private int increment ; - private ClassMap classToPrinter = new ClassMap() ; + private ObjectUtility() {} - private static ObjectUtility standard = new ObjectUtility( false, true, - 0, 4 ) ; - private static ObjectUtility compact = new ObjectUtility( true, false, - 0, 4 ) ; - private ObjectUtility( boolean useToString, boolean isIndenting, - int initialLevel, int increment ) - { - this.useToString = useToString ; - this.isIndenting = isIndenting ; - this.initialLevel = initialLevel ; - this.increment = increment ; - classToPrinter.put( Properties.class, propertiesPrinter ) ; - classToPrinter.put( Collection.class, collectionPrinter ) ; - classToPrinter.put( Map.class, mapPrinter ) ; - } - - /** Construct an Utility instance with the desired objectToString - * behavior. - */ - public static ObjectUtility make( boolean useToString, boolean isIndenting, - int initialLevel, int increment ) - { - return new ObjectUtility( useToString, isIndenting, initialLevel, - increment ) ; - } - - /** Construct an Utility instance with the desired objectToString - * behavior. - */ - public static ObjectUtility make( boolean useToString, boolean isIndenting ) - { - return new ObjectUtility( useToString, isIndenting, 0, 4 ) ; - } - - /** Get the standard Utility object that supports objectToString with - * indented display and no use of toString() methods. - */ - public static ObjectUtility make() - { - return standard ; - } - - /** A convenience method that gives the default behavior: use indenting - * to display the object's structure and do not use built-in toString - * methods. - */ - public static String defaultObjectToString( java.lang.Object object ) - { - return standard.objectToString( object ) ; - } - - public static String compactObjectToString( java.lang.Object object ) - { - return compact.objectToString( object ) ; - } - - /** objectToString handles display of arbitrary objects. It correctly - * handles objects whose elements form an arbitrary graph. It uses - * reflection to display the contents of any kind of object. - * An object's toString() method may optionally be used, but the default - * is to ignore all toString() methods except for those defined for - * primitive types, primitive type wrappers, and strings. - */ - public String objectToString(java.lang.Object obj) - { - IdentityHashMap printed = new IdentityHashMap() ; - ObjectWriter result = ObjectWriter.make( isIndenting, initialLevel, - increment ) ; - objectToStringHelper( printed, result, obj ) ; - return result.toString() ; - } - - // Perform a deep structural equality comparison of the two objects. - // This handles all arrays, maps, and sets specially, otherwise - // it just calls the object's equals() method. - public static boolean equals( java.lang.Object obj1, java.lang.Object obj2 ) - { - // Set of pairs of objects that have been (or are being) considered for - // equality. Such pairs are presumed to be equals. If they are not, - // this will be detected eventually and the equals method will return - // false. - Set considered = new HashSet() ; - - // Map that gives the corresponding component of obj2 for a component - // of obj1. This is used to check for the same aliasing and use of - // equal objects in both objects. - Map counterpart = new IdentityHashMap() ; - - return equalsHelper( counterpart, considered, obj1, obj2 ) ; - } - /** If arr1 and arr2 are both arrays of the same component type, * return an array of that component type that consists of the * elements of arr1 followed by the elements of arr2. @@ -179,544 +84,4 @@ return result ; } -//=========================================================================== -// Implementation -//=========================================================================== - - private void objectToStringHelper( IdentityHashMap printed, - ObjectWriter result, java.lang.Object obj) - { - if (obj==null) { - result.append( "null" ) ; - result.endElement() ; - } else { - Class cls = obj.getClass() ; - result.startObject( obj ) ; - - if (printed.keySet().contains( obj )) { - result.endObject( "*VISITED*" ) ; - } else { - printed.put( obj, null ) ; - - if (mustUseToString(cls)) { - result.endObject( obj.toString() ) ; - } else { - // First, handle any classes that have special printer - // methods defined. This is useful when the class - // overrides toString with something that - // is not sufficiently detailed. - ObjectPrinter printer = (ObjectPrinter)(classToPrinter.get( - cls )) ; - if (printer != null) { - printer.print( printed, result, obj ) ; - result.endObject() ; - } else { - Class compClass = cls.getComponentType() ; - - if (compClass == null) - // handleObject always calls endObject - handleObject( printed, result, obj ) ; - else { - handleArray( printed, result, obj ) ; - result.endObject() ; - } - } - } - } - } - } - - private static interface ObjectPrinter { - void print( IdentityHashMap printed, ObjectWriter buff, - java.lang.Object obj ) ; - } - - private ObjectPrinter propertiesPrinter = new ObjectPrinter() { - public void print( IdentityHashMap printed, ObjectWriter buff, - java.lang.Object obj ) - { - if (!(obj instanceof Properties)) - throw new Error() ; - - Properties props = (Properties)obj ; - Enumeration keys = props.propertyNames() ; - while (keys.hasMoreElements()) { - String key = (String)(keys.nextElement()) ; - String value = props.getProperty( key ) ; - buff.startElement() ; - buff.append( key ) ; - buff.append( "=" ) ; - buff.append( value ) ; - buff.endElement() ; - } - } - } ; - - private ObjectPrinter collectionPrinter = new ObjectPrinter() { - public void print( IdentityHashMap printed, ObjectWriter buff, - java.lang.Object obj ) - { - if (!(obj instanceof Collection)) - throw new Error() ; - - Collection coll = (Collection)obj ; - Iterator iter = coll.iterator() ; - while (iter.hasNext()) { - java.lang.Object element = iter.next() ; - buff.startElement() ; - objectToStringHelper( printed, buff, element ) ; - buff.endElement() ; - } - } - } ; - - private ObjectPrinter mapPrinter = new ObjectPrinter() { - public void print( IdentityHashMap printed, ObjectWriter buff, - java.lang.Object obj ) - { - if (!(obj instanceof Map)) - throw new Error() ; - - Map map = (Map)obj ; - Iterator iter = map.entrySet().iterator() ; - while (iter.hasNext()) { - Entry entry = (Entry)(iter.next()) ; - buff.startElement() ; - objectToStringHelper( printed, buff, entry.getKey() ) ; - buff.append( "=>" ) ; - objectToStringHelper( printed, buff, entry.getValue() ) ; - buff.endElement() ; - } - } - } ; - - private static class ClassMap { - ArrayList data ; - - public ClassMap() - { - data = new ArrayList() ; - } - - /** Return the first element of the ClassMap that is assignable to cls. - * The order is determined by the order in which the put method was - * called. Returns null if there is no match. - */ - public java.lang.Object get( Class cls ) - { - Iterator iter = data.iterator() ; - while (iter.hasNext()) { - java.lang.Object[] arr = (java.lang.Object[])(iter.next()) ; - Class key = (Class)(arr[0]) ; - if (key.isAssignableFrom( cls )) - return arr[1] ; - } - - return null ; - } - - /** Add obj to the map with key cls. Note that order matters, - * as the first match is returned. - */ - public void put( Class cls, java.lang.Object obj ) - { - java.lang.Object[] pair = { cls, obj } ; - data.add( pair ) ; - } - } - - private boolean mustUseToString( Class cls ) - { - // These probably never occur - if (cls.isPrimitive()) - return true ; - - // We must use toString for all primitive wrappers, since - // otherwise the code recurses endlessly (access value field - // inside Integer, returns another Integer through reflection). - if ((cls == Integer.class) || - (cls == BigInteger.class) || - (cls == BigDecimal.class) || - (cls == String.class) || - (cls == StringBuffer.class) || - (cls == Long.class) || - (cls == Short.class) || - (cls == Byte.class) || - (cls == Character.class) || - (cls == Float.class) || - (cls == Double.class) || - (cls == Boolean.class)) - return true ; - - if (useToString) { - try { - cls.getDeclaredMethod( "toString", (Class[])null ) ; - return true ; - } catch (Exception exc) { - return false ; - } - } - - return false ; - } - - private void handleObject( IdentityHashMap printed, ObjectWriter result, - java.lang.Object obj ) - { - Class cls = obj.getClass() ; - - try { - Field[] fields; - SecurityManager security = System.getSecurityManager(); - if (security != null && !Modifier.isPublic(cls.getModifiers())) { - fields = new Field[0]; - } else { - fields = cls.getDeclaredFields(); - } - - for (int ctr=0; ctr<fields.length; ctr++ ) { - final Field fld = fields[ctr] ; - int modifiers = fld.getModifiers() ; - - // Do not display field if it is static, since these fields - // are always the same for every instances. This could - // be made configurable, but I don't think it is - // useful to do so. - if (!Modifier.isStatic( modifiers )) { - if (security != null) { - if (!Modifier.isPublic(modifiers)) - continue; - } - result.startElement() ; - result.append( fld.getName() ) ; - result.append( ":" ) ; - - try { - // Make sure that we can read the field if it is - // not public - AccessController.doPrivileged( new PrivilegedAction() { - public Object run() { - fld.setAccessible( true ) ; - return null ; - } - } ) ; - - java.lang.Object value = fld.get( obj ) ; - objectToStringHelper( printed, result, value ) ; - } catch (Exception exc2) { - result.append( "???" ) ; - } - - result.endElement() ; - } - } - - result.endObject() ; - } catch (Exception exc2) { - result.endObject( obj.toString() ) ; - } - } - - private void handleArray( IdentityHashMap printed, ObjectWriter result, - java.lang.Object obj ) - { - Class compClass = obj.getClass().getComponentType() ; - if (compClass == boolean.class) { - boolean[] arr = (boolean[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else if (compClass == byte.class) { - byte[] arr = (byte[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else if (compClass == short.class) { - short[] arr = (short[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else if (compClass == int.class) { - int[] arr = (int[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else if (compClass == long.class) { - long[] arr = (long[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else if (compClass == char.class) { - char[] arr = (char[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else if (compClass == float.class) { - float[] arr = (float[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else if (compClass == double.class) { - double[] arr = (double[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - result.append( arr[ctr] ) ; - result.endElement() ; - } - } else { // array of object - java.lang.Object[] arr = (java.lang.Object[])obj ; - for (int ctr=0; ctr<arr.length; ctr++) { - result.startElement() ; - objectToStringHelper( printed, result, arr[ctr] ) ; - result.endElement() ; - } - } - } - - private static class Pair - { - private java.lang.Object obj1 ; - private java.lang.Object obj2 ; - - Pair( java.lang.Object obj1, java.lang.Object obj2 ) - { - this.obj1 = obj1 ; - this.obj2 = obj2 ; - } - - public boolean equals( java.lang.Object obj ) - { - if (!(obj instanceof Pair)) - return false ; - - Pair other = (Pair)obj ; - return other.obj1 == obj1 && other.obj2 == obj2 ; - } - - public int hashCode() - { - return System.identityHashCode( obj1 ) ^ - System.identityHashCode( obj2 ) ; - } - } - - private static boolean equalsHelper( Map counterpart, Set considered, - java.lang.Object obj1, java.lang.Object obj2 ) - { - if ((obj1 == null) || (obj2 == null)) - return obj1 == obj2 ; - - java.lang.Object other2 = counterpart.get( obj1 ) ; - if (other2 == null) { - other2 = obj2 ; - counterpart.put( obj1, other2 ) ; - } - - if (obj1 == other2) - return true ; - - if (obj2 != other2) - return false ; - - Pair pair = new Pair( obj1, obj2 ) ; - if (considered.contains( pair )) - return true ; - else - considered.add( pair ) ; - - if (obj1 instanceof java.lang.Object... [truncated message content] |
From: <ls...@us...> - 2011-03-05 11:01:21
|
Revision: 5796 http://jnode.svn.sourceforge.net/jnode/?rev=5796&view=rev Author: lsantha Date: 2011-03-05 11:01:11 +0000 (Sat, 05 Mar 2011) Log Message: ----------- Integrating OpenJDK 6 b22. Modified Paths: -------------- classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/security/transforms/Transform.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/AbstractLauncher.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayReferenceImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/BaseLineInfo.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassLoaderReferenceImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassObjectReferenceImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/CommandSender.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConcreteMethodImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConnectorImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/EventQueueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/EventRequestManagerImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/EventSetImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/FieldImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/FloatTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/FloatValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/GenericAttachingConnector.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/GenericListeningConnector.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/IntegerTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/IntegerValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/InterfaceTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/InternalEventHandler.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/JDWPException.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/JNITypeParser.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/LineInfo.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/LinkedHashMap.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/LocalVariableImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/LocationImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/LockObject.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/LongTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/LongValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/MethodImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/MirrorImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/MonitorInfoImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/NonConcreteMethodImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ObjectReferenceImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ObsoleteMethodImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/Packet.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/PacketStream.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/PrimitiveTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/PrimitiveValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/RawCommandLineLauncher.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ReferenceTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/SDE.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ShortTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ShortValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/SocketAttachingConnector.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/SocketListeningConnector.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/SocketTransportService.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/StackFrameImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/StratumLineInfo.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/StringReferenceImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/SunCommandLineLauncher.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/TargetVM.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ThreadAction.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ThreadGroupReferenceImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ThreadListener.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ThreadReferenceImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/TypeComponentImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/TypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VMAction.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VMListener.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VMModifiers.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VMState.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ValueContainer.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/ValueImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VirtualMachineImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VirtualMachineManagerImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VirtualMachineManagerService.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VoidTypeImpl.java classlib6/core/src/openjdk/com/com/sun/tools/jdi/VoidValueImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/Entity.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/XMLEntityReader.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/XMLEventReaderImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/XMLInputFactoryImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/XMLOutputFactoryImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/AttributeImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/CharacterEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/CommentEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/DTDEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/DummyEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/EndDocumentEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/EndElementEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/EntityDeclarationImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/EntityReferenceEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/NamedEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/NotationDeclarationImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/ProcessingInstructionEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/StartDocumentEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/events/StartElementEvent.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/writers/XMLOutputSource.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java classlib6/core/src/openjdk/com/com/sun/xml/internal/stream/writers/XMLWriter.java Modified: classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -20,6 +20,8 @@ package com.sun.org.apache.xerces.internal.jaxp.validation; +import java.util.HashMap; + import javax.xml.validation.Schema; import javax.xml.validation.Validator; import javax.xml.validation.ValidatorHandler; @@ -33,6 +35,16 @@ abstract class AbstractXMLSchema extends Schema implements XSGrammarPoolContainer { + /** + * Map containing the initial values of features for + * validators created using this grammar pool container. + */ + private final HashMap fFeatures; + + public AbstractXMLSchema() { + fFeatures = new HashMap(); + } + /* * Schema methods */ @@ -51,4 +63,25 @@ return new ValidatorHandlerImpl(this); } + /* + * XSGrammarPoolContainer methods + */ + + /** + * Returns the initial value of a feature for validators created + * using this grammar pool container or null if the validators + * should use the default value. + */ + public final Boolean getFeature(String featureId) { + return (Boolean) fFeatures.get(featureId); + } + + /* + * Other methods + */ + + final void setFeature(String featureId, boolean state) { + fFeatures.put(featureId, state ? Boolean.TRUE : Boolean.FALSE); + } + } // AbstractXMLSchema Modified: classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -33,18 +33,11 @@ */ final class EmptyXMLSchema extends AbstractXMLSchema implements XMLGrammarPool { - private static EmptyXMLSchema EMPTY_XML_SCHEMA_INSTANCE = new EmptyXMLSchema(); - /** Zero length grammar array. */ private static final Grammar [] ZERO_LENGTH_GRAMMAR_ARRAY = new Grammar [0]; - /** Returns the one and only instance of this class. */ - public static EmptyXMLSchema getInstance() { - return EMPTY_XML_SCHEMA_INSTANCE; - } + public EmptyXMLSchema() {} - private EmptyXMLSchema() {} - /* * XMLGrammarPool methods */ Modified: classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -228,21 +228,26 @@ // Select Schema implementation based on grammar count. final int grammarCount = pool.getGrammarCount(); + AbstractXMLSchema schema = null; if (grammarCount > 1) { - return new XMLSchema(new ReadOnlyGrammarPool(pool)); + schema = new XMLSchema(new ReadOnlyGrammarPool(pool)); } else if (grammarCount == 1) { Grammar[] grammars = pool.retrieveInitialGrammarSet(XMLGrammarDescription.XML_SCHEMA); - return new SimpleXMLSchema(grammars[0]); + schema = new SimpleXMLSchema(grammars[0]); } else { - return EmptyXMLSchema.getInstance(); + schema = new EmptyXMLSchema(); } + propagateFeatures(schema); + return schema; } public Schema newSchema() throws SAXException { // Use a Schema that uses the system id as the equality source. - return new WeakReferenceXMLSchema(); + AbstractXMLSchema schema = new WeakReferenceXMLSchema(); + propagateFeatures(schema); + return schema; } public boolean getFeature(String name) @@ -372,6 +377,15 @@ } } + private void propagateFeatures(AbstractXMLSchema schema) { + schema.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, fSecurityManager != null); + String[] features = fXMLSchemaLoader.getRecognizedFeatures(); + for (int i = 0; i < features.length; ++i) { + boolean state = fXMLSchemaLoader.getFeature(features[i]); + schema.setFeature(features[i], state); + } + } + /** * Extension of XMLGrammarPoolImpl which exposes the number of * grammars stored in the grammar pool. Modified: classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -22,6 +22,8 @@ import java.util.HashMap; import java.util.Locale; +import java.util.Iterator; +import java.util.Map; import javax.xml.XMLConstants; @@ -161,6 +163,19 @@ private ValidationManager fValidationManager; // + // Configuration + // + + /** Stores initial feature values for validator reset. */ + private final HashMap fInitFeatures = new HashMap(); + + /** Stores initial property values for validator reset. */ + private final HashMap fInitProperties = new HashMap(); + + /** Stores the initial security manager. */ + private final SecurityManager fInitSecurityManager; + + // // User Objects // @@ -211,9 +226,20 @@ fErrorReporter.putMessageFormatter(XSMessageFormatter.SCHEMA_DOMAIN, new XSMessageFormatter()); // add all recognized features and properties and apply their defaults - addRecognizedParamsAndSetDefaults(fEntityManager); - addRecognizedParamsAndSetDefaults(fErrorReporter); - addRecognizedParamsAndSetDefaults(fSchemaValidator); + addRecognizedParamsAndSetDefaults(fEntityManager, grammarContainer); + addRecognizedParamsAndSetDefaults(fErrorReporter, grammarContainer); + addRecognizedParamsAndSetDefaults(fSchemaValidator, grammarContainer); + + // if the secure processing feature is set to true, add a security manager to the configuration + Boolean secureProcessing = grammarContainer.getFeature(XMLConstants.FEATURE_SECURE_PROCESSING); + if (Boolean.TRUE.equals(secureProcessing)) { + fInitSecurityManager = new SecurityManager(); + } + else { + fInitSecurityManager = null; + } + fComponents.put(SECURITY_MANAGER, fInitSecurityManager); + } /** @@ -266,7 +292,6 @@ else if (USE_GRAMMAR_POOL_ONLY.equals(featureId) && value != fUseGrammarPoolOnly) { throw new XMLConfigurationException(XMLConfigurationException.NOT_SUPPORTED, featureId); } - fConfigUpdated = true; if (XMLConstants.FEATURE_SECURE_PROCESSING.equals(featureId)) { if (_isSecureMode && !value) { throw new XMLConfigurationException(XMLConfigurationException.NOT_ALLOWED, XMLConstants.FEATURE_SECURE_PROCESSING); @@ -274,9 +299,14 @@ setProperty(SECURITY_MANAGER, value ? new SecurityManager() : null); return; } + fConfigUpdated = true; fEntityManager.setFeature(featureId, value); fErrorReporter.setFeature(featureId, value); fSchemaValidator.setFeature(featureId, value); + if (!fInitFeatures.containsKey(featureId)) { + boolean current = super.getFeature(featureId); + fInitFeatures.put(featureId, current ? Boolean.TRUE : Boolean.FALSE); + } super.setFeature(featureId, value); } @@ -336,6 +366,9 @@ fComponents.put(propertyId, value); return; } + if (!fInitProperties.containsKey(propertyId)) { + fInitProperties.put(propertyId, super.getProperty(propertyId)); + } super.setProperty(propertyId, value); } @@ -348,7 +381,7 @@ * @param component The component whose recognized features * and properties will be added to the configuration */ - public void addRecognizedParamsAndSetDefaults(XMLComponent component) { + public void addRecognizedParamsAndSetDefaults(XMLComponent component, XSGrammarPoolContainer grammarContainer) { // register component's recognized features final String[] recognizedFeatures = component.getRecognizedFeatures(); @@ -359,7 +392,7 @@ addRecognizedProperties(recognizedProperties); // set default values - setFeatureDefaults(component, recognizedFeatures); + setFeatureDefaults(component, recognizedFeatures, grammarContainer); setPropertyDefaults(component, recognizedProperties); } @@ -406,10 +439,6 @@ void restoreInitialState() { fConfigUpdated = true; - // Clear feature and property tables. - fFeatures.clear(); - fProperties.clear(); - // Remove error resolver and error handler fComponents.put(ENTITY_RESOLVER, null); fComponents.put(ERROR_HANDLER, null); @@ -418,21 +447,46 @@ setLocale(null); fComponents.put(LOCALE, null); - // Restore component defaults. - setFeatureDefaults(fEntityManager, fEntityManager.getRecognizedFeatures()); - setPropertyDefaults(fEntityManager, fEntityManager.getRecognizedProperties()); - setFeatureDefaults(fErrorReporter, fErrorReporter.getRecognizedFeatures()); - setPropertyDefaults(fErrorReporter, fErrorReporter.getRecognizedProperties()); - setFeatureDefaults(fSchemaValidator, fSchemaValidator.getRecognizedFeatures()); - setPropertyDefaults(fSchemaValidator, fSchemaValidator.getRecognizedProperties()); + // Restore initial security manager + fComponents.put(SECURITY_MANAGER, fInitSecurityManager); + + // Set the Locale back to null. + setLocale(null); + fComponents.put(LOCALE, null); + + // Reset feature and property values to their initial values + if (!fInitFeatures.isEmpty()) { + Iterator iter = fInitFeatures.entrySet().iterator(); + while (iter.hasNext()) { + Map.Entry entry = (Map.Entry) iter.next(); + String name = (String) entry.getKey(); + boolean value = ((Boolean) entry.getValue()).booleanValue(); + super.setFeature(name, value); + } + fInitFeatures.clear(); + } + if (!fInitProperties.isEmpty()) { + Iterator iter = fInitProperties.entrySet().iterator(); + while (iter.hasNext()) { + Map.Entry entry = (Map.Entry) iter.next(); + String name = (String) entry.getKey(); + Object value = entry.getValue(); + super.setProperty(name, value); + } + fInitProperties.clear(); + } } /** Sets feature defaults for the given component on this configuration. */ - private void setFeatureDefaults(final XMLComponent component, final String [] recognizedFeatures) { + private void setFeatureDefaults(final XMLComponent component, + final String [] recognizedFeatures, XSGrammarPoolContainer grammarContainer) { if (recognizedFeatures != null) { for (int i = 0; i < recognizedFeatures.length; ++i) { String featureId = recognizedFeatures[i]; - Boolean state = component.getFeatureDefault(featureId); + Boolean state = grammarContainer.getFeature(featureId); + if (state == null) { + state = component.getFeatureDefault(featureId); + } if (state != null) { // Do not overwrite values already set on the configuration. if (!fFeatures.containsKey(featureId)) { Modified: classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -48,4 +48,11 @@ */ public boolean isFullyComposed(); + /** + * Returns the initial value of a feature for validators created + * using this grammar pool container or null if the validators + * should use the default value. + */ + public Boolean getFeature(String featureId); + } Modified: classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/security/transforms/Transform.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/security/transforms/Transform.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/org/apache/xml/internal/security/transforms/Transform.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -247,6 +247,8 @@ if (!_alreadyInitialized) { _transformHash = new HashMap(10); + // make sure builtin algorithms are all registered first + com.sun.org.apache.xml.internal.security.Init.init(); _alreadyInitialized = true; } } @@ -274,19 +276,13 @@ "algorithm.alreadyRegistered", exArgs); } - ClassLoader cl = (ClassLoader) AccessController.doPrivileged( - new PrivilegedAction() { - public Object run() { - return Thread.currentThread().getContextClassLoader(); - } - }); + ClassLoader cl = Thread.currentThread().getContextClassLoader(); try { Transform._transformHash.put (algorithmURI, Class.forName(implementingClass, true, cl)); } catch (ClassNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + throw new RuntimeException(e); } } } Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/AbstractLauncher.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/AbstractLauncher.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/AbstractLauncher.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; @@ -119,7 +119,7 @@ String[] tokenArray = new String[tokenList.size()]; for (int i = 0; i < tokenList.size(); i++) { - tokenArray[i] = (String)tokenList.get(i); + tokenArray[i] = tokenList.get(i); } return tokenArray; } Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayReferenceImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayReferenceImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayReferenceImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayTypeImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayTypeImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ArrayTypeImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2001 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/BaseLineInfo.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/BaseLineInfo.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/BaseLineInfo.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved. + * 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanTypeImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanTypeImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanTypeImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanValueImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanValueImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/BooleanValueImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteTypeImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteTypeImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteTypeImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteValueImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteValueImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ByteValueImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharTypeImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharTypeImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharTypeImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharValueImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharValueImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/CharValueImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassLoaderReferenceImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassLoaderReferenceImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassLoaderReferenceImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassObjectReferenceImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassObjectReferenceImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassObjectReferenceImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1999-2000 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassTypeImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassTypeImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ClassTypeImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; @@ -95,11 +95,8 @@ } public List<ClassType> subclasses() { - List<ReferenceType> all = vm.allClasses(); List<ClassType> subs = new ArrayList<ClassType>(); - Iterator iter = all.iterator(); - while (iter.hasNext()) { - ReferenceType refType = (ReferenceType)iter.next(); + for (ReferenceType refType : vm.allClasses()) { if (refType instanceof ClassType) { ClassType clazz = (ClassType)refType; ClassType superclass = clazz.superclass(); @@ -223,7 +220,7 @@ List<? extends Value> arguments = method.validateAndPrepareArgumentsForInvoke(origArguments); - ValueImpl[] args = (ValueImpl[])arguments.toArray(new ValueImpl[0]); + ValueImpl[] args = arguments.toArray(new ValueImpl[0]); JDWP.ClassType.InvokeMethod ret; try { PacketStream stream = @@ -271,7 +268,7 @@ List<Value> arguments = method.validateAndPrepareArgumentsForInvoke( origArguments); - ValueImpl[] args = (ValueImpl[])arguments.toArray(new ValueImpl[0]); + ValueImpl[] args = arguments.toArray(new ValueImpl[0]); JDWP.ClassType.NewInstance ret = null; try { PacketStream stream = @@ -301,11 +298,8 @@ } public Method concreteMethodByName(String name, String signature) { - List methods = visibleMethods(); Method method = null; - Iterator iter = methods.iterator(); - while (iter.hasNext()) { - Method candidate = (Method)iter.next(); + for (Method candidate : visibleMethods()) { if (candidate.name().equals(name) && candidate.signature().equals(signature) && !candidate.isAbstract()) { @@ -330,9 +324,7 @@ * Avoid duplicate checking on each method by iterating through * duplicate-free allInterfaces() rather than recursing */ - Iterator iter = allInterfaces().iterator(); - while (iter.hasNext()) { - InterfaceType interfaze = (InterfaceType)iter.next(); + for (InterfaceType interfaze : allInterfaces()) { list.addAll(interfaze.methods()); } Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/CommandSender.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/CommandSender.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/CommandSender.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConcreteMethodImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConcreteMethodImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConcreteMethodImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 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 @@ -22,6 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package com.sun.tools.jdi; import com.sun.jdi.*; @@ -246,7 +247,7 @@ public byte[] bytecodes() { byte[] bytecodes = (bytecodesRef == null) ? null : - (byte[])bytecodesRef.get(); + bytecodesRef.get(); if (bytecodes == null) { try { bytecodes = JDWP.Method.Bytecodes. @@ -261,7 +262,7 @@ * to return the cached bytecodes directly; instead, we * make a clone at the cost of using more memory. */ - return (byte[])bytecodes.clone(); + return bytecodes.clone(); } int argSlotCount() throws AbsentInformationException { @@ -278,7 +279,7 @@ String stratumID = stratum.id(); SoftLocationXRefs info = (softOtherLocationXRefsRef == null) ? null : - (SoftLocationXRefs)softOtherLocationXRefsRef.get(); + softOtherLocationXRefsRef.get(); if (info != null && info.stratumID.equals(stratumID)) { return info; } @@ -347,7 +348,7 @@ private SoftLocationXRefs getBaseLocations() { SoftLocationXRefs info = (softBaseLocationXRefsRef == null) ? null : - (SoftLocationXRefs)softBaseLocationXRefsRef.get(); + softBaseLocationXRefsRef.get(); if (info != null) { return info; } Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConnectorImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConnectorImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/ConnectorImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleTypeImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleTypeImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleTypeImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 1999, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleValueImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleValueImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/DoubleValueImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. + * Please 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.jdi; Modified: classlib6/core/src/openjdk/com/com/sun/tools/jdi/EventQueueImpl.java =================================================================== --- classlib6/core/src/openjdk/com/com/sun/tools/jdi/EventQueueImpl.java 2011-02-28 21:24:15 UTC (rev 5795) +++ classlib6/core/src/openjdk/com/com/sun/tools/jdi/EventQueueImpl.java 2011-03-05 11:01:11 UTC (rev 5796) @@ -1,12 +1,12 @@ /* - * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved. + * Copyright (c) 1998, 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. Sun designates this + * published by the Free Software Foundation. Oracle designates this * particular file as subject to the "Classpath" exception as provided - * by Sun in the LICENSE file that accompanied this code. + * 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 @@ -18,9 +18,9 @@ * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, - * CA 95054 USA or visit www.sun.com if you need additional information or - * have any questions. ... [truncated message content] |