[jboss-svn-commits] JBL Code SVN: r35936 - in labs/jbossrules/trunk/drools-grid/drools-grid-impl/src: main/java/org/drools/grid/conf/impl and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Nov 10 09:30:21 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-11-10 09:30:18 -0500 (Wed, 10 Nov 2010)
New Revision: 35936
Added:
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesLookup.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesLookupConfiguration.java
Removed:
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesWhitePages.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesConfiguration.java
Modified:
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/conf/impl/GridNodeSocketConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/impl/GridImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesRemoteConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServer.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/NodeTests.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RegisterServicesTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/WhitePagesTest.java
Log:
JBRULES-2746 Drools Grid Impl2
-more cleaning up and making tests pass
Copied: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesLookup.java (from rev 35927, labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesWhitePages.java)
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesLookup.java (rev 0)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesLookup.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -0,0 +1,10 @@
+package org.drools.grid;
+
+import java.util.Map;
+
+public interface CoreServicesLookup {
+ public GridServiceDescription lookup(Class cls);
+
+ public Map<String, GridServiceDescription> getServices();
+}
+
Deleted: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesWhitePages.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesWhitePages.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/CoreServicesWhitePages.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -1,9 +0,0 @@
-package org.drools.grid;
-
-import java.util.Map;
-
-public interface CoreServicesWhitePages {
- public GridServiceDescription lookup(Class cls);
-
- public Map<String, GridServiceDescription> getServices();
-}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/conf/impl/GridNodeSocketConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/conf/impl/GridNodeSocketConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/conf/impl/GridNodeSocketConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -5,7 +5,7 @@
import org.drools.grid.conf.GridPeerServiceConfiguration;
import org.drools.grid.service.directory.impl.*;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridNode;
@@ -29,7 +29,7 @@
GridNode gnode = grid.get( GridNode.class );
if ( port != -1 ) {
- CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( GridNode.class );
if ( gsd == null ) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/impl/GridImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/impl/GridImpl.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/impl/GridImpl.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -16,38 +16,59 @@
import org.drools.grid.GridNodeConnection;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.SocketService;
+import org.drools.grid.conf.GridPeerServiceConfiguration;
import org.drools.grid.local.LocalGridNodeConnection;
import org.drools.grid.remote.RemoteGridNodeConnection;
import org.drools.grid.service.directory.Address;
import org.drools.grid.service.directory.WhitePages;
import org.drools.grid.service.directory.impl.GridServiceDescriptionImpl;
+import org.drools.grid.service.directory.impl.WhitePagesRemoteConfiguration;
public class GridImpl
implements
Grid {
private Map<String, Object> services;
- private Map<String, Object> localServices;
private Map<String, GridNode> localNodes = new HashMap<String, GridNode>();
+ private Map<String, GridPeerServiceConfiguration> serviceConfigurators = new HashMap();
+
private String id;
+ public GridImpl() {
+ this(null);
+ }
+
public GridImpl(Map<String, Object> services) {
- this.services = services;
- this.localServices = new ConcurrentHashMap<String, Object>();
+ if ( services == null ) {
+ this.services = new ConcurrentHashMap<String, Object>();
+ } else {
+ this.services = services;
+ }
+
this.id = UUID.randomUUID().toString();
init();
}
private void init() {
ConnectionFactoryService conn = new ConnectionFactoryServiceImpl(this);
- this.localServices.put( ConnectionFactoryService.class.getName(), conn );
+ this.services.put( ConnectionFactoryService.class.getName(), conn );
+
+ this.serviceConfigurators.put( WhitePages.class.getName(), new WhitePagesRemoteConfiguration( null ) );
}
+ public Object getX(String str) {
+ return this.services.get( str );
+ }
+
public <T> T get(Class<T> serviceClass) {
- T service = (T) this.localServices.get( serviceClass.getName() );
+ T service = (T) this.services.get( serviceClass.getName() );
+
if ( service == null ) {
- service = (T) services.get( serviceClass.getName() );
+ // If the service does not exist, it'll lazily create it
+ GridPeerServiceConfiguration configurator = this.serviceConfigurators.get( serviceClass.getName() );
+ configurator.configureService( this );
+ service = (T) this.services.get( serviceClass.getName() );
}
return service;
}
@@ -60,7 +81,7 @@
public void addService(String id,
Object service) {
- this.localServices.put( id,
+ this.services.put( id,
service );
}
@@ -185,4 +206,5 @@
// return conn;
// }
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -79,8 +79,8 @@
new NewKnowledgeBaseCommand( null ) ) } ) );
sendMessage( this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
- this.gsd.getServiceInterface().getName(),
+ (InetSocketAddress) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getId(),
cmd );
return new KnowledgeBaseRemoteClient( localId,
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -78,8 +78,8 @@
kresultsId ) } ) );
sendMessage( this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
- this.gsd.getServiceInterface().getName(),
+ (InetSocketAddress) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getId(),
cmd );
}
@@ -153,8 +153,8 @@
kresultsId ) ) } ) );
sendMessage( this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
- this.gsd.getServiceInterface().getName(),
+ (InetSocketAddress) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getId(),
cmd );
return new StatefulKnowledgeSessionRemoteClient( localId,
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -92,8 +92,8 @@
kresultsId ) } ) );
Object result = sendMessage( this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
- this.gsd.getServiceInterface().getName(),
+ (InetSocketAddress) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getId(),
cmd );
return (Integer) result;
@@ -288,8 +288,8 @@
kresultsId ) } ) );
Object result = sendMessage( this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
- this.gsd.getServiceInterface().getName(),
+ (InetSocketAddress) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getId(),
cmd );
return (FactHandle) result;
Copied: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesLookupConfiguration.java (from rev 35927, labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesConfiguration.java)
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesLookupConfiguration.java (rev 0)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesLookupConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -0,0 +1,27 @@
+/**
+ *
+ */
+package org.drools.grid.service.directory.impl;
+
+import java.util.Map;
+
+import org.drools.grid.CoreServicesLookup;
+import org.drools.grid.Grid;
+import org.drools.grid.GridServiceDescription;
+import org.drools.grid.conf.GridPeerServiceConfiguration;
+import org.drools.grid.impl.GridImpl;
+
+public class CoreServicesLookupConfiguration
+ implements
+ GridPeerServiceConfiguration {
+ private Map<String, GridServiceDescription> services;
+
+ public CoreServicesLookupConfiguration(Map<String, GridServiceDescription> services) {
+ this.services = services;
+ }
+
+ public void configureService(Grid grid) {
+ ((GridImpl) grid).addService( CoreServicesLookup.class,
+ new CoreServicesWhitePagesImpl( this.services ) );
+ }
+}
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -1,27 +0,0 @@
-/**
- *
- */
-package org.drools.grid.service.directory.impl;
-
-import java.util.Map;
-
-import org.drools.grid.CoreServicesWhitePages;
-import org.drools.grid.Grid;
-import org.drools.grid.GridServiceDescription;
-import org.drools.grid.conf.GridPeerServiceConfiguration;
-import org.drools.grid.impl.GridImpl;
-
-public class CoreServicesWhitePagesConfiguration
- implements
- GridPeerServiceConfiguration {
- private Map<String, GridServiceDescription> services;
-
- public CoreServicesWhitePagesConfiguration(Map<String, GridServiceDescription> services) {
- this.services = services;
- }
-
- public void configureService(Grid grid) {
- ((GridImpl) grid).addService( CoreServicesWhitePages.class,
- new CoreServicesWhitePagesImpl( this.services ) );
- }
-}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -2,12 +2,12 @@
import java.util.Map;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.GridServiceDescription;
public class CoreServicesWhitePagesImpl
implements
- CoreServicesWhitePages {
+ CoreServicesLookup {
private Map<String, GridServiceDescription> services;
public CoreServicesWhitePagesImpl(Map<String, GridServiceDescription> services) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -6,6 +6,7 @@
import java.util.Arrays;
import java.util.List;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.MessageReceiverHandlerFactoryService;
@@ -21,15 +22,19 @@
implements
WhitePages,
MessageReceiverHandlerFactoryService {
- private GridServiceDescription whitePagesGsd;
+ private Grid grid;
private ConversationManager conversationManager;
- public WhitePagesClient(GridServiceDescription gsd,
+ public WhitePagesClient(Grid grid,
ConversationManager conversationManager) {
- this.whitePagesGsd = gsd;
+ this.grid = grid;
this.conversationManager = conversationManager;
}
+
+ public GridServiceDescription<WhitePages> getGsd() {
+ return this.grid.get( CoreServicesLookup.class ).lookup( WhitePages.class );
+ }
public static Object sendMessage(ConversationManager conversationManager,
Serializable addr,
@@ -72,38 +77,42 @@
}
public GridServiceDescription create(String serviceDescriptionId) {
- InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) whitePagesGsd.getAddresses().get( "socket" )).getObject();
+ GridServiceDescription<WhitePages> wpGsd = getGsd();
+ InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) wpGsd.getAddresses().get( "socket" )).getObject();
CommandImpl cmd = new CommandImpl( "WhitePages.create",
Arrays.asList( new Object[]{ serviceDescriptionId } ) );
GridServiceDescription gsd = (GridServiceDescription) sendMessage( this.conversationManager,
sockets,
- this.whitePagesGsd.getId(),
+ wpGsd.getId(),
cmd );
return new GridServiceDescriptionClient( gsd,
- this.whitePagesGsd,
+ wpGsd,
this.conversationManager );
}
public GridServiceDescription lookup(String serviceDescriptionId) {
- InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) whitePagesGsd.getAddresses().get( "socket" )).getObject();
+ GridServiceDescription<WhitePages> wpGsd = getGsd();
+ InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) wpGsd.getAddresses().get( "socket" )).getObject();
CommandImpl cmd = new CommandImpl( "WhitePages.lookup",
Arrays.asList( new Object[]{ serviceDescriptionId } ) );
GridServiceDescription gsd = (GridServiceDescription) sendMessage( this.conversationManager,
sockets,
- this.whitePagesGsd.getId(),
+ wpGsd.getId(),
cmd );
return (gsd == null) ? gsd : new GridServiceDescriptionClient( gsd,
- this.whitePagesGsd,
+ wpGsd,
this.conversationManager );
}
public void remove(String serviceDescriptionId) {
- InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) whitePagesGsd.getAddresses().get( "socket" )).getObject();
+ GridServiceDescription<WhitePages> wpGsd = getGsd();
+
+ InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) wpGsd.getAddresses().get( "socket" )).getObject();
CommandImpl cmd = new CommandImpl( "WhitePages.remove",
Arrays.asList( new Object[]{ serviceDescriptionId } ) );
sendMessage( this.conversationManager,
sockets,
- this.whitePagesGsd.getId(),
+ wpGsd.getId(),
cmd );
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -4,7 +4,7 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.MessageReceiverHandlerFactoryService;
@@ -44,7 +44,7 @@
}
public static void doRegisterSocketService(Grid grid, String id, String ip, int port) {
- CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( WhitePages.class );
if ( gsd == null ) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesRemoteConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesRemoteConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesRemoteConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -3,7 +3,7 @@
*/
package org.drools.grid.service.directory.impl;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.conf.GridPeerServiceConfiguration;
import org.drools.grid.impl.GridImpl;
@@ -20,11 +20,11 @@
}
public void configureService(Grid grid) {
- CoreServicesWhitePagesImpl coreServices = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServices = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServices.lookup( WhitePages.class );
- WhitePages wp = new WhitePagesClient( gsd,
+ WhitePages wp = new WhitePagesClient( grid,
cm );
((GridImpl) grid).addService( WhitePages.class,
wp );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServer.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServer.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServer.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -6,7 +6,7 @@
import java.util.Map;
import org.apache.commons.collections.map.HashedMap;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.io.Conversation;
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -6,7 +6,7 @@
import java.io.Serializable;
import java.net.InetSocketAddress;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.MessageReceiverHandlerFactoryService;
@@ -32,7 +32,7 @@
WhitePages wp = grid.get( WhitePages.class );
if ( port != -1 ) {
- CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( WhitePages.class );
if ( gsd == null ) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -3,7 +3,7 @@
*/
package org.drools.grid.timer.impl;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.conf.GridPeerServiceConfiguration;
import org.drools.grid.impl.GridImpl;
@@ -19,7 +19,7 @@
}
public void configureService(Grid grid) {
- CoreServicesWhitePages wp = grid.get( CoreServicesWhitePages.class );
+ CoreServicesLookup wp = grid.get( CoreServicesLookup.class );
((GridImpl) grid).addService( CoreServicesScheduler.class,
new CoreServicesSchedulerImpl( new SchedulerImpl( "scheduler:core" ) ) );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -19,7 +19,7 @@
import org.drools.grid.conf.GridPeerServiceConfiguration;
import org.drools.grid.service.directory.impl.*;
import java.net.InetSocketAddress;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.SocketService;
@@ -38,7 +38,7 @@
}
public void configureService(Grid grid) {
- CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( SchedulerService.class );
if ( gsd == null ) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -19,7 +19,7 @@
import java.net.InetSocketAddress;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.MessageReceiverHandlerFactoryService;
@@ -76,7 +76,7 @@
String id,
String ip,
int port) {
- CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( SchedulerService.class );
if ( gsd == null ) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -3,7 +3,7 @@
*/
package org.drools.grid.timer.impl;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.service.directory.impl.*;
import org.drools.grid.Grid;
import org.drools.grid.conf.GridPeerServiceConfiguration;
@@ -22,7 +22,7 @@
}
public void configureService(Grid grid) {
- CoreServicesWhitePagesImpl coreServices = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServices = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServices.lookup( SchedulerService.class );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -6,7 +6,7 @@
import org.drools.grid.conf.GridPeerServiceConfiguration;
import org.drools.grid.service.directory.impl.*;
import java.net.InetSocketAddress;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
@@ -32,7 +32,7 @@
SchedulerService sched = grid.get( SchedulerService.class );
if ( port != -1 ) {
- CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
+ CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesLookup.class );
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( SchedulerService.class );
if ( gsd == null ) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/NodeTests.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/NodeTests.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/NodeTests.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -42,7 +42,7 @@
import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
import org.drools.grid.service.directory.Address;
import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.CoreServicesWhitePagesConfiguration;
+import org.drools.grid.service.directory.impl.CoreServicesLookupConfiguration;
import org.drools.grid.service.directory.impl.GridServiceDescriptionImpl;
import org.drools.grid.service.directory.impl.WhitePagesLocalConfiguration;
import org.drools.grid.service.directory.impl.WhitePagesSocketConfiguration;
@@ -167,7 +167,7 @@
System.out.println( "Error: " + error.getMessage() );
}
- return;
+ fail("KnowledgeBase did not build");
}
KnowledgeBase kbase = remoteN1.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase();
@@ -180,14 +180,6 @@
Assert.assertNotNull( session );
- WhitePages wp = grid2.get( WhitePages.class );
-
- GridServiceDescription gsd = wp.lookup( "mynode" );
-
- remoteN1 = grid2.getGridNode( gsd.getId() );
-
- Assert.assertNotNull( remoteN1 );
-
FactHandle handle = session.insert( new MyObject() );
Assert.assertNotNull( handle );
@@ -205,7 +197,7 @@
GridPeerConfiguration conf = new GridPeerConfiguration();
//Configuring the Core Services White Pages
- GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesLookupConfiguration( coreServicesMap );
conf.addConfiguration( coreSeviceWPConf );
//Configuring the Core Services Scheduler
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -34,7 +34,7 @@
import org.drools.time.Trigger;
import junit.framework.TestCase;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.Grid;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.SocketService;
@@ -42,7 +42,7 @@
import org.drools.grid.impl.MultiplexSocketServerImpl;
import org.drools.grid.io.impl.MultiplexSocketServiceCongifuration;
import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
-import org.drools.grid.service.directory.impl.CoreServicesWhitePagesConfiguration;
+import org.drools.grid.service.directory.impl.CoreServicesLookupConfiguration;
import org.drools.grid.service.directory.impl.WhitePagesLocalConfiguration;
import org.drools.grid.service.directory.impl.WhitePagesRemoteConfiguration;
import org.drools.grid.service.directory.impl.WhitePagesSocketConfiguration;
@@ -164,7 +164,7 @@
// */
// public void testDistributedJobSchedulingRemote() {
// //Core services Map Definition
-// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
//
// //Grid View
// GridImpl grid1 = new GridImpl( new ConcurrentHashMap<String, Object>() );
@@ -218,7 +218,7 @@
//
// public void testMultipleSchedulersTest() {
// //Core services Map Definition
-// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
//
// //Grid View
// GridImpl grid1 = new GridImpl( new ConcurrentHashMap<String, Object>() );
@@ -234,7 +234,7 @@
// configureGrid3( grid3,
// conn );
//
-// CoreServicesWhitePages corewp = grid3.get( CoreServicesWhitePages.class );
+// CoreServicesLookup corewp = grid3.get( CoreServicesLookup.class );
//
// GridServiceDescription gsd = corewp.lookup( SchedulerService.class );
//
@@ -255,7 +255,7 @@
//
// public void testGetDataFromCoreServices() {
//
-// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
//
// //Grid View
// GridImpl grid1 = new GridImpl( new ConcurrentHashMap<String, Object>() );
@@ -266,7 +266,7 @@
// configureGrid1( grid2,
// 5013 );
//
-// CoreServicesWhitePages corewp = grid1.get( CoreServicesWhitePages.class );
+// CoreServicesLookup corewp = grid1.get( CoreServicesLookup.class );
//
// //Get Scheduler Service
// GridServiceDescription gsd = corewp.lookup( SchedulerService.class );
@@ -452,7 +452,7 @@
// GridPeerConfiguration conf = new GridPeerConfiguration();
//
// //Configuring the Core Services White Pages
-// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesLookupConfiguration( coreServicesMap );
// conf.addConfiguration( coreSeviceWPConf );
//
// //Configuring the Core Services Scheduler
@@ -495,7 +495,7 @@
// Connector conn) {
// GridPeerConfiguration conf = new GridPeerConfiguration();
//
-// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesLookupConfiguration( coreServicesMap );
// conf.addConfiguration( coreSeviceWPConf );
//
// ConversationManager cm = new ConversationManagerImpl( "s1",
@@ -515,7 +515,7 @@
// Connector conn) {
// GridPeerConfiguration conf = new GridPeerConfiguration();
//
-// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesLookupConfiguration( coreServicesMap );
// conf.addConfiguration( coreSeviceWPConf );
//
// ConversationManager cm = new ConversationManagerImpl( "s1",
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RegisterServicesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RegisterServicesTest.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RegisterServicesTest.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -21,7 +21,7 @@
import java.util.Map;
import org.drools.SystemEventListener;
import org.drools.SystemEventListenerFactory;
-import org.drools.grid.CoreServicesWhitePages;
+import org.drools.grid.CoreServicesLookup;
import org.drools.grid.GridServiceDescription;
import org.drools.grid.SocketService;
import org.drools.grid.conf.GridPeerServiceConfiguration;
@@ -35,7 +35,7 @@
import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
import org.drools.grid.remote.mina.MinaConnector;
import org.drools.grid.service.directory.WhitePages;
-import org.drools.grid.service.directory.impl.CoreServicesWhitePagesConfiguration;
+import org.drools.grid.service.directory.impl.CoreServicesLookupConfiguration;
import org.drools.grid.service.directory.impl.WhitePagesClient;
import org.drools.grid.service.directory.impl.WhitePagesLocalConfiguration;
import org.drools.grid.service.directory.impl.WhitePagesSocketConfiguration;
@@ -90,7 +90,7 @@
// @Test
// public void testRegisterInCoreServices() {
//
-// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+// coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
//
// GridImpl grid = new GridImpl( new HashMap<String, Object>() );
//
@@ -98,7 +98,7 @@
// GridPeerConfiguration conf = new GridPeerConfiguration();
//
// //Configuring the Core Services White Pages
-// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+// GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesLookupConfiguration( coreServicesMap );
// conf.addConfiguration( coreSeviceWPConf );
//
// //Configuring the Core Services Scheduler
@@ -141,7 +141,7 @@
// GridServiceDescription gsdLocalSched = wp.lookup( "scheduler:" + "myLocalSched" + SchedulerService.class.getName() );
//
// //Get the CoreWhitePages
-// CoreServicesWhitePages corewp = grid.get( CoreServicesWhitePages.class );
+// CoreServicesLookup corewp = grid.get( CoreServicesLookup.class );
// //Get the registered Scheduler
// GridServiceDescription gsdLocalButExposedSched = corewp.lookup( SchedulerService.class );
// //Get the registered white pages
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -19,7 +19,7 @@
import org.drools.grid.io.Connector;
import org.drools.grid.io.ConversationManager;
import org.drools.grid.io.impl.ConversationManagerImpl;
-import org.drools.grid.service.directory.impl.CoreServicesWhitePagesConfiguration;
+import org.drools.grid.service.directory.impl.CoreServicesLookupConfiguration;
import org.drools.grid.io.impl.MultiplexSocketServiceCongifuration;
import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
import org.drools.grid.remote.mina.MinaConnector;
@@ -33,7 +33,7 @@
public void test1() {
- Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+ Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
@@ -41,7 +41,7 @@
GridPeerConfiguration conf = new GridPeerConfiguration();
- GridPeerServiceConfiguration coreSeviceConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ GridPeerServiceConfiguration coreSeviceConf = new CoreServicesLookupConfiguration( coreServicesMap );
conf.addConfiguration( coreSeviceConf );
MultiplexSocketServiceCongifuration socketConf = new MultiplexSocketServiceCongifuration( new MultiplexSocketServerImpl( "127.0.0.1",
@@ -61,8 +61,8 @@
GridImpl grid2 = new GridImpl( new ConcurrentHashMap<String, Object>() );
conf = new GridPeerConfiguration();
- //coreServicesMap = Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
- coreSeviceConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ //coreServicesMap = Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
+ coreSeviceConf = new CoreServicesLookupConfiguration( coreServicesMap );
conf.addConfiguration( coreSeviceConf );
Connector conn = new MinaConnector();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/WhitePagesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/WhitePagesTest.java 2010-11-10 14:30:08 UTC (rev 35935)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl/src/test/java/org/drools/io/mina/WhitePagesTest.java 2010-11-10 14:30:18 UTC (rev 35936)
@@ -18,7 +18,7 @@
import org.drools.grid.io.Connector;
import org.drools.grid.io.ConversationManager;
import org.drools.grid.io.impl.ConversationManagerImpl;
-import org.drools.grid.service.directory.impl.CoreServicesWhitePagesConfiguration;
+import org.drools.grid.service.directory.impl.CoreServicesLookupConfiguration;
import org.drools.grid.io.impl.MultiplexSocketServiceCongifuration;
import org.drools.grid.remote.mina.MinaAcceptorFactoryService;
import org.drools.grid.remote.mina.MinaConnector;
@@ -32,7 +32,7 @@
public class WhitePagesTest extends TestCase {
public void test1() throws Exception {
- Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+ Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
@@ -40,7 +40,7 @@
GridPeerConfiguration conf = new GridPeerConfiguration();
- GridPeerServiceConfiguration coreSeviceConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ GridPeerServiceConfiguration coreSeviceConf = new CoreServicesLookupConfiguration( coreServicesMap );
conf.addConfiguration( coreSeviceConf );
MultiplexSocketServiceCongifuration socketConf = new MultiplexSocketServiceCongifuration( new MultiplexSocketServerImpl( "127.0.0.1",
@@ -59,8 +59,8 @@
GridImpl grid2 = new GridImpl( new ConcurrentHashMap<String, Object>() );
conf = new GridPeerConfiguration();
- //coreServicesMap = Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
- coreSeviceConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ //coreServicesMap = Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
+ coreSeviceConf = new CoreServicesLookupConfiguration( coreServicesMap );
conf.addConfiguration( coreSeviceConf );
Connector conn = new MinaConnector();
@@ -96,7 +96,7 @@
}
public void testWhitePagesLookupServices() {
- Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+ Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesLookup.class.getName() );
SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
@@ -104,7 +104,7 @@
GridPeerConfiguration conf = new GridPeerConfiguration();
- GridPeerServiceConfiguration coreSeviceConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ GridPeerServiceConfiguration coreSeviceConf = new CoreServicesLookupConfiguration( coreServicesMap );
conf.addConfiguration( coreSeviceConf );
GridPeerServiceConfiguration wplConf = new WhitePagesLocalConfiguration();
More information about the jboss-svn-commits
mailing list