[jboss-svn-commits] JBL Code SVN: r31045 - in labs/jbossrules/branches/salaboy_grid-rio/drools-vsm: src/main/java/org/drools/vsm/rio and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 12 17:31:13 EST 2010
Author: salaboy21
Date: 2010-01-12 17:31:13 -0500 (Tue, 12 Jan 2010)
New Revision: 31045
Removed:
labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java
labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioServer.java
labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java
labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/service/
labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerRioRemoteTest.java
Modified:
labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/pom.xml
Log:
remove rio deps from vsm
Modified: labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/pom.xml 2010-01-12 22:29:23 UTC (rev 31044)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/pom.xml 2010-01-12 22:31:13 UTC (rev 31045)
@@ -68,35 +68,7 @@
<version>1.5.2</version>
</dependency>
- <dependency>
- <groupId>org.rioproject</groupId>
- <artifactId>rio</artifactId>
- <version>4.0-M3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.rioproject</groupId>
- <artifactId>cybernode</artifactId>
- <version>4.0-M3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.rioproject</groupId>
- <artifactId>monitor</artifactId>
- <version>4.0-M3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.rioproject</groupId>
- <artifactId>boot</artifactId>
- <version>4.0-M3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.rioproject.tools</groupId>
- <artifactId>cli</artifactId>
- <version>4.0-M3-SNAPSHOT</version>
- </dependency>
+
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-process-task</artifactId>
@@ -126,33 +98,14 @@
</dependencies>
<repositories>
+
<repository>
- <id>rio</id>
- <url>http://www.rio-project.org/maven2</url>
- </repository>
- <repository>
- <id>elastic-grid</id>
- <url>http://maven.elastic-grid.com</url>
- </repository>
- <repository>
<id>jboss-snapshots</id>
<url>http://snapshots.jboss.org/maven2</url>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>rio</id>
- <url>http://www.rio-project.org/maven2</url>
- </pluginRepository>
+
- <pluginRepository>
-
- <id>elastic-grid</id>
- <url>http://maven.elastic-grid.com</url>
-
- </pluginRepository>
- </pluginRepositories>
-
</project>
Deleted: labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java 2010-01-12 22:29:23 UTC (rev 31044)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioConnector.java 2010-01-12 22:31:13 UTC (rev 31045)
@@ -1,140 +0,0 @@
-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
- GenericConnector,
- GenericIoWriter {
-
- 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,
- ClientGenericMessageReceiver ioHandler) {
- if ( name == null ) {
- throw new IllegalArgumentException( "Name can not be null" );
- }
- this.name = name;
- this.counter = new AtomicInteger();
- this.eventListener = eventListener;
- this.ioHandler = ioHandler;
- }
-
- public RioConnector(String name,
- SystemEventListener eventListener,
- SessionService sessionService,
- ClientGenericMessageReceiver ioHandler) {
- if ( name == null ) {
- throw new IllegalArgumentException( "Name can not be null" );
- }
- this.name = name;
- 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;
- }
-
- /* (non-Javadoc)
- * @see org.drools.vsm.mina.Messenger#disconnect()
- */
- public void disconnect() {
- //I don't need to be disconected
- }
-
- public Message write(Message msg) {
- if ( sessionService != null ) {
- try {
-
- Message returnMessage = this.sessionService.write( msg );
- return returnMessage;
- // ioHandler.messageReceived( sessionService ,
- // returnMessage );
-
- } catch ( RemoteException ex ) {
- Logger.getLogger( RioConnector.class.getName() ).log( Level.SEVERE,
- null,
- ex );
- } catch ( Exception ex ) {
- Logger.getLogger( RioConnector.class.getName() ).log( Level.SEVERE,
- null,
- ex );
- }
- }
- throw new IllegalStateException( "sessionService should not be null" );
- }
-
- public void write(Message msg,
- MessageResponseHandler responseHandler) {
- throw new UnsupportedOperationException();
- }
-
-
-}
Deleted: labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioServer.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioServer.java 2010-01-12 22:29:23 UTC (rev 31044)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/RioServer.java 2010-01-12 22:31:13 UTC (rev 31045)
@@ -1,47 +0,0 @@
-package org.drools.vsm.rio;
-
-
-import java.io.File;
-import java.io.IOException;
-
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import org.drools.vsm.AcceptorService;
-import org.rioproject.cybernode.StaticCybernode;
-
-public class RioServer
- implements
- AcceptorService {
- private SessionService sessionService;
- private String opstring = "src/test/resources/org/drools/sessionService.groovy";
-
- public RioServer() {
-
- }
-
- public synchronized void start() throws IOException {
- try {
- StaticCybernode cybernode = new StaticCybernode();
- Map<String, Object> map = cybernode.activate(new File(opstring));
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- String beanName = entry.getKey();
- Object beanImpl = entry.getValue();
- if (beanName.equals("SessionService")) {
- sessionService = (SessionService) beanImpl;
- }
- }
- } catch (Exception ex) {
- Logger.getLogger(RioServer.class.getName()).log(Level.SEVERE, null, ex);
- }
- }
-
- public synchronized void stop() {
- //do nothing
- }
- public SessionService getSessionService(){
- return this.sessionService;
- }
-
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java 2010-01-12 22:29:23 UTC (rev 31044)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/main/java/org/drools/vsm/rio/SessionService.java 2010-01-12 22:31:13 UTC (rev 31045)
@@ -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;
-
-}
Deleted: labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerRioRemoteTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerRioRemoteTest.java 2010-01-12 22:29:23 UTC (rev 31044)
+++ labs/jbossrules/branches/salaboy_grid-rio/drools-vsm/src/test/java/org/drools/vsm/ServiceManagerRioRemoteTest.java 2010-01-12 22:31:13 UTC (rev 31045)
@@ -1,41 +0,0 @@
-package org.drools.vsm;
-
-import org.drools.SystemEventListenerFactory;
-import org.drools.vsm.mina.ClientGenericMessageReceiverImpl;
-import org.drools.vsm.remote.ServiceManagerRemoteClient;
-import org.drools.vsm.rio.RioConnector;
-import org.drools.vsm.rio.RioServer;
-import org.drools.vsm.rio.service.SessionServiceImpl;;
-
-public class ServiceManagerRioRemoteTest extends ServiceManagerTestBase {
- AcceptorService server;
-
- protected void setUp() throws Exception {
-
- ServiceManagerData serverData = new ServiceManagerData();
-
- //setup Server
- RioServer rioServer = new RioServer();
- rioServer.start();
-
- GenericMessageHandler handler = ((SessionServiceImpl)rioServer.getSessionService()).getGenericMessageHandler();
-
- RioConnector connector = new RioConnector( "client 1",
- SystemEventListenerFactory.getSystemEventListener(),
- rioServer.getSessionService(),
- new ClientGenericMessageReceiverImpl(handler, SystemEventListenerFactory.getSystemEventListener()));
-
- // setup Client
- this.client = new ServiceManagerRemoteClient( "client 1",
- connector );
- //this.client.connect();
-
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- ((ServiceManagerRemoteClient) client).disconnect();
- //this.server.stop();
- }
-
-}
More information about the jboss-svn-commits
mailing list