[jboss-svn-commits] JBL Code SVN: r29865 - in labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio: service and 1 other directory.

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

Author: mark.proctor at jboss.com
Date: 2009-10-28 18:55:19 -0400 (Wed, 28 Oct 2009)
New Revision: 29865

Removed:
   labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioIoWriter.java
Modified:
   labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java
   labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java
   labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java
Log:
JBRULES-2269 Virtual Service Manager
-more generifying

Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java	2009-10-28 22:51:46 UTC (rev 29864)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java	2009-10-28 22:55:19 UTC (rev 29865)
@@ -113,9 +113,9 @@
         if ( sessionService != null ) {
             try {
                 
-                Message returnMessage = this.sessionService.write( msg );
+                Message returnMessage = this.sessionService.rioWrite( msg );
                 
-                ioHandler.messageReceived( new RioIoWriter(sessionService) ,
+                ioHandler.messageReceived( sessionService ,
                                            returnMessage );
                 
             } catch ( RemoteException ex ) {

Deleted: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioIoWriter.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioIoWriter.java	2009-10-28 22:51:46 UTC (rev 29864)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/RioIoWriter.java	2009-10-28 22:55:19 UTC (rev 29865)
@@ -1,27 +0,0 @@
-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;
-
-public class RioIoWriter
-    implements
-    GenericIoWriter {
-    private SessionService sessionService;
-
-    public RioIoWriter(SessionService sessionService) {
-        this.sessionService = sessionService;
-    }
-
-    public void write(Message message) {
-        try {
-            this.sessionService.write(message);
-        } catch (RemoteException ex) {
-            Logger.getLogger(RioIoWriter.class.getName()).log(Level.SEVERE, null, ex);
-        }
-    }
-
-}

Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java	2009-10-28 22:51:46 UTC (rev 29864)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java	2009-10-28 22:55:19 UTC (rev 29865)
@@ -5,15 +5,18 @@
 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 {
+public interface SessionService extends GenericIoWriter {
 
-    public Message write(Message msg) throws RemoteException;
+    public Message rioWrite(Message msg) throws RemoteException;    
     
-    
 }

Modified: labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java	2009-10-28 22:51:46 UTC (rev 29864)
+++ labs/jbossrules/trunk/drools-vsm/src/main/java/org/drools/vsm/rio/service/SessionServiceImpl.java	2009-10-28 22:55:19 UTC (rev 29865)
@@ -18,14 +18,11 @@
 package org.drools.vsm.rio.service;
 
 import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 import org.drools.SystemEventListener;
 import org.drools.SystemEventListenerFactory;
-import org.drools.command.FinishedCommand;
-import org.drools.command.impl.ContextImpl;
-import org.drools.command.impl.GenericCommand;
-import org.drools.runtime.impl.ExecutionResultImpl;
 import org.drools.vsm.BlockingGenericIoWriter;
 import org.drools.vsm.GenericMessageHandler;
 import org.drools.vsm.GenericMessageHandlerImpl;
@@ -51,7 +48,7 @@
     }
 
 
-    public Message write(Message msg) throws RemoteException {   
+    public Message rioWrite(Message msg) throws RemoteException {   
         BlockingGenericIoWriter blockingWriter = new BlockingGenericIoWriter();
         try {
             handler.messageReceived( blockingWriter, msg );
@@ -65,6 +62,15 @@
     public GenericMessageHandler getGenericMessageHandler() {
         return this.handler;
     }
+
+
+    public void write(Message message) {
+        try {
+            rioWrite(message);
+        } catch (RemoteException ex) {
+            Logger.getLogger(SessionServiceImpl.class.getName()).log(Level.SEVERE, null, ex);
+        }
+    }
     
 
 }