You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pa...@apache.org on 2010/09/16 03:36:11 UTC
svn commit: r997556 [1/2] - in /incubator/river/jtsk/skunk/patsTaskManager:
./ examples/hello/src/com/sun/jini/example/hello/ lib/ qa/ qa/doc/
qa/src/com/sun/jini/test/impl/joinmanager/
qa/src/com/sun/jini/test/impl/norm/ qa/src/com/sun/jini/test/impl/...
Author: pats
Date: Thu Sep 16 01:36:08 2010
New Revision: 997556
URL: http://svn.apache.org/viewvc?rev=997556&view=rev
Log:
Merge in trunk changes since this branch was created.
Removed:
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/io/Convert.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/lookup/ServiceRegistrarFacade.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/lookup/StreamServiceRegistrarFacade.java
incubator/river/jtsk/skunk/patsTaskManager/test/src/net/jini/io/ConvertTest.java
Modified:
incubator/river/jtsk/skunk/patsTaskManager/ (props changed)
incubator/river/jtsk/skunk/patsTaskManager/build.xml
incubator/river/jtsk/skunk/patsTaskManager/examples/hello/src/com/sun/jini/example/hello/Server.java
incubator/river/jtsk/skunk/patsTaskManager/lib/asm-3.2.jar (props changed)
incubator/river/jtsk/skunk/patsTaskManager/lib/asm-commons-3.2.jar (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/ (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/README.txt (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/HowToRunATest.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/HowToWriteATest.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverygroupmanagement-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverygroupmanagement-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverylocatormanagement-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverylocatormanagement-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-test.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-test.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-test.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/index-requirements.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/index-testdescriptions.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/index.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/javaspace_req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/javaspace_test.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/joinmanager-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/joinmanager-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/joinmanager-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/locatordiscovery-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/locatordiscovery-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/locatordiscovery-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/lookupdiscovery-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/lookupdiscovery-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/lookupdiscovery-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/qaMethodWorkArch.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/qaarch.sdw (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalmanager-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalmanager-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-test.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-req.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-req.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-test.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-test.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/testcategories.doc (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/doc/testcategories.html (props changed)
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTest.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTestShutdown.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RemoveExactlyOneTestFailureFails.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RenewalFailureTest.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckConstraints.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckTrustEquivalence.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosConstructorAccessor.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEndpointInUse.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEqualityTest.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosIllegalArgumentException.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosListenContextException.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNewRequestConflictingConstraints.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNullPointerException.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosRobustnessTest.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerConstructorAccessor.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerEndpoint.td
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Register.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java
incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.td
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/DiscoveryV1.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/UnicastResponse.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/internal/Plaintext.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/fiddler/FiddlerImpl.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mahalo/JoinStateManager.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mercury/MailboxImpl.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/norm/lookup/JoinState.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/outrigger/JoinStateManager.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/reggie/RegistrarImpl.java
incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/thread/TaskManager.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/core/discovery/LookupLocator.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/discovery/ConstrainableLookupLocator.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/discovery/DiscoveryEvent.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/discovery/IncomingUnicastResponse.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/discovery/LookupUnmarshalException.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/io/MarshalledInstance.java
incubator/river/jtsk/skunk/patsTaskManager/src/net/jini/lookup/JoinManager.java
Propchange: incubator/river/jtsk/skunk/patsTaskManager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters:765902-766476
+/incubator/river/jtsk/trunk:996933-997555
Modified: incubator/river/jtsk/skunk/patsTaskManager/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/build.xml?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/build.xml (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/build.xml Thu Sep 16 01:36:08 2010
@@ -2072,7 +2072,7 @@
-->
<target name="qa.run" depends="" description="Run QA tests">
<property name="run.categories"
- value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread,renewalmanager,constraint,export,lookupdiscovery,servicediscovery,io,security"/>
+ value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread,renewalmanager,constraint,export,lookupdiscovery,servicediscovery,io,security,lookupservice,renewalservice,eventmailbox,jeri,start,discoveryservice,discoveryproviders"/>
<!-- Call qa subcomponent build -->
<ant dir="qa" target="run-categories" inheritall="false" >
<property name="run.categories" value="${run.categories}" />
Modified: incubator/river/jtsk/skunk/patsTaskManager/examples/hello/src/com/sun/jini/example/hello/Server.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/examples/hello/src/com/sun/jini/example/hello/Server.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/examples/hello/src/com/sun/jini/example/hello/Server.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/examples/hello/src/com/sun/jini/example/hello/Server.java Thu Sep 16 01:36:08 2010
@@ -27,7 +27,7 @@ import net.jini.config.ConfigurationExce
import net.jini.config.ConfigurationProvider;
import net.jini.config.NoSuchEntryException;
import net.jini.core.lookup.ServiceID;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.discovery.DiscoveryManagement;
import net.jini.discovery.LookupDiscovery;
import net.jini.export.Exporter;
import net.jini.export.ProxyAccessor;
@@ -149,11 +149,11 @@ public class Server implements Hello, Se
Proxy smartProxy = Proxy.create(serverProxy);
/* Get the discovery manager, for discovering lookup services */
- DiscoveryListenerManagement discoveryManager;
+ DiscoveryManagement discoveryManager;
try {
- discoveryManager = (DiscoveryListenerManagement) config.getEntry(
+ discoveryManager = (DiscoveryManagement) config.getEntry(
"com.sun.jini.example.hello.Server", "discoveryManager",
- DiscoveryListenerManagement.class);
+ DiscoveryManagement.class);
} catch (NoSuchEntryException e) {
/* Use the public group */
discoveryManager = new LookupDiscovery(
Propchange: incubator/river/jtsk/skunk/patsTaskManager/lib/asm-3.2.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/tools/asm-3.2.jar:765902-766476
+/incubator/river/jtsk/trunk/lib/asm-3.2.jar:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/lib/asm-commons-3.2.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/tools/asm-commons-3.2.jar:765902-766476
+/incubator/river/jtsk/trunk/lib/asm-commons-3.2.jar:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -0,0 +1 @@
+/incubator/river/jtsk/trunk/qa:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/README.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/README.txt:766115-766476
+/incubator/river/jtsk/trunk/qa/README.txt:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/HowToRunATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToRunATest.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/HowToRunATest.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/HowToWriteATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToWriteATest.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/HowToWriteATest.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverygroupmanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverygroupmanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverylocatormanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverylocatormanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverymanagement-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverymanagement-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverymanagement-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoverymanagement-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoverymanagement-test.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoveryservice-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoveryservice-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoveryservice-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/discoveryservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/discoveryservice-test.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/eventmailbox-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/eventmailbox-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/eventmailbox-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/eventmailbox-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/eventmailbox-test.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/index-requirements.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index-requirements.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/index-requirements.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/index-testdescriptions.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index-testdescriptions.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/index-testdescriptions.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/index.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/javaspace_req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/javaspace_req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/javaspace_test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_test.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/javaspace_test.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/joinmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/joinmanager-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/joinmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/joinmanager-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/joinmanager-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/joinmanager-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/locatordiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/locatordiscovery-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/locatordiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/locatordiscovery-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/locatordiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/locatordiscovery-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/lookupdiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/lookupdiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/lookupdiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/qaMethodWorkArch.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/qaMethodWorkArch.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/qaMethodWorkArch.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/qaarch.sdw
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/qaarch.sdw:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/qaarch.sdw:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/renewalmanager-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/renewalmanager-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/renewalservice-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/renewalservice-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/renewalservice-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/renewalservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/renewalservice-test.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/servicediscovery-req.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/servicediscovery-req.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/servicediscovery-test.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/servicediscovery-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/servicediscovery-test.html:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/testcategories.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.doc:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/testcategories.doc:996933-997555
Propchange: incubator/river/jtsk/skunk/patsTaskManager/qa/doc/testcategories.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 16 01:36:08 2010
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.html:766115-766476
+/incubator/river/jtsk/trunk/qa/doc/testcategories.html:996933-997555
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/AddAttributesRace.java Thu Sep 16 01:36:08 2010
@@ -31,7 +31,6 @@ import net.jini.discovery.LookupDiscover
import net.jini.lookup.JoinManager;
import net.jini.core.entry.Entry;
-import net.jini.discovery.DiscoveryListenerManagement;
/** Regression test for bug #4671109.
*
@@ -169,7 +168,7 @@ public class AddAttributesRace extends A
joinMgrSrvcID = new JoinManager(testService,
serviceAttrs,
serviceID,
- (DiscoveryListenerManagement) ldm,
+ ldm,
leaseMgr,
getConfig().getConfiguration());
joinMgrList.add(joinMgrSrvcID);
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateISE.java Thu Sep 16 01:36:08 2010
@@ -24,7 +24,6 @@ import com.sun.jini.test.spec.joinmanage
import net.jini.lookup.JoinManager;
import java.util.logging.Level;
-import net.jini.discovery.DiscoveryListenerManagement;
/** Regression test for bug #4953710 (ISE = IllegalStateException).
*
@@ -63,8 +62,7 @@ public class RaceAttrsVsTerminateISE ext
removeDups( addAttrsDup1DupAll(serviceAttrs,newServiceAttrs) );
/* Discover & join lookups just started */
jm = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
- leaseMgr,
+ getLookupDiscoveryManager(),leaseMgr,
sysConfig.getConfiguration());
}//end setup
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RaceAttrsVsTerminateULE.java Thu Sep 16 01:36:08 2010
@@ -24,7 +24,6 @@ import com.sun.jini.test.spec.joinmanage
import net.jini.lookup.JoinManager;
import java.util.logging.Level;
-import net.jini.discovery.DiscoveryListenerManagement;
/** Regression test for bug #4953710 (ULE = UnknownLeaseException).
*
@@ -63,8 +62,7 @@ public class RaceAttrsVsTerminateULE ext
removeDups( addAttrsDup1DupAll(serviceAttrs,newServiceAttrs) );
/* Discover & join lookups just started */
jm = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
- leaseMgr,
+ getLookupDiscoveryManager(),leaseMgr,
sysConfig.getConfiguration());
}//end setup
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/RegisterStorm.java Thu Sep 16 01:36:08 2010
@@ -34,7 +34,6 @@ import net.jini.core.lookup.ServiceMatch
import java.rmi.RemoteException;
import java.util.ArrayList;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -106,7 +105,7 @@ public class RegisterStorm extends Abstr
JoinManager jm =
new JoinManager(ts,serviceAttrs,
sidListener,
- (DiscoveryListenerManagement) ldm,leaseMgr,
+ ldm,leaseMgr,
getConfig().getConfiguration());
joinMgrList.add(jm);
}//end loop
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/joinmanager/TerminateSemantics.java Thu Sep 16 01:36:08 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,8 +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,
- null,
+ null,null,
sysConfig.getConfiguration());
}//end setup
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTest.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTest.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTest.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTest.td Thu Sep 16 01:36:08 2010
@@ -3,4 +3,4 @@ testCategories=renewalservice,renewalser
com.sun.jini.test.impl.norm.renew_grant=60000
include0=norm.properties
-testLoggingProperties=<file: tests/logging/normFullLogging.properties>
+testLoggingProperties=<file: src/com/sun/jini/test/resources/qa1_debug.logging>
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTestShutdown.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTestShutdown.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTestShutdown.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/AddRenewRemoveTestShutdown.td Thu Sep 16 01:36:08 2010
@@ -7,4 +7,4 @@ testCategories=renewalservice,renewalser
com.sun.jini.test.impl.norm.renew_grant=60000
com.sun.jini.test.impl.norm.tryShutdown=true
include0=norm.properties
-testLoggingProperties=<file: tests/logging/normFullLogging.properties>
+testLoggingProperties=<file: src/com/sun/jini/test/resources/qa1_debug.logging>
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RemoveExactlyOneTestFailureFails.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RemoveExactlyOneTestFailureFails.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RemoveExactlyOneTestFailureFails.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RemoveExactlyOneTestFailureFails.td Thu Sep 16 01:36:08 2010
@@ -12,4 +12,4 @@ testCategories=renewalservice,renewalser
com.sun.jini.test.impl.norm.tryShutdown=true
com.sun.jini.test.impl.norm.failureFails=true
include0=norm.properties
-testLoggingProperties=<file: tests/logging/normFullLogging.properties>
+testLoggingProperties=<file: src/com/sun/jini/test/resources/qa1_debug.logging>
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RenewalFailureTest.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RenewalFailureTest.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RenewalFailureTest.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/norm/RenewalFailureTest.td Thu Sep 16 01:36:08 2010
@@ -10,4 +10,4 @@ com.sun.jini.test.impl.norm.renew_grant=
com.sun.jini.test.impl.norm.renew_count=2
com.sun.jini.test.impl.norm.tryShutdown=true
include0=norm.properties
-testLoggingProperties=<file: tests/logging/normFullLogging.properties>
+testLoggingProperties=<file: src/com/sun/jini/test/resources/qa1_debug.logging>
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/impl/reggie/MultihomedClientTest.td Thu Sep 16 01:36:08 2010
@@ -10,7 +10,8 @@ reggieClasses=${com.sun.jini.jsk.home}/l
reggieConfig=<url:com/sun/jini/test/impl/reggie/resources/reggie.config>
startConfig=<url:com/sun/jini/test/impl/reggie/resources/start.config>
lookupConfig=<url:com/sun/jini/test/impl/reggie/resources/lookupdiscovery.config>
-logging=<file:tests/logging/multihomedClientTestLogging.properties>
+#logging=<file:tests/logging/multihomedClientTestLogging.properties>
+logging=${java.util.logging.config.file}
metaInf=<file: lib/qa1-multihomedmetainf.jar>
timeout=10
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckConstraints.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckConstraints.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckConstraints.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckConstraints.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckTrustEquivalence.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckTrustEquivalence.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckTrustEquivalence.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosCheckTrustEquivalence.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosConstructorAccessor.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosConstructorAccessor.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosConstructorAccessor.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosConstructorAccessor.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEndpointInUse.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEndpointInUse.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEndpointInUse.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEndpointInUse.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEqualityTest.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEqualityTest.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEqualityTest.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosEqualityTest.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosIllegalArgumentException.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosIllegalArgumentException.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosIllegalArgumentException.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosIllegalArgumentException.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosListenContextException.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosListenContextException.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosListenContextException.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosListenContextException.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNewRequestConflictingConstraints.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNewRequestConflictingConstraints.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNewRequestConflictingConstraints.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNewRequestConflictingConstraints.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNullPointerException.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNullPointerException.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNullPointerException.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosNullPointerException.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosRobustnessTest.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosRobustnessTest.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosRobustnessTest.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosRobustnessTest.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerConstructorAccessor.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerConstructorAccessor.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerConstructorAccessor.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerConstructorAccessor.td Thu Sep 16 01:36:08 2010
@@ -17,3 +17,4 @@ jeri.transport.wrappedTest=com.sun.jini.
com.sun.jini.qa.harness.runkitserver=false
com.sun.jini.qa.harness.runjiniserver=false
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerEndpoint.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerEndpoint.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerEndpoint.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/jeri/kerberos/KerberosServerEndpoint.td Thu Sep 16 01:36:08 2010
@@ -15,3 +15,5 @@ testjvmargs=${testjvmargs},\
-DserverKeytabLocation=${com.sun.jini.qa.harness.kerberos.aggregatePasswordFile},\
-Djeri.transport.kerberosServer=${com.sun.jini.qa.harness.kerberos.serverPrincipal},\
-Djeri.transport.kerberosClient=${com.sun.jini.qa.harness.kerberos.clientPrincipal}
+
+com.sun.jini.qa.harness.verifier=com.sun.jini.qa.harness.SkipTestVerifier
\ No newline at end of file
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Equality.java Thu Sep 16 01:36:08 2010
@@ -27,7 +27,6 @@ import net.jini.lookup.JoinManager;
import net.jini.config.ConfigurationException;
import java.io.IOException;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -58,7 +57,7 @@ public class Equality extends AbstractBa
joinMgrCallback = new JoinManager(testService,
serviceAttrs,
callback,
- (DiscoveryListenerManagement) discoveryMgr,
+ discoveryMgr,
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrCallback);
@@ -66,7 +65,7 @@ public class Equality extends AbstractBa
joinMgrSrvcID = new JoinManager(testService,
serviceAttrs,
serviceID,
- (DiscoveryListenerManagement) discoveryMgr,
+ discoveryMgr,
leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
@@ -108,7 +107,7 @@ public class Equality extends AbstractBa
newJM = new JoinManager(testService,
serviceAttrs,
serviceID,
- (DiscoveryListenerManagement) discoveryMgr,
+ discoveryMgr,
leaseMgr,
getConfig().getConfiguration());
joinMgrList.add(newJM);
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetAttributes.java Thu Sep 16 01:36:08 2010
@@ -27,7 +27,6 @@ import com.sun.jini.test.share.Attribute
import net.jini.lookup.JoinManager;
import net.jini.core.entry.Entry;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -59,8 +58,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(),
- leaseMgr,
+ getLookupDiscoveryManager(),leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
}//end setup
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/GetJoinSetCallback.java Thu Sep 16 01:36:08 2010
@@ -27,7 +27,6 @@ import net.jini.lookup.JoinManager;
import net.jini.core.lookup.ServiceRegistrar;
import java.util.ArrayList;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -70,14 +69,12 @@ public class GetJoinSetCallback extends
if(callbackJM) {
jm = new JoinManager(testService,serviceAttrs,
new SrvcIDListener(testService),
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
- leaseMgr,
+ 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(),
- leaseMgr,
+ getLookupDiscoveryManager(),leaseMgr,
sysConfig.getConfiguration());
nServiceIDEventsExpected = 0;
}//endif
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/LDMNullPublicGroup.java Thu Sep 16 01:36:08 2010
@@ -32,7 +32,6 @@ import net.jini.lookup.JoinManager;
import net.jini.core.discovery.LookupLocator;
import java.util.ArrayList;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* This class verifies that when <code>null</code> is input to the
@@ -65,14 +64,12 @@ public class LDMNullPublicGroup extends
super.setup(sysConfig);
logger.log(Level.FINE, "creating a callback join manager ...");
joinMgrCallback = new JoinManager(testService,serviceAttrs,callback,
- (DiscoveryListenerManagement) discoveryMgr,
- leaseMgr,
+ 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,
- leaseMgr,
+ discoveryMgr,leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
}//end setup
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/ModifyAttributesServiceControlled.java Thu Sep 16 01:36:08 2010
@@ -27,7 +27,6 @@ import com.sun.jini.test.share.Attribute
import net.jini.lookup.JoinManager;
import net.jini.core.entry.Entry;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* This class verifies that the <code>JoinManager</code> utility class
@@ -101,8 +100,7 @@ public class ModifyAttributesServiceCont
}//end loop
logger.log(Level.FINE, "creating a service ID join manager ...");
joinMgrSrvcID = new JoinManager(testService,serviceAttrs,serviceID,
- (DiscoveryListenerManagement) getLookupDiscoveryManager(),
- leaseMgr,
+ getLookupDiscoveryManager(),leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
}//end setup
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Register.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Register.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Register.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/Register.java Thu Sep 16 01:36:08 2010
@@ -23,7 +23,6 @@ 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.lookup.JoinManager;
/**
@@ -56,8 +55,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(),
- leaseMgr,
+ getLookupDiscoveryManager(),leaseMgr,
sysConfig.getConfiguration());
joinMgrList.add(joinMgrSrvcID);
}//end setup
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateDiscovery.java Thu Sep 16 01:36:08 2010
@@ -23,7 +23,6 @@ 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.LookupDiscoveryManager;
import net.jini.lookup.JoinManager;
@@ -62,14 +61,13 @@ 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,
- null,sysConfig.getConfiguration());
+ 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/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/joinmanager/TerminateLeases.java Thu Sep 16 01:36:08 2010
@@ -23,7 +23,6 @@ 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,8 +54,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(),
- null,
+ getLookupDiscoveryManager(),null,
sysConfig.getConfiguration());
/* Note: no need to add joinMgrSrvcID to the joinMgrList for
* termination during tearDown because it will be terminated
Modified: incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.td
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.td?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.td (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/qa/src/com/sun/jini/test/spec/renewalservice/NormalEventReturnTest.td Thu Sep 16 01:36:08 2010
@@ -1,4 +1,4 @@
testClass=NormalEventReturnTest
testCategories=renewalservice,renewalservice_spec
include0=renewalservice.properties
-testLoggingProperties=<file: tests/logging/normFullLogging.properties>
+testLoggingProperties=<file: src/com/sun/jini/test/resources/qa1_debug.logging>
Modified: incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/DiscoveryV1.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/DiscoveryV1.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/DiscoveryV1.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/DiscoveryV1.java Thu Sep 16 01:36:08 2010
@@ -21,13 +21,17 @@ package com.sun.jini.discovery;
import com.sun.jini.discovery.internal.Plaintext;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import java.io.UTFDataFormatException;
import java.net.DatagramPacket;
import java.net.Socket;
import java.nio.ByteBuffer;
+import java.rmi.MarshalledObject;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
@@ -39,8 +43,6 @@ import net.jini.core.lookup.ServiceID;
import net.jini.core.lookup.ServiceRegistrar;
import net.jini.discovery.Constants;
import net.jini.io.MarshalledInstance;
-import net.jini.io.MiToMoOutputStream;
-import net.jini.io.MoToMiInputStream;
import net.jini.io.UnsupportedConstraintException;
/**
@@ -387,10 +389,11 @@ class DiscoveryV1 extends Discovery {
String host = socket.getInetAddress().getHostAddress();
int port = socket.getPort();
- // read LUS proxy - Converted from java.rmi.MarshalledObject form.
- ObjectInputStream oin = new MoToMiInputStream(
+ // read LUS proxy
+ ObjectInputStream oin = new ObjectInputStream(
new BufferedInputStream(socket.getInputStream()));
- MarshalledInstance mi = (MarshalledInstance) oin.readObject();
+ MarshalledInstance mi =
+ new MarshalledInstance((MarshalledObject) oin.readObject());
ServiceRegistrar reg =
(ServiceRegistrar) mi.get(defaultLoader, false, null, context);
@@ -432,11 +435,11 @@ class DiscoveryV1 extends Discovery {
// note: unicast request (the protocol version) already consumed
// write LUS proxy
- ObjectOutputStream oout = new MiToMoOutputStream(
+ ObjectOutputStream oout = new ObjectOutputStream(
new BufferedOutputStream(socket.getOutputStream()));
oout.writeObject(
new MarshalledInstance(
- response.getPRegistrar(), context));
+ response.getRegistrar(), context).convertToMarshalledObject());
// write LUS member groups
String[] groups = response.getGroups();
Modified: incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/UnicastResponse.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/UnicastResponse.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/UnicastResponse.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/UnicastResponse.java Thu Sep 16 01:36:08 2010
@@ -19,9 +19,7 @@
package com.sun.jini.discovery;
import java.util.Arrays;
-import net.jini.core.lookup.PortableServiceRegistrar;
import net.jini.core.lookup.ServiceRegistrar;
-import net.jini.lookup.ServiceRegistrarFacade;
/**
* Class representing the values obtained as the result of unicast discovery.
@@ -38,16 +36,12 @@ public class UnicastResponse {
/** The lookup service member groups. */
protected String[] groups;
/** The lookup service proxy. */
- protected PortableServiceRegistrar registrar;
-
+ protected ServiceRegistrar registrar;
+
/**
* Creates new <code>UnicastResponse</code> instance containing the given
* values. The <code>groups</code> array is copied; a <code>null</code>
* value is considered equivalent to an empty array.
- *
- * This constructor has been changed in 2.2.0 to break binary compatibility
- * with 2.2.1 however it is still compile time compatible. I figured
- * that client code will utilise this class, but be unlikely to construct it.
*
* @param host the lookup service host
* @param port the lookup service listen port
@@ -61,9 +55,9 @@ public class UnicastResponse {
public UnicastResponse(String host,
int port,
String[] groups,
- PortableServiceRegistrar registrar)
+ ServiceRegistrar registrar)
{
- groups = (groups != null) ? groups.clone() : new String[0];
+ groups = (groups != null) ? (String[]) groups.clone() : new String[0];
if (host == null ||
registrar == null ||
Arrays.asList(groups).contains(null))
@@ -108,28 +102,13 @@ public class UnicastResponse {
/**
* Returns the lookup service proxy.
- *
- * @return the lookup service proxy
- * @since 2.2.0
- */
- public PortableServiceRegistrar getPRegistrar() {
- return registrar;
- }
-
- /**
- * Returns the lookup service proxy.
- *
+ *
* @return the lookup service proxy
- * @deprecated replaced by {@link #getPRegistrar()}
*/
- @Deprecated
public ServiceRegistrar getRegistrar() {
- if(registrar instanceof ServiceRegistrar ){
- return (ServiceRegistrar)registrar;
- }
- return new ServiceRegistrarFacade(registrar);
+ return registrar;
}
-
+
/**
* Returns a string representation of this response.
*
Modified: incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/internal/Plaintext.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/internal/Plaintext.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/internal/Plaintext.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/discovery/internal/Plaintext.java Thu Sep 16 01:36:08 2010
@@ -424,7 +424,7 @@ public class Plaintext {
// write LUS proxy
new ObjectOutputStream(out).writeObject(
- new MarshalledInstance(response.getPRegistrar(), context));
+ new MarshalledInstance(response.getRegistrar(), context));
} catch (RuntimeException e) {
throw new DiscoveryProtocolException(null, e);
}
Modified: incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/fiddler/FiddlerImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/fiddler/FiddlerImpl.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/fiddler/FiddlerImpl.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/fiddler/FiddlerImpl.java Thu Sep 16 01:36:08 2010
@@ -59,6 +59,7 @@ import net.jini.discovery.DiscoveryEvent
import net.jini.discovery.DiscoveryChangeListener;
import net.jini.discovery.DiscoveryGroupManagement;
import net.jini.discovery.DiscoveryLocatorManagement;
+import net.jini.discovery.DiscoveryManagement;
import net.jini.discovery.LookupDiscoveryManager;
import net.jini.discovery.LookupDiscoveryRegistration;
import net.jini.discovery.RemoteDiscoveryEvent;
@@ -139,7 +140,6 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.logging.Level;
import java.util.logging.Logger;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* This class is the server side of an implementation of the lookup
@@ -278,7 +278,7 @@ class FiddlerImpl implements ServerProxy
/** Earliest expiration time over all active registrations */
private long minExpiration = Long.MAX_VALUE;
/** The lookup discovery manager this service's join manager will use */
- private DiscoveryListenerManagement joinMgrLDM;
+ private DiscoveryManagement joinMgrLDM;
/** Manager for discovering and registering with lookup services */
private JoinManager joinMgr;
/** Task manager for sending remote discovery events */
@@ -5290,11 +5290,11 @@ class FiddlerImpl implements ServerProxy
/* Get the discovery manager to pass to this service's join manager. */
try {
joinMgrLDM =
- (DiscoveryListenerManagement)Config.getNonNullEntry
+ (DiscoveryManagement)Config.getNonNullEntry
(config,
COMPONENT_NAME,
"discoveryManager",
- DiscoveryListenerManagement.class);
+ DiscoveryManagement.class);
if( joinMgrLDM instanceof DiscoveryGroupManagement ) {
String[] groups0 =
((DiscoveryGroupManagement)joinMgrLDM).getGroups();
Modified: incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mahalo/JoinStateManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mahalo/JoinStateManager.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mahalo/JoinStateManager.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mahalo/JoinStateManager.java Thu Sep 16 01:36:08 2010
@@ -36,11 +36,13 @@ import net.jini.config.ConfigurationExce
import net.jini.core.discovery.LookupLocator;
import net.jini.core.entry.Entry;
import net.jini.core.lookup.ServiceID;
+import net.jini.discovery.DiscoveryManagement;
import net.jini.discovery.DiscoveryLocatorManagement;
import net.jini.discovery.DiscoveryGroupManagement;
import net.jini.discovery.LookupDiscoveryManager;
import net.jini.id.Uuid;
import net.jini.lookup.JoinManager;
+import net.jini.lookup.ServiceIDListener;
import net.jini.security.ProxyPreparer;
@@ -48,7 +50,7 @@ import com.sun.jini.config.Config;
import com.sun.jini.logging.Levels;
import com.sun.jini.reliableLog.LogHandler;
import com.sun.jini.reliableLog.ReliableLog;
-import net.jini.discovery.DiscoveryListenerManagement;
+import net.jini.io.MiToMoOutputStream;
/**
* <code>JoinStateManager</code> provides a utility that manages
@@ -78,7 +80,7 @@ class JoinStateManager extends LogHandle
* Object used to find lookups. Has to implement DiscoveryManagement
* and DiscoveryLocatorManagement as well as DiscoveryGroupManagement.
*/
- private DiscoveryListenerManagement dm;
+ private DiscoveryManagement dm;
/**
* <code>JoinManager</code> that is handling the details of binding
@@ -180,9 +182,9 @@ class JoinStateManager extends LogHandle
lookupLocatorPreparer);
}
//TODO - defer creation of default LDM
- dm = (DiscoveryListenerManagement)
+ dm = (DiscoveryManagement)
Config.getNonNullEntry(config, TxnManager.MAHALO,
- "discoveryManager", DiscoveryListenerManagement.class,
+ "discoveryManager", DiscoveryManagement.class,
new LookupDiscoveryManager(
DiscoveryGroupManagement.NO_GROUPS, null, null, config));
if(initlogger.isLoggable(Level.CONFIG)) {
@@ -321,7 +323,7 @@ class JoinStateManager extends LogHandle
initlogger.log(Level.FINEST, "Creating JoinManager");
}
mgr = new JoinManager(service, attributes, serviceID,
- (DiscoveryListenerManagement) dm, null, config);
+ dm, null, config);
// Once we are running we don't need the attributes,
// locators, and groups fields, null them out (the
// state is in the mgr and dm.
Modified: incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mercury/MailboxImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mercury/MailboxImpl.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mercury/MailboxImpl.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/mercury/MailboxImpl.java Thu Sep 16 01:36:08 2010
@@ -130,7 +130,6 @@ import net.jini.core.lease.LeaseDeniedEx
import net.jini.core.lease.UnknownLeaseException;
import net.jini.core.lookup.ServiceID;
import net.jini.discovery.DiscoveryGroupManagement;
-import net.jini.discovery.DiscoveryListenerManagement;
import net.jini.discovery.DiscoveryLocatorManagement;
import net.jini.discovery.DiscoveryManagement;
import net.jini.discovery.LookupDiscoveryManager;
@@ -394,7 +393,7 @@ class MailboxImpl implements MailboxBack
* This can always be obtained from the JoinManager, so
* this is just used as a shortcut.
*/
- private DiscoveryListenerManagement lookupDiscMgr = null;
+ private DiscoveryManagement lookupDiscMgr = null;
/** The attributes to use when joining lookup services */
private Entry[] baseLookupAttrs = new Entry[] {
Modified: incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/norm/lookup/JoinState.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/norm/lookup/JoinState.java?rev=997556&r1=997555&r2=997556&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/norm/lookup/JoinState.java (original)
+++ incubator/river/jtsk/skunk/patsTaskManager/src/com/sun/jini/norm/lookup/JoinState.java Thu Sep 16 01:36:08 2010
@@ -38,6 +38,7 @@ import net.jini.core.entry.Entry;
import net.jini.core.lookup.ServiceID;
import net.jini.discovery.DiscoveryGroupManagement;
import net.jini.discovery.DiscoveryLocatorManagement;
+import net.jini.discovery.DiscoveryManagement;
import net.jini.discovery.LookupDiscoveryManager;
import net.jini.lease.LeaseRenewalManager;
import net.jini.lookup.JoinManager;
@@ -47,7 +48,6 @@ import com.sun.jini.config.Config;
import com.sun.jini.logging.Levels;
import com.sun.jini.reliableLog.LogHandler;
import com.sun.jini.reliableLog.ReliableLog;
-import net.jini.discovery.DiscoveryListenerManagement;
/**
* Utility class that combines <code>JoinManager</code> with persistence.
@@ -120,7 +120,7 @@ public class JoinState extends LogHandle
* must also implement <code>DiscoveryGroupManagement</code> and
* <code>DiscoveryLocatorManagement</code>.
*/
- private DiscoveryListenerManagement dm;
+ private DiscoveryManagement dm;
/** Our join manager */
private JoinManager joinMgr;
@@ -302,8 +302,8 @@ public class JoinState extends LogHandle
throws ConfigurationException, IOException
{
try {
- dm = (DiscoveryListenerManagement) Config.getNonNullEntry(
- config, NORM, "discoveryManager", DiscoveryListenerManagement.class);
+ dm = (DiscoveryManagement) Config.getNonNullEntry(
+ config, NORM, "discoveryManager", DiscoveryManagement.class);
if (!(dm instanceof DiscoveryGroupManagement)) {
throw new ConfigurationException(
"Entry for component " + NORM +