You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2010/09/11 10:08:54 UTC
svn commit: r996093 - in /incubator/river/jtsk/skunk/pepe:
qa/src/com/sun/jini/qa/harness/ qa/src/com/sun/jini/test/impl/joinmanager/
qa/src/com/sun/jini/test/impl/servicediscovery/event/
qa/src/com/sun/jini/test/share/reggie/ qa/src/com/sun/jini/test/...
Author: peter_firmstone
Date: Sat Sep 11 08:08:53 2010
New Revision: 996093
URL: http://svn.apache.org/viewvc?rev=996093&view=rev
Log:
Removed CDC based API changes from qa tests and made everything buildable.
Removed:
incubator/river/jtsk/skunk/pepe/test/src/net/jini/discovery/RemoteDiscoveryEventTest.java
incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/ConvertTest.java
incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/MiToMoOutputStreamTest.java
incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/MoToMiInputStreamTest.java
Modified:
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/qa/harness/RunningServiceAdmin.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/servicediscovery/event/LookupTaskServiceIdMapRace.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Register.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
incubator/river/jtsk/skunk/pepe/src/net/jini/core/lookup/StreamServiceRegistrar.java
incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java
incubator/river/jtsk/skunk/pepe/test/src/net/jini/core/event/RemoteEventTest.java
incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/PackageVersionTest.java
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/qa/harness/RunningServiceAdmin.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/qa/harness/RunningServiceAdmin.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/qa/harness/RunningServiceAdmin.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/qa/harness/RunningServiceAdmin.java Sat Sep 11 08:08:53 2010
@@ -139,9 +139,6 @@ public class RunningServiceAdmin extends
manager = new LookupDiscoveryManager(getGroups(),
getLocators(),
listener);
- } catch (ConfigurationException e) {
- throw new TestException("failed to create a LookupDiscoveryManager",
- e);
} catch (IOException e) {
throw new TestException("failed to create a LookupDiscoveryManager",
e);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java Sat Sep 11 08:08:53 2010
@@ -31,7 +31,7 @@ import net.jini.discovery.LookupDiscover
import net.jini.lookup.JoinManager;
import net.jini.core.entry.Entry;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/** Regression test for bug #4671109.
*
@@ -169,7 +169,7 @@ public class AddAttributesRace extends A
joinMgrSrvcID = new JoinManager(testService,
serviceAttrs,
serviceID,
- (DiscoveryListenerManagement) ldm,
+ (DiscoveryManagement) ldm,
leaseMgr,
getConfig().getConfiguration());
joinMgrList.add(joinMgrSrvcID);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/LeaseRenewDurRFE.java Sat Sep 11 08:08:53 2010
@@ -111,8 +111,7 @@ import java.util.StringTokenizer;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginContext;
-import net.jini.discovery.DiscoveryListenerManagement;
-import net.jini.discovery.RegistrarManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that the current implementation of the
@@ -453,7 +452,7 @@ public class LeaseRenewDurRFE extends Ab
/* create SDM to retrieve ref to TestService-i from lookup */
sdm = new ServiceDiscoveryManager
- ((DiscoveryListenerManagement) ldm, null, sysConfig.getConfiguration());
+ ((DiscoveryManagement) ldm, null, sysConfig.getConfiguration());
}//end setup
/** For each separate TestService started during setup, do the following:
@@ -1229,7 +1228,7 @@ public class LeaseRenewDurRFE extends Ab
outerProxy = TestServiceProxy.createTestServiceProxy
(innerProxy, proxyID, val, renewDur);
joinMgr = new JoinManager(outerProxy, null, serviceID,
- (DiscoveryListenerManagement) ldm,
+ (DiscoveryManagement) ldm,
null, config);
}//end doInit
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java Sat Sep 11 08:08:53 2010
@@ -24,7 +24,7 @@ import com.sun.jini.test.spec.joinmanage
import net.jini.lookup.JoinManager;
import java.util.logging.Level;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/** Regression test for bug #4953710 (ISE = IllegalStateException).
*
@@ -63,7 +63,7 @@ public class RaceAttrsVsTerminateISE ext
removeDups( addAttrsDup1DupAll(serviceAttrs,newServiceAttrs) );
/* Discover & join lookups just started */
jm = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
leaseMgr,
sysConfig.getConfiguration());
}//end setup
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java Sat Sep 11 08:08:53 2010
@@ -24,7 +24,7 @@ import com.sun.jini.test.spec.joinmanage
import net.jini.lookup.JoinManager;
import java.util.logging.Level;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/** Regression test for bug #4953710 (ULE = UnknownLeaseException).
*
@@ -63,7 +63,7 @@ public class RaceAttrsVsTerminateULE ext
removeDups( addAttrsDup1DupAll(serviceAttrs,newServiceAttrs) );
/* Discover & join lookups just started */
jm = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
leaseMgr,
sysConfig.getConfiguration());
}//end setup
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java Sat Sep 11 08:08:53 2010
@@ -34,7 +34,7 @@ import net.jini.core.lookup.ServiceMatch
import java.rmi.RemoteException;
import java.util.ArrayList;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -106,7 +106,7 @@ public class RegisterStorm extends Abstr
JoinManager jm =
new JoinManager(ts,serviceAttrs,
sidListener,
- (DiscoveryListenerManagement) ldm,leaseMgr,
+ (DiscoveryManagement) ldm,leaseMgr,
getConfig().getConfiguration());
joinMgrList.add(jm);
}//end loop
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java Sat Sep 11 08:08:53 2010
@@ -29,7 +29,6 @@ import net.jini.lookup.JoinManager;
import net.jini.core.entry.Entry;
import net.jini.core.lookup.ServiceRegistrar;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* With respect to the current implementation of the <code>JoinManager</code>
@@ -67,7 +66,7 @@ public class TerminateSemantics extends
super.setup(sysConfig);
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) null,
+ (DiscoveryManagement) null,
null,
sysConfig.getConfiguration());
}//end setup
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/servicediscovery/event/LookupTaskServiceIdMapRace.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/servicediscovery/event/LookupTaskServiceIdMapRace.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/servicediscovery/event/LookupTaskServiceIdMapRace.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/impl/servicediscovery/event/LookupTaskServiceIdMapRace.java Sat Sep 11 08:08:53 2010
@@ -37,8 +37,7 @@ import net.jini.core.lookup.ServiceRegis
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.logging.Level;
-import net.jini.discovery.DiscoveryListenerManagement;
-import net.jini.discovery.RegistrarManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This test attempts to simulate the following race condition that
@@ -275,7 +274,7 @@ public class LookupTaskServiceIdMapRace
/* 2. Create half the SDM's and caches */
for (int i=0; i<(N_SDM/2); i++) {
ServiceDiscoveryManager sdm = new ServiceDiscoveryManager
- ( (DiscoveryListenerManagement) ldm,null,testConfig.getConfiguration());
+ ( (DiscoveryManagement) ldm,null,testConfig.getConfiguration());
sdmList.add(sdm);
SDMListener l = new SDMListener(testConfig, "SDM_"+i);
sdmListeners.add(l);
@@ -289,7 +288,7 @@ public class LookupTaskServiceIdMapRace
/* 4. Create the remaining SDM's and caches */
for (int i=(N_SDM/2); i<N_SDM; i++) {
ServiceDiscoveryManager sdm = new ServiceDiscoveryManager
- ( (DiscoveryListenerManagement) ldm,null,testConfig.getConfiguration());
+ ( (DiscoveryManagement) ldm,null,testConfig.getConfiguration());
sdmList.add(sdm);
SDMListener l = new SDMListener(testConfig, "SDM_"+i);
sdmListeners.add(l);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/share/reggie/RegistrarImpl.java Sat Sep 11 08:08:53 2010
@@ -3938,14 +3938,9 @@ public class RegistrarImpl implements Re
}
log.snapshot();
discoer = null;
- try {
- discoer = new LookupDiscoveryManager(lookupGroups, lookupLocators,
- null);
- } catch (ConfigurationException e) {
- throw new IOException("LookupDiscoveryManager constructor threw exeption", e);
- }
+ discoer = new LookupDiscoveryManager(lookupGroups, lookupLocators, null);
joiner = new JoinManager(proxy, lookupAttrs, myServiceID,
- (DiscoveryListenerManagement) discoer, null);
+ (DiscoveryManagement) discoer, null);
/* start up all the daemon threads */
serviceExpirer.start();
eventExpirer.start();
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java Sat Sep 11 08:08:53 2010
@@ -27,7 +27,7 @@ import net.jini.lookup.JoinManager;
import net.jini.config.ConfigurationException;
import java.io.IOException;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -58,7 +58,7 @@ public class Equality extends AbstractBa
joinMgrCallback = new JoinManager(testService,
serviceAttrs,
callback,
- (DiscoveryListenerManagement) discoveryMgr,
+ (DiscoveryManagement) discoveryMgr,
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrCallback);
@@ -66,7 +66,7 @@ public class Equality extends AbstractBa
joinMgrSrvcID = new JoinManager(testService,
serviceAttrs,
serviceID,
- (DiscoveryListenerManagement) discoveryMgr,
+ (DiscoveryManagement) discoveryMgr,
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
@@ -108,7 +108,7 @@ public class Equality extends AbstractBa
newJM = new JoinManager(testService,
serviceAttrs,
serviceID,
- (DiscoveryListenerManagement) discoveryMgr,
+ (DiscoveryManagement) discoveryMgr,
leaseMgr,
getConfig().getConfiguration());
joinMgrList.add(newJM);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java Sat Sep 11 08:08:53 2010
@@ -27,7 +27,7 @@ import com.sun.jini.test.share.Attribute
import net.jini.lookup.JoinManager;
import net.jini.core.entry.Entry;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -59,7 +59,7 @@ public class GetAttributes extends Abstr
/* Discover & join lookups just started */
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java Sat Sep 11 08:08:53 2010
@@ -27,7 +27,7 @@ import net.jini.lookup.JoinManager;
import net.jini.core.lookup.ServiceRegistrar;
import java.util.ArrayList;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -70,13 +70,13 @@ public class GetJoinSetCallback extends
if(callbackJM) {
jm = new JoinManager(testService,serviceAttrs,
new SrvcIDListener(testService),
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
leaseMgr,
sysConfig.getConfiguration());
nServiceIDEventsExpected = 1;
} else {//create a join manager that sends the generated ID in an event
jm = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
leaseMgr,
sysConfig.getConfiguration());
nServiceIDEventsExpected = 0;
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java Sat Sep 11 08:08:53 2010
@@ -32,7 +32,7 @@ import net.jini.lookup.JoinManager;
import net.jini.core.discovery.LookupLocator;
import java.util.ArrayList;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that when <code>null</code> is input to the
@@ -65,13 +65,13 @@ public class LDMNullPublicGroup extends
super.setup(sysConfig);
logger.log(Level.FINE, "creating a callback join manager ...");
joinMgrCallback = new JoinManager(testService,serviceAttrs,callback,
- (DiscoveryListenerManagement) discoveryMgr,
+ (DiscoveryManagement) discoveryMgr,
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrCallback);
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) discoveryMgr,
+ (DiscoveryManagement) discoveryMgr,
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java Sat Sep 11 08:08:53 2010
@@ -27,7 +27,7 @@ import com.sun.jini.test.share.Attribute
import net.jini.lookup.JoinManager;
import net.jini.core.entry.Entry;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -101,7 +101,7 @@ public class ModifyAttributesServiceCont
}//end loop
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Register.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Register.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Register.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/Register.java Sat Sep 11 08:08:53 2010
@@ -23,7 +23,7 @@ import java.util.logging.Level;
import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.TestException;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
import net.jini.lookup.JoinManager;
/**
@@ -56,7 +56,7 @@ public class Register extends AbstractBa
/* Discover & join lookups just started */
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java Sat Sep 11 08:08:53 2010
@@ -23,7 +23,7 @@ import java.util.logging.Level;
import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.TestException;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
import net.jini.discovery.LookupDiscoveryManager;
import net.jini.lookup.JoinManager;
@@ -62,14 +62,14 @@ public class TerminateDiscovery extends
/* Discover & join lookups just started */
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) null,
+ (DiscoveryManagement) null,
null,sysConfig.getConfiguration());
/* Note: no need to add joinMgrSrvcID to the joinMgrList for
* termination during tearDown because it will be terminated
* in the run method
*/
LookupDiscoveryManager discMgr
- = (LookupDiscoveryManager)(joinMgrSrvcID.discoveryManager());
+ = (LookupDiscoveryManager) joinMgrSrvcID.getDiscoveryManager();
discMgr.setGroups(toGroupsArray(initLookupsToStart));
discMgr.addDiscoveryListener(mainListener);
}//end setup
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java Sat Sep 11 08:08:53 2010
@@ -19,11 +19,8 @@
package com.sun.jini.test.spec.joinmanager;
import java.util.logging.Level;
-
import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.TestException;
-
-import net.jini.discovery.DiscoveryListenerManagement;
import net.jini.discovery.DiscoveryManagement;
import net.jini.lookup.JoinManager;
@@ -55,7 +52,7 @@ public class TerminateLeases extends Abs
/* Discover & join lookups just started */
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ (DiscoveryManagement) getLookupDiscoveryManager(),
null,
sysConfig.getConfiguration());
/* Note: no need to add joinMgrSrvcID to the joinMgrList for
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/AbstractBaseTest.java Sat Sep 11 08:08:53 2010
@@ -66,8 +66,6 @@ import java.util.HashMap;
import java.util.Properties;
import net.jini.config.ConfigurationException;
-import net.jini.discovery.DiscoveryListenerManagement;
-import net.jini.discovery.RegistrarManagement;
/**
* This class is an abstract class that acts as the base class which
@@ -505,7 +503,7 @@ abstract public class AbstractBaseTest e
/* Construct the ServiceDiscoveryManager that will be tested */
logger.log(Level.FINE, "constructing a service discovery manager");
srvcDiscoveryMgr = new ServiceDiscoveryManager
- ( (DiscoveryListenerManagement) getLookupDiscoveryManager(),
+ ( getLookupDiscoveryManager(),
null, //LeaseRenewalManager
sysConfig.getConfiguration());
sdmList.add(srvcDiscoveryMgr);
@@ -575,7 +573,7 @@ abstract public class AbstractBaseTest e
for(int i=0;i<sdmList.size();i++) {
ServiceDiscoveryManager sdmMgr
= (ServiceDiscoveryManager)sdmList.get(i);
- DiscoveryListenerManagement discMgr = sdmMgr.getDiscoveryListenerManager();
+ DiscoveryManagement discMgr = sdmMgr.getDiscoveryManager();
try {
logger.log(Level.FINE,
"tearDown - terminating service discovery manager "+i);
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/DefaultDiscoverPublic.java Sat Sep 11 08:08:53 2010
@@ -26,8 +26,6 @@ import net.jini.discovery.LookupDiscover
import net.jini.lookup.ServiceDiscoveryManager;
import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.TestException;
-import net.jini.discovery.DiscoveryListenerManagement;
-import net.jini.discovery.RegistrarManagement;
import net.jini.lease.LeaseRenewalManager;
/**
@@ -62,7 +60,7 @@ public class DefaultDiscoverPublic exten
testDesc = "service discovery manager with default lookup "
+"discovery manager (should discover public lookups)";
srvcDiscoveryMgr =
- new ServiceDiscoveryManager( (DiscoveryListenerManagement) null,
+ new ServiceDiscoveryManager( (DiscoveryManagement) null,
(LeaseRenewalManager) null,
config.getConfiguration());
sdmList.add(srvcDiscoveryMgr);
@@ -80,7 +78,7 @@ public class DefaultDiscoverPublic exten
* <code>null</code> if the test was successful.
*/
protected void applyTestDef() throws Exception {
- DiscoveryListenerManagement dm = srvcDiscoveryMgr.getDiscoveryListenerManager();
+ DiscoveryManagement dm = srvcDiscoveryMgr.getDiscoveryManager();
if( !(dm instanceof LookupDiscoveryManager) ) {
throw new TestException(" -- default lookup discovery manager is not "
+"an instance of "
Modified: incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java (original)
+++ incubator/river/jtsk/skunk/pepe/qa/src/com/sun/jini/test/spec/servicediscovery/cache/AddListenerNPE.java Sat Sep 11 08:08:53 2010
@@ -33,8 +33,7 @@ import net.jini.lookup.ServiceDiscoveryM
import java.rmi.RemoteException;
import com.sun.jini.qa.harness.QAConfig;
import com.sun.jini.qa.harness.TestException;
-import net.jini.discovery.DiscoveryListenerManagement;
-import net.jini.discovery.RegistrarManagement;
+import net.jini.discovery.DiscoveryManagement;
/**
* This class verifies that the <code>addListener</code> method of
@@ -86,7 +85,7 @@ public class AddListenerNPE extends Abst
null,
sysConfig.getConfiguration());
srvcDiscoveryMgr =
- new ServiceDiscoveryManager((DiscoveryListenerManagement) discoveryMgr,
+ new ServiceDiscoveryManager((DiscoveryManagement) discoveryMgr,
null,
sysConfig.getConfiguration());
sdmList.add(srvcDiscoveryMgr);
Modified: incubator/river/jtsk/skunk/pepe/src/net/jini/core/lookup/StreamServiceRegistrar.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/net/jini/core/lookup/StreamServiceRegistrar.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/net/jini/core/lookup/StreamServiceRegistrar.java (original)
+++ incubator/river/jtsk/skunk/pepe/src/net/jini/core/lookup/StreamServiceRegistrar.java Sat Sep 11 08:08:53 2010
@@ -19,10 +19,6 @@ package net.jini.core.lookup;
import java.io.IOException;
import org.apache.river.api.util.ResultStream;
-import net.jini.core.entry.Entry;
-import net.jini.core.event.EventRegistration;
-import net.jini.core.event.RemoteEventListener;
-import net.jini.io.MarshalledInstance;
/**
* Defines the interface to the lookup service. The interface is not a
@@ -48,41 +44,7 @@ import net.jini.io.MarshalledInstance;
* @author Peter Firmstone
* @since 2.2.0
*/
-public interface StreamServiceRegistrar extends PortableServiceRegistrar{
-
- /**
- * Registers for event notification. The registration is leased; the
- * lease expiration request is not exact. The registration is persistent
- * across restarts (crashes) of the lookup service until the lease expires
- * or is cancelled. The event ID in the returned EventRegistration is
- * unique at least with respect to all other active event registrations
- * in this lookup service with different service templates or transitions.
- * <p>
- * While the event registration is in effect, a ServiceEvent is sent to
- * the specified listener whenever a register, lease cancellation or
- * expiration, or attribute change operation results in an item changing
- * state in a way that satisfies the template and transition combination.
- * <p>
- * The method signature varies slightly from ServiceRegistar in case
- * a class implements both method signatures and a caller used a null
- * MarshalledInstance, the call would be ambiguious.
- *
- * @param tmpl template to match
- * @param transitions bitwise OR of any non-empty set of transition values
- * @param listener listener to send events to
- * @param handback object to include in every ServiceEvent generated
- * @param leaseDuration requested lease duration
- * @return an EventRegistration object to the entity that registered the
- * specified remote listener
- * @throws java.rmi.RemoteException
- * @since 2.2.0
- */
- public EventRegistration notify(
- ServiceTemplate tmpl,
- int transitions,
- RemoteEventListener listener,MarshalledInstance handback,
- long leaseDuration)
- throws IOException;
+public interface StreamServiceRegistrar extends ServiceRegistrar{
/**
* Returns a ResultStream that provides access to MarshalledServiceItem
Modified: incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java (original)
+++ incubator/river/jtsk/skunk/pepe/src/org/apache/river/imp/security/policy/cdc/DynamicPolicyProviderImpl.java Sat Sep 11 08:08:53 2010
@@ -78,8 +78,8 @@ public class DynamicPolicyProviderImpl e
private volatile boolean initialized;
// REMIND: do something with WeakIdentityMap and Concurrency, note
// this means different implementation methods not a drop in.
- private final Map domainPerms;
- private final Map loaderGrants;
+ private final WeakIdentityMap domainPerms;
+ private final WeakIdentityMap loaderGrants;
private final Grants globalGrants;
private static final Logger logger = Logger.getLogger(
"net.jini.security.policy");
Modified: incubator/river/jtsk/skunk/pepe/test/src/net/jini/core/event/RemoteEventTest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/test/src/net/jini/core/event/RemoteEventTest.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/test/src/net/jini/core/event/RemoteEventTest.java (original)
+++ incubator/river/jtsk/skunk/pepe/test/src/net/jini/core/event/RemoteEventTest.java Sat Sep 11 08:08:53 2010
@@ -41,15 +41,15 @@ public class RemoteEventTest {
}
String s = "happy";
Object source = "source";
- MarshalledObject<String> m = null;
+ MarshalledObject m = null;
RemoteEvent e = null;
- MarshalledObject<String> mo = null;
+ MarshalledObject mo = null;
@Before
@SuppressWarnings("deprecation")
public void setUp() {
try {
- m = new MarshalledObject<String>(s);
+ m = new MarshalledObject(s);
} catch (IOException ex) {
Logger.getLogger(RemoteEventTest.class.getName()).log(Level.SEVERE, null, ex);
}
Modified: incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/PackageVersionTest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/PackageVersionTest.java?rev=996093&r1=996092&r2=996093&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/PackageVersionTest.java (original)
+++ incubator/river/jtsk/skunk/pepe/test/src/net/jini/io/PackageVersionTest.java Sat Sep 11 08:08:53 2010
@@ -10,11 +10,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
import static org.junit.Assert.*;
/**