[jboss-svn-commits] JBL Code SVN: r34142 - in labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid: drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 23 11:22:28 EDT 2010
Author: salaboy21
Date: 2010-07-23 11:22:27 -0400 (Fri, 23 Jul 2010)
New Revision: 34142
Added:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/resources/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/resources/org/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/resources/org/drools/
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/resources/org/drools/directoryNodeServiceTest.groovy
Modified:
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/RioDirectoryConnector.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/resources/org/drools/directoryNodeService.groovy
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/conf/test-config.groovy
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ExecutionNodeBaseTest.java
labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ITGridExecutionTest.java
Log:
modify opString for directoryNodeService
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/RioDirectoryConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/RioDirectoryConnector.java 2010-07-23 14:49:05 UTC (rev 34141)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-api/src/main/java/org/drools/grid/distributed/RioDirectoryConnector.java 2010-07-23 15:22:27 UTC (rev 34142)
@@ -51,7 +51,6 @@
}
-
public Message write(Message msg) throws ConnectorException, RemoteException {
if (directoryNode != null) {
@@ -127,7 +126,7 @@
}
public String lookupId(String resourceId) throws ConnectorException, RemoteException {
- return this.directoryNode.lookupId(resourceId);
+ return this.directoryNode.lookupId(resourceId);
}
public void registerKBase(String kbaseId, String resourceId) throws ConnectorException, RemoteException {
@@ -155,6 +154,6 @@
}
public void dispose() throws ConnectorException, RemoteException {
- this.directoryNode.dispose();
+ this.directoryNode.dispose();
}
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java 2010-07-23 14:49:05 UTC (rev 34141)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/java/org/drools/distributed/directory/impl/DirectoryNodeServiceImpl.java 2010-07-23 15:22:27 UTC (rev 34142)
@@ -122,8 +122,9 @@
}
@Override
- public String lookupId(String resourceId) throws ConnectorException {
- throw new UnsupportedOperationException("Not supported yet.");
+ public String lookupId(String sessionId) throws ConnectorException {
+ System.out.println("SessionId = "+sessionId +" ResourceId = "+directoryMap.get(sessionId));
+ return directoryMap.get(sessionId);
}
@Override
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/resources/org/drools/directoryNodeService.groovy
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/resources/org/drools/directoryNodeService.groovy 2010-07-23 14:49:05 UTC (rev 34141)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/main/resources/org/drools/directoryNodeService.groovy 2010-07-23 15:22:27 UTC (rev 34142)
@@ -32,7 +32,7 @@
classes 'org.drools.grid.DirectoryNodeService'
artifact ref:'service-dir-dl'
}
- implementation(class:'org.drools.grid.distributed.impl.DirectoryNodeServiceImpl') {
+ implementation(class:'org.drools.distributed.directory.impl.DirectoryNodeServiceImpl') {
artifact ref:'service-dir'
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/conf/test-config.groovy
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/conf/test-config.groovy 2010-07-23 14:49:05 UTC (rev 34141)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/conf/test-config.groovy 2010-07-23 15:22:27 UTC (rev 34142)
@@ -6,7 +6,7 @@
numCybernodes = 1
numMonitors = 1
//numLookups = 1
- opstring = 'src/main/resources/org/drools/directoryNodeService.groovy'
+ opstring = 'src/test/resources/org/drools/directoryNodeServiceTest.groovy'
autoDeploy = true
//harvest = true
}
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ExecutionNodeBaseTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ExecutionNodeBaseTest.java 2010-07-23 14:49:05 UTC (rev 34141)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ExecutionNodeBaseTest.java 2010-07-23 15:22:27 UTC (rev 34142)
@@ -22,6 +22,7 @@
import junit.framework.Assert;
import org.drools.grid.ConnectorException;
import org.drools.grid.DirectoryNodeService;
+import org.drools.grid.ExecutionNode;
import org.drools.grid.GridConnection;
import org.junit.Test;
/**
@@ -32,6 +33,7 @@
public abstract class ExecutionNodeBaseTest {
protected DirectoryNodeService directory;
+ protected ExecutionNode node;
protected GridConnection connection = new GridConnection();
public ExecutionNodeBaseTest() {
Modified: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ITGridExecutionTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ITGridExecutionTest.java 2010-07-23 14:49:05 UTC (rev 34141)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/java/org/drools/distributed/directory/ITGridExecutionTest.java 2010-07-23 15:22:27 UTC (rev 34142)
@@ -3,8 +3,10 @@
import org.drools.grid.ConnectorException;
import org.drools.grid.AcceptorService;
import junit.framework.Assert;
+import net.jini.core.lookup.ServiceItem;
import org.drools.grid.DirectoryNodeService;
+import org.drools.grid.ExecutionNodeService;
import org.junit.After;
@@ -27,29 +29,28 @@
public void setUp() throws Exception {
Assert.assertNotNull(testManager);
-// //setup all the services using the Rio Test Framework
-// //In real scenarios all this code will happen inside the connection.connect() method
+
//
DirectoryNodeService directoryService = (DirectoryNodeService) testManager.waitForService(DirectoryNodeService.class);
Assert.assertNotNull(directoryService);
- //Gnostic service = (Gnostic)testManager.waitForService(Gnostic.class);
+
connection.addDirectoryNode(directoryService);
-// ExecutionNodeService executionNode = (ExecutionNodeService) testManager.waitForService(ExecutionNodeService.class);
-// ServiceItem[] nodeServiceItems = testManager.getServiceItems(ExecutionNodeService.class);
-// System.out.println("ExecutionNodes Items =" + nodeServiceItems.length);
-//
-// for (int i = 0; i < nodeServiceItems.length; i++) {
-// if (nodeServiceItems[i].service instanceof ExecutionNodeService) {
-// connection.addExecutionNode((ExecutionNodeService) nodeServiceItems[i].service);
-// }
-// }
-//
-// //Get an execution node using the default/round robin strategy
-// node = connection.getExecutionNode();
-// System.out.println("ExecutionNode = "+ node);
+ ExecutionNodeService executionNode = (ExecutionNodeService) testManager.waitForService(ExecutionNodeService.class);
+ ServiceItem[] nodeServiceItems = testManager.getServiceItems(ExecutionNodeService.class);
+ System.out.println("ExecutionNodes Items =" + nodeServiceItems.length);
+ for (int i = 0; i < nodeServiceItems.length; i++) {
+ if (nodeServiceItems[i].service instanceof ExecutionNodeService) {
+ connection.addExecutionNode((ExecutionNodeService) nodeServiceItems[i].service);
+ }
+ }
+
+ //Get an execution node using the default/round robin strategy
+ node = connection.getExecutionNode();
+ System.out.println("ExecutionNode = "+ node);
+
directory = connection.getDirectoryNode().get(DirectoryNodeService.class);
System.out.println("Directory Node = "+directory);
Added: labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/resources/org/drools/directoryNodeServiceTest.groovy
===================================================================
--- labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/resources/org/drools/directoryNodeServiceTest.groovy (rev 0)
+++ labs/jbossrules/branches/salaboy_drools_grid_api_separation/drools-grid/drools-grid-distributed-dir-rio/src/test/resources/org/drools/directoryNodeServiceTest.groovy 2010-07-23 15:22:27 UTC (rev 34142)
@@ -0,0 +1,57 @@
+import org.rioproject.config.Constants
+import java.util.logging.Level
+
+import org.rioproject.resources.servicecore.Service
+
+deployment(name:'directoryNodeService', debug: 'true') {
+
+ logging {
+ logger 'org.rioproject.resolver', Level.ALL
+ logger 'org.rioproject.associsations' , Level.ALL
+ }
+ /* Configuration for the discovery group that the service should join.
+ * This first checks if the org.rioproject.groups property is set, if not
+ * the user name is used */
+ groups System.getProperty(Constants.GROUPS_PROPERTY_NAME,
+ System.getProperty('user.name'))
+
+ /* Declares the artifacts required for deployment. Note the 'dl'
+ * classifier used for the 'download' jar */
+ artifact id:'service-dir', 'org.drools:drools-grid-distributed-dir-rio:5.1.0.SNAPSHOT'
+ artifact id:'service-dir-dl', 'org.drools:drools-grid-distributed-dir-rio:dl:5.1.0.SNAPSHOT'
+ artifact id:'service', 'org.drools:drools-grid-distributed-rio:5.1.0.SNAPSHOT'
+ artifact id:'service-dl', 'org.drools:drools-grid-distributed-rio:dl:5.1.0.SNAPSHOT'
+
+ /*
+ * Declare the service to be deployed. The number of instances deployed
+ * defaults to 1. If you require > 1 instances change as needed
+ */
+
+ service(name: 'DirectoryNodeService') {
+ interfaces {
+ classes 'org.drools.grid.DirectoryNodeService'
+ artifact ref:'service-dir-dl'
+ }
+ implementation(class:'org.drools.distributed.directory.impl.DirectoryNodeServiceImpl') {
+ artifact ref:'service-dir'
+ }
+
+ association (name:'ExecutionNodeService', type:'uses', property:'executionNodes')
+
+ maintain 1
+ }
+
+ service(name: 'ExecutionNodeService', fork: 'no') { //fork yes, works only in unix machines
+ interfaces {
+ classes 'org.drools.grid.ExecutionNodeService'
+ artifact ref:'service-dl'
+ }
+ implementation(class:'org.drools.grid.distributed.impl.ExecutionNodeServiceImpl') {
+ artifact ref:'service'
+ }
+
+ maintain 1
+ }
+
+
+}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list