[jboss-svn-commits] JBL Code SVN: r31070 - in labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src: test/java/org/drools/vms and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: salaboy21
Date: 2010-01-13 15:25:47 -0500 (Wed, 13 Jan 2010)
New Revision: 31070

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/test/java/org/drools/vms/ITServiceManagerRioRemoteTest.java
Log:
remove client handler, not needed

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-13 20:14:43 UTC (rev 31069)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/main/java/org/drools/vsm/rio/RioConnector.java	2010-01-13 20:25:47 UTC (rev 31070)
@@ -1,25 +1,16 @@
 package org.drools.vsm.rio;
 
-import java.io.IOException;
 import java.rmi.RemoteException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.net.SocketAddress;
 import java.util.concurrent.atomic.AtomicInteger;
 
-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.SystemEventListener;
-import org.drools.SystemEventListenerFactory;
-import org.drools.vsm.ClientGenericMessageReceiver;
 import org.drools.vsm.GenericConnector;
 import org.drools.vsm.GenericIoWriter;
 import org.drools.vsm.Message;
 import org.drools.vsm.MessageResponseHandler;
-import org.drools.vsm.mina.ClientGenericMessageReceiverImpl;
 
 public class RioConnector
     implements
@@ -31,24 +22,24 @@
     protected SessionService               sessionService;
     protected SocketAddress                address;
     protected SystemEventListener          eventListener;
-    protected ClientGenericMessageReceiver ioHandler;
+    //protected ClientGenericMessageReceiver ioHandler;
 
     public RioConnector(String name,
-                        SystemEventListener eventListener,
-                        ClientGenericMessageReceiver ioHandler) {
+                        SystemEventListener eventListener
+                       ) {
         if ( name == null ) {
             throw new IllegalArgumentException( "Name can not be null" );
         }
         this.name = name;
         this.counter = new AtomicInteger();
         this.eventListener = eventListener;
-        this.ioHandler = ioHandler;
+   //     this.ioHandler = ioHandler;
     }
 
     public RioConnector(String name,
                         SystemEventListener eventListener,
-                        SessionService sessionService,
-                        ClientGenericMessageReceiver ioHandler) {
+                        SessionService sessionService
+                        ) {
         if ( name == null ) {
             throw new IllegalArgumentException( "Name can not be null" );
         }
@@ -56,7 +47,7 @@
         this.counter = new AtomicInteger();
         this.eventListener = eventListener;
         this.sessionService = sessionService;
-        this.ioHandler = ioHandler; //new RioIoHandler( this.eventListener );
+       // this.ioHandler = ioHandler; //new RioIoHandler( this.eventListener );
     }
 
     /* (non-Javadoc)

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-13 20:14:43 UTC (rev 31069)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-grid-rio/src/test/java/org/drools/vms/ITServiceManagerRioRemoteTest.java	2010-01-13 20:25:47 UTC (rev 31070)
@@ -29,12 +29,12 @@
         //setup Server
         SessionService sessionService = (SessionService) testManager.waitForService(SessionService.class);
         
-        GenericMessageHandler handler =  ((SessionServiceImpl)sessionService).getGenericMessageHandler();
+        
                                        
         RioConnector connector = new RioConnector( "client 1",
                                                    SystemEventListenerFactory.getSystemEventListener(),
-                                                   sessionService,
-                                                   new ClientGenericMessageReceiverImpl(handler, SystemEventListenerFactory.getSystemEventListener()));
+                                                   sessionService
+                                                   );
 
         // setup Client
         this.client = new ServiceManagerRemoteClient( "client 1",