You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by jc...@apache.org on 2010/09/15 12:15:48 UTC
svn commit: r997255 - in /incubator/river/jtsk/trunk: build.xml
src/com/sun/jini/outrigger/JoinStateManager.java
Author: jcosters
Date: Wed Sep 15 10:15:47 2010
New Revision: 997255
URL: http://svn.apache.org/viewvc?rev=997255&view=rev
Log:
backed out changes to JoinStateManager that broke 2 eventmailbox QA tests. All eventmailbox tests now pass.
RIVER-301: add "eventmailbox" category to list of QA test categories to run by Hudson
Modified:
incubator/river/jtsk/trunk/build.xml
incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java
Modified: incubator/river/jtsk/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/build.xml?rev=997255&r1=997254&r2=997255&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/build.xml (original)
+++ incubator/river/jtsk/trunk/build.xml Wed Sep 15 10:15:47 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,lookupservice,renewalservice"/>
+ value="id,loader,policyprovider,locatordiscovery,activation,config,discoverymanager,joinmanager,url,iiop,jrmp,reliability,thread,renewalmanager,constraint,export,lookupdiscovery,servicediscovery,io,security,lookupservice,renewalservice,eventmailbox"/>
<!-- Call qa subcomponent build -->
<ant dir="qa" target="run-categories" inheritall="false" >
<property name="run.categories" value="${run.categories}" />
Modified: incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java?rev=997255&r1=997254&r2=997255&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java (original)
+++ incubator/river/jtsk/trunk/src/com/sun/jini/outrigger/JoinStateManager.java Wed Sep 15 10:15:47 2010
@@ -29,6 +29,7 @@ import java.util.logging.Logger;
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;
@@ -40,8 +41,6 @@ import net.jini.security.ProxyPreparer;
import com.sun.jini.config.Config;
import com.sun.jini.logging.Levels;
-import net.jini.discovery.DiscoveryListenerManagement;
-import net.jini.discovery.RegistrarManagement;
/**
* <code>JoinStateManager</code> provides a utility that manages
@@ -166,20 +165,8 @@ class JoinStateManager implements Storab
new LookupDiscoveryManager(
DiscoveryGroupManagement.NO_GROUPS, null, null,
config));
-
- if (!(dgm instanceof DiscoveryListenerManagement))
- throw throwNewConfigurationException("Entry for component " +
- OutriggerServerImpl.COMPONENT_NAME + ", name " +
- "discoveryManager must implement " +
- "net.jini.discovery.DiscoveryListenerManagement");
-
- if (!(dgm instanceof RegistrarManagement))
- throw throwNewConfigurationException("Entry for component " +
- OutriggerServerImpl.COMPONENT_NAME + ", name " +
- "discoveryManager must implement " +
- "net.jini.discovery.RegistrarManagement");
-
- if (!(dgm instanceof DiscoveryGroupManagement))
+
+ if (!(dgm instanceof DiscoveryManagement))
throw throwNewConfigurationException("Entry for component " +
OutriggerServerImpl.COMPONENT_NAME + ", name " +
"discoveryManager must implement " +
@@ -316,7 +303,7 @@ class JoinStateManager implements Storab
((DiscoveryLocatorManagement)dgm).setLocators(locators);
mgr = new JoinManager(service, attributes, serviceID,
- (DiscoveryListenerManagement)dgm, null, config);
+ (DiscoveryManagement)dgm, null, config);
// Once we are running we don't need the attributes,
// locators, and groups fields, null them out (the
@@ -341,7 +328,7 @@ class JoinStateManager implements Storab
mgr.terminate();
if (dgm != null)
- ((RegistrarManagement)dgm).terminate();
+ ((DiscoveryManagement)dgm).terminate();
}
/* Basically we are implementing JoinAdmin, for get methods we just