Author: gtrasuk
Date: Sun Dec 6 08:23:59 2015
New Revision: 1718151
URL: http://svn.apache.org/viewvc?rev=1718151&view=rev
Log:
Remove Activation subsystem and JRMP support.
Integrates RIVER-445.
Added:
river/jtsk/branches/2.2/qa/quarantined-src/
river/jtsk/branches/2.2/qa/quarantined-src/README.txt
river/jtsk/branches/2.2/qa/quarantined-src/com/
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/joinmanager/
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java
- copied unchanged from r1644543,
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td
- copied unchanged from r1644543,
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/mercury/
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java
- copied, changed from r1644543,
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.td
- copied unchanged from r1644543,
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.td
river/jtsk/branches/2.2/src/com/sun/jini/start/ExportClassLoader.java
Removed:
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ActivatableServiceStarterAdmin.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ActivationSystemAdmin.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/KillerImpl.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/SharedGroupAdmin.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/SharedVMVerifier.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperActivateDescTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperActivateDescTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperActivateDescTest2.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperActivateDescTest2.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperActivateDescTest3.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperActivateDescTest3.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadCodebase.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadCodebase.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadGroup.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadGroup.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadImplClass.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadImplClass.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadStubClass.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadStubClass.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadStubCodebase.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterBadStubCodebase.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterUnsharedImpl.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperRegisterUnsharedImpl.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ActivateWrapperTestUtil.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/BadServiceProxyAccessor.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/BadServiceProxyAccessorImpl.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ClassLoaderTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ClasspathTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ClasspathTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/CodebaseTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/CodebaseTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupCreateBadDesc.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupCreateBadDesc.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupCreateBaseTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupCreateEmptyTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupCreateEmptyTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupMainEmptyArgs.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupMainEmptyArgs.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupMainEmptyConfig.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupMainEmptyConfig.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupMainMissingConfig.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/DestroySharedGroupMainMissingConfig.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ExportClassLoaderTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ExportClassLoaderTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/MultipleClasspathComponentTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/MultipleClasspathComponentTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SecurityTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SecurityTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateBadServiceProxyAccessorTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateBadServiceProxyAccessorTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateSharedBadActServiceTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateSharedBadActServiceTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateSharedGroupTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ServiceStarterCreateSharedGroupTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivatableServiceDescriptorTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivatableServiceDescriptorTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivatableServiceDescriptorTest2.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivatableServiceDescriptorTest2.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivatableServiceDescriptorTest3.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivatableServiceDescriptorTest3.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationGroupDescriptorTest2.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionActionsTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionActionsTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionCollectionTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionCollectionTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionEqualsTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionEqualsTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPEqualsTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPEqualsTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPImpliesTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionHTTPImpliesTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionImpliesTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedActivationPolicyPermissionImpliesTest.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedGroupNullConfigEntries.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedGroupNullConfigEntries.td
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedGroupProxyEqualityTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SharedGroupProxyEqualityTest.td
river/jtsk/branches/2.2/src/com/sun/jini/fiddler/ActivatableFiddlerImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/mahalo/ActivatableMahaloImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/mercury/ActivatableMercuryImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/norm/ActivatableNormServerImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/start/ActivateWrapper.java
river/jtsk/branches/2.2/src/com/sun/jini/start/DestroySharedGroup.java
river/jtsk/branches/2.2/src/com/sun/jini/start/ProxyVerifier.java
river/jtsk/branches/2.2/src/com/sun/jini/start/SharedActivatableServiceDescriptor.java
river/jtsk/branches/2.2/src/com/sun/jini/start/SharedActivationGroupDescriptor.java
river/jtsk/branches/2.2/src/com/sun/jini/start/SharedActivationPolicyPermission.java
river/jtsk/branches/2.2/src/com/sun/jini/start/SharedGroup.java
river/jtsk/branches/2.2/src/com/sun/jini/start/SharedGroupBackEnd.java
river/jtsk/branches/2.2/src/com/sun/jini/start/SharedGroupImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckActivationSystem.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckPersistence.java
Modified:
river/jtsk/branches/2.2/build.xml
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/AdminManager.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceDestroyer.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceListRequest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/MahaloImplReadyStateTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullConfigEntries.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullRecoveredLocators.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplBadUnexportConfigEntries.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplNullConfigEntries.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplReadyStateTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/norm/ExpiredLeaseTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/reggie/resources/start.config
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/AbstractStartBaseTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SerializedServiceDescriptors.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/ServiceDescriptorProxyPreparationTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/StartAllServicesTest.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/StarterBase.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/TestUtil.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/start.properties
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/services/lookupsimulator/LookupSimulatorImpl.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/share/TestBase.java
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/spec/lookupservice/QATestRegistrar.java
river/jtsk/branches/2.2/src/com/sun/jini/fiddler/FiddlerImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/mahalo/TxnManagerImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/mercury/MailboxImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/outrigger/OutriggerServerImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/outrigger/OutriggerServerWrapper.java
river/jtsk/branches/2.2/src/com/sun/jini/outrigger/PersistentOutriggerImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/reggie/PersistentRegistrarImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/reggie/RegistrarImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/reggie/TransientRegistrarImpl.java
river/jtsk/branches/2.2/src/com/sun/jini/start/NonActivatableServiceDescriptor.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/EnvCheck.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/Util.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckCodebase.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckConfig.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckJDK1_4.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckJSKPlatform.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckJSKPolicy.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckJsseProps.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckLoggingConfig.java
river/jtsk/branches/2.2/src/com/sun/jini/tool/envcheck/plugins/CheckPolicy.java
Modified: river/jtsk/branches/2.2/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/build.xml?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
--- river/jtsk/branches/2.2/build.xml (original)
+++ river/jtsk/branches/2.2/build.xml Sun Dec 6 08:23:59 2015
@@ -431,7 +431,7 @@
extra.jar,
browser.jars" />
- <target name="river.jars" depends="stubs,
+ <target name="river.jars" depends="compile,
jini-core.jar,
jini-ext.jar,
jsk-dl.jar,
@@ -445,8 +445,6 @@
destroy.jar,
fiddler.jar,
fiddler-dl.jar,
- group.jar,
- group-dl.jar,
mahalo.jar,
mahalo-dl.jar,
mercury.jar,
@@ -456,15 +454,10 @@
outrigger.jar,
outrigger-dl.jar,
outrigger-snaplogstore.jar,
- phoenix.jar,
- phoenix-dl.jar,
- phoenix-group.jar,
- phoenix-init.jar,
reggie.jar,
reggie-dl.jar,
sdm-dl.jar,
serviceui.jar,
- sharedvm.jar,
start.jar" />
<target name="browser.jars" depends="services.jars,
@@ -534,12 +527,6 @@
<delete file="${jre.ext.dir}/jsk-policy.jar"/>
</target>
- <target name="stubs" description="Generate stubs"
- depends="compile, browser.stubs, fiddler.stubs, mahalo.stubs,
- mercury.stubs, norm.stubs, outrigger.stubs, phoenix.stubs,
- reggie.stubs, sdm.stubs, start.stubs">
- </target>
-
<target name="clean" depends="clean-dist, clean-jars, doc-clean"
description="Removes all files and dirs created by the build">
<delete dir="${build.dir}" quiet="true"/>
@@ -700,7 +687,7 @@
<!--
Deprecated since 2.1 - Scheduled for removal (RIVER-365)
-->
- <target name="jini-core.jar" depends="stubs">
+ <target name="jini-core.jar" depends="compile">
<jar destfile="${lib.dir}/jini-core.jar" index="false">
<fileset dir="${build.classes.dir}"
includes="net/jini/core/**"/>
@@ -710,7 +697,7 @@
<!--
Deprecated since 2.1 - Scheduled for removal (RIVER-365)
-->
- <target name="jini-ext.jar" depends="stubs">
+ <target name="jini-ext.jar" depends="compile">
<property name="jini-ext.deps"
location="${build.deps.dir}/jini-ext.deps"/>
<classdep output="${jini-ext.deps}"
classpathref="classdep.classes.classpath">
@@ -732,7 +719,7 @@
</target>
- <target name="jsk-debug-policy.jar" depends="stubs">
+ <target name="jsk-debug-policy.jar" depends="compile">
<property name="jsk-debug-policy.deps"
location="${build.deps.dir}/jsk-debug-policy.deps"/>
<classdep output="${jsk-debug-policy.deps}"
classpathref="classdep.classes.classpath">
@@ -751,7 +738,7 @@
</jar>
</target>
- <target name="jsk-dl.jar" depends="stubs">
+ <target name="jsk-dl.jar" depends="compile">
<property name="jsk-dl.deps" location="${build.deps.dir}/jsk-dl.deps"/>
<classdep output="${jsk-dl.deps}"
classpathref="classdep.classes.classpath">
@@ -790,7 +777,6 @@
<arg value="net.jini.lease.LeaseUnmarshalException"/>
<arg value="net.jini.lease.RenewalFailureEvent"/>
<arg value="net.jini.lookup.DiscoveryAdmin"/>
- <arg
value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
</classdep>
<jar destfile="${lib-dl.dir}/jsk-dl.jar"
index="false">
@@ -799,7 +785,7 @@
</jar>
</target>
- <target name="jsk-lib.jar" depends="stubs">
+ <target name="jsk-lib.jar" depends="compile">
<property name="jsk-lib.deps"
location="${build.deps.dir}/jsk-lib.deps"/>
<classdep output="${jsk-lib.deps}"
classpathref="classdep.classes.classpath">
@@ -820,7 +806,6 @@
<arg path="${build.classes.dir}/com/sun/jini/thread"/>
<arg path="${build.classes.dir}/net/jini"/>
<arg value="com.sun.jini.logging.Levels"/>
- <arg value="com.sun.jini.phoenix.ActivationAdmin"/>
<arg value="com.sun.jini.start.LifeCycle"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
</classdep>
@@ -909,7 +894,7 @@
</preferredlistgen>
</target>
- <target name="jsk-policy.jar" depends="stubs">
+ <target name="jsk-policy.jar" depends="compile">
<property name="jsk-policy.deps"
location="${build.deps.dir}/jsk-policy.deps"/>
<classdep output="${jsk-policy.deps}"
classpathref="classdep.classes.classpath">
@@ -927,7 +912,7 @@
</jar>
</target>
- <target name="jsk-resources.jar" depends="stubs">
+ <target name="jsk-resources.jar" depends="compile">
<jar destfile="${lib.dir}/jsk-resources.jar"
index="false">
<fileset dir="${src.manifest.dir}/jsk-resources"
@@ -943,7 +928,7 @@
Deprecated since 2.1 - Scheduled for removal
Note: the QA suite depends on some of the classes in sun-util.jar
-->
- <target name="sun-util.jar" depends="stubs">
+ <target name="sun-util.jar" depends="compile">
<property name="sun-util.deps"
location="${build.deps.dir}/sun-util.deps"/>
<classdep output="${sun-util.deps}"
classpathref="classdep.classes.classpath">
@@ -953,7 +938,6 @@
<arg value="com.sun.jini.discovery.ClientSubjectChecker"/>
<arg value="com.sun.jini.fiddler.FiddlerAdmin"/>
<arg value="com.sun.jini.outrigger.ConstrainableJavaSpaceAdmin"/>
- <arg value="com.sun.jini.phoenix.ActivationAdmin"/>
<arg value="com.sun.jini.start.LifeCycle"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
<arg line="-in com.sun.jini"/>
@@ -983,7 +967,7 @@
<!--
Deprecated since 2.1 - Scheduled for removal
-->
- <target name="sdm-dl.jar" depends="stubs">
+ <target name="sdm-dl.jar" depends="compile">
<property name="sdm-dl.deps" location="${build.deps.dir}/sdm-dl.deps"/>
<classdep output="${sdm-dl.deps}">
<arg value="-cp"/>
@@ -993,7 +977,6 @@
<arg line="-in com.sun.jini"/>
<arg line="-in net.jini"/>
<arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
- <arg
value="net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
</classdep>
<jar destfile="${lib-dl.dir}/sdm-dl.jar"
index="false">
@@ -1006,18 +989,10 @@
<arg path="${lib-dl.dir}/sdm-dl.jar"/>
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy
net.jini.lookup.ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener_Stub"/>
<classpath refid="river.jars"/>
</preferredlistgen>
</target>
- <target name="sdm.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars"/>
- <include
name="net/jini/lookup/ServiceDiscoveryManager$$LookupCacheImpl$$LookupListener.class"/>
- </rmic>
- </target>
-
<patternset id="svc-common-entries-set">
<include name="JoinManager"/>
<patternset id="dis-common-entries-set">
@@ -1027,23 +1002,6 @@
</patternset>
</patternset>
- <macrodef name="create-activatable">
- <attribute name="prefix"/>
- <sequential>
- <echo message="Creating ${configentry.dir}/@{prefix}-activatable"/>
- <concat destfile="${configentry.dir}/@{prefix}-activatable"
force="no" >
- <fileset dir="${src.configentry.dir}">
- <include name="@{prefix}-activatable"/>
- <include name="@{prefix}-persistent"/>
- <include name="@{prefix}-transient"/>
- </fileset>
- <fileset dir="${src.configentry.dir}">
- <patternset refid="svc-common-entries-set"/>
- </fileset>
- </concat>
- </sequential>
- </macrodef>
-
<macrodef name="create-persistent">
<attribute name="prefix"/>
<sequential>
@@ -1079,33 +1037,23 @@
depends="prep,
browser.configentry,
destroy.configentry,
- fiddler-activatable.configentry,
fiddler-persistent.configentry,
fiddler-transient.configentry,
JoinManager.configentry,
LeaseRenewalManager.configentry,
LookupDiscovery.configentry,
LookupLocatorDiscovery.configentry,
- mahalo-activatable.configentry,
mahalo-persistent.configentry,
mahalo-transient.configentry,
- mercury-activatable.configentry,
mercury-persistent.configentry,
mercury-transient.configentry,
- norm-activatable.configentry,
norm-persistent.configentry,
norm-transient.configentry,
- outrigger-activatable.configentry,
outrigger-persistent.configentry,
outrigger-transient.configentry,
- phoenix.configentry,
- phoenix-group.configentry,
- phoenix-stop.configentry,
- reggie-activatable.configentry,
reggie-persistent.configentry,
reggie-transient.configentry,
ServiceDiscoveryManager.configentry,
- sharedgroup.configentry,
start.configentry,
WakeupManager.configentry" description="Populates the
configentry directory.">
</target>
@@ -1143,16 +1091,6 @@
<copy file="${src.configentry.dir}/destroy"
todir="${configentry.dir}"/>
</target>
- <target name="fiddler-activatable.configentry"
- depends="fiddler-persistent.configentry,
- fiddler-transient.configentry,
- svc-common-entries">
- <!--
- <delete file="${configentry.dir}/fiddler-activatable"/>
- -->
- <create-activatable prefix="fiddler"/>
- </target>
-
<target name="fiddler-persistent.configentry">
<!--
<delete file="${configentry.dir}/fiddler-persistent"/>
@@ -1195,13 +1133,6 @@
<copy file="${src.configentry.dir}/LookupLocatorDiscovery"
todir="${configentry.dir}"/>
</target>
- <target name="mahalo-activatable.configentry">
- <!--
- <delete file="${configentry.dir}/mahalo-activatable"/>
- -->
- <create-activatable prefix="mahalo"/>
- </target>
-
<target name="mahalo-persistent.configentry">
<!--
<delete file="${configentry.dir}/mahalo-persistent"/>
@@ -1216,13 +1147,6 @@
<create-transient prefix="mahalo"/>
</target>
- <target name="mercury-activatable.configentry">
- <!--
- <delete file="${configentry.dir}/mercury-activatable"/>
- -->
- <create-activatable prefix="mercury"/>
- </target>
-
<target name="mercury-persistent.configentry">
<!--
<delete file="${configentry.dir}/mercury-persistent"/>
@@ -1237,13 +1161,6 @@
<create-transient prefix="mercury"/>
</target>
- <target name="norm-activatable.configentry">
- <!--
- <delete file="${configentry.dir}/norm-activatable"/>
- -->
- <create-activatable prefix="norm"/>
- </target>
-
<target name="norm-persistent.configentry">
<!--
<delete file="${configentry.dir}/norm-persistent"/>
@@ -1258,13 +1175,6 @@
<create-transient prefix="norm"/>
</target>
- <target name="outrigger-activatable.configentry">
- <!--
- <delete file="${configentry.dir}/outrigger-activatable"/>
- -->
- <create-activatable prefix="outrigger"/>
- </target>
-
<target name="outrigger-persistent.configentry">
<!--
<delete file="${configentry.dir}/outrigger-persistent"/>
@@ -1286,27 +1196,6 @@
<copy file="${src.configentry.dir}/phoenix"
todir="${configentry.dir}"/>
</target>
- <target name="phoenix-group.configentry">
- <!--
- <delete file="${configentry.dir}/phoenix-group"/>
- -->
- <copy file="${src.configentry.dir}/phoenix-group"
todir="${configentry.dir}"/>
- </target>
-
- <target name="phoenix-stop.configentry">
- <!--
- <delete file="${configentry.dir}/phoenix-stop"/>
- -->
- <copy file="${src.configentry.dir}/phoenix-stop"
todir="${configentry.dir}"/>
- </target>
-
- <target name="reggie-activatable.configentry">
- <!--
- <delete file="${configentry.dir}/reggie-activatable"/>
- -->
- <create-activatable prefix="reggie"/>
- </target>
-
<target name="reggie-persistent.configentry">
<!--
<delete file="${configentry.dir}/reggie-persistent"/>
@@ -1328,13 +1217,6 @@
<copy file="${src.configentry.dir}/ServiceDiscoveryManager"
todir="${configentry.dir}"/>
</target>
- <target name="sharedgroup.configentry">
- <!--
- <delete file="${configentry.dir}/sharedgroup"/>
- -->
- <copy file="${src.configentry.dir}/sharedgroup"
todir="${configentry.dir}"/>
- </target>
-
<target name="start.configentry">
<!--
<delete file="${configentry.dir}/start"/>
@@ -1349,7 +1231,7 @@
<copy file="${src.configentry.dir}/WakeupManager"
todir="${configentry.dir}"/>
</target>
- <target name="serviceui.jar" depends="stubs">
+ <target name="serviceui.jar" depends="compile">
<jar destfile="${lib.dir}/serviceui.jar"
index="false">
<fileset dir="${build.classes.dir}">
@@ -1361,7 +1243,7 @@
</jar>
</target>
- <target name="browser.jar" depends="stubs">
+ <target name="browser.jar" depends="compile">
<property name="browser.deps"
location="${build.deps.dir}/browser.deps"/>
<classdep output="${browser.deps}">
<arg value="-cp"/>
@@ -1370,8 +1252,6 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.example.browser"/>
<arg value="com.sun.jini.example.browser.Browser"/>
- <arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
- <arg
value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
</classdep>
<jar destfile="${lib.dir}/browser.jar"
index="false"
@@ -1380,7 +1260,7 @@
</jar>
</target>
- <target name="browser-dl.jar" depends="stubs">
+ <target name="browser-dl.jar" depends="compile">
<property name="browser-dl.deps"
location="${build.deps.dir}/browser-dl.deps"/>
<classdep output="${browser-dl.deps}">
<arg value="-cp"/>
@@ -1388,8 +1268,6 @@
<arg value="-files"/>
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.example.browser"/>
- <arg value="com.sun.jini.example.browser.Browser$$Listener_Stub"/>
- <arg
value="com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
<arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
</classdep>
<jar destfile="${lib-dl.dir}/browser-dl.jar"
@@ -1403,20 +1281,11 @@
<arg path="${lib-dl.dir}/browser-dl.jar"/>
<arg line="-jar"/>
<arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy
com.sun.jini.example.browser.ServiceEditor$$NotifyReceiver_Stub"/>
<classpath refid="river.jars"/>
</preferredlistgen>
</target>
- <target name="browser.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars"/>
- <include
name="com/sun/jini/example/browser/Browser$$Listener.class"/>
- <include
name="com/sun/jini/example/browser/ServiceEditor$$NotifyReceiver.class"/>
- </rmic>
- </target>
-
- <target name="fiddler.jar" depends="stubs">
+ <target name="fiddler.jar" depends="compile">
<property name="fiddler.deps"
location="${build.deps.dir}/fiddler.deps" />
<classdep output="${fiddler.deps}">
<arg value="-cp"/>
@@ -1424,9 +1293,7 @@
<arg value="-files" />
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.fiddler"/>
- <arg value="com.sun.jini.fiddler.ActivatableFiddlerImpl"/>
<arg value="com.sun.jini.fiddler.FiddlerPermission" />
- <arg value="com.sun.jini.fiddler.FiddlerImpl_Stub" />
<arg value="com.sun.jini.fiddler.NonActivatableFiddlerImpl"
/>
<arg value="com.sun.jini.fiddler.TransientFiddlerImpl"/>
</classdep>
@@ -1445,7 +1312,7 @@
</preferredlistgen>
</target>
- <target name="fiddler-dl.jar" depends="stubs">
+ <target name="fiddler-dl.jar" depends="compile">
<property name="fiddler-dl.deps"
location="${build.deps.dir}/fiddler-dl.deps" />
<classdep output="${fiddler-dl.deps}">
<arg value="-cp"/>
@@ -1455,7 +1322,6 @@
<arg line="-in com.sun.jini.fiddler"/>
<arg value="com.sun.jini.fiddler.FiddlerAdminProxy" />
<arg value="com.sun.jini.fiddler.FiddlerImpl$$FiddlerStatus"/>
- <arg value="com.sun.jini.fiddler.FiddlerImpl_Stub" />
<arg value="com.sun.jini.fiddler.FiddlerLease"/>
<arg value="com.sun.jini.fiddler.FiddlerProxy"/>
<arg value="com.sun.jini.fiddler.FiddlerRegistration"/>
@@ -1481,14 +1347,7 @@
</preferredlistgen>
</target>
- <target name="fiddler.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/fiddler/FiddlerImpl.class" />
- </rmic>
- </target>
-
- <target name="mahalo.jar" depends="stubs">
+ <target name="mahalo.jar" depends="compile">
<property name="mahalo.deps" location="${build.deps.dir}/mahalo.deps"
/>
<classdep output="${mahalo.deps}">
<arg value="-cp"/>
@@ -1496,11 +1355,9 @@
<arg value="-files" />
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.mahalo" />
- <arg value="com.sun.jini.mahalo.ActivatableMahaloImpl"/>
<arg value="com.sun.jini.mahalo.NonActivatableMahaloImpl"/>
<arg value="com.sun.jini.mahalo.TransientMahaloImpl"/>
<arg value="com.sun.jini.mahalo.MahaloPermission"/>
- <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
</classdep>
<jar destfile="${lib.dir}/mahalo.jar" index="false"
manifest="${src.manifest.dir}/mahalo.mf">
@@ -1516,7 +1373,7 @@
</preferredlistgen>
</target>
- <target name="mahalo-dl.jar" depends="stubs">
+ <target name="mahalo-dl.jar" depends="compile">
<property name="mahalo-dl.deps"
location="${build.deps.dir}/mahalo-dl.deps" />
<classdep output="${mahalo-dl.deps}">
<arg value="-cp"/>
@@ -1533,7 +1390,6 @@
<arg value="com.sun.jini.lookup.entry.BasicServiceType" />
<arg value="com.sun.jini.mahalo.TxnMgrAdminProxy"/>
<arg value="com.sun.jini.mahalo.InternalManagerException"/>
- <arg value="com.sun.jini.mahalo.TxnManagerImpl_Stub"/>
</classdep>
<jar destfile="${lib-dl.dir}/mahalo-dl.jar" index="false">
<fileset dir="${build.classes.dir}"
includesfile="${mahalo-dl.deps}" />
@@ -1551,14 +1407,7 @@
</preferredlistgen>
</target>
- <target name="mahalo.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/mahalo/TxnManagerImpl.class" />
- </rmic>
- </target>
-
- <target name="mercury.jar" depends="stubs">
+ <target name="mercury.jar" depends="compile">
<property name="mercury.deps"
location="${build.deps.dir}/mercury.deps" />
<classdep output="${mercury.deps}">
<arg value="-cp"/>
@@ -1566,11 +1415,9 @@
<arg value="-files" />
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.mercury"/>
- <arg value="com.sun.jini.mercury.ActivatableMercuryImpl"/>
<arg value="com.sun.jini.mercury.NonActivatableMercuryImpl"
/>
<arg value="com.sun.jini.mercury.TransientMercuryImpl"/>
<arg value="com.sun.jini.mercury.MercuryPermission" />
- <arg value="com.sun.jini.mercury.MailboxImpl_Stub" />
</classdep>
<jar destfile="${lib.dir}/mercury.jar" index="false"
manifest="${src.manifest.dir}/mercury.mf">
@@ -1586,7 +1433,7 @@
</preferredlistgen>
</target>
- <target name="mercury-dl.jar" depends="stubs">
+ <target name="mercury-dl.jar" depends="compile">
<property name="mercury-dl.deps"
location="${build.deps.dir}/mercury-dl.deps" />
<classdep output="${mercury-dl.deps}">
<arg value="-cp"/>
@@ -1598,7 +1445,6 @@
<arg value="com.sun.jini.mercury.InternalMailboxException" />
<arg value="com.sun.jini.mercury.ListenerProxy" />
<arg value="com.sun.jini.mercury.MailboxAdminProxy" />
- <arg value="com.sun.jini.mercury.MailboxImpl_Stub" />
<arg value="com.sun.jini.mercury.MailboxProxy"/>
<arg value="com.sun.jini.mercury.MercuryPermission" />
<arg value="com.sun.jini.mercury.RemoteEventDataCursor"/>
@@ -1625,14 +1471,7 @@
</preferredlistgen>
</target>
- <target name="mercury.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/mercury/MailboxImpl.class" />
- </rmic>
- </target>
-
- <target name="norm.jar" depends="stubs">
+ <target name="norm.jar" depends="compile">
<property name="norm.deps" location="${build.deps.dir}/norm.deps" />
<classdep output="${norm.deps}">
<arg value="-cp"/>
@@ -1640,9 +1479,7 @@
<arg value="-files" />
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.norm"/>
- <arg value="com.sun.jini.norm.ActivatableNormServerImpl"/>
<arg value="com.sun.jini.norm.NormPermission"/>
- <arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>
<arg value="com.sun.jini.norm.PersistentNormServerImpl"/>
<arg value="com.sun.jini.norm.TransientNormServerImpl"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
@@ -1661,7 +1498,7 @@
</preferredlistgen>
</target>
- <target name="norm-dl.jar" depends="stubs">
+ <target name="norm-dl.jar" depends="compile">
<property name="norm-dl.deps"
location="${build.deps.dir}/norm-dl.deps" />
<classdep output="${norm-dl.deps}">
<arg value="-cp"/>
@@ -1674,7 +1511,6 @@
<arg value="com.sun.jini.norm.CorruptedStoreException"/>
<arg value="com.sun.jini.norm.InternalNormException"/>
<arg value="com.sun.jini.norm.NormPermission"/>
- <arg value="com.sun.jini.norm.NormServerBaseImpl_Stub"/>
<arg value="com.sun.jini.norm.ProxyVerifier"/>
<arg value="com.sun.jini.reliableLog.LogException"/>
<arg value="com.sun.jini.start.ServiceProxyAccessor"/>
@@ -1698,14 +1534,7 @@
</preferredlistgen>
</target>
- <target name="norm.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/norm/NormServerBaseImpl.class" />
- </rmic>
- </target>
-
- <target name="outrigger-snaplogstore.jar" depends="stubs">
+ <target name="outrigger-snaplogstore.jar" depends="compile">
<property name="outrigger-snaplogstore.deps"
location="${build.deps.dir}/outrigger-snaplogstore.deps" />
<classdep output="${outrigger-snaplogstore.deps}">
<arg value="-cp"/>
@@ -1730,7 +1559,6 @@
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.outrigger"/>
<arg value="com.sun.jini.outrigger.OutriggerPermission"/>
- <arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub"
/>
<arg value="com.sun.jini.outrigger.PersistentOutriggerImpl"
/>
<arg value="com.sun.jini.outrigger.TransientOutriggerImpl"/>
</classdep>
@@ -1753,7 +1581,6 @@
<arg value="com.sun.jini.lookup.entry.BasicServiceType"/>
<arg value="com.sun.jini.outrigger.OutriggerPermission"/>
<arg value="com.sun.jini.outrigger.OutriggerQueryCookie"/>
- <arg value="com.sun.jini.outrigger.OutriggerServerWrapper_Stub"
/>
<arg value="com.sun.jini.outrigger.OutriggerAvailabilityEvent"/>
<arg value="com.sun.jini.outrigger.ProxyVerifier"/>
<arg value="net.jini.lookup.entry.ServiceInfo"/>
@@ -1777,139 +1604,7 @@
</preferredlistgen>
</target>
- <target name="outrigger.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include
name="com/sun/jini/outrigger/OutriggerServerWrapper.class" />
- </rmic>
- </target>
-
- <target name="phoenix.jar" depends="tools.jar">
- <property name="phoenix.deps"
location="${build.deps.dir}/phoenix.deps" />
- <classdep output="${phoenix.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files"/>
- <arg line="${jskprivate.include}"/>
- <arg line="-in com.sun.jini.phoenix"/>
- <arg value="com.sun.jini.phoenix.AccessILFactory"/>
- <arg value="com.sun.jini.phoenix.Activation"/>
- <arg value="com.sun.jini.phoenix.ActivatorPermission"/>
- <arg value="com.sun.jini.phoenix.ActivatorSunJrmpExporter"/>
- <arg value="com.sun.jini.phoenix.MonitorAccessExporter"/>
- <arg value="com.sun.jini.phoenix.MonitorPermission"/>
- <arg value="com.sun.jini.phoenix.PhoenixConstants"/>
- <arg value="com.sun.jini.phoenix.RegistrySunExporter"/>
- <arg value="com.sun.jini.phoenix.SystemAccessExporter"/>
- <arg value="com.sun.jini.phoenix.SystemAccessILFactory"/>
- <arg value="com.sun.jini.phoenix.SystemAccessProxyTrustILFactory"/>
- <arg value="com.sun.jini.phoenix.SystemPermission"/>
- <arg value="com.sun.jini.phoenix.AbstractActivator_Stub"/>
- <arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub"
/>
- <arg value="com.sun.jini.phoenix.AbstractMonitor_Stub"/>
- <arg value="com.sun.jini.phoenix.AbstractRegistry_Skel"/>
- <arg value="com.sun.jini.phoenix.AbstractRegistry_Stub"/>
- <arg value="com.sun.jini.phoenix.AbstractSystem_Stub"/>
- <!--Why was the following class was missing from jar file,
- is this a bug with ClassDep?
- com.sun.jini.phoenix.Activation depends on this:-->
- <arg value="com.sun.jini.phoenix.ConstrainableAID"/>
- </classdep>
- <jar destfile="${lib.dir}/phoenix.jar" index="false"
- manifest="${src.manifest.dir}/phoenix.mf">
- <fileset dir="${build.classes.dir}"
includesfile="${phoenix.deps}" />
- <fileset dir="${src.dir}"
includes="com/sun/jini/phoenix/resources/*.properties" />
- </jar>
- </target>
-
- <target name="phoenix-dl.jar" depends="stubs">
- <property name="phoenix-dl.deps"
location="${build.deps.dir}/phoenix-dl.deps" />
- <classdep output="${phoenix-dl.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files"/>
- <arg line="${jskprivate.include}"/>
- <arg line="-in com.sun.jini.phoenix"/>
- <arg value="com.sun.jini.phoenix.ConstrainableAID"/>
- <arg value="com.sun.jini.phoenix.SystemPermission"/>
- <arg value="com.sun.jini.phoenix.ActivatorPermission"/>
- <arg value="com.sun.jini.phoenix.MonitorPermission"/>
- <arg value="com.sun.jini.phoenix.ExecOptionPermission"/>
- <arg value="com.sun.jini.phoenix.ExecPermission"/>
- <arg value="com.sun.jini.phoenix.InactiveGroupException"/>
- <arg value="com.sun.jini.proxy.BasicProxyTrustVerifier"/>
- <arg value="com.sun.jini.phoenix.AbstractActivator_Stub"/>
- <arg value="com.sun.jini.phoenix.AbstractMonitor_Stub"/>
- <arg value="com.sun.jini.phoenix.AbstractSystem_Stub"/>
- <arg value="com.sun.jini.phoenix.AbstractRegistry_Stub"/>
- </classdep>
- <jar destfile="${lib-dl.dir}/phoenix-dl.jar" index="false">
- <fileset dir="${build.classes.dir}"
includesfile="${phoenix-dl.deps}" />
- </jar>
- <preferredlistgen>
- <arg line="-cp" />
- <arg path="${lib.dir}/jsk-platform.jar" />
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/phoenix-dl.jar"/>
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy com.sun.jini.phoenix.AbstractSystem_Stub"
/>
- <classpath refid="river.jars"/>
- </preferredlistgen>
- </target>
-
- <target name="phoenix-group.jar" depends="stubs">
- <property name="phoenix-group.deps"
location="${build.deps.dir}/phoenix-group.deps" />
- <classdep output="${phoenix-group.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files"/>
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in com.sun.jini"/>
- <arg line="-in net.jini"/>
- <arg value="com.sun.jini.phoenix.ActivationGroupImpl"/>
- <arg value="com.sun.jini.phoenix.AccessILFactory"/>
- <arg value="com.sun.jini.phoenix.InstantiatorAccessExporter"/>
- <arg value="com.sun.jini.phoenix.InstantiatorPermission"/>
- <arg value="com.sun.jini.phoenix.AbstractInstantiator_Stub"
/>
- </classdep>
- <jar destfile="${lib.dir}/phoenix-group.jar" index="false">
- <fileset dir="${build.classes.dir}"
includesfile="${phoenix-group.deps}" />
- <metainf dir="${src.manifest.dir}/phoenix-group/META-INF" />
- </jar>
- </target>
-
- <target name="phoenix-init.jar" depends="stubs">
- <property name="phoenix-init.deps"
location="${build.deps.dir}/phoenix-init.deps" />
- <classdep output="${phoenix-init.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files" />
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in com.sun.jini"/>
- <arg line="-in net.jini"/>
- <arg value="com.sun.jini.phoenix.ActivationGroupInit" />
- </classdep>
- <jar destfile="${lib.dir}/phoenix-init.jar" index="false">
- <fileset dir="${build.classes.dir}"
includesfile="${phoenix-init.deps}" />
- </jar>
- </target>
-
- <target name="phoenix.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/phoenix/AbstractActivator.class" />
- <include name="com/sun/jini/phoenix/AbstractMonitor.class" />
- <include name="com/sun/jini/phoenix/AbstractSystem.class" />
- <include name="com/sun/jini/phoenix/AbstractInstantiator.class" />
- </rmic>
- <rmic base="${build.classes.dir}" stubversion="1.1">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/phoenix/AbstractRegistry.class" />
- </rmic>
- </target>
-
- <target name="reggie.jar" depends="stubs">
+ <target name="reggie.jar" depends="compile">
<property name="reggie.deps" location="${build.deps.dir}/reggie.deps"
/>
<classdep output="${reggie.deps}">
<arg value="-cp"/>
@@ -1919,7 +1614,6 @@
<arg line="-in com.sun.jini.reggie" />
<arg value="com.sun.jini.reggie.PersistentRegistrarImpl"/>
<arg value="com.sun.jini.reggie.RegistrarPermission"/>
- <arg value="com.sun.jini.reggie.RegistrarImpl_Stub" />
<arg value="com.sun.jini.reggie.TransientRegistrarImpl" />
</classdep>
<jar destfile="${lib.dir}/reggie.jar" index="false"
@@ -1936,7 +1630,7 @@
</preferredlistgen>
</target>
- <target name="reggie-dl.jar" depends="stubs">
+ <target name="reggie-dl.jar" depends="compile">
<property name="reggie-dl.deps"
location="${build.deps.dir}/reggie-dl.deps" />
<classdep output="${reggie-dl.deps}">
<arg value="-cp"/>
@@ -1949,7 +1643,6 @@
<arg value="com.sun.jini.reggie.EventLease"/>
<arg value="com.sun.jini.reggie.ProxyVerifier"/>
<arg value="com.sun.jini.reggie.RegistrarEvent"/>
- <arg value="com.sun.jini.reggie.RegistrarImpl_Stub"/>
<arg value="com.sun.jini.reggie.RegistrarPermission"/>
<arg value="com.sun.jini.reggie.RegistrarProxy"/>
<arg value="com.sun.jini.reggie.Registration"/>
@@ -1972,13 +1665,6 @@
</preferredlistgen>
</target>
- <target name="reggie.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/reggie/RegistrarImpl.class" />
- </rmic>
- </target>
-
<target name="start.copy-resources" depends="prep">
<!--
<delete dir="${build.classes.dir}/com/sun/jini/start/resources"/>
@@ -1991,7 +1677,7 @@
</copy>
</target>
- <target name="destroy.jar" depends="stubs">
+ <target name="destroy.jar" depends="compile">
<property name="destroy.deps"
location="${build.deps.dir}/destroy.deps" />
<classdep output="${destroy.deps}">
<arg value="-cp"/>
@@ -1999,7 +1685,6 @@
<arg value="-files"/>
<arg line="${jskprivate.include}"/>
<arg line="-in com.sun.jini.start"/>
- <arg value="com.sun.jini.start.DestroySharedGroup"/>
</classdep>
<jar destfile="${lib.dir}/destroy.jar" index="false"
manifest="${src.manifest.dir}/destroy.mf">
@@ -2009,65 +1694,7 @@
</jar>
</target>
- <target name="group.jar" depends="stubs">
- <property name="group.deps" location="${build.deps.dir}/group.deps" />
- <classdep output="${group.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files" />
- <arg line="${jskprivate.include}"/>
- <arg line="-in com.sun.jini.start"/>
- <arg value="com.sun.jini.start.SharedGroupImpl" />
- <arg value="com.sun.jini.start.SharedGroupImpl_Stub"/>
- </classdep>
- <jar destfile="${lib.dir}/group.jar" index="false">
- <fileset dir="${build.classes.dir}" includesfile="${group.deps}" />
- </jar>
- </target>
-
- <target name="group-dl.jar" depends="stubs">
- <property name="group-dl.deps"
location="${build.deps.dir}/group-dl.deps" />
- <classdep output="${group-dl.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files" />
- <arg line="${jskprivate.include}"/>
- <arg line="-in com.sun.jini.start"/>
- <arg value="com.sun.jini.start.ProxyVerifier"/>
- <arg value="com.sun.jini.start.SharedGroupImpl_Stub"/>
- </classdep>
- <jar destfile="${lib-dl.dir}/group-dl.jar" index="false">
- <fileset dir="${build.classes.dir}"
includesfile="${group-dl.deps}" />
- </jar>
- <preferredlistgen>
- <arg line="-cp" />
- <arg path="${lib.dir}/jsk-platform.jar" />
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/group-dl.jar"/>
- <arg line="-jar"/>
- <arg path="${lib-dl.dir}/jsk-dl.jar"/>
- <arg line="-proxy com.sun.jini.start.SharedGroupImpl_Stub"/>
- <classpath refid="river.jars"/>
- </preferredlistgen>
- </target>
-
- <target name="sharedvm.jar" depends="stubs">
- <property name="sharedvm.deps"
location="${build.deps.dir}/sharedvm.deps" />
- <classdep output="${sharedvm.deps}">
- <arg value="-cp"/>
- <arg path="${build.classes.dir}"/>
- <arg value="-files"/>
- <arg line="${jskplatform.exclude}"/>
- <arg line="-in com.sun.jini" />
- <arg value="com.sun.jini.start.ActivateWrapper"/>
- </classdep>
- <jar destfile="${lib.dir}/sharedvm.jar" index="false"
- manifest="${src.manifest.dir}/sharedvm.mf">
- <fileset dir="${build.classes.dir}"
includesfile="${sharedvm.deps}" />
- </jar>
- </target>
-
- <target name="start.jar" depends="stubs">
+ <target name="start.jar" depends="compile">
<property name="start.deps" location="${build.deps.dir}/start.deps" />
<classdep output="${start.deps}"
classpathref="classdep.classes.classpath">
@@ -2077,8 +1704,6 @@
<arg line="${jskplatform.exclude}"/>
<arg line="-in com.sun.jini" />
<arg value="com.sun.jini.start.ServiceStarter"/>
- <arg
value="com.sun.jini.start.SharedActivatableServiceDescriptor"/>
- <arg value="com.sun.jini.start.SharedActivationGroupDescriptor"
/>
<arg value="com.sun.jini.start.NonActivatableServiceDescriptor"
/>
</classdep>
<jar destfile="${lib.dir}/start.jar" index="false"
@@ -2089,13 +1714,6 @@
</jar>
</target>
- <target name="start.stubs" depends="compile">
- <rmic base="${build.classes.dir}" stubversion="1.2">
- <classpath refid="river.jars" />
- <include name="com/sun/jini/start/SharedGroupImpl.class" />
- </rmic>
- </target>
-
<target name="tools.copy-resources" depends="prep">
<!--
<delete dir="${build.classes.dir}/com/sun/jini/tool/resources"/>
@@ -2140,7 +1758,6 @@
<arg value="com.sun.jini.tool.envcheck.AbstractPlugin"/>
<arg value="com.sun.jini.tool.envcheck.EnvCheck"/>
<arg value="com.sun.jini.tool.envcheck.SubVM"/>
- <arg
value="com.sun.jini.tool.envcheck.plugins.CheckActivationSystem"/>
<arg value="com.sun.jini.tool.envcheck.plugins.CheckCodebase"/>
<arg value="com.sun.jini.tool.envcheck.plugins.CheckConfig"
/>
<arg value="com.sun.jini.tool.envcheck.plugins.CheckJDK1_4"
/>
Added: river/jtsk/branches/2.2/qa/quarantined-src/README.txt
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/quarantined-src/README.txt?rev=1718151&view=auto
==============================================================================
--- river/jtsk/branches/2.2/qa/quarantined-src/README.txt (added)
+++ river/jtsk/branches/2.2/qa/quarantined-src/README.txt Sun Dec 6 08:23:59
2015
@@ -0,0 +1,7 @@
+This folder contains source that is quarantined as a result of dropping the
+activation system. This folder is not part of the build.
+
+The classes here are from the QA system and make use of the now-defunct
activation
+capabilities as part of the test harness, rather than testing activation
itself.
+We may want to re-implement these tests without the activation system.
+
Copied:
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java
(from r1644543,
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java)
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java?p2=river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java&p1=river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java&r1=1644543&r2=1718151&rev=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java
(original)
+++
river/jtsk/branches/2.2/qa/quarantined-src/com/sun/jini/test/impl/mercury/ExpiredRegRecovery.java
Sun Dec 6 08:23:59 2015
@@ -36,8 +36,8 @@ import net.jini.event.MailboxPullRegistr
import net.jini.event.PullEventMailbox;
import com.sun.jini.qa.harness.Admin;
-import com.sun.jini.qa.harness.ActivatableServiceStarterAdmin;
import com.sun.jini.qa.harness.TestException;
+import com.sun.jini.test.impl.mercury.MailboxTestBase;
/*
* This is a regression test for bug 4507320. The test attempts to
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/AdminManager.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/AdminManager.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
--- river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/AdminManager.java
(original)
+++ river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/AdminManager.java
Sun Dec 6 08:23:59 2015
@@ -21,7 +21,6 @@ package com.sun.jini.qa.harness;
import java.io.File;
import java.lang.reflect.Constructor;
import java.rmi.RemoteException;
-import java.rmi.activation.ActivationException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -61,17 +60,10 @@ import net.jini.core.lookup.ServiceRegis
* on the value of the service property named <code>type</code>.
* Specifically:
* <ul>
- * <li>if <code>type</code> has the value <code>"group"</code>, then
- * a <code>SharedGroupAdmin</code> is returned. A reference to the
- * groups admin is maintained and passed to the constructor of any
- * subsequently created <code>ActivatableServiceStarterAdmin</code>s.
* <li>if <code>type</code> has the value <code>"nonactivatablegroup"</code>
* a <code>NonActivatableGroupAdmin</code> is returned. A reference to
* the groups admin is maintained and passed to the constructor of any
* subsequently created <code>NonActivatableServiceStarterAdmin</code>s.
- * <li>if <code>type</code> has the value <code>"rmid"</code> or
- * <code>"phoenix"</code>, then an <code>ActivationSystemAdmin</code>
- * is returned
* <li>if <code>type</code> has the value <code>"classServer"</code>
* then a <code>ClassServerAdmin</code> is returned.
* <li>if <code>type</code> has the value <code>"running"</code>
@@ -126,9 +118,6 @@ public class AdminManager {
/** The <code>QAConfig</code> object */
private QAConfig config;
- /** the admin for the shared group managed by this class. */
- private SharedGroupAdmin sharedGroupAdmin;
-
/** The admin for the shared non-activatable group */
private NonActivatableGroupAdmin nonActivatableGroupAdmin;
@@ -255,19 +244,7 @@ public class AdminManager {
admin = getServiceSuppliedAdmin(serviceName, counter);
}
} else if (isSharedGroup(serviceName)) {
- /*
- * a shared group is just a specific activatable service, so
- * this case must be handled before the general activatable service
case
- */
- if (sharedGroupAdmin != null) {
- logger.log(Level.FINE,
- "Warning: replacing default shared group");
- }
- sharedGroupAdmin = new SharedGroupAdmin(config,
- serviceName,
- 0,
- this);
- admin = sharedGroupAdmin;
+ throw new UnsupportedOperationException("Activation is no longer
supported");
} else if (isNonActivatableGroup(serviceName)) {
if (nonActivatableGroupAdmin != null) {
logger.log(Level.FINE,
@@ -278,26 +255,11 @@ public class AdminManager {
0);
admin = nonActivatableGroupAdmin;
} else if (isActivationSystem(serviceName)) {
- admin = new ActivationSystemAdmin(config,
- serviceName,
- counter);
+ throw new UnsupportedOperationException("Activation is no longer
supported");
} else if (isClassServer(serviceName)) {
admin = new ClassServerAdmin(config, serviceName, counter);
} else if (isActivatable(serviceName)) {
- String serviceHost = config.getServiceHost(serviceName,
- counter,
- host);
- if (serviceHost != null) {
- admin = new RemoteServiceAdmin(serviceHost,
- config,
- serviceName,
- counter);
- } else {
- admin = new ActivatableServiceStarterAdmin(config,
- serviceName,
- counter,
- this);
- }
+ throw new UnsupportedOperationException("Activation is no longer
supported");
} else if (isNonActivatable(serviceName)) {
// always returns null on slave systems
String serviceHost = config.getServiceHost(serviceName,
@@ -368,8 +330,7 @@ public class AdminManager {
}
try {
Class c = Class.forName(adminName, true, config.getTestLoader());
- if (! (ActivatableServiceStarterAdmin.class.isAssignableFrom(c)
- ||
NonActivatableServiceStarterAdmin.class.isAssignableFrom(c))) {
+ if (! (NonActivatableServiceStarterAdmin.class.isAssignableFrom(c))
) {
throw new TestException("User supplied admin must extend
(Non)ActivatableServiceAdmin");
}
Constructor constructor = c.getConstructor(new
Class[]{QAConfig.class,
@@ -440,7 +401,7 @@ public class AdminManager {
* activatable service. A service is assumed to be activatable
* if a value for <code>prefix.running</code> does not exist and
* a value for <code>prefix.type</code> has the value
- * "<code>activatable</code>" or does not exist.
+ * "<code>activatable</code>".
*
* @param prefix the service prefix
*
@@ -456,11 +417,11 @@ public class AdminManager {
if (config.getServiceStringProperty(prefix, "running", index) != null) {
return false;
}
- // if type is undefined or "activatable", it's activatable
+ // if type is undefined it's 'transient'
String type = config.getServiceStringProperty(prefix,
"type",
index,
- "activatable");
+ "transient");
return type.equals("activatable");
}
@@ -843,12 +804,8 @@ public class AdminManager {
}
if (admin.getProxy() instanceof ServiceRegistrar) {
lusList.add(admin);
- } else if (admin instanceof SharedGroupAdmin) {
- sharedList.add(admin);
} else if (admin instanceof NonActivatableGroupAdmin) {
nonActList.add(admin);
- } else if (admin instanceof ActivationSystemAdmin) {
- actSystemList.add(admin);
} else if (admin instanceof ClassServerAdmin) {
classServerList.add(admin);
} else {
@@ -919,30 +876,16 @@ public class AdminManager {
try {
logger.log(Level.FINE,
"destroying service: " + proxy.getClass());
- if (admin instanceof ActivatableServiceStarterAdmin) {
- ActivatableServiceStarterAdmin
- ssa = (ActivatableServiceStarterAdmin) admin;
- int destroyCode = ssa.stopAndWait(nSecsWait);
- if(nSecsWait <= 0) {//doesn't care if act group still there
- destroyCode = ServiceDestroyer.DESTROY_SUCCESS;
- }
- handleDestroyCode(destroyCode);
- return destroyCode == ServiceDestroyer.DESTROY_SUCCESS ;
- } else {
- admin.stop();
- }
- if (admin == sharedGroupAdmin) {
- sharedGroupAdmin = null;
- }
+
+ admin.stop();
+
if (admin == nonActivatableGroupAdmin) {
nonActivatableGroupAdmin = null;
}
return true;
} catch(RemoteException e) {
logger.log(Level.FINE, "RemoteException stopping service", e);
- } catch(ActivationException e) {
- logger.log(Level.FINE, "ActivationException stopping
service:", e);
- }
+ }
finally {
it.remove(); // must use iterator's remove
}
@@ -959,10 +902,6 @@ public class AdminManager {
*/
public String getSharedVMLog() {
String sharedLogDir = null;
- if (sharedGroupAdmin != null) {
- sharedLogDir =
- sharedGroupAdmin.getSharedGroupLog().getAbsolutePath();
- }
return sharedLogDir;
}
@@ -981,15 +920,6 @@ public class AdminManager {
if (admin == null) {
return false;
}
- if (admin instanceof ActivatableServiceStarterAdmin) {
- // assume it works, even if a RemoteException is thrown
- try {
- ((ActivatableServiceStarterAdmin) admin).killVM();
- } catch (RemoteException e) {
- logger.log(Level.INFO, "Exception killing VM", e);
- }
- return true;
- }
if (admin instanceof RemoteServiceAdmin) {
try {
return ((RemoteServiceAdmin) admin).killVM();
@@ -1048,15 +978,6 @@ public class AdminManager {
}
/**
- * Return the <code>SharedGroupAdmin</code> being managed.
- *
- * @return the admin
- */
- public SharedGroupAdmin getSharedGroupAdmin() {
- return sharedGroupAdmin;
- }
-
- /**
* Return the <code>NonActivatableGroupAdmin</code> being managed.
*
* @return the admin
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/NonActivatableGroupImpl.java
Sun Dec 6 08:23:59 2015
@@ -28,13 +28,13 @@ import java.rmi.RemoteException;
import java.rmi.server.ExportException;
import java.util.ArrayList;
import java.util.logging.Logger;
-import java.util.logging.Level;
-
import net.jini.config.Configuration;
import net.jini.config.ConfigurationException;
import net.jini.config.ConfigurationProvider;
import net.jini.export.Exporter;
-import net.jini.jrmp.JrmpExporter;
+import net.jini.jeri.BasicILFactory;
+import net.jini.jeri.BasicJeriExporter;
+import net.jini.jeri.tcp.TcpServerEndpoint;
/**
* A container for nonactivatable services. This class is the
@@ -103,7 +103,7 @@ class NonActivatableGroupImpl {
* at construction time using a <code>JrmpExporter</code>.
*/
public GroupImpl() {
- exporter = new JrmpExporter();
+ exporter = new BasicJeriExporter(TcpServerEndpoint.getInstance(0),
new BasicILFactory());
try {
proxy = exporter.export(this);
} catch (ExportException e) {
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceDestroyer.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceDestroyer.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceDestroyer.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceDestroyer.java
Sun Dec 6 08:23:59 2015
@@ -18,12 +18,7 @@
package com.sun.jini.qa.harness;
import com.sun.jini.admin.DestroyAdmin;
-import com.sun.jini.start.SharedActivatableServiceDescriptor.Created;
-import java.rmi.activation.ActivationException;
-import java.rmi.activation.ActivationSystem;
-import java.rmi.activation.UnknownObjectException;
-import java.rmi.activation.ActivationGroup;
import java.rmi.RemoteException;
import net.jini.admin.Administrable;
@@ -79,79 +74,5 @@ class ServiceDestroyer {
return DESTROY_SUCCESS;
}
- /**
- * Administratively destroys the service referenced by the
- * <code>proxy</code> parameter, which is assumed to be running
- * under a shared VM environment. This method attempts to verify
- * that the desired service is indeed destroyed by verifying that
- * the service's activation information/descriptor is no longer
- * registered with the activation system.
- *
- * @param created the <code>Created</code> object returned when the
- * service was started
- * @param nSecsWait the number of seconds to wait for the service's
- * activation descriptor to be no longer registered with
- * the activation system
- * @param config a <code>Configuration</code> object which is unused
- * and probably present only for historical reasons
- *
- * @return <code>int</code> value that indicates either success or
- * one of a number of possible reasons for failure to destroy
- * the service. Possible values are:
- * <p><ul>
- * <li> ServiceDestroyer.DESTROY_SUCCESS
- * <li> ServiceDestroyer.SERVICE_NOT_ADMINISTRABLE - returned when
- * the service to destroy is not an instance of
- * net.jini.admin.Administrable
- * <li> ServiceDestroyer.SERVICE_NOT_DESTROY_ADMIN - returned when
- * the service to destroy is not an instance of
- * com.sun.jini.admin.DestroyAdmin
- * <li> ServiceDestroyer.DEACTIVATION_TIMEOUT - returned when the
- * service's activation descriptor is still registered with the
- * activation system after the number of seconds to wait have passed
- * <li> ServiceDestroyer.PERSISTENT_STORE_EXISTS - returned when the
- * directory in which the service stores its persistent state
- * still exists after the service has been successfully destroyed
- * </ul>
- *
- * @throws java.rmi.RemoteException typically, this exception occurs when
- * there is a communication failure between the client and the
- * service's backend. When this exception does occur, the
- * service may or may not have been successfully destroyed.
- * @throws java.rmi.activation.ActivationException typically, this
- * exception occurs when problems arise while attempting to
- * interact with the activation system
- */
- static int destroy(Created created, int nSecsWait, Configuration config)
- throws RemoteException, ActivationException
- {
- Object proxy = created.proxy;
- int destroyCode = destroy(proxy);
- if(destroyCode != DESTROY_SUCCESS) return destroyCode;
- /* Verify the service has actually been destroyed by waiting until
- * service's activation ID is no longer registered with the
- * activation system.
- *
- * Since an exception will be thrown when an attempt is made to
- * retrieve an activation descriptor for an ID which is not
- * registered, this method makes repeated attempts to retrieve the
- * activation descriptor until such an exception is thrown,
- * or until the indicated number of seconds to wait has passed.
- */
- boolean deactivated = false;
- for(int i = 0; i < nSecsWait; i++) {
- try {
- ActivationGroup.getSystem().getActivationDesc(created.aid);
- } catch (UnknownObjectException e) {
- deactivated = true;
- break;
- }
- try {
- Thread.sleep(1*N_MS_PER_SEC);
- } catch (InterruptedException e) { }
- }
- if(!deactivated) return DEACTIVATION_TIMEOUT;
- return DESTROY_SUCCESS;
- }
}
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceListRequest.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceListRequest.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceListRequest.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/qa/harness/ServiceListRequest.java
Sun Dec 6 08:23:59 2015
@@ -37,18 +37,6 @@ public class ServiceListRequest implemen
ArrayList list = new ArrayList();
for (int i = 0; i < admins.length; i++) {
AbstractServiceAdmin admin = admins[i];
- if (admin instanceof ActivatableServiceStarterAdmin
- || admin instanceof NonActivatableServiceStarterAdmin)
- {
- String impl = admin.getImpl();
- if (impl == null) {
- impl = admin.getName();
- }
- if (impl.indexOf(".") > 0) {
- impl = impl.substring(impl.lastIndexOf(".") + 1);
- }
- list.add(impl);
- }
if (admin instanceof RemoteServiceAdmin) {
String host = ((RemoteServiceAdmin) admin).getHost();
int index = host.indexOf("."); // strip domain name
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/MahaloImplReadyStateTest.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/MahaloImplReadyStateTest.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/MahaloImplReadyStateTest.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/MahaloImplReadyStateTest.java
Sun Dec 6 08:23:59 2015
@@ -24,7 +24,6 @@ import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.QATest;
import net.jini.config.ConfigurationException;
import com.sun.jini.start.ServiceStarter;
-import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.OverrideProvider;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullConfigEntries.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullConfigEntries.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullConfigEntries.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullConfigEntries.java
Sun Dec 6 08:23:59 2015
@@ -23,7 +23,6 @@ import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.QATest;
import net.jini.config.ConfigurationException;
import com.sun.jini.start.ServiceStarter;
-import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.OverrideProvider;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullRecoveredLocators.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullRecoveredLocators.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullRecoveredLocators.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mahalo/TxnMgrImplNullRecoveredLocators.java
Sun Dec 6 08:23:59 2015
@@ -23,7 +23,6 @@ import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.QATest;
import net.jini.config.ConfigurationException;
import com.sun.jini.start.ServiceStarter;
-import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.OverrideProvider;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplBadUnexportConfigEntries.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplBadUnexportConfigEntries.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplBadUnexportConfigEntries.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplBadUnexportConfigEntries.java
Sun Dec 6 08:23:59 2015
@@ -23,7 +23,6 @@ import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.QATest;
import net.jini.config.ConfigurationException;
import com.sun.jini.start.ServiceStarter;
-import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.OverrideProvider;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplNullConfigEntries.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplNullConfigEntries.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplNullConfigEntries.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplNullConfigEntries.java
Sun Dec 6 08:23:59 2015
@@ -23,7 +23,6 @@ import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.QATest;
import net.jini.config.ConfigurationException;
import com.sun.jini.start.ServiceStarter;
-import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.OverrideProvider;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplReadyStateTest.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplReadyStateTest.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplReadyStateTest.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/mercury/MailboxImplReadyStateTest.java
Sun Dec 6 08:23:59 2015
@@ -24,7 +24,6 @@ import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.QATest;
import net.jini.config.ConfigurationException;
import com.sun.jini.start.ServiceStarter;
-import com.sun.jini.start.SharedGroup;
import com.sun.jini.qa.harness.OverrideProvider;
import com.sun.jini.qa.harness.TestException;
import com.sun.jini.qa.harness.QAConfig;
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/norm/ExpiredLeaseTest.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/norm/ExpiredLeaseTest.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/norm/ExpiredLeaseTest.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/norm/ExpiredLeaseTest.java
Sun Dec 6 08:23:59 2015
@@ -20,7 +20,6 @@ package com.sun.jini.test.impl.norm;
import java.util.logging.Level;
import com.sun.jini.qa.harness.Admin;
-import com.sun.jini.qa.harness.ActivatableServiceStarterAdmin;
import com.sun.jini.qa.harness.TestException;
import java.io.IOException;
@@ -125,38 +124,8 @@ public class ExpiredLeaseTest extends Te
if (!tryShutdown)
return;
- logger.log(Level.INFO, "First half of test passed, ");
+ logger.log(Level.INFO, "Test passed, ");
- Admin admin = manager.getAdmin(lrs);
- if (admin instanceof ActivatableServiceStarterAdmin) {
- logger.log(Level.INFO, "trying second half");
- final Lease second =
LocalLease.getDestructingLocalLease(Lease.FOREVER,
- 60000, 1, 1, 2);
- listener.setExpectedLease(second);
- set.renewFor(second, Lease.FOREVER);
-
- if (listener.didReceiveExpected()) {
- throw new TestException(
- "Got 2nd event before "
- + "we killed the server");
- }
- shutdown(0);
-
- logger.log(Level.INFO, "Sleeping for " + eventWait + " ms");
- Thread.sleep(eventWait);
-
- listenerRslt = listener.didPass();
- if (listenerRslt != null) {
- throw new TestException( listenerRslt);
- }
-
- if (!listener.didReceiveExpected()) {
- throw new TestException(
- "Did not receive an 2nd event");
- }
- } else {
- logger.log(Level.INFO, "service is not activable, skipping second
half");
- }
}
/** Listener class that does some checking and dispaches to the owner */
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/reggie/resources/start.config
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/reggie/resources/start.config?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/reggie/resources/start.config
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/reggie/resources/start.config
Sun Dec 6 08:23:59 2015
@@ -1,7 +1,5 @@
import com.sun.jini.start.NonActivatableServiceDescriptor;
import com.sun.jini.start.ServiceDescriptor;
-import com.sun.jini.start.SharedActivatableServiceDescriptor;
-import com.sun.jini.start.SharedActivationGroupDescriptor;
com.sun.jini.start {
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/AbstractStartBaseTest.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/AbstractStartBaseTest.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/AbstractStartBaseTest.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/AbstractStartBaseTest.java
Sun Dec 6 08:23:59 2015
@@ -48,21 +48,12 @@ abstract public class AbstractStartBaseT
* <p>
* <ul>
* <li> retrieves configuration values needed by the current test
- * <li> starts the shared group (and thus the activation system)
- * if the shared parameter is true
* </ul>
- * The shared group is explicitly started because the harness is designed
- * to start it lazily.
*/
public void setup(QAConfig config) throws Exception {
super.setup(config);
logger.log(Level.FINE, "AbstractBaseTest:setup()");
getSetupInfo();
- if (config.getBooleanConfigVal("com.sun.jini.qa.harness.shared",
- true))
- {
- manager.startService("sharedGroup");
- }
}//end setup
/* Retrieve (and display) configuration values for the current test */
Modified:
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.java
URL:
http://svn.apache.org/viewvc/river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.java?rev=1718151&r1=1718150&r2=1718151&view=diff
==============================================================================
---
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.java
(original)
+++
river/jtsk/branches/2.2/qa/src/com/sun/jini/test/impl/start/SecurityTestNonActivatable.java
Sun Dec 6 08:23:59 2015
@@ -21,7 +21,6 @@ import java.util.logging.Level;
// com.sun.jini
import com.sun.jini.qa.harness.TestException;
-import com.sun.jini.qa.harness.ActivatableServiceStarterAdmin;
import com.sun.jini.qa.harness.QAConfig;
// java.rmi
