From c605d928762f62458f2216de90fe72db5bbd27e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= Date: Wed, 22 Apr 2026 21:35:13 +0200 Subject: [PATCH 1/5] Removed spaces in imports before semicolon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: David Matějček --- .../annotation/processing/FileGenerator.java | 15 +- .../ORBConfiguratorPersistentImpl.java | 24 +-- .../corba/ee/impl/activation/ServerMain.java | 12 +- .../ee/impl/activation/ServerManagerImpl.java | 24 +-- .../ee/impl/activation/ServerTableEntry.java | 2 +- .../impl/naming/pcosnaming/NameService.java | 4 +- .../internal/CosNaming/BootstrapServer.java | 8 +- .../AdapterActivatorServer.java | 8 +- .../src/test/java/corba/codeset/Client.java | 4 +- .../connectintercept_1_4/MySocketFactory.java | 4 +- .../ORBDBadServerIdHandler.java | 12 +- .../connectintercept_1_4/ServerCommon.java | 2 +- .../java/corba/folb_8_1/ClientForTiming.java | 4 +- .../corba/folb_8_1/IORInterceptorImpl.java | 2 +- .../corba/folb_8_1/IORToSocketInfoImpl.java | 4 +- .../src/test/java/corba/folb_8_1/Server.java | 2 +- .../java/corba/folb_8_1/ZeroPortServer1.java | 2 +- .../test/java/corba/framework/Compiler.java | 2 +- .../java/corba/framework/EmmaControl.java | 4 +- .../java/corba/framework/MethodEvent.java | 4 +- .../src/test/java/corba/framework/PRO.java | 4 +- .../src/test/java/corba/framework/Post.java | 10 +- .../src/test/java/corba/framework/Pre.java | 10 +- .../corba/framework/ProxyInterceptor.java | 20 +-- .../java/corba/framework/TestngRunner.java | 14 +- .../test/java/corba/framework/TimedTest.java | 6 +- .../corba/framework/TraceAccumulator.java | 6 +- .../java/corba/framework/TraceElement.java | 2 +- .../src/test/java/corba/fwddecl/Client.java | 18 +- .../test/java/corba/hcks/idlPOAServant.java | 80 ++++----- .../java/corba/iorintsockfact/Server.java | 2 +- .../iorintsockfact/ServerORBInitializer.java | 4 +- .../corba/iorintsockfact/SocketFactory.java | 4 +- .../src/test/java/corba/islocal/Client.java | 2 +- .../java/corba/multiorb/policy2Server.java | 2 +- .../test/java/corba/oneway/helloClient.java | 2 +- .../test/java/corba/oneway/helloServer.java | 2 +- .../java/corba/poamanager/HelloClient.java | 4 +- .../ObjectFactoryUsingServantManager.java | 2 +- .../test/java/corba/poatest/helloClient.java | 2 +- .../corba/preinvokepostinvoke/Interface.java | 4 +- .../corba/preinvokepostinvoke/MyServant.java | 6 +- .../src/test/java/corba/repid/Client.java | 2 +- .../corba/rmipoacounter/counterClient.java | 4 +- .../java/corba/rmipoacounter/counterIF.java | 4 +- .../java/corba/rmipoacounter/counterImpl.java | 12 +- .../java/corba/rogueclient/RogueClient.java | 2 +- .../src/test/java/corba/unarrow/Server.java | 2 +- .../CORBA/serialization/IIOPPerformance.java | 2 +- .../test/java/pi/iorinterceptor/Server.java | 6 +- .../src/test/java/rmic/HelloTest.java | 8 +- .../src/test/java/rmic/LocalStubTest.java | 2 +- .../src/test/java/rmic/ParseTest.java | 2 +- .../src/test/java/rmic/TestExecutor.java | 12 +- functional-tests/src/test/java/test/Test.java | 8 +- .../com/sun/tools/corba/ee/idl/Parser.java | 6 +- .../src/java/argparser/ArgParser.java | 28 +-- .../argparser/CompositeInvocationHandler.java | 4 +- .../CompositeInvocationHandlerImpl.java | 8 +- .../src/java/argparser/DefaultValue.java | 10 +- .../src/java/argparser/ElementParser.java | 2 +- .../src/java/argparser/ElementParserImpl.java | 18 +- .../src/java/argparser/Help.java | 10 +- .../src/java/argparser/Separator.java | 10 +- .../java/glassfish/GlassFishInstallation.java | 2 +- .../src/java/orbfailover/Main.java | 6 +- .../src/java/testtools/Base.java | 14 +- .../src/java/testtools/Post.java | 10 +- .../src/java/testtools/Pre.java | 10 +- .../src/java/testtools/Test.java | 10 +- .../ee/impl/threadpool/ThreadPoolImpl.java | 16 +- .../threadpool/ThreadPoolManagerImpl.java | 6 +- .../ee/impl/threadpool/WorkQueueImpl.java | 6 +- .../corba/ee/spi/threadpool/ThreadPool.java | 2 +- .../ee/spi/threadpool/ThreadPoolFactory.java | 2 +- .../ee/spi/threadpool/ThreadPoolManager.java | 2 +- .../spi/threadpool/ThreadStateValidator.java | 2 +- .../com/sun/corba/ee/org/omg/CORBA/ORB.java | 2 +- .../src/main/java/javax/rmi/CORBA/Stub.java | 2 +- .../src/main/java/javax/rmi/CORBA/Util.java | 2 +- .../JavaStreamORBObjectCopierImpl.java | 4 +- .../copyobject/ORBStreamObjectCopierImpl.java | 2 +- .../copyobject/ReflectObjectCopierImpl.java | 14 +- .../sun/corba/ee/impl/corba/AsynchInvoke.java | 2 +- .../sun/corba/ee/impl/corba/ContextImpl.java | 2 +- .../sun/corba/ee/impl/corba/NVListImpl.java | 2 +- .../corba/ee/impl/corba/NamedValueImpl.java | 2 +- .../sun/corba/ee/impl/corba/RequestImpl.java | 8 +- .../ee/impl/corba/ServerRequestImpl.java | 4 +- .../sun/corba/ee/impl/corba/TCUtility.java | 2 +- .../sun/corba/ee/impl/corba/TypeCodeImpl.java | 16 +- .../ee/impl/dynamicany/DynAnyBasicImpl.java | 2 +- .../impl/dynamicany/DynAnyCollectionImpl.java | 2 +- .../ee/impl/dynamicany/DynAnyComplexImpl.java | 2 +- .../dynamicany/DynAnyConstructedImpl.java | 2 +- .../ee/impl/dynamicany/DynAnyFactoryImpl.java | 2 +- .../corba/ee/impl/dynamicany/DynAnyImpl.java | 6 +- .../corba/ee/impl/dynamicany/DynAnyUtil.java | 4 +- .../ee/impl/dynamicany/DynArrayImpl.java | 2 +- .../corba/ee/impl/dynamicany/DynEnumImpl.java | 2 +- .../ee/impl/dynamicany/DynFixedImpl.java | 2 +- .../ee/impl/dynamicany/DynSequenceImpl.java | 2 +- .../ee/impl/dynamicany/DynStructImpl.java | 2 +- .../ee/impl/dynamicany/DynUnionImpl.java | 2 +- .../ee/impl/dynamicany/DynValueBoxImpl.java | 2 +- .../impl/dynamicany/DynValueCommonImpl.java | 2 +- .../ee/impl/dynamicany/DynValueImpl.java | 2 +- .../ee/impl/encoding/CDRInputObject.java | 2 +- .../ee/impl/encoding/CDROutputObject.java | 6 +- .../ee/impl/encoding/CachedCodeBase.java | 4 +- .../ee/impl/encoding/WrapperInputStream.java | 4 +- .../ee/impl/folb/GroupInfoServiceBase.java | 2 +- .../ee/impl/folb/InitialGroupInfoService.java | 30 ++-- .../ee/impl/folb/ServerGroupManager.java | 8 +- .../interceptors/ClientRequestInfoImpl.java | 4 +- .../ee/impl/interceptors/IORInfoImpl.java | 12 +- .../ee/impl/interceptors/InterceptorList.java | 2 +- .../ee/impl/interceptors/ORBInitInfoImpl.java | 2 +- .../ee/impl/interceptors/PIHandlerImpl.java | 4 +- .../impl/interceptors/PINoOpHandlerImpl.java | 4 +- .../interceptors/ServerRequestInfoImpl.java | 2 +- .../sun/corba/ee/impl/io/IIOPInputStream.java | 1 - .../ee/impl/io/ObjectStreamClassCorbaExt.java | 4 +- .../corba/ee/impl/io/ValueHandlerImpl.java | 8 +- .../sun/corba/ee/impl/io/ValueUtility.java | 2 +- .../ee/impl/ior/EncapsulationUtility.java | 18 +- .../sun/corba/ee/impl/ior/FreezableList.java | 6 +- .../ee/impl/ior/GenericIdentifiable.java | 10 +- .../ee/impl/ior/GenericTaggedComponent.java | 10 +- .../ee/impl/ior/GenericTaggedProfile.java | 16 +- .../com/sun/corba/ee/impl/ior/IORImpl.java | 36 ++-- .../corba/ee/impl/ior/IORTemplateImpl.java | 28 +-- .../ee/impl/ior/IORTemplateListImpl.java | 22 +-- .../ior/IdentifiableFactoryFinderBase.java | 16 +- .../ee/impl/ior/JIDLObjectKeyTemplate.java | 10 +- .../ee/impl/ior/NewObjectKeyTemplateBase.java | 14 +- .../ee/impl/ior/ObjectAdapterIdArray.java | 4 +- .../ee/impl/ior/ObjectAdapterIdBase.java | 6 +- .../sun/corba/ee/impl/ior/ObjectIdImpl.java | 8 +- .../ee/impl/ior/ObjectKeyFactoryImpl.java | 24 +-- .../sun/corba/ee/impl/ior/ObjectKeyImpl.java | 14 +- .../ee/impl/ior/ObjectKeyTemplateBase.java | 20 +-- .../impl/ior/ObjectReferenceFactoryImpl.java | 16 +- .../impl/ior/ObjectReferenceProducerBase.java | 14 +- .../impl/ior/ObjectReferenceTemplateImpl.java | 18 +- .../ee/impl/ior/OldJIDLObjectKeyTemplate.java | 16 +- .../ee/impl/ior/OldObjectKeyTemplateBase.java | 6 +- .../ee/impl/ior/OldPOAObjectKeyTemplate.java | 14 +- .../ee/impl/ior/POAObjectKeyTemplate.java | 12 +- .../sun/corba/ee/impl/ior/StubIORImpl.java | 18 +- .../ior/TaggedComponentFactoryFinderImpl.java | 10 +- .../ior/TaggedProfileFactoryFinderImpl.java | 6 +- ...aggedProfileTemplateFactoryFinderImpl.java | 6 +- .../ee/impl/ior/WireObjectKeyTemplate.java | 22 +-- .../AlternateIIOPAddressComponentImpl.java | 10 +- .../impl/ior/iiop/CodeSetsComponentImpl.java | 16 +- .../ee/impl/ior/iiop/IIOPAddressBase.java | 4 +- .../ee/impl/ior/iiop/IIOPAddressImpl.java | 4 +- .../ior/iiop/IIOPProfileTemplateImpl.java | 32 ++-- .../ior/iiop/JavaCodebaseComponentImpl.java | 8 +- .../ior/iiop/LoadBalancingComponentImpl.java | 2 +- .../impl/ior/iiop/ORBTypeComponentImpl.java | 8 +- .../RequestPartitioningComponentImpl.java | 2 +- .../javax/rmi/CORBA/StubDelegateImpl.java | 6 +- .../impl/javax/rmi/PortableRemoteObject.java | 2 +- .../connection/DefaultSocketFactory.java | 4 +- .../connection/SocketFactoryAcceptorImpl.java | 2 +- .../ee/impl/legacy/connection/USLPort.java | 6 +- .../corba/ee/impl/misc/ClassInfoCache.java | 34 ++-- .../sun/corba/ee/impl/misc/ORBUtility.java | 48 ++--- .../naming/cosnaming/NamingContextImpl.java | 2 +- .../ee/impl/naming/namingutil/INSURLBase.java | 2 +- .../sun/corba/ee/impl/oa/NullServantImpl.java | 4 +- .../sun/corba/ee/impl/oa/poa/AOMEntry.java | 6 +- .../corba/ee/impl/oa/poa/ActiveObjectMap.java | 12 +- .../corba/ee/impl/oa/poa/DelegateImpl.java | 4 +- .../sun/corba/ee/impl/oa/poa/POACurrent.java | 8 +- .../sun/corba/ee/impl/oa/poa/POAFactory.java | 42 ++--- .../com/sun/corba/ee/impl/oa/poa/POAImpl.java | 102 +++++------ .../corba/ee/impl/oa/poa/POAManagerImpl.java | 28 +-- .../ee/impl/oa/poa/POAPolicyMediator.java | 18 +- .../ee/impl/oa/poa/POAPolicyMediatorBase.java | 14 +- .../impl/oa/poa/POAPolicyMediatorBase_R.java | 12 +- .../oa/poa/POAPolicyMediatorImpl_NR_UDS.java | 18 +- .../oa/poa/POAPolicyMediatorImpl_NR_USM.java | 30 ++-- .../oa/poa/POAPolicyMediatorImpl_R_AOM.java | 14 +- .../oa/poa/POAPolicyMediatorImpl_R_UDS.java | 12 +- .../oa/poa/POAPolicyMediatorImpl_R_USM.java | 24 +-- .../sun/corba/ee/impl/oa/poa/Policies.java | 16 +- .../ee/impl/oa/poa/minor_code_example.txt | 4 +- .../ee/impl/oa/rfm/ReferenceFactoryImpl.java | 4 +- .../oa/rfm/ReferenceFactoryManagerImpl.java | 46 ++--- .../oa/rfm/ReferenceManagerConfigurator.java | 30 ++-- .../com/sun/corba/ee/impl/oa/toa/TOA.java | 2 +- .../sun/corba/ee/impl/oa/toa/TOAFactory.java | 20 +-- .../com/sun/corba/ee/impl/oa/toa/TOAImpl.java | 28 +-- .../impl/oa/toa/TransientObjectManager.java | 4 +- .../ee/impl/orb/AppletDataCollector.java | 4 +- .../corba/ee/impl/orb/DataCollectorBase.java | 34 ++-- .../ee/impl/orb/DataCollectorFactory.java | 8 +- .../ee/impl/orb/NormalDataCollector.java | 2 +- .../corba/ee/impl/orb/NormalParserAction.java | 4 +- .../corba/ee/impl/orb/NormalParserData.java | 6 +- .../ee/impl/orb/ORBConfiguratorImpl.java | 62 +++---- .../corba/ee/impl/orb/ORBDataParserImpl.java | 16 +- .../sun/corba/ee/impl/orb/ORBSingleton.java | 6 +- .../sun/corba/ee/impl/orb/ORBVersionImpl.java | 4 +- .../ee/impl/orb/ObjectKeyCacheEntryBase.java | 4 +- .../ee/impl/orb/ObjectKeyCacheEntryImpl.java | 4 +- ...bjectKeyCacheEntryNoObjectAdapterImpl.java | 4 +- .../sun/corba/ee/impl/orb/ParserAction.java | 2 +- .../corba/ee/impl/orb/ParserActionBase.java | 4 +- .../ee/impl/orb/ParserActionFactory.java | 2 +- .../sun/corba/ee/impl/orb/ParserDataBase.java | 4 +- .../sun/corba/ee/impl/orb/ParserTable.java | 56 +++--- .../corba/ee/impl/orb/PrefixParserAction.java | 14 +- .../corba/ee/impl/orb/PrefixParserData.java | 6 +- .../impl/orb/PropertyOnlyDataCollector.java | 2 +- .../ee/impl/osgi/loader/OSGIListener.java | 28 +-- .../plugin/hwlb/NoConnectionCacheImpl.java | 42 ++--- .../plugin/hwlb/VirtualAddressAgentImpl.java | 82 ++++----- .../rmi/DynamicMethodMarshallerImpl.java | 26 +-- .../presentation/rmi/DynamicStubImpl.java | 32 ++-- .../presentation/rmi/ExceptionHandler.java | 4 +- .../rmi/ExceptionHandlerImpl.java | 14 +- .../rmi/IDLNameTranslatorImpl.java | 6 +- .../rmi/InvocationHandlerFactoryImpl.java | 12 +- .../rmi/PresentationManagerImpl.java | 44 ++--- .../impl/presentation/rmi/ReflectiveTie.java | 14 +- .../presentation/rmi/StubConnectImpl.java | 6 +- .../presentation/rmi/StubFactoryBase.java | 4 +- .../rmi/StubFactoryDynamicBase.java | 4 +- .../rmi/StubFactoryFactoryBase.java | 2 +- .../rmi/StubFactoryFactoryDynamicBase.java | 6 +- .../rmi/StubFactoryFactoryStaticImpl.java | 4 +- .../rmi/codegen/CodegenStubBase.java | 40 ++--- .../StubFactoryFactoryCodegenImpl.java | 4 +- .../proxy/StubFactoryFactoryProxyImpl.java | 2 +- .../rmi/proxy/StubFactoryProxyImpl.java | 6 +- .../BootstrapServerRequestDispatcher.java | 18 +- .../ee/impl/protocol/ClientDelegateImpl.java | 2 +- .../FullServantCacheLocalCRDImpl.java | 6 +- .../InfoOnlyServantCacheLocalCRDImpl.java | 6 +- .../ee/impl/protocol/JIDLLocalCRDImpl.java | 4 +- .../LocalClientRequestDispatcherBase.java | 10 +- .../MinimalServantCacheLocalCRDImpl.java | 8 +- .../impl/protocol/NotLocalLocalCRDImpl.java | 2 +- .../ee/impl/protocol/POALocalCRDImpl.java | 4 +- .../RequestDispatcherRegistryImpl.java | 10 +- .../protocol/ServantCacheLocalCRDBase.java | 2 +- .../protocol/ServerRequestDispatcherImpl.java | 6 +- .../corba/ee/impl/protocol/SpecialMethod.java | 2 +- .../LocateReplyMessage_1_0.java | 2 +- .../LocateReplyMessage_1_1.java | 2 +- .../protocol/giopmsgheaders/Message_1_0.java | 2 +- .../protocol/giopmsgheaders/Message_1_1.java | 2 +- .../giopmsgheaders/ReplyMessage_1_0.java | 2 +- .../giopmsgheaders/ReplyMessage_1_2.java | 6 +- .../impl/resolver/BootstrapResolverImpl.java | 32 ++-- .../impl/resolver/CompositeResolverImpl.java | 6 +- .../ee/impl/resolver/FileResolverImpl.java | 6 +- .../ee/impl/resolver/INSURLOperationImpl.java | 30 ++-- .../ee/impl/resolver/LocalResolverImpl.java | 2 +- .../ORBDefaultInitRefResolverImpl.java | 4 +- .../impl/resolver/ORBInitRefResolverImpl.java | 4 +- .../impl/resolver/SplitLocalResolverImpl.java | 4 +- .../CodeSetServiceContextImpl.java | 4 +- ...StreamFormatVersionServiceContextImpl.java | 4 +- .../ORBVersionServiceContextImpl.java | 12 +- .../SendingContextServiceContextImpl.java | 14 +- .../ServiceContextFactoryRegistryImpl.java | 12 +- .../servicecontext/ServiceContextsImpl.java | 26 +-- .../UEInfoServiceContextImpl.java | 8 +- .../UnknownServiceContextImpl.java | 4 +- .../transport/AcceptorAcceptOnlyImpl.java | 2 +- .../corba/ee/impl/transport/AcceptorBase.java | 2 +- .../impl/transport/ConnectionCacheBase.java | 10 +- .../ee/impl/transport/ContactInfoImpl.java | 2 +- .../impl/transport/ContactInfoListImpl.java | 24 +-- .../ContactInfoListIteratorImpl.java | 8 +- .../transport/DefaultIORToSocketInfoImpl.java | 6 +- .../transport/InboundConnectionCacheImpl.java | 6 +- .../InboundConnectionCacheProbeProvider.java | 6 +- .../transport/MessageTraceManagerImpl.java | 8 +- .../OutboundConnectionCacheImpl.java | 6 +- .../OutboundConnectionCacheProbeProvider.java | 6 +- .../corba/ee/impl/transport/SelectorImpl.java | 6 +- .../ee/impl/transport/TcpTimeoutsImpl.java | 2 +- .../impl/transport/TransportManagerImpl.java | 4 +- .../ConcurrentQueueBlockingImpl.java | 2 +- .../concurrent/ConcurrentQueueImpl.java | 3 +- .../ConcurrentQueueNonBlockingImpl.java | 2 +- .../impl/transport/concurrent/LMSQueue.java | 2 +- .../connection/ConnectionCacheBase.java | 6 +- .../ConnectionCacheBlockingBase.java | 2 +- .../ConnectionCacheNonBlockingBase.java | 6 +- .../InboundConnectionCacheBlockingImpl.java | 10 +- .../InboundConnectionCacheImpl.java | 12 +- .../connection/OutboundCacheEntry.java | 22 +-- .../OutboundConnectionCacheBlockingImpl.java | 26 +-- .../OutboundConnectionCacheImpl.java | 18 +- .../connection/OutboundConnectionState.java | 12 +- .../com/sun/corba/ee/impl/util/JDKBridge.java | 10 +- .../corba/ee/impl/util/JDKClassLoader.java | 10 +- .../sun/corba/ee/impl/util/RepositoryId.java | 2 +- .../com/sun/corba/ee/impl/util/Utility.java | 14 +- .../ee/spi/copyobject/CopierManager.java | 2 +- .../ee/spi/copyobject/CopyobjectDefaults.java | 18 +- .../ee/spi/extension/CopyObjectPolicy.java | 6 +- .../ee/spi/extension/LoadBalancingPolicy.java | 8 +- .../extension/RequestPartitioningPolicy.java | 8 +- .../spi/extension/ServantCachingPolicy.java | 6 +- .../ee/spi/extension/ZeroPortPolicy.java | 6 +- .../ee/spi/folb/ClusterInstanceInfo.java | 2 +- .../com/sun/corba/ee/spi/folb/SocketInfo.java | 2 +- .../ee/spi/ior/EncapsulationFactoryBase.java | 6 +- .../java/com/sun/corba/ee/spi/ior/IOR.java | 14 +- .../sun/corba/ee/spi/ior/IORFactories.java | 38 ++-- .../com/sun/corba/ee/spi/ior/IORFactory.java | 2 +- .../com/sun/corba/ee/spi/ior/IORTemplate.java | 4 +- .../sun/corba/ee/spi/ior/IORTemplateList.java | 2 +- .../sun/corba/ee/spi/ior/Identifiable.java | 4 +- .../corba/ee/spi/ior/IdentifiableBase.java | 4 +- .../ee/spi/ior/IdentifiableContainerBase.java | 2 +- .../corba/ee/spi/ior/IdentifiableFactory.java | 4 +- .../ee/spi/ior/IdentifiableFactoryFinder.java | 2 +- .../sun/corba/ee/spi/ior/ObjectAdapterId.java | 8 +- .../com/sun/corba/ee/spi/ior/ObjectId.java | 6 +- .../com/sun/corba/ee/spi/ior/ObjectKey.java | 2 +- .../corba/ee/spi/ior/ObjectKeyFactory.java | 2 +- .../corba/ee/spi/ior/ObjectKeyTemplate.java | 12 +- .../sun/corba/ee/spi/ior/TaggedComponent.java | 22 +-- .../corba/ee/spi/ior/TaggedComponentBase.java | 6 +- .../sun/corba/ee/spi/ior/TaggedProfile.java | 8 +- .../ee/spi/ior/TaggedProfileTemplate.java | 16 +- .../ee/spi/ior/TaggedProfileTemplateBase.java | 8 +- .../sun/corba/ee/spi/ior/WriteContents.java | 2 +- .../com/sun/corba/ee/spi/ior/Writeable.java | 2 +- .../iiop/AlternateIIOPAddressComponent.java | 8 +- .../ee/spi/ior/iiop/CodeSetsComponent.java | 10 +- .../corba/ee/spi/ior/iiop/GIOPVersion.java | 8 +- .../corba/ee/spi/ior/iiop/IIOPAddress.java | 8 +- .../corba/ee/spi/ior/iiop/IIOPFactories.java | 50 +++--- .../corba/ee/spi/ior/iiop/IIOPProfile.java | 10 +- .../spi/ior/iiop/JavaCodebaseComponent.java | 8 +- .../iiop/MaxStreamFormatVersionComponent.java | 8 +- .../ee/spi/ior/iiop/ORBTypeComponent.java | 8 +- .../iiop/RequestPartitioningComponent.java | 6 +- .../legacy/interceptor/ORBInitInfoExt.java | 2 +- .../com/sun/corba/ee/spi/logex/corba/CS.java | 10 +- .../sun/corba/ee/spi/logex/corba/CSValue.java | 2 +- .../ee/spi/logex/corba/ORBException.java | 10 +- .../logging/ActivationSystemException.java | 4 +- .../ee/spi/logging/IORSystemException.java | 4 +- .../logging/InterceptorsSystemException.java | 4 +- .../ee/spi/logging/NamingSystemException.java | 4 +- .../ee/spi/logging/OMGSystemException.java | 4 +- .../spi/logging/ORBUtilSystemException.java | 4 +- .../ee/spi/logging/POASystemException.java | 4 +- .../ee/spi/logging/UtilSystemException.java | 4 +- .../sun/corba/ee/spi/misc/ORBConstants.java | 2 +- .../com/sun/corba/ee/spi/oa/NullServant.java | 2 +- .../com/sun/corba/ee/spi/oa/OADefault.java | 6 +- .../sun/corba/ee/spi/oa/OAInvocationInfo.java | 2 +- .../sun/corba/ee/spi/oa/ObjectAdapter.java | 10 +- .../corba/ee/spi/oa/ObjectAdapterBase.java | 18 +- .../corba/ee/spi/oa/ObjectAdapterFactory.java | 4 +- .../spi/oa/rfm/ReferenceFactoryManager.java | 8 +- .../sun/corba/ee/spi/orb/DataCollector.java | 2 +- .../com/sun/corba/ee/spi/orb/ORBData.java | 16 +- .../com/sun/corba/ee/spi/orb/ORBVersion.java | 8 +- .../corba/ee/spi/orb/ORBVersionFactory.java | 4 +- .../corba/ee/spi/orb/ObjectKeyCacheEntry.java | 4 +- .../corba/ee/spi/orb/OperationFactory.java | 8 +- .../corba/ee/spi/orb/OperationFactoryExt.java | 4 +- .../com/sun/corba/ee/spi/orb/ParserData.java | 2 +- .../corba/ee/spi/orb/ParserDataFactory.java | 4 +- .../sun/corba/ee/spi/orb/ParserImplBase.java | 20 +-- .../corba/ee/spi/orb/ParserImplTableBase.java | 10 +- .../sun/corba/ee/spi/orb/PropertyParser.java | 16 +- .../com/sun/corba/ee/spi/osgi/ORBFactory.java | 10 +- .../rmi/DynamicMethodMarshaller.java | 12 +- .../ee/spi/presentation/rmi/DynamicStub.java | 8 +- .../presentation/rmi/IDLNameTranslator.java | 2 +- .../presentation/rmi/PresentationManager.java | 8 +- .../ee/spi/presentation/rmi/StubAdapter.java | 32 ++-- .../ee/spi/presentation/rmi/StubWrapper.java | 28 +-- .../spi/protocol/ClientDelegateFactory.java | 2 +- .../ee/spi/protocol/ForwardException.java | 8 +- .../InitialServerRequestDispatcher.java | 2 +- .../LocalClientRequestDispatcherFactory.java | 2 +- .../sun/corba/ee/spi/protocol/PIHandler.java | 28 +-- .../ee/spi/protocol/ProtocolHandler.java | 2 +- .../protocol/RequestDispatcherDefault.java | 22 +-- .../protocol/RequestDispatcherRegistry.java | 2 +- .../spi/protocol/ServerRequestDispatcher.java | 2 +- .../ee/spi/resolver/ResolverDefault.java | 22 +-- .../ORBVersionServiceContext.java | 4 +- .../SendingContextServiceContext.java | 2 +- .../ee/spi/servicecontext/ServiceContext.java | 4 +- .../servicecontext/ServiceContextBase.java | 8 +- .../ServiceContextDefaults.java | 28 +-- .../spi/servicecontext/ServiceContexts.java | 2 +- .../java/com/sun/corba/ee/spi/trace/Cdr.java | 8 +- .../com/sun/corba/ee/spi/trace/CdrRead.java | 8 +- .../com/sun/corba/ee/spi/trace/CdrWrite.java | 8 +- .../sun/corba/ee/spi/trace/DynamicType.java | 8 +- .../java/com/sun/corba/ee/spi/trace/Folb.java | 8 +- .../java/com/sun/corba/ee/spi/trace/Giop.java | 8 +- .../com/sun/corba/ee/spi/trace/IsLocal.java | 8 +- .../sun/corba/ee/spi/trace/MonitorRead.java | 8 +- .../sun/corba/ee/spi/trace/MonitorWrite.java | 8 +- .../com/sun/corba/ee/spi/trace/Naming.java | 8 +- .../sun/corba/ee/spi/trace/OrbLifeCycle.java | 8 +- .../java/com/sun/corba/ee/spi/trace/Orbd.java | 8 +- .../java/com/sun/corba/ee/spi/trace/Osgi.java | 8 +- .../java/com/sun/corba/ee/spi/trace/Poa.java | 8 +- .../com/sun/corba/ee/spi/trace/PoaFSM.java | 8 +- .../sun/corba/ee/spi/trace/PrimitiveRead.java | 8 +- .../corba/ee/spi/trace/PrimitiveWrite.java | 8 +- .../com/sun/corba/ee/spi/trace/Shutdown.java | 8 +- .../ee/spi/trace/StreamFormatVersion.java | 8 +- .../sun/corba/ee/spi/trace/Subcontract.java | 8 +- .../corba/ee/spi/trace/TraceInterceptor.java | 8 +- .../ee/spi/trace/TraceServiceContext.java | 8 +- .../corba/ee/spi/trace/TraceValueHandler.java | 8 +- .../ee/spi/trace/TransientObjectManager.java | 8 +- .../com/sun/corba/ee/spi/trace/Transport.java | 8 +- .../corba/ee/spi/trace/ValueHandlerRead.java | 8 +- .../corba/ee/spi/trace/ValueHandlerWrite.java | 8 +- .../sun/corba/ee/spi/transport/Acceptor.java | 6 +- .../corba/ee/spi/transport/Connection.java | 2 +- .../corba/ee/spi/transport/ContactInfo.java | 2 +- .../ee/spi/transport/ContactInfoList.java | 6 +- .../spi/transport/ContactInfoListFactory.java | 2 +- .../ee/spi/transport/IORTransformer.java | 6 +- .../corba/ee/spi/transport/MessageData.java | 2 +- .../corba/ee/spi/transport/TcpTimeouts.java | 2 +- .../ee/spi/transport/TransportDefault.java | 14 +- .../ee/spi/transport/TransportManager.java | 8 +- .../concurrent/ConcurrentQueueFactory.java | 6 +- .../spi/transport/connection/Connection.java | 2 +- .../connection/ConnectionCacheFactory.java | 8 +- .../connection/ConnectionFinder.java | 4 +- .../spi/transport/connection/ContactInfo.java | 2 +- .../connection/OutboundConnectionCache.java | 2 +- .../org/glassfish/corba/BridgePermission.java | 2 +- .../testclasses/IDLMultipleInterfaceTest.java | 2 +- .../ee/impl/osgi/main/ORBFactoryTest.java | 32 ++-- .../com/sun/corba/ee/tool/IORDump.java | 26 +-- .../org/omg/PortableServer/package.html | 2 +- .../sun/rmi/rmic/iiop/ClassPathLoader.java | 4 +- .../performance/eesample/SampleData.java | 6 +- .../performance/eesample/StandardTest.java | 114 ++++++------ .../performance/simpleperf/counterClient.java | 64 +++---- .../share/classes/corba/cdrext/Client.java | 8 +- .../classes/corba/cdrstreams/Client.java | 6 +- .../corba/cdrstreams/GraphProcessor.java | 4 +- .../corba/cdrstreams/GraphProcessorImpl.java | 10 +- .../classes/corba/cdrstreams/Server.java | 2 +- .../share/classes/corba/cmvt/GIOPCombo.java | 4 +- .../classes/corba/cmvt/GIOPComboImpl.java | 2 +- .../classes/corba/connectioncache/Client.java | 58 +++--- .../corba/connectioncache/StressClient.java | 34 ++-- .../classes/corba/connections/Client.java | 6 +- .../connections/ConnectionStatistics.java | 8 +- .../corba/copyobjectpolicy/Client.java | 58 +++--- .../classes/corba/copyobjectpolicy/Echo.java | 4 +- .../corba/copyobjectpolicy/EchoImpl.java | 4 +- .../copyobjectpolicy/UserConfigurator.java | 16 +- .../share/classes/corba/custom/Verifier.java | 4 +- .../classes/corba/custom/VerifierImpl.java | 2 +- .../classes/corba/dynamicrmiiiop/Client.java | 88 ++++----- .../dynamicrmiiiop/TestClientDelegate.java | 42 ++--- .../TestCodegenProxyCreator.java | 14 +- .../corba/dynamicrmiiiop/TestTransport.java | 16 +- .../corba/dynamicrmiiiop/testclasses/C2.java | 2 +- .../corba/dynamicrmiiiop/testclasses/C3.java | 2 +- .../corba/dynamicrmiiiop/testclasses/D.java | 2 +- .../testclasses/DMMImplTestClasses.java | 4 +- .../corba/dynamicrmiiiop/testclasses/G.java | 2 +- .../dynamicrmiiiop/testclasses/TieTest.java | 6 +- .../testclasses/TieTestImpl.java | 20 +-- .../classes/corba/enuminterop/Client.java | 6 +- .../classes/corba/enuminterop/Server.java | 8 +- .../share/classes/corba/example/Client.java | 2 +- .../share/classes/corba/example/Server.java | 2 +- test/src/share/classes/corba/folb/Client.java | 6 +- .../share/classes/corba/folb/ClientBase.java | 6 +- .../classes/corba/folb/ClientCircular.java | 6 +- .../share/classes/corba/folb/ClientMulti.java | 6 +- .../classes/corba/folb/ClientWaitTimeout.java | 6 +- .../corba/folb/GroupInfoServiceImpl.java | 2 +- test/src/share/classes/corba/folb/Server.java | 16 +- .../corba/fragment/FragmentTester.java | 4 +- .../corba/fragment/FragmentTesterImpl.java | 2 +- .../corba/fragment2/FragmentTester.java | 4 +- .../corba/fragment2/FragmentTesterImpl.java | 2 +- test/src/share/classes/corba/fsm/Client.sjava | 26 +-- .../src/share/classes/corba/fsm/FSMTest.sjava | 14 +- .../share/classes/corba/giopgen/Client.java | 2 +- .../share/classes/corba/giopgen/Server.java | 2 +- .../src/share/classes/corba/giopgen/Test.java | 2 +- .../classes/corba/giopgen/TestServant.java | 10 +- test/src/share/classes/corba/ior/Client.java | 170 +++++++++--------- test/src/share/classes/corba/lb/Client.java | 2 +- test/src/share/classes/corba/lb/LB.java | 26 +-- test/src/share/classes/corba/lb/LBTest.java | 14 +- test/src/share/classes/corba/lb/Server.java | 8 +- .../classes/corba/lbq/ClientControl.java | 4 +- test/src/share/classes/corba/lbq/Common.java | 28 +-- .../share/classes/corba/lbq/LBControl.java | 4 +- test/src/share/classes/corba/lbq/Server.java | 4 +- .../classes/corba/lbq/ServerControl.java | 4 +- .../classes/corba/lbq/ServerReporter.java | 4 +- .../classes/corba/messagetrace/Client.java | 58 +++--- test/src/share/classes/corba/misc/Buck.java | 6 +- .../classes/corba/misc/BuckPasserAL.java | 2 +- .../share/classes/corba/misc/BuckPasserV.java | 2 +- test/src/share/classes/corba/misc/Client.java | 2 +- .../share/classes/corba/mixedorb/Client.java | 28 +-- .../share/classes/corba/mixedorb/Echo.java | 4 +- .../classes/corba/mixedorb/EchoImpl.java | 6 +- .../share/classes/corba/msgtypes/Client.java | 12 +- .../corba/msgtypes/FragmentTester.java | 2 +- .../corba/msgtypes/FragmentTesterImpl.java | 2 +- .../share/classes/corba/nortel/Client.java | 32 ++-- test/src/share/classes/corba/nortel/Echo.java | 6 +- .../share/classes/corba/nortel/EchoImpl.java | 12 +- .../share/classes/corba/nortel/UserInfo.java | 2 +- .../corba/orbconfig/MyConfigurator.java | 6 +- .../classes/corba/orbconfig/TestSession.java | 6 +- .../UserORBConfiguratorImpl.java | 2 +- .../classes/corba/ortremote/ORTEcho.java | 8 +- .../classes/corba/ortremote/ORTEchoImpl.java | 14 +- .../share/classes/corba/ortremote/Test.java | 22 +-- .../classes/corba/ortremote/TestSession.java | 2 +- .../corba/preinvokepostinvoke/Server.java | 2 +- .../resolve_deadlock/ResolveDeadlock.java | 6 +- .../classes/corba/retryplugin/Client.java | 4 +- .../classes/corba/retryplugin/Server.java | 4 +- .../share/classes/corba/rfm/TestClient.java | 68 +++---- .../corba/rmipoacounter/counterServer.java | 8 +- .../share/classes/corba/security/Client.java | 26 +-- .../share/classes/corba/shutdown/Client.sjava | 2 +- .../share/classes/corba/shutdown/Server.sjava | 6 +- .../share/classes/corba/shutdown/Test.java | 4 +- .../classes/corba/shutdown/TestImpl.java | 4 +- .../classes/corba/simpledynamic/Client.java | 28 +-- .../classes/corba/simpledynamic/Echo.java | 4 +- .../classes/corba/simpledynamic/EchoImpl.java | 14 +- .../corba/simpledynamic/Framework.java | 26 +-- .../corba/simpledynamic/FrameworkClient.java | 28 +-- .../simpledynamic/InterceptorTester.java | 32 ++-- .../simpledynamic/NewAcceptorClient.java | 6 +- .../corba/stubserialization/Client.java | 46 ++--- .../corba/stubserialization/HelloServant.java | 8 +- .../corba/stubserialization/Server.java | 8 +- test/src/share/classes/corba/tbbc/Sample.java | 2 +- .../classes/corba/testngrunner/Client.java | 22 +-- .../classes/corba/testngrunner/Second.java | 22 +-- .../corba/testngrunner/TestngRunnerTest.java | 8 +- .../classes/corba/travelmuse/Client.java | 8 +- .../share/classes/hopper/h4620926/Server.java | 2 +- .../share/classes/hopper/h4647746/Client.java | 44 ++--- .../share/classes/hopper/h4655388/Client.java | 44 ++--- test/src/share/classes/javax/rmi/PROTest.java | 4 +- .../naming/pcosnaming/helloClient.java | 2 +- .../naming/pcosnaming/helloServer.java | 2 +- .../rinameservice/NameServiceClient.java | 2 +- .../performance/simpleperf/counterIF.java | 4 +- .../performance/simpleperf/counterImpl.java | 12 +- .../performance/simpleperf/counterServer.java | 36 ++-- .../simpleperf2/counterClient.java | 8 +- .../performance/simpleperf2/counterIF.java | 4 +- .../performance/simpleperf2/counterImpl.java | 12 +- .../simpleperf2/counterServer.java | 10 +- .../classes/test12/SerializationTest.java | 2 +- www/design/6763340_diffs.txt | 10 +- www/design/SAF/interceptor_usage.text | 10 +- 580 files changed, 3044 insertions(+), 3043 deletions(-) diff --git a/exception-annotation-processor/src/main/java/org/glassfish/corba/annotation/processing/FileGenerator.java b/exception-annotation-processor/src/main/java/org/glassfish/corba/annotation/processing/FileGenerator.java index e2a2a68d1b..67dc9eada4 100644 --- a/exception-annotation-processor/src/main/java/org/glassfish/corba/annotation/processing/FileGenerator.java +++ b/exception-annotation-processor/src/main/java/org/glassfish/corba/annotation/processing/FileGenerator.java @@ -19,18 +19,19 @@ package org.glassfish.corba.annotation.processing; -import org.glassfish.pfl.basic.logex.ExceptionWrapper; -import org.glassfish.pfl.basic.logex.Message; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import javax.annotation.processing.Filer; import javax.lang.model.element.Element; import javax.tools.FileObject; import javax.tools.StandardLocation; -import java.io.IOException; -import java.io.Writer; -import java.util.Date; -import java.util.ArrayList; -import java.util.List; + +import org.glassfish.pfl.basic.logex.ExceptionWrapper; +import org.glassfish.pfl.basic.logex.Message; /** * This class generates properties files based on annotations. diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ORBConfiguratorPersistentImpl.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ORBConfiguratorPersistentImpl.java index db962a1515..0a7425cec7 100644 --- a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ORBConfiguratorPersistentImpl.java +++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ORBConfiguratorPersistentImpl.java @@ -19,28 +19,28 @@ package com.sun.corba.ee.impl.activation ; -import java.util.Collection ; -import java.util.Iterator ; +import java.util.Collection; +import java.util.Iterator; -import org.omg.CORBA.CompletionStatus ; +import org.omg.CORBA.CompletionStatus; -import com.sun.corba.ee.spi.activation.Locator ; -import com.sun.corba.ee.spi.activation.Activator ; -import com.sun.corba.ee.spi.activation.LocatorHelper ; -import com.sun.corba.ee.spi.activation.ActivatorHelper ; -import com.sun.corba.ee.spi.activation.EndPointInfo ; +import com.sun.corba.ee.spi.activation.Locator; +import com.sun.corba.ee.spi.activation.Activator; +import com.sun.corba.ee.spi.activation.LocatorHelper; +import com.sun.corba.ee.spi.activation.ActivatorHelper; +import com.sun.corba.ee.spi.activation.EndPointInfo; -import com.sun.corba.ee.spi.orb.ORBData ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORBData; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.transport.SocketInfo; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.impl.orb.ORBConfiguratorImpl; import com.sun.corba.ee.spi.legacy.connection.LegacyServerSocketEndPointInfo; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; public class ORBConfiguratorPersistentImpl extends ORBConfiguratorImpl { private ORBUtilSystemException wrapper = ORBUtilSystemException.self ; diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java index 75666dbc0a..a6973c79fb 100644 --- a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java +++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java @@ -23,13 +23,13 @@ import java.lang.reflect.Modifier; import java.io.*; import java.util.Date; -import java.util.Properties ; +import java.util.Properties; -import org.omg.CORBA.ORB ; -import com.sun.corba.ee.spi.activation.Activator ; -import com.sun.corba.ee.spi.activation.ActivatorHelper ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.misc.ORBClassLoader ; +import org.omg.CORBA.ORB; +import com.sun.corba.ee.spi.activation.Activator; +import com.sun.corba.ee.spi.activation.ActivatorHelper; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.misc.ORBClassLoader; /** * @version 1.8, 99/11/02 diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerManagerImpl.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerManagerImpl.java index f8c962cf1f..d5b6f16d7d 100644 --- a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerManagerImpl.java +++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerManagerImpl.java @@ -52,22 +52,22 @@ import com.sun.corba.ee.spi.activation.InvalidORBid; import com.sun.corba.ee.spi.activation.Server; import com.sun.corba.ee.spi.activation.IIOP_CLEAR_TEXT; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.TaggedComponent ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.TaggedComponent; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; import com.sun.corba.ee.spi.legacy.connection.LegacyServerSocketEndPointInfo; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.ForwardException; import com.sun.corba.ee.spi.transport.TransportManager; -import com.sun.corba.ee.spi.logging.ActivationSystemException ; +import com.sun.corba.ee.spi.logging.ActivationSystemException; import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler; import com.sun.corba.ee.spi.misc.ORBConstants; diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTableEntry.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTableEntry.java index cbf099212b..bd1d50c53a 100644 --- a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTableEntry.java +++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTableEntry.java @@ -36,7 +36,7 @@ import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef; import com.sun.corba.ee.spi.misc.ORBConstants; -import com.sun.corba.ee.spi.logging.ActivationSystemException ; +import com.sun.corba.ee.spi.logging.ActivationSystemException; import java.util.HashMap; import java.util.Map; diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java index 125a0cf4ff..5a33bbb5ff 100644 --- a/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java +++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java @@ -26,9 +26,9 @@ import org.omg.CosNaming.NamingContextHelper; import org.omg.PortableServer.*; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; /** * @version 1.3, 00/04/06 diff --git a/functional-tests/src/test/java/com/sun/corba/ee/internal/CosNaming/BootstrapServer.java b/functional-tests/src/test/java/com/sun/corba/ee/internal/CosNaming/BootstrapServer.java index e1dcd048c9..cd150e05de 100644 --- a/functional-tests/src/test/java/com/sun/corba/ee/internal/CosNaming/BootstrapServer.java +++ b/functional-tests/src/test/java/com/sun/corba/ee/internal/CosNaming/BootstrapServer.java @@ -23,11 +23,11 @@ import java.io.File; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.spi.resolver.Resolver ; -import com.sun.corba.ee.spi.resolver.LocalResolver ; -import com.sun.corba.ee.spi.resolver.ResolverDefault ; +import com.sun.corba.ee.spi.resolver.Resolver; +import com.sun.corba.ee.spi.resolver.LocalResolver; +import com.sun.corba.ee.spi.resolver.ResolverDefault; import com.sun.corba.ee.spi.misc.ORBConstants; diff --git a/functional-tests/src/test/java/corba/adapteractivator/AdapterActivatorServer.java b/functional-tests/src/test/java/corba/adapteractivator/AdapterActivatorServer.java index 5bbcc935dd..cca92f8593 100644 --- a/functional-tests/src/test/java/corba/adapteractivator/AdapterActivatorServer.java +++ b/functional-tests/src/test/java/corba/adapteractivator/AdapterActivatorServer.java @@ -19,10 +19,10 @@ package corba.adapteractivator ; -import org.omg.PortableServer.POA ; -import org.omg.PortableServer.AdapterActivator ; -import org.omg.PortableServer.LifespanPolicyValue ; -import org.omg.PortableServer.IdAssignmentPolicyValue ; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.AdapterActivator; +import org.omg.PortableServer.LifespanPolicyValue; +import org.omg.PortableServer.IdAssignmentPolicyValue; import corba.framework.RTMConstants; import org.omg.CORBA.LocalObject; diff --git a/functional-tests/src/test/java/corba/codeset/Client.java b/functional-tests/src/test/java/corba/codeset/Client.java index 1fb1a0cfad..91ba60409e 100644 --- a/functional-tests/src/test/java/corba/codeset/Client.java +++ b/functional-tests/src/test/java/corba/codeset/Client.java @@ -20,8 +20,8 @@ package corba.codeset; -import CodeSetTester.Verifier ; -import CodeSetTester.VerifierHelper ; +import CodeSetTester.Verifier; +import CodeSetTester.VerifierHelper; import CodeSetTester.VerifierPackage.TestCharSeqHolder; import CodeSetTester.VerifierPackage.TestWCharSeqHolder; import java.util.Properties; diff --git a/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java b/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java index 76ef900d00..091b793876 100644 --- a/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java +++ b/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java @@ -36,8 +36,8 @@ import org.omg.IOP.TaggedComponent; import com.sun.corba.ee.spi.ior.IOR; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; import com.sun.corba.ee.spi.legacy.connection.GetEndPointInfoAgainException; import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory; import com.sun.corba.ee.spi.transport.SocketInfo; diff --git a/functional-tests/src/test/java/corba/connectintercept_1_4/ORBDBadServerIdHandler.java b/functional-tests/src/test/java/corba/connectintercept_1_4/ORBDBadServerIdHandler.java index 10ea2e43dd..46fa74dd3e 100644 --- a/functional-tests/src/test/java/corba/connectintercept_1_4/ORBDBadServerIdHandler.java +++ b/functional-tests/src/test/java/corba/connectintercept_1_4/ORBDBadServerIdHandler.java @@ -32,12 +32,12 @@ import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.IORTemplate; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.ObjectKeyFactory ; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.ObjectKeyFactory; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.protocol.ForwardException; @@ -48,7 +48,7 @@ import com.sun.corba.ee.impl.misc.ORBUtility; import com.sun.corba.ee.impl.ior.IORImpl; -import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate ; +import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate; import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler; diff --git a/functional-tests/src/test/java/corba/connectintercept_1_4/ServerCommon.java b/functional-tests/src/test/java/corba/connectintercept_1_4/ServerCommon.java index e48f1142a2..89f559f3ca 100644 --- a/functional-tests/src/test/java/corba/connectintercept_1_4/ServerCommon.java +++ b/functional-tests/src/test/java/corba/connectintercept_1_4/ServerCommon.java @@ -24,7 +24,7 @@ package corba.connectintercept_1_4; -import java.util.Properties ; +import java.util.Properties; import org.omg.CORBA.ORB; import org.omg.CORBA.Policy; diff --git a/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java b/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java index 02148e00d9..04f4f902a9 100644 --- a/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java +++ b/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java @@ -31,7 +31,7 @@ import com.sun.corba.ee.spi.transport.TransportManager; import com.sun.corba.ee.spi.transport.ContactInfo; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.transport.SocketInfo; import com.sun.corba.ee.spi.misc.ORBConstants; @@ -45,7 +45,7 @@ import org.glassfish.pfl.tf.timer.spi.TimerFactory; import org.glassfish.pfl.tf.timer.spi.TimerManager; -// import corba.framework.TimerUtils ; +// import corba.framework.TimerUtils; /** * @author Harold Carr diff --git a/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java b/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java index 300511cbb6..85631a5b0a 100644 --- a/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java +++ b/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java @@ -36,7 +36,7 @@ import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt; -import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt ; +import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.impl.misc.ORBUtility; diff --git a/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java b/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java index 81a8bc7d7c..34596f0ee3 100644 --- a/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java +++ b/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java @@ -32,8 +32,8 @@ import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.TaggedComponent; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; import com.sun.corba.ee.spi.transport.IORToSocketInfo; import com.sun.corba.ee.spi.transport.SocketInfo; diff --git a/functional-tests/src/test/java/corba/folb_8_1/Server.java b/functional-tests/src/test/java/corba/folb_8_1/Server.java index 80e45ed504..016cc25bcc 100644 --- a/functional-tests/src/test/java/corba/folb_8_1/Server.java +++ b/functional-tests/src/test/java/corba/folb_8_1/Server.java @@ -25,7 +25,7 @@ package corba.folb_8_1; -import java.util.Properties ; +import java.util.Properties; import org.omg.CORBA.ORB; import org.omg.PortableServer.POA; diff --git a/functional-tests/src/test/java/corba/folb_8_1/ZeroPortServer1.java b/functional-tests/src/test/java/corba/folb_8_1/ZeroPortServer1.java index 3de7c42bc7..b52ad2f523 100644 --- a/functional-tests/src/test/java/corba/folb_8_1/ZeroPortServer1.java +++ b/functional-tests/src/test/java/corba/folb_8_1/ZeroPortServer1.java @@ -25,7 +25,7 @@ package corba.folb_8_1; -import java.util.Properties ; +import java.util.Properties; import org.omg.CORBA.ORB; import org.omg.PortableServer.POA; diff --git a/functional-tests/src/test/java/corba/framework/Compiler.java b/functional-tests/src/test/java/corba/framework/Compiler.java index e077bd6d78..48ded212bf 100644 --- a/functional-tests/src/test/java/corba/framework/Compiler.java +++ b/functional-tests/src/test/java/corba/framework/Compiler.java @@ -20,7 +20,7 @@ package corba.framework; import java.util.Vector; -import java.util.Properties ; +import java.util.Properties; /** * Abstraction of a compiler, used to implement IDLJ, RMIC, and Javac diff --git a/functional-tests/src/test/java/corba/framework/EmmaControl.java b/functional-tests/src/test/java/corba/framework/EmmaControl.java index 8e6d112f97..b45c6d18c0 100644 --- a/functional-tests/src/test/java/corba/framework/EmmaControl.java +++ b/functional-tests/src/test/java/corba/framework/EmmaControl.java @@ -19,9 +19,9 @@ package corba.framework; -import java.util.Properties ; +import java.util.Properties; -// import com.vladium.emma.ctl.ctlCommand ; +// import com.vladium.emma.ctl.ctlCommand; /** Programmatic API for use in controlling emma. This is * specific to emma version 2.1. This is intended for use diff --git a/functional-tests/src/test/java/corba/framework/MethodEvent.java b/functional-tests/src/test/java/corba/framework/MethodEvent.java index 8b3f374c17..1ef9f2ef2a 100644 --- a/functional-tests/src/test/java/corba/framework/MethodEvent.java +++ b/functional-tests/src/test/java/corba/framework/MethodEvent.java @@ -19,8 +19,8 @@ package corba.framework ; -import java.lang.reflect.Method ; -import java.util.EventObject ; +import java.lang.reflect.Method; +import java.util.EventObject; /** An event representing entering or exiting a particular method * on a particular thread, as recorded by an interceptor with a diff --git a/functional-tests/src/test/java/corba/framework/PRO.java b/functional-tests/src/test/java/corba/framework/PRO.java index fc946c527c..5bc1fe7772 100644 --- a/functional-tests/src/test/java/corba/framework/PRO.java +++ b/functional-tests/src/test/java/corba/framework/PRO.java @@ -19,9 +19,9 @@ package corba.framework ; -import java.rmi.Remote ; +import java.rmi.Remote; -import javax.rmi.PortableRemoteObject ; +import javax.rmi.PortableRemoteObject; public class PRO { private PRO() {} diff --git a/functional-tests/src/test/java/corba/framework/Post.java b/functional-tests/src/test/java/corba/framework/Post.java index 3d7a20ea0f..f5dd72f556 100644 --- a/functional-tests/src/test/java/corba/framework/Post.java +++ b/functional-tests/src/test/java/corba/framework/Post.java @@ -19,11 +19,11 @@ package corba.framework ; -import java.lang.annotation.Target ; -import java.lang.annotation.Documented ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** Used to mark methods that are executed after every test case * diff --git a/functional-tests/src/test/java/corba/framework/Pre.java b/functional-tests/src/test/java/corba/framework/Pre.java index b5a640a733..0f1cacedee 100644 --- a/functional-tests/src/test/java/corba/framework/Pre.java +++ b/functional-tests/src/test/java/corba/framework/Pre.java @@ -19,11 +19,11 @@ package corba.framework ; -import java.lang.annotation.Target ; -import java.lang.annotation.Documented ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** Used to mark methods executed before each test case. * diff --git a/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java b/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java index a6b3f0f377..9123ca18db 100644 --- a/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java +++ b/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java @@ -19,16 +19,16 @@ package corba.framework ; -import java.util.Iterator ; -import java.util.Set ; -import java.util.HashSet ; -import java.lang.reflect.Method ; -import java.lang.reflect.Proxy ; -import java.lang.reflect.InvocationHandler ; -import java.lang.reflect.InvocationTargetException ; - -import corba.framework.MethodEvent ; -import corba.framework.MethodEventListener ; +import java.util.Iterator; +import java.util.Set; +import java.util.HashSet; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; + +import corba.framework.MethodEvent; +import corba.framework.MethodEventListener; /** Create an interceptor that reports method entry and exit for a * certain set of methods. Method entry and exit is reported as diff --git a/functional-tests/src/test/java/corba/framework/TestngRunner.java b/functional-tests/src/test/java/corba/framework/TestngRunner.java index 37442340e2..6761c24705 100644 --- a/functional-tests/src/test/java/corba/framework/TestngRunner.java +++ b/functional-tests/src/test/java/corba/framework/TestngRunner.java @@ -19,16 +19,16 @@ package corba.framework ; -import java.io.File ; +import java.io.File; -import java.util.Set ; -import java.util.HashSet ; +import java.util.Set; +import java.util.HashSet; import org.glassfish.pfl.test.JUnitReportHelper; -import org.testng.TestNG ; -import org.testng.ITestResult ; -import org.testng.ITestListener ; -import org.testng.ITestContext ; +import org.testng.TestNG; +import org.testng.ITestResult; +import org.testng.ITestListener; +import org.testng.ITestContext; /** Used to set up an appropriate instance of TestNG for running a test. * Used inside the CORBA test framework in order to generate useful reports diff --git a/functional-tests/src/test/java/corba/framework/TimedTest.java b/functional-tests/src/test/java/corba/framework/TimedTest.java index 8f4b52547b..d1b5562b22 100644 --- a/functional-tests/src/test/java/corba/framework/TimedTest.java +++ b/functional-tests/src/test/java/corba/framework/TimedTest.java @@ -19,9 +19,9 @@ package corba.framework ; -import junit.extensions.RepeatedTest ; -import junit.framework.TestResult ; -import junit.framework.Test ; +import junit.extensions.RepeatedTest; +import junit.framework.TestResult; +import junit.framework.Test; public class TimedTest extends RepeatedTest { diff --git a/functional-tests/src/test/java/corba/framework/TraceAccumulator.java b/functional-tests/src/test/java/corba/framework/TraceAccumulator.java index 63e683b51e..2ab6c92ea8 100644 --- a/functional-tests/src/test/java/corba/framework/TraceAccumulator.java +++ b/functional-tests/src/test/java/corba/framework/TraceAccumulator.java @@ -19,9 +19,9 @@ package corba.framework ; -import java.util.Iterator ; -import java.util.List ; -import java.util.ArrayList ; +import java.util.Iterator; +import java.util.List; +import java.util.ArrayList; public class TraceAccumulator implements MethodEventListener { diff --git a/functional-tests/src/test/java/corba/framework/TraceElement.java b/functional-tests/src/test/java/corba/framework/TraceElement.java index 788aec15da..dd4e665a80 100644 --- a/functional-tests/src/test/java/corba/framework/TraceElement.java +++ b/functional-tests/src/test/java/corba/framework/TraceElement.java @@ -19,7 +19,7 @@ package corba.framework ; -import java.lang.reflect.Method ; +import java.lang.reflect.Method; public class TraceElement { diff --git a/functional-tests/src/test/java/corba/fwddecl/Client.java b/functional-tests/src/test/java/corba/fwddecl/Client.java index 8d85a1d8bb..7ddc02e091 100644 --- a/functional-tests/src/test/java/corba/fwddecl/Client.java +++ b/functional-tests/src/test/java/corba/fwddecl/Client.java @@ -20,21 +20,21 @@ package corba.fwddecl; import org.omg.CORBA.Any; -import org.omg.CORBA_2_3.portable.OutputStream ; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; +import org.omg.CORBA_2_3.portable.InputStream; -import java.util.Properties ; +import java.util.Properties; import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.impl.encoding.CDRInputObject ; -import com.sun.corba.ee.impl.encoding.CDROutputObject ; -import com.sun.corba.ee.impl.encoding.EncapsInputStream ; -import com.sun.corba.ee.impl.encoding.EncapsOutputStream ; +import com.sun.corba.ee.impl.encoding.CDRInputObject; +import com.sun.corba.ee.impl.encoding.CDROutputObject; +import com.sun.corba.ee.impl.encoding.EncapsInputStream; +import com.sun.corba.ee.impl.encoding.EncapsOutputStream; -import org.testng.annotations.Test ; +import org.testng.annotations.Test; -import corba.framework.TestngRunner ; +import corba.framework.TestngRunner; import org.glassfish.pfl.test.ObjectUtility; public class Client diff --git a/functional-tests/src/test/java/corba/hcks/idlPOAServant.java b/functional-tests/src/test/java/corba/hcks/idlPOAServant.java index 1a7b909159..7fdfa4194b 100644 --- a/functional-tests/src/test/java/corba/hcks/idlPOAServant.java +++ b/functional-tests/src/test/java/corba/hcks/idlPOAServant.java @@ -28,51 +28,51 @@ import java.util.Iterator; import java.util.Properties; -import com.sun.corba.ee.spi.ior.Identifiable ; -import com.sun.corba.ee.spi.ior.IdentifiableFactory ; -import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedComponent ; -import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactory ; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.ior.IdentifiableContainerBase ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.IORTemplateList ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; - -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfile ; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.ior.ObjectKeyFactory ; +import com.sun.corba.ee.spi.ior.Identifiable; +import com.sun.corba.ee.spi.ior.IdentifiableFactory; +import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedComponent; +import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactory; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.ior.IdentifiableContainerBase; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.IORTemplateList; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; + +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.ior.ObjectKeyFactory; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.transport.Acceptor; -import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent ; - -import com.sun.corba.ee.impl.ior.GenericTaggedProfile ; -import com.sun.corba.ee.impl.ior.GenericTaggedComponent ; -import com.sun.corba.ee.impl.ior.FreezableList ; -import com.sun.corba.ee.impl.ior.OldJIDLObjectKeyTemplate ; -import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate ; -import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate ; -import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate ; -import com.sun.corba.ee.impl.ior.WireObjectKeyTemplate ; -import com.sun.corba.ee.impl.ior.EncapsulationUtility ; -import com.sun.corba.ee.impl.ior.TaggedComponentFactoryFinderImpl ; -import com.sun.corba.ee.impl.ior.TaggedProfileFactoryFinderImpl ; -import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray ; -import com.sun.corba.ee.impl.ior.ObjectAdapterIdNumber ; -import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl ; -import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl ; +import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent; + +import com.sun.corba.ee.impl.ior.GenericTaggedProfile; +import com.sun.corba.ee.impl.ior.GenericTaggedComponent; +import com.sun.corba.ee.impl.ior.FreezableList; +import com.sun.corba.ee.impl.ior.OldJIDLObjectKeyTemplate; +import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate; +import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate; +import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate; +import com.sun.corba.ee.impl.ior.WireObjectKeyTemplate; +import com.sun.corba.ee.impl.ior.EncapsulationUtility; +import com.sun.corba.ee.impl.ior.TaggedComponentFactoryFinderImpl; +import com.sun.corba.ee.impl.ior.TaggedProfileFactoryFinderImpl; +import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray; +import com.sun.corba.ee.impl.ior.ObjectAdapterIdNumber; +import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl; +import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl; import com.sun.corba.ee.impl.orb.ORBVersionImpl; import com.sun.corba.ee.spi.misc.ORBConstants; diff --git a/functional-tests/src/test/java/corba/iorintsockfact/Server.java b/functional-tests/src/test/java/corba/iorintsockfact/Server.java index 7829eca5b2..60c3a8e069 100644 --- a/functional-tests/src/test/java/corba/iorintsockfact/Server.java +++ b/functional-tests/src/test/java/corba/iorintsockfact/Server.java @@ -24,7 +24,7 @@ package corba.iorintsockfact; -import java.util.Properties ; +import java.util.Properties; import org.omg.CORBA.ORB; import org.omg.CORBA.Policy; diff --git a/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java b/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java index 046217ce61..af0f760c2a 100644 --- a/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java +++ b/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java @@ -34,8 +34,8 @@ import org.omg.PortableInterceptor.ORBInitInfoPackage.InvalidName; import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt ; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt; /** * @author Harold Carr diff --git a/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java b/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java index 1aed5423b4..9d495a8ca9 100644 --- a/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java +++ b/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java @@ -30,8 +30,8 @@ import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory; import com.sun.corba.ee.spi.ior.IOR; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent; import com.sun.corba.ee.spi.transport.SocketInfo; diff --git a/functional-tests/src/test/java/corba/islocal/Client.java b/functional-tests/src/test/java/corba/islocal/Client.java index 86476d796f..9596f464dd 100644 --- a/functional-tests/src/test/java/corba/islocal/Client.java +++ b/functional-tests/src/test/java/corba/islocal/Client.java @@ -31,7 +31,7 @@ import corba.hcks.C; import corba.hcks.U; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; public class Client { diff --git a/functional-tests/src/test/java/corba/multiorb/policy2Server.java b/functional-tests/src/test/java/corba/multiorb/policy2Server.java index 874b943fc9..ed1ea241ac 100644 --- a/functional-tests/src/test/java/corba/multiorb/policy2Server.java +++ b/functional-tests/src/test/java/corba/multiorb/policy2Server.java @@ -31,7 +31,7 @@ import org.omg.CORBA.Policy; import org.omg.PortableServer.Servant; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; import examples.policy_2POA; import org.omg.CORBA.ORB; import org.omg.CosNaming.NameComponent; diff --git a/functional-tests/src/test/java/corba/oneway/helloClient.java b/functional-tests/src/test/java/corba/oneway/helloClient.java index f95ab8d88d..7f3ddaf245 100644 --- a/functional-tests/src/test/java/corba/oneway/helloClient.java +++ b/functional-tests/src/test/java/corba/oneway/helloClient.java @@ -21,7 +21,7 @@ import HelloApp.hello; import HelloApp.helloHelper; -import java.util.Properties ; +import java.util.Properties; import org.omg.CORBA.ORB; import org.omg.CosNaming.NameComponent; import org.omg.CosNaming.NamingContext; diff --git a/functional-tests/src/test/java/corba/oneway/helloServer.java b/functional-tests/src/test/java/corba/oneway/helloServer.java index 3f692644b3..87f5fc86e6 100644 --- a/functional-tests/src/test/java/corba/oneway/helloServer.java +++ b/functional-tests/src/test/java/corba/oneway/helloServer.java @@ -20,7 +20,7 @@ package corba.oneway; import HelloApp._helloImplBase; -import java.util.Properties ; +import java.util.Properties; import org.omg.CORBA.ORB; import org.omg.CosNaming.NameComponent; import org.omg.CosNaming.NamingContext; diff --git a/functional-tests/src/test/java/corba/poamanager/HelloClient.java b/functional-tests/src/test/java/corba/poamanager/HelloClient.java index 82bd7ee216..7d7743aeac 100644 --- a/functional-tests/src/test/java/corba/poamanager/HelloClient.java +++ b/functional-tests/src/test/java/corba/poamanager/HelloClient.java @@ -25,8 +25,8 @@ import Util.GenericFactory; import org.omg.PortableServer.POAManagerPackage.AdapterInactive; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.logging.POASystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.logging.POASystemException; import org.omg.CORBA.COMM_FAILURE; import org.omg.CORBA.OBJ_ADAPTER; import org.omg.CORBA.SystemException; diff --git a/functional-tests/src/test/java/corba/poapolicies/ObjectFactoryUsingServantManager.java b/functional-tests/src/test/java/corba/poapolicies/ObjectFactoryUsingServantManager.java index a1364361f7..9ddc0da18d 100644 --- a/functional-tests/src/test/java/corba/poapolicies/ObjectFactoryUsingServantManager.java +++ b/functional-tests/src/test/java/corba/poapolicies/ObjectFactoryUsingServantManager.java @@ -19,7 +19,7 @@ package corba.poapolicies; -import Util.CreationMethods ; +import Util.CreationMethods; public class ObjectFactoryUsingServantManager extends BasicObjectFactoryImpl { private static int idNum = 0; diff --git a/functional-tests/src/test/java/corba/poatest/helloClient.java b/functional-tests/src/test/java/corba/poatest/helloClient.java index 564e0f66ff..3e06b5bcba 100644 --- a/functional-tests/src/test/java/corba/poatest/helloClient.java +++ b/functional-tests/src/test/java/corba/poatest/helloClient.java @@ -24,7 +24,7 @@ import org.omg.CosNaming.NamingContext; import org.omg.CosNaming.NamingContextHelper; -import HelloA.hello ; +import HelloA.hello; import HelloA.helloHelper; public class helloClient diff --git a/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java b/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java index 105248f9c8..aa1a167a59 100644 --- a/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java +++ b/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java @@ -19,8 +19,8 @@ package corba.preinvokepostinvoke; -import java.rmi.Remote ; -import java.rmi.RemoteException ; +import java.rmi.Remote; +import java.rmi.RemoteException; public interface Interface extends java.rmi.Remote { public String o1(String x) throws RemoteException; diff --git a/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java b/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java index 6bbdd87856..4eec6f9947 100644 --- a/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java +++ b/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java @@ -19,9 +19,9 @@ package corba.preinvokepostinvoke; -import java.rmi.RemoteException ; -import javax.rmi.PortableRemoteObject ; -import org.omg.CORBA.ORB ; +import java.rmi.RemoteException; +import javax.rmi.PortableRemoteObject; +import org.omg.CORBA.ORB; import org.omg.CosNaming.NamingContextExt; import org.omg.CosNaming.NamingContextExtHelper; diff --git a/functional-tests/src/test/java/corba/repid/Client.java b/functional-tests/src/test/java/corba/repid/Client.java index 52a20e9f96..1474327046 100644 --- a/functional-tests/src/test/java/corba/repid/Client.java +++ b/functional-tests/src/test/java/corba/repid/Client.java @@ -25,7 +25,7 @@ import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; public class Client { diff --git a/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java b/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java index a8288b1d34..eb837f9551 100644 --- a/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java +++ b/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java @@ -21,10 +21,10 @@ import java.util.*; import java.io.*; -import java.io.DataInputStream ; +import java.io.DataInputStream; import org.omg.CORBA.*; import org.omg.CosNaming.*; -import javax.rmi.PortableRemoteObject ; +import javax.rmi.PortableRemoteObject; import corba.framework.*; public class counterClient implements InternalProcess diff --git a/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java b/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java index 3f3ec0ff54..f1d7e08ad4 100644 --- a/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java +++ b/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java @@ -19,8 +19,8 @@ package corba.rmipoacounter; -import java.rmi.Remote ; -import java.rmi.RemoteException ; +import java.rmi.Remote; +import java.rmi.RemoteException; public interface counterIF extends java.rmi.Remote { public long increment( long invalue ) throws java.rmi.RemoteException ; diff --git a/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java b/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java index 0db5f120a5..cfed5756ab 100644 --- a/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java +++ b/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java @@ -19,12 +19,12 @@ package corba.rmipoacounter; -import java.rmi.RemoteException ; -import javax.rmi.PortableRemoteObject ; -import org.omg.CORBA.ORB ; -import java.io.File ; -import java.io.RandomAccessFile ; -import org.omg.PortableServer.POA ; +import java.rmi.RemoteException; +import javax.rmi.PortableRemoteObject; +import org.omg.CORBA.ORB; +import java.io.File; +import java.io.RandomAccessFile; +import org.omg.PortableServer.POA; public class counterImpl extends PortableRemoteObject implements counterIF { diff --git a/functional-tests/src/test/java/corba/rogueclient/RogueClient.java b/functional-tests/src/test/java/corba/rogueclient/RogueClient.java index f3fa152d89..2cc9d0be31 100644 --- a/functional-tests/src/test/java/corba/rogueclient/RogueClient.java +++ b/functional-tests/src/test/java/corba/rogueclient/RogueClient.java @@ -40,7 +40,7 @@ import javax.naming.InitialContext; import javax.rmi.PortableRemoteObject; -import java.util.concurrent.atomic.AtomicInteger ; +import java.util.concurrent.atomic.AtomicInteger; import org.glassfish.pfl.test.JUnitReportHelper; public class RogueClient implements Runnable diff --git a/functional-tests/src/test/java/corba/unarrow/Server.java b/functional-tests/src/test/java/corba/unarrow/Server.java index 414ce1dd39..938002122a 100644 --- a/functional-tests/src/test/java/corba/unarrow/Server.java +++ b/functional-tests/src/test/java/corba/unarrow/Server.java @@ -22,7 +22,7 @@ import org.omg.CosNaming.*; import org.omg.CosNaming.NamingContextPackage.*; import org.omg.CORBA.*; -import java.util.Properties ; +import java.util.Properties; import org.omg.PortableServer.*; /** diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java index 227d2719ac..05b7b6761d 100644 --- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java +++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java @@ -34,7 +34,7 @@ import rmic.ObjectByValue; import java.io.*; -import java.util.Properties ; +import java.util.Properties; public class IIOPPerformance extends test.Test { diff --git a/functional-tests/src/test/java/pi/iorinterceptor/Server.java b/functional-tests/src/test/java/pi/iorinterceptor/Server.java index beafd0de7c..951faba024 100644 --- a/functional-tests/src/test/java/pi/iorinterceptor/Server.java +++ b/functional-tests/src/test/java/pi/iorinterceptor/Server.java @@ -20,15 +20,15 @@ package pi.iorinterceptor; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfile ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.IORFactories; import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.impl.encoding.EncapsInputStream; import com.sun.corba.ee.impl.encoding.EncapsOutputStream; -import com.sun.corba.ee.impl.ior.GenericIdentifiable ; +import com.sun.corba.ee.impl.ior.GenericIdentifiable; import corba.framework.InternalProcess; import java.io.PrintStream; import java.util.ArrayList; diff --git a/functional-tests/src/test/java/rmic/HelloTest.java b/functional-tests/src/test/java/rmic/HelloTest.java index d946669979..09ea5620f1 100644 --- a/functional-tests/src/test/java/rmic/HelloTest.java +++ b/functional-tests/src/test/java/rmic/HelloTest.java @@ -34,10 +34,10 @@ import org.omg.CORBA.portable.ServantObject; import org.omg.CORBA.portable.Delegate; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBData ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBData; import org.glassfish.pfl.test.JUnitReportHelper; /* diff --git a/functional-tests/src/test/java/rmic/LocalStubTest.java b/functional-tests/src/test/java/rmic/LocalStubTest.java index d0f1f0cc52..1c78b771c8 100644 --- a/functional-tests/src/test/java/rmic/LocalStubTest.java +++ b/functional-tests/src/test/java/rmic/LocalStubTest.java @@ -34,7 +34,7 @@ import java.io.File; import com.sun.corba.ee.impl.util.JDKBridge; import java.rmi.MarshalException; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; import org.glassfish.pfl.test.JUnitReportHelper; /* diff --git a/functional-tests/src/test/java/rmic/ParseTest.java b/functional-tests/src/test/java/rmic/ParseTest.java index 1c590bc9f1..2a66d090fe 100644 --- a/functional-tests/src/test/java/rmic/ParseTest.java +++ b/functional-tests/src/test/java/rmic/ParseTest.java @@ -25,7 +25,7 @@ import org.glassfish.rmic.tools.java.ClassPath; import java.lang.reflect.Method; -import corba.framework.TestngRunner ; +import corba.framework.TestngRunner; public class ParseTest extends test.Test implements Constants { public static ClassPath createClassPath() { diff --git a/functional-tests/src/test/java/rmic/TestExecutor.java b/functional-tests/src/test/java/rmic/TestExecutor.java index 38b21fa34a..31895dbf4e 100644 --- a/functional-tests/src/test/java/rmic/TestExecutor.java +++ b/functional-tests/src/test/java/rmic/TestExecutor.java @@ -33,13 +33,13 @@ import org.glassfish.rmic.iiop.AbstractType; import org.glassfish.rmic.iiop.ContextStack; -import org.testng.Assert ; +import org.testng.Assert; -import org.testng.annotations.Test ; -import org.testng.annotations.AfterGroups ; -import org.testng.annotations.BeforeGroups ; -import org.testng.annotations.AfterSuite ; -import org.testng.annotations.BeforeSuite ; +import org.testng.annotations.Test; +import org.testng.annotations.AfterGroups; +import org.testng.annotations.BeforeGroups; +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; public class TestExecutor { private ByteArrayOutputStream out = null; diff --git a/functional-tests/src/test/java/test/Test.java b/functional-tests/src/test/java/test/Test.java index 445e9eb21a..dd1d0c06e9 100644 --- a/functional-tests/src/test/java/test/Test.java +++ b/functional-tests/src/test/java/test/Test.java @@ -21,10 +21,10 @@ package test; -import java.lang.management.RuntimeMXBean ; -import java.lang.management.ManagementFactory ; +import java.lang.management.RuntimeMXBean; +import java.lang.management.ManagementFactory; -import java.util.List ; +import java.util.List; import java.util.Hashtable; import java.util.Vector; import java.util.Date; @@ -43,7 +43,7 @@ import java.net.ServerSocket; import java.util.Properties; import com.sun.corba.ee.spi.misc.ORBConstants; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; /** * The abstract Test class. The simplest way to use this class is to inherit from it diff --git a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java index 890486714f..65235d0e66 100644 --- a/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java +++ b/idlj/src/main/java/com/sun/tools/corba/ee/idl/Parser.java @@ -50,11 +50,11 @@ import java.io.EOFException; import java.io.IOException; import java.math.BigInteger; -import java.util.ArrayList ; +import java.util.ArrayList; import java.util.Enumeration; import java.util.Hashtable; -import java.util.Iterator ; -import java.util.List ; +import java.util.Iterator; +import java.util.List; import java.util.Stack; import java.util.Vector; diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ArgParser.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ArgParser.java index 351f980bef..1c7a79bcba 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ArgParser.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ArgParser.java @@ -19,20 +19,20 @@ package argparser ; -import java.util.Collection ; -import java.util.Collections ; -import java.util.ArrayList ; -import java.util.List ; -import java.util.Map ; -import java.util.Set ; -import java.util.HashMap ; - -import java.lang.reflect.Array ; -import java.lang.reflect.Method ; -import java.lang.reflect.Proxy ; -import java.lang.reflect.InvocationHandler ; - -import java.net.URL ; +import java.util.Collection; +import java.util.Collections; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.HashMap; + +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.lang.reflect.InvocationHandler; + +import java.net.URL; import java.util.Arrays; /** A general purpose argument parser that uses annotations, reflection, diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandler.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandler.java index 5c98c55970..e0e561c355 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandler.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandler.java @@ -19,8 +19,8 @@ package argparser ; -import java.io.Serializable ; -import java.lang.reflect.InvocationHandler ; +import java.io.Serializable; +import java.lang.reflect.InvocationHandler; public interface CompositeInvocationHandler extends InvocationHandler, Serializable diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandlerImpl.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandlerImpl.java index bdcf52a660..9cea40d9b7 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandlerImpl.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/CompositeInvocationHandlerImpl.java @@ -20,11 +20,11 @@ package argparser ; -import java.util.Map ; -import java.util.LinkedHashMap ; +import java.util.Map; +import java.util.LinkedHashMap; -import java.lang.reflect.Method ; -import java.lang.reflect.InvocationHandler ; +import java.lang.reflect.Method; +import java.lang.reflect.InvocationHandler; public class CompositeInvocationHandlerImpl implements CompositeInvocationHandler diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/DefaultValue.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/DefaultValue.java index c362a28632..964a15149e 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/DefaultValue.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/DefaultValue.java @@ -19,11 +19,11 @@ package argparser ; -import java.lang.annotation.Documented ; -import java.lang.annotation.Target ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Documented; +import java.lang.annotation.Target; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; @Documented @Target(ElementType.METHOD) diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParser.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParser.java index 85cb46b49c..d259f53f10 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParser.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParser.java @@ -19,7 +19,7 @@ package argparser ; -import java.lang.reflect.Method ; +import java.lang.reflect.Method; public interface ElementParser extends UnaryFunction { String[] describe() ; diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParserImpl.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParserImpl.java index 41f848b6c3..804fc7bbbd 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParserImpl.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/ElementParserImpl.java @@ -19,15 +19,15 @@ package argparser ; -import java.util.List ; -import java.util.ArrayList ; - -import java.lang.reflect.Array ; -import java.lang.reflect.Method ; -import java.lang.reflect.Constructor ; -import java.lang.reflect.Type ; -import java.lang.reflect.ParameterizedType ; -import java.lang.reflect.InvocationTargetException ; +import java.util.List; +import java.util.ArrayList; + +import java.lang.reflect.Array; +import java.lang.reflect.Method; +import java.lang.reflect.Constructor; +import java.lang.reflect.Type; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.InvocationTargetException; public class ElementParserImpl implements ElementParser { private UnaryFunction func ; diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Help.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Help.java index 67c1c115e7..1310892f40 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Help.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Help.java @@ -19,11 +19,11 @@ package argparser ; -import java.lang.annotation.Documented ; -import java.lang.annotation.Target ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Documented; +import java.lang.annotation.Target; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; @Documented @Target(ElementType.METHOD) diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Separator.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Separator.java index 04199f2a43..a1ebfd766d 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Separator.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/argparser/Separator.java @@ -19,11 +19,11 @@ package argparser ; -import java.lang.annotation.Documented ; -import java.lang.annotation.Target ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Documented; +import java.lang.annotation.Target; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; @Documented @Target(ElementType.METHOD) diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/glassfish/GlassFishInstallation.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/glassfish/GlassFishInstallation.java index 0952c8fd39..7bd2e5b2f9 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/glassfish/GlassFishInstallation.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/glassfish/GlassFishInstallation.java @@ -20,7 +20,7 @@ package glassfish; import java.util.List; -import argparser.Pair ; +import argparser.Pair; import java.io.File; import java.util.ArrayList; import testtools.Base; diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/orbfailover/Main.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/orbfailover/Main.java index 8354985e23..dc760780e1 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/orbfailover/Main.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/orbfailover/Main.java @@ -46,12 +46,12 @@ import javax.naming.NameClassPair; import javax.naming.NamingEnumeration; -import testtools.Test ; -import testtools.Base ; +import testtools.Test; +import testtools.Base; import testtools.Post; import testtools.Pre; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.ClientDelegate; import java.lang.reflect.Field; import javax.rmi.CORBA.Stub; diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Base.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Base.java index c1fe72c68e..a1453cb66a 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Base.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Base.java @@ -22,13 +22,13 @@ import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.List; -import java.util.Set ; -import java.util.HashSet ; -import java.lang.reflect.Method ; -import argparser.ArgParser ; -import argparser.Help ; -import argparser.DefaultValue ; -import argparser.Separator ; +import java.util.Set; +import java.util.HashSet; +import java.lang.reflect.Method; +import argparser.ArgParser; +import argparser.Help; +import argparser.DefaultValue; +import argparser.Separator; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Post.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Post.java index 99e7b3824c..34d3ba4bed 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Post.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Post.java @@ -19,11 +19,11 @@ package testtools ; -import java.lang.annotation.Target ; -import java.lang.annotation.Documented ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** Used to mark methods that are executed after every test case * diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Pre.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Pre.java index b1b14e0543..031c1565f8 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Pre.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Pre.java @@ -19,11 +19,11 @@ package testtools ; -import java.lang.annotation.Target ; -import java.lang.annotation.Documented ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** Used to mark methods executed before each test case. * diff --git a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Test.java b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Test.java index fc44ecfd01..456f47f0f8 100644 --- a/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Test.java +++ b/iiop-folb-dev-test/test/OrbFailOver/OrbFailOver-app-client/src/java/testtools/Test.java @@ -19,11 +19,11 @@ package testtools ; -import java.lang.annotation.Target ; -import java.lang.annotation.Documented ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; +import java.lang.annotation.Target; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; /** * diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java index 472788ffcc..b9d10225a2 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolImpl.java @@ -25,19 +25,19 @@ import com.sun.corba.ee.spi.threadpool.Work; import com.sun.corba.ee.spi.threadpool.WorkQueue; -import java.io.Closeable ; -import java.io.IOException ; +import java.io.Closeable; +import java.io.IOException; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.ArrayList ; -import java.util.List ; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedObject ; -import org.glassfish.gmbal.NameValue ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; +import org.glassfish.gmbal.NameValue; @ManagedObject @Description( "A ThreadPool used by the ORB" ) diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java index 891b5cddb4..8e78c6f5c1 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/ThreadPoolManagerImpl.java @@ -24,10 +24,10 @@ import com.sun.corba.ee.spi.threadpool.ThreadPoolChooser; import com.sun.corba.ee.spi.threadpool.ThreadPoolManager; -import java.io.IOException ; -import java.security.AccessController ; +import java.io.IOException; +import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.concurrent.atomic.AtomicInteger ; +import java.util.concurrent.atomic.AtomicInteger; public class ThreadPoolManagerImpl implements ThreadPoolManager { diff --git a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java index bfd66e683e..a06659544a 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java +++ b/internal-api/src/main/java/com/sun/corba/ee/impl/threadpool/WorkQueueImpl.java @@ -26,9 +26,9 @@ import java.util.LinkedList; import java.util.Queue; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.NameValue ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.NameValue; public class WorkQueueImpl implements WorkQueue { diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java index 2072431364..19ca2a1532 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPool.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.threadpool; -import java.io.Closeable ; +import java.io.Closeable; /** This interface defines a thread pool execution service. The ORB uses this * interface, which preceeds the JDK 5 ExecutorService. Note that the close diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolFactory.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolFactory.java index b548d453b5..70f7afec07 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolFactory.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolFactory.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.threadpool; -import com.sun.corba.ee.impl.threadpool.ThreadPoolImpl ; +import com.sun.corba.ee.impl.threadpool.ThreadPoolImpl; public class ThreadPoolFactory { /** Create an unbounded thread pool in the current thread group diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java index e218c9146e..159cf49567 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadPoolManager.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.threadpool; -import java.io.Closeable ; +import java.io.Closeable; public interface ThreadPoolManager extends Closeable { diff --git a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadStateValidator.java b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadStateValidator.java index 95d307c936..d243490970 100644 --- a/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadStateValidator.java +++ b/internal-api/src/main/java/com/sun/corba/ee/spi/threadpool/ThreadStateValidator.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.threadpool; -import com.sun.corba.ee.impl.threadpool.Exceptions ; +import com.sun.corba.ee.impl.threadpool.Exceptions; import java.util.ArrayList; import java.util.List; diff --git a/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/ORB.java b/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/ORB.java index 474c5df66e..a29a212555 100644 --- a/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/ORB.java +++ b/omgapi/src/main/java/com/sun/corba/ee/org/omg/CORBA/ORB.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.org.omg.CORBA ; -import org.omg.CORBA.ORBPackage.InvalidName ; +import org.omg.CORBA.ORBPackage.InvalidName; /** This ORB class is defined to provide a home for the * register_initial_reference operation, which is added by diff --git a/omgapi/src/main/java/javax/rmi/CORBA/Stub.java b/omgapi/src/main/java/javax/rmi/CORBA/Stub.java index a5b39753fd..f7ccbee910 100644 --- a/omgapi/src/main/java/javax/rmi/CORBA/Stub.java +++ b/omgapi/src/main/java/javax/rmi/CORBA/Stub.java @@ -23,7 +23,7 @@ import com.sun.corba.ee.org.omg.CORBA.GetPropertyAction; import java.io.IOException; -import java.net.MalformedURLException ; +import java.net.MalformedURLException; import java.rmi.RemoteException; import java.rmi.server.RMIClassLoader; import java.security.AccessController; diff --git a/omgapi/src/main/java/javax/rmi/CORBA/Util.java b/omgapi/src/main/java/javax/rmi/CORBA/Util.java index 37e6e44b97..6a3fec7fba 100644 --- a/omgapi/src/main/java/javax/rmi/CORBA/Util.java +++ b/omgapi/src/main/java/javax/rmi/CORBA/Util.java @@ -23,7 +23,7 @@ import com.sun.corba.ee.org.omg.CORBA.GetPropertyAction; import java.io.SerializablePermission; -import java.net.MalformedURLException ; +import java.net.MalformedURLException; import java.rmi.Remote; import java.rmi.RemoteException; import java.rmi.server.RMIClassLoader; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/JavaStreamORBObjectCopierImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/JavaStreamORBObjectCopierImpl.java index 5a080d5465..a19116c6f5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/JavaStreamORBObjectCopierImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/JavaStreamORBObjectCopierImpl.java @@ -24,8 +24,8 @@ import java.rmi.Remote; -import org.glassfish.pfl.dynamic.copyobject.impl.JavaStreamObjectCopierImpl ; -import org.omg.CORBA.ORB ; +import org.glassfish.pfl.dynamic.copyobject.impl.JavaStreamObjectCopierImpl; +import org.omg.CORBA.ORB; public class JavaStreamORBObjectCopierImpl extends JavaStreamObjectCopierImpl { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ORBStreamObjectCopierImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ORBStreamObjectCopierImpl.java index b9697f9126..6789f374e7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ORBStreamObjectCopierImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ORBStreamObjectCopierImpl.java @@ -27,7 +27,7 @@ import java.rmi.Remote; import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopier; -import org.omg.CORBA.ORB ; +import org.omg.CORBA.ORB; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java index 069dcd01b3..a942d20d5a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/copyobject/ReflectObjectCopierImpl.java @@ -20,13 +20,13 @@ package com.sun.corba.ee.impl.copyobject ; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; -import com.sun.corba.ee.impl.util.Utility ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; +import com.sun.corba.ee.impl.util.Utility; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.IdentityHashMap ; -import java.util.Map ; +import java.util.IdentityHashMap; +import java.util.Map; import org.glassfish.pfl.basic.logex.OperationTracer; import org.glassfish.pfl.dynamic.copyobject.impl.ClassCopier; @@ -37,8 +37,8 @@ import org.glassfish.pfl.dynamic.copyobject.impl.PipelineClassCopierFactory; import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopier; import org.glassfish.pfl.dynamic.copyobject.spi.ReflectiveCopyException; -import org.omg.CORBA.portable.Delegate ; -import org.omg.CORBA.portable.ObjectImpl ; +import org.omg.CORBA.portable.Delegate; +import org.omg.CORBA.portable.ObjectImpl; /** Class used to deep copy arbitrary data. A single * ReflectObjectCopierImpl diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java index e6317f4885..80f7c6cce1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/AsynchInvoke.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.corba; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; /////////////////////////////////////////////////////////////////////////// // helper class for deferred invocations diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java index 437043140c..a572cd7d34 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ContextImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.corba; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import org.omg.CORBA.Any; import org.omg.CORBA.Context; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java index 32ae82fe66..589ee08b88 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NVListImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.corba; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import java.util.ArrayList; import java.util.List; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java index 3466baa736..85e570ec5b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/NamedValueImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.corba; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.NamedValue; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java index 5a4a589247..6321a98927 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/RequestImpl.java @@ -39,10 +39,10 @@ import org.omg.CORBA.SystemException; import org.omg.CORBA.TCKind; import org.omg.CORBA.TypeCode; -import org.omg.CORBA.portable.ApplicationException ; -import org.omg.CORBA.portable.InputStream ; -import org.omg.CORBA.portable.OutputStream ; -import org.omg.CORBA.portable.RemarshalException ; +import org.omg.CORBA.portable.ApplicationException; +import org.omg.CORBA.portable.InputStream; +import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.RemarshalException; public class RequestImpl extends Request diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java index 30aea22a5a..3b1bd8a4e3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/ServerRequestImpl.java @@ -20,8 +20,8 @@ package com.sun.corba.ee.impl.corba; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.MessageMediator; import org.omg.CORBA.Any; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java index ba1a78fd8b..91794c5915 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TCUtility.java @@ -22,7 +22,7 @@ import com.sun.corba.ee.impl.encoding.CDRInputObject; import com.sun.corba.ee.impl.encoding.CDROutputObject; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import java.io.Serializable; import java.math.BigDecimal; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java index c8c46ff7c6..9d52827c00 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/corba/TypeCodeImpl.java @@ -28,7 +28,7 @@ import com.sun.corba.ee.impl.encoding.WrapperInputStream; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.spi.trace.DynamicType ; +import com.sun.corba.ee.spi.trace.DynamicType; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -37,13 +37,13 @@ import org.glassfish.pfl.dynamic.copyobject.spi.Copy; import org.glassfish.pfl.dynamic.copyobject.spi.CopyType; -import org.omg.CORBA.Any ; -import org.omg.CORBA.StructMember ; -import org.omg.CORBA.TCKind ; -import org.omg.CORBA.TypeCode ; -import org.omg.CORBA.UnionMember ; -import org.omg.CORBA.ValueMember ; -import org.omg.CORBA.TypeCodePackage.BadKind ; +import org.omg.CORBA.Any; +import org.omg.CORBA.StructMember; +import org.omg.CORBA.TCKind; +import org.omg.CORBA.TypeCode; +import org.omg.CORBA.UnionMember; +import org.omg.CORBA.ValueMember; +import org.omg.CORBA.TypeCodePackage.BadKind; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java index 07d0e6670d..7dcff09a5f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyBasicImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TCKind; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyCollectionImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyCollectionImpl.java index 1816144c31..3f9a85280e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyCollectionImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyCollectionImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java index 8fd4695a76..5c2c736e12 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyComplexImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TCKind; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyConstructedImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyConstructedImpl.java index 4f204bab2a..d2bef117ca 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyConstructedImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyConstructedImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.dynamicany; import com.sun.corba.ee.impl.corba.TypeCodeImpl; // needed for recursive type codes -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java index 0625bb1858..baf2eeb8f7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyFactoryImpl.java @@ -21,7 +21,7 @@ -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import java.io.IOException; import java.io.ObjectInputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java index 1a9ed67bd2..6067ddd910 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyImpl.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java index f7df403182..410e7edfae 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynAnyUtil.java @@ -20,8 +20,8 @@ package com.sun.corba.ee.impl.dynamicany; import com.sun.corba.ee.impl.corba.AnyImpl; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ORB; import java.math.BigDecimal; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java index 22590b801e..22aaac6d75 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynArrayImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java index 5e2a807295..04b5a27dab 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynEnumImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java index 15836f6e49..0714b4e0e5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynFixedImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import java.math.BigDecimal; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java index cf957db6f5..0b683d2ed8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynSequenceImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.BAD_OPERATION; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java index 87d88cdf0e..d9a5a91455 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynStructImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java index 2c317609fe..e36906b6f1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynUnionImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java index 4cab6d73cc..cc5c76d0f9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueBoxImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java index 280c86a645..083362a8ea 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueCommonImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueImpl.java index 0d693c4712..e5447a8361 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/dynamicany/DynValueImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.dynamicany; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.Any; import org.omg.CORBA.TypeCode; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java index 6ad668a1c0..624380416a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDRInputObject.java @@ -27,7 +27,7 @@ import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.MessageMediator; -import com.sun.corba.ee.spi.trace.MonitorRead ; +import com.sun.corba.ee.spi.trace.MonitorRead; import com.sun.corba.ee.spi.trace.Transport; import com.sun.corba.ee.spi.transport.Connection; import com.sun.org.omg.SendingContext.CodeBase; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java index 5589cbe169..09989ebe89 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CDROutputObject.java @@ -26,12 +26,12 @@ import com.sun.corba.ee.spi.logging.OMGSystemException; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.spi.protocol.MessageMediator ; -import com.sun.corba.ee.spi.trace.CdrWrite ; +import com.sun.corba.ee.spi.protocol.MessageMediator; +import com.sun.corba.ee.spi.trace.CdrWrite; import com.sun.corba.ee.spi.transport.Connection; import com.sun.corba.ee.spi.transport.TransportManager; -import java.io.IOException ; +import java.io.IOException; import java.io.ObjectInputStream; import java.lang.reflect.Field; import java.nio.ByteBuffer; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CachedCodeBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CachedCodeBase.java index f0792cc705..e7a4fcbb45 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CachedCodeBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/CachedCodeBase.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.encoding; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.transport.Connection; import com.sun.org.omg.CORBA.ValueDefPackage.FullValueDescription; import com.sun.org.omg.SendingContext.CodeBase; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java index 5fff47885b..529c692f35 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/encoding/WrapperInputStream.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.Map; -import org.omg.CORBA.Any ; -import org.omg.CORBA.TypeCode ; +import org.omg.CORBA.Any; +import org.omg.CORBA.TypeCode; import org.omg.CORBA_2_3.portable.InputStream; public class WrapperInputStream extends org.omg.CORBA_2_3.portable.InputStream implements TypeCodeReader diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java index 2aa5c9ba22..0a00d89730 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/GroupInfoServiceBase.java @@ -28,7 +28,7 @@ import com.sun.corba.ee.spi.folb.ClusterInstanceInfo; import com.sun.corba.ee.spi.folb.GroupInfoService; import com.sun.corba.ee.spi.folb.GroupInfoServiceObserver; -import com.sun.corba.ee.spi.trace.Folb ; +import com.sun.corba.ee.spi.trace.Folb; import java.util.ArrayList; import java.util.LinkedList; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java index dfd1350b55..75690eb418 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/InitialGroupInfoService.java @@ -23,34 +23,34 @@ import com.sun.corba.ee.spi.folb.ClusterInstanceInfo; import com.sun.corba.ee.spi.folb.GroupInfoService; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.trace.Folb; -import java.rmi.Remote ; -import java.rmi.RemoteException ; -import java.util.List ; +import java.rmi.Remote; +import java.rmi.RemoteException; +import java.util.List; -import javax.rmi.PortableRemoteObject ; +import javax.rmi.PortableRemoteObject; import javax.rmi.CORBA.Tie; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.CORBA.LocalObject ; +import org.omg.CORBA.LocalObject; -//import com.sun.corba.ee.spi.orb.ORB ; +//import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.ORB; import org.omg.CORBA.Policy; -import org.omg.CosNaming.NameComponent ; -import org.omg.CosNaming.NamingContext ; -import org.omg.CosNaming.NamingContextHelper ; -import org.omg.PortableServer.ForwardRequest ; +import org.omg.CosNaming.NameComponent; +import org.omg.CosNaming.NamingContext; +import org.omg.CosNaming.NamingContextHelper; +import org.omg.PortableServer.ForwardRequest; import org.omg.PortableServer.LifespanPolicyValue; import org.omg.PortableServer.POA; -import org.omg.PortableServer.RequestProcessingPolicyValue ; +import org.omg.PortableServer.RequestProcessingPolicyValue; import org.omg.PortableServer.Servant; -import org.omg.PortableServer.ServantLocator ; -import org.omg.PortableServer.ServantRetentionPolicyValue ; -import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ; +import org.omg.PortableServer.ServantLocator; +import org.omg.PortableServer.ServantRetentionPolicyValue; +import org.omg.PortableServer.ServantLocatorPackage.CookieHolder; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java index d9bb90b1fb..015f160172 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/folb/ServerGroupManager.java @@ -28,16 +28,16 @@ import com.sun.corba.ee.spi.folb.GroupInfoService; import com.sun.corba.ee.spi.folb.GroupInfoServiceObserver; import com.sun.corba.ee.spi.folb.SocketInfo; -import com.sun.corba.ee.spi.ior.iiop.ClusterInstanceInfoComponent ; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; +import com.sun.corba.ee.spi.ior.iiop.ClusterInstanceInfoComponent; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; import com.sun.corba.ee.spi.legacy.interceptor.ServerRequestInfoExt; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory; import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager; -import com.sun.corba.ee.spi.orb.DataCollector ; +import com.sun.corba.ee.spi.orb.DataCollector; import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.spi.orb.ORBConfigurator ; +import com.sun.corba.ee.spi.orb.ORBConfigurator; import com.sun.corba.ee.spi.trace.Folb; import java.net.InetAddress; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java index b46a49330d..fb5c82a3e5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ClientRequestInfoImpl.java @@ -33,8 +33,8 @@ import com.sun.corba.ee.spi.transport.ContactInfoList; import com.sun.corba.ee.spi.transport.ContactInfoListIterator; -import java.util.HashMap ; -import java.util.Map ; +import java.util.HashMap; +import java.util.Map; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; import org.omg.CORBA.Any; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java index 4804c8ecb9..48db890aec 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/IORInfoImpl.java @@ -19,17 +19,17 @@ package com.sun.corba.ee.impl.interceptors; -import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder ; +import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder; import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt; import com.sun.corba.ee.spi.legacy.interceptor.UnknownType; -import com.sun.corba.ee.spi.logging.InterceptorsSystemException ; -import com.sun.corba.ee.spi.logging.OMGSystemException ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.InterceptorsSystemException; +import com.sun.corba.ee.spi.logging.OMGSystemException; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.oa.ObjectAdapter; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.Iterator ; +import java.util.Iterator; import org.omg.CORBA.LocalObject; import org.omg.CORBA.Policy; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java index 6262152c58..f2f68bd530 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/InterceptorList.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.interceptors; -import com.sun.corba.ee.spi.logging.InterceptorsSystemException ; +import com.sun.corba.ee.spi.logging.InterceptorsSystemException; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java index da76741be7..5121e1b989 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ORBInitInfoImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.interceptors; -import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt ; +import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt; import com.sun.corba.ee.spi.logging.InterceptorsSystemException; import com.sun.corba.ee.spi.logging.OMGSystemException; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java index d6640c5cb0..8b4bba1f2e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PIHandlerImpl.java @@ -32,7 +32,7 @@ import com.sun.corba.ee.spi.protocol.ForwardException; import com.sun.corba.ee.spi.protocol.MessageMediator; import com.sun.corba.ee.spi.protocol.PIHandler; -import com.sun.corba.ee.spi.protocol.RetryType ; +import com.sun.corba.ee.spi.protocol.RetryType; import com.sun.corba.ee.spi.trace.TraceInterceptor; import java.util.HashMap; @@ -54,7 +54,7 @@ import org.omg.PortableInterceptor.Interceptor; import org.omg.PortableInterceptor.LOCATION_FORWARD; import org.omg.PortableInterceptor.ORBInitializer; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; import org.omg.PortableInterceptor.PolicyFactory; import org.omg.PortableInterceptor.SUCCESSFUL; import org.omg.PortableInterceptor.SYSTEM_EXCEPTION; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java index e04ca2448c..d6aab72903 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/PINoOpHandlerImpl.java @@ -32,9 +32,9 @@ import org.omg.CORBA.portable.RemarshalException; import org.omg.PortableInterceptor.Current; import org.omg.PortableInterceptor.Interceptor; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; import org.omg.PortableInterceptor.PolicyFactory; -import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName ; +import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; /** * This is No-Op implementation of PIHandler. It is used in ORBConfigurator diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java index 397ae01eea..70a51d12d1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/interceptors/ServerRequestInfoImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.interceptors; import com.sun.corba.ee.impl.protocol.giopmsgheaders.ReplyMessage; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; import com.sun.corba.ee.spi.legacy.interceptor.ServerRequestInfoExt; import com.sun.corba.ee.spi.oa.ObjectAdapter; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java index 0e2d93c0df..ab97e85bf4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java @@ -21,7 +21,6 @@ package com.sun.corba.ee.impl.io; -import com.sun.corba.ee.impl.io.InputStreamHook.ReadObjectState; import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; import com.sun.corba.ee.impl.misc.ClassInfoCache; import com.sun.corba.ee.impl.util.Utility; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java index 5a5532a9ea..89915a91c6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ObjectStreamClassCorbaExt.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.io; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; -import com.sun.corba.ee.impl.misc.ORBUtility ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; +import com.sun.corba.ee.impl.misc.ORBUtility; import java.lang.reflect.Method; import java.security.AccessController; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java index 3ccc4727a1..a5c6e38f7e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueHandlerImpl.java @@ -22,20 +22,20 @@ import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; import com.sun.corba.ee.impl.util.RepositoryId; import com.sun.corba.ee.impl.util.Utility; import com.sun.corba.ee.spi.logging.OMGSystemException; import com.sun.corba.ee.spi.logging.UtilSystemException; -import com.sun.corba.ee.spi.trace.ValueHandlerRead ; -import com.sun.corba.ee.spi.trace.ValueHandlerWrite ; +import com.sun.corba.ee.spi.trace.ValueHandlerRead; +import com.sun.corba.ee.spi.trace.ValueHandlerWrite; import com.sun.org.omg.SendingContext.CodeBase; import com.sun.org.omg.SendingContext.CodeBaseHelper; import java.io.IOException; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.Map ; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.glassfish.pfl.basic.logex.OperationTracer; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueUtility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueUtility.java index ee7ff74ef1..70037c50ab 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueUtility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/io/ValueUtility.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.io; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; import com.sun.corba.ee.impl.util.RepositoryId; import com.sun.org.omg.CORBA.AttributeDescription; import com.sun.org.omg.CORBA.Initializer; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/EncapsulationUtility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/EncapsulationUtility.java index 6b2d4ef385..08f638318d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/EncapsulationUtility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/EncapsulationUtility.java @@ -20,20 +20,20 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.impl.encoding.CDROutputObject ; -import com.sun.corba.ee.impl.encoding.EncapsInputStream ; +import com.sun.corba.ee.impl.encoding.CDROutputObject; +import com.sun.corba.ee.impl.encoding.EncapsInputStream; import com.sun.corba.ee.impl.encoding.EncapsInputStreamFactory; -import com.sun.corba.ee.impl.encoding.EncapsOutputStream ; +import com.sun.corba.ee.impl.encoding.EncapsOutputStream; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; -import com.sun.corba.ee.spi.ior.Identifiable ; -import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ; -import com.sun.corba.ee.spi.ior.WriteContents ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.Identifiable; +import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder; +import com.sun.corba.ee.spi.ior.WriteContents; +import com.sun.corba.ee.spi.orb.ORB; import java.util.List; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** * This static utility class contains various utility methods for reading and diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java index 832a20d5cb..10d252b187 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/FreezableList.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.ior ; -import com.sun.corba.ee.spi.ior.MakeImmutable ; +import com.sun.corba.ee.spi.ior.MakeImmutable; -import java.util.AbstractList ; -import java.util.List ; +import java.util.AbstractList; +import java.util.List; /** Simple class that delegates all List operations to * another list. It also can be frozen, which means that diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java index a0c64807f8..ad9137a9ad 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericIdentifiable.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.Identifiable ; +import com.sun.corba.ee.spi.ior.Identifiable; -import java.util.Arrays ; +import java.util.Arrays; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedComponent.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedComponent.java index 0feaf268e5..3d0bed02d2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedComponent.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.TaggedComponent ; +import com.sun.corba.ee.spi.ior.TaggedComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedData ; -import org.omg.CORBA.ORB ; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedData; +import org.omg.CORBA.ORB; +import org.omg.CORBA_2_3.portable.InputStream; /** * Generic representation of a tagged component of a type unknown to the ORB diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java index 9f2e0b90ff..0be43aa734 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/GenericTaggedProfile.java @@ -19,16 +19,16 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.impl.encoding.EncapsOutputStream ; +import com.sun.corba.ee.impl.encoding.EncapsOutputStream; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; public class GenericTaggedProfile extends GenericIdentifiable implements TaggedProfile { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORImpl.java index 7db389c126..ea4a031c1f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORImpl.java @@ -23,30 +23,30 @@ import com.sun.corba.ee.impl.encoding.MarshalOutputStream; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; import com.sun.corba.ee.impl.misc.HexOutputStream; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.IORTemplateList ; -import com.sun.corba.ee.spi.ior.IdentifiableContainerBase ; -import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfile ; -import com.sun.corba.ee.spi.logging.IORSystemException ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.IORTemplateList; +import com.sun.corba.ee.spi.ior.IdentifiableContainerBase; +import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; +import com.sun.corba.ee.spi.logging.IORSystemException; import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.orb.ORB; import java.io.IOException; import java.io.StringWriter; -import java.util.HashMap ; -import java.util.Iterator ; -import java.util.Map ; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; -import org.omg.IOP.TAG_INTERNET_IOP ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; +import org.omg.IOP.TAG_INTERNET_IOP; /** An IOR is represented as a list of profiles. * Only objects that extend TaggedProfile should be added to an IOR. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java index 320f32bc67..d9ead26c7b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateImpl.java @@ -19,20 +19,20 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactory ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.IdentifiableContainerBase ; -import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.orb.ORB ; - -import java.util.Iterator ; - -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactory; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.IdentifiableContainerBase; +import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.orb.ORB; + +import java.util.Iterator; + +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** * This class is a container of TaggedProfileTemplates. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java index fd122cb403..8ef2348628 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IORTemplateListImpl.java @@ -19,19 +19,19 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IORFactory ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.IORTemplateList ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IORFactory; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.IORTemplateList; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.ArrayList ; -import java.util.Iterator ; +import java.util.ArrayList; +import java.util.Iterator; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; public class IORTemplateListImpl extends FreezableList implements IORTemplateList diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java index f9a61473e1..86cab854aa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/IdentifiableFactoryFinderBase.java @@ -19,16 +19,16 @@ package com.sun.corba.ee.impl.ior ; -import com.sun.corba.ee.spi.ior.Identifiable ; -import com.sun.corba.ee.spi.ior.IdentifiableFactory ; -import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ; -import com.sun.corba.ee.spi.logging.IORSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.Identifiable; +import com.sun.corba.ee.spi.ior.IdentifiableFactory; +import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder; +import com.sun.corba.ee.spi.logging.IORSystemException; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.HashMap ; -import java.util.Map ; +import java.util.HashMap; +import java.util.Map; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; public abstract class IdentifiableFactoryFinderBase implements IdentifiableFactoryFinder diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/JIDLObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/JIDLObjectKeyTemplate.java index ece4e85c10..a1b1e6041b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/JIDLObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/JIDLObjectKeyTemplate.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; -import org.omg.CORBA.OctetSeqHolder ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA.OctetSeqHolder; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/NewObjectKeyTemplateBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/NewObjectKeyTemplateBase.java index 856427e853..ff5dc8c429 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/NewObjectKeyTemplateBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/NewObjectKeyTemplateBase.java @@ -20,14 +20,14 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersion ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersion; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; public abstract class NewObjectKeyTemplateBase extends ObjectKeyTemplateBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java index 9a5630df0a..1767fe9595 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdArray.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.ior ; -import java.util.Arrays ; -import java.util.Iterator ; +import java.util.Arrays; +import java.util.Iterator; public class ObjectAdapterIdArray extends ObjectAdapterIdBase { private final String[] objectAdapterId ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdBase.java index 58947b4fcf..c1f8065b9b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectAdapterIdBase.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.impl.ior ; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; -import java.util.Iterator ; +import java.util.Iterator; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; abstract class ObjectAdapterIdBase implements ObjectAdapterId { @Override diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java index 09215f41d8..fb941c2dee 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectIdImpl.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.impl.misc.ORBUtility ; -import com.sun.corba.ee.spi.ior.ObjectId ; +import com.sun.corba.ee.impl.misc.ORBUtility; +import com.sun.corba.ee.spi.ior.ObjectId; -import java.util.Arrays ; +import java.util.Arrays; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java index 0565f2afa6..d55ab96dac 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyFactoryImpl.java @@ -19,19 +19,19 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.impl.encoding.EncapsInputStream ; +import com.sun.corba.ee.impl.encoding.EncapsInputStream; import com.sun.corba.ee.impl.encoding.EncapsInputStreamFactory; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.ObjectKeyFactory ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.logging.IORSystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.ORB ; - -import org.omg.CORBA.MARSHAL ; -import org.omg.CORBA.OctetSeqHolder ; -import org.omg.CORBA_2_3.portable.InputStream ; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.ObjectKeyFactory; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.logging.IORSystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.ORB; + +import org.omg.CORBA.MARSHAL; +import org.omg.CORBA.OctetSeqHolder; +import org.omg.CORBA_2_3.portable.InputStream; /** Based on the magic and scid, return the appropriate * ObjectKeyTemplate. Expects to be called with a valid diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java index 75873ce91d..15855835c7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyImpl.java @@ -19,16 +19,16 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.impl.encoding.EncapsOutputStream ; +import com.sun.corba.ee.impl.encoding.EncapsOutputStream; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; import com.sun.corba.ee.spi.logging.IORSystemException; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java index d89e622e56..a870c2e23c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectKeyTemplateBase.java @@ -20,16 +20,16 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.logging.IORSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersion ; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; - -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.logging.IORSystemException; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersion; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; + +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java index 4a3c30a498..ea313ebf7a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceFactoryImpl.java @@ -22,14 +22,14 @@ import com.sun.corba.ee.spi.ior.IORFactories; import com.sun.corba.ee.spi.ior.IORFactory; import com.sun.corba.ee.spi.ior.IORTemplateList; -import com.sun.corba.ee.spi.orb.ORB ; - -import org.omg.CORBA.TypeCode ; -import org.omg.CORBA.portable.InputStream ; -import org.omg.CORBA.portable.OutputStream ; -import org.omg.CORBA.portable.StreamableValue ; -import org.omg.PortableInterceptor.ObjectReferenceFactory ; -import org.omg.PortableInterceptor.ObjectReferenceFactoryHelper ; +import com.sun.corba.ee.spi.orb.ORB; + +import org.omg.CORBA.TypeCode; +import org.omg.CORBA.portable.InputStream; +import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.StreamableValue; +import org.omg.PortableInterceptor.ObjectReferenceFactory; +import org.omg.PortableInterceptor.ObjectReferenceFactoryHelper; /** This is an implementation of the ObjectReferenceFactory abstract value * type defined by the portable interceptors IDL. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceProducerBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceProducerBase.java index bf7e826b02..dce062ac27 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceProducerBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceProducerBase.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.impl.ior ; -import com.sun.corba.ee.impl.misc.ORBUtility ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IORFactory ; -import com.sun.corba.ee.spi.ior.IORTemplateList ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.misc.ORBUtility; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IORFactory; +import com.sun.corba.ee.spi.ior.IORTemplateList; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.orb.ORB; import java.io.Serializable; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java index 9b15a348a4..0f62dc2d80 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/ObjectReferenceTemplateImpl.java @@ -23,15 +23,15 @@ import com.sun.corba.ee.spi.ior.IORFactory; import com.sun.corba.ee.spi.ior.IORTemplate; import com.sun.corba.ee.spi.ior.IORTemplateList; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.orb.ORB ; - -import org.omg.CORBA.TypeCode ; -import org.omg.CORBA.portable.InputStream ; -import org.omg.CORBA.portable.OutputStream ; -import org.omg.CORBA.portable.StreamableValue ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; -import org.omg.PortableInterceptor.ObjectReferenceTemplateHelper ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.orb.ORB; + +import org.omg.CORBA.TypeCode; +import org.omg.CORBA.portable.InputStream; +import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.StreamableValue; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; +import org.omg.PortableInterceptor.ObjectReferenceTemplateHelper; /** This is an implementation of the ObjectReferenceTemplate abstract value * type defined by the portable interceptors IDL. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java index 6bc08ef19a..6f3ec80712 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldJIDLObjectKeyTemplate.java @@ -19,14 +19,14 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.impl.encoding.CDRInputObject ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; - -import org.omg.CORBA.OctetSeqHolder ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import com.sun.corba.ee.impl.encoding.CDRInputObject; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; + +import org.omg.CORBA.OctetSeqHolder; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** * Handles object keys created by JDK ORBs from before JDK 1.4.0. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldObjectKeyTemplateBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldObjectKeyTemplateBase.java index bc591e259f..008d510bed 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldObjectKeyTemplateBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldObjectKeyTemplateBase.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldPOAObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldPOAObjectKeyTemplate.java index 1b9dffaf18..77efcc5a51 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldPOAObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/OldPOAObjectKeyTemplate.java @@ -20,14 +20,14 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersion ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersion; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; -import org.omg.CORBA.INTERNAL ; -import org.omg.CORBA.OctetSeqHolder ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA.INTERNAL; +import org.omg.CORBA.OctetSeqHolder; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java index ab94f4bdc0..e37f76c099 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/POAObjectKeyTemplate.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; -import org.omg.CORBA.OctetSeqHolder ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA.OctetSeqHolder; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; public final class POAObjectKeyTemplate extends NewObjectKeyTemplateBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/StubIORImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/StubIORImpl.java index 162bb633b4..6b9bc6fe41 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/StubIORImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/StubIORImpl.java @@ -26,17 +26,17 @@ // Be very careful: com.sun.corba imports must not depend on // PEORB internal classes in ways that prevent portability to // other vendor's ORBs. -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; -import java.io.IOException ; -import java.io.ObjectOutputStream ; -import java.io.Serializable ; -import java.util.Arrays ; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Arrays; -import org.omg.CORBA.ORB ; -import org.omg.CORBA.portable.Delegate ; -import org.omg.CORBA.portable.InputStream ; -import org.omg.CORBA.portable.OutputStream ; +import org.omg.CORBA.ORB; +import org.omg.CORBA.portable.Delegate; +import org.omg.CORBA.portable.InputStream; +import org.omg.CORBA.portable.OutputStream; /** * This class implements a very simply IOR representation diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java index 476b6845fa..e992e2d2e2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedComponentFactoryFinderImpl.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.impl.encoding.EncapsOutputStream ; +import com.sun.corba.ee.impl.encoding.EncapsOutputStream; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; -import com.sun.corba.ee.spi.ior.TaggedComponent ; -import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.TaggedComponent; +import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java index 88cf577e76..55426880da 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileFactoryFinderImpl.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; public class TaggedProfileFactoryFinderImpl extends IdentifiableFactoryFinderBase diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java index f5617b56d0..8e8e18137b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/TaggedProfileTemplateFactoryFinderImpl.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/WireObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/WireObjectKeyTemplate.java index 22987aceed..9824c194f1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/WireObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/WireObjectKeyTemplate.java @@ -21,17 +21,17 @@ package com.sun.corba.ee.impl.ior; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.logging.IORSystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersion ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; - -import org.omg.CORBA_2_3.portable.OutputStream ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.logging.IORSystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersion; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; + +import org.omg.CORBA_2_3.portable.OutputStream; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java index 4ea1c9c4f2..79be678a4d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/AlternateIIOPAddressComponentImpl.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.impl.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedComponentBase ; -import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; +import com.sun.corba.ee.spi.ior.TaggedComponentBase; +import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; -import org.omg.CORBA_2_3.portable.OutputStream ; -import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS ; +import org.omg.CORBA_2_3.portable.OutputStream; +import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java index e63bdf51b7..193db3acb1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/CodeSetsComponentImpl.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.impl.ior.iiop; -import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo ; -import com.sun.corba.ee.impl.encoding.MarshalInputStream ; -import com.sun.corba.ee.impl.encoding.MarshalOutputStream ; -import com.sun.corba.ee.spi.ior.TaggedComponentBase ; -import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent ; +import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; +import com.sun.corba.ee.impl.encoding.MarshalInputStream; +import com.sun.corba.ee.impl.encoding.MarshalOutputStream; +import com.sun.corba.ee.spi.ior.TaggedComponentBase; +import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; -import org.omg.IOP.TAG_CODE_SETS ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; +import org.omg.IOP.TAG_CODE_SETS; public class CodeSetsComponentImpl extends TaggedComponentBase implements CodeSetsComponent diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java index aed4d138e6..8e3f4e8f0f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressBase.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.ior.iiop ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; abstract class IIOPAddressBase implements IIOPAddress { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java index 1d9440cf9c..2665790119 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPAddressImpl.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.ior.iiop; -import com.sun.corba.ee.spi.logging.IORSystemException ; +import com.sun.corba.ee.spi.logging.IORSystemException; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java index 58db755ea7..21513722b3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/IIOPProfileTemplateImpl.java @@ -20,26 +20,26 @@ package com.sun.corba.ee.impl.ior.iiop; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; -import com.sun.corba.ee.impl.ior.EncapsulationUtility ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedComponent ; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplateBase ; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; +import com.sun.corba.ee.impl.ior.EncapsulationUtility; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedComponent; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplateBase; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.transport.SocketInfo; -import java.util.Iterator ; +import java.util.Iterator; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; -import org.omg.IOP.TAG_INTERNET_IOP ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; +import org.omg.IOP.TAG_INTERNET_IOP; /** * @author diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaCodebaseComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaCodebaseComponentImpl.java index bf786aca96..53320cd12c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaCodebaseComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/JavaCodebaseComponentImpl.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.impl.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedComponentBase ; -import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent ; +import com.sun.corba.ee.spi.ior.TaggedComponentBase; +import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent; -import org.omg.CORBA_2_3.portable.OutputStream ; -import org.omg.IOP.TAG_JAVA_CODEBASE ; +import org.omg.CORBA_2_3.portable.OutputStream; +import org.omg.IOP.TAG_JAVA_CODEBASE; public class JavaCodebaseComponentImpl extends TaggedComponentBase implements JavaCodebaseComponent diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java index 04b83707a9..42d2017eb9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/LoadBalancingComponentImpl.java @@ -21,7 +21,7 @@ import com.sun.corba.ee.spi.ior.TaggedComponentBase; import com.sun.corba.ee.spi.ior.iiop.LoadBalancingComponent; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBConstants; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java index c2d68f1acc..9828bf9e24 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/ORBTypeComponentImpl.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.impl.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedComponentBase ; -import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent ; +import com.sun.corba.ee.spi.ior.TaggedComponentBase; +import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent; -import org.omg.CORBA_2_3.portable.OutputStream ; -import org.omg.IOP.TAG_ORB_TYPE ; +import org.omg.CORBA_2_3.portable.OutputStream; +import org.omg.IOP.TAG_ORB_TYPE; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java index 46c494a0a1..e102b39466 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/ior/iiop/RequestPartitioningComponentImpl.java @@ -21,7 +21,7 @@ import com.sun.corba.ee.spi.ior.TaggedComponentBase; import com.sun.corba.ee.spi.ior.iiop.RequestPartitioningComponent; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBConstants; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java index c279558b4d..96b3e25024 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/CORBA/StubDelegateImpl.java @@ -20,9 +20,9 @@ package com.sun.corba.ee.impl.javax.rmi.CORBA; -import com.sun.corba.ee.impl.ior.StubIORImpl ; -import com.sun.corba.ee.impl.presentation.rmi.StubConnectImpl ; -import com.sun.corba.ee.spi.logging.UtilSystemException ; +import com.sun.corba.ee.impl.ior.StubIORImpl; +import com.sun.corba.ee.impl.presentation.rmi.StubConnectImpl; +import com.sun.corba.ee.spi.logging.UtilSystemException; import java.io.IOException; import java.rmi.RemoteException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java index 8a55250471..eda2dbb09c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/javax/rmi/PortableRemoteObject.java @@ -21,7 +21,7 @@ package com.sun.corba.ee.impl.javax.rmi; import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; import com.sun.corba.ee.impl.util.RepositoryId; import com.sun.corba.ee.impl.util.Utility; import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/DefaultSocketFactory.java b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/DefaultSocketFactory.java index 9b74532192..77e222c195 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/DefaultSocketFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/DefaultSocketFactory.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.impl.misc.ORBUtility; import com.sun.corba.ee.spi.ior.IOR; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; import com.sun.corba.ee.spi.legacy.connection.GetEndPointInfoAgainException; import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryAcceptorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryAcceptorImpl.java index 132031417f..7cb822cb66 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryAcceptorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/SocketFactoryAcceptorImpl.java @@ -27,7 +27,7 @@ import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.trace.Transport; -import java.util.Iterator ; +import java.util.Iterator; /** * @author Harold Carr diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java index 83efdc85aa..8dd5c18573 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/legacy/connection/USLPort.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.legacy.connection; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; @ManagedData @Description( "An address of a transport endpoint that the ORB " diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ClassInfoCache.java b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ClassInfoCache.java index 1d68bfc157..7d1d1b89fb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ClassInfoCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ClassInfoCache.java @@ -19,23 +19,23 @@ package com.sun.corba.ee.impl.misc; -import com.sun.corba.ee.spi.orb.ORB ; - -import java.io.Externalizable ; -import java.io.Serializable ; -import java.lang.reflect.Proxy ; -import java.rmi.Remote ; -import java.rmi.RemoteException ; -import java.util.Map ; -import java.util.WeakHashMap ; - -import org.omg.CORBA.UserException ; -import org.omg.CORBA.portable.CustomValue ; -import org.omg.CORBA.portable.IDLEntity ; -import org.omg.CORBA.portable.ObjectImpl ; -import org.omg.CORBA.portable.Streamable ; -import org.omg.CORBA.portable.StreamableValue ; -import org.omg.CORBA.portable.ValueBase ; +import com.sun.corba.ee.spi.orb.ORB; + +import java.io.Externalizable; +import java.io.Serializable; +import java.lang.reflect.Proxy; +import java.rmi.Remote; +import java.rmi.RemoteException; +import java.util.Map; +import java.util.WeakHashMap; + +import org.omg.CORBA.UserException; +import org.omg.CORBA.portable.CustomValue; +import org.omg.CORBA.portable.IDLEntity; +import org.omg.CORBA.portable.ObjectImpl; +import org.omg.CORBA.portable.Streamable; +import org.omg.CORBA.portable.StreamableValue; +import org.omg.CORBA.portable.ValueBase; /** This class caches information about classes that is somewhat expensive * to obtain, notably the results of isInterface(), isArray(), and isAssignableFrom. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java index 3cb7c20b70..2dcad039a9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/misc/ORBUtility.java @@ -21,31 +21,31 @@ package com.sun.corba.ee.impl.misc; -import com.sun.corba.ee.impl.corba.CORBAObjectImpl ; +import com.sun.corba.ee.impl.corba.CORBAObjectImpl; import com.sun.corba.ee.impl.ior.iiop.JavaSerializationComponent; import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; -import com.sun.corba.ee.spi.logging.OMGSystemException ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.OMGSystemException; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBClassLoader; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; -import com.sun.corba.ee.spi.protocol.ClientDelegate ; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; +import com.sun.corba.ee.spi.protocol.ClientDelegate; import com.sun.corba.ee.spi.protocol.MessageMediator; -import com.sun.corba.ee.spi.transport.ContactInfoList ; +import com.sun.corba.ee.spi.transport.ContactInfoList; -import java.io.IOException ; -import java.io.PrintStream ; +import java.io.IOException; +import java.io.PrintStream; import java.io.Serializable; import java.lang.System.Logger; -import java.net.SocketAddress ; -import java.nio.ByteBuffer ; -import java.nio.channels.SocketChannel ; +import java.net.SocketAddress; +import java.nio.ByteBuffer; +import java.nio.channels.SocketChannel; import java.security.AccessController; import java.security.PermissionCollection; import java.security.Policy; @@ -60,15 +60,15 @@ import javax.rmi.CORBA.ValueHandler; import javax.rmi.CORBA.ValueHandlerMultiFormat; -import org.omg.CORBA.Any ; -import org.omg.CORBA.CompletionStatus ; -import org.omg.CORBA.StructMember ; -import org.omg.CORBA.SystemException ; -import org.omg.CORBA.TCKind ; -import org.omg.CORBA.TypeCode ; -import org.omg.CORBA.TypeCodePackage.BadKind ; -import org.omg.CORBA.portable.InputStream ; -import org.omg.CORBA.portable.OutputStream ; +import org.omg.CORBA.Any; +import org.omg.CORBA.CompletionStatus; +import org.omg.CORBA.StructMember; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TCKind; +import org.omg.CORBA.TypeCode; +import org.omg.CORBA.TypeCodePackage.BadKind; +import org.omg.CORBA.portable.InputStream; +import org.omg.CORBA.portable.OutputStream; import static java.lang.System.Logger.Level.DEBUG; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java index 0acb7617b4..807f8c72ea 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/cosnaming/NamingContextImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.naming.cosnaming; import com.sun.corba.ee.impl.naming.namingutil.INSURLHandler; -import com.sun.corba.ee.spi.logging.NamingSystemException ; +import com.sun.corba.ee.spi.logging.NamingSystemException; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.trace.Naming; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java index 5af38f86f4..5c1c166317 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/naming/namingutil/INSURLBase.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.naming.namingutil; -import com.sun.corba.ee.spi.logging.OMGSystemException ; +import com.sun.corba.ee.spi.logging.OMGSystemException; /** The corbaloc: URL definitions from the -ORBInitDef and -ORBDefaultInitDef's * will be stored in this object. This object is capable of storing multiple diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/NullServantImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/NullServantImpl.java index 5fe768fc38..f9856d77a1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/NullServantImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/NullServantImpl.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.oa ; -import com.sun.corba.ee.spi.oa.NullServant ; +import com.sun.corba.ee.spi.oa.NullServant; -import org.omg.CORBA.SystemException ; +import org.omg.CORBA.SystemException; public class NullServantImpl implements NullServant { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java index 6e0013e1d4..ee6adb70ab 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/AOMEntry.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.oa.poa ; -import com.sun.corba.ee.spi.logging.POASystemException ; +import com.sun.corba.ee.spi.logging.POASystemException; import com.sun.corba.ee.spi.trace.PoaFSM; -import java.util.concurrent.locks.Condition ; +import java.util.concurrent.locks.Condition; import org.glassfish.pfl.basic.fsm.Action; import org.glassfish.pfl.basic.fsm.FSM; @@ -34,7 +34,7 @@ import org.glassfish.pfl.basic.fsm.State; import org.glassfish.pfl.basic.fsm.StateEngine; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.PortableServer.POAPackage.ObjectAlreadyActive ; +import org.omg.PortableServer.POAPackage.ObjectAlreadyActive; import static org.glassfish.pfl.basic.fsm.Guard.Base.constant; import static org.glassfish.pfl.basic.fsm.Guard.Base.eq; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java index 34c9ac0da6..86fa66ec36 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/ActiveObjectMap.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.impl.oa.poa; -import java.util.HashMap ; -import java.util.HashSet ; -import java.util.Map ; -import java.util.Set ; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** The ActiveObjectMap maintains associations between servants and * their keys. There are two variants, to support whether or not diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java index 4e23f51b48..b1d184db94 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/DelegateImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.oa.poa; -import com.sun.corba.ee.spi.logging.POASystemException ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.orb.ORB; import java.util.EmptyStackException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java index 143bfd0c8c..46d545a410 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POACurrent.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.oa.poa; -import com.sun.corba.ee.spi.logging.POASystemException ; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; +import com.sun.corba.ee.spi.oa.ObjectAdapter; +import com.sun.corba.ee.spi.orb.ORB; import java.util.EmptyStackException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java index d3a2c9bef5..39230339ca 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAFactory.java @@ -20,21 +20,21 @@ package com.sun.corba.ee.impl.oa.poa ; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.logging.OMGSystemException ; -import com.sun.corba.ee.spi.logging.POASystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; -import com.sun.corba.ee.spi.oa.ObjectAdapterFactory ; -import com.sun.corba.ee.spi.orb.ORB ; - -import java.util.ArrayList ; -import java.util.HashSet ; -import java.util.Iterator ; -import java.util.List ; -import java.util.Map ; -import java.util.Set ; -import java.util.WeakHashMap ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.logging.OMGSystemException; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.oa.ObjectAdapter; +import com.sun.corba.ee.spi.oa.ObjectAdapterFactory; +import com.sun.corba.ee.spi.orb.ORB; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; @@ -43,12 +43,12 @@ import org.glassfish.gmbal.ManagedObject; import org.glassfish.gmbal.ManagedObjectManager; import org.glassfish.pfl.basic.func.NullaryFunction; -import org.omg.CORBA.OBJECT_NOT_EXIST ; -import org.omg.CORBA.TRANSIENT ; -import org.omg.CORBA.ORBPackage.InvalidName ; -import org.omg.PortableServer.POA ; -import org.omg.PortableServer.POAManager ; -import org.omg.PortableServer.Servant ; +import org.omg.CORBA.OBJECT_NOT_EXIST; +import org.omg.CORBA.TRANSIENT; +import org.omg.CORBA.ORBPackage.InvalidName; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.POAManager; +import org.omg.PortableServer.Servant; @ManagedObject @Description( "The factory for all POAs and POAManagers") diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java index e015c69428..1972fef287 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAImpl.java @@ -20,42 +20,42 @@ package com.sun.corba.ee.impl.oa.poa; -import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray ; -import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate ; -import com.sun.corba.ee.spi.copyobject.CopierManager ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IORTemplateList ; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedProfile ; +import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray; +import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate; +import com.sun.corba.ee.spi.copyobject.CopierManager; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IORTemplateList; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedProfile; import com.sun.corba.ee.spi.logging.OMGSystemException; import com.sun.corba.ee.spi.logging.POASystemException; import com.sun.corba.ee.spi.misc.ORBConstants; -import com.sun.corba.ee.spi.oa.OADestroyed ; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; -import com.sun.corba.ee.spi.oa.ObjectAdapterBase ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.protocol.ForwardException ; +import com.sun.corba.ee.spi.oa.OADestroyed; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; +import com.sun.corba.ee.spi.oa.ObjectAdapterBase; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.protocol.ForwardException; import com.sun.corba.ee.spi.trace.Poa; import java.util.ArrayList; -import java.util.Collection ; -import java.util.HashMap ; -import java.util.HashSet ; -import java.util.Iterator ; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; -import java.util.Map ; -import java.util.Set ; +import java.util.Map; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.Condition ; +import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.management.ObjectName ; +import javax.management.ObjectName; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; @@ -64,41 +64,41 @@ import org.glassfish.gmbal.NameValue; import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.CORBA.Policy ; -import org.omg.CORBA.SystemException ; -import org.omg.PortableInterceptor.NON_EXISTENT ; -import org.omg.PortableInterceptor.ObjectReferenceFactory ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; -import org.omg.PortableServer.AdapterActivator ; -import org.omg.PortableServer.ForwardRequest ; +import org.omg.CORBA.Policy; +import org.omg.CORBA.SystemException; +import org.omg.PortableInterceptor.NON_EXISTENT; +import org.omg.PortableInterceptor.ObjectReferenceFactory; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; +import org.omg.PortableServer.AdapterActivator; +import org.omg.PortableServer.ForwardRequest; import org.omg.PortableServer.IdAssignmentPolicy; -import org.omg.PortableServer.IdAssignmentPolicyValue ; +import org.omg.PortableServer.IdAssignmentPolicyValue; import org.omg.PortableServer.IdUniquenessPolicy; -import org.omg.PortableServer.IdUniquenessPolicyValue ; +import org.omg.PortableServer.IdUniquenessPolicyValue; import org.omg.PortableServer.ImplicitActivationPolicy; -import org.omg.PortableServer.ImplicitActivationPolicyValue ; +import org.omg.PortableServer.ImplicitActivationPolicyValue; import org.omg.PortableServer.LifespanPolicy; -import org.omg.PortableServer.LifespanPolicyValue ; -import org.omg.PortableServer.POA ; -import org.omg.PortableServer.POAManager ; +import org.omg.PortableServer.LifespanPolicyValue; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.POAManager; import org.omg.PortableServer.RequestProcessingPolicy; -import org.omg.PortableServer.RequestProcessingPolicyValue ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.ServantManager ; +import org.omg.PortableServer.RequestProcessingPolicyValue; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantManager; import org.omg.PortableServer.ServantRetentionPolicy; -import org.omg.PortableServer.ServantRetentionPolicyValue ; +import org.omg.PortableServer.ServantRetentionPolicyValue; import org.omg.PortableServer.ThreadPolicy; -import org.omg.PortableServer.ThreadPolicyValue ; -import org.omg.PortableServer.POAPackage.AdapterAlreadyExists ; -import org.omg.PortableServer.POAPackage.AdapterNonExistent ; -import org.omg.PortableServer.POAPackage.InvalidPolicy ; -import org.omg.PortableServer.POAPackage.NoServant ; -import org.omg.PortableServer.POAPackage.ObjectAlreadyActive ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.ServantAlreadyActive ; -import org.omg.PortableServer.POAPackage.ServantNotActive ; -import org.omg.PortableServer.POAPackage.WrongAdapter ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.ThreadPolicyValue; +import org.omg.PortableServer.POAPackage.AdapterAlreadyExists; +import org.omg.PortableServer.POAPackage.AdapterNonExistent; +import org.omg.PortableServer.POAPackage.InvalidPolicy; +import org.omg.PortableServer.POAPackage.NoServant; +import org.omg.PortableServer.POAPackage.ObjectAlreadyActive; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.ServantAlreadyActive; +import org.omg.PortableServer.POAPackage.ServantNotActive; +import org.omg.PortableServer.POAPackage.WrongAdapter; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** * POAImpl is the implementation of the Portable Object Adapter. It diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java index b036a2b551..baf80ba42a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAManagerImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.oa.poa; -import com.sun.corba.ee.spi.logging.POASystemException ; -import com.sun.corba.ee.spi.protocol.PIHandler ; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.protocol.PIHandler; import com.sun.corba.ee.spi.trace.Poa; import java.util.HashSet; @@ -30,19 +30,19 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedObject ; -import org.glassfish.gmbal.ManagedOperation ; -import org.glassfish.gmbal.NameValue ; -import org.glassfish.gmbal.ParameterNames ; -import org.glassfish.pfl.basic.contain.MultiSet ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; +import org.glassfish.gmbal.ManagedOperation; +import org.glassfish.gmbal.NameValue; +import org.glassfish.gmbal.ParameterNames; +import org.glassfish.pfl.basic.contain.MultiSet; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.PortableInterceptor.ACTIVE ; -import org.omg.PortableInterceptor.DISCARDING ; -import org.omg.PortableInterceptor.HOLDING ; -import org.omg.PortableInterceptor.INACTIVE ; -import org.omg.PortableInterceptor.NON_EXISTENT ; +import org.omg.PortableInterceptor.ACTIVE; +import org.omg.PortableInterceptor.DISCARDING; +import org.omg.PortableInterceptor.HOLDING; +import org.omg.PortableInterceptor.INACTIVE; +import org.omg.PortableInterceptor.NON_EXISTENT; import org.omg.PortableServer.POAManager; import org.omg.PortableServer.POAManagerPackage.State; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediator.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediator.java index 45751dfefc..91481cf442 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediator.java @@ -22,15 +22,15 @@ import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedData; -import org.omg.PortableServer.ForwardRequest ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.ServantManager ; -import org.omg.PortableServer.POAPackage.NoServant ; -import org.omg.PortableServer.POAPackage.ObjectAlreadyActive ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.ServantAlreadyActive ; -import org.omg.PortableServer.POAPackage.ServantNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.ForwardRequest; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantManager; +import org.omg.PortableServer.POAPackage.NoServant; +import org.omg.PortableServer.POAPackage.ObjectAlreadyActive; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.ServantAlreadyActive; +import org.omg.PortableServer.POAPackage.ServantNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** POAPolicyMediator defines an interface to which the POA delegates all * policy specific operations. This permits code paths for different diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java index 8adbe72286..e37c49938f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase.java @@ -20,16 +20,16 @@ package com.sun.corba.ee.impl.oa.poa ; -import com.sun.corba.ee.impl.misc.ORBUtility ; -import com.sun.corba.ee.spi.extension.ServantCachingPolicy ; +import com.sun.corba.ee.impl.misc.ORBUtility; +import com.sun.corba.ee.spi.extension.ServantCachingPolicy; import com.sun.corba.ee.spi.logging.OMGSystemException; import com.sun.corba.ee.spi.logging.POASystemException; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.PortableServer.ForwardRequest ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.ForwardRequest; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** Implementation of POARequesHandler that provides policy specific * operations on the POA. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java index e7abbdac9c..bfaad7a58d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorBase_R.java @@ -22,12 +22,12 @@ import com.sun.corba.ee.spi.trace.Poa; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.POAPackage.ObjectAlreadyActive ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.ServantAlreadyActive ; -import org.omg.PortableServer.POAPackage.ServantNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.POAPackage.ObjectAlreadyActive; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.ServantAlreadyActive; +import org.omg.PortableServer.POAPackage.ServantNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; @Poa public abstract class POAPolicyMediatorBase_R extends POAPolicyMediatorBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java index 194f62a12a..c91b024649 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_UDS.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.impl.oa.poa ; -import org.omg.PortableServer.ForwardRequest ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.ServantManager ; -import org.omg.PortableServer.POAPackage.NoServant ; -import org.omg.PortableServer.POAPackage.ObjectAlreadyActive ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.ServantAlreadyActive ; -import org.omg.PortableServer.POAPackage.ServantNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.ForwardRequest; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantManager; +import org.omg.PortableServer.POAPackage.NoServant; +import org.omg.PortableServer.POAPackage.ObjectAlreadyActive; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.ServantAlreadyActive; +import org.omg.PortableServer.POAPackage.ServantNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** Implementation of POAPolicyMediator that provides policy specific * operations on the POA. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java index 3c21828800..926603c376 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_NR_USM.java @@ -20,21 +20,21 @@ package com.sun.corba.ee.impl.oa.poa ; -import com.sun.corba.ee.impl.oa.NullServantImpl ; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; - -import org.omg.PortableServer.ForwardRequest ; -import org.omg.PortableServer.POA ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.ServantLocator ; -import org.omg.PortableServer.ServantManager ; -import org.omg.PortableServer.POAPackage.NoServant ; -import org.omg.PortableServer.POAPackage.ObjectAlreadyActive ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.ServantAlreadyActive ; -import org.omg.PortableServer.POAPackage.ServantNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; -import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ; +import com.sun.corba.ee.impl.oa.NullServantImpl; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; + +import org.omg.PortableServer.ForwardRequest; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantLocator; +import org.omg.PortableServer.ServantManager; +import org.omg.PortableServer.POAPackage.NoServant; +import org.omg.PortableServer.POAPackage.ObjectAlreadyActive; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.ServantAlreadyActive; +import org.omg.PortableServer.POAPackage.ServantNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; +import org.omg.PortableServer.ServantLocatorPackage.CookieHolder; /** Implementation of POARequesHandler that provides policy specific * operations on the POA. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java index a873b72075..ad29a49ca9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_AOM.java @@ -19,14 +19,14 @@ package com.sun.corba.ee.impl.oa.poa ; -import com.sun.corba.ee.impl.oa.NullServantImpl ; +import com.sun.corba.ee.impl.oa.NullServantImpl; -import org.omg.PortableServer.ForwardRequest ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.ServantManager ; -import org.omg.PortableServer.POAPackage.NoServant ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.ForwardRequest; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantManager; +import org.omg.PortableServer.POAPackage.NoServant; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** Implementation of POARequesHandler that provides policy specific * operations on the POA in the case: diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java index 97813f70ec..e13b9bd958 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_UDS.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.impl.oa.poa ; -import org.omg.PortableServer.ForwardRequest ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.ServantManager ; -import org.omg.PortableServer.POAPackage.NoServant ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.PortableServer.ForwardRequest; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantManager; +import org.omg.PortableServer.POAPackage.NoServant; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** Implementation of POARequesHandler that provides policy specific * operations on the POA. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java index f6613c9fb6..529f0a844e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java @@ -19,22 +19,22 @@ package com.sun.corba.ee.impl.oa.poa ; -import com.sun.corba.ee.impl.oa.NullServantImpl ; -import com.sun.corba.ee.spi.oa.NullServant ; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; +import com.sun.corba.ee.impl.oa.NullServantImpl; +import com.sun.corba.ee.spi.oa.NullServant; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; import com.sun.corba.ee.spi.trace.Poa; -import java.util.Set ; +import java.util.Set; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.CORBA.SystemException ; -import org.omg.PortableServer.ForwardRequest ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.ServantActivator ; -import org.omg.PortableServer.ServantManager ; -import org.omg.PortableServer.POAPackage.NoServant ; -import org.omg.PortableServer.POAPackage.ObjectNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import org.omg.CORBA.SystemException; +import org.omg.PortableServer.ForwardRequest; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.ServantActivator; +import org.omg.PortableServer.ServantManager; +import org.omg.PortableServer.POAPackage.NoServant; +import org.omg.PortableServer.POAPackage.ObjectNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** Implementation of POARequesHandler that provides policy specific * operations on the POA. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java index bf041b7828..2862d87cfa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/Policies.java @@ -20,14 +20,14 @@ package com.sun.corba.ee.impl.oa.poa; -import com.sun.corba.ee.spi.extension.CopyObjectPolicy ; -import com.sun.corba.ee.spi.extension.ServantCachingPolicy ; -import com.sun.corba.ee.spi.extension.ZeroPortPolicy ; -import com.sun.corba.ee.spi.misc.ORBConstants ; - -import java.util.BitSet ; -import java.util.HashMap ; -import java.util.Map ; +import com.sun.corba.ee.spi.extension.CopyObjectPolicy; +import com.sun.corba.ee.spi.extension.ServantCachingPolicy; +import com.sun.corba.ee.spi.extension.ZeroPortPolicy; +import com.sun.corba.ee.spi.misc.ORBConstants; + +import java.util.BitSet; +import java.util.HashMap; +import java.util.Map; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/minor_code_example.txt b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/minor_code_example.txt index ca4c703fb0..81d3f5c66b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/minor_code_example.txt +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/poa/minor_code_example.txt @@ -19,8 +19,8 @@ package @PKGNAME@ ; -import org.omg.CORBA.OMGVMCID ; -import org.omg.CORBA.CompletionStatus ; +import org.omg.CORBA.OMGVMCID; +import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.@SYSEX@ ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java index 4bb4c6a80d..c225b04be4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryImpl.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.oa.rfm; -import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory ; +import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory; -import org.omg.CORBA.LocalObject ; +import org.omg.CORBA.LocalObject; public class ReferenceFactoryImpl extends LocalObject implements ReferenceFactory { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java index 87569278a1..116be0a69c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceFactoryManagerImpl.java @@ -19,37 +19,37 @@ package com.sun.corba.ee.impl.oa.rfm; -import com.sun.corba.ee.spi.logging.POASystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; -import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory ; -import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.oa.ObjectAdapter; +import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory; +import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.trace.Poa; -import java.util.ArrayList ; -import java.util.Arrays ; -import java.util.HashMap ; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; import java.util.HashSet; -import java.util.List ; -import java.util.Map ; +import java.util.List; +import java.util.Map; import java.util.Set; -import java.util.concurrent.locks.Condition ; -import java.util.concurrent.locks.ReentrantLock ; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedObject; import org.glassfish.pfl.basic.contain.Pair; -import org.omg.CORBA.LocalObject ; -import org.omg.CORBA.Policy ; -import org.omg.PortableServer.AdapterActivator ; -import org.omg.PortableServer.LifespanPolicyValue ; -import org.omg.PortableServer.POA ; -import org.omg.PortableServer.POAManager ; -import org.omg.PortableServer.RequestProcessingPolicyValue ; -import org.omg.PortableServer.ServantLocator ; -import org.omg.PortableServer.ServantRetentionPolicyValue ; -import org.omg.PortableServer.POAManagerPackage.AdapterInactive ; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.Policy; +import org.omg.PortableServer.AdapterActivator; +import org.omg.PortableServer.LifespanPolicyValue; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.POAManager; +import org.omg.PortableServer.RequestProcessingPolicyValue; +import org.omg.PortableServer.ServantLocator; +import org.omg.PortableServer.ServantRetentionPolicyValue; +import org.omg.PortableServer.POAManagerPackage.AdapterInactive; @Poa @ManagedObject diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java index cf0ef53e9d..68e9d14aa2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/rfm/ReferenceManagerConfigurator.java @@ -19,21 +19,21 @@ package com.sun.corba.ee.impl.oa.rfm; -import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt ; -import com.sun.corba.ee.spi.logging.POASystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; -import com.sun.corba.ee.spi.orb.DataCollector ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBConfigurator ; - -import org.omg.CORBA.LocalObject ; -import org.omg.PortableInterceptor.IORInfo ; -import org.omg.PortableInterceptor.IORInterceptor_3_0 ; -import org.omg.PortableInterceptor.ORBInitInfo ; -import org.omg.PortableInterceptor.ORBInitializer ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; -import org.omg.PortableServer.POA ; +import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.oa.ObjectAdapter; +import com.sun.corba.ee.spi.orb.DataCollector; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBConfigurator; + +import org.omg.CORBA.LocalObject; +import org.omg.PortableInterceptor.IORInfo; +import org.omg.PortableInterceptor.IORInterceptor_3_0; +import org.omg.PortableInterceptor.ORBInitInfo; +import org.omg.PortableInterceptor.ORBInitializer; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; +import org.omg.PortableServer.POA; /** Used to initialize the ReferenceManager in the ORB. * The ReferenceManager is an optional component built diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOA.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOA.java index a3620048cd..ea3c3b6230 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOA.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOA.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.oa.toa ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; +import com.sun.corba.ee.spi.oa.ObjectAdapter; /** The Transient Object Adapter is used for standard RMI-IIOP and Java-IDL * (legacy JDK 1.2) object implementations. Its protocol for managing objects is very diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java index b7996b10c7..3357caa5ce 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAFactory.java @@ -20,16 +20,16 @@ package com.sun.corba.ee.impl.oa.toa ; -import com.sun.corba.ee.impl.ior.ObjectKeyTemplateBase ; -import com.sun.corba.ee.impl.javax.rmi.CORBA.Util ; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; -import com.sun.corba.ee.spi.oa.ObjectAdapterFactory ; -import com.sun.corba.ee.spi.orb.ORB ; - -import java.util.HashMap ; -import java.util.Map ; +import com.sun.corba.ee.impl.ior.ObjectKeyTemplateBase; +import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.oa.ObjectAdapter; +import com.sun.corba.ee.spi.oa.ObjectAdapterFactory; +import com.sun.corba.ee.spi.orb.ORB; + +import java.util.HashMap; +import java.util.Map; import org.glassfish.gmbal.AMXMetadata; import org.glassfish.gmbal.Description; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java index bbeb4650c9..ae3dba1f91 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TOAImpl.java @@ -19,21 +19,21 @@ package com.sun.corba.ee.impl.oa.toa ; -import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate ; +import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate; import com.sun.corba.ee.impl.oa.NullServantImpl; import com.sun.corba.ee.impl.oa.poa.Policies; -import com.sun.corba.ee.impl.protocol.JIDLLocalCRDImpl ; -import com.sun.corba.ee.spi.copyobject.CopierManager ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.oa.OADestroyed ; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; -import com.sun.corba.ee.spi.oa.ObjectAdapterBase ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; +import com.sun.corba.ee.impl.protocol.JIDLLocalCRDImpl; +import com.sun.corba.ee.spi.copyobject.CopierManager; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.oa.OADestroyed; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; +import com.sun.corba.ee.spi.oa.ObjectAdapterBase; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; import com.sun.corba.ee.spi.protocol.ClientDelegate; -import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher ; -import com.sun.corba.ee.spi.transport.ContactInfoList ; +import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher; +import com.sun.corba.ee.spi.transport.ContactInfoList; import java.util.concurrent.atomic.AtomicLong; @@ -42,9 +42,9 @@ import org.glassfish.gmbal.ManagedObject; import org.glassfish.gmbal.NameValue; import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory; -import org.omg.CORBA.Policy ; +import org.omg.CORBA.Policy; import org.omg.PortableInterceptor.ACTIVE; -import org.omg.PortableInterceptor.ObjectReferenceFactory ; +import org.omg.PortableInterceptor.ObjectReferenceFactory; /** The Transient Object Adapter (TOA) represents the OA for purely transient * objects. It is used for standard RMI-IIOP as well as backwards compatible diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TransientObjectManager.java b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TransientObjectManager.java index 662fb9c038..c247e3d5f4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TransientObjectManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/oa/toa/TransientObjectManager.java @@ -20,8 +20,8 @@ package com.sun.corba.ee.impl.oa.toa; -import com.sun.corba.ee.impl.misc.ORBUtility ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.misc.ORBUtility; +import com.sun.corba.ee.spi.orb.ORB; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java index 7506a7b7d9..edf460b66a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/AppletDataCollector.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.orb ; -import java.applet.Applet ; -import java.util.Properties ; +import java.applet.Applet; +import java.util.Properties; public class AppletDataCollector extends DataCollectorBase { private Applet applet ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java index 051cff7386..c166404741 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorBase.java @@ -19,23 +19,23 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.org.omg.CORBA.GetPropertyAction ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.DataCollector ; -import com.sun.corba.ee.spi.orb.PropertyParser ; - -import java.applet.Applet ; -import java.io.File ; -import java.io.FileInputStream ; -import java.net.URL ; -import java.security.AccessController ; -import java.security.PrivilegedAction ; -import java.util.Enumeration ; -import java.util.HashSet ; -import java.util.Iterator ; -import java.util.Properties ; -import java.util.Set ; -import java.util.StringTokenizer ; +import com.sun.corba.ee.org.omg.CORBA.GetPropertyAction; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.DataCollector; +import com.sun.corba.ee.spi.orb.PropertyParser; + +import java.applet.Applet; +import java.io.File; +import java.io.FileInputStream; +import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Properties; +import java.util.Set; +import java.util.StringTokenizer; public abstract class DataCollectorBase implements DataCollector { private Set propertyNames ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorFactory.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorFactory.java index a6007d1fab..068ca48c64 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/DataCollectorFactory.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.DataCollector ; +import com.sun.corba.ee.spi.orb.DataCollector; -import java.applet.Applet ; -import java.net.URL ; -import java.util.Properties ; +import java.applet.Applet; +import java.net.URL; +import java.util.Properties; public abstract class DataCollectorFactory { private DataCollectorFactory() {} diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java index 8b0f2dfc2e..b4ea4e2320 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalDataCollector.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.orb ; -import java.util.Properties ; +import java.util.Properties; public class NormalDataCollector extends DataCollectorBase { private String[] args ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java index 5d25c18af8..cef880ed82 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserAction.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.Operation ; +import com.sun.corba.ee.spi.orb.Operation; -import java.util.Properties ; +import java.util.Properties; public class NormalParserAction extends ParserActionBase { public NormalParserAction( String propertyName, diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserData.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserData.java index 7f7de05340..909296474e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/NormalParserData.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.Operation ; -import com.sun.corba.ee.spi.orb.PropertyParser ; +import com.sun.corba.ee.spi.orb.Operation; +import com.sun.corba.ee.spi.orb.PropertyParser; -import java.util.Properties ; +import java.util.Properties; public class NormalParserData extends ParserDataBase { private String testData ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java index 49edfa1d63..e52196c764 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBConfiguratorImpl.java @@ -20,53 +20,53 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.impl.dynamicany.DynAnyFactoryImpl ; +import com.sun.corba.ee.impl.dynamicany.DynAnyFactoryImpl; import com.sun.corba.ee.impl.legacy.connection.SocketFactoryAcceptorImpl; import com.sun.corba.ee.impl.legacy.connection.SocketFactoryContactInfoListImpl; import com.sun.corba.ee.impl.legacy.connection.USLPort; import com.sun.corba.ee.impl.transport.AcceptorImpl; -import com.sun.corba.ee.spi.copyobject.CopierManager ; -import com.sun.corba.ee.spi.copyobject.CopyobjectDefaults ; +import com.sun.corba.ee.spi.copyobject.CopierManager; +import com.sun.corba.ee.spi.copyobject.CopyobjectDefaults; import com.sun.corba.ee.spi.ior.IOR; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; import com.sun.corba.ee.spi.legacy.connection.LegacyServerSocketEndPointInfo; import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBConstants; -import com.sun.corba.ee.spi.oa.OADefault ; -import com.sun.corba.ee.spi.oa.ObjectAdapterFactory ; -import com.sun.corba.ee.spi.orb.DataCollector ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBConfigurator ; -import com.sun.corba.ee.spi.orb.ORBData ; -import com.sun.corba.ee.spi.orb.Operation ; -import com.sun.corba.ee.spi.orb.OperationFactory ; -import com.sun.corba.ee.spi.orb.ParserImplBase ; -import com.sun.corba.ee.spi.orb.PropertyParser ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationDefaults ; -import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher ; -import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcherFactory ; -import com.sun.corba.ee.spi.protocol.RequestDispatcherDefault ; -import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry ; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; -import com.sun.corba.ee.spi.resolver.LocalResolver ; -import com.sun.corba.ee.spi.resolver.Resolver ; -import com.sun.corba.ee.spi.resolver.ResolverDefault ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextFactoryRegistry ; +import com.sun.corba.ee.spi.oa.OADefault; +import com.sun.corba.ee.spi.oa.ObjectAdapterFactory; +import com.sun.corba.ee.spi.orb.DataCollector; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBConfigurator; +import com.sun.corba.ee.spi.orb.ORBData; +import com.sun.corba.ee.spi.orb.Operation; +import com.sun.corba.ee.spi.orb.OperationFactory; +import com.sun.corba.ee.spi.orb.ParserImplBase; +import com.sun.corba.ee.spi.orb.PropertyParser; +import com.sun.corba.ee.spi.presentation.rmi.PresentationDefaults; +import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher; +import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcherFactory; +import com.sun.corba.ee.spi.protocol.RequestDispatcherDefault; +import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; +import com.sun.corba.ee.spi.resolver.LocalResolver; +import com.sun.corba.ee.spi.resolver.Resolver; +import com.sun.corba.ee.spi.resolver.ResolverDefault; +import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults; +import com.sun.corba.ee.spi.servicecontext.ServiceContextFactoryRegistry; import com.sun.corba.ee.spi.transport.Acceptor; import com.sun.corba.ee.spi.transport.ContactInfoList; import com.sun.corba.ee.spi.transport.ContactInfoListFactory; import com.sun.corba.ee.spi.transport.SocketInfo; -import com.sun.corba.ee.spi.transport.TransportDefault ; +import com.sun.corba.ee.spi.transport.TransportDefault; import java.lang.System.Logger; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.security.AccessController ; -import java.security.PrivilegedExceptionAction ; +import java.security.AccessController; +import java.security.PrivilegedExceptionAction; import org.glassfish.pfl.basic.func.NullaryFunction; import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java index b212c94b4d..5e91f73798 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBDataParserImpl.java @@ -19,14 +19,14 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo ; +import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; import com.sun.corba.ee.impl.legacy.connection.USLPort; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.DataCollector ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBData ; -import com.sun.corba.ee.spi.orb.ParserImplTableBase ; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.DataCollector; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBData; +import com.sun.corba.ee.spi.orb.ParserImplTableBase; import com.sun.corba.ee.spi.transport.Acceptor; import com.sun.corba.ee.spi.transport.ContactInfoListFactory; import com.sun.corba.ee.spi.transport.IIOPPrimaryToContactInfo; @@ -36,7 +36,7 @@ import java.net.InetAddress; import org.glassfish.pfl.basic.contain.Pair; -import org.omg.PortableInterceptor.ORBInitializer ; +import org.omg.PortableInterceptor.ORBInitializer; public class ORBDataParserImpl extends ParserImplTableBase implements ORBData diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBSingleton.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBSingleton.java index 4d006c43ec..c00bf3518e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBSingleton.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBSingleton.java @@ -52,7 +52,7 @@ import com.sun.corba.ee.spi.presentation.rmi.PresentationDefaults; import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; import com.sun.corba.ee.spi.protocol.ClientDelegateFactory; -import com.sun.corba.ee.spi.protocol.ClientInvocationInfo ; +import com.sun.corba.ee.spi.protocol.ClientInvocationInfo; import com.sun.corba.ee.spi.protocol.PIHandler; import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry; import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; @@ -63,8 +63,8 @@ import com.sun.corba.ee.spi.threadpool.ThreadPoolManager; import com.sun.corba.ee.spi.transport.ConnectionCache; import com.sun.corba.ee.spi.transport.ContactInfo; -import com.sun.corba.ee.spi.transport.ContactInfoListFactory ; -import com.sun.corba.ee.spi.transport.Selector ; +import com.sun.corba.ee.spi.transport.ContactInfoListFactory; +import com.sun.corba.ee.spi.transport.Selector; import com.sun.corba.ee.spi.transport.TransportManager; import java.applet.Applet; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java index 7f5d396138..b43086ec1a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ORBVersionImpl.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.ORBVersion ; +import com.sun.corba.ee.spi.orb.ORBVersion; -import org.omg.CORBA.portable.OutputStream ; +import org.omg.CORBA.portable.OutputStream; public class ORBVersionImpl implements ORBVersion { private byte orbType ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java index 966f0d95c7..9d5b88bf06 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryBase.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.orb.ObjectKeyCacheEntry ; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.orb.ObjectKeyCacheEntry; public abstract class ObjectKeyCacheEntryBase implements ObjectKeyCacheEntry { private ObjectKey okey ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryImpl.java index 057582a9b9..6ac1b1d8e5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.oa.ObjectAdapter; public class ObjectKeyCacheEntryImpl extends ObjectKeyCacheEntryBase { private volatile ObjectAdapter oa ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryNoObjectAdapterImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryNoObjectAdapterImpl.java index c9d3f3d402..4493565e08 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryNoObjectAdapterImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ObjectKeyCacheEntryNoObjectAdapterImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.oa.ObjectAdapter; public class ObjectKeyCacheEntryNoObjectAdapterImpl extends ObjectKeyCacheEntryBase { public ObjectKeyCacheEntryNoObjectAdapterImpl( ObjectKey okey ) { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserAction.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserAction.java index 08e95acf87..f885ff97b8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserAction.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserAction.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.orb ; -import java.util.Properties ; +import java.util.Properties; public interface ParserAction { /** Return the property name or prefix for which this action diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java index 0a1283d381..41ddc67f6d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionBase.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.Operation ; +import com.sun.corba.ee.spi.orb.Operation; -import java.util.Properties ; +import java.util.Properties; public abstract class ParserActionBase implements ParserAction { private String propertyName ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionFactory.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionFactory.java index 213bbe2d48..31d19d943f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserActionFactory.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.Operation ; +import com.sun.corba.ee.spi.orb.Operation; public class ParserActionFactory{ private ParserActionFactory() {} diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java index 57f7ce8d1a..83f9b815f7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserDataBase.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.Operation ; -import com.sun.corba.ee.spi.orb.ParserData ; +import com.sun.corba.ee.spi.orb.Operation; +import com.sun.corba.ee.spi.orb.ParserData; public abstract class ParserDataBase implements ParserData { private String propertyName ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java index 512df8ca5c..6717ac13b2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/ParserTable.java @@ -20,29 +20,29 @@ package com.sun.corba.ee.impl.orb ; import com.sun.corba.ee.impl.encoding.CDROutputObject; -import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo ; -import com.sun.corba.ee.impl.encoding.OSFCodeSetRegistry ; -import com.sun.corba.ee.impl.legacy.connection.USLPort ; -import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler ; +import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; +import com.sun.corba.ee.impl.encoding.OSFCodeSetRegistry; +import com.sun.corba.ee.impl.legacy.connection.USLPort; +import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler; import com.sun.corba.ee.impl.oa.poa.Policies; -import com.sun.corba.ee.impl.protocol.giopmsgheaders.KeyAddr ; -import com.sun.corba.ee.impl.protocol.giopmsgheaders.ProfileAddr ; -import com.sun.corba.ee.impl.protocol.giopmsgheaders.ReferenceAddr ; +import com.sun.corba.ee.impl.protocol.giopmsgheaders.KeyAddr; +import com.sun.corba.ee.impl.protocol.giopmsgheaders.ProfileAddr; +import com.sun.corba.ee.impl.protocol.giopmsgheaders.ReferenceAddr; import com.sun.corba.ee.impl.transport.DefaultIORToSocketInfoImpl; import com.sun.corba.ee.impl.transport.DefaultSocketFactoryImpl; import com.sun.corba.ee.impl.transport.TcpTimeoutsImpl; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.spi.orb.Operation ; -import com.sun.corba.ee.spi.orb.OperationFactory ; -import com.sun.corba.ee.spi.orb.OperationFactoryExt ; -import com.sun.corba.ee.spi.orb.ParserData ; -import com.sun.corba.ee.spi.orb.ParserDataFactory ; +import com.sun.corba.ee.spi.orb.Operation; +import com.sun.corba.ee.spi.orb.OperationFactory; +import com.sun.corba.ee.spi.orb.OperationFactoryExt; +import com.sun.corba.ee.spi.orb.ParserData; +import com.sun.corba.ee.spi.orb.ParserDataFactory; import com.sun.corba.ee.spi.protocol.MessageMediator; import com.sun.corba.ee.spi.transport.Acceptor; import com.sun.corba.ee.spi.transport.ContactInfo; @@ -56,22 +56,22 @@ import com.sun.corba.ee.spi.transport.TcpTimeouts; import java.net.InetSocketAddress; -import java.net.ServerSocket ; -import java.net.Socket ; +import java.net.ServerSocket; +import java.net.Socket; import java.net.SocketException; -import java.security.AccessController ; -import java.security.PrivilegedActionException ; -import java.security.PrivilegedExceptionAction ; -import java.util.HashMap ; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.HashMap; import java.util.List; -import java.util.Map ; +import java.util.Map; -import javax.management.ObjectName ; +import javax.management.ObjectName; import org.glassfish.pfl.basic.contain.Pair; import org.glassfish.pfl.basic.func.UnaryFunction; -import org.omg.PortableInterceptor.ORBInitInfo ; -import org.omg.PortableInterceptor.ORBInitializer ; +import org.omg.PortableInterceptor.ORBInitInfo; +import org.omg.PortableInterceptor.ORBInitializer; /** Initialize the parser data for the standard ORB parser. This is used both * to implement ORBDataParserImpl and to provide the basic testing framework diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java index fdd828003d..23225215c3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserAction.java @@ -19,14 +19,14 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.Operation ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.Operation; -import java.lang.reflect.Array ; -import java.util.Iterator ; -import java.util.LinkedList ; -import java.util.List ; -import java.util.Properties ; +import java.lang.reflect.Array; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Properties; import org.glassfish.pfl.basic.contain.Pair; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java index 6134d4761c..f21e6bc7b2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PrefixParserData.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.orb ; -import com.sun.corba.ee.spi.orb.Operation ; -import com.sun.corba.ee.spi.orb.PropertyParser ; +import com.sun.corba.ee.spi.orb.Operation; +import com.sun.corba.ee.spi.orb.PropertyParser; -import java.util.Properties ; +import java.util.Properties; import org.glassfish.pfl.basic.contain.Pair; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java index ebbe90d891..275e528df7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/orb/PropertyOnlyDataCollector.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.orb ; -import java.util.Properties ; +import java.util.Properties; public class PropertyOnlyDataCollector extends DataCollectorBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java b/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java index 20ace28094..dcabe049f6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/osgi/loader/OSGIListener.java @@ -19,14 +19,14 @@ package com.sun.corba.ee.impl.osgi.loader ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ClassCodeBaseHandler ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ClassCodeBaseHandler; import com.sun.corba.ee.spi.trace.Osgi; -import java.security.AccessController ; -import java.security.PrivilegedAction ; -import java.security.PrivilegedActionException ; -import java.security.PrivilegedExceptionAction ; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; import java.util.Dictionary; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -35,14 +35,14 @@ import org.glassfish.pfl.basic.func.UnaryFunction; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.osgi.framework.Bundle ; -import org.osgi.framework.BundleActivator ; -import org.osgi.framework.BundleContext ; -import org.osgi.framework.BundleEvent ; -import org.osgi.framework.ServiceReference ; -import org.osgi.framework.SynchronousBundleListener ; -import org.osgi.service.packageadmin.ExportedPackage ; -import org.osgi.service.packageadmin.PackageAdmin ; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.SynchronousBundleListener; +import org.osgi.service.packageadmin.ExportedPackage; +import org.osgi.service.packageadmin.PackageAdmin; /** OSGi class that monitors which bundles provide classes that the ORB * needs to instantiate for initialization. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java index 41166f3c3f..a7fe98f200 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/NoConnectionCacheImpl.java @@ -19,35 +19,35 @@ package com.sun.corba.ee.impl.plugin.hwlb ; -import com.sun.corba.ee.impl.encoding.CDRInputObject ; +import com.sun.corba.ee.impl.encoding.CDRInputObject; // The following 3 implementation classes are needed as base // classes. This needs some architectural changes, perhaps // adding a codegen-based proxy layer for dynamic inheritance. -import com.sun.corba.ee.impl.protocol.ClientRequestDispatcherImpl ; -import com.sun.corba.ee.impl.transport.ConnectionCacheBase ; -import com.sun.corba.ee.impl.transport.ConnectionImpl ; -import com.sun.corba.ee.impl.transport.ContactInfoImpl ; -import com.sun.corba.ee.impl.transport.ContactInfoListImpl ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.DataCollector ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBConfigurator ; -import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher ; -import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry ; +import com.sun.corba.ee.impl.protocol.ClientRequestDispatcherImpl; +import com.sun.corba.ee.impl.transport.ConnectionCacheBase; +import com.sun.corba.ee.impl.transport.ConnectionImpl; +import com.sun.corba.ee.impl.transport.ContactInfoImpl; +import com.sun.corba.ee.impl.transport.ContactInfoListImpl; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.DataCollector; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBConfigurator; +import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher; +import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry; import com.sun.corba.ee.spi.trace.Transport; -import com.sun.corba.ee.spi.transport.Connection ; +import com.sun.corba.ee.spi.transport.Connection; import com.sun.corba.ee.spi.transport.ContactInfo; -import com.sun.corba.ee.spi.transport.ContactInfoList ; -import com.sun.corba.ee.spi.transport.ContactInfoListFactory ; -import com.sun.corba.ee.spi.transport.OutboundConnectionCache ; +import com.sun.corba.ee.spi.transport.ContactInfoList; +import com.sun.corba.ee.spi.transport.ContactInfoListFactory; +import com.sun.corba.ee.spi.transport.OutboundConnectionCache; -import java.util.Collection ; -import java.util.HashMap ; -import java.util.Map ; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.CORBA.LocalObject ; +import org.omg.CORBA.LocalObject; /** Install this in an ORB using the property diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java index db1c968fa5..6e1a98e6bb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/plugin/hwlb/VirtualAddressAgentImpl.java @@ -19,52 +19,52 @@ package com.sun.corba.ee.impl.plugin.hwlb ; -import com.sun.corba.ee.impl.interceptors.IORInfoImpl ; -import com.sun.corba.ee.impl.ior.iiop.IIOPProfileImpl ; -import com.sun.corba.ee.impl.ior.iiop.IIOPProfileTemplateImpl ; -import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler ; -import com.sun.corba.ee.impl.orb.ORBDataParserImpl ; -import com.sun.corba.ee.spi.ior.EncapsulationFactoryBase ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.Identifiable ; -import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedComponent ; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent ; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; +import com.sun.corba.ee.impl.interceptors.IORInfoImpl; +import com.sun.corba.ee.impl.ior.iiop.IIOPProfileImpl; +import com.sun.corba.ee.impl.ior.iiop.IIOPProfileTemplateImpl; +import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler; +import com.sun.corba.ee.impl.orb.ORBDataParserImpl; +import com.sun.corba.ee.spi.ior.EncapsulationFactoryBase; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.Identifiable; +import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedComponent; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.DataCollector ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBConfigurator ; -import com.sun.corba.ee.spi.orb.ORBData ; -import com.sun.corba.ee.spi.orb.OperationFactory ; -import com.sun.corba.ee.spi.orb.ParserImplBase ; -import com.sun.corba.ee.spi.orb.PropertyParser ; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.DataCollector; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBConfigurator; +import com.sun.corba.ee.spi.orb.ORBData; +import com.sun.corba.ee.spi.orb.OperationFactory; +import com.sun.corba.ee.spi.orb.ParserImplBase; +import com.sun.corba.ee.spi.orb.PropertyParser; import com.sun.corba.ee.spi.trace.Subcontract; -import java.lang.reflect.Field ; -import java.security.AccessController ; -import java.security.PrivilegedAction ; -import java.util.Iterator ; +import java.lang.reflect.Field; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Iterator; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.CORBA.LocalObject ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.IOP.TAG_INTERNET_IOP ; -import org.omg.PortableInterceptor.IORInfo ; -import org.omg.PortableInterceptor.IORInterceptor_3_0 ; -import org.omg.PortableInterceptor.ORBInitInfo ; -import org.omg.PortableInterceptor.ORBInitializer ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.IOP.TAG_INTERNET_IOP; +import org.omg.PortableInterceptor.IORInfo; +import org.omg.PortableInterceptor.IORInterceptor_3_0; +import org.omg.PortableInterceptor.ORBInitInfo; +import org.omg.PortableInterceptor.ORBInitializer; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; @Subcontract public class VirtualAddressAgentImpl diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java index 725bd10e68..316dcffd28 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicMethodMarshallerImpl.java @@ -19,23 +19,23 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.impl.javax.rmi.CORBA.Util ; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller ; +import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; +import com.sun.corba.ee.impl.misc.ClassInfoCache; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller; -import java.io.Externalizable ; -import java.io.Serializable ; -import java.lang.reflect.Method ; -import java.rmi.RemoteException ; +import java.io.Externalizable; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.rmi.RemoteException; -import javax.rmi.PortableRemoteObject ; +import javax.rmi.PortableRemoteObject; import org.glassfish.pfl.basic.logex.OperationTracer; -import org.omg.CORBA.ORB ; -import org.omg.CORBA.portable.ApplicationException ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA.ORB; +import org.omg.CORBA.portable.ApplicationException; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; public class DynamicMethodMarshallerImpl implements DynamicMethodMarshaller { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java index 1510367c83..3230959430 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/DynamicStubImpl.java @@ -19,22 +19,22 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.impl.ior.StubIORImpl ; -import com.sun.corba.ee.impl.util.JDKBridge ; -import com.sun.corba.ee.impl.util.RepositoryId ; -import com.sun.corba.ee.spi.presentation.rmi.DynamicStub ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; - -import java.io.IOException ; -import java.io.ObjectInputStream ; -import java.io.ObjectOutputStream ; -import java.io.Serializable ; -import java.rmi.RemoteException ; - -import org.omg.CORBA.ORB ; -import org.omg.CORBA.portable.Delegate ; -import org.omg.CORBA.portable.OutputStream ; -import org.omg.CORBA_2_3.portable.ObjectImpl ; +import com.sun.corba.ee.impl.ior.StubIORImpl; +import com.sun.corba.ee.impl.util.JDKBridge; +import com.sun.corba.ee.impl.util.RepositoryId; +import com.sun.corba.ee.spi.presentation.rmi.DynamicStub; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.rmi.RemoteException; + +import org.omg.CORBA.ORB; +import org.omg.CORBA.portable.Delegate; +import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA_2_3.portable.ObjectImpl; public class DynamicStubImpl extends ObjectImpl implements DynamicStub, Serializable diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandler.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandler.java index e79107035f..65c01ab788 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandler.java @@ -20,8 +20,8 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import org.omg.CORBA.portable.ApplicationException ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA.portable.ApplicationException; +import org.omg.CORBA_2_3.portable.OutputStream; public interface ExceptionHandler { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java index df3edb7840..0aa3b72b3f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ExceptionHandlerImpl.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import java.lang.reflect.Method ; -import java.rmi.UnexpectedException ; +import java.lang.reflect.Method; +import java.rmi.UnexpectedException; -import org.omg.CORBA.portable.ApplicationException ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA.portable.ApplicationException; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; public class ExceptionHandlerImpl implements ExceptionHandler { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java index 4d0263f942..f75fbd688e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/IDLNameTranslatorImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationDefaults ; +import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator; +import com.sun.corba.ee.spi.presentation.rmi.PresentationDefaults; import java.lang.reflect.Method; import java.security.AccessController; @@ -31,7 +31,7 @@ import java.util.Set; import java.util.StringTokenizer; -import org.glassfish.pfl.basic.proxy.DynamicAccessPermission ; +import org.glassfish.pfl.basic.proxy.DynamicAccessPermission; /** * Bidirectional translator between RMI-IIOP interface methods and diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java index e749b83847..e375a9cbd2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/InvocationHandlerFactoryImpl.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.spi.presentation.rmi.DynamicStub ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; +import com.sun.corba.ee.spi.presentation.rmi.DynamicStub; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; -import java.io.ObjectStreamException ; -import java.io.Serializable ; -import java.lang.reflect.InvocationHandler ; -import java.lang.reflect.Proxy ; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Proxy; import org.glassfish.pfl.basic.proxy.CompositeInvocationHandler; import org.glassfish.pfl.basic.proxy.CompositeInvocationHandlerImpl; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java index 432a0f92a2..3dcfd2101b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/PresentationManagerImpl.java @@ -19,34 +19,34 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; -import com.sun.corba.ee.impl.util.RepositoryId ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller ; -import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; - -import java.io.PrintStream ; -import java.lang.reflect.Method ; -import java.rmi.Remote ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; +import com.sun.corba.ee.impl.util.RepositoryId; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller; +import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; + +import java.io.PrintStream; +import java.lang.reflect.Method; +import java.rmi.Remote; import java.security.AccessController; import java.security.PrivilegedAction; -import java.util.ArrayList ; -import java.util.HashMap ; -import java.util.HashSet ; -import java.util.List ; -import java.util.Map ; -import java.util.Set ; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; -import javax.rmi.CORBA.Tie ; +import javax.rmi.CORBA.Tie; import org.glassfish.pfl.basic.concurrent.WeakCache; -import org.glassfish.pfl.basic.graph.Graph ; -import org.glassfish.pfl.basic.graph.GraphImpl ; -import org.glassfish.pfl.basic.graph.Node ; +import org.glassfish.pfl.basic.graph.Graph; +import org.glassfish.pfl.basic.graph.GraphImpl; +import org.glassfish.pfl.basic.graph.Node; import org.glassfish.pfl.basic.proxy.InvocationHandlerFactory; -import org.omg.PortableServer.POA ; -import org.omg.PortableServer.Servant ; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.Servant; public final class PresentationManagerImpl implements PresentationManager { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java index 940869f19e..b79e642f65 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/ReflectiveTie.java @@ -19,18 +19,18 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationDefaults ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller; +import com.sun.corba.ee.spi.presentation.rmi.PresentationDefaults; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; -import java.lang.reflect.InvocationTargetException ; -import java.lang.reflect.Method ; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.rmi.Remote; import javax.rmi.CORBA.Tie; -import org.glassfish.pfl.basic.proxy.DynamicAccessPermission ; +import org.glassfish.pfl.basic.proxy.DynamicAccessPermission; import org.omg.CORBA.SystemException; import org.omg.CORBA.portable.ResponseHandler; import org.omg.CORBA.portable.UnknownException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java index 178ac16ada..413652fb9c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubConnectImpl.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.impl.corba.CORBAObjectImpl ; -import com.sun.corba.ee.impl.ior.StubIORImpl ; +import com.sun.corba.ee.impl.corba.CORBAObjectImpl; +import com.sun.corba.ee.impl.ior.StubIORImpl; import com.sun.corba.ee.impl.util.Utility; -import com.sun.corba.ee.spi.logging.UtilSystemException ; +import com.sun.corba.ee.spi.logging.UtilSystemException; import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; import java.rmi.RemoteException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryBase.java index 0f15f186ea..e6e47ed961 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryBase.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; public abstract class StubFactoryBase implements PresentationManager.StubFactory { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java index 6e85954cb7..8b5d06fd57 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryDynamicBase.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.presentation.rmi ; -import com.sun.corba.ee.spi.misc.ORBClassLoader ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; +import com.sun.corba.ee.spi.misc.ORBClassLoader; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; import java.io.SerializablePermission; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryBase.java index 8aae938603..2944626e77 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryBase.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.presentation.rmi; -import com.sun.corba.ee.impl.util.Utility ; +import com.sun.corba.ee.impl.util.Utility; import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; public abstract class StubFactoryFactoryBase implements diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java index 7f00ca64c1..0b7920b219 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryDynamicBase.java @@ -20,12 +20,12 @@ package com.sun.corba.ee.impl.presentation.rmi; import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; -import javax.rmi.CORBA.Tie ; +import javax.rmi.CORBA.Tie; public abstract class StubFactoryFactoryDynamicBase extends StubFactoryFactoryBase diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java index 97c3d7ecdd..619f8aec6f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/StubFactoryFactoryStaticImpl.java @@ -22,11 +22,11 @@ import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; import com.sun.corba.ee.impl.util.PackagePrefixChecker; import com.sun.corba.ee.impl.util.Utility; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBClassLoader; import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; -import javax.rmi.CORBA.Tie ; +import javax.rmi.CORBA.Tie; public class StubFactoryFactoryStaticImpl extends StubFactoryFactoryBase diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java index 1e8591b61e..aebc3de73b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/CodegenStubBase.java @@ -19,26 +19,26 @@ package com.sun.corba.ee.impl.presentation.rmi.codegen ; -import com.sun.corba.ee.impl.ior.StubIORImpl ; -import com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl ; -import com.sun.corba.ee.impl.presentation.rmi.StubInvocationHandlerImpl ; -import com.sun.corba.ee.impl.util.JDKBridge ; -import com.sun.corba.ee.impl.util.RepositoryId ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; - -import java.io.IOException ; -import java.io.ObjectInputStream ; -import java.io.ObjectStreamException ; -import java.lang.reflect.Field ; -import java.lang.reflect.InvocationHandler ; -import java.lang.reflect.Method ; -import java.security.AccessController ; -import java.security.PrivilegedAction ; - -import javax.rmi.CORBA.Stub ; +import com.sun.corba.ee.impl.ior.StubIORImpl; +import com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl; +import com.sun.corba.ee.impl.presentation.rmi.StubInvocationHandlerImpl; +import com.sun.corba.ee.impl.util.JDKBridge; +import com.sun.corba.ee.impl.util.RepositoryId; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; + +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectStreamException; +import java.lang.reflect.Field; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.security.AccessController; +import java.security.PrivilegedAction; + +import javax.rmi.CORBA.Stub; public class CodegenStubBase extends Stub { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java index f79a01706f..0ae632d5b4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/codegen/StubFactoryFactoryCodegenImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.presentation.rmi.codegen ; -import com.sun.corba.ee.impl.presentation.rmi.StubFactoryFactoryDynamicBase ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; +import com.sun.corba.ee.impl.presentation.rmi.StubFactoryFactoryDynamicBase; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; public class StubFactoryFactoryCodegenImpl extends StubFactoryFactoryDynamicBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java index 2620a8f815..59d90ede66 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryFactoryProxyImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.presentation.rmi.proxy; import com.sun.corba.ee.impl.presentation.rmi.StubFactoryFactoryDynamicBase; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; import com.sun.corba.ee.spi.presentation.rmi.PresentationManager.StubFactory; import java.security.AccessController; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java index 336e880d7e..3212d718b3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/presentation/rmi/proxy/StubFactoryProxyImpl.java @@ -20,10 +20,10 @@ package com.sun.corba.ee.impl.presentation.rmi.proxy ; import com.sun.corba.ee.impl.presentation.rmi.StubFactoryDynamicBase; -import com.sun.corba.ee.spi.presentation.rmi.DynamicStub ; -import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ; +import com.sun.corba.ee.spi.presentation.rmi.DynamicStub; +import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; -import java.lang.reflect.Proxy ; +import java.lang.reflect.Proxy; import org.glassfish.pfl.basic.proxy.InvocationHandlerFactory; import org.glassfish.pfl.basic.proxy.LinkedInvocationHandler; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java index 1536a3d6ec..4a15abf9fb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/BootstrapServerRequestDispatcher.java @@ -19,18 +19,18 @@ package com.sun.corba.ee.impl.protocol ; -import com.sun.corba.ee.impl.encoding.MarshalInputStream ; -import com.sun.corba.ee.impl.encoding.MarshalOutputStream ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.encoding.MarshalInputStream; +import com.sun.corba.ee.impl.encoding.MarshalOutputStream; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.MessageMediator; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; -import java.util.Iterator ; +import java.util.Iterator; -import org.omg.CORBA.SystemException ; +import org.omg.CORBA.SystemException; /** * Class BootstrapServerRequestDispatcher handles the requests coming to the diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java index be795147c3..6c71f2847b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ClientDelegateImpl.java @@ -33,7 +33,7 @@ import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; -import com.sun.corba.ee.spi.protocol.ClientDelegate ; +import com.sun.corba.ee.spi.protocol.ClientDelegate; import com.sun.corba.ee.spi.protocol.ClientInvocationInfo; import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher; import com.sun.corba.ee.spi.trace.IsLocal; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java index e3f1f0e199..e5458c0106 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/FullServantCacheLocalCRDImpl.java @@ -21,12 +21,12 @@ import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.oa.OADestroyed; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.trace.Subcontract; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.CORBA.portable.ServantObject ; +import org.omg.CORBA.portable.ServantObject; @Subcontract public class FullServantCacheLocalCRDImpl extends ServantCacheLocalCRDBase diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java index 88b2affaec..97c2412651 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/InfoOnlyServantCacheLocalCRDImpl.java @@ -21,10 +21,10 @@ import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.oa.OADestroyed; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA.portable.ServantObject ; +import org.omg.CORBA.portable.ServantObject; public class InfoOnlyServantCacheLocalCRDImpl extends ServantCacheLocalCRDBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java index f73d9ae462..55080e7b72 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/JIDLLocalCRDImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.protocol; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.orb.ORB; import javax.rmi.CORBA.Tie; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/LocalClientRequestDispatcherBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/LocalClientRequestDispatcherBase.java index 9d0caf3dd8..7232271a35 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/LocalClientRequestDispatcherBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/LocalClientRequestDispatcherBase.java @@ -19,25 +19,25 @@ package com.sun.corba.ee.impl.protocol; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.ObjectAdapterId; import com.sun.corba.ee.spi.ior.ObjectId; import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; import com.sun.corba.ee.spi.ior.TaggedProfile; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.logging.POASystemException; -import com.sun.corba.ee.spi.oa.OADestroyed ; +import com.sun.corba.ee.spi.oa.OADestroyed; import com.sun.corba.ee.spi.oa.ObjectAdapterFactory; import com.sun.corba.ee.spi.orb.ORB; -import com.sun.corba.ee.spi.protocol.ForwardException ; +import com.sun.corba.ee.spi.protocol.ForwardException; import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher; import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry; import com.sun.corba.ee.spi.trace.IsLocal; import com.sun.corba.ee.spi.trace.Subcontract; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; -import org.omg.CORBA.SystemException ; -import org.omg.CORBA.TRANSIENT ; +import org.omg.CORBA.SystemException; +import org.omg.CORBA.TRANSIENT; import org.omg.CORBA.portable.ServantObject; @Subcontract diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java index ebdfdcbbfc..e12f3d261c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/MinimalServantCacheLocalCRDImpl.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.impl.protocol ; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.oa.OADestroyed; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA.portable.ServantObject ; +import org.omg.CORBA.portable.ServantObject; public class MinimalServantCacheLocalCRDImpl extends ServantCacheLocalCRDBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java index d1fea81a15..62b796bea7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/NotLocalLocalCRDImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.protocol; -import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher ; +import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher; import org.omg.CORBA.portable.ServantObject; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java index 7fc8ec0ede..40ed6d9d78 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/POALocalCRDImpl.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.protocol; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.oa.OADestroyed; -import com.sun.corba.ee.spi.oa.OAInvocationInfo ; +import com.sun.corba.ee.spi.oa.OAInvocationInfo; import com.sun.corba.ee.spi.oa.ObjectAdapter; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.trace.Subcontract; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestDispatcherRegistryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestDispatcherRegistryImpl.java index e2d681f8fd..19ad503e85 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestDispatcherRegistryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/RequestDispatcherRegistryImpl.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.impl.protocol; -import com.sun.corba.ee.spi.oa.ObjectAdapterFactory ; -import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher ; -import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcherFactory ; -import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry ; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; +import com.sun.corba.ee.spi.oa.ObjectAdapterFactory; +import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher; +import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcherFactory; +import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; import java.util.Collections; import java.util.HashMap; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java index 173245c0c9..adbefad27e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServantCacheLocalCRDBase.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.protocol; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.oa.OADestroyed; import com.sun.corba.ee.spi.oa.OAInvocationInfo; import com.sun.corba.ee.spi.oa.ObjectAdapter; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java index 5161fad730..20d23d59a4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/ServerRequestDispatcherImpl.java @@ -23,13 +23,13 @@ -import com.sun.corba.ee.impl.corba.ServerRequestImpl ; +import com.sun.corba.ee.impl.corba.ServerRequestImpl; import com.sun.corba.ee.impl.encoding.CDROutputObject; import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; import com.sun.corba.ee.impl.encoding.MarshalInputStream; import com.sun.corba.ee.impl.encoding.OSFCodeSetRegistry; import com.sun.corba.ee.impl.misc.ORBUtility; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.ObjectAdapterId; import com.sun.corba.ee.spi.ior.ObjectKey; import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; @@ -44,7 +44,7 @@ import com.sun.corba.ee.spi.orb.ORBVersion; import com.sun.corba.ee.spi.orb.ORBVersionFactory; import com.sun.corba.ee.spi.orb.ObjectKeyCacheEntry; -import com.sun.corba.ee.spi.protocol.ForwardException ; +import com.sun.corba.ee.spi.protocol.ForwardException; import com.sun.corba.ee.spi.protocol.MessageMediator; import com.sun.corba.ee.spi.protocol.RequestDispatcherRegistry; import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java index 3d92319395..88e2fdf1e3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/SpecialMethod.java @@ -21,7 +21,7 @@ import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import com.sun.corba.ee.spi.oa.NullServant ; +import com.sun.corba.ee.spi.oa.NullServant; import com.sun.corba.ee.spi.oa.ObjectAdapter; import com.sun.corba.ee.spi.protocol.MessageMediator; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java index 062f51001c..42b447b385 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_0.java @@ -22,7 +22,7 @@ import com.sun.corba.ee.impl.encoding.CDRInputObject; import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.IORFactories; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.SystemException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java index 621733cb5e..f90c59a927 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/LocateReplyMessage_1_1.java @@ -23,7 +23,7 @@ import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.IORFactories; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.SystemException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java index cd71a588c0..70656509e1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_0.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.protocol.giopmsgheaders; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import java.nio.ByteBuffer; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_1.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_1.java index a34ebef380..e0e19f511d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_1.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/Message_1_1.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.protocol.giopmsgheaders; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import java.nio.ByteBuffer; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java index 1eae913e1b..04d07a08c1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_0.java @@ -24,7 +24,7 @@ import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.IORFactories; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults; import com.sun.corba.ee.spi.servicecontext.ServiceContexts; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java index 9b6059bd0e..9086d3b26b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/protocol/giopmsgheaders/ReplyMessage_1_2.java @@ -23,13 +23,13 @@ import com.sun.corba.ee.impl.encoding.CDROutputObject; import com.sun.corba.ee.impl.misc.ORBUtility; import com.sun.corba.ee.spi.ior.IOR; -import com.sun.corba.ee.spi.ior.IORFactories ; +import com.sun.corba.ee.spi.ior.IORFactories; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults; import com.sun.corba.ee.spi.servicecontext.ServiceContexts; -import com.sun.corba.ee.spi.trace.Transport ; +import com.sun.corba.ee.spi.trace.Transport; import org.omg.CORBA.CompletionStatus; import org.omg.CORBA.SystemException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java index fef62a3ad7..3d045255ab 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/BootstrapResolverImpl.java @@ -21,25 +21,25 @@ import com.sun.corba.ee.impl.ior.ObjectIdImpl; import com.sun.corba.ee.impl.ior.ObjectKeyImpl; -import com.sun.corba.ee.impl.misc.ORBUtility ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.resolver.Resolver ; +import com.sun.corba.ee.impl.misc.ORBUtility; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.resolver.Resolver; import java.util.Set; -import org.omg.CORBA.portable.ApplicationException ; -import org.omg.CORBA.portable.InputStream ; -import org.omg.CORBA.portable.OutputStream ; -import org.omg.CORBA.portable.RemarshalException ; +import org.omg.CORBA.portable.ApplicationException; +import org.omg.CORBA.portable.InputStream; +import org.omg.CORBA.portable.OutputStream; +import org.omg.CORBA.portable.RemarshalException; public class BootstrapResolverImpl implements Resolver { private org.omg.CORBA.portable.Delegate bootstrapDelegate ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java index bd81f3350e..844c131a3d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/CompositeResolverImpl.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.impl.resolver ; -import com.sun.corba.ee.spi.resolver.Resolver ; +import com.sun.corba.ee.spi.resolver.Resolver; -import java.util.HashSet ; -import java.util.Set ; +import java.util.HashSet; +import java.util.Set; public class CompositeResolverImpl implements Resolver { private Resolver first ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java index bc3b0107bf..87d30fa522 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/FileResolverImpl.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.resolver ; -import com.sun.corba.ee.impl.misc.CorbaResourceUtil ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.resolver.Resolver ; +import com.sun.corba.ee.impl.misc.CorbaResourceUtil; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.resolver.Resolver; import java.io.File; import java.io.FileInputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java index 4344af2b73..a63b270065 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/INSURLOperationImpl.java @@ -34,25 +34,25 @@ import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; -import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.logging.OMGSystemException ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.ior.iiop.IIOPFactories; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.logging.OMGSystemException; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.orb.Operation; -import java.util.ArrayList ; -import java.util.Collections ; -import java.util.Comparator ; -import java.util.HashMap ; -import java.util.Iterator ; -import java.util.List ; -import java.util.Map ; - -import org.omg.CORBA.ORBPackage.InvalidName ; -import org.omg.CosNaming.NamingContextExt ; -import org.omg.CosNaming.NamingContextExtHelper ; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.omg.CORBA.ORBPackage.InvalidName; +import org.omg.CosNaming.NamingContextExt; +import org.omg.CosNaming.NamingContextExtHelper; /** * This class provides an Operation that converts from CORBA INS URL strings into diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/LocalResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/LocalResolverImpl.java index c52519dc3e..d367eb5fbe 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/LocalResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/LocalResolverImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.resolver ; -import com.sun.corba.ee.spi.resolver.LocalResolver ; +import com.sun.corba.ee.spi.resolver.LocalResolver; import java.lang.System.Logger; import java.util.concurrent.ConcurrentHashMap; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java index 8c71f20ab6..05bc2d5b23 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBDefaultInitRefResolverImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.resolver ; -import com.sun.corba.ee.spi.orb.Operation ; -import com.sun.corba.ee.spi.resolver.Resolver ; +import com.sun.corba.ee.spi.orb.Operation; +import com.sun.corba.ee.spi.resolver.Resolver; import java.util.Set; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBInitRefResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBInitRefResolverImpl.java index 75c0d3213d..eaaa1d4533 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBInitRefResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/ORBInitRefResolverImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.resolver ; -import com.sun.corba.ee.spi.orb.Operation ; -import com.sun.corba.ee.spi.resolver.Resolver ; +import com.sun.corba.ee.spi.orb.Operation; +import com.sun.corba.ee.spi.resolver.Resolver; import java.util.Set; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java index d7cbb8227b..811671901b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/resolver/SplitLocalResolverImpl.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.impl.resolver ; -import com.sun.corba.ee.spi.resolver.LocalResolver ; -import com.sun.corba.ee.spi.resolver.Resolver ; +import com.sun.corba.ee.spi.resolver.LocalResolver; +import com.sun.corba.ee.spi.resolver.Resolver; import java.util.Set; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java index 6c9af7e46f..ccc8b57b4f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java @@ -20,8 +20,8 @@ package com.sun.corba.ee.impl.servicecontext; import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo ; -import com.sun.corba.ee.impl.encoding.MarshalInputStream ; -import com.sun.corba.ee.impl.encoding.MarshalOutputStream ; +import com.sun.corba.ee.impl.encoding.MarshalInputStream; +import com.sun.corba.ee.impl.encoding.MarshalOutputStream; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.servicecontext.CodeSetServiceContext; import com.sun.corba.ee.spi.servicecontext.ServiceContextBase; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java index 64ae24d857..951ab91321 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/MaxStreamFormatVersionServiceContextImpl.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.impl.misc.ORBUtility; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.servicecontext.MaxStreamFormatVersionServiceContext ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextBase ; +import com.sun.corba.ee.spi.servicecontext.MaxStreamFormatVersionServiceContext; +import com.sun.corba.ee.spi.servicecontext.ServiceContextBase; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java index 63b20e8a44..ffd378c394 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ORBVersionServiceContextImpl.java @@ -20,14 +20,14 @@ package com.sun.corba.ee.impl.servicecontext; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.orb.ORBVersion ; -import com.sun.corba.ee.spi.orb.ORBVersionFactory ; -import com.sun.corba.ee.spi.servicecontext.ORBVersionServiceContext ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextBase ; +import com.sun.corba.ee.spi.orb.ORBVersion; +import com.sun.corba.ee.spi.orb.ORBVersionFactory; +import com.sun.corba.ee.spi.servicecontext.ORBVersionServiceContext; +import com.sun.corba.ee.spi.servicecontext.ServiceContextBase; import org.omg.CORBA.SystemException; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; public class ORBVersionServiceContextImpl extends ServiceContextBase implements ORBVersionServiceContext diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java index ad2c8a1acb..6c9946973b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/SendingContextServiceContextImpl.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.impl.servicecontext; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.IORFactories ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.IORFactories; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.servicecontext.SendingContextServiceContext ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextBase ; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.servicecontext.SendingContextServiceContext; +import com.sun.corba.ee.spi.servicecontext.ServiceContextBase; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; public class SendingContextServiceContextImpl extends ServiceContextBase implements SendingContextServiceContext diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java index 35ead67c75..7b8199888b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextFactoryRegistryImpl.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.impl.servicecontext; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.servicecontext.ServiceContext ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextFactoryRegistry ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.servicecontext.ServiceContext; +import com.sun.corba.ee.spi.servicecontext.ServiceContextFactoryRegistry; -import java.util.HashMap ; -import java.util.Map ; +import java.util.HashMap; +import java.util.Map; public class ServiceContextFactoryRegistryImpl implements ServiceContextFactoryRegistry diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java index 83be9de29e..c9ec58bb2d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/ServiceContextsImpl.java @@ -20,27 +20,27 @@ package com.sun.corba.ee.impl.servicecontext; import com.sun.corba.ee.impl.encoding.CDRInputObject; -import com.sun.corba.ee.impl.encoding.EncapsInputStream ; +import com.sun.corba.ee.impl.encoding.EncapsInputStream; import com.sun.corba.ee.impl.encoding.EncapsInputStreamFactory; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.servicecontext.ServiceContext ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextFactoryRegistry ; -import com.sun.corba.ee.spi.servicecontext.ServiceContexts ; -import com.sun.corba.ee.spi.servicecontext.UEInfoServiceContext ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.servicecontext.ServiceContext; +import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults; +import com.sun.corba.ee.spi.servicecontext.ServiceContextFactoryRegistry; +import com.sun.corba.ee.spi.servicecontext.ServiceContexts; +import com.sun.corba.ee.spi.servicecontext.UEInfoServiceContext; import com.sun.corba.ee.spi.trace.TraceServiceContext; import com.sun.org.omg.SendingContext.CodeBase; -import java.util.HashMap ; -import java.util.Map ; -import java.util.concurrent.atomic.AtomicInteger ; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; import org.omg.CORBA.OctetSeqHelper; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; @TraceServiceContext public class ServiceContextsImpl implements ServiceContexts diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java index c1224fc4a7..312fd4939d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UEInfoServiceContextImpl.java @@ -20,11 +20,11 @@ package com.sun.corba.ee.impl.servicecontext; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.servicecontext.ServiceContextBase ; -import com.sun.corba.ee.spi.servicecontext.UEInfoServiceContext ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.servicecontext.ServiceContextBase; +import com.sun.corba.ee.spi.servicecontext.UEInfoServiceContext; -import java.io.Serializable ; +import java.io.Serializable; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java index baf7669c5b..d841555c16 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/UnknownServiceContextImpl.java @@ -20,8 +20,8 @@ package com.sun.corba.ee.impl.servicecontext; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import com.sun.corba.ee.spi.servicecontext.ServiceContextBase ; -import com.sun.corba.ee.spi.servicecontext.UnknownServiceContext ; +import com.sun.corba.ee.spi.servicecontext.ServiceContextBase; +import com.sun.corba.ee.spi.servicecontext.UnknownServiceContext; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorAcceptOnlyImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorAcceptOnlyImpl.java index cd8d078006..0dad2462d3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorAcceptOnlyImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorAcceptOnlyImpl.java @@ -30,7 +30,7 @@ import java.net.Socket; -import org.glassfish.pfl.basic.func.UnaryVoidFunction ; +import org.glassfish.pfl.basic.func.UnaryVoidFunction; /** This version of an acceptor is the other half of CorbaAcceptorLazyImpl. * The idea is that AcceptOnly will NOT contribute to an IORTemplate, and will diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java index acaad2715e..940f7694ec 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/AcceptorBase.java @@ -46,7 +46,7 @@ import com.sun.corba.ee.spi.transport.SocketInfo; import com.sun.corba.ee.spi.transport.TransportManager; -import java.net.Socket ; +import java.net.Socket; import java.nio.channels.SelectionKey; import java.util.Iterator; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionCacheBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionCacheBase.java index 11bb462fa2..85fb3a9160 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionCacheBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ConnectionCacheBase.java @@ -28,11 +28,11 @@ import java.util.Collection; import java.util.Iterator; -import org.glassfish.external.statistics.CountStatistic ; -import org.glassfish.external.statistics.impl.CountStatisticImpl ; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.NameValue ; +import org.glassfish.external.statistics.CountStatistic; +import org.glassfish.external.statistics.impl.CountStatisticImpl; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.NameValue; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoImpl.java index b38294287b..2beefa77db 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoImpl.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.impl.transport; import com.sun.corba.ee.impl.misc.ORBUtility; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.transport.Connection; import com.sun.corba.ee.spi.transport.ContactInfoList; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java index 4550f3ce75..9ca1e01b8b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListImpl.java @@ -20,15 +20,15 @@ package com.sun.corba.ee.impl.transport; import com.sun.corba.ee.impl.protocol.NotLocalLocalCRDImpl; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.TaggedComponent ; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfile ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.ior.iiop.LoadBalancingComponent ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.TaggedComponent; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.ior.iiop.LoadBalancingComponent; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher; @@ -36,15 +36,15 @@ import com.sun.corba.ee.spi.trace.IsLocal; import com.sun.corba.ee.spi.trace.Transport; import com.sun.corba.ee.spi.transport.ContactInfo; -import com.sun.corba.ee.spi.transport.ContactInfoList ; +import com.sun.corba.ee.spi.transport.ContactInfoList; import com.sun.corba.ee.spi.transport.SocketInfo; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.concurrent.locks.ReadWriteLock ; -import java.util.concurrent.locks.ReentrantReadWriteLock ; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; import org.glassfish.pfl.basic.func.UnaryPredicate; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java index cb59bf8433..84df026574 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/ContactInfoListIteratorImpl.java @@ -20,9 +20,9 @@ package com.sun.corba.ee.impl.transport; import com.sun.corba.ee.impl.protocol.InvocationInfo; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.trace.Transport; import com.sun.corba.ee.spi.transport.ContactInfo; import com.sun.corba.ee.spi.transport.ContactInfoList; @@ -30,10 +30,10 @@ import com.sun.corba.ee.spi.transport.IIOPPrimaryToContactInfo; import com.sun.corba.ee.spi.transport.TcpTimeouts; -import java.util.HashSet ; +import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Set ; +import java.util.Set; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; import org.omg.CORBA.COMM_FAILURE; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultIORToSocketInfoImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultIORToSocketInfoImpl.java index 4aaf3d5905..f3b89db795 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultIORToSocketInfoImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/DefaultIORToSocketInfoImpl.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent; -import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; +import com.sun.corba.ee.spi.ior.iiop.IIOPAddress; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; import com.sun.corba.ee.spi.transport.IORToSocketInfo; import com.sun.corba.ee.spi.transport.SocketInfo; @@ -30,7 +30,7 @@ import java.util.Iterator; import java.util.List; -import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS ; +import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS; public class DefaultIORToSocketInfoImpl implements IORToSocketInfo diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java index 4cc758c8bc..f1da68e626 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheImpl.java @@ -28,9 +28,9 @@ import java.util.ArrayList; import java.util.Collection; -import org.glassfish.gmbal.AMXMetadata ; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedObject ; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedObject; /** * @author Harold Carr diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheProbeProvider.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheProbeProvider.java index c1b0e9331a..e4b8034181 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheProbeProvider.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/InboundConnectionCacheProbeProvider.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.transport; -import org.glassfish.external.probe.provider.annotations.Probe ; -import org.glassfish.external.probe.provider.annotations.ProbeParam ; -import org.glassfish.external.probe.provider.annotations.ProbeProvider ; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** This simple class is for the GFv3 probe mechanism. As of * 9/16/09, gfprobes have the unfortunate requirement that ALL diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java index 08fa9942ef..e55445ef9f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/MessageTraceManagerImpl.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.impl.transport; -import com.sun.corba.ee.spi.transport.MessageTraceManager ; +import com.sun.corba.ee.spi.transport.MessageTraceManager; -import java.nio.ByteBuffer ; -import java.util.ArrayList ; -import java.util.List ; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; public class MessageTraceManagerImpl implements MessageTraceManager { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java index 939ef0cc27..0e3fac5273 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheImpl.java @@ -29,9 +29,9 @@ import java.util.HashMap; import java.util.Map; -import org.glassfish.gmbal.AMXMetadata ; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedObject ; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedObject; /** * @author Harold Carr diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheProbeProvider.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheProbeProvider.java index 3a25c67c49..f3f760898c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheProbeProvider.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/OutboundConnectionCacheProbeProvider.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.impl.transport; -import org.glassfish.external.probe.provider.annotations.Probe ; -import org.glassfish.external.probe.provider.annotations.ProbeParam ; -import org.glassfish.external.probe.provider.annotations.ProbeProvider ; +import org.glassfish.external.probe.provider.annotations.Probe; +import org.glassfish.external.probe.provider.annotations.ProbeParam; +import org.glassfish.external.probe.provider.annotations.ProbeProvider; /** This simple class is for the GFv3 probe mechanism. As of * 9/16/09, gfprobes have the unfortunate requirement that ALL diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java index 2a55c548b2..0b10945e0c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/SelectorImpl.java @@ -43,9 +43,9 @@ import java.util.List; import java.util.Map; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedObject ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TcpTimeoutsImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TcpTimeoutsImpl.java index 64cf69b0f7..747193a100 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TcpTimeoutsImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TcpTimeoutsImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.transport; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; import com.sun.corba.ee.spi.transport.TcpTimeouts; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java index 068de509d7..143f03e017 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/TransportManagerImpl.java @@ -42,8 +42,8 @@ import java.util.List; import java.util.Map; -import org.glassfish.external.probe.provider.PluginPoint ; -import org.glassfish.external.probe.provider.StatsProviderManager ; +import org.glassfish.external.probe.provider.PluginPoint; +import org.glassfish.external.probe.provider.StatsProviderManager; import org.glassfish.gmbal.ManagedObjectManager; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueBlockingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueBlockingImpl.java index efd3b54354..0d7229185f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueBlockingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueBlockingImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.transport.concurrent ; -import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue ; +import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; public class ConcurrentQueueBlockingImpl implements ConcurrentQueue { // This implementation of ConcurrentQueue uses a single lock, which must be diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java index 0e97f76fd2..d54f9988a0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java @@ -19,7 +19,8 @@ package com.sun.corba.ee.impl.transport.concurrent ; -import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue ; +import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; +import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue.Handle; public class ConcurrentQueueImpl implements ConcurrentQueue { // This implementation of ConcurrentQueue is unsynchronized, for use in diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java index 3f3068f79a..67a1d39a34 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueNonBlockingImpl.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.impl.transport.concurrent ; -import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue ; +import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; public class ConcurrentQueueNonBlockingImpl implements ConcurrentQueue { // This implementation of ConcurrentQueue uses a non-blocking algorithm (TBD). diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/LMSQueue.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/LMSQueue.java index 2a3e747040..e762361ef7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/LMSQueue.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/LMSQueue.java @@ -22,7 +22,7 @@ */ package com.sun.corba.ee.impl.transport.concurrent ; -import java.util.concurrent.atomic.AtomicReference ; +import java.util.concurrent.atomic.AtomicReference; public class LMSQueue { static private class Node { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBase.java index 571ab73ec0..61bb15cf80 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBase.java @@ -21,10 +21,10 @@ import com.sun.corba.ee.spi.trace.Transport; -import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue ; +import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue.Handle; -import com.sun.corba.ee.spi.transport.connection.Connection ; -import com.sun.corba.ee.spi.transport.connection.ConnectionCache ; +import com.sun.corba.ee.spi.transport.connection.Connection; +import com.sun.corba.ee.spi.transport.connection.ConnectionCache; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBlockingBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBlockingBase.java index 7858d7c9f6..21cf3a9db9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBlockingBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheBlockingBase.java @@ -21,7 +21,7 @@ import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory; -import com.sun.corba.ee.spi.transport.connection.Connection ; +import com.sun.corba.ee.spi.transport.connection.Connection; abstract class ConnectionCacheBlockingBase extends ConnectionCacheBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java index 9bf6373325..0cdef9889d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/ConnectionCacheNonBlockingBase.java @@ -20,10 +20,10 @@ package com.sun.corba.ee.impl.transport.connection; -import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory ; -import com.sun.corba.ee.spi.transport.connection.Connection ; +import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory; +import com.sun.corba.ee.spi.transport.connection.Connection; -import java.util.concurrent.atomic.AtomicInteger ; +import java.util.concurrent.atomic.AtomicInteger; abstract class ConnectionCacheNonBlockingBase extends ConnectionCacheBase { diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java index 6040ddce82..986c9655a4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheBlockingImpl.java @@ -21,12 +21,12 @@ import com.sun.corba.ee.spi.trace.Transport; import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; -import com.sun.corba.ee.spi.transport.connection.Connection ; -import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache ; +import com.sun.corba.ee.spi.transport.connection.Connection; +import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache; -import java.io.IOException ; -import java.util.HashMap ; -import java.util.Map ; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheImpl.java index fe0da51738..2023a97295 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/InboundConnectionCacheImpl.java @@ -21,13 +21,13 @@ import com.sun.corba.ee.spi.trace.Transport; import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; -import com.sun.corba.ee.spi.transport.connection.Connection ; -import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache ; +import com.sun.corba.ee.spi.transport.connection.Connection; +import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache; -import java.io.IOException ; -import java.util.concurrent.ConcurrentHashMap ; -import java.util.concurrent.ConcurrentMap ; -import java.util.concurrent.atomic.AtomicInteger ; +import java.io.IOException; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundCacheEntry.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundCacheEntry.java index 376572ca58..da65195c66 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundCacheEntry.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundCacheEntry.java @@ -19,19 +19,19 @@ package com.sun.corba.ee.impl.transport.connection; -import com.sun.corba.ee.spi.transport.connection.Connection ; +import com.sun.corba.ee.spi.transport.connection.Connection; import java.util.ArrayList; -import java.util.Collection ; -import java.util.Collections ; -import java.util.Queue ; -import java.util.concurrent.LinkedBlockingQueue ; -import java.util.concurrent.locks.Condition ; -import java.util.concurrent.locks.ReentrantLock ; - -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import java.util.Collection; +import java.util.Collections; +import java.util.Queue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.ReentrantLock; + +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; // Represents an entry in the outbound connection cache. // This version handles normal shareable ContactInfo diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java index b7780ba900..7fe047bbb4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheBlockingImpl.java @@ -21,19 +21,19 @@ import com.sun.corba.ee.spi.trace.Transport; import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory; -import com.sun.corba.ee.spi.transport.connection.Connection ; -import com.sun.corba.ee.spi.transport.connection.ConnectionFinder ; -import com.sun.corba.ee.spi.transport.connection.ContactInfo ; -import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache ; - -import java.io.IOException ; -import java.util.HashMap ; -import java.util.Map ; -import java.util.concurrent.locks.ReentrantLock ; - -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedObject ; +import com.sun.corba.ee.spi.transport.connection.Connection; +import com.sun.corba.ee.spi.transport.connection.ConnectionFinder; +import com.sun.corba.ee.spi.transport.connection.ContactInfo; +import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.locks.ReentrantLock; + +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; @Transport diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java index f4e4934dbc..3bf3fa2531 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionCacheImpl.java @@ -21,15 +21,15 @@ import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory; -import com.sun.corba.ee.spi.transport.connection.Connection ; -import com.sun.corba.ee.spi.transport.connection.ConnectionFinder ; -import com.sun.corba.ee.spi.transport.connection.ContactInfo ; -import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache ; - -import java.io.IOException ; -import java.util.concurrent.ConcurrentHashMap ; -import java.util.concurrent.ConcurrentMap ; -import java.util.concurrent.atomic.AtomicInteger ; +import com.sun.corba.ee.spi.transport.connection.Connection; +import com.sun.corba.ee.spi.transport.connection.ConnectionFinder; +import com.sun.corba.ee.spi.transport.connection.ContactInfo; +import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache; + +import java.io.IOException; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicInteger; /** Manage connections that are initiated from this VM. Connections are managed * by a get/release mechanism and cached by the ContactInfo used to create them. diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java index 4a242318d3..ce200dbffe 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/connection/OutboundConnectionState.java @@ -20,15 +20,15 @@ package com.sun.corba.ee.impl.transport.connection; import com.sun.corba.ee.spi.trace.Transport; -import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue ; -import com.sun.corba.ee.spi.transport.connection.Connection ; -import com.sun.corba.ee.spi.transport.connection.ContactInfo ; +import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue; +import com.sun.corba.ee.spi.transport.connection.Connection; +import com.sun.corba.ee.spi.transport.connection.ContactInfo; -import java.io.IOException ; +import java.io.IOException; import org.glassfish.gmbal.Description; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; import org.glassfish.pfl.tf.spi.annotation.InfoMethod; @Transport diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKBridge.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKBridge.java index 4b0c8b21b1..3800df7bba 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKBridge.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKBridge.java @@ -25,14 +25,14 @@ import com.sun.corba.ee.org.omg.CORBA.GetPropertyAction; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import java.lang.ref.ReferenceQueue ; -import java.lang.ref.SoftReference ; +import java.lang.ref.ReferenceQueue; +import java.lang.ref.SoftReference; import java.net.MalformedURLException; import java.rmi.server.RMIClassLoader; import java.security.AccessController; -import java.util.HashMap ; -import java.util.Map ; -import java.util.WeakHashMap ; +import java.util.HashMap; +import java.util.Map; +import java.util.WeakHashMap; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java index a396b8aa22..95d28035db 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/JDKClassLoader.java @@ -20,11 +20,11 @@ package com.sun.corba.ee.impl.util; -import java.security.AccessController ; -import java.security.PrivilegedAction ; -import java.util.Collections ; -import java.util.Map ; -import java.util.WeakHashMap ; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.Collections; +import java.util.Map; +import java.util.WeakHashMap; import org.glassfish.pfl.basic.reflection.Bridge; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java index ad18c7f728..33065513ff 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/RepositoryId.java @@ -23,7 +23,7 @@ import com.sun.corba.ee.impl.io.ObjectStreamClass; import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; -import com.sun.corba.ee.impl.misc.ClassInfoCache ; +import com.sun.corba.ee.impl.misc.ClassInfoCache; import java.io.IOException; import java.lang.reflect.Method; diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java b/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java index 5ba09fccb6..27f58fce81 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java +++ b/orbmain/src/main/java/com/sun/corba/ee/impl/util/Utility.java @@ -23,18 +23,18 @@ package com.sun.corba.ee.impl.util; import com.sun.corba.ee.impl.javax.rmi.CORBA.Util; -import com.sun.corba.ee.spi.logging.OMGSystemException ; -import com.sun.corba.ee.spi.logging.UtilSystemException ; -import com.sun.corba.ee.spi.misc.ORBClassLoader ; +import com.sun.corba.ee.spi.logging.OMGSystemException; +import com.sun.corba.ee.spi.logging.UtilSystemException; +import com.sun.corba.ee.spi.misc.ORBClassLoader; import com.sun.corba.ee.spi.presentation.rmi.PresentationManager; -import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ; +import com.sun.corba.ee.spi.presentation.rmi.StubAdapter; import java.rmi.Remote; import java.rmi.RemoteException; -import java.util.ArrayList ; +import java.util.ArrayList; import java.util.IdentityHashMap; -import java.util.Iterator ; -import java.util.List ; +import java.util.Iterator; +import java.util.List; import javax.rmi.PortableRemoteObject; import javax.rmi.CORBA.Tie; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopierManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopierManager.java index 20469eef80..2cc9c27106 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopierManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopierManager.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.copyobject ; -import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory ; +import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory; /** Manager of ObjectCopier implementations used to support javax.rmi.CORBA.Util.copyObject(s). * This provides simple methods for registering all supported ObjectCopier factories. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java b/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java index c1d7568a4a..a25f443824 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/copyobject/CopyobjectDefaults.java @@ -19,16 +19,16 @@ package com.sun.corba.ee.spi.copyobject ; -import com.sun.corba.ee.impl.copyobject.JavaStreamORBObjectCopierImpl ; -import com.sun.corba.ee.impl.copyobject.ORBStreamObjectCopierImpl ; -import com.sun.corba.ee.impl.copyobject.OldReflectObjectCopierImpl ; -import com.sun.corba.ee.impl.copyobject.ReferenceObjectCopierImpl ; -import com.sun.corba.ee.impl.copyobject.ReflectObjectCopierImpl ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.copyobject.JavaStreamORBObjectCopierImpl; +import com.sun.corba.ee.impl.copyobject.ORBStreamObjectCopierImpl; +import com.sun.corba.ee.impl.copyobject.OldReflectObjectCopierImpl; +import com.sun.corba.ee.impl.copyobject.ReferenceObjectCopierImpl; +import com.sun.corba.ee.impl.copyobject.ReflectObjectCopierImpl; +import com.sun.corba.ee.spi.orb.ORB; -import org.glassfish.pfl.dynamic.copyobject.impl.FallbackObjectCopierImpl ; -import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopier ; -import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory ; +import org.glassfish.pfl.dynamic.copyobject.impl.FallbackObjectCopierImpl; +import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopier; +import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory; public abstract class CopyobjectDefaults { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java index 667a955c72..4150de6556 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/CopyObjectPolicy.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.extension ; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; -import org.omg.CORBA.LocalObject ; -import org.omg.CORBA.Policy ; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.Policy; /** Policy used to specify the copyObject implementation to use. */ diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java index 99a0a101b6..65b727268a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/LoadBalancingPolicy.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.extension ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; -import org.omg.CORBA.LocalObject ; -import org.omg.CORBA.Policy ; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.Policy; /** Policy used to support the request partitioning feature and to * specify the partition to use. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java index 7d38887185..5b423cc5f3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/RequestPartitioningPolicy.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.extension ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; +import com.sun.corba.ee.spi.misc.ORBConstants; -import org.omg.CORBA.LocalObject ; -import org.omg.CORBA.Policy ; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.Policy; /** Policy used to support the request partitioning feature and to * specify the partition to use. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java index 6a8d8c7b28..d8dd8f857b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ServantCachingPolicy.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.extension ; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; -import org.omg.CORBA.LocalObject ; -import org.omg.CORBA.Policy ; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.Policy; /** Policy used to implement servant caching optimization in the POA. * Creating a POA with an instance pol of this policy where diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java index 41cd9c53f5..09d22c2fb1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/extension/ZeroPortPolicy.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.extension ; -import com.sun.corba.ee.spi.misc.ORBConstants ; +import com.sun.corba.ee.spi.misc.ORBConstants; -import org.omg.CORBA.LocalObject ; -import org.omg.CORBA.Policy ; +import org.omg.CORBA.LocalObject; +import org.omg.CORBA.Policy; /** Policy used to implement zero IIOP port policy in the POA. */ diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java index f72ec11b20..0c66ab7c7a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/ClusterInstanceInfo.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.folb; -import java.io.Serializable ; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java index 0608f57ce9..aa4b8386b9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/folb/SocketInfo.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.folb; -import java.io.Serializable ; +import java.io.Serializable; import org.omg.CORBA_2_3.portable.InputStream; import org.omg.CORBA_2_3.portable.OutputStream; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/EncapsulationFactoryBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/EncapsulationFactoryBase.java index 29b8024bb6..43aa7f7027 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/EncapsulationFactoryBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/EncapsulationFactoryBase.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.ior ; -import com.sun.corba.ee.impl.ior.EncapsulationUtility ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.ior.EncapsulationUtility; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; public abstract class EncapsulationFactoryBase implements IdentifiableFactory { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IOR.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IOR.java index 9de981ad5e..9d7c3a31ec 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IOR.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IOR.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfile ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.Iterator ; -import java.util.List ; +import java.util.Iterator; +import java.util.List; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** An IOR is represented as a list of profiles. * Only instances of TaggedProfile are contained in the list. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java index bcc3f7704d..6cf26ac0cb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactories.java @@ -19,25 +19,25 @@ package com.sun.corba.ee.spi.ior ; -import com.sun.corba.ee.impl.ior.IORImpl ; -import com.sun.corba.ee.impl.ior.IORTemplateImpl ; -import com.sun.corba.ee.impl.ior.IORTemplateListImpl ; -import com.sun.corba.ee.impl.ior.ObjectIdImpl ; -import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl ; -import com.sun.corba.ee.impl.ior.ObjectKeyImpl ; -import com.sun.corba.ee.impl.ior.ObjectReferenceFactoryImpl ; -import com.sun.corba.ee.impl.ior.ObjectReferenceProducerBase ; -import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl ; -import com.sun.corba.ee.impl.misc.ORBUtility ; -import com.sun.corba.ee.spi.orb.ORB ; - -import java.io.Serializable ; - -import org.omg.CORBA.BAD_PARAM ; -import org.omg.CORBA.portable.ValueFactory ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.PortableInterceptor.ObjectReferenceFactory ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; +import com.sun.corba.ee.impl.ior.IORImpl; +import com.sun.corba.ee.impl.ior.IORTemplateImpl; +import com.sun.corba.ee.impl.ior.IORTemplateListImpl; +import com.sun.corba.ee.impl.ior.ObjectIdImpl; +import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl; +import com.sun.corba.ee.impl.ior.ObjectKeyImpl; +import com.sun.corba.ee.impl.ior.ObjectReferenceFactoryImpl; +import com.sun.corba.ee.impl.ior.ObjectReferenceProducerBase; +import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl; +import com.sun.corba.ee.impl.misc.ORBUtility; +import com.sun.corba.ee.spi.orb.ORB; + +import java.io.Serializable; + +import org.omg.CORBA.BAD_PARAM; +import org.omg.CORBA.portable.ValueFactory; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.PortableInterceptor.ObjectReferenceFactory; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; /** This class provides a number of factory methods for creating * various IOR SPI classes which are not subclassed for specific protocols. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactory.java index e03555f2d9..aad556933e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORFactory.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.ior ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; /** An IORFactory provides the capability of creating IORs. It contains * some collection of TaggedProfileTemplates, which can be iterated over diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplate.java index b5f9cd4c6f..c776b46201 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplate.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.ior ; -import java.util.Iterator ; -import java.util.List ; +import java.util.Iterator; +import java.util.List; /** An IORTemplate provides all of the data necessary to create an IOR except * for the typeId and ObjectId. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplateList.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplateList.java index 3e96535cad..69a2fec7c4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplateList.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IORTemplateList.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.ior ; -import java.util.List ; +import java.util.List; /** An IORTemplateList is a list of IORTemplate instances. It can be used to create IORs. * This is useful for representing IORs made of profiles from different object diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java index 886f899c68..6a00d1ad4f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Identifiable.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.ior; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; /** This interface represents an entity that can be written to an * OutputStream and has an identity that is represented by an integer. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java index b9444514d3..a06fdb510a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableBase.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.impl.ior.EncapsulationUtility ; +import com.sun.corba.ee.impl.ior.EncapsulationUtility; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; /** Provide support for properly reading and writing Identifiable objects * that are also encapsulations (tagged profiles and components). diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableContainerBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableContainerBase.java index 24c30e9f7d..a1b09f1487 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableContainerBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableContainerBase.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.impl.ior.FreezableList ; +import com.sun.corba.ee.impl.ior.FreezableList; import java.util.ArrayList; import java.util.Iterator; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java index 115059b084..7311c518e6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactory.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.ior ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; /** Factory interface for creating Identifiables. */ diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactoryFinder.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactoryFinder.java index b209f7fd62..86f50f9f3b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactoryFinder.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/IdentifiableFactoryFinder.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.ior; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; /** Interface used to manage a group of related IdentifiableFactory instances. * Factories can be registered, and invoked through a create method, which diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectAdapterId.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectAdapterId.java index b038b6b032..fc8129fa71 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectAdapterId.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectAdapterId.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.ior ; -import java.util.Iterator ; +import java.util.Iterator; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** This is the object adapter ID for an object adapter. * Typically this is the path of strings starting from the diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java index 61a02331ab..492e64d607 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectId.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.ior; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKey.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKey.java index c264be1560..b685043d21 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKey.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKey.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; /** The full object key, which is contained in an IIOPProfile. * The object identifier corresponds to the information passed into diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyFactory.java index 23d453531b..cefe489b9f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyFactory.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.ior; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; /** Construct ObjectKey and ObjectKeyTemplate instances from their * CDR-marshalled representation. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java index 1c58d840c6..d077ef0c16 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/ObjectKeyTemplate.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.spi.orb.ORBVersion ; -import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher ; +import com.sun.corba.ee.spi.orb.ORBVersion; +import com.sun.corba.ee.spi.protocol.ServerRequestDispatcher; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; +import org.omg.CORBA_2_3.portable.OutputStream; /** An ObjectKeyTemplate represents the part of an Object Key * that corresponds to the object adapter used to create an diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponent.java index 2794257c79..8d35bdd2dc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponent.java @@ -19,18 +19,18 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.impl.ior.GenericTaggedComponent ; -import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent ; -import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent ; -import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent ; -import com.sun.corba.ee.spi.ior.iiop.MaxStreamFormatVersionComponent ; -import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent ; -import com.sun.corba.ee.spi.ior.iiop.RequestPartitioningComponent ; +import com.sun.corba.ee.impl.ior.GenericTaggedComponent; +import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent; +import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent; +import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent; +import com.sun.corba.ee.spi.ior.iiop.MaxStreamFormatVersionComponent; +import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent; +import com.sun.corba.ee.spi.ior.iiop.RequestPartitioningComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.IncludeSubclass ; -import org.glassfish.gmbal.ManagedData ; -import org.omg.CORBA.ORB ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.IncludeSubclass; +import org.glassfish.gmbal.ManagedData; +import org.omg.CORBA.ORB; /** Generic interface for all tagged components. Users of the ORB may * create implementations of this class and also corresponding factories diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java index 4c30690753..f60cf4a1c1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedComponentBase.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.impl.encoding.EncapsOutputStream ; +import com.sun.corba.ee.impl.encoding.EncapsOutputStream; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; /** Base class to use for implementing TaggedComponents. It implements diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfile.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfile.java index 3d1c010699..b2b5dc9591 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfile.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfile.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.ior; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.IncludeSubclass ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.IncludeSubclass; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** TaggedProfile represents a tagged profile in an IOR. * A profile contains all of the information necessary for an invocation. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java index a769b4a9af..201191c052 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplate.java @@ -19,16 +19,16 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.Iterator ; -import java.util.List ; +import java.util.Iterator; +import java.util.List; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.IncludeSubclass ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.IncludeSubclass; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; +import org.omg.CORBA_2_3.portable.OutputStream; /** Base template for creating TaggedProfiles. A TaggedProfile will often contain * tagged components. A template that does not contain components acts like diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java index 937c724d46..6c1f9315d6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/TaggedProfileTemplateBase.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.spi.ior; -import com.sun.corba.ee.impl.ior.EncapsulationUtility ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.ior.EncapsulationUtility; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.Iterator ; +import java.util.Iterator; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; public abstract class TaggedProfileTemplateBase extends IdentifiableContainerBase diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/WriteContents.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/WriteContents.java index d83d5c8fd3..a817acef91 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/WriteContents.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/WriteContents.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.ior; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; public interface WriteContents { void writeContents( OutputStream os ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Writeable.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Writeable.java index 09011ba04b..82ff00ee6b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Writeable.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/Writeable.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.ior; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; /** This interface represents an entity that can be written to an OutputStream. * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java index 4c0b7f2ddf..658823043e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/AlternateIIOPAddressComponent.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedComponent ; +import com.sun.corba.ee.spi.ior.TaggedComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java index 3ba6a83829..241cd89539 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/CodeSetsComponent.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.spi.ior.iiop; -import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo ; -import com.sun.corba.ee.spi.ior.TaggedComponent ; +import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; +import com.sun.corba.ee.spi.ior.TaggedComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java index 75b35fde28..17769e08c5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/GIOPVersion.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.spi.ior.iiop ; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.misc.ORBConstants; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.orb.ORBVersion; import com.sun.corba.ee.spi.orb.ORBVersionFactory; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; @ManagedData @Description( "The maximum GIOP version supported by this IOR" ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java index 198e6dd25d..b120a2c10b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPAddress.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.ior.iiop; -import com.sun.corba.ee.spi.ior.Writeable ; +import com.sun.corba.ee.spi.ior.Writeable; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** IIOPAddress represents the host and port used to establish a * TCP connection for an IIOP request. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java index de5a96eb3c..d4bad67651 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPFactories.java @@ -19,34 +19,34 @@ package com.sun.corba.ee.spi.ior.iiop ; -import com.sun.corba.ee.impl.ior.iiop.AlternateIIOPAddressComponentImpl ; -import com.sun.corba.ee.impl.ior.iiop.ClusterInstanceInfoComponentImpl ; -import com.sun.corba.ee.impl.ior.iiop.CodeSetsComponentImpl ; -import com.sun.corba.ee.impl.ior.iiop.IIOPAddressImpl ; -import com.sun.corba.ee.impl.ior.iiop.IIOPProfileImpl ; -import com.sun.corba.ee.impl.ior.iiop.IIOPProfileTemplateImpl ; -import com.sun.corba.ee.impl.ior.iiop.JavaCodebaseComponentImpl ; +import com.sun.corba.ee.impl.ior.iiop.AlternateIIOPAddressComponentImpl; +import com.sun.corba.ee.impl.ior.iiop.ClusterInstanceInfoComponentImpl; +import com.sun.corba.ee.impl.ior.iiop.CodeSetsComponentImpl; +import com.sun.corba.ee.impl.ior.iiop.IIOPAddressImpl; +import com.sun.corba.ee.impl.ior.iiop.IIOPProfileImpl; +import com.sun.corba.ee.impl.ior.iiop.IIOPProfileTemplateImpl; +import com.sun.corba.ee.impl.ior.iiop.JavaCodebaseComponentImpl; import com.sun.corba.ee.impl.ior.iiop.JavaSerializationComponent; -import com.sun.corba.ee.impl.ior.iiop.LoadBalancingComponentImpl ; -import com.sun.corba.ee.impl.ior.iiop.MaxStreamFormatVersionComponentImpl ; -import com.sun.corba.ee.impl.ior.iiop.ORBTypeComponentImpl ; -import com.sun.corba.ee.impl.ior.iiop.RequestPartitioningComponentImpl ; -import com.sun.corba.ee.spi.folb.ClusterInstanceInfo ; -import com.sun.corba.ee.spi.ior.EncapsulationFactoryBase ; -import com.sun.corba.ee.spi.ior.Identifiable ; -import com.sun.corba.ee.spi.ior.IdentifiableFactory ; -import com.sun.corba.ee.spi.ior.ObjectId ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; +import com.sun.corba.ee.impl.ior.iiop.LoadBalancingComponentImpl; +import com.sun.corba.ee.impl.ior.iiop.MaxStreamFormatVersionComponentImpl; +import com.sun.corba.ee.impl.ior.iiop.ORBTypeComponentImpl; +import com.sun.corba.ee.impl.ior.iiop.RequestPartitioningComponentImpl; +import com.sun.corba.ee.spi.folb.ClusterInstanceInfo; +import com.sun.corba.ee.spi.ior.EncapsulationFactoryBase; +import com.sun.corba.ee.spi.ior.Identifiable; +import com.sun.corba.ee.spi.ior.IdentifiableFactory; +import com.sun.corba.ee.spi.ior.ObjectId; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; import com.sun.corba.ee.spi.misc.ORBConstants; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS ; -import org.omg.IOP.TAG_CODE_SETS ; -import org.omg.IOP.TAG_INTERNET_IOP ; -import org.omg.IOP.TAG_JAVA_CODEBASE ; -import org.omg.IOP.TAG_ORB_TYPE ; -import org.omg.IOP.TAG_RMI_CUSTOM_MAX_STREAM_FORMAT ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS; +import org.omg.IOP.TAG_CODE_SETS; +import org.omg.IOP.TAG_INTERNET_IOP; +import org.omg.IOP.TAG_JAVA_CODEBASE; +import org.omg.IOP.TAG_ORB_TYPE; +import org.omg.IOP.TAG_RMI_CUSTOM_MAX_STREAM_FORMAT; /** This class provides all of the factories for the IIOP profiles and * components. This includes direct construction of profiles and templates, diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfile.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfile.java index cac7efa91d..fa09e0310c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfile.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/IIOPProfile.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.spi.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.orb.ORBVersion ; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.orb.ORBVersion; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** IIOPProfile represents an IIOP tagged profile. * It is essentially composed of an object identifier and diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java index f9b33d0c35..52a1d2b96f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/JavaCodebaseComponent.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedComponent ; +import com.sun.corba.ee.spi.ior.TaggedComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java index cbd50a25bc..6cb6a44d41 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/MaxStreamFormatVersionComponent.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedComponent ; +import com.sun.corba.ee.spi.ior.TaggedComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; // Java to IDL ptc 02-01-12 1.4.11 // TAG_RMI_CUSTOM_MAX_STREAM_FORMAT diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java index db2d460e71..e4d5e90d1d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/ORBTypeComponent.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.ior.iiop; -import com.sun.corba.ee.spi.ior.TaggedComponent ; +import com.sun.corba.ee.spi.ior.TaggedComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; /** * @author Ken Cavanaugh diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java index 70cbd20146..4ace3985f9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/ior/iiop/RequestPartitioningComponent.java @@ -21,9 +21,9 @@ import com.sun.corba.ee.spi.ior.TaggedComponent; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; @ManagedData @Description( "Component encoding request paritioning ID" ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/ORBInitInfoExt.java b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/ORBInitInfoExt.java index 4d3a90cb3a..d68160addc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/ORBInitInfoExt.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/legacy/interceptor/ORBInitInfoExt.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.legacy.interceptor; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; /** The interface defines an extension to the standard ORBInitInfo * that gives access to the ORB being initialized. Interceptors run diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CS.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CS.java index 3919a5d195..fd452430ce 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CS.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CS.java @@ -23,11 +23,11 @@ * * @author ken */ -import java.lang.annotation.Documented ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** This annotation is applied to a method to indicate what CompletionStatus to use * for creating a CORBA exception. It is an error to apply this annotation to a method diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CSValue.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CSValue.java index 8718e687f9..8160e35f81 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CSValue.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/CSValue.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.logex.corba ; -import org.omg.CORBA.CompletionStatus ; +import org.omg.CORBA.CompletionStatus; /** Enum corresponding to CompletionStatus that can be used in annotations. * diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/ORBException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/ORBException.java index 8292afc43b..ddb1d14dd9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/ORBException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logex/corba/ORBException.java @@ -23,11 +23,11 @@ * * @author ken */ -import java.lang.annotation.Documented ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** This annotation is applied to an interface or abstract class that is used * to define logging and/or constructing CORBA exceptions. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ActivationSystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ActivationSystemException.java index b22b69cace..27d15c022b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ActivationSystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ActivationSystemException.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.logging ; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import org.glassfish.pfl.basic.logex.Chain; import org.glassfish.pfl.basic.logex.ExceptionWrapper; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/IORSystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/IORSystemException.java index ef2be1f242..d8df017bfd 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/IORSystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/IORSystemException.java @@ -20,8 +20,8 @@ package com.sun.corba.ee.spi.logging ; import com.sun.corba.ee.spi.ior.ObjectAdapterId; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import java.io.IOException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/InterceptorsSystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/InterceptorsSystemException.java index c6a8e361a8..6d4d0614a5 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/InterceptorsSystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/InterceptorsSystemException.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.spi.logex.corba.CS; import com.sun.corba.ee.spi.logex.corba.CSValue; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import com.sun.corba.ee.spi.oa.ObjectAdapter; import java.util.List; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/NamingSystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/NamingSystemException.java index 2d7c191e6f..83ea67529b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/NamingSystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/NamingSystemException.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.spi.logex.corba.CS; import com.sun.corba.ee.spi.logex.corba.CSValue; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import org.glassfish.pfl.basic.logex.Chain; import org.glassfish.pfl.basic.logex.ExceptionWrapper; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/OMGSystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/OMGSystemException.java index 8a67639fd5..faae32688c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/OMGSystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/OMGSystemException.java @@ -22,8 +22,8 @@ import com.sun.corba.ee.spi.ior.ObjectAdapterId; import com.sun.corba.ee.spi.logex.corba.CS; import com.sun.corba.ee.spi.logex.corba.CSValue; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import org.glassfish.pfl.basic.logex.Chain; import org.glassfish.pfl.basic.logex.ExceptionWrapper; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ORBUtilSystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ORBUtilSystemException.java index aa3cf28b34..7708dfa53f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ORBUtilSystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/ORBUtilSystemException.java @@ -24,8 +24,8 @@ import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.logex.corba.CS; import com.sun.corba.ee.spi.logex.corba.CSValue; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import com.sun.corba.ee.spi.transport.Connection; import com.sun.corba.ee.spi.transport.EventHandler; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/POASystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/POASystemException.java index f0ab959372..24d9dd58e9 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/POASystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/POASystemException.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.spi.logex.corba.CS; import com.sun.corba.ee.spi.logex.corba.CSValue; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import org.glassfish.pfl.basic.logex.Chain; import org.glassfish.pfl.basic.logex.ExceptionWrapper; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/UtilSystemException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/UtilSystemException.java index b1ba133fa4..58103a391f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/logging/UtilSystemException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/logging/UtilSystemException.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.spi.logex.corba.CS; import com.sun.corba.ee.spi.logex.corba.CSValue; -import com.sun.corba.ee.spi.logex.corba.CorbaExtension ; -import com.sun.corba.ee.spi.logex.corba.ORBException ; +import com.sun.corba.ee.spi.logex.corba.CorbaExtension; +import com.sun.corba.ee.spi.logex.corba.ORBException; import java.io.IOException; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/misc/ORBConstants.java b/orbmain/src/main/java/com/sun/corba/ee/spi/misc/ORBConstants.java index 614f9f11f4..fd2b21ca20 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/misc/ORBConstants.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/misc/ORBConstants.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.misc; -import com.sun.corba.ee.org.omg.CORBA.SUNVMCID ; +import com.sun.corba.ee.org.omg.CORBA.SUNVMCID; public class ORBConstants { private ORBConstants() {} diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/NullServant.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/NullServant.java index cb2f5ee42e..f79df613c8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/NullServant.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/NullServant.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.oa ; -import org.omg.CORBA.SystemException ; +import org.omg.CORBA.SystemException; /** NullServant is used to represent a null servant returned * OAInvocationInfo after a diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADefault.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADefault.java index a3e4297b65..cd45c5f97e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADefault.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OADefault.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.oa ; -import com.sun.corba.ee.impl.oa.poa.POAFactory ; -import com.sun.corba.ee.impl.oa.toa.TOAFactory ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.oa.poa.POAFactory; +import com.sun.corba.ee.impl.oa.toa.TOAFactory; +import com.sun.corba.ee.spi.orb.ORB; /** OADefault provides methods to create the standard ObjectAdapterFactory * instances for this version of the ORB. These methods are generally diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OAInvocationInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OAInvocationInfo.java index 9b1a5b5c8f..9476c21718 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OAInvocationInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/OAInvocationInfo.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.oa; -import javax.rmi.CORBA.Tie ; +import javax.rmi.CORBA.Tie; import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory; import org.omg.CORBA.portable.ServantObject; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java index c4b79de4be..b84c2fd1c1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapter.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.spi.oa ; -import com.sun.corba.ee.spi.ior.IORTemplate ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.IORTemplate; +import com.sun.corba.ee.spi.orb.ORB; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.gmbal.ManagedObject; -import org.omg.CORBA.Policy ; -import org.omg.PortableInterceptor.ObjectReferenceFactory ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; +import org.omg.CORBA.Policy; +import org.omg.PortableInterceptor.ObjectReferenceFactory; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; // REVISIT: What should the order be? enter/push...pop/exit? diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java index 48b5319b5f..a527302a3b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterBase.java @@ -20,25 +20,25 @@ package com.sun.corba.ee.spi.oa ; import com.sun.corba.ee.impl.oa.poa.Policies; -import com.sun.corba.ee.spi.ior.IORFactories ; -import com.sun.corba.ee.spi.ior.IORTemplate ; +import com.sun.corba.ee.spi.ior.IORFactories; +import com.sun.corba.ee.spi.ior.IORTemplate; import com.sun.corba.ee.spi.ior.ObjectAdapterId; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.logging.POASystemException ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.protocol.PIHandler ; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.logging.POASystemException; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.protocol.PIHandler; import org.glassfish.gmbal.Description; import org.glassfish.gmbal.ManagedAttribute; import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory; -import org.omg.CORBA.Policy ; +import org.omg.CORBA.Policy; import org.omg.PortableInterceptor.ACTIVE; import org.omg.PortableInterceptor.DISCARDING; import org.omg.PortableInterceptor.HOLDING; import org.omg.PortableInterceptor.INACTIVE; import org.omg.PortableInterceptor.NON_EXISTENT; -import org.omg.PortableInterceptor.ObjectReferenceFactory ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; +import org.omg.PortableInterceptor.ObjectReferenceFactory; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; abstract public class ObjectAdapterBase extends org.omg.CORBA.LocalObject implements ObjectAdapter diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterFactory.java index b6882d16a2..ee0d0de4f1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/ObjectAdapterFactory.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.oa ; -import com.sun.corba.ee.spi.ior.ObjectAdapterId ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.ObjectAdapterId; +import com.sun.corba.ee.spi.orb.ORB; public interface ObjectAdapterFactory { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java index 09dd7375b2..964aeddcb2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/oa/rfm/ReferenceFactoryManager.java @@ -19,12 +19,12 @@ package com.sun.corba.ee.spi.oa.rfm ; -import java.util.List ; -import java.util.Map ; +import java.util.List; +import java.util.Map; import org.glassfish.pfl.basic.contain.Pair; -import org.omg.CORBA.Policy ; -import org.omg.PortableServer.ServantLocator ; +import org.omg.CORBA.Policy; +import org.omg.PortableServer.ServantLocator; /** ReferenceFactoryManager uses the ORB POA to create * a specialized reference factory. This is done primarily diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/DataCollector.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/DataCollector.java index ca763bbd15..67a87a35bf 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/DataCollector.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/DataCollector.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.orb ; -import java.util.Properties ; +import java.util.Properties; /** Interface for collecting all sources of ORB configuration properties * into a single properties object. A PropertyParser is needed so that diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java index 39555d629f..fdb5079d47 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBData.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.orb ; -import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo ; +import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; import com.sun.corba.ee.impl.legacy.connection.USLPort; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.transport.Acceptor; import com.sun.corba.ee.spi.transport.ContactInfoListFactory; import com.sun.corba.ee.spi.transport.IIOPPrimaryToContactInfo; @@ -30,12 +30,12 @@ import java.util.concurrent.TimeUnit; -import org.glassfish.gmbal.AMXMetadata ; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedObject ; -import org.glassfish.pfl.basic.contain.Pair ; -import org.omg.PortableInterceptor.ORBInitializer ; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; +import org.glassfish.pfl.basic.contain.Pair; +import org.omg.PortableInterceptor.ORBInitializer; // Which attributes should become setters? NOT everything, but only // those that we think might actually be useful to set. This may change diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java index 4b2eddcc61..30de83bbc0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersion.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.orb ; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedData ; -import org.omg.CORBA.portable.OutputStream ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedData; +import org.omg.CORBA.portable.OutputStream; @ManagedData @Description( "The version of the ORB" ) diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java index 860a5c0493..4df09272d8 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ORBVersionFactory.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.orb ; -import com.sun.corba.ee.impl.orb.ORBVersionImpl ; +import com.sun.corba.ee.impl.orb.ORBVersionImpl; -import org.omg.CORBA.portable.InputStream ; +import org.omg.CORBA.portable.InputStream; public class ORBVersionFactory { private ORBVersionFactory() {} ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ObjectKeyCacheEntry.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ObjectKeyCacheEntry.java index cfba9d2ee1..09adc378e0 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ObjectKeyCacheEntry.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ObjectKeyCacheEntry.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.orb ; -import com.sun.corba.ee.spi.ior.ObjectKey ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; +import com.sun.corba.ee.spi.ior.ObjectKey; +import com.sun.corba.ee.spi.oa.ObjectAdapter; /** Interface used to represent information cached for a particular byte[] that * represent a GIOP marshalled ObjectKey. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java index bedb833c72..63204e821e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactory.java @@ -22,10 +22,10 @@ import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import java.lang.reflect.Array ; -import java.net.MalformedURLException ; -import java.net.URL ; -import java.util.StringTokenizer ; +import java.lang.reflect.Array; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.StringTokenizer; import org.glassfish.pfl.basic.algorithm.ObjectUtility; import org.glassfish.pfl.basic.contain.Pair; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactoryExt.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactoryExt.java index 99ff3de7ce..209e6e5faa 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactoryExt.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/OperationFactoryExt.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.orb ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import java.lang.reflect.Constructor ; +import java.lang.reflect.Constructor; /** Provides an extension to the OperationFactory for convertAction( Class ), * which takes a Class with a constructor that takes a String as an argument. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java index 819dc73c4d..c9e4e1da99 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserData.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.orb ; -import java.util.Properties ; +import java.util.Properties; public interface ParserData { public String getPropertyName() ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserDataFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserDataFactory.java index 8bc2fb58cd..224e1e1edf 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserDataFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserDataFactory.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.orb ; -import com.sun.corba.ee.impl.orb.NormalParserData ; -import com.sun.corba.ee.impl.orb.PrefixParserData ; +import com.sun.corba.ee.impl.orb.NormalParserData; +import com.sun.corba.ee.impl.orb.PrefixParserData; import org.glassfish.pfl.basic.contain.Pair; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java index d1f6e7a1ee..bd004df4a6 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplBase.java @@ -19,16 +19,16 @@ package com.sun.corba.ee.spi.orb ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; - -import java.lang.reflect.Field ; -import java.security.AccessController ; -import java.security.PrivilegedActionException ; -import java.security.PrivilegedExceptionAction ; -import java.util.Iterator ; -import java.util.Map ; -import java.util.Properties ; -import java.util.Set ; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; + +import java.lang.reflect.Field; +import java.security.AccessController; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; +import java.util.Set; public abstract class ParserImplBase { private static final ORBUtilSystemException wrapper = diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java index dd5123b7a8..294c026495 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/ParserImplTableBase.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.orb ; -import java.util.AbstractMap ; -import java.util.AbstractSet ; -import java.util.Iterator ; -import java.util.Map ; -import java.util.Set ; +import java.util.AbstractMap; +import java.util.AbstractSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; public abstract class ParserImplTableBase extends ParserImplBase { private final ParserData[] entries ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/PropertyParser.java b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/PropertyParser.java index d045e84a84..eb3a9da940 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/orb/PropertyParser.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/orb/PropertyParser.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.spi.orb ; -import com.sun.corba.ee.impl.orb.ParserAction ; -import com.sun.corba.ee.impl.orb.ParserActionFactory ; +import com.sun.corba.ee.impl.orb.ParserAction; +import com.sun.corba.ee.impl.orb.ParserActionFactory; -import java.util.HashMap ; -import java.util.Iterator ; -import java.util.LinkedList ; -import java.util.List ; -import java.util.Map ; -import java.util.Properties ; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; public class PropertyParser { private List actions ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/osgi/ORBFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/osgi/ORBFactory.java index 9f08c20fc1..4224bfbf6e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/osgi/ORBFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/osgi/ORBFactory.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.spi.osgi; -import com.sun.corba.ee.impl.orb.ORBImpl ; +import com.sun.corba.ee.impl.orb.ORBImpl; import com.sun.corba.ee.impl.osgi.loader.OSGIListener; import com.sun.corba.ee.spi.misc.ORBConstants; -import com.sun.corba.ee.spi.orb.ClassCodeBaseHandler ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ClassCodeBaseHandler; +import com.sun.corba.ee.spi.orb.ORB; -import java.util.Properties ; +import java.util.Properties; -import org.glassfish.external.amx.AMXGlassfish ; +import org.glassfish.external.amx.AMXGlassfish; /** A simple factory for creating our ORB that avoids the ClassLoader * problems with org.omg.CORBA.ORB.init, which must load the ORB impl class. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicMethodMarshaller.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicMethodMarshaller.java index ef9f7e5460..f621376b40 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicMethodMarshaller.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicMethodMarshaller.java @@ -19,13 +19,13 @@ package com.sun.corba.ee.spi.presentation.rmi ; -import java.lang.reflect.Method ; -import java.rmi.RemoteException ; +import java.lang.reflect.Method; +import java.rmi.RemoteException; -import org.omg.CORBA.ORB ; -import org.omg.CORBA.portable.ApplicationException ; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA.ORB; +import org.omg.CORBA.portable.ApplicationException; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** Used to read and write arguments and results for a particular method. * diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicStub.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicStub.java index 67b89f0ba7..afdc74c644 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicStub.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/DynamicStub.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.presentation.rmi ; -import java.rmi.RemoteException ; +import java.rmi.RemoteException; -import org.omg.CORBA.ORB ; -import org.omg.CORBA.portable.Delegate ; -import org.omg.CORBA.portable.OutputStream ; +import org.omg.CORBA.ORB; +import org.omg.CORBA.portable.Delegate; +import org.omg.CORBA.portable.OutputStream; /** Interface used to support dynamically generated stubs. * This supplies some methods that are found in diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/IDLNameTranslator.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/IDLNameTranslator.java index 4d34b4d1bb..67c5f7db1d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/IDLNameTranslator.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/IDLNameTranslator.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.presentation.rmi ; -import java.lang.reflect.Method ; +import java.lang.reflect.Method; /** Translates between methods on an interface and RMI-IIOP encodings * of those methods as names. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java index a141a29341..c7f97410fe 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/PresentationManager.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.presentation.rmi ; -import java.io.PrintStream ; -import java.lang.reflect.Method ; -import java.util.Map ; +import java.io.PrintStream; +import java.lang.reflect.Method; +import java.util.Map; -import javax.rmi.CORBA.Tie ; +import javax.rmi.CORBA.Tie; import org.glassfish.pfl.basic.proxy.InvocationHandlerFactory; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java index 114e71533e..bd47542f18 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubAdapter.java @@ -19,22 +19,22 @@ package com.sun.corba.ee.spi.presentation.rmi ; -import com.sun.corba.ee.impl.oa.poa.POAManagerImpl ; -import com.sun.corba.ee.spi.logging.ORBUtilSystemException ; - -import javax.rmi.CORBA.Tie ; - -import org.omg.CORBA.ORB ; -import org.omg.CORBA.portable.Delegate ; -import org.omg.CORBA.portable.ObjectImpl ; -import org.omg.CORBA.portable.OutputStream ; -import org.omg.PortableServer.POA ; -import org.omg.PortableServer.POAManager ; -import org.omg.PortableServer.Servant ; -import org.omg.PortableServer.POAManagerPackage.AdapterInactive ; -import org.omg.PortableServer.POAManagerPackage.State ; -import org.omg.PortableServer.POAPackage.ServantNotActive ; -import org.omg.PortableServer.POAPackage.WrongPolicy ; +import com.sun.corba.ee.impl.oa.poa.POAManagerImpl; +import com.sun.corba.ee.spi.logging.ORBUtilSystemException; + +import javax.rmi.CORBA.Tie; + +import org.omg.CORBA.ORB; +import org.omg.CORBA.portable.Delegate; +import org.omg.CORBA.portable.ObjectImpl; +import org.omg.CORBA.portable.OutputStream; +import org.omg.PortableServer.POA; +import org.omg.PortableServer.POAManager; +import org.omg.PortableServer.Servant; +import org.omg.PortableServer.POAManagerPackage.AdapterInactive; +import org.omg.PortableServer.POAManagerPackage.State; +import org.omg.PortableServer.POAPackage.ServantNotActive; +import org.omg.PortableServer.POAPackage.WrongPolicy; /** Provide access to stub delegate and type id information * independent of the stub type. This class exists because diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java index 6b40f5a960..e246c8be83 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/presentation/rmi/StubWrapper.java @@ -19,20 +19,20 @@ package com.sun.corba.ee.spi.presentation.rmi ; -import java.rmi.RemoteException ; - -import org.omg.CORBA.Context ; -import org.omg.CORBA.ContextList ; -import org.omg.CORBA.DomainManager ; -import org.omg.CORBA.ExceptionList ; -import org.omg.CORBA.NVList ; -import org.omg.CORBA.NamedValue ; -import org.omg.CORBA.ORB ; -import org.omg.CORBA.Policy ; -import org.omg.CORBA.Request ; -import org.omg.CORBA.SetOverrideType ; -import org.omg.CORBA.portable.Delegate ; -import org.omg.CORBA.portable.OutputStream ; +import java.rmi.RemoteException; + +import org.omg.CORBA.Context; +import org.omg.CORBA.ContextList; +import org.omg.CORBA.DomainManager; +import org.omg.CORBA.ExceptionList; +import org.omg.CORBA.NVList; +import org.omg.CORBA.NamedValue; +import org.omg.CORBA.ORB; +import org.omg.CORBA.Policy; +import org.omg.CORBA.Request; +import org.omg.CORBA.SetOverrideType; +import org.omg.CORBA.portable.Delegate; +import org.omg.CORBA.portable.OutputStream; /** Wrapper that can take any stub (object x such that StubAdapter.isStub(x)) * and treat it as a DynamicStub. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientDelegateFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientDelegateFactory.java index caf89fd34a..608142aa3c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientDelegateFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ClientDelegateFactory.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.protocol ; -import com.sun.corba.ee.spi.transport.ContactInfoList ; +import com.sun.corba.ee.spi.transport.ContactInfoList; /** Interface used to create a ClientDelegate from a ContactInfoList. */ diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java index f2080db806..850dc7a79a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ForwardException.java @@ -19,11 +19,11 @@ package com.sun.corba.ee.spi.protocol; -import com.sun.corba.ee.impl.misc.ORBUtility ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.impl.misc.ORBUtility; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.orb.ORB; -import org.omg.CORBA.BAD_PARAM ; +import org.omg.CORBA.BAD_PARAM; /** * Thrown to signal an OBJECT_FORWARD or LOCATION_FORWARD diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/InitialServerRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/InitialServerRequestDispatcher.java index f2c6d68914..c98a417be4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/InitialServerRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/InitialServerRequestDispatcher.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.protocol; -import com.sun.corba.ee.spi.resolver.Resolver ; +import com.sun.corba.ee.spi.resolver.Resolver; /** InitialServerRequestDispatcher is a specialized version of a ServerRequestDispatcher * that provides an initialization method. This delegate is used diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java index 42d37bc094..e3f531c093 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/LocalClientRequestDispatcherFactory.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.protocol; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; public interface LocalClientRequestDispatcherFactory { public LocalClientRequestDispatcher create( int id, IOR ior ) ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java index e71610d922..39b6980b1a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/PIHandler.java @@ -19,23 +19,23 @@ package com.sun.corba.ee.spi.protocol; -import com.sun.corba.ee.impl.corba.RequestImpl ; -import com.sun.corba.ee.impl.protocol.giopmsgheaders.ReplyMessage ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.oa.ObjectAdapter ; +import com.sun.corba.ee.impl.corba.RequestImpl; +import com.sun.corba.ee.impl.protocol.giopmsgheaders.ReplyMessage; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.oa.ObjectAdapter; -import java.io.Closeable ; +import java.io.Closeable; -import org.omg.CORBA.Any ; -import org.omg.CORBA.NVList ; -import org.omg.CORBA.Policy ; -import org.omg.CORBA.PolicyError ; +import org.omg.CORBA.Any; +import org.omg.CORBA.NVList; +import org.omg.CORBA.Policy; +import org.omg.CORBA.PolicyError; import org.omg.CORBA.portable.RemarshalException; -import org.omg.PortableInterceptor.Current ; -import org.omg.PortableInterceptor.Interceptor ; -import org.omg.PortableInterceptor.ObjectReferenceTemplate ; -import org.omg.PortableInterceptor.PolicyFactory ; -import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName ; +import org.omg.PortableInterceptor.Current; +import org.omg.PortableInterceptor.Interceptor; +import org.omg.PortableInterceptor.ObjectReferenceTemplate; +import org.omg.PortableInterceptor.PolicyFactory; +import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName; /** This interface defines the PI interface that is used to interface the rest of the * ORB to the PI implementation. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java index 53a8b47cdb..2da88f2f6a 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ProtocolHandler.java @@ -21,7 +21,7 @@ import com.sun.corba.ee.impl.protocol.giopmsgheaders.LocateRequestMessage; import com.sun.corba.ee.impl.protocol.giopmsgheaders.RequestMessage; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.servicecontext.ServiceContexts; import org.omg.CORBA.CompletionStatus; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherDefault.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherDefault.java index cf9b4fb168..20448db831 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherDefault.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherDefault.java @@ -20,18 +20,18 @@ package com.sun.corba.ee.spi.protocol ; -import com.sun.corba.ee.impl.protocol.BootstrapServerRequestDispatcher ; -import com.sun.corba.ee.impl.protocol.ClientRequestDispatcherImpl ; -import com.sun.corba.ee.impl.protocol.FullServantCacheLocalCRDImpl ; -import com.sun.corba.ee.impl.protocol.INSServerRequestDispatcher ; -import com.sun.corba.ee.impl.protocol.InfoOnlyServantCacheLocalCRDImpl ; -import com.sun.corba.ee.impl.protocol.JIDLLocalCRDImpl ; -import com.sun.corba.ee.impl.protocol.MinimalServantCacheLocalCRDImpl ; -import com.sun.corba.ee.impl.protocol.POALocalCRDImpl ; -import com.sun.corba.ee.impl.protocol.ServerRequestDispatcherImpl ; +import com.sun.corba.ee.impl.protocol.BootstrapServerRequestDispatcher; +import com.sun.corba.ee.impl.protocol.ClientRequestDispatcherImpl; +import com.sun.corba.ee.impl.protocol.FullServantCacheLocalCRDImpl; +import com.sun.corba.ee.impl.protocol.INSServerRequestDispatcher; +import com.sun.corba.ee.impl.protocol.InfoOnlyServantCacheLocalCRDImpl; +import com.sun.corba.ee.impl.protocol.JIDLLocalCRDImpl; +import com.sun.corba.ee.impl.protocol.MinimalServantCacheLocalCRDImpl; +import com.sun.corba.ee.impl.protocol.POALocalCRDImpl; +import com.sun.corba.ee.impl.protocol.ServerRequestDispatcherImpl; // Used only in the implementation: no client of this class ever needs these -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.orb.ORB; public final class RequestDispatcherDefault { private RequestDispatcherDefault() {} diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherRegistry.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherRegistry.java index 4b59c07e4e..299a133ecc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherRegistry.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/RequestDispatcherRegistry.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.spi.protocol; -import com.sun.corba.ee.spi.oa.ObjectAdapterFactory ; +import com.sun.corba.ee.spi.oa.ObjectAdapterFactory; import java.util.Set; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java index b5a7f44a9b..93556d9acb 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/protocol/ServerRequestDispatcher.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.spi.protocol; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.ObjectKey; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/resolver/ResolverDefault.java b/orbmain/src/main/java/com/sun/corba/ee/spi/resolver/ResolverDefault.java index d6b24c9f53..538b60b500 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/resolver/ResolverDefault.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/resolver/ResolverDefault.java @@ -19,18 +19,18 @@ package com.sun.corba.ee.spi.resolver ; -import com.sun.corba.ee.impl.resolver.BootstrapResolverImpl ; -import com.sun.corba.ee.impl.resolver.CompositeResolverImpl ; -import com.sun.corba.ee.impl.resolver.FileResolverImpl ; -import com.sun.corba.ee.impl.resolver.INSURLOperationImpl ; -import com.sun.corba.ee.impl.resolver.LocalResolverImpl ; -import com.sun.corba.ee.impl.resolver.ORBDefaultInitRefResolverImpl ; -import com.sun.corba.ee.impl.resolver.ORBInitRefResolverImpl ; -import com.sun.corba.ee.impl.resolver.SplitLocalResolverImpl ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.Operation ; +import com.sun.corba.ee.impl.resolver.BootstrapResolverImpl; +import com.sun.corba.ee.impl.resolver.CompositeResolverImpl; +import com.sun.corba.ee.impl.resolver.FileResolverImpl; +import com.sun.corba.ee.impl.resolver.INSURLOperationImpl; +import com.sun.corba.ee.impl.resolver.LocalResolverImpl; +import com.sun.corba.ee.impl.resolver.ORBDefaultInitRefResolverImpl; +import com.sun.corba.ee.impl.resolver.ORBInitRefResolverImpl; +import com.sun.corba.ee.impl.resolver.SplitLocalResolverImpl; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.Operation; -import java.io.File ; +import java.io.File; import org.glassfish.pfl.basic.contain.Pair; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ORBVersionServiceContext.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ORBVersionServiceContext.java index b9ff4d4a87..006a4ca458 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ORBVersionServiceContext.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ORBVersionServiceContext.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.servicecontext; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.orb.ORBVersion ; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.orb.ORBVersion; public interface ORBVersionServiceContext extends ServiceContext { int SERVICE_CONTEXT_ID = ORBConstants.TAG_ORB_VERSION ; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/SendingContextServiceContext.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/SendingContextServiceContext.java index abf6803ebe..3ae91c845c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/SendingContextServiceContext.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/SendingContextServiceContext.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.servicecontext; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; public interface SendingContextServiceContext extends ServiceContext { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContext.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContext.java index 18b8f07c08..129fe6ac9c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContext.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContext.java @@ -21,8 +21,8 @@ import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** Base class for all ServiceContext classes. * There is a derived ServiceContext class for each service context that diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextBase.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextBase.java index 9c6f5b0b37..6530141712 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextBase.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextBase.java @@ -19,15 +19,15 @@ package com.sun.corba.ee.spi.servicecontext; -import com.sun.corba.ee.impl.encoding.EncapsOutputStream ; +import com.sun.corba.ee.impl.encoding.EncapsOutputStream; import com.sun.corba.ee.impl.encoding.OutputStreamFactory; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.logging.ORBUtilSystemException; -import com.sun.corba.ee.spi.orb.ORB ; +import com.sun.corba.ee.spi.orb.ORB; import org.omg.CORBA.SystemException; -import org.omg.CORBA_2_3.portable.InputStream ; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.InputStream; +import org.omg.CORBA_2_3.portable.OutputStream; /** Base class for all ServiceContext classes. * There is a derived ServiceContext class for each service context that diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java index 16ec7c28ef..3abcc0c400 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContextDefaults.java @@ -19,22 +19,22 @@ package com.sun.corba.ee.spi.servicecontext; -import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo ; -import com.sun.corba.ee.impl.servicecontext.CodeSetServiceContextImpl ; -import com.sun.corba.ee.impl.servicecontext.MaxStreamFormatVersionServiceContextImpl ; -import com.sun.corba.ee.impl.servicecontext.ORBVersionServiceContextImpl ; -import com.sun.corba.ee.impl.servicecontext.SendingContextServiceContextImpl ; -import com.sun.corba.ee.impl.servicecontext.ServiceContextFactoryRegistryImpl ; -import com.sun.corba.ee.impl.servicecontext.ServiceContextsImpl ; -import com.sun.corba.ee.impl.servicecontext.UEInfoServiceContextImpl ; -import com.sun.corba.ee.impl.servicecontext.UnknownServiceContextImpl ; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.orb.ORBVersion ; +import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; +import com.sun.corba.ee.impl.servicecontext.CodeSetServiceContextImpl; +import com.sun.corba.ee.impl.servicecontext.MaxStreamFormatVersionServiceContextImpl; +import com.sun.corba.ee.impl.servicecontext.ORBVersionServiceContextImpl; +import com.sun.corba.ee.impl.servicecontext.SendingContextServiceContextImpl; +import com.sun.corba.ee.impl.servicecontext.ServiceContextFactoryRegistryImpl; +import com.sun.corba.ee.impl.servicecontext.ServiceContextsImpl; +import com.sun.corba.ee.impl.servicecontext.UEInfoServiceContextImpl; +import com.sun.corba.ee.impl.servicecontext.UnknownServiceContextImpl; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.orb.ORBVersion; import com.sun.corba.ee.spi.orb.ORBVersionFactory; -import org.omg.CORBA_2_3.portable.InputStream ; +import org.omg.CORBA_2_3.portable.InputStream; public abstract class ServiceContextDefaults { diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java index 5717254582..dbc260b08b 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/ServiceContexts.java @@ -21,7 +21,7 @@ import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; -import org.omg.CORBA_2_3.portable.OutputStream ; +import org.omg.CORBA_2_3.portable.OutputStream; /** The collection of ServiceContext instances used in a particular * request. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Cdr.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Cdr.java index 53850203b8..35a8620242 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Cdr.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Cdr.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrRead.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrRead.java index f186883b65..fede8ca841 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrRead.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrRead.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrWrite.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrWrite.java index a88b497204..cf46a3598f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrWrite.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/CdrWrite.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/DynamicType.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/DynamicType.java index 46c3623291..9acb3895ea 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/DynamicType.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/DynamicType.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Folb.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Folb.java index dd239dc166..d30c01ebd2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Folb.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Folb.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Giop.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Giop.java index 147c8a1c13..9c15e012ce 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Giop.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Giop.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/IsLocal.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/IsLocal.java index 8ee18bb698..676313628c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/IsLocal.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/IsLocal.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorRead.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorRead.java index f5fd0562cf..c6ff3632fc 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorRead.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorRead.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorWrite.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorWrite.java index 9c25c953fc..06b11481ac 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorWrite.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/MonitorWrite.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Naming.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Naming.java index 48b4d5726e..570536c3f1 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Naming.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Naming.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/OrbLifeCycle.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/OrbLifeCycle.java index 3061ff358e..ecca8f5a38 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/OrbLifeCycle.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/OrbLifeCycle.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Orbd.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Orbd.java index 41348ec180..e47be5b999 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Orbd.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Orbd.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Osgi.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Osgi.java index 0752810037..4ec0e9ec2d 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Osgi.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Osgi.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Poa.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Poa.java index e157868a12..279548ac31 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Poa.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Poa.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PoaFSM.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PoaFSM.java index 45910cf997..37f12834df 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PoaFSM.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PoaFSM.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveRead.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveRead.java index 1750b68b08..ce98970452 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveRead.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveRead.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveWrite.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveWrite.java index a77103dcb7..6263296b73 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveWrite.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/PrimitiveWrite.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Shutdown.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Shutdown.java index 1fd4f93a43..a14ed9d313 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Shutdown.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Shutdown.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/StreamFormatVersion.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/StreamFormatVersion.java index 1caea7ae40..eb2d1ad0ad 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/StreamFormatVersion.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/StreamFormatVersion.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Subcontract.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Subcontract.java index b4c02d6b6c..1cdb7b26de 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Subcontract.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Subcontract.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceInterceptor.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceInterceptor.java index 37e2fc7a6d..6d858e563c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceInterceptor.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceInterceptor.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceServiceContext.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceServiceContext.java index c91e20cf22..680c526cc7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceServiceContext.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceServiceContext.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceValueHandler.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceValueHandler.java index 6efed941a5..d01452aa96 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceValueHandler.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TraceValueHandler.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TransientObjectManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TransientObjectManager.java index 84b3142f79..7279ae0cf4 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TransientObjectManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/TransientObjectManager.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Transport.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Transport.java index c7e4d644bb..dfa7dfd111 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Transport.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/Transport.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerRead.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerRead.java index baa19cfed5..1784bb36f3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerRead.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerRead.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerWrite.java b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerWrite.java index d7302ebdd7..a56f158410 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerWrite.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/trace/ValueHandlerWrite.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.trace ; -import java.lang.annotation.ElementType ; -import java.lang.annotation.Retention ; -import java.lang.annotation.RetentionPolicy ; -import java.lang.annotation.Target ; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import org.glassfish.pfl.tf.spi.annotation.MethodMonitorGroup; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java index fe3e355814..1a16b8c530 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Acceptor.java @@ -29,9 +29,9 @@ import java.net.ServerSocket; import java.net.Socket; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedObject ; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * @author Harold Carr diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java index 11e306179e..8743b7f766 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/Connection.java @@ -22,7 +22,7 @@ import com.sun.corba.ee.impl.encoding.CDRInputObject; import com.sun.corba.ee.impl.encoding.CDROutputObject; import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.iiop.GIOPVersion; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.MessageMediator; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java index ef59ec7615..92edba942f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfo.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.spi.transport; import com.sun.corba.ee.impl.encoding.CDROutputObject; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.ior.iiop.IIOPProfile; import com.sun.corba.ee.spi.orb.ORB; import com.sun.corba.ee.spi.protocol.ClientRequestDispatcher; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java index e83d186ea9..ba274d71d7 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoList.java @@ -19,10 +19,10 @@ package com.sun.corba.ee.spi.transport; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher; -import java.util.Iterator ; +import java.util.Iterator; /** diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java index 6535ba9c5e..bac4810400 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/ContactInfoListFactory.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.spi.transport ; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.spi.ior.IOR; import com.sun.corba.ee.spi.orb.ORB; /** Interface used to create a ContactInfoList from an IOR, as required diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IORTransformer.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IORTransformer.java index 92ca9d91d3..dc16a2ee41 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IORTransformer.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/IORTransformer.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.transport ; -import com.sun.corba.ee.impl.encoding.CDRInputObject ; -import com.sun.corba.ee.impl.encoding.CDROutputObject ; -import com.sun.corba.ee.spi.ior.IOR ; +import com.sun.corba.ee.impl.encoding.CDRInputObject; +import com.sun.corba.ee.impl.encoding.CDROutputObject; +import com.sun.corba.ee.spi.ior.IOR; /** Interface that provides operations to transorm an IOR * between its programmatic representation and a representation diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/MessageData.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/MessageData.java index 803f254d72..44f173da1f 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/MessageData.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/MessageData.java @@ -20,7 +20,7 @@ package com.sun.corba.ee.spi.transport; import com.sun.corba.ee.impl.encoding.CDRInputObject; -import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message ; +import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message; public interface MessageData { /** An array of GIOP messages. The messages will diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java index 7ec4071fd6..7f893080ae 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TcpTimeouts.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.transport; -import com.sun.corba.ee.impl.transport.TcpTimeoutsImpl ; +import com.sun.corba.ee.impl.transport.TcpTimeoutsImpl; /** This interface defines the ability to wait for a configurable time, * applying an exponential backoff to increase the time. The maximum diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java index 9caff3414b..b95cbccfd2 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportDefault.java @@ -20,15 +20,15 @@ package com.sun.corba.ee.spi.transport ; // Internal imports, not used in the interface to this package -import com.sun.corba.ee.impl.protocol.ClientDelegateImpl ; +import com.sun.corba.ee.impl.protocol.ClientDelegateImpl; import com.sun.corba.ee.impl.transport.AcceptorAcceptOnlyImpl; -import com.sun.corba.ee.impl.transport.AcceptorImpl ; -import com.sun.corba.ee.impl.transport.AcceptorLazyImpl ; +import com.sun.corba.ee.impl.transport.AcceptorImpl; +import com.sun.corba.ee.impl.transport.AcceptorLazyImpl; import com.sun.corba.ee.impl.transport.ContactInfoListImpl; -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.protocol.ClientDelegate ; -import com.sun.corba.ee.spi.protocol.ClientDelegateFactory ; +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.protocol.ClientDelegate; +import com.sun.corba.ee.spi.protocol.ClientDelegateFactory; import java.net.Socket; diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java index 09c83537ce..80176e6c62 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/TransportManager.java @@ -27,10 +27,10 @@ import java.util.Collection; -import org.glassfish.gmbal.AMXMetadata ; -import org.glassfish.gmbal.Description ; -import org.glassfish.gmbal.ManagedAttribute ; -import org.glassfish.gmbal.ManagedObject ; +import org.glassfish.gmbal.AMXMetadata; +import org.glassfish.gmbal.Description; +import org.glassfish.gmbal.ManagedAttribute; +import org.glassfish.gmbal.ManagedObject; /** * @author Harold Carr diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/concurrent/ConcurrentQueueFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/concurrent/ConcurrentQueueFactory.java index 257a426a39..d5313ce325 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/concurrent/ConcurrentQueueFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/concurrent/ConcurrentQueueFactory.java @@ -19,9 +19,9 @@ package com.sun.corba.ee.spi.transport.concurrent ; -import com.sun.corba.ee.impl.transport.concurrent.ConcurrentQueueBlockingImpl ; -import com.sun.corba.ee.impl.transport.concurrent.ConcurrentQueueImpl ; -import com.sun.corba.ee.impl.transport.concurrent.ConcurrentQueueNonBlockingImpl ; +import com.sun.corba.ee.impl.transport.concurrent.ConcurrentQueueBlockingImpl; +import com.sun.corba.ee.impl.transport.concurrent.ConcurrentQueueImpl; +import com.sun.corba.ee.impl.transport.concurrent.ConcurrentQueueNonBlockingImpl; /** A factory class for creating instances of ConcurrentQueue. * Note that a rather unusual syntax is needed for calling these methods: diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/Connection.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/Connection.java index 8192a2ee5b..30ac1ead3e 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/Connection.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/Connection.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.transport.connection; -import java.io.IOException ; +import java.io.IOException; /** A Connection represents some kind of channel to a (possibly different) process. * Here we only need the capability of closing the connection. Any connection diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionCacheFactory.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionCacheFactory.java index 818172bc1b..3f5e9e2d97 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionCacheFactory.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionCacheFactory.java @@ -20,10 +20,10 @@ package com.sun.corba.ee.spi.transport.connection; -import com.sun.corba.ee.impl.transport.connection.InboundConnectionCacheBlockingImpl ; -import com.sun.corba.ee.impl.transport.connection.InboundConnectionCacheImpl ; -import com.sun.corba.ee.impl.transport.connection.OutboundConnectionCacheBlockingImpl ; -import com.sun.corba.ee.impl.transport.connection.OutboundConnectionCacheImpl ; +import com.sun.corba.ee.impl.transport.connection.InboundConnectionCacheBlockingImpl; +import com.sun.corba.ee.impl.transport.connection.InboundConnectionCacheImpl; +import com.sun.corba.ee.impl.transport.connection.OutboundConnectionCacheBlockingImpl; +import com.sun.corba.ee.impl.transport.connection.OutboundConnectionCacheImpl; /** A factory class for creating connections caches. * Note that a rather unusual syntax is needed for calling these methods: diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionFinder.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionFinder.java index 7e2182d53e..7a7953930c 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionFinder.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ConnectionFinder.java @@ -19,8 +19,8 @@ package com.sun.corba.ee.spi.transport.connection; -import java.io.IOException ; -import java.util.Collection ; +import java.io.IOException; +import java.util.Collection; /** An instance of a ConnectionFinder may be supplied to the * OutboundConnectionCache.get method. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ContactInfo.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ContactInfo.java index dc4a80f316..b163d79411 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ContactInfo.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/ContactInfo.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.transport.connection; -import java.io.IOException ; +import java.io.IOException; /** The ContactInfo represents the information needed to establish a connection * to a (possibly different) process. This is a subset of the PEPt 2.0 connection. diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/OutboundConnectionCache.java b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/OutboundConnectionCache.java index 33a6813ee2..681a4645a3 100644 --- a/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/OutboundConnectionCache.java +++ b/orbmain/src/main/java/com/sun/corba/ee/spi/transport/connection/OutboundConnectionCache.java @@ -19,7 +19,7 @@ package com.sun.corba.ee.spi.transport.connection; -import java.io.IOException ; +import java.io.IOException; /** A concurrent mostly non-blocking connection cache. Here a Connection is an * abstraction of a Socket or SocketChannel: basically some sort of resource diff --git a/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java b/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java index b91d354135..fabf8a6311 100644 --- a/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java +++ b/orbmain/src/main/java/org/glassfish/corba/BridgePermission.java @@ -19,7 +19,7 @@ package org.glassfish.corba; -import java.security.BasicPermission ; +import java.security.BasicPermission; /** Permission class used to protect access to the sun.corba.Bridge * object. The only name valid here is "getBridge". The diff --git a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLMultipleInterfaceTest.java b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLMultipleInterfaceTest.java index e89ad23b43..ce133c6c71 100644 --- a/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLMultipleInterfaceTest.java +++ b/orbmain/src/test/java/corba/dynamicrmiiiop/testclasses/IDLMultipleInterfaceTest.java @@ -19,7 +19,7 @@ package corba.dynamicrmiiiop.testclasses; -import java.rmi.RemoteException ; +import java.rmi.RemoteException; public class IDLMultipleInterfaceTest { diff --git a/src/share/classes/com/sun/corba/ee/impl/osgi/main/ORBFactoryTest.java b/src/share/classes/com/sun/corba/ee/impl/osgi/main/ORBFactoryTest.java index 9d4e8f4e36..9d301ee883 100644 --- a/src/share/classes/com/sun/corba/ee/impl/osgi/main/ORBFactoryTest.java +++ b/src/share/classes/com/sun/corba/ee/impl/osgi/main/ORBFactoryTest.java @@ -19,22 +19,22 @@ package com.sun.corba.ee.impl.osgi.main ; -import org.osgi.framework.Bundle ; -import org.osgi.framework.BundleActivator ; -import org.osgi.framework.BundleEvent ; -import org.osgi.framework.BundleContext ; -import org.osgi.framework.SynchronousBundleListener ; -import org.osgi.framework.ServiceReference ; - -import org.osgi.service.packageadmin.PackageAdmin ; -import org.osgi.service.packageadmin.ExportedPackage ; - -import java.util.Properties ; - -import com.sun.corba.ee.spi.osgi.ORBFactory ; -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.misc.ORBConstants ; -import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager ; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleEvent; +import org.osgi.framework.BundleContext; +import org.osgi.framework.SynchronousBundleListener; +import org.osgi.framework.ServiceReference; + +import org.osgi.service.packageadmin.PackageAdmin; +import org.osgi.service.packageadmin.ExportedPackage; + +import java.util.Properties; + +import com.sun.corba.ee.spi.osgi.ORBFactory; +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.misc.ORBConstants; +import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager; public class ORBFactoryTest implements BundleActivator, SynchronousBundleListener { private static PackageAdmin pkgAdmin ; diff --git a/src/share/classes/com/sun/corba/ee/tool/IORDump.java b/src/share/classes/com/sun/corba/ee/tool/IORDump.java index d91d2ece49..5a19ce4a2f 100644 --- a/src/share/classes/com/sun/corba/ee/tool/IORDump.java +++ b/src/share/classes/com/sun/corba/ee/tool/IORDump.java @@ -19,19 +19,19 @@ package com.sun.corba.ee.tool ; -import org.omg.CORBA.portable.ObjectImpl ; - -import com.sun.corba.ee.spi.orb.ORB ; -import com.sun.corba.ee.spi.protocol.ClientDelegate ; -import com.sun.corba.ee.spi.transport.ContactInfoList ; - -import com.sun.corba.ee.spi.ior.IOR ; -import com.sun.corba.ee.impl.ior.GenericIdentifiable ; -import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ; -import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ; -import com.sun.corba.ee.spi.ior.TaggedProfile ; -import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ; -import com.sun.corba.ee.spi.ior.TaggedComponent ; +import org.omg.CORBA.portable.ObjectImpl; + +import com.sun.corba.ee.spi.orb.ORB; +import com.sun.corba.ee.spi.protocol.ClientDelegate; +import com.sun.corba.ee.spi.transport.ContactInfoList; + +import com.sun.corba.ee.spi.ior.IOR; +import com.sun.corba.ee.impl.ior.GenericIdentifiable; +import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate; +import com.sun.corba.ee.spi.ior.TaggedProfileTemplate; +import com.sun.corba.ee.spi.ior.TaggedProfile; +import com.sun.corba.ee.spi.ior.ObjectKeyTemplate; +import com.sun.corba.ee.spi.ior.TaggedComponent; import org.glassfish.pfl.basic.algorithm.Printer; public class IORDump { diff --git a/src/share/classes/org/omg/PortableServer/package.html b/src/share/classes/org/omg/PortableServer/package.html index 1cb96216bb..c20aa164e8 100644 --- a/src/share/classes/org/omg/PortableServer/package.html +++ b/src/share/classes/org/omg/PortableServer/package.html @@ -144,7 +144,7 @@

Example Server Code

 import javax.naming.InitialContext;
 import javax.naming.Context;
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 import com.sun.corba.ee.impl.poa.POAORB;
 import org.omg.PortableServer.*;
 import java.util.*;
diff --git a/src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java b/src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java
index bf8a601218..696a87bb16 100644
--- a/src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java
+++ b/src/share/classes/sun/rmi/rmic/iiop/ClassPathLoader.java
@@ -20,8 +20,8 @@
 package sun.rmi.rmic.iiop;
 
 import java.io.*;
-import sun.tools.java.ClassPath ;
-import sun.tools.java.ClassFile ;
+import sun.tools.java.ClassPath;
+import sun.tools.java.ClassFile;
 
 /**
  * A ClassLoader that will ultimately use a given sun.tools.java.ClassPath to
diff --git a/test/disabled/performance/eesample/SampleData.java b/test/disabled/performance/eesample/SampleData.java
index 07129ec62f..b5e0bb9d70 100644
--- a/test/disabled/performance/eesample/SampleData.java
+++ b/test/disabled/performance/eesample/SampleData.java
@@ -28,9 +28,9 @@
 
 package performance.eesample;
 
-import java.io.Serializable ;
-import java.util.List ;
-import java.util.ArrayList ;
+import java.io.Serializable;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
  *
diff --git a/test/disabled/performance/eesample/StandardTest.java b/test/disabled/performance/eesample/StandardTest.java
index 1da1b936ec..640a760f24 100644
--- a/test/disabled/performance/eesample/StandardTest.java
+++ b/test/disabled/performance/eesample/StandardTest.java
@@ -19,86 +19,86 @@
 
 package performance.eesample;
 
-import java.lang.reflect.Field ;
-import java.lang.reflect.Method ;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 
-import java.lang.annotation.ElementType ;
-import java.lang.annotation.RetentionPolicy ;
-import java.lang.annotation.Target ;
-import java.lang.annotation.Retention ;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.annotation.Retention;
 
-import java.util.Arrays ;
-import java.util.List ;
-import java.util.ArrayList ;
-import java.util.Map ;
-import java.util.Set ;
-import java.util.HashMap ;
-import java.util.Properties ;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashMap;
+import java.util.Properties;
 
-import java.rmi.RemoteException ;
-import java.rmi.Remote ;
+import java.rmi.RemoteException;
+import java.rmi.Remote;
 
-import javax.rmi.CORBA.Tie ;
-import javax.rmi.CORBA.Stub ;
+import javax.rmi.CORBA.Tie;
+import javax.rmi.CORBA.Stub;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.DatatypeConstants;
 
-import org.omg.CORBA.Policy ;
-import org.omg.CORBA.BAD_OPERATION ;
-import org.omg.CORBA.LocalObject ;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.LocalObject;
 
-import org.omg.CosNaming.NamingContext ;
-import org.omg.CosNaming.NamingContextHelper ;
-import org.omg.CosNaming.NamingContextExt ;
-import org.omg.CosNaming.NamingContextExtHelper ;
-import org.omg.CosNaming.NameComponent ;
-import org.omg.CosNaming.NamingContextPackage.CannotProceed ;
-import org.omg.CosNaming.NamingContextPackage.InvalidName ;
-import org.omg.CosNaming.NamingContextPackage.AlreadyBound ;
-import org.omg.CosNaming.NamingContextPackage.NotFound ;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContextPackage.CannotProceed;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
 
-import org.omg.PortableServer.ForwardRequest ;
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.ServantLocator ;
+import org.omg.PortableServer.ForwardRequest;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
 
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
 
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager ;
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory ;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService ;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 
-import com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject ;
-import com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl ;
-import com.sun.corba.ee.impl.javax.rmi.CORBA.Util ;
+import com.sun.corba.ee.impl.javax.rmi.PortableRemoteObject;
+import com.sun.corba.ee.impl.javax.rmi.CORBA.StubDelegateImpl;
+import com.sun.corba.ee.impl.javax.rmi.CORBA.Util;
 
-import com.sun.corba.ee.spi.extension.ServantCachingPolicy ;
+import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
 
-import performance.eesample.wspex.Address ;
-import performance.eesample.wspex.ArrayOfLineItem ;
-import performance.eesample.wspex.Customer ;
-import performance.eesample.wspex.EchoOrderRequest ;
-import performance.eesample.wspex.EchoOrderResponse ;
-import performance.eesample.wspex.Item ;
+import performance.eesample.wspex.Address;
+import performance.eesample.wspex.ArrayOfLineItem;
+import performance.eesample.wspex.Customer;
+import performance.eesample.wspex.EchoOrderRequest;
+import performance.eesample.wspex.EchoOrderResponse;
+import performance.eesample.wspex.Item;
 import performance.eesample.wspex.ItemArrayType;
-import performance.eesample.wspex.LineItem ;
-import performance.eesample.wspex.Location ;
-import performance.eesample.wspex.Order ;
-import performance.eesample.wspex.Struct ;
-import performance.eesample.wspex.Synthetic ;
+import performance.eesample.wspex.LineItem;
+import performance.eesample.wspex.Location;
+import performance.eesample.wspex.Order;
+import performance.eesample.wspex.Struct;
+import performance.eesample.wspex.Synthetic;
 import performance.eesample.wspex.components.OrderBL;
 
-import com.sun.japex.JapexDriverBase ;
-import com.sun.japex.TestCase ;
+import com.sun.japex.JapexDriverBase;
+import com.sun.japex.TestCase;
 import org.glassfish.pfl.basic.tools.argparser.ArgParser;
 import org.glassfish.pfl.basic.tools.argparser.DefaultValue;
 import org.glassfish.pfl.dynamic.codegen.spi.GenericClass;
diff --git a/test/disabled/performance/simpleperf/counterClient.java b/test/disabled/performance/simpleperf/counterClient.java
index 6c4baf46f5..bcd8305468 100644
--- a/test/disabled/performance/simpleperf/counterClient.java
+++ b/test/disabled/performance/simpleperf/counterClient.java
@@ -19,38 +19,38 @@
 
 package performance.simpleperf;
 
-import java.io.PrintStream ;
-import javax.rmi.PortableRemoteObject ;
-import java.rmi.RemoteException ;
-import java.util.Hashtable ;
-import java.util.Map ;
-import java.util.Properties ;
-
-import org.omg.CORBA.Policy ;
-import org.omg.PortableServer.LifespanPolicyValue ;
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.POAPackage.AdapterAlreadyExists ;
-import org.omg.PortableServer.POAPackage.InvalidPolicy ;
-import org.omg.PortableServer.POAPackage.WrongPolicy ;
-import org.omg.PortableServer.RequestProcessingPolicyValue ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.ServantLocator ;
-import org.omg.PortableServer.ServantRetentionPolicyValue ;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
-
-import com.sun.corba.ee.spi.extension.ServantCachingPolicy ;
-
-import com.sun.corba.ee.spi.orb.ORB ;
-
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ;
-
-import com.sun.corba.ee.spi.copyobject.CopierManager ;
-import com.sun.corba.ee.spi.copyobject.CopyobjectDefaults ;
-
-import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints ;
-import com.sun.corba.ee.spi.misc.ORBConstants ;
-
-import corba.framework.InternalProcess ;
+import java.io.PrintStream;
+import javax.rmi.PortableRemoteObject;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Properties;
+
+import org.omg.CORBA.Policy;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
+import org.omg.PortableServer.POAPackage.WrongPolicy;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
+
+import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
+
+import com.sun.corba.ee.spi.orb.ORB;
+
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+
+import com.sun.corba.ee.spi.copyobject.CopierManager;
+import com.sun.corba.ee.spi.copyobject.CopyobjectDefaults;
+
+import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import corba.framework.InternalProcess;
 import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory;
 import org.glassfish.pfl.tf.timer.spi.Statistics;
 import org.glassfish.pfl.tf.timer.spi.StatsEventHandler;
diff --git a/test/src/share/classes/corba/cdrext/Client.java b/test/src/share/classes/corba/cdrext/Client.java
index 90d0678cca..ba3ae4de9c 100644
--- a/test/src/share/classes/corba/cdrext/Client.java
+++ b/test/src/share/classes/corba/cdrext/Client.java
@@ -26,11 +26,11 @@
 import java.util.*;
 import javax.rmi.CORBA.*;
 
-import org.testng.annotations.Test ;
-import org.testng.annotations.BeforeSuite ;
-import org.testng.Assert ;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeSuite;
+import org.testng.Assert;
 
-import corba.framework.TestngRunner ;
+import corba.framework.TestngRunner;
 
 public class Client {
     // Important: put the initialContext here so that is does NOT get GCed and finalized
diff --git a/test/src/share/classes/corba/cdrstreams/Client.java b/test/src/share/classes/corba/cdrstreams/Client.java
index 2e3ca8fd97..711bba987e 100644
--- a/test/src/share/classes/corba/cdrstreams/Client.java
+++ b/test/src/share/classes/corba/cdrstreams/Client.java
@@ -27,10 +27,10 @@
 import java.io.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import org.testng.annotations.Test ;
-import org.testng.annotations.BeforeSuite ;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeSuite;
 
-import corba.framework.TestngRunner ;
+import corba.framework.TestngRunner;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/cdrstreams/GraphProcessor.java b/test/src/share/classes/corba/cdrstreams/GraphProcessor.java
index 081a9f3304..d033026a51 100644
--- a/test/src/share/classes/corba/cdrstreams/GraphProcessor.java
+++ b/test/src/share/classes/corba/cdrstreams/GraphProcessor.java
@@ -19,8 +19,8 @@
 
 package corba.cdrstreams;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface GraphProcessor extends java.rmi.Remote
 {
diff --git a/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java b/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java
index 6b66917518..047c517e6e 100644
--- a/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java
+++ b/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java
@@ -19,12 +19,12 @@
 
 package corba.cdrstreams;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
-import org.omg.CORBA.ORB ;
-import java.io.File ;
-import java.io.RandomAccessFile ;
-import org.omg.PortableServer.POA ;
+import org.omg.CORBA.ORB;
+import java.io.File;
+import java.io.RandomAccessFile;
+import org.omg.PortableServer.POA;
 import java.util.*;
 
 public class GraphProcessorImpl extends PortableRemoteObject implements GraphProcessor
diff --git a/test/src/share/classes/corba/cdrstreams/Server.java b/test/src/share/classes/corba/cdrstreams/Server.java
index 2251ec9c95..0a8d624bf8 100644
--- a/test/src/share/classes/corba/cdrstreams/Server.java
+++ b/test/src/share/classes/corba/cdrstreams/Server.java
@@ -27,7 +27,7 @@
 import java.util.Properties;
 import org.omg.PortableServer.*;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 public class Server
 {
diff --git a/test/src/share/classes/corba/cmvt/GIOPCombo.java b/test/src/share/classes/corba/cmvt/GIOPCombo.java
index d4a1d87ee3..b66f597340 100644
--- a/test/src/share/classes/corba/cmvt/GIOPCombo.java
+++ b/test/src/share/classes/corba/cmvt/GIOPCombo.java
@@ -19,8 +19,8 @@
 
 package corba.cmvt;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 import org.omg.CORBA.*;
 
 public interface GIOPCombo extends Remote {
diff --git a/test/src/share/classes/corba/cmvt/GIOPComboImpl.java b/test/src/share/classes/corba/cmvt/GIOPComboImpl.java
index f942a35c5c..72ffde640a 100644
--- a/test/src/share/classes/corba/cmvt/GIOPComboImpl.java
+++ b/test/src/share/classes/corba/cmvt/GIOPComboImpl.java
@@ -24,7 +24,7 @@
 import org.omg.CORBA.*;
 import java.io.DataInputStream;
 import java.rmi.*;
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 
 public class GIOPComboImpl extends PortableRemoteObject implements GIOPCombo
 {
diff --git a/test/src/share/classes/corba/connectioncache/Client.java b/test/src/share/classes/corba/connectioncache/Client.java
index ef0f7ffff8..d5d1126049 100644
--- a/test/src/share/classes/corba/connectioncache/Client.java
+++ b/test/src/share/classes/corba/connectioncache/Client.java
@@ -19,35 +19,35 @@
 
 package corba.connectioncache ;
 
-import java.util.Collection ;
-import java.util.List ;
-import java.util.ArrayList ;
-import java.util.Set ;
-import java.util.HashSet ;
-
-import java.util.logging.Logger ;
-import java.util.logging.Handler ;
-import java.util.logging.Level ;
-import java.util.logging.StreamHandler ;
-import java.util.logging.Formatter ;
-import java.util.logging.LogRecord ;
-
-import java.io.IOException ;
-
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
-
-import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue ;
-import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory ;
-
-import com.sun.corba.ee.spi.transport.connection.ConnectionFinder ;
-import com.sun.corba.ee.spi.transport.connection.ConnectionCache ;
-import com.sun.corba.ee.spi.transport.connection.ContactInfo ;
-import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache ;
-import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache ;
-import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory ;
-
-import corba.framework.TestngRunner ;
+import java.util.Collection;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Set;
+import java.util.HashSet;
+
+import java.util.logging.Logger;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.StreamHandler;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
+
+import java.io.IOException;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue;
+import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory;
+
+import com.sun.corba.ee.spi.transport.connection.ConnectionFinder;
+import com.sun.corba.ee.spi.transport.connection.ConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.ContactInfo;
+import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory;
+
+import corba.framework.TestngRunner;
 
 public class Client {
     // Ignore all of the LogRecord information except the message.
diff --git a/test/src/share/classes/corba/connectioncache/StressClient.java b/test/src/share/classes/corba/connectioncache/StressClient.java
index a6df598edc..55054f24b1 100644
--- a/test/src/share/classes/corba/connectioncache/StressClient.java
+++ b/test/src/share/classes/corba/connectioncache/StressClient.java
@@ -19,28 +19,28 @@
 
 package corba.connectioncache ;
 
-import java.util.List ;
-import java.util.ArrayList ;
+import java.util.List;
+import java.util.ArrayList;
 
-import java.util.logging.Logger ;
-import java.util.logging.Handler ;
-import java.util.logging.Level ;
-import java.util.logging.StreamHandler ;
-import java.util.logging.Formatter ;
-import java.util.logging.LogRecord ;
+import java.util.logging.Logger;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.StreamHandler;
+import java.util.logging.Formatter;
+import java.util.logging.LogRecord;
 
-import java.io.IOException ;
+import java.io.IOException;
 
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
-import com.sun.corba.ee.spi.transport.connection.ConnectionCache ;
-import com.sun.corba.ee.spi.transport.connection.ContactInfo ;
-import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache ;
-import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache ;
-import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory ;
+import com.sun.corba.ee.spi.transport.connection.ConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.ContactInfo;
+import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory;
 
-import corba.framework.TestngRunner ;
+import corba.framework.TestngRunner;
 import java.util.Random;
 
 public class StressClient {
diff --git a/test/src/share/classes/corba/connections/Client.java b/test/src/share/classes/corba/connections/Client.java
index e39a61348c..f8844ce5d5 100644
--- a/test/src/share/classes/corba/connections/Client.java
+++ b/test/src/share/classes/corba/connections/Client.java
@@ -27,14 +27,14 @@
 import java.rmi.RemoteException;
 import javax.naming.InitialContext;
 
-import java.util.Properties ;
+import java.util.Properties;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/connections/ConnectionStatistics.java b/test/src/share/classes/corba/connections/ConnectionStatistics.java
index a1dce69112..153eec9fd3 100644
--- a/test/src/share/classes/corba/connections/ConnectionStatistics.java
+++ b/test/src/share/classes/corba/connections/ConnectionStatistics.java
@@ -31,13 +31,13 @@
 import com.sun.corba.ee.spi.transport.Acceptor;
 import com.sun.corba.ee.spi.transport.TransportManager;
 import com.sun.corba.ee.spi.transport.ConnectionCache;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
 import corba.hcks.U;
 
-import org.glassfish.gmbal.GmbalException ;
-import org.glassfish.gmbal.AMXClient ;
-import org.glassfish.gmbal.ManagedObjectManager ;
+import org.glassfish.gmbal.GmbalException;
+import org.glassfish.gmbal.AMXClient;
+import org.glassfish.gmbal.ManagedObjectManager;
 
 public class ConnectionStatistics
 {
diff --git a/test/src/share/classes/corba/copyobjectpolicy/Client.java b/test/src/share/classes/corba/copyobjectpolicy/Client.java
index e6cfbda884..f422a205d2 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/Client.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/Client.java
@@ -19,44 +19,44 @@
 
 package corba.copyobjectpolicy;
 
-import java.util.Map ;
-import java.util.HashMap ;
-import java.util.Hashtable ;
-import java.util.List ;
-import java.util.ArrayList ;
-import java.util.Properties ;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Properties;
 
-import java.io.PrintStream ;
-import java.io.DataInputStream ;
+import java.io.PrintStream;
+import java.io.DataInputStream;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 
-import org.omg.CORBA.Policy ;
-import org.omg.CORBA.ORB ;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.ORB;
 
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.ServantLocator ;
-import org.omg.PortableServer.ServantManager ;
-import org.omg.PortableServer.ServantRetentionPolicyValue ;
-import org.omg.PortableServer.RequestProcessingPolicyValue ;
-import org.omg.PortableServer.LifespanPolicyValue ;
-import org.omg.PortableServer.POAPackage.WrongPolicy ;
-import org.omg.PortableServer.POAPackage.InvalidPolicy ;
-import org.omg.PortableServer.POAPackage.AdapterAlreadyExists ;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
+import org.omg.PortableServer.ServantManager;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POAPackage.WrongPolicy;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
 
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.spi.extension.ServantCachingPolicy ;
-import com.sun.corba.ee.spi.extension.CopyObjectPolicy ;
+import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
+import com.sun.corba.ee.spi.extension.CopyObjectPolicy;
 
-import corba.framework.TraceElement ;
-import corba.framework.MethodEvent ;
-import corba.framework.InternalProcess ;
+import corba.framework.TraceElement;
+import corba.framework.MethodEvent;
+import corba.framework.InternalProcess;
 
 public class Client implements InternalProcess
 {
diff --git a/test/src/share/classes/corba/copyobjectpolicy/Echo.java b/test/src/share/classes/corba/copyobjectpolicy/Echo.java
index 18ba8af492..b63462c460 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/Echo.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/Echo.java
@@ -19,8 +19,8 @@
 
 package corba.copyobjectpolicy;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface Echo extends Remote {
     public Object echo( Object invalue ) throws RemoteException ;
diff --git a/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java b/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java
index 2697d3bbb2..826eee2491 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java
@@ -19,8 +19,8 @@
 
 package corba.copyobjectpolicy;
 
-import java.rmi.RemoteException ;
-import javax.rmi.PortableRemoteObject ;
+import java.rmi.RemoteException;
+import javax.rmi.PortableRemoteObject;
 
 public class EchoImpl extends PortableRemoteObject implements Echo
 {
diff --git a/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java b/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java
index 2151a03cbb..168b1c90f9 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java
@@ -19,17 +19,17 @@
 
 package corba.copyobjectpolicy;
 
-import java.lang.reflect.Method ;
+import java.lang.reflect.Method;
 
-import com.sun.corba.ee.spi.orb.ORB ;
-import com.sun.corba.ee.spi.orb.ORBConfigurator ;
-import com.sun.corba.ee.spi.orb.DataCollector ;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBConfigurator;
+import com.sun.corba.ee.spi.orb.DataCollector;
 
-import com.sun.corba.ee.spi.copyobject.CopierManager ;
-import com.sun.corba.ee.spi.copyobject.CopyobjectDefaults ;
+import com.sun.corba.ee.spi.copyobject.CopierManager;
+import com.sun.corba.ee.spi.copyobject.CopyobjectDefaults;
 
-import corba.framework.TraceAccumulator ;
-import corba.framework.ProxyInterceptor ;
+import corba.framework.TraceAccumulator;
+import corba.framework.ProxyInterceptor;
 import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory;
 
 public class UserConfigurator implements ORBConfigurator
diff --git a/test/src/share/classes/corba/custom/Verifier.java b/test/src/share/classes/corba/custom/Verifier.java
index 1e52912845..2159e5077f 100644
--- a/test/src/share/classes/corba/custom/Verifier.java
+++ b/test/src/share/classes/corba/custom/Verifier.java
@@ -19,8 +19,8 @@
 
 package corba.custom;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 /**
  * Simple interface to send an Object and get it as a reply.  (Sometimes
diff --git a/test/src/share/classes/corba/custom/VerifierImpl.java b/test/src/share/classes/corba/custom/VerifierImpl.java
index d590db0d5f..f43c98de8f 100644
--- a/test/src/share/classes/corba/custom/VerifierImpl.java
+++ b/test/src/share/classes/corba/custom/VerifierImpl.java
@@ -19,7 +19,7 @@
 
 package corba.custom;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
 
 public class VerifierImpl extends PortableRemoteObject implements Verifier
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/Client.java b/test/src/share/classes/corba/dynamicrmiiiop/Client.java
index 2ad3f6aa5c..f63c76f8e6 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/Client.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/Client.java
@@ -19,69 +19,69 @@
 
 package corba.dynamicrmiiiop  ;
 
-import java.rmi.Remote ;
+import java.rmi.Remote;
 
-import java.io.Serializable ;
-import java.io.Externalizable ;
+import java.io.Serializable;
+import java.io.Externalizable;
 
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Tie;
 
-import org.omg.CORBA.SystemException ;
-import org.omg.CORBA.portable.ApplicationException ;
-import org.omg.CORBA.portable.ResponseHandler ;
-import org.omg.CORBA.portable.UnknownException ;
-import org.omg.CORBA_2_3.portable.InputStream ;
-import org.omg.CORBA_2_3.portable.OutputStream ;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.portable.ApplicationException;
+import org.omg.CORBA.portable.ResponseHandler;
+import org.omg.CORBA.portable.UnknownException;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
 
-import java.util.Set ;
-import java.util.HashSet ;
-import java.util.Properties ;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Properties;
 
 import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException ;
+import java.lang.reflect.InvocationTargetException;
 
-import junit.framework.TestCase ;
-import junit.framework.Test ;
-import junit.framework.TestResult ;
-import junit.framework.TestSuite ;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ;
-import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller ;
-import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator ;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
+import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller;
+import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator;
 import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.presentation.rmi.IDLType ;
+import com.sun.corba.ee.impl.presentation.rmi.IDLType;
 
-import corba.dynamicrmiiiop.testclasses.A ;
-import corba.dynamicrmiiiop.testclasses.B ;
-import corba.dynamicrmiiiop.testclasses.C ;
-import corba.dynamicrmiiiop.testclasses.D ;
-import corba.dynamicrmiiiop.testclasses.E ;
-import corba.dynamicrmiiiop.testclasses.F ;
-import corba.dynamicrmiiiop.testclasses.G ;
-import corba.dynamicrmiiiop.testclasses.H ;
-import corba.dynamicrmiiiop.testclasses.C1 ;
-import corba.dynamicrmiiiop.testclasses.C2 ;
-import corba.dynamicrmiiiop.testclasses.C3 ;
-import corba.dynamicrmiiiop.testclasses.C4 ;
-import corba.dynamicrmiiiop.testclasses.C5 ;
-import corba.dynamicrmiiiop.testclasses.C6 ;
+import corba.dynamicrmiiiop.testclasses.A;
+import corba.dynamicrmiiiop.testclasses.B;
+import corba.dynamicrmiiiop.testclasses.C;
+import corba.dynamicrmiiiop.testclasses.D;
+import corba.dynamicrmiiiop.testclasses.E;
+import corba.dynamicrmiiiop.testclasses.F;
+import corba.dynamicrmiiiop.testclasses.G;
+import corba.dynamicrmiiiop.testclasses.H;
+import corba.dynamicrmiiiop.testclasses.C1;
+import corba.dynamicrmiiiop.testclasses.C2;
+import corba.dynamicrmiiiop.testclasses.C3;
+import corba.dynamicrmiiiop.testclasses.C4;
+import corba.dynamicrmiiiop.testclasses.C5;
+import corba.dynamicrmiiiop.testclasses.C6;
 
-import corba.dynamicrmiiiop.testclasses.TieTest ;
-import corba.dynamicrmiiiop.testclasses.TieTestImpl ;
-import corba.dynamicrmiiiop.testclasses.DMMImplTestClasses ;
+import corba.dynamicrmiiiop.testclasses.TieTest;
+import corba.dynamicrmiiiop.testclasses.TieTestImpl;
+import corba.dynamicrmiiiop.testclasses.DMMImplTestClasses;
 
-import com.sun.corba.ee.impl.presentation.rmi.ExceptionHandlerImpl ;
+import com.sun.corba.ee.impl.presentation.rmi.ExceptionHandlerImpl;
 
 // Included to directly test makeReaderWriter, which is not
 // needed in the PresentationManager API.
-import com.sun.corba.ee.impl.presentation.rmi.DynamicMethodMarshallerImpl ;
+import com.sun.corba.ee.impl.presentation.rmi.DynamicMethodMarshallerImpl;
 
-import com.sun.corba.ee.impl.util.RepositoryId ;
+import com.sun.corba.ee.impl.util.RepositoryId;
 import org.glassfish.pfl.basic.graph.Graph;
 import org.glassfish.pfl.basic.graph.GraphImpl;
 import org.glassfish.pfl.basic.graph.Node;
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java b/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java
index 2bba7dc29b..4013fa2b14 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java
@@ -19,34 +19,34 @@
 
 package corba.dynamicrmiiiop  ;
 
-import java.util.Iterator ;
+import java.util.Iterator;
 
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Tie;
 
-import org.omg.CORBA.portable.InputStream ;
-import org.omg.CORBA.portable.OutputStream ;
-import org.omg.CORBA.portable.ServantObject ;
-import org.omg.CORBA.portable.ApplicationException ;
-import org.omg.CORBA.portable.RemarshalException ;
-import org.omg.CORBA.portable.ResponseHandler ;
-import org.omg.CORBA.Request ;
+import org.omg.CORBA.portable.InputStream;
+import org.omg.CORBA.portable.OutputStream;
+import org.omg.CORBA.portable.ServantObject;
+import org.omg.CORBA.portable.ApplicationException;
+import org.omg.CORBA.portable.RemarshalException;
+import org.omg.CORBA.portable.ResponseHandler;
+import org.omg.CORBA.Request;
 
-import org.omg.CORBA.Context ;
-import org.omg.CORBA.NVList ;
-import org.omg.CORBA.NamedValue ;
-import org.omg.CORBA.ExceptionList ;
-import org.omg.CORBA.ContextList ;
+import org.omg.CORBA.Context;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.NamedValue;
+import org.omg.CORBA.ExceptionList;
+import org.omg.CORBA.ContextList;
 
-import org.omg.CORBA_2_3.portable.Delegate ;
+import org.omg.CORBA_2_3.portable.Delegate;
 
-import com.sun.corba.ee.spi.transport.ContactInfoList ;
+import com.sun.corba.ee.spi.transport.ContactInfoList;
 
-import com.sun.corba.ee.spi.orb.ORB ;
-import com.sun.corba.ee.spi.ior.IOR ;
-import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher ;
-import com.sun.corba.ee.spi.protocol.ClientDelegate ;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher;
+import com.sun.corba.ee.spi.protocol.ClientDelegate;
 
-import corba.dynamicrmiiiop.testclasses.TieTestImpl ;
+import corba.dynamicrmiiiop.testclasses.TieTestImpl;
 
 public class TestClientDelegate extends ClientDelegate
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java b/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java
index c17ddd68f1..53ad61a329 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java
@@ -20,16 +20,16 @@
 
 package corba.dynamicrmiiiop ;
 
-import junit.framework.TestCase ;
-import junit.framework.Test ;
-import junit.framework.TestSuite ;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
-import java.lang.reflect.Method ;
-import java.lang.reflect.InvocationTargetException ;
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
 
-import java.security.ProtectionDomain ;
+import java.security.ProtectionDomain;
 
-import com.sun.corba.ee.impl.presentation.rmi.codegen.CodegenProxyCreator ;
+import com.sun.corba.ee.impl.presentation.rmi.codegen.CodegenProxyCreator;
 
 /** Test for the codegen-based ProxyCreator.
  * Steps to test:
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java b/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java
index 5fe79a6fa2..fcc4b156e6 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java
@@ -19,17 +19,17 @@
 
 package corba.dynamicrmiiiop ;
 
-import org.omg.CORBA.portable.ApplicationException ;
-import org.omg.CORBA_2_3.portable.InputStream ;
-import org.omg.CORBA_2_3.portable.OutputStream ;
+import org.omg.CORBA.portable.ApplicationException;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
 
-import com.sun.corba.ee.impl.encoding.CDROutputObject ;
-import com.sun.corba.ee.impl.encoding.EncapsInputStream ;
-import com.sun.corba.ee.impl.encoding.EncapsOutputStream ;
-import com.sun.corba.ee.impl.encoding.CDRInputObject ;
+import com.sun.corba.ee.impl.encoding.CDROutputObject;
+import com.sun.corba.ee.impl.encoding.EncapsInputStream;
+import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
+import com.sun.corba.ee.impl.encoding.CDRInputObject;
 
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
 public class TestTransport {
     private ORB orb ;
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C2.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C2.java
index a39727c721..01daff3271 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C2.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C2.java
@@ -19,7 +19,7 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.util.HashMap ;
+import java.util.HashMap;
 
 public class C2 extends HashMap implements B
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C3.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C3.java
index d68f5b07af..f8a42d0f3e 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C3.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/C3.java
@@ -19,7 +19,7 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.util.HashMap ;
+import java.util.HashMap;
 
 public class C3 extends HashMap implements A, B
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/D.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/D.java
index 51b5124a9d..3d75825754 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/D.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/D.java
@@ -19,7 +19,7 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.rmi.Remote ;
+import java.rmi.Remote;
 
 public interface D extends Remote
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java
index c546819d82..34acd7c6e9 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java
@@ -19,8 +19,8 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface DMMImplTestClasses
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/G.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/G.java
index 03155128ee..47e6f00c2e 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/G.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/G.java
@@ -19,7 +19,7 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.rmi.Remote ;
+import java.rmi.Remote;
 
 public interface G extends Remote
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTest.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTest.java
index 9edbebdfd5..fef3887b79 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTest.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTest.java
@@ -19,9 +19,9 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
-import java.util.Map ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.Map;
 
 public interface TieTest extends Remote
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java
index 50622d63a2..7c49b8be9d 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java
@@ -19,21 +19,21 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
-import java.util.Map ;
-import java.util.HashMap ;
+import java.util.Map;
+import java.util.HashMap;
 
-import javax.rmi.CORBA.Util ;
+import javax.rmi.CORBA.Util;
 
-import org.omg.CORBA.BAD_PARAM ;
-import org.omg.CORBA.BAD_OPERATION ;
-import org.omg.CORBA.CompletionStatus ;
-import org.omg.CORBA.SystemException ;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.CompletionStatus;
+import org.omg.CORBA.SystemException;
 
-import org.omg.CORBA.portable.UnknownException ;
+import org.omg.CORBA.portable.UnknownException;
 
-import com.sun.corba.ee.spi.logging.ORBUtilSystemException ;
+import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
 import org.glassfish.pfl.test.ObjectUtility;
 
 public class TieTestImpl implements TieTest
diff --git a/test/src/share/classes/corba/enuminterop/Client.java b/test/src/share/classes/corba/enuminterop/Client.java
index cb0f308248..9a3c827cf5 100644
--- a/test/src/share/classes/corba/enuminterop/Client.java
+++ b/test/src/share/classes/corba/enuminterop/Client.java
@@ -21,7 +21,7 @@
 
 import corba.framework.TestngRunner;
 import java.io.PrintStream;
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
 import org.omg.CORBA.ORB;
 
@@ -31,8 +31,8 @@
 import org.omg.CosNaming.NamingContextExt;
 import org.omg.CosNaming.NamingContextHelper;
 
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 /**
  * This tests that enums can be correctly deserialized when sent from the JDK ORB (no EnumDesc support)
diff --git a/test/src/share/classes/corba/enuminterop/Server.java b/test/src/share/classes/corba/enuminterop/Server.java
index d2b023e0b5..5128211d7d 100644
--- a/test/src/share/classes/corba/enuminterop/Server.java
+++ b/test/src/share/classes/corba/enuminterop/Server.java
@@ -23,17 +23,17 @@
 import javax.naming.Context;
 import java.util.Properties;
 
-import javax.rmi.PortableRemoteObject ;
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.PortableRemoteObject;
+import javax.rmi.CORBA.Tie;
 
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.*;
 
 import org.omg.PortableServer.*;
 
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 
 /**
diff --git a/test/src/share/classes/corba/example/Client.java b/test/src/share/classes/corba/example/Client.java
index 589e02ce7e..c935200753 100644
--- a/test/src/share/classes/corba/example/Client.java
+++ b/test/src/share/classes/corba/example/Client.java
@@ -20,7 +20,7 @@
 package corba.example;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import java.util.Properties ;
+import java.util.Properties;
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
diff --git a/test/src/share/classes/corba/example/Server.java b/test/src/share/classes/corba/example/Server.java
index c80232b325..b717936e46 100644
--- a/test/src/share/classes/corba/example/Server.java
+++ b/test/src/share/classes/corba/example/Server.java
@@ -19,7 +19,7 @@
 
 package corba.example;
 
-import java.util.Properties ;
+import java.util.Properties;
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
diff --git a/test/src/share/classes/corba/folb/Client.java b/test/src/share/classes/corba/folb/Client.java
index 523445f9d5..6f097ebafc 100644
--- a/test/src/share/classes/corba/folb/Client.java
+++ b/test/src/share/classes/corba/folb/Client.java
@@ -24,9 +24,9 @@
 
 package corba.folb;
 
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
-import org.testng.annotations.BeforeSuite ;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeSuite;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/ClientBase.java b/test/src/share/classes/corba/folb/ClientBase.java
index b98972961a..c646ffe4d1 100644
--- a/test/src/share/classes/corba/folb/ClientBase.java
+++ b/test/src/share/classes/corba/folb/ClientBase.java
@@ -33,7 +33,7 @@
 
 import com.sun.corba.ee.spi.orb.ORB;
 
-import com.sun.corba.ee.spi.logging.ORBUtilSystemException ;
+import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
 
 import com.sun.corba.ee.impl.folb.ClientGroupManager;
 
@@ -44,9 +44,9 @@
 import corba.framework.TestngRunner;
 import corba.hcks.U;
 
-import org.testng.Assert ;
+import org.testng.Assert;
 
-import org.omg.CORBA.SystemException ;
+import org.omg.CORBA.SystemException;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/ClientCircular.java b/test/src/share/classes/corba/folb/ClientCircular.java
index d7ec90ff1c..285e0c3aea 100644
--- a/test/src/share/classes/corba/folb/ClientCircular.java
+++ b/test/src/share/classes/corba/folb/ClientCircular.java
@@ -30,10 +30,10 @@
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import org.testng.annotations.BeforeSuite ;
-import org.testng.annotations.Test ;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
 
-import org.testng.Assert ;
+import org.testng.Assert;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/ClientMulti.java b/test/src/share/classes/corba/folb/ClientMulti.java
index fc0d591ca4..7f4fdeea76 100644
--- a/test/src/share/classes/corba/folb/ClientMulti.java
+++ b/test/src/share/classes/corba/folb/ClientMulti.java
@@ -35,10 +35,10 @@
 import corba.framework.Controller;
 import corba.hcks.U;
 
-import org.testng.annotations.BeforeSuite ;
-import org.testng.annotations.Test ;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
 
-import org.testng.Assert ;
+import org.testng.Assert;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/ClientWaitTimeout.java b/test/src/share/classes/corba/folb/ClientWaitTimeout.java
index bf04508c8e..b1108a01af 100644
--- a/test/src/share/classes/corba/folb/ClientWaitTimeout.java
+++ b/test/src/share/classes/corba/folb/ClientWaitTimeout.java
@@ -39,10 +39,10 @@
 import corba.framework.Controller;
 import corba.hcks.U;
 
-import org.testng.annotations.BeforeSuite ;
-import org.testng.annotations.Test ;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
 
-import org.testng.Assert ;
+import org.testng.Assert;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java b/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java
index 709b090674..e9fc1f8e5c 100644
--- a/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java
+++ b/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java
@@ -24,7 +24,7 @@
 
 package corba.folb;
 
-import java.net.InetAddress ;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/test/src/share/classes/corba/folb/Server.java b/test/src/share/classes/corba/folb/Server.java
index 30ccc9316f..e54751c367 100644
--- a/test/src/share/classes/corba/folb/Server.java
+++ b/test/src/share/classes/corba/folb/Server.java
@@ -27,19 +27,19 @@
 import java.rmi.RemoteException;
 import java.util.Properties;
 
-import org.omg.CORBA.LocalObject ;
+import org.omg.CORBA.LocalObject;
 import org.omg.CORBA.ORBPackage.InvalidName;
 
-import org.omg.PortableServer.ForwardRequest ;
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.ServantLocator ;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
+import org.omg.PortableServer.ForwardRequest;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
 import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
-import com.sun.corba.ee.spi.orb.ORBConfigurator ;
-import com.sun.corba.ee.spi.orb.DataCollector ;
+import com.sun.corba.ee.spi.orb.ORBConfigurator;
+import com.sun.corba.ee.spi.orb.DataCollector;
 import com.sun.corba.ee.spi.orb.ORB;
 
 import com.sun.corba.ee.impl.folb.ServerGroupManager;
diff --git a/test/src/share/classes/corba/fragment/FragmentTester.java b/test/src/share/classes/corba/fragment/FragmentTester.java
index 96651dbad3..027f0d01df 100644
--- a/test/src/share/classes/corba/fragment/FragmentTester.java
+++ b/test/src/share/classes/corba/fragment/FragmentTester.java
@@ -19,8 +19,8 @@
 
 package corba.fragment;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface FragmentTester extends java.rmi.Remote
 {
diff --git a/test/src/share/classes/corba/fragment/FragmentTesterImpl.java b/test/src/share/classes/corba/fragment/FragmentTesterImpl.java
index 384e450725..c0486bc6ce 100644
--- a/test/src/share/classes/corba/fragment/FragmentTesterImpl.java
+++ b/test/src/share/classes/corba/fragment/FragmentTesterImpl.java
@@ -19,7 +19,7 @@
 
 package corba.fragment;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
 
 public class FragmentTesterImpl extends PortableRemoteObject implements FragmentTester
diff --git a/test/src/share/classes/corba/fragment2/FragmentTester.java b/test/src/share/classes/corba/fragment2/FragmentTester.java
index a3279e620d..c02657f398 100644
--- a/test/src/share/classes/corba/fragment2/FragmentTester.java
+++ b/test/src/share/classes/corba/fragment2/FragmentTester.java
@@ -19,8 +19,8 @@
 
 package corba.fragment2;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface FragmentTester extends java.rmi.Remote
 {
diff --git a/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java b/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java
index 0436b71cb5..05b95d42fe 100644
--- a/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java
+++ b/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java
@@ -19,7 +19,7 @@
 
 package corba.fragment2;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
 
 public class FragmentTesterImpl extends PortableRemoteObject implements FragmentTester
diff --git a/test/src/share/classes/corba/fsm/Client.sjava b/test/src/share/classes/corba/fsm/Client.sjava
index a5ff179a57..1bfc26069c 100644
--- a/test/src/share/classes/corba/fsm/Client.sjava
+++ b/test/src/share/classes/corba/fsm/Client.sjava
@@ -19,25 +19,25 @@
  */
 
 package corba.fsm ;
-import java.util.Iterator ;
-import java.util.Properties ;
-import java.util.Map ;
-import java.util.List ;
-import java.util.ArrayList ;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
 
-import java.io.PrintWriter ;
+import java.io.PrintWriter;
 
-import org.testng.TestNG ;
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
+import org.testng.TestNG;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
 
-import com.sun.corba.ee.impl.orbutil.newtimer.VersionedHashSet ;
-import com.sun.corba.ee.impl.orbutil.newtimer.TimingPoints ;
+import com.sun.corba.ee.impl.orbutil.newtimer.VersionedHashSet;
+import com.sun.corba.ee.impl.orbutil.newtimer.TimingPoints;
 
-import com.sun.corba.ee.impl.orbutil.ORBConstants ;
+import com.sun.corba.ee.impl.orbutil.ORBConstants;
 
 public class Client {
     private Foo extends NameBase {
diff --git a/test/src/share/classes/corba/fsm/FSMTest.sjava b/test/src/share/classes/corba/fsm/FSMTest.sjava
index 04dcbdc63d..5283b7244f 100644
--- a/test/src/share/classes/corba/fsm/FSMTest.sjava
+++ b/test/src/share/classes/corba/fsm/FSMTest.sjava
@@ -19,13 +19,13 @@
 
 package com.sun.corba.ee.spi.orbutil.fsm ;
 
-import com.sun.corba.ee.spi.orbutil.fsm.Input ;
-import com.sun.corba.ee.spi.orbutil.fsm.Action ;
-import com.sun.corba.ee.spi.orbutil.fsm.Guard ;
-import com.sun.corba.ee.spi.orbutil.fsm.StateEngine ;
-import com.sun.corba.ee.spi.orbutil.fsm.StateImpl ;
-import com.sun.corba.ee.spi.orbutil.fsm.StateEngineFactory ;
-import com.sun.corba.ee.spi.orbutil.fsm.FSM ;
+import com.sun.corba.ee.spi.orbutil.fsm.Input;
+import com.sun.corba.ee.spi.orbutil.fsm.Action;
+import com.sun.corba.ee.spi.orbutil.fsm.Guard;
+import com.sun.corba.ee.spi.orbutil.fsm.StateEngine;
+import com.sun.corba.ee.spi.orbutil.fsm.StateImpl;
+import com.sun.corba.ee.spi.orbutil.fsm.StateEngineFactory;
+import com.sun.corba.ee.spi.orbutil.fsm.FSM;
 
 
 import test.Test;
diff --git a/test/src/share/classes/corba/giopgen/Client.java b/test/src/share/classes/corba/giopgen/Client.java
index a65a78a9fe..8f87f730b1 100644
--- a/test/src/share/classes/corba/giopgen/Client.java
+++ b/test/src/share/classes/corba/giopgen/Client.java
@@ -35,7 +35,7 @@
 import org.omg.CORBA.COMM_FAILURE;
 import org.omg.CORBA.ORB;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/giopgen/Server.java b/test/src/share/classes/corba/giopgen/Server.java
index 12bbc7bfaa..8089fd6e32 100644
--- a/test/src/share/classes/corba/giopgen/Server.java
+++ b/test/src/share/classes/corba/giopgen/Server.java
@@ -30,7 +30,7 @@
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/giopgen/Test.java b/test/src/share/classes/corba/giopgen/Test.java
index 576229897a..3fef82cf5d 100644
--- a/test/src/share/classes/corba/giopgen/Test.java
+++ b/test/src/share/classes/corba/giopgen/Test.java
@@ -27,7 +27,7 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-import java.util.Map ;
+import java.util.Map;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/giopgen/TestServant.java b/test/src/share/classes/corba/giopgen/TestServant.java
index c112575503..2ebf2f2088 100644
--- a/test/src/share/classes/corba/giopgen/TestServant.java
+++ b/test/src/share/classes/corba/giopgen/TestServant.java
@@ -26,14 +26,14 @@
 
 import java.rmi.RemoteException;
 
-import java.util.Map ;
-import java.util.HashMap ;
+import java.util.Map;
+import java.util.HashMap;
 
-import java.io.Serializable ;
+import java.io.Serializable;
 
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 
-import com.sun.corba.ee.spi.logging.UtilSystemException ;
+import com.sun.corba.ee.spi.logging.UtilSystemException;
 import org.glassfish.pfl.basic.contain.SPair;
 
 public class TestServant
diff --git a/test/src/share/classes/corba/ior/Client.java b/test/src/share/classes/corba/ior/Client.java
index 05a174a9c6..35d50f2786 100644
--- a/test/src/share/classes/corba/ior/Client.java
+++ b/test/src/share/classes/corba/ior/Client.java
@@ -19,97 +19,97 @@
 
 package corba.ior;
 
-import java.io.PrintStream ;
-
-import java.util.Properties ;
-import java.util.NoSuchElementException ;
-import java.util.List ;
-import java.util.LinkedList ;
-import java.util.Iterator ;
-import java.util.StringTokenizer ;
-import java.util.ArrayList ;
-
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.IdAssignmentPolicyValue ;
-
-import org.omg.CORBA.Policy ;
-import org.omg.CORBA.BAD_PARAM ;
-import org.omg.CORBA.INTERNAL ;
-import org.omg.CORBA.OctetSeqHolder ;
-
-import org.omg.CORBA_2_3.portable.OutputStream ;
-import org.omg.CORBA_2_3.portable.InputStream ;
-
-import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS ;
-import org.omg.IOP.TAG_CODE_SETS ;
-import org.omg.IOP.TAG_JAVA_CODEBASE ;
-import org.omg.IOP.TAG_ORB_TYPE ;
-import org.omg.IOP.TAG_INTERNET_IOP ;
-
-
-import com.sun.corba.ee.spi.ior.Identifiable ;
-import com.sun.corba.ee.spi.ior.IdentifiableFactory ;
-import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder ;
-import com.sun.corba.ee.spi.ior.ObjectKeyTemplate ;
-import com.sun.corba.ee.spi.ior.TaggedComponent ;
-import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder ;
-import com.sun.corba.ee.spi.ior.ObjectId ;
-import com.sun.corba.ee.spi.ior.ObjectKey ;
-import com.sun.corba.ee.spi.ior.IOR ;
-import com.sun.corba.ee.spi.ior.IORFactory ;
-import com.sun.corba.ee.spi.ior.ObjectAdapterId ;
-import com.sun.corba.ee.spi.ior.IdentifiableContainerBase ;
-import com.sun.corba.ee.spi.ior.IORTemplate ;
-import com.sun.corba.ee.spi.ior.IORTemplateList ;
-import com.sun.corba.ee.spi.ior.IORFactories ;
-import com.sun.corba.ee.spi.ior.TaggedProfileTemplate ;
-
-import com.sun.corba.ee.spi.ior.iiop.IIOPFactories ;
-import com.sun.corba.ee.spi.ior.iiop.IIOPAddress ;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate ;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfile ;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ;
-
-import com.sun.corba.ee.spi.activation.POANameHelper ;
-
-import com.sun.corba.ee.spi.extension.ZeroPortPolicy ;
+import java.io.PrintStream;
+
+import java.util.Properties;
+import java.util.NoSuchElementException;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.ArrayList;
+
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.IdAssignmentPolicyValue;
+
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.OctetSeqHolder;
+
+import org.omg.CORBA_2_3.portable.OutputStream;
+import org.omg.CORBA_2_3.portable.InputStream;
+
+import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS;
+import org.omg.IOP.TAG_CODE_SETS;
+import org.omg.IOP.TAG_JAVA_CODEBASE;
+import org.omg.IOP.TAG_ORB_TYPE;
+import org.omg.IOP.TAG_INTERNET_IOP;
+
+
+import com.sun.corba.ee.spi.ior.Identifiable;
+import com.sun.corba.ee.spi.ior.IdentifiableFactory;
+import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder;
+import com.sun.corba.ee.spi.ior.ObjectKeyTemplate;
+import com.sun.corba.ee.spi.ior.TaggedComponent;
+import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder;
+import com.sun.corba.ee.spi.ior.ObjectId;
+import com.sun.corba.ee.spi.ior.ObjectKey;
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.ior.IORFactory;
+import com.sun.corba.ee.spi.ior.ObjectAdapterId;
+import com.sun.corba.ee.spi.ior.IdentifiableContainerBase;
+import com.sun.corba.ee.spi.ior.IORTemplate;
+import com.sun.corba.ee.spi.ior.IORTemplateList;
+import com.sun.corba.ee.spi.ior.IORFactories;
+import com.sun.corba.ee.spi.ior.TaggedProfileTemplate;
+
+import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
+import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfile;
+import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
+
+import com.sun.corba.ee.spi.activation.POANameHelper;
+
+import com.sun.corba.ee.spi.extension.ZeroPortPolicy;
 
 import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.orb.ORBVersion ;
-import com.sun.corba.ee.spi.orb.ORBVersionFactory ;
-
-import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent ;
-import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent ;
-import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent ;
-import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent ;
-
-import com.sun.corba.ee.impl.ior.GenericTaggedProfile ;
-import com.sun.corba.ee.impl.ior.GenericTaggedComponent ;
-import com.sun.corba.ee.impl.ior.FreezableList ;
-import com.sun.corba.ee.impl.ior.OldJIDLObjectKeyTemplate ;
-import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate ;
-import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate ;
-import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate ;
-import com.sun.corba.ee.impl.ior.WireObjectKeyTemplate ;
-import com.sun.corba.ee.impl.ior.EncapsulationUtility ;
-import com.sun.corba.ee.impl.ior.TaggedComponentFactoryFinderImpl ;
-import com.sun.corba.ee.impl.ior.TaggedProfileFactoryFinderImpl ;
-import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray ;
-import com.sun.corba.ee.impl.ior.ObjectAdapterIdNumber ;
-import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl ;
-import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl ;
-
-import com.sun.corba.ee.impl.encoding.CDRInputObject ;
+import com.sun.corba.ee.spi.orb.ORBVersion;
+import com.sun.corba.ee.spi.orb.ORBVersionFactory;
+
+import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent;
+import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent;
+import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent;
+import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent;
+
+import com.sun.corba.ee.impl.ior.GenericTaggedProfile;
+import com.sun.corba.ee.impl.ior.GenericTaggedComponent;
+import com.sun.corba.ee.impl.ior.FreezableList;
+import com.sun.corba.ee.impl.ior.OldJIDLObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.WireObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.EncapsulationUtility;
+import com.sun.corba.ee.impl.ior.TaggedComponentFactoryFinderImpl;
+import com.sun.corba.ee.impl.ior.TaggedProfileFactoryFinderImpl;
+import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray;
+import com.sun.corba.ee.impl.ior.ObjectAdapterIdNumber;
+import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl;
+import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl;
+
+import com.sun.corba.ee.impl.encoding.CDRInputObject;
 import com.sun.corba.ee.impl.encoding.CDROutputObject;
-import com.sun.corba.ee.impl.encoding.EncapsInputStream ;
-import com.sun.corba.ee.impl.encoding.EncapsOutputStream ;
+import com.sun.corba.ee.impl.encoding.EncapsInputStream;
+import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import org.testng.annotations.Test ;
-import org.testng.Assert ;
+import org.testng.annotations.Test;
+import org.testng.Assert;
 
-import corba.framework.TestngRunner ;
+import corba.framework.TestngRunner;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/lb/Client.java b/test/src/share/classes/corba/lb/Client.java
index b8c1221a14..aa83da88b0 100644
--- a/test/src/share/classes/corba/lb/Client.java
+++ b/test/src/share/classes/corba/lb/Client.java
@@ -35,7 +35,7 @@
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.SystemException;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @Author Ken Cavanaugh
diff --git a/test/src/share/classes/corba/lb/LB.java b/test/src/share/classes/corba/lb/LB.java
index 89969d6002..72cd31e853 100644
--- a/test/src/share/classes/corba/lb/LB.java
+++ b/test/src/share/classes/corba/lb/LB.java
@@ -19,19 +19,19 @@
 
 package corba.lb ;
 
-import java.io.IOException ;
-import java.io.InputStream ;
-import java.io.OutputStream ;
-
-import java.net.Socket ;
-import java.net.ServerSocket ;
-import java.net.InetAddress ;
-import java.net.InetSocketAddress ;
-
-import java.util.Arrays ;
-import java.util.List ;
-import java.util.ArrayList ;
-import java.util.Iterator ;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import java.net.Socket;
+import java.net.ServerSocket;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
 
 /** This class implements a TCP load balancer.  The idea is that it has a pool of addresses
  * that it can send messages to.  Every time a TCP connection is made to this process,
diff --git a/test/src/share/classes/corba/lb/LBTest.java b/test/src/share/classes/corba/lb/LBTest.java
index a58e74dac7..3953dd7f15 100644
--- a/test/src/share/classes/corba/lb/LBTest.java
+++ b/test/src/share/classes/corba/lb/LBTest.java
@@ -19,16 +19,16 @@
 
 package corba.lb ;
 
-import java.util.Properties ;
+import java.util.Properties;
 
-import corba.framework.CORBATest ;
-import corba.framework.Options ;
-import corba.framework.Controller ;
+import corba.framework.CORBATest;
+import corba.framework.Options;
+import corba.framework.Controller;
 
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
-import com.sun.corba.ee.impl.plugin.hwlb.VirtualAddressAgentImpl ;
-import com.sun.corba.ee.impl.plugin.hwlb.NoConnectionCacheImpl ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.impl.plugin.hwlb.VirtualAddressAgentImpl;
+import com.sun.corba.ee.impl.plugin.hwlb.NoConnectionCacheImpl;
 
 public class LBTest
     extends
diff --git a/test/src/share/classes/corba/lb/Server.java b/test/src/share/classes/corba/lb/Server.java
index acf32551cf..391eb7c084 100644
--- a/test/src/share/classes/corba/lb/Server.java
+++ b/test/src/share/classes/corba/lb/Server.java
@@ -27,12 +27,12 @@
 import java.util.Properties;
 import java.util.Hashtable;
 
-import javax.naming.InitialContext ;
+import javax.naming.InitialContext;
 
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 
 import org.omg.CORBA.ORB;
-import org.omg.CORBA.Policy ;
+import org.omg.CORBA.Policy;
 
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
@@ -43,7 +43,7 @@
 import org.omg.PortableServer.ServantRetentionPolicyValue;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/lbq/ClientControl.java b/test/src/share/classes/corba/lbq/ClientControl.java
index b7051d488b..6b82f5d6b7 100644
--- a/test/src/share/classes/corba/lbq/ClientControl.java
+++ b/test/src/share/classes/corba/lbq/ClientControl.java
@@ -19,8 +19,8 @@
 
 package corba.lbq ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 /** Interface for remote object used to control the Client behavior.
  */
diff --git a/test/src/share/classes/corba/lbq/Common.java b/test/src/share/classes/corba/lbq/Common.java
index 84e3bec046..5b169291f3 100644
--- a/test/src/share/classes/corba/lbq/Common.java
+++ b/test/src/share/classes/corba/lbq/Common.java
@@ -28,32 +28,32 @@
 import java.util.List;
 import java.util.ArrayList;
 import java.util.StringTokenizer;
-import java.util.Properties ;
+import java.util.Properties;
 
-import java.rmi.Remote ;
+import java.rmi.Remote;
 
-import java.lang.reflect.Field ;
+import java.lang.reflect.Field;
 
-import java.security.AccessController ;
-import java.security.PrivilegedAction ;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 
 import org.omg.CosNaming.*;
 import org.omg.CosNaming.NamingContextPackage.*;
 
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.Servant ;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
 
-import org.omg.PortableInterceptor.ORBInitializer ;
+import org.omg.PortableInterceptor.ORBInitializer;
 
-import com.sun.corba.ee.spi.orb.ORB ;
-import com.sun.corba.ee.spi.orb.ORBData ;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBData;
 
-import com.sun.corba.ee.impl.orb.ORBDataParserImpl ;
-import com.sun.corba.ee.impl.orb.ORBImpl ;
+import com.sun.corba.ee.impl.orb.ORBDataParserImpl;
+import com.sun.corba.ee.impl.orb.ORBImpl;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 public class Common
 {
diff --git a/test/src/share/classes/corba/lbq/LBControl.java b/test/src/share/classes/corba/lbq/LBControl.java
index d7165519b2..80a93831c1 100644
--- a/test/src/share/classes/corba/lbq/LBControl.java
+++ b/test/src/share/classes/corba/lbq/LBControl.java
@@ -19,8 +19,8 @@
 
 package corba.lbq ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 /** Interface for a remote object used to control the software
  * load balancer.
diff --git a/test/src/share/classes/corba/lbq/Server.java b/test/src/share/classes/corba/lbq/Server.java
index f6533b5a67..39f3be802f 100644
--- a/test/src/share/classes/corba/lbq/Server.java
+++ b/test/src/share/classes/corba/lbq/Server.java
@@ -26,7 +26,7 @@
 
 import java.util.Properties;
 
-import org.omg.CORBA.Policy ;
+import org.omg.CORBA.Policy;
 
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
@@ -37,7 +37,7 @@
 import org.omg.PortableServer.ServantRetentionPolicyValue;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/lbq/ServerControl.java b/test/src/share/classes/corba/lbq/ServerControl.java
index 7fff500c77..72192f6f3c 100644
--- a/test/src/share/classes/corba/lbq/ServerControl.java
+++ b/test/src/share/classes/corba/lbq/ServerControl.java
@@ -19,8 +19,8 @@
 
 package corba.lbq ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 /** Interface for a remote object used to control a server.
  */
diff --git a/test/src/share/classes/corba/lbq/ServerReporter.java b/test/src/share/classes/corba/lbq/ServerReporter.java
index 94400df860..4fa95aa599 100644
--- a/test/src/share/classes/corba/lbq/ServerReporter.java
+++ b/test/src/share/classes/corba/lbq/ServerReporter.java
@@ -19,8 +19,8 @@
 
 package corba.lbq ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 /** One of these is implemented by Orchestrator for each server instance and
  * registered with the server.
diff --git a/test/src/share/classes/corba/messagetrace/Client.java b/test/src/share/classes/corba/messagetrace/Client.java
index 0e8f67a6d9..d33e48a374 100644
--- a/test/src/share/classes/corba/messagetrace/Client.java
+++ b/test/src/share/classes/corba/messagetrace/Client.java
@@ -19,52 +19,52 @@
 
 package corba.messagetrace  ;
 
-import java.util.Properties ;
+import java.util.Properties;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
-import javax.rmi.PortableRemoteObject ;
-import javax.rmi.CORBA.Util ;
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.PortableRemoteObject;
+import javax.rmi.CORBA.Util;
+import javax.rmi.CORBA.Tie;
 
-import java.nio.ByteBuffer ;
+import java.nio.ByteBuffer;
 
 import corba.util.TransportManagerUtil;
-import org.omg.CORBA.TypeCode ;
-import org.omg.CORBA.ValueMember ;
-import org.omg.CORBA.PUBLIC_MEMBER ;
-import org.omg.CORBA.PRIVATE_MEMBER ;
+import org.omg.CORBA.TypeCode;
+import org.omg.CORBA.ValueMember;
+import org.omg.CORBA.PUBLIC_MEMBER;
+import org.omg.CORBA.PRIVATE_MEMBER;
 
 // I have removed some weblogic test code for bug 5034649.
 // We need to check to see if we can include this, because
 // the test case relies on code supplied by BEA.
-// import weblogic.management.WebLogicObjectName ;
-// import weblogic.management.internal.WebLogicAttribute ;
+// import weblogic.management.WebLogicObjectName;
+// import weblogic.management.internal.WebLogicAttribute;
 
-import javax.management.ObjectName ;
-import javax.management.Attribute ;
+import javax.management.ObjectName;
+import javax.management.Attribute;
 
-import junit.framework.TestCase ;
-import junit.framework.Test ;
-import junit.framework.TestResult ;
-import junit.framework.TestSuite ;
-import junit.extensions.TestSetup ;
+import junit.framework.TestCase;
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
+import junit.extensions.TestSetup;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
-import com.sun.corba.ee.spi.transport.TransportManager ;
-import com.sun.corba.ee.spi.transport.MessageTraceManager ;
-import com.sun.corba.ee.spi.transport.MessageData ;
+import com.sun.corba.ee.spi.transport.TransportManager;
+import com.sun.corba.ee.spi.transport.MessageTraceManager;
+import com.sun.corba.ee.spi.transport.MessageData;
 
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion ;
+import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
 
-import com.sun.corba.ee.impl.misc.ORBUtility ;
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message ;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message;
 
-import com.sun.corba.ee.impl.encoding.CDRInputObject ;
+import com.sun.corba.ee.impl.encoding.CDRInputObject;
 import org.glassfish.pfl.test.TestCaseTools;
 
 public class Client extends TestCase
diff --git a/test/src/share/classes/corba/misc/Buck.java b/test/src/share/classes/corba/misc/Buck.java
index a084de4423..583f2aa6af 100644
--- a/test/src/share/classes/corba/misc/Buck.java
+++ b/test/src/share/classes/corba/misc/Buck.java
@@ -19,9 +19,9 @@
 
 package corba.misc ;
 
-import java.io.ObjectInput ;
-import java.io.ObjectOutput ;
-import java.io.IOException ;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.IOException;
 
 public class Buck implements java.io.Externalizable {
     String name = "";
diff --git a/test/src/share/classes/corba/misc/BuckPasserAL.java b/test/src/share/classes/corba/misc/BuckPasserAL.java
index 6cb8e9f358..38b90319f3 100644
--- a/test/src/share/classes/corba/misc/BuckPasserAL.java
+++ b/test/src/share/classes/corba/misc/BuckPasserAL.java
@@ -19,7 +19,7 @@
 
 package corba.misc ;
 
-import java.util.ArrayList ;
+import java.util.ArrayList;
 
 public class BuckPasserAL extends ArrayList {
 }
diff --git a/test/src/share/classes/corba/misc/BuckPasserV.java b/test/src/share/classes/corba/misc/BuckPasserV.java
index f82aeac3e7..16b0e08138 100644
--- a/test/src/share/classes/corba/misc/BuckPasserV.java
+++ b/test/src/share/classes/corba/misc/BuckPasserV.java
@@ -19,7 +19,7 @@
 
 package corba.misc ;
 
-import java.util.Vector ;
+import java.util.Vector;
 
 public class BuckPasserV extends Vector {
 }
diff --git a/test/src/share/classes/corba/misc/Client.java b/test/src/share/classes/corba/misc/Client.java
index b70cd3fe70..4f4954d8be 100644
--- a/test/src/share/classes/corba/misc/Client.java
+++ b/test/src/share/classes/corba/misc/Client.java
@@ -79,7 +79,7 @@
 import javax.rmi.CORBA.Tie;
 import javax.rmi.PortableRemoteObject;
 
-//import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints ;
+//import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints;
 
 public class Client extends TestCase
 {
diff --git a/test/src/share/classes/corba/mixedorb/Client.java b/test/src/share/classes/corba/mixedorb/Client.java
index 49b94d7bbf..4c34a6a6fd 100644
--- a/test/src/share/classes/corba/mixedorb/Client.java
+++ b/test/src/share/classes/corba/mixedorb/Client.java
@@ -20,28 +20,28 @@
 
 package corba.mixedorb;
 
-import java.util.Properties ;
-import java.util.Hashtable ;
+import java.util.Properties;
+import java.util.Hashtable;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
-import javax.rmi.CORBA.Util ;
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Util;
+import javax.rmi.CORBA.Tie;
 
-import javax.naming.InitialContext ;
+import javax.naming.InitialContext;
 
 import com.sun.corba.ee.spi.JndiConstants;
-import org.omg.CORBA.ORB ;
+import org.omg.CORBA.ORB;
 
-import org.testng.TestNG ;
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
-import org.testng.annotations.AfterTest ;
-import org.testng.annotations.BeforeTest ;
+import org.testng.TestNG;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService ;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 
 import static corba.framework.PRO.* ;
 
diff --git a/test/src/share/classes/corba/mixedorb/Echo.java b/test/src/share/classes/corba/mixedorb/Echo.java
index 6ea00ef20a..26ee0c5dcf 100644
--- a/test/src/share/classes/corba/mixedorb/Echo.java
+++ b/test/src/share/classes/corba/mixedorb/Echo.java
@@ -19,8 +19,8 @@
 
 package corba.mixedorb;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface Echo extends Remote {
     Echo say( Echo obj ) throws RemoteException ;
diff --git a/test/src/share/classes/corba/mixedorb/EchoImpl.java b/test/src/share/classes/corba/mixedorb/EchoImpl.java
index 66a14e84d4..c0bf3f34b3 100644
--- a/test/src/share/classes/corba/mixedorb/EchoImpl.java
+++ b/test/src/share/classes/corba/mixedorb/EchoImpl.java
@@ -19,9 +19,9 @@
 
 package corba.mixedorb;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
-import javax.rmi.PortableRemoteObject ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import javax.rmi.PortableRemoteObject;
 
 public class EchoImpl extends PortableRemoteObject implements Echo {
     private String name ;
diff --git a/test/src/share/classes/corba/msgtypes/Client.java b/test/src/share/classes/corba/msgtypes/Client.java
index 2192231e34..909fd278d0 100644
--- a/test/src/share/classes/corba/msgtypes/Client.java
+++ b/test/src/share/classes/corba/msgtypes/Client.java
@@ -22,8 +22,8 @@
 import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
 
-import org.omg.CORBA.INTERNAL ;
-import org.omg.CORBA.LocalObject ;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.LocalObject;
 
 import com.sun.corba.ee.spi.transport.ConnectionCache;
 
@@ -41,10 +41,10 @@
 import com.sun.corba.ee.spi.protocol.MessageMediator;
 import com.sun.corba.ee.spi.protocol.ClientDelegate;
 import com.sun.corba.ee.spi.transport.Connection;
-import com.sun.corba.ee.spi.transport.ContactInfo ;
-import com.sun.corba.ee.spi.transport.ContactInfoList ;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ;
-import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults ;
+import com.sun.corba.ee.spi.transport.ContactInfo;
+import com.sun.corba.ee.spi.transport.ContactInfoList;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults;
 
 import com.sun.corba.ee.impl.encoding.CDROutputObject;
 import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl;
diff --git a/test/src/share/classes/corba/msgtypes/FragmentTester.java b/test/src/share/classes/corba/msgtypes/FragmentTester.java
index c5f0784a55..fda67f8aae 100644
--- a/test/src/share/classes/corba/msgtypes/FragmentTester.java
+++ b/test/src/share/classes/corba/msgtypes/FragmentTester.java
@@ -19,7 +19,7 @@
 
 package corba.msgtypes;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
 public interface FragmentTester extends java.rmi.Remote
 {
diff --git a/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java b/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java
index 22333574e6..96b890132e 100644
--- a/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java
+++ b/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java
@@ -19,7 +19,7 @@
 
 package corba.msgtypes;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 import javax.rmi.PortableRemoteObject;
 
 public class FragmentTesterImpl extends PortableRemoteObject implements FragmentTester
diff --git a/test/src/share/classes/corba/nortel/Client.java b/test/src/share/classes/corba/nortel/Client.java
index e7f2d7c594..1f79cfe7bc 100644
--- a/test/src/share/classes/corba/nortel/Client.java
+++ b/test/src/share/classes/corba/nortel/Client.java
@@ -20,30 +20,30 @@
 
 package corba.nortel;
 
-import java.util.Properties ;
-import java.util.Hashtable ;
-import java.util.Collection ;
-import java.util.ArrayList ;
+import java.util.Properties;
+import java.util.Hashtable;
+import java.util.Collection;
+import java.util.ArrayList;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
-import javax.rmi.CORBA.Util ;
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Util;
+import javax.rmi.CORBA.Tie;
 
-import javax.naming.InitialContext ;
+import javax.naming.InitialContext;
 
 import com.sun.corba.ee.spi.JndiConstants;
-import org.omg.CORBA.ORB ;
+import org.omg.CORBA.ORB;
 
-import org.testng.TestNG ;
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
-import org.testng.annotations.AfterTest ;
-import org.testng.annotations.BeforeTest ;
+import org.testng.TestNG;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService ;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 
 import static corba.framework.PRO.* ;
 
diff --git a/test/src/share/classes/corba/nortel/Echo.java b/test/src/share/classes/corba/nortel/Echo.java
index 9828ef2624..92b9b69e0a 100644
--- a/test/src/share/classes/corba/nortel/Echo.java
+++ b/test/src/share/classes/corba/nortel/Echo.java
@@ -19,10 +19,10 @@
 
 package corba.nortel;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
-import java.util.Collection ;
+import java.util.Collection;
 
 public interface Echo extends Remote {
     Echo say( Echo obj ) throws RemoteException ;
diff --git a/test/src/share/classes/corba/nortel/EchoImpl.java b/test/src/share/classes/corba/nortel/EchoImpl.java
index d9fe7c4011..3120eac156 100644
--- a/test/src/share/classes/corba/nortel/EchoImpl.java
+++ b/test/src/share/classes/corba/nortel/EchoImpl.java
@@ -19,13 +19,13 @@
 
 package corba.nortel;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
-import javax.rmi.PortableRemoteObject ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import javax.rmi.PortableRemoteObject;
 
-import java.util.List ;
-import java.util.ArrayList ;
-import java.util.Collection ;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collection;
 
 public class EchoImpl extends PortableRemoteObject implements Echo {
     private String name ;
diff --git a/test/src/share/classes/corba/nortel/UserInfo.java b/test/src/share/classes/corba/nortel/UserInfo.java
index dc38cca5c9..508354daab 100644
--- a/test/src/share/classes/corba/nortel/UserInfo.java
+++ b/test/src/share/classes/corba/nortel/UserInfo.java
@@ -19,7 +19,7 @@
 
 package corba.nortel ;
 
-import java.io.Serializable ;
+import java.io.Serializable;
 
 public class UserInfo implements Serializable {
     private String firstName ;
diff --git a/test/src/share/classes/corba/orbconfig/MyConfigurator.java b/test/src/share/classes/corba/orbconfig/MyConfigurator.java
index 438a539b0d..040d5edbd9 100644
--- a/test/src/share/classes/corba/orbconfig/MyConfigurator.java
+++ b/test/src/share/classes/corba/orbconfig/MyConfigurator.java
@@ -19,9 +19,9 @@
 
 package corba.orbconfig ;
 
-import com.sun.corba.ee.spi.orb.DataCollector ;
-import com.sun.corba.ee.spi.orb.ORBConfigurator ;
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.DataCollector;
+import com.sun.corba.ee.spi.orb.ORBConfigurator;
+import com.sun.corba.ee.spi.orb.ORB;
 
 public class MyConfigurator implements ORBConfigurator
 {
diff --git a/test/src/share/classes/corba/orbconfig/TestSession.java b/test/src/share/classes/corba/orbconfig/TestSession.java
index 10218b736d..6b5e225058 100644
--- a/test/src/share/classes/corba/orbconfig/TestSession.java
+++ b/test/src/share/classes/corba/orbconfig/TestSession.java
@@ -19,10 +19,10 @@
 
 package corba.orbconfig;
 
-import java.io.PrintStream ;
+import java.io.PrintStream;
 
-import java.util.ArrayList ;
-import java.util.List ;
+import java.util.ArrayList;
+import java.util.List;
 import org.glassfish.pfl.basic.func.NullaryFunction;
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.glassfish.pfl.test.ObjectUtility;
diff --git a/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java b/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java
index 17290c5e47..9b056717c1 100644
--- a/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java
+++ b/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java
@@ -25,7 +25,7 @@
 package corba.orbconfigappserv;
 
 import org.omg.CORBA.INITIALIZE;
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.orb.ORBConfigurator;
 import com.sun.corba.ee.spi.orb.ParserImplBase;
 import com.sun.corba.ee.spi.orb.PropertyParser;
diff --git a/test/src/share/classes/corba/ortremote/ORTEcho.java b/test/src/share/classes/corba/ortremote/ORTEcho.java
index 266f8f1947..d8294a1113 100644
--- a/test/src/share/classes/corba/ortremote/ORTEcho.java
+++ b/test/src/share/classes/corba/ortremote/ORTEcho.java
@@ -19,10 +19,10 @@
 
 package corba.ortremote ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate ;
-import org.omg.PortableInterceptor.ObjectReferenceFactory ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
+import org.omg.PortableInterceptor.ObjectReferenceFactory;
 
 public interface ORTEcho extends Remote
 {
diff --git a/test/src/share/classes/corba/ortremote/ORTEchoImpl.java b/test/src/share/classes/corba/ortremote/ORTEchoImpl.java
index d2e259acd5..3259c3d61e 100644
--- a/test/src/share/classes/corba/ortremote/ORTEchoImpl.java
+++ b/test/src/share/classes/corba/ortremote/ORTEchoImpl.java
@@ -19,13 +19,13 @@
 
 package corba.ortremote ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate ;
-import org.omg.PortableInterceptor.ObjectReferenceFactory ;
-import org.omg.PortableServer.POA ;
-import com.sun.corba.ee.spi.oa.ObjectAdapter ;
-import javax.rmi.PortableRemoteObject ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
+import org.omg.PortableInterceptor.ObjectReferenceFactory;
+import org.omg.PortableServer.POA;
+import com.sun.corba.ee.spi.oa.ObjectAdapter;
+import javax.rmi.PortableRemoteObject;
 
 public class ORTEchoImpl extends PortableRemoteObject implements ORTEcho
 {
diff --git a/test/src/share/classes/corba/ortremote/Test.java b/test/src/share/classes/corba/ortremote/Test.java
index 27cb58bac0..0be8cd3637 100644
--- a/test/src/share/classes/corba/ortremote/Test.java
+++ b/test/src/share/classes/corba/ortremote/Test.java
@@ -19,18 +19,18 @@
 
 package corba.ortremote ;
 
-import com.sun.corba.ee.spi.oa.ObjectAdapter ;
-import java.rmi.RemoteException ;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate ;
-import org.omg.PortableInterceptor.ObjectReferenceFactory ;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
-import java.util.Properties ;
-import org.omg.CORBA.ORB ;
-import org.omg.CORBA.Policy ;
-import javax.rmi.PortableRemoteObject ;
-import javax.rmi.CORBA.Util ;
+import com.sun.corba.ee.spi.oa.ObjectAdapter;
+import java.rmi.RemoteException;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
+import org.omg.PortableInterceptor.ObjectReferenceFactory;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
+import java.util.Properties;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import javax.rmi.PortableRemoteObject;
+import javax.rmi.CORBA.Util;
 import org.glassfish.pfl.basic.func.NullaryFunction;
-import org.omg.CORBA.LocalObject ;
+import org.omg.CORBA.LocalObject;
 import org.omg.CORBA.ORBPackage.InvalidName;
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.LifespanPolicyValue;
diff --git a/test/src/share/classes/corba/ortremote/TestSession.java b/test/src/share/classes/corba/ortremote/TestSession.java
index 7d93ce3f89..c3fd92fbdf 100644
--- a/test/src/share/classes/corba/ortremote/TestSession.java
+++ b/test/src/share/classes/corba/ortremote/TestSession.java
@@ -19,7 +19,7 @@
 
 package corba.ortremote ;
 
-import java.io.PrintStream ;
+import java.io.PrintStream;
 import org.glassfish.pfl.basic.func.NullaryFunction;
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.glassfish.pfl.test.ObjectUtility;
diff --git a/test/src/share/classes/corba/preinvokepostinvoke/Server.java b/test/src/share/classes/corba/preinvokepostinvoke/Server.java
index 29d79cc5a6..ba5bf14fe2 100644
--- a/test/src/share/classes/corba/preinvokepostinvoke/Server.java
+++ b/test/src/share/classes/corba/preinvokepostinvoke/Server.java
@@ -27,7 +27,7 @@
 import org.omg.PortableServer.ServantManager;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
 import org.omg.PortableServer.ServantLocator;
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
 
 public class Server {
diff --git a/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java b/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java
index 7c6d814443..fa51b55804 100644
--- a/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java
+++ b/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java
@@ -19,13 +19,13 @@
 
 package corba.resolve_deadlock;
 
-import java.util.Properties ;
+import java.util.Properties;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 
-import org.omg.CORBA.ORB ;
+import org.omg.CORBA.ORB;
 
 
 
diff --git a/test/src/share/classes/corba/retryplugin/Client.java b/test/src/share/classes/corba/retryplugin/Client.java
index 8f786a615b..2590d031d3 100644
--- a/test/src/share/classes/corba/retryplugin/Client.java
+++ b/test/src/share/classes/corba/retryplugin/Client.java
@@ -33,9 +33,9 @@
 import org.omg.CORBA.COMM_FAILURE;
 import org.omg.CORBA.ORB;
 
-import com.sun.corba.ee.impl.plugin.hwlb.RetryClientRequestInterceptor ;
+import com.sun.corba.ee.impl.plugin.hwlb.RetryClientRequestInterceptor;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/retryplugin/Server.java b/test/src/share/classes/corba/retryplugin/Server.java
index 35989e8469..61d899af4d 100644
--- a/test/src/share/classes/corba/retryplugin/Server.java
+++ b/test/src/share/classes/corba/retryplugin/Server.java
@@ -30,9 +30,9 @@
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 
-import com.sun.corba.ee.impl.plugin.hwlb.RetryServerRequestInterceptor ;
+import com.sun.corba.ee.impl.plugin.hwlb.RetryServerRequestInterceptor;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/rfm/TestClient.java b/test/src/share/classes/corba/rfm/TestClient.java
index cdaf2e80a9..0d9cbbe3fc 100644
--- a/test/src/share/classes/corba/rfm/TestClient.java
+++ b/test/src/share/classes/corba/rfm/TestClient.java
@@ -19,52 +19,52 @@
 
 package corba.rfm ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
-import java.util.Arrays ;
-import java.util.List ;
-import java.util.ArrayList ;
-import java.util.Map ;
-import java.util.HashMap ;
-import java.util.Properties ;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Properties;
 
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Tie;
 
-import org.omg.CORBA.ORB ;
-import org.omg.CORBA.Policy ;
-import org.omg.CORBA.BAD_OPERATION ;
-import org.omg.CORBA.LocalObject ;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.LocalObject;
 
-import org.omg.CosNaming.NamingContext ;
-import org.omg.CosNaming.NamingContextHelper ;
-import org.omg.CosNaming.NamingContextExt ;
-import org.omg.CosNaming.NamingContextExtHelper ;
-import org.omg.CosNaming.NameComponent ;
-import org.omg.CosNaming.NamingContextPackage.CannotProceed ;
-import org.omg.CosNaming.NamingContextPackage.InvalidName ;
-import org.omg.CosNaming.NamingContextPackage.AlreadyBound ;
-import org.omg.CosNaming.NamingContextPackage.NotFound ;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContextPackage.CannotProceed;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
 
-import org.omg.PortableServer.ForwardRequest ;
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.ServantLocator ;
+import org.omg.PortableServer.ForwardRequest;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
 
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory ;
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager ;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
 
-import com.sun.corba.ee.spi.extension.ServantCachingPolicy ;
+import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
 
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService ;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 import org.glassfish.pfl.basic.contain.Pair;
 
 /** This is a test for the ReferenceFactoryManager.
diff --git a/test/src/share/classes/corba/rmipoacounter/counterServer.java b/test/src/share/classes/corba/rmipoacounter/counterServer.java
index bb1e48b489..33f980d09e 100644
--- a/test/src/share/classes/corba/rmipoacounter/counterServer.java
+++ b/test/src/share/classes/corba/rmipoacounter/counterServer.java
@@ -19,10 +19,10 @@
 
 package corba.rmipoacounter;
 
-import javax.rmi.PortableRemoteObject ;
-import java.io.DataOutputStream ;
-import java.rmi.RemoteException ;
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import javax.rmi.PortableRemoteObject;
+import java.io.DataOutputStream;
+import java.rmi.RemoteException;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
diff --git a/test/src/share/classes/corba/security/Client.java b/test/src/share/classes/corba/security/Client.java
index be79c2f494..a301e1e925 100644
--- a/test/src/share/classes/corba/security/Client.java
+++ b/test/src/share/classes/corba/security/Client.java
@@ -19,19 +19,19 @@
 
 package corba.security;
 
-import java.security.ProtectionDomain ;
-import java.security.Permission ;
-import java.security.PermissionCollection ;
-import java.security.Principal ;
-import java.security.CodeSource ;
-import java.security.cert.Certificate ;
-import java.security.Policy ;
-
-import java.util.Properties ;
-import java.util.Enumeration ;
-
-import java.io.PrintStream ;
-import java.net.URL ;
+import java.security.ProtectionDomain;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Principal;
+import java.security.CodeSource;
+import java.security.cert.Certificate;
+import java.security.Policy;
+
+import java.util.Properties;
+import java.util.Enumeration;
+
+import java.io.PrintStream;
+import java.net.URL;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/shutdown/Client.sjava b/test/src/share/classes/corba/shutdown/Client.sjava
index df5da306b7..5615d6c0d1 100644
--- a/test/src/share/classes/corba/shutdown/Client.sjava
+++ b/test/src/share/classes/corba/shutdown/Client.sjava
@@ -23,7 +23,7 @@ import HelloApp.*;
 import com.sun.corba.ee.impl.orbutil.ORBConstants;
 import org.omg.CosNaming.*;
 import org.omg.CORBA.*;
-import java.util.Properties ;
+import java.util.Properties;
 
 public class Client implements Runnable
 {
diff --git a/test/src/share/classes/corba/shutdown/Server.sjava b/test/src/share/classes/corba/shutdown/Server.sjava
index da4c051810..1370301d87 100644
--- a/test/src/share/classes/corba/shutdown/Server.sjava
+++ b/test/src/share/classes/corba/shutdown/Server.sjava
@@ -25,11 +25,11 @@ import com.sun.corba.ee.impl.orbutil.ORBConstants;
 import org.omg.CosNaming.*;
 import org.omg.CosNaming.NamingContextPackage.*;
 import org.omg.CORBA.*;
-import java.util.Properties ;
+import java.util.Properties;
 import org.omg.PortableServer.*;
 
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager ;
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory ;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
 
 /**
  * Servant implementation
diff --git a/test/src/share/classes/corba/shutdown/Test.java b/test/src/share/classes/corba/shutdown/Test.java
index 22debddc98..08d620e07e 100644
--- a/test/src/share/classes/corba/shutdown/Test.java
+++ b/test/src/share/classes/corba/shutdown/Test.java
@@ -19,8 +19,8 @@
 
 package corba.shutdown;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface Test extends Remote {
     int echo( int arg ) throws RemoteException ;
diff --git a/test/src/share/classes/corba/shutdown/TestImpl.java b/test/src/share/classes/corba/shutdown/TestImpl.java
index 3542d68b9e..e2b86a42ad 100644
--- a/test/src/share/classes/corba/shutdown/TestImpl.java
+++ b/test/src/share/classes/corba/shutdown/TestImpl.java
@@ -19,8 +19,8 @@
 
 package corba.shutdown;
 
-import java.rmi.RemoteException ;
-import javax.rmi.PortableRemoteObject ;
+import java.rmi.RemoteException;
+import javax.rmi.PortableRemoteObject;
 
 public class TestImpl extends PortableRemoteObject implements Test {
     public TestImpl() throws RemoteException {
diff --git a/test/src/share/classes/corba/simpledynamic/Client.java b/test/src/share/classes/corba/simpledynamic/Client.java
index 48fc6344ce..36715337e6 100644
--- a/test/src/share/classes/corba/simpledynamic/Client.java
+++ b/test/src/share/classes/corba/simpledynamic/Client.java
@@ -20,28 +20,28 @@
 
 package corba.simpledynamic;
 
-import java.util.Properties ;
-import java.util.Hashtable ;
+import java.util.Properties;
+import java.util.Hashtable;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
-import javax.rmi.CORBA.Util ;
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Util;
+import javax.rmi.CORBA.Tie;
 
-import javax.naming.InitialContext ;
+import javax.naming.InitialContext;
 
 import com.sun.corba.ee.spi.JndiConstants;
-import org.omg.CORBA.ORB ;
+import org.omg.CORBA.ORB;
 
-import org.testng.TestNG ;
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
-import org.testng.annotations.AfterTest ;
-import org.testng.annotations.BeforeTest ;
+import org.testng.TestNG;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService ;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 
 import static corba.framework.PRO.* ;
 
diff --git a/test/src/share/classes/corba/simpledynamic/Echo.java b/test/src/share/classes/corba/simpledynamic/Echo.java
index 80409b1769..81bcc8461f 100644
--- a/test/src/share/classes/corba/simpledynamic/Echo.java
+++ b/test/src/share/classes/corba/simpledynamic/Echo.java
@@ -19,8 +19,8 @@
 
 package corba.simpledynamic;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 import corba.misc.BuckPasserAL  ;
 import corba.misc.BuckPasserV  ;
diff --git a/test/src/share/classes/corba/simpledynamic/EchoImpl.java b/test/src/share/classes/corba/simpledynamic/EchoImpl.java
index 18e431da26..9dfddbe3cb 100644
--- a/test/src/share/classes/corba/simpledynamic/EchoImpl.java
+++ b/test/src/share/classes/corba/simpledynamic/EchoImpl.java
@@ -19,16 +19,16 @@
 
 package corba.simpledynamic;
 
-import java.util.Map ;
-import java.util.HashMap ;
+import java.util.Map;
+import java.util.HashMap;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
-import javax.rmi.PortableRemoteObject ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import javax.rmi.PortableRemoteObject;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
-import com.sun.corba.ee.spi.logging.UtilSystemException ;
+import com.sun.corba.ee.spi.logging.UtilSystemException;
 
 import corba.misc.BuckPasserAL  ;
 import corba.misc.BuckPasserV  ;
diff --git a/test/src/share/classes/corba/simpledynamic/Framework.java b/test/src/share/classes/corba/simpledynamic/Framework.java
index c749888607..26c7ed314c 100644
--- a/test/src/share/classes/corba/simpledynamic/Framework.java
+++ b/test/src/share/classes/corba/simpledynamic/Framework.java
@@ -20,27 +20,27 @@
 
 package corba.simpledynamic;
 
-import java.util.Properties ;
-import java.util.Hashtable ;
+import java.util.Properties;
+import java.util.Hashtable;
 
-import java.rmi.Remote ;
+import java.rmi.Remote;
 
-import javax.rmi.CORBA.Util ;
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Util;
+import javax.rmi.CORBA.Tie;
 
-import javax.naming.InitialContext ;
-import javax.naming.NamingException ;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 
 import com.sun.corba.ee.spi.JndiConstants;
-import org.testng.TestNG ;
-import org.testng.annotations.AfterTest ;
-import org.testng.annotations.BeforeTest ;
+import org.testng.TestNG;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService ;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 
 import static corba.framework.PRO.* ;
 
diff --git a/test/src/share/classes/corba/simpledynamic/FrameworkClient.java b/test/src/share/classes/corba/simpledynamic/FrameworkClient.java
index e68bfb67ef..51a9560d4c 100644
--- a/test/src/share/classes/corba/simpledynamic/FrameworkClient.java
+++ b/test/src/share/classes/corba/simpledynamic/FrameworkClient.java
@@ -24,30 +24,30 @@
 import org.glassfish.pfl.tf.timer.spi.TimerManager;
 import org.glassfish.pfl.tf.timer.spi.TimerGroup;
 import org.glassfish.pfl.tf.timer.spi.LogEventHandler;
-import java.io.IOException ;
-import java.io.ObjectInputStream ;
-import java.io.ObjectOutputStream ;
-import java.io.Serializable ;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
-import java.rmi.MarshalException ;
+import java.rmi.MarshalException;
 
-import java.util.Properties ;
+import java.util.Properties;
 
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
 
 
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
-import org.testng.annotations.BeforeGroups ;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeGroups;
 
-import corba.nortel.NortelSocketFactory ;
+import corba.nortel.NortelSocketFactory;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.orb.ORB;
 
-import corba.misc.Buck ;
+import corba.misc.Buck;
 
 import static corba.framework.PRO.* ;
 
diff --git a/test/src/share/classes/corba/simpledynamic/InterceptorTester.java b/test/src/share/classes/corba/simpledynamic/InterceptorTester.java
index 1381d6747e..6d68ccfc33 100644
--- a/test/src/share/classes/corba/simpledynamic/InterceptorTester.java
+++ b/test/src/share/classes/corba/simpledynamic/InterceptorTester.java
@@ -19,22 +19,22 @@
 
 package corba.simpledynamic;
 
-import org.omg.PortableInterceptor.ORBInitializer ;
-import org.omg.PortableInterceptor.ClientRequestInterceptor ;
-import org.omg.PortableInterceptor.ClientRequestInfo ;
-import org.omg.PortableInterceptor.ORBInitInfo ;
-import org.omg.PortableInterceptor.ForwardRequest ;
-
-import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName ;
-
-import org.omg.CORBA.LocalObject ;
-import org.omg.CORBA.SystemException ;
-import org.omg.CORBA.INTERNAL ;
-import org.omg.CORBA.COMM_FAILURE ;
-import org.omg.CORBA.ORB ;
-import org.omg.CORBA.Any ;
-
-import com.sun.corba.ee.impl.misc.ORBUtility ;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ORBInitInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
+
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
+
+import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.COMM_FAILURE;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Any;
+
+import com.sun.corba.ee.impl.misc.ORBUtility;
 
 public class InterceptorTester extends LocalObject implements
     ORBInitializer, ClientRequestInterceptor {
diff --git a/test/src/share/classes/corba/simpledynamic/NewAcceptorClient.java b/test/src/share/classes/corba/simpledynamic/NewAcceptorClient.java
index 256e28e963..3d5d39283b 100644
--- a/test/src/share/classes/corba/simpledynamic/NewAcceptorClient.java
+++ b/test/src/share/classes/corba/simpledynamic/NewAcceptorClient.java
@@ -21,7 +21,7 @@
 
 import java.net.Socket;
 import java.util.Properties;
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 
 import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.misc.ORBConstants;
@@ -29,8 +29,8 @@
 import com.sun.corba.ee.spi.transport.TransportDefault;
 import org.glassfish.pfl.basic.func.UnaryVoidFunction;
 
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class NewAcceptorClient extends Framework {
     private static final int SERVER_PORT = Integer.parseInt( PORT_NUM ) ;
diff --git a/test/src/share/classes/corba/stubserialization/Client.java b/test/src/share/classes/corba/stubserialization/Client.java
index 87973c84a2..75ab14f12d 100644
--- a/test/src/share/classes/corba/stubserialization/Client.java
+++ b/test/src/share/classes/corba/stubserialization/Client.java
@@ -19,36 +19,36 @@
 
 package corba.stubserialization  ;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
-import java.rmi.UnexpectedException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.UnexpectedException;
 
-import java.io.Serializable ;
-import java.io.Externalizable ;
+import java.io.Serializable;
+import java.io.Externalizable;
 
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.CORBA.Tie;
 
-import org.omg.CORBA.BAD_PARAM ;
-import org.omg.CORBA.BAD_OPERATION ;
-import org.omg.CORBA.SystemException ;
-import org.omg.CORBA.portable.ApplicationException ;
-import org.omg.CORBA.portable.ResponseHandler ;
-import org.omg.CORBA.portable.UnknownException ;
-import org.omg.CORBA.portable.Delegate ;
-import org.omg.CORBA_2_3.portable.InputStream ;
-import org.omg.CORBA_2_3.portable.OutputStream ;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.portable.ApplicationException;
+import org.omg.CORBA.portable.ResponseHandler;
+import org.omg.CORBA.portable.UnknownException;
+import org.omg.CORBA.portable.Delegate;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
 
 import org.omg.CosNaming.*;
 import org.omg.CORBA.ORB;
 
-import java.util.Map ;
-import java.util.Set ;
-import java.util.HashSet ;
-import java.util.Properties ;
+import java.util.Map;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Properties;
 
 import java.lang.reflect.Proxy;
 import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException ;
+import java.lang.reflect.InvocationTargetException;
 
 import javax.naming.NamingException;
 import javax.naming.InitialContext;
@@ -61,10 +61,10 @@
 import java.util.*;
 import java.io.*;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
-import org.testng.Assert ;
-import org.testng.annotations.Test ;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 /**
  * This tests that Stub serialization and deserialization to and from the
diff --git a/test/src/share/classes/corba/stubserialization/HelloServant.java b/test/src/share/classes/corba/stubserialization/HelloServant.java
index 33f2936723..f41a8bda8e 100644
--- a/test/src/share/classes/corba/stubserialization/HelloServant.java
+++ b/test/src/share/classes/corba/stubserialization/HelloServant.java
@@ -22,11 +22,11 @@
 import java.rmi.RemoteException;
 
 import javax.rmi.PortableRemoteObject;
-import java.io.FileInputStream ;
-import java.io.ObjectInputStream ;
+import java.io.FileInputStream;
+import java.io.ObjectInputStream;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ;
-import com.sun.corba.ee.spi.orb.ORB ;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+import com.sun.corba.ee.spi.orb.ORB;
 
 public class HelloServant extends PortableRemoteObject implements Hello
 {
diff --git a/test/src/share/classes/corba/stubserialization/Server.java b/test/src/share/classes/corba/stubserialization/Server.java
index db5a601c79..a3a53cc7fa 100644
--- a/test/src/share/classes/corba/stubserialization/Server.java
+++ b/test/src/share/classes/corba/stubserialization/Server.java
@@ -23,17 +23,17 @@
 import javax.naming.Context;
 import java.util.Properties;
 
-import javax.rmi.PortableRemoteObject ;
-import javax.rmi.CORBA.Tie ;
+import javax.rmi.PortableRemoteObject;
+import javax.rmi.CORBA.Tie;
 
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.*;
 
 import org.omg.PortableServer.*;
 
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
 
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 
 /**
diff --git a/test/src/share/classes/corba/tbbc/Sample.java b/test/src/share/classes/corba/tbbc/Sample.java
index 65965f71cc..ca49466f81 100644
--- a/test/src/share/classes/corba/tbbc/Sample.java
+++ b/test/src/share/classes/corba/tbbc/Sample.java
@@ -22,7 +22,7 @@
 
 import org.glassfish.pfl.dynamic.codegen.spi.Expression;
 import org.glassfish.pfl.dynamic.codegen.spi.Type;
-import java.lang.reflect.Method ;
+import java.lang.reflect.Method;
 
 import static java.lang.reflect.Modifier.* ;
 import static org.glassfish.pfl.dynamic.codegen.spi.Wrapper.* ;
diff --git a/test/src/share/classes/corba/testngrunner/Client.java b/test/src/share/classes/corba/testngrunner/Client.java
index 5b9a8b7321..249a5c5601 100644
--- a/test/src/share/classes/corba/testngrunner/Client.java
+++ b/test/src/share/classes/corba/testngrunner/Client.java
@@ -20,20 +20,20 @@
 
 package corba.testngrunner ;
 
-import java.util.Iterator ;
-import java.util.Properties ;
-import java.util.Map ;
-import java.util.List ;
-import java.util.ArrayList ;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
 
-import java.io.PrintWriter ;
+import java.io.PrintWriter;
 
-import org.testng.Assert ;
-import org.testng.annotations.BeforeSuite ;
-import org.testng.annotations.AfterSuite ;
-import org.testng.annotations.Test ;
+import org.testng.Assert;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.Test;
 
-import corba.framework.TestngRunner ;
+import corba.framework.TestngRunner;
 
 public class Client {
     private void msg( String str ) {
diff --git a/test/src/share/classes/corba/testngrunner/Second.java b/test/src/share/classes/corba/testngrunner/Second.java
index 96269e9178..5ebe455b6f 100644
--- a/test/src/share/classes/corba/testngrunner/Second.java
+++ b/test/src/share/classes/corba/testngrunner/Second.java
@@ -20,20 +20,20 @@
 
 package corba.testngrunner ;
 
-import java.util.Iterator ;
-import java.util.Properties ;
-import java.util.Map ;
-import java.util.List ;
-import java.util.ArrayList ;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.Map;
+import java.util.List;
+import java.util.ArrayList;
 
-import java.io.PrintWriter ;
+import java.io.PrintWriter;
 
-import org.testng.Assert ;
-import org.testng.annotations.BeforeSuite ;
-import org.testng.annotations.AfterSuite ;
-import org.testng.annotations.Test ;
+import org.testng.Assert;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.AfterSuite;
+import org.testng.annotations.Test;
 
-import corba.framework.TestngRunner ;
+import corba.framework.TestngRunner;
 
 public class Second {
     private void msg( String str ) {
diff --git a/test/src/share/classes/corba/testngrunner/TestngRunnerTest.java b/test/src/share/classes/corba/testngrunner/TestngRunnerTest.java
index f574984894..7f048aa4f7 100644
--- a/test/src/share/classes/corba/testngrunner/TestngRunnerTest.java
+++ b/test/src/share/classes/corba/testngrunner/TestngRunnerTest.java
@@ -19,11 +19,11 @@
 
 package corba.lb ;
 
-import java.util.Properties ;
+import java.util.Properties;
 
-import corba.framework.CORBATest ;
-import corba.framework.Options ;
-import corba.framework.Controller ;
+import corba.framework.CORBATest;
+import corba.framework.Options;
+import corba.framework.Controller;
 
 public class TestngRunnerTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/travelmuse/Client.java b/test/src/share/classes/corba/travelmuse/Client.java
index 1859b18002..ac2162ba1f 100644
--- a/test/src/share/classes/corba/travelmuse/Client.java
+++ b/test/src/share/classes/corba/travelmuse/Client.java
@@ -29,10 +29,10 @@
 import java.util.Properties;
 
 import corba.util.TransportManagerUtil;
-import org.testng.annotations.Test ;
-import org.testng.annotations.AfterTest ;
-import org.testng.annotations.BeforeTest ;
-import org.testng.Assert ;
+import org.testng.annotations.Test;
+import org.testng.annotations.AfterTest;
+import org.testng.annotations.BeforeTest;
+import org.testng.Assert;
 
 import corba.framework.TestngRunner;
 
diff --git a/test/src/share/classes/hopper/h4620926/Server.java b/test/src/share/classes/hopper/h4620926/Server.java
index 06bdd6ed59..005e1007d2 100644
--- a/test/src/share/classes/hopper/h4620926/Server.java
+++ b/test/src/share/classes/hopper/h4620926/Server.java
@@ -23,7 +23,7 @@
 import org.omg.PortableServer.*;
 import org.omg.CosNaming.*;
 import test.*;
-import java.util.Properties ;
+import java.util.Properties;
 
 class HelloServant extends HelloPOA {
     public String sayHello() {
diff --git a/test/src/share/classes/hopper/h4647746/Client.java b/test/src/share/classes/hopper/h4647746/Client.java
index 9784124acc..36441dcae3 100644
--- a/test/src/share/classes/hopper/h4647746/Client.java
+++ b/test/src/share/classes/hopper/h4647746/Client.java
@@ -19,36 +19,36 @@
 
 package hopper.h4647746;
 
-import java.io.PrintStream ;
+import java.io.PrintStream;
 
-import java.util.Properties ;
-import java.util.LinkedList ;
-import java.util.Iterator ;
-import java.util.StringTokenizer ;
-import java.util.Arrays ;
+import java.util.Properties;
+import java.util.LinkedList;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Arrays;
 
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.RequestProcessingPolicyValue ;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
 
-import org.omg.PortableServer.POAPackage.WrongPolicy ;
-import org.omg.PortableServer.POAPackage.InvalidPolicy ;
-import org.omg.PortableServer.POAPackage.AdapterAlreadyExists ;
+import org.omg.PortableServer.POAPackage.WrongPolicy;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
 
-import org.omg.PortableServer.portable.Delegate ;
+import org.omg.PortableServer.portable.Delegate;
 
-import org.omg.CORBA.portable.ObjectImpl ;
+import org.omg.CORBA.portable.ObjectImpl;
 
-import org.omg.CORBA.ORB ;
-import org.omg.CORBA.Policy ;
-import org.omg.CORBA.BAD_PARAM ;
-import org.omg.CORBA.INTERNAL ;
-import org.omg.CORBA.OctetSeqHolder ;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.OctetSeqHolder;
 
-import org.omg.CORBA.ORBPackage.InvalidName ;
+import org.omg.CORBA.ORBPackage.InvalidName;
 
-import org.omg.CORBA_2_3.portable.OutputStream ;
-import org.omg.CORBA_2_3.portable.InputStream ;
+import org.omg.CORBA_2_3.portable.OutputStream;
+import org.omg.CORBA_2_3.portable.InputStream;
 
 public class Client
 {
diff --git a/test/src/share/classes/hopper/h4655388/Client.java b/test/src/share/classes/hopper/h4655388/Client.java
index 84a0c6a09f..4f6430c0c0 100644
--- a/test/src/share/classes/hopper/h4655388/Client.java
+++ b/test/src/share/classes/hopper/h4655388/Client.java
@@ -19,36 +19,36 @@
 
 package hopper.h4655388;
 
-import java.io.PrintStream ;
+import java.io.PrintStream;
 
-import java.util.Properties ;
-import java.util.LinkedList ;
-import java.util.Iterator ;
-import java.util.StringTokenizer ;
-import java.util.Arrays ;
+import java.util.Properties;
+import java.util.LinkedList;
+import java.util.Iterator;
+import java.util.StringTokenizer;
+import java.util.Arrays;
 
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.RequestProcessingPolicyValue ;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
 
-import org.omg.PortableServer.POAPackage.WrongPolicy ;
-import org.omg.PortableServer.POAPackage.InvalidPolicy ;
-import org.omg.PortableServer.POAPackage.AdapterAlreadyExists ;
+import org.omg.PortableServer.POAPackage.WrongPolicy;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
 
-import org.omg.PortableServer.portable.Delegate ;
+import org.omg.PortableServer.portable.Delegate;
 
-import org.omg.CORBA.portable.ObjectImpl ;
+import org.omg.CORBA.portable.ObjectImpl;
 
-import org.omg.CORBA.ORB ;
-import org.omg.CORBA.Policy ;
-import org.omg.CORBA.BAD_PARAM ;
-import org.omg.CORBA.INTERNAL ;
-import org.omg.CORBA.OctetSeqHolder ;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.OctetSeqHolder;
 
-import org.omg.CORBA.ORBPackage.InvalidName ;
+import org.omg.CORBA.ORBPackage.InvalidName;
 
-import org.omg.CORBA_2_3.portable.OutputStream ;
-import org.omg.CORBA_2_3.portable.InputStream ;
+import org.omg.CORBA_2_3.portable.OutputStream;
+import org.omg.CORBA_2_3.portable.InputStream;
 
 public class Client
 {
diff --git a/test/src/share/classes/javax/rmi/PROTest.java b/test/src/share/classes/javax/rmi/PROTest.java
index faab4e4152..7c34bb8373 100644
--- a/test/src/share/classes/javax/rmi/PROTest.java
+++ b/test/src/share/classes/javax/rmi/PROTest.java
@@ -39,8 +39,8 @@
 import com.sun.org.omg.SendingContext.CodeBase;
 import alpha.bravo.Multi;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter ;
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager ;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
 import org.glassfish.pfl.test.JUnitReportHelper;
 
 /*
diff --git a/test/src/share/classes/naming/pcosnaming/helloClient.java b/test/src/share/classes/naming/pcosnaming/helloClient.java
index dd7bc12975..eda5a4331d 100644
--- a/test/src/share/classes/naming/pcosnaming/helloClient.java
+++ b/test/src/share/classes/naming/pcosnaming/helloClient.java
@@ -22,7 +22,7 @@
 import HelloApp.*;
 import org.omg.CosNaming.*;
 import org.omg.CORBA.*;
-import java.util.Properties ;
+import java.util.Properties;
 
 public class helloClient
 {
diff --git a/test/src/share/classes/naming/pcosnaming/helloServer.java b/test/src/share/classes/naming/pcosnaming/helloServer.java
index 56fce9dd2d..1c509ede3b 100644
--- a/test/src/share/classes/naming/pcosnaming/helloServer.java
+++ b/test/src/share/classes/naming/pcosnaming/helloServer.java
@@ -19,7 +19,7 @@
 
 package naming.pcosnaming;
 
-import HelloApp._helloImplBase ;
+import HelloApp._helloImplBase;
 import corba.framework.Controller;
 import corba.framework.InternalProcess;
 import java.io.PrintStream;
diff --git a/test/src/share/classes/naming/rinameservice/NameServiceClient.java b/test/src/share/classes/naming/rinameservice/NameServiceClient.java
index 204efd6714..44119c60de 100644
--- a/test/src/share/classes/naming/rinameservice/NameServiceClient.java
+++ b/test/src/share/classes/naming/rinameservice/NameServiceClient.java
@@ -24,7 +24,7 @@
 import corba.framework.*;
 import java.util.*;
 import java.io.*;
-import com.sun.corba.ee.spi.misc.ORBConstants ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * NameServiceClient just tests that StandAlone Name Service that we
diff --git a/test/src/share/classes/performance/simpleperf/counterIF.java b/test/src/share/classes/performance/simpleperf/counterIF.java
index a5fa41c211..49feb8a02b 100644
--- a/test/src/share/classes/performance/simpleperf/counterIF.java
+++ b/test/src/share/classes/performance/simpleperf/counterIF.java
@@ -19,8 +19,8 @@
 
 package performance.simpleperf;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface counterIF extends java.rmi.Remote {
     public long increment( long invalue ) throws java.rmi.RemoteException ;
diff --git a/test/src/share/classes/performance/simpleperf/counterImpl.java b/test/src/share/classes/performance/simpleperf/counterImpl.java
index 5a1d330eac..7143b02806 100644
--- a/test/src/share/classes/performance/simpleperf/counterImpl.java
+++ b/test/src/share/classes/performance/simpleperf/counterImpl.java
@@ -19,12 +19,12 @@
 
 package performance.simpleperf;
 
-import java.rmi.RemoteException ;
-import javax.rmi.PortableRemoteObject ;
-import org.omg.CORBA.ORB ;
-import java.io.File ;
-import java.io.RandomAccessFile ;
-import org.omg.PortableServer.POA ;
+import java.rmi.RemoteException;
+import javax.rmi.PortableRemoteObject;
+import org.omg.CORBA.ORB;
+import java.io.File;
+import java.io.RandomAccessFile;
+import org.omg.PortableServer.POA;
 
 public class counterImpl extends PortableRemoteObject implements counterIF
 {
diff --git a/test/src/share/classes/performance/simpleperf/counterServer.java b/test/src/share/classes/performance/simpleperf/counterServer.java
index ac8f99584b..e92a3c1bfa 100644
--- a/test/src/share/classes/performance/simpleperf/counterServer.java
+++ b/test/src/share/classes/performance/simpleperf/counterServer.java
@@ -19,24 +19,24 @@
 
 package performance.simpleperf;
 
-import javax.rmi.PortableRemoteObject ;
-import java.util.Properties ;
-
-import org.omg.CORBA.ORB ;
-import org.omg.CORBA.Policy ;
-import org.omg.CosNaming.NameComponent ;
-import org.omg.CosNaming.NamingContext ;
-import org.omg.CosNaming.NamingContextHelper ;
-import org.omg.PortableServer.LifespanPolicyValue ;
-import org.omg.PortableServer.POA ;
-import org.omg.PortableServer.RequestProcessingPolicyValue ;
-import org.omg.PortableServer.Servant ;
-import org.omg.PortableServer.ServantLocator ;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
-import org.omg.PortableServer.ServantRetentionPolicyValue ;
-
-import com.sun.corba.ee.spi.misc.ORBConstants ;
-import corba.framework.ThreadProcess ;
+import javax.rmi.PortableRemoteObject;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
+
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import corba.framework.ThreadProcess;
 
 public class counterServer extends ThreadProcess {
 
diff --git a/test/src/share/classes/performance/simpleperf2/counterClient.java b/test/src/share/classes/performance/simpleperf2/counterClient.java
index dc27826848..dbbf894b2c 100644
--- a/test/src/share/classes/performance/simpleperf2/counterClient.java
+++ b/test/src/share/classes/performance/simpleperf2/counterClient.java
@@ -23,14 +23,14 @@
 import java.util.Hashtable;
 import java.util.Properties;
 
-import javax.rmi.PortableRemoteObject ;
-import java.rmi.RemoteException ;
+import javax.rmi.PortableRemoteObject;
+import java.rmi.RemoteException;
 
 import org.omg.CORBA.ORB;
 import org.omg.PortableServer.POA;
-import org.omg.PortableServer.Servant ;
+import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocator;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder ;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 import corba.framework.InternalProcess;
 
diff --git a/test/src/share/classes/performance/simpleperf2/counterIF.java b/test/src/share/classes/performance/simpleperf2/counterIF.java
index 01a2fe5ed6..c9ab299367 100644
--- a/test/src/share/classes/performance/simpleperf2/counterIF.java
+++ b/test/src/share/classes/performance/simpleperf2/counterIF.java
@@ -19,8 +19,8 @@
 
 package performance.simpleperf2;
 
-import java.rmi.Remote ;
-import java.rmi.RemoteException ;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public interface counterIF extends java.rmi.Remote {
     public long increment( long invalue ) throws java.rmi.RemoteException ;
diff --git a/test/src/share/classes/performance/simpleperf2/counterImpl.java b/test/src/share/classes/performance/simpleperf2/counterImpl.java
index e0ffed2738..8538659dcd 100644
--- a/test/src/share/classes/performance/simpleperf2/counterImpl.java
+++ b/test/src/share/classes/performance/simpleperf2/counterImpl.java
@@ -19,12 +19,12 @@
 
 package performance.simpleperf2;
 
-import java.rmi.RemoteException ;
-import javax.rmi.PortableRemoteObject ;
-import org.omg.CORBA.ORB ;
-import java.io.File ;
-import java.io.RandomAccessFile ;
-import org.omg.PortableServer.POA ;
+import java.rmi.RemoteException;
+import javax.rmi.PortableRemoteObject;
+import org.omg.CORBA.ORB;
+import java.io.File;
+import java.io.RandomAccessFile;
+import org.omg.PortableServer.POA;
 
 public class counterImpl extends PortableRemoteObject implements counterIF
 {
diff --git a/test/src/share/classes/performance/simpleperf2/counterServer.java b/test/src/share/classes/performance/simpleperf2/counterServer.java
index 326710943f..d4f353ca19 100644
--- a/test/src/share/classes/performance/simpleperf2/counterServer.java
+++ b/test/src/share/classes/performance/simpleperf2/counterServer.java
@@ -19,17 +19,17 @@
 
 package performance.simpleperf2;
 
-import javax.rmi.PortableRemoteObject ;
+import javax.rmi.PortableRemoteObject;
 import java.io.*;
-import java.io.DataOutputStream ;
+import java.io.DataOutputStream;
 import java.util.*;
-import java.rmi.RemoteException ;
+import java.rmi.RemoteException;
 import org.omg.CORBA.*;
 import org.omg.CosNaming.*;
 import org.omg.PortableServer.*;
 import org.omg.PortableServer.ServantLocatorPackage.*;
-import com.sun.corba.ee.spi.misc.ORBConstants ;
-import corba.framework.ThreadProcess ;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import corba.framework.ThreadProcess;
 
 public class counterServer extends ThreadProcess {
 
diff --git a/test/src/share/classes/test12/SerializationTest.java b/test/src/share/classes/test12/SerializationTest.java
index 82281d27e5..aef68e672d 100644
--- a/test/src/share/classes/test12/SerializationTest.java
+++ b/test/src/share/classes/test12/SerializationTest.java
@@ -20,7 +20,7 @@
 
 package test12;
 
-import java.util.Properties ;
+import java.util.Properties;
 import org.glassfish.pfl.test.JUnitReportHelper;
 
 public class SerializationTest extends test.Test {
diff --git a/www/design/6763340_diffs.txt b/www/design/6763340_diffs.txt
index ae797219bb..6a067a53b3 100644
--- a/www/design/6763340_diffs.txt
+++ b/www/design/6763340_diffs.txt
@@ -3089,7 +3089,7 @@ diff -r 4074e79c320a src/share/classes/com/sun/corba/ee/impl/interceptors/PIHand
  import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
 @@ -71,7 +62,6 @@
  import org.omg.PortableInterceptor.PolicyFactory;
- import org.omg.PortableInterceptor.ObjectReferenceTemplate ;
+ import org.omg.PortableInterceptor.ObjectReferenceTemplate;
  
 -import com.sun.corba.ee.pept.encoding.OutputObject;
  
@@ -3100,7 +3100,7 @@ diff -r 4074e79c320a src/share/classes/com/sun/corba/ee/impl/interceptors/PIHand
  import com.sun.corba.ee.spi.protocol.ForwardException;
  import com.sun.corba.ee.spi.protocol.PIHandler;
 -import com.sun.corba.ee.spi.orbutil.misc.StackImpl;
-+import com.sun.corba.ee.spi.protocol.RetryType ;
++import com.sun.corba.ee.spi.protocol.RetryType;
  
  import com.sun.corba.ee.impl.logging.InterceptorsSystemException;
  import com.sun.corba.ee.impl.logging.ORBUtilSystemException;
@@ -4807,10 +4807,10 @@ diff -r 4074e79c320a src/share/classes/com/sun/corba/ee/impl/interceptors/Reques
 --- a/src/share/classes/com/sun/corba/ee/impl/interceptors/RequestInfoImpl.java Fri May 15 17:40:34 2009 -0700
 +++ b/src/share/classes/com/sun/corba/ee/impl/interceptors/RequestInfoImpl.java Mon Jul 06 12:05:55 2009 -0700
 @@ -41,40 +41,26 @@
- import java.lang.reflect.InvocationTargetException ;
+ import java.lang.reflect.InvocationTargetException;
  
- import java.util.Map ;
--import java.util.HashMap ;
+ import java.util.Map;
+-import java.util.HashMap;
  
  import org.omg.PortableInterceptor.ForwardRequest;
  import org.omg.PortableInterceptor.InvalidSlot;
diff --git a/www/design/SAF/interceptor_usage.text b/www/design/SAF/interceptor_usage.text
index 3d6c165cd0..b764f83bca 100644
--- a/www/design/SAF/interceptor_usage.text
+++ b/www/design/SAF/interceptor_usage.text
@@ -56,12 +56,12 @@ ORBD Activator:
 
 package com.sun.corba.ee.internal.PortableActivation ;
 
-import com.sun.corba.ee.PortableActivation.ObjectTemplate ;
-import com.sun.corba.ee.PortableActivation.ObjectTemplateValueFactory ;
-import com.sun.corba.ee.PortableActivation.Activator ;
+import com.sun.corba.ee.PortableActivation.ObjectTemplate;
+import com.sun.corba.ee.PortableActivation.ObjectTemplateValueFactory;
+import com.sun.corba.ee.PortableActivation.Activator;
 import org.omg.CORBA_2_3.ORB  ;
-import org.omg.PortableServer.POA ;
-import org.omg.CORBA.Policy ;
+import org.omg.PortableServer.POA;
+import org.omg.CORBA.Policy;
 
 class ORBDActivator implements Activator {
     Activator( ORB orb ) {

From 59812baddaf9b4e88dc619a57765e02cb3f76bc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= 
Date: Wed, 22 Apr 2026 22:04:18 +0200
Subject: [PATCH 2/5] Fixed default target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- I don't think we execute these tests anywhere, but Eclipse IDE reported it as
  an error

Signed-off-by: David Matějček 
---
 make/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/build.xml b/make/build.xml
index d8d22edfee..761507bccf 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -21,7 +21,7 @@
 
 -->
 
-
+
     
         This is the Ant file that builds the GlassFish ORB.
     

From 686419187a68caf7ee38a168cc5a6005f2b82b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= 
Date: Wed, 22 Apr 2026 22:04:52 +0200
Subject: [PATCH 3/5] Switched from hamcrest-all 1.3 to hamcrest 3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: David Matějček 
---
 idlj/pom.xml    | 2 +-
 omgapi/pom.xml  | 2 +-
 orbmain/pom.xml | 2 +-
 pom.xml         | 4 ++--
 rmic/pom.xml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/idlj/pom.xml b/idlj/pom.xml
index 6cd8fbae0b..a22ce6445b 100644
--- a/idlj/pom.xml
+++ b/idlj/pom.xml
@@ -34,7 +34,7 @@
     
         
             org.hamcrest
-            hamcrest-all
+            hamcrest
         
         
             junit
diff --git a/omgapi/pom.xml b/omgapi/pom.xml
index c1b4db572d..92f7b10155 100644
--- a/omgapi/pom.xml
+++ b/omgapi/pom.xml
@@ -75,7 +75,7 @@
         
         
             org.hamcrest
-            hamcrest-all
+            hamcrest
         
         
             com.meterware.simplestub
diff --git a/orbmain/pom.xml b/orbmain/pom.xml
index 3a21b393e3..b04c0a38de 100644
--- a/orbmain/pom.xml
+++ b/orbmain/pom.xml
@@ -70,7 +70,7 @@
         
         
             org.hamcrest
-            hamcrest-all
+            hamcrest
         
         
             junit
diff --git a/pom.xml b/pom.xml
index 906b63ff75..12c1a59f38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,8 +150,8 @@
             
             
                 org.hamcrest
-                hamcrest-all
-                1.3
+                hamcrest
+                3.0
                 test
             
             
diff --git a/rmic/pom.xml b/rmic/pom.xml
index 238f688781..f1d1c26a76 100644
--- a/rmic/pom.xml
+++ b/rmic/pom.xml
@@ -44,7 +44,7 @@
         
         
             org.hamcrest
-            hamcrest-all
+            hamcrest
         
         
             junit

From d2ebbf109dfefe8f2e177009eea50a2b06b5b220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= 
Date: Wed, 22 Apr 2026 22:10:49 +0200
Subject: [PATCH 4/5] Yet imports with multiple spaces
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: David Matějček 
---
 .../ee/impl/servicecontext/CodeSetServiceContextImpl.java     | 2 +-
 .../corba/ee/spi/servicecontext/CodeSetServiceContext.java    | 2 +-
 test/src/share/classes/corba/simpledynamic/Echo.java          | 4 ++--
 test/src/share/classes/corba/simpledynamic/EchoImpl.java      | 4 ++--
 www/design/SAF/interceptor_usage.text                         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java
index ccc8b57b4f..d06c68d16d 100644
--- a/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java
+++ b/orbmain/src/main/java/com/sun/corba/ee/impl/servicecontext/CodeSetServiceContextImpl.java
@@ -19,7 +19,7 @@
 
 package com.sun.corba.ee.impl.servicecontext;
 
-import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo  ;
+import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo;
 import com.sun.corba.ee.impl.encoding.MarshalInputStream;
 import com.sun.corba.ee.impl.encoding.MarshalOutputStream;
 import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
diff --git a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/CodeSetServiceContext.java b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/CodeSetServiceContext.java
index 5686247a2c..cb930a3993 100644
--- a/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/CodeSetServiceContext.java
+++ b/orbmain/src/main/java/com/sun/corba/ee/spi/servicecontext/CodeSetServiceContext.java
@@ -19,7 +19,7 @@
 
 package com.sun.corba.ee.spi.servicecontext;
 
-import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo  ;
+import com.sun.corba.ee.impl.encoding.CodeSetComponentInfo;
 
 public interface CodeSetServiceContext extends ServiceContext {
     int SERVICE_CONTEXT_ID = 1 ;
diff --git a/test/src/share/classes/corba/simpledynamic/Echo.java b/test/src/share/classes/corba/simpledynamic/Echo.java
index 81bcc8461f..7c3fc735cf 100644
--- a/test/src/share/classes/corba/simpledynamic/Echo.java
+++ b/test/src/share/classes/corba/simpledynamic/Echo.java
@@ -22,8 +22,8 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-import corba.misc.BuckPasserAL  ;
-import corba.misc.BuckPasserV  ;
+import corba.misc.BuckPasserAL;
+import corba.misc.BuckPasserV;
 
 public interface Echo extends Remote {
     String sayHello( Object obj ) throws RemoteException ;
diff --git a/test/src/share/classes/corba/simpledynamic/EchoImpl.java b/test/src/share/classes/corba/simpledynamic/EchoImpl.java
index 9dfddbe3cb..68313b364b 100644
--- a/test/src/share/classes/corba/simpledynamic/EchoImpl.java
+++ b/test/src/share/classes/corba/simpledynamic/EchoImpl.java
@@ -30,8 +30,8 @@
 
 import com.sun.corba.ee.spi.logging.UtilSystemException;
 
-import corba.misc.BuckPasserAL  ;
-import corba.misc.BuckPasserV  ;
+import corba.misc.BuckPasserAL;
+import corba.misc.BuckPasserV;
 import org.glassfish.pfl.basic.contain.Pair;
 
 public class EchoImpl extends PortableRemoteObject implements Echo {
diff --git a/www/design/SAF/interceptor_usage.text b/www/design/SAF/interceptor_usage.text
index b764f83bca..939c6a9a42 100644
--- a/www/design/SAF/interceptor_usage.text
+++ b/www/design/SAF/interceptor_usage.text
@@ -59,7 +59,7 @@ package com.sun.corba.ee.internal.PortableActivation ;
 import com.sun.corba.ee.PortableActivation.ObjectTemplate;
 import com.sun.corba.ee.PortableActivation.ObjectTemplateValueFactory;
 import com.sun.corba.ee.PortableActivation.Activator;
-import org.omg.CORBA_2_3.ORB  ;
+import org.omg.CORBA_2_3.ORB;
 import org.omg.PortableServer.POA;
 import org.omg.CORBA.Policy;
 

From 9b04cb1b84759a9f464d2f005010b4bd34befbc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mat=C4=9Bj=C4=8Dek?= 
Date: Wed, 22 Apr 2026 23:04:44 +0200
Subject: [PATCH 5/5] Organizing imports, removed asterisks and duplicities
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: David Matějček 
---
 .../impl/activation/ProcessMonitorThread.java |   4 +-
 .../corba/ee/impl/activation/ServerMain.java  |  13 +-
 .../corba/ee/impl/activation/ServerTool.java  |  34 +++--
 .../impl/naming/pcosnaming/NameService.java   |  13 +-
 .../naming/pcosnaming/NamingContextImpl.java  |  45 +++---
 .../src/test/java/corba/Client.java           |   6 +-
 .../adapteractivator/AdapterActivator.java    |   7 +-
 .../test/java/corba/codeset/CodeSetTest.java  |  10 +-
 .../corba/connectintercept_1_4/Common.java    |  10 +-
 .../connectintercept_1_4/MySocketFactory.java |  21 +--
 .../src/test/java/corba/folb_8_1/Client.java  |  16 +--
 .../java/corba/folb_8_1/ClientForTiming.java  |  23 ++-
 .../test/java/corba/folb_8_1/ColocatedCS.java |   1 +
 .../src/test/java/corba/folb_8_1/Common.java  |  16 ++-
 .../test/java/corba/folb_8_1/FolbTest.java    |   2 +-
 .../IIOPPrimaryToContactInfoImpl.java         |  17 ++-
 .../corba/folb_8_1/IORInterceptorImpl.java    |  16 +--
 .../corba/folb_8_1/IORToSocketInfoImpl.java   |  15 +-
 .../src/test/java/corba/folb_8_1/Server.java  |   8 +-
 .../corba/folb_8_1/SocketFactoryImpl.java     |  18 ++-
 .../test/java/corba/framework/CORBATest.java  |   3 +-
 .../test/java/corba/framework/CORBAUtil.java  |  11 +-
 .../test/java/corba/framework/Compiler.java   |   2 +-
 .../test/java/corba/framework/Controller.java |   2 +-
 .../corba/framework/ControllerAdapter.java    |   6 +-
 .../test/java/corba/framework/DebugExec.java  |   8 +-
 .../java/corba/framework/ExternalExec.java    |   1 -
 .../corba/framework/FileOutputDecorator.java  |   6 +-
 .../java/corba/framework/IDLCompiler.java     |   2 +-
 .../java/corba/framework/InternalExec.java    |   2 +-
 .../java/corba/framework/InternalProcess.java |   2 +-
 .../java/corba/framework/JavaCompiler.java    |   2 +-
 .../src/test/java/corba/framework/Loader.java |   7 +-
 .../java/corba/framework/MethodEvent.java     |   1 -
 .../test/java/corba/framework/ODebugExec.java |   6 +-
 .../test/java/corba/framework/Options.java    |   5 +-
 .../src/test/java/corba/framework/Port.java   |   4 +-
 .../src/test/java/corba/framework/Post.java   |   2 +-
 .../src/test/java/corba/framework/Pre.java    |   2 +-
 .../corba/framework/ProxyInterceptor.java     |  13 +-
 .../test/java/corba/framework/RDebugExec.java |   6 +-
 .../test/java/corba/framework/ResolveNS.java  |   1 -
 .../java/corba/framework/TestngRunner.java    |  11 +-
 .../test/java/corba/framework/ThreadExec.java |   2 +-
 .../java/corba/framework/ThreadProcess.java   |   2 +-
 .../test/java/corba/framework/TimedTest.java  |   2 +-
 .../corba/framework/TraceAccumulator.java     |   2 +-
 .../java/corba/framework/TraceElement.java    |   2 -
 .../test/java/corba/framework/statusU.java    |   6 +-
 .../src/test/java/corba/fwddecl/Client.java   |  18 ++-
 .../java/corba/fwddecl/ForwardDeclTest.java   |   6 +-
 .../java/corba/giopheaderpadding/Client.java  |  15 +-
 .../ColocatedClientServer.java                |   7 +-
 .../GIOPHeaderPaddingTest.java                |  10 +-
 .../giopheaderpadding/ServantLocator.java     |   6 +-
 .../java/corba/giopheaderpadding/Server.java  |  24 ++--
 .../giopheaderpadding/rmiiIServantPOA.java    |   4 +-
 .../src/test/java/corba/hcks/C.java           |  17 ++-
 .../src/test/java/corba/hcks/Client.java      |  40 +++---
 .../corba/hcks/ColocatedClientServer.java     |   1 +
 .../java/corba/hcks/ErrorAccumulator.java     |   3 +-
 .../src/test/java/corba/hcks/HcksTest.java    |   2 +-
 .../test/java/corba/hcks/MyInterceptor.java   |  14 +-
 .../java/corba/hcks/MyORBInitializer.java     |   8 +-
 .../java/corba/hcks/MyServantActivator.java   |   2 +-
 .../java/corba/hcks/MyServantLocator.java     |   2 +-
 .../hcks/SendRecursiveTypePOAServant.java     |   5 +-
 .../src/test/java/corba/hcks/Server.java      |  19 +--
 .../java/corba/hcks/SsPicInterceptor.java     |  14 +-
 .../src/test/java/corba/hcks/U.java           |  29 ++--
 .../hcks/idlDeprecatedDynamicServant.java     |   5 +-
 .../java/corba/hcks/idlDynInvokeHelper.java   |  14 +-
 .../java/corba/hcks/idlDynamicServant.java    |   6 +-
 .../test/java/corba/hcks/idlPOAServant.java   |  57 ++------
 .../test/java/corba/hcks/idlSLIServant.java   |   2 +-
 .../java/corba/hcks/idlStaticServant.java     |   5 +-
 .../corba/hcks/rmiiAttributesIServantPOA.java |   1 +
 .../test/java/corba/hcks/rmiiIServant.java    |   3 +-
 .../test/java/corba/hcks/rmiiIServantPOA.java |   2 +
 .../test/java/corba/invocation/Client.java    |   9 +-
 .../java/corba/invocation/InvocationTest.java |   8 +-
 .../java/corba/iorintsockfact/Common.java     |  10 +-
 .../corba/iorintsockfact/IORInterceptor.java  |  18 +--
 .../iorintsockfact/IorIntSockFactTest.java    |   2 +-
 .../iorintsockfact/ServerORBInitializer.java  |  14 +-
 .../corba/iorintsockfact/SocketFactory.java   |  17 ++-
 .../src/test/java/corba/islocal/Client.java   |   7 +-
 .../corba/islocal/ColocatedClientServer.java  |   7 +-
 .../java/corba/islocal/CustomClassLoader.java |   5 +-
 .../test/java/corba/islocal/IsLocalTest.java  |   2 +-
 .../java/corba/islocal/MyServantLocator.java  |   7 +-
 .../src/test/java/corba/islocal/Server.java   |  14 +-
 .../corba/islocal/rmiiIServantConnect.java    |   5 +-
 .../java/corba/islocal/rmiiIServantPOA.java   |   4 +-
 .../java/corba/multiorb/MultiORBTest.java     |   4 +-
 .../java/corba/multiorb/policy2Client.java    |   6 +-
 .../java/corba/multiorb/policy2Server.java    |  22 +--
 .../test/java/corba/oneway/OneWayTest.java    |   4 +-
 .../test/java/corba/oneway/helloClient.java   |   6 +-
 .../test/java/corba/oneway/helloServer.java   |   4 +-
 .../java/corba/poaandequals/POAAndEquals.java |  14 +-
 .../java/corba/poaandequals/WombatClient.java |   7 +-
 .../java/corba/poaandequals/WombatServer.java |   5 +-
 .../corba/poacallback/POACallbackTest.java    |   3 +-
 .../test/java/corba/poacallback/Server.java   |   6 +-
 .../poacallback/idlI1ServantLocator.java      |   4 +-
 .../poacallback/idlI2ServantLocator.java      |   4 +-
 .../java/corba/poamanager/FactoryImpl.java    |   7 +-
 .../java/corba/poamanager/HelloClient.java    |  13 +-
 .../java/corba/poamanager/HelloServer.java    |   3 +-
 .../java/corba/poamanager/POAManagerTest.java |   5 +-
 .../test/java/corba/poamanager/Utility.java   |   2 +
 .../poapolicies/BasicObjectFactoryImpl.java   |   5 +-
 .../FactoryForRetainAndUseActiveMapOnly.java  |   4 +-
 .../FactoryForRetainAndUseServantManager.java |  17 +--
 .../java/corba/poapolicies/HelloServer.java   |   3 +-
 .../java/corba/poapolicies/POAFactory.java    |   6 +-
 .../corba/poapolicies/POAPoliciesTest.java    |   8 +-
 .../test/java/corba/poapolicies/Utility.java  |   1 +
 .../test/java/corba/poatest/OneWayTest.java   |   4 +-
 .../test/java/corba/poatest/helloServer.java  |  15 +-
 .../corba/preinvokepostinvoke/Interface.java  |   1 -
 .../corba/preinvokepostinvoke/MyServant.java  |   3 +-
 .../preinvokepostinvoke/MyServantLocator.java |   4 +-
 .../PreInvokePostInvokeTest.java              |   3 +-
 .../test/java/corba/purgecalls/Client.java    |   4 +-
 .../corba/purgecalls/ClientInterceptor.java   |   4 +-
 .../purgecalls/ClientORBInitializer.java      |   2 +-
 .../java/corba/purgecalls/PurgecallsTest.java |   2 +-
 .../test/java/corba/purgecalls/Server.java    |   1 +
 .../src/test/java/corba/repid/Client.java     |   4 +-
 .../src/test/java/corba/repid/RepIdTest.java  |   4 +-
 .../corba/requestpartitioning/Client.java     |   2 +-
 .../RequestPartitioningTest.java              |   4 +-
 .../corba/requestpartitioning/Server.java     |   9 +-
 .../TestThreadPoolManager.java                |   9 +-
 .../rmipoacounter/RMIPOACounterTest.java      |  11 +-
 .../corba/rmipoacounter/counterClient.java    |  20 ++-
 .../java/corba/rmipoacounter/counterIF.java   |   3 -
 .../java/corba/rmipoacounter/counterImpl.java |   6 +-
 .../test/java/corba/rogueclient/Client.java   |   9 +-
 .../java/corba/rogueclient/RogueClient.java   |   8 +-
 .../corba/rogueclient/RogueClientTest.java    |   6 +-
 .../test/java/corba/rogueclient/Server.java   |   9 +-
 .../java/corba/rogueclient/TesterImpl.java    |   3 +-
 .../java/corba/systemexceptions/Client.java   |   6 +-
 .../ColocatedClientServer.java                |   7 +-
 .../java/corba/systemexceptions/Server.java   |  23 ++-
 .../SystemExceptionsTest.java                 |   7 +-
 .../src/test/java/corba/unarrow/Client.java   |   9 +-
 .../src/test/java/corba/unarrow/Server.java   |  10 +-
 .../corba/unarrow/UncheckedNarrowTest.java    |   5 +-
 .../javax/rmi/CORBA/serialization/BitSet.java |   2 +-
 .../CORBA/serialization/BudgetSummary.java    |   1 -
 .../serialization/ComplexTestObjectFour.java  |   7 +-
 .../serialization/ComplexTestObjectOne.java   |   4 +-
 .../serialization/ComplexTestObjectThree.java |   4 +-
 .../serialization/ComplexTestObjectTwo.java   |   7 +-
 .../ComplexTestObjectTwoDelta.java            |   6 +-
 .../ComplexTestObjectTwoSubclass.java         |   3 -
 .../ComplexTestObjectTwoSubclassDefaults.java |   5 +-
 .../serialization/ComplexTestObjectXXX.java   |   4 +-
 .../CORBA/serialization/EmptyTestObject.java  |   4 -
 .../javax/rmi/CORBA/serialization/Graph.java  |   4 +-
 .../rmi/CORBA/serialization/IDLValue.java     |   3 +-
 .../CORBA/serialization/IDLValueHelper.java   |   4 -
 .../CORBA/serialization/IIOPPerformance.java  |   7 +-
 .../CORBA/serialization/JRMPPerformance.java  |   9 +-
 .../OBVTestObjectCustomImpl.java              |   3 +-
 .../serialization/OBVTestObjectOneImpl.java   |   3 +-
 .../serialization/SerializationTest.java      |  10 +-
 .../rmi/CORBA/serialization/TestOBV2.java     |   3 +-
 .../test/java/javax/rmi/PortableContext.java  |  14 +-
 .../javax/rmi/download/SecurityManager.java   |   3 -
 .../java/javax/rmi/download/TheClient.java    |  10 +-
 .../java/javax/rmi/download/TheServer.java    |  10 +-
 .../test/java/javax/rmi/download/TheTest.java |  17 ++-
 .../src/test/java/mantis/m4764130/Client.java |   8 +-
 .../java/mantis/m4764130/Interceptor.java     |  11 +-
 .../mantis/m4764130/SendingContextTest.java   |   5 +-
 .../src/test/java/mantis/m4764130/Server.java |   8 +-
 .../pi/clientinterceptor/ClientCommon.java    |   2 +
 .../ClientInterceptorTest.java                |   4 +-
 .../pi/clientinterceptor/DIIPOAClient.java    |  23 ++-
 .../clientinterceptor/DIIPOALocalClient.java  |  23 ++-
 .../clientinterceptor/DIIRMILocalClient.java  |  22 ++-
 .../clientinterceptor/OldRMILocalServer.java  |  20 +--
 .../pi/clientinterceptor/OldRMIServer.java    |  22 ++-
 .../java/pi/clientinterceptor/POAClient.java  |  26 ++--
 .../pi/clientinterceptor/POALocalClient.java  |  26 ++--
 .../pi/clientinterceptor/POALocalServer.java  |  23 ++-
 .../java/pi/clientinterceptor/POAServer.java  |  26 ++--
 .../java/pi/clientinterceptor/RMIClient.java  |  23 ++-
 .../pi/clientinterceptor/RMILocalClient.java  |  24 ++--
 .../pi/clientinterceptor/RMILocalServer.java  |  20 +--
 .../java/pi/clientinterceptor/RMIServer.java  |  22 ++-
 .../SampleClientRequestInterceptor.java       |   7 +-
 .../pi/clientinterceptor/TestInitializer.java |  12 +-
 .../clientinterceptor/helloDIIClientStub.java |  10 +-
 .../pi/clientinterceptor/helloDelegate.java   |  10 +-
 .../pi/clientinterceptor/helloOldRMIIIOP.java |  11 +-
 .../pi/clientinterceptor/helloRMIIIOP.java    |  10 +-
 .../pi/clientinterceptor/helloServant.java    |   8 +-
 .../AttributesValidStrategy.java              |   8 +-
 .../pi/clientrequestinfo/ClientCommon.java    |   2 +
 .../ClientRequestInfoTest.java                |   4 +-
 .../pi/clientrequestinfo/DIIPOAClient.java    |  22 ++-
 .../clientrequestinfo/DIIPOALocalClient.java  |  22 ++-
 .../clientrequestinfo/DIIRMILocalClient.java  |  22 ++-
 .../pi/clientrequestinfo/DynamicStrategy.java |  16 ++-
 .../EffectiveProfileStrategy.java             |   7 +-
 .../clientrequestinfo/ExceptionStrategy.java  |  17 ++-
 .../ForwardReferenceStrategy.java             |   6 +-
 .../InterceptorStrategy.java                  |   4 +-
 .../pi/clientrequestinfo/InvokeDynamic.java   |   7 +-
 .../clientrequestinfo/InvokeExceptions.java   |   8 +-
 .../pi/clientrequestinfo/InvokeOneWay.java    |   4 -
 .../pi/clientrequestinfo/InvokeRecursive.java |   4 -
 .../pi/clientrequestinfo/InvokeStrategy.java  |   3 -
 .../pi/clientrequestinfo/InvokeVisitAll.java  |   4 +-
 .../InvokeVisitAllForward.java                |   4 +-
 .../clientrequestinfo/OldRMILocalServer.java  |  20 +--
 .../pi/clientrequestinfo/OldRMIServer.java    |  22 ++-
 .../pi/clientrequestinfo/OneWayStrategy.java  |   4 +-
 .../java/pi/clientrequestinfo/POAClient.java  |  25 ++--
 .../pi/clientrequestinfo/POALocalClient.java  |  25 ++--
 .../pi/clientrequestinfo/POALocalServer.java  |  23 ++-
 .../java/pi/clientrequestinfo/POAServer.java  |  26 ++--
 .../java/pi/clientrequestinfo/RMIClient.java  |  23 ++-
 .../pi/clientrequestinfo/RMILocalClient.java  |  20 +--
 .../pi/clientrequestinfo/RMILocalServer.java  |  20 +--
 .../java/pi/clientrequestinfo/RMIServer.java  |  22 ++-
 .../clientrequestinfo/RequestId1Strategy.java |   4 +-
 .../clientrequestinfo/RequestId2Strategy.java |   4 +-
 .../SampleClientRequestInterceptor.java       |   5 +-
 .../ServiceContextStrategy.java               |  13 +-
 .../pi/clientrequestinfo/TestInitializer.java |  12 +-
 .../clientrequestinfo/helloDIIClientStub.java |  18 ++-
 .../pi/clientrequestinfo/helloDelegate.java   |  11 +-
 .../java/pi/clientrequestinfo/helloIF.java    |   4 +-
 .../pi/clientrequestinfo/helloOldRMIIIOP.java |  13 +-
 .../pi/clientrequestinfo/helloRMIIIOP.java    |  12 +-
 .../pi/clientrequestinfo/helloServant.java    |  10 +-
 .../test/java/pi/iorinterceptor/Client.java   |  19 ++-
 .../pi/iorinterceptor/IORInterceptorTest.java |   5 +-
 .../pi/iorinterceptor/NPEIORInterceptor.java  |   4 +-
 .../iorinterceptor/PolicyFactoryHundred.java  |   6 +-
 .../java/pi/iorinterceptor/PolicyHundred.java |   5 +-
 .../iorinterceptor/SampleIORInterceptor.java  |  31 ++--
 .../test/java/pi/iorinterceptor/Server.java   |  14 +-
 .../iorinterceptor/ServerTestInitializer.java |  11 +-
 .../java/pi/iorinterceptor/SimpleServant.java |   3 +-
 .../test/java/pi/orbinit/ClientCommon.java    |   2 +
 .../pi/orbinit/ClientTestInitializer.java     |  20 +--
 .../src/test/java/pi/orbinit/ORBInitTest.java |   4 +-
 .../src/test/java/pi/orbinit/PropsClient.java |  12 +-
 .../SampleClientRequestInterceptor.java       |   6 +-
 .../java/pi/orbinit/SampleIORInterceptor.java |   5 -
 .../java/pi/orbinit/SampleObjectImpl.java     |   2 +-
 .../SampleServerRequestInterceptor.java       |   4 -
 .../test/java/pi/orbinit/SystemClient.java    |  12 +-
 .../src/test/java/pi/ort/DelayServant.java    |   3 +-
 .../java/pi/ort/ORTStateChangeEvaluator.java  |   3 +-
 .../src/test/java/pi/ort/ORTTest.java         |   5 +-
 .../java/pi/ort/SampleIORInterceptor.java     |  15 +-
 .../src/test/java/pi/ort/Server.java          |   8 +-
 .../java/pi/ort/ServerTestInitializer.java    |  10 +-
 .../pi/serverinterceptor/ClientCommon.java    |  23 ++-
 .../java/pi/serverinterceptor/DSIImpl.java    |  16 +--
 .../serverinterceptor/DSIPOALocalServer.java  |  18 +--
 .../serverinterceptor/DSIPOARemoteServer.java |  18 +--
 .../pi/serverinterceptor/DSIPOAServer.java    |  23 ++-
 .../pi/serverinterceptor/DSIRMIClient.java    |  28 ++--
 .../serverinterceptor/DSIRMILocalClient.java  |  21 +--
 .../serverinterceptor/DSIRMILocalServer.java  |  20 +--
 .../serverinterceptor/DSIRMIRemoteClient.java |  21 +--
 .../serverinterceptor/DSIRMIRemoteServer.java |  21 +--
 .../pi/serverinterceptor/DSIRMIServer.java    |  24 +---
 .../java/pi/serverinterceptor/POAClient.java  |  28 ++--
 .../pi/serverinterceptor/POALocalClient.java  |  18 +--
 .../pi/serverinterceptor/POALocalServer.java  |  16 +--
 .../pi/serverinterceptor/POARemoteClient.java |  18 +--
 .../pi/serverinterceptor/POARemoteServer.java |  16 +--
 .../java/pi/serverinterceptor/POAServer.java  |  28 ++--
 .../java/pi/serverinterceptor/RMIClient.java  |  27 ++--
 .../pi/serverinterceptor/RMILocalClient.java  |  21 +--
 .../pi/serverinterceptor/RMILocalServer.java  |  20 +--
 .../pi/serverinterceptor/RMIRemoteClient.java |  21 +--
 .../pi/serverinterceptor/RMIRemoteServer.java |  21 +--
 .../java/pi/serverinterceptor/RMIServer.java  |  24 +---
 .../SampleServerRequestInterceptor.java       |   5 +-
 .../pi/serverinterceptor/ServerCommon.java    |   3 +
 .../ServerInterceptorTest.java                |   8 +-
 .../pi/serverinterceptor/TestInitializer.java |  10 +-
 .../serverinterceptor/TestServantLocator.java |  11 +-
 .../helloDSIDeprecatedServant.java            |  10 +-
 .../pi/serverinterceptor/helloDSIServant.java |  11 +-
 .../pi/serverinterceptor/helloDelegate.java   |   9 +-
 .../java/pi/serverinterceptor/helloIF.java    |   4 +-
 .../pi/serverinterceptor/helloRMIIIOP.java    |  11 +-
 .../pi/serverinterceptor/helloServant.java    |   8 +-
 .../serverrequestinfo/AdapterIdStrategy.java  |  12 +-
 .../AttributesValidStrategy.java              |  10 +-
 .../pi/serverrequestinfo/ClientCommon.java    |  23 ++-
 .../java/pi/serverrequestinfo/DSIImpl.java    |  15 +-
 .../serverrequestinfo/DSIPOALocalServer.java  |  18 +--
 .../serverrequestinfo/DSIPOARemoteServer.java |  18 +--
 .../pi/serverrequestinfo/DSIRMIClient.java    |  29 ++--
 .../serverrequestinfo/DSIRMILocalClient.java  |  21 +--
 .../serverrequestinfo/DSIRMILocalServer.java  |  20 +--
 .../serverrequestinfo/DSIRMIRemoteClient.java |  21 +--
 .../serverrequestinfo/DSIRMIRemoteServer.java |  21 +--
 .../pi/serverrequestinfo/DSIRMIServer.java    |  29 ++--
 .../serverrequestinfo/ExceptionStrategy.java  |  14 +-
 .../ForwardReferenceStrategy.java             |   6 +-
 .../GetServerPolicyStrategy.java              |  12 +-
 .../InterceptorStrategy.java                  |   4 +-
 .../serverrequestinfo/InvokeExceptions.java   |   7 +-
 .../pi/serverrequestinfo/InvokeOneWay.java    |   4 -
 .../pi/serverrequestinfo/InvokeStrategy.java  |   3 -
 .../pi/serverrequestinfo/InvokeVisitAll.java  |   4 +-
 .../InvokeVisitAllForward.java                |   4 +-
 .../pi/serverrequestinfo/OneWayStrategy.java  |   4 +-
 .../java/pi/serverrequestinfo/POAClient.java  |  29 ++--
 .../pi/serverrequestinfo/POALocalClient.java  |  18 +--
 .../pi/serverrequestinfo/POALocalServer.java  |  18 +--
 .../pi/serverrequestinfo/POARemoteClient.java |  18 +--
 .../pi/serverrequestinfo/POARemoteServer.java |  18 +--
 .../java/pi/serverrequestinfo/POAServer.java  |  31 ++--
 .../PolicyFactoryHundred.java                 |   6 +-
 .../pi/serverrequestinfo/PolicyHundred.java   |   5 +-
 .../java/pi/serverrequestinfo/RMIClient.java  |  29 ++--
 .../pi/serverrequestinfo/RMILocalClient.java  |  21 +--
 .../pi/serverrequestinfo/RMILocalServer.java  |  20 +--
 .../pi/serverrequestinfo/RMIRemoteClient.java |  21 +--
 .../pi/serverrequestinfo/RMIRemoteServer.java |  21 +--
 .../java/pi/serverrequestinfo/RMIServer.java  |  27 ++--
 .../serverrequestinfo/RequestId1Strategy.java |   4 +-
 .../RequestInfoStackStrategy.java             |   8 +-
 .../SampleServerRequestInterceptor.java       |   2 -
 .../pi/serverrequestinfo/ServerCommon.java    |   3 +
 .../ServerRequestInfoTest.java                |   4 +-
 .../ServiceContextStrategy.java               |  13 +-
 .../pi/serverrequestinfo/TestInitializer.java |  13 +-
 .../helloDSIDeprecatedServant.java            |  10 +-
 .../pi/serverrequestinfo/helloDSIServant.java |  11 +-
 .../pi/serverrequestinfo/helloDelegate.java   |  10 +-
 .../java/pi/serverrequestinfo/helloIF.java    |   4 +-
 .../pi/serverrequestinfo/helloRMIIIOP.java    |  12 +-
 .../pi/serverrequestinfo/helloServant.java    |   9 +-
 .../AServiceIORInterceptor.java               |   3 +-
 .../java/pi/serviceexample/AServiceImpl.java  |   2 +-
 .../serviceexample/AServiceInterceptor.java   |   8 +-
 .../serviceexample/ArbitraryObjectImpl.java   |   9 +-
 .../test/java/pi/serviceexample/Client.java   |   9 +-
 .../pi/serviceexample/ColocatedServers.java   |   3 +-
 .../LoggingServiceClientInterceptor.java      |   3 +-
 .../LoggingServiceClientORBInitializer.java   |   5 +-
 .../pi/serviceexample/LoggingServiceImpl.java |   7 +-
 .../LoggingServiceServerInterceptor.java      |   8 +-
 .../LoggingServiceServerORBInitializer.java   |   4 +-
 .../pi/serviceexample/ServiceExampleTest.java |   2 +-
 functional-tests/src/test/java/rmic/Cat.java  |   1 -
 .../src/test/java/rmic/ClassEnumerator.java   |  12 +-
 .../src/test/java/rmic/HelloImpl.java         |  11 +-
 .../src/test/java/rmic/HelloTest.java         |  31 ++--
 functional-tests/src/test/java/rmic/Hi.java   |   2 +-
 .../src/test/java/rmic/HiServant.java         |   2 -
 .../src/test/java/rmic/InnerTest.java         |  12 +-
 .../src/test/java/rmic/LocalHello.java        |   1 -
 .../src/test/java/rmic/LocalHelloServant.java |   5 +-
 .../src/test/java/rmic/LocalStubTest.java     |  24 ++--
 .../src/test/java/rmic/MangleMethods.java     |   3 +-
 .../src/test/java/rmic/MapType.java           |   4 +-
 .../src/test/java/rmic/ObjectByValue.java     |   2 -
 .../src/test/java/rmic/OnlyRemoteServant.java |   1 +
 .../src/test/java/rmic/ParseTest.java         |   7 +-
 .../src/test/java/rmic/RMICTest.java          |   8 +-
 .../test/java/rmic/RemoteObjectServer.java    |   3 +-
 .../src/test/java/rmic/SimpleServant.java     |   2 +-
 .../test/java/rmic/StaticStringsHashTest.java |   6 +-
 .../src/test/java/rmic/StressParseIIOP.java   |  11 +-
 .../src/test/java/rmic/StubReferenceTest.java |   1 +
 .../src/test/java/rmic/TestEnv.java           |   3 +-
 .../src/test/java/rmic/TestExecutor.java      |  22 +--
 .../java/rmic/ThrowCORBAUserExServant.java    |   4 +-
 .../java/rmic/ThrowCORBAUserException.java    |   3 +-
 .../src/test/java/test/Alarm.java             |   2 +-
 .../src/test/java/test/AlarmHandler.java      |   2 -
 .../src/test/java/test/ClassUtils.java        |   6 +-
 .../src/test/java/test/Debug.java             |   5 +-
 .../test/java/test/DistributedSetMonitor.java |  14 +-
 .../src/test/java/test/HelloClient.java       |   1 -
 .../src/test/java/test/InstallTest.java       |   3 +-
 .../src/test/java/test/ProcessMonitor.java    |   2 +-
 .../src/test/java/test/RemoteTest.java        |  13 +-
 .../src/test/java/test/RemoteTestExample.java |   4 +-
 .../src/test/java/test/ServantContext.java    |  14 +-
 .../test/java/test/ServantManagerImpl.java    |  10 +-
 .../src/test/java/test/StartRMIRegistry.java  |   2 +-
 .../src/test/java/test/StreamReader.java      |   6 +-
 functional-tests/src/test/java/test/Test.java |  28 ++--
 functional-tests/src/test/java/test/Util.java |  15 +-
 .../src/test/java/test/WebServer.java         |  15 +-
 .../concurrent/ConcurrentQueueImpl.java       |   1 -
 .../rmi/TestIDLNameTranslator.java            |  11 +-
 .../presentation/rmi/TestRMIIDLTypes.java     |   1 +
 .../ee/impl/transport/ConnectionImplTest.java |   3 -
 .../eesample/wspex/components/OrderBL.java    |   9 +-
 .../AcceptorAndContactInfoTest.java           |   2 +-
 .../corba/acceptorandcontactinfo/Client.java  |   8 +-
 .../ColocatedClientServer.java                |   7 +-
 .../ServantLocator.java                       |   6 +-
 .../corba/acceptorandcontactinfo/Server.java  |  15 +-
 .../rmiiIServantPOA.java                      |   4 +-
 .../share/classes/corba/cdrext/AbsTester.java |   2 +-
 .../classes/corba/cdrext/CDRExtTest.java      |   9 +-
 .../share/classes/corba/cdrext/Client.java    |  22 +--
 .../corba/cdrext/CustomMarshalTester.java     |   8 +-
 .../classes/corba/cdrext/MarshalChecker.java  |   4 -
 .../classes/corba/cdrext/MarshalTester.java   |   5 +-
 .../classes/corba/cdrext/ReplaceSubClass.java |   2 -
 .../corba/cdrext/ReplaceSuperClass.java       |   2 +-
 .../share/classes/corba/cdrext/Server.java    |  21 +--
 .../share/classes/corba/cdrext/SubClass.java  |   2 +-
 .../share/classes/corba/cdrext/TestClass.java |   6 +-
 .../corba/cdrext/TestExternalizable.java      |   5 +-
 .../classes/corba/cdrext/TestObject.java      |  10 +-
 .../share/classes/corba/cdrext/Tester.java    |   9 +-
 .../classes/corba/cdrstreams/CDRTests.java    |   6 +-
 .../classes/corba/cdrstreams/Client.java      |  23 +--
 .../corba/cdrstreams/CustomMarshaled.java     |   3 +-
 .../corba/cdrstreams/GraphProcessor.java      |   1 -
 .../corba/cdrstreams/GraphProcessorImpl.java  |   8 +-
 .../corba/cdrstreams/MarkResetTester.java     |   3 +-
 .../classes/corba/cdrstreams/Server.java      |  14 +-
 .../share/classes/corba/cmvt/CMVTTest.java    |   9 +-
 test/src/share/classes/corba/cmvt/Client.java |  12 +-
 .../share/classes/corba/cmvt/GIOPCombo.java   |   1 -
 .../classes/corba/cmvt/GIOPComboImpl.java     |   7 +-
 test/src/share/classes/corba/cmvt/Server.java |  15 +-
 .../share/classes/corba/codebase/Client.java  |   5 +-
 .../classes/corba/codebase/CodeBaseTest.java  |  16 ++-
 .../corba/codebase/NoSecurityManager.java     |   4 +-
 .../share/classes/corba/codebase/Server.java  |   5 +-
 .../classes/corba/codebase/WebServer.java     |  15 +-
 .../classes/corba/connectioncache/Client.java |  37 +++--
 .../ConnectionCacheStressTest.java            |   3 +-
 .../connectioncache/ConnectionCacheTest.java  |   3 +-
 .../corba/connectioncache/ConnectionImpl.java |   1 +
 .../connectioncache/ContactInfoImpl.java      |   1 +
 .../corba/connectioncache/StressClient.java   |  30 ++--
 .../classes/corba/connections/Client.java     |  11 +-
 .../connections/ConnectionStatistics.java     |   9 +-
 .../corba/connections/ConnectionsTest.java    |   2 +-
 .../corba/connections/RemoteService.java      |   6 +-
 .../classes/corba/connections/Server.java     |  10 +-
 .../corba/copyobjectpolicy/Client.java        |  40 +++---
 .../CopyObjectPolicyTest.java                 |   7 +-
 .../corba/copyobjectpolicy/EchoImpl.java      |   1 +
 .../copyobjectpolicy/UserConfigurator.java    |  14 +-
 .../classes/corba/custom/ArrayListNode.java   |   3 +-
 .../share/classes/corba/custom/Client.java    |  13 +-
 .../classes/corba/custom/CustomTest.java      |   9 +-
 test/src/share/classes/corba/custom/Node.java |   3 +-
 .../share/classes/corba/custom/Server.java    |  12 +-
 .../share/classes/corba/custom/Verifier.java  |   1 -
 .../classes/corba/custom/VerifierImpl.java    |   1 +
 .../classes/corba/dynamicrmiiiop/Client.java  |  78 +++++-----
 .../dynamicrmiiiop/DynamicRmiIIOPTest.java    |   5 +-
 .../dynamicrmiiiop/TestClientDelegate.java    |  36 +++--
 .../TestCodegenProxyCreator.java              |  11 +-
 .../corba/dynamicrmiiiop/TestTransport.java   |  12 +-
 .../testclasses/DMMImplTestClasses.java       |   1 -
 .../testclasses/TieTestImpl.java              |  12 +-
 .../classes/corba/enuminterop/Client.java     |   6 +-
 .../classes/corba/enuminterop/EnumTest.java   |   1 +
 .../classes/corba/enuminterop/Server.java     |  17 +--
 .../share/classes/corba/example/Client.java   |   6 +-
 .../share/classes/corba/example/Example.java  |   6 +-
 .../share/classes/corba/example/Server.java   |   2 +-
 .../CSIv2SSLTaggedComponentHandlerImpl.java   |  17 ++-
 test/src/share/classes/corba/folb/Client.java |   2 +-
 .../share/classes/corba/folb/ClientBase.java  |  20 ++-
 .../classes/corba/folb/ClientCircular.java    |   8 +-
 .../share/classes/corba/folb/ClientMulti.java |  14 +-
 .../classes/corba/folb/ClientWaitTimeout.java |  17 +--
 test/src/share/classes/corba/folb/Common.java |   3 -
 .../share/classes/corba/folb/EchoTest.java    |   2 -
 .../classes/corba/folb/EchoTestServant.java   |   8 +-
 .../share/classes/corba/folb/FolbTest.java    |   5 -
 .../corba/folb/GroupInfoServiceImpl.java      |  13 +-
 .../corba/folb/GroupInfoServiceTest.java      |   2 -
 .../folb/GroupInfoServiceTestServant.java     |  15 +-
 test/src/share/classes/corba/folb/Server.java |  26 ++--
 .../share/classes/corba/fragment/Client.java  |  11 +-
 .../classes/corba/fragment/FragmentTest.java  |   9 +-
 .../corba/fragment/FragmentTester.java        |   1 -
 .../corba/fragment/FragmentTesterImpl.java    |   1 +
 .../share/classes/corba/fragment/Server.java  |  15 +-
 .../share/classes/corba/fragment2/Client.java |  12 +-
 .../classes/corba/fragment2/FragmentTest.java |   9 +-
 .../corba/fragment2/FragmentTester.java       |   1 -
 .../corba/fragment2/FragmentTesterImpl.java   |   1 +
 .../share/classes/corba/fragment2/Server.java |  12 +-
 .../share/classes/corba/giopgen/Client.java   |   8 +-
 .../share/classes/corba/giopgen/Common.java   |   7 +-
 .../classes/corba/giopgen/GIOPGenTest.java    |   5 -
 .../share/classes/corba/giopgen/Server.java   |   4 +-
 .../src/share/classes/corba/giopgen/Test.java |   1 -
 .../classes/corba/giopgen/TestServant.java    |   9 +-
 test/src/share/classes/corba/ior/Client.java  | 136 ++++++++----------
 .../src/share/classes/corba/ior/IORTests.java |   7 +-
 test/src/share/classes/corba/lb/Client.java   |   9 +-
 test/src/share/classes/corba/lb/Common.java   |   7 +-
 test/src/share/classes/corba/lb/LB.java       |  10 +-
 test/src/share/classes/corba/lb/LBTest.java   |  10 +-
 test/src/share/classes/corba/lb/Server.java   |  18 ++-
 .../share/classes/corba/lb/TestServant.java   |   1 +
 test/src/share/classes/corba/lbq/Common.java  |  40 +++---
 test/src/share/classes/corba/lbq/Server.java  |  15 +-
 .../share/classes/corba/lbq/TestServant.java  |   1 +
 .../corba/legacyorbclasses/Client.java        |  10 +-
 .../LegacyORBClassesTest.java                 |   2 +-
 .../classes/corba/messagetrace/Client.java    |  55 +++----
 .../corba/messagetrace/MessageTraceTest.java  |   8 +-
 test/src/share/classes/corba/misc/Buck.java   |   2 +-
 test/src/share/classes/corba/misc/Client.java |  49 ++++---
 .../share/classes/corba/misc/MiscTest.java    |   5 +-
 .../share/classes/corba/mixedorb/Client.java  |  25 ++--
 .../classes/corba/mixedorb/EchoImpl.java      |   2 +-
 .../classes/corba/mixedorb/MixedOrbTest.java  |   6 +-
 .../share/classes/corba/msgtypes/Client.java  |  52 +++----
 .../corba/msgtypes/FragmentTesterImpl.java    |   1 +
 .../classes/corba/msgtypes/MsgTypesTest.java  |   2 +
 .../share/classes/corba/msgtypes/Server.java  |   9 +-
 .../share/classes/corba/nortel/Client.java    |  29 ++--
 test/src/share/classes/corba/nortel/Echo.java |   1 -
 .../share/classes/corba/nortel/EchoImpl.java  |   7 +-
 .../corba/nortel/NortelSocketFactory.java     |   3 -
 test/src/share/classes/corba/nortel/Test.java |   4 +-
 .../share/classes/corba/orbconfig/Client.java |  27 ++--
 .../corba/orbconfig/MyConfigurator.java       |   2 +-
 .../classes/corba/orbconfig/NewORBTests.java  |   4 +-
 .../classes/corba/orbconfig/TestSession.java  |   2 +-
 .../ORBConfigAppServTest.java                 |   4 +-
 .../orbconfigappserv/ORBInitializerImpl.java  |   3 -
 .../corba/orbconfigappserv/ORBManager.java    |  12 +-
 .../orbconfigappserv/SocketFactoryImpl.java   |  14 +-
 .../UserORBConfiguratorImpl.java              |   5 +-
 .../classes/corba/ortremote/ORTEcho.java      |   3 +-
 .../classes/corba/ortremote/ORTEchoImpl.java  |  10 +-
 .../corba/ortremote/ORTRemoteTest.java        |   8 +-
 .../share/classes/corba/ortremote/Test.java   |  21 +--
 .../classes/corba/ortremote/TestSession.java  |   1 +
 .../corba/preinvokepostinvoke/Server.java     |  11 +-
 .../resolve_deadlock/ResolveDeadlock.java     |   5 +-
 .../resolve_deadlock/ResolveDeadlockTest.java |   6 +-
 .../classes/corba/retryplugin/Client.java     |   8 +-
 .../classes/corba/retryplugin/Common.java     |   7 +-
 .../corba/retryplugin/RetryPluginTest.java    |   5 -
 .../classes/corba/retryplugin/Server.java     |   7 +-
 .../corba/retryplugin/TestServant.java        |   1 +
 .../share/classes/corba/rfm/TestClient.java   |  39 ++---
 test/src/share/classes/corba/rfm/TestRFM.java |   5 +-
 .../share/classes/corba/rmic/RmicTest.java    |   4 +-
 .../corba/rmipoacounter/counterServer.java    |  11 +-
 .../share/classes/corba/security/Client.java  |  15 +-
 .../corba/security/PermissionTest.java        |   5 +-
 .../serialization/good/GoodRepIdTest.java     |   4 +-
 .../corba/serialization/good/ShowRepid.java   |   5 +-
 .../corba/serialization/proxy/Client.java     |   6 +-
 .../proxy/FrobnicatorProvider.java            |   2 +-
 .../proxy/FrobnicatorProviderBean.java        |   3 +-
 .../corba/serialization/proxy/Handler.java    |   4 +-
 .../proxy/NoSecurityManager.java              |   4 +-
 .../proxy/ProxySerializationTest.java         |   6 +-
 .../corba/serialization/proxy/Server.java     |   5 +-
 .../ClassWithZeroLengthStrings.java           |   5 +-
 .../zerolengthstring/MainTest.java            |   4 +-
 .../ZeroLengthStringTest.java                 |   3 +-
 .../share/classes/corba/shutdown/Example.java |   6 +-
 .../classes/corba/shutdown/TestImpl.java      |   1 +
 .../classes/corba/simpledynamic/Client.java   |  25 ++--
 .../classes/corba/simpledynamic/Echo.java     |   6 +-
 .../classes/corba/simpledynamic/EchoImpl.java |  16 +--
 .../corba/simpledynamic/Framework.java        |  23 ++-
 .../corba/simpledynamic/FrameworkClient.java  |  34 ++---
 .../simpledynamic/InterceptorTester.java      |  23 ++-
 .../corba/simpledynamic/NewAcceptor.java      |   3 +-
 .../simpledynamic/NewAcceptorClient.java      |  12 +-
 .../corba/simpledynamic/SimpleDynamic.java    |   3 +-
 .../src/share/classes/corba/strm2/Client.java |   6 +-
 .../src/share/classes/corba/strm2/Server.java |   5 +-
 .../share/classes/corba/strm2/Strm2Test.java  |  11 +-
 .../src/share/classes/corba/strm2/Tester.java |   4 +-
 .../share/classes/corba/strm2/TesterImpl.java |   7 +-
 .../corba/strm2/class1/TestObjectSuper.java   |   2 +-
 .../corba/strm2/class2/TestObject.java        |   1 -
 .../corba/strm2/class2/TestObjectSuper.java   |   3 +-
 .../corba/strm2/class3/TestObject.java        |   3 +-
 .../corba/strm2/class3/TestObjectSuper.java   |   5 +-
 .../corba/strm2/class4/TestObject.java        |   9 +-
 .../corba/strm2/class4/TestObjectSuper.java   |   7 +-
 .../corba/strm2/class5/TestObject.java        |   9 +-
 .../corba/strm2/class5/TestObjectSuper.java   |  10 +-
 .../corba/strm2/class6/TestObject.java        |   9 +-
 .../corba/strm2/class6/TestObjectSuper.java   |  10 +-
 .../strm2/class6/TestObjectSuperSub.java      |   2 -
 .../strm2/class6/TestObjectSuperSuper.java    |   2 +-
 .../corba/strm2/class7/TestObject.java        |   9 +-
 .../corba/strm2/class7/TestObjectSuper.java   |  10 +-
 .../strm2/class7/TestObjectSuperSub.java      |   5 +-
 .../strm2/class7/TestObjectSuperSuper.java    |   3 +-
 .../corba/stubserialization/Client.java       |  54 ++-----
 .../corba/stubserialization/HelloServant.java |   8 +-
 .../corba/stubserialization/Server.java       |  17 +--
 .../StubSerializationTest.java                |   6 +-
 test/src/share/classes/corba/tbbc/Sample.java |  26 +++-
 .../classes/corba/testngrunner/Client.java    |  12 +-
 .../classes/corba/testngrunner/Second.java    |  12 +-
 .../corba/testngrunner/TestngRunnerTest.java  |   3 -
 .../classes/corba/travelmuse/Client.java      |  11 +-
 .../corba/travelmuse/TravelMuseTest.java      |   5 +-
 .../share/classes/hopper/h4486041/Client.java |   3 +-
 .../hopper/h4486041/ORBInitErrorTest.java     |   7 +-
 .../classes/hopper/h4486041/TestORB.java      |  21 ++-
 .../classes/hopper/h4515953/Processor.java    |   4 +-
 .../hopper/h4515953/ProcessorImpl.java        |   4 +-
 .../hopper/h4515953/RMICIDLEntityTest.java    |   7 +-
 .../share/classes/hopper/h4549085/Client.java |   9 +-
 .../share/classes/hopper/h4549085/Server.java |   8 +-
 .../share/classes/hopper/h4620926/Client.java |  10 +-
 .../ConcurrentServantActivatorTest.java       |   6 +-
 .../share/classes/hopper/h4620926/Server.java |  19 ++-
 .../hopper/h4645953/ValidateIdlModules.java   |   4 +-
 .../share/classes/hopper/h4647746/Client.java |  29 +---
 .../hopper/h4647746/POAAppletTest.java        |   6 +-
 .../share/classes/hopper/h4655388/Client.java |  28 +---
 .../hopper/h4655388/POAHierarchyTest.java     |   6 +-
 .../classes/hopper/h4670827/INSServer.java    |  15 +-
 .../classes/hopper/h4670827/INSTest.java      |   8 +-
 .../classes/ibmspace/client/ActionSource.java |   5 +-
 .../share/classes/ibmspace/client/Arrow.java  |   4 +-
 .../classes/ibmspace/client/BarControl.java   |  15 +-
 .../classes/ibmspace/client/BarGroup.java     |  10 +-
 .../classes/ibmspace/client/GalaxyView.java   |  24 +++-
 .../ibmspace/client/GameSurrogate.java        |  18 ++-
 .../share/classes/ibmspace/client/GameUI.java |  25 +++-
 .../classes/ibmspace/client/JourneyArrow.java |   3 +-
 .../ibmspace/client/LabeledBarControl.java    |  15 +-
 .../ibmspace/client/PercentLayout.java        |   9 +-
 .../classes/ibmspace/client/PieControl.java   |  12 +-
 .../ibmspace/client/PlanetStatsView.java      |  11 +-
 .../classes/ibmspace/client/PlanetViewUI.java |  11 +-
 .../ibmspace/client/ResourceLevelsPanel.java  |   9 +-
 .../ibmspace/client/ShipListPanel.java        |  10 +-
 .../classes/ibmspace/client/SpaceFrame.java   |  17 ++-
 .../ibmspace/client/TechLevelsPanel.java      |   9 +-
 .../share/classes/ibmspace/server/Battle.java |   2 +-
 .../share/classes/ibmspace/server/Budget.java |   5 +-
 .../classes/ibmspace/server/FleetImpl.java    |   6 +-
 .../share/classes/ibmspace/server/Galaxy.java |   3 +-
 .../share/classes/ibmspace/server/Game.java   |   6 +-
 .../classes/ibmspace/server/GameViewImpl.java |  12 +-
 .../ibmspace/server/GameViewServer.java       |   8 +-
 .../classes/ibmspace/server/JourneyImpl.java  |   1 -
 .../classes/ibmspace/server/PlanetImpl.java   |   4 +-
 .../ibmspace/server/PlanetViewImpl.java       |   1 +
 .../share/classes/ibmspace/server/Player.java |   6 +-
 .../ibmspace/server/SpaceConquestServer.java  |  13 +-
 .../classes/javax/rmi/ClassLoadTest.java      |  12 +-
 test/src/share/classes/javax/rmi/DogImpl.java |   1 -
 .../share/classes/javax/rmi/DogServer.java    |   2 -
 test/src/share/classes/javax/rmi/PROImpl.java |   3 +-
 .../src/share/classes/javax/rmi/PROImpl2.java |   1 -
 test/src/share/classes/javax/rmi/PROTest.java |  35 ++---
 test/src/share/classes/javax/rmi/SInner.java  |   6 +-
 .../share/classes/javax/rmi/ServantInner.java |   7 +-
 .../share/classes/javax/rmi/fvd/LogImpl.java  |  10 +-
 .../classes/javax/rmi/fvd/ParentClass.java    |   2 -
 .../javax/rmi/fvd/SecurityManager.java        |   3 -
 .../classes/javax/rmi/fvd/TheClient.java      |  13 +-
 .../classes/javax/rmi/fvd/TheServer.java      |  12 +-
 .../share/classes/javax/rmi/fvd/TheTest.java  |  13 +-
 .../classes/javax/rmi/test1/TheServer.java    |  12 +-
 .../classes/javax/rmi/test1/TheTest.java      |  13 +-
 .../share/classes/naming/cosnaming/Test.java  |   3 +-
 .../naming/cosnaming/naming_client.java       |  14 +-
 .../share/classes/naming/instest/Client.java  |   1 +
 .../classes/naming/instest/HelloImpl.java     |   2 +
 .../classes/naming/instest/INSServer.java     |   6 +-
 .../share/classes/naming/instest/INSTest.java |   2 +
 .../naming/pcosnaming/PCOSNamingTest.java     |   9 +-
 .../naming/pcosnaming/helloClient.java        |  11 +-
 .../naming/pcosnaming/helloServer.java        |   8 +-
 .../naming/rinameservice/NameServer.java      |  10 +-
 .../rinameservice/NameServiceClient.java      |  14 +-
 .../rinameservice/RINameServiceTest.java      |   6 +-
 test/src/share/classes/omega/Constants.java   |   1 -
 .../simpleperf/SimplePerfTest.java            |   2 -
 .../performance/simpleperf/counterIF.java     |   3 -
 .../performance/simpleperf/counterImpl.java   |   5 +-
 .../performance/simpleperf/counterServer.java |  12 +-
 .../simpleperf2/SimplePerfTest.java           |   7 +-
 .../simpleperf2/counterClient.java            |   6 +-
 .../performance/simpleperf2/counterIF.java    |   3 -
 .../performance/simpleperf2/counterImpl.java  |   5 +-
 .../simpleperf2/counterServer.java            |  27 ++--
 .../classes/pi/policyfactory/Client.java      |   8 +-
 .../policyfactory/PolicyFactoryHundred.java   |   6 +-
 .../pi/policyfactory/PolicyFactoryTest.java   |   6 +-
 .../PolicyFactoryThousandPlus.java            |   6 +-
 .../pi/policyfactory/PolicyHundred.java       |   5 +-
 .../pi/policyfactory/PolicyTenThousand.java   |   5 +-
 .../pi/policyfactory/PolicyThousand.java      |   5 +-
 .../pi/policyfactory/TestORBInitializer.java  |   8 +-
 test/src/share/classes/test12/ARectangle.java |   7 +-
 .../classes/test12/SerializationTest.java     |   1 +
 tools/classcmp/ClassComparer.java             |  17 ++-
 720 files changed, 3351 insertions(+), 3921 deletions(-)

diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ProcessMonitorThread.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ProcessMonitorThread.java
index 3c1bf924ee..51088537b5 100644
--- a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ProcessMonitorThread.java
+++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ProcessMonitorThread.java
@@ -19,9 +19,11 @@
 
 package com.sun.corba.ee.impl.activation;
 
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import java.util.Iterator;
+import java.util.Map;
+
 /** ProcessMonitorThread is started when ServerManager is instantiated. The
   * thread wakes up every minute (This can be changed by setting sleepTime) and
   * makes sure that all the processes (Servers) registered with the ServerTool
diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java
index a6973c79fb..abc40535b4 100644
--- a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java
+++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerMain.java
@@ -19,17 +19,20 @@
 
 package com.sun.corba.ee.impl.activation;
 
+import com.sun.corba.ee.spi.activation.Activator;
+import com.sun.corba.ee.spi.activation.ActivatorHelper;
+import com.sun.corba.ee.spi.misc.ORBClassLoader;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.io.*;
 import java.util.Date;
 import java.util.Properties;
 
 import org.omg.CORBA.ORB;
-import com.sun.corba.ee.spi.activation.Activator;
-import com.sun.corba.ee.spi.activation.ActivatorHelper;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.misc.ORBClassLoader;
 
 /**
  * @version     1.8, 99/11/02
diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTool.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTool.java
index 494ce4c68a..661863eaa6 100644
--- a/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTool.java
+++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/activation/ServerTool.java
@@ -19,24 +19,38 @@
 
 package com.sun.corba.ee.impl.activation;
 
+import com.sun.corba.ee.impl.misc.CorbaResourceUtil;
+import com.sun.corba.ee.spi.activation.Activator;
+import com.sun.corba.ee.spi.activation.ActivatorHelper;
+import com.sun.corba.ee.spi.activation.BadServerDefinition;
+import com.sun.corba.ee.spi.activation.EndPointInfo;
+import com.sun.corba.ee.spi.activation.IIOP_CLEAR_TEXT;
+import com.sun.corba.ee.spi.activation.InvalidORBid;
+import com.sun.corba.ee.spi.activation.Locator;
+import com.sun.corba.ee.spi.activation.LocatorHelper;
+import com.sun.corba.ee.spi.activation.NoSuchEndPoint;
+import com.sun.corba.ee.spi.activation.ORBPortInfo;
+import com.sun.corba.ee.spi.activation.Repository;
+import com.sun.corba.ee.spi.activation.RepositoryHelper;
+import com.sun.corba.ee.spi.activation.ServerAlreadyActive;
+import com.sun.corba.ee.spi.activation.ServerAlreadyRegistered;
+import com.sun.corba.ee.spi.activation.ServerHeldDown;
+import com.sun.corba.ee.spi.activation.ServerNotActive;
+import com.sun.corba.ee.spi.activation.ServerNotRegistered;
+import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocation;
+import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocationPerORB;
+import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
 import org.omg.CORBA.ORB;
-import org.omg.CORBA.INITIALIZE;
-import org.omg.CORBA.CompletionStatus;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.CorbaResourceUtil;
-import com.sun.corba.ee.spi.activation.*;
-import com.sun.corba.ee.spi.activation.ServerHeldDown;
-import com.sun.corba.ee.spi.activation.RepositoryPackage.ServerDef;
-import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocation;
-import com.sun.corba.ee.spi.activation.LocatorPackage.ServerLocationPerORB;
 
 /**
  *
diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java
index 5a33bbb5ff..4f4a9454e5 100644
--- a/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java
+++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NameService.java
@@ -19,16 +19,19 @@
 
 package com.sun.corba.ee.impl.naming.pcosnaming;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
+
 import java.io.File;
 
 import org.omg.CORBA.Policy;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
-import org.omg.PortableServer.*;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.PortableServer.IdAssignmentPolicyValue;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 /**
  * @version     1.3, 00/04/06
diff --git a/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NamingContextImpl.java b/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NamingContextImpl.java
index 418bc081a8..dec54a20a8 100644
--- a/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NamingContextImpl.java
+++ b/functional-tests/src/test/java/com/sun/corba/ee/impl/naming/pcosnaming/NamingContextImpl.java
@@ -19,36 +19,39 @@
 
 package com.sun.corba.ee.impl.naming.pcosnaming;
 
-
-import org.omg.CORBA.Object;
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.Policy;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.LifespanPolicyValue;
-import org.omg.PortableServer.IdAssignmentPolicyValue;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
-
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-
+import com.sun.corba.ee.impl.naming.cosnaming.BindingIteratorImpl;
 import com.sun.corba.ee.impl.naming.cosnaming.NamingContextDataStore;
-import com.sun.corba.ee.impl.naming.cosnaming.NamingUtils;
-
 import com.sun.corba.ee.impl.naming.namingutil.INSURLHandler;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.logging.NamingSystemException;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.trace.Naming;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
-
 import java.io.Serializable;
 import java.util.Hashtable;
 
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.Object;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.SystemException;
+import org.omg.CosNaming.BindingIteratorHolder;
+import org.omg.CosNaming.BindingListHolder;
+import org.omg.CosNaming.BindingType;
+import org.omg.CosNaming.BindingTypeHolder;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextExtPOA;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
+import org.omg.CosNaming.NamingContextPackage.NotFoundReason;
+import org.omg.PortableServer.IdAssignmentPolicyValue;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
+
 /**
  * Class NamingContextImpl implements the org.omg.CosNaming::NamingContext and
  * NamingContextExt interface.
diff --git a/functional-tests/src/test/java/corba/Client.java b/functional-tests/src/test/java/corba/Client.java
index 22afa3dcea..6469e5b27e 100644
--- a/functional-tests/src/test/java/corba/Client.java
+++ b/functional-tests/src/test/java/corba/Client.java
@@ -27,12 +27,10 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+
 import corba.framework.Controller;
-import corba.framework.Options;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 public class Client
 {
diff --git a/functional-tests/src/test/java/corba/adapteractivator/AdapterActivator.java b/functional-tests/src/test/java/corba/adapteractivator/AdapterActivator.java
index 81d01d4f9d..7b7e5214ed 100644
--- a/functional-tests/src/test/java/corba/adapteractivator/AdapterActivator.java
+++ b/functional-tests/src/test/java/corba/adapteractivator/AdapterActivator.java
@@ -19,10 +19,9 @@
 
 package corba.adapteractivator;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
-import org.omg.CORBA.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 public class AdapterActivator extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/codeset/CodeSetTest.java b/functional-tests/src/test/java/corba/codeset/CodeSetTest.java
index 2ad7b8577c..4a77a73a9a 100644
--- a/functional-tests/src/test/java/corba/codeset/CodeSetTest.java
+++ b/functional-tests/src/test/java/corba/codeset/CodeSetTest.java
@@ -19,11 +19,13 @@
 
 package corba.codeset;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import org.omg.CORBA.*;
+
+import java.util.Properties;
+
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 /**
  * Simple tests in GIOP 1.1 and 1.2 of chars and wstrings.
diff --git a/functional-tests/src/test/java/corba/connectintercept_1_4/Common.java b/functional-tests/src/test/java/corba/connectintercept_1_4/Common.java
index 116dd9a497..6cbd2a1beb 100644
--- a/functional-tests/src/test/java/corba/connectintercept_1_4/Common.java
+++ b/functional-tests/src/test/java/corba/connectintercept_1_4/Common.java
@@ -24,13 +24,15 @@
 
 package corba.connectintercept_1_4;
 
+import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
+import com.sun.corba.ee.spi.legacy.interceptor.UnknownType;
+
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.INTERNAL;
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-
-import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
-import com.sun.corba.ee.spi.legacy.interceptor.UnknownType;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public abstract class Common
 {
diff --git a/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java b/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java
index 091b793876..b0ca11e0c6 100644
--- a/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java
+++ b/functional-tests/src/test/java/corba/connectintercept_1_4/MySocketFactory.java
@@ -24,26 +24,27 @@
 
 package corba.connectintercept_1_4;
 
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
+import com.sun.corba.ee.spi.legacy.connection.GetEndPointInfoAgainException;
+import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
+import com.sun.corba.ee.spi.transport.SocketInfo;
+
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
 import org.omg.CORBA.ORB;
 import org.omg.IOP.TaggedComponent;
 
-import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
-import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
-import com.sun.corba.ee.spi.legacy.connection.GetEndPointInfoAgainException;
-import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
-import com.sun.corba.ee.spi.transport.SocketInfo;
-
-import com.sun.corba.ee.impl.misc.ORBUtility;
-
 public class MySocketFactory
     implements
         ORBSocketFactory
diff --git a/functional-tests/src/test/java/corba/folb_8_1/Client.java b/functional-tests/src/test/java/corba/folb_8_1/Client.java
index abfe2a3ef4..922a39f4b6 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/Client.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/Client.java
@@ -24,20 +24,18 @@
 
 package corba.folb_8_1;
 
+import com.sun.corba.ee.spi.legacy.interceptor.RequestInfoExt;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.transport.Connection;
+import com.sun.corba.ee.spi.transport.SocketInfo;
+
 import java.util.Properties;
 
 import org.omg.CORBA.ORB;
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ClientRequestInfo;
-import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ORBInitInfo;
-
-import com.sun.corba.ee.spi.transport.Connection;
-
-import com.sun.corba.ee.spi.legacy.interceptor.RequestInfoExt;
-import com.sun.corba.ee.spi.transport.SocketInfo;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.PortableInterceptor.ORBInitializer;
 
 /**
  * @author Harold Carr
diff --git a/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java b/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java
index 04f4f902a9..8f32c37b3c 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/ClientForTiming.java
@@ -24,26 +24,19 @@
 
 package corba.folb_8_1;
 
-import java.io.File;
-import java.util.Properties;
-
-
-import com.sun.corba.ee.spi.transport.TransportManager;
-import com.sun.corba.ee.spi.transport.ContactInfo;
-
+import com.sun.corba.ee.impl.transport.ContactInfoListImpl;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.orb.ORB;
+//import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints;
+import com.sun.corba.ee.spi.protocol.ClientDelegate;
+import com.sun.corba.ee.spi.transport.ContactInfo;
 import com.sun.corba.ee.spi.transport.SocketInfo;
+import com.sun.corba.ee.spi.transport.TransportManager;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import java.io.File;
+import java.util.Properties;
 
-import com.sun.corba.ee.impl.transport.ContactInfoListImpl;
-//import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints;
-import com.sun.corba.ee.spi.protocol.ClientDelegate;
-import org.glassfish.pfl.tf.timer.spi.LogEventHandler;
 import org.glassfish.pfl.tf.timer.spi.Timer;
-import org.glassfish.pfl.tf.timer.spi.TimerEventController;
-import org.glassfish.pfl.tf.timer.spi.TimerFactory;
-import org.glassfish.pfl.tf.timer.spi.TimerManager;
 
 // import corba.framework.TimerUtils;
 
diff --git a/functional-tests/src/test/java/corba/folb_8_1/ColocatedCS.java b/functional-tests/src/test/java/corba/folb_8_1/ColocatedCS.java
index 554dff484c..a88c72bb39 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/ColocatedCS.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/ColocatedCS.java
@@ -25,6 +25,7 @@
 package corba.folb_8_1;
 
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 
 public class ColocatedCS
diff --git a/functional-tests/src/test/java/corba/folb_8_1/Common.java b/functional-tests/src/test/java/corba/folb_8_1/Common.java
index cdfd96802a..024e58d6da 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/Common.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/Common.java
@@ -24,23 +24,25 @@
 
 package corba.folb_8_1;
 
+import com.sun.corba.ee.spi.extension.ZeroPortPolicy;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
-import org.omg.PortableServer.LifespanPolicyValue;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.Servant;
-import org.omg.CosNaming.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.IOP.Codec;
 import org.omg.IOP.CodecFactory;
 import org.omg.IOP.CodecFactoryHelper;
-import org.omg.IOP.Encoding;
 import org.omg.IOP.ENCODING_CDR_ENCAPS;
-
-import com.sun.corba.ee.spi.extension.ZeroPortPolicy;
+import org.omg.IOP.Encoding;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
 
 /**
  * @author Harold Carr
diff --git a/functional-tests/src/test/java/corba/folb_8_1/FolbTest.java b/functional-tests/src/test/java/corba/folb_8_1/FolbTest.java
index 9977a26b56..7725be9b52 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/FolbTest.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/FolbTest.java
@@ -24,8 +24,8 @@
 
 package corba.folb_8_1;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * @author Harold Carr
diff --git a/functional-tests/src/test/java/corba/folb_8_1/IIOPPrimaryToContactInfoImpl.java b/functional-tests/src/test/java/corba/folb_8_1/IIOPPrimaryToContactInfoImpl.java
index 4e2f0af334..993716c036 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/IIOPPrimaryToContactInfoImpl.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/IIOPPrimaryToContactInfoImpl.java
@@ -26,23 +26,22 @@
 
 package corba.folb_8_1;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-import java.util.logging.Level;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.orb.ORB;
 
 //import com.sun.logging.LogDomains;
 
 // These are "ee" in the AS version:
 import com.sun.corba.ee.spi.transport.ContactInfo;
-import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.transport.ContactInfoList;
 import com.sun.corba.ee.spi.transport.IIOPPrimaryToContactInfo;
 import com.sun.corba.ee.spi.transport.SocketInfo;
-import com.sun.corba.ee.impl.misc.ORBUtility;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
 
 /**
  * This is the "sticky manager" - based on the 7.1 EE concept.
diff --git a/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java b/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java
index 85631a5b0a..ed5b7123c3 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/IORInterceptorImpl.java
@@ -24,23 +24,21 @@
 
 package corba.folb_8_1;
 
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
+import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt;
+import com.sun.corba.ee.spi.orb.ORB;
+
 import java.net.InetAddress;
 
 import org.omg.CORBA.Any;
 import org.omg.IOP.TaggedComponent;
-
 import org.omg.PortableInterceptor.IORInfo;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
-import org.omg.PortableInterceptor.ORBInitializer;
 import org.omg.PortableInterceptor.ORBInitInfo;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
-import com.sun.corba.ee.spi.legacy.interceptor.IORInfoExt;
-import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt;
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.impl.misc.ORBUtility;
-
 /**
  * @author Harold Carr
  */
diff --git a/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java b/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java
index 34596f0ee3..871690f430 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/IORToSocketInfoImpl.java
@@ -24,20 +24,19 @@
 
 package corba.folb_8_1;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.omg.CORBA.Any;
-
+import com.sun.corba.ee.impl.misc.ORBUtility;
 import com.sun.corba.ee.spi.ior.IOR;
 import com.sun.corba.ee.spi.ior.TaggedComponent;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
 import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
 import com.sun.corba.ee.spi.transport.IORToSocketInfo;
 import com.sun.corba.ee.spi.transport.SocketInfo;
 
-import com.sun.corba.ee.impl.misc.ORBUtility;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.omg.CORBA.Any;
 
 public class IORToSocketInfoImpl
     implements IORToSocketInfo
diff --git a/functional-tests/src/test/java/corba/folb_8_1/Server.java b/functional-tests/src/test/java/corba/folb_8_1/Server.java
index 016cc25bcc..b30d05940f 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/Server.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/Server.java
@@ -25,15 +25,15 @@
 package corba.folb_8_1;
 
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import corba.hcks.U;
+
 import java.util.Properties;
 
 import org.omg.CORBA.ORB;
 import org.omg.PortableServer.POA;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import corba.hcks.U;
-
 /**
  * @author Harold Carr
  */
diff --git a/functional-tests/src/test/java/corba/folb_8_1/SocketFactoryImpl.java b/functional-tests/src/test/java/corba/folb_8_1/SocketFactoryImpl.java
index 1f8df8143f..ad90550fe2 100644
--- a/functional-tests/src/test/java/corba/folb_8_1/SocketFactoryImpl.java
+++ b/functional-tests/src/test/java/corba/folb_8_1/SocketFactoryImpl.java
@@ -19,21 +19,19 @@
 
 package corba.folb_8_1;
 
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.transport.Acceptor;
+import com.sun.corba.ee.spi.transport.ORBSocketFactory;
+
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
-import java.net.ServerSocket;
-import java.nio.channels.SocketChannel;
 import java.nio.channels.ServerSocketChannel;
-
-import com.sun.corba.ee.spi.transport.Acceptor;
-
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.transport.ORBSocketFactory;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.ORBUtility;
+import java.nio.channels.SocketChannel;
 
 public class SocketFactoryImpl
     implements ORBSocketFactory
diff --git a/functional-tests/src/test/java/corba/framework/CORBATest.java b/functional-tests/src/test/java/corba/framework/CORBATest.java
index af6e7c2055..a2b1e8f26d 100644
--- a/functional-tests/src/test/java/corba/framework/CORBATest.java
+++ b/functional-tests/src/test/java/corba/framework/CORBATest.java
@@ -27,7 +27,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -39,7 +38,9 @@
 import java.util.Properties;
 import java.util.StringTokenizer;
 import java.util.Vector;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
+import org.omg.CORBA.Any;
 
 import test.RemoteTest;
 import test.ServantContext;
diff --git a/functional-tests/src/test/java/corba/framework/CORBAUtil.java b/functional-tests/src/test/java/corba/framework/CORBAUtil.java
index 434fdb6353..3d73dba4a8 100644
--- a/functional-tests/src/test/java/corba/framework/CORBAUtil.java
+++ b/functional-tests/src/test/java/corba/framework/CORBAUtil.java
@@ -19,9 +19,14 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.util.*;
-import test.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.LineNumberReader;
+import java.io.OutputStream;
+import java.util.Vector;
 
 /**
  * Collection of utility methods used by CORBATest and its helpers.
diff --git a/functional-tests/src/test/java/corba/framework/Compiler.java b/functional-tests/src/test/java/corba/framework/Compiler.java
index 48ded212bf..65057d5540 100644
--- a/functional-tests/src/test/java/corba/framework/Compiler.java
+++ b/functional-tests/src/test/java/corba/framework/Compiler.java
@@ -19,8 +19,8 @@
 
 package corba.framework;
 
-import java.util.Vector;
 import java.util.Properties;
+import java.util.Vector;
 
 /**
  * Abstraction of a compiler, used to implement IDLJ, RMIC, and Javac
diff --git a/functional-tests/src/test/java/corba/framework/Controller.java b/functional-tests/src/test/java/corba/framework/Controller.java
index 2310c6e9e2..33167bc742 100644
--- a/functional-tests/src/test/java/corba/framework/Controller.java
+++ b/functional-tests/src/test/java/corba/framework/Controller.java
@@ -20,8 +20,8 @@
 package corba.framework;
 
 import java.io.OutputStream;
-import java.util.Properties;
 import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Defines the interface for interacting with a process.  This is
diff --git a/functional-tests/src/test/java/corba/framework/ControllerAdapter.java b/functional-tests/src/test/java/corba/framework/ControllerAdapter.java
index 49d688fa7d..c4d758e333 100644
--- a/functional-tests/src/test/java/corba/framework/ControllerAdapter.java
+++ b/functional-tests/src/test/java/corba/framework/ControllerAdapter.java
@@ -19,9 +19,9 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.util.*;
-import test.*;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Adapter class providing some convenient default implementations for
diff --git a/functional-tests/src/test/java/corba/framework/DebugExec.java b/functional-tests/src/test/java/corba/framework/DebugExec.java
index 7d878c0035..a0de35e9b7 100644
--- a/functional-tests/src/test/java/corba/framework/DebugExec.java
+++ b/functional-tests/src/test/java/corba/framework/DebugExec.java
@@ -20,9 +20,11 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.util.*;
-import test.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 
 /**
  * Debugging execution strategy.
diff --git a/functional-tests/src/test/java/corba/framework/ExternalExec.java b/functional-tests/src/test/java/corba/framework/ExternalExec.java
index fc68d27a16..bc9b1d1571 100644
--- a/functional-tests/src/test/java/corba/framework/ExternalExec.java
+++ b/functional-tests/src/test/java/corba/framework/ExternalExec.java
@@ -23,7 +23,6 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
diff --git a/functional-tests/src/test/java/corba/framework/FileOutputDecorator.java b/functional-tests/src/test/java/corba/framework/FileOutputDecorator.java
index 890bfb16f5..77c00dd422 100644
--- a/functional-tests/src/test/java/corba/framework/FileOutputDecorator.java
+++ b/functional-tests/src/test/java/corba/framework/FileOutputDecorator.java
@@ -19,8 +19,10 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Decorator around a Controller, allowing the user to simply specify
diff --git a/functional-tests/src/test/java/corba/framework/IDLCompiler.java b/functional-tests/src/test/java/corba/framework/IDLCompiler.java
index 167c4e9e6a..30689f830b 100644
--- a/functional-tests/src/test/java/corba/framework/IDLCompiler.java
+++ b/functional-tests/src/test/java/corba/framework/IDLCompiler.java
@@ -19,8 +19,8 @@
 
 package corba.framework;
 
-import java.util.Vector;
 import java.io.File;
+import java.util.Vector;
 
 /**
  * Wrapper around calling a real IDL compiler.
diff --git a/functional-tests/src/test/java/corba/framework/InternalExec.java b/functional-tests/src/test/java/corba/framework/InternalExec.java
index f2ce79e9a7..6f6b6e2ff2 100644
--- a/functional-tests/src/test/java/corba/framework/InternalExec.java
+++ b/functional-tests/src/test/java/corba/framework/InternalExec.java
@@ -19,7 +19,7 @@
 
 package corba.framework;
 
-import java.io.*;
+import java.io.PrintStream;
 
 /**
  * Runs the class in the current process.  This assumes the class implements
diff --git a/functional-tests/src/test/java/corba/framework/InternalProcess.java b/functional-tests/src/test/java/corba/framework/InternalProcess.java
index 7c1a76125c..5dddb18031 100644
--- a/functional-tests/src/test/java/corba/framework/InternalProcess.java
+++ b/functional-tests/src/test/java/corba/framework/InternalProcess.java
@@ -20,8 +20,8 @@
 package corba.framework;
 
 import java.io.PrintStream;
-import java.util.Properties;
 import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Interface representing a process which is run in the same
diff --git a/functional-tests/src/test/java/corba/framework/JavaCompiler.java b/functional-tests/src/test/java/corba/framework/JavaCompiler.java
index 768a2a8555..6dcb6f988c 100644
--- a/functional-tests/src/test/java/corba/framework/JavaCompiler.java
+++ b/functional-tests/src/test/java/corba/framework/JavaCompiler.java
@@ -19,8 +19,8 @@
 
 package corba.framework;
 
-import java.util.Vector;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 /**
  * Wrapper around calling javac.
diff --git a/functional-tests/src/test/java/corba/framework/Loader.java b/functional-tests/src/test/java/corba/framework/Loader.java
index c73d212962..07155c5bfb 100644
--- a/functional-tests/src/test/java/corba/framework/Loader.java
+++ b/functional-tests/src/test/java/corba/framework/Loader.java
@@ -19,8 +19,11 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Vector;
 
 /**
  * Allows extra paths to be specified when searching for classes.  This
diff --git a/functional-tests/src/test/java/corba/framework/MethodEvent.java b/functional-tests/src/test/java/corba/framework/MethodEvent.java
index 1ef9f2ef2a..b12d3e4908 100644
--- a/functional-tests/src/test/java/corba/framework/MethodEvent.java
+++ b/functional-tests/src/test/java/corba/framework/MethodEvent.java
@@ -20,7 +20,6 @@
 package corba.framework ;
 
 import java.lang.reflect.Method;
-import java.util.EventObject;
 
 /** An event representing entering or exiting a particular method
  * on a particular thread, as recorded by an interceptor with a
diff --git a/functional-tests/src/test/java/corba/framework/ODebugExec.java b/functional-tests/src/test/java/corba/framework/ODebugExec.java
index 268099591a..40224c3f6d 100644
--- a/functional-tests/src/test/java/corba/framework/ODebugExec.java
+++ b/functional-tests/src/test/java/corba/framework/ODebugExec.java
@@ -19,9 +19,9 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.util.*;
-import test.*;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Runs the class in a separate process using the JPDA options so that it can be
diff --git a/functional-tests/src/test/java/corba/framework/Options.java b/functional-tests/src/test/java/corba/framework/Options.java
index e89258f604..e65e67884c 100644
--- a/functional-tests/src/test/java/corba/framework/Options.java
+++ b/functional-tests/src/test/java/corba/framework/Options.java
@@ -20,9 +20,8 @@
 
 package corba.framework;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.JndiConstants;
-import test.Util;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,6 +30,8 @@
 import java.util.StringTokenizer;
 import java.util.Vector;
 
+import test.Util;
+
 /** Static library class to provide access to test configuration data.
  * This thing need to be further re-written to a class that is instantiated,
  * instead of the current static approach.  It should set up the defaults from
diff --git a/functional-tests/src/test/java/corba/framework/Port.java b/functional-tests/src/test/java/corba/framework/Port.java
index 9ef11ad59a..473787ce07 100644
--- a/functional-tests/src/test/java/corba/framework/Port.java
+++ b/functional-tests/src/test/java/corba/framework/Port.java
@@ -19,8 +19,8 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.net.ServerSocket;
 
 /**
  * Simple port abstraction with the capability of
diff --git a/functional-tests/src/test/java/corba/framework/Post.java b/functional-tests/src/test/java/corba/framework/Post.java
index f5dd72f556..33dc1ddc41 100644
--- a/functional-tests/src/test/java/corba/framework/Post.java
+++ b/functional-tests/src/test/java/corba/framework/Post.java
@@ -19,11 +19,11 @@
 
 package corba.framework ;
 
-import java.lang.annotation.Target;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /** Used to mark methods that are executed after every test case
  *
diff --git a/functional-tests/src/test/java/corba/framework/Pre.java b/functional-tests/src/test/java/corba/framework/Pre.java
index 0f1cacedee..80d051b167 100644
--- a/functional-tests/src/test/java/corba/framework/Pre.java
+++ b/functional-tests/src/test/java/corba/framework/Pre.java
@@ -19,11 +19,11 @@
 
 package corba.framework ;
 
-import java.lang.annotation.Target;
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /** Used to mark methods executed before each test case.
  *
diff --git a/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java b/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java
index 9123ca18db..ee46b886aa 100644
--- a/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java
+++ b/functional-tests/src/test/java/corba/framework/ProxyInterceptor.java
@@ -19,16 +19,13 @@
 
 package corba.framework ;
 
-import java.util.Iterator;
-import java.util.Set;
-import java.util.HashSet;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
-
-import corba.framework.MethodEvent;
-import corba.framework.MethodEventListener;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
 /** Create an interceptor that reports method entry and exit for a
  * certain set of methods.  Method entry and exit is reported as
diff --git a/functional-tests/src/test/java/corba/framework/RDebugExec.java b/functional-tests/src/test/java/corba/framework/RDebugExec.java
index d74823275e..1e705ca1b7 100644
--- a/functional-tests/src/test/java/corba/framework/RDebugExec.java
+++ b/functional-tests/src/test/java/corba/framework/RDebugExec.java
@@ -19,9 +19,9 @@
 
 package corba.framework;
 
-import java.io.*;
-import java.util.*;
-import test.*;
+import java.io.OutputStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Runs the class in a separate process using the JPDA options so that it can be
diff --git a/functional-tests/src/test/java/corba/framework/ResolveNS.java b/functional-tests/src/test/java/corba/framework/ResolveNS.java
index 7e4d139492..f5ec6435b8 100644
--- a/functional-tests/src/test/java/corba/framework/ResolveNS.java
+++ b/functional-tests/src/test/java/corba/framework/ResolveNS.java
@@ -20,7 +20,6 @@
 package corba.framework;
 
 import org.omg.CORBA.ORB;
-import org.omg.CORBA.Object;
 import org.omg.CORBA.ORBPackage.InvalidName;
 
 public class ResolveNS {
diff --git a/functional-tests/src/test/java/corba/framework/TestngRunner.java b/functional-tests/src/test/java/corba/framework/TestngRunner.java
index 6761c24705..7e6c73303f 100644
--- a/functional-tests/src/test/java/corba/framework/TestngRunner.java
+++ b/functional-tests/src/test/java/corba/framework/TestngRunner.java
@@ -20,15 +20,14 @@
 package corba.framework ;
 
 import java.io.File;
-
-import java.util.Set;
 import java.util.HashSet;
-import org.glassfish.pfl.test.JUnitReportHelper;
+import java.util.Set;
 
-import org.testng.TestNG;
-import org.testng.ITestResult;
-import org.testng.ITestListener;
+import org.glassfish.pfl.test.JUnitReportHelper;
 import org.testng.ITestContext;
+import org.testng.ITestListener;
+import org.testng.ITestResult;
+import org.testng.TestNG;
 
 /** Used to set up an appropriate instance of TestNG for running a test.
  * Used inside the CORBA test framework in order to generate useful reports
diff --git a/functional-tests/src/test/java/corba/framework/ThreadExec.java b/functional-tests/src/test/java/corba/framework/ThreadExec.java
index a21fba1641..97bf7d5971 100644
--- a/functional-tests/src/test/java/corba/framework/ThreadExec.java
+++ b/functional-tests/src/test/java/corba/framework/ThreadExec.java
@@ -19,7 +19,7 @@
 
 package corba.framework;
 
-import java.io.*;
+import java.io.PrintStream;
 
 /**
  * Runs the class in a separate thread.  Currently, the class must extend the
diff --git a/functional-tests/src/test/java/corba/framework/ThreadProcess.java b/functional-tests/src/test/java/corba/framework/ThreadProcess.java
index ff67e02016..eda5cf6df9 100644
--- a/functional-tests/src/test/java/corba/framework/ThreadProcess.java
+++ b/functional-tests/src/test/java/corba/framework/ThreadProcess.java
@@ -20,8 +20,8 @@
 package corba.framework;
 
 import java.io.PrintStream;
-import java.util.Properties;
 import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Class representing a process which will run a separate thread but
diff --git a/functional-tests/src/test/java/corba/framework/TimedTest.java b/functional-tests/src/test/java/corba/framework/TimedTest.java
index d1b5562b22..e3794269e2 100644
--- a/functional-tests/src/test/java/corba/framework/TimedTest.java
+++ b/functional-tests/src/test/java/corba/framework/TimedTest.java
@@ -20,8 +20,8 @@
 package corba.framework ;
 
 import junit.extensions.RepeatedTest;
-import junit.framework.TestResult;
 import junit.framework.Test;
+import junit.framework.TestResult;
 
 public class TimedTest extends RepeatedTest
 {
diff --git a/functional-tests/src/test/java/corba/framework/TraceAccumulator.java b/functional-tests/src/test/java/corba/framework/TraceAccumulator.java
index 2ab6c92ea8..2fac17a661 100644
--- a/functional-tests/src/test/java/corba/framework/TraceAccumulator.java
+++ b/functional-tests/src/test/java/corba/framework/TraceAccumulator.java
@@ -19,9 +19,9 @@
 
 package corba.framework ;
 
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
 
 public class TraceAccumulator implements MethodEventListener
 {
diff --git a/functional-tests/src/test/java/corba/framework/TraceElement.java b/functional-tests/src/test/java/corba/framework/TraceElement.java
index dd4e665a80..c6c3f9bbbe 100644
--- a/functional-tests/src/test/java/corba/framework/TraceElement.java
+++ b/functional-tests/src/test/java/corba/framework/TraceElement.java
@@ -19,8 +19,6 @@
 
 package corba.framework ;
 
-import java.lang.reflect.Method;
-
 public class TraceElement
 {
     private boolean isEnter ;
diff --git a/functional-tests/src/test/java/corba/framework/statusU.java b/functional-tests/src/test/java/corba/framework/statusU.java
index e86725606a..5b2abd3017 100644
--- a/functional-tests/src/test/java/corba/framework/statusU.java
+++ b/functional-tests/src/test/java/corba/framework/statusU.java
@@ -20,12 +20,10 @@
 
 package corba.framework;
 
+import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Set;
 import java.util.TreeMap;
-import java.util.Iterator;
-import java.util.Hashtable;
-
-import java.util.StringTokenizer;
 
 public class statusU {
 
diff --git a/functional-tests/src/test/java/corba/fwddecl/Client.java b/functional-tests/src/test/java/corba/fwddecl/Client.java
index 7ddc02e091..71e4170f86 100644
--- a/functional-tests/src/test/java/corba/fwddecl/Client.java
+++ b/functional-tests/src/test/java/corba/fwddecl/Client.java
@@ -19,23 +19,21 @@
 
 package corba.fwddecl;
 
-import org.omg.CORBA.Any;
-import org.omg.CORBA_2_3.portable.OutputStream;
-import org.omg.CORBA_2_3.portable.InputStream;
-
-import java.util.Properties;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
 import com.sun.corba.ee.impl.encoding.CDRInputObject;
 import com.sun.corba.ee.impl.encoding.CDROutputObject;
 import com.sun.corba.ee.impl.encoding.EncapsInputStream;
 import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
-
-import org.testng.annotations.Test;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import corba.framework.TestngRunner;
+
+import java.util.Properties;
+
 import org.glassfish.pfl.test.ObjectUtility;
+import org.omg.CORBA.Any;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
+import org.testng.annotations.Test;
 
 public class Client
 {
diff --git a/functional-tests/src/test/java/corba/fwddecl/ForwardDeclTest.java b/functional-tests/src/test/java/corba/fwddecl/ForwardDeclTest.java
index 9a426a4f93..8149ed12c0 100644
--- a/functional-tests/src/test/java/corba/fwddecl/ForwardDeclTest.java
+++ b/functional-tests/src/test/java/corba/fwddecl/ForwardDeclTest.java
@@ -19,9 +19,8 @@
 
 package corba.fwddecl;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 
 /**
@@ -33,6 +32,7 @@ public class ForwardDeclTest extends CORBATest
 {
     // This is the main method defining the test.  All tests
     // should have this.
+    @Override
     protected void doTest() throws Throwable
     {
         // Create client controller using the given
diff --git a/functional-tests/src/test/java/corba/giopheaderpadding/Client.java b/functional-tests/src/test/java/corba/giopheaderpadding/Client.java
index 6f147416c7..ea6075cc94 100644
--- a/functional-tests/src/test/java/corba/giopheaderpadding/Client.java
+++ b/functional-tests/src/test/java/corba/giopheaderpadding/Client.java
@@ -24,17 +24,22 @@
 
 package corba.giopheaderpadding;
 
-import javax.naming.InitialContext;
-import org.omg.CORBA.ORB;
+import com.sun.corba.ee.impl.protocol.MessageMediatorImpl;
 
 import corba.framework.Controller;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.impl.protocol.MessageMediatorImpl;
+import java.lang.reflect.Field;
 
-import java.lang.reflect.*;
-import org.omg.PortableInterceptor.*;
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.ORB;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ORBInitInfo;
+import org.omg.PortableInterceptor.ORBInitializer;
 
 public class Client extends org.omg.CORBA.LocalObject
     implements ORBInitializer, ClientRequestInterceptor {
diff --git a/functional-tests/src/test/java/corba/giopheaderpadding/ColocatedClientServer.java b/functional-tests/src/test/java/corba/giopheaderpadding/ColocatedClientServer.java
index 6be9516c17..75d7b45831 100644
--- a/functional-tests/src/test/java/corba/giopheaderpadding/ColocatedClientServer.java
+++ b/functional-tests/src/test/java/corba/giopheaderpadding/ColocatedClientServer.java
@@ -24,11 +24,14 @@
 
 package corba.giopheaderpadding;
 
+import corba.hcks.C;
+import corba.hcks.U;
+
 import java.util.Properties;
+
 import javax.naming.InitialContext;
+
 import org.omg.CORBA.ORB;
-import corba.hcks.C;
-import corba.hcks.U;
 
 public class ColocatedClientServer
 {
diff --git a/functional-tests/src/test/java/corba/giopheaderpadding/GIOPHeaderPaddingTest.java b/functional-tests/src/test/java/corba/giopheaderpadding/GIOPHeaderPaddingTest.java
index 4abe437247..6d4bca0fe5 100644
--- a/functional-tests/src/test/java/corba/giopheaderpadding/GIOPHeaderPaddingTest.java
+++ b/functional-tests/src/test/java/corba/giopheaderpadding/GIOPHeaderPaddingTest.java
@@ -24,16 +24,14 @@
 
 package corba.giopheaderpadding;
 
-import corba.framework.Controller;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 import java.util.Properties;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.orb.ORB;
-
-import corba.framework.*;
-
 public class GIOPHeaderPaddingTest extends CORBATest {
 
     public static final String thisPackage =
diff --git a/functional-tests/src/test/java/corba/giopheaderpadding/ServantLocator.java b/functional-tests/src/test/java/corba/giopheaderpadding/ServantLocator.java
index eeb0675b35..e6c238515a 100644
--- a/functional-tests/src/test/java/corba/giopheaderpadding/ServantLocator.java
+++ b/functional-tests/src/test/java/corba/giopheaderpadding/ServantLocator.java
@@ -24,15 +24,13 @@
 
 package corba.giopheaderpadding;
 
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.OBJECT_NOT_EXIST;
+import corba.hcks.U;
+
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import corba.hcks.U;
-
 public class ServantLocator extends org.omg.CORBA.LocalObject
     implements org.omg.PortableServer.ServantLocator {
 
diff --git a/functional-tests/src/test/java/corba/giopheaderpadding/Server.java b/functional-tests/src/test/java/corba/giopheaderpadding/Server.java
index 87253becdc..e4e3df6ca7 100644
--- a/functional-tests/src/test/java/corba/giopheaderpadding/Server.java
+++ b/functional-tests/src/test/java/corba/giopheaderpadding/Server.java
@@ -24,23 +24,27 @@
 
 package corba.giopheaderpadding;
 
-import javax.naming.InitialContext;
-
-import org.omg.CORBA.Policy;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
+import com.sun.corba.ee.impl.protocol.MessageMediatorImpl;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.transport.TransportManager;
 
 import corba.framework.Controller;
 import corba.framework.Options;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.spi.transport.TransportManager;
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.impl.protocol.MessageMediatorImpl;
+import java.lang.reflect.Field;
+
+import javax.naming.InitialContext;
 
-import java.lang.reflect.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.CORBA.Policy;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ORBInitInfo;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ServerRequestInfo;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 public class Server extends org.omg.CORBA.LocalObject
     implements ORBInitializer, ServerRequestInterceptor {
diff --git a/functional-tests/src/test/java/corba/giopheaderpadding/rmiiIServantPOA.java b/functional-tests/src/test/java/corba/giopheaderpadding/rmiiIServantPOA.java
index bcb07fa858..cc36cec91a 100644
--- a/functional-tests/src/test/java/corba/giopheaderpadding/rmiiIServantPOA.java
+++ b/functional-tests/src/test/java/corba/giopheaderpadding/rmiiIServantPOA.java
@@ -24,9 +24,11 @@
 
 package corba.giopheaderpadding;
 
+import corba.hcks.U;
+
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
-import corba.hcks.U;
 
 public class rmiiIServantPOA extends PortableRemoteObject
     implements rmiiI {
diff --git a/functional-tests/src/test/java/corba/hcks/C.java b/functional-tests/src/test/java/corba/hcks/C.java
index 0c8273c51c..6c18ea97ac 100644
--- a/functional-tests/src/test/java/corba/hcks/C.java
+++ b/functional-tests/src/test/java/corba/hcks/C.java
@@ -24,24 +24,23 @@
 
 package corba.hcks;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
 import org.omg.CORBA.Any;
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.IMP_LIMIT;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.UNKNOWN;
-
 import org.omg.CORBA.portable.UnknownException;
-
 import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.CurrentHelper;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.Hashtable;
-import java.util.Properties;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
 public class C
 {
     // Custom classes.
diff --git a/functional-tests/src/test/java/corba/hcks/Client.java b/functional-tests/src/test/java/corba/hcks/Client.java
index ba12c11be8..22fd1ff13f 100644
--- a/functional-tests/src/test/java/corba/hcks/Client.java
+++ b/functional-tests/src/test/java/corba/hcks/Client.java
@@ -28,25 +28,12 @@
 
 package corba.hcks;
 
-import java.rmi.MarshalException;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+import com.sun.corba.ee.spi.presentation.rmi.StubWrapper;
 
 import corba.framework.Controller;
 
-//
-// IDL imports.
-//
-
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.MARSHAL;
-import org.omg.CORBA.NO_IMPLEMENT;
-import org.omg.CORBA.OBJECT_NOT_EXIST;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.PERSIST_STORE;
-import org.omg.CORBA.SystemException;
-import org.omg.DynamicAny.DynAny;
-import org.omg.DynamicAny.DynAnyFactory;
-import org.omg.DynamicAny.DynAnyFactoryHelper;
-
+import java.rmi.MarshalException;
 
 //
 // RMI-IIOP imports.
@@ -63,21 +50,32 @@
 //
 
 import org.omg.CORBA.Any;
+
+//
+// IDL imports.
+//
+
+import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.IMP_LIMIT;
+import org.omg.CORBA.MARSHAL;
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.omg.CORBA.OBJ_ADAPTER;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.PERSIST_STORE;
+import org.omg.CORBA.SystemException;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
+import org.omg.DynamicAny.DynAny;
+import org.omg.DynamicAny.DynAnyFactory;
+import org.omg.DynamicAny.DynAnyFactoryHelper;
 import org.omg.IOP.Codec;
 import org.omg.IOP.CodecFactory;
 import org.omg.IOP.CodecFactoryHelper;
 import org.omg.IOP.Encoding;
+import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.ForwardRequestHelper;
-import org.omg.PortableInterceptor.Current;
-
-
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
-import com.sun.corba.ee.spi.presentation.rmi.StubWrapper;
 
 
 //
diff --git a/functional-tests/src/test/java/corba/hcks/ColocatedClientServer.java b/functional-tests/src/test/java/corba/hcks/ColocatedClientServer.java
index bc5c2f5d3f..f3afd2f04a 100644
--- a/functional-tests/src/test/java/corba/hcks/ColocatedClientServer.java
+++ b/functional-tests/src/test/java/corba/hcks/ColocatedClientServer.java
@@ -25,6 +25,7 @@
 package corba.hcks;
 
 import javax.naming.InitialContext;
+
 import org.omg.CORBA.ORB;
 
 public class ColocatedClientServer
diff --git a/functional-tests/src/test/java/corba/hcks/ErrorAccumulator.java b/functional-tests/src/test/java/corba/hcks/ErrorAccumulator.java
index 3a02030cbd..0190f0e558 100644
--- a/functional-tests/src/test/java/corba/hcks/ErrorAccumulator.java
+++ b/functional-tests/src/test/java/corba/hcks/ErrorAccumulator.java
@@ -24,10 +24,11 @@
 
 package corba.hcks;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
+
 import org.glassfish.pfl.basic.contain.Pair;
 
 public class ErrorAccumulator
diff --git a/functional-tests/src/test/java/corba/hcks/HcksTest.java b/functional-tests/src/test/java/corba/hcks/HcksTest.java
index 28bc323feb..33b5b5947b 100644
--- a/functional-tests/src/test/java/corba/hcks/HcksTest.java
+++ b/functional-tests/src/test/java/corba/hcks/HcksTest.java
@@ -24,8 +24,8 @@
 
 package corba.hcks;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class HcksTest
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/MyInterceptor.java b/functional-tests/src/test/java/corba/hcks/MyInterceptor.java
index 0f71b5b2cc..b11e1e2e76 100644
--- a/functional-tests/src/test/java/corba/hcks/MyInterceptor.java
+++ b/functional-tests/src/test/java/corba/hcks/MyInterceptor.java
@@ -24,20 +24,20 @@
 
 package corba.hcks;
 
+import com.sun.corba.ee.spi.legacy.interceptor.RequestInfoExt;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+
+import java.util.Hashtable;
+
 import org.omg.CORBA.IMP_LIMIT;
 import org.omg.CORBA.PERSIST_STORE;
 import org.omg.CORBA.SystemException;
 import org.omg.IOP.ServiceContext;
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.RequestInfo;
-import org.omg.PortableInterceptor.ServerRequestInterceptor;
 import org.omg.PortableInterceptor.ServerRequestInfo;
-
-import com.sun.corba.ee.spi.legacy.interceptor.RequestInfoExt;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
-
-import java.util.Hashtable;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
 public class MyInterceptor
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/MyORBInitializer.java b/functional-tests/src/test/java/corba/hcks/MyORBInitializer.java
index 018b451080..12edd30c62 100644
--- a/functional-tests/src/test/java/corba/hcks/MyORBInitializer.java
+++ b/functional-tests/src/test/java/corba/hcks/MyORBInitializer.java
@@ -24,13 +24,11 @@
 
 package corba.hcks;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-
-import org.omg.PortableInterceptor.ORBInitInfo;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.CurrentHelper;
+import org.omg.PortableInterceptor.ORBInitInfo;
 
 public class MyORBInitializer
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/MyServantActivator.java b/functional-tests/src/test/java/corba/hcks/MyServantActivator.java
index 22e14378cf..8e51ee14fa 100644
--- a/functional-tests/src/test/java/corba/hcks/MyServantActivator.java
+++ b/functional-tests/src/test/java/corba/hcks/MyServantActivator.java
@@ -25,8 +25,8 @@
 
 import org.omg.CORBA.IMP_LIMIT;
 import org.omg.CORBA.INTERNAL;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.OBJECT_NOT_EXIST;
+import org.omg.CORBA.ORB;
 import org.omg.CORBA.SystemException;
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.POA;
diff --git a/functional-tests/src/test/java/corba/hcks/MyServantLocator.java b/functional-tests/src/test/java/corba/hcks/MyServantLocator.java
index 7c7ea8521d..aef723955e 100644
--- a/functional-tests/src/test/java/corba/hcks/MyServantLocator.java
+++ b/functional-tests/src/test/java/corba/hcks/MyServantLocator.java
@@ -26,8 +26,8 @@
 
 import org.omg.CORBA.IMP_LIMIT;
 import org.omg.CORBA.INTERNAL;
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.OBJECT_NOT_EXIST;
+import org.omg.CORBA.ORB;
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
diff --git a/functional-tests/src/test/java/corba/hcks/SendRecursiveTypePOAServant.java b/functional-tests/src/test/java/corba/hcks/SendRecursiveTypePOAServant.java
index 7cf8d56474..25d1b9b567 100644
--- a/functional-tests/src/test/java/corba/hcks/SendRecursiveTypePOAServant.java
+++ b/functional-tests/src/test/java/corba/hcks/SendRecursiveTypePOAServant.java
@@ -24,9 +24,8 @@
 
 package corba.hcks;
 
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-import java.util.Properties;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.ORB;
 
 class SendRecursiveTypePOAServant
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/Server.java b/functional-tests/src/test/java/corba/hcks/Server.java
index b89bd73988..662e93cac1 100644
--- a/functional-tests/src/test/java/corba/hcks/Server.java
+++ b/functional-tests/src/test/java/corba/hcks/Server.java
@@ -24,7 +24,11 @@
 
 package corba.hcks;
 
-import java.util.Properties;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+//import java.rmi.Naming; // JRMP
+import javax.naming.InitialContext;    // IIOP
 
 //
 // IDL imports (and POA-based RMI-IIOP).
@@ -36,19 +40,6 @@
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
 
-import corba.framework.Controller;
-import corba.framework.Options;
-
-//
-// RMI-IIOP imports.
-//
-
-import java.rmi.RMISecurityManager;
-import javax.rmi.PortableRemoteObject;
-
-//import java.rmi.Naming; // JRMP
-import javax.naming.InitialContext;    // IIOP
-
 public class Server
 {
     public static final String baseMsg = Server.class.getName();
diff --git a/functional-tests/src/test/java/corba/hcks/SsPicInterceptor.java b/functional-tests/src/test/java/corba/hcks/SsPicInterceptor.java
index a3c94ee8bc..7474621698 100644
--- a/functional-tests/src/test/java/corba/hcks/SsPicInterceptor.java
+++ b/functional-tests/src/test/java/corba/hcks/SsPicInterceptor.java
@@ -27,19 +27,17 @@
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.ORB;
-
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextPackage.CannotProceed;
+import org.omg.CosNaming.NamingContextPackage.InvalidName;
+import org.omg.CosNaming.NamingContextPackage.NotFound;
 import org.omg.IOP.ServiceContext;
-
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.Current;
-import org.omg.PortableInterceptor.InvalidSlot;
 import org.omg.PortableInterceptor.RequestInfo;
-import org.omg.PortableInterceptor.ServerRequestInterceptor;
 import org.omg.PortableInterceptor.ServerRequestInfo;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
 /**
  * This interceptor helps test Server-Side PICurrent operation.
diff --git a/functional-tests/src/test/java/corba/hcks/U.java b/functional-tests/src/test/java/corba/hcks/U.java
index f2e03ae590..e3e879ab90 100644
--- a/functional-tests/src/test/java/corba/hcks/U.java
+++ b/functional-tests/src/test/java/corba/hcks/U.java
@@ -25,12 +25,18 @@
 
 package corba.hcks;
 
+import com.sun.corba.ee.impl.oa.poa.POACurrent;
+import com.sun.corba.ee.impl.transport.AcceptorImpl;
+import com.sun.corba.ee.spi.transport.Acceptor;
+import com.sun.corba.ee.spi.transport.Connection;
+import com.sun.corba.ee.spi.transport.SocketInfo;
+import com.sun.corba.ee.spi.transport.TransportManager;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-
-import java.util.List;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
@@ -38,35 +44,24 @@
 import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
 
-import com.sun.corba.ee.impl.oa.poa.POACurrent;
-
+import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
 import org.omg.CORBA.TCKind;
 import org.omg.CORBA.TypeCode;
-
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableInterceptor.InvalidSlot;
 import org.omg.PortableInterceptor.RequestInfo;
 import org.omg.PortableInterceptor.ServerRequestInfo;
-
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantManager;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
 
-import com.sun.corba.ee.spi.transport.Acceptor;
-import com.sun.corba.ee.spi.transport.Connection;
-import com.sun.corba.ee.spi.transport.TransportManager;
-import com.sun.corba.ee.spi.transport.SocketInfo;
-
-import com.sun.corba.ee.impl.transport.AcceptorImpl;
-import org.glassfish.pfl.test.JUnitReportHelper;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
-
 public class U
 {
     private static JUnitReportHelper helper = null ;
diff --git a/functional-tests/src/test/java/corba/hcks/idlDeprecatedDynamicServant.java b/functional-tests/src/test/java/corba/hcks/idlDeprecatedDynamicServant.java
index 70ece775b9..c97ac886c7 100644
--- a/functional-tests/src/test/java/corba/hcks/idlDeprecatedDynamicServant.java
+++ b/functional-tests/src/test/java/corba/hcks/idlDeprecatedDynamicServant.java
@@ -24,9 +24,8 @@
 
 package corba.hcks;
 
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-import java.util.Properties;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
 
 class idlDeprecatedDynamicServant
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/idlDynInvokeHelper.java b/functional-tests/src/test/java/corba/hcks/idlDynInvokeHelper.java
index fa58ff52e1..ff683b5720 100644
--- a/functional-tests/src/test/java/corba/hcks/idlDynInvokeHelper.java
+++ b/functional-tests/src/test/java/corba/hcks/idlDynInvokeHelper.java
@@ -24,12 +24,18 @@
 
 package corba.hcks;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.portable.UnknownException;
-import org.omg.PortableServer.*;
-import java.util.Properties;
 import com.sun.corba.ee.impl.misc.ORBUtility;
 
+import org.omg.CORBA.ARG_IN;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.portable.UnknownException;
+
 class idlDynInvokeHelper
 {
 
diff --git a/functional-tests/src/test/java/corba/hcks/idlDynamicServant.java b/functional-tests/src/test/java/corba/hcks/idlDynamicServant.java
index 2e3d4184b6..060d56aa47 100644
--- a/functional-tests/src/test/java/corba/hcks/idlDynamicServant.java
+++ b/functional-tests/src/test/java/corba/hcks/idlDynamicServant.java
@@ -24,9 +24,9 @@
 
 package corba.hcks;
 
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-import java.util.Properties;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
+import org.omg.PortableServer.POA;
 
 class idlDynamicServant
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/idlPOAServant.java b/functional-tests/src/test/java/corba/hcks/idlPOAServant.java
index 7fdfa4194b..ef6c398815 100644
--- a/functional-tests/src/test/java/corba/hcks/idlPOAServant.java
+++ b/functional-tests/src/test/java/corba/hcks/idlPOAServant.java
@@ -24,59 +24,22 @@
 
 package corba.hcks;
 
-import org.omg.PortableServer.*;
-import java.util.Iterator;
-import java.util.Properties;
-
-import com.sun.corba.ee.spi.ior.Identifiable;
-import com.sun.corba.ee.spi.ior.IdentifiableFactory;
-import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder;
-import com.sun.corba.ee.spi.ior.ObjectKeyTemplate;
-import com.sun.corba.ee.spi.ior.TaggedComponent;
-import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder;
-import com.sun.corba.ee.spi.ior.ObjectId;
-import com.sun.corba.ee.spi.ior.ObjectKey;
+import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray;
+import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.impl.orb.ORBVersionImpl;
 import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.ior.IORFactory;
-import com.sun.corba.ee.spi.ior.ObjectAdapterId;
-import com.sun.corba.ee.spi.ior.IdentifiableContainerBase;
-import com.sun.corba.ee.spi.ior.IORTemplate;
-import com.sun.corba.ee.spi.ior.IORTemplateList;
 import com.sun.corba.ee.spi.ior.IORFactories;
-import com.sun.corba.ee.spi.ior.TaggedProfileTemplate;
-
-import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
+import com.sun.corba.ee.spi.ior.IORTemplate;
+import com.sun.corba.ee.spi.ior.ObjectAdapterId;
+import com.sun.corba.ee.spi.ior.ObjectId;
+import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
 import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
+import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
 import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfile;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
-import com.sun.corba.ee.spi.ior.ObjectKeyFactory;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.transport.Acceptor;
-
 import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent;
-
-import com.sun.corba.ee.impl.ior.GenericTaggedProfile;
-import com.sun.corba.ee.impl.ior.GenericTaggedComponent;
-import com.sun.corba.ee.impl.ior.FreezableList;
-import com.sun.corba.ee.impl.ior.OldJIDLObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.WireObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.EncapsulationUtility;
-import com.sun.corba.ee.impl.ior.TaggedComponentFactoryFinderImpl;
-import com.sun.corba.ee.impl.ior.TaggedProfileFactoryFinderImpl;
-import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray;
-import com.sun.corba.ee.impl.ior.ObjectAdapterIdNumber;
-import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl;
-import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl;
-
-import com.sun.corba.ee.impl.orb.ORBVersionImpl;
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.orb.ORB;
 
 class idlPOAServant
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/idlSLIServant.java b/functional-tests/src/test/java/corba/hcks/idlSLIServant.java
index 2ee858c1b3..d4d2d80fc8 100644
--- a/functional-tests/src/test/java/corba/hcks/idlSLIServant.java
+++ b/functional-tests/src/test/java/corba/hcks/idlSLIServant.java
@@ -24,8 +24,8 @@
 
 package corba.hcks;
 
-import org.omg.CORBA.ORB;
 import org.omg.CORBA.NO_MEMORY;
+import org.omg.CORBA.ORB;
 
 class idlSLIServant
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/idlStaticServant.java b/functional-tests/src/test/java/corba/hcks/idlStaticServant.java
index 3496e1ece7..2314cc38f5 100644
--- a/functional-tests/src/test/java/corba/hcks/idlStaticServant.java
+++ b/functional-tests/src/test/java/corba/hcks/idlStaticServant.java
@@ -24,10 +24,7 @@
 
 package corba.hcks;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.portable.UnknownException;
-import org.omg.PortableServer.*;
-import java.util.Properties;
+import org.omg.CORBA.ORB;
 
 class idlStaticServant
     extends
diff --git a/functional-tests/src/test/java/corba/hcks/rmiiAttributesIServantPOA.java b/functional-tests/src/test/java/corba/hcks/rmiiAttributesIServantPOA.java
index 5f86f5c0e5..4a65d8bdb3 100644
--- a/functional-tests/src/test/java/corba/hcks/rmiiAttributesIServantPOA.java
+++ b/functional-tests/src/test/java/corba/hcks/rmiiAttributesIServantPOA.java
@@ -25,6 +25,7 @@
 package corba.hcks;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class rmiiAttributesIServantPOA
diff --git a/functional-tests/src/test/java/corba/hcks/rmiiIServant.java b/functional-tests/src/test/java/corba/hcks/rmiiIServant.java
index 1ceb9319fb..266a45eda3 100644
--- a/functional-tests/src/test/java/corba/hcks/rmiiIServant.java
+++ b/functional-tests/src/test/java/corba/hcks/rmiiIServant.java
@@ -25,11 +25,12 @@
 package corba.hcks;
 
 import java.rmi.RemoteException;
-import org.omg.CORBA.INTERNAL;
 
 //import java.rmi.server.UnicastRemoteObject; // JRMP
 import javax.rmi.PortableRemoteObject;        // IIOP
 
+import org.omg.CORBA.INTERNAL;
+
 public class rmiiIServant
     extends
         //UnicastRemoteObject // JRMP
diff --git a/functional-tests/src/test/java/corba/hcks/rmiiIServantPOA.java b/functional-tests/src/test/java/corba/hcks/rmiiIServantPOA.java
index 950ed31ddb..a0c01afe81 100644
--- a/functional-tests/src/test/java/corba/hcks/rmiiIServantPOA.java
+++ b/functional-tests/src/test/java/corba/hcks/rmiiIServantPOA.java
@@ -25,7 +25,9 @@
 package corba.hcks;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
+
 import org.omg.CORBA.INTERNAL;
 import org.omg.CORBA.ORB;
 
diff --git a/functional-tests/src/test/java/corba/invocation/Client.java b/functional-tests/src/test/java/corba/invocation/Client.java
index e4442c3f04..0d55c3f5b2 100644
--- a/functional-tests/src/test/java/corba/invocation/Client.java
+++ b/functional-tests/src/test/java/corba/invocation/Client.java
@@ -19,13 +19,14 @@
 
 package corba.invocation;
 
+import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Object;
 import org.omg.CORBA.SystemException;
-import java.util.*;
-
-import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 public class Client implements Runnable {
 
diff --git a/functional-tests/src/test/java/corba/invocation/InvocationTest.java b/functional-tests/src/test/java/corba/invocation/InvocationTest.java
index 7d36726d3f..fbe603c024 100644
--- a/functional-tests/src/test/java/corba/invocation/InvocationTest.java
+++ b/functional-tests/src/test/java/corba/invocation/InvocationTest.java
@@ -19,9 +19,11 @@
 
 package corba.invocation;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
 
 /**
  * This tests if invocation on non-existent targets results in COMM_FAILURE.
diff --git a/functional-tests/src/test/java/corba/iorintsockfact/Common.java b/functional-tests/src/test/java/corba/iorintsockfact/Common.java
index 64afb947bc..b6437549b2 100644
--- a/functional-tests/src/test/java/corba/iorintsockfact/Common.java
+++ b/functional-tests/src/test/java/corba/iorintsockfact/Common.java
@@ -24,13 +24,13 @@
 
 package corba.iorintsockfact;
 
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.INTERNAL;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
 /**
  * @author Harold Carr
  */
diff --git a/functional-tests/src/test/java/corba/iorintsockfact/IORInterceptor.java b/functional-tests/src/test/java/corba/iorintsockfact/IORInterceptor.java
index b823f2a76f..48775ddb02 100644
--- a/functional-tests/src/test/java/corba/iorintsockfact/IORInterceptor.java
+++ b/functional-tests/src/test/java/corba/iorintsockfact/IORInterceptor.java
@@ -24,17 +24,8 @@
 
 package corba.iorintsockfact;
 
-import java.net.InetAddress;
-import java.util.Iterator;
-
-import org.omg.CORBA.Any;
-import org.omg.IOP.Codec;
-import org.omg.IOP.Encoding;
-import org.omg.PortableInterceptor.IORInfo;
-// This one is only necessary when running in current development workspace.
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
-
 import com.sun.corba.ee.spi.ior.TaggedProfileTemplate;
+import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent;
 import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
 import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
 import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
@@ -42,7 +33,12 @@
 import com.sun.corba.ee.spi.oa.ObjectAdapter;
 import com.sun.corba.ee.spi.orb.ORB;
 
-import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent;
+import java.net.InetAddress;
+import java.util.Iterator;
+
+import org.omg.PortableInterceptor.IORInfo;
+// This one is only necessary when running in current development workspace.
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
 /**
  * @author Harold Carr
diff --git a/functional-tests/src/test/java/corba/iorintsockfact/IorIntSockFactTest.java b/functional-tests/src/test/java/corba/iorintsockfact/IorIntSockFactTest.java
index c9c72b9cab..7395ec72fc 100644
--- a/functional-tests/src/test/java/corba/iorintsockfact/IorIntSockFactTest.java
+++ b/functional-tests/src/test/java/corba/iorintsockfact/IorIntSockFactTest.java
@@ -24,8 +24,8 @@
 
 package corba.iorintsockfact;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * @author Harold Carr
diff --git a/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java b/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java
index af0f760c2a..e3db8f09c3 100644
--- a/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java
+++ b/functional-tests/src/test/java/corba/iorintsockfact/ServerORBInitializer.java
@@ -24,19 +24,13 @@
 
 package corba.iorintsockfact;
 
-import org.omg.CosNaming.*;
-import org.omg.IOP.Codec;
-import org.omg.IOP.CodecFactory;
-import org.omg.IOP.CodecFactoryHelper;
-import org.omg.IOP.Encoding;
-import org.omg.PortableInterceptor.ORBInitializer;
+import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt;
+import com.sun.corba.ee.spi.orb.ORB;
+
 import org.omg.PortableInterceptor.ORBInitInfo;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.InvalidName;
+import org.omg.PortableInterceptor.ORBInitializer;
 import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt;
-
 /**
  * @author Harold Carr
  */
diff --git a/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java b/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java
index 9d495a8ca9..05997b410d 100644
--- a/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java
+++ b/functional-tests/src/test/java/corba/iorintsockfact/SocketFactory.java
@@ -24,19 +24,18 @@
 
 package corba.iorintsockfact;
 
-import java.util.Iterator;
-
-import org.omg.CORBA.ORB;
-
-import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
+import com.sun.corba.ee.impl.legacy.connection.DefaultSocketFactory;
+import com.sun.corba.ee.impl.legacy.connection.EndPointInfoImpl;
 import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
-import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
 import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent;
+import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
+import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
 import com.sun.corba.ee.spi.transport.SocketInfo;
 
-import com.sun.corba.ee.impl.legacy.connection.DefaultSocketFactory;
-import com.sun.corba.ee.impl.legacy.connection.EndPointInfoImpl;
+import java.util.Iterator;
+
+import org.omg.CORBA.ORB;
 
 /**
  * @author Harold Carr
diff --git a/functional-tests/src/test/java/corba/islocal/Client.java b/functional-tests/src/test/java/corba/islocal/Client.java
index 9596f464dd..2f1e8cb8c1 100644
--- a/functional-tests/src/test/java/corba/islocal/Client.java
+++ b/functional-tests/src/test/java/corba/islocal/Client.java
@@ -24,14 +24,15 @@
 
 package corba.islocal;
 
-import javax.naming.InitialContext;
-import org.omg.CORBA.ORB;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
 import corba.framework.Controller;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.ORB;
 
 public class Client
 {
diff --git a/functional-tests/src/test/java/corba/islocal/ColocatedClientServer.java b/functional-tests/src/test/java/corba/islocal/ColocatedClientServer.java
index d0fde2020e..bdf2ef1df4 100644
--- a/functional-tests/src/test/java/corba/islocal/ColocatedClientServer.java
+++ b/functional-tests/src/test/java/corba/islocal/ColocatedClientServer.java
@@ -24,11 +24,14 @@
 
 package corba.islocal;
 
+import corba.hcks.C;
+import corba.hcks.U;
+
 import java.util.Properties;
+
 import javax.naming.InitialContext;
+
 import org.omg.CORBA.ORB;
-import corba.hcks.C;
-import corba.hcks.U;
 
 public class ColocatedClientServer
 {
diff --git a/functional-tests/src/test/java/corba/islocal/CustomClassLoader.java b/functional-tests/src/test/java/corba/islocal/CustomClassLoader.java
index 92a856fb40..bc72984c1b 100644
--- a/functional-tests/src/test/java/corba/islocal/CustomClassLoader.java
+++ b/functional-tests/src/test/java/corba/islocal/CustomClassLoader.java
@@ -24,11 +24,10 @@
 
 package corba.islocal;
 
+import corba.framework.Loader;
+
 import java.util.Hashtable;
 import java.util.StringTokenizer;
-import java.util.Vector;
-
-import corba.framework.Loader;
 
 public class CustomClassLoader
     extends Loader
diff --git a/functional-tests/src/test/java/corba/islocal/IsLocalTest.java b/functional-tests/src/test/java/corba/islocal/IsLocalTest.java
index 6d27f02961..57086e7613 100644
--- a/functional-tests/src/test/java/corba/islocal/IsLocalTest.java
+++ b/functional-tests/src/test/java/corba/islocal/IsLocalTest.java
@@ -24,8 +24,8 @@
 
 package corba.islocal;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class IsLocalTest extends CORBATest {
     public static final String thisPackage =
diff --git a/functional-tests/src/test/java/corba/islocal/MyServantLocator.java b/functional-tests/src/test/java/corba/islocal/MyServantLocator.java
index c815f3af7b..f6f83161bb 100644
--- a/functional-tests/src/test/java/corba/islocal/MyServantLocator.java
+++ b/functional-tests/src/test/java/corba/islocal/MyServantLocator.java
@@ -24,20 +24,17 @@
 
 package corba.islocal;
 
+import corba.hcks.U;
+
 import javax.rmi.CORBA.Tie;
 
-import org.omg.CORBA.IMP_LIMIT;
-import org.omg.CORBA.INTERNAL;
 import org.omg.CORBA.ORB;
-import org.omg.CORBA.OBJECT_NOT_EXIST;
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocator;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import corba.hcks.U;
-
 public class MyServantLocator
     extends
         org.omg.CORBA.LocalObject
diff --git a/functional-tests/src/test/java/corba/islocal/Server.java b/functional-tests/src/test/java/corba/islocal/Server.java
index 0f2bba725e..b0375bdf82 100644
--- a/functional-tests/src/test/java/corba/islocal/Server.java
+++ b/functional-tests/src/test/java/corba/islocal/Server.java
@@ -24,19 +24,19 @@
 
 package corba.islocal;
 
-import javax.naming.InitialContext;
-
-import org.omg.CORBA.Policy;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.transport.TransportManager;
 
 import corba.framework.Controller;
 import corba.framework.Options;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.spi.transport.TransportManager;
-import com.sun.corba.ee.spi.orb.ORB;
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.Policy;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 public class Server
 {
diff --git a/functional-tests/src/test/java/corba/islocal/rmiiIServantConnect.java b/functional-tests/src/test/java/corba/islocal/rmiiIServantConnect.java
index b4bc606f7f..de1c01bea6 100644
--- a/functional-tests/src/test/java/corba/islocal/rmiiIServantConnect.java
+++ b/functional-tests/src/test/java/corba/islocal/rmiiIServantConnect.java
@@ -24,10 +24,11 @@
 
 package corba.islocal;
 
+import corba.hcks.U;
+
 import java.rmi.RemoteException;
-import javax.rmi.PortableRemoteObject;
 
-import corba.hcks.U;
+import javax.rmi.PortableRemoteObject;
 
 public class rmiiIServantConnect
     extends
diff --git a/functional-tests/src/test/java/corba/islocal/rmiiIServantPOA.java b/functional-tests/src/test/java/corba/islocal/rmiiIServantPOA.java
index d20f0838b6..4160209eef 100644
--- a/functional-tests/src/test/java/corba/islocal/rmiiIServantPOA.java
+++ b/functional-tests/src/test/java/corba/islocal/rmiiIServantPOA.java
@@ -24,9 +24,11 @@
 
 package corba.islocal;
 
+import corba.hcks.U;
+
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
-import corba.hcks.U;
 
 public class rmiiIServantPOA
     extends
diff --git a/functional-tests/src/test/java/corba/multiorb/MultiORBTest.java b/functional-tests/src/test/java/corba/multiorb/MultiORBTest.java
index b72b7467a7..dd9777d321 100644
--- a/functional-tests/src/test/java/corba/multiorb/MultiORBTest.java
+++ b/functional-tests/src/test/java/corba/multiorb/MultiORBTest.java
@@ -19,8 +19,8 @@
 
 package corba.multiorb;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class MultiORBTest extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/multiorb/policy2Client.java b/functional-tests/src/test/java/corba/multiorb/policy2Client.java
index 3eae8dd103..1e968bbf87 100644
--- a/functional-tests/src/test/java/corba/multiorb/policy2Client.java
+++ b/functional-tests/src/test/java/corba/multiorb/policy2Client.java
@@ -19,15 +19,17 @@
 
 package corba.multiorb;
 
-import examples.policy_2;
-import examples.policy_2Helper;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
 
+import examples.policy_2;
+import examples.policy_2Helper;
+
 public class policy2Client {
     private static final String msgPassed = "policy_2: **PASSED**";
 
diff --git a/functional-tests/src/test/java/corba/multiorb/policy2Server.java b/functional-tests/src/test/java/corba/multiorb/policy2Server.java
index ed1ea241ac..af83f4c318 100644
--- a/functional-tests/src/test/java/corba/multiorb/policy2Server.java
+++ b/functional-tests/src/test/java/corba/multiorb/policy2Server.java
@@ -19,24 +19,26 @@
 
 package corba.multiorb;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableServer.IdAssignmentPolicyValue;
-import org.omg.PortableServer.ThreadPolicyValue;
-import org.omg.PortableServer.LifespanPolicyValue;
 import org.omg.PortableServer.IdUniquenessPolicyValue;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
-import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.ImplicitActivationPolicyValue;
-import org.omg.CORBA.Policy;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.ThreadPolicyValue;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import examples.policy_2POA;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.NameComponent;
-import org.omg.CosNaming.NamingContext;
-import org.omg.PortableServer.POA;
 
 class policy2_servantA extends policy_2POA
 {
diff --git a/functional-tests/src/test/java/corba/oneway/OneWayTest.java b/functional-tests/src/test/java/corba/oneway/OneWayTest.java
index c7f6114fda..6b37fd5ac0 100644
--- a/functional-tests/src/test/java/corba/oneway/OneWayTest.java
+++ b/functional-tests/src/test/java/corba/oneway/OneWayTest.java
@@ -19,8 +19,8 @@
 
 package corba.oneway;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class OneWayTest extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/oneway/helloClient.java b/functional-tests/src/test/java/corba/oneway/helloClient.java
index 7f3ddaf245..de0bc21a70 100644
--- a/functional-tests/src/test/java/corba/oneway/helloClient.java
+++ b/functional-tests/src/test/java/corba/oneway/helloClient.java
@@ -19,14 +19,16 @@
 
 package corba.oneway;
 
-import HelloApp.hello;
-import HelloApp.helloHelper;
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
 
+import HelloApp.hello;
+import HelloApp.helloHelper;
+
 public class helloClient
 {
     public static void main(String args[])
diff --git a/functional-tests/src/test/java/corba/oneway/helloServer.java b/functional-tests/src/test/java/corba/oneway/helloServer.java
index 87f5fc86e6..6604c28582 100644
--- a/functional-tests/src/test/java/corba/oneway/helloServer.java
+++ b/functional-tests/src/test/java/corba/oneway/helloServer.java
@@ -19,13 +19,15 @@
 
 package corba.oneway;
 
-import HelloApp._helloImplBase;
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
 
+import HelloApp._helloImplBase;
+
 class helloServant extends _helloImplBase
 {
     public void shutdown()
diff --git a/functional-tests/src/test/java/corba/poaandequals/POAAndEquals.java b/functional-tests/src/test/java/corba/poaandequals/POAAndEquals.java
index 97df8b6974..f123e3df6c 100644
--- a/functional-tests/src/test/java/corba/poaandequals/POAAndEquals.java
+++ b/functional-tests/src/test/java/corba/poaandequals/POAAndEquals.java
@@ -19,10 +19,16 @@
 
 package corba.poaandequals;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
-import org.omg.CORBA.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.InternalExec;
+import corba.framework.Options;
+import corba.framework.ThreadExec;
+
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
 
 public class POAAndEquals extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/poaandequals/WombatClient.java b/functional-tests/src/test/java/corba/poaandequals/WombatClient.java
index fac656c49e..22afadbc52 100644
--- a/functional-tests/src/test/java/corba/poaandequals/WombatClient.java
+++ b/functional-tests/src/test/java/corba/poaandequals/WombatClient.java
@@ -19,15 +19,18 @@
 
 package corba.poaandequals;
 
-import WombatStuff.Wombat;
-import WombatStuff.WombatHelper;
 import corba.framework.Controller;
 import corba.framework.ThreadProcess;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
+
 import org.omg.CORBA.ORB;
 
+import WombatStuff.Wombat;
+import WombatStuff.WombatHelper;
+
 public class WombatClient extends ThreadProcess
 {
     ORB orb;
diff --git a/functional-tests/src/test/java/corba/poaandequals/WombatServer.java b/functional-tests/src/test/java/corba/poaandequals/WombatServer.java
index 7e1b53a62f..92beb12947 100644
--- a/functional-tests/src/test/java/corba/poaandequals/WombatServer.java
+++ b/functional-tests/src/test/java/corba/poaandequals/WombatServer.java
@@ -19,19 +19,22 @@
 
 package corba.poaandequals;
 
-import WombatStuff.WombatHelper;
 import corba.framework.Controller;
 import corba.framework.InternalProcess;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
 import java.util.Hashtable;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.ORBPackage.InvalidName;
 import org.omg.PortableServer.POA;
 
+import WombatStuff.WombatHelper;
+
 public class WombatServer implements InternalProcess
 {
     PrintStream out;
diff --git a/functional-tests/src/test/java/corba/poacallback/POACallbackTest.java b/functional-tests/src/test/java/corba/poacallback/POACallbackTest.java
index 055deafd7a..e51010a0a4 100644
--- a/functional-tests/src/test/java/corba/poacallback/POACallbackTest.java
+++ b/functional-tests/src/test/java/corba/poacallback/POACallbackTest.java
@@ -19,9 +19,8 @@
 
 package corba.poacallback;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
-import corba.framework.Options;
+import corba.framework.Controller;
 
 public class POACallbackTest extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/poacallback/Server.java b/functional-tests/src/test/java/corba/poacallback/Server.java
index 354d4b770c..9d245d7cfe 100644
--- a/functional-tests/src/test/java/corba/poacallback/Server.java
+++ b/functional-tests/src/test/java/corba/poacallback/Server.java
@@ -19,14 +19,12 @@
 
 package corba.poacallback;
 
-import org.omg.CORBA.Policy;
 import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
-import org.omg.PortableServer.Servant;
-import org.omg.PortableServer.ServantManager;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
 import org.omg.PortableServer.ServantLocator;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 public class Server {
 
diff --git a/functional-tests/src/test/java/corba/poacallback/idlI1ServantLocator.java b/functional-tests/src/test/java/corba/poacallback/idlI1ServantLocator.java
index 68d67ead58..1099e9234c 100644
--- a/functional-tests/src/test/java/corba/poacallback/idlI1ServantLocator.java
+++ b/functional-tests/src/test/java/corba/poacallback/idlI1ServantLocator.java
@@ -21,9 +21,9 @@
 
 
 import org.omg.CORBA.ORB;
-import org.omg.PortableServer.ServantLocator;
-import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 public class idlI1ServantLocator
diff --git a/functional-tests/src/test/java/corba/poacallback/idlI2ServantLocator.java b/functional-tests/src/test/java/corba/poacallback/idlI2ServantLocator.java
index 94a922b0a9..c14a6eb0e9 100644
--- a/functional-tests/src/test/java/corba/poacallback/idlI2ServantLocator.java
+++ b/functional-tests/src/test/java/corba/poacallback/idlI2ServantLocator.java
@@ -21,9 +21,9 @@
 
 
 import org.omg.CORBA.ORB;
-import org.omg.PortableServer.ServantLocator;
-import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 
diff --git a/functional-tests/src/test/java/corba/poamanager/FactoryImpl.java b/functional-tests/src/test/java/corba/poamanager/FactoryImpl.java
index 4c7e99a393..79825b0e4f 100644
--- a/functional-tests/src/test/java/corba/poamanager/FactoryImpl.java
+++ b/functional-tests/src/test/java/corba/poamanager/FactoryImpl.java
@@ -19,11 +19,12 @@
 
 package corba.poamanager;
 
-import Util.CreationMethods;
-import Util.GenericFactoryPOA;
 import org.omg.PortableServer.POA;
-import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
 import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
+
+import Util.CreationMethods;
+import Util.GenericFactoryPOA;
 
 public final class FactoryImpl extends GenericFactoryPOA
 {
diff --git a/functional-tests/src/test/java/corba/poamanager/HelloClient.java b/functional-tests/src/test/java/corba/poamanager/HelloClient.java
index 7d7743aeac..0e89a1c617 100644
--- a/functional-tests/src/test/java/corba/poamanager/HelloClient.java
+++ b/functional-tests/src/test/java/corba/poamanager/HelloClient.java
@@ -19,17 +19,18 @@
 
 package corba.poamanager;
 
-import HelloStuff.Hello;
-import HelloStuff.HelloHelper;
-import Util.CreationMethods;
-import Util.GenericFactory;
-import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
-
 import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
 import com.sun.corba.ee.spi.logging.POASystemException;
+
 import org.omg.CORBA.COMM_FAILURE;
 import org.omg.CORBA.OBJ_ADAPTER;
 import org.omg.CORBA.SystemException;
+import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
+
+import HelloStuff.Hello;
+import HelloStuff.HelloHelper;
+import Util.CreationMethods;
+import Util.GenericFactory;
 
 // Will this test exit with value 1 when errors in WorkerThreads?  REVISIT
 
diff --git a/functional-tests/src/test/java/corba/poamanager/HelloServer.java b/functional-tests/src/test/java/corba/poamanager/HelloServer.java
index 3fd46a07fc..0bf170aa6f 100644
--- a/functional-tests/src/test/java/corba/poamanager/HelloServer.java
+++ b/functional-tests/src/test/java/corba/poamanager/HelloServer.java
@@ -19,9 +19,10 @@
 
 package corba.poamanager;
 
-import Util.GenericFactoryHelper;
 import org.omg.PortableServer.POA;
 
+import Util.GenericFactoryHelper;
+
 public class HelloServer {
     public static void main(String[] args) {
         try {
diff --git a/functional-tests/src/test/java/corba/poamanager/POAManagerTest.java b/functional-tests/src/test/java/corba/poamanager/POAManagerTest.java
index 6f0ab9cf79..86c7424cc8 100644
--- a/functional-tests/src/test/java/corba/poamanager/POAManagerTest.java
+++ b/functional-tests/src/test/java/corba/poamanager/POAManagerTest.java
@@ -19,9 +19,8 @@
 
 package corba.poamanager;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class POAManagerTest extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/poamanager/Utility.java b/functional-tests/src/test/java/corba/poamanager/Utility.java
index f680f6c28f..e0d65acad9 100644
--- a/functional-tests/src/test/java/corba/poamanager/Utility.java
+++ b/functional-tests/src/test/java/corba/poamanager/Utility.java
@@ -20,11 +20,13 @@
 package corba.poamanager;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 
 public class Utility {
diff --git a/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java b/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java
index ecf63b5409..c8d55094ee 100644
--- a/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java
+++ b/functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java
@@ -20,11 +20,12 @@
 
 package corba.poapolicies;
 
-import Util.CreationMethods;
-import Util.ServantFactoryPOA;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 
+import Util.CreationMethods;
+import Util.ServantFactoryPOA;
+
 public class BasicObjectFactoryImpl extends ServantFactoryPOA
 {
     final boolean useServantToReference = true;
diff --git a/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseActiveMapOnly.java b/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseActiveMapOnly.java
index 7a7f1f1522..a2253fb4b5 100644
--- a/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseActiveMapOnly.java
+++ b/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseActiveMapOnly.java
@@ -21,10 +21,10 @@
 
 import org.omg.CORBA.Policy;
 import org.omg.PortableServer.POA;
-import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
-import org.omg.PortableServer.POAPackage.InvalidPolicy;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
 
 public class FactoryForRetainAndUseActiveMapOnly implements POAFactory
 {
diff --git a/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseServantManager.java b/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseServantManager.java
index a6671ba728..92f047b894 100644
--- a/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseServantManager.java
+++ b/functional-tests/src/test/java/corba/poapolicies/FactoryForRetainAndUseServantManager.java
@@ -19,14 +19,15 @@
 
 package corba.poapolicies;
 
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-
-import java.io.*;
-import java.util.*;
-
-import Util.*;
+import org.omg.CORBA.Policy;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
+import org.omg.PortableServer.ServantActivator;
+import org.omg.PortableServer.ServantActivatorHelper;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
+import org.omg.PortableServer.POAPackage.WrongPolicy;
 
 public class FactoryForRetainAndUseServantManager implements POAFactory {
 
diff --git a/functional-tests/src/test/java/corba/poapolicies/HelloServer.java b/functional-tests/src/test/java/corba/poapolicies/HelloServer.java
index dbb180493e..0c3ec50d53 100644
--- a/functional-tests/src/test/java/corba/poapolicies/HelloServer.java
+++ b/functional-tests/src/test/java/corba/poapolicies/HelloServer.java
@@ -20,9 +20,10 @@
 
 package corba.poapolicies;
 
-import Util.ServantFactoryHelper;
 import org.omg.PortableServer.POA;
 
+import Util.ServantFactoryHelper;
+
 class Waiter extends Thread {
     BasicObjectFactoryImpl f;
     POA p;
diff --git a/functional-tests/src/test/java/corba/poapolicies/POAFactory.java b/functional-tests/src/test/java/corba/poapolicies/POAFactory.java
index 0a60a394fa..443ae7f211 100644
--- a/functional-tests/src/test/java/corba/poapolicies/POAFactory.java
+++ b/functional-tests/src/test/java/corba/poapolicies/POAFactory.java
@@ -19,9 +19,9 @@
 
 package corba.poapolicies;
 
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
 
 public interface POAFactory {
     public POA createPOA(POA parent) throws AdapterAlreadyExists,
diff --git a/functional-tests/src/test/java/corba/poapolicies/POAPoliciesTest.java b/functional-tests/src/test/java/corba/poapolicies/POAPoliciesTest.java
index c789fd27f9..8eb54224ad 100644
--- a/functional-tests/src/test/java/corba/poapolicies/POAPoliciesTest.java
+++ b/functional-tests/src/test/java/corba/poapolicies/POAPoliciesTest.java
@@ -19,9 +19,13 @@
 
 package corba.poapolicies;
 
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
+
 import test.Test;
-import corba.framework.*;
 
 public class POAPoliciesTest extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/poapolicies/Utility.java b/functional-tests/src/test/java/corba/poapolicies/Utility.java
index 44c367fb97..2cbb08b9dd 100644
--- a/functional-tests/src/test/java/corba/poapolicies/Utility.java
+++ b/functional-tests/src/test/java/corba/poapolicies/Utility.java
@@ -25,6 +25,7 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 
 public class Utility {
diff --git a/functional-tests/src/test/java/corba/poatest/OneWayTest.java b/functional-tests/src/test/java/corba/poatest/OneWayTest.java
index 59fba62951..7cfa87be58 100644
--- a/functional-tests/src/test/java/corba/poatest/OneWayTest.java
+++ b/functional-tests/src/test/java/corba/poatest/OneWayTest.java
@@ -19,8 +19,8 @@
 
 package corba.poatest;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class OneWayTest extends CORBATest
 {
diff --git a/functional-tests/src/test/java/corba/poatest/helloServer.java b/functional-tests/src/test/java/corba/poatest/helloServer.java
index aa321c1df3..a753529834 100644
--- a/functional-tests/src/test/java/corba/poatest/helloServer.java
+++ b/functional-tests/src/test/java/corba/poatest/helloServer.java
@@ -19,14 +19,17 @@
 
 package corba.poatest;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableServer.POA;
-import HelloA.*;
 
-import java.util.Properties;
+import HelloA.hello;
+import HelloA.helloHelper;
+import HelloA.helloPOA;
 
 class helloServant extends helloPOA
 {
diff --git a/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java b/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java
index aa1a167a59..ede09e5d50 100644
--- a/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java
+++ b/functional-tests/src/test/java/corba/preinvokepostinvoke/Interface.java
@@ -19,7 +19,6 @@
 
 package corba.preinvokepostinvoke;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 public interface Interface extends java.rmi.Remote {
diff --git a/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java b/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java
index 4eec6f9947..3740bc9123 100644
--- a/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java
+++ b/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServant.java
@@ -20,8 +20,9 @@
 package corba.preinvokepostinvoke;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
-import org.omg.CORBA.ORB;
+
 import org.omg.CosNaming.NamingContextExt;
 import org.omg.CosNaming.NamingContextExtHelper;
 
diff --git a/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServantLocator.java b/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServantLocator.java
index ac0787ce21..53a7aee344 100644
--- a/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServantLocator.java
+++ b/functional-tests/src/test/java/corba/preinvokepostinvoke/MyServantLocator.java
@@ -21,9 +21,9 @@
 
 
 import org.omg.CORBA.ORB;
-import org.omg.PortableServer.ServantLocator;
-import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 public class MyServantLocator
diff --git a/functional-tests/src/test/java/corba/preinvokepostinvoke/PreInvokePostInvokeTest.java b/functional-tests/src/test/java/corba/preinvokepostinvoke/PreInvokePostInvokeTest.java
index d221d3c598..60ca858c95 100644
--- a/functional-tests/src/test/java/corba/preinvokepostinvoke/PreInvokePostInvokeTest.java
+++ b/functional-tests/src/test/java/corba/preinvokepostinvoke/PreInvokePostInvokeTest.java
@@ -19,9 +19,8 @@
 
 package corba.preinvokepostinvoke;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
-import corba.framework.Options;
+import corba.framework.Controller;
 
 public class PreInvokePostInvokeTest
     extends
diff --git a/functional-tests/src/test/java/corba/purgecalls/Client.java b/functional-tests/src/test/java/corba/purgecalls/Client.java
index af19a01bb0..8add55ab39 100644
--- a/functional-tests/src/test/java/corba/purgecalls/Client.java
+++ b/functional-tests/src/test/java/corba/purgecalls/Client.java
@@ -25,10 +25,12 @@
 package corba.purgecalls;
 
 import com.sun.corba.ee.spi.legacy.connection.Connection;
-import corba.framework.Controller;
+
 import corba.hcks.U;
+
 import java.net.Socket;
 import java.util.Properties;
+
 import org.omg.CORBA.COMM_FAILURE;
 import org.omg.CORBA.ORB;
 
diff --git a/functional-tests/src/test/java/corba/purgecalls/ClientInterceptor.java b/functional-tests/src/test/java/corba/purgecalls/ClientInterceptor.java
index b7392b8010..8ab2334bf6 100644
--- a/functional-tests/src/test/java/corba/purgecalls/ClientInterceptor.java
+++ b/functional-tests/src/test/java/corba/purgecalls/ClientInterceptor.java
@@ -25,11 +25,13 @@
 package corba.purgecalls;
 
 import com.sun.corba.ee.spi.legacy.interceptor.RequestInfoExt;
+
 import corba.hcks.U;
+
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.SystemException;
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 
 public class ClientInterceptor
     extends
diff --git a/functional-tests/src/test/java/corba/purgecalls/ClientORBInitializer.java b/functional-tests/src/test/java/corba/purgecalls/ClientORBInitializer.java
index bf6c6bc714..2dda62a9e1 100644
--- a/functional-tests/src/test/java/corba/purgecalls/ClientORBInitializer.java
+++ b/functional-tests/src/test/java/corba/purgecalls/ClientORBInitializer.java
@@ -25,7 +25,7 @@
 package corba.purgecalls;
 
 import corba.hcks.U;
-import org.omg.PortableInterceptor.ORBInitializer;
+
 import org.omg.PortableInterceptor.ORBInitInfo;
 
 public class ClientORBInitializer
diff --git a/functional-tests/src/test/java/corba/purgecalls/PurgecallsTest.java b/functional-tests/src/test/java/corba/purgecalls/PurgecallsTest.java
index f03c475e55..6a709376ae 100644
--- a/functional-tests/src/test/java/corba/purgecalls/PurgecallsTest.java
+++ b/functional-tests/src/test/java/corba/purgecalls/PurgecallsTest.java
@@ -24,8 +24,8 @@
 
 package corba.purgecalls;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class PurgecallsTest
     extends
diff --git a/functional-tests/src/test/java/corba/purgecalls/Server.java b/functional-tests/src/test/java/corba/purgecalls/Server.java
index ddae7369db..500e3c909d 100644
--- a/functional-tests/src/test/java/corba/purgecalls/Server.java
+++ b/functional-tests/src/test/java/corba/purgecalls/Server.java
@@ -27,6 +27,7 @@
 import corba.framework.Controller;
 import corba.hcks.C;
 import corba.hcks.U;
+
 import org.omg.CORBA.ORB;
 import org.omg.PortableServer.POA;
 
diff --git a/functional-tests/src/test/java/corba/repid/Client.java b/functional-tests/src/test/java/corba/repid/Client.java
index 1474327046..922bf11626 100644
--- a/functional-tests/src/test/java/corba/repid/Client.java
+++ b/functional-tests/src/test/java/corba/repid/Client.java
@@ -19,14 +19,14 @@
 
 package corba.repid;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA_2_3.portable.InputStream;
 import org.omg.CORBA_2_3.portable.OutputStream;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
 public class Client {
 
     public static void main(String args[]) {
diff --git a/functional-tests/src/test/java/corba/repid/RepIdTest.java b/functional-tests/src/test/java/corba/repid/RepIdTest.java
index f35f3995b8..64d475797f 100644
--- a/functional-tests/src/test/java/corba/repid/RepIdTest.java
+++ b/functional-tests/src/test/java/corba/repid/RepIdTest.java
@@ -24,10 +24,8 @@
 
 package corba.repid;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
-
-import corba.framework.*;
+import corba.framework.Controller;
 
 public class RepIdTest extends CORBATest {
     public static final String thisPackage =
diff --git a/functional-tests/src/test/java/corba/requestpartitioning/Client.java b/functional-tests/src/test/java/corba/requestpartitioning/Client.java
index 7bca211bea..6fcd7e70d7 100644
--- a/functional-tests/src/test/java/corba/requestpartitioning/Client.java
+++ b/functional-tests/src/test/java/corba/requestpartitioning/Client.java
@@ -21,9 +21,9 @@
 package corba.requestpartitioning;
 
 import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 import corba.hcks.U;
+
 import java.rmi.RemoteException;
 import java.util.Properties;
 
diff --git a/functional-tests/src/test/java/corba/requestpartitioning/RequestPartitioningTest.java b/functional-tests/src/test/java/corba/requestpartitioning/RequestPartitioningTest.java
index 40218586e7..eb8afc24c3 100644
--- a/functional-tests/src/test/java/corba/requestpartitioning/RequestPartitioningTest.java
+++ b/functional-tests/src/test/java/corba/requestpartitioning/RequestPartitioningTest.java
@@ -29,9 +29,11 @@
 package corba.requestpartitioning;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import corba.framework.Controller;
+
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 import corba.framework.Options;
+
 import java.util.Properties;
 
 public class RequestPartitioningTest
diff --git a/functional-tests/src/test/java/corba/requestpartitioning/Server.java b/functional-tests/src/test/java/corba/requestpartitioning/Server.java
index 8866ce7ca7..1584702666 100644
--- a/functional-tests/src/test/java/corba/requestpartitioning/Server.java
+++ b/functional-tests/src/test/java/corba/requestpartitioning/Server.java
@@ -19,19 +19,20 @@
 
 package corba.requestpartitioning;
 
-import java.util.Properties;
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.extension.RequestPartitioningPolicy;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.threadpool.ThreadPoolManager;
 
 import corba.framework.Options;
 import corba.hcks.U;
 
+import java.util.Properties;
+
 import org.omg.CORBA.Policy;
+import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContextExt;
 import org.omg.CosNaming.NamingContextExtHelper;
-import org.omg.CosNaming.NameComponent;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.POAHelper;
 
diff --git a/functional-tests/src/test/java/corba/requestpartitioning/TestThreadPoolManager.java b/functional-tests/src/test/java/corba/requestpartitioning/TestThreadPoolManager.java
index ab8dfa0243..1546f389cd 100644
--- a/functional-tests/src/test/java/corba/requestpartitioning/TestThreadPoolManager.java
+++ b/functional-tests/src/test/java/corba/requestpartitioning/TestThreadPoolManager.java
@@ -19,16 +19,13 @@
 
 package corba.requestpartitioning;
 
+import com.sun.corba.ee.impl.threadpool.ThreadPoolImpl;
+import com.sun.corba.ee.spi.threadpool.NoSuchThreadPoolException;
 import com.sun.corba.ee.spi.threadpool.ThreadPoolChooser;
 import com.sun.corba.ee.spi.threadpool.ThreadPoolManager;
-import com.sun.corba.ee.spi.threadpool.ThreadPool;
-import com.sun.corba.ee.spi.threadpool.NoSuchThreadPoolException;
 
-import com.sun.corba.ee.impl.threadpool.ThreadPoolImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 public class TestThreadPoolManager implements ThreadPoolManager {
 
diff --git a/functional-tests/src/test/java/corba/rmipoacounter/RMIPOACounterTest.java b/functional-tests/src/test/java/corba/rmipoacounter/RMIPOACounterTest.java
index 716d921514..7b8340c9c3 100644
--- a/functional-tests/src/test/java/corba/rmipoacounter/RMIPOACounterTest.java
+++ b/functional-tests/src/test/java/corba/rmipoacounter/RMIPOACounterTest.java
@@ -19,11 +19,16 @@
 
 package corba.rmipoacounter;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.InternalExec;
+import corba.framework.Options;
+
+import java.util.Hashtable;
+import java.util.Properties;
+
 public class RMIPOACounterTest extends CORBATest
 {
     protected Controller newClientController()
diff --git a/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java b/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java
index eb837f9551..a9ee627329 100644
--- a/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java
+++ b/functional-tests/src/test/java/corba/rmipoacounter/counterClient.java
@@ -19,13 +19,23 @@
 
 package corba.rmipoacounter;
 
-import java.util.*;
-import java.io.*;
+import corba.framework.Controller;
+import corba.framework.InternalProcess;
+
 import java.io.DataInputStream;
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
 import javax.rmi.PortableRemoteObject;
-import corba.framework.*;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public class counterClient implements InternalProcess
 {
diff --git a/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java b/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java
index f1d7e08ad4..b98ecd64a0 100644
--- a/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java
+++ b/functional-tests/src/test/java/corba/rmipoacounter/counterIF.java
@@ -19,9 +19,6 @@
 
 package corba.rmipoacounter;
 
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
 public interface counterIF extends java.rmi.Remote {
     public long increment( long invalue ) throws java.rmi.RemoteException ;
 }
diff --git a/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java b/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java
index cfed5756ab..5c6c247777 100644
--- a/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java
+++ b/functional-tests/src/test/java/corba/rmipoacounter/counterImpl.java
@@ -19,11 +19,13 @@
 
 package corba.rmipoacounter;
 
+import java.io.File;
+import java.io.RandomAccessFile;
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
+
 import org.omg.CORBA.ORB;
-import java.io.File;
-import java.io.RandomAccessFile;
 import org.omg.PortableServer.POA;
 
 public class counterImpl extends PortableRemoteObject implements counterIF
diff --git a/functional-tests/src/test/java/corba/rogueclient/Client.java b/functional-tests/src/test/java/corba/rogueclient/Client.java
index 149ee8a5a5..29dde2e34b 100644
--- a/functional-tests/src/test/java/corba/rogueclient/Client.java
+++ b/functional-tests/src/test/java/corba/rogueclient/Client.java
@@ -20,14 +20,15 @@
 
 package corba.rogueclient;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import corba.hcks.U;
+
 import java.rmi.RemoteException;
 import java.util.Properties;
 
-import javax.rmi.PortableRemoteObject;
 import javax.naming.InitialContext;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import corba.hcks.U;
+import javax.rmi.PortableRemoteObject;
 
 public class Client extends Thread
 {
diff --git a/functional-tests/src/test/java/corba/rogueclient/RogueClient.java b/functional-tests/src/test/java/corba/rogueclient/RogueClient.java
index 2cc9d0be31..e08a1ac4f1 100644
--- a/functional-tests/src/test/java/corba/rogueclient/RogueClient.java
+++ b/functional-tests/src/test/java/corba/rogueclient/RogueClient.java
@@ -19,6 +19,8 @@
 
 package corba.rogueclient;
 
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message;
 import com.sun.corba.ee.spi.ior.IOR;
 import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
 import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
@@ -27,9 +29,6 @@
 import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 import com.sun.corba.ee.spi.protocol.ClientDelegate;
 import com.sun.corba.ee.spi.transport.ContactInfoList;
-import com.sun.corba.ee.impl.misc.ORBUtility;
-import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message;
-
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -37,10 +36,11 @@
 import java.nio.ByteOrder;
 import java.nio.channels.SocketChannel;
 import java.rmi.RemoteException;
+import java.util.concurrent.atomic.AtomicInteger;
+
 import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
 
-import java.util.concurrent.atomic.AtomicInteger;
 import org.glassfish.pfl.test.JUnitReportHelper;
 
 public class RogueClient implements Runnable
diff --git a/functional-tests/src/test/java/corba/rogueclient/RogueClientTest.java b/functional-tests/src/test/java/corba/rogueclient/RogueClientTest.java
index 46a9de981d..6a1ed66a30 100644
--- a/functional-tests/src/test/java/corba/rogueclient/RogueClientTest.java
+++ b/functional-tests/src/test/java/corba/rogueclient/RogueClientTest.java
@@ -26,12 +26,14 @@
 
 package corba.rogueclient;
 
-import java.util.Properties;
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import corba.framework.Controller;
+
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 import corba.framework.Options;
 
+import java.util.Properties;
+
 public class RogueClientTest extends CORBATest {
 
     public static final String thisPackage =
diff --git a/functional-tests/src/test/java/corba/rogueclient/Server.java b/functional-tests/src/test/java/corba/rogueclient/Server.java
index 0c9da7eb55..565a038f6c 100644
--- a/functional-tests/src/test/java/corba/rogueclient/Server.java
+++ b/functional-tests/src/test/java/corba/rogueclient/Server.java
@@ -19,17 +19,16 @@
 
 package corba.rogueclient;
 
-import java.util.Properties;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import corba.framework.Options;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import org.omg.PortableServer.POA;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
 
 //
 // Created      : 2004 May 3, 2004 by Charlie Hunt
diff --git a/functional-tests/src/test/java/corba/rogueclient/TesterImpl.java b/functional-tests/src/test/java/corba/rogueclient/TesterImpl.java
index cb68cb1768..7271b68ec7 100644
--- a/functional-tests/src/test/java/corba/rogueclient/TesterImpl.java
+++ b/functional-tests/src/test/java/corba/rogueclient/TesterImpl.java
@@ -20,9 +20,10 @@
 
 package corba.rogueclient;
 
-import javax.rmi.PortableRemoteObject;
 import java.rmi.RemoteException;
 
+import javax.rmi.PortableRemoteObject;
+
 public class TesterImpl extends PortableRemoteObject implements Tester
 {
     public TesterImpl() throws RemoteException {
diff --git a/functional-tests/src/test/java/corba/systemexceptions/Client.java b/functional-tests/src/test/java/corba/systemexceptions/Client.java
index 0ba6559644..6df6bcd562 100644
--- a/functional-tests/src/test/java/corba/systemexceptions/Client.java
+++ b/functional-tests/src/test/java/corba/systemexceptions/Client.java
@@ -25,9 +25,13 @@
 package corba.systemexceptions;
 
 import com.sun.corba.ee.impl.misc.ORBUtility;
+
 import corba.framework.Controller;
 import corba.hcks.C;
 import corba.hcks.U;
+
+import javax.naming.InitialContext;
+
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.SystemException;
@@ -37,8 +41,6 @@
 import org.omg.PortableInterceptor.ORBInitInfo;
 import org.omg.PortableInterceptor.ORBInitializer;
 
-import javax.naming.InitialContext;
-
 public class Client extends org.omg.CORBA.LocalObject
     implements ORBInitializer, ClientRequestInterceptor {
 
diff --git a/functional-tests/src/test/java/corba/systemexceptions/ColocatedClientServer.java b/functional-tests/src/test/java/corba/systemexceptions/ColocatedClientServer.java
index ba925b719a..3eee3a5f75 100644
--- a/functional-tests/src/test/java/corba/systemexceptions/ColocatedClientServer.java
+++ b/functional-tests/src/test/java/corba/systemexceptions/ColocatedClientServer.java
@@ -24,11 +24,14 @@
 
 package corba.systemexceptions;
 
+import corba.hcks.C;
+import corba.hcks.U;
+
 import java.util.Properties;
+
 import javax.naming.InitialContext;
+
 import org.omg.CORBA.ORB;
-import corba.hcks.C;
-import corba.hcks.U;
 
 public class ColocatedClientServer
 {
diff --git a/functional-tests/src/test/java/corba/systemexceptions/Server.java b/functional-tests/src/test/java/corba/systemexceptions/Server.java
index 54e54a44d5..815f97a103 100644
--- a/functional-tests/src/test/java/corba/systemexceptions/Server.java
+++ b/functional-tests/src/test/java/corba/systemexceptions/Server.java
@@ -24,23 +24,32 @@
 
 package corba.systemexceptions;
 
-import javax.naming.InitialContext;
-
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.Servant;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import corba.framework.Controller;
 import corba.framework.Options;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.spi.orb.ORB;
-
 import java.rmi.Remote;
 import java.rmi.RemoteException;
+
+import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
 
-import org.omg.CORBA.*;
+import org.omg.CORBA.ACTIVITY_COMPLETED;
+import org.omg.CORBA.ACTIVITY_REQUIRED;
+import org.omg.CORBA.BAD_QOS;
+import org.omg.CORBA.CODESET_INCOMPATIBLE;
+import org.omg.CORBA.CompletionStatus;
+import org.omg.CORBA.INVALID_ACTIVITY;
+import org.omg.CORBA.REBIND;
+import org.omg.CORBA.TIMEOUT;
+import org.omg.CORBA.TRANSACTION_MODE;
+import org.omg.CORBA.TRANSACTION_UNAVAILABLE;
+import org.omg.CORBA.UNKNOWN;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
 
 interface rmiiI extends Remote {
     void invoke(int excType) throws RemoteException;
diff --git a/functional-tests/src/test/java/corba/systemexceptions/SystemExceptionsTest.java b/functional-tests/src/test/java/corba/systemexceptions/SystemExceptionsTest.java
index cc8653dfb5..358baea42f 100644
--- a/functional-tests/src/test/java/corba/systemexceptions/SystemExceptionsTest.java
+++ b/functional-tests/src/test/java/corba/systemexceptions/SystemExceptionsTest.java
@@ -24,12 +24,11 @@
 
 package corba.systemexceptions;
 
-import java.util.Properties;
-
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
-import corba.framework.*;
+import java.util.Properties;
 
 public class SystemExceptionsTest extends CORBATest {
     public static final String thisPackage =
diff --git a/functional-tests/src/test/java/corba/unarrow/Client.java b/functional-tests/src/test/java/corba/unarrow/Client.java
index be2e9311de..1d502b2552 100644
--- a/functional-tests/src/test/java/corba/unarrow/Client.java
+++ b/functional-tests/src/test/java/corba/unarrow/Client.java
@@ -19,13 +19,14 @@
 
 package corba.unarrow;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
-
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
 public class Client
 {
     static Hello helloRef;
diff --git a/functional-tests/src/test/java/corba/unarrow/Server.java b/functional-tests/src/test/java/corba/unarrow/Server.java
index 938002122a..1a6449eae8 100644
--- a/functional-tests/src/test/java/corba/unarrow/Server.java
+++ b/functional-tests/src/test/java/corba/unarrow/Server.java
@@ -19,11 +19,11 @@
 
 package corba.unarrow;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
-import java.util.Properties;
-import org.omg.PortableServer.*;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 /**
  * Servant implementation
diff --git a/functional-tests/src/test/java/corba/unarrow/UncheckedNarrowTest.java b/functional-tests/src/test/java/corba/unarrow/UncheckedNarrowTest.java
index 3b7639024a..a9542d82fe 100644
--- a/functional-tests/src/test/java/corba/unarrow/UncheckedNarrowTest.java
+++ b/functional-tests/src/test/java/corba/unarrow/UncheckedNarrowTest.java
@@ -19,9 +19,8 @@
 
 package corba.unarrow;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * This is a POA version of the mthello test.  The
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BitSet.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BitSet.java
index dfb298f0ba..2b5a4894e4 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BitSet.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BitSet.java
@@ -19,7 +19,7 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.io.*;
+import java.io.IOException;
 
 /**
  * This class implements a vector of bits that grows as needed. Each
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BudgetSummary.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BudgetSummary.java
index 10156c7b2a..5b0c28b4e2 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BudgetSummary.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/BudgetSummary.java
@@ -20,7 +20,6 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.lang.reflect.Array;
 import java.io.Serializable;
 
 public class BudgetSummary implements Serializable
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectFour.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectFour.java
index 9da59f1b13..8a33edf81d 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectFour.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectFour.java
@@ -20,8 +20,11 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Random;
 
 public class ComplexTestObjectFour implements Externalizable
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectOne.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectOne.java
index 3aabdb701b..5d0bc381a5 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectOne.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectOne.java
@@ -20,8 +20,8 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.io.Serializable;
+import java.util.Random;
 
 public class ComplexTestObjectOne implements Serializable
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectThree.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectThree.java
index de9b9a9132..6f44b4c262 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectThree.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectThree.java
@@ -20,8 +20,8 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.io.Serializable;
+import java.util.Random;
 
 public class ComplexTestObjectThree implements Serializable
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwo.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwo.java
index 7d581bdc7f..341cad0cbe 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwo.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwo.java
@@ -20,8 +20,11 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Random;
 
 public class ComplexTestObjectTwo implements Serializable
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoDelta.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoDelta.java
index bb148a315b..bd4ddd1a64 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoDelta.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoDelta.java
@@ -20,8 +20,10 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Random;
 
 public class ComplexTestObjectTwoDelta implements Serializable
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclass.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclass.java
index cbc9cf3415..dec0f18340 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclass.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclass.java
@@ -20,9 +20,6 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
-
 public class ComplexTestObjectTwoSubclass extends ComplexTestObjectTwo
 {
 
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclassDefaults.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclassDefaults.java
index c22b5b2ca6..481a14e98e 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclassDefaults.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectTwoSubclassDefaults.java
@@ -20,8 +20,9 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 public class ComplexTestObjectTwoSubclassDefaults extends ComplexTestObjectTwo
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectXXX.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectXXX.java
index 6e5f19aae5..a2bf317110 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectXXX.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/ComplexTestObjectXXX.java
@@ -20,8 +20,8 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.io.Serializable;
+import java.util.Random;
 
 public class ComplexTestObjectXXX implements Serializable
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/EmptyTestObject.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/EmptyTestObject.java
index 704ecd93ab..2a7100a383 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/EmptyTestObject.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/EmptyTestObject.java
@@ -20,10 +20,6 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-
 public class EmptyTestObject implements java.io.Serializable
 {
 
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/Graph.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/Graph.java
index 5871596b4d..0e48c26bce 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/Graph.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/Graph.java
@@ -21,9 +21,7 @@
 package javax.rmi.CORBA.serialization;
 
 // Class from Sun
-
-
-import java.io.*;
+import java.io.Serializable;
 
 public class Graph implements Serializable {
 
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValue.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValue.java
index 5e14a72fc3..0281a1f4ff 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValue.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValue.java
@@ -20,8 +20,7 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.util.Random;
 
 public class IDLValue implements org.omg.CORBA.portable.IDLEntity
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValueHelper.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValueHelper.java
index 5c6457e7a7..748f5414f0 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValueHelper.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IDLValueHelper.java
@@ -20,10 +20,6 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.TypeCode;
-
 public abstract class IDLValueHelper
 {
     public static void insert (org.omg.CORBA.Any a, IDLValue that)
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java
index 05b7b6761d..407d226ed4 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/IIOPPerformance.java
@@ -29,13 +29,10 @@
 
 package javax.rmi.CORBA.serialization;
 
-import javax.rmi.CORBA.serialization.*;
-import javax.rmi.CORBA.*;
-import rmic.ObjectByValue;
-
-import java.io.*;
 import java.util.Properties;
 
+import rmic.ObjectByValue;
+
 public class IIOPPerformance extends test.Test
 {
     public void run()
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/JRMPPerformance.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/JRMPPerformance.java
index 95275627ca..cd8a8837f2 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/JRMPPerformance.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/JRMPPerformance.java
@@ -29,11 +29,12 @@
 
 package javax.rmi.CORBA.serialization;
 
-import javax.rmi.CORBA.serialization.*;
-import javax.rmi.CORBA.*;
-import rmic.ObjectByValue;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
-import java.io.*;
+import rmic.ObjectByValue;
 
 public class JRMPPerformance extends test.Test
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectCustomImpl.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectCustomImpl.java
index 1ad941f974..82a1a3912d 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectCustomImpl.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectCustomImpl.java
@@ -20,8 +20,7 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.util.Random;
 
 public class OBVTestObjectCustomImpl extends OBVTestObjectCustom {
     private static Random r = new Random();
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectOneImpl.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectOneImpl.java
index 066f280f0e..bfbc75dff5 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectOneImpl.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/OBVTestObjectOneImpl.java
@@ -20,8 +20,7 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.util.Random;
 
 public class OBVTestObjectOneImpl extends OBVTestObjectOne
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/SerializationTest.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/SerializationTest.java
index 626690438a..64ab85dcd9 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/SerializationTest.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/SerializationTest.java
@@ -34,17 +34,19 @@
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.util.Properties;
 import java.util.HashMap;
+import java.util.Properties;
 import java.util.Random;
 import java.util.Vector;
 import java.util.concurrent.ConcurrentHashMap;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
-import rmic.ObjectByValue;
-import org.omg.CORBA.WStringValueHelper;
-import org.omg.CORBA.SystemException;
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.MARSHAL;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.WStringValueHelper;
+
+import rmic.ObjectByValue;
 
 public class SerializationTest extends test.Test
 {
diff --git a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/TestOBV2.java b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/TestOBV2.java
index 938e5fd308..150e68dc99 100644
--- a/functional-tests/src/test/java/javax/rmi/CORBA/serialization/TestOBV2.java
+++ b/functional-tests/src/test/java/javax/rmi/CORBA/serialization/TestOBV2.java
@@ -20,8 +20,7 @@
 
 package javax.rmi.CORBA.serialization;
 
-import java.util.*;
-import java.io.*;
+import java.util.Random;
 
 public class TestOBV2 extends TestOBV implements java.io.Serializable {
     public int bar;
diff --git a/functional-tests/src/test/java/javax/rmi/PortableContext.java b/functional-tests/src/test/java/javax/rmi/PortableContext.java
index 0be8f085ba..91f3dc0445 100644
--- a/functional-tests/src/test/java/javax/rmi/PortableContext.java
+++ b/functional-tests/src/test/java/javax/rmi/PortableContext.java
@@ -23,13 +23,7 @@
 
 import com.sun.corba.ee.impl.util.Utility;
 import com.sun.corba.ee.spi.JndiConstants;
-import org.omg.CORBA.ORB;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.CORBA.Tie;
-import javax.rmi.CORBA.Util;
 import java.io.IOException;
 import java.rmi.RMISecurityManager;
 import java.rmi.Remote;
@@ -41,6 +35,14 @@
 import java.util.Properties;
 import java.util.Vector;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.rmi.CORBA.Tie;
+import javax.rmi.CORBA.Util;
+
+import org.omg.CORBA.ORB;
+
 /**
  * PortableContext is a convenience class for rmi-iiop programs which simplifies
  * both server and client initialization. Server-side features include:
diff --git a/functional-tests/src/test/java/javax/rmi/download/SecurityManager.java b/functional-tests/src/test/java/javax/rmi/download/SecurityManager.java
index 798f99a0a2..b3937f8a39 100644
--- a/functional-tests/src/test/java/javax/rmi/download/SecurityManager.java
+++ b/functional-tests/src/test/java/javax/rmi/download/SecurityManager.java
@@ -20,10 +20,7 @@
 package javax.rmi.download;
 
 import java.io.FileDescriptor;
-import java.util.Hashtable;
 import java.net.InetAddress;
-import java.lang.reflect.Member;
-//import java.security.*;
 
 public class SecurityManager extends java.rmi.RMISecurityManager {
 
diff --git a/functional-tests/src/test/java/javax/rmi/download/TheClient.java b/functional-tests/src/test/java/javax/rmi/download/TheClient.java
index 9d75d42ee1..9cf96a3b0e 100644
--- a/functional-tests/src/test/java/javax/rmi/download/TheClient.java
+++ b/functional-tests/src/test/java/javax/rmi/download/TheClient.java
@@ -21,16 +21,18 @@
 package javax.rmi.download;
 
 import com.sun.corba.ee.spi.JndiConstants;
-import org.omg.CORBA.ORB;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Hashtable;
 import java.util.Properties;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.ORB;
+
 public class TheClient {
 
     private static String[] myArgs = new String[]{"-ORBInitialPort" , "1050" };
diff --git a/functional-tests/src/test/java/javax/rmi/download/TheServer.java b/functional-tests/src/test/java/javax/rmi/download/TheServer.java
index 35f1676658..96f1e2354b 100644
--- a/functional-tests/src/test/java/javax/rmi/download/TheServer.java
+++ b/functional-tests/src/test/java/javax/rmi/download/TheServer.java
@@ -21,14 +21,16 @@
 package javax.rmi.download;
 
 import com.sun.corba.ee.spi.JndiConstants;
-import org.omg.CORBA.ORB;
+
+import java.util.Hashtable;
+import java.util.Properties;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.rmi.CORBA.Tie;
 import javax.rmi.PortableRemoteObject;
-import java.util.Hashtable;
-import java.util.Properties;
+import javax.rmi.CORBA.Tie;
+
+import org.omg.CORBA.ORB;
 
 public class TheServer {
 
diff --git a/functional-tests/src/test/java/javax/rmi/download/TheTest.java b/functional-tests/src/test/java/javax/rmi/download/TheTest.java
index c9d93ab177..09b8ca002d 100644
--- a/functional-tests/src/test/java/javax/rmi/download/TheTest.java
+++ b/functional-tests/src/test/java/javax/rmi/download/TheTest.java
@@ -21,19 +21,22 @@
 package javax.rmi.download;
 
 import com.sun.corba.ee.spi.JndiConstants;
-import org.glassfish.pfl.test.JUnitReportHelper;
-import org.omg.CORBA.ORB;
-import test.Util;
-import test.WebServer;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
 import java.io.File;
 import java.util.Hashtable;
 import java.util.Properties;
 import java.util.Vector;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.glassfish.pfl.test.JUnitReportHelper;
+import org.omg.CORBA.ORB;
+
+import test.Util;
+import test.WebServer;
+
 /*
  * @test
  */
diff --git a/functional-tests/src/test/java/mantis/m4764130/Client.java b/functional-tests/src/test/java/mantis/m4764130/Client.java
index bb45891105..c479498eb6 100644
--- a/functional-tests/src/test/java/mantis/m4764130/Client.java
+++ b/functional-tests/src/test/java/mantis/m4764130/Client.java
@@ -24,10 +24,14 @@
 
 package mantis.m4764130;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public class Client
 {
diff --git a/functional-tests/src/test/java/mantis/m4764130/Interceptor.java b/functional-tests/src/test/java/mantis/m4764130/Interceptor.java
index 52e6081b57..61053c7b5e 100644
--- a/functional-tests/src/test/java/mantis/m4764130/Interceptor.java
+++ b/functional-tests/src/test/java/mantis/m4764130/Interceptor.java
@@ -24,20 +24,17 @@
 
 package mantis.m4764130;
 
-import java.util.Properties;
+import com.sun.corba.ee.spi.servicecontext.SendingContextServiceContext;
+
 import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
 import org.omg.IOP.ServiceContext;
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.ORBInitInfo;
 import org.omg.PortableInterceptor.ORBInitializer;
-import org.omg.PortableInterceptor.ServerRequestInterceptor;
 import org.omg.PortableInterceptor.ServerRequestInfo;
-import com.sun.corba.ee.spi.servicecontext.SendingContextServiceContext;
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
 public class Interceptor
     extends
diff --git a/functional-tests/src/test/java/mantis/m4764130/SendingContextTest.java b/functional-tests/src/test/java/mantis/m4764130/SendingContextTest.java
index fe70f9aaff..15bf499109 100644
--- a/functional-tests/src/test/java/mantis/m4764130/SendingContextTest.java
+++ b/functional-tests/src/test/java/mantis/m4764130/SendingContextTest.java
@@ -24,11 +24,8 @@
 
 package mantis.m4764130;
 
-import java.util.Properties;
-import corba.framework.Controller;
 import corba.framework.CORBATest;
-import corba.framework.Options;
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import corba.framework.Controller;
 
 public class SendingContextTest extends CORBATest {
 
diff --git a/functional-tests/src/test/java/mantis/m4764130/Server.java b/functional-tests/src/test/java/mantis/m4764130/Server.java
index 1329ed7b7a..1946f59025 100644
--- a/functional-tests/src/test/java/mantis/m4764130/Server.java
+++ b/functional-tests/src/test/java/mantis/m4764130/Server.java
@@ -24,11 +24,15 @@
 
 package mantis.m4764130;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableServer.POA;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 class HelloImpl
     extends
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/ClientCommon.java b/functional-tests/src/test/java/pi/clientinterceptor/ClientCommon.java
index 80d7d0578a..4621479489 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/ClientCommon.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/ClientCommon.java
@@ -20,8 +20,10 @@
 package pi.clientinterceptor;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.io.PrintStream;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.UNKNOWN;
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/ClientInterceptorTest.java b/functional-tests/src/test/java/pi/clientinterceptor/ClientInterceptorTest.java
index 660539e52a..5cbf20f493 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/ClientInterceptorTest.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/ClientInterceptorTest.java
@@ -19,8 +19,8 @@
 
 package pi.clientinterceptor;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * Tests ClientInterceptor as per Portable Interceptors spec
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/DIIPOAClient.java b/functional-tests/src/test/java/pi/clientinterceptor/DIIPOAClient.java
index b1bc779ba5..fa4d5492dc 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/DIIPOAClient.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/DIIPOAClient.java
@@ -19,18 +19,17 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+import corba.framework.InternalProcess;
 
 /**
  * Tests DII POA Remote invocation
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/DIIPOALocalClient.java b/functional-tests/src/test/java/pi/clientinterceptor/DIIPOALocalClient.java
index eb8158ef09..b507bb7f85 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/DIIPOALocalClient.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/DIIPOALocalClient.java
@@ -19,18 +19,17 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 /**
  * Tests DII POA Local invocation (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/DIIRMILocalClient.java b/functional-tests/src/test/java/pi/clientinterceptor/DIIRMILocalClient.java
index 9f9cc255c7..78bc3897e5 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/DIIRMILocalClient.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/DIIRMILocalClient.java
@@ -19,18 +19,16 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 /**
  * Tests DII RMI Local invocation
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/OldRMILocalServer.java b/functional-tests/src/test/java/pi/clientinterceptor/OldRMILocalServer.java
index b36a82e8f7..cbef7a0ab8 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/OldRMILocalServer.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/OldRMILocalServer.java
@@ -19,19 +19,13 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
 
 /**
  * Server for RMI/IIOP version of test.  Uses old _*ImplBase skeletons.
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/OldRMIServer.java b/functional-tests/src/test/java/pi/clientinterceptor/OldRMIServer.java
index b6e54ce9d7..4788256411 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/OldRMIServer.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/OldRMIServer.java
@@ -19,19 +19,15 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.ORB;
 
 /**
  * Server for RMI/IIOP version of test.  Uses old _*ImplBase skeletons.
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/POAClient.java b/functional-tests/src/test/java/pi/clientinterceptor/POAClient.java
index b1c3f2a471..f9d726f7fb 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/POAClient.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/POAClient.java
@@ -19,18 +19,20 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+import ClientRequestInterceptor.hello;
+import ClientRequestInterceptor.helloHelper;
 
 /**
  * Tests POA Remote invocation
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/POALocalClient.java b/functional-tests/src/test/java/pi/clientinterceptor/POALocalClient.java
index b52b694e62..2b6acbb66a 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/POALocalClient.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/POALocalClient.java
@@ -19,18 +19,20 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+import ClientRequestInterceptor.hello;
+import ClientRequestInterceptor.helloHelper;
 
 /**
  * Tests POA Local invocation (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/POALocalServer.java b/functional-tests/src/test/java/pi/clientinterceptor/POALocalServer.java
index 61e9365a7f..7c66e0fbc5 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/POALocalServer.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/POALocalServer.java
@@ -19,20 +19,15 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*; // hello interface
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 public class POALocalServer {
     // Set from run()
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/POAServer.java b/functional-tests/src/test/java/pi/clientinterceptor/POAServer.java
index 20af4127f8..ff5cd2770e 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/POAServer.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/POAServer.java
@@ -19,20 +19,18 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*; // hello interface
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 public class POAServer
     implements InternalProcess
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/RMIClient.java b/functional-tests/src/test/java/pi/clientinterceptor/RMIClient.java
index d58f766880..2efa49b940 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/RMIClient.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/RMIClient.java
@@ -19,20 +19,15 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.rmi.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
-import javax.rmi.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
 
 public class RMIClient
     extends ClientCommon
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/RMILocalClient.java b/functional-tests/src/test/java/pi/clientinterceptor/RMILocalClient.java
index 67fe637b2b..8b39fc9653 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/RMILocalClient.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/RMILocalClient.java
@@ -19,21 +19,15 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ClientRequestInterceptor.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
 
 /**
  * Tests RMI Local invocation (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/RMILocalServer.java b/functional-tests/src/test/java/pi/clientinterceptor/RMILocalServer.java
index 34f3b4f2b3..e1026ff0fa 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/RMILocalServer.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/RMILocalServer.java
@@ -19,19 +19,13 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
 
 /**
  * Server for RMI/IIOP version of test
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/RMIServer.java b/functional-tests/src/test/java/pi/clientinterceptor/RMIServer.java
index f018699f96..a1ee046201 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/RMIServer.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/RMIServer.java
@@ -19,19 +19,15 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.ORB;
 
 /**
  * Server for RMI/IIOP version of test
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/SampleClientRequestInterceptor.java b/functional-tests/src/test/java/pi/clientinterceptor/SampleClientRequestInterceptor.java
index 3d59fe1e44..e370262abe 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/SampleClientRequestInterceptor.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/SampleClientRequestInterceptor.java
@@ -19,15 +19,12 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-
-import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.CORBA.UNKNOWN;
 import org.omg.PortableInterceptor.ClientRequestInfo;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.RequestInfo;
 
-//import ORBInitTest.*;
-
 /**
  * Sample ClientRequestInterceptor for use in testing
  */
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/TestInitializer.java b/functional-tests/src/test/java/pi/clientinterceptor/TestInitializer.java
index bb5f62e1f7..81617f2ef6 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/TestInitializer.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/TestInitializer.java
@@ -19,14 +19,12 @@
 
 package pi.clientinterceptor;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
-
-import ClientRequestInterceptor.*; // hello interface
+import org.omg.CORBA.ORB;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 /**
  * Registers the necessary Client Interceptors to test
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/helloDIIClientStub.java b/functional-tests/src/test/java/pi/clientinterceptor/helloDIIClientStub.java
index 5a161bd757..05d07db633 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/helloDIIClientStub.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/helloDIIClientStub.java
@@ -19,9 +19,13 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
+import org.omg.CORBA.ARG_IN;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.NamedValue;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Request;
 
 /**
  * Utility class to encapsulate the logic to make DII calls on the
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/helloDelegate.java b/functional-tests/src/test/java/pi/clientinterceptor/helloDelegate.java
index d62f2a328d..b42b4b043e 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/helloDelegate.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/helloDelegate.java
@@ -19,14 +19,10 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.util.Observable;
 
-import java.io.*;
-import javax.rmi.*;
-import javax.naming.*;
-import java.util.*;
-
-import ClientRequestInterceptor.*; // hello interface
+import org.omg.CORBA.UNKNOWN;
 
 /**
  * Contains the actual implementations of hello operations.
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/helloOldRMIIIOP.java b/functional-tests/src/test/java/pi/clientinterceptor/helloOldRMIIIOP.java
index a022eb678e..493066bc53 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/helloOldRMIIIOP.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/helloOldRMIIIOP.java
@@ -19,14 +19,11 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
 
-import java.io.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
-
-import ClientRequestInterceptor.*; // hello interface
+// hello interface
+import ClientRequestInterceptor._helloImplBase;
 
 /**
  * ClientDelegate implementation with old stubs.
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/helloRMIIIOP.java b/functional-tests/src/test/java/pi/clientinterceptor/helloRMIIIOP.java
index e8a40a35ad..b1bdcd2139 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/helloRMIIIOP.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/helloRMIIIOP.java
@@ -19,14 +19,10 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
 
-import java.io.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
-
-import ClientRequestInterceptor.*; // hello interface
+import javax.rmi.PortableRemoteObject;
 
 /**
  * RMI/IIOP implementation.
diff --git a/functional-tests/src/test/java/pi/clientinterceptor/helloServant.java b/functional-tests/src/test/java/pi/clientinterceptor/helloServant.java
index e16cdace38..e76d50387f 100644
--- a/functional-tests/src/test/java/pi/clientinterceptor/helloServant.java
+++ b/functional-tests/src/test/java/pi/clientinterceptor/helloServant.java
@@ -19,12 +19,10 @@
 
 package pi.clientinterceptor;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInterceptor.*; // hello interface
+// hello interface
+import ClientRequestInterceptor.helloPOA;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/AttributesValidStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/AttributesValidStrategy.java
index cc68dd7f20..f05b5d9e86 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/AttributesValidStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/AttributesValidStrategy.java
@@ -19,10 +19,10 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.Messaging.*;
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.Messaging.SYNC_WITH_TRANSPORT;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Strategy to test operations()
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/ClientCommon.java b/functional-tests/src/test/java/pi/clientrequestinfo/ClientCommon.java
index 6f8f57c7f9..68a5654e59 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/ClientCommon.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/ClientCommon.java
@@ -20,8 +20,10 @@
 package pi.clientrequestinfo;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.io.PrintStream;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/ClientRequestInfoTest.java b/functional-tests/src/test/java/pi/clientrequestinfo/ClientRequestInfoTest.java
index e247751983..5ee2e71c1b 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/ClientRequestInfoTest.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/ClientRequestInfoTest.java
@@ -19,8 +19,8 @@
 
 package pi.clientrequestinfo;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * Tests ClientRequestInfo as per Portable Interceptors spec
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOAClient.java b/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOAClient.java
index ef7a6b8d8b..eaf1a90a9c 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOAClient.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOAClient.java
@@ -19,18 +19,16 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInfo.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 /**
  * Tests DII POA Remote invocation
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOALocalClient.java b/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOALocalClient.java
index b2045c54e2..ffd74c9c8b 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOALocalClient.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/DIIPOALocalClient.java
@@ -19,18 +19,16 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInfo.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 /**
  * Tests DII POA Local invocation (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/DIIRMILocalClient.java b/functional-tests/src/test/java/pi/clientrequestinfo/DIIRMILocalClient.java
index 2011c059e7..6f83c290a6 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/DIIRMILocalClient.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/DIIRMILocalClient.java
@@ -19,18 +19,16 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInfo.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 /**
  * Tests DII RMI Local invocation (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/DynamicStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/DynamicStrategy.java
index 22f29aa316..e967f29180 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/DynamicStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/DynamicStrategy.java
@@ -19,13 +19,15 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.Messaging.*;
-import org.omg.Dynamic.*;
-
-import ClientRequestInfo.*;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.TCKind;
+import org.omg.CORBA.TypeCode;
+import org.omg.Dynamic.Parameter;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
+
+import ClientRequestInfo.ExampleExceptionHelper;
 
 /**
  * Strategy to test DII dynamic operations.  This was originally its own
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/EffectiveProfileStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/EffectiveProfileStrategy.java
index bc28153457..578bff7ba8 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/EffectiveProfileStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/EffectiveProfileStrategy.java
@@ -19,9 +19,10 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
+import org.omg.IOP.TAG_INTERNET_IOP;
+import org.omg.IOP.TaggedProfile;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Strategy to test effective_profile
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/ExceptionStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/ExceptionStrategy.java
index df8dba982e..7e11901c66 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/ExceptionStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/ExceptionStrategy.java
@@ -19,12 +19,17 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.misc.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import ClientRequestInfo.*;
-import org.omg.CORBA.*;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.UNKNOWN;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
+
+import ClientRequestInfo.ExampleException;
+import ClientRequestInfo.ExampleExceptionHelper;
 
 /**
  * Strategy to test received_exception() and received_exception_id().
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/ForwardReferenceStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/ForwardReferenceStrategy.java
index 4e32685073..a7b1dfe317 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/ForwardReferenceStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/ForwardReferenceStrategy.java
@@ -19,9 +19,9 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Strategy to test forward_reference
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InterceptorStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/InterceptorStrategy.java
index 49f825c1d0..8682feb09f 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InterceptorStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InterceptorStrategy.java
@@ -19,8 +19,8 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Base class for all client request interceptor strategies used in this
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeDynamic.java b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeDynamic.java
index 472effdf71..4bd53a2d46 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeDynamic.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeDynamic.java
@@ -19,11 +19,10 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.UNKNOWN;
+import org.omg.CORBA.UnknownUserException;
 
-import ClientRequestInfo.*;
+import ClientRequestInfo.ExampleException;
 
 /**
  * Invocation strategy in which each interception point is visited, similar
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeExceptions.java b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeExceptions.java
index e385ccc5e7..91137b3ea7 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeExceptions.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeExceptions.java
@@ -19,10 +19,10 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
-import ClientRequestInfo.*;
+import org.omg.CORBA.UNKNOWN;
+import org.omg.CORBA.UnknownUserException;
+
+import ClientRequestInfo.ExampleException;
 
 /**
  * Invocation strategy in which three calls are made.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeOneWay.java b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeOneWay.java
index dab83b868f..4642eae06e 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeOneWay.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeOneWay.java
@@ -19,10 +19,6 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
-
 /**
  * Invocation strategy in which two requests are sent, one that is not oneway
  * and one that is oneway, in that order.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeRecursive.java b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeRecursive.java
index 94d662a64d..e2b511435f 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeRecursive.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeRecursive.java
@@ -19,10 +19,6 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
-
 /**
  * Invocation strategy in which a recursive call is made, causing
  * send_request and receive_reply to be invoked twice, as follows:
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeStrategy.java
index 71c83acb12..c299a29790 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeStrategy.java
@@ -19,9 +19,6 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-
 /**
  * Base class for all invocation strategies used in this test.  This allows
  * for dynamic behavior modifications between test cases of which objects
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAll.java b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAll.java
index 8035bda646..52400be327 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAll.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAll.java
@@ -19,9 +19,7 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.UNKNOWN;
 
 /**
  * Invocation strategy in which each interception point is visited.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAllForward.java b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAllForward.java
index 5846b0dfb6..8419ecbc75 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAllForward.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/InvokeVisitAllForward.java
@@ -19,9 +19,7 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.UNKNOWN;
 
 /**
  * Invocation strategy in which each interception point is visited.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/OldRMILocalServer.java b/functional-tests/src/test/java/pi/clientrequestinfo/OldRMILocalServer.java
index 3d3e2bea48..cda54af31b 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/OldRMILocalServer.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/OldRMILocalServer.java
@@ -19,19 +19,13 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
 
 /**
  * Server for RMI/IIOP version of test.  Uses old _*ImplBase skeletons.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/OldRMIServer.java b/functional-tests/src/test/java/pi/clientrequestinfo/OldRMIServer.java
index 6b234596a7..f412161c30 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/OldRMIServer.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/OldRMIServer.java
@@ -19,19 +19,15 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.ORB;
 
 /**
  * Server for RMI/IIOP version of test.  Uses old _*ImplBase skeletons.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/OneWayStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/OneWayStrategy.java
index 980aa3c813..da46af342f 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/OneWayStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/OneWayStrategy.java
@@ -19,8 +19,8 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Strategy to test response_expected()
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/POAClient.java b/functional-tests/src/test/java/pi/clientrequestinfo/POAClient.java
index 337eb555a7..27bd74017f 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/POAClient.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/POAClient.java
@@ -19,18 +19,19 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInfo.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+import ClientRequestInfo.hello;
+import ClientRequestInfo.helloHelper;
 
 /**
  * Tests POA Remote invocation
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/POALocalClient.java b/functional-tests/src/test/java/pi/clientrequestinfo/POALocalClient.java
index 6915eca283..4618d9b36f 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/POALocalClient.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/POALocalClient.java
@@ -19,18 +19,19 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInfo.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+import ClientRequestInfo.hello;
+import ClientRequestInfo.helloHelper;
 
 /**
  * Tests POA Local invocation (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/POALocalServer.java b/functional-tests/src/test/java/pi/clientrequestinfo/POALocalServer.java
index be4e566a94..40744d0f47 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/POALocalServer.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/POALocalServer.java
@@ -19,20 +19,15 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInfo.*; // hello interface
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 public class POALocalServer {
     // Set from run()
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/POAServer.java b/functional-tests/src/test/java/pi/clientrequestinfo/POAServer.java
index 272c7c4c3b..8ad134ea37 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/POAServer.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/POAServer.java
@@ -19,20 +19,18 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-
-import ClientRequestInfo.*; // hello interface
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 public class POAServer
     implements InternalProcess
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/RMIClient.java b/functional-tests/src/test/java/pi/clientrequestinfo/RMIClient.java
index 74db1c35d2..24f4999d6f 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/RMIClient.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/RMIClient.java
@@ -19,20 +19,15 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-
-import java.rmi.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
-import javax.rmi.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
 
 public class RMIClient
     extends ClientCommon
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalClient.java b/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalClient.java
index a4c11ae834..51eddadb51 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalClient.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalClient.java
@@ -19,21 +19,15 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
+import corba.framework.InternalProcess;
 
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
 
-import ClientRequestInfo.*;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
 
 /**
  * Tests RMI Local invocation (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalServer.java b/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalServer.java
index ef731f46e3..a0c232e60f 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalServer.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/RMILocalServer.java
@@ -19,19 +19,13 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Observable;
+import java.util.Observer;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
 
 /**
  * Server for RMI/IIOP version of test
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/RMIServer.java b/functional-tests/src/test/java/pi/clientrequestinfo/RMIServer.java
index 423bf2b5f2..c146a4d87b 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/RMIServer.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/RMIServer.java
@@ -19,19 +19,15 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-
-import java.util.*;
-import java.io.*;
-import javax.naming.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.ORB;
 
 /**
  * Server for RMI/IIOP version of test
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/RequestId1Strategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/RequestId1Strategy.java
index fdf6bd24c9..07633f74ff 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/RequestId1Strategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/RequestId1Strategy.java
@@ -19,8 +19,8 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Strategy to test request_id.1
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/RequestId2Strategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/RequestId2Strategy.java
index 63d7cde0ae..6c7883f4c1 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/RequestId2Strategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/RequestId2Strategy.java
@@ -19,8 +19,8 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Strategy to test request_id.2
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/SampleClientRequestInterceptor.java b/functional-tests/src/test/java/pi/clientrequestinfo/SampleClientRequestInterceptor.java
index 50488a7116..2bef62e723 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/SampleClientRequestInterceptor.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/SampleClientRequestInterceptor.java
@@ -19,11 +19,10 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-
-import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.PortableInterceptor.ClientRequestInfo;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Sample ClientRequestInterceptor for use in testing.  This interceptor
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/ServiceContextStrategy.java b/functional-tests/src/test/java/pi/clientrequestinfo/ServiceContextStrategy.java
index a119650836..d3b62653c7 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/ServiceContextStrategy.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/ServiceContextStrategy.java
@@ -19,12 +19,15 @@
 
 package pi.clientrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
 import com.sun.corba.ee.spi.servicecontext.ORBVersionServiceContext;
-import org.omg.CORBA.*;
-import java.util.*;
+
+import java.util.Arrays;
+
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.IOP.ServiceContext;
+import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Strategy to test get_request_service_context and get_reply_service_context.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/TestInitializer.java b/functional-tests/src/test/java/pi/clientrequestinfo/TestInitializer.java
index 17f5037879..7ae1d093e3 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/TestInitializer.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/TestInitializer.java
@@ -19,14 +19,12 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
-
-import ClientRequestInfo.*; // hello interface
+import org.omg.CORBA.ORB;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 /**
  * Registers the necessary Client Interceptors to test
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/helloDIIClientStub.java b/functional-tests/src/test/java/pi/clientrequestinfo/helloDIIClientStub.java
index 69442e2886..c3526942be 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/helloDIIClientStub.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/helloDIIClientStub.java
@@ -19,11 +19,19 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import ClientRequestInfo.*;
+import org.omg.CORBA.ARG_IN;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.ContextList;
+import org.omg.CORBA.Environment;
+import org.omg.CORBA.ExceptionList;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.NamedValue;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Request;
+import org.omg.CORBA.UnknownUserException;
+
+import ClientRequestInfo.ExampleException;
+import ClientRequestInfo.ExampleExceptionHelper;
 
 /**
  * Utility class to encapsulate the logic to make DII calls on the
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/helloDelegate.java b/functional-tests/src/test/java/pi/clientrequestinfo/helloDelegate.java
index 7cea9d96bf..a6d0d38c4e 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/helloDelegate.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/helloDelegate.java
@@ -19,14 +19,13 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.util.Observable;
 
-import java.io.*;
-import javax.rmi.*;
-import javax.naming.*;
-import java.util.*;
+import org.omg.CORBA.UNKNOWN;
 
-import ClientRequestInfo.*; // hello interface
+// hello interface
+import ClientRequestInfo.ExampleException;
 
 /**
  * Contains the actual implementations of hello operations.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/helloIF.java b/functional-tests/src/test/java/pi/clientrequestinfo/helloIF.java
index e74d32cb4b..19130c2dde 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/helloIF.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/helloIF.java
@@ -21,8 +21,8 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import org.omg.CORBA.*;
-import ClientRequestInfo.*;
+
+import ClientRequestInfo.ExampleException;
 
 /**
  * Hello interface for RMI-IIOP version of test
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/helloOldRMIIIOP.java b/functional-tests/src/test/java/pi/clientrequestinfo/helloOldRMIIIOP.java
index 77626c5b78..4dad0275c2 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/helloOldRMIIIOP.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/helloOldRMIIIOP.java
@@ -19,15 +19,12 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
 
-import java.io.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
-import org.omg.CORBA.*;
-
-import ClientRequestInfo.*; // hello interface
+// hello interface
+import ClientRequestInfo.ExampleException;
+import ClientRequestInfo._helloImplBase;
 
 /**
  * ClientDelegate implementation with old stubs.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/helloRMIIIOP.java b/functional-tests/src/test/java/pi/clientrequestinfo/helloRMIIIOP.java
index de2372f796..6c63fa96a9 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/helloRMIIIOP.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/helloRMIIIOP.java
@@ -19,15 +19,13 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
 
-import java.io.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
-import org.omg.CORBA.*;
+import javax.rmi.PortableRemoteObject;
 
-import ClientRequestInfo.*; // hello interface
+// hello interface
+import ClientRequestInfo.ExampleException;
 
 /**
  * RMI/IIOP implementation.
diff --git a/functional-tests/src/test/java/pi/clientrequestinfo/helloServant.java b/functional-tests/src/test/java/pi/clientrequestinfo/helloServant.java
index 5d3a09c50c..79bf81d8d2 100644
--- a/functional-tests/src/test/java/pi/clientrequestinfo/helloServant.java
+++ b/functional-tests/src/test/java/pi/clientrequestinfo/helloServant.java
@@ -19,13 +19,11 @@
 
 package pi.clientrequestinfo;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
-
-import ClientRequestInfo.*; // hello interface
+// hello interface
+import ClientRequestInfo.ExampleException;
+import ClientRequestInfo.helloPOA;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/Client.java b/functional-tests/src/test/java/pi/iorinterceptor/Client.java
index 15dc53ad4d..6f7bd875d5 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/Client.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/Client.java
@@ -19,17 +19,14 @@
 
 package pi.iorinterceptor;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.IOP.CodecFactory;
 
 public class Client
     implements InternalProcess
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/IORInterceptorTest.java b/functional-tests/src/test/java/pi/iorinterceptor/IORInterceptorTest.java
index 102b9969ea..4aefd842ff 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/IORInterceptorTest.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/IORInterceptorTest.java
@@ -19,9 +19,8 @@
 
 package pi.iorinterceptor;
 
-import org.omg.CORBA.*;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * Tests IORInterceptor and IORInfo as per Portable Interceptors spec
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/NPEIORInterceptor.java b/functional-tests/src/test/java/pi/iorinterceptor/NPEIORInterceptor.java
index cbc721c2b4..02835d5062 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/NPEIORInterceptor.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/NPEIORInterceptor.java
@@ -19,11 +19,9 @@
 
 package pi.iorinterceptor;
 
-import java.io.*;
+import java.io.PrintStream;
 
 import org.omg.CORBA.LocalObject;
-
-import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
 import org.omg.PortableInterceptor.ObjectReferenceTemplate;
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/PolicyFactoryHundred.java b/functional-tests/src/test/java/pi/iorinterceptor/PolicyFactoryHundred.java
index 0470af4aac..bac31b2a48 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/PolicyFactoryHundred.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/PolicyFactoryHundred.java
@@ -19,9 +19,9 @@
 
 package pi.iorinterceptor;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.Policy;
 
 /**
  * This is the Policy Factory to create PolicyHundred object.
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/PolicyHundred.java b/functional-tests/src/test/java/pi/iorinterceptor/PolicyHundred.java
index bb5bf3d06e..331624f5ce 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/PolicyHundred.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/PolicyHundred.java
@@ -19,9 +19,8 @@
 
 package pi.iorinterceptor;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.Policy;
 
 /**
  * This Policy object's type is 100.
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/SampleIORInterceptor.java b/functional-tests/src/test/java/pi/iorinterceptor/SampleIORInterceptor.java
index 46dc21bd92..bb1b4e6e50 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/SampleIORInterceptor.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/SampleIORInterceptor.java
@@ -19,18 +19,29 @@
 
 package pi.iorinterceptor;
 
-import java.io.*;
-
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
+import com.sun.corba.ee.spi.logging.OMGSystemException;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import org.omg.IOP.TaggedComponent;
+import java.io.PrintStream;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.INV_POLICY;
+import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.IOP.Codec;
+import org.omg.IOP.CodecFactory;
+import org.omg.IOP.CodecFactoryHelper;
+import org.omg.IOP.ENCODING_CDR_ENCAPS;
+import org.omg.IOP.Encoding;
 import org.omg.IOP.TAG_INTERNET_IOP;
-import com.sun.corba.ee.spi.logging.OMGSystemException;
+import org.omg.IOP.TaggedComponent;
+import org.omg.PortableInterceptor.IORInfo;
+import org.omg.PortableInterceptor.IORInterceptor;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
+import org.omg.PortableServer.ID_UNIQUENESS_POLICY_ID;
+import org.omg.PortableServer.IdUniquenessPolicy;
+import org.omg.PortableServer.IdUniquenessPolicyValue;
 
 /**
  * Thoroughly tests IORInterceptor support.
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/Server.java b/functional-tests/src/test/java/pi/iorinterceptor/Server.java
index 951faba024..812a537081 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/Server.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/Server.java
@@ -19,23 +19,25 @@
 
 package pi.iorinterceptor;
 
+import com.sun.corba.ee.impl.encoding.EncapsInputStream;
+import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
+import com.sun.corba.ee.impl.ior.GenericIdentifiable;
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.ior.IORFactories;
 import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
 import com.sun.corba.ee.spi.ior.iiop.IIOPProfile;
 import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
-import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.ior.IORFactories;
-
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.encoding.EncapsInputStream;
-import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
-import com.sun.corba.ee.impl.ior.GenericIdentifiable;
+
 import corba.framework.InternalProcess;
+
 import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/ServerTestInitializer.java b/functional-tests/src/test/java/pi/iorinterceptor/ServerTestInitializer.java
index 06d678807d..abcc59e1d3 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/ServerTestInitializer.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/ServerTestInitializer.java
@@ -19,12 +19,13 @@
 
 package pi.iorinterceptor;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.ORB;
+import org.omg.PortableInterceptor.IORInterceptor;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.PolicyFactory;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 /**
  * Registers the necessary IORInterceptor interceptors to test IORInterceptor.
diff --git a/functional-tests/src/test/java/pi/iorinterceptor/SimpleServant.java b/functional-tests/src/test/java/pi/iorinterceptor/SimpleServant.java
index 5b9b66932d..a7ec4d91ca 100644
--- a/functional-tests/src/test/java/pi/iorinterceptor/SimpleServant.java
+++ b/functional-tests/src/test/java/pi/iorinterceptor/SimpleServant.java
@@ -19,7 +19,8 @@
 
 package pi.iorinterceptor;
 
-import IORInterceptorTest.*;    // for IDL
+// for IDL
+import IORInterceptorTest.simplePOA;
 
 /**
  * Servant implementation for simplePOA
diff --git a/functional-tests/src/test/java/pi/orbinit/ClientCommon.java b/functional-tests/src/test/java/pi/orbinit/ClientCommon.java
index 29e05ee992..a15392b0bc 100644
--- a/functional-tests/src/test/java/pi/orbinit/ClientCommon.java
+++ b/functional-tests/src/test/java/pi/orbinit/ClientCommon.java
@@ -20,9 +20,11 @@
 package pi.orbinit;
 
 import corba.framework.InternalProcess;
+
 import java.io.PrintStream;
 import java.util.Hashtable;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 import org.omg.IOP.CodecFactory;
diff --git a/functional-tests/src/test/java/pi/orbinit/ClientTestInitializer.java b/functional-tests/src/test/java/pi/orbinit/ClientTestInitializer.java
index 3ce944b16a..e5cf7e4659 100644
--- a/functional-tests/src/test/java/pi/orbinit/ClientTestInitializer.java
+++ b/functional-tests/src/test/java/pi/orbinit/ClientTestInitializer.java
@@ -19,15 +19,17 @@
 
 package pi.orbinit;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
-
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
-
-import ORBInitTest.*;
+import java.io.PrintStream;
+
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.OBJECT_NOT_EXIST;
+import org.omg.CORBA.ORB;
+import org.omg.IOP.CodecFactory;
+import org.omg.IOP.CodecFactoryHelper;
+import org.omg.PortableInterceptor.ORBInitInfo;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 /**
  * Test initializer on the client side.  Most of the testing is done in this
diff --git a/functional-tests/src/test/java/pi/orbinit/ORBInitTest.java b/functional-tests/src/test/java/pi/orbinit/ORBInitTest.java
index 3284c6fdb1..ee968b6d4e 100644
--- a/functional-tests/src/test/java/pi/orbinit/ORBInitTest.java
+++ b/functional-tests/src/test/java/pi/orbinit/ORBInitTest.java
@@ -19,8 +19,8 @@
 
 package pi.orbinit;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * Tests ORBInitializer and ORBInitInfo as per Portable Interceptors spec
diff --git a/functional-tests/src/test/java/pi/orbinit/PropsClient.java b/functional-tests/src/test/java/pi/orbinit/PropsClient.java
index fe5ce69ab3..204154165c 100644
--- a/functional-tests/src/test/java/pi/orbinit/PropsClient.java
+++ b/functional-tests/src/test/java/pi/orbinit/PropsClient.java
@@ -19,17 +19,11 @@
 
 package pi.orbinit;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
 
-import java.util.*;
-import java.io.*;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
 
 /**
  * Client that passes in orb initializers as a properties object
diff --git a/functional-tests/src/test/java/pi/orbinit/SampleClientRequestInterceptor.java b/functional-tests/src/test/java/pi/orbinit/SampleClientRequestInterceptor.java
index 717a1e2b57..1d9e164d15 100644
--- a/functional-tests/src/test/java/pi/orbinit/SampleClientRequestInterceptor.java
+++ b/functional-tests/src/test/java/pi/orbinit/SampleClientRequestInterceptor.java
@@ -19,13 +19,9 @@
 
 package pi.orbinit;
 
-import org.omg.CORBA.LocalObject;
-
-import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.ClientRequestInfo;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
-
-import ORBInitTest.*;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Sample ClientRequestInterceptor for use in testing
diff --git a/functional-tests/src/test/java/pi/orbinit/SampleIORInterceptor.java b/functional-tests/src/test/java/pi/orbinit/SampleIORInterceptor.java
index 796c0084ab..5461f5ee28 100644
--- a/functional-tests/src/test/java/pi/orbinit/SampleIORInterceptor.java
+++ b/functional-tests/src/test/java/pi/orbinit/SampleIORInterceptor.java
@@ -19,15 +19,10 @@
 
 package pi.orbinit;
 
-import org.omg.CORBA.LocalObject;
-
-import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
 import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
-import ORBInitTest.*;
-
 /**
  * Sample IORInterceptor for use in testing
  */
diff --git a/functional-tests/src/test/java/pi/orbinit/SampleObjectImpl.java b/functional-tests/src/test/java/pi/orbinit/SampleObjectImpl.java
index 31449a2cc1..f90f0f9209 100644
--- a/functional-tests/src/test/java/pi/orbinit/SampleObjectImpl.java
+++ b/functional-tests/src/test/java/pi/orbinit/SampleObjectImpl.java
@@ -19,7 +19,7 @@
 
 package pi.orbinit;
 
-import ORBInitTest.*;
+import ORBInitTest._SampleObjectImplBase;
 
 public class SampleObjectImpl
     extends _SampleObjectImplBase
diff --git a/functional-tests/src/test/java/pi/orbinit/SampleServerRequestInterceptor.java b/functional-tests/src/test/java/pi/orbinit/SampleServerRequestInterceptor.java
index eb1e8c64ab..d3236f3e7d 100644
--- a/functional-tests/src/test/java/pi/orbinit/SampleServerRequestInterceptor.java
+++ b/functional-tests/src/test/java/pi/orbinit/SampleServerRequestInterceptor.java
@@ -19,14 +19,10 @@
 
 package pi.orbinit;
 
-import org.omg.CORBA.LocalObject;
-
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.ServerRequestInfo;
 import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
-import ORBInitTest.*;
-
 /**
  * Sample ServerRequestInterceptor for use in testing
  */
diff --git a/functional-tests/src/test/java/pi/orbinit/SystemClient.java b/functional-tests/src/test/java/pi/orbinit/SystemClient.java
index bc1b887b4d..dc34a5cdde 100644
--- a/functional-tests/src/test/java/pi/orbinit/SystemClient.java
+++ b/functional-tests/src/test/java/pi/orbinit/SystemClient.java
@@ -19,17 +19,11 @@
 
 package pi.orbinit;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
 
-import java.util.*;
-import java.io.*;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
 
 /**
  * Client that passes in orb initializers as system properties.
diff --git a/functional-tests/src/test/java/pi/ort/DelayServant.java b/functional-tests/src/test/java/pi/ort/DelayServant.java
index 987bdc6a66..7758ef10a2 100644
--- a/functional-tests/src/test/java/pi/ort/DelayServant.java
+++ b/functional-tests/src/test/java/pi/ort/DelayServant.java
@@ -19,7 +19,8 @@
 
 package pi.ort;
 
-import IORInterceptorTest.*;    // for IDL
+// for IDL
+import IORInterceptorTest.delayPOA;
 
 /**
  * Servant implementation for delayPOA. This is a special servant created for
diff --git a/functional-tests/src/test/java/pi/ort/ORTStateChangeEvaluator.java b/functional-tests/src/test/java/pi/ort/ORTStateChangeEvaluator.java
index e9915767ed..75b5d8f3dc 100644
--- a/functional-tests/src/test/java/pi/ort/ORTStateChangeEvaluator.java
+++ b/functional-tests/src/test/java/pi/ort/ORTStateChangeEvaluator.java
@@ -19,7 +19,8 @@
 
 package pi.ort;
 
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.NON_EXISTENT;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
 /**
  * ORTStateChangeEvaluator is a Singleton used for
diff --git a/functional-tests/src/test/java/pi/ort/ORTTest.java b/functional-tests/src/test/java/pi/ort/ORTTest.java
index 258181666c..9ab9bc992c 100644
--- a/functional-tests/src/test/java/pi/ort/ORTTest.java
+++ b/functional-tests/src/test/java/pi/ort/ORTTest.java
@@ -19,9 +19,8 @@
 
 package pi.ort;
 
-import org.omg.CORBA.*;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * Tests IORInterceptor and IORInfo as per Portable Interceptors spec
diff --git a/functional-tests/src/test/java/pi/ort/SampleIORInterceptor.java b/functional-tests/src/test/java/pi/ort/SampleIORInterceptor.java
index 413e29235b..6b36ed60d7 100644
--- a/functional-tests/src/test/java/pi/ort/SampleIORInterceptor.java
+++ b/functional-tests/src/test/java/pi/ort/SampleIORInterceptor.java
@@ -19,17 +19,12 @@
 
 package pi.ort;
 
-import java.io.*;
+import java.io.PrintStream;
 
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import org.omg.IOP.TaggedComponent;
-import org.omg.IOP.TAG_INTERNET_IOP;
+import org.omg.CORBA.LocalObject;
+import org.omg.PortableInterceptor.IORInfo;
+import org.omg.PortableInterceptor.IORInterceptor_3_0;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
 /**
  * Thoroughly tests IORInterceptor support.
diff --git a/functional-tests/src/test/java/pi/ort/Server.java b/functional-tests/src/test/java/pi/ort/Server.java
index b3448e8266..575e274b3f 100644
--- a/functional-tests/src/test/java/pi/ort/Server.java
+++ b/functional-tests/src/test/java/pi/ort/Server.java
@@ -20,11 +20,13 @@
 package pi.ort;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import IORInterceptorTest.*;    // for IDL
+
 import corba.framework.InternalProcess;
+
 import java.io.PrintStream;
 import java.util.Hashtable;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
@@ -33,6 +35,10 @@
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.POAManager;
 
+// for IDL
+import IORInterceptorTest.delay;
+import IORInterceptorTest.delayHelper;
+
 public class Server
     implements InternalProcess
 {
diff --git a/functional-tests/src/test/java/pi/ort/ServerTestInitializer.java b/functional-tests/src/test/java/pi/ort/ServerTestInitializer.java
index 9f8b1386d2..0121ddc41b 100644
--- a/functional-tests/src/test/java/pi/ort/ServerTestInitializer.java
+++ b/functional-tests/src/test/java/pi/ort/ServerTestInitializer.java
@@ -19,12 +19,12 @@
 
 package pi.ort;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.ORB;
+import org.omg.PortableInterceptor.IORInterceptor;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 /**
  * Registers the necessary IORInterceptor interceptors to test IORInterceptor.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/ClientCommon.java b/functional-tests/src/test/java/pi/serverinterceptor/ClientCommon.java
index 9a7c0e22c7..1d63422a9e 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/ClientCommon.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/ClientCommon.java
@@ -19,21 +19,14 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Date;
+import java.util.Properties;
+
+import org.omg.CORBA.IMP_LIMIT;
+import org.omg.CORBA.ORB;
 
 public abstract class ClientCommon
     implements InternalProcess
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIImpl.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIImpl.java
index c7896ad5aa..62a5e162d8 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIImpl.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIImpl.java
@@ -19,14 +19,14 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableServer.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+
+import org.omg.CORBA.ARG_IN;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
+import org.omg.CORBA.TCKind;
 
 /**
  * Servant implementation, shared by ServerRequestDispatcher and POA versions of
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIPOALocalServer.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIPOALocalServer.java
index c7108a49a7..a6b28336f1 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIPOALocalServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIPOALocalServer.java
@@ -19,21 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Tests POA Local invocations (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIPOARemoteServer.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIPOARemoteServer.java
index caedb2d0d7..099a8713f6 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIPOARemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIPOARemoteServer.java
@@ -19,21 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIPOARemoteServer
     extends DSIPOAServer
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIPOAServer.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIPOAServer.java
index e0906e4a41..6ebc8fb67e 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIPOAServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIPOAServer.java
@@ -19,20 +19,15 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 /**
  * Common base class for DSI POA Server test files.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIClient.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIClient.java
index 14e579759c..f49874ebe4 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIClient.java
@@ -19,24 +19,16 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import org.omg.PortableInterceptor.ForwardRequest;
+
+import ServerRequestInterceptor.hello;
+import ServerRequestInterceptor.helloHelper;
 
 /**
  * Common base class for RMI client test code
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalClient.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalClient.java
index eaaa983f04..e1687e6546 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMILocalClient
     extends DSIRMIClient
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalServer.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalServer.java
index f974e2c7f2..61611ca98a 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMILocalServer.java
@@ -19,23 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMILocalServer
     extends DSIRMIServer
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteClient.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteClient.java
index bd190af09f..44a6dc0bcb 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMIRemoteClient
     extends DSIRMIClient
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteServer.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteServer.java
index 6c01edb598..4aaf7e9210 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIRemoteServer.java
@@ -19,24 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMIRemoteServer
     extends DSIRMIServer
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIServer.java b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIServer.java
index 9bc90eaaec..0bfaef53bb 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/DSIRMIServer.java
@@ -19,24 +19,12 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
 
 public abstract class DSIRMIServer
     extends ServerCommon
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/POAClient.java b/functional-tests/src/test/java/pi/serverinterceptor/POAClient.java
index 490968ecea..980bf6e9ca 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/POAClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/POAClient.java
@@ -19,21 +19,19 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.NO_IMPLEMENT;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableInterceptor.ForwardRequest;
+
+import ServerRequestInterceptor.hello;
+import ServerRequestInterceptor.helloHelper;
 
 public abstract class POAClient
     extends ClientCommon
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/POALocalClient.java b/functional-tests/src/test/java/pi/serverinterceptor/POALocalClient.java
index 355f2c57f4..a94cef9d81 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/POALocalClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/POALocalClient.java
@@ -19,21 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * This client is launched from POALocalServer so they can share
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/POALocalServer.java b/functional-tests/src/test/java/pi/serverinterceptor/POALocalServer.java
index 5abb26581f..034de60800 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/POALocalServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/POALocalServer.java
@@ -19,21 +19,11 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Tests POA Local invocations (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/POARemoteClient.java b/functional-tests/src/test/java/pi/serverinterceptor/POARemoteClient.java
index 43886570c0..9eef4935f6 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/POARemoteClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/POARemoteClient.java
@@ -19,21 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class POARemoteClient
     extends POAClient
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/POARemoteServer.java b/functional-tests/src/test/java/pi/serverinterceptor/POARemoteServer.java
index ec1ed78fc3..ed7c98ede1 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/POARemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/POARemoteServer.java
@@ -19,21 +19,11 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class POARemoteServer
     extends POAServer
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/POAServer.java b/functional-tests/src/test/java/pi/serverinterceptor/POAServer.java
index 1bc827890f..cdc6756137 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/POAServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/POAServer.java
@@ -19,21 +19,19 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 /**
  * Common base class for POA Server test files.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/RMIClient.java b/functional-tests/src/test/java/pi/serverinterceptor/RMIClient.java
index c95ff675da..578aa8a1a2 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/RMIClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/RMIClient.java
@@ -19,24 +19,15 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Common base class for RMI client test code
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/RMILocalClient.java b/functional-tests/src/test/java/pi/serverinterceptor/RMILocalClient.java
index 13afa2fe84..b9464a7b44 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/RMILocalClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/RMILocalClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMILocalClient
     extends RMIClient
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/RMILocalServer.java b/functional-tests/src/test/java/pi/serverinterceptor/RMILocalServer.java
index 59b46a3c69..227bc0a57f 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/RMILocalServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/RMILocalServer.java
@@ -19,23 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMILocalServer
     extends RMIServer
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteClient.java b/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteClient.java
index 2aced3db93..5fe82ddb1e 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteClient.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInterceptor.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMIRemoteClient
     extends RMIClient
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteServer.java b/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteServer.java
index e0377759ac..0cd5737eb4 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/RMIRemoteServer.java
@@ -19,24 +19,9 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMIRemoteServer
     extends RMIServer
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/RMIServer.java b/functional-tests/src/test/java/pi/serverinterceptor/RMIServer.java
index d383bd8e9f..dc1aacb35a 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/RMIServer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/RMIServer.java
@@ -19,24 +19,12 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
 
 public abstract class RMIServer
     extends ServerCommon
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/SampleServerRequestInterceptor.java b/functional-tests/src/test/java/pi/serverinterceptor/SampleServerRequestInterceptor.java
index d4b6bdb6c6..8ad0434b6c 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/SampleServerRequestInterceptor.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/SampleServerRequestInterceptor.java
@@ -19,15 +19,12 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-
+import org.omg.CORBA.IMP_LIMIT;
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.RequestInfo;
 import org.omg.PortableInterceptor.ServerRequestInfo;
 import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
-//import ORBInitTest.*;
-
 /**
  * Sample ServerRequestInterceptor for use in testing
  */
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/ServerCommon.java b/functional-tests/src/test/java/pi/serverinterceptor/ServerCommon.java
index 0956b84341..1b25abda92 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/ServerCommon.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/ServerCommon.java
@@ -20,9 +20,12 @@
 package pi.serverinterceptor;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import corba.framework.InternalProcess;
+
 import java.io.PrintStream;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/ServerInterceptorTest.java b/functional-tests/src/test/java/pi/serverinterceptor/ServerInterceptorTest.java
index 870ac0d24f..786ac526b8 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/ServerInterceptorTest.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/ServerInterceptorTest.java
@@ -20,8 +20,12 @@
 package pi.serverinterceptor;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import corba.framework.*;
-import java.util.*;
+
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
 
 /**
  * Tests ServerInterceptor as per Portable Interceptors spec
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/TestInitializer.java b/functional-tests/src/test/java/pi/serverinterceptor/TestInitializer.java
index 2d6b7dbb87..84e71fc5f1 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/TestInitializer.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/TestInitializer.java
@@ -19,12 +19,12 @@
 
 package pi.serverinterceptor;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.ORB;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 /**
  * Registers the necessary Server Interceptors to test
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/TestServantLocator.java b/functional-tests/src/test/java/pi/serverinterceptor/TestServantLocator.java
index 90bc8eee64..ee6985c53d 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/TestServantLocator.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/TestServantLocator.java
@@ -19,10 +19,13 @@
 
 package pi.serverinterceptor;
 
-import java.io.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+
+import org.omg.CORBA.ORB;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantLocator;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 /**
  * Test Servant locator that throws a ForwardRequest.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/helloDSIDeprecatedServant.java b/functional-tests/src/test/java/pi/serverinterceptor/helloDSIDeprecatedServant.java
index 9ee16cc5f8..6ef90224b1 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/helloDSIDeprecatedServant.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/helloDSIDeprecatedServant.java
@@ -19,14 +19,10 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableServer.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/helloDSIServant.java b/functional-tests/src/test/java/pi/serverinterceptor/helloDSIServant.java
index 0b2f42c3ea..a4ed034f98 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/helloDSIServant.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/helloDSIServant.java
@@ -19,14 +19,11 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableServer.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInterceptor.*;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
+import org.omg.PortableServer.POA;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/helloDelegate.java b/functional-tests/src/test/java/pi/serverinterceptor/helloDelegate.java
index d5096b72e0..42f55a6cef 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/helloDelegate.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/helloDelegate.java
@@ -19,13 +19,10 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.PortableInterceptor.*;
-
-import ServerRequestInterceptor.*;
+import org.omg.CORBA.IMP_LIMIT;
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/helloIF.java b/functional-tests/src/test/java/pi/serverinterceptor/helloIF.java
index 984f67328d..7605c645ae 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/helloIF.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/helloIF.java
@@ -21,8 +21,8 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import org.omg.PortableInterceptor.*;
-import ServerRequestInterceptor.*;
+
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * Hello interface for RMI-IIOP version of test
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/helloRMIIIOP.java b/functional-tests/src/test/java/pi/serverinterceptor/helloRMIIIOP.java
index c548524c93..7b1c59d94e 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/helloRMIIIOP.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/helloRMIIIOP.java
@@ -19,15 +19,12 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
 
-import java.io.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
-import org.omg.PortableInterceptor.*;
+import javax.rmi.PortableRemoteObject;
 
-import ServerRequestInterceptor.*; // hello interface
+import org.omg.PortableInterceptor.ForwardRequest;
 
 /**
  * RMI/IIOP implementation.
diff --git a/functional-tests/src/test/java/pi/serverinterceptor/helloServant.java b/functional-tests/src/test/java/pi/serverinterceptor/helloServant.java
index 6320d4bd9a..f4715ea15e 100644
--- a/functional-tests/src/test/java/pi/serverinterceptor/helloServant.java
+++ b/functional-tests/src/test/java/pi/serverinterceptor/helloServant.java
@@ -19,13 +19,11 @@
 
 package pi.serverinterceptor;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ForwardRequest;
 
-import ServerRequestInterceptor.*;
+import ServerRequestInterceptor.helloPOA;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/AdapterIdStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/AdapterIdStrategy.java
index dec05a51bc..df0807399d 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/AdapterIdStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/AdapterIdStrategy.java
@@ -19,14 +19,14 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.Messaging.*;
 import com.sun.corba.ee.impl.misc.HexOutputStream;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Arrays;
+
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to further test adapter_id() (only executed for POA)
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/AttributesValidStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/AttributesValidStrategy.java
index 7b753a7ed4..8250fe89ff 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/AttributesValidStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/AttributesValidStrategy.java
@@ -19,12 +19,12 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.Messaging.*;
+import java.util.Arrays;
 
-import java.util.*;
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.Messaging.SYNC_WITH_TRANSPORT;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to test operations()
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/ClientCommon.java b/functional-tests/src/test/java/pi/serverrequestinfo/ClientCommon.java
index 9330688e0c..21b56df80f 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/ClientCommon.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/ClientCommon.java
@@ -19,21 +19,14 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import corba.framework.InternalProcess;
+
+import java.io.PrintStream;
+import java.util.Date;
+import java.util.Properties;
+
+import org.omg.CORBA.IMP_LIMIT;
+import org.omg.CORBA.ORB;
 
 public abstract class ClientCommon
     implements InternalProcess
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIImpl.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIImpl.java
index 3a43be6604..852825067c 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIImpl.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIImpl.java
@@ -19,14 +19,17 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableServer.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
+import org.omg.CORBA.ARG_IN;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
+import org.omg.CORBA.TCKind;
 
-import ServerRequestInfo.*;
+import ServerRequestInfo.ExampleException;
+import ServerRequestInfo.ExampleExceptionHelper;
 
 /**
  * Servant implementation, shared by ServerRequestDispatcher and POA versions of
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOALocalServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOALocalServer.java
index c05151b4c3..e05e22ac40 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOALocalServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOALocalServer.java
@@ -19,21 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Tests DSI POA Local invocations (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOARemoteServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOARemoteServer.java
index a81c292844..c66a66e0c4 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOARemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIPOARemoteServer.java
@@ -19,21 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIPOARemoteServer
     extends POAServer
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIClient.java
index cc16d2fdf4..ca89503898 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIClient.java
@@ -19,24 +19,17 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import ServerRequestInfo.ExampleException;
+import ServerRequestInfo.INVOKE_SAY_HELLO;
+import ServerRequestInfo.INVOKE_SAY_SYSTEM_EXCEPTION;
+import ServerRequestInfo.hello;
+import ServerRequestInfo.helloHelper;
 
 /**
  * Common base class for DSI RMI client test code
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalClient.java
index ed1d53abc8..b93f8d1b4d 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMILocalClient
     extends DSIRMIClient
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalServer.java
index e803593592..b3dde5d20a 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMILocalServer.java
@@ -19,23 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMILocalServer
     extends DSIRMIServer
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteClient.java
index 6dfc60dbe8..6e1089b863 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMIRemoteClient
     extends DSIRMIClient
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteServer.java
index 01799cabd5..f9f4e68c4b 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIRemoteServer.java
@@ -19,24 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class DSIRMIRemoteServer
     extends DSIRMIServer
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIServer.java
index 730ea5616b..9ad03573a4 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/DSIRMIServer.java
@@ -19,24 +19,17 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.SystemException;
+
+import ServerRequestInfo.hello;
+import ServerRequestInfo.helloHelper;
 
 public abstract class DSIRMIServer
     extends ServerCommon
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/ExceptionStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/ExceptionStrategy.java
index da63e2c1e8..d83f5d25ce 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/ExceptionStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/ExceptionStrategy.java
@@ -19,12 +19,14 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.misc.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import ServerRequestInfo.*;
-import org.omg.CORBA.*;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.IMP_LIMIT;
+import org.omg.CORBA.SystemException;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to test received_exception() and received_exception_id().
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/ForwardReferenceStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/ForwardReferenceStrategy.java
index b2b9f9594d..8124535e75 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/ForwardReferenceStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/ForwardReferenceStrategy.java
@@ -19,9 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to test forward_reference
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/GetServerPolicyStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/GetServerPolicyStrategy.java
index 46dc4c9afc..e268519748 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/GetServerPolicyStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/GetServerPolicyStrategy.java
@@ -19,13 +19,11 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.PortableServer.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.Messaging.*;
-
-import java.util.*;
+import org.omg.CORBA.INV_POLICY;
+import org.omg.CORBA.Policy;
+import org.omg.PortableInterceptor.ServerRequestInfo;
+import org.omg.PortableServer.ID_UNIQUENESS_POLICY_ID;
+import org.omg.PortableServer.IdUniquenessPolicy;
 
 /**
  * Strategy to test get_server_policy.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/InterceptorStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/InterceptorStrategy.java
index 14a3d2a589..3c2065f249 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/InterceptorStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/InterceptorStrategy.java
@@ -19,8 +19,8 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Base class for all server request interceptor strategies used in this
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeExceptions.java b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeExceptions.java
index 754397be9f..149cd1d8da 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeExceptions.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeExceptions.java
@@ -19,10 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
-import ServerRequestInfo.*;
+import org.omg.CORBA.IMP_LIMIT;
+
+import ServerRequestInfo.ExampleException;
 
 /**
  * Invocation strategy in which four calls are made.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeOneWay.java b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeOneWay.java
index 316bbfcd9f..78a22417e0 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeOneWay.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeOneWay.java
@@ -19,10 +19,6 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
-
 /**
  * Invocation strategy in which two requests are sent, one that is not oneway
  * and one that is oneway, in that order.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeStrategy.java
index fba60fad11..4c664e8a62 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeStrategy.java
@@ -19,9 +19,6 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-
 /**
  * Base class for all invocation strategies used in this test.  This allows
  * for dynamic behavior modifications between test cases of which objects
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAll.java b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAll.java
index 26f8876be7..d369e6b033 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAll.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAll.java
@@ -19,9 +19,7 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.IMP_LIMIT;
 
 /**
  * Invocation strategy in which each interception point is visited.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAllForward.java b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAllForward.java
index 7aae33f365..6b7394df40 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAllForward.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/InvokeVisitAllForward.java
@@ -19,9 +19,7 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.IMP_LIMIT;
 
 /**
  * Invocation strategy in which each interception point is visited.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/OneWayStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/OneWayStrategy.java
index 1fe5a4c6e2..8613c3e067 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/OneWayStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/OneWayStrategy.java
@@ -19,8 +19,8 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to test response_expected()
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/POAClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/POAClient.java
index 369e2e9943..b3a68870b9 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/POAClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/POAClient.java
@@ -19,21 +19,20 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
+import ServerRequestInfo.ExampleException;
+import ServerRequestInfo.INVOKE_SAY_HELLO;
+import ServerRequestInfo.INVOKE_SAY_SYSTEM_EXCEPTION;
+import ServerRequestInfo.hello;
+import ServerRequestInfo.helloHelper;
 
 public abstract class POAClient
     extends ClientCommon
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/POALocalClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/POALocalClient.java
index 2d61e70b50..d7ef155d5e 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/POALocalClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/POALocalClient.java
@@ -19,21 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * This client is launched from POALocalServer so they can share
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/POALocalServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/POALocalServer.java
index f5b9c3d5bf..f8e4568239 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/POALocalServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/POALocalServer.java
@@ -19,21 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 /**
  * Tests POA Local invocations (with a co-located orb)
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteClient.java
index 48152c9646..8d989b43e2 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteClient.java
@@ -19,21 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class POARemoteClient
     extends POAClient
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteServer.java
index b84bd6c6c1..906687fedf 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/POARemoteServer.java
@@ -19,21 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class POARemoteServer
     extends POAServer
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/POAServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/POAServer.java
index 393b33f785..c0c62be3f9 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/POAServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/POAServer.java
@@ -19,21 +19,22 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import org.omg.CORBA.Any;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.IdUniquenessPolicyValue;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
+
+import ServerRequestInfo.hello;
 
 /**
  * Common base class for POA Server test files.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/PolicyFactoryHundred.java b/functional-tests/src/test/java/pi/serverrequestinfo/PolicyFactoryHundred.java
index bd40eaf03e..1a1b68c674 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/PolicyFactoryHundred.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/PolicyFactoryHundred.java
@@ -19,9 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.Any;
+import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.Policy;
 
 /**
  * This is the Policy Factory to create PolicyHundred object.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/PolicyHundred.java b/functional-tests/src/test/java/pi/serverrequestinfo/PolicyHundred.java
index 8f2045b815..8679e672f9 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/PolicyHundred.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/PolicyHundred.java
@@ -19,9 +19,8 @@
 
 package pi.serverrequestinfo;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
+import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.Policy;
 
 /**
  * This Policy object's type is 100.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RMIClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/RMIClient.java
index af6a6aa96c..8ba3842a2a 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RMIClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RMIClient.java
@@ -19,24 +19,17 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import ServerRequestInfo.ExampleException;
+import ServerRequestInfo.INVOKE_SAY_HELLO;
+import ServerRequestInfo.INVOKE_SAY_SYSTEM_EXCEPTION;
 
 /**
  * Common base class for RMI client test code
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalClient.java
index 996a64d11a..0368c1b91d 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMILocalClient
     extends RMIClient
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalServer.java
index cf4bb43a5a..f379067f47 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RMILocalServer.java
@@ -19,23 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMILocalServer
     extends RMIServer
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteClient.java b/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteClient.java
index 3de97bd1dd..1b9e66919d 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteClient.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteClient.java
@@ -19,24 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CosNaming.*;
-import com.sun.corba.ee.impl.corba.AnyImpl;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
-import org.omg.IOP.CodecPackage.*;
-import org.omg.IOP.CodecFactoryPackage.*;
-import corba.framework.*;
-
-import java.util.*;
-import java.io.*;
-import java.rmi.*;
-import javax.naming.*;
-import javax.rmi.*;
-
-import ServerRequestInfo.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMIRemoteClient
     extends RMIClient
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteServer.java
index 6015f50a70..be78985b93 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RMIRemoteServer.java
@@ -19,24 +19,9 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class RMIRemoteServer
     extends RMIServer
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RMIServer.java b/functional-tests/src/test/java/pi/serverrequestinfo/RMIServer.java
index 2d979378b6..6dacace9c4 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RMIServer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RMIServer.java
@@ -19,24 +19,15 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.ORBPackage.*;
-import org.omg.CosNaming.*;
-import org.omg.PortableServer.*;
-import org.omg.PortableServer.POAPackage.*;
-import org.omg.PortableServer.ServantLocatorPackage.*;
-import org.omg.PortableInterceptor.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import corba.framework.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.SystemException;
 
 public abstract class RMIServer
     extends ServerCommon
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RequestId1Strategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/RequestId1Strategy.java
index 9ed1ee5174..769bfba6c5 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RequestId1Strategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RequestId1Strategy.java
@@ -19,8 +19,8 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to test request_id.1
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/RequestInfoStackStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/RequestInfoStackStrategy.java
index ee78982d96..600764e40c 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/RequestInfoStackStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/RequestInfoStackStrategy.java
@@ -19,12 +19,8 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.Messaging.*;
-
-import java.util.*;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to test that the server-sides request info stack is functioning.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/SampleServerRequestInterceptor.java b/functional-tests/src/test/java/pi/serverrequestinfo/SampleServerRequestInterceptor.java
index 25fc4437ca..176eb2d8b9 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/SampleServerRequestInterceptor.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/SampleServerRequestInterceptor.java
@@ -19,8 +19,6 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-
 import org.omg.PortableInterceptor.ForwardRequest;
 import org.omg.PortableInterceptor.ServerRequestInfo;
 import org.omg.PortableInterceptor.ServerRequestInterceptor;
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/ServerCommon.java b/functional-tests/src/test/java/pi/serverrequestinfo/ServerCommon.java
index fb02d29a1c..e96eb1ec16 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/ServerCommon.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/ServerCommon.java
@@ -20,9 +20,12 @@
 package pi.serverrequestinfo;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import corba.framework.InternalProcess;
+
 import java.io.PrintStream;
 import java.util.Properties;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.omg.CORBA.ORB;
 
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/ServerRequestInfoTest.java b/functional-tests/src/test/java/pi/serverrequestinfo/ServerRequestInfoTest.java
index 0cec096601..115fc6641f 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/ServerRequestInfoTest.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/ServerRequestInfoTest.java
@@ -19,8 +19,8 @@
 
 package pi.serverrequestinfo;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  * Tests ServerRequestInfo as per Portable Interceptors spec
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/ServiceContextStrategy.java b/functional-tests/src/test/java/pi/serverrequestinfo/ServiceContextStrategy.java
index f721a8d157..99b9aed35a 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/ServiceContextStrategy.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/ServiceContextStrategy.java
@@ -19,12 +19,15 @@
 
 package pi.serverrequestinfo;
 
-import com.sun.corba.ee.impl.interceptors.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.IOP.*;
 import com.sun.corba.ee.spi.servicecontext.ORBVersionServiceContext;
-import org.omg.CORBA.*;
-import java.util.*;
+
+import java.util.Arrays;
+
+import org.omg.CORBA.BAD_INV_ORDER;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.IOP.ServiceContext;
+import org.omg.PortableInterceptor.ForwardRequest;
+import org.omg.PortableInterceptor.ServerRequestInfo;
 
 /**
  * Strategy to test get_request_service_context and get_reply_service_context.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/TestInitializer.java b/functional-tests/src/test/java/pi/serverrequestinfo/TestInitializer.java
index ede7b3ed98..fa6c7d530c 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/TestInitializer.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/TestInitializer.java
@@ -19,14 +19,13 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.CORBA.*;
-
-import ServerRequestInfo.*; // hello interface
+import org.omg.CORBA.ORB;
+import org.omg.PortableInterceptor.ORBInitializer;
+import org.omg.PortableInterceptor.PolicyFactory;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
+import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
 
 /**
  * Registers the necessary Server Interceptors to test
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIDeprecatedServant.java b/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIDeprecatedServant.java
index 8b1d02546c..0cf844847a 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIDeprecatedServant.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIDeprecatedServant.java
@@ -19,14 +19,10 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableServer.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIServant.java b/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIServant.java
index b1bdd61ad0..cd17fe95ec 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIServant.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/helloDSIServant.java
@@ -19,14 +19,11 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
-import org.omg.PortableInterceptor.*;
-import org.omg.PortableServer.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-
-import ServerRequestInfo.*;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.ServerRequest;
+import org.omg.PortableServer.POA;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/helloDelegate.java b/functional-tests/src/test/java/pi/serverrequestinfo/helloDelegate.java
index 0a3f161392..89831a25c5 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/helloDelegate.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/helloDelegate.java
@@ -19,13 +19,13 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.PortableInterceptor.*;
+import org.omg.CORBA.IMP_LIMIT;
 
-import ServerRequestInfo.*;
+import ServerRequestInfo.ExampleException;
+import ServerRequestInfo.INVOKE_SAY_HELLO;
+import ServerRequestInfo.INVOKE_SAY_SYSTEM_EXCEPTION;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/helloIF.java b/functional-tests/src/test/java/pi/serverrequestinfo/helloIF.java
index fe6937aefc..fd1b49fa78 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/helloIF.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/helloIF.java
@@ -21,8 +21,8 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import org.omg.PortableInterceptor.*;
-import ServerRequestInfo.*;
+
+import ServerRequestInfo.ExampleException;
 
 /**
  * Hello interface for RMI-IIOP version of test
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/helloRMIIIOP.java b/functional-tests/src/test/java/pi/serverrequestinfo/helloRMIIIOP.java
index 17d4d06af2..71899607c2 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/helloRMIIIOP.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/helloRMIIIOP.java
@@ -19,15 +19,13 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
+import java.rmi.RemoteException;
 
-import java.io.*;
-import java.rmi.*;
-import javax.rmi.*;
-import javax.naming.*;
-import org.omg.PortableInterceptor.*;
+import javax.rmi.PortableRemoteObject;
 
-import ServerRequestInfo.*; // hello interface
+// hello interface
+import ServerRequestInfo.ExampleException;
 
 /**
  * RMI/IIOP implementation.
diff --git a/functional-tests/src/test/java/pi/serverrequestinfo/helloServant.java b/functional-tests/src/test/java/pi/serverrequestinfo/helloServant.java
index 61e3b63fee..964c1ae4cb 100644
--- a/functional-tests/src/test/java/pi/serverrequestinfo/helloServant.java
+++ b/functional-tests/src/test/java/pi/serverrequestinfo/helloServant.java
@@ -19,13 +19,10 @@
 
 package pi.serverrequestinfo;
 
-import org.omg.CORBA.*;
+import java.io.PrintStream;
 
-import java.util.*;
-import java.io.*;
-import org.omg.PortableInterceptor.*;
-
-import ServerRequestInfo.*;
+import ServerRequestInfo.ExampleException;
+import ServerRequestInfo.helloPOA;
 
 /**
  * Servant implementation.
diff --git a/functional-tests/src/test/java/pi/serviceexample/AServiceIORInterceptor.java b/functional-tests/src/test/java/pi/serviceexample/AServiceIORInterceptor.java
index 85b8e3e5ab..4e7a29d73e 100644
--- a/functional-tests/src/test/java/pi/serviceexample/AServiceIORInterceptor.java
+++ b/functional-tests/src/test/java/pi/serviceexample/AServiceIORInterceptor.java
@@ -25,10 +25,9 @@
 package pi.serviceexample;
 
 import org.omg.CORBA.Any;
-import org.omg.CORBA.LocalObject;
 import org.omg.CORBA.ORB;
-import org.omg.IOP.TaggedComponent;
 import org.omg.IOP.Codec;
+import org.omg.IOP.TaggedComponent;
 import org.omg.IOP.CodecPackage.InvalidTypeForEncoding;
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
diff --git a/functional-tests/src/test/java/pi/serviceexample/AServiceImpl.java b/functional-tests/src/test/java/pi/serviceexample/AServiceImpl.java
index b7f5357264..816d967433 100644
--- a/functional-tests/src/test/java/pi/serviceexample/AServiceImpl.java
+++ b/functional-tests/src/test/java/pi/serviceexample/AServiceImpl.java
@@ -25,9 +25,9 @@
 package pi.serviceexample;
 
 import org.omg.CORBA.Any;
-import org.omg.CORBA.TCKind;
 import org.omg.CORBA.LocalObject;
 import org.omg.CORBA.ORB;
+import org.omg.CORBA.TCKind;
 import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.InvalidSlot;
 
diff --git a/functional-tests/src/test/java/pi/serviceexample/AServiceInterceptor.java b/functional-tests/src/test/java/pi/serviceexample/AServiceInterceptor.java
index 66344a7e79..4fca33f034 100644
--- a/functional-tests/src/test/java/pi/serviceexample/AServiceInterceptor.java
+++ b/functional-tests/src/test/java/pi/serviceexample/AServiceInterceptor.java
@@ -29,15 +29,15 @@
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
 import org.omg.IOP.Codec;
-import org.omg.IOP.CodecPackage.FormatMismatch;
-import org.omg.IOP.CodecPackage.TypeMismatch;
 import org.omg.IOP.ServiceContext;
 import org.omg.IOP.TaggedComponent;
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.IOP.CodecPackage.FormatMismatch;
+import org.omg.IOP.CodecPackage.TypeMismatch;
 import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.InvalidSlot;
-import org.omg.PortableInterceptor.ServerRequestInterceptor;
 import org.omg.PortableInterceptor.ServerRequestInfo;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
 public class AServiceInterceptor
     extends org.omg.CORBA.LocalObject
diff --git a/functional-tests/src/test/java/pi/serviceexample/ArbitraryObjectImpl.java b/functional-tests/src/test/java/pi/serviceexample/ArbitraryObjectImpl.java
index 545326a350..08b0bdd14e 100644
--- a/functional-tests/src/test/java/pi/serviceexample/ArbitraryObjectImpl.java
+++ b/functional-tests/src/test/java/pi/serviceexample/ArbitraryObjectImpl.java
@@ -19,14 +19,15 @@
 
 package pi.serviceexample;
 
+import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.ORBPackage.InvalidName;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableServer.POA;
 
-import java.util.Properties;
-
 class ArbitraryObjectImpl
     extends ArbitraryObjectPOA
 {
diff --git a/functional-tests/src/test/java/pi/serviceexample/Client.java b/functional-tests/src/test/java/pi/serviceexample/Client.java
index 6db9e62846..3c77cd83fb 100644
--- a/functional-tests/src/test/java/pi/serviceexample/Client.java
+++ b/functional-tests/src/test/java/pi/serviceexample/Client.java
@@ -24,12 +24,13 @@
 
 package pi.serviceexample;
 
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-
 import java.util.Properties;
 
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+
 public class Client
 {
     public static void main(String av[])
diff --git a/functional-tests/src/test/java/pi/serviceexample/ColocatedServers.java b/functional-tests/src/test/java/pi/serviceexample/ColocatedServers.java
index 14c78f7789..0772ae9bc3 100644
--- a/functional-tests/src/test/java/pi/serviceexample/ColocatedServers.java
+++ b/functional-tests/src/test/java/pi/serviceexample/ColocatedServers.java
@@ -24,9 +24,10 @@
 
 package pi.serviceexample;
 
-import org.omg.CORBA.ORB;
 import java.util.Properties;
 
+import org.omg.CORBA.ORB;
+
 public class ColocatedServers
 {
     public static ORB orb;
diff --git a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientInterceptor.java b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientInterceptor.java
index 1d55ba4b8a..069f61ff25 100644
--- a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientInterceptor.java
+++ b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientInterceptor.java
@@ -27,9 +27,8 @@
 import org.omg.CORBA.Any;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
-import org.omg.IOP.ServiceContext;
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.InvalidSlot;
 
diff --git a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientORBInitializer.java b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientORBInitializer.java
index 898e828d6c..9da97884f0 100644
--- a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientORBInitializer.java
+++ b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceClientORBInitializer.java
@@ -24,8 +24,9 @@
 
 package pi.serviceexample;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.CurrentHelper;
 import org.omg.PortableInterceptor.ORBInitInfo;
diff --git a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceImpl.java b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceImpl.java
index 19cbdcab1f..95a4266fa9 100644
--- a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceImpl.java
+++ b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceImpl.java
@@ -25,12 +25,11 @@
 package pi.serviceexample;
 
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableServer.POA;
 
-import java.util.Properties;
-
 class LoggingServiceImpl
     extends LoggingServicePOA
 {
diff --git a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerInterceptor.java b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerInterceptor.java
index 8ec1275375..f3e42b7ca0 100644
--- a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerInterceptor.java
+++ b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerInterceptor.java
@@ -24,19 +24,19 @@
 
 package pi.serviceexample;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
 import org.omg.CORBA.Any;
 import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.TCKind;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
 import org.omg.IOP.ServiceContext;
-import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ClientRequestInfo;
+import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.InvalidSlot;
-import org.omg.PortableInterceptor.ServerRequestInterceptor;
 import org.omg.PortableInterceptor.ServerRequestInfo;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
 public class LoggingServiceServerInterceptor
     extends org.omg.CORBA.LocalObject
diff --git a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerORBInitializer.java b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerORBInitializer.java
index 54ee9da6df..f77c466c37 100644
--- a/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerORBInitializer.java
+++ b/functional-tests/src/test/java/pi/serviceexample/LoggingServiceServerORBInitializer.java
@@ -24,8 +24,8 @@
 
 package pi.serviceexample;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.CurrentHelper;
 import org.omg.PortableInterceptor.ORBInitInfo;
diff --git a/functional-tests/src/test/java/pi/serviceexample/ServiceExampleTest.java b/functional-tests/src/test/java/pi/serviceexample/ServiceExampleTest.java
index 032ef80641..6d8ac00783 100644
--- a/functional-tests/src/test/java/pi/serviceexample/ServiceExampleTest.java
+++ b/functional-tests/src/test/java/pi/serviceexample/ServiceExampleTest.java
@@ -24,8 +24,8 @@
 
 package pi.serviceexample;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class ServiceExampleTest
     extends
diff --git a/functional-tests/src/test/java/rmic/Cat.java b/functional-tests/src/test/java/rmic/Cat.java
index fc55a42d64..05e2378c0d 100644
--- a/functional-tests/src/test/java/rmic/Cat.java
+++ b/functional-tests/src/test/java/rmic/Cat.java
@@ -21,7 +21,6 @@
 package rmic;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.io.IOException;
 
 public interface Cat extends Remote {
     String cat(String one, String two, String three, Object it) throws RemoteException;
diff --git a/functional-tests/src/test/java/rmic/ClassEnumerator.java b/functional-tests/src/test/java/rmic/ClassEnumerator.java
index a7d21b113a..3bbe8419d6 100644
--- a/functional-tests/src/test/java/rmic/ClassEnumerator.java
+++ b/functional-tests/src/test/java/rmic/ClassEnumerator.java
@@ -20,16 +20,16 @@
 
 package rmic;
 
-import java.util.Enumeration;
-import java.util.Vector;
-import java.util.Hashtable;
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipException;
-import java.util.Comparator;
-import java.util.Arrays;
+import java.util.zip.ZipFile;
 
 /**
  * This class provides static methods to enumerate all classes in
diff --git a/functional-tests/src/test/java/rmic/HelloImpl.java b/functional-tests/src/test/java/rmic/HelloImpl.java
index 938b2596f1..d9b1b44477 100644
--- a/functional-tests/src/test/java/rmic/HelloImpl.java
+++ b/functional-tests/src/test/java/rmic/HelloImpl.java
@@ -20,15 +20,14 @@
 
 package rmic;
 
-import org.omg.CORBA.ORB;
-import javax.rmi.CORBA.Tie;
-import javax.rmi.PortableRemoteObject;
-import javax.rmi.CORBA.Util;
-import org.omg.CORBA.NO_PERMISSION;
-import org.omg.CORBA.CompletionStatus;
 import java.io.Serializable;
 import java.rmi.server.RMIClassLoader;
 
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.CompletionStatus;
+import org.omg.CORBA.NO_PERMISSION;
+
 public class HelloImpl //extends javax.rmi.PortableRemoteObject
     implements Hello {
 
diff --git a/functional-tests/src/test/java/rmic/HelloTest.java b/functional-tests/src/test/java/rmic/HelloTest.java
index 09ea5620f1..17b122a863 100644
--- a/functional-tests/src/test/java/rmic/HelloTest.java
+++ b/functional-tests/src/test/java/rmic/HelloTest.java
@@ -20,25 +20,28 @@
 
 package rmic;
 
-import test.ServantContext;
-import test.RemoteTest;
-import java.rmi.AccessException;
-import java.util.Properties;
-import java.util.Enumeration;
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBData;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+
+import java.io.File;
 import java.io.Serializable;
+import java.rmi.AccessException;
 import java.rmi.RemoteException;
-import java.io.File;
-import test.WebServer;
-import test.Util;
+import java.util.Enumeration;
+import java.util.Properties;
+
 import javax.rmi.PortableRemoteObject;
-import org.omg.CORBA.portable.ServantObject;
-import org.omg.CORBA.portable.Delegate;
 
-import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.orb.ORBData;
 import org.glassfish.pfl.test.JUnitReportHelper;
+import org.omg.CORBA.portable.Delegate;
+import org.omg.CORBA.portable.ServantObject;
+
+import test.RemoteTest;
+import test.ServantContext;
+import test.Util;
+import test.WebServer;
 
 /*
  * @test
diff --git a/functional-tests/src/test/java/rmic/Hi.java b/functional-tests/src/test/java/rmic/Hi.java
index c58c9a904a..a31ba0e0c3 100644
--- a/functional-tests/src/test/java/rmic/Hi.java
+++ b/functional-tests/src/test/java/rmic/Hi.java
@@ -19,9 +19,9 @@
  */
 
 package rmic;
+import java.io.IOException;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.io.IOException;
 
 public interface Hi extends Remote {
     public String hi_0 () throws RemoteException, ClassNotFoundException;
diff --git a/functional-tests/src/test/java/rmic/HiServant.java b/functional-tests/src/test/java/rmic/HiServant.java
index 4c8499f38c..d1f05ee406 100644
--- a/functional-tests/src/test/java/rmic/HiServant.java
+++ b/functional-tests/src/test/java/rmic/HiServant.java
@@ -19,8 +19,6 @@
  */
 
 package rmic;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
 import java.io.IOException;
 
 public class HiServant implements Hi {
diff --git a/functional-tests/src/test/java/rmic/InnerTest.java b/functional-tests/src/test/java/rmic/InnerTest.java
index c6cf0672c8..23f78bf7ce 100644
--- a/functional-tests/src/test/java/rmic/InnerTest.java
+++ b/functional-tests/src/test/java/rmic/InnerTest.java
@@ -21,17 +21,19 @@
 
 package rmic;
 
-import test.Test;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.io.Serializable;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.io.Serializable;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
-import org.glassfish.rmic.iiop.Constants;
 import org.glassfish.rmic.iiop.CompoundType;
+import org.glassfish.rmic.iiop.Constants;
 import org.glassfish.rmic.iiop.ContextStack;
 
+import test.Test;
+
 public class InnerTest extends Test implements Constants {
 
     private ByteArrayOutputStream out = null;
diff --git a/functional-tests/src/test/java/rmic/LocalHello.java b/functional-tests/src/test/java/rmic/LocalHello.java
index 7c12b05a77..87c02578d6 100644
--- a/functional-tests/src/test/java/rmic/LocalHello.java
+++ b/functional-tests/src/test/java/rmic/LocalHello.java
@@ -19,7 +19,6 @@
  */
 
 package rmic;
-import javax.rmi.CORBA.Stub;
 
 public interface LocalHello extends java.rmi.Remote {
     public String sayHello(String to) throws java.rmi.RemoteException;
diff --git a/functional-tests/src/test/java/rmic/LocalHelloServant.java b/functional-tests/src/test/java/rmic/LocalHelloServant.java
index 8e6024099f..ca1277d44a 100644
--- a/functional-tests/src/test/java/rmic/LocalHelloServant.java
+++ b/functional-tests/src/test/java/rmic/LocalHelloServant.java
@@ -20,10 +20,9 @@
 
 package rmic;
 import com.sun.corba.ee.impl.util.JDKBridge;
-import javax.rmi.CORBA.Stub;
-import org.omg.CORBA.BAD_OPERATION;
-import java.rmi.RemoteException;
+
 import java.rmi.MarshalException;
+import java.rmi.RemoteException;
 
 public class LocalHelloServant extends javax.rmi.PortableRemoteObject implements LocalHello {
 
diff --git a/functional-tests/src/test/java/rmic/LocalStubTest.java b/functional-tests/src/test/java/rmic/LocalStubTest.java
index 1c78b771c8..b8da970c26 100644
--- a/functional-tests/src/test/java/rmic/LocalStubTest.java
+++ b/functional-tests/src/test/java/rmic/LocalStubTest.java
@@ -20,22 +20,26 @@
 
 package rmic;
 
+import com.sun.corba.ee.impl.util.JDKBridge;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+
+import java.io.File;
+import java.rmi.MarshalException;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import test.ServantContext;
-import test.RemoteTest;
+
+import javax.naming.Context;
 import javax.rmi.PortableRemoteObject;
 import javax.rmi.CORBA.Util;
-import javax.naming.Context;
+
+import org.glassfish.pfl.test.JUnitReportHelper;
+import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.ORB;
-import org.omg.CORBA.portable.ServantObject;
 import org.omg.CORBA.portable.Delegate;
-import org.omg.CORBA.BAD_OPERATION;
-import java.io.File;
-import com.sun.corba.ee.impl.util.JDKBridge;
-import java.rmi.MarshalException;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
-import org.glassfish.pfl.test.JUnitReportHelper;
+import org.omg.CORBA.portable.ServantObject;
+
+import test.RemoteTest;
+import test.ServantContext;
 
 /*
  * @test
diff --git a/functional-tests/src/test/java/rmic/MangleMethods.java b/functional-tests/src/test/java/rmic/MangleMethods.java
index 1f60c39f02..36b75c0001 100644
--- a/functional-tests/src/test/java/rmic/MangleMethods.java
+++ b/functional-tests/src/test/java/rmic/MangleMethods.java
@@ -20,11 +20,10 @@
 
 package rmic;
 
+import java.rmi.MarshalException;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.rmi.MarshalException;
 import java.util.Hashtable;
-import java.io.IOException;
 
 public interface MangleMethods extends Remote {
 
diff --git a/functional-tests/src/test/java/rmic/MapType.java b/functional-tests/src/test/java/rmic/MapType.java
index b696b76d5c..fb66d15b71 100644
--- a/functional-tests/src/test/java/rmic/MapType.java
+++ b/functional-tests/src/test/java/rmic/MapType.java
@@ -22,11 +22,11 @@
 package rmic;
 
 import org.glassfish.rmic.Names;
-import org.glassfish.rmic.iiop.Type;
 import org.glassfish.rmic.iiop.CompoundType;
 import org.glassfish.rmic.iiop.ContextStack;
-import org.glassfish.rmic.tools.java.ClassPath;
+import org.glassfish.rmic.iiop.Type;
 import org.glassfish.rmic.tools.java.ClassDeclaration;
+import org.glassfish.rmic.tools.java.ClassPath;
 import org.glassfish.rmic.tools.java.Identifier;
 
 public class MapType extends CompoundType {
diff --git a/functional-tests/src/test/java/rmic/ObjectByValue.java b/functional-tests/src/test/java/rmic/ObjectByValue.java
index d9afeda314..143c23501a 100644
--- a/functional-tests/src/test/java/rmic/ObjectByValue.java
+++ b/functional-tests/src/test/java/rmic/ObjectByValue.java
@@ -20,8 +20,6 @@
 
 package rmic;
 
-import java.lang.String;
-
 public class ObjectByValue implements java.io.Serializable {
 
     public static int foo = 1;
diff --git a/functional-tests/src/test/java/rmic/OnlyRemoteServant.java b/functional-tests/src/test/java/rmic/OnlyRemoteServant.java
index 183a6959af..72b3effce9 100644
--- a/functional-tests/src/test/java/rmic/OnlyRemoteServant.java
+++ b/functional-tests/src/test/java/rmic/OnlyRemoteServant.java
@@ -21,6 +21,7 @@
 package rmic;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class OnlyRemoteServant extends PortableRemoteObject
diff --git a/functional-tests/src/test/java/rmic/ParseTest.java b/functional-tests/src/test/java/rmic/ParseTest.java
index 2a66d090fe..a26a72b20f 100644
--- a/functional-tests/src/test/java/rmic/ParseTest.java
+++ b/functional-tests/src/test/java/rmic/ParseTest.java
@@ -21,11 +21,12 @@
 
 package rmic;
 
-import org.glassfish.rmic.iiop.Constants;
-import org.glassfish.rmic.tools.java.ClassPath;
+import corba.framework.TestngRunner;
+
 import java.lang.reflect.Method;
 
-import corba.framework.TestngRunner;
+import org.glassfish.rmic.iiop.Constants;
+import org.glassfish.rmic.tools.java.ClassPath;
 
 public class ParseTest extends test.Test implements Constants {
     public static ClassPath createClassPath() {
diff --git a/functional-tests/src/test/java/rmic/RMICTest.java b/functional-tests/src/test/java/rmic/RMICTest.java
index 0d4ec2bf4a..6d2f251bdd 100644
--- a/functional-tests/src/test/java/rmic/RMICTest.java
+++ b/functional-tests/src/test/java/rmic/RMICTest.java
@@ -20,14 +20,14 @@
 
 package rmic;
 
-import java.util.Vector;
-import java.io.OutputStream;
-import java.io.IOException;
 import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.HashSet;
-import test.Util;
+import java.util.Vector;
+
 import test.Test;
+import test.Util;
 
 /*
  * @test
diff --git a/functional-tests/src/test/java/rmic/RemoteObjectServer.java b/functional-tests/src/test/java/rmic/RemoteObjectServer.java
index ba64532c75..4deb945067 100644
--- a/functional-tests/src/test/java/rmic/RemoteObjectServer.java
+++ b/functional-tests/src/test/java/rmic/RemoteObjectServer.java
@@ -20,9 +20,10 @@
 
 package rmic;
 
-import javax.rmi.PortableRemoteObject;
 import java.rmi.server.RMIClassLoader;
 
+import javax.rmi.PortableRemoteObject;
+
 public class RemoteObjectServer extends PortableRemoteObject implements RemoteObject {
 
     int value;
diff --git a/functional-tests/src/test/java/rmic/SimpleServant.java b/functional-tests/src/test/java/rmic/SimpleServant.java
index ac8c4555e6..040feb8aad 100644
--- a/functional-tests/src/test/java/rmic/SimpleServant.java
+++ b/functional-tests/src/test/java/rmic/SimpleServant.java
@@ -19,8 +19,8 @@
  */
 
 package rmic;
-import java.rmi.Remote;
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class SimpleServant extends PortableRemoteObject implements Simple {
diff --git a/functional-tests/src/test/java/rmic/StaticStringsHashTest.java b/functional-tests/src/test/java/rmic/StaticStringsHashTest.java
index ca692d81b0..31d49c0fe1 100644
--- a/functional-tests/src/test/java/rmic/StaticStringsHashTest.java
+++ b/functional-tests/src/test/java/rmic/StaticStringsHashTest.java
@@ -21,11 +21,13 @@
 
 package rmic;
 
-import test.Test;
-import org.glassfish.rmic.iiop.StaticStringsHash;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
+import org.glassfish.rmic.iiop.StaticStringsHash;
+
+import test.Test;
 
 /*
  * @test
diff --git a/functional-tests/src/test/java/rmic/StressParseIIOP.java b/functional-tests/src/test/java/rmic/StressParseIIOP.java
index 4c5ced5bba..136fd6e773 100644
--- a/functional-tests/src/test/java/rmic/StressParseIIOP.java
+++ b/functional-tests/src/test/java/rmic/StressParseIIOP.java
@@ -20,14 +20,13 @@
 
 package rmic;
 
-import java.io.File;
-import java.io.PrintStream;
-import java.util.Vector;
-import java.io.InputStreamReader;
 import java.io.BufferedReader;
-import java.io.PrintWriter;
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.util.Vector;
 
 /**
  * StressParseIIOP walks all classes in a classpath and has CompoundType.makeType()
diff --git a/functional-tests/src/test/java/rmic/StubReferenceTest.java b/functional-tests/src/test/java/rmic/StubReferenceTest.java
index efcaf4f947..c262047f1f 100644
--- a/functional-tests/src/test/java/rmic/StubReferenceTest.java
+++ b/functional-tests/src/test/java/rmic/StubReferenceTest.java
@@ -22,6 +22,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.util.StringTokenizer;
+
 import org.glassfish.pfl.test.JUnitReportHelper;
 
 
diff --git a/functional-tests/src/test/java/rmic/TestEnv.java b/functional-tests/src/test/java/rmic/TestEnv.java
index 2fc940f448..2b22ad46ce 100644
--- a/functional-tests/src/test/java/rmic/TestEnv.java
+++ b/functional-tests/src/test/java/rmic/TestEnv.java
@@ -21,9 +21,10 @@
 
 package rmic;
 
+import java.io.OutputStream;
+
 import org.glassfish.rmic.Main;
 import org.glassfish.rmic.tools.java.ClassPath;
-import java.io.OutputStream;
 
 public class TestEnv extends org.glassfish.rmic.iiop.BatchEnvironment {
 
diff --git a/functional-tests/src/test/java/rmic/TestExecutor.java b/functional-tests/src/test/java/rmic/TestExecutor.java
index 31895dbf4e..339b399e80 100644
--- a/functional-tests/src/test/java/rmic/TestExecutor.java
+++ b/functional-tests/src/test/java/rmic/TestExecutor.java
@@ -21,25 +21,25 @@
 
 package rmic;
 
-import test.Util;
 import java.io.ByteArrayOutputStream;
 import java.util.Hashtable;
-import org.glassfish.rmic.tools.java.MemberDefinition;
-import org.glassfish.rmic.iiop.Type;
-import org.glassfish.rmic.iiop.ValueType;
-import org.glassfish.rmic.iiop.Constants;
-import org.glassfish.rmic.iiop.CompoundType;
-import org.glassfish.rmic.iiop.RemoteType;
+
 import org.glassfish.rmic.iiop.AbstractType;
+import org.glassfish.rmic.iiop.CompoundType;
+import org.glassfish.rmic.iiop.Constants;
 import org.glassfish.rmic.iiop.ContextStack;
-
+import org.glassfish.rmic.iiop.RemoteType;
+import org.glassfish.rmic.iiop.Type;
+import org.glassfish.rmic.iiop.ValueType;
+import org.glassfish.rmic.tools.java.MemberDefinition;
 import org.testng.Assert;
-
-import org.testng.annotations.Test;
 import org.testng.annotations.AfterGroups;
-import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.AfterSuite;
+import org.testng.annotations.BeforeGroups;
 import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
+
+import test.Util;
 
 public class TestExecutor {
     private ByteArrayOutputStream out = null;
diff --git a/functional-tests/src/test/java/rmic/ThrowCORBAUserExServant.java b/functional-tests/src/test/java/rmic/ThrowCORBAUserExServant.java
index 6a7caaf1a4..47fe58df3d 100644
--- a/functional-tests/src/test/java/rmic/ThrowCORBAUserExServant.java
+++ b/functional-tests/src/test/java/rmic/ThrowCORBAUserExServant.java
@@ -19,10 +19,10 @@
  */
 
 package rmic;
-import org.omg.CORBA.UserException;
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
+import org.omg.CORBA.UserException;
+
 public class ThrowCORBAUserExServant implements ThrowCORBAUserException {
     public ThrowCORBAUserExServant() throws RemoteException {}
     public void a () throws RemoteException {}
diff --git a/functional-tests/src/test/java/rmic/ThrowCORBAUserException.java b/functional-tests/src/test/java/rmic/ThrowCORBAUserException.java
index 6a607c8376..a71ee98705 100644
--- a/functional-tests/src/test/java/rmic/ThrowCORBAUserException.java
+++ b/functional-tests/src/test/java/rmic/ThrowCORBAUserException.java
@@ -19,10 +19,11 @@
  */
 
 package rmic;
-import org.omg.CORBA.UserException;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
+import org.omg.CORBA.UserException;
+
 public interface ThrowCORBAUserException extends Remote {
     void a () throws RemoteException;
     void b () throws RemoteException, CORBAUserException;
diff --git a/functional-tests/src/test/java/test/Alarm.java b/functional-tests/src/test/java/test/Alarm.java
index 6b3131ca81..42b6ca39f2 100644
--- a/functional-tests/src/test/java/test/Alarm.java
+++ b/functional-tests/src/test/java/test/Alarm.java
@@ -20,7 +20,7 @@
 
 package test;
 
-import java.util.*;
+import java.util.Vector;
 
 /**
  * Alarm provides a one-shot mechanism to schedule asynchronous calls
diff --git a/functional-tests/src/test/java/test/AlarmHandler.java b/functional-tests/src/test/java/test/AlarmHandler.java
index eae2bdf6c8..330967d121 100644
--- a/functional-tests/src/test/java/test/AlarmHandler.java
+++ b/functional-tests/src/test/java/test/AlarmHandler.java
@@ -20,8 +20,6 @@
 
 package test;
 
-import java.util.*;
-
 /**
  * AlarmHandler provides an interface which is called asynchronously by Alarm
  * at the scheduled wakeup time.
diff --git a/functional-tests/src/test/java/test/ClassUtils.java b/functional-tests/src/test/java/test/ClassUtils.java
index ced3d2a244..ba8c6b9564 100644
--- a/functional-tests/src/test/java/test/ClassUtils.java
+++ b/functional-tests/src/test/java/test/ClassUtils.java
@@ -21,13 +21,13 @@
 
 package test;
 
-import org.glassfish.rmic.tools.java.ClassFile;
-import org.glassfish.rmic.tools.java.ClassPath;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.StringTokenizer;
 
+import org.glassfish.rmic.tools.java.ClassFile;
+import org.glassfish.rmic.tools.java.ClassPath;
+
 /**
  * ClassUtils provides miscellaneous static utility methods related to
  * classes and their packages.
diff --git a/functional-tests/src/test/java/test/Debug.java b/functional-tests/src/test/java/test/Debug.java
index ff016ac010..a6b030504a 100644
--- a/functional-tests/src/test/java/test/Debug.java
+++ b/functional-tests/src/test/java/test/Debug.java
@@ -21,14 +21,13 @@
 
 package test;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
-import java.util.Properties;
 import java.util.Enumeration;
+import java.util.Properties;
 
 public class Debug {
 
diff --git a/functional-tests/src/test/java/test/DistributedSetMonitor.java b/functional-tests/src/test/java/test/DistributedSetMonitor.java
index eaae4cc4fa..b15a0046bd 100644
--- a/functional-tests/src/test/java/test/DistributedSetMonitor.java
+++ b/functional-tests/src/test/java/test/DistributedSetMonitor.java
@@ -20,22 +20,20 @@
 
 package test;
 
-import java.rmi.Remote;
+import java.io.DataInputStream;
 import java.rmi.RemoteException;
+import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
-import java.util.Enumeration;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+
 import javax.naming.Context;
+import javax.naming.NameClassPair;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import javax.naming.NameClassPair;
-import javax.rmi.CORBA.Tie;
 import javax.rmi.PortableRemoteObject;
+import javax.rmi.CORBA.Tie;
+
 import org.omg.CORBA.ORB;
-import java.io.DataInputStream;
-import javax.rmi.PortableRemoteObject;
 
 /**
  * DistributedSetMonitor implements the DistributedSet interface and
diff --git a/functional-tests/src/test/java/test/HelloClient.java b/functional-tests/src/test/java/test/HelloClient.java
index a5f4bf1c50..bd0675c172 100644
--- a/functional-tests/src/test/java/test/HelloClient.java
+++ b/functional-tests/src/test/java/test/HelloClient.java
@@ -21,7 +21,6 @@
 package test;
 
 import javax.rmi.PortableContext;
-import javax.rmi.PortableRemoteObject;
 
 public class HelloClient {
 
diff --git a/functional-tests/src/test/java/test/InstallTest.java b/functional-tests/src/test/java/test/InstallTest.java
index 14ccee0e52..71b2515357 100644
--- a/functional-tests/src/test/java/test/InstallTest.java
+++ b/functional-tests/src/test/java/test/InstallTest.java
@@ -20,9 +20,10 @@
 
 package test;
 
-import rmic.HelloTest;
 import com.sun.corba.ee.impl.util.Version;
 
+import rmic.HelloTest;
+
 /*
  * @test
  */
diff --git a/functional-tests/src/test/java/test/ProcessMonitor.java b/functional-tests/src/test/java/test/ProcessMonitor.java
index f70d6da156..6ff72db772 100644
--- a/functional-tests/src/test/java/test/ProcessMonitor.java
+++ b/functional-tests/src/test/java/test/ProcessMonitor.java
@@ -20,7 +20,7 @@
 
 package test;
 
-import java.io.*;
+import java.io.OutputStream;
 
 /**
  * ProcessMonitor provides a thread which will consume output from a
diff --git a/functional-tests/src/test/java/test/RemoteTest.java b/functional-tests/src/test/java/test/RemoteTest.java
index 3905da3ba4..feb16e11b0 100644
--- a/functional-tests/src/test/java/test/RemoteTest.java
+++ b/functional-tests/src/test/java/test/RemoteTest.java
@@ -20,16 +20,15 @@
 
 package test;
 
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import java.io.IOException;
+import com.sun.corba.ee.impl.util.Utility;
+
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.PrintStream;
-import javax.naming.NamingException;
 import java.util.HashSet;
-import com.sun.corba.ee.impl.util.Utility;
-import java.io.File;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
 
 /*
  * @test
diff --git a/functional-tests/src/test/java/test/RemoteTestExample.java b/functional-tests/src/test/java/test/RemoteTestExample.java
index 6e12b84471..66459e57d0 100644
--- a/functional-tests/src/test/java/test/RemoteTestExample.java
+++ b/functional-tests/src/test/java/test/RemoteTestExample.java
@@ -21,9 +21,7 @@
 package test;
 
 import java.rmi.Remote;
-import java.rmi.RemoteException;
-import test.ServantContext;
-import test.RemoteTest;
+
 import javax.rmi.PortableRemoteObject;
 
 // NOTE: This is a template for subclasses of RemoteTest. Copy it, then:
diff --git a/functional-tests/src/test/java/test/ServantContext.java b/functional-tests/src/test/java/test/ServantContext.java
index 6ed26249af..e1ab0b806f 100644
--- a/functional-tests/src/test/java/test/ServantContext.java
+++ b/functional-tests/src/test/java/test/ServantContext.java
@@ -20,17 +20,17 @@
 
 package test;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.rmi.Remote;
-import java.util.Vector;
-import java.util.Hashtable;
 import java.util.Enumeration;
-import org.omg.CORBA.ORB;
+import java.util.Hashtable;
+
 import javax.naming.Context;
-import javax.naming.NamingException;
-import java.io.IOException;
 import javax.rmi.PortableRemoteObject;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+
+import org.omg.CORBA.ORB;
 
 public class ServantContext implements ServantManager {
 
diff --git a/functional-tests/src/test/java/test/ServantManagerImpl.java b/functional-tests/src/test/java/test/ServantManagerImpl.java
index 1ae94a7e97..7083019da1 100644
--- a/functional-tests/src/test/java/test/ServantManagerImpl.java
+++ b/functional-tests/src/test/java/test/ServantManagerImpl.java
@@ -21,13 +21,15 @@
 package test;
 
 import java.rmi.Remote;
-import java.util.Hashtable;
 import java.rmi.RemoteException;
-import org.omg.CORBA.ORB;
+import java.util.Enumeration;
+import java.util.Hashtable;
+
 import javax.naming.Context;
-import javax.rmi.CORBA.Tie;
 import javax.rmi.PortableRemoteObject;
-import java.util.Enumeration;
+import javax.rmi.CORBA.Tie;
+
+import org.omg.CORBA.ORB;
 
 public class ServantManagerImpl implements ServantManager {
 
diff --git a/functional-tests/src/test/java/test/StartRMIRegistry.java b/functional-tests/src/test/java/test/StartRMIRegistry.java
index c199659461..aa9f96776d 100644
--- a/functional-tests/src/test/java/test/StartRMIRegistry.java
+++ b/functional-tests/src/test/java/test/StartRMIRegistry.java
@@ -21,9 +21,9 @@
 
 package test;
 
+import java.rmi.RMISecurityManager;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
-import java.rmi.RMISecurityManager;
 
 public class StartRMIRegistry {
 
diff --git a/functional-tests/src/test/java/test/StreamReader.java b/functional-tests/src/test/java/test/StreamReader.java
index fd20db8121..608c036777 100644
--- a/functional-tests/src/test/java/test/StreamReader.java
+++ b/functional-tests/src/test/java/test/StreamReader.java
@@ -20,7 +20,11 @@
 
 package test;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/functional-tests/src/test/java/test/Test.java b/functional-tests/src/test/java/test/Test.java
index dd1d0c06e9..d99276d936 100644
--- a/functional-tests/src/test/java/test/Test.java
+++ b/functional-tests/src/test/java/test/Test.java
@@ -21,29 +21,29 @@
 
 package test;
 
-import java.lang.management.RuntimeMXBean;
-import java.lang.management.ManagementFactory;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
 
-import java.util.List;
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Date;
-import java.util.StringTokenizer;
-import java.io.IOException;
-import java.io.FileInputStream;
+import java.io.BufferedReader;
 import java.io.DataInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StreamTokenizer;
-import java.io.BufferedReader;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.net.ServerSocket;
+import java.util.Date;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
 import org.glassfish.rmic.tools.java.ClassFile;
 import org.glassfish.rmic.tools.java.ClassPath;
-import java.net.ServerSocket;
-import java.util.Properties;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.orb.ORB;
 
 /**
  * The abstract Test class.  The simplest way to use this class is to inherit from it
diff --git a/functional-tests/src/test/java/test/Util.java b/functional-tests/src/test/java/test/Util.java
index 4bd5c22280..169137ec14 100644
--- a/functional-tests/src/test/java/test/Util.java
+++ b/functional-tests/src/test/java/test/Util.java
@@ -22,14 +22,9 @@
 package test;
 
 import com.sun.corba.ee.impl.util.JDKBridge;
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.JndiConstants;
-import org.omg.CORBA.ORB;
-import sun.rmi.rmic.Main;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -38,6 +33,14 @@
 import java.util.Properties;
 import java.util.Vector;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.ORB;
+
+import sun.rmi.rmic.Main;
+
 public class Util {
 
     static private boolean debug = false ;
diff --git a/functional-tests/src/test/java/test/WebServer.java b/functional-tests/src/test/java/test/WebServer.java
index 5dea924b92..bd4f3230c4 100644
--- a/functional-tests/src/test/java/test/WebServer.java
+++ b/functional-tests/src/test/java/test/WebServer.java
@@ -24,9 +24,18 @@
 
 package test;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Date;
+import java.util.Properties;
+import java.util.Vector;
 
 public class WebServer extends Thread implements HttpConstants {
 
diff --git a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java
index d54f9988a0..0d5b876b93 100644
--- a/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java
+++ b/orbmain/src/main/java/com/sun/corba/ee/impl/transport/concurrent/ConcurrentQueueImpl.java
@@ -20,7 +20,6 @@
 package com.sun.corba.ee.impl.transport.concurrent ;
 
 import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue;
-import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue.Handle;
 
 public class ConcurrentQueueImpl implements ConcurrentQueue {
     // This implementation of ConcurrentQueue is unsynchronized, for use in
diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java
index f628d112c2..f4d302da49 100644
--- a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java
+++ b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestIDLNameTranslator.java
@@ -22,11 +22,6 @@
 
 import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator;
 
-import java.lang.reflect.Method;
-import java.math.BigInteger;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
 import corba.dynamicrmiiiop.testclasses.ContainerClash1;
 import corba.dynamicrmiiiop.testclasses.ContainerClash2;
 import corba.dynamicrmiiiop.testclasses.IDLCaseSensitivityTest;
@@ -40,6 +35,12 @@
 import corba.dynamicrmiiiop.testclasses.InvalidRemotes;
 import corba.dynamicrmiiiop.testclasses._ContainerClash3;
 import corba.dynamicrmiiiop.testclasses._ContainerClash4;
+
+import java.lang.reflect.Method;
+import java.math.BigInteger;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
 import junit.framework.TestCase;
 
 public class TestIDLNameTranslator extends TestCase {
diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java
index 6a705c6221..04c99e970e 100644
--- a/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java
+++ b/orbmain/src/test/java/com/sun/corba/ee/impl/presentation/rmi/TestRMIIDLTypes.java
@@ -28,6 +28,7 @@
 import corba.dynamicrmiiiop.testclasses.ValidObjRefs;
 import corba.dynamicrmiiiop.testclasses.ValidRemotes;
 import corba.dynamicrmiiiop.testclasses.ValidValues;
+
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
diff --git a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java
index 402c33a8db..6b4c9e45e9 100644
--- a/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java
+++ b/orbmain/src/test/java/com/sun/corba/ee/impl/transport/ConnectionImplTest.java
@@ -22,9 +22,6 @@
 import com.sun.corba.ee.impl.encoding.CDRInputObject;
 import com.sun.corba.ee.impl.protocol.RequestIdImpl;
 import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message;
-import com.sun.corba.ee.impl.transport.TransportTestBase.BackgroundProcessor;
-import com.sun.corba.ee.impl.transport.TransportTestBase.RequestDispatcher;
-import com.sun.corba.ee.impl.transport.TransportTestBase.SocketChannelFake;
 import com.sun.corba.ee.spi.protocol.MessageMediator;
 import com.sun.corba.ee.spi.threadpool.Work;
 
diff --git a/test/disabled/performance/eesample/wspex/components/OrderBL.java b/test/disabled/performance/eesample/wspex/components/OrderBL.java
index 918e52912c..db1df57700 100644
--- a/test/disabled/performance/eesample/wspex/components/OrderBL.java
+++ b/test/disabled/performance/eesample/wspex/components/OrderBL.java
@@ -19,13 +19,18 @@
 
 package performance.eesample.wspex.components;
 
-import performance.eesample.wspex.*;
+import java.util.List;
 
-import java.util.*;
 import javax.xml.datatype.DatatypeConstants;
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import performance.eesample.wspex.Address;
+import performance.eesample.wspex.ArrayOfLineItem;
+import performance.eesample.wspex.Customer;
+import performance.eesample.wspex.LineItem;
+import performance.eesample.wspex.Order;
+
 public class OrderBL {
 
     static DatatypeFactory df;
diff --git a/test/src/share/classes/corba/acceptorandcontactinfo/AcceptorAndContactInfoTest.java b/test/src/share/classes/corba/acceptorandcontactinfo/AcceptorAndContactInfoTest.java
index d392f0a7ae..5f5d4b0cf1 100644
--- a/test/src/share/classes/corba/acceptorandcontactinfo/AcceptorAndContactInfoTest.java
+++ b/test/src/share/classes/corba/acceptorandcontactinfo/AcceptorAndContactInfoTest.java
@@ -24,8 +24,8 @@
 
 package corba.acceptorandcontactinfo;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class AcceptorAndContactInfoTest
     extends
diff --git a/test/src/share/classes/corba/acceptorandcontactinfo/Client.java b/test/src/share/classes/corba/acceptorandcontactinfo/Client.java
index f977799d15..3421938cdb 100644
--- a/test/src/share/classes/corba/acceptorandcontactinfo/Client.java
+++ b/test/src/share/classes/corba/acceptorandcontactinfo/Client.java
@@ -24,15 +24,13 @@
 
 package corba.acceptorandcontactinfo;
 
-import javax.naming.InitialContext;
-import javax.rmi.CORBA.Util;
-import org.omg.CORBA.ORB;
-
 import corba.framework.Controller;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.impl.legacy.connection.LegacyServerSocketManagerImpl;
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.ORB;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/acceptorandcontactinfo/ColocatedClientServer.java b/test/src/share/classes/corba/acceptorandcontactinfo/ColocatedClientServer.java
index 01fbd100dc..66daff1c3a 100644
--- a/test/src/share/classes/corba/acceptorandcontactinfo/ColocatedClientServer.java
+++ b/test/src/share/classes/corba/acceptorandcontactinfo/ColocatedClientServer.java
@@ -24,11 +24,14 @@
 
 package corba.acceptorandcontactinfo;
 
+import corba.hcks.C;
+import corba.hcks.U;
+
 import java.util.Properties;
+
 import javax.naming.InitialContext;
+
 import org.omg.CORBA.ORB;
-import corba.hcks.C;
-import corba.hcks.U;
 
 public class ColocatedClientServer
 {
diff --git a/test/src/share/classes/corba/acceptorandcontactinfo/ServantLocator.java b/test/src/share/classes/corba/acceptorandcontactinfo/ServantLocator.java
index 0828d8d7b0..0110e9e78f 100644
--- a/test/src/share/classes/corba/acceptorandcontactinfo/ServantLocator.java
+++ b/test/src/share/classes/corba/acceptorandcontactinfo/ServantLocator.java
@@ -24,15 +24,13 @@
 
 package corba.acceptorandcontactinfo;
 
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.OBJECT_NOT_EXIST;
+import corba.hcks.U;
+
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import corba.hcks.U;
-
 public class ServantLocator
     extends
         org.omg.CORBA.LocalObject
diff --git a/test/src/share/classes/corba/acceptorandcontactinfo/Server.java b/test/src/share/classes/corba/acceptorandcontactinfo/Server.java
index 757fc5583e..28d881a462 100644
--- a/test/src/share/classes/corba/acceptorandcontactinfo/Server.java
+++ b/test/src/share/classes/corba/acceptorandcontactinfo/Server.java
@@ -24,20 +24,19 @@
 
 package corba.acceptorandcontactinfo;
 
-import javax.naming.InitialContext;
-
-import org.omg.CORBA.Policy;
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.transport.TransportManager;
 
 import corba.framework.Controller;
 import corba.framework.Options;
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.spi.transport.TransportManager;
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.impl.legacy.connection.LegacyServerSocketManagerImpl;
+import javax.naming.InitialContext;
+
+import org.omg.CORBA.Policy;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 public class Server
 {
diff --git a/test/src/share/classes/corba/acceptorandcontactinfo/rmiiIServantPOA.java b/test/src/share/classes/corba/acceptorandcontactinfo/rmiiIServantPOA.java
index 75906af28e..6588328639 100644
--- a/test/src/share/classes/corba/acceptorandcontactinfo/rmiiIServantPOA.java
+++ b/test/src/share/classes/corba/acceptorandcontactinfo/rmiiIServantPOA.java
@@ -24,9 +24,11 @@
 
 package corba.acceptorandcontactinfo;
 
+import corba.hcks.U;
+
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
-import corba.hcks.U;
 
 public class rmiiIServantPOA
     extends
diff --git a/test/src/share/classes/corba/cdrext/AbsTester.java b/test/src/share/classes/corba/cdrext/AbsTester.java
index f3a09d8e2d..29f5bffb7e 100644
--- a/test/src/share/classes/corba/cdrext/AbsTester.java
+++ b/test/src/share/classes/corba/cdrext/AbsTester.java
@@ -19,7 +19,7 @@
 
 package corba.cdrext;
 
-import java.rmi.*;
+import java.rmi.RemoteException;
 
 public interface AbsTester
 {
diff --git a/test/src/share/classes/corba/cdrext/CDRExtTest.java b/test/src/share/classes/corba/cdrext/CDRExtTest.java
index 558ebfb4c4..b541faa488 100644
--- a/test/src/share/classes/corba/cdrext/CDRExtTest.java
+++ b/test/src/share/classes/corba/cdrext/CDRExtTest.java
@@ -19,11 +19,14 @@
 
 package corba.cdrext;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
+
 public class CDRExtTest extends CORBATest {
 
     protected void doTest() throws Throwable
diff --git a/test/src/share/classes/corba/cdrext/Client.java b/test/src/share/classes/corba/cdrext/Client.java
index ba3ae4de9c..a56b8910b0 100644
--- a/test/src/share/classes/corba/cdrext/Client.java
+++ b/test/src/share/classes/corba/cdrext/Client.java
@@ -19,18 +19,22 @@
 
 package corba.cdrext;
 
-import java.rmi.*;
+import corba.framework.TestngRunner;
+
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Vector;
+
+import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
-import javax.naming.*;
-import java.io.*;
-import java.util.*;
-import javax.rmi.CORBA.*;
 
-import org.testng.annotations.Test;
 import org.testng.annotations.BeforeSuite;
-import org.testng.Assert;
-
-import corba.framework.TestngRunner;
+import org.testng.annotations.Test;
 
 public class Client {
     // Important: put the initialContext here so that is does NOT get GCed and finalized
diff --git a/test/src/share/classes/corba/cdrext/CustomMarshalTester.java b/test/src/share/classes/corba/cdrext/CustomMarshalTester.java
index 2160e9459f..b834a135d6 100644
--- a/test/src/share/classes/corba/cdrext/CustomMarshalTester.java
+++ b/test/src/share/classes/corba/cdrext/CustomMarshalTester.java
@@ -19,8 +19,12 @@
 
 package corba.cdrext;
 
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 public class CustomMarshalTester extends MarshalTester implements Serializable
 {
diff --git a/test/src/share/classes/corba/cdrext/MarshalChecker.java b/test/src/share/classes/corba/cdrext/MarshalChecker.java
index cb8a6517b2..c68a744a4a 100644
--- a/test/src/share/classes/corba/cdrext/MarshalChecker.java
+++ b/test/src/share/classes/corba/cdrext/MarshalChecker.java
@@ -18,7 +18,3 @@
  */
 
 package corba.cdrext;
-
-import java.io.*;
-import java.util.*;
-
diff --git a/test/src/share/classes/corba/cdrext/MarshalTester.java b/test/src/share/classes/corba/cdrext/MarshalTester.java
index 80a51037ea..4f6176d021 100644
--- a/test/src/share/classes/corba/cdrext/MarshalTester.java
+++ b/test/src/share/classes/corba/cdrext/MarshalTester.java
@@ -19,9 +19,10 @@
 
 package corba.cdrext;
 
+import java.io.Externalizable;
+import java.io.Serializable;
 import java.rmi.Remote;
-import java.io.*;
-import java.util.*;
+import java.util.Arrays;
 
 /**
  * Class with all basic fields plus a recursive, Object,
diff --git a/test/src/share/classes/corba/cdrext/ReplaceSubClass.java b/test/src/share/classes/corba/cdrext/ReplaceSubClass.java
index 6a7f0b4d6d..5110ea1138 100644
--- a/test/src/share/classes/corba/cdrext/ReplaceSubClass.java
+++ b/test/src/share/classes/corba/cdrext/ReplaceSubClass.java
@@ -20,8 +20,6 @@
 
 package corba.cdrext;
 
-import java.io.*;
-
 public class ReplaceSubClass extends ReplaceSuperClass
 {
     private long longValue;
diff --git a/test/src/share/classes/corba/cdrext/ReplaceSuperClass.java b/test/src/share/classes/corba/cdrext/ReplaceSuperClass.java
index e6a8b28216..a40d09c5b7 100644
--- a/test/src/share/classes/corba/cdrext/ReplaceSuperClass.java
+++ b/test/src/share/classes/corba/cdrext/ReplaceSuperClass.java
@@ -20,7 +20,7 @@
 
 package corba.cdrext;
 
-import java.io.*;
+import java.io.Serializable;
 
 public class ReplaceSuperClass implements Serializable
 {
diff --git a/test/src/share/classes/corba/cdrext/Server.java b/test/src/share/classes/corba/cdrext/Server.java
index cff214909a..13019946af 100644
--- a/test/src/share/classes/corba/cdrext/Server.java
+++ b/test/src/share/classes/corba/cdrext/Server.java
@@ -19,17 +19,20 @@
 
 package corba.cdrext;
 
-import org.omg.CORBA.*;
-import org.omg.CORBA.portable.*;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.PortableServer.*;
+import java.rmi.RemoteException;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 
-import java.rmi.*;
 import javax.rmi.PortableRemoteObject;
-import javax.naming.*;
-import java.io.*;
-import java.util.*;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 public class Server extends PortableRemoteObject implements Tester
 {
diff --git a/test/src/share/classes/corba/cdrext/SubClass.java b/test/src/share/classes/corba/cdrext/SubClass.java
index cf9bce7bbf..c4abd5f6c9 100644
--- a/test/src/share/classes/corba/cdrext/SubClass.java
+++ b/test/src/share/classes/corba/cdrext/SubClass.java
@@ -20,7 +20,7 @@
 
 package corba.cdrext;
 
-import java.io.*;
+import java.io.Serializable;
 
 public class SubClass extends SuperClass implements Serializable
 {
diff --git a/test/src/share/classes/corba/cdrext/TestClass.java b/test/src/share/classes/corba/cdrext/TestClass.java
index a9b94cc450..3e3eb7521a 100644
--- a/test/src/share/classes/corba/cdrext/TestClass.java
+++ b/test/src/share/classes/corba/cdrext/TestClass.java
@@ -19,7 +19,11 @@
 
 package corba.cdrext;
 
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
 
 public class TestClass implements Serializable
 {
diff --git a/test/src/share/classes/corba/cdrext/TestExternalizable.java b/test/src/share/classes/corba/cdrext/TestExternalizable.java
index 0fef040ff4..e96b4cbc81 100644
--- a/test/src/share/classes/corba/cdrext/TestExternalizable.java
+++ b/test/src/share/classes/corba/cdrext/TestExternalizable.java
@@ -19,7 +19,10 @@
 
 package corba.cdrext;
 
-import java.io.*;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 
 public class TestExternalizable implements Externalizable
 {
diff --git a/test/src/share/classes/corba/cdrext/TestObject.java b/test/src/share/classes/corba/cdrext/TestObject.java
index 1f7a3fa48c..6b58287aa8 100644
--- a/test/src/share/classes/corba/cdrext/TestObject.java
+++ b/test/src/share/classes/corba/cdrext/TestObject.java
@@ -19,8 +19,14 @@
 
 package corba.cdrext;
 
-import java.util.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.ObjectStreamField;
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Uses PutField/GetField
diff --git a/test/src/share/classes/corba/cdrext/Tester.java b/test/src/share/classes/corba/cdrext/Tester.java
index 0366678313..2d9405c8bb 100644
--- a/test/src/share/classes/corba/cdrext/Tester.java
+++ b/test/src/share/classes/corba/cdrext/Tester.java
@@ -19,10 +19,13 @@
 
 package corba.cdrext;
 
-import java.rmi.*;
-import java.io.*;
-import java.util.*;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 import java.sql.Date;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
 
 public interface Tester extends Remote, AbsTester {
 
diff --git a/test/src/share/classes/corba/cdrstreams/CDRTests.java b/test/src/share/classes/corba/cdrstreams/CDRTests.java
index e7970ceb13..c2a41c82fb 100644
--- a/test/src/share/classes/corba/cdrstreams/CDRTests.java
+++ b/test/src/share/classes/corba/cdrstreams/CDRTests.java
@@ -19,10 +19,8 @@
 
 package corba.cdrstreams;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
-import com.sun.corba.ee.spi.orb.ORB;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class CDRTests extends CORBATest
 {
diff --git a/test/src/share/classes/corba/cdrstreams/Client.java b/test/src/share/classes/corba/cdrstreams/Client.java
index 711bba987e..c2fa56199e 100644
--- a/test/src/share/classes/corba/cdrstreams/Client.java
+++ b/test/src/share/classes/corba/cdrstreams/Client.java
@@ -19,19 +19,24 @@
 
 package corba.cdrstreams;
 
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.*;
-import java.util.* ;
-import java.rmi.RemoteException;
-import java.io.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import org.testng.annotations.Test;
-import org.testng.annotations.BeforeSuite;
-
 import corba.framework.TestngRunner;
 
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Properties;
+import java.util.Vector;
+
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
+
 public class Client
 {
     GraphProcessor processor ;
diff --git a/test/src/share/classes/corba/cdrstreams/CustomMarshaled.java b/test/src/share/classes/corba/cdrstreams/CustomMarshaled.java
index ae7800b0d2..e17a99b193 100644
--- a/test/src/share/classes/corba/cdrstreams/CustomMarshaled.java
+++ b/test/src/share/classes/corba/cdrstreams/CustomMarshaled.java
@@ -19,7 +19,8 @@
 
 package corba.cdrstreams;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 
 public class CustomMarshaled implements Serializable
 {
diff --git a/test/src/share/classes/corba/cdrstreams/GraphProcessor.java b/test/src/share/classes/corba/cdrstreams/GraphProcessor.java
index d033026a51..c07d18d089 100644
--- a/test/src/share/classes/corba/cdrstreams/GraphProcessor.java
+++ b/test/src/share/classes/corba/cdrstreams/GraphProcessor.java
@@ -19,7 +19,6 @@
 
 package corba.cdrstreams;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 public interface GraphProcessor extends java.rmi.Remote
diff --git a/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java b/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java
index 047c517e6e..a0ec45c23e 100644
--- a/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java
+++ b/test/src/share/classes/corba/cdrstreams/GraphProcessorImpl.java
@@ -20,12 +20,10 @@
 package corba.cdrstreams;
 
 import java.rmi.RemoteException;
+import java.util.Enumeration;
+import java.util.Vector;
+
 import javax.rmi.PortableRemoteObject;
-import org.omg.CORBA.ORB;
-import java.io.File;
-import java.io.RandomAccessFile;
-import org.omg.PortableServer.POA;
-import java.util.*;
 
 public class GraphProcessorImpl extends PortableRemoteObject implements GraphProcessor
 {
diff --git a/test/src/share/classes/corba/cdrstreams/MarkResetTester.java b/test/src/share/classes/corba/cdrstreams/MarkResetTester.java
index 0bc395940a..301fc881a4 100644
--- a/test/src/share/classes/corba/cdrstreams/MarkResetTester.java
+++ b/test/src/share/classes/corba/cdrstreams/MarkResetTester.java
@@ -19,7 +19,8 @@
 
 package corba.cdrstreams;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 
 public class MarkResetTester implements Serializable
 {
diff --git a/test/src/share/classes/corba/cdrstreams/Server.java b/test/src/share/classes/corba/cdrstreams/Server.java
index 0a8d624bf8..2b408a5b73 100644
--- a/test/src/share/classes/corba/cdrstreams/Server.java
+++ b/test/src/share/classes/corba/cdrstreams/Server.java
@@ -19,15 +19,15 @@
 
 package corba.cdrstreams;
 
-import org.omg.CORBA.portable.*;
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
-import org.omg.PortableServer.*;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 public class Server
 {
diff --git a/test/src/share/classes/corba/cmvt/CMVTTest.java b/test/src/share/classes/corba/cmvt/CMVTTest.java
index 081b53e24e..cc472a1c10 100644
--- a/test/src/share/classes/corba/cmvt/CMVTTest.java
+++ b/test/src/share/classes/corba/cmvt/CMVTTest.java
@@ -20,11 +20,14 @@
 
 package corba.cmvt;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
+
 public class CMVTTest extends CORBATest {
     static final int GROW = 0;
     static final int STREAM = 2;
diff --git a/test/src/share/classes/corba/cmvt/Client.java b/test/src/share/classes/corba/cmvt/Client.java
index bae4802ec9..c19b9196f5 100644
--- a/test/src/share/classes/corba/cmvt/Client.java
+++ b/test/src/share/classes/corba/cmvt/Client.java
@@ -19,15 +19,11 @@
 
 package corba.cmvt;
 
+import java.io.FileInputStream;
+
 import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.*;
-import java.util.* ;
-import java.rmi.RemoteException;
-import java.io.*;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
+
+import org.omg.CORBA.ORB;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/cmvt/GIOPCombo.java b/test/src/share/classes/corba/cmvt/GIOPCombo.java
index b66f597340..41dac2c9c9 100644
--- a/test/src/share/classes/corba/cmvt/GIOPCombo.java
+++ b/test/src/share/classes/corba/cmvt/GIOPCombo.java
@@ -21,7 +21,6 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import org.omg.CORBA.*;
 
 public interface GIOPCombo extends Remote {
     public int sayHello(int value)
diff --git a/test/src/share/classes/corba/cmvt/GIOPComboImpl.java b/test/src/share/classes/corba/cmvt/GIOPComboImpl.java
index 72ffde640a..85d5bbd497 100644
--- a/test/src/share/classes/corba/cmvt/GIOPComboImpl.java
+++ b/test/src/share/classes/corba/cmvt/GIOPComboImpl.java
@@ -19,11 +19,8 @@
 
 package corba.cmvt;
 
-import java.io.*;
-import java.util.*;
-import org.omg.CORBA.*;
-import java.io.DataInputStream;
-import java.rmi.*;
+import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class GIOPComboImpl extends PortableRemoteObject implements GIOPCombo
diff --git a/test/src/share/classes/corba/cmvt/Server.java b/test/src/share/classes/corba/cmvt/Server.java
index 1e4696db4b..fb82f9ad63 100644
--- a/test/src/share/classes/corba/cmvt/Server.java
+++ b/test/src/share/classes/corba/cmvt/Server.java
@@ -19,17 +19,10 @@
 
 package corba.cmvt;
 
-import org.omg.CORBA.portable.*;
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
-import java.util.Properties;
-import org.omg.PortableServer.*;
-import java.io.*;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
+import java.io.FileOutputStream;
+
+import org.omg.CORBA.ORB;
+import org.omg.PortableServer.POA;
 
 public class Server
 {
diff --git a/test/src/share/classes/corba/codebase/Client.java b/test/src/share/classes/corba/codebase/Client.java
index 049507dbac..5f29be67f5 100644
--- a/test/src/share/classes/corba/codebase/Client.java
+++ b/test/src/share/classes/corba/codebase/Client.java
@@ -19,11 +19,8 @@
 
 package corba.codebase;
 
-import java.rmi.*;
+import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
-import javax.naming.*;
-
-import java.io.*;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/codebase/CodeBaseTest.java b/test/src/share/classes/corba/codebase/CodeBaseTest.java
index d00b4236ec..b6528c389f 100644
--- a/test/src/share/classes/corba/codebase/CodeBaseTest.java
+++ b/test/src/share/classes/corba/codebase/CodeBaseTest.java
@@ -19,11 +19,19 @@
 
 package corba.codebase;
 
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.DebugExec;
+import corba.framework.EmmaControl;
+import corba.framework.ExternalExec;
+import corba.framework.FileOutputDecorator;
+import corba.framework.Options;
+
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Properties;
+
 import test.Test;
-import corba.framework.*;
-import java.util.*;
-import java.io.*;
-import com.sun.corba.ee.spi.orb.ORB;
 
 public class CodeBaseTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/codebase/NoSecurityManager.java b/test/src/share/classes/corba/codebase/NoSecurityManager.java
index 9d4e6f897f..313f9bcd32 100644
--- a/test/src/share/classes/corba/codebase/NoSecurityManager.java
+++ b/test/src/share/classes/corba/codebase/NoSecurityManager.java
@@ -20,10 +20,8 @@
 package corba.codebase;
 
 import java.io.FileDescriptor;
-import java.util.Hashtable;
 import java.net.InetAddress;
-import java.lang.reflect.Member;
-import java.security.*;
+import java.security.Permission;
 
 /**
  * Allows everything.  The No Security Security Manager.
diff --git a/test/src/share/classes/corba/codebase/Server.java b/test/src/share/classes/corba/codebase/Server.java
index cc3d815a24..a4f7cfafc5 100644
--- a/test/src/share/classes/corba/codebase/Server.java
+++ b/test/src/share/classes/corba/codebase/Server.java
@@ -19,11 +19,8 @@
 
 package corba.codebase;
 
-import java.rmi.*;
+import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
-import javax.naming.*;
-
-import java.io.*;
 
 public class Server extends PortableRemoteObject implements Tester
 {
diff --git a/test/src/share/classes/corba/codebase/WebServer.java b/test/src/share/classes/corba/codebase/WebServer.java
index 0b8c3d3649..da13dd9c69 100644
--- a/test/src/share/classes/corba/codebase/WebServer.java
+++ b/test/src/share/classes/corba/codebase/WebServer.java
@@ -19,9 +19,18 @@
 
 package corba.codebase;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Date;
+import java.util.Properties;
+import java.util.Vector;
 
 public class WebServer extends Thread implements HttpConstants {
 
diff --git a/test/src/share/classes/corba/connectioncache/Client.java b/test/src/share/classes/corba/connectioncache/Client.java
index d5d1126049..ace7add963 100644
--- a/test/src/share/classes/corba/connectioncache/Client.java
+++ b/test/src/share/classes/corba/connectioncache/Client.java
@@ -19,36 +19,33 @@
 
 package corba.connectioncache ;
 
+import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue;
+import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory;
+import com.sun.corba.ee.spi.transport.connection.ConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory;
+import com.sun.corba.ee.spi.transport.connection.ConnectionFinder;
+import com.sun.corba.ee.spi.transport.connection.ContactInfo;
+import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache;
+
+import corba.framework.TestngRunner;
+
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Set;
-import java.util.HashSet;
-
-import java.util.logging.Logger;
+import java.util.logging.Formatter;
 import java.util.logging.Handler;
 import java.util.logging.Level;
-import java.util.logging.StreamHandler;
-import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
-
-import java.io.IOException;
+import java.util.logging.Logger;
+import java.util.logging.StreamHandler;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueue;
-import com.sun.corba.ee.spi.transport.concurrent.ConcurrentQueueFactory;
-
-import com.sun.corba.ee.spi.transport.connection.ConnectionFinder;
-import com.sun.corba.ee.spi.transport.connection.ConnectionCache;
-import com.sun.corba.ee.spi.transport.connection.ContactInfo;
-import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache;
-import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache;
-import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory;
-
-import corba.framework.TestngRunner;
-
 public class Client {
     // Ignore all of the LogRecord information except the message.
     public static class ReallySimpleFormatter extends Formatter {
diff --git a/test/src/share/classes/corba/connectioncache/ConnectionCacheStressTest.java b/test/src/share/classes/corba/connectioncache/ConnectionCacheStressTest.java
index a0a4998643..f13956cc0b 100644
--- a/test/src/share/classes/corba/connectioncache/ConnectionCacheStressTest.java
+++ b/test/src/share/classes/corba/connectioncache/ConnectionCacheStressTest.java
@@ -19,7 +19,8 @@
 
 package corba.connectioncache;
 
-import corba.framework.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class ConnectionCacheStressTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/connectioncache/ConnectionCacheTest.java b/test/src/share/classes/corba/connectioncache/ConnectionCacheTest.java
index db7ef78e15..fa503c0836 100644
--- a/test/src/share/classes/corba/connectioncache/ConnectionCacheTest.java
+++ b/test/src/share/classes/corba/connectioncache/ConnectionCacheTest.java
@@ -19,7 +19,8 @@
 
 package corba.connectioncache;
 
-import corba.framework.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class ConnectionCacheTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/connectioncache/ConnectionImpl.java b/test/src/share/classes/corba/connectioncache/ConnectionImpl.java
index fd4930844d..56e651f05f 100644
--- a/test/src/share/classes/corba/connectioncache/ConnectionImpl.java
+++ b/test/src/share/classes/corba/connectioncache/ConnectionImpl.java
@@ -22,6 +22,7 @@
 // A simple implementation of Connection for testing.  No
 
 import com.sun.corba.ee.spi.transport.connection.Connection;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 
 // synchronization is required to use this class.
diff --git a/test/src/share/classes/corba/connectioncache/ContactInfoImpl.java b/test/src/share/classes/corba/connectioncache/ContactInfoImpl.java
index eb3a6b3c01..0f9b3c7d59 100644
--- a/test/src/share/classes/corba/connectioncache/ContactInfoImpl.java
+++ b/test/src/share/classes/corba/connectioncache/ContactInfoImpl.java
@@ -20,6 +20,7 @@
 package corba.connectioncache ;
 
 import com.sun.corba.ee.spi.transport.connection.ContactInfo;
+
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/test/src/share/classes/corba/connectioncache/StressClient.java b/test/src/share/classes/corba/connectioncache/StressClient.java
index 55054f24b1..69f71c4b2a 100644
--- a/test/src/share/classes/corba/connectioncache/StressClient.java
+++ b/test/src/share/classes/corba/connectioncache/StressClient.java
@@ -19,29 +19,27 @@
 
 package corba.connectioncache ;
 
-import java.util.List;
-import java.util.ArrayList;
-
-import java.util.logging.Logger;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.StreamHandler;
-import java.util.logging.Formatter;
-import java.util.logging.LogRecord;
-
-import java.io.IOException;
-
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
 import com.sun.corba.ee.spi.transport.connection.ConnectionCache;
+import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory;
 import com.sun.corba.ee.spi.transport.connection.ContactInfo;
 import com.sun.corba.ee.spi.transport.connection.InboundConnectionCache;
 import com.sun.corba.ee.spi.transport.connection.OutboundConnectionCache;
-import com.sun.corba.ee.spi.transport.connection.ConnectionCacheFactory;
 
 import corba.framework.TestngRunner;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
+import java.util.logging.Formatter;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import java.util.logging.StreamHandler;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class StressClient {
     // Ignore all of the LogRecord information except the message.
diff --git a/test/src/share/classes/corba/connections/Client.java b/test/src/share/classes/corba/connections/Client.java
index f8844ce5d5..c2aafb1a16 100644
--- a/test/src/share/classes/corba/connections/Client.java
+++ b/test/src/share/classes/corba/connections/Client.java
@@ -24,17 +24,16 @@
 
 package corba.connections;
 
-import java.rmi.RemoteException;
-import javax.naming.InitialContext;
-
-import java.util.Properties;
-
 import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
 import corba.hcks.C;
 import corba.hcks.U;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+import java.rmi.RemoteException;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/connections/ConnectionStatistics.java b/test/src/share/classes/corba/connections/ConnectionStatistics.java
index 153eec9fd3..23faa2bd4f 100644
--- a/test/src/share/classes/corba/connections/ConnectionStatistics.java
+++ b/test/src/share/classes/corba/connections/ConnectionStatistics.java
@@ -24,19 +24,14 @@
 
 package corba.connections;
 
-import java.util.Collection;
-import java.util.Iterator;
-
 import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.transport.Acceptor;
-import com.sun.corba.ee.spi.transport.TransportManager;
 import com.sun.corba.ee.spi.transport.ConnectionCache;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
+import com.sun.corba.ee.spi.transport.TransportManager;
 
 import corba.hcks.U;
 
-import org.glassfish.gmbal.GmbalException;
 import org.glassfish.gmbal.AMXClient;
+import org.glassfish.gmbal.GmbalException;
 import org.glassfish.gmbal.ManagedObjectManager;
 
 public class ConnectionStatistics
diff --git a/test/src/share/classes/corba/connections/ConnectionsTest.java b/test/src/share/classes/corba/connections/ConnectionsTest.java
index 073e6f97c6..b838294941 100644
--- a/test/src/share/classes/corba/connections/ConnectionsTest.java
+++ b/test/src/share/classes/corba/connections/ConnectionsTest.java
@@ -24,8 +24,8 @@
 
 package corba.connections;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class ConnectionsTest
     extends
diff --git a/test/src/share/classes/corba/connections/RemoteService.java b/test/src/share/classes/corba/connections/RemoteService.java
index 8767a11f84..62cf43e878 100644
--- a/test/src/share/classes/corba/connections/RemoteService.java
+++ b/test/src/share/classes/corba/connections/RemoteService.java
@@ -24,11 +24,11 @@
 
 package corba.connections;
 
+import com.sun.corba.ee.spi.orb.ORB;
+
 import java.rmi.RemoteException;
-import javax.rmi.PortableRemoteObject;
-import javax.rmi.CORBA.Util;
 
-import com.sun.corba.ee.spi.orb.ORB;
+import javax.rmi.PortableRemoteObject;
 
 public class RemoteService
     extends
diff --git a/test/src/share/classes/corba/connections/Server.java b/test/src/share/classes/corba/connections/Server.java
index 0b4406bf5d..19ae69c1a1 100644
--- a/test/src/share/classes/corba/connections/Server.java
+++ b/test/src/share/classes/corba/connections/Server.java
@@ -24,17 +24,17 @@
 
 package corba.connections;
 
-import java.util.Properties;
-import javax.naming.InitialContext;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
 import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import corba.framework.Options;
 import corba.hcks.C;
 import corba.hcks.U;
 
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
 public class Server
 {
     public static String server1   = "server1";
diff --git a/test/src/share/classes/corba/copyobjectpolicy/Client.java b/test/src/share/classes/corba/copyobjectpolicy/Client.java
index f422a205d2..c13b0e7f7a 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/Client.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/Client.java
@@ -19,45 +19,37 @@
 
 package corba.copyobjectpolicy;
 
-import java.util.Map;
+import com.sun.corba.ee.spi.extension.CopyObjectPolicy;
+import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
+
+import corba.framework.InternalProcess;
+import corba.framework.MethodEvent;
+import corba.framework.TraceElement;
+
+import java.io.PrintStream;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.List;
-import java.util.ArrayList;
+import java.util.Map;
 import java.util.Properties;
 
-import java.io.PrintStream;
-import java.io.DataInputStream;
-
-import java.rmi.RemoteException;
-
 import javax.rmi.PortableRemoteObject;
 
-import org.omg.CORBA.Policy;
 import org.omg.CORBA.ORB;
-
+import org.omg.CORBA.Policy;
+import org.omg.PortableServer.LifespanPolicyValue;
 import org.omg.PortableServer.POA;
+import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocator;
-import org.omg.PortableServer.ServantManager;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
-import org.omg.PortableServer.RequestProcessingPolicyValue;
-import org.omg.PortableServer.LifespanPolicyValue;
-import org.omg.PortableServer.POAPackage.WrongPolicy;
-import org.omg.PortableServer.POAPackage.InvalidPolicy;
 import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
-
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
+import org.omg.PortableServer.POAPackage.WrongPolicy;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
-import com.sun.corba.ee.spi.extension.CopyObjectPolicy;
-
-import corba.framework.TraceElement;
-import corba.framework.MethodEvent;
-import corba.framework.InternalProcess;
-
 public class Client implements InternalProcess
 {
     public Client()
diff --git a/test/src/share/classes/corba/copyobjectpolicy/CopyObjectPolicyTest.java b/test/src/share/classes/corba/copyobjectpolicy/CopyObjectPolicyTest.java
index faf5a42486..62953a9636 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/CopyObjectPolicyTest.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/CopyObjectPolicyTest.java
@@ -19,9 +19,10 @@
 
 package corba.copyobjectpolicy;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.InternalExec;
+import corba.framework.Options;
 
 public class CopyObjectPolicyTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java b/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java
index 826eee2491..b792d0bb1c 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/EchoImpl.java
@@ -20,6 +20,7 @@
 package corba.copyobjectpolicy;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class EchoImpl extends PortableRemoteObject implements Echo
diff --git a/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java b/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java
index 168b1c90f9..b0dd4bf191 100644
--- a/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java
+++ b/test/src/share/classes/corba/copyobjectpolicy/UserConfigurator.java
@@ -19,17 +19,17 @@
 
 package corba.copyobjectpolicy;
 
-import java.lang.reflect.Method;
-
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.orb.ORBConfigurator;
-import com.sun.corba.ee.spi.orb.DataCollector;
-
 import com.sun.corba.ee.spi.copyobject.CopierManager;
 import com.sun.corba.ee.spi.copyobject.CopyobjectDefaults;
+import com.sun.corba.ee.spi.orb.DataCollector;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBConfigurator;
 
-import corba.framework.TraceAccumulator;
 import corba.framework.ProxyInterceptor;
+import corba.framework.TraceAccumulator;
+
+import java.lang.reflect.Method;
+
 import org.glassfish.pfl.dynamic.copyobject.spi.ObjectCopierFactory;
 
 public class UserConfigurator implements ORBConfigurator
diff --git a/test/src/share/classes/corba/custom/ArrayListNode.java b/test/src/share/classes/corba/custom/ArrayListNode.java
index 5df6645df8..df04842177 100644
--- a/test/src/share/classes/corba/custom/ArrayListNode.java
+++ b/test/src/share/classes/corba/custom/ArrayListNode.java
@@ -19,7 +19,8 @@
 
 package corba.custom;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.Serializable;
 
 /**
  * Simple data structure with a java.lang.Object array of links
diff --git a/test/src/share/classes/corba/custom/Client.java b/test/src/share/classes/corba/custom/Client.java
index e904b822f6..a150bf0c3c 100644
--- a/test/src/share/classes/corba/custom/Client.java
+++ b/test/src/share/classes/corba/custom/Client.java
@@ -19,12 +19,15 @@
 
 package corba.custom;
 
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.*;
-import java.util.*;
 import java.rmi.RemoteException;
-import java.io.*;
+import java.util.Hashtable;
+
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/custom/CustomTest.java b/test/src/share/classes/corba/custom/CustomTest.java
index 0183617053..dd9bbd8dfb 100644
--- a/test/src/share/classes/corba/custom/CustomTest.java
+++ b/test/src/share/classes/corba/custom/CustomTest.java
@@ -19,11 +19,14 @@
 
 package corba.custom;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
+
 // Loops through all possible fragment sizes from 32 through user defined
 // max.  Currently [32, 512]
 //
diff --git a/test/src/share/classes/corba/custom/Node.java b/test/src/share/classes/corba/custom/Node.java
index 4b46b4ab70..3cb2a67fd9 100644
--- a/test/src/share/classes/corba/custom/Node.java
+++ b/test/src/share/classes/corba/custom/Node.java
@@ -20,7 +20,8 @@
 package corba.custom;
 
 import java.io.Serializable;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Vector;
 
 public class Node implements Serializable
 {
diff --git a/test/src/share/classes/corba/custom/Server.java b/test/src/share/classes/corba/custom/Server.java
index 577628494d..a5eb14506e 100644
--- a/test/src/share/classes/corba/custom/Server.java
+++ b/test/src/share/classes/corba/custom/Server.java
@@ -19,13 +19,11 @@
 
 package corba.custom;
 
-import org.omg.CORBA.portable.*;
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
-import java.util.Properties;
-import org.omg.PortableServer.*;
+import org.omg.CORBA.ORB;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
 
 // Nothing interesting here
 public class Server
diff --git a/test/src/share/classes/corba/custom/Verifier.java b/test/src/share/classes/corba/custom/Verifier.java
index 2159e5077f..6d8061de3e 100644
--- a/test/src/share/classes/corba/custom/Verifier.java
+++ b/test/src/share/classes/corba/custom/Verifier.java
@@ -19,7 +19,6 @@
 
 package corba.custom;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 /**
diff --git a/test/src/share/classes/corba/custom/VerifierImpl.java b/test/src/share/classes/corba/custom/VerifierImpl.java
index f43c98de8f..5bffc594fc 100644
--- a/test/src/share/classes/corba/custom/VerifierImpl.java
+++ b/test/src/share/classes/corba/custom/VerifierImpl.java
@@ -20,6 +20,7 @@
 package corba.custom;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class VerifierImpl extends PortableRemoteObject implements Verifier
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/Client.java b/test/src/share/classes/corba/dynamicrmiiiop/Client.java
index f63c76f8e6..7d61e0f8cc 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/Client.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/Client.java
@@ -19,74 +19,64 @@
 
 package corba.dynamicrmiiiop  ;
 
-import java.rmi.Remote;
-
-import java.io.Serializable;
-import java.io.Externalizable;
-
-import javax.rmi.CORBA.Tie;
-
-import org.omg.CORBA.SystemException;
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA.portable.ResponseHandler;
-import org.omg.CORBA.portable.UnknownException;
-import org.omg.CORBA_2_3.portable.InputStream;
-import org.omg.CORBA_2_3.portable.OutputStream;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Properties;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-
+// Included to directly test makeReaderWriter, which is not
+// needed in the PresentationManager API.
+import com.sun.corba.ee.impl.presentation.rmi.DynamicMethodMarshallerImpl;
+import com.sun.corba.ee.impl.presentation.rmi.ExceptionHandlerImpl;
+import com.sun.corba.ee.impl.presentation.rmi.IDLType;
+import com.sun.corba.ee.impl.util.RepositoryId;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
 import com.sun.corba.ee.spi.presentation.rmi.DynamicMethodMarshaller;
 import com.sun.corba.ee.spi.presentation.rmi.IDLNameTranslator;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
 import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.impl.presentation.rmi.IDLType;
-
 import corba.dynamicrmiiiop.testclasses.A;
 import corba.dynamicrmiiiop.testclasses.B;
 import corba.dynamicrmiiiop.testclasses.C;
-import corba.dynamicrmiiiop.testclasses.D;
-import corba.dynamicrmiiiop.testclasses.E;
-import corba.dynamicrmiiiop.testclasses.F;
-import corba.dynamicrmiiiop.testclasses.G;
-import corba.dynamicrmiiiop.testclasses.H;
 import corba.dynamicrmiiiop.testclasses.C1;
 import corba.dynamicrmiiiop.testclasses.C2;
 import corba.dynamicrmiiiop.testclasses.C3;
 import corba.dynamicrmiiiop.testclasses.C4;
 import corba.dynamicrmiiiop.testclasses.C5;
 import corba.dynamicrmiiiop.testclasses.C6;
-
+import corba.dynamicrmiiiop.testclasses.D;
+import corba.dynamicrmiiiop.testclasses.DMMImplTestClasses;
+import corba.dynamicrmiiiop.testclasses.E;
+import corba.dynamicrmiiiop.testclasses.F;
+import corba.dynamicrmiiiop.testclasses.G;
+import corba.dynamicrmiiiop.testclasses.H;
 import corba.dynamicrmiiiop.testclasses.TieTest;
 import corba.dynamicrmiiiop.testclasses.TieTestImpl;
-import corba.dynamicrmiiiop.testclasses.DMMImplTestClasses;
 
-import com.sun.corba.ee.impl.presentation.rmi.ExceptionHandlerImpl;
+import java.io.Externalizable;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.rmi.Remote;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
 
-// Included to directly test makeReaderWriter, which is not
-// needed in the PresentationManager API.
-import com.sun.corba.ee.impl.presentation.rmi.DynamicMethodMarshallerImpl;
+import javax.rmi.CORBA.Tie;
 
-import com.sun.corba.ee.impl.util.RepositoryId;
 import org.glassfish.pfl.basic.graph.Graph;
 import org.glassfish.pfl.basic.graph.GraphImpl;
 import org.glassfish.pfl.basic.graph.Node;
 import org.glassfish.pfl.dynamic.copyobject.spi.LibraryClassLoader;
 import org.glassfish.pfl.test.TestCaseTools;
+import org.omg.CORBA.SystemException;
+import org.omg.CORBA.portable.ApplicationException;
+import org.omg.CORBA.portable.ResponseHandler;
+import org.omg.CORBA.portable.UnknownException;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
 
 public class Client extends TestCase
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/DynamicRmiIIOPTest.java b/test/src/share/classes/corba/dynamicrmiiiop/DynamicRmiIIOPTest.java
index ad6569bdd4..ddc74ea9de 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/DynamicRmiIIOPTest.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/DynamicRmiIIOPTest.java
@@ -19,9 +19,8 @@
 
 package corba.dynamicrmiiiop;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class DynamicRmiIIOPTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java b/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java
index 4013fa2b14..b74ddf68be 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/TestClientDelegate.java
@@ -19,34 +19,30 @@
 
 package corba.dynamicrmiiiop  ;
 
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.protocol.ClientDelegate;
+import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher;
+import com.sun.corba.ee.spi.transport.ContactInfoList;
+
+import corba.dynamicrmiiiop.testclasses.TieTestImpl;
+
 import java.util.Iterator;
 
 import javax.rmi.CORBA.Tie;
 
+import org.omg.CORBA.Context;
+import org.omg.CORBA.ContextList;
+import org.omg.CORBA.ExceptionList;
+import org.omg.CORBA.NVList;
+import org.omg.CORBA.NamedValue;
+import org.omg.CORBA.Request;
+import org.omg.CORBA.portable.ApplicationException;
 import org.omg.CORBA.portable.InputStream;
 import org.omg.CORBA.portable.OutputStream;
-import org.omg.CORBA.portable.ServantObject;
-import org.omg.CORBA.portable.ApplicationException;
 import org.omg.CORBA.portable.RemarshalException;
 import org.omg.CORBA.portable.ResponseHandler;
-import org.omg.CORBA.Request;
-
-import org.omg.CORBA.Context;
-import org.omg.CORBA.NVList;
-import org.omg.CORBA.NamedValue;
-import org.omg.CORBA.ExceptionList;
-import org.omg.CORBA.ContextList;
-
-import org.omg.CORBA_2_3.portable.Delegate;
-
-import com.sun.corba.ee.spi.transport.ContactInfoList;
-
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.protocol.LocalClientRequestDispatcher;
-import com.sun.corba.ee.spi.protocol.ClientDelegate;
-
-import corba.dynamicrmiiiop.testclasses.TieTestImpl;
+import org.omg.CORBA.portable.ServantObject;
 
 public class TestClientDelegate extends ClientDelegate
 {
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java b/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java
index 53ad61a329..e550caffc0 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/TestCodegenProxyCreator.java
@@ -20,16 +20,15 @@
 
 package corba.dynamicrmiiiop ;
 
-import junit.framework.TestCase;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import com.sun.corba.ee.impl.presentation.rmi.codegen.CodegenProxyCreator;
 
-import java.lang.reflect.Method;
 import java.lang.reflect.InvocationTargetException;
-
+import java.lang.reflect.Method;
 import java.security.ProtectionDomain;
 
-import com.sun.corba.ee.impl.presentation.rmi.codegen.CodegenProxyCreator;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
 
 /** Test for the codegen-based ProxyCreator.
  * Steps to test:
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java b/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java
index fcc4b156e6..b2097118d5 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/TestTransport.java
@@ -19,18 +19,16 @@
 
 package corba.dynamicrmiiiop ;
 
-import org.omg.CORBA.portable.ApplicationException;
-import org.omg.CORBA_2_3.portable.InputStream;
-import org.omg.CORBA_2_3.portable.OutputStream;
-
+import com.sun.corba.ee.impl.encoding.CDRInputObject;
 import com.sun.corba.ee.impl.encoding.CDROutputObject;
 import com.sun.corba.ee.impl.encoding.EncapsInputStream;
 import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
-import com.sun.corba.ee.impl.encoding.CDRInputObject;
-
-
 import com.sun.corba.ee.spi.orb.ORB;
 
+import org.omg.CORBA.portable.ApplicationException;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
+
 public class TestTransport {
     private ORB orb ;
 
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java
index 34acd7c6e9..5b90b937a7 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/DMMImplTestClasses.java
@@ -19,7 +19,6 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 public interface DMMImplTestClasses
diff --git a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java
index 7c49b8be9d..1a91016154 100644
--- a/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java
+++ b/test/src/share/classes/corba/dynamicrmiiiop/testclasses/TieTestImpl.java
@@ -19,23 +19,21 @@
 
 package corba.dynamicrmiiiop.testclasses ;
 
-import java.rmi.RemoteException;
+import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
 
-import java.util.Map;
+import java.rmi.RemoteException;
 import java.util.HashMap;
+import java.util.Map;
 
 import javax.rmi.CORBA.Util;
 
-import org.omg.CORBA.BAD_PARAM;
+import org.glassfish.pfl.test.ObjectUtility;
 import org.omg.CORBA.BAD_OPERATION;
+import org.omg.CORBA.BAD_PARAM;
 import org.omg.CORBA.CompletionStatus;
 import org.omg.CORBA.SystemException;
-
 import org.omg.CORBA.portable.UnknownException;
 
-import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
-import org.glassfish.pfl.test.ObjectUtility;
-
 public class TieTestImpl implements TieTest
 {
     private static final ORBUtilSystemException wrapper =
diff --git a/test/src/share/classes/corba/enuminterop/Client.java b/test/src/share/classes/corba/enuminterop/Client.java
index 9a3c827cf5..7c04414bfd 100644
--- a/test/src/share/classes/corba/enuminterop/Client.java
+++ b/test/src/share/classes/corba/enuminterop/Client.java
@@ -20,17 +20,17 @@
 package corba.enuminterop  ;
 
 import corba.framework.TestngRunner;
+
 import java.io.PrintStream;
 import java.rmi.RemoteException;
 
-import org.omg.CORBA.ORB;
-
 import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextExt;
 import org.omg.CosNaming.NamingContextHelper;
-
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
diff --git a/test/src/share/classes/corba/enuminterop/EnumTest.java b/test/src/share/classes/corba/enuminterop/EnumTest.java
index 600d89ed1d..70f9a8ea2f 100644
--- a/test/src/share/classes/corba/enuminterop/EnumTest.java
+++ b/test/src/share/classes/corba/enuminterop/EnumTest.java
@@ -22,6 +22,7 @@
 import corba.framework.CORBATest;
 import corba.framework.Controller;
 import corba.framework.Options;
+
 import java.util.Properties;
 
 public class EnumTest extends CORBATest {
diff --git a/test/src/share/classes/corba/enuminterop/Server.java b/test/src/share/classes/corba/enuminterop/Server.java
index 5128211d7d..a512815732 100644
--- a/test/src/share/classes/corba/enuminterop/Server.java
+++ b/test/src/share/classes/corba/enuminterop/Server.java
@@ -19,21 +19,14 @@
 
 package corba.enuminterop;
 
-import javax.naming.InitialContext;
-import javax.naming.Context;
-import java.util.Properties;
-
-import javax.rmi.PortableRemoteObject;
 import javax.rmi.CORBA.Tie;
 
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-
-import org.omg.PortableServer.*;
-
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableServer.POA;
+import org.omg.PortableServer.Servant;
 
 
 /**
diff --git a/test/src/share/classes/corba/example/Client.java b/test/src/share/classes/corba/example/Client.java
index c935200753..97e1ec2e5a 100644
--- a/test/src/share/classes/corba/example/Client.java
+++ b/test/src/share/classes/corba/example/Client.java
@@ -19,13 +19,15 @@
 
 package corba.example;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
 import java.util.Properties;
+
 import org.omg.CORBA.ORB;
 import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
-import HelloApp.* ;
+
+import HelloApp.hello;
+import HelloApp.helloHelper;
 
 public class Client implements Runnable
 {
diff --git a/test/src/share/classes/corba/example/Example.java b/test/src/share/classes/corba/example/Example.java
index 667a9c8fa8..d963351aa9 100644
--- a/test/src/share/classes/corba/example/Example.java
+++ b/test/src/share/classes/corba/example/Example.java
@@ -19,9 +19,9 @@
 
 package corba.example;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 /**
  * This is a POA version of the mthello test.  The
diff --git a/test/src/share/classes/corba/example/Server.java b/test/src/share/classes/corba/example/Server.java
index b717936e46..f0ae6fe68f 100644
--- a/test/src/share/classes/corba/example/Server.java
+++ b/test/src/share/classes/corba/example/Server.java
@@ -25,7 +25,7 @@
 import org.omg.CosNaming.NamingContext;
 import org.omg.CosNaming.NamingContextHelper;
 import org.omg.PortableServer.POA;
-import HelloApp.* ;
+import HelloApp.hello ;
 
 /**
  * Servant implementation
diff --git a/test/src/share/classes/corba/folb/CSIv2SSLTaggedComponentHandlerImpl.java b/test/src/share/classes/corba/folb/CSIv2SSLTaggedComponentHandlerImpl.java
index edef95ce55..3c10b1f9ef 100644
--- a/test/src/share/classes/corba/folb/CSIv2SSLTaggedComponentHandlerImpl.java
+++ b/test/src/share/classes/corba/folb/CSIv2SSLTaggedComponentHandlerImpl.java
@@ -24,22 +24,21 @@
 
 package corba.folb;
 
-import java.util.List;
-
-import org.omg.CORBA.ORBPackage.InvalidName;
-import org.omg.IOP.TaggedComponent;
-import org.omg.PortableInterceptor.IORInfo;
-
-import com.sun.corba.ee.spi.folb.ClusterInstanceInfo;
 import com.sun.corba.ee.impl.folb.CSIv2SSLTaggedComponentHandler;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.folb.ClusterInstanceInfo;
 import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.orb.DataCollector;
 import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.orb.ORBConfigurator;
 import com.sun.corba.ee.spi.transport.SocketInfo;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.ORBUtility;
+import java.util.List;
+
+import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.IOP.TaggedComponent;
+import org.omg.PortableInterceptor.IORInfo;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/Client.java b/test/src/share/classes/corba/folb/Client.java
index 6f097ebafc..e9311fe21a 100644
--- a/test/src/share/classes/corba/folb/Client.java
+++ b/test/src/share/classes/corba/folb/Client.java
@@ -25,8 +25,8 @@
 package corba.folb;
 
 import org.testng.Assert;
-import org.testng.annotations.Test;
 import org.testng.annotations.BeforeSuite;
+import org.testng.annotations.Test;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/ClientBase.java b/test/src/share/classes/corba/folb/ClientBase.java
index c646ffe4d1..f38c1181ba 100644
--- a/test/src/share/classes/corba/folb/ClientBase.java
+++ b/test/src/share/classes/corba/folb/ClientBase.java
@@ -24,29 +24,25 @@
 
 package corba.folb;
 
-import java.util.Hashtable;
-import java.util.Properties;
-import javax.naming.InitialContext;
-
+import com.sun.corba.ee.impl.folb.ClientGroupManager;
+import com.sun.corba.ee.impl.misc.ORBUtility;
 import com.sun.corba.ee.spi.folb.GroupInfoService;
 import com.sun.corba.ee.spi.folb.GroupInfoServiceObserver;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
 import com.sun.corba.ee.spi.logging.ORBUtilSystemException;
-
-import com.sun.corba.ee.impl.folb.ClientGroupManager;
-
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import corba.folb_8_1.SocketFactoryImpl;
 import corba.framework.TestngRunner;
 import corba.hcks.U;
 
-import org.testng.Assert;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
 
 import org.omg.CORBA.SystemException;
+import org.testng.Assert;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/ClientCircular.java b/test/src/share/classes/corba/folb/ClientCircular.java
index 285e0c3aea..9c7ffe0793 100644
--- a/test/src/share/classes/corba/folb/ClientCircular.java
+++ b/test/src/share/classes/corba/folb/ClientCircular.java
@@ -24,17 +24,15 @@
 
 package corba.folb;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
 
 import org.omg.CORBA.SystemException;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
+import org.testng.Assert;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
-import org.testng.Assert;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/folb/ClientMulti.java b/test/src/share/classes/corba/folb/ClientMulti.java
index 7f4fdeea76..1ad3c8f74b 100644
--- a/test/src/share/classes/corba/folb/ClientMulti.java
+++ b/test/src/share/classes/corba/folb/ClientMulti.java
@@ -24,22 +24,10 @@
 
 package corba.folb;
 
-import java.util.Hashtable;
-import java.util.Properties;
-import javax.naming.InitialContext;
-
-import org.omg.CORBA.ORB;
-
-import com.sun.corba.ee.impl.misc.ORBUtility;
-
-import corba.framework.Controller;
-import corba.hcks.U;
-
+import org.testng.Assert;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
-import org.testng.Assert;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/folb/ClientWaitTimeout.java b/test/src/share/classes/corba/folb/ClientWaitTimeout.java
index b1108a01af..6df492067e 100644
--- a/test/src/share/classes/corba/folb/ClientWaitTimeout.java
+++ b/test/src/share/classes/corba/folb/ClientWaitTimeout.java
@@ -24,26 +24,15 @@
 
 package corba.folb;
 
-import java.util.Hashtable;
-import java.util.Properties;
-import javax.naming.InitialContext;
-
-import org.omg.CORBA.COMM_FAILURE;
-import org.omg.CORBA.CompletionStatus;
-import org.omg.CORBA.SystemException;
-
-import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.ORBUtility;
 
-import corba.framework.Controller;
-import corba.hcks.U;
+import java.util.Properties;
 
+import org.omg.CORBA.SystemException;
+import org.testng.Assert;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
-import org.testng.Assert;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/folb/Common.java b/test/src/share/classes/corba/folb/Common.java
index 9dd4e8c782..56c487cdb8 100644
--- a/test/src/share/classes/corba/folb/Common.java
+++ b/test/src/share/classes/corba/folb/Common.java
@@ -24,9 +24,6 @@
 
 package corba.folb;
 
-import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/folb/EchoTest.java b/test/src/share/classes/corba/folb/EchoTest.java
index b8682ef2d5..45a744e444 100644
--- a/test/src/share/classes/corba/folb/EchoTest.java
+++ b/test/src/share/classes/corba/folb/EchoTest.java
@@ -24,8 +24,6 @@
 
 package corba.folb;
 
-import java.util.List;
-
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
diff --git a/test/src/share/classes/corba/folb/EchoTestServant.java b/test/src/share/classes/corba/folb/EchoTestServant.java
index ed7ebe37a7..af29b0d857 100644
--- a/test/src/share/classes/corba/folb/EchoTestServant.java
+++ b/test/src/share/classes/corba/folb/EchoTestServant.java
@@ -24,14 +24,12 @@
 
 package corba.folb;
 
-import java.util.List;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import java.rmi.RemoteException;
-import javax.rmi.PortableRemoteObject;
 
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.impl.misc.ORBUtility;
+import javax.rmi.PortableRemoteObject;
 
 public class EchoTestServant
     extends PortableRemoteObject
diff --git a/test/src/share/classes/corba/folb/FolbTest.java b/test/src/share/classes/corba/folb/FolbTest.java
index 780e5a6bf0..616a29905e 100644
--- a/test/src/share/classes/corba/folb/FolbTest.java
+++ b/test/src/share/classes/corba/folb/FolbTest.java
@@ -24,13 +24,8 @@
 
 package corba.folb;
 
-import java.util.Properties;
-
 import corba.framework.CORBATest;
 import corba.framework.Controller;
-import corba.framework.Options;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java b/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java
index e9fc1f8e5c..0b74ce3079 100644
--- a/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java
+++ b/test/src/share/classes/corba/folb/GroupInfoServiceImpl.java
@@ -24,19 +24,18 @@
 
 package corba.folb;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-
+import com.sun.corba.ee.impl.folb.GroupInfoServiceBase;
+import com.sun.corba.ee.impl.misc.ORBUtility;
 import com.sun.corba.ee.spi.folb.ClusterInstanceInfo;
 import com.sun.corba.ee.spi.folb.GroupInfoService;
-import com.sun.corba.ee.impl.folb.GroupInfoServiceBase;
 import com.sun.corba.ee.spi.folb.GroupInfoServiceObserver;
 import com.sun.corba.ee.spi.folb.SocketInfo;
 
-import com.sun.corba.ee.impl.misc.ORBUtility;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/folb/GroupInfoServiceTest.java b/test/src/share/classes/corba/folb/GroupInfoServiceTest.java
index fe0b67e2fe..e7d765cfcc 100644
--- a/test/src/share/classes/corba/folb/GroupInfoServiceTest.java
+++ b/test/src/share/classes/corba/folb/GroupInfoServiceTest.java
@@ -24,8 +24,6 @@
 
 package corba.folb;
 
-import java.util.List;
-
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
diff --git a/test/src/share/classes/corba/folb/GroupInfoServiceTestServant.java b/test/src/share/classes/corba/folb/GroupInfoServiceTestServant.java
index d3d443892e..14c1539997 100644
--- a/test/src/share/classes/corba/folb/GroupInfoServiceTestServant.java
+++ b/test/src/share/classes/corba/folb/GroupInfoServiceTestServant.java
@@ -25,19 +25,16 @@
 
 package corba.folb;
 
-import java.rmi.RemoteException;
-import javax.rmi.PortableRemoteObject;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
 import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import corba.hcks.U;
 
+import java.rmi.RemoteException;
+import java.util.Map;
+
+import javax.rmi.PortableRemoteObject;
+
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/folb/Server.java b/test/src/share/classes/corba/folb/Server.java
index e54751c367..bf399a1d24 100644
--- a/test/src/share/classes/corba/folb/Server.java
+++ b/test/src/share/classes/corba/folb/Server.java
@@ -24,31 +24,29 @@
 
 package corba.folb;
 
+import com.sun.corba.ee.impl.folb.ServerGroupManager;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
+import com.sun.corba.ee.spi.orb.DataCollector;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBConfigurator;
+
+import corba.framework.Options;
+import corba.hcks.U;
+
 import java.rmi.RemoteException;
 import java.util.Properties;
 
 import org.omg.CORBA.LocalObject;
 import org.omg.CORBA.ORBPackage.InvalidName;
-
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocator;
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
-import com.sun.corba.ee.spi.orb.ORBConfigurator;
-import com.sun.corba.ee.spi.orb.DataCollector;
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.impl.folb.ServerGroupManager;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.misc.ORBUtility;
-
-import corba.framework.Options;
-import corba.hcks.U;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/fragment/Client.java b/test/src/share/classes/corba/fragment/Client.java
index 8b478d9a53..13f786de45 100644
--- a/test/src/share/classes/corba/fragment/Client.java
+++ b/test/src/share/classes/corba/fragment/Client.java
@@ -19,15 +19,12 @@
 
 package corba.fragment;
 
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.*;
-import java.util.* ;
+import java.io.FileInputStream;
 import java.rmi.RemoteException;
-import java.io.*;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.ORB;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/fragment/FragmentTest.java b/test/src/share/classes/corba/fragment/FragmentTest.java
index b699443152..80b6870760 100644
--- a/test/src/share/classes/corba/fragment/FragmentTest.java
+++ b/test/src/share/classes/corba/fragment/FragmentTest.java
@@ -20,11 +20,14 @@
 
 package corba.fragment;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
+
 public class FragmentTest extends CORBATest {
     static final int GROW = 0;
     static final int COLLECT = 1;
diff --git a/test/src/share/classes/corba/fragment/FragmentTester.java b/test/src/share/classes/corba/fragment/FragmentTester.java
index 027f0d01df..cb2d186e28 100644
--- a/test/src/share/classes/corba/fragment/FragmentTester.java
+++ b/test/src/share/classes/corba/fragment/FragmentTester.java
@@ -19,7 +19,6 @@
 
 package corba.fragment;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 public interface FragmentTester extends java.rmi.Remote
diff --git a/test/src/share/classes/corba/fragment/FragmentTesterImpl.java b/test/src/share/classes/corba/fragment/FragmentTesterImpl.java
index c0486bc6ce..9ee65e9bf8 100644
--- a/test/src/share/classes/corba/fragment/FragmentTesterImpl.java
+++ b/test/src/share/classes/corba/fragment/FragmentTesterImpl.java
@@ -20,6 +20,7 @@
 package corba.fragment;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class FragmentTesterImpl extends PortableRemoteObject implements FragmentTester
diff --git a/test/src/share/classes/corba/fragment/Server.java b/test/src/share/classes/corba/fragment/Server.java
index 6b849ac9d1..13faac8c05 100644
--- a/test/src/share/classes/corba/fragment/Server.java
+++ b/test/src/share/classes/corba/fragment/Server.java
@@ -19,17 +19,10 @@
 
 package corba.fragment;
 
-import org.omg.CORBA.portable.*;
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
-import java.util.Properties;
-import org.omg.PortableServer.*;
-import java.io.*;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
+import java.io.FileOutputStream;
+
+import org.omg.CORBA.ORB;
+import org.omg.PortableServer.POA;
 
 public class Server
 {
diff --git a/test/src/share/classes/corba/fragment2/Client.java b/test/src/share/classes/corba/fragment2/Client.java
index 67efbcfc32..4265bf2363 100644
--- a/test/src/share/classes/corba/fragment2/Client.java
+++ b/test/src/share/classes/corba/fragment2/Client.java
@@ -19,14 +19,14 @@
 
 package corba.fragment2;
 
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CORBA.*;
-import java.util.* ;
-import java.rmi.RemoteException;
-import java.io.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import java.io.FileInputStream;
+
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.ORB;
+
 class Tester extends Thread{
     FragmentTester tester;
     int size;
diff --git a/test/src/share/classes/corba/fragment2/FragmentTest.java b/test/src/share/classes/corba/fragment2/FragmentTest.java
index c68e531061..294aa775ec 100644
--- a/test/src/share/classes/corba/fragment2/FragmentTest.java
+++ b/test/src/share/classes/corba/fragment2/FragmentTest.java
@@ -19,11 +19,14 @@
 
 package corba.fragment2;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
+import java.util.Properties;
+
 public class FragmentTest extends CORBATest
 {
     protected void doTest() throws Throwable
diff --git a/test/src/share/classes/corba/fragment2/FragmentTester.java b/test/src/share/classes/corba/fragment2/FragmentTester.java
index c02657f398..73f673a85d 100644
--- a/test/src/share/classes/corba/fragment2/FragmentTester.java
+++ b/test/src/share/classes/corba/fragment2/FragmentTester.java
@@ -19,7 +19,6 @@
 
 package corba.fragment2;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
 
 public interface FragmentTester extends java.rmi.Remote
diff --git a/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java b/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java
index 05b95d42fe..99fb28f1e7 100644
--- a/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java
+++ b/test/src/share/classes/corba/fragment2/FragmentTesterImpl.java
@@ -20,6 +20,7 @@
 package corba.fragment2;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class FragmentTesterImpl extends PortableRemoteObject implements FragmentTester
diff --git a/test/src/share/classes/corba/fragment2/Server.java b/test/src/share/classes/corba/fragment2/Server.java
index 1f9ae9155e..c33a89fb41 100644
--- a/test/src/share/classes/corba/fragment2/Server.java
+++ b/test/src/share/classes/corba/fragment2/Server.java
@@ -19,14 +19,10 @@
 
 package corba.fragment2;
 
-import org.omg.CORBA.portable.*;
-import javax.rmi.PortableRemoteObject;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import org.omg.CORBA.*;
-import java.util.Properties;
-import org.omg.PortableServer.*;
-import java.io.*;
+import java.io.FileOutputStream;
+
+import org.omg.CORBA.ORB;
+import org.omg.PortableServer.POA;
 
 public class Server
 {
diff --git a/test/src/share/classes/corba/giopgen/Client.java b/test/src/share/classes/corba/giopgen/Client.java
index 8f87f730b1..35ba20579f 100644
--- a/test/src/share/classes/corba/giopgen/Client.java
+++ b/test/src/share/classes/corba/giopgen/Client.java
@@ -24,19 +24,19 @@
 
 package corba.giopgen;
 
-import java.util.Map;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Map;
 import java.util.Properties;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
 
-import org.omg.CORBA.COMM_FAILURE;
 import org.omg.CORBA.ORB;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
 public class Client
 {
     static {
diff --git a/test/src/share/classes/corba/giopgen/Common.java b/test/src/share/classes/corba/giopgen/Common.java
index 7c0d52455f..dc5b3a3d2c 100644
--- a/test/src/share/classes/corba/giopgen/Common.java
+++ b/test/src/share/classes/corba/giopgen/Common.java
@@ -24,12 +24,13 @@
 
 package corba.giopgen;
 
-import java.util.Vector;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public class Common
 {
diff --git a/test/src/share/classes/corba/giopgen/GIOPGenTest.java b/test/src/share/classes/corba/giopgen/GIOPGenTest.java
index 813efb8e14..0950c33d23 100644
--- a/test/src/share/classes/corba/giopgen/GIOPGenTest.java
+++ b/test/src/share/classes/corba/giopgen/GIOPGenTest.java
@@ -24,13 +24,8 @@
 
 package corba.giopgen;
 
-import java.util.Properties;
-
 import corba.framework.CORBATest;
 import corba.framework.Controller;
-import corba.framework.Options;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/giopgen/Server.java b/test/src/share/classes/corba/giopgen/Server.java
index 8089fd6e32..7216311e95 100644
--- a/test/src/share/classes/corba/giopgen/Server.java
+++ b/test/src/share/classes/corba/giopgen/Server.java
@@ -24,14 +24,14 @@
 
 package corba.giopgen;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
 
 import org.omg.CORBA.ORB;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/giopgen/Test.java b/test/src/share/classes/corba/giopgen/Test.java
index 3fef82cf5d..b90a1d8ffa 100644
--- a/test/src/share/classes/corba/giopgen/Test.java
+++ b/test/src/share/classes/corba/giopgen/Test.java
@@ -26,7 +26,6 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-
 import java.util.Map;
 
 /**
diff --git a/test/src/share/classes/corba/giopgen/TestServant.java b/test/src/share/classes/corba/giopgen/TestServant.java
index 2ebf2f2088..63e6820df9 100644
--- a/test/src/share/classes/corba/giopgen/TestServant.java
+++ b/test/src/share/classes/corba/giopgen/TestServant.java
@@ -24,16 +24,15 @@
 
 package corba.giopgen;
 
-import java.rmi.RemoteException;
-
-import java.util.Map;
-import java.util.HashMap;
+import com.sun.corba.ee.spi.logging.UtilSystemException;
 
 import java.io.Serializable;
+import java.rmi.RemoteException;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.rmi.PortableRemoteObject;
 
-import com.sun.corba.ee.spi.logging.UtilSystemException;
 import org.glassfish.pfl.basic.contain.SPair;
 
 public class TestServant
diff --git a/test/src/share/classes/corba/ior/Client.java b/test/src/share/classes/corba/ior/Client.java
index 35d50f2786..1a5c638073 100644
--- a/test/src/share/classes/corba/ior/Client.java
+++ b/test/src/share/classes/corba/ior/Client.java
@@ -19,97 +19,83 @@
 
 package corba.ior;
 
-import java.io.PrintStream;
-
-import java.util.Properties;
-import java.util.NoSuchElementException;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.ArrayList;
-
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.IdAssignmentPolicyValue;
-
-import org.omg.CORBA.Policy;
-import org.omg.CORBA.BAD_PARAM;
-import org.omg.CORBA.INTERNAL;
-import org.omg.CORBA.OctetSeqHolder;
-
-import org.omg.CORBA_2_3.portable.OutputStream;
-import org.omg.CORBA_2_3.portable.InputStream;
-
-import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS;
-import org.omg.IOP.TAG_CODE_SETS;
-import org.omg.IOP.TAG_JAVA_CODEBASE;
-import org.omg.IOP.TAG_ORB_TYPE;
-import org.omg.IOP.TAG_INTERNET_IOP;
-
-
+import com.sun.corba.ee.impl.encoding.CDRInputObject;
+import com.sun.corba.ee.impl.encoding.CDROutputObject;
+import com.sun.corba.ee.impl.encoding.EncapsInputStream;
+import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
+import com.sun.corba.ee.impl.ior.EncapsulationUtility;
+import com.sun.corba.ee.impl.ior.FreezableList;
+import com.sun.corba.ee.impl.ior.GenericTaggedComponent;
+import com.sun.corba.ee.impl.ior.GenericTaggedProfile;
+import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray;
+import com.sun.corba.ee.impl.ior.ObjectAdapterIdNumber;
+import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl;
+import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl;
+import com.sun.corba.ee.impl.ior.OldJIDLObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.TaggedComponentFactoryFinderImpl;
+import com.sun.corba.ee.impl.ior.TaggedProfileFactoryFinderImpl;
+import com.sun.corba.ee.impl.ior.WireObjectKeyTemplate;
+import com.sun.corba.ee.spi.activation.POANameHelper;
+import com.sun.corba.ee.spi.extension.ZeroPortPolicy;
+import com.sun.corba.ee.spi.ior.IOR;
+import com.sun.corba.ee.spi.ior.IORFactories;
+import com.sun.corba.ee.spi.ior.IORFactory;
+import com.sun.corba.ee.spi.ior.IORTemplate;
+import com.sun.corba.ee.spi.ior.IORTemplateList;
 import com.sun.corba.ee.spi.ior.Identifiable;
+import com.sun.corba.ee.spi.ior.IdentifiableContainerBase;
 import com.sun.corba.ee.spi.ior.IdentifiableFactory;
 import com.sun.corba.ee.spi.ior.IdentifiableFactoryFinder;
+import com.sun.corba.ee.spi.ior.ObjectAdapterId;
+import com.sun.corba.ee.spi.ior.ObjectId;
+import com.sun.corba.ee.spi.ior.ObjectKey;
 import com.sun.corba.ee.spi.ior.ObjectKeyTemplate;
 import com.sun.corba.ee.spi.ior.TaggedComponent;
 import com.sun.corba.ee.spi.ior.TaggedComponentFactoryFinder;
-import com.sun.corba.ee.spi.ior.ObjectId;
-import com.sun.corba.ee.spi.ior.ObjectKey;
-import com.sun.corba.ee.spi.ior.IOR;
-import com.sun.corba.ee.spi.ior.IORFactory;
-import com.sun.corba.ee.spi.ior.ObjectAdapterId;
-import com.sun.corba.ee.spi.ior.IdentifiableContainerBase;
-import com.sun.corba.ee.spi.ior.IORTemplate;
-import com.sun.corba.ee.spi.ior.IORTemplateList;
-import com.sun.corba.ee.spi.ior.IORFactories;
 import com.sun.corba.ee.spi.ior.TaggedProfileTemplate;
-
-import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
+import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent;
+import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent;
+import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
 import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
+import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
 import com.sun.corba.ee.spi.ior.iiop.IIOPProfile;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
-
-import com.sun.corba.ee.spi.activation.POANameHelper;
-
-import com.sun.corba.ee.spi.extension.ZeroPortPolicy;
-
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
+import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent;
+import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.orb.ORBVersion;
 import com.sun.corba.ee.spi.orb.ORBVersionFactory;
 
-import com.sun.corba.ee.spi.ior.iiop.AlternateIIOPAddressComponent;
-import com.sun.corba.ee.spi.ior.iiop.CodeSetsComponent;
-import com.sun.corba.ee.spi.ior.iiop.ORBTypeComponent;
-import com.sun.corba.ee.spi.ior.iiop.JavaCodebaseComponent;
-
-import com.sun.corba.ee.impl.ior.GenericTaggedProfile;
-import com.sun.corba.ee.impl.ior.GenericTaggedComponent;
-import com.sun.corba.ee.impl.ior.FreezableList;
-import com.sun.corba.ee.impl.ior.OldJIDLObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.JIDLObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.WireObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.EncapsulationUtility;
-import com.sun.corba.ee.impl.ior.TaggedComponentFactoryFinderImpl;
-import com.sun.corba.ee.impl.ior.TaggedProfileFactoryFinderImpl;
-import com.sun.corba.ee.impl.ior.ObjectAdapterIdArray;
-import com.sun.corba.ee.impl.ior.ObjectAdapterIdNumber;
-import com.sun.corba.ee.impl.ior.ObjectReferenceTemplateImpl;
-import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl;
-
-import com.sun.corba.ee.impl.encoding.CDRInputObject;
-import com.sun.corba.ee.impl.encoding.CDROutputObject;
-import com.sun.corba.ee.impl.encoding.EncapsInputStream;
-import com.sun.corba.ee.impl.encoding.EncapsOutputStream;
+import corba.framework.TestngRunner;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.StringTokenizer;
 
-import org.testng.annotations.Test;
+import org.omg.CORBA.BAD_PARAM;
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.OctetSeqHolder;
+import org.omg.CORBA.Policy;
+import org.omg.CORBA_2_3.portable.InputStream;
+import org.omg.CORBA_2_3.portable.OutputStream;
+import org.omg.IOP.TAG_ALTERNATE_IIOP_ADDRESS;
+import org.omg.IOP.TAG_CODE_SETS;
+import org.omg.IOP.TAG_INTERNET_IOP;
+import org.omg.IOP.TAG_JAVA_CODEBASE;
+import org.omg.IOP.TAG_ORB_TYPE;
+import org.omg.PortableServer.IdAssignmentPolicyValue;
+import org.omg.PortableServer.POA;
 import org.testng.Assert;
-
-import corba.framework.TestngRunner;
+import org.testng.annotations.Test;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/ior/IORTests.java b/test/src/share/classes/corba/ior/IORTests.java
index 9858f01c12..0655efaaab 100644
--- a/test/src/share/classes/corba/ior/IORTests.java
+++ b/test/src/share/classes/corba/ior/IORTests.java
@@ -19,11 +19,8 @@
 
 package corba.ior;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
-
-import com.sun.corba.ee.impl.ior.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 /**
  */
diff --git a/test/src/share/classes/corba/lb/Client.java b/test/src/share/classes/corba/lb/Client.java
index aa83da88b0..7418c0d057 100644
--- a/test/src/share/classes/corba/lb/Client.java
+++ b/test/src/share/classes/corba/lb/Client.java
@@ -24,19 +24,18 @@
 
 package corba.lb;
 
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import java.rmi.RemoteException;
 import java.util.Hashtable;
 import java.util.Properties;
-import java.rmi.RemoteException;
+
 import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
 
-import org.omg.CORBA.COMM_FAILURE;
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.SystemException;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
 /**
  * @Author Ken Cavanaugh
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/lb/Common.java b/test/src/share/classes/corba/lb/Common.java
index aa3c3c34dc..2f19d10f5a 100644
--- a/test/src/share/classes/corba/lb/Common.java
+++ b/test/src/share/classes/corba/lb/Common.java
@@ -24,12 +24,13 @@
 
 package corba.lb;
 
-import java.util.Vector;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public class Common
 {
diff --git a/test/src/share/classes/corba/lb/LB.java b/test/src/share/classes/corba/lb/LB.java
index 72cd31e853..a833134a3a 100644
--- a/test/src/share/classes/corba/lb/LB.java
+++ b/test/src/share/classes/corba/lb/LB.java
@@ -22,16 +22,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
-import java.net.Socket;
-import java.net.ServerSocket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-
-import java.util.Arrays;
-import java.util.List;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 
 /** This class implements a TCP load balancer.  The idea is that it has a pool of addresses
  * that it can send messages to.  Every time a TCP connection is made to this process,
diff --git a/test/src/share/classes/corba/lb/LBTest.java b/test/src/share/classes/corba/lb/LBTest.java
index 3953dd7f15..91d8c684fe 100644
--- a/test/src/share/classes/corba/lb/LBTest.java
+++ b/test/src/share/classes/corba/lb/LBTest.java
@@ -19,16 +19,14 @@
 
 package corba.lb ;
 
-import java.util.Properties;
+import com.sun.corba.ee.impl.plugin.hwlb.VirtualAddressAgentImpl;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 import corba.framework.CORBATest;
-import corba.framework.Options;
 import corba.framework.Controller;
+import corba.framework.Options;
 
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.plugin.hwlb.VirtualAddressAgentImpl;
-import com.sun.corba.ee.impl.plugin.hwlb.NoConnectionCacheImpl;
+import java.util.Properties;
 
 public class LBTest
     extends
diff --git a/test/src/share/classes/corba/lb/Server.java b/test/src/share/classes/corba/lb/Server.java
index 391eb7c084..d9e471374c 100644
--- a/test/src/share/classes/corba/lb/Server.java
+++ b/test/src/share/classes/corba/lb/Server.java
@@ -24,26 +24,24 @@
 
 package corba.lb;
 
-import java.util.Properties;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Hashtable;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
-
 import javax.rmi.PortableRemoteObject;
 
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
-
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.Servant;
-import org.omg.PortableServer.LifespanPolicyValue;
-import org.omg.PortableServer.IdUniquenessPolicyValue;
 import org.omg.PortableServer.IdAssignmentPolicyValue;
+import org.omg.PortableServer.IdUniquenessPolicyValue;
 import org.omg.PortableServer.ImplicitActivationPolicyValue;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/lb/TestServant.java b/test/src/share/classes/corba/lb/TestServant.java
index 26b7e124af..3b8dbece24 100644
--- a/test/src/share/classes/corba/lb/TestServant.java
+++ b/test/src/share/classes/corba/lb/TestServant.java
@@ -25,6 +25,7 @@
 package corba.lb;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class TestServant
diff --git a/test/src/share/classes/corba/lbq/Common.java b/test/src/share/classes/corba/lbq/Common.java
index 5b169291f3..612fddc6c7 100644
--- a/test/src/share/classes/corba/lbq/Common.java
+++ b/test/src/share/classes/corba/lbq/Common.java
@@ -24,37 +24,35 @@
 
 package corba.lbq;
 
-import java.util.Vector;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-import java.util.Properties;
-
-import java.rmi.Remote;
+import com.sun.corba.ee.impl.orb.ORBDataParserImpl;
+import com.sun.corba.ee.impl.orb.ORBImpl;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBData;
 
 import java.lang.reflect.Field;
-
+import java.rmi.Remote;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.Vector;
 
 import javax.rmi.PortableRemoteObject;
 
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-
+import org.omg.CosNaming.Binding;
+import org.omg.CosNaming.BindingIteratorHolder;
+import org.omg.CosNaming.BindingListHolder;
+import org.omg.CosNaming.BindingType;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.PortableInterceptor.ORBInitializer;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 
-import org.omg.PortableInterceptor.ORBInitializer;
-
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.orb.ORBData;
-
-import com.sun.corba.ee.impl.orb.ORBDataParserImpl;
-import com.sun.corba.ee.impl.orb.ORBImpl;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
 public class Common
 {
     public static final String ReferenceName = "Test";
diff --git a/test/src/share/classes/corba/lbq/Server.java b/test/src/share/classes/corba/lbq/Server.java
index 39f3be802f..dc3bcd1f3e 100644
--- a/test/src/share/classes/corba/lbq/Server.java
+++ b/test/src/share/classes/corba/lbq/Server.java
@@ -24,20 +24,19 @@
 
 package corba.lbq;
 
+import com.sun.corba.ee.spi.orb.ORB;
+
 import java.util.Properties;
 
 import org.omg.CORBA.Policy;
-
-import org.omg.PortableServer.POA;
-import org.omg.PortableServer.Servant;
-import org.omg.PortableServer.LifespanPolicyValue;
-import org.omg.PortableServer.IdUniquenessPolicyValue;
 import org.omg.PortableServer.IdAssignmentPolicyValue;
+import org.omg.PortableServer.IdUniquenessPolicyValue;
 import org.omg.PortableServer.ImplicitActivationPolicyValue;
-import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.LifespanPolicyValue;
+import org.omg.PortableServer.POA;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
-
-import com.sun.corba.ee.spi.orb.ORB;
+import org.omg.PortableServer.Servant;
+import org.omg.PortableServer.ServantRetentionPolicyValue;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/lbq/TestServant.java b/test/src/share/classes/corba/lbq/TestServant.java
index 3ea67c27b1..70a5d2d128 100644
--- a/test/src/share/classes/corba/lbq/TestServant.java
+++ b/test/src/share/classes/corba/lbq/TestServant.java
@@ -25,6 +25,7 @@
 package corba.lbq;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class TestServant
diff --git a/test/src/share/classes/corba/legacyorbclasses/Client.java b/test/src/share/classes/corba/legacyorbclasses/Client.java
index 9cbab2e4a6..1d9bd353b3 100644
--- a/test/src/share/classes/corba/legacyorbclasses/Client.java
+++ b/test/src/share/classes/corba/legacyorbclasses/Client.java
@@ -24,12 +24,14 @@
 
 package corba.legacyorbclasses;
 
-import java.util.Properties;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import corba.framework.Controller;
+
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/legacyorbclasses/LegacyORBClassesTest.java b/test/src/share/classes/corba/legacyorbclasses/LegacyORBClassesTest.java
index fb87889bfd..648154fc8e 100644
--- a/test/src/share/classes/corba/legacyorbclasses/LegacyORBClassesTest.java
+++ b/test/src/share/classes/corba/legacyorbclasses/LegacyORBClassesTest.java
@@ -24,8 +24,8 @@
 
 package corba.legacyorbclasses;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class LegacyORBClassesTest
     extends
diff --git a/test/src/share/classes/corba/messagetrace/Client.java b/test/src/share/classes/corba/messagetrace/Client.java
index d33e48a374..8063238da7 100644
--- a/test/src/share/classes/corba/messagetrace/Client.java
+++ b/test/src/share/classes/corba/messagetrace/Client.java
@@ -19,53 +19,40 @@
 
 package corba.messagetrace  ;
 
-import java.util.Properties;
+import com.sun.corba.ee.impl.encoding.CDRInputObject;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message;
+import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.transport.MessageData;
+import com.sun.corba.ee.spi.transport.MessageTraceManager;
+import com.sun.corba.ee.spi.transport.TransportManager;
 
+import corba.util.TransportManagerUtil;
+
+import java.nio.ByteBuffer;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
+import java.util.Properties;
 
+import javax.management.Attribute;
+import javax.management.ObjectName;
 import javax.rmi.PortableRemoteObject;
-import javax.rmi.CORBA.Util;
 import javax.rmi.CORBA.Tie;
+import javax.rmi.CORBA.Util;
 
-import java.nio.ByteBuffer;
-
-import corba.util.TransportManagerUtil;
+import org.glassfish.pfl.test.TestCaseTools;
+import org.omg.CORBA.PRIVATE_MEMBER;
+import org.omg.CORBA.PUBLIC_MEMBER;
 import org.omg.CORBA.TypeCode;
 import org.omg.CORBA.ValueMember;
-import org.omg.CORBA.PUBLIC_MEMBER;
-import org.omg.CORBA.PRIVATE_MEMBER;
-
-// I have removed some weblogic test code for bug 5034649.
-// We need to check to see if we can include this, because
-// the test case relies on code supplied by BEA.
-// import weblogic.management.WebLogicObjectName;
-// import weblogic.management.internal.WebLogicAttribute;
 
-import javax.management.ObjectName;
-import javax.management.Attribute;
-
-import junit.framework.TestCase;
 import junit.framework.Test;
+import junit.extensions.TestSetup;
+import junit.framework.TestCase;
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
-import junit.extensions.TestSetup;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.transport.TransportManager;
-import com.sun.corba.ee.spi.transport.MessageTraceManager;
-import com.sun.corba.ee.spi.transport.MessageData;
-
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
-
-import com.sun.corba.ee.impl.misc.ORBUtility;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message;
-
-import com.sun.corba.ee.impl.encoding.CDRInputObject;
-import org.glassfish.pfl.test.TestCaseTools;
 
 public class Client extends TestCase
 {
diff --git a/test/src/share/classes/corba/messagetrace/MessageTraceTest.java b/test/src/share/classes/corba/messagetrace/MessageTraceTest.java
index f1351524b1..3a68024bf8 100644
--- a/test/src/share/classes/corba/messagetrace/MessageTraceTest.java
+++ b/test/src/share/classes/corba/messagetrace/MessageTraceTest.java
@@ -19,12 +19,8 @@
 
 package corba.messagetrace;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class MessageTraceTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/misc/Buck.java b/test/src/share/classes/corba/misc/Buck.java
index 583f2aa6af..3fa64382cf 100644
--- a/test/src/share/classes/corba/misc/Buck.java
+++ b/test/src/share/classes/corba/misc/Buck.java
@@ -19,9 +19,9 @@
 
 package corba.misc ;
 
+import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import java.io.IOException;
 
 public class Buck implements java.io.Externalizable {
     String name = "";
diff --git a/test/src/share/classes/corba/misc/Client.java b/test/src/share/classes/corba/misc/Client.java
index 4f4954d8be..771ccd5dfb 100644
--- a/test/src/share/classes/corba/misc/Client.java
+++ b/test/src/share/classes/corba/misc/Client.java
@@ -31,11 +31,25 @@
 import com.sun.corba.ee.spi.trace.PrimitiveWrite;
 import com.sun.corba.ee.spi.trace.ValueHandlerRead;
 import com.sun.corba.ee.spi.trace.ValueHandlerWrite;
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.lang.annotation.Annotation;
+import java.nio.ByteBuffer;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
+import javax.rmi.PortableRemoteObject;
+import javax.rmi.CORBA.Tie;
+
 import org.glassfish.pfl.basic.logex.OperationTracer;
 import org.glassfish.pfl.test.TestCaseTools;
 import org.glassfish.pfl.tf.spi.MethodMonitorFactory;
@@ -55,29 +69,18 @@
 import org.omg.PortableServer.ImplicitActivationPolicyValue;
 import org.omg.PortableServer.LifespanPolicyValue;
 import org.omg.PortableServer.POA;
-import org.omg.PortableServer.POAPackage.ObjectNotActive;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocator;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.POAPackage.ObjectNotActive;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.PrintStream;
-import java.io.Serializable;
-import java.lang.annotation.Annotation;
-import java.nio.ByteBuffer;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-import javax.rmi.CORBA.Tie;
-import javax.rmi.PortableRemoteObject;
+import junit.framework.Test;
+import junit.extensions.TestSetup;
+import junit.framework.TestCase;
+import junit.framework.TestResult;
+import junit.framework.TestSuite;
 
 //import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints;
 
diff --git a/test/src/share/classes/corba/misc/MiscTest.java b/test/src/share/classes/corba/misc/MiscTest.java
index ec74eaab48..a464fa157c 100644
--- a/test/src/share/classes/corba/misc/MiscTest.java
+++ b/test/src/share/classes/corba/misc/MiscTest.java
@@ -19,9 +19,8 @@
 
 package corba.misc;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class MiscTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/mixedorb/Client.java b/test/src/share/classes/corba/mixedorb/Client.java
index 4c34a6a6fd..f3b1ee4baa 100644
--- a/test/src/share/classes/corba/mixedorb/Client.java
+++ b/test/src/share/classes/corba/mixedorb/Client.java
@@ -20,30 +20,27 @@
 
 package corba.mixedorb;
 
-import java.util.Properties;
-import java.util.Hashtable;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
+import com.sun.corba.ee.spi.JndiConstants;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 import java.rmi.RemoteException;
-
-import javax.rmi.CORBA.Util;
-import javax.rmi.CORBA.Tie;
+import java.util.Hashtable;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
+import javax.rmi.CORBA.Tie;
+import javax.rmi.CORBA.Util;
 
-import com.sun.corba.ee.spi.JndiConstants;
 import org.omg.CORBA.ORB;
-
-import org.testng.TestNG;
 import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.testng.TestNG;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
-
-import static corba.framework.PRO.* ;
+import static corba.framework.PRO.narrow;
+import static corba.framework.PRO.toStub;
 
 public class Client {
     private ORB clientORB ;
diff --git a/test/src/share/classes/corba/mixedorb/EchoImpl.java b/test/src/share/classes/corba/mixedorb/EchoImpl.java
index c0bf3f34b3..c18851ad92 100644
--- a/test/src/share/classes/corba/mixedorb/EchoImpl.java
+++ b/test/src/share/classes/corba/mixedorb/EchoImpl.java
@@ -19,8 +19,8 @@
 
 package corba.mixedorb;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class EchoImpl extends PortableRemoteObject implements Echo {
diff --git a/test/src/share/classes/corba/mixedorb/MixedOrbTest.java b/test/src/share/classes/corba/mixedorb/MixedOrbTest.java
index 0de30e3690..6d8fb6f18d 100644
--- a/test/src/share/classes/corba/mixedorb/MixedOrbTest.java
+++ b/test/src/share/classes/corba/mixedorb/MixedOrbTest.java
@@ -19,9 +19,9 @@
 
 package corba.mixedorb;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 public class MixedOrbTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/msgtypes/Client.java b/test/src/share/classes/corba/msgtypes/Client.java
index 909fd278d0..963499163a 100644
--- a/test/src/share/classes/corba/msgtypes/Client.java
+++ b/test/src/share/classes/corba/msgtypes/Client.java
@@ -19,47 +19,51 @@
 
 package corba.msgtypes;
 
-import java.rmi.RemoteException;
-import javax.rmi.PortableRemoteObject;
-
-import org.omg.CORBA.INTERNAL;
-import org.omg.CORBA.LocalObject;
-
-import com.sun.corba.ee.spi.transport.ConnectionCache;
-
+import com.sun.corba.ee.impl.encoding.CDROutputObject;
+import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl;
+import com.sun.corba.ee.impl.ior.ObjectKeyImpl;
+import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate;
+import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate;
+import com.sun.corba.ee.impl.misc.ORBUtility;
+import com.sun.corba.ee.impl.protocol.ClientDelegateImpl;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.KeyAddr;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.LocateReplyMessage;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.LocateRequestMessage;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.Message;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.MessageBase;
+import com.sun.corba.ee.impl.protocol.giopmsgheaders.RequestMessage;
+import com.sun.corba.ee.impl.transport.ContactInfoListImpl;
 import com.sun.corba.ee.spi.ior.IOR;
 import com.sun.corba.ee.spi.ior.IORFactories;
-import com.sun.corba.ee.spi.ior.ObjectKey;
-import com.sun.corba.ee.spi.ior.ObjectKeyTemplate;
 import com.sun.corba.ee.spi.ior.IORTemplate;
 import com.sun.corba.ee.spi.ior.ObjectAdapterId;
+import com.sun.corba.ee.spi.ior.ObjectKey;
+import com.sun.corba.ee.spi.ior.ObjectKeyTemplate;
 import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
 import com.sun.corba.ee.spi.ior.iiop.IIOPAddress;
-import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
 import com.sun.corba.ee.spi.ior.iiop.IIOPFactories;
+import com.sun.corba.ee.spi.ior.iiop.IIOPProfileTemplate;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.protocol.MessageMediator;
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 import com.sun.corba.ee.spi.protocol.ClientDelegate;
+import com.sun.corba.ee.spi.protocol.MessageMediator;
+import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults;
 import com.sun.corba.ee.spi.transport.Connection;
+import com.sun.corba.ee.spi.transport.ConnectionCache;
 import com.sun.corba.ee.spi.transport.ContactInfo;
 import com.sun.corba.ee.spi.transport.ContactInfoList;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
-import com.sun.corba.ee.spi.servicecontext.ServiceContextDefaults;
 
-import com.sun.corba.ee.impl.encoding.CDROutputObject;
-import com.sun.corba.ee.impl.ior.ObjectKeyFactoryImpl;
-import com.sun.corba.ee.impl.ior.ObjectKeyImpl;
-import com.sun.corba.ee.impl.ior.POAObjectKeyTemplate;
-import com.sun.corba.ee.impl.ior.OldPOAObjectKeyTemplate;
-import com.sun.corba.ee.impl.misc.ORBUtility;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.impl.protocol.ClientDelegateImpl;
-import com.sun.corba.ee.impl.protocol.giopmsgheaders.*;
-import com.sun.corba.ee.impl.transport.ContactInfoListImpl;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.rmi.RemoteException;
 import java.util.Iterator;
 import java.util.Properties;
+
+import javax.rmi.PortableRemoteObject;
+
+import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.LocalObject;
 import org.omg.PortableInterceptor.ClientRequestInfo;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
 import org.omg.PortableInterceptor.ForwardRequest;
diff --git a/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java b/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java
index 96b890132e..6e1db09526 100644
--- a/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java
+++ b/test/src/share/classes/corba/msgtypes/FragmentTesterImpl.java
@@ -20,6 +20,7 @@
 package corba.msgtypes;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class FragmentTesterImpl extends PortableRemoteObject implements FragmentTester
diff --git a/test/src/share/classes/corba/msgtypes/MsgTypesTest.java b/test/src/share/classes/corba/msgtypes/MsgTypesTest.java
index effe203887..2ae2907c0a 100644
--- a/test/src/share/classes/corba/msgtypes/MsgTypesTest.java
+++ b/test/src/share/classes/corba/msgtypes/MsgTypesTest.java
@@ -21,9 +21,11 @@
 package corba.msgtypes;
 
 import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import corba.framework.CORBATest;
 import corba.framework.Controller;
 import corba.framework.Options;
+
 import java.util.Properties;
 
 public class MsgTypesTest extends CORBATest {
diff --git a/test/src/share/classes/corba/msgtypes/Server.java b/test/src/share/classes/corba/msgtypes/Server.java
index 74c89e6ba5..d085520ecf 100644
--- a/test/src/share/classes/corba/msgtypes/Server.java
+++ b/test/src/share/classes/corba/msgtypes/Server.java
@@ -19,15 +19,16 @@
 
 package corba.msgtypes;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.protocol.ForwardException;
-import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler;
 import com.sun.corba.ee.impl.ior.IORImpl;
+import com.sun.corba.ee.impl.oa.poa.BadServerIdHandler;
 import com.sun.corba.ee.spi.ior.IOR;
 import com.sun.corba.ee.spi.ior.ObjectKey;
-import java.io.FileOutputStream;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.protocol.ForwardException;
 
+import java.io.FileOutputStream;
 import java.util.Properties;
+
 import org.omg.CORBA.INTERNAL;
 import org.omg.CORBA.LocalObject;
 import org.omg.CORBA.ORB;
diff --git a/test/src/share/classes/corba/nortel/Client.java b/test/src/share/classes/corba/nortel/Client.java
index 1f79cfe7bc..99cc5fe390 100644
--- a/test/src/share/classes/corba/nortel/Client.java
+++ b/test/src/share/classes/corba/nortel/Client.java
@@ -20,32 +20,29 @@
 
 package corba.nortel;
 
-import java.util.Properties;
-import java.util.Hashtable;
-import java.util.Collection;
-import java.util.ArrayList;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
+import com.sun.corba.ee.spi.JndiConstants;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 import java.rmi.RemoteException;
-
-import javax.rmi.CORBA.Util;
-import javax.rmi.CORBA.Tie;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Hashtable;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
+import javax.rmi.CORBA.Tie;
+import javax.rmi.CORBA.Util;
 
-import com.sun.corba.ee.spi.JndiConstants;
 import org.omg.CORBA.ORB;
-
-import org.testng.TestNG;
 import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.testng.TestNG;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
-
-import static corba.framework.PRO.* ;
+import static corba.framework.PRO.narrow;
+import static corba.framework.PRO.toStub;
 
 public class Client {
     private ORB clientORB ;
diff --git a/test/src/share/classes/corba/nortel/Echo.java b/test/src/share/classes/corba/nortel/Echo.java
index 92b9b69e0a..c10e4ec677 100644
--- a/test/src/share/classes/corba/nortel/Echo.java
+++ b/test/src/share/classes/corba/nortel/Echo.java
@@ -21,7 +21,6 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-
 import java.util.Collection;
 
 public interface Echo extends Remote {
diff --git a/test/src/share/classes/corba/nortel/EchoImpl.java b/test/src/share/classes/corba/nortel/EchoImpl.java
index 3120eac156..99e6af3252 100644
--- a/test/src/share/classes/corba/nortel/EchoImpl.java
+++ b/test/src/share/classes/corba/nortel/EchoImpl.java
@@ -19,13 +19,12 @@
 
 package corba.nortel;
 
-import java.rmi.Remote;
 import java.rmi.RemoteException;
-import javax.rmi.PortableRemoteObject;
-
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
+
+import javax.rmi.PortableRemoteObject;
 
 public class EchoImpl extends PortableRemoteObject implements Echo {
     private String name ;
diff --git a/test/src/share/classes/corba/nortel/NortelSocketFactory.java b/test/src/share/classes/corba/nortel/NortelSocketFactory.java
index 1247b27fa2..3a6a65fdb8 100644
--- a/test/src/share/classes/corba/nortel/NortelSocketFactory.java
+++ b/test/src/share/classes/corba/nortel/NortelSocketFactory.java
@@ -22,13 +22,10 @@
 import com.sun.corba.ee.impl.transport.DefaultSocketFactoryImpl;
 
 import java.io.IOException;
-
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import java.lang.String;
-
 public class NortelSocketFactory extends DefaultSocketFactoryImpl {
     private static Socket savedSocket = null ;
     private static boolean transportDown = false ;
diff --git a/test/src/share/classes/corba/nortel/Test.java b/test/src/share/classes/corba/nortel/Test.java
index d802bef1d7..e94906b4c6 100644
--- a/test/src/share/classes/corba/nortel/Test.java
+++ b/test/src/share/classes/corba/nortel/Test.java
@@ -19,8 +19,8 @@
 
 package corba.nortel;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class Test extends CORBATest
 {
diff --git a/test/src/share/classes/corba/orbconfig/Client.java b/test/src/share/classes/corba/orbconfig/Client.java
index e8730e0046..cf77f131b5 100644
--- a/test/src/share/classes/corba/orbconfig/Client.java
+++ b/test/src/share/classes/corba/orbconfig/Client.java
@@ -19,6 +19,20 @@
 
 package corba.orbconfig;
 
+import com.sun.corba.ee.impl.orb.DataCollectorFactory;
+import com.sun.corba.ee.impl.orb.ORBDataParserImpl;
+import com.sun.corba.ee.impl.orb.ParserTable;
+import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.DataCollector;
+import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBData;
+import com.sun.corba.ee.spi.orb.Operation;
+import com.sun.corba.ee.spi.orb.OperationFactory;
+import com.sun.corba.ee.spi.orb.ParserData;
+import com.sun.corba.ee.spi.orb.ParserImplBase;
+import com.sun.corba.ee.spi.orb.PropertyParser;
+
 import java.applet.Applet;
 import java.applet.AppletContext;
 import java.applet.AppletStub;
@@ -38,19 +52,6 @@
 import java.util.Properties;
 import java.util.Set;
 
-import com.sun.corba.ee.impl.orb.DataCollectorFactory;
-import com.sun.corba.ee.impl.orb.ORBDataParserImpl;
-import com.sun.corba.ee.impl.orb.ParserTable;
-import com.sun.corba.ee.spi.ior.iiop.GIOPVersion;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.orb.DataCollector;
-import com.sun.corba.ee.spi.orb.ORB;
-import com.sun.corba.ee.spi.orb.ORBData;
-import com.sun.corba.ee.spi.orb.Operation;
-import com.sun.corba.ee.spi.orb.OperationFactory;
-import com.sun.corba.ee.spi.orb.ParserData;
-import com.sun.corba.ee.spi.orb.ParserImplBase;
-import com.sun.corba.ee.spi.orb.PropertyParser;
 import org.glassfish.pfl.basic.contain.Pair;
 import org.glassfish.pfl.basic.func.NullaryFunction;
 import org.glassfish.pfl.test.JUnitReportHelper;
diff --git a/test/src/share/classes/corba/orbconfig/MyConfigurator.java b/test/src/share/classes/corba/orbconfig/MyConfigurator.java
index 040d5edbd9..f8c97a3cad 100644
--- a/test/src/share/classes/corba/orbconfig/MyConfigurator.java
+++ b/test/src/share/classes/corba/orbconfig/MyConfigurator.java
@@ -20,8 +20,8 @@
 package corba.orbconfig ;
 
 import com.sun.corba.ee.spi.orb.DataCollector;
-import com.sun.corba.ee.spi.orb.ORBConfigurator;
 import com.sun.corba.ee.spi.orb.ORB;
+import com.sun.corba.ee.spi.orb.ORBConfigurator;
 
 public class MyConfigurator implements ORBConfigurator
 {
diff --git a/test/src/share/classes/corba/orbconfig/NewORBTests.java b/test/src/share/classes/corba/orbconfig/NewORBTests.java
index f32988dd34..3c02f22aa5 100644
--- a/test/src/share/classes/corba/orbconfig/NewORBTests.java
+++ b/test/src/share/classes/corba/orbconfig/NewORBTests.java
@@ -19,8 +19,8 @@
 
 package corba.orbconfig;
 
-import test.Test;
-import corba.framework.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 
 public class NewORBTests extends CORBATest
diff --git a/test/src/share/classes/corba/orbconfig/TestSession.java b/test/src/share/classes/corba/orbconfig/TestSession.java
index 6b5e225058..2bf70b2f91 100644
--- a/test/src/share/classes/corba/orbconfig/TestSession.java
+++ b/test/src/share/classes/corba/orbconfig/TestSession.java
@@ -20,9 +20,9 @@
 package corba.orbconfig;
 
 import java.io.PrintStream;
-
 import java.util.ArrayList;
 import java.util.List;
+
 import org.glassfish.pfl.basic.func.NullaryFunction;
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.glassfish.pfl.test.ObjectUtility;
diff --git a/test/src/share/classes/corba/orbconfigappserv/ORBConfigAppServTest.java b/test/src/share/classes/corba/orbconfigappserv/ORBConfigAppServTest.java
index b6e202e8f5..61a790ecfe 100644
--- a/test/src/share/classes/corba/orbconfigappserv/ORBConfigAppServTest.java
+++ b/test/src/share/classes/corba/orbconfigappserv/ORBConfigAppServTest.java
@@ -24,8 +24,8 @@
 
 package corba.orbconfigappserv;
 
-import test.Test;
-import corba.framework.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class ORBConfigAppServTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/orbconfigappserv/ORBInitializerImpl.java b/test/src/share/classes/corba/orbconfigappserv/ORBInitializerImpl.java
index fb36961594..6867b82ff2 100644
--- a/test/src/share/classes/corba/orbconfigappserv/ORBInitializerImpl.java
+++ b/test/src/share/classes/corba/orbconfigappserv/ORBInitializerImpl.java
@@ -25,9 +25,6 @@
 package corba.orbconfigappserv;
 
 import org.omg.PortableInterceptor.ORBInitInfo;
-import org.omg.PortableInterceptor.ORBInitInfoPackage.DuplicateName;
-import org.omg.PortableInterceptor.Current;
-import org.omg.PortableInterceptor.CurrentHelper;
 
 public class ORBInitializerImpl
     extends
diff --git a/test/src/share/classes/corba/orbconfigappserv/ORBManager.java b/test/src/share/classes/corba/orbconfigappserv/ORBManager.java
index de9b9b520e..34820aa8db 100644
--- a/test/src/share/classes/corba/orbconfigappserv/ORBManager.java
+++ b/test/src/share/classes/corba/orbconfigappserv/ORBManager.java
@@ -25,18 +25,12 @@
 
 package corba.orbconfigappserv;
 
-import org.omg.CORBA.ORB;
-
-import java.util.*;
-import java.io.*;
+import java.util.Properties;
 
-import javax.rmi.CORBA.Tie;
 import javax.rmi.PortableRemoteObject;
+import javax.rmi.CORBA.Tie;
 
-import javax.naming.InitialContext;
-import javax.naming.Context;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import org.omg.CORBA.ORB;
 
 
 public class ORBManager
diff --git a/test/src/share/classes/corba/orbconfigappserv/SocketFactoryImpl.java b/test/src/share/classes/corba/orbconfigappserv/SocketFactoryImpl.java
index 69b4988641..6924f1a629 100644
--- a/test/src/share/classes/corba/orbconfigappserv/SocketFactoryImpl.java
+++ b/test/src/share/classes/corba/orbconfigappserv/SocketFactoryImpl.java
@@ -24,19 +24,17 @@
 
 package corba.orbconfigappserv;
 
-import java.io.IOException;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-import org.omg.CORBA.ORB;
-
+import com.sun.corba.ee.impl.legacy.connection.DefaultSocketFactory;
 import com.sun.corba.ee.spi.ior.IOR;
 import com.sun.corba.ee.spi.legacy.connection.GetEndPointInfoAgainException;
 import com.sun.corba.ee.spi.legacy.connection.ORBSocketFactory;
 import com.sun.corba.ee.spi.transport.SocketInfo;
 
-import com.sun.corba.ee.impl.legacy.connection.DefaultSocketFactory;
-import com.sun.corba.ee.impl.legacy.connection.EndPointInfoImpl;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import org.omg.CORBA.ORB;
 
 public class SocketFactoryImpl
     implements
diff --git a/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java b/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java
index 9b056717c1..9e8c4dedc0 100644
--- a/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java
+++ b/test/src/share/classes/corba/orbconfigappserv/UserORBConfiguratorImpl.java
@@ -24,13 +24,12 @@
 
 package corba.orbconfigappserv;
 
-import org.omg.CORBA.INITIALIZE;
+import com.sun.corba.ee.spi.orb.DataCollector;
 import com.sun.corba.ee.spi.orb.ORB;
 import com.sun.corba.ee.spi.orb.ORBConfigurator;
+import com.sun.corba.ee.spi.orb.OperationFactory;
 import com.sun.corba.ee.spi.orb.ParserImplBase;
 import com.sun.corba.ee.spi.orb.PropertyParser;
-import com.sun.corba.ee.spi.orb.DataCollector;
-import com.sun.corba.ee.spi.orb.OperationFactory;
 
 public class UserORBConfiguratorImpl
     implements
diff --git a/test/src/share/classes/corba/ortremote/ORTEcho.java b/test/src/share/classes/corba/ortremote/ORTEcho.java
index d8294a1113..27f1404a19 100644
--- a/test/src/share/classes/corba/ortremote/ORTEcho.java
+++ b/test/src/share/classes/corba/ortremote/ORTEcho.java
@@ -21,8 +21,9 @@
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
+
 import org.omg.PortableInterceptor.ObjectReferenceFactory;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 
 public interface ORTEcho extends Remote
 {
diff --git a/test/src/share/classes/corba/ortremote/ORTEchoImpl.java b/test/src/share/classes/corba/ortremote/ORTEchoImpl.java
index 3259c3d61e..91c648dc32 100644
--- a/test/src/share/classes/corba/ortremote/ORTEchoImpl.java
+++ b/test/src/share/classes/corba/ortremote/ORTEchoImpl.java
@@ -19,13 +19,15 @@
 
 package corba.ortremote ;
 
-import java.rmi.Remote;
+import com.sun.corba.ee.spi.oa.ObjectAdapter;
+
 import java.rmi.RemoteException;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
+
+import javax.rmi.PortableRemoteObject;
+
 import org.omg.PortableInterceptor.ObjectReferenceFactory;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 import org.omg.PortableServer.POA;
-import com.sun.corba.ee.spi.oa.ObjectAdapter;
-import javax.rmi.PortableRemoteObject;
 
 public class ORTEchoImpl extends PortableRemoteObject implements ORTEcho
 {
diff --git a/test/src/share/classes/corba/ortremote/ORTRemoteTest.java b/test/src/share/classes/corba/ortremote/ORTRemoteTest.java
index 22e1381fbd..b96ab8725d 100644
--- a/test/src/share/classes/corba/ortremote/ORTRemoteTest.java
+++ b/test/src/share/classes/corba/ortremote/ORTRemoteTest.java
@@ -19,11 +19,9 @@
 
 package corba.ortremote;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
-import com.sun.corba.ee.spi.misc.ORBConstants;
-import com.sun.corba.ee.spi.orb.ORB;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 public class ORTRemoteTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/ortremote/Test.java b/test/src/share/classes/corba/ortremote/Test.java
index 0be8cd3637..0a6777413e 100644
--- a/test/src/share/classes/corba/ortremote/Test.java
+++ b/test/src/share/classes/corba/ortremote/Test.java
@@ -20,29 +20,32 @@
 package corba.ortremote ;
 
 import com.sun.corba.ee.spi.oa.ObjectAdapter;
+
 import java.rmi.RemoteException;
-import org.omg.PortableInterceptor.ObjectReferenceTemplate;
-import org.omg.PortableInterceptor.ObjectReferenceFactory;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 import java.util.Properties;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Policy;
+
 import javax.rmi.PortableRemoteObject;
 import javax.rmi.CORBA.Util;
+
 import org.glassfish.pfl.basic.func.NullaryFunction;
 import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
 import org.omg.CORBA.ORBPackage.InvalidName;
+import org.omg.PortableInterceptor.ObjectReferenceFactory;
+import org.omg.PortableInterceptor.ObjectReferenceTemplate;
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.LifespanPolicyValue;
 import org.omg.PortableServer.POA;
-import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
-import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
-import org.omg.PortableServer.POAPackage.InvalidPolicy;
-import org.omg.PortableServer.POAPackage.WrongPolicy;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocator;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
+import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
+import org.omg.PortableServer.POAPackage.InvalidPolicy;
+import org.omg.PortableServer.POAPackage.WrongPolicy;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 public class Test
 {
diff --git a/test/src/share/classes/corba/ortremote/TestSession.java b/test/src/share/classes/corba/ortremote/TestSession.java
index c3fd92fbdf..2c79adf4b7 100644
--- a/test/src/share/classes/corba/ortremote/TestSession.java
+++ b/test/src/share/classes/corba/ortremote/TestSession.java
@@ -20,6 +20,7 @@
 package corba.ortremote ;
 
 import java.io.PrintStream;
+
 import org.glassfish.pfl.basic.func.NullaryFunction;
 import org.glassfish.pfl.test.JUnitReportHelper;
 import org.glassfish.pfl.test.ObjectUtility;
diff --git a/test/src/share/classes/corba/preinvokepostinvoke/Server.java b/test/src/share/classes/corba/preinvokepostinvoke/Server.java
index ba5bf14fe2..9e481e265a 100644
--- a/test/src/share/classes/corba/preinvokepostinvoke/Server.java
+++ b/test/src/share/classes/corba/preinvokepostinvoke/Server.java
@@ -19,16 +19,15 @@
 
 package corba.preinvokepostinvoke;
 
-import org.omg.CORBA.Policy;
+import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
+
+import javax.rmi.PortableRemoteObject;
+
 import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.RequestProcessingPolicyValue;
-import org.omg.PortableServer.Servant;
-import org.omg.PortableServer.ServantManager;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
-import org.omg.PortableServer.ServantLocator;
-import javax.rmi.PortableRemoteObject;
-import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
 
 public class Server {
 
diff --git a/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java b/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java
index fa51b55804..056d1e163c 100644
--- a/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java
+++ b/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlock.java
@@ -19,11 +19,10 @@
 
 package corba.resolve_deadlock;
 
-import java.util.Properties;
-
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
 import com.sun.corba.ee.spi.misc.ORBConstants;
 
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
+import java.util.Properties;
 
 import org.omg.CORBA.ORB;
 
diff --git a/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlockTest.java b/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlockTest.java
index 8164a50515..d648a67a51 100644
--- a/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlockTest.java
+++ b/test/src/share/classes/corba/resolve_deadlock/ResolveDeadlockTest.java
@@ -19,9 +19,9 @@
 
 package corba.resolve_deadlock;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 public class ResolveDeadlockTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/retryplugin/Client.java b/test/src/share/classes/corba/retryplugin/Client.java
index 2590d031d3..b85151c1af 100644
--- a/test/src/share/classes/corba/retryplugin/Client.java
+++ b/test/src/share/classes/corba/retryplugin/Client.java
@@ -24,8 +24,12 @@
 
 package corba.retryplugin;
 
+import com.sun.corba.ee.impl.plugin.hwlb.RetryClientRequestInterceptor;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Hashtable;
 import java.util.Properties;
+
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.rmi.PortableRemoteObject;
@@ -33,10 +37,6 @@
 import org.omg.CORBA.COMM_FAILURE;
 import org.omg.CORBA.ORB;
 
-import com.sun.corba.ee.impl.plugin.hwlb.RetryClientRequestInterceptor;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/retryplugin/Common.java b/test/src/share/classes/corba/retryplugin/Common.java
index d70e593b07..7f720d13f8 100644
--- a/test/src/share/classes/corba/retryplugin/Common.java
+++ b/test/src/share/classes/corba/retryplugin/Common.java
@@ -24,12 +24,13 @@
 
 package corba.retryplugin;
 
-import java.util.Vector;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 import org.omg.CORBA.ORB;
-import org.omg.CosNaming.*;
-import org.omg.CosNaming.NamingContextPackage.*;
+import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContext;
+import org.omg.CosNaming.NamingContextHelper;
 
 public class Common
 {
diff --git a/test/src/share/classes/corba/retryplugin/RetryPluginTest.java b/test/src/share/classes/corba/retryplugin/RetryPluginTest.java
index 52f179f44d..efcc749672 100644
--- a/test/src/share/classes/corba/retryplugin/RetryPluginTest.java
+++ b/test/src/share/classes/corba/retryplugin/RetryPluginTest.java
@@ -24,13 +24,8 @@
 
 package corba.retryplugin;
 
-import java.util.Properties;
-
 import corba.framework.CORBATest;
 import corba.framework.Controller;
-import corba.framework.Options;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
 
 /**
  * @author Harold Carr
diff --git a/test/src/share/classes/corba/retryplugin/Server.java b/test/src/share/classes/corba/retryplugin/Server.java
index 61d899af4d..9eefed929c 100644
--- a/test/src/share/classes/corba/retryplugin/Server.java
+++ b/test/src/share/classes/corba/retryplugin/Server.java
@@ -24,16 +24,15 @@
 
 package corba.retryplugin;
 
+import com.sun.corba.ee.impl.plugin.hwlb.RetryServerRequestInterceptor;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+
 import java.util.Properties;
 
 import org.omg.CORBA.ORB;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 
-import com.sun.corba.ee.impl.plugin.hwlb.RetryServerRequestInterceptor;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
 /**
  * @author Harold Carr
  */
diff --git a/test/src/share/classes/corba/retryplugin/TestServant.java b/test/src/share/classes/corba/retryplugin/TestServant.java
index a5b2346920..8bdd635e93 100644
--- a/test/src/share/classes/corba/retryplugin/TestServant.java
+++ b/test/src/share/classes/corba/retryplugin/TestServant.java
@@ -25,6 +25,7 @@
 package corba.retryplugin;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class TestServant
diff --git a/test/src/share/classes/corba/rfm/TestClient.java b/test/src/share/classes/corba/rfm/TestClient.java
index 0d9cbbe3fc..dbeed97d4b 100644
--- a/test/src/share/classes/corba/rfm/TestClient.java
+++ b/test/src/share/classes/corba/rfm/TestClient.java
@@ -19,54 +19,45 @@
 
 package corba.rfm ;
 
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
+import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
+import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
+import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
+
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.Map;
-import java.util.HashMap;
 import java.util.Properties;
 
 import javax.rmi.PortableRemoteObject;
-
 import javax.rmi.CORBA.Tie;
 
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.Policy;
+import org.glassfish.pfl.basic.contain.Pair;
 import org.omg.CORBA.BAD_OPERATION;
 import org.omg.CORBA.LocalObject;
-
+import org.omg.CORBA.ORB;
+import org.omg.CORBA.Policy;
+import org.omg.CosNaming.NameComponent;
 import org.omg.CosNaming.NamingContext;
-import org.omg.CosNaming.NamingContextHelper;
 import org.omg.CosNaming.NamingContextExt;
 import org.omg.CosNaming.NamingContextExtHelper;
-import org.omg.CosNaming.NameComponent;
+import org.omg.CosNaming.NamingContextHelper;
+import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
 import org.omg.CosNaming.NamingContextPackage.CannotProceed;
 import org.omg.CosNaming.NamingContextPackage.InvalidName;
-import org.omg.CosNaming.NamingContextPackage.AlreadyBound;
 import org.omg.CosNaming.NamingContextPackage.NotFound;
-
 import org.omg.PortableServer.ForwardRequest;
 import org.omg.PortableServer.POA;
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantLocator;
-
 import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactory;
-import com.sun.corba.ee.spi.oa.rfm.ReferenceFactoryManager;
-
-import com.sun.corba.ee.spi.extension.ServantCachingPolicy;
-
-import com.sun.corba.ee.spi.presentation.rmi.PresentationManager;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
-import org.glassfish.pfl.basic.contain.Pair;
-
 /** This is a test for the ReferenceFactoryManager.
  * The basic idea is to start up a number of client threads,
  * both remote and co-located, that delay for various
diff --git a/test/src/share/classes/corba/rfm/TestRFM.java b/test/src/share/classes/corba/rfm/TestRFM.java
index 45548394f7..e76f753392 100644
--- a/test/src/share/classes/corba/rfm/TestRFM.java
+++ b/test/src/share/classes/corba/rfm/TestRFM.java
@@ -19,9 +19,8 @@
 
 package corba.rfm;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class TestRFM extends CORBATest
 {
diff --git a/test/src/share/classes/corba/rmic/RmicTest.java b/test/src/share/classes/corba/rmic/RmicTest.java
index a9858bf3eb..561b30b3db 100644
--- a/test/src/share/classes/corba/rmic/RmicTest.java
+++ b/test/src/share/classes/corba/rmic/RmicTest.java
@@ -24,10 +24,8 @@
 
 package corba.rmic;
 
-import corba.framework.Controller;
 import corba.framework.CORBATest;
-
-import corba.framework.*;
+import corba.framework.Options;
 
 public class RmicTest extends CORBATest {
 
diff --git a/test/src/share/classes/corba/rmipoacounter/counterServer.java b/test/src/share/classes/corba/rmipoacounter/counterServer.java
index 33f980d09e..07e800b2f4 100644
--- a/test/src/share/classes/corba/rmipoacounter/counterServer.java
+++ b/test/src/share/classes/corba/rmipoacounter/counterServer.java
@@ -19,14 +19,17 @@
 
 package corba.rmipoacounter;
 
-import javax.rmi.PortableRemoteObject;
-import java.io.DataOutputStream;
-import java.rmi.RemoteException;
 import com.sun.corba.ee.spi.misc.ORBConstants;
+
+import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.OutputStream;
+import java.rmi.RemoteException;
 import java.util.Properties;
+
+import javax.rmi.PortableRemoteObject;
+
 import org.omg.CORBA.ORB;
 import org.omg.CORBA.Policy;
 import org.omg.CosNaming.NameComponent;
@@ -40,8 +43,8 @@
 import org.omg.PortableServer.Servant;
 import org.omg.PortableServer.ServantActivator;
 import org.omg.PortableServer.ServantLocator;
-import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 import org.omg.PortableServer.ServantRetentionPolicyValue;
+import org.omg.PortableServer.ServantLocatorPackage.CookieHolder;
 
 public class counterServer {
     public static boolean debug = true;
diff --git a/test/src/share/classes/corba/security/Client.java b/test/src/share/classes/corba/security/Client.java
index a301e1e925..d137371276 100644
--- a/test/src/share/classes/corba/security/Client.java
+++ b/test/src/share/classes/corba/security/Client.java
@@ -19,19 +19,16 @@
 
 package corba.security;
 
-import java.security.ProtectionDomain;
+import java.io.PrintStream;
+import java.net.URL;
+import java.security.CodeSource;
 import java.security.Permission;
 import java.security.PermissionCollection;
-import java.security.Principal;
-import java.security.CodeSource;
-import java.security.cert.Certificate;
 import java.security.Policy;
-
-import java.util.Properties;
+import java.security.ProtectionDomain;
+import java.security.cert.Certificate;
 import java.util.Enumeration;
-
-import java.io.PrintStream;
-import java.net.URL;
+import java.util.Properties;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/security/PermissionTest.java b/test/src/share/classes/corba/security/PermissionTest.java
index 6a19691992..c2e1c1784e 100644
--- a/test/src/share/classes/corba/security/PermissionTest.java
+++ b/test/src/share/classes/corba/security/PermissionTest.java
@@ -19,9 +19,8 @@
 
 package corba.security;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class PermissionTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/serialization/good/GoodRepIdTest.java b/test/src/share/classes/corba/serialization/good/GoodRepIdTest.java
index 86641ca1d5..0913a9f0a9 100644
--- a/test/src/share/classes/corba/serialization/good/GoodRepIdTest.java
+++ b/test/src/share/classes/corba/serialization/good/GoodRepIdTest.java
@@ -19,8 +19,8 @@
 
 package corba.serialization.good;
 
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class GoodRepIdTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/serialization/good/ShowRepid.java b/test/src/share/classes/corba/serialization/good/ShowRepid.java
index e6577b5e67..aa571dd234 100644
--- a/test/src/share/classes/corba/serialization/good/ShowRepid.java
+++ b/test/src/share/classes/corba/serialization/good/ShowRepid.java
@@ -38,9 +38,12 @@
  */
 package corba.serialization.good;
 
-import java.io.*;
 import com.sun.corba.ee.impl.util.RepositoryId;
 
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+
 public class ShowRepid implements Serializable {
     static final long serialVersionUID = 0x1234;
 
diff --git a/test/src/share/classes/corba/serialization/proxy/Client.java b/test/src/share/classes/corba/serialization/proxy/Client.java
index f0c88b6db0..7ced31f7d4 100644
--- a/test/src/share/classes/corba/serialization/proxy/Client.java
+++ b/test/src/share/classes/corba/serialization/proxy/Client.java
@@ -19,11 +19,9 @@
 
 package corba.serialization.proxy;
 
-import java.rmi.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
 import javax.rmi.PortableRemoteObject;
-import javax.naming.*;
-
-import java.io.*;
 
 public class Client
 {
diff --git a/test/src/share/classes/corba/serialization/proxy/FrobnicatorProvider.java b/test/src/share/classes/corba/serialization/proxy/FrobnicatorProvider.java
index 1471281eb0..09785f8dd4 100644
--- a/test/src/share/classes/corba/serialization/proxy/FrobnicatorProvider.java
+++ b/test/src/share/classes/corba/serialization/proxy/FrobnicatorProvider.java
@@ -19,7 +19,7 @@
 
 package corba.serialization.proxy;
 
-import java.rmi.*;
+import java.rmi.RemoteException;
 
 public interface FrobnicatorProvider  extends java.rmi.Remote {
 
diff --git a/test/src/share/classes/corba/serialization/proxy/FrobnicatorProviderBean.java b/test/src/share/classes/corba/serialization/proxy/FrobnicatorProviderBean.java
index 83a593e060..5bd3f1f2f7 100644
--- a/test/src/share/classes/corba/serialization/proxy/FrobnicatorProviderBean.java
+++ b/test/src/share/classes/corba/serialization/proxy/FrobnicatorProviderBean.java
@@ -19,9 +19,10 @@
 
 package corba.serialization.proxy;
 
+import java.lang.reflect.Proxy;
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
-import java.lang.reflect.*;
 
 public class FrobnicatorProviderBean extends PortableRemoteObject implements
                                                         FrobnicatorProvider
diff --git a/test/src/share/classes/corba/serialization/proxy/Handler.java b/test/src/share/classes/corba/serialization/proxy/Handler.java
index dd87522a20..91edfa35a3 100644
--- a/test/src/share/classes/corba/serialization/proxy/Handler.java
+++ b/test/src/share/classes/corba/serialization/proxy/Handler.java
@@ -20,8 +20,8 @@
 package corba.serialization.proxy;
 
 import java.io.Serializable;
-
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
 
 public final class Handler implements InvocationHandler, Serializable {
 
diff --git a/test/src/share/classes/corba/serialization/proxy/NoSecurityManager.java b/test/src/share/classes/corba/serialization/proxy/NoSecurityManager.java
index 6c6ee355a5..ea86b28245 100644
--- a/test/src/share/classes/corba/serialization/proxy/NoSecurityManager.java
+++ b/test/src/share/classes/corba/serialization/proxy/NoSecurityManager.java
@@ -20,10 +20,8 @@
 package corba.serialization.proxy;
 
 import java.io.FileDescriptor;
-import java.util.Hashtable;
 import java.net.InetAddress;
-import java.lang.reflect.Member;
-import java.security.*;
+import java.security.Permission;
 
 /**
  * Allows everything.  The No Security Security Manager.
diff --git a/test/src/share/classes/corba/serialization/proxy/ProxySerializationTest.java b/test/src/share/classes/corba/serialization/proxy/ProxySerializationTest.java
index d8519b62f5..b4c6dc9f3f 100644
--- a/test/src/share/classes/corba/serialization/proxy/ProxySerializationTest.java
+++ b/test/src/share/classes/corba/serialization/proxy/ProxySerializationTest.java
@@ -19,8 +19,10 @@
 
 package corba.serialization.proxy;
 
-import test.Test;
-import corba.framework.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
+
 import java.util.Properties;
 
 public class ProxySerializationTest extends CORBATest {
diff --git a/test/src/share/classes/corba/serialization/proxy/Server.java b/test/src/share/classes/corba/serialization/proxy/Server.java
index 54fe3416c3..63238e21b3 100644
--- a/test/src/share/classes/corba/serialization/proxy/Server.java
+++ b/test/src/share/classes/corba/serialization/proxy/Server.java
@@ -19,9 +19,8 @@
 
 package corba.serialization.proxy;
 
-import java.rmi.*;
-import javax.rmi.PortableRemoteObject;
-import javax.naming.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
 
 public class Server {
 
diff --git a/test/src/share/classes/corba/serialization/zerolengthstring/ClassWithZeroLengthStrings.java b/test/src/share/classes/corba/serialization/zerolengthstring/ClassWithZeroLengthStrings.java
index 39ff61180a..988924f21b 100644
--- a/test/src/share/classes/corba/serialization/zerolengthstring/ClassWithZeroLengthStrings.java
+++ b/test/src/share/classes/corba/serialization/zerolengthstring/ClassWithZeroLengthStrings.java
@@ -27,7 +27,10 @@
  */
 package corba.serialization.zerolengthstring;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 public class ClassWithZeroLengthStrings implements Serializable {
     private int field1;
diff --git a/test/src/share/classes/corba/serialization/zerolengthstring/MainTest.java b/test/src/share/classes/corba/serialization/zerolengthstring/MainTest.java
index d653468966..d250a32a93 100644
--- a/test/src/share/classes/corba/serialization/zerolengthstring/MainTest.java
+++ b/test/src/share/classes/corba/serialization/zerolengthstring/MainTest.java
@@ -26,10 +26,10 @@
  */
 package corba.serialization.zerolengthstring;
 
-import java.util.Properties;
-import org.omg.CORBA.ORB;
 import javax.rmi.CORBA.Util;
 
+import org.omg.CORBA.ORB;
+
 public class MainTest {
 
     private static boolean runTest( String[] args ) {
diff --git a/test/src/share/classes/corba/serialization/zerolengthstring/ZeroLengthStringTest.java b/test/src/share/classes/corba/serialization/zerolengthstring/ZeroLengthStringTest.java
index eef00e7649..71ded918b5 100644
--- a/test/src/share/classes/corba/serialization/zerolengthstring/ZeroLengthStringTest.java
+++ b/test/src/share/classes/corba/serialization/zerolengthstring/ZeroLengthStringTest.java
@@ -19,7 +19,8 @@
 
 package corba.serialization.zerolengthstring;
 
-import corba.framework.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
 
 public class ZeroLengthStringTest extends CORBATest
 {
diff --git a/test/src/share/classes/corba/shutdown/Example.java b/test/src/share/classes/corba/shutdown/Example.java
index 9424dbf266..a83b29607a 100644
--- a/test/src/share/classes/corba/shutdown/Example.java
+++ b/test/src/share/classes/corba/shutdown/Example.java
@@ -19,9 +19,9 @@
 
 package corba.shutdown;
 
-import test.Test;
-import corba.framework.*;
-import java.util.*;
+import corba.framework.CORBATest;
+import corba.framework.Controller;
+import corba.framework.Options;
 
 /**
  * This is a POA version of the mthello test.  The
diff --git a/test/src/share/classes/corba/shutdown/TestImpl.java b/test/src/share/classes/corba/shutdown/TestImpl.java
index e2b86a42ad..34d256beb1 100644
--- a/test/src/share/classes/corba/shutdown/TestImpl.java
+++ b/test/src/share/classes/corba/shutdown/TestImpl.java
@@ -20,6 +20,7 @@
 package corba.shutdown;
 
 import java.rmi.RemoteException;
+
 import javax.rmi.PortableRemoteObject;
 
 public class TestImpl extends PortableRemoteObject implements Test {
diff --git a/test/src/share/classes/corba/simpledynamic/Client.java b/test/src/share/classes/corba/simpledynamic/Client.java
index 36715337e6..a6556e9819 100644
--- a/test/src/share/classes/corba/simpledynamic/Client.java
+++ b/test/src/share/classes/corba/simpledynamic/Client.java
@@ -20,30 +20,27 @@
 
 package corba.simpledynamic;
 
-import java.util.Properties;
-import java.util.Hashtable;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
+import com.sun.corba.ee.spi.JndiConstants;
+import com.sun.corba.ee.spi.misc.ORBConstants;
 
 import java.rmi.RemoteException;
-
-import javax.rmi.CORBA.Util;
-import javax.rmi.CORBA.Tie;
+import java.util.Hashtable;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
+import javax.rmi.CORBA.Tie;
+import javax.rmi.CORBA.Util;
 
-import com.sun.corba.ee.spi.JndiConstants;
 import org.omg.CORBA.ORB;
-
-import org.testng.TestNG;
 import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.testng.TestNG;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
-
-import static corba.framework.PRO.* ;
+import static corba.framework.PRO.narrow;
+import static corba.framework.PRO.toStub;
 
 public class Client {
     private ORB clientORB ;
diff --git a/test/src/share/classes/corba/simpledynamic/Echo.java b/test/src/share/classes/corba/simpledynamic/Echo.java
index 7c3fc735cf..b25d0f456a 100644
--- a/test/src/share/classes/corba/simpledynamic/Echo.java
+++ b/test/src/share/classes/corba/simpledynamic/Echo.java
@@ -19,12 +19,12 @@
 
 package corba.simpledynamic;
 
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
 import corba.misc.BuckPasserAL;
 import corba.misc.BuckPasserV;
 
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
 public interface Echo extends Remote {
     String sayHello( Object obj ) throws RemoteException ;
 
diff --git a/test/src/share/classes/corba/simpledynamic/EchoImpl.java b/test/src/share/classes/corba/simpledynamic/EchoImpl.java
index 68313b364b..1cbe6b91ee 100644
--- a/test/src/share/classes/corba/simpledynamic/EchoImpl.java
+++ b/test/src/share/classes/corba/simpledynamic/EchoImpl.java
@@ -19,19 +19,17 @@
 
 package corba.simpledynamic;
 
-import java.util.Map;
-import java.util.HashMap;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import javax.rmi.PortableRemoteObject;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
 import com.sun.corba.ee.spi.logging.UtilSystemException;
 
 import corba.misc.BuckPasserAL;
 import corba.misc.BuckPasserV;
+
+import java.rmi.RemoteException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.rmi.PortableRemoteObject;
+
 import org.glassfish.pfl.basic.contain.Pair;
 
 public class EchoImpl extends PortableRemoteObject implements Echo {
diff --git a/test/src/share/classes/corba/simpledynamic/Framework.java b/test/src/share/classes/corba/simpledynamic/Framework.java
index 26c7ed314c..fea0e722fd 100644
--- a/test/src/share/classes/corba/simpledynamic/Framework.java
+++ b/test/src/share/classes/corba/simpledynamic/Framework.java
@@ -20,29 +20,26 @@
 
 package corba.simpledynamic;
 
-import java.util.Properties;
-import java.util.Hashtable;
+import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
+import com.sun.corba.ee.spi.JndiConstants;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
 
 import java.rmi.Remote;
-
-import javax.rmi.CORBA.Util;
-import javax.rmi.CORBA.Tie;
+import java.util.Hashtable;
+import java.util.Properties;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.rmi.CORBA.Tie;
+import javax.rmi.CORBA.Util;
 
-import com.sun.corba.ee.spi.JndiConstants;
 import org.testng.TestNG;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 
-import com.sun.corba.ee.spi.orb.ORB;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.impl.naming.cosnaming.TransientNameService;
-
-import static corba.framework.PRO.* ;
+import static corba.framework.PRO.narrow;
+import static corba.framework.PRO.toStub;
 
 public abstract class Framework {
     private ORB clientORB ;
diff --git a/test/src/share/classes/corba/simpledynamic/FrameworkClient.java b/test/src/share/classes/corba/simpledynamic/FrameworkClient.java
index 51a9560d4c..187d39b993 100644
--- a/test/src/share/classes/corba/simpledynamic/FrameworkClient.java
+++ b/test/src/share/classes/corba/simpledynamic/FrameworkClient.java
@@ -19,37 +19,26 @@
 
 package corba.simpledynamic;
 
-import org.glassfish.pfl.basic.func.NullaryFunction;
-//import com.sun.corba.ee.impl.orbutil.newtimer.generated.TimingPoints;
-import org.glassfish.pfl.tf.timer.spi.TimerManager;
-import org.glassfish.pfl.tf.timer.spi.TimerGroup;
-import org.glassfish.pfl.tf.timer.spi.LogEventHandler;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.spi.orb.ORB;
+
+import corba.nortel.NortelSocketFactory;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-
 import java.rmi.MarshalException;
-
-import java.util.Properties;
-
 import java.rmi.RemoteException;
+import java.util.Properties;
 
-
-
+import org.glassfish.pfl.basic.func.NullaryFunction;
 import org.testng.Assert;
-import org.testng.annotations.Test;
 import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.Test;
 
-import corba.nortel.NortelSocketFactory;
-
-import com.sun.corba.ee.spi.misc.ORBConstants;
-
-import com.sun.corba.ee.spi.orb.ORB;
-
-import corba.misc.Buck;
-
-import static corba.framework.PRO.* ;
+import static corba.framework.PRO.narrow;
+import static corba.framework.PRO.toStub;
 
 public class FrameworkClient extends Framework {
     private static final boolean RUN_FRAGMENT_TEST = false ;
@@ -202,8 +191,9 @@ public void testFragmentation( Echo sref ) {
 
     private int[] makeIntArray( int size ) {
         int[] result = new int[size] ;
-        for (int ctr=0; ctr