[jboss-svn-commits] JBL Code SVN: r35889 - in labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src: main/java/org/drools/grid/hazelcast and 15 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 8 00:46:41 EST 2010
Author: mark.proctor at jboss.com
Date: 2010-11-08 00:46:39 -0500 (Mon, 08 Nov 2010)
New Revision: 35889
Modified:
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/CoreServicesWhitePages.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/DaemonService.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Grid.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNode.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNodeConnection.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerServiceConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridService.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridServiceDescription.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MessageReceiverHandlerFactoryService.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MultiplexSocketService.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Service.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/ServiceFactory.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/hazelcast/HazelCastServiceLookup.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/ConnectionFactoryServiceImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/DistributedMap.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeLocalConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeServer.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeSocketConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridServiceDescriptionFactory.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/HazelCastMap.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocket.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocketServerImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/NodeConnectionFactory.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageDirectoryMapRequestResponseHandler.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageResponseHandler.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Acceptor.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/AcceptorFactoryService.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Connector.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Conversation.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/ConversationManager.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/IoWriter.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Message.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/MessageReceiverHandler.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/CommandImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationManagerImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageHandlerImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageIoReceiverImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/RequestResponseDispatchListener.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/local/LocalGridConnection.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/GridNodeRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderProviderRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/RemoteGridConnection.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptorFactoryService.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaConnector.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaIoWriter.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/Address.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/WhitePages.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/YellowPages.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressJpa.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionJpa.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/JpaWhitePages.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/RegisterWhitePagesConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesPeeredConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServiceConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/CoreServicesScheduler.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJob.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJobConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerClient.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerLocalConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServer.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServiceConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ServiceConfiguration.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/UuidJobHandle.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/GridTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/HazelCastTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/NodeTests.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/local/LocalGridNodeTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/MockJob.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/ScheduledJobJpaTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/GridServiceDescriptionJpaTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/JpaWhitePagesTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/MinaTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RegisterServicesTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java
labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/WhitePagesTest.java
Log:
JBRULES-2746 Drools Grid Impl2
-source refactoring
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/CoreServicesWhitePages.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/CoreServicesWhitePages.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/CoreServicesWhitePages.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,6 +3,7 @@
import java.util.Map;
public interface CoreServicesWhitePages {
- public GridServiceDescription lookup(Class cls);
- public Map<String, GridServiceDescription> getServices();
+ public GridServiceDescription lookup(Class cls);
+
+ public Map<String, GridServiceDescription> getServices();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/DaemonService.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/DaemonService.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/DaemonService.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,7 +1,11 @@
package org.drools.grid;
-public interface DaemonService extends Service {
+public interface DaemonService
+ extends
+ Service {
void start();
- void stop();
+
+ void stop();
+
boolean isRunning();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Grid.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Grid.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Grid.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,14 +1,13 @@
package org.drools.grid;
-
public interface Grid {
public <T> T get(Class<T> serviceClass);
public GridNode createGridNode(String id);
-
+
public GridNode createGridNode(GridServiceDescription gsd);
-
+
public GridNode getGridNode(String id);
-
- public GridNodeConnection getGridNodeConnection(GridServiceDescription serviceDescription);
+
+ public GridNodeConnection getGridNodeConnection(GridServiceDescription serviceDescription);
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNode.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNode.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNode.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,6 +1,8 @@
package org.drools.grid;
-public interface GridNode extends GridService {
+public interface GridNode
+ extends
+ GridService {
public <T> T get(String identifier,
Class<T> cls);
@@ -9,6 +11,5 @@
public void set(String identifier,
Object object);
-
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNodeConnection.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNodeConnection.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridNodeConnection.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -21,10 +21,10 @@
* @author salaboy
*/
public interface GridNodeConnection {
-
+
public void connect();
-
+
public void disconnect();
-
+
public GridNode getGridNode();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -6,7 +6,6 @@
import java.util.ArrayList;
import java.util.List;
-
public class GridPeerConfiguration {
private List<GridPeerServiceConfiguration> configurations;
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerServiceConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerServiceConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridPeerServiceConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,7 +3,6 @@
*/
package org.drools.grid;
-
public interface GridPeerServiceConfiguration {
public void configureService(Grid grid);
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridService.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridService.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridService.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,5 +1,7 @@
package org.drools.grid;
-public interface GridService extends Service {
+public interface GridService
+ extends
+ Service {
public String getId();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridServiceDescription.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridServiceDescription.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/GridServiceDescription.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,7 +3,6 @@
import java.io.Serializable;
import java.util.Map;
-
import org.drools.grid.service.directory.Address;
public interface GridServiceDescription {
@@ -12,7 +11,7 @@
public Class getServiceInterface();
public void setServiceInterface(Class cls);
-
+
public Class getImplementedClass();
public void setImplementedClass(Class cls);
@@ -22,8 +21,8 @@
public Address addAddress(String transport);
public void removeAddress(String transport);
-
+
public Serializable getData();
-
+
public void setData(Serializable data);
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MessageReceiverHandlerFactoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MessageReceiverHandlerFactoryService.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MessageReceiverHandlerFactoryService.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -2,6 +2,6 @@
import org.drools.grid.io.MessageReceiverHandler;
-public interface MessageReceiverHandlerFactoryService {
+public interface MessageReceiverHandlerFactoryService {
MessageReceiverHandler getMessageReceiverHandler();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MultiplexSocketService.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MultiplexSocketService.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/MultiplexSocketService.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -13,8 +13,8 @@
String id);
String getIp();
-
+
Set<Integer> getPorts();
-
+
void close();
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Service.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Service.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/Service.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -2,5 +2,6 @@
public interface Service {
void init(Object context);
+
void dispose();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/ServiceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/ServiceFactory.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/ServiceFactory.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -27,28 +27,45 @@
* @author salaboy
*/
public class ServiceFactory {
- public static <T> T newServiceInstance(Class<T> serviceClass, GridServiceDescription gsd) {
+ public static <T> T newServiceInstance(Class<T> serviceClass,
+ GridServiceDescription gsd) {
T t = null;
try {
- Class clazz = Class.forName(gsd.getImplementedClass().getCanonicalName());
- Constructor constructor = clazz.getConstructor(String.class, GridServiceDescription.class);
- t = (T)constructor.newInstance("thisID", gsd);
- } catch (InstantiationException ex) {
- Logger.getLogger(ServiceFactory.class.getName()).log(Level.SEVERE, null, ex);
- } catch (IllegalAccessException ex) {
- Logger.getLogger(ServiceFactory.class.getName()).log(Level.SEVERE, null, ex);
- } catch (IllegalArgumentException ex) {
- Logger.getLogger(ServiceFactory.class.getName()).log(Level.SEVERE, null, ex);
- } catch (InvocationTargetException ex) {
- Logger.getLogger(ServiceFactory.class.getName()).log(Level.SEVERE, null, ex);
- } catch (NoSuchMethodException ex) {
- Logger.getLogger(ServiceFactory.class.getName()).log(Level.SEVERE, null, ex);
- } catch (SecurityException ex) {
- Logger.getLogger(ServiceFactory.class.getName()).log(Level.SEVERE, null, ex);
- } catch (ClassNotFoundException ex) {
- Logger.getLogger(ServiceFactory.class.getName()).log(Level.SEVERE, null, ex);
+ Class clazz = Class.forName( gsd.getImplementedClass().getCanonicalName() );
+ Constructor constructor = clazz.getConstructor( String.class,
+ GridServiceDescription.class );
+ t = (T) constructor.newInstance( "thisID",
+ gsd );
+ } catch ( InstantiationException ex ) {
+ Logger.getLogger( ServiceFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
+ } catch ( IllegalAccessException ex ) {
+ Logger.getLogger( ServiceFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
+ } catch ( IllegalArgumentException ex ) {
+ Logger.getLogger( ServiceFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
+ } catch ( InvocationTargetException ex ) {
+ Logger.getLogger( ServiceFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
+ } catch ( NoSuchMethodException ex ) {
+ Logger.getLogger( ServiceFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
+ } catch ( SecurityException ex ) {
+ Logger.getLogger( ServiceFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
+ } catch ( ClassNotFoundException ex ) {
+ Logger.getLogger( ServiceFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
}
return t;
-
+
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/hazelcast/HazelCastServiceLookup.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/hazelcast/HazelCastServiceLookup.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/hazelcast/HazelCastServiceLookup.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -8,18 +8,20 @@
import com.hazelcast.core.Hazelcast;
-public class HazelCastServiceLookup implements DistributedServiceLookup {
+public class HazelCastServiceLookup
+ implements
+ DistributedServiceLookup {
Map<String, InetSocketAddress[]> serviceAddress;
public HazelCastServiceLookup() {
serviceAddress = Hazelcast.getMap( "grid-services" );
}
-
+
public <T> T get(Class<T> serviceClass) {
if ( serviceClass == WhitePages.class ) {
-
+
}
-
+
// TODO Auto-generated method stub
return null;
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/ConnectionFactoryServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/ConnectionFactoryServiceImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/ConnectionFactoryServiceImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -4,7 +4,9 @@
import org.drools.grid.GridNodeConnection;
import org.drools.grid.service.directory.Address;
-public class ConnectionFactoryServiceImpl implements ConnectionFactoryService {
+public class ConnectionFactoryServiceImpl
+ implements
+ ConnectionFactoryService {
public GridNodeConnection createConnection(Address address) {
return null;
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/DistributedMap.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/DistributedMap.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/DistributedMap.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -2,6 +2,8 @@
import java.util.Map;
-public interface DistributedMap<K, V> extends Map<K, V> {
+public interface DistributedMap<K, V>
+ extends
+ Map<K, V> {
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -16,112 +16,120 @@
import org.drools.grid.service.directory.Address;
import org.drools.grid.service.directory.WhitePages;
-public class GridImpl implements Grid {
- private Map<String, Object> services;
- private Map<String, Object> localServices;
-
- private Map<String, GridNode> localNodes = new HashMap<String, GridNode>();
-
+public class GridImpl
+ implements
+ Grid {
+ private Map<String, Object> services;
+ private Map<String, Object> localServices;
+
+ private Map<String, GridNode> localNodes = new HashMap<String, GridNode>();
+
public GridImpl(Map<String, Object> services) {
this.services = services;
this.localServices = new ConcurrentHashMap<String, Object>();
}
-
+
public <T> T get(Class<T> serviceClass) {
T service = (T) this.localServices.get( serviceClass.getName() );
if ( service == null ) {
- service = (T) services.get( serviceClass.getName() );
+ service = (T) services.get( serviceClass.getName() );
}
return service;
}
-
- public void addService(Class cls, Object service) {
- addService( cls.getName(), service );
+
+ public void addService(Class cls,
+ Object service) {
+ addService( cls.getName(),
+ service );
}
- public void addService(String id, Object service) {
- this.localServices.put( id, service );
+
+ public void addService(String id,
+ Object service) {
+ this.localServices.put( id,
+ service );
}
-
-
-// public void configureServiceForSocket(int port, Class cls) {
-// configureServiceForSocket( port, cls.getName() );
-// }
-//
-// public void configureServiceForSocket(int port, String id) {
-// Object service = this.localServices.get( id );
-// if ( service == null ) {
-// throw new IllegalArgumentException( "Service '" + id + "' could not be found" );
-// }
-// this.socketServer.addService( port, id, ((MessageReceiverHandlerFactoryService) service).getMessageReceiverHandler() );
-// }
+ // public void configureServiceForSocket(int port, Class cls) {
+ // configureServiceForSocket( port, cls.getName() );
+ // }
+ //
+ // public void configureServiceForSocket(int port, String id) {
+ // Object service = this.localServices.get( id );
+ // if ( service == null ) {
+ // throw new IllegalArgumentException( "Service '" + id + "' could not be found" );
+ // }
+ // this.socketServer.addService( port, id, ((MessageReceiverHandlerFactoryService) service).getMessageReceiverHandler() );
+ // }
+
public GridNodeConnection getGridNodeConnection(GridServiceDescription serviceDescription) {
-
+
if ( localNodes.containsKey( serviceDescription.getId() ) ) {
// see if the serviceDescription is local, if so use it
return new LocalGridConnection( localNodes.get( serviceDescription.getId() ) );
} else {
// by default use socket
-
+
}
-
+
return null;
}
-
+
public GridNodeConnection getGridNodeConnection(Address address) {
boolean isLocal = false;
if ( "socket".equals( address.getTransport() ) ) {
- InetSocketAddress isAddress = ( InetSocketAddress ) address.getObject();
+ InetSocketAddress isAddress = (InetSocketAddress) address.getObject();
try {
if ( InetAddress.getLocalHost().equals( isAddress.getAddress() ) ) {
isLocal = true;
}
} catch ( UnknownHostException e ) {
- throw new RuntimeException( "Unable to determine local ip address", e );
+ throw new RuntimeException( "Unable to determine local ip address",
+ e );
}
}
-
+
if ( isLocal ) {
//new LocalGr
} else {
-
+
}
-
+
// TODO Auto-generated method stub
return null;
}
public GridNode createGridNode(String id) {
- GridServiceDescription gsd = GridServiceDescriptionFactory.newGridServiceDescritpion(id);
- return createGridNode(gsd);
-
+ GridServiceDescription gsd = GridServiceDescriptionFactory.newGridServiceDescritpion( id );
+ return createGridNode( gsd );
+
}
-
- public GridNode createGridNode(GridServiceDescription gsd){
- GridNodeConnection connection = NodeConnectionFactory.newGridNodeConnection(gsd);
+
+ public GridNode createGridNode(GridServiceDescription gsd) {
+ GridNodeConnection connection = NodeConnectionFactory.newGridNodeConnection( gsd );
GridNode gnode = connection.getGridNode();
- if(gnode instanceof GridNodeImpl){
- localNodes.put( gsd.getId(), gnode );
+ if ( gnode instanceof GridNodeImpl ) {
+ localNodes.put( gsd.getId(),
+ gnode );
}
-
+
WhitePages pages = get( WhitePages.class );
pages.create( gsd.getId() );
-
+
return gnode;
}
-
- public GridNode getGridNode(String id){
- if(isLocalNode(id)){
- return localNodes.get(id);
+
+ public GridNode getGridNode(String id) {
+ if ( isLocalNode( id ) ) {
+ return localNodes.get( id );
}
WhitePages pages = get( WhitePages.class );
- GridServiceDescription gsd = pages.lookup(id);
- return new RemoteGridConnection(gsd).getGridNode();
-
+ GridServiceDescription gsd = pages.lookup( id );
+ return new RemoteGridConnection( gsd ).getGridNode();
+
}
-
- private boolean isLocalNode(String id){
- if(id.contains("@local")){
+
+ private boolean isLocalNode(String id) {
+ if ( id.contains( "@local" ) ) {
return true;
}
return false;
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -31,11 +31,14 @@
*
* @author salaboy
*/
-public class GridNodeImpl implements GridNode, MessageReceiverHandlerFactoryService {
+public class GridNodeImpl
+ implements
+ GridNode,
+ MessageReceiverHandlerFactoryService {
- private String id;
- private final Map<String, Object> localContext = new ConcurrentHashMap<String, Object>();
- private final ServiceRegistry serviceRegistry = ServiceRegistryImpl.getInstance();
+ private String id;
+ private final Map<String, Object> localContext = new ConcurrentHashMap<String, Object>();
+ private final ServiceRegistry serviceRegistry = ServiceRegistryImpl.getInstance();
public GridNodeImpl() {
this.id = UUID.randomUUID().toString();
@@ -48,28 +51,31 @@
/* (non-Javadoc)
* @see org.drools.grid.GridNode#get(java.lang.String, java.lang.Class)
*/
- public <T> T get(String identifier, Class<T> cls) {
- T service = (T) localContext.get(identifier);
+ public <T> T get(String identifier,
+ Class<T> cls) {
+ T service = (T) localContext.get( identifier );
if ( service == null ) {
service = this.serviceRegistry.get( cls );
}
-
-
+
return service;
}
-
+
/* (non-Javadoc)
* @see org.drools.grid.GridNode#get(java.lang.Class)
*/
public <T> T get(Class<T> serviceClass) {
- return get( serviceClass.getName(), serviceClass );
+ return get( serviceClass.getName(),
+ serviceClass );
}
/* (non-Javadoc)
* @see org.drools.grid.GridNode#set(java.lang.String, java.lang.Object)
*/
- public void set(String identifier, Object object) {
- this.localContext.put( identifier, object );
+ public void set(String identifier,
+ Object object) {
+ this.localContext.put( identifier,
+ object );
}
/* (non-Javadoc)
@@ -86,11 +92,12 @@
public void dispose() {
}
- public void init(Object context) {
+ public void init(Object context) {
}
public MessageReceiverHandler getMessageReceiverHandler() {
- return new GridNodeServer(this, new NodeData());
+ return new GridNodeServer( this,
+ new NodeData() );
}
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeLocalConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeLocalConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeLocalConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -25,18 +25,19 @@
*
* @author salaboy
*/
-public class GridNodeLocalConfiguration implements GridPeerServiceConfiguration {
+public class GridNodeLocalConfiguration
+ implements
+ GridPeerServiceConfiguration {
private GridNode gnode;
+
public GridNodeLocalConfiguration() {
}
public void setGnode(GridNode gnode) {
this.gnode = gnode;
}
-
-
-
+
public void configureService(Grid grid) {
GridNode gnode = (this.gnode != null) ? this.gnode : new GridNodeImpl();
((GridImpl) grid).addService( GridNode.class,
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeServer.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeServer.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeServer.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -30,28 +30,31 @@
import org.drools.grid.io.impl.NodeData;
import org.drools.runtime.impl.ExecutionResultImpl;
-
/**
*
* @author salaboy
*/
-public class GridNodeServer implements
- MessageReceiverHandler{
- private GridNode gnode;
+public class GridNodeServer
+ implements
+ MessageReceiverHandler {
+ private GridNode gnode;
private NodeData data;
- public GridNodeServer(GridNode gnode, NodeData data) {
+
+ public GridNodeServer(GridNode gnode,
+ NodeData data) {
this.gnode = gnode;
this.data = data;
}
-
- public void messageReceived(Conversation conversation, Message msg) {
+
+ public void messageReceived(Conversation conversation,
+ Message msg) {
final CommandImpl cmd = (CommandImpl) msg.getBody();
this.execs.get( cmd.getName() ).execute( gnode,
conversation,
msg,
cmd );
}
-
+
private Map<String, Exec> execs = new HashMap<String, Exec>() {
{
put( "execute",
@@ -62,22 +65,18 @@
CommandImpl cmd) {
GridNode gnode = (GridNode) object;
List list = cmd.getArguments();
- GenericCommand command = (GenericCommand) list.get(0);
+ GenericCommand command = (GenericCommand) list.get( 0 );
- // Setup the evaluation context
- ContextImpl localSessionContext = new ContextImpl( "session_" + cmd.getName(),
- data.getContextManager(),
- data.getTemp() );
- ExecutionResultImpl localKresults = new ExecutionResultImpl();
- localSessionContext.set( "kresults_" + cmd.getName(),
- localKresults );
+ // Setup the evaluation context
+ ContextImpl localSessionContext = new ContextImpl( "session_" + cmd.getName(),
+ data.getContextManager(),
+ data.getTemp() );
+ ExecutionResultImpl localKresults = new ExecutionResultImpl();
+ localSessionContext.set( "kresults_" + cmd.getName(),
+ localKresults );
-
+ Object result = command.execute( localSessionContext );
- Object result = command.execute( localSessionContext );
-
-
-
con.respond( result );
}
} );
@@ -91,5 +90,4 @@
CommandImpl cmd);
}
-
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeSocketConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeSocketConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridNodeSocketConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -13,10 +13,10 @@
import org.drools.grid.MultiplexSocketService;
public class GridNodeSocketConfiguration
-implements
-GridPeerServiceConfiguration {
+ implements
+ GridPeerServiceConfiguration {
private int port = -1;
-
+
public GridNodeSocketConfiguration(int port) {
this.port = port;
}
@@ -24,58 +24,53 @@
public int getPort() {
return port;
}
-
+
public void configureService(Grid grid) {
GridNode gnode = grid.get( GridNode.class );
if ( port != -1 ) {
CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
- GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup(GridNode.class);
+ GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( GridNode.class );
if ( gsd == null ) {
gsd = new GridServiceDescriptionImpl( GridNode.class );
}
MultiplexSocketService mss = grid.get( MultiplexSocketService.class );
-
-// GridServiceDescription service = coreServicesWP.getServices().get( SchedulerService.class.getName() );
-// if( service == null){
-// coreServicesWP.getServices().put(SchedulerService.class.getName(), gsd);
-// service = gsd;
-// }
-// Address address = null;
-// if(service.getAddresses().get("socket") != null){
-// address = service.getAddresses().get("socket");
-// } else{
-// address = service.addAddress( "socket" );
-// }
-// InetSocketAddress[] addresses = (InetSocketAddress[])address.getObject();
-// if(addresses != null && addresses.length >= 1){
-// InetSocketAddress[] newAddresses = new InetSocketAddress[addresses.length+1];
-// if(addresses !=null){
-// System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
-// }
-// newAddresses[addresses.length]= new InetSocketAddress( mss.getIp(),
-// this.port);
-// ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddresses);
-// service.setData(conf);
-// }else{
-// InetSocketAddress[] newAddress = new InetSocketAddress[1];
-// newAddress[0]= new InetSocketAddress( mss.getIp(),
-// this.port);
-// address.setObject( newAddress );
-// ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddress);
-// service.setData(conf);
-// }
-
+ // GridServiceDescription service = coreServicesWP.getServices().get( SchedulerService.class.getName() );
+ // if( service == null){
+ // coreServicesWP.getServices().put(SchedulerService.class.getName(), gsd);
+ // service = gsd;
+ // }
+ // Address address = null;
+ // if(service.getAddresses().get("socket") != null){
+ // address = service.getAddresses().get("socket");
+ // } else{
+ // address = service.addAddress( "socket" );
+ // }
+ // InetSocketAddress[] addresses = (InetSocketAddress[])address.getObject();
+ // if(addresses != null && addresses.length >= 1){
+ // InetSocketAddress[] newAddresses = new InetSocketAddress[addresses.length+1];
+ // if(addresses !=null){
+ // System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
+ // }
+ // newAddresses[addresses.length]= new InetSocketAddress( mss.getIp(),
+ // this.port);
+ // ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddresses);
+ // service.setData(conf);
+ // }else{
+ // InetSocketAddress[] newAddress = new InetSocketAddress[1];
+ // newAddress[0]= new InetSocketAddress( mss.getIp(),
+ // this.port);
+ // address.setObject( newAddress );
+ // ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddress);
+ // service.setData(conf);
+ // }
-
-
-
mss.addService( this.port,
GridNode.class.getName(),
- ((MessageReceiverHandlerFactoryService) gnode ).getMessageReceiverHandler() );
+ ((MessageReceiverHandlerFactoryService) gnode).getMessageReceiverHandler() );
}
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridServiceDescriptionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridServiceDescriptionFactory.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/GridServiceDescriptionFactory.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -27,38 +27,40 @@
* @author salaboy
*/
public class GridServiceDescriptionFactory {
-
- public static GridServiceDescription newGridServiceDescritpion(String serviceId){
- GridServiceDescription gsd = new GridServiceDescriptionImpl(serviceId);
+
+ public static GridServiceDescription newGridServiceDescritpion(String serviceId) {
+ GridServiceDescription gsd = new GridServiceDescriptionImpl( serviceId );
try {
-
- String[] clazzName = serviceId.split(":");
-
- if(clazzName[0].equals("scheduler")){
- gsd.setServiceInterface(Class.forName("org.drools.time.SchedulerService"));
- gsd.setImplementedClass(Class.forName("org.drools.grid.timer.impl.SchedulerImpl"));
+
+ String[] clazzName = serviceId.split( ":" );
+
+ if ( clazzName[0].equals( "scheduler" ) ) {
+ gsd.setServiceInterface( Class.forName( "org.drools.time.SchedulerService" ) );
+ gsd.setImplementedClass( Class.forName( "org.drools.grid.timer.impl.SchedulerImpl" ) );
}
- if(clazzName[0].equals("schedulerclient")){
- gsd.setServiceInterface(Class.forName("org.drools.time.SchedulerService"));
- gsd.setImplementedClass(Class.forName("org.drools.grid.timer.impl.SchedulerClient"));
+ if ( clazzName[0].equals( "schedulerclient" ) ) {
+ gsd.setServiceInterface( Class.forName( "org.drools.time.SchedulerService" ) );
+ gsd.setImplementedClass( Class.forName( "org.drools.grid.timer.impl.SchedulerClient" ) );
}
-
- if(clazzName[0].equals("executionnode")){
- gsd.setServiceInterface(Class.forName("org.drools.grid.GridNode"));
- gsd.setImplementedClass(Class.forName("org.drools.grid.impl.GridNodeImpl"));
+
+ if ( clazzName[0].equals( "executionnode" ) ) {
+ gsd.setServiceInterface( Class.forName( "org.drools.grid.GridNode" ) );
+ gsd.setImplementedClass( Class.forName( "org.drools.grid.impl.GridNodeImpl" ) );
}
-
- if(clazzName[0].equals("executionnodeclient")){
- gsd.setServiceInterface(Class.forName("org.drools.grid.GridNode"));
- gsd.setImplementedClass(Class.forName("org.drools.grid.remote.GridNodeRemoteClient"));
+
+ if ( clazzName[0].equals( "executionnodeclient" ) ) {
+ gsd.setServiceInterface( Class.forName( "org.drools.grid.GridNode" ) );
+ gsd.setImplementedClass( Class.forName( "org.drools.grid.remote.GridNodeRemoteClient" ) );
}
- if(clazzName[0].equals("test")){
- gsd.setServiceInterface(Class.forName("java.lang.String"));
- gsd.setImplementedClass(Class.forName("java.lang.String"));
+ if ( clazzName[0].equals( "test" ) ) {
+ gsd.setServiceInterface( Class.forName( "java.lang.String" ) );
+ gsd.setImplementedClass( Class.forName( "java.lang.String" ) );
}
-
- } catch (ClassNotFoundException ex) {
- Logger.getLogger(GridServiceDescriptionFactory.class.getName()).log(Level.SEVERE, null, ex);
+
+ } catch ( ClassNotFoundException ex ) {
+ Logger.getLogger( GridServiceDescriptionFactory.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
}
return gsd;
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/HazelCastMap.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/HazelCastMap.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/HazelCastMap.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -4,9 +4,11 @@
import java.util.Map;
import java.util.Set;
-public class HazelCastMap<K, V> implements DistributedMap<K, V> {
+public class HazelCastMap<K, V>
+ implements
+ DistributedMap<K, V> {
private Map<K, V> map;
-
+
public void clear() {
map.clear();
}
@@ -18,10 +20,11 @@
public boolean containsValue(Object value) {
return map.containsValue( value );
}
+
public boolean equals(Object o) {
return map.equals( o );
}
-
+
public int hashCode() {
return map.hashCode();
}
@@ -30,13 +33,11 @@
return map.isEmpty();
}
-
public int size() {
return map.size();
}
-
- public HazelCastMap(Map<K, V> map) {
+ public HazelCastMap(Map<K, V> map) {
this.map = map;
}
@@ -54,7 +55,8 @@
public V put(K key,
V value) {
- return this.map.put( key, value );
+ return this.map.put( key,
+ value );
}
public void putAll(Map< ? extends K, ? extends V> m) {
@@ -62,7 +64,7 @@
}
public V remove(Object key) {
- return this.map.remove( key );
+ return this.map.remove( key );
}
public Collection<V> values() {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocket.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocket.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocket.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -10,20 +10,23 @@
import org.drools.grid.io.Message;
import org.drools.grid.io.MessageReceiverHandler;
-public class MultiplexSocket implements MessageReceiverHandler {
+public class MultiplexSocket
+ implements
+ MessageReceiverHandler {
private Map<String, MessageReceiverHandler> handlers;
-
+
public MultiplexSocket() {
this.handlers = new CopyOnWriteMap<String, MessageReceiverHandler>();
}
-
+
public Map<String, MessageReceiverHandler> getHandlers() {
return this.handlers;
}
-
+
public void messageReceived(Conversation conversation,
Message msg) {
- this.handlers.get( msg.getRecipientId() ).messageReceived( conversation, msg );
+ this.handlers.get( msg.getRecipientId() ).messageReceived( conversation,
+ msg );
}
-
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocketServerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocketServerImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/MultiplexSocketServerImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -11,53 +11,61 @@
import org.drools.grid.io.AcceptorFactoryService;
import org.drools.grid.io.MessageReceiverHandler;
-public class MultiplexSocketServerImpl implements MultiplexSocketService {
+public class MultiplexSocketServerImpl
+ implements
+ MultiplexSocketService {
private AcceptorFactoryService factory;
-
- private String ip;
-
- private SystemEventListener l;
-
+
+ private String ip;
+
+ private SystemEventListener l;
+
private Map<Integer, Acceptor> acceptors;
-
- public MultiplexSocketServerImpl(String ip, AcceptorFactoryService factory, SystemEventListener l ) {
+
+ public MultiplexSocketServerImpl(String ip,
+ AcceptorFactoryService factory,
+ SystemEventListener l) {
this.factory = factory;
this.ip = ip;
this.l = l;
this.acceptors = new HashMap<Integer, Acceptor>();
}
-
-
+
/* (non-Javadoc)
* @see org.drools.grid.impl.SocketServer#addService(int, java.lang.String, org.drools.grid.io.MessageReceiverHandler)
*/
- public synchronized void addService(int socket, String id, MessageReceiverHandler receiver ) {
+ public synchronized void addService(int socket,
+ String id,
+ MessageReceiverHandler receiver) {
Acceptor acc = this.acceptors.get( socket );
-
+
if ( acc == null ) {
acc = factory.newAcceptor();
-
+
MultiplexSocket ms = new MultiplexSocket();
acc.open( new InetSocketAddress( this.ip,
socket ),
ms,
this.l );
- this.acceptors.put(socket, acc);
+ this.acceptors.put( socket,
+ acc );
}
-
- MultiplexSocket ms = ( MultiplexSocket ) acc.getMessageReceiverHandler();
- ms.getHandlers().put( id, receiver );
+
+ MultiplexSocket ms = (MultiplexSocket) acc.getMessageReceiverHandler();
+ ms.getHandlers().put( id,
+ receiver );
}
-
+
/* (non-Javadoc)
* @see org.drools.grid.impl.SocketServer#removeService(int, java.lang.String)
*/
- public synchronized void removeService(int socket, String id) {
+ public synchronized void removeService(int socket,
+ String id) {
Acceptor acc = this.acceptors.get( socket );
if ( acc != null ) {
- MultiplexSocket ms = ( MultiplexSocket ) acc.getMessageReceiverHandler();
- ms.getHandlers().remove( id );
+ MultiplexSocket ms = (MultiplexSocket) acc.getMessageReceiverHandler();
+ ms.getHandlers().remove( id );
if ( ms.getHandlers().isEmpty() ) {
// If there are no more services on this socket, then close it
acc.close();
@@ -65,21 +73,20 @@
}
}
- public void close(){
- for(Acceptor acc : this.acceptors.values()){
- if(acc.isOpen()){
+ public void close() {
+ for ( Acceptor acc : this.acceptors.values() ) {
+ if ( acc.isOpen() ) {
acc.close();
}
-
-
+
}
}
public String getIp() {
return this.ip;
}
-
- public Set<Integer> getPorts(){
+
+ public Set<Integer> getPorts() {
return acceptors.keySet();
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/NodeConnectionFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/NodeConnectionFactory.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/impl/NodeConnectionFactory.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -29,13 +29,13 @@
public class NodeConnectionFactory {
public static GridNodeConnection newGridNodeConnection(GridServiceDescription gsd) {
- if(gsd.getAddresses().get("local") != null){
- return new LocalGridConnection(gsd.getId());
+ if ( gsd.getAddresses().get( "local" ) != null ) {
+ return new LocalGridConnection( gsd.getId() );
}
- if(gsd.getAddresses().get("socket") != null){
- return new RemoteGridConnection(gsd);
+ if ( gsd.getAddresses().get( "socket" ) != null ) {
+ return new RemoteGridConnection( gsd );
}
return null;
}
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageDirectoryMapRequestResponseHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageDirectoryMapRequestResponseHandler.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageDirectoryMapRequestResponseHandler.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -18,7 +18,8 @@
private Map<String, String> directoryMap;
private volatile Message message;
- public synchronized void messageReceived(Conversation conversation, Message message) {
+ public synchronized void messageReceived(Conversation conversation,
+ Message message) {
this.message = message;
setDone( true );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageResponseHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageResponseHandler.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/internal/responsehandlers/BlockingMessageResponseHandler.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -11,7 +11,7 @@
public class BlockingMessageResponseHandler extends AbstractBlockingResponseHandler
implements
MessageReceiverHandler {
- private static final int WAIT_TIME = 60000;
+ private static final int WAIT_TIME = 60000;
private volatile Message message;
@@ -24,7 +24,7 @@
public Message getMessage() {
return getMessage( WAIT_TIME );
}
-
+
public Message getMessage(long waitTime) {
boolean done = waitTillDone( waitTime );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Acceptor.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Acceptor.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Acceptor.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -6,7 +6,12 @@
public interface Acceptor {
boolean isOpen();
- void open(InetSocketAddress address, MessageReceiverHandler handler, SystemEventListener systemEventListener);
+
+ void open(InetSocketAddress address,
+ MessageReceiverHandler handler,
+ SystemEventListener systemEventListener);
+
void close();
+
MessageReceiverHandler getMessageReceiverHandler();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/AcceptorFactoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/AcceptorFactoryService.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/AcceptorFactoryService.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -2,4 +2,4 @@
public interface AcceptorFactoryService {
Acceptor newAcceptor();
-}
+}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Connector.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Connector.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Connector.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -6,7 +6,10 @@
public interface Connector {
public boolean isOpen();
- public IoWriter open(InetSocketAddress address, MessageReceiverHandler handler, SystemEventListener systemEventListener);
+
+ public IoWriter open(InetSocketAddress address,
+ MessageReceiverHandler handler,
+ SystemEventListener systemEventListener);
+
public void close();
}
-
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Conversation.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Conversation.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Conversation.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,11 +3,10 @@
*/
package org.drools.grid.io;
-
public interface Conversation {
-
+
void respond(Object body);
-
+
void sendMessage(Object body,
MessageReceiverHandler handler);
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/ConversationManager.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/ConversationManager.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/ConversationManager.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -5,11 +5,10 @@
import java.net.InetSocketAddress;
-
public interface ConversationManager {
Conversation startConversation(InetSocketAddress address,
String recipientId);
-
+
void endConversation();
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/IoWriter.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/IoWriter.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/IoWriter.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,6 +1,5 @@
package org.drools.grid.io;
-
-public interface IoWriter {
+public interface IoWriter {
void write(Message msg);
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Message.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Message.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/Message.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -9,7 +9,7 @@
public String getRecipientId();
public int getRequestId();
-
+
public int getResponseId();
public Object getBody();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/MessageReceiverHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/MessageReceiverHandler.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/MessageReceiverHandler.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,10 +1,8 @@
package org.drools.grid.io;
-
-
public interface MessageReceiverHandler {
public void messageReceived(Conversation conversation,
- Message msg);
+ Message msg);
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/CommandImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/CommandImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/CommandImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,24 +3,25 @@
import java.io.Serializable;
import java.util.List;
-public class CommandImpl implements Serializable {
- private String name;
+public class CommandImpl
+ implements
+ Serializable {
+ private String name;
private List<Object> arguments;
-
+
public CommandImpl(String name,
List<Object> arguments) {
super();
this.name = name;
this.arguments = arguments;
}
-
+
public String getName() {
return name;
}
-
+
public List<Object> getArguments() {
return arguments;
}
-
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -18,7 +18,7 @@
private IoWriter writer;
private String conversationId;
private String senderId;
- private String recipientId;
+ private String recipientId;
private AtomicInteger requestId;
private RequestResponseDispatchListener dispathListener;
private ConversationManager conversationManager;
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationManagerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationManagerImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/ConversationManagerImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -17,17 +17,17 @@
implements
ConversationManager {
- private Connector conn;
-
- private SystemEventListener systemEventListener;
+ private Connector conn;
- private String senderId;
+ private SystemEventListener systemEventListener;
- private AtomicLong conversationIdCounter;
+ private String senderId;
+ private AtomicLong conversationIdCounter;
+
public ConversationManagerImpl(String senderId,
Connector conn,
- SystemEventListener systemEventListener) {
+ SystemEventListener systemEventListener) {
this.conn = conn;
this.senderId = senderId;
this.conversationIdCounter = new AtomicLong();
@@ -36,7 +36,7 @@
public Conversation startConversation(InetSocketAddress address,
String recipientId) {
- RequestResponseDispatchListener dispathListener = new RequestResponseDispatchListener();
+ RequestResponseDispatchListener dispathListener = new RequestResponseDispatchListener();
IoWriter writer = this.conn.open( address,
dispathListener,
systemEventListener );
@@ -47,7 +47,7 @@
writer,
this );
}
-
+
public void endConversation() {
this.conn.close();
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageHandlerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageHandlerImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageHandlerImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -49,12 +49,12 @@
Object result = command.execute( localSessionContext );
-// session.write( new MessageImpl( msg.getConversationId(),
-// msg.getRequestId(),
-// null,
-// 1,
-// result ),
-// null );
+ // session.write( new MessageImpl( msg.getConversationId(),
+ // msg.getRequestId(),
+ // null,
+ // 1,
+ // result ),
+ // null );
// if ( !msg.isAsync() && localKresults.getIdentifiers().isEmpty() ) {
// // if it's not an async invocation and their are no results, just send a simple notification message
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -9,12 +9,12 @@
implements
Serializable,
Message {
- private String conversationId;
- private String senderId;
+ private String conversationId;
+ private String senderId;
private String recipientId;
- private int requestId;
- private int responseId;
- private Object body;
+ private int requestId;
+ private int responseId;
+ private Object body;
public MessageImpl(String conversationId,
String senderId,
@@ -43,7 +43,7 @@
public String getConversationId() {
return this.conversationId;
}
-
+
public String getSenderId() {
return senderId;
}
@@ -58,10 +58,10 @@
public int getRequestId() {
return this.requestId;
}
-
+
public int getResponseId() {
return this.responseId;
- }
+ }
/* (non-Javadoc)
* @see org.drools.grid.io.impl.Message#getPayload()
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageIoReceiverImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageIoReceiverImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/MessageIoReceiverImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -16,61 +16,61 @@
public class MessageIoReceiverImpl
implements
MessageReceiverHandler {
-
-// protected Map<Integer, RequestResponseListener> responseHandlers;
- private MessageReceiverHandler handler;
+ // protected Map<Integer, RequestResponseListener> responseHandlers;
- private final SystemEventListener systemEventListener;
+ private MessageReceiverHandler handler;
+ private final SystemEventListener systemEventListener;
+
public MessageIoReceiverImpl(MessageReceiverHandler handler,
SystemEventListener systemEventListener) {
this.handler = handler;
-// this.responseHandlers = new ConcurrentHashMap<Integer, RequestResponseListener>();;
+ // this.responseHandlers = new ConcurrentHashMap<Integer, RequestResponseListener>();;
this.systemEventListener = systemEventListener;
}
-// /* (non-Javadoc)
-// * @see org.drools.vsm.mina.ClientGenericMessageReceiver#addResponseHandler(int, org.drools.vsm.MessageResponseHandler)
-// */
-// public void addResponseHandler(int id,
-// RequestResponseListener responseHandler) {
-// this.responseHandlers.put( id,
-// responseHandler );
-// }
+ // /* (non-Javadoc)
+ // * @see org.drools.vsm.mina.ClientGenericMessageReceiver#addResponseHandler(int, org.drools.vsm.MessageResponseHandler)
+ // */
+ // public void addResponseHandler(int id,
+ // RequestResponseListener responseHandler) {
+ // this.responseHandlers.put( id,
+ // responseHandler );
+ // }
public void messageReceived(Conversation conversation,
Message msg) {
// TODO Auto-generated method stub
-
+
}
-// /* (non-Javadoc)
-// * @see org.drools.vsm.mina.ClientGenericMessageReceiver#messageReceived(org.drools.vsm.mina.MinaIoWriter, org.drools.vsm.Message)
-// */
-// public void messageReceived(IoWriter writer,
-// Message msg) throws Exception {
-//
-// this.systemEventListener.debug( "Message receieved : " + msg );
-//
-// RequestResponseListener responseHandler = this.responseHandlers.remove( msg.getRequestId() );
-//
-// if ( responseHandler != null ) {
-// Object payload = msg.getPayload();
-// if ( payload instanceof SimpleCommand && ((SimpleCommand) msg.getPayload()).getArguments().size() > 0 &&
-// ((SimpleCommand) msg.getPayload()).getArguments().get( 0 ) instanceof RuntimeException ) {
-// payload = ((SimpleCommand) msg.getPayload()).getArguments().get( 0 );
-// }
-// if ( (payload != null && payload instanceof RuntimeException) ) {
-// responseHandler.setError( (RuntimeException) payload );
-// } else {
-// responseHandler.receive( msg );
-// }
-// } else if ( this.handler != null ) {
-// this.handler.messageReceived( writer,
-// msg );
-// } else {
-// throw new RuntimeException( "Unable to process Message" );
-// }
-// }
+ // /* (non-Javadoc)
+ // * @see org.drools.vsm.mina.ClientGenericMessageReceiver#messageReceived(org.drools.vsm.mina.MinaIoWriter, org.drools.vsm.Message)
+ // */
+ // public void messageReceived(IoWriter writer,
+ // Message msg) throws Exception {
+ //
+ // this.systemEventListener.debug( "Message receieved : " + msg );
+ //
+ // RequestResponseListener responseHandler = this.responseHandlers.remove( msg.getRequestId() );
+ //
+ // if ( responseHandler != null ) {
+ // Object payload = msg.getPayload();
+ // if ( payload instanceof SimpleCommand && ((SimpleCommand) msg.getPayload()).getArguments().size() > 0 &&
+ // ((SimpleCommand) msg.getPayload()).getArguments().get( 0 ) instanceof RuntimeException ) {
+ // payload = ((SimpleCommand) msg.getPayload()).getArguments().get( 0 );
+ // }
+ // if ( (payload != null && payload instanceof RuntimeException) ) {
+ // responseHandler.setError( (RuntimeException) payload );
+ // } else {
+ // responseHandler.receive( msg );
+ // }
+ // } else if ( this.handler != null ) {
+ // this.handler.messageReceived( writer,
+ // msg );
+ // } else {
+ // throw new RuntimeException( "Unable to process Message" );
+ // }
+ // }
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/RequestResponseDispatchListener.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/RequestResponseDispatchListener.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/io/impl/RequestResponseDispatchListener.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -11,23 +11,29 @@
import org.drools.grid.io.Message;
import org.drools.grid.io.MessageReceiverHandler;
-public class RequestResponseDispatchListener implements MessageReceiverHandler {
+public class RequestResponseDispatchListener
+ implements
+ MessageReceiverHandler {
// Need time based eviction queue, to remove old unreturned requests
private Map<Integer, MessageReceiverHandler> msgRecHandlers;
-
+
public RequestResponseDispatchListener() {
this.msgRecHandlers = new ConcurrentHashMap<Integer, MessageReceiverHandler>();
}
-
- public void addMessageReceiverHandler(int requestId, MessageReceiverHandler msgRecHandler) {
- this.msgRecHandlers.put(requestId, msgRecHandler);
+
+ public void addMessageReceiverHandler(int requestId,
+ MessageReceiverHandler msgRecHandler) {
+ this.msgRecHandlers.put( requestId,
+ msgRecHandler );
}
-
- public void messageReceived(Conversation conversation, Message msg) {
- MessageReceiverHandler msgRecHandler = this.msgRecHandlers.remove( msg.getResponseId());
+
+ public void messageReceived(Conversation conversation,
+ Message msg) {
+ MessageReceiverHandler msgRecHandler = this.msgRecHandlers.remove( msg.getResponseId() );
if ( msgRecHandler != null ) {
- msgRecHandler.messageReceived( conversation, msg );
+ msgRecHandler.messageReceived( conversation,
+ msg );
}
}
-
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/local/LocalGridConnection.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/local/LocalGridConnection.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/local/LocalGridConnection.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -4,15 +4,17 @@
import org.drools.grid.GridNodeConnection;
import org.drools.grid.impl.GridNodeImpl;
-public class LocalGridConnection implements GridNodeConnection {
+public class LocalGridConnection
+ implements
+ GridNodeConnection {
private GridNode gridNode;
-
+
public LocalGridConnection(GridNode gridNode) {
this.gridNode = gridNode;
}
-
+
public LocalGridConnection(String id) {
- gridNode = new GridNodeImpl(id);
+ gridNode = new GridNodeImpl( id );
}
public void connect() {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/GridNodeRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/GridNodeRemoteClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/GridNodeRemoteClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -34,53 +34,61 @@
*
* @author salaboy
*/
-public class GridNodeRemoteClient implements GridNode{
-
- private String id;
- private GridServiceDescription gsd;
- private final Map<String, Object> localContext = new ConcurrentHashMap<String, Object>();
- private final ServiceRegistry serviceRegistry = ServiceRegistryImpl.getInstance();
+public class GridNodeRemoteClient
+ implements
+ GridNode {
+ private String id;
+ private GridServiceDescription gsd;
+ private final Map<String, Object> localContext = new ConcurrentHashMap<String, Object>();
+ private final ServiceRegistry serviceRegistry = ServiceRegistryImpl.getInstance();
+
public GridNodeRemoteClient(GridServiceDescription gsd) {
this.gsd = gsd;
- init(this.localContext);
+ init( this.localContext );
}
-
- public <T> T get(String identifier, Class<T> cls) {
- T service = (T) localContext.get(identifier);
+
+ public <T> T get(String identifier,
+ Class<T> cls) {
+ T service = (T) localContext.get( identifier );
if ( service == null ) {
service = this.serviceRegistry.get( cls );
}
-
-
+
return service;
}
public <T> T get(Class<T> serviceClass) {
- return get( serviceClass.getName(), serviceClass );
+ return get( serviceClass.getName(),
+ serviceClass );
}
- public void set(String identifier, Object object) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void set(String identifier,
+ Object object) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public String getId() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void init(Object context) {
-
+
MinaConnector connector = new MinaConnector();
- ConversationManager cm = new ConversationManagerImpl(id, connector, SystemEventListenerFactory.getSystemEventListener());
+ ConversationManager cm = new ConversationManagerImpl( id,
+ connector,
+ SystemEventListenerFactory.getSystemEventListener() );
this.localContext.put( KnowledgeBuilderFactoryService.class.getCanonicalName(),
- new KnowledgeBuilderProviderRemoteClient( cm, gsd ) );
+ new KnowledgeBuilderProviderRemoteClient( cm,
+ gsd ) );
this.localContext.put( KnowledgeBaseFactoryService.class.getCanonicalName(),
- new KnowledgeBaseProviderRemoteClient( cm, gsd ) );
-
+ new KnowledgeBaseProviderRemoteClient( cm,
+ gsd ) );
+
}
public void dispose() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseProviderRemoteClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -39,101 +39,105 @@
*
* @author salaboy
*/
-public class KnowledgeBaseProviderRemoteClient implements KnowledgeBaseFactoryService {
+public class KnowledgeBaseProviderRemoteClient
+ implements
+ KnowledgeBaseFactoryService {
- private ConversationManager cm;
+ private ConversationManager cm;
private GridServiceDescription gsd;
- public KnowledgeBaseProviderRemoteClient(ConversationManager cm, GridServiceDescription gsd) {
+
+ public KnowledgeBaseProviderRemoteClient(ConversationManager cm,
+ GridServiceDescription gsd) {
this.cm = cm;
this.gsd = gsd;
}
-
-
public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration(Properties properties, ClassLoader... classLoader) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public KnowledgeBaseConfiguration newKnowledgeBaseConfiguration(Properties properties,
+ ClassLoader... classLoader) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeSessionConfiguration newKnowledgeSessionConfiguration(Properties properties) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeBase newKnowledgeBase() {
String localId = UUID.randomUUID().toString();
-
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{new SetVariableCommand( "__TEMP__",
- localId,
- new NewKnowledgeBaseCommand( null ) )}));
-
- sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
- return new KnowledgeBaseRemoteClient( localId, this.gsd, this.cm );
-
-
+
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new SetVariableCommand( "__TEMP__",
+ localId,
+ new NewKnowledgeBaseCommand( null ) ) } ) );
+
+ sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
+ return new KnowledgeBaseRemoteClient( localId,
+ this.gsd,
+ this.cm );
+
}
public KnowledgeBase newKnowledgeBase(String kbaseId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeBase newKnowledgeBase(KnowledgeBaseConfiguration conf) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public KnowledgeBase newKnowledgeBase(String kbaseId, KnowledgeBaseConfiguration conf) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public KnowledgeBase newKnowledgeBase(String kbaseId,
+ KnowledgeBaseConfiguration conf) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Environment newEnvironment() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public static Object sendMessage(ConversationManager conversationManager,
- Serializable addr,
- String id,
- Object body) {
+ Serializable addr,
+ String id,
+ Object body) {
InetSocketAddress[] sockets = null;
- if (addr instanceof InetSocketAddress[]) {
+ if ( addr instanceof InetSocketAddress[] ) {
sockets = (InetSocketAddress[]) addr;
- } else if (addr instanceof InetSocketAddress) {
- sockets = new InetSocketAddress[1];
+ } else if ( addr instanceof InetSocketAddress ) {
+ sockets = new InetSocketAddress[ 1 ];
sockets[0] = (InetSocketAddress) addr;
}
-
BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
Exception exception = null;
- for (InetSocketAddress socket : sockets) {
+ for ( InetSocketAddress socket : sockets ) {
try {
- Conversation conv = conversationManager.startConversation(socket,
- id);
- conv.sendMessage(body,
- handler);
+ Conversation conv = conversationManager.startConversation( socket,
+ id );
+ conv.sendMessage( body,
+ handler );
exception = null;
- } catch (Exception e) {
+ } catch ( Exception e ) {
exception = e;
conversationManager.endConversation();
}
- if (exception == null) {
+ if ( exception == null ) {
break;
}
}
- if (exception != null) {
- throw new RuntimeException("Unable to send message",
- exception);
+ if ( exception != null ) {
+ throw new RuntimeException( "Unable to send message",
+ exception );
}
try {
return handler.getMessage().getBody();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBaseRemoteClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -48,13 +48,17 @@
*
* @author salaboy
*/
-public class KnowledgeBaseRemoteClient implements KnowledgeBase{
-
- private String instanceId;
- private ConversationManager cm;
+public class KnowledgeBaseRemoteClient
+ implements
+ KnowledgeBase {
+
+ private String instanceId;
+ private ConversationManager cm;
private GridServiceDescription gsd;
- public KnowledgeBaseRemoteClient(String localId, GridServiceDescription gsd, ConversationManager cm) {
+ public KnowledgeBaseRemoteClient(String localId,
+ GridServiceDescription gsd,
+ ConversationManager cm) {
this.instanceId = localId;
this.cm = cm;
this.gsd = gsd;
@@ -64,157 +68,162 @@
String kuilderInstanceId = ((CollectionClient<KnowledgePackage>) kpackages).getParentInstanceId();
String kresultsId = "kresults_" + this.cm.toString();
String localId = UUID.randomUUID().toString();
-
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{new KnowledgeContextResolveFromContextCommand( new KnowledgeBaseAddKnowledgePackagesCommand(),
- kuilderInstanceId,
- this.instanceId,
- null,
- kresultsId )}));
-
- sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
+
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new KnowledgeContextResolveFromContextCommand( new KnowledgeBaseAddKnowledgePackagesCommand(),
+ kuilderInstanceId,
+ this.instanceId,
+ null,
+ kresultsId ) } ) );
+
+ sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
}
public Collection<KnowledgePackage> getKnowledgePackages() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgePackage getKnowledgePackage(String packageName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void removeKnowledgePackage(String packageName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public Rule getRule(String packageName, String ruleName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public Rule getRule(String packageName,
+ String ruleName) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void removeRule(String packageName, String ruleName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void removeRule(String packageName,
+ String ruleName) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public Query getQuery(String packageName, String queryName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public Query getQuery(String packageName,
+ String queryName) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void removeQuery(String packageName, String queryName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void removeQuery(String packageName,
+ String queryName) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void removeFunction(String packageName, String ruleName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void removeFunction(String packageName,
+ String ruleName) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public FactType getFactType(String packageName, String typeName) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public FactType getFactType(String packageName,
+ String typeName) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Process getProcess(String processId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void removeProcess(String processId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<Process> getProcesses() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public StatefulKnowledgeSession newStatefulKnowledgeSession(KnowledgeSessionConfiguration conf, Environment environment) {
+ public StatefulKnowledgeSession newStatefulKnowledgeSession(KnowledgeSessionConfiguration conf,
+ Environment environment) {
String kresultsId = "kresults_" + this.cm.toString();
String localId = UUID.randomUUID().toString();
-
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{new SetVariableCommand( "__TEMP__",
- localId,
- new KnowledgeContextResolveFromContextCommand( new NewStatefulKnowledgeSessionCommand( conf ),
- null,
- this.instanceId,
- null,
- kresultsId ) )}));
-
- sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
+
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new SetVariableCommand( "__TEMP__",
+ localId,
+ new KnowledgeContextResolveFromContextCommand( new NewStatefulKnowledgeSessionCommand( conf ),
+ null,
+ this.instanceId,
+ null,
+ kresultsId ) ) } ) );
+
+ sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
return new StatefulKnowledgeSessionRemoteClient( localId,
this.gsd,
this.cm );
-
-
}
public StatefulKnowledgeSession newStatefulKnowledgeSession() {
- return newStatefulKnowledgeSession(null, null);
+ return newStatefulKnowledgeSession( null,
+ null );
}
public Collection<StatefulKnowledgeSession> getStatefulKnowledgeSessions() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public StatelessKnowledgeSession newStatelessKnowledgeSession(KnowledgeSessionConfiguration conf) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public StatelessKnowledgeSession newStatelessKnowledgeSession() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void addEventListener(KnowledgeBaseEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void removeEventListener(KnowledgeBaseEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<KnowledgeBaseEventListener> getKnowledgeBaseEventListeners() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
-
- public static Object sendMessage(ConversationManager conversationManager,
- Serializable addr,
- String id,
- Object body) {
+ public static Object sendMessage(ConversationManager conversationManager,
+ Serializable addr,
+ String id,
+ Object body) {
+
InetSocketAddress[] sockets = null;
- if (addr instanceof InetSocketAddress[]) {
+ if ( addr instanceof InetSocketAddress[] ) {
sockets = (InetSocketAddress[]) addr;
- } else if (addr instanceof InetSocketAddress) {
- sockets = new InetSocketAddress[1];
+ } else if ( addr instanceof InetSocketAddress ) {
+ sockets = new InetSocketAddress[ 1 ];
sockets[0] = (InetSocketAddress) addr;
}
-
BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
Exception exception = null;
- for (InetSocketAddress socket : sockets) {
+ for ( InetSocketAddress socket : sockets ) {
try {
- Conversation conv = conversationManager.startConversation(socket,
- id);
- conv.sendMessage(body,
- handler);
+ Conversation conv = conversationManager.startConversation( socket,
+ id );
+ conv.sendMessage( body,
+ handler );
exception = null;
- } catch (Exception e) {
+ } catch ( Exception e ) {
exception = e;
conversationManager.endConversation();
}
- if (exception == null) {
+ if ( exception == null ) {
break;
}
}
- if (exception != null) {
- throw new RuntimeException("Unable to send message",
- exception);
+ if ( exception != null ) {
+ throw new RuntimeException( "Unable to send message",
+ exception );
}
try {
return handler.getMessage().getBody();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderProviderRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderProviderRemoteClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderProviderRemoteClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -40,98 +40,103 @@
*
* @author salaboy
*/
-public class KnowledgeBuilderProviderRemoteClient implements KnowledgeBuilderFactoryService {
+public class KnowledgeBuilderProviderRemoteClient
+ implements
+ KnowledgeBuilderFactoryService {
- private ConversationManager cm;
+ private ConversationManager cm;
private GridServiceDescription gsd;
- public KnowledgeBuilderProviderRemoteClient(ConversationManager cm, GridServiceDescription gsd) {
+ public KnowledgeBuilderProviderRemoteClient(ConversationManager cm,
+ GridServiceDescription gsd) {
this.cm = cm;
this.gsd = gsd;
}
-
-
public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration(Properties properties, ClassLoader... classLoader) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public KnowledgeBuilderConfiguration newKnowledgeBuilderConfiguration(Properties properties,
+ ClassLoader... classLoader) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public DecisionTableConfiguration newDecisionTableConfiguration() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeBuilder newKnowledgeBuilder() {
String localId = UUID.randomUUID().toString();
-
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{new SetVariableCommand( "__TEMP__",
- localId,
- new NewKnowledgeBuilderCommand( null ) )}));
-
- sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
- return new KnowledgeBuilderRemoteClient( localId,this.gsd, this.cm );
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new SetVariableCommand( "__TEMP__",
+ localId,
+ new NewKnowledgeBuilderCommand( null ) ) } ) );
+
+ sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
+ return new KnowledgeBuilderRemoteClient( localId,
+ this.gsd,
+ this.cm );
+
}
public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBuilderConfiguration conf) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase, KnowledgeBuilderConfiguration conf) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public KnowledgeBuilder newKnowledgeBuilder(KnowledgeBase kbase,
+ KnowledgeBuilderConfiguration conf) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public JaxbConfiguration newJaxbConfiguration(Options xjcOpts, String systemId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public JaxbConfiguration newJaxbConfiguration(Options xjcOpts,
+ String systemId) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public static Object sendMessage(ConversationManager conversationManager,
- Serializable addr,
- String id,
- Object body) {
+ Serializable addr,
+ String id,
+ Object body) {
InetSocketAddress[] sockets = null;
- if (addr instanceof InetSocketAddress[]) {
+ if ( addr instanceof InetSocketAddress[] ) {
sockets = (InetSocketAddress[]) addr;
- } else if (addr instanceof InetSocketAddress) {
- sockets = new InetSocketAddress[1];
+ } else if ( addr instanceof InetSocketAddress ) {
+ sockets = new InetSocketAddress[ 1 ];
sockets[0] = (InetSocketAddress) addr;
}
-
BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
Exception exception = null;
- for (InetSocketAddress socket : sockets) {
+ for ( InetSocketAddress socket : sockets ) {
try {
- Conversation conv = conversationManager.startConversation(socket,
- id);
- conv.sendMessage(body,
- handler);
+ Conversation conv = conversationManager.startConversation( socket,
+ id );
+ conv.sendMessage( body,
+ handler );
exception = null;
- } catch (Exception e) {
+ } catch ( Exception e ) {
exception = e;
conversationManager.endConversation();
}
- if (exception == null) {
+ if ( exception == null ) {
break;
}
}
- if (exception != null) {
- throw new RuntimeException("Unable to send message",
- exception);
+ if ( exception != null ) {
+ throw new RuntimeException( "Unable to send message",
+ exception );
}
try {
return handler.getMessage().getBody();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderRemoteClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/KnowledgeBuilderRemoteClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -48,46 +48,50 @@
*
* @author salaboy
*/
-public class KnowledgeBuilderRemoteClient implements KnowledgeBuilder{
+public class KnowledgeBuilderRemoteClient
+ implements
+ KnowledgeBuilder {
- private String instanceId;
- private ConversationManager cm;
+ private String instanceId;
+ private ConversationManager cm;
private GridServiceDescription gsd;
-
- public KnowledgeBuilderRemoteClient(String localId, GridServiceDescription gsd, ConversationManager cm) {
+
+ public KnowledgeBuilderRemoteClient(String localId,
+ GridServiceDescription gsd,
+ ConversationManager cm) {
this.instanceId = localId;
this.gsd = gsd;
this.cm = cm;
}
-
-
- public void add(Resource resource, ResourceType type) {
- add(resource, type, null);
-
+ public void add(Resource resource,
+ ResourceType type) {
+ add( resource,
+ type,
+ null );
+
}
- public void add(Resource resource, ResourceType type, ResourceConfiguration configuration) {
-
+ public void add(Resource resource,
+ ResourceType type,
+ ResourceConfiguration configuration) {
+
String localId = UUID.randomUUID().toString();
-
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{new KnowledgeContextResolveFromContextCommand( new KnowledgeBuilderAddCommand( resource,
- type,
- configuration ),
- this.instanceId,
- null,
- null,
- null )}));
-
- sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
-
-
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new KnowledgeContextResolveFromContextCommand( new KnowledgeBuilderAddCommand( resource,
+ type,
+ configuration ),
+ this.instanceId,
+ null,
+ null,
+ null ) } ) );
+
+ sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
}
public Collection<KnowledgePackage> getKnowledgePackages() {
@@ -95,71 +99,67 @@
}
public KnowledgeBase newKnowledgeBase() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public boolean hasErrors() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeBuilderErrors getErrors() {
String commandId = "kbuilder.getErrors_" + this.gsd.getId();
String kresultsId = "kresults_" + this.gsd.getId();
String localId = UUID.randomUUID().toString();
-
-
-
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{new KnowledgeContextResolveFromContextCommand( new KnowledgeBuilderGetErrorsCommand( ),
- this.instanceId,
- null,
- null,
- kresultsId ) }));
-
- Object result = sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
- return (KnowledgeBuilderErrors) result;
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new KnowledgeContextResolveFromContextCommand( new KnowledgeBuilderGetErrorsCommand(),
+ this.instanceId,
+ null,
+ null,
+ kresultsId ) } ) );
+ Object result = sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
+ return (KnowledgeBuilderErrors) result;
+
}
-
- public static Object sendMessage(ConversationManager conversationManager,
- Serializable addr,
- String id,
- Object body) {
+ public static Object sendMessage(ConversationManager conversationManager,
+ Serializable addr,
+ String id,
+ Object body) {
+
InetSocketAddress[] sockets = null;
- if (addr instanceof InetSocketAddress[]) {
+ if ( addr instanceof InetSocketAddress[] ) {
sockets = (InetSocketAddress[]) addr;
- } else if (addr instanceof InetSocketAddress) {
- sockets = new InetSocketAddress[1];
+ } else if ( addr instanceof InetSocketAddress ) {
+ sockets = new InetSocketAddress[ 1 ];
sockets[0] = (InetSocketAddress) addr;
}
-
BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
Exception exception = null;
- for (InetSocketAddress socket : sockets) {
+ for ( InetSocketAddress socket : sockets ) {
try {
- Conversation conv = conversationManager.startConversation(socket,
- id);
- conv.sendMessage(body,
- handler);
+ Conversation conv = conversationManager.startConversation( socket,
+ id );
+ conv.sendMessage( body,
+ handler );
exception = null;
- } catch (Exception e) {
+ } catch ( Exception e ) {
exception = e;
conversationManager.endConversation();
}
- if (exception == null) {
+ if ( exception == null ) {
break;
}
}
- if (exception != null) {
- throw new RuntimeException("Unable to send message",
- exception);
+ if ( exception != null ) {
+ throw new RuntimeException( "Unable to send message",
+ exception );
}
try {
return handler.getMessage().getBody();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/RemoteGridConnection.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/RemoteGridConnection.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/RemoteGridConnection.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -21,24 +21,25 @@
import org.drools.grid.GridNodeConnection;
import org.drools.grid.GridServiceDescription;
-
/**
*
* @author salaboy
*/
-public class RemoteGridConnection implements GridNodeConnection {
+public class RemoteGridConnection
+ implements
+ GridNodeConnection {
private GridNode gridNode;
-
+
public RemoteGridConnection(GridServiceDescription gsd) {
- this.gridNode = new GridNodeRemoteClient(gsd);
+ this.gridNode = new GridNodeRemoteClient( gsd );
}
public void connect() {
-
+
}
public void disconnect() {
-
+
}
public GridNode getGridNode() {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/StatefulKnowledgeSessionRemoteClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -58,376 +58,384 @@
*
* @author salaboy
*/
-public class StatefulKnowledgeSessionRemoteClient implements StatefulKnowledgeSession {
- private String instanceId;
+public class StatefulKnowledgeSessionRemoteClient
+ implements
+ StatefulKnowledgeSession {
+ private String instanceId;
private GridServiceDescription gsd;
- private ConversationManager cm;
- public StatefulKnowledgeSessionRemoteClient(String localId, GridServiceDescription gsd, ConversationManager cm) {
+ private ConversationManager cm;
+
+ public StatefulKnowledgeSessionRemoteClient(String localId,
+ GridServiceDescription gsd,
+ ConversationManager cm) {
this.instanceId = localId;
this.gsd = gsd;
this.cm = cm;
}
-
-
public int getId() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void dispose() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public int fireAllRules() {
- String kresultsId = "kresults_" + this.gsd.getId();
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{ new KnowledgeContextResolveFromContextCommand( CommandFactory.newFireAllRules( ),
- null,
- null,
- this.instanceId,
- kresultsId )}));
-
- Object result = sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
-
-
+ String kresultsId = "kresults_" + this.gsd.getId();
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new KnowledgeContextResolveFromContextCommand( CommandFactory.newFireAllRules(),
+ null,
+ null,
+ this.instanceId,
+ kresultsId ) } ) );
+
+ Object result = sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
return (Integer) result;
-
-
-// String commandId = "ksession.fireAllRules" + this.messageSession.getNextId();
-// String kresultsId = "kresults_" + this.messageSession.getSessionId();
-//
-// Message msg = new Message( this.messageSession.getSessionId(),
-// this.messageSession.counter.incrementAndGet(),
-// false,
-// new KnowledgeContextResolveFromContextCommand( CommandFactory.newFireAllRules( commandId ),
-// null,
-// null,
-// this.instanceId,
-// kresultsId ) );
-// try {
-// this.connector.connect();
-// Object object = this.connector.write( msg ).getPayload();
-//
-// if ( object == null ) {
-// throw new RuntimeException( "Response was not correctly received" );
-// }
-// this.connector.disconnect();
-// //return (Integer) ((ExecutionResults) object).getValue(commandId);
-// return (Integer) object;
-// } catch ( Exception e ) {
-// throw new RuntimeException( "Unable to execute message",
-// e );
-// }
+
+ // String commandId = "ksession.fireAllRules" + this.messageSession.getNextId();
+ // String kresultsId = "kresults_" + this.messageSession.getSessionId();
+ //
+ // Message msg = new Message( this.messageSession.getSessionId(),
+ // this.messageSession.counter.incrementAndGet(),
+ // false,
+ // new KnowledgeContextResolveFromContextCommand( CommandFactory.newFireAllRules( commandId ),
+ // null,
+ // null,
+ // this.instanceId,
+ // kresultsId ) );
+ // try {
+ // this.connector.connect();
+ // Object object = this.connector.write( msg ).getPayload();
+ //
+ // if ( object == null ) {
+ // throw new RuntimeException( "Response was not correctly received" );
+ // }
+ // this.connector.disconnect();
+ // //return (Integer) ((ExecutionResults) object).getValue(commandId);
+ // return (Integer) object;
+ // } catch ( Exception e ) {
+ // throw new RuntimeException( "Unable to execute message",
+ // e );
+ // }
}
public int fireAllRules(int max) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public int fireAllRules(AgendaFilter agendaFilter) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void fireUntilHalt() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void fireUntilHalt(AgendaFilter agendaFilter) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public <T> T execute(Command<T> command) {
-// String localId = UUID.randomUUID().toString();
-// String commandId = "ksession.execute" + this.gsd.getId();
-// String kresultsId = "kresults_" + this.gsd.getId();
-// CommandImpl cmd = new CommandImpl("execute",
-// Arrays.asList(new Object[]{new KnowledgeContextResolveFromContextCommand( new ExecuteCommand( command ),
-// null,
-// null,
-// this.instanceId,
-// kresultsId )}));
-//
-// Object result = sendMessage(this.cm,
-// (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
-// this.gsd.getServiceInterface().getName(),
-// cmd);
-//
-//
-//
-// return (T) result;
-
-// String commandId = "ksession.execute" + this.messageSession.getNextId();
-// String kresultsId = "kresults_" + this.messageSession.getSessionId();
-//
-// Message msg = new Message( this.messageSession.getSessionId(),
-// this.messageSession.counter.incrementAndGet(),
-// false,
-// new KnowledgeContextResolveFromContextCommand( new ExecuteCommand( commandId,
-// command ),
-// null,
-// null,
-// this.instanceId,
-// kresultsId ) );
-//
-// try {
-// this.connector.connect();
-// Object object = this.connector.write( msg ).getPayload();
-// if ( object == null ) {
-// throw new RuntimeException( "Response was not correctly received" );
-// }
-// this.connector.disconnect();
-// return (ExecutionResults) ((ExecutionResults) object).getValue( commandId );
-// } catch ( Exception e ) {
-// throw new RuntimeException( "Unable to execute message",
-// e );
-// }
- throw new UnsupportedOperationException("Not supported yet.");
-
+ // String localId = UUID.randomUUID().toString();
+ // String commandId = "ksession.execute" + this.gsd.getId();
+ // String kresultsId = "kresults_" + this.gsd.getId();
+ // CommandImpl cmd = new CommandImpl("execute",
+ // Arrays.asList(new Object[]{new KnowledgeContextResolveFromContextCommand( new ExecuteCommand( command ),
+ // null,
+ // null,
+ // this.instanceId,
+ // kresultsId )}));
+ //
+ // Object result = sendMessage(this.cm,
+ // (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
+ // this.gsd.getServiceInterface().getName(),
+ // cmd);
+ //
+ //
+ //
+ // return (T) result;
+
+ // String commandId = "ksession.execute" + this.messageSession.getNextId();
+ // String kresultsId = "kresults_" + this.messageSession.getSessionId();
+ //
+ // Message msg = new Message( this.messageSession.getSessionId(),
+ // this.messageSession.counter.incrementAndGet(),
+ // false,
+ // new KnowledgeContextResolveFromContextCommand( new ExecuteCommand( commandId,
+ // command ),
+ // null,
+ // null,
+ // this.instanceId,
+ // kresultsId ) );
+ //
+ // try {
+ // this.connector.connect();
+ // Object object = this.connector.write( msg ).getPayload();
+ // if ( object == null ) {
+ // throw new RuntimeException( "Response was not correctly received" );
+ // }
+ // this.connector.disconnect();
+ // return (ExecutionResults) ((ExecutionResults) object).getValue( commandId );
+ // } catch ( Exception e ) {
+ // throw new RuntimeException( "Unable to execute message",
+ // e );
+ // }
+ throw new UnsupportedOperationException( "Not supported yet." );
+
}
public <T extends SessionClock> T getSessionClock() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void setGlobal(String identifier, Object object) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void setGlobal(String identifier,
+ Object object) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Object getGlobal(String identifier) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Globals getGlobals() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Calendars getCalendars() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Environment getEnvironment() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeBase getKnowledgeBase() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void registerExitPoint(String name, ExitPoint exitPoint) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void registerExitPoint(String name,
+ ExitPoint exitPoint) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void unregisterExitPoint(String name) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void registerChannel(String name, Channel channel) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void registerChannel(String name,
+ Channel channel) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void unregisterChannel(String name) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Map<String, Channel> getChannels() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public KnowledgeSessionConfiguration getSessionConfiguration() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void halt() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Agenda getAgenda() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public WorkingMemoryEntryPoint getWorkingMemoryEntryPoint(String name) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public Collection<? extends WorkingMemoryEntryPoint> getWorkingMemoryEntryPoints() {
- throw new UnsupportedOperationException("Not supported yet.");
+ public Collection< ? extends WorkingMemoryEntryPoint> getWorkingMemoryEntryPoints() {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public QueryResults getQueryResults(String query, Object... arguments) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public QueryResults getQueryResults(String query,
+ Object... arguments) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public LiveQuery openLiveQuery(String query, Object[] arguments, ViewChangedEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public LiveQuery openLiveQuery(String query,
+ Object[] arguments,
+ ViewChangedEventListener listener) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public String getEntryPointId() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public FactHandle insert(Object object) {
-
+
String kresultsId = "kresults_" + this.gsd.getId();
- CommandImpl cmd = new CommandImpl("execute",
- Arrays.asList(new Object[]{ new KnowledgeContextResolveFromContextCommand( new InsertObjectCommand( object,
- true ),
- null,
- null,
- this.instanceId,
- kresultsId )}));
-
- Object result = sendMessage(this.cm,
- (InetSocketAddress[]) this.gsd.getAddresses().get("socket").getObject(),
- this.gsd.getServiceInterface().getName(),
- cmd);
-
-
-
+ CommandImpl cmd = new CommandImpl( "execute",
+ Arrays.asList( new Object[]{ new KnowledgeContextResolveFromContextCommand( new InsertObjectCommand( object,
+ true ),
+ null,
+ null,
+ this.instanceId,
+ kresultsId ) } ) );
+
+ Object result = sendMessage( this.cm,
+ (InetSocketAddress[]) this.gsd.getAddresses().get( "socket" ).getObject(),
+ this.gsd.getServiceInterface().getName(),
+ cmd );
+
return (FactHandle) result;
}
public void retract(FactHandle handle) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void update(FactHandle handle, Object object) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void update(FactHandle handle,
+ Object object) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public FactHandle getFactHandle(Object object) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Object getObject(FactHandle factHandle) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<Object> getObjects() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<Object> getObjects(ObjectFilter filter) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public <T extends FactHandle> Collection<T> getFactHandles() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public <T extends FactHandle> Collection<T> getFactHandles(ObjectFilter filter) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public long getFactCount() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public ProcessInstance startProcess(String processId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public ProcessInstance startProcess(String processId, Map<String, Object> parameters) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public ProcessInstance startProcess(String processId,
+ Map<String, Object> parameters) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void signalEvent(String type, Object event) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void signalEvent(String type,
+ Object event) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
- public void signalEvent(String type, Object event, long processInstanceId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ public void signalEvent(String type,
+ Object event,
+ long processInstanceId) {
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<ProcessInstance> getProcessInstances() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public ProcessInstance getProcessInstance(long processInstanceId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void abortProcessInstance(long processInstanceId) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public WorkItemManager getWorkItemManager() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void addEventListener(WorkingMemoryEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void removeEventListener(WorkingMemoryEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<WorkingMemoryEventListener> getWorkingMemoryEventListeners() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void addEventListener(AgendaEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void removeEventListener(AgendaEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<AgendaEventListener> getAgendaEventListeners() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void addEventListener(ProcessEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void removeEventListener(ProcessEventListener listener) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public Collection<ProcessEventListener> getProcessEventListeners() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public static Object sendMessage(ConversationManager conversationManager,
- Serializable addr,
- String id,
- Object body) {
+ Serializable addr,
+ String id,
+ Object body) {
InetSocketAddress[] sockets = null;
- if (addr instanceof InetSocketAddress[]) {
+ if ( addr instanceof InetSocketAddress[] ) {
sockets = (InetSocketAddress[]) addr;
- } else if (addr instanceof InetSocketAddress) {
- sockets = new InetSocketAddress[1];
+ } else if ( addr instanceof InetSocketAddress ) {
+ sockets = new InetSocketAddress[ 1 ];
sockets[0] = (InetSocketAddress) addr;
}
-
BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
Exception exception = null;
- for (InetSocketAddress socket : sockets) {
+ for ( InetSocketAddress socket : sockets ) {
try {
- Conversation conv = conversationManager.startConversation(socket,
- id);
- conv.sendMessage(body,
- handler);
+ Conversation conv = conversationManager.startConversation( socket,
+ id );
+ conv.sendMessage( body,
+ handler );
exception = null;
- } catch (Exception e) {
+ } catch ( Exception e ) {
exception = e;
conversationManager.endConversation();
}
- if (exception == null) {
+ if ( exception == null ) {
break;
}
}
- if (exception != null) {
- throw new RuntimeException("Unable to send message",
- exception);
+ if ( exception != null ) {
+ throw new RuntimeException( "Unable to send message",
+ exception );
}
try {
return handler.getMessage().getBody();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptor.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -19,8 +19,8 @@
public class MinaAcceptor
implements
Acceptor {
- private IoAcceptor acceptor;
-
+ private IoAcceptor acceptor;
+
private MessageReceiverHandler handler;
public MinaAcceptor() {
@@ -42,7 +42,7 @@
acceptor.getSessionConfig().setIdleTime( IdleStatus.BOTH_IDLE,
10 );
}
-
+
this.handler = handler;
acceptor.setHandler( new MinaIoHandler( systemEventListener,
handler ) );
@@ -80,5 +80,5 @@
public MessageReceiverHandler getMessageReceiverHandler() {
return this.handler;
}
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptorFactoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptorFactoryService.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaAcceptorFactoryService.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,10 +3,12 @@
import org.drools.grid.io.Acceptor;
import org.drools.grid.io.AcceptorFactoryService;
-public class MinaAcceptorFactoryService implements AcceptorFactoryService {
+public class MinaAcceptorFactoryService
+ implements
+ AcceptorFactoryService {
public Acceptor newAcceptor() {
return new MinaAcceptor();
}
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaConnector.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaConnector.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaConnector.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -23,12 +23,12 @@
public class MinaConnector
implements
Connector {
-
- protected MinaIoWriter writer;
- protected SocketConnector connector;
+ protected MinaIoWriter writer;
- public MinaConnector() {
+ protected SocketConnector connector;
+
+ public MinaConnector() {
}
/**
@@ -60,24 +60,24 @@
new ProtocolCodecFilter(
new ObjectSerializationCodecFactory() ) );
}
-
-// this.handler = new MessageHandler() {
-// private Map<Integer, MessageResponseHandler> map = new HashMap<Integer, MessageResponseHandler>();
-//
-// public void messageReceived(IoWriter session,
-// Message msg) throws Exception {
-// MessageResponseHandler responseHandler = map.remove( msg.getRequestId() );
-// if ( responseHandler != null ) {
-// responseHandler.receive( msg );
-// }
-// }
-//
-// public void addResponseHandler(int id,
-// MessageResponseHandler responseHandler) {
-// map.put( id, responseHandler );
-// }
-// };
+ // this.handler = new MessageHandler() {
+ // private Map<Integer, MessageResponseHandler> map = new HashMap<Integer, MessageResponseHandler>();
+ //
+ // public void messageReceived(IoWriter session,
+ // Message msg) throws Exception {
+ // MessageResponseHandler responseHandler = map.remove( msg.getRequestId() );
+ // if ( responseHandler != null ) {
+ // responseHandler.receive( msg );
+ // }
+ // }
+ //
+ // public void addResponseHandler(int id,
+ // MessageResponseHandler responseHandler) {
+ // map.put( id, responseHandler );
+ // }
+ // };
+
this.connector.setHandler( new MinaIoHandler( systemEventListener,
handler ) );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaIoWriter.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaIoWriter.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/remote/mina/MinaIoWriter.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -16,32 +16,33 @@
public class MinaIoWriter
implements
IoWriter {
-// protected final String id;
-// protected final MessageHandler handler;
- private IoSession session;
-// private RequestResponseDispatchListener reqResDisListener;
+ // protected final String id;
+ // protected final MessageHandler handler;
+ private IoSession session;
-// protected String conversationId;
-// protected final AtomicInteger requestIdCounter;
+ // private RequestResponseDispatchListener reqResDisListener;
+ // protected String conversationId;
+ // protected final AtomicInteger requestIdCounter;
+
public MinaIoWriter(
-// String id,
-// String conversationId,
+ // String id,
+ // String conversationId,
IoSession session
-// MessageHandler handler
- ) {
-// this.id = id;
-// this.conversationId = conversationId;
+ // MessageHandler handler
+ ) {
+ // this.id = id;
+ // this.conversationId = conversationId;
this.session = session;
-// this.reqResDisListener = new RequestResponseDispatchListener(this);
-// this.handler = handler;
-// this.requestIdCounter = new AtomicInteger();
+ // this.reqResDisListener = new RequestResponseDispatchListener(this);
+ // this.handler = handler;
+ // this.requestIdCounter = new AtomicInteger();
}
-// public String getId() {
-// return this.id;
-// }
-
+ // public String getId() {
+ // return this.id;
+ // }
+
public IoSession getIoSession() {
return this.session;
}
@@ -50,36 +51,35 @@
this.session = null;
}
-// private void addResponseHandler(int id,
-// MessageReceiverHandler responseHandler) {
-// this.handler.addResponseHandler( id,
-// responseHandler );
-// }
+ // private void addResponseHandler(int id,
+ // MessageReceiverHandler responseHandler) {
+ // this.handler.addResponseHandler( id,
+ // responseHandler );
+ // }
public void write(Message msg) {
if ( this.session == null || !this.session.isConnected() ) {
throw new IllegalStateException( "Cannot write message and socket is not open" );
}
-
-// int requestId = msg.getRequestId();
-// if ( requestId != -1 ) {
-// this.reqResDisListener.addMessageReceiverHandler( requestId, responseHandler );
-// }
-// int requestId = -1;
-// if ( responseHandler != null ) {
-// requestId = this.requestIdCounter.getAndIncrement();
-// addResponseHandler( requestId,
-// responseHandler );
-// }
-// Message msg = new MessageImpl( this.conversationId,
-// this.id,
-//
-// requestId,
-// null,
-// body );
+ // int requestId = msg.getRequestId();
+ // if ( requestId != -1 ) {
+ // this.reqResDisListener.addMessageReceiverHandler( requestId, responseHandler );
+ // }
+ // int requestId = -1;
+ // if ( responseHandler != null ) {
+ // requestId = this.requestIdCounter.getAndIncrement();
+ // addResponseHandler( requestId,
+ // responseHandler );
+ // }
+ // Message msg = new MessageImpl( this.conversationId,
+ // this.id,
+ //
+ // requestId,
+ // null,
+ // body );
this.session.write( msg );
}
-
+
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/Address.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/Address.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/Address.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,18 +1,15 @@
package org.drools.grid.service.directory;
-
-
import org.drools.grid.GridServiceDescription;
public interface Address {
-
+
public GridServiceDescription getGridServiceDescription();
-
+
public String getTransport();
-
+
public Object getObject();
-
+
public void setObject(Object object);
-
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/WhitePages.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/WhitePages.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/WhitePages.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,10 +3,10 @@
import org.drools.grid.GridServiceDescription;
public interface WhitePages {
- public GridServiceDescription create(String serviceDescriptionId);
-
+ public GridServiceDescription create(String serviceDescriptionId);
+
public void remove(String serviceDescriptionId);
-
+
public GridServiceDescription lookup(String serviceDescriptionId);
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/YellowPages.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/YellowPages.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/YellowPages.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,5 +1,5 @@
package org.drools.grid.service.directory;
public interface YellowPages {
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -87,6 +87,4 @@
return "Address id=" + id + " tranport=" + transport + " object=" + object;
}
-
-
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressJpa.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressJpa.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/AddressJpa.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -9,40 +9,43 @@
import org.drools.grid.GridServiceDescription;
import org.drools.grid.service.directory.Address;
-public class AddressJpa implements Address, Serializable {
- private Address detached;
-
- transient
- private EntityManagerFactory emf;
-
+public class AddressJpa
+ implements
+ Address,
+ Serializable {
+ private Address detached;
+
+ transient private EntityManagerFactory emf;
+
public AddressJpa(Address detached,
EntityManagerFactory emf) {
this.detached = detached;
this.emf = emf;
}
-
+
public GridServiceDescription getGridServiceDescription() {
return this.detached.getGridServiceDescription();
}
-
+
public Object getObject() {
return this.detached.getObject();
}
-
+
public String getTransport() {
return this.detached.getTransport();
}
-
+
public void setObject(Object object) {
EntityManager em = this.emf.createEntityManager();
em.getTransaction().begin();
- this.detached = em.find( AddressImpl.class, ((AddressImpl)this.detached).getId() );
- this.detached.setObject( object );
+ this.detached = em.find( AddressImpl.class,
+ ((AddressImpl) this.detached).getId() );
+ this.detached.setObject( object );
em.getTransaction().commit();
- em.close();
+ em.close();
}
-
+
private Object readResolve() throws ObjectStreamException {
return this.detached;
- }
+ }
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/CoreServicesWhitePagesImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -5,9 +5,11 @@
import org.drools.grid.CoreServicesWhitePages;
import org.drools.grid.GridServiceDescription;
-public class CoreServicesWhitePagesImpl implements CoreServicesWhitePages {
+public class CoreServicesWhitePagesImpl
+ implements
+ CoreServicesWhitePages {
private Map<String, GridServiceDescription> services;
-
+
public CoreServicesWhitePagesImpl(Map<String, GridServiceDescription> services) {
this.services = services;
}
@@ -17,7 +19,7 @@
}
public GridServiceDescription lookup(Class cls) {
- return this.services.get(cls.getName());
+ return this.services.get( cls.getName() );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -25,7 +25,6 @@
private GridServiceDescription detachedLocal;
-
public GridServiceDescriptionClient(GridServiceDescription detachedLocal,
GridServiceDescription whitePagesGsd,
ConversationManager conversationManager) {
@@ -50,7 +49,8 @@
public Map<String, Address> getAddresses() {
Map<String, Address> addresses = new HashMap<String, Address>();
for ( Address address : this.detachedLocal.getAddresses().values() ) {
- addresses.put( address.getTransport(), new AddressClient( address,
+ addresses.put( address.getTransport(),
+ new AddressClient( address,
this.whitePagesGsd,
this.conversationManager ) );
}
@@ -84,22 +84,17 @@
whitePagesGsd.getId(),
cmd );
}
-
-
@Override
public boolean equals(Object obj) {
//@TODO: improve equals comparision
final GridServiceDescription other = (GridServiceDescription) obj;
- if (!this.getId().equals(other.getId() )) {
+ if ( !this.getId().equals( other.getId() ) ) {
return false;
}
return true;
}
-
-
-
@Override
public int hashCode() {
int hash = 7;
@@ -114,9 +109,9 @@
CommandImpl cmd = new CommandImpl( "GridServiceDescription.getData",
null );
Serializable data = (Serializable) sendMessage( this.conversationManager,
- sockets,
- whitePagesGsd.getId(),
- cmd );
+ sockets,
+ whitePagesGsd.getId(),
+ cmd );
return data;
}
@@ -124,24 +119,19 @@
InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) whitePagesGsd.getAddresses().get( "socket" )).getObject();
CommandImpl cmd = new CommandImpl( "GridServiceDescription.setData",
Arrays.asList( new Object[]{ data } ) );
- sendMessage( this.conversationManager,
+ sendMessage( this.conversationManager,
sockets,
whitePagesGsd.getId(),
cmd );
-
+
}
public Class getServiceInterface() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void setServiceInterface(Class cls) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
-
-
-
-
-
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -14,47 +14,47 @@
implements
GridServiceDescription,
Serializable {
-
+
private String id;
private Class implementedClass;
-
+
private Class serviceInterface;
-
+
private Map<String, Address> addresses = new HashMap<String, Address>();
-
- private Serializable data;
-
+
+ private Serializable data;
+
public GridServiceDescriptionImpl() {
-
+
}
public GridServiceDescriptionImpl(Class cls) {
this( cls.getCanonicalName() );
this.implementedClass = cls;
}
-
+
public GridServiceDescriptionImpl(String id) {
-
+
this.id = id;
}
public String getId() {
return id;
}
-
+
public void setId(String id) {
- this.id = id;
+ this.id = id;
}
- public Class getServiceInterface(){
+ public Class getServiceInterface() {
return this.serviceInterface;
}
-
- public void setServiceInterface(Class serviceInterface){
+
+ public void setServiceInterface(Class serviceInterface) {
this.serviceInterface = serviceInterface;
}
-
+
public Class getImplementedClass() {
return implementedClass;
}
@@ -64,7 +64,9 @@
}
public synchronized Address addAddress(String protocol) {
- AddressImpl address = new AddressImpl( this, protocol, null );
+ AddressImpl address = new AddressImpl( this,
+ protocol,
+ null );
this.addresses.put( address.getTransport(),
address );
return address;
@@ -77,7 +79,6 @@
public synchronized void removeAddress(String transport) {
this.addresses.remove( transport );
}
-
@Override
public int hashCode() {
@@ -93,22 +94,21 @@
public boolean equals(Object obj) {
//@TODO: improve equals comparision
final GridServiceDescription other = (GridServiceDescription) obj;
- if (!this.getId().equals(other.getId() )) {
+ if ( !this.getId().equals( other.getId() ) ) {
return false;
}
return true;
}
-
@Override
public String toString() {
- String result = id + "@";
-
+ String result = id + "@";
+
Set<String> keys = addresses.keySet();
- for(String key : keys){
- if(addresses.get(key).getObject() instanceof InetSocketAddress[] ){
- result += key+"=["+((InetSocketAddress[])addresses.get(key).getObject())[0].getHostName()+":"+
- ((InetSocketAddress[])addresses.get(key).getObject())[0].getPort()+"]/"+addresses.get(key).getTransport();
+ for ( String key : keys ) {
+ if ( addresses.get( key ).getObject() instanceof InetSocketAddress[] ) {
+ result += key + "=[" + ((InetSocketAddress[]) addresses.get( key ).getObject())[0].getHostName() + ":" +
+ ((InetSocketAddress[]) addresses.get( key ).getObject())[0].getPort() + "]/" + addresses.get( key ).getTransport();
}
}
return result;
@@ -121,7 +121,5 @@
public void setData(Serializable data) {
this.data = data;
}
-
-
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionJpa.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionJpa.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/GridServiceDescriptionJpa.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -14,9 +14,10 @@
public class GridServiceDescriptionJpa
implements
- GridServiceDescription, Serializable {
+ GridServiceDescription,
+ Serializable {
private GridServiceDescription detached;
-
+
private EntityManagerFactory emf;
public GridServiceDescriptionJpa(GridServiceDescription detached,
@@ -29,7 +30,8 @@
EntityManager em = this.emf.createEntityManager();
Map<String, Address> addresses = new HashMap<String, Address>();
for ( Address address : this.detached.getAddresses().values() ) {
- addresses.put( address.getTransport(), new AddressJpa( address,
+ addresses.put( address.getTransport(),
+ new AddressJpa( address,
this.emf ) );
}
em.close();
@@ -39,18 +41,21 @@
public Address addAddress(String transport) {
EntityManager em = this.emf.createEntityManager();
em.getTransaction().begin();
- this.detached = em.find( GridServiceDescriptionImpl.class, this.detached.getId() );
+ this.detached = em.find( GridServiceDescriptionImpl.class,
+ this.detached.getId() );
Address address = this.detached.addAddress( transport );
em.getTransaction().commit();
em.close();
- return new AddressJpa( address, this.emf );
+ return new AddressJpa( address,
+ this.emf );
}
public void removeAddress(String transport) {
EntityManager em = this.emf.createEntityManager();
- em.getTransaction().begin();
- this.detached = em.find( GridServiceDescriptionImpl.class, this.detached.getId() );
+ em.getTransaction().begin();
+ this.detached = em.find( GridServiceDescriptionImpl.class,
+ this.detached.getId() );
Address address = this.detached.getAddresses().get( transport );
this.detached.removeAddress( transport );
em.remove( address ); //because jpa does not automatically remove orphans
@@ -69,7 +74,8 @@
public void setImplementedClass(Class cls) {
EntityManager em = this.emf.createEntityManager();
em.getTransaction().begin();
- this.detached = em.find( GridServiceDescriptionImpl.class, this.detached.getId() );
+ this.detached = em.find( GridServiceDescriptionImpl.class,
+ this.detached.getId() );
this.detached.setImplementedClass( cls );
em.getTransaction().commit();
em.close();
@@ -79,22 +85,22 @@
return this.detached;
}
- public Serializable getData() {
+ public Serializable getData() {
EntityManager em = this.emf.createEntityManager();
em.getTransaction().begin();
- this.detached = em.find( GridServiceDescriptionImpl.class, this.detached.getId() );
+ this.detached = em.find( GridServiceDescriptionImpl.class,
+ this.detached.getId() );
Serializable data = this.detached.getData();
em.getTransaction().commit();
em.close();
return data;
}
-
- @Override
+ @Override
public boolean equals(Object obj) {
//@TODO: improve equals comparision
final GridServiceDescription other = (GridServiceDescription) obj;
- if (!this.getId().equals(other.getId() )) {
+ if ( !this.getId().equals( other.getId() ) ) {
return false;
}
return true;
@@ -110,21 +116,19 @@
public void setData(Serializable data) {
EntityManager em = this.emf.createEntityManager();
em.getTransaction().begin();
- this.detached = em.find( GridServiceDescriptionImpl.class, this.detached.getId() );
- this.detached.setData(data);
+ this.detached = em.find( GridServiceDescriptionImpl.class,
+ this.detached.getId() );
+ this.detached.setData( data );
em.getTransaction().commit();
em.close();
}
public Class getServiceInterface() {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
public void setServiceInterface(Class cls) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
-
-
-
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/JpaWhitePages.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/JpaWhitePages.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/JpaWhitePages.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -1,6 +1,5 @@
package org.drools.grid.service.directory.impl;
-
import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
@@ -28,20 +27,23 @@
em.persist( gsd );
em.getTransaction().commit();
em.close();
- return new GridServiceDescriptionJpa( gsd, emf );
+ return new GridServiceDescriptionJpa( gsd,
+ emf );
}
public GridServiceDescription lookup(String serviceDescriptionId) {
GridServiceDescription gsd = this.emf.createEntityManager().find( GridServiceDescriptionImpl.class,
serviceDescriptionId );
- return ( gsd == null ) ? null : new GridServiceDescriptionJpa( gsd, emf );
+ return (gsd == null) ? null : new GridServiceDescriptionJpa( gsd,
+ emf );
}
public void remove(String serviceDescriptionId) {
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
- GridServiceDescription gsd = em.find( GridServiceDescriptionImpl.class, serviceDescriptionId );
- for ( Address address :gsd.getAddresses().values() ) { // because JPA won't cascade delete to orphans
+ GridServiceDescription gsd = em.find( GridServiceDescriptionImpl.class,
+ serviceDescriptionId );
+ for ( Address address : gsd.getAddresses().values() ) { // because JPA won't cascade delete to orphans
em.remove( address );
}
em.remove( gsd );
@@ -54,7 +56,7 @@
}
public List<GridServiceDescription> lookupServices(Class clazz) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
// public GridServiceDescription create(GridServiceDescription serviceDescription) {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/RegisterWhitePagesConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/RegisterWhitePagesConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/RegisterWhitePagesConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -17,7 +17,6 @@
package org.drools.grid.service.directory.impl;
-
import java.net.InetSocketAddress;
import org.drools.grid.CoreServicesWhitePages;
import org.drools.grid.Grid;
@@ -33,55 +32,59 @@
*
* @author salaboy
*/
-public class RegisterWhitePagesConfiguration implements GridPeerServiceConfiguration {
+public class RegisterWhitePagesConfiguration
+ implements
+ GridPeerServiceConfiguration {
public RegisterWhitePagesConfiguration() {
}
-
public void configureService(Grid grid) {
CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
- GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup(WhitePages.class);
- if ( gsd == null ) {
- gsd = new GridServiceDescriptionImpl( WhitePages.class );
- }
+ GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( WhitePages.class );
+ if ( gsd == null ) {
+ gsd = new GridServiceDescriptionImpl( WhitePages.class );
+ }
-
MultiplexSocketService mss = grid.get( MultiplexSocketService.class );
int port = mss.getPorts().iterator().next();
GridServiceDescription service = coreServicesWP.getServices().get( WhitePages.class.getName() );
- if( service == null){
- coreServicesWP.getServices().put(WhitePages.class.getName(), gsd);
- service = gsd;
+ if ( service == null ) {
+ coreServicesWP.getServices().put( WhitePages.class.getName(),
+ gsd );
+ service = gsd;
+ }
+ Address address = null;
+ if ( service.getAddresses().get( "socket" ) != null ) {
+ address = service.getAddresses().get( "socket" );
+ } else {
+ address = service.addAddress( "socket" );
+ }
+
+ InetSocketAddress[] addresses = (InetSocketAddress[]) address.getObject();
+ if ( addresses != null && addresses.length >= 1 ) {
+ InetSocketAddress[] newAddresses = new InetSocketAddress[ addresses.length + 1 ];
+ if ( addresses != null ) {
+ System.arraycopy( addresses,
+ 0,
+ newAddresses,
+ 0,
+ addresses.length );
}
- Address address = null;
- if(service.getAddresses().get("socket") != null){
- address = service.getAddresses().get("socket");
- } else{
- address = service.addAddress( "socket" );
- }
-
- InetSocketAddress[] addresses = (InetSocketAddress[])address.getObject();
- if(addresses != null && addresses.length >= 1){
- InetSocketAddress[] newAddresses = new InetSocketAddress[addresses.length+1];
- if(addresses !=null){
- System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
- }
-
- newAddresses[addresses.length]= new InetSocketAddress( mss.getIp(),
- port);
- ServiceConfiguration conf = new WhitePagesServiceConfiguration(newAddresses);
- service.setData(conf);
- }else{
- InetSocketAddress[] newAddress = new InetSocketAddress[1];
- newAddress[0]= new InetSocketAddress( mss.getIp(),
- port);
- address.setObject( newAddress );
- ServiceConfiguration conf = new WhitePagesServiceConfiguration(newAddress);
- service.setData(conf);
- }
+
+ newAddresses[addresses.length] = new InetSocketAddress( mss.getIp(),
+ port );
+ ServiceConfiguration conf = new WhitePagesServiceConfiguration( newAddresses );
+ service.setData( conf );
+ } else {
+ InetSocketAddress[] newAddress = new InetSocketAddress[ 1 ];
+ newAddress[0] = new InetSocketAddress( mss.getIp(),
+ port );
+ address.setObject( newAddress );
+ ServiceConfiguration conf = new WhitePagesServiceConfiguration( newAddress );
+ service.setData( conf );
+ }
}
-
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -29,19 +29,18 @@
this.whitePagesGsd = gsd;
this.conversationManager = conversationManager;
}
-
public static Object sendMessage(ConversationManager conversationManager,
Serializable addr,
String id,
Object body) {
-
+
InetSocketAddress[] sockets = null;
- if(addr instanceof InetSocketAddress[]){
- sockets = (InetSocketAddress[])addr;
- }else if (addr instanceof InetSocketAddress){
- sockets = new InetSocketAddress[1];
- sockets[0] = (InetSocketAddress)addr;
+ if ( addr instanceof InetSocketAddress[] ) {
+ sockets = (InetSocketAddress[]) addr;
+ } else if ( addr instanceof InetSocketAddress ) {
+ sockets = new InetSocketAddress[ 1 ];
+ sockets[0] = (InetSocketAddress) addr;
}
BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
Exception exception = null;
@@ -75,24 +74,24 @@
InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) whitePagesGsd.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(),
- cmd );
- return new GridServiceDescriptionClient(gsd,
- this.whitePagesGsd,
- this.conversationManager );
+ GridServiceDescription gsd = (GridServiceDescription) sendMessage( this.conversationManager,
+ sockets,
+ this.whitePagesGsd.getId(),
+ cmd );
+ return new GridServiceDescriptionClient( gsd,
+ this.whitePagesGsd,
+ this.conversationManager );
}
public GridServiceDescription lookup(String serviceDescriptionId) {
InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) whitePagesGsd.getAddresses().get( "socket" )).getObject();
CommandImpl cmd = new CommandImpl( "WhitePages.lookup",
Arrays.asList( new Object[]{ serviceDescriptionId } ) );
- GridServiceDescription gsd = ( GridServiceDescription ) sendMessage( this.conversationManager,
+ GridServiceDescription gsd = (GridServiceDescription) sendMessage( this.conversationManager,
sockets,
this.whitePagesGsd.getId(),
cmd );
- return (gsd == null ) ? gsd : new GridServiceDescriptionClient(gsd,
+ return (gsd == null) ? gsd : new GridServiceDescriptionClient( gsd,
this.whitePagesGsd,
this.conversationManager );
}
@@ -100,19 +99,17 @@
public void remove(String serviceDescriptionId) {
InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) whitePagesGsd.getAddresses().get( "socket" )).getObject();
CommandImpl cmd = new CommandImpl( "WhitePages.remove",
- Arrays.asList( new Object[]{ serviceDescriptionId } ) );
+ Arrays.asList( new Object[]{ serviceDescriptionId } ) );
sendMessage( this.conversationManager,
sockets,
this.whitePagesGsd.getId(),
- cmd );
+ cmd );
}
public MessageReceiverHandler getMessageReceiverHandler() {
return new WhitePagesServer( this );
}
-
-
// public void addAddress(String id,
// Address address) {
// InetSocketAddress[] sockets = ( InetSocketAddress[] ) ((Address) whitePagesGsd.getAddresses().get( "socket" )).getObject();
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -11,23 +11,26 @@
import org.drools.grid.io.MessageReceiverHandler;
import org.drools.grid.service.directory.WhitePages;
-public class WhitePagesImpl implements WhitePages, MessageReceiverHandlerFactoryService {
+public class WhitePagesImpl
+ implements
+ WhitePages,
+ MessageReceiverHandlerFactoryService {
private Map<String, GridServiceDescription> directory = new ConcurrentHashMap<String, GridServiceDescription>();
-
-
+
public GridServiceDescription create(String serviceDescriptionId) {
-
+
//GridServiceDescription gsd = new GridServiceDescriptionImpl( serviceDescriptionId );
GridServiceDescription gsd = GridServiceDescriptionFactory.newGridServiceDescritpion( serviceDescriptionId );
//this.directory.put(gsd.getServiceInterface().getCanonicalName() , gsd );
- this.directory.put(gsd.getId() , gsd );
+ this.directory.put( gsd.getId(),
+ gsd );
return gsd;
}
public GridServiceDescription lookup(String serviceDescriptionId) {
return this.directory.get( serviceDescriptionId );
}
-
+
public void remove(String serviceDescriptionId) {
this.directory.remove( serviceDescriptionId );
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesPeeredConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesPeeredConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesPeeredConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -9,7 +9,7 @@
public class WhitePagesPeeredConfiguration
implements
GridPeerServiceConfiguration {
-
+
public void configureService(Grid grid) {
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServiceConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServiceConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesServiceConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -25,10 +25,12 @@
*
* @author salaboy
*/
-public class WhitePagesServiceConfiguration implements ServiceConfiguration{
-
+public class WhitePagesServiceConfiguration
+ implements
+ ServiceConfiguration {
+
private InetSocketAddress[] addresses;
-
+
public WhitePagesServiceConfiguration(InetSocketAddress[] addresses) {
this.addresses = addresses;
}
@@ -37,8 +39,5 @@
//get addresses from the grid.. or whatever
return addresses;
}
-
-
-
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/service/directory/impl/WhitePagesSocketConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -16,10 +16,10 @@
import org.drools.grid.service.directory.WhitePages;
public class WhitePagesSocketConfiguration
-implements
-GridPeerServiceConfiguration {
+ implements
+ GridPeerServiceConfiguration {
private int port = -1;
-
+
public WhitePagesSocketConfiguration(int port) {
this.port = port;
}
@@ -27,7 +27,7 @@
public int getPort() {
return port;
}
-
+
public void configureService(Grid grid) {
WhitePages wp = grid.get( WhitePages.class );
@@ -41,31 +41,31 @@
MultiplexSocketService mss = grid.get( MultiplexSocketService.class );
-// GridServiceDescription service = coreServicesWP.getServices().get( WhitePages.class.getName() );
-// if( service == null){
-// coreServicesWP.getServices().put(WhitePages.class.getName(), gsd);
-// service = gsd;
-// }
-//
-// Address address = null;
-// if(service.getAddresses().get("socket") != null){
-// address = service.getAddresses().get("socket");
-// } else{
-// address = service.addAddress( "socket" );
-// }
-// InetSocketAddress[] addresses = (InetSocketAddress[])address.getObject();
-// int newAddressesLenght = 1;
-// if(addresses != null){
-// newAddressesLenght = addresses.length + 1;
-// }
-// InetSocketAddress[] newAddresses = new InetSocketAddress[newAddressesLenght];
-// if(addresses !=null){
-// System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
-// }
-// newAddresses[newAddressesLenght-1]= new InetSocketAddress( mss.getIp(),
-// this.port);
-// address.setObject( newAddresses );
-
+ // GridServiceDescription service = coreServicesWP.getServices().get( WhitePages.class.getName() );
+ // if( service == null){
+ // coreServicesWP.getServices().put(WhitePages.class.getName(), gsd);
+ // service = gsd;
+ // }
+ //
+ // Address address = null;
+ // if(service.getAddresses().get("socket") != null){
+ // address = service.getAddresses().get("socket");
+ // } else{
+ // address = service.addAddress( "socket" );
+ // }
+ // InetSocketAddress[] addresses = (InetSocketAddress[])address.getObject();
+ // int newAddressesLenght = 1;
+ // if(addresses != null){
+ // newAddressesLenght = addresses.length + 1;
+ // }
+ // InetSocketAddress[] newAddresses = new InetSocketAddress[newAddressesLenght];
+ // if(addresses !=null){
+ // System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
+ // }
+ // newAddresses[newAddressesLenght-1]= new InetSocketAddress( mss.getIp(),
+ // this.port);
+ // address.setObject( newAddresses );
+
mss.addService( this.port,
WhitePages.class.getName(),
((MessageReceiverHandlerFactoryService) wp).getMessageReceiverHandler() );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/CoreServicesScheduler.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/CoreServicesScheduler.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/CoreServicesScheduler.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -24,8 +24,7 @@
* @author salaboy
*/
-
public interface CoreServicesScheduler {
public void scheduleJob(ScheduledJob job);
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -3,7 +3,6 @@
*/
package org.drools.grid.timer.impl;
-
import org.drools.grid.CoreServicesWhitePages;
import org.drools.grid.Grid;
import org.drools.grid.GridPeerServiceConfiguration;
@@ -15,15 +14,17 @@
implements
GridPeerServiceConfiguration {
- public CoreServicesSchedulerConfiguration() {
-
+ public CoreServicesSchedulerConfiguration() {
+
}
public void configureService(Grid grid) {
- CoreServicesWhitePages wp = grid.get(CoreServicesWhitePages.class);
-
+ CoreServicesWhitePages wp = grid.get( CoreServicesWhitePages.class );
+
((GridImpl) grid).addService( CoreServicesScheduler.class,
- new CoreServicesSchedulerImpl( new SchedulerImpl("scheduler:core",grid) ) );
- wp.getServices().put(CoreServicesScheduler.class.getName(), new GridServiceDescriptionImpl(CoreServicesScheduler.class));
+ new CoreServicesSchedulerImpl( new SchedulerImpl( "scheduler:core",
+ grid ) ) );
+ wp.getServices().put( CoreServicesScheduler.class.getName(),
+ new GridServiceDescriptionImpl( CoreServicesScheduler.class ) );
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/CoreServicesSchedulerImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -20,23 +20,24 @@
import org.drools.grid.timer.CoreServicesScheduler;
import org.drools.time.SchedulerService;
-
/**
*
* @author salaboy
*/
-public class CoreServicesSchedulerImpl implements CoreServicesScheduler {
+public class CoreServicesSchedulerImpl
+ implements
+ CoreServicesScheduler {
-
private SchedulerService scheduler;
-
-
+
public CoreServicesSchedulerImpl(SchedulerService scheduler) {
this.scheduler = scheduler;
}
public void scheduleJob(ScheduledJob job) {
- this.scheduler.scheduleJob(job.getJob(), job.getJobContext(), job.getTrigger());
+ this.scheduler.scheduleJob( job.getJob(),
+ job.getJobContext(),
+ job.getTrigger() );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/RegisterSchedulerConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -30,52 +30,58 @@
*
* @author salaboy
*/
-public class RegisterSchedulerConfiguration implements GridPeerServiceConfiguration {
+public class RegisterSchedulerConfiguration
+ implements
+ GridPeerServiceConfiguration {
public RegisterSchedulerConfiguration() {
}
public void configureService(Grid grid) {
- CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get(CoreServicesWhitePages.class);
+ CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
- GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup(SchedulerService.class);
- if (gsd == null) {
- gsd = new GridServiceDescriptionImpl(SchedulerService.class);
+ GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( SchedulerService.class );
+ if ( gsd == null ) {
+ gsd = new GridServiceDescriptionImpl( SchedulerService.class );
}
-
- MultiplexSocketService mss = grid.get(MultiplexSocketService.class);
+ MultiplexSocketService mss = grid.get( MultiplexSocketService.class );
int port = mss.getPorts().iterator().next();
- GridServiceDescription service = coreServicesWP.getServices().get(SchedulerService.class.getName());
- if (service == null) {
- coreServicesWP.getServices().put(SchedulerService.class.getName(), gsd);
+ GridServiceDescription service = coreServicesWP.getServices().get( SchedulerService.class.getName() );
+ if ( service == null ) {
+ coreServicesWP.getServices().put( SchedulerService.class.getName(),
+ gsd );
service = gsd;
}
Address address = null;
- if (service.getAddresses().get("socket") != null) {
- address = service.getAddresses().get("socket");
+ if ( service.getAddresses().get( "socket" ) != null ) {
+ address = service.getAddresses().get( "socket" );
} else {
- address = service.addAddress("socket");
+ address = service.addAddress( "socket" );
}
InetSocketAddress[] addresses = (InetSocketAddress[]) address.getObject();
- if (addresses != null && addresses.length >= 1) {
- InetSocketAddress[] newAddresses = new InetSocketAddress[addresses.length + 1];
- if (addresses != null) {
- System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
+ if ( addresses != null && addresses.length >= 1 ) {
+ InetSocketAddress[] newAddresses = new InetSocketAddress[ addresses.length + 1 ];
+ if ( addresses != null ) {
+ System.arraycopy( addresses,
+ 0,
+ newAddresses,
+ 0,
+ addresses.length );
}
- newAddresses[addresses.length] = new InetSocketAddress(mss.getIp(),
- port);
- ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddresses);
- service.setData(conf);
+ newAddresses[addresses.length] = new InetSocketAddress( mss.getIp(),
+ port );
+ ServiceConfiguration conf = new SchedulerServiceConfiguration( newAddresses );
+ service.setData( conf );
} else {
- InetSocketAddress[] newAddress = new InetSocketAddress[1];
- newAddress[0] = new InetSocketAddress(mss.getIp(),
- port);
- address.setObject(newAddress);
- ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddress);
- service.setData(conf);
+ InetSocketAddress[] newAddress = new InetSocketAddress[ 1 ];
+ newAddress[0] = new InetSocketAddress( mss.getIp(),
+ port );
+ address.setObject( newAddress );
+ ServiceConfiguration conf = new SchedulerServiceConfiguration( newAddress );
+ service.setData( conf );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJob.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJob.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJob.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -16,22 +16,23 @@
import org.drools.time.JobHandle;
import org.drools.time.Trigger;
-public class ScheduledJob implements Externalizable {
- private static final long serialVersionUID = 510l;
+public class ScheduledJob
+ implements
+ Externalizable {
+ private static final long serialVersionUID = 510l;
- private String id;
- private UuidJobHandle jobHandle;
- private Class jobClass;
- private Serializable trigger;
- private Date nextFireTime;
+ private String id;
+ private UuidJobHandle jobHandle;
+ private Class jobClass;
+ private Serializable trigger;
+ private Date nextFireTime;
private ScheduledJobConfiguration configuration;
- private Serializable ctx;
-
+ private Serializable ctx;
+
public ScheduledJob() {
-
+
}
-
public ScheduledJob(UuidJobHandle jobHandle,
final Job job,
final JobContext context,
@@ -42,8 +43,9 @@
this.ctx = (Serializable) context;
this.trigger = (Serializable) trigger;
this.nextFireTime = trigger.hasNextFireTime();
-
+
}
+
/**
* @param jhandle
* @param timestamp
@@ -55,14 +57,17 @@
final JobContext context,
final Trigger trigger,
final ScheduledJobConfiguration conf) {
- this(jobHandle, job, context, trigger);
+ this( jobHandle,
+ job,
+ context,
+ trigger );
this.configuration = conf;
}
public JobHandle getJobHandle() {
if ( this.jobHandle == null ) {
// it's transient on persistence, so restore on demand
- this.jobHandle = new UuidJobHandle( UUID.fromString( this.id ));
+ this.jobHandle = new UuidJobHandle( UUID.fromString( this.id ) );
}
return this.jobHandle;
}
@@ -74,11 +79,11 @@
throw new RuntimeException( e );
}
}
-
+
public String getId() {
return this.id;
}
-
+
public Date getNextFireTime() {
return this.nextFireTime;
}
@@ -98,8 +103,6 @@
public void setConfiguration(ScheduledJobConfiguration configuration) {
this.configuration = configuration;
}
-
-
public String toString() {
return "ScheduledJob( job=" + jobClass.getName() + " trigger=" + trigger + " context=" + ctx + " )";
@@ -111,18 +114,17 @@
out.writeObject( this.trigger );
out.writeLong( this.nextFireTime.getTime() );
out.writeObject( this.ctx );
- out.writeObject( this.configuration);
+ out.writeObject( this.configuration );
}
-
+
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
this.id = in.readUTF();
- this.jobClass = ( Class ) Class.forName(in.readUTF());
- this.trigger = ( Serializable ) in.readObject();
+ this.jobClass = (Class) Class.forName( in.readUTF() );
+ this.trigger = (Serializable) in.readObject();
this.nextFireTime = new Date( in.readLong() );
- this.ctx = ( Serializable ) in.readObject();
+ this.ctx = (Serializable) in.readObject();
this.configuration = (ScheduledJobConfiguration) in.readObject();
}
-
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJobConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJobConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ScheduledJobConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -26,13 +26,14 @@
*
* @author salaboy
*/
-public class ScheduledJobConfiguration implements Externalizable {
+public class ScheduledJobConfiguration
+ implements
+ Externalizable {
private int redundancy = 1;
public ScheduledJobConfiguration() {
}
-
public ScheduledJobConfiguration(int redundancy) {
this.redundancy = redundancy;
}
@@ -44,15 +45,14 @@
public void setRedundancy(int redundancy) {
this.redundancy = redundancy;
}
-
-
-
+
public void writeExternal(ObjectOutput out) throws IOException {
- out.writeInt(redundancy);
+ out.writeInt( redundancy );
}
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
this.redundancy = in.readInt();
}
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerClient.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerClient.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerClient.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -44,34 +44,38 @@
*
* @author salaboy
*/
-public class SchedulerClient implements SchedulerService,
- MessageReceiverHandlerFactoryService{
+public class SchedulerClient
+ implements
+ SchedulerService,
+ MessageReceiverHandlerFactoryService {
private GridServiceDescription schedulerGsd;
private ConversationManager conversationManager;
- private Grid grid;
- public SchedulerClient(Grid grid, GridServiceDescription schedulerGsd, ConversationManager conversationManager) {
+ private Grid grid;
+
+ public SchedulerClient(Grid grid,
+ GridServiceDescription schedulerGsd,
+ ConversationManager conversationManager) {
this.grid = grid;
this.schedulerGsd = schedulerGsd;
this.conversationManager = conversationManager;
}
-
+
public static Object sendMessage(ConversationManager conversationManager,
Serializable addr,
String id,
Object body) {
-
+
InetSocketAddress[] sockets = null;
- if(addr instanceof InetSocketAddress[]){
- sockets = (InetSocketAddress[])addr;
- }else if (addr instanceof InetSocketAddress){
- sockets = new InetSocketAddress[1];
- sockets[0] = (InetSocketAddress)addr;
+ if ( addr instanceof InetSocketAddress[] ) {
+ sockets = (InetSocketAddress[]) addr;
+ } else if ( addr instanceof InetSocketAddress ) {
+ sockets = new InetSocketAddress[ 1 ];
+ sockets[0] = (InetSocketAddress) addr;
}
-
-
+
BlockingMessageResponseHandler handler = new BlockingMessageResponseHandler();
Exception exception = null;
for ( InetSocketAddress socket : sockets ) {
@@ -100,62 +104,70 @@
}
}
-
public MessageReceiverHandler getMessageReceiverHandler() {
return new SchedulerServer( this );
}
-
- public JobHandle scheduleJob(Job job, JobContext ctx, Trigger trigger) {
+ public JobHandle scheduleJob(Job job,
+ JobContext ctx,
+ Trigger trigger) {
List<JobHandle> jobHandles = new ArrayList<JobHandle>();
UuidJobHandle jobhandle = new UuidJobHandle();
// Get the Service Configuration from the Data field
SchedulerServiceConfiguration conf = (SchedulerServiceConfiguration) schedulerGsd.getData();
// If the GSD doesn't have conf and it doesn't have addresses, we can use the local SchedulerService
- if(conf == null && schedulerGsd.getAddresses().get("socket") == null){
+ if ( conf == null && schedulerGsd.getAddresses().get( "socket" ) == null ) {
SchedulerService sched = null;
try {
// We use the ID that contains the type of the service that we are using -> refactor this and include serviceType in GSD
- sched = grid.get((Class<SchedulerService>)Class.forName(schedulerGsd.getServiceInterface().getCanonicalName()));
- } catch (ClassNotFoundException ex) {
- Logger.getLogger(SchedulerClient.class.getName()).log(Level.SEVERE, null, ex);
+ sched = grid.get( (Class<SchedulerService>) Class.forName( schedulerGsd.getServiceInterface().getCanonicalName() ) );
+ } catch ( ClassNotFoundException ex ) {
+ Logger.getLogger( SchedulerClient.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
}
- return sched.scheduleJob(job, ctx, trigger);
+ return sched.scheduleJob( job,
+ ctx,
+ trigger );
}
// If we have a service configuration
int redundancy = 1;
InetSocketAddress[] addresses = null;
- if(conf != null){
+ if ( conf != null ) {
redundancy = conf.getRedundancy();
- addresses = conf.getServices(grid);
+ addresses = conf.getServices( grid );
}
// If we have an address use that address.
- if(addresses == null){
- if(schedulerGsd.getAddresses() != null && schedulerGsd.getAddresses().get("socket") != null){
- addresses = (InetSocketAddress[])schedulerGsd.getAddresses().get("socket").getObject();
+ if ( addresses == null ) {
+ if ( schedulerGsd.getAddresses() != null && schedulerGsd.getAddresses().get( "socket" ) != null ) {
+ addresses = (InetSocketAddress[]) schedulerGsd.getAddresses().get( "socket" ).getObject();
}
}
//If not use the configuration and the bucket systems.
- for( int i = 0; i < redundancy; i ++){
- int bucket = (int)jobhandle.hashCode() % addresses.length;
+ for ( int i = 0; i < redundancy; i++ ) {
+ int bucket = (int) jobhandle.hashCode() % addresses.length;
//InetSocketAddress[] sockets = (InetSocketAddress[]) ((Address) schedulerGsd.getAddresses().get( "socket" )).getObject();
- InetSocketAddress socket = addresses[bucket];
+ InetSocketAddress socket = addresses[bucket];
CommandImpl cmd = new CommandImpl( "Scheduler.scheduleJob",
- Arrays.asList( new Object[]{ new ScheduledJob(jobhandle, job, ctx, trigger, null) } ) );
- UuidJobHandle handle = (UuidJobHandle) sendMessage( this.conversationManager,
- socket,
- this.schedulerGsd.getId(),
- cmd );
-
- jobHandles.add(handle);
+ Arrays.asList( new Object[]{ new ScheduledJob( jobhandle,
+ job,
+ ctx,
+ trigger,
+ null ) } ) );
+ UuidJobHandle handle = (UuidJobHandle) sendMessage( this.conversationManager,
+ socket,
+ this.schedulerGsd.getId(),
+ cmd );
+
+ jobHandles.add( handle );
}
-
- return new MultiJobHandle(jobHandles);
-
+
+ return new MultiJobHandle( jobHandles );
+
}
public boolean removeJob(JobHandle jobHandle) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerImpl.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -33,18 +33,22 @@
*
* @author salaboy
*/
-public class SchedulerImpl implements SchedulerService, MessageReceiverHandlerFactoryService{
- private TimerService timer = new JDKTimerService();
- private String id;
- private Grid grid;
-
- public SchedulerImpl(String id, Grid grid){
+public class SchedulerImpl
+ implements
+ SchedulerService,
+ MessageReceiverHandlerFactoryService {
+ private TimerService timer = new JDKTimerService();
+ private String id;
+ private Grid grid;
+
+ public SchedulerImpl(String id,
+ Grid grid) {
this.id = id;
this.grid = grid;
}
-
+
public MessageReceiverHandler getMessageReceiverHandler() {
- return new SchedulerServer(this);
+ return new SchedulerServer( this );
}
public String getId() {
@@ -55,18 +59,16 @@
return grid;
}
- public JobHandle scheduleJob(Job job, JobContext ctx, Trigger trigger) {
- return timer.scheduleJob(job, ctx, trigger);
+ public JobHandle scheduleJob(Job job,
+ JobContext ctx,
+ Trigger trigger) {
+ return timer.scheduleJob( job,
+ ctx,
+ trigger );
}
public boolean removeJob(JobHandle jobHandle) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException( "Not supported yet." );
}
-
-
-
-
-
-
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerLocalConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerLocalConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerLocalConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -14,10 +14,10 @@
GridPeerServiceConfiguration {
private SchedulerService scheduler;
- private String id;
+ private String id;
public SchedulerLocalConfiguration(String id) {
- this.id = id;
+ this.id = id;
}
public void setScheduler(SchedulerService scheduler) {
@@ -25,11 +25,12 @@
}
public void configureService(Grid grid) {
- WhitePages wp = grid.get(WhitePages.class);
- SchedulerService sched = (this.scheduler != null) ? this.scheduler : new SchedulerImpl(this.id, grid);
+ WhitePages wp = grid.get( WhitePages.class );
+ SchedulerService sched = (this.scheduler != null) ? this.scheduler : new SchedulerImpl( this.id,
+ grid );
((GridImpl) grid).addService( SchedulerService.class,
sched );
- wp.create("scheduler:"+this.id+SchedulerService.class.getName());
+ wp.create( "scheduler:" + this.id + SchedulerService.class.getName() );
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerRemoteConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -11,15 +11,13 @@
import org.drools.grid.io.ConversationManager;
import org.drools.time.SchedulerService;
-
public class SchedulerRemoteConfiguration
implements
GridPeerServiceConfiguration {
private ConversationManager cm;
-
- public SchedulerRemoteConfiguration( ConversationManager cm) {
-
+ public SchedulerRemoteConfiguration(ConversationManager cm) {
+
this.cm = cm;
}
@@ -28,10 +26,11 @@
GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServices.lookup( SchedulerService.class );
- SchedulerService scheduler = new SchedulerClient(grid, gsd,
- cm );
+ SchedulerService scheduler = new SchedulerClient( grid,
+ gsd,
+ cm );
((GridImpl) grid).addService( SchedulerService.class,
scheduler );
-
+
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServer.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServer.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServer.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -26,27 +26,28 @@
import org.drools.grid.io.impl.CommandImpl;
import org.drools.time.SchedulerService;
-
/**
*
* @author salaboy
*/
-public class SchedulerServer implements
- MessageReceiverHandler{
- private SchedulerService scheduler = null;
+public class SchedulerServer
+ implements
+ MessageReceiverHandler {
+ private SchedulerService scheduler = null;
public SchedulerServer(SchedulerService scheduler) {
this.scheduler = scheduler;
}
-
- public void messageReceived(Conversation conversation, Message msg) {
+
+ public void messageReceived(Conversation conversation,
+ Message msg) {
final CommandImpl cmd = (CommandImpl) msg.getBody();
this.execs.get( cmd.getName() ).execute( scheduler,
conversation,
msg,
cmd );
}
-
+
private Map<String, Exec> execs = new HashMap<String, Exec>() {
{
put( "Scheduler.scheduleJob",
@@ -57,8 +58,10 @@
CommandImpl cmd) {
SchedulerService scheduler = (SchedulerService) object;
final List list = cmd.getArguments();
- scheduler.scheduleJob(((ScheduledJob)list.get(0)).getJob(),((ScheduledJob)list.get(0)).getJobContext(), ((ScheduledJob)list.get(0)).getTrigger());
- con.respond( ((ScheduledJob)list.get(0)).getJobHandle() );
+ scheduler.scheduleJob( ((ScheduledJob) list.get( 0 )).getJob(),
+ ((ScheduledJob) list.get( 0 )).getJobContext(),
+ ((ScheduledJob) list.get( 0 )).getTrigger() );
+ con.respond( ((ScheduledJob) list.get( 0 )).getJobHandle() );
}
} );
}
@@ -71,5 +74,4 @@
CommandImpl cmd);
}
-
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServiceConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServiceConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerServiceConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -24,10 +24,12 @@
*
* @author salaboy
*/
-public class SchedulerServiceConfiguration implements ServiceConfiguration{
- private int redundancy = 1; //Default 1, 0 all
+public class SchedulerServiceConfiguration
+ implements
+ ServiceConfiguration {
+ private int redundancy = 1; //Default 1, 0 all
private InetSocketAddress[] addresses;
-
+
public SchedulerServiceConfiguration(InetSocketAddress[] addresses) {
this.addresses = addresses;
}
@@ -36,14 +38,13 @@
//get addresses from the grid.. or whatever
return addresses;
}
-
- public int getRedundancy(){
+
+ public int getRedundancy() {
return this.redundancy;
}
-
- public void setRedundancy(int redundancy){
+
+ public void setRedundancy(int redundancy) {
this.redundancy = redundancy;
}
-
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/SchedulerSocketConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -16,10 +16,10 @@
import org.drools.time.SchedulerService;
public class SchedulerSocketConfiguration
-implements
-GridPeerServiceConfiguration {
+ implements
+ GridPeerServiceConfiguration {
private int port = -1;
-
+
public SchedulerSocketConfiguration(int port) {
this.port = port;
}
@@ -27,58 +27,53 @@
public int getPort() {
return port;
}
-
+
public void configureService(Grid grid) {
SchedulerService sched = grid.get( SchedulerService.class );
if ( port != -1 ) {
CoreServicesWhitePagesImpl coreServicesWP = (CoreServicesWhitePagesImpl) grid.get( CoreServicesWhitePages.class );
- GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup(SchedulerService.class);
+ GridServiceDescriptionImpl gsd = (GridServiceDescriptionImpl) coreServicesWP.lookup( SchedulerService.class );
if ( gsd == null ) {
gsd = new GridServiceDescriptionImpl( SchedulerService.class );
}
MultiplexSocketService mss = grid.get( MultiplexSocketService.class );
-
-// GridServiceDescription service = coreServicesWP.getServices().get( SchedulerService.class.getName() );
-// if( service == null){
-// coreServicesWP.getServices().put(SchedulerService.class.getName(), gsd);
-// service = gsd;
-// }
-// Address address = null;
-// if(service.getAddresses().get("socket") != null){
-// address = service.getAddresses().get("socket");
-// } else{
-// address = service.addAddress( "socket" );
-// }
-// InetSocketAddress[] addresses = (InetSocketAddress[])address.getObject();
-// if(addresses != null && addresses.length >= 1){
-// InetSocketAddress[] newAddresses = new InetSocketAddress[addresses.length+1];
-// if(addresses !=null){
-// System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
-// }
-// newAddresses[addresses.length]= new InetSocketAddress( mss.getIp(),
-// this.port);
-// ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddresses);
-// service.setData(conf);
-// }else{
-// InetSocketAddress[] newAddress = new InetSocketAddress[1];
-// newAddress[0]= new InetSocketAddress( mss.getIp(),
-// this.port);
-// address.setObject( newAddress );
-// ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddress);
-// service.setData(conf);
-// }
-
+ // GridServiceDescription service = coreServicesWP.getServices().get( SchedulerService.class.getName() );
+ // if( service == null){
+ // coreServicesWP.getServices().put(SchedulerService.class.getName(), gsd);
+ // service = gsd;
+ // }
+ // Address address = null;
+ // if(service.getAddresses().get("socket") != null){
+ // address = service.getAddresses().get("socket");
+ // } else{
+ // address = service.addAddress( "socket" );
+ // }
+ // InetSocketAddress[] addresses = (InetSocketAddress[])address.getObject();
+ // if(addresses != null && addresses.length >= 1){
+ // InetSocketAddress[] newAddresses = new InetSocketAddress[addresses.length+1];
+ // if(addresses !=null){
+ // System.arraycopy(addresses, 0, newAddresses, 0, addresses.length);
+ // }
+ // newAddresses[addresses.length]= new InetSocketAddress( mss.getIp(),
+ // this.port);
+ // ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddresses);
+ // service.setData(conf);
+ // }else{
+ // InetSocketAddress[] newAddress = new InetSocketAddress[1];
+ // newAddress[0]= new InetSocketAddress( mss.getIp(),
+ // this.port);
+ // address.setObject( newAddress );
+ // ServiceConfiguration conf = new SchedulerServiceConfiguration(newAddress);
+ // service.setData(conf);
+ // }
-
-
-
mss.addService( this.port,
SchedulerService.class.getName(),
- ((MessageReceiverHandlerFactoryService) sched ).getMessageReceiverHandler() );
+ ((MessageReceiverHandlerFactoryService) sched).getMessageReceiverHandler() );
}
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ServiceConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ServiceConfiguration.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/ServiceConfiguration.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -25,6 +25,8 @@
*
* @author salaboy
*/
-public interface ServiceConfiguration extends Serializable{
+public interface ServiceConfiguration
+ extends
+ Serializable {
public InetSocketAddress[] getServices(Grid grid);
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/UuidJobHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/UuidJobHandle.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/main/java/org/drools/grid/timer/impl/UuidJobHandle.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -10,13 +10,14 @@
public class UuidJobHandle
implements
- JobHandle, Serializable {
+ JobHandle,
+ Serializable {
private UUID uuid;
public UuidJobHandle() {
this.uuid = UUID.randomUUID();
}
-
+
public UuidJobHandle(UUID uuid) {
this.uuid = uuid;
}
@@ -26,7 +27,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((uuid == null) ? 0 : uuid.hashCode());
- if(result < 0){
+ if ( result < 0 ) {
result *= -1;
}
return result;
@@ -43,7 +44,7 @@
} else if ( !uuid.equals( other.uuid ) ) return false;
return true;
}
-
+
public UUID getUuid() {
return this.uuid;
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/GridTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/GridTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/GridTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -7,19 +7,19 @@
public class GridTest extends TestCase {
public void testNodeCreationAndWhitePagesRegistration() {
-
+
// GridConnectionService.getGrid()
-
-// Grid grid = new GridImpl();
-//
-// GridNode gnode = grid.createGridNode( "test1 at domain.com" );
-//
-// WhitePages pages = grid.get( WhitePages.class );
-// GridServiceDescription serviceDescription = pages.lookup( "test1 at domain.com" );
-//
-// GridNodeConnection connection = grid.getGridNodeConnection( serviceDescription );
-// connection.connect();
-// assertSame( gnode,
-// connection.getGridNode() );
+
+ // Grid grid = new GridImpl();
+ //
+ // GridNode gnode = grid.createGridNode( "test1 at domain.com" );
+ //
+ // WhitePages pages = grid.get( WhitePages.class );
+ // GridServiceDescription serviceDescription = pages.lookup( "test1 at domain.com" );
+ //
+ // GridNodeConnection connection = grid.getGridNodeConnection( serviceDescription );
+ // connection.connect();
+ // assertSame( gnode,
+ // connection.getGridNode() );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/HazelCastTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/HazelCastTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/HazelCastTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -10,17 +10,16 @@
public class HazelCastTest extends TestCase {
public void test1() {
Config c1 = new XmlConfigBuilder().build();
-// c1.setPortAutoIncrement(false);
-// c1.setPort(5709);
+ // c1.setPortAutoIncrement(false);
+ // c1.setPort(5709);
-
HazelcastInstance hci1 = Hazelcast.newHazelcastInstance( null );
//hci1.
System.out.println( hci1.getConfig().getPort() );
-
+
Config c2 = new XmlConfigBuilder().build();
-// c2.setPortAutoIncrement(false);
-// c2.setPort(5710);
+ // c2.setPortAutoIncrement(false);
+ // c2.setPort(5710);
HazelcastInstance hci2 = Hazelcast.newHazelcastInstance( null );
System.out.println( hci2.getConfig().getPort() );
//System.out.println( hci1.getConfig().get);
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/NodeTests.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/NodeTests.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/NodeTests.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -64,10 +64,8 @@
*/
public class NodeTests {
-
-
private Map<String, GridServiceDescription> coreServicesMap;
-
+
public NodeTests() {
}
@@ -87,185 +85,173 @@
public void tearDown() {
}
-
- @Test
- public void basicLocalNodeTest() {
-
-
- Grid grid = new GridImpl(new HashMap<String, Object>());
- GridPeerConfiguration conf = new GridPeerConfiguration();
-
- GridPeerServiceConfiguration wpconf = new WhitePagesLocalConfiguration();
- conf.addConfiguration(wpconf);
-
- conf.configure(grid);
- GridServiceDescription localExecutioNodeGSD = new GridServiceDescriptionImpl("executionnode:local at local");
- localExecutioNodeGSD.addAddress("local");
- //GridNode gnode = grid.createGridNode("executionnode:local at local");
- GridNode gnode = grid.createGridNode(localExecutioNodeGSD);
-
- KnowledgeBuilder kbuilder = gnode.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
-
- Assert.assertNotNull(kbuilder);
-
- KnowledgeBase kbase = gnode.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
-
- Assert.assertNotNull(kbase);
-
- StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
-
- Assert.assertNotNull(session);
-
- WhitePages wp = grid.get(WhitePages.class);
- GridServiceDescription gsd = wp.lookup("executionnode:local at local");
-
- gnode = grid.getGridNode(gsd.getId());
-
-
- Assert.assertNotNull(gnode);
-
- }
-
- @Test
- public void basicRemoteNodeTest() {
-
-
- coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
-
- Grid grid1 = new GridImpl(new HashMap<String, Object>());
- configureGrid1(grid1, 8000);
-
-
-
-
- Grid grid2 = new GridImpl(new HashMap<String, Object>());
- GridPeerConfiguration conf = new GridPeerConfiguration();
-
- GridPeerServiceConfiguration wpconf = new WhitePagesLocalConfiguration();
- conf.addConfiguration(wpconf);
-
- conf.configure(grid2);
-
- GridServiceDescription remoteExecutioNodeGSD = new GridServiceDescriptionImpl("executionnodeclient:mynode at remote[localhost:8080]/socket");
- remoteExecutioNodeGSD.setServiceInterface(GridNode.class);
- remoteExecutioNodeGSD.setImplementedClass(GridNodeRemoteClient.class);
- Address addr = remoteExecutioNodeGSD.addAddress("socket");
- addr.setObject(new InetSocketAddress[]{new InetSocketAddress("localhost", 8000)});
-
-
-
- GridNode gnode = grid2.createGridNode(remoteExecutioNodeGSD);
-
-
- KnowledgeBuilder kbuilder = gnode.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
-
- Assert.assertNotNull(kbuilder);
-
- String rule = "package test\n"
- + "Rule \"test\""
- + " when"
- + " then"
- + " System.out.println(\"Rule Fired!\");"
- + " end";
-
- kbuilder.add(new ByteArrayResource(rule.getBytes()), ResourceType.DRL);
-
- KnowledgeBuilderErrors errors = kbuilder.getErrors();
- if(errors != null && errors.size() > 0){
- for(KnowledgeBuilderError error : errors){
- System.out.println("Error: "+error.getMessage());
+ @Test
+ public void basicLocalNodeTest() {
- }
- return;
- }
-
- KnowledgeBase kbase = gnode.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
-
- Assert.assertNotNull(kbase);
-
- kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
-
- StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
-
- Assert.assertNotNull(session);
-
- WhitePages wp = grid2.get(WhitePages.class);
- GridServiceDescription gsd = wp.lookup("executionnodeclient:mynode at remote[localhost:8080]/socket");
-
- gnode = grid2.getGridNode(gsd.getId());
-
-
- Assert.assertNotNull(gnode);
-
- FactHandle handle = session.insert(new MyObject());
- Assert.assertNotNull(handle);
-
- int i = session.fireAllRules();
- Assert.assertEquals(1, i);
-
-
-
- }
-
-
-
-
- private void configureGrid1(Grid grid, int port){
-
+ Grid grid = new GridImpl( new HashMap<String, Object>() );
+ GridPeerConfiguration conf = new GridPeerConfiguration();
+
+ GridPeerServiceConfiguration wpconf = new WhitePagesLocalConfiguration();
+ conf.addConfiguration( wpconf );
+
+ conf.configure( grid );
+ GridServiceDescription localExecutioNodeGSD = new GridServiceDescriptionImpl( "executionnode:local at local" );
+ localExecutioNodeGSD.addAddress( "local" );
+ //GridNode gnode = grid.createGridNode("executionnode:local at local");
+ GridNode gnode = grid.createGridNode( localExecutioNodeGSD );
+
+ KnowledgeBuilder kbuilder = gnode.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder();
+
+ Assert.assertNotNull( kbuilder );
+
+ KnowledgeBase kbase = gnode.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase();
+
+ Assert.assertNotNull( kbase );
+
+ StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
+
+ Assert.assertNotNull( session );
+
+ WhitePages wp = grid.get( WhitePages.class );
+ GridServiceDescription gsd = wp.lookup( "executionnode:local at local" );
+
+ gnode = grid.getGridNode( gsd.getId() );
+
+ Assert.assertNotNull( gnode );
+
+ }
+
+ @Test
+ public void basicRemoteNodeTest() {
+
+ coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
+
+ Grid grid1 = new GridImpl( new HashMap<String, Object>() );
+ configureGrid1( grid1,
+ 8000 );
+
+ Grid grid2 = new GridImpl( new HashMap<String, Object>() );
+ GridPeerConfiguration conf = new GridPeerConfiguration();
+
+ GridPeerServiceConfiguration wpconf = new WhitePagesLocalConfiguration();
+ conf.addConfiguration( wpconf );
+
+ conf.configure( grid2 );
+
+ GridServiceDescription remoteExecutioNodeGSD = new GridServiceDescriptionImpl( "executionnodeclient:mynode at remote[localhost:8080]/socket" );
+ remoteExecutioNodeGSD.setServiceInterface( GridNode.class );
+ remoteExecutioNodeGSD.setImplementedClass( GridNodeRemoteClient.class );
+ Address addr = remoteExecutioNodeGSD.addAddress( "socket" );
+ addr.setObject( new InetSocketAddress[]{ new InetSocketAddress( "localhost",
+ 8000 ) } );
+
+ GridNode gnode = grid2.createGridNode( remoteExecutioNodeGSD );
+
+ KnowledgeBuilder kbuilder = gnode.get( KnowledgeBuilderFactoryService.class ).newKnowledgeBuilder();
+
+ Assert.assertNotNull( kbuilder );
+
+ String rule = "package test\n"
+ + "Rule \"test\""
+ + " when"
+ + " then"
+ + " System.out.println(\"Rule Fired!\");"
+ + " end";
+
+ kbuilder.add( new ByteArrayResource( rule.getBytes() ),
+ ResourceType.DRL );
+
+ KnowledgeBuilderErrors errors = kbuilder.getErrors();
+ if ( errors != null && errors.size() > 0 ) {
+ for ( KnowledgeBuilderError error : errors ) {
+ System.out.println( "Error: " + error.getMessage() );
+
+ }
+ return;
+ }
+
+ KnowledgeBase kbase = gnode.get( KnowledgeBaseFactoryService.class ).newKnowledgeBase();
+
+ Assert.assertNotNull( kbase );
+
+ kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+
+ StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
+
+ Assert.assertNotNull( session );
+
+ WhitePages wp = grid2.get( WhitePages.class );
+ GridServiceDescription gsd = wp.lookup( "executionnodeclient:mynode at remote[localhost:8080]/socket" );
+
+ gnode = grid2.getGridNode( gsd.getId() );
+
+ Assert.assertNotNull( gnode );
+
+ FactHandle handle = session.insert( new MyObject() );
+ Assert.assertNotNull( handle );
+
+ int i = session.fireAllRules();
+ Assert.assertEquals( 1,
+ i );
+
+ }
+
+ private void configureGrid1(Grid grid,
+ int port) {
+
//Local Grid Configuration, for our client
GridPeerConfiguration conf = new GridPeerConfiguration();
//Configuring the Core Services White Pages
- GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration(coreServicesMap);
- conf.addConfiguration(coreSeviceWPConf);
+ GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ conf.addConfiguration( coreSeviceWPConf );
//Configuring the Core Services Scheduler
GridPeerServiceConfiguration coreSeviceSchedulerConf = new CoreServicesSchedulerConfiguration();
- conf.addConfiguration(coreSeviceSchedulerConf);
+ conf.addConfiguration( coreSeviceSchedulerConf );
//Configuring the MultiplexSocketService
- GridPeerServiceConfiguration socketConf = new MultiplexSocketServiceCongifuration(new MultiplexSocketServerImpl("127.0.0.1",
- new MinaAcceptorFactoryService(),
- SystemEventListenerFactory.getSystemEventListener()));
- conf.addConfiguration(socketConf);
-
+ GridPeerServiceConfiguration socketConf = new MultiplexSocketServiceCongifuration( new MultiplexSocketServerImpl( "127.0.0.1",
+ new MinaAcceptorFactoryService(),
+ SystemEventListenerFactory.getSystemEventListener() ) );
+ conf.addConfiguration( socketConf );
+
//Configuring the WhitePages
GridPeerServiceConfiguration wplConf = new WhitePagesLocalConfiguration();
- conf.addConfiguration(wplConf);
-
+ conf.addConfiguration( wplConf );
+
//Exposing Local WhitePages
- GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration(port);
- conf.addConfiguration(wpsc);
+ GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration( port );
+ conf.addConfiguration( wpsc );
GridPeerServiceConfiguration registerwpincore = new RegisterWhitePagesConfiguration();
- conf.addConfiguration(registerwpincore);
+ conf.addConfiguration( registerwpincore );
//Create a Local Scheduler
- GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration("myLocalSched");
- conf.addConfiguration(schlConf);
+ GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration( "myLocalSched" );
+ conf.addConfiguration( schlConf );
//Expose it to the Grid so it can be accesed by different nodes
// I need to use the same port to reuse the service multiplexer
- GridPeerServiceConfiguration schlsc = new SchedulerSocketConfiguration(port);
- conf.addConfiguration(schlsc);
-
+ GridPeerServiceConfiguration schlsc = new SchedulerSocketConfiguration( port );
+ conf.addConfiguration( schlsc );
+
GridPeerServiceConfiguration registerschedincore = new RegisterSchedulerConfiguration();
- conf.addConfiguration(registerschedincore);
-
-
+ conf.addConfiguration( registerschedincore );
+
GridPeerServiceConfiguration executionNodeLocal = new GridNodeLocalConfiguration();
- conf.addConfiguration(executionNodeLocal);
-
- GridPeerServiceConfiguration executionNodeSocket = new GridNodeSocketConfiguration(port);
- conf.addConfiguration(executionNodeSocket);
-
+ conf.addConfiguration( executionNodeLocal );
- conf.configure(grid);
-
-
+ GridPeerServiceConfiguration executionNodeSocket = new GridNodeSocketConfiguration( port );
+ conf.addConfiguration( executionNodeSocket );
+
+ conf.configure( grid );
+
}
-
- private static class MyObject implements Serializable{
+ private static class MyObject
+ implements
+ Serializable {
+
public MyObject() {
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/local/LocalGridNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/local/LocalGridNodeTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/local/LocalGridNodeTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -21,11 +21,12 @@
import org.drools.grid.service.directory.impl.GridServiceDescriptionImpl;
import org.drools.grid.service.directory.impl.WhitePagesLocalConfiguration;
-public class LocalGridNodeTest extends TestCase {
-
- public void test(){
-
+public class LocalGridNodeTest extends TestCase {
+
+ public void test() {
+
}
+
public void testConnectWithId() {
GridNodeConnection connection = new LocalGridConnection( "test-id" );
GridNode gnode = connection.getGridNode();
@@ -60,18 +61,18 @@
}
public void testNodeCreationAndWhitePagesRegistration() {
- Grid grid = new GridImpl(new HashMap<String,Object>());
-
+ Grid grid = new GridImpl( new HashMap<String, Object>() );
+
GridPeerConfiguration conf = new GridPeerConfiguration();
-
+
//Configuring the WhitePages
GridPeerServiceConfiguration wplConf = new WhitePagesLocalConfiguration();
- conf.addConfiguration(wplConf);
-
- conf.configure(grid);
-
- GridServiceDescription gsd = new GridServiceDescriptionImpl("test1 at local");
- gsd.addAddress("local");
+ conf.addConfiguration( wplConf );
+
+ conf.configure( grid );
+
+ GridServiceDescription gsd = new GridServiceDescriptionImpl( "test1 at local" );
+ gsd.addAddress( "local" );
GridNode gnode = grid.createGridNode( gsd );
WhitePages pages = grid.get( WhitePages.class );
@@ -83,36 +84,36 @@
connection.getGridNode() );
}
-// public void testWhitePagesAddRemoveAddresss() {
-// Grid grid = new GridImpl(new HashMap<String,Object>());
-//
-// GridNode gnode = grid.createGridNode( "test1 at domain.com" );
-// assertNotNull( gnode );
-//
-// WhitePages pages = grid.get( WhitePages.class );
-// GridServiceDescription serviceDescription = pages.lookup( "test1 at domain.com" );
-//
-// assertEquals( 0,
-// serviceDescription.getAddresses().size() );
-//
-// Address address = new AddressImpl( "test1 at domain.com",
-// "socket",
-// new InetSocketAddress( getLocalAddress(),
-// 9201 ) );
-// pages.addAddress( "test1 at domain.com",
-// address );
-//
-// assertEquals( 1,
-// serviceDescription.getAddresses().size() );
-// assertSame( address,
-// serviceDescription.getAddresses().get( "socket" ) );
-//
-// pages.removeAddress( "test1 at domain.com",
-// address );
-// assertEquals( 0,
-// serviceDescription.getAddresses().size() );
-//
-// }
+ // public void testWhitePagesAddRemoveAddresss() {
+ // Grid grid = new GridImpl(new HashMap<String,Object>());
+ //
+ // GridNode gnode = grid.createGridNode( "test1 at domain.com" );
+ // assertNotNull( gnode );
+ //
+ // WhitePages pages = grid.get( WhitePages.class );
+ // GridServiceDescription serviceDescription = pages.lookup( "test1 at domain.com" );
+ //
+ // assertEquals( 0,
+ // serviceDescription.getAddresses().size() );
+ //
+ // Address address = new AddressImpl( "test1 at domain.com",
+ // "socket",
+ // new InetSocketAddress( getLocalAddress(),
+ // 9201 ) );
+ // pages.addAddress( "test1 at domain.com",
+ // address );
+ //
+ // assertEquals( 1,
+ // serviceDescription.getAddresses().size() );
+ // assertSame( address,
+ // serviceDescription.getAddresses().get( "socket" ) );
+ //
+ // pages.removeAddress( "test1 at domain.com",
+ // address );
+ // assertEquals( 0,
+ // serviceDescription.getAddresses().size() );
+ //
+ // }
private InetAddress getLocalAddress() {
try {
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/DistributedSchedulerTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -60,12 +60,13 @@
public class DistributedSchedulerTest extends TestCase {
- private Acceptor acc = new MinaAcceptor();
- private SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
+ private Acceptor acc = new MinaAcceptor();
+ private SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
private Map<String, GridServiceDescription> coreServicesMap;
+
@Override
public void setUp() {
-
+
}
@Override
@@ -75,67 +76,78 @@
public void test1() throws Exception {
-
-
MessageReceiverHandler accHandler = new MessageReceiverHandler() {
- private String id;
+ private String id;
private AtomicLong counter = new AtomicLong();
public void messageReceived(Conversation conversation,
- Message msgIn) {
- conversation.respond("echo: " + msgIn.getBody());
+ Message msgIn) {
+ conversation.respond( "echo: " + msgIn.getBody() );
}
};
- acc.open(new InetSocketAddress("127.0.0.1",
- 5012),
- accHandler,
- l);
+ acc.open( new InetSocketAddress( "127.0.0.1",
+ 5012 ),
+ accHandler,
+ l );
-
Connector conn = new MinaConnector();
- ConversationManager cm = new ConversationManagerImpl("s1",
- conn,
- l);
+ ConversationManager cm = new ConversationManagerImpl( "s1",
+ conn,
+ l );
- Conversation cv = cm.startConversation(new InetSocketAddress("127.0.0.1",
- 5012),
- "r1");
+ Conversation cv = cm.startConversation( new InetSocketAddress( "127.0.0.1",
+ 5012 ),
+ "r1" );
BlockingMessageResponseHandler blockHandler = new BlockingMessageResponseHandler();
- cv.sendMessage("hello",
- blockHandler);
+ cv.sendMessage( "hello",
+ blockHandler );
- Message msg = blockHandler.getMessage(5000);
- System.out.println(msg.getBody());
+ Message msg = blockHandler.getMessage( 5000 );
+ System.out.println( msg.getBody() );
conn.close();
acc.close();
}
public void testDistributedJobSchedullingLocal() {
-
- GridImpl grid = new GridImpl(new ConcurrentHashMap<String, Object>());
- grid.addService(SchedulerService.class, new SchedulerImpl("myLocalSched",grid));
- SchedulerService scheduler = grid.get(SchedulerService.class);
+ GridImpl grid = new GridImpl( new ConcurrentHashMap<String, Object>() );
+ grid.addService( SchedulerService.class,
+ new SchedulerImpl( "myLocalSched",
+ grid ) );
+ SchedulerService scheduler = grid.get( SchedulerService.class );
+
UuidJobHandle handle = new UuidJobHandle();
- ScheduledJob sj1 = new ScheduledJob(handle, new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)), new ScheduledJobConfiguration(1));
- ScheduledJob sj2 = new ScheduledJob(handle, new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)), new ScheduledJobConfiguration(1));
+ ScheduledJob sj1 = new ScheduledJob( handle,
+ new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ),
+ new ScheduledJobConfiguration( 1 ) );
+ ScheduledJob sj2 = new ScheduledJob( handle,
+ new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ),
+ new ScheduledJobConfiguration( 1 ) );
- scheduler.scheduleJob(new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)));
+ scheduler.scheduleJob( new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ) );
//The Job Will be executed in 1 second
try {
- Thread.sleep(1000);
- } catch (InterruptedException ex) {
- Logger.getLogger(DistributedSchedulerTest.class.getName()).log(Level.SEVERE, null, ex);
+ Thread.sleep( 1000 );
+ } catch ( InterruptedException ex ) {
+ Logger.getLogger( DistributedSchedulerTest.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
}
- assertEquals(1, MockJob.counter);
+ assertEquals( 1,
+ MockJob.counter );
-
}
/*
@@ -150,142 +162,153 @@
public void testDistributedJobSchedulingRemote() {
//Core services Map Definition
coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
-
//Grid View
- GridImpl grid1 = new GridImpl(new ConcurrentHashMap<String, Object>());
+ GridImpl grid1 = new GridImpl( new ConcurrentHashMap<String, Object>() );
//Configure grid with:
// core whitepages
// core scheduler
// local whitepages
// local scheduler
// expose multiplex socket
- configureGrid1(grid1, 5012);
-
+ configureGrid1( grid1,
+ 5012 );
-
+ GridImpl grid2 = new GridImpl( new ConcurrentHashMap<String, Object>() );
+ Connector conn = new MinaConnector();
+ configureGrid2( grid2,
+ conn );
-
- GridImpl grid2 = new GridImpl(new ConcurrentHashMap<String, Object>());
- Connector conn = new MinaConnector();
- configureGrid2(grid2, conn);
-
-
//Create a Job
UuidJobHandle handle = new UuidJobHandle();
- ScheduledJob sj1 = new ScheduledJob(handle, new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)), new ScheduledJobConfiguration(1));
+ ScheduledJob sj1 = new ScheduledJob( handle,
+ new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ),
+ new ScheduledJobConfiguration( 1 ) );
//From grid2 I get the Scheduler (that it's a client)
- SchedulerService scheduler = grid2.get(SchedulerService.class);
+ SchedulerService scheduler = grid2.get( SchedulerService.class );
//Schedule remotely the Job
- scheduler.scheduleJob(new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)));
+ scheduler.scheduleJob( new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ) );
try {
- Thread.sleep(1000);
- } catch (InterruptedException ex) {
- Logger.getLogger(DistributedSchedulerTest.class.getName()).log(Level.SEVERE, null, ex);
+ Thread.sleep( 1000 );
+ } catch ( InterruptedException ex ) {
+ Logger.getLogger( DistributedSchedulerTest.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
}
-
- assertEquals(1, MockJob.counter);
-
+
+ assertEquals( 1,
+ MockJob.counter );
+
//Close the peer connection
conn.close();
-
+
//Shutdown the MultiplexSocketService
- grid1.get(MultiplexSocketService.class).close();
-
+ grid1.get( MultiplexSocketService.class ).close();
+ }
+ public void testMultipleSchedulersTest() {
+ //Core services Map Definition
+ coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
- }
-
- public void testMultipleSchedulersTest(){
- //Core services Map Definition
- coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
-
//Grid View
- GridImpl grid1 = new GridImpl(new ConcurrentHashMap<String, Object>());
- configureGrid1(grid1, 5012);
-
-
- GridImpl grid2 = new GridImpl(new ConcurrentHashMap<String, Object>());
- configureGrid1(grid2, 5013);
-
-
-
- GridImpl grid3 = new GridImpl(new ConcurrentHashMap<String, Object>());
+ GridImpl grid1 = new GridImpl( new ConcurrentHashMap<String, Object>() );
+ configureGrid1( grid1,
+ 5012 );
+
+ GridImpl grid2 = new GridImpl( new ConcurrentHashMap<String, Object>() );
+ configureGrid1( grid2,
+ 5013 );
+
+ GridImpl grid3 = new GridImpl( new ConcurrentHashMap<String, Object>() );
Connector conn = new MinaConnector();
- configureGrid3(grid3, conn);
-
- CoreServicesWhitePages corewp = grid3.get(CoreServicesWhitePages.class);
-
- GridServiceDescription gsd = corewp.lookup(SchedulerService.class);
-
- Assert.assertEquals(1, ((InetSocketAddress[])gsd.getAddresses().values().iterator().next().getObject()).length);
-
- Assert.assertEquals(2, ((InetSocketAddress[])((SchedulerServiceConfiguration)gsd.getData()).getServices(grid3)).length);
-
- Assert.assertEquals(0, MockJob.counter);
-
+ configureGrid3( grid3,
+ conn );
+
+ CoreServicesWhitePages corewp = grid3.get( CoreServicesWhitePages.class );
+
+ GridServiceDescription gsd = corewp.lookup( SchedulerService.class );
+
+ Assert.assertEquals( 1,
+ ((InetSocketAddress[]) gsd.getAddresses().values().iterator().next().getObject()).length );
+
+ Assert.assertEquals( 2,
+ ((InetSocketAddress[]) ((SchedulerServiceConfiguration) gsd.getData()).getServices( grid3 )).length );
+
+ Assert.assertEquals( 0,
+ MockJob.counter );
+
conn.close();
- grid1.get(MultiplexSocketService.class).close();
- grid2.get(MultiplexSocketService.class).close();
-
-
-
+ grid1.get( MultiplexSocketService.class ).close();
+ grid2.get( MultiplexSocketService.class ).close();
+
}
-
- public void testGetDataFromCoreServices(){
-
+
+ public void testGetDataFromCoreServices() {
+
coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
-
+
//Grid View
- GridImpl grid1 = new GridImpl(new ConcurrentHashMap<String, Object>());
- configureGrid1(grid1, 5012);
-
- GridImpl grid2 = new GridImpl(new ConcurrentHashMap<String, Object>());
- configureGrid1(grid2, 5013);
-
- CoreServicesWhitePages corewp = grid1.get(CoreServicesWhitePages.class);
-
+ GridImpl grid1 = new GridImpl( new ConcurrentHashMap<String, Object>() );
+ configureGrid1( grid1,
+ 5012 );
+
+ GridImpl grid2 = new GridImpl( new ConcurrentHashMap<String, Object>() );
+ configureGrid1( grid2,
+ 5013 );
+
+ CoreServicesWhitePages corewp = grid1.get( CoreServicesWhitePages.class );
+
//Get Scheduler Service
- GridServiceDescription gsd = corewp.lookup(SchedulerService.class);
-
-
- Assert.assertEquals(1, ((InetSocketAddress[])gsd.getAddresses().values().iterator().next().getObject()).length);
-
- Assert.assertEquals(2, ((InetSocketAddress[])((SchedulerServiceConfiguration)gsd.getData()).getServices(grid1)).length);
-
-
+ GridServiceDescription gsd = corewp.lookup( SchedulerService.class );
+
+ Assert.assertEquals( 1,
+ ((InetSocketAddress[]) gsd.getAddresses().values().iterator().next().getObject()).length );
+
+ Assert.assertEquals( 2,
+ ((InetSocketAddress[]) ((SchedulerServiceConfiguration) gsd.getData()).getServices( grid1 )).length );
+
Connector conn = new MinaConnector();
- ConversationManager cm = new ConversationManagerImpl("s1",
- conn,
- l);
+ ConversationManager cm = new ConversationManagerImpl( "s1",
+ conn,
+ l );
+ SchedulerClient schedulerClient = new SchedulerClient( grid1,
+ gsd,
+ cm );
+ ((SchedulerServiceConfiguration) gsd.getData()).setRedundancy( 3 );
- SchedulerClient schedulerClient = new SchedulerClient(grid1,gsd, cm);
- ((SchedulerServiceConfiguration)gsd.getData()).setRedundancy(3);
-
- JobHandle handle = schedulerClient.scheduleJob(new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)));
+ JobHandle handle = schedulerClient.scheduleJob( new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ) );
try {
- Thread.sleep(1000);
- } catch (InterruptedException ex) {
- Logger.getLogger(DistributedSchedulerTest.class.getName()).log(Level.SEVERE, null, ex);
+ Thread.sleep( 1000 );
+ } catch ( InterruptedException ex ) {
+ Logger.getLogger( DistributedSchedulerTest.class.getName() ).log( Level.SEVERE,
+ null,
+ ex );
}
-
- assertEquals(3, MockJob.counter);
-
+
+ assertEquals( 3,
+ MockJob.counter );
+
conn.close();
- grid1.get(MultiplexSocketService.class).close();
- grid2.get(MultiplexSocketService.class).close();
-
+ grid1.get( MultiplexSocketService.class ).close();
+ grid2.get( MultiplexSocketService.class ).close();
+
}
-
-
-
- public static class MockJobContext implements JobContext, Serializable {
+ public static class MockJobContext
+ implements
+ JobContext,
+ Serializable {
private String text;
@@ -308,7 +331,10 @@
}
}
- public static class MockTrigger implements Trigger, Serializable {
+ public static class MockTrigger
+ implements
+ Trigger,
+ Serializable {
private Date date;
@@ -326,7 +352,7 @@
public Date nextFireTime() {
Date tmp = new Date();
- tmp.setTime(this.date.getTime());
+ tmp.setTime( this.date.getTime() );
this.date = null;
return tmp;
}
@@ -352,8 +378,8 @@
}
public JobHandle scheduleJob(Job job,
- JobContext ctx,
- Trigger trigger) {
+ JobContext ctx,
+ Trigger trigger) {
// TODO Auto-generated method stub
return null;
}
@@ -366,19 +392,19 @@
public static class TimerServiceClusterManager {
private String[] ids;
- private int redundancyCount;
+ private int redundancyCount;
public void configure(String[] ids,
- int redundancyCount) {
+ int redundancyCount) {
this.ids = ids;
this.redundancyCount = redundancyCount;
- if (redundancyCount >= ids.length) {
- throw new IllegalArgumentException("Redundancy must be less than or equal to to total-1");
+ if ( redundancyCount >= ids.length ) {
+ throw new IllegalArgumentException( "Redundancy must be less than or equal to to total-1" );
}
}
private int indexOf(final int hashCode,
- final int dataSize) {
+ final int dataSize) {
return hashCode & (dataSize - 1);
}
}
@@ -388,11 +414,11 @@
TimerService {
public long getCurrentTime() {
- throw new UnsupportedOperationException("not supported");
+ throw new UnsupportedOperationException( "not supported" );
}
public long getTimeToNextJob() {
- throw new UnsupportedOperationException("not supported");
+ throw new UnsupportedOperationException( "not supported" );
}
public boolean removeJob(JobHandle jobHandle) {
@@ -400,106 +426,105 @@
}
public JobHandle scheduleJob(Job job,
- JobContext ctx,
- Trigger trigger) {
+ JobContext ctx,
+ Trigger trigger) {
UuidJobHandle jhandle = new UuidJobHandle();
- ScheduledJob sj = new ScheduledJob(jhandle,
- job,
- ctx,
- trigger);
+ ScheduledJob sj = new ScheduledJob( jhandle,
+ job,
+ ctx,
+ trigger );
return jhandle;
}
public void shutdown() {
- throw new UnsupportedOperationException("not supported");
+ throw new UnsupportedOperationException( "not supported" );
}
}
-
- private void configureGrid1(Grid grid, int port){
-
+
+ private void configureGrid1(Grid grid,
+ int port) {
+
//Local Grid Configuration, for our client
GridPeerConfiguration conf = new GridPeerConfiguration();
//Configuring the Core Services White Pages
- GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration(coreServicesMap);
- conf.addConfiguration(coreSeviceWPConf);
+ GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ conf.addConfiguration( coreSeviceWPConf );
//Configuring the Core Services Scheduler
GridPeerServiceConfiguration coreSeviceSchedulerConf = new CoreServicesSchedulerConfiguration();
- conf.addConfiguration(coreSeviceSchedulerConf);
+ conf.addConfiguration( coreSeviceSchedulerConf );
//Configuring the MultiplexSocketService
- GridPeerServiceConfiguration socketConf = new MultiplexSocketServiceCongifuration(new MultiplexSocketServerImpl("127.0.0.1",
- new MinaAcceptorFactoryService(),
- l));
- conf.addConfiguration(socketConf);
-
+ GridPeerServiceConfiguration socketConf = new MultiplexSocketServiceCongifuration( new MultiplexSocketServerImpl( "127.0.0.1",
+ new MinaAcceptorFactoryService(),
+ l ) );
+ conf.addConfiguration( socketConf );
+
//Configuring the WhitePages
GridPeerServiceConfiguration wplConf = new WhitePagesLocalConfiguration();
- conf.addConfiguration(wplConf);
-
+ conf.addConfiguration( wplConf );
+
//Exposing Local WhitePages
- GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration(port);
- conf.addConfiguration(wpsc);
+ GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration( port );
+ conf.addConfiguration( wpsc );
GridPeerServiceConfiguration registerwpincore = new RegisterWhitePagesConfiguration();
- conf.addConfiguration(registerwpincore);
+ conf.addConfiguration( registerwpincore );
//Create a Local Scheduler
- GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration("myLocalSched");
- conf.addConfiguration(schlConf);
+ GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration( "myLocalSched" );
+ conf.addConfiguration( schlConf );
//Expose it to the Grid so it can be accesed by different nodes
// I need to use the same port to reuse the service multiplexer
- GridPeerServiceConfiguration schlsc = new SchedulerSocketConfiguration(port);
- conf.addConfiguration(schlsc);
-
+ GridPeerServiceConfiguration schlsc = new SchedulerSocketConfiguration( port );
+ conf.addConfiguration( schlsc );
+
GridPeerServiceConfiguration registerschedincore = new RegisterSchedulerConfiguration();
- conf.addConfiguration(registerschedincore);
+ conf.addConfiguration( registerschedincore );
- conf.configure(grid);
-
-
+ conf.configure( grid );
+
}
-
- private void configureGrid2(Grid grid2, Connector conn){
+
+ private void configureGrid2(Grid grid2,
+ Connector conn) {
GridPeerConfiguration conf = new GridPeerConfiguration();
- GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration(coreServicesMap);
- conf.addConfiguration(coreSeviceWPConf);
+ GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ conf.addConfiguration( coreSeviceWPConf );
+ ConversationManager cm = new ConversationManagerImpl( "s1",
+ conn,
+ l );
- ConversationManager cm = new ConversationManagerImpl("s1",
- conn,
- l);
+ GridPeerServiceConfiguration wprConf = new WhitePagesRemoteConfiguration( cm );
+ conf.addConfiguration( wprConf );
- GridPeerServiceConfiguration wprConf = new WhitePagesRemoteConfiguration(cm);
- conf.addConfiguration(wprConf);
+ GridPeerServiceConfiguration schedRemoteClientConf = new SchedulerRemoteConfiguration( cm );
+ conf.addConfiguration( schedRemoteClientConf );
- GridPeerServiceConfiguration schedRemoteClientConf = new SchedulerRemoteConfiguration( cm);
- conf.addConfiguration(schedRemoteClientConf);
+ conf.configure( grid2 );
+ }
- conf.configure(grid2);
- }
-
-
- private void configureGrid3(Grid grid3, Connector conn){
+ private void configureGrid3(Grid grid3,
+ Connector conn) {
GridPeerConfiguration conf = new GridPeerConfiguration();
- GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration(coreServicesMap);
- conf.addConfiguration(coreSeviceWPConf);
+ GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ conf.addConfiguration( coreSeviceWPConf );
+ ConversationManager cm = new ConversationManagerImpl( "s1",
+ conn,
+ l );
- ConversationManager cm = new ConversationManagerImpl("s1",
- conn,
- l);
+ GridPeerServiceConfiguration wprConf = new WhitePagesRemoteConfiguration( cm );
+ conf.addConfiguration( wprConf );
- GridPeerServiceConfiguration wprConf = new WhitePagesRemoteConfiguration(cm);
- conf.addConfiguration(wprConf);
+ GridPeerServiceConfiguration schedRemoteClientConf = new SchedulerRemoteConfiguration( cm );
+ conf.addConfiguration( schedRemoteClientConf );
- GridPeerServiceConfiguration schedRemoteClientConf = new SchedulerRemoteConfiguration(cm);
- conf.addConfiguration(schedRemoteClientConf);
-
- conf.configure(grid3);
+ conf.configure( grid3 );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/MockJob.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/MockJob.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/MockJob.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -24,10 +24,13 @@
*
* @author salaboy
*/
- public class MockJob implements Job {
- public static int counter = 0;
- public void execute(JobContext ctx) {
- System.out.println("Job Executed!");
- counter++;
- }
+public class MockJob
+ implements
+ Job {
+ public static int counter = 0;
+
+ public void execute(JobContext ctx) {
+ System.out.println( "Job Executed!" );
+ counter++;
}
+}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/ScheduledJobJpaTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/ScheduledJobJpaTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/grid/time/impl/ScheduledJobJpaTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -16,72 +16,92 @@
import junit.framework.TestCase;
+public class ScheduledJobJpaTest extends TestCase {
-public class ScheduledJobJpaTest extends TestCase {
-
- public void test1() {
- EntityManagerFactory emf = Persistence.createEntityManagerFactory("org.drools.grid");
-
+ public void test1() {
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory( "org.drools.grid" );
+
UuidJobHandle handle = new UuidJobHandle();
- ScheduledJob sj1 = new ScheduledJob( handle, new MockJob(), new MockJobContext("xxx"), new MockTrigger( new Date(1000 ) ) );
- ScheduledJob sj2 = new ScheduledJob( handle, new MockJob(), new MockJobContext("xxx"), new MockTrigger( new Date(1000 ) ) );
-
+ ScheduledJob sj1 = new ScheduledJob( handle,
+ new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ) );
+ ScheduledJob sj2 = new ScheduledJob( handle,
+ new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ) );
+
EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
em.persist( sj1 );
em.getTransaction().commit();
em.close();
-
+
em = emf.createEntityManager();
-
- sj1 = em.find( ScheduledJob.class, sj1.getId() );
-
- assertEquals( sj2.getId(), sj1.getId() );
- assertEquals( sj2.getJob().getClass(), sj1.getJob().getClass() );
- assertEquals( "xxx", ((MockJobContext) sj1.getJobContext()).getText() );
- assertEquals( new Date(1000), ((MockTrigger) sj1.getTrigger()).hasNextFireTime() );
- assertEquals( new Date(1000), ((MockTrigger) sj1.getTrigger()).nextFireTime() );
-
+
+ sj1 = em.find( ScheduledJob.class,
+ sj1.getId() );
+
+ assertEquals( sj2.getId(),
+ sj1.getId() );
+ assertEquals( sj2.getJob().getClass(),
+ sj1.getJob().getClass() );
+ assertEquals( "xxx",
+ ((MockJobContext) sj1.getJobContext()).getText() );
+ assertEquals( new Date( 1000 ),
+ ((MockTrigger) sj1.getTrigger()).hasNextFireTime() );
+ assertEquals( new Date( 1000 ),
+ ((MockTrigger) sj1.getTrigger()).nextFireTime() );
+
}
-
- public static class MockJob implements Job, Serializable {
+
+ public static class MockJob
+ implements
+ Job,
+ Serializable {
public void execute(JobContext ctx) {
- }
+ }
}
-
- public static class MockJobContext implements JobContext, Serializable {
+
+ public static class MockJobContext
+ implements
+ JobContext,
+ Serializable {
private String text;
public MockJobContext() {
-
+
}
-
+
public MockJobContext(String text) {
this.text = text;
}
-
+
public JobHandle getJobHandle() {
return null;
}
public void setJobHandle(JobHandle jobHandle) {
-
- }
-
+
+ }
+
public String getText() {
return this.text;
}
-
+
}
-
- public static class MockTrigger implements Trigger, Serializable {
-
+
+ public static class MockTrigger
+ implements
+ Trigger,
+ Serializable {
+
private Date date;
-
+
public MockTrigger() {
-
+
}
-
+
public MockTrigger(Date date) {
this.date = date;
}
@@ -93,7 +113,7 @@
public Date nextFireTime() {
return this.date;
}
-
+
}
-
+
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/GridServiceDescriptionJpaTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/GridServiceDescriptionJpaTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/GridServiceDescriptionJpaTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -14,47 +14,56 @@
import junit.framework.TestCase;
+public class GridServiceDescriptionJpaTest extends TestCase {
+ public void test1() {
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory( "org.drools.grid" );
+ WhitePages wp = new WhitePagesImpl();
-public class GridServiceDescriptionJpaTest extends TestCase {
- public void test1() {
- EntityManagerFactory emf = Persistence.createEntityManagerFactory("org.drools.grid");
- WhitePages wp = new WhitePagesImpl();
-
-
-
- GridServiceDescription gsd1 = wp.create( WhitePages.class.getName() );
- gsd1.setImplementedClass(WhitePages.class);
- gsd1.addAddress( "socket" ).setObject( new InetSocketAddress("127.0.0.1", 5011));
- gsd1.addAddress("p1").setObject( "v1" );
-
- EntityManager em = emf.createEntityManager();
+ GridServiceDescription gsd1 = wp.create( WhitePages.class.getName() );
+ gsd1.setImplementedClass( WhitePages.class );
+ gsd1.addAddress( "socket" ).setObject( new InetSocketAddress( "127.0.0.1",
+ 5011 ) );
+ gsd1.addAddress( "p1" ).setObject( "v1" );
+
+ EntityManager em = emf.createEntityManager();
em.getTransaction().begin();
- em.persist(gsd1);
+ em.persist( gsd1 );
em.getTransaction().commit();
em.close();
-
- GridServiceDescriptionImpl gsd2 = new GridServiceDescriptionImpl("s1");
- gsd2.setImplementedClass(WhitePages.class);
- gsd2.addAddress( "socket" ).setObject( new InetSocketAddress("127.0.0.1", 5012));
- gsd2.addAddress( "p2" ).setObject( "v2" );
-
+
+ GridServiceDescriptionImpl gsd2 = new GridServiceDescriptionImpl( "s1" );
+ gsd2.setImplementedClass( WhitePages.class );
+ gsd2.addAddress( "socket" ).setObject( new InetSocketAddress( "127.0.0.1",
+ 5012 ) );
+ gsd2.addAddress( "p2" ).setObject( "v2" );
+
em = emf.createEntityManager();
- em.getTransaction().begin();
- em.persist(gsd2);
- em.getTransaction().commit();
- em.close();
-
- em = emf.createEntityManager();
- GridServiceDescription gsd1r = em.find( GridServiceDescriptionImpl.class, WhitePages.class.getName() );
- assertNotNull( gsd1r );
- assertEquals( gsd1, gsd1r );
- assertEquals( new InetSocketAddress("127.0.0.1", 5011), gsd1.getAddresses().get( "socket" ).getObject() );
- assertEquals( "v1", gsd1.getAddresses().get( "p1" ).getObject() );
-
- GridServiceDescription gsd2r = em.find( GridServiceDescriptionImpl.class, "s1" );
+ em.getTransaction().begin();
+ em.persist( gsd2 );
+ em.getTransaction().commit();
+ em.close();
+
+ em = emf.createEntityManager();
+ GridServiceDescription gsd1r = em.find( GridServiceDescriptionImpl.class,
+ WhitePages.class.getName() );
+ assertNotNull( gsd1r );
+ assertEquals( gsd1,
+ gsd1r );
+ assertEquals( new InetSocketAddress( "127.0.0.1",
+ 5011 ),
+ gsd1.getAddresses().get( "socket" ).getObject() );
+ assertEquals( "v1",
+ gsd1.getAddresses().get( "p1" ).getObject() );
+
+ GridServiceDescription gsd2r = em.find( GridServiceDescriptionImpl.class,
+ "s1" );
assertNotNull( gsd2r );
- assertEquals( gsd2, gsd2r );
- assertEquals( new InetSocketAddress("127.0.0.1", 5012), gsd2.getAddresses().get( "socket" ).getObject() );
- assertEquals( "v2", gsd2.getAddresses().get( "p2" ).getObject() );
- }
+ assertEquals( gsd2,
+ gsd2r );
+ assertEquals( new InetSocketAddress( "127.0.0.1",
+ 5012 ),
+ gsd2.getAddresses().get( "socket" ).getObject() );
+ assertEquals( "v2",
+ gsd2.getAddresses().get( "p2" ).getObject() );
+ }
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/JpaWhitePagesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/JpaWhitePagesTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/JpaWhitePagesTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -39,11 +39,11 @@
gs1.getAddresses().size() );
assertEquals( "v1",
gs1.getAddresses().get( "p1" ).getObject() );
-
+
wp.remove( "s1" );
-
+
assertNull( wp.lookup( "s1" ) );
-
+
GridServiceDescription gs2 = wp.lookup( "s2" );
assertNotNull( gs2 );
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/MinaTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/MinaTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/MinaTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -38,7 +38,7 @@
public void messageReceived(Conversation conversation,
Message msgIn) {
- conversation.respond( "echo: " + msgIn.getBody() );
+ conversation.respond( "echo: " + msgIn.getBody() );
}
};
@@ -53,25 +53,26 @@
ConversationManager cm = new ConversationManagerImpl( "s1",
conn,
- l);
+ l );
Conversation cv = cm.startConversation( new InetSocketAddress( "127.0.0.1",
5012 ),
"r1" );
-
+
BlockingMessageResponseHandler blockHandler = new BlockingMessageResponseHandler();
cv.sendMessage( "hello",
blockHandler );
-
+
Message msg = blockHandler.getMessage( 5000 );
System.out.println( msg.getBody() );
-
+
conn.close();
- if(acc.isOpen()){
+ if ( acc.isOpen() ) {
acc.close();
}
- assertEquals(false, acc.isOpen());
+ assertEquals( false,
+ acc.isOpen() );
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RegisterServicesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RegisterServicesTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RegisterServicesTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -62,7 +62,7 @@
*/
public class RegisterServicesTest {
- private SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
+ private SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
private Map<String, GridServiceDescription> coreServicesMap;
public RegisterServicesTest() {
@@ -86,100 +86,101 @@
@Test
public void testRegisterInCoreServices() {
-
+
coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
-
- GridImpl grid = new GridImpl(new HashMap<String, Object>());
+ GridImpl grid = new GridImpl( new HashMap<String, Object>() );
+
//Local Grid Configuration, for our client
GridPeerConfiguration conf = new GridPeerConfiguration();
//Configuring the Core Services White Pages
- GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration(coreServicesMap);
- conf.addConfiguration(coreSeviceWPConf);
+ GridPeerServiceConfiguration coreSeviceWPConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
+ conf.addConfiguration( coreSeviceWPConf );
//Configuring the Core Services Scheduler
GridPeerServiceConfiguration coreSeviceSchedulerConf = new CoreServicesSchedulerConfiguration();
- conf.addConfiguration(coreSeviceSchedulerConf);
+ conf.addConfiguration( coreSeviceSchedulerConf );
//Configuring the MultiplexSocketService
- GridPeerServiceConfiguration socketConf = new MultiplexSocketServiceCongifuration(new MultiplexSocketServerImpl("127.0.0.1",
- new MinaAcceptorFactoryService(),
- l));
- conf.addConfiguration(socketConf);
+ GridPeerServiceConfiguration socketConf = new MultiplexSocketServiceCongifuration( new MultiplexSocketServerImpl( "127.0.0.1",
+ new MinaAcceptorFactoryService(),
+ l ) );
+ conf.addConfiguration( socketConf );
//Configuring the WhitePages
GridPeerServiceConfiguration wplConf = new WhitePagesLocalConfiguration();
- conf.addConfiguration(wplConf);
+ conf.addConfiguration( wplConf );
//Exposing Local WhitePages
- GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration(5012);
- conf.addConfiguration(wpsc);
+ GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration( 5012 );
+ conf.addConfiguration( wpsc );
-
GridPeerServiceConfiguration registerwpincore = new RegisterWhitePagesConfiguration();
- conf.addConfiguration(registerwpincore);
+ conf.addConfiguration( registerwpincore );
-
//Create a Local Scheduler
- GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration("myLocalSched");
- conf.addConfiguration(schlConf);
+ GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration( "myLocalSched" );
+ conf.addConfiguration( schlConf );
//Expose it to the Grid so it can be accesed by different nodes
// I need to use the same port to reuse the service multiplexer
- GridPeerServiceConfiguration schlsc = new SchedulerSocketConfiguration(5012);
- conf.addConfiguration(schlsc);
+ GridPeerServiceConfiguration schlsc = new SchedulerSocketConfiguration( 5012 );
+ conf.addConfiguration( schlsc );
GridPeerServiceConfiguration registerschedincore = new RegisterSchedulerConfiguration();
- conf.addConfiguration(registerschedincore);
-
-
- conf.configure(grid);
+ conf.addConfiguration( registerschedincore );
+ conf.configure( grid );
//Local White Pages
- WhitePages wp = grid.get(WhitePages.class);
+ WhitePages wp = grid.get( WhitePages.class );
//Local sched in Local WP
- GridServiceDescription gsdLocalSched = wp.lookup("scheduler:"+"myLocalSched"+SchedulerService.class.getName());
+ GridServiceDescription gsdLocalSched = wp.lookup( "scheduler:" + "myLocalSched" + SchedulerService.class.getName() );
//Get the CoreWhitePages
- CoreServicesWhitePages corewp = grid.get(CoreServicesWhitePages.class);
+ CoreServicesWhitePages corewp = grid.get( CoreServicesWhitePages.class );
//Get the registered Scheduler
- GridServiceDescription gsdLocalButExposedSched = corewp.lookup(SchedulerService.class);
+ GridServiceDescription gsdLocalButExposedSched = corewp.lookup( SchedulerService.class );
//Get the registered white pages
- GridServiceDescription gsdLocalButExposedWp = corewp.lookup(WhitePages.class);
+ GridServiceDescription gsdLocalButExposedWp = corewp.lookup( WhitePages.class );
+ //The Scheduler is local = no addresses and no Data
+ Assert.assertEquals( 0,
+ gsdLocalSched.getAddresses().size() );
+ Assert.assertNull( gsdLocalSched.getData() );
- //The Scheduler is local = no addresses and no Data
- Assert.assertEquals(0, gsdLocalSched.getAddresses().size());
- Assert.assertNull(gsdLocalSched.getData());
-
- Assert.assertNotNull(gsdLocalButExposedSched.getData());
-
+ Assert.assertNotNull( gsdLocalButExposedSched.getData() );
+
Connector conn = new MinaConnector();
- ConversationManager cm = new ConversationManagerImpl("s1",
- conn,
- l);
-
+ ConversationManager cm = new ConversationManagerImpl( "s1",
+ conn,
+ l );
+
SchedulerClient sched = null;
-
-
- GridServiceDescription clientSched1 = wp.lookup("scheduler:"+"myLocalSched"+SchedulerService.class.getName());
- sched = new SchedulerClient(grid, clientSched1, cm);
- sched.scheduleJob(new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)));
-
- sched = new SchedulerClient(grid, gsdLocalButExposedSched, cm);
- sched.scheduleJob(new MockJob(), new MockJobContext("xxx"), new MockTrigger(new Date(1000)));
-
-
+
+ GridServiceDescription clientSched1 = wp.lookup( "scheduler:" + "myLocalSched" + SchedulerService.class.getName() );
+ sched = new SchedulerClient( grid,
+ clientSched1,
+ cm );
+ sched.scheduleJob( new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ) );
+
+ sched = new SchedulerClient( grid,
+ gsdLocalButExposedSched,
+ cm );
+ sched.scheduleJob( new MockJob(),
+ new MockJobContext( "xxx" ),
+ new MockTrigger( new Date( 1000 ) ) );
+
//GridServiceDescription clientSched2 = new WhitePagesClient( gsdLocalButExposedWp, cm).lookup(SchedulerService.class.getName());
-
-
+
conn.close();
-
- grid.get(MultiplexSocketService.class).close();
+ grid.get( MultiplexSocketService.class ).close();
+
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/RemoteWhitePagesTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -33,7 +33,7 @@
public class RemoteWhitePagesTest extends TestCase {
public void test1() {
-
+
Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
@@ -53,12 +53,12 @@
WhitePagesLocalConfiguration wplConf = new WhitePagesLocalConfiguration();
wplConf.setWhitePages( new JpaWhitePages( Persistence.createEntityManagerFactory( "org.drools.grid" ) ) );
conf.addConfiguration( wplConf );
-
- GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration(5012);
+
+ GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration( 5012 );
conf.addConfiguration( wpsc );
-
+
GridPeerServiceConfiguration registerwpincore = new RegisterWhitePagesConfiguration();
- conf.addConfiguration(registerwpincore);
+ conf.addConfiguration( registerwpincore );
conf.configure( grid1 );
@@ -106,19 +106,17 @@
gs1.getAddresses().size() );
assertEquals( "v1",
gs1.getAddresses().get( "p1" ).getObject() );
-
+
wp.remove( "s1" );
-
+
assertNull( wp.lookup( "s1" ) );
GridServiceDescription gs2 = wp.lookup( "s2" );
assertNotNull( gs2 );
-
+
conn.close();
-
+
grid1.get( MultiplexSocketService.class ).close();
-
-
-
+
}
}
Modified: labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/WhitePagesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/WhitePagesTest.java 2010-11-06 00:02:23 UTC (rev 35888)
+++ labs/jbossrules/trunk/drools-grid/drools-grid-impl2/src/test/java/org/drools/io/mina/WhitePagesTest.java 2010-11-08 05:46:39 UTC (rev 35889)
@@ -30,7 +30,6 @@
import org.drools.grid.timer.impl.SchedulerLocalConfiguration;
import org.drools.time.SchedulerService;
-
public class WhitePagesTest extends TestCase {
public void test1() throws Exception {
@@ -52,16 +51,14 @@
GridPeerServiceConfiguration wplConf = new WhitePagesLocalConfiguration();
conf.addConfiguration( wplConf );
-
- GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration(5012);
+
+ GridPeerServiceConfiguration wpsc = new WhitePagesSocketConfiguration( 5012 );
conf.addConfiguration( wpsc );
-
+
GridPeerServiceConfiguration registerwpincore = new RegisterWhitePagesConfiguration();
- conf.addConfiguration(registerwpincore);
+ conf.addConfiguration( registerwpincore );
conf.configure( grid1 );
-
-
GridImpl grid2 = new GridImpl( new ConcurrentHashMap<String, Object>() );
conf = new GridPeerConfiguration();
@@ -82,9 +79,8 @@
conf.configure( grid2 );
WhitePages wpClient = grid2.get( WhitePages.class );
-
- GridServiceDescription test1Gsd = wpClient.create( "test:string at domain1" );
+ GridServiceDescription test1Gsd = wpClient.create( "test:string at domain1" );
GridServiceDescription testGsd_2 = wpClient.lookup( "test:string at domain1" );
assertEquals( test1Gsd,
@@ -98,12 +94,12 @@
assertEquals( test1Gsd,
testGsd_3 );
assertNotSame( test1Gsd,
- testGsd_3 );
+ testGsd_3 );
conn.close();
- grid1.get(MultiplexSocketService.class).close();
+ grid1.get( MultiplexSocketService.class ).close();
}
-
- public void testWhitePagesLookupServices(){
+
+ public void testWhitePagesLookupServices() {
Map<String, GridServiceDescription> coreServicesMap = new HashMap<String, GridServiceDescription>();//Hazelcast.newHazelcastInstance( null ).getMap( CoreServicesWhitePages.class.getName() );
SystemEventListener l = SystemEventListenerFactory.getSystemEventListener();
@@ -114,34 +110,26 @@
GridPeerServiceConfiguration coreSeviceConf = new CoreServicesWhitePagesConfiguration( coreServicesMap );
conf.addConfiguration( coreSeviceConf );
-
+
GridPeerServiceConfiguration wplConf = new WhitePagesLocalConfiguration();
conf.addConfiguration( wplConf );
-
+
//Create a Local Scheduler
- GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration("myLocalSched1");
- conf.addConfiguration(schlConf);
-
+ GridPeerServiceConfiguration schlConf = new SchedulerLocalConfiguration( "myLocalSched1" );
+ conf.addConfiguration( schlConf );
+
//Create a Local Scheduler
- GridPeerServiceConfiguration schlConf2 = new SchedulerLocalConfiguration("myLocalSched2");
- conf.addConfiguration(schlConf2);
-
+ GridPeerServiceConfiguration schlConf2 = new SchedulerLocalConfiguration( "myLocalSched2" );
+ conf.addConfiguration( schlConf2 );
+
conf.configure( grid1 );
-
-
- WhitePages wplocal= grid1.get(WhitePages.class);
- Assert.assertNotNull(wplocal);
- GridServiceDescription schedulersgsd = wplocal.lookup("scheduler:"+"myLocalSched1"+SchedulerService.class.getName());
-
- Assert.assertNotNull(schedulersgsd);
-
-
-
-
-
-
+
+ WhitePages wplocal = grid1.get( WhitePages.class );
+ Assert.assertNotNull( wplocal );
+ GridServiceDescription schedulersgsd = wplocal.lookup( "scheduler:" + "myLocalSched1" + SchedulerService.class.getName() );
+
+ Assert.assertNotNull( schedulersgsd );
+
}
-
-
}
More information about the jboss-svn-commits
mailing list