Mercurial > hg > openjdk > bsd-port > jdk
changeset 5828:0079a2150886
8004748: clean up @build tags in RMI tests
Reviewed-by: alanb, darcy, mchung
line wrap: on
line diff
--- a/test/java/rmi/MarshalledObject/compare/Compare.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/MarshalledObject/compare/Compare.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,7 +29,6 @@ * not involved in location should be compared. * @author Ken Arnold * - * @build Compare * @run main Compare 11 annotatedRef */
--- a/test/java/rmi/MarshalledObject/compare/HashCode.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/MarshalledObject/compare/HashCode.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,7 +27,6 @@ * @summary MarshalledObject with null throws NullPointerException * @author Ken Arnold * - * @build HashCode * @run main HashCode 11 annotatedRef */
--- a/test/java/rmi/MarshalledObject/compare/NullReference.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/MarshalledObject/compare/NullReference.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,7 +27,6 @@ * @summary MarshalledObject with null throws NullPointerException * @author Ken Arnold * - * @build NullReference * @run main NullReference */
--- a/test/java/rmi/Naming/DefaultRegistryPort.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/Naming/DefaultRegistryPort.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,7 +28,6 @@ * @author Dana Burns * @library ../testlibrary * @build TestLibrary - * @build DefaultRegistryPort * @run main DefaultRegistryPort */
--- a/test/java/rmi/Naming/LookupIPv6.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/Naming/LookupIPv6.java Wed Dec 12 09:53:01 2012 -0800 @@ -22,12 +22,11 @@ */ /* @test + * @summary Ensure that java.rmi.Naming.lookup can handle URLs containing + * IPv6 addresses. * @bug 4402708 * * @run main/othervm -Djava.net.preferIPv6Addresses=true LookupIPv6 - * - * @summary Ensure that java.rmi.Naming.lookup can handle URLs containing - * IPv6 addresses. */ import java.net.InetAddress;
--- a/test/java/rmi/Naming/RmiIsNoScheme.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/Naming/RmiIsNoScheme.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,7 +30,6 @@ * * @library ../testlibrary * @build TestLibrary - * @build RmiIsNoScheme * @run main/othervm RmiIsNoScheme */
--- a/test/java/rmi/Naming/UnderscoreHost.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/Naming/UnderscoreHost.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,8 +29,7 @@ * @author Vinod Johnson * * @library ../testlibrary - * @build TestLibrary - * @build UnderscoreHost UnderscoreHost_Stub + * @build TestLibrary UnderscoreHost_Stub * @run main/othervm UnderscoreHost */
--- a/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java Wed Dec 12 09:53:01 2012 -0800 @@ -21,14 +21,13 @@ * questions. */ -/** +/* * @test * @bug 4254808 * @summary Naming assumes '/' is present in relative URL; change in URL causes regression * @author Dana Burns * @library ../../testlibrary - * @build TestLibrary - * @build Legal LegalRegistryNames LegalRegistryNames_Stub + * @build TestLibrary Legal LegalRegistryNames_Stub * @run main LegalRegistryNames */
--- a/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/RMISecurityManager/checkPackageAccess/CheckPackageAccess.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,10 +28,9 @@ * as when the default java.lang.SecurityManager is set, which with the * default "java.security" file in the JDK means that access to packages in * the sun.* package hierarchy is denied (without explicit runtime permission - * "accessClassInPackge.*"). + * "accessClassInPackage.*"). * @author Peter Jones * - * @build CheckPackageAccess * @run main/othervm CheckPackageAccess */
--- a/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java Wed Dec 12 09:53:01 2012 -0800 @@ -36,8 +36,7 @@ * functionality is in place * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build ActivateMe CheckActivateRef_Stub CheckActivateRef + * @build TestLibrary RMID ActivateMe CheckActivateRef_Stub * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=true CheckActivateRef * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=false CheckActivateRef */
--- a/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,10 +28,7 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build MyRMI - * @build CheckAnnotations - * @build CheckAnnotations_Stub + * @build TestLibrary RMID MyRMI CheckAnnotations_Stub * @run main/othervm/policy=security.policy/timeout=480 CheckAnnotations */
--- a/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java Wed Dec 12 09:53:01 2012 -0800 @@ -24,14 +24,11 @@ /* @test * @bug 4289544 * @summary ActivationGroupImpl.newInstance does not set context classloader for impl - * * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build MyRMI - * @build CheckImplClassLoader ActivatableImpl - * @build ActivatableImpl ActivatableImpl_Stub + * @build TestLibrary RMID + * MyRMI ActivatableImpl ActivatableImpl ActivatableImpl_Stub * @run main/othervm/policy=security.policy/timeout=150 CheckImplClassLoader */
--- a/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,8 +27,8 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build RMID ActivationLibrary TestLibrary - * @build ActivateMe CheckRegisterInLog CheckRegisterInLog_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe CheckRegisterInLog_Stub * @run main/othervm/policy=security.policy/timeout=240 CheckRegisterInLog */
--- a/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java Wed Dec 12 09:53:01 2012 -0800 @@ -22,14 +22,12 @@ */ /* @test - * @author Laird Dornin * @bug 4164971 * @summary allow non-public activatable class and/or constructor + * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build ActivateMe - * @build CreatePrivateActivatable + * @build TestLibrary RMID ActivateMe * @run main/othervm/policy=security.policy/timeout=240 CreatePrivateActivatable */
--- a/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java Wed Dec 12 09:53:01 2012 -0800 @@ -32,11 +32,7 @@ * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build DownloadParameterClass - * @build Foo - * @build FooReceiverImpl - * @build FooReceiverImpl_Stub - * @build Bar + * Foo FooReceiverImpl FooReceiverImpl_Stub Bar * @run main/othervm/policy=security.policy/timeout=240 DownloadParameterClass */
--- a/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java Wed Dec 12 09:53:01 2012 -0800 @@ -23,14 +23,11 @@ /* @test * @bug 4128620 - * * @summary synopsis: NoSuchMethodError should be elucidated - * * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build ActivateMe ElucidateNoSuchMethod ElucidateNoSuchMethod_Stub + * @build TestLibrary RMID ActivateMe ElucidateNoSuchMethod_Stub * @run main/othervm/policy=security.policy/timeout=240 ElucidateNoSuchMethod */
--- a/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/extLoadedImpl/ext.sh Wed Dec 12 09:53:01 2012 -0800 @@ -28,7 +28,7 @@ # set to the impl's class loader) when the impl is activated. # @library ../../../testlibrary # @build TestLibrary RMID ActivationLibrary -# @build ExtLoadedImplTest ExtLoadedImpl ExtLoadedImpl_Stub CheckLoader +# ExtLoadedImplTest ExtLoadedImpl ExtLoadedImpl_Stub CheckLoader # @run shell ext.sh mkdir -p classes
--- a/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,9 +27,8 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build ActivateMe - * @build ForceLogSnapshot - * @build ForceLogSnapshot_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe ForceLogSnapshot_Stub * @run main/othervm/policy=security.policy/timeout=640 ForceLogSnapshot */
--- a/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,10 +29,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build InactiveGroup - * @build InactiveGroup_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe InactiveGroup_Stub * @run main/othervm/policy=security.policy/timeout=240 InactiveGroup */
--- a/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java Wed Dec 12 09:53:01 2012 -0800 @@ -24,14 +24,12 @@ /* * @test * @bug 6245733 - * * @summary synopsis: rmid's registry's list operation doesn't include * activation system * @author Ann Wollrath * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build LookupActivationSystem * @run main/othervm/timeout=240 LookupActivationSystem */
--- a/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java Wed Dec 12 09:53:01 2012 -0800 @@ -23,15 +23,11 @@ /* @test * @bug 4138056 - * * @summary synopsis: Activating objects from an Activatable constructor causes deadlock * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build NestedActivate - * @build NestedActivate_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe NestedActivate_Stub * @run main/othervm/policy=security.policy/timeout=240 NestedActivate */
--- a/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java Wed Dec 12 09:53:01 2012 -0800 @@ -23,16 +23,13 @@ /* @test * @bug 4115296 - * * @summary synopsis: NoSuchObjectException not thrown for non-existent * activatable objects * @author Ann Wollrath * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build NonExistentActivatable - * @build NonExistentActivatable_Stub + * ActivateMe NonExistentActivatable_Stub * @run main/othervm/policy=security.policy/timeout=240 NonExistentActivatable */
--- a/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,10 +28,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build ActivateMe - * @build RestartCrashedService - * @build RestartCrashedService_Stub + * @build TestLibrary RMID ActivateMe RestartCrashedService_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartCrashedService */
--- a/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,8 +28,7 @@ * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build RestartLatecomer - * @build RestartLatecomer_Stub + * RestartLatecomer RestartLatecomer_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartLatecomer */
--- a/test/java/rmi/activation/Activatable/restartService/RestartService.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/restartService/RestartService.java Wed Dec 12 09:53:01 2012 -0800 @@ -23,15 +23,11 @@ /* @test * @bug 4095165 4321151 - * @summary synopsis: activator should restart daemon services * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build RestartService - * @build RestartService_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe RestartService_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartService */
--- a/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,11 +28,8 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build TestSecurityManager - * @build RegisteringActivatable - * @build ShutdownGracefully - * @build ShutdownGracefully_Stub + * @build TestLibrary RMID + * TestSecurityManager RegisteringActivatable ShutdownGracefully_Stub * @run main/othervm/policy=security.policy/timeout=700 ShutdownGracefully */
--- a/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java Wed Dec 12 09:53:01 2012 -0800 @@ -23,16 +23,12 @@ /* @test * @bug 4115331 - * @summary synopsis: activatable object fails to go inactive after * unregister/inactive sequence. * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID ActivationLibrary - * @build ActivateMe - * @build UnregisterInactive - * @build UnregisterInactive_Stub + * @build TestLibrary RMID ActivationLibrary ActivateMe UnregisterInactive_Stub * @run main/othervm/policy=security.policy/timeout=240 UnregisterInactive */
--- a/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,11 +31,8 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build ActivateMe - * @build ActivateFails - * @build ActivateFails_Stub - * @build ShutdownThread + * @build TestLibrary RMID ActivationLibrary + * ActivateMe ActivateFails_Stub ShutdownThread * @run main/othervm/policy=security.policy/timeout=240 ActivateFails */
--- a/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java Wed Dec 12 09:53:01 2012 -0800 @@ -33,9 +33,7 @@ * * @library ../../../testlibrary * @build TestLibrary RMID ActivationLibrary - * @build MyActivationGroupImpl - * @build DownloadActivationGroup - * @build DownloadActivationGroup_Stub + * DownloadActivationGroup MyActivationGroupImpl DownloadActivationGroup_Stub * @run main/othervm/policy=security.policy/timeout=240 DownloadActivationGroup */
--- a/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java Wed Dec 12 09:53:01 2012 -0800 @@ -21,16 +21,15 @@ * questions. */ -/** +/* * @test * @bug 4252236 * @summary ActivationGroupDesc should not do early binding of default classname - * @library ../../../testlibrary + * @author Laird Dornin * - * @build CheckDefaultGroupName - * + * @library ../../../testlibrary + * @build TestLibrary * @run main CheckDefaultGroupName - * @author Laird Dornin */ import java.rmi.activation.*;
--- a/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java Wed Dec 12 09:53:01 2012 -0800 @@ -23,15 +23,13 @@ /* @test * @bug 4720528 - * * @summary synopsis: (spec) ActivationSystem.activeGroup spec should be * relaxed (duplicate call to activeGroup with same instantiator and * incarnation should not throw ActivationException; it should succeed) * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID - * @build IdempotentActiveGroup + * @build TestLibrary RMID ActivationLibrary * @run main/othervm/policy=security.policy/timeout=480 IdempotentActiveGroup */
--- a/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,9 +29,8 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build ActivateMe - * @build ModifyDescriptor - * @build ModifyDescriptor_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe ModifyDescriptor_Stub * @run main/othervm/policy=security.policy/timeout=240 ModifyDescriptor */
--- a/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java Wed Dec 12 09:53:01 2012 -0800 @@ -24,14 +24,11 @@ /* @test * @bug 4179055 * @summary Some java apps need to have access to read "accessClassInPackage.sun.rmi.server" - * * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe ActivationLibrary - * @build CanCreateStubs - * @build StubClassesPermitted - * @build StubClassesPermitted_Stub + * @build TestLibrary RMID ActivationLibrary + * CanCreateStubs StubClassesPermitted_Stub * @run main/othervm/policy=security.policy/secure=java.lang.SecurityManager/timeout=240 StubClassesPermitted */
--- a/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java Wed Dec 12 09:53:01 2012 -0800 @@ -24,16 +24,12 @@ /* @test * @bug 4134233 * @bug 4213186 - * * @summary synopsis: ActivationSystem.unregisterGroup should unregister objects in group * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build ActivateMe CallbackInterface - * @build UnregisterGroup - * @build UnregisterGroup_Stub - * @build Callback_Stub + * @build TestLibrary RMID ActivationLibrary + * ActivateMe CallbackInterface UnregisterGroup_Stub Callback_Stub * @run main/othervm/policy=security.policy/timeout=480 UnregisterGroup */
--- a/test/java/rmi/activation/CommandEnvironment/NullOptions.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/CommandEnvironment/NullOptions.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,7 +27,6 @@ * ActivationGroupDesc.CommandEnvironment * @author Ann Wollrath * - * @build NullOptions * @run main/othervm/timeout=240 NullOptions */
--- a/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java Wed Dec 12 09:53:01 2012 -0800 @@ -35,9 +35,10 @@ * @author Adrian Colley * * @library ../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build Eliza Retireable Doctor Doctor_Stub SetChildEnv - * @run main/othervm/timeout=240/policy=security.policy -Djava.compiler=NONE SetChildEnv + * @build TestLibrary RMID ActivationLibrary + * Eliza Retireable Doctor Doctor_Stub + * @run main/othervm/timeout=240/policy=security.policy + * -Djava.compiler=NONE SetChildEnv */ import java.rmi.*; import java.util.Properties;
--- a/test/java/rmi/activation/checkusage/CheckUsage.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/checkusage/CheckUsage.java Wed Dec 12 09:53:01 2012 -0800 @@ -25,7 +25,7 @@ * @bug 4259564 * * @library ../../testlibrary - * @build TestLibrary JavaVM CheckUsage + * @build TestLibrary JavaVM * @run main/othervm CheckUsage */
--- a/test/java/rmi/activation/log/LogTest.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/log/LogTest.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,7 +29,6 @@ * boundaries * @author Ann Wollrath * - * @build LogTest * @run main/othervm/timeout=240 LogTest */
--- a/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,8 +29,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build RMID ActivationLibrary - * @build InheritedChannelNotServerSocket + * @build TestLibrary RMID ActivationLibrary * @run main/othervm/timeout=240 InheritedChannelNotServerSocket */
--- a/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,9 +27,7 @@ * @author Ann Wollrath * * @library ../../testlibrary - * @build RMID ActivationLibrary - * @build RmidViaInheritedChannel - * @build TestLibrary + * @build TestLibrary RMID ActivationLibrary * @run main/othervm/timeout=240 RmidViaInheritedChannel */
--- a/test/java/rmi/dgc/VMID/CheckVMID.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/dgc/VMID/CheckVMID.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,7 +30,7 @@ * @author Ann Wollrath * * @library ../../testlibrary - * @build CheckVMID + * @build TestLibrary * @run main/othervm/policy=security.policy CheckVMID */
--- a/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,8 +30,7 @@ * rather than pinning it indefinitely. * @author Peter Jones * - * @build DGCAckFailure - * @build DGCAckFailure_Stub + * @build DGCAckFailure DGCAckFailure_Stub * @run main/othervm DGCAckFailure */
--- a/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,9 +31,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build TestLibrary - * @build DGCImplInsulation - * @build DGCImplInsulation_Stub + * @build TestLibrary DGCImplInsulation_Stub * @run main/othervm/policy=security.policy DGCImplInsulation */
--- a/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/dgc/retryDirtyCalls/RetryDirtyCalls.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,8 +29,7 @@ * renewing that lease at all after the first failure. * @author Peter Jones (inspired by Adrian Colley's test case in 4268258) * - * @build RetryDirtyCalls - * @build RetryDirtyCalls_Stub + * @build RetryDirtyCalls RetryDirtyCalls_Stub * @run main/othervm RetryDirtyCalls */
--- a/test/java/rmi/invalidName/InvalidName.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/invalidName/InvalidName.java Wed Dec 12 09:53:01 2012 -0800 @@ -32,7 +32,7 @@ * @author Laird Dornin * * @library ../testlibrary - * @build InvalidName + * @build TestLibrary * @run main/othervm InvalidName */
--- a/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,8 +27,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build StreamPipe TestParams TestLibrary JavaVM RMID - * @build AltSecurityManager TestSecurityManager + * @build TestLibrary JavaVM RMID TestSecurityManager * @run main/othervm AltSecurityManager */
--- a/test/java/rmi/registry/checkusage/CheckUsage.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/registry/checkusage/CheckUsage.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,7 +27,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build TestLibrary JavaVM CheckUsage + * @build TestLibrary JavaVM * @run main/othervm CheckUsage */
--- a/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,7 +30,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build ClassPathCodebase Dummy TestLibrary + * @build TestLibrary Dummy * @run main/othervm/policy=security.policy ClassPathCodebase */
--- a/test/java/rmi/registry/interfaceHash/InterfaceHash.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/registry/interfaceHash/InterfaceHash.java Wed Dec 12 09:53:01 2012 -0800 @@ -36,9 +36,7 @@ * * @author Peter Jones * @library ../../testlibrary - * @build InterfaceHash - * @build ReferenceRegistryStub - * @build TestLibrary + * @build TestLibrary ReferenceRegistryStub * @run main/othervm InterfaceHash */
--- a/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,7 +28,6 @@ * * @library ../../testlibrary * @build TestLibrary - * @build MultipleRegistries * @run main/othervm/timeout=240 MultipleRegistries */
--- a/test/java/rmi/registry/readTest/readTest.sh Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/registry/readTest/readTest.sh Wed Dec 12 09:53:01 2012 -0800 @@ -25,7 +25,7 @@ # @bug 7102369 7094468 7100592 # @library ../../testlibrary # @build TestLibrary -# @summary remove java.rmi.server.codebase property parsing from registyimpl +# @summary remove java.rmi.server.codebase property parsing from RegistryImpl # @run shell readTest.sh OS=`uname -s`
--- a/test/java/rmi/registry/reexport/Reexport.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/registry/reexport/Reexport.java Wed Dec 12 09:53:01 2012 -0800 @@ -25,9 +25,7 @@ * @bug 4120329 * @summary RMI registry creation is impossible if first attempt fails. * @library ../../testlibrary - * @build StreamPipe TestParams TestLibrary JavaVM - * @build RegistryRunner RegistryRunner_Stub - * @build Reexport + * @build TestLibrary JavaVM RegistryRunner RegistryRunner_Stub * @run main/othervm Reexport */
--- a/test/java/rmi/reliability/benchmark/runRmiBench.sh Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/reliability/benchmark/runRmiBench.sh Wed Dec 12 09:53:01 2012 -0800 @@ -27,20 +27,20 @@ # used to run the test under JTREG. # # @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark -# @build bench.Reporter bench.XmlReporter bench.ConfigFormatException -# @build bench.Harness bench.TextReporter bench.rmi.BenchServer -# @build bench.rmi.DoubleArrayCalls bench.rmi.LongCalls bench.rmi.ShortCalls -# @build bench.rmi.BenchServerImpl bench.rmi.DoubleCalls -# @build bench.rmi.Main bench.rmi.SmallObjTreeCalls -# @build bench.rmi.BooleanArrayCalls bench.rmi.ExceptionCalls -# @build bench.rmi.NullCalls bench.rmi.BooleanCalls bench.rmi.ExportObjs -# @build bench.rmi.ObjArrayCalls bench.rmi.ByteArrayCalls -# @build bench.rmi.FloatArrayCalls bench.rmi.ObjTreeCalls -# @build bench.rmi.ByteCalls bench.rmi.FloatCalls bench.rmi.ProxyArrayCalls -# @build bench.rmi.CharArrayCalls bench.rmi.IntArrayCalls -# @build bench.rmi.RemoteObjArrayCalls bench.rmi.CharCalls bench.rmi.IntCalls -# @build bench.rmi.ClassLoading bench.rmi.LongArrayCalls -# @build bench.rmi.ShortArrayCalls bench.rmi.altroot.Node +# bench.Reporter bench.XmlReporter bench.ConfigFormatException +# bench.Harness bench.TextReporter bench.rmi.BenchServer +# bench.rmi.DoubleArrayCalls bench.rmi.LongCalls bench.rmi.ShortCalls +# bench.rmi.BenchServerImpl bench.rmi.DoubleCalls +# bench.rmi.Main bench.rmi.SmallObjTreeCalls +# bench.rmi.BooleanArrayCalls bench.rmi.ExceptionCalls +# bench.rmi.NullCalls bench.rmi.BooleanCalls bench.rmi.ExportObjs +# bench.rmi.ObjArrayCalls bench.rmi.ByteArrayCalls +# bench.rmi.FloatArrayCalls bench.rmi.ObjTreeCalls +# bench.rmi.ByteCalls bench.rmi.FloatCalls bench.rmi.ProxyArrayCalls +# bench.rmi.CharArrayCalls bench.rmi.IntArrayCalls +# bench.rmi.RemoteObjArrayCalls bench.rmi.CharCalls bench.rmi.IntCalls +# bench.rmi.ClassLoading bench.rmi.LongArrayCalls +# bench.rmi.ShortArrayCalls bench.rmi.altroot.Node # # @run shell/timeout=1800 runRmiBench.sh #
--- a/test/java/rmi/reliability/benchmark/runSerialBench.sh Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/reliability/benchmark/runSerialBench.sh Wed Dec 12 09:53:01 2012 -0800 @@ -27,22 +27,22 @@ # used to run the test under JTREG. # # @build bench.BenchInfo bench.HtmlReporter bench.Util bench.Benchmark -# @build bench.Reporter bench.XmlReporter bench.ConfigFormatException -# @build bench.Harness bench.TextReporter -# @build bench.serial.BooleanArrays bench.serial.Booleans -# @build bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays -# @build bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons -# @build bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees -# @build bench.serial.DoubleArrays bench.serial.Doubles -# @build bench.serial.ExternObjTrees bench.serial.FloatArrays -# @build bench.serial.Floats bench.serial.GetPutFieldTrees -# @build bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays -# @build bench.serial.Longs bench.serial.Main bench.serial.ObjArrays -# @build bench.serial.ObjTrees bench.serial.ProxyArrays -# @build bench.serial.ProxyClassDesc bench.serial.RepeatObjs -# @build bench.serial.ReplaceTrees bench.serial.ShortArrays -# @build bench.serial.Shorts bench.serial.SmallObjTrees -# @build bench.serial.StreamBuffer bench.serial.Strings +# bench.Reporter bench.XmlReporter bench.ConfigFormatException +# bench.Harness bench.TextReporter +# bench.serial.BooleanArrays bench.serial.Booleans +# bench.serial.ByteArrays bench.serial.Bytes bench.serial.CharArrays +# bench.serial.Chars bench.serial.ClassDesc bench.serial.Cons +# bench.serial.CustomDefaultObjTrees bench.serial.CustomObjTrees +# bench.serial.DoubleArrays bench.serial.Doubles +# bench.serial.ExternObjTrees bench.serial.FloatArrays +# bench.serial.Floats bench.serial.GetPutFieldTrees +# bench.serial.IntArrays bench.serial.Ints bench.serial.LongArrays +# bench.serial.Longs bench.serial.Main bench.serial.ObjArrays +# bench.serial.ObjTrees bench.serial.ProxyArrays +# bench.serial.ProxyClassDesc bench.serial.RepeatObjs +# bench.serial.ReplaceTrees bench.serial.ShortArrays +# bench.serial.Shorts bench.serial.SmallObjTrees +# bench.serial.StreamBuffer bench.serial.Strings # # @run shell/timeout=1800 runSerialBench.sh #
--- a/test/java/rmi/reliability/juicer/AppleUserImpl.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/reliability/juicer/AppleUserImpl.java Wed Dec 12 09:53:01 2012 -0800 @@ -55,11 +55,10 @@ * has been reached. * * @library ../../testlibrary - * - * @build Apple AppleEvent AppleImpl AppleUserImpl - * @build Orange OrangeEcho OrangeEchoImpl OrangeImpl - * @build ApplicationServer * @build TestLibrary + * Apple AppleEvent AppleImpl + * Orange OrangeEcho OrangeEchoImpl OrangeImpl + * ApplicationServer * * @run main/othervm/policy=security.policy AppleUserImpl -seconds 30 *
--- a/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/ObjID/randomIDs/RandomIDs.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,7 +30,6 @@ * ObjID() should still generate sequential object numbers. * @author Peter Jones * - * @build RandomIDs * @run main/othervm RandomIDs random * @run main/othervm -Djava.rmi.server.randomIDs=true RandomIDs random * @run main/othervm -Djava.rmi.server.randomIDs=false RandomIDs sequential
--- a/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java Wed Dec 12 09:53:01 2012 -0800 @@ -33,9 +33,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build DelegateBeforePermissionCheck - * @build Foo + * @build TestLibrary Foo * @run main/othervm DelegateBeforePermissionCheck */
--- a/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,7 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build DelegateToContextLoader Dummy + * @build TestLibrary Dummy * @run main/othervm/policy=security.policy/timeout=120 DelegateToContextLoader */
--- a/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,11 +31,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Receiver - * @build DownloadArrayClass - * @build DownloadArrayClass_Stub - * @build Foo + * @build TestLibrary Receiver DownloadArrayClass_Stub Foo * @run main/othervm/policy=security.policy DownloadArrayClass */
--- a/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,7 +29,6 @@ * * @library ../../../testlibrary * @build TestLibrary - * @build NullClass * @run main/othervm NullClass */
--- a/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,9 +29,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build TestLibrary - * @build GetClassLoader - * @build Foo + * @build TestLibrary Foo * @run main/othervm/policy=security.policy GetClassLoader */
--- a/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,8 +30,8 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary FnnClass FnnUnmarshal LoadProxyClasses NonpublicInterface - * @build NonpublicInterface1 PublicInterface PublicInterface1 + * @build TestLibrary FnnClass FnnUnmarshal NonpublicInterface + * NonpublicInterface1 PublicInterface PublicInterface1 * @run main/othervm/policy=security.policy LoadProxyClasses */
--- a/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/noSecurityManager/NoSecurityManager.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,7 +30,7 @@ * been used for the RMI class loader instance. * @author Peter Jones * - * @build NoSecurityManager Dummy LocalDummy + * @build Dummy LocalDummy * @run main/othervm/timeout=120 NoSecurityManager */
--- a/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,11 +30,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build ContextInsulation - * @build ServiceConfiguration - * @build TestProvider - * @build TestProvider2 + * @build TestLibrary ServiceConfiguration TestProvider TestProvider2 * @run main/othervm/policy=security.policy ContextInsulation */
--- a/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,10 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build DefaultProperty - * @build ServiceConfiguration - * @build Foo + * @build TestLibrary ServiceConfiguration Foo * @run main/othervm/policy=security.policy DefaultProperty */
--- a/test/java/rmi/server/RMIClassLoader/spi/Installed.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/spi/Installed.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,11 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Installed - * @build ServiceConfiguration - * @build TestProvider - * @build TestProvider2 + * @build TestLibrary ServiceConfiguration TestProvider TestProvider2 * @run main/othervm/policy=security.policy Installed */
--- a/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,9 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build InvalidProperty - * @build ServiceConfiguration + * @build TestLibrary ServiceConfiguration * @run main/othervm/policy=security.policy InvalidProperty */
--- a/test/java/rmi/server/RMIClassLoader/spi/Property.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/spi/Property.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,10 +29,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Property - * @build ServiceConfiguration - * @build TestProvider + * @build TestLibrary ServiceConfiguration TestProvider * @run main/othervm/policy=security.policy Property */
--- a/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,12 +31,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build Receiver - * @build UseCodebaseOnly - * @build UseCodebaseOnly_Stub - * @build Foo - * @build Bar + * @build TestLibrary Receiver UseCodebaseOnly_Stub Foo Bar * @run main/othervm/policy=security.policy UseCodebaseOnly */
--- a/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,8 +30,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build UseGetURLs Dummy + * @build TestLibrary Dummy * @run main/othervm/policy=security.policy/timeout=120 UseGetURLs */
--- a/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,11 +28,7 @@ * @author Ann Wollrath * * @library ../../../../testlibrary - * @build Echo - * @build EchoImpl - * @build EchoImpl_Stub - * @build UseCustomSocketFactory - * @build TestLibrary + * @build TestLibrary Echo EchoImpl EchoImpl_Stub * @run main/othervm/policy=security.policy/timeout=360 UseCustomSocketFactory */
--- a/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,12 +29,7 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../../testlibrary - * @build Hello - * @build HelloImpl - * @build HelloImpl_Stub - * @build TestLibrary - * @build UseCustomSocketFactory - * @build Compress + * @build TestLibrary Compress Hello HelloImpl HelloImpl_Stub * @run main/othervm/policy=security.policy/timeout=240 UseCustomSocketFactory */
--- a/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,11 +29,7 @@ * @author Ann Wollrath * * @library ../../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build Echo - * @build EchoImpl - * @build EchoImpl_Stub - * @build UseCustomSocketFactory + * @build TestLibrary RMID JavaVM Echo EchoImpl EchoImpl_Stub * @run main/othervm/policy=security.policy/timeout=120 UseCustomSocketFactory */
--- a/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RemoteObject/notExtending/NotExtending.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,9 +29,7 @@ * (specifically: stubs) that contain the instance's RemoteRef. * @author Peter Jones * - * @build NotExtending - * @build NotExtending_Stub - * @build NotExtending_Skel + * @build NotExtending_Stub NotExtending_Skel * @run main/othervm/timeout=240 NotExtending */
--- a/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java Wed Dec 12 09:53:01 2012 -0800 @@ -21,16 +21,16 @@ * questions. */ -/** +/* * @test * @bug 4251010 * @summary equals does not works on stub objects created with * custom socket AndFactory - * @library ../../../testlibrary + * @author Laird Dornin * - * @build VerifyRemoteEquals + * @library ../../../testlibrary + * @build TestLibrary * @run main/othervm/timeout=40 VerifyRemoteEquals - * @author Laird Dornin */ import java.io.*;
--- a/test/java/rmi/server/RemoteServer/AddrInUse.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/RemoteServer/AddrInUse.java Wed Dec 12 09:53:01 2012 -0800 @@ -26,8 +26,6 @@ * @summary retryServerSocket should not retry on BindException * @author Ann Wollrath * - * @library ../../testlibrary - * @build AddrInUse * @run main/othervm AddrInUse */
--- a/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/UnicastRemoteObject/changeHostName/ChangeHostName.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,8 +31,7 @@ * * @author Ann Wollrath * - * @build ChangeHostName - * @build ChangeHostName_Stub + * @build ChangeHostName ChangeHostName_Stub * @run main/othervm ChangeHostName */
--- a/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/UnicastRemoteObject/exportObject/GcDuringExport.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,6 +30,7 @@ * @bug 6597112 * @summary GC'ing objects whilst being exported to RMI should not cause exceptions * @author Neil Richards <neil.richards@ngmr.net>, <neil_richards@uk.ibm.com> + * @run main GcDuringExport */ import java.rmi.Remote;
--- a/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java Wed Dec 12 09:53:01 2012 -0800 @@ -32,14 +32,8 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build JavaVM - * @build KeepAliveDuringCall - * @build KeepAliveDuringCall_Stub - * @build ShutdownMonitor - * @build Shutdown - * @build ShutdownImpl - * @build ShutdownImpl_Stub + * @build TestLibrary JavaVM KeepAliveDuringCall_Stub + * ShutdownMonitor Shutdown ShutdownImpl ShutdownImpl_Stub * @run main/othervm KeepAliveDuringCall */
--- a/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,8 +31,7 @@ * IOException (see fix for bugid 4017232). * @author Peter Jones * - * @build MarshalAfterUnexport - * @build MarshalAfterUnexport_Stub + * @build MarshalAfterUnexport MarshalAfterUnexport_Stub * @run main/othervm MarshalAfterUnexport */
--- a/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/UnicastRemoteObject/marshalAfterUnexport/MarshalAfterUnexport2.java Wed Dec 12 09:53:01 2012 -0800 @@ -33,8 +33,7 @@ * @author Peter Jones * @author Ann Wollrath * - * @build MarshalAfterUnexport2 - * @build MarshalAfterUnexport2_Stub + * @build MarshalAfterUnexport2 MarshalAfterUnexport2_Stub * @run main/othervm MarshalAfterUnexport2 */
--- a/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,10 +29,7 @@ * @author Ann Wollrath * * @library ../../../testlibrary - * @build UnexportLeak - * @build UnexportLeak_Stub - * @build TestLibrary - * @build Ping + * @build TestLibrary UnexportLeak_Stub Ping * @run main/othervm UnexportLeak */
--- a/test/java/rmi/server/Unmarshal/PrimitiveClasses.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/Unmarshal/PrimitiveClasses.java Wed Dec 12 09:53:01 2012 -0800 @@ -25,6 +25,7 @@ * @bug 4442373 * @summary Verify that RMI can successfully unmarshal Class objects for * primitive types. + * @run main PrimitiveClasses */ import java.rmi.MarshalledObject;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshal.java Wed Dec 12 09:53:01 2012 -0800 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * + */ +import java.rmi.Remote; +import java.rmi.RemoteException; + /* + * Interface with methods to exercise RMI parameter marshalling + * and unmarshalling. + */ + interface CheckUnmarshal extends java.rmi.Remote { + public PoisonPill getPoisonPill() throws RemoteException; + public Object ping() throws RemoteException; + public void passRuntimeExceptionParameter( + RuntimeExceptionParameter rep) + throws RemoteException; + }
--- a/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,10 +31,8 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build TestLibrary RMID JavaVM StreamPipe - * @build CheckUnmarshall PoisonPill RuntimeExceptionParameter - * @build CheckUnmarshalOnStopThread - * @build CheckUnmarshalOnStopThread_Stub + * @build TestLibrary CheckUnmarshal CheckUnmarshalOnStopThread_Stub + * PoisonPill RuntimeExceptionParameter * @run main/othervm/timeout=480 CheckUnmarshalOnStopThread */
--- a/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshall.java Fri Nov 30 15:36:11 2012 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -/* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/** - * - */ -import java.rmi.Remote; -import java.rmi.RemoteException; - /* - * Interface with methods to exercise RMI parameter marshalling - * and unmarshalling. - */ - interface CheckUnmarshal extends java.rmi.Remote { - public PoisonPill getPoisonPill() throws RemoteException; - public Object ping() throws RemoteException; - public void passRuntimeExceptionParameter( - RuntimeExceptionParameter rep) - throws RemoteException; - }
--- a/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java Wed Dec 12 09:53:01 2012 -0800 @@ -35,9 +35,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build FiniteGCLatency - * @build FiniteGCLatency_Stub - * @build TestLibrary + * @build TestLibrary FiniteGCLatency_Stub * @run main/othervm/timeout=120 FiniteGCLatency */
--- a/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java Wed Dec 12 09:53:01 2012 -0800 @@ -37,11 +37,7 @@ * @author Peter Jones * * @library ../../../testlibrary - * @build TestLibrary - * @build JavaVM - * @build LeaseCheckInterval - * @build LeaseCheckInterval_Stub - * @build SelfTerminator + * @build TestLibrary JavaVM LeaseCheckInterval_Stub SelfTerminator * @run main/othervm LeaseCheckInterval */
--- a/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/Unreferenced/marshalledObjectGet/MarshalledObjectGet.java Wed Dec 12 09:53:01 2012 -0800 @@ -30,8 +30,6 @@ * invoked. * @author Peter Jones * - * @library ../../../testlibrary - * @build MarshalledObjectGet * @build MarshalledObjectGet_Stub * @run main/othervm/timeout=120 MarshalledObjectGet */
--- a/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java Wed Dec 12 09:53:01 2012 -0800 @@ -39,9 +39,7 @@ * @author Laird Dornin * * @library ../../../testlibrary - * @build UnreferencedContext - * @build UnreferencedContext_Stub - * @build TestLibrary + * @build TestLibrary UnreferencedContext_Stub * @run main/othervm/timeout=120 UnreferencedContext */
--- a/test/java/rmi/server/clientStackTrace/ClientStackTrace.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/clientStackTrace/ClientStackTrace.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,7 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build ClientStackTrace MyRemoteObject_Stub TestLibrary TestParams + * @build TestLibrary ClientStackTrace MyRemoteObject_Stub * @run main/othervm/policy=security.policy/timeout=120 ClientStackTrace */
--- a/test/java/rmi/server/getRemoteClass/GetRemoteClass.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/getRemoteClass/GetRemoteClass.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,7 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build GetRemoteClass TestLibrary TestParams + * @build TestLibrary * @run main/othervm GetRemoteClass */
--- a/test/java/rmi/server/serverStackTrace/ServerStackTrace.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/serverStackTrace/ServerStackTrace.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,8 +29,7 @@ * serialized with the Throwable from the server. * @author Peter Jones * - * @build ServerStackTrace - * @build ServerStackTrace_Stub + * @build ServerStackTrace ServerStackTrace_Stub * @run main/othervm ServerStackTrace */
--- a/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/serverStackTrace/SuppressStackTraces.java Wed Dec 12 09:53:01 2012 -0800 @@ -36,10 +36,7 @@ * for reasons of performance or confidentiality requirements. * @author Peter Jones * - * @build SuppressStackTraces - * @build Impl2_Stub - * @build Impl1_Stub - * @build Impl1_Skel + * @build SuppressStackTraces Impl2_Stub Impl1_Stub Impl1_Skel * @run main/othervm SuppressStackTraces */
--- a/test/java/rmi/server/useCustomRef/UseCustomRef.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/server/useCustomRef/UseCustomRef.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,11 +31,7 @@ * 4180392 * * @library ../../testlibrary - * @build UseCustomRef - * @build Ping - * @build UseCustomRef_Stub - * @build UseCustomRef_Skel - * @build TestLibrary + * @build TestLibrary Ping UseCustomRef_Stub UseCustomRef_Skel * @run main/othervm/policy=security.policy/secure=java.rmi.RMISecurityManager/timeout=120 UseCustomRef * * This test was failing to run because the synthetic access
--- a/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/acceptLoop/CloseServerSocketOnTermination.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,7 +31,6 @@ * exception for which it doesn't even consult the RMIFailureHandler. * @author Peter Jones * - * @build CloseServerSocketOnTermination * @run main/othervm CloseServerSocketOnTermination */
--- a/test/java/rmi/transport/checkFQDN/CheckFQDN.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/checkFQDN/CheckFQDN.java Wed Dec 12 09:53:01 2012 -0800 @@ -33,8 +33,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build CheckFQDN CheckFQDNClient CheckFQDN_Stub TellServerName - * @build TestLibrary + * @build TestLibrary CheckFQDNClient CheckFQDN_Stub TellServerName * @run main/othervm/timeout=120 CheckFQDN */
--- a/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,8 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build CheckLeaseLeak CheckLeaseLeak_Stub LeaseLeakClient LeaseLeak - * @build TestLibrary + * @build TestLibrary CheckLeaseLeak_Stub LeaseLeakClient LeaseLeak * @run main/othervm/timeout=240 CheckLeaseLeak * */
--- a/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,7 +31,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build CloseServerSocket TestLibrary + * @build TestLibrary * @run main/othervm CloseServerSocket */
--- a/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,11 +28,7 @@ * @author Laird Dornin * * @library ../../testlibrary - * @build DGCDeadLock - * @build Test - * @build TestImpl - * @build TestImpl_Stub - * @build TestLibrary + * @build TestLibrary Test TestImpl TestImpl_Stub * @run main/othervm/policy=security.policy/timeout=360 DGCDeadLock */
--- a/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,7 +31,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build HandshakeFailure TestLibrary + * @build TestLibrary * @run main/othervm HandshakeFailure */
--- a/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java Wed Dec 12 09:53:01 2012 -0800 @@ -34,7 +34,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build HandshakeTimeout TestLibrary + * @build TestLibrary * @run main/othervm HandshakeTimeout */
--- a/test/java/rmi/transport/httpSocket/HttpSocketTest.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/httpSocket/HttpSocketTest.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,7 +27,7 @@ * @author Dana Burns * * @library ../../testlibrary - * @build HttpSocketTest HttpSocketTest_Stub TestLibrary + * @build TestLibrary HttpSocketTest HttpSocketTest_Stub * @run main/othervm/policy=security.policy HttpSocketTest */
--- a/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java Wed Dec 12 09:53:01 2012 -0800 @@ -32,7 +32,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build TestLibrary RapidExportUnexport + * @build TestLibrary * @run main/othervm RapidExportUnexport */
--- a/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/readTimeout/ReadTimeoutTest.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,12 +27,9 @@ * @summary Incoming connections should be subject to timeout * @author Adrian Colley * - * @library ../../testlibrary - * @build TestIface - * @build TestImpl - * @build TestImpl_Stub - * @build ReadTimeoutTest - * @run main/othervm/policy=security.policy/timeout=60 -Dsun.rmi.transport.tcp.readTimeout=5000 ReadTimeoutTest + * @build TestIface TestImpl TestImpl_Stub + * @run main/othervm/policy=security.policy/timeout=60 + * -Dsun.rmi.transport.tcp.readTimeout=5000 ReadTimeoutTest */ /* This test sets a very short read timeout, exports an object, and then
--- a/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java Wed Dec 12 09:53:01 2012 -0800 @@ -34,7 +34,7 @@ * @author Peter Jones * * @library ../../testlibrary - * @build ReuseDefaultPort TestLibrary + * @build TestLibrary * @run main/othervm ReuseDefaultPort */
--- a/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/java/rmi/transport/runtimeThreadInheritanceLeak/RuntimeThreadInheritanceLeak.java Wed Dec 12 09:53:01 2012 -0800 @@ -38,7 +38,6 @@ * subsystems also not holding on to the loader in their daemon threads.] * @author Peter Jones * - * @build RuntimeThreadInheritanceLeak * @build RuntimeThreadInheritanceLeak_Stub * @run main/othervm RuntimeThreadInheritanceLeak */
--- a/test/javax/rmi/ssl/SocketFactoryTest.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/javax/rmi/ssl/SocketFactoryTest.java Wed Dec 12 09:53:01 2012 -0800 @@ -26,8 +26,7 @@ * @bug 4932837 6582235 * @summary Test SslRMI[Client|Server]SocketFactory equals() and hashCode(). * @author Daniel Fuchs - * @run clean SocketFactoryTest - * @run build SocketFactoryTest + * * @run main SocketFactoryTest */
--- a/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java Wed Dec 12 09:53:01 2012 -0800 @@ -22,8 +22,10 @@ */ /* @test - @bug 4094889 - @summary rmid can have a corrupted log + * @bug 4094889 + * @summary rmid can have a corrupted log + * + * @run main LogAlignmentTest */ /* Fault: ReliableLog used RandomAccessFile.skipBytes() to seek past the end
--- a/test/sun/rmi/log/ReliableLog/SnapshotSize.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/log/ReliableLog/SnapshotSize.java Wed Dec 12 09:53:01 2012 -0800 @@ -25,6 +25,8 @@ * @bug 4319866 * @summary Verify that ReliableLog.snapshotSize() returns correct snapshot * file size even if LogHandler doesn't flush. + * + * @run main SnapshotSize */ import java.io.ByteArrayOutputStream;
--- a/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/rmic/RMIGenerator/RmicDefault.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,7 +28,6 @@ * @library ../../../../java/rmi/testlibrary * * @build StreamPipe - * @build RmicDefault * @run main RmicDefault */
--- a/test/sun/rmi/rmic/newrmic/equivalence/run.sh Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/rmic/newrmic/equivalence/run.sh Wed Dec 12 09:53:01 2012 -0800 @@ -26,22 +26,24 @@ # @summary This test verifies that the new implementation of rmic # generates equivalent classes as the old implementation, for a set # of sample input classes. -# @library ../../../../../java/rmi/testlibrary -# @build TestLibrary # @author Peter Jones # -# @build AgentServerImpl -# @build AppleImpl -# @build AppleUserImpl -# @build ComputeServerImpl -# @build CountServerImpl -# @build DayTimeServerImpl -# @build G1Impl -# @build MyObjectImpl -# @build NotActivatableServerImpl -# @build OrangeEchoImpl -# @build OrangeImpl -# @build ServerImpl +# @library ../../../../../java/rmi/testlibrary +# +# @build TestLibrary +# AgentServerImpl +# AppleImpl +# AppleUserImpl +# ComputeServerImpl +# CountServerImpl +# DayTimeServerImpl +# G1Impl +# MyObjectImpl +# NotActivatableServerImpl +# OrangeEchoImpl +# OrangeImpl +# ServerImpl +# # @run shell run.sh if [ "${TESTJAVA}" = "" ]
--- a/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,8 +31,7 @@ * @author Peter Jones * * @library ../../../../../java/rmi/testlibrary - * @build JavaVM - * @build NoConsoleOutput + * @build TestLibrary JavaVM * @run main/othervm NoConsoleOutput */
--- a/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,11 +28,7 @@ * @author Laird Dornin * * @library ../../../../../java/rmi/testlibrary - * @build TestLibrary - * @build TestParams - * @build TestFailedException - * @build CheckLogging - * @build CheckLogStreams + * @build TestLibrary CheckLogging * @run main/othervm -Dsun.rmi.log.useOld=true CheckLogStreams */
--- a/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java Wed Dec 12 09:53:01 2012 -0800 @@ -29,9 +29,6 @@ * * @library ../../../../../java/rmi/testlibrary * @build TestLibrary - * @build TestParams - * @build TestFailedException - * @build CheckLogging * @run main/othervm CheckLogging */
--- a/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java Wed Dec 12 09:53:01 2012 -0800 @@ -31,11 +31,7 @@ * @author Ann Wollrath * * @library ../../../../../java/rmi/testlibrary - * @build TestLibrary - * @build TestFailedException - * @build MarshalForeignStub - * @build Receiver - * @build MarshalForeignStub_Stub + * @build TestLibrary Receiver MarshalForeignStub_Stub * @run main/othervm/policy=security.policy MarshalForeignStub */
--- a/test/sun/rmi/transport/proxy/EagerHttpFallback.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/transport/proxy/EagerHttpFallback.java Wed Dec 12 09:53:01 2012 -0800 @@ -25,6 +25,7 @@ * @bug 4290727 * @summary Verify that ConnectException will trigger HTTP fallback if * sun.rmi.transport.proxy.eagerHttpFallback system property is set. + * * @library ../../../../java/rmi/testlibrary * @build TestLibrary * @run main/othervm EagerHttpFallback
--- a/test/sun/rmi/transport/tcp/DeadCachedConnection.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/transport/tcp/DeadCachedConnection.java Wed Dec 12 09:53:01 2012 -0800 @@ -25,9 +25,7 @@ * @bug 4094891 * @summary unable to retry call if cached connection to server is used * @library ../../../../java/rmi/testlibrary - * @build DeadCachedConnection - * @build JavaVM - * @build TestLibrary + * @build TestLibrary JavaVM * @run main/othervm DeadCachedConnection */
--- a/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java Wed Dec 12 09:53:01 2012 -0800 @@ -27,11 +27,8 @@ * @summary RMI blocks in HttpAwareServerSocket.accept() if you telnet to it * @author Adrian Colley * - * @library ../../../../../java/rmi/testlibrary/ - * @build TestIface - * @build TestImpl - * @build TestImpl_Stub - * @build BlockAcceptTest + * @library ../../../../../java/rmi/testlibrary + * @build TestIface TestImpl TestImpl_Stub * @run main/othervm/policy=security.policy/timeout=60 BlockAcceptTest */
--- a/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java Fri Nov 30 15:36:11 2012 +0000 +++ b/test/sun/rmi/transport/tcp/disableMultiplexing/DisableMultiplexing.java Wed Dec 12 09:53:01 2012 -0800 @@ -28,7 +28,6 @@ * on that port, rather than engage in the deprecated "multiplexing protocol". * @author Peter Jones * - * @build DisableMultiplexing * @build DisableMultiplexing_Stub * @run main/othervm DisableMultiplexing */