[jboss-svn-commits] JBL Code SVN: r31134 - in labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio: src/main/java/org/drools/vsm/rio and 4 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jan 19 09:13:23 EST 2010


Author: salaboy21
Date: 2010-01-19 09:13:22 -0500 (Tue, 19 Jan 2010)
New Revision: 31134

Added:
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/RegistryServiceImpl.java
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/utils/
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/utils/IDEntry.java
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java
Removed:
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/SessionService.java
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBase.java
Modified:
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/pom.xml
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioConnector.java
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioServer.java
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ITServiceManagerRioRemoteTest.java
   labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/resources/org/drools/sessionService.groovy
Log:
simple registry service impl

Modified: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/pom.xml	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/pom.xml	2010-01-19 14:13:22 UTC (rev 31134)
@@ -55,8 +55,11 @@
                     <createJar>
                         <classifier>dl</classifier>
                         <in>org.drools.vsm</in>
+                        
                         <topclasses>
-                            <topclass>org.drools.vsm.rio.SessionService</topclass>
+                            <topclass>org.drools.vsm.grid.SessionService</topclass>
+                            <topclass>org.drools.vsm.grid.RegistryService</topclass>
+                            <topclass>org.drools.vsm.rio.utils.IDEntry</topclass>
                         </topclasses>
                     </createJar>
                 </configuration>
@@ -85,11 +88,8 @@
                     <forkMode>always</forkMode>
                     <argLine>-DRIO_TEST_ATTACH</argLine>
                     <systemProperties>
+                        
                         <property>
-                            <name>RIO_HOME</name>
-                            <value>/Users/salaboy/projects/rio/distribution/target/rio-4.0-M3/</value>
-                        </property>
-                        <property>
                             <name>opstring</name>
                             <value>src/test/resources/org/drools/sessionService.groovy</value>
                         </property>

Modified: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioConnector.java	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioConnector.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -1,5 +1,6 @@
 package org.drools.vsm.rio;
 
+import org.drools.vsm.grid.SessionService;
 import java.rmi.RemoteException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -8,22 +9,20 @@
 
 import org.drools.SystemEventListener;
 import org.drools.vsm.GenericConnector;
-import org.drools.vsm.GenericIoWriter;
 import org.drools.vsm.Message;
 import org.drools.vsm.MessageResponseHandler;
+import org.drools.vsm.grid.RegistryService;
 
 public class RioConnector
     implements
-    GenericConnector,
-    GenericIoWriter {
+    GenericConnector {
 
     protected final String                 name;
     protected AtomicInteger                counter;
     protected SessionService               sessionService;
     protected SocketAddress                address;
     protected SystemEventListener          eventListener;
-    //protected ClientGenericMessageReceiver ioHandler;
-
+  
     public RioConnector(String name,
                         SystemEventListener eventListener
                        ) {
@@ -33,7 +32,7 @@
         this.name = name;
         this.counter = new AtomicInteger();
         this.eventListener = eventListener;
-   //     this.ioHandler = ioHandler;
+   
     }
 
     public RioConnector(String name,
@@ -47,49 +46,14 @@
         this.counter = new AtomicInteger();
         this.eventListener = eventListener;
         this.sessionService = sessionService;
-       // this.ioHandler = ioHandler; //new RioIoHandler( this.eventListener );
+       
     }
 
     /* (non-Javadoc)
      * @see org.drools.vsm.mina.Messenger#connect()
      */
     public boolean connect() {
-        //        Class[] classes = new Class[]{org.drools.vsm.rio.SessionService.class};
-        //        ServiceTemplate tmpl = new ServiceTemplate(null, classes, null);
-        //
-        //        LookupDiscoveryManager lookupDiscovery = null;
-        //        ServiceItem item = null;
-        //        try {
-        //            lookupDiscovery = new LookupDiscoveryManager(LookupDiscoveryManager.ALL_GROUPS, null, null);
-        //
-        //
-        //            System.out.println("Discovering Manager service ...");
-        //
-        //            ServiceDiscoveryManager serviceDiscovery = new ServiceDiscoveryManager(lookupDiscovery, new LeaseRenewalManager());
-        //
-        //            /* Wait no more then 10 seconds to discover the service */
-        //            item = serviceDiscovery.lookup(tmpl, null, 10000);
-        //
-        //            serviceDiscovery.terminate();
-        //        } catch (InterruptedException ex) {
-        //            Logger.getLogger(RioConnector.class.getName()).log(Level.SEVERE, null, ex);
-        //        } catch (RemoteException ex) {
-        //            Logger.getLogger(RioConnector.class.getName()).log(Level.SEVERE, null, ex);
-        //        } catch (IOException ex) {
-        //            Logger.getLogger(RioConnector.class.getName()).log(Level.SEVERE, null, ex);
-        //        }
-        //        if (item != null) {
-        //            System.out.println("Discovered Account service");
-        //            if (item.service instanceof SessionService) {
-        //                sessionService = (SessionService) item.service;
-        //
-        //            }
-        //            return true;
-        //        } else {
-        //            System.out.println("Session service not discovered, make sure the" +
-        //                    "service is deployed");
-        //            return false;
-        //        }
+        
         return true;
     }
 
@@ -125,7 +89,27 @@
     public void write(Message msg,
                       MessageResponseHandler responseHandler) {
         throw new UnsupportedOperationException();
-    }   
+    }
+
+ 
+    public String getId() {
+        try {
+            return sessionService.getId();
+        } catch (RemoteException ex) {
+            Logger.getLogger(RioConnector.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        return null;
+    }
+
+    public SessionService getSessionService() {
+        return sessionService;
+    }
+
     
+    public void setSession(Object object) {
+        this.sessionService = (SessionService) object;
+    }
 
+
+
 }

Modified: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioServer.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioServer.java	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioServer.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -1,6 +1,7 @@
 package org.drools.vsm.rio;
 
 
+import org.drools.vsm.grid.SessionService;
 import java.io.File;
 import java.io.IOException;
 

Deleted: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/SessionService.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/SessionService.java	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/SessionService.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -1,22 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.drools.vsm.rio;
-
-import java.rmi.RemoteException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.drools.vsm.GenericIoWriter;
-import org.drools.vsm.Message;
-
-/**
- *
- * @author salaboy
- */
-public interface SessionService extends GenericIoWriter {
-
-    public Message write(Message msg) throws RemoteException;    
-    
-}

Added: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/RegistryServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/RegistryServiceImpl.java	                        (rev 0)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/RegistryServiceImpl.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -0,0 +1,93 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.drools.vsm.rio.service;
+
+import java.io.IOException;
+import java.rmi.RemoteException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import net.jini.core.entry.Entry;
+import net.jini.core.lookup.ServiceItem;
+import net.jini.core.lookup.ServiceTemplate;
+import net.jini.discovery.LookupDiscoveryManager;
+import net.jini.lease.LeaseRenewalManager;
+import net.jini.lookup.ServiceDiscoveryManager;
+import org.drools.vsm.grid.RegistryService;
+import org.drools.vsm.grid.SessionService;
+import org.drools.vsm.rio.utils.IDEntry;
+
+/**
+ *
+ * @author salaboy
+ */
+public class RegistryServiceImpl implements RegistryService{
+
+    private Map<String, String> registry = new HashMap<String, String>();
+
+    @Override
+    public void register(String sessionId, String sessionServiceId) throws RemoteException {
+        System.out.println("Registering: "+  sessionId + " -- "+sessionServiceId);
+        registry.put(sessionId, sessionServiceId);
+    }
+
+    @Override
+    public SessionService lookup(String sessionId) throws RemoteException {
+        SessionService sessionService = null;
+        String sessionServiceId = (String)registry.get(sessionId);
+        System.out.println("Registry = "+ registry.toString());
+        
+        Class[] classes = new Class[]{org.drools.vsm.grid.SessionService.class};
+
+
+        ServiceTemplate tmpl = new ServiceTemplate(null, classes,new Entry[]{new IDEntry(sessionServiceId)});
+
+        LookupDiscoveryManager lookupDiscovery = null;
+        try {
+            lookupDiscovery = new LookupDiscoveryManager(LookupDiscoveryManager.ALL_GROUPS, null, null);
+        } catch (IOException ex) {
+            Logger.getLogger(RegistryServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+        System.out.println("Discovering Manager service ...");
+
+        ServiceDiscoveryManager serviceDiscovery =  null;
+        try {
+            serviceDiscovery = new ServiceDiscoveryManager(lookupDiscovery, new LeaseRenewalManager());
+        } catch (IOException ex) {
+            Logger.getLogger(RegistryServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+        }
+
+
+        /* Wait no more then 10 seconds to discover the service */
+        ServiceItem item = null;
+         try {
+            item = serviceDiscovery.lookup(tmpl, null, 1000);
+        } catch (InterruptedException ex) {
+            Logger.getLogger(RegistryServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+        }
+        serviceDiscovery.terminate();
+
+        if(item != null) {
+            System.out.println("Discovered Session service");
+            if(item.service instanceof SessionService){
+                sessionService = (SessionService)item.service;
+
+            }
+
+
+        } else {
+            System.out.println("Session service not discovered, make sure the"+
+                               "service is deployed");
+        }
+
+
+
+        return sessionService;
+    }
+
+}

Modified: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -14,12 +14,10 @@
  *  limitations under the License.
  *  under the License.
  */
-
 package org.drools.vsm.rio.service;
 
 import java.rmi.RemoteException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.UUID;
 
 import org.drools.SystemEventListener;
 import org.drools.SystemEventListenerFactory;
@@ -29,46 +27,58 @@
 import org.drools.vsm.Message;
 import org.drools.vsm.MessageResponseHandler;
 import org.drools.vsm.ServiceManagerData;
-import org.drools.vsm.rio.SessionService;
+import org.drools.vsm.grid.SessionService;
+import org.drools.vsm.rio.utils.IDEntry;
+import org.rioproject.core.jsb.ServiceBeanContext;
 
 /**
  *
  * @author salaboy
  */
-public class SessionServiceImpl implements SessionService{   
+public class SessionServiceImpl implements SessionService {
+
     private GenericMessageHandler handler;
+    private String id;
 
-    public SessionServiceImpl() {        
+    public SessionServiceImpl() {
+        this.id = UUID.randomUUID().toString();
         handler = new GenericMessageHandlerImpl(new ServiceManagerData(), SystemEventListenerFactory.getSystemEventListener());
     }
-    
-    
+
     public SessionServiceImpl(ServiceManagerData data,
-                              SystemEventListener systemEventListener) {
-        handler = new GenericMessageHandlerImpl( data, systemEventListener );
+            SystemEventListener systemEventListener) {
+        handler = new GenericMessageHandlerImpl(data, systemEventListener);
     }
 
-
-    public Message write(Message msg) throws RemoteException {   
+    public Message write(Message msg) throws RemoteException {
         BlockingGenericIoWriter blockingWriter = new BlockingGenericIoWriter();
         try {
-            handler.messageReceived( blockingWriter, msg );
-        } catch ( Exception e ) {
-            throw new RemoteException( e.getMessage() );
+            handler.messageReceived(blockingWriter, msg);
+        } catch (Exception e) {
+            throw new RemoteException(e.getMessage());
         }
-        
+
         return blockingWriter.getMessage();
     }
-    
+
     public GenericMessageHandler getGenericMessageHandler() {
         return this.handler;
     }
 
-
     public void write(Message msg,
-                      MessageResponseHandler responseHandler) {
+            MessageResponseHandler responseHandler) {
         throw new UnsupportedOperationException();
     }
-    
 
+    public void setServiceBeanContext(ServiceBeanContext context) {
+        context.addAttribute(new IDEntry(this.id));
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 }

Added: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/utils/IDEntry.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/utils/IDEntry.java	                        (rev 0)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/utils/IDEntry.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -0,0 +1,22 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package org.drools.vsm.rio.utils;
+
+/**
+ *
+ * @author salaboy
+ */
+public class IDEntry extends net.jini.entry.AbstractEntry{
+    public String id;
+
+   public IDEntry() {
+       super();
+   }
+
+   public IDEntry(String id) {
+       this. id = id;
+   }
+}

Modified: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ITServiceManagerRioRemoteTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ITServiceManagerRioRemoteTest.java	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ITServiceManagerRioRemoteTest.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -1,15 +1,17 @@
 package org.drools.vms;
 
+import java.util.List;
+import junit.framework.Assert;
+import net.jini.core.lookup.ServiceItem;
 import org.drools.SystemEventListenerFactory;
 import org.drools.vsm.AcceptorService;
-import org.drools.vsm.GenericMessageHandler;
 import org.drools.vsm.ServiceManagerData;
-import org.drools.vsm.mina.ClientGenericMessageReceiverImpl;
+import org.drools.vsm.grid.RegistryService;
+import org.drools.vsm.grid.ServiceManagerGridClient;
 import org.drools.vsm.remote.ServiceManagerRemoteClient;
 import org.drools.vsm.rio.RioConnector;
-import org.drools.vsm.rio.RioServer;
-import org.drools.vsm.rio.SessionService;
-import org.drools.vsm.rio.service.SessionServiceImpl;import org.junit.After;
+import org.drools.vsm.grid.SessionService;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.runner.RunWith;
 import org.rioproject.test.RioTestRunner;
@@ -17,19 +19,21 @@
 import org.rioproject.test.TestManager;
 
 @RunWith(RioTestRunner.class)
-public class ITServiceManagerRioRemoteTest extends ServiceManagerTestBase {
+public class ITServiceManagerRioRemoteTest extends ServiceManagerTestBaseGrid {
     AcceptorService server;
     @SetTestManager
     static TestManager testManager; 
     @Before
     public void setUp() throws Exception {
-
+        
         ServiceManagerData serverData = new ServiceManagerData();
-
+       Assert.assertNotNull(testManager);
         //setup Server
         SessionService sessionService = (SessionService) testManager.waitForService(SessionService.class);
-        
-        
+        //ServiceItem[] sessionServiceItems =   testManager.getServiceItems(SessionService.class);
+         Assert.assertNotNull(sessionService);
+        RegistryService registryService = (RegistryService) testManager.waitForService(RegistryService.class);
+         Assert.assertNotNull(registryService);
                                        
         RioConnector connector = new RioConnector( "client 1",
                                                    SystemEventListenerFactory.getSystemEventListener(),
@@ -37,16 +41,19 @@
                                                    );
 
         // setup Client
-        this.client = new ServiceManagerRemoteClient( "client 1",
+        this.client = new ServiceManagerGridClient( "client 1",
                                                       connector );
-        //this.client.connect();
 
+        ((ServiceManagerGridClient)this.client).setRegistryService(registryService);
+
+        ((ServiceManagerGridClient)this.client).connect();
+
     }
-    @After
-    public void tearDown() throws Exception {
-        
-        ((ServiceManagerRemoteClient) client).disconnect();
-        //this.server.stop();
-    }
+//    @After
+//    public void tearDown() throws Exception {
+//
+//        ((ServiceManagerGridClient) client).disconnect();
+//        //this.server.stop();
+//    }
 
 }

Deleted: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBase.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBase.java	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBase.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -1,187 +0,0 @@
-package org.drools.vms;
-
-
-
-import junit.framework.Assert;
-import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
-import org.drools.builder.KnowledgeBuilder;
-import org.drools.builder.KnowledgeBuilderProvider;
-import org.drools.builder.ResourceType;
-import org.drools.command.runtime.rule.FireAllRulesCommand;
-import org.drools.io.ResourceFactory;
-import org.drools.runtime.ExecutionResults;
-import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.vsm.ServiceManager;
-import org.junit.Test;
-
-
-public class ServiceManagerTestBase {
-
-	
-	
-    protected ServiceManager client;
-	
-    @Test
-    public void testFireAllRules() throws Exception {
-        String str = "";
-        str += "package org.drools \n";
-        str += "global java.util.List list \n";
-        str += "rule rule1 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello1!!!\" ); \n";
-        str += "end \n";
-        str += "rule rule2 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello2!!!\" ); \n";
-        str += "end \n";
-
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
-        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
-        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
-                      ResourceType.DRL );
-
-        if ( kbuilder.hasErrors() ) {
-            System.out.println( "Errors: " + kbuilder.getErrors() );
-        }
-
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
-        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
-
-        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
-
-        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
-        int fired = ksession.fireAllRules();
-        Assert.assertEquals( 2,
-                      fired );
-
-    }
-    @Test
-    public void testExecute() throws Exception {
-        String str = "";
-        str += "package org.drools \n";
-        str += "global java.util.List list \n";
-        str += "rule rule1 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello1!!!\" ); \n";
-        str += "end \n";
-        str += "rule rule2 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello2!!!\" ); \n";
-        str += "end \n";
-
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
-        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
-        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
-                      ResourceType.DRL );
-
-        if ( kbuilder.hasErrors() ) {
-            System.out.println( "Errors: " + kbuilder.getErrors() );
-        }
-
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
-        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
-
-        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
-
-        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
-
-        ExecutionResults results = ksession.execute( new FireAllRulesCommand( "fired" ) );
-
-        Assert.assertEquals( 2,
-                      (int) (Integer) results.getValue( "fired" ) );
-    }
-    @Test
-    public void testNamedService() throws Exception {
-        String str = "";
-        str += "package org.drools \n";
-        str += "global java.util.List list \n";
-        str += "rule rule1 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello1!!!\" ); \n";
-        str += "end \n";
-        str += "rule rule2 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello2!!!\" ); \n";
-        str += "end \n";
-
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
-        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
-        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
-                      ResourceType.DRL );
-
-        if ( kbuilder.hasErrors() ) {
-            System.out.println( "Errors: " + kbuilder.getErrors() );
-        }
-
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
-        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
-
-        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
-
-        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
-
-        this.client.register( "ksession1",
-                              ksession );
-
-        ExecutionResults results = this.client.lookup( "ksession1" ).execute( new FireAllRulesCommand( "fired" ) );
-
-        Assert.assertEquals( 2,
-                     (int) (Integer) results.getValue( "fired" ) );
-    }
-    @Test
-    public void testVsmPipeline() throws Exception {
-        String str = "";
-        str += "package org.drools \n";
-        str += "global java.util.List list \n";
-        str += "rule rule1 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello1!!!\" ); \n";
-        str += "end \n";
-        str += "rule rule2 \n";
-        str += "    dialect \"java\" \n";
-        str += "when \n";
-        str += "then \n";
-        str += "    System.out.println( \"hello2!!!\" ); \n";
-        str += "end \n";
-
-        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
-        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
-        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
-                      ResourceType.DRL );
-
-        if ( kbuilder.hasErrors() ) {
-            System.out.println( "Errors: " + kbuilder.getErrors() );
-        }
-
-        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
-        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
-
-        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
-
-        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
-
-        this.client.register( "ksession1",
-                              ksession );
-
-                ExecutionResults results = this.client.lookup( "ksession1" ).execute( new FireAllRulesCommand( "fired" ) );
-               
-                Assert.assertEquals( 2, (int ) ( Integer) results.getValue( "fired" ) );
-    }
-
-   
-}

Copied: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java (from rev 31068, labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBase.java)
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java	                        (rev 0)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ServiceManagerTestBaseGrid.java	2010-01-19 14:13:22 UTC (rev 31134)
@@ -0,0 +1,189 @@
+package org.drools.vms;
+
+
+
+import junit.framework.Assert;
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseProvider;
+import org.drools.builder.KnowledgeBuilder;
+import org.drools.builder.KnowledgeBuilderProvider;
+import org.drools.builder.ResourceType;
+import org.drools.command.runtime.rule.FireAllRulesCommand;
+import org.drools.io.ResourceFactory;
+import org.drools.runtime.ExecutionResults;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.vsm.ServiceManager;
+import org.junit.Test;
+
+
+public class ServiceManagerTestBaseGrid {
+
+	
+	
+    protected ServiceManager client;
+	
+//    @Test
+//    public void testFireAllRules() throws Exception {
+//        String str = "";
+//        str += "package org.drools \n";
+//        str += "global java.util.List list \n";
+//        str += "rule rule1 \n";
+//        str += "    dialect \"java\" \n";
+//        str += "when \n";
+//        str += "then \n";
+//        str += "    System.out.println( \"hello1!!!\" ); \n";
+//        str += "end \n";
+//        str += "rule rule2 \n";
+//        str += "    dialect \"java\" \n";
+//        str += "when \n";
+//        str += "then \n";
+//        str += "    System.out.println( \"hello2!!!\" ); \n";
+//        str += "end \n";
+//
+//        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+//        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
+//        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
+//                      ResourceType.DRL );
+//
+//        if ( kbuilder.hasErrors() ) {
+//            System.out.println( "Errors: " + kbuilder.getErrors() );
+//        }
+//
+//        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+//        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
+//
+//        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+//
+//        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+//        int fired = ksession.fireAllRules();
+//        Assert.assertEquals( 2,
+//                      fired );
+//
+//    }
+//    @Test
+//    public void testExecute() throws Exception {
+//        String str = "";
+//        str += "package org.drools \n";
+//        str += "global java.util.List list \n";
+//        str += "rule rule1 \n";
+//        str += "    dialect \"java\" \n";
+//        str += "when \n";
+//        str += "then \n";
+//        str += "    System.out.println( \"hello1!!!\" ); \n";
+//        str += "end \n";
+//        str += "rule rule2 \n";
+//        str += "    dialect \"java\" \n";
+//        str += "when \n";
+//        str += "then \n";
+//        str += "    System.out.println( \"hello2!!!\" ); \n";
+//        str += "end \n";
+//
+//        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+//        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
+//        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
+//                      ResourceType.DRL );
+//
+//        if ( kbuilder.hasErrors() ) {
+//            System.out.println( "Errors: " + kbuilder.getErrors() );
+//        }
+//
+//        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+//        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
+//
+//        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+//
+//        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+//
+//        ExecutionResults results = ksession.execute( new FireAllRulesCommand( "fired" ) );
+//
+//        Assert.assertEquals( 2,
+//                      (int) (Integer) results.getValue( "fired" ) );
+//    }
+    
+    @Test
+    public void testVsmPipeline() throws Exception {
+        String str = "";
+        str += "package org.drools \n";
+        str += "global java.util.List list \n";
+        str += "rule rule1 \n";
+        str += "    dialect \"java\" \n";
+        str += "when \n";
+        str += "then \n";
+        str += "    System.out.println( \"hello3!!!\" ); \n";
+        str += "end \n";
+        str += "rule rule2 \n";
+        str += "    dialect \"java\" \n";
+        str += "when \n";
+        str += "then \n";
+        str += "    System.out.println( \"hello4!!!\" ); \n";
+        str += "end \n";
+
+        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
+        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
+                      ResourceType.DRL );
+
+        if ( kbuilder.hasErrors() ) {
+            System.out.println( "Errors: " + kbuilder.getErrors() );
+        }
+
+        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
+
+        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+
+        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+
+        this.client.register( "ksession1",
+                              ksession );
+
+                ExecutionResults results = this.client.lookup( "ksession1" ).execute( new FireAllRulesCommand( "fired" ) );
+               
+                Assert.assertEquals( 2, (int ) ( Integer) results.getValue( "fired" ) );
+    }
+    @Test
+    public void testNamedService() throws Exception {
+        System.out.println("Running ===============> testNamedService");
+        String str = "";
+        str += "package org.drools \n";
+        str += "global java.util.List list \n";
+        str += "rule rule1 \n";
+        str += "    dialect \"java\" \n";
+        str += "when \n";
+        str += "then \n";
+        str += "    System.out.println( \"hello1!!!\" ); \n";
+        str += "end \n";
+        str += "rule rule2 \n";
+        str += "    dialect \"java\" \n";
+        str += "when \n";
+        str += "then \n";
+        str += "    System.out.println( \"hello2!!!\" ); \n";
+        str += "end \n";
+
+        KnowledgeBuilderProvider kbuilderFactory = this.client.getKnowledgeBuilderFactory();
+        KnowledgeBuilder kbuilder = kbuilderFactory.newKnowledgeBuilder();
+        kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
+                      ResourceType.DRL );
+
+        if ( kbuilder.hasErrors() ) {
+            System.out.println( "Errors: " + kbuilder.getErrors() );
+        }
+
+        KnowledgeBaseProvider kbaseFactory = this.client.getKnowledgeBaseFactory();
+        KnowledgeBase kbase = kbaseFactory.newKnowledgeBase();
+
+        kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
+
+        StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+        System.out.println("registering a session!!!!!!!");
+        this.client.register( "ksession1",
+                              ksession );
+        System.out.println("Lookup ksession1!!!!!!!!!!!!!");
+        ExecutionResults results = this.client.lookup( "ksession1" ).execute( new FireAllRulesCommand( "fired" ) );
+
+        Assert.assertEquals( 2,
+                     (int) (Integer) results.getValue( "fired" ) );
+        System.out.println("TEst ENDED =========>");
+    }
+   
+}

Modified: labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/resources/org/drools/sessionService.groovy
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/resources/org/drools/sessionService.groovy	2010-01-19 13:56:44 UTC (rev 31133)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/resources/org/drools/sessionService.groovy	2010-01-19 14:13:22 UTC (rev 31134)
@@ -18,7 +18,7 @@
      */
     service(name: 'SessionService') {
         interfaces {
-            classes 'org.drools.vsm.rio.SessionService'
+            classes 'org.drools.vsm.grid.SessionService'
             artifact ref:'service-dl'
         }
         implementation(class:'org.drools.vsm.rio.service.SessionServiceImpl') {
@@ -26,4 +26,14 @@
         }
         maintain 1
     }
+    service(name: 'RegistryService') {
+        interfaces {
+            classes 'org.drools.vsm.grid.RegistryService'
+            artifact ref:'service-dl'
+        }
+        implementation(class:'org.drools.vsm.rio.service.RegistryServiceImpl') {
+            artifact ref:'service'
+        }
+        maintain 1
+    }
 }
\ No newline at end of file



More information about the jboss-svn-commits mailing list