[jboss-svn-commits] JBL Code SVN: r32022 - in labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services: src/main/java/org/drools/services and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 10 13:50:22 EST 2010
Author: salaboy21
Date: 2010-03-10 13:50:20 -0500 (Wed, 10 Mar 2010)
New Revision: 32022
Added:
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.java
Removed:
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionGridConnection.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/NodeData.java
Modified:
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeClientConnectCommand.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeContext.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/LookupCommand.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/RegisterCommand.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericConnector.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericMessageHandlerImpl.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/MinaConnector.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/RemoteExecutionNodeTest.java
Log:
JBRULES-2446: Drools Services API
- drools-services refactoring
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/pom.xml 2010-03-10 18:50:20 UTC (rev 32022)
@@ -10,7 +10,7 @@
<groupId>org.drools</groupId>
<artifactId>drools-services</artifactId>
<version>5.1.0.SNAPSHOT</version>
- <name>drools-services</name>
+ <name>Drools :: Services</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
Deleted: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionGridConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionGridConnection.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionGridConnection.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -1,58 +0,0 @@
-/*
- * Copyright 2010 salaboy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * under the License.
- */
-
-package org.drools.services;
-
-import java.util.List;
-
-/**
- *
- * @author salaboy
- */
-public class ExecutionGridConnection {
- private List<ExecutionNode> nodes;
- private String url;
-
- public ExecutionGridConnection() {
- }
-
- public ExecutionGridConnection(String url) {
- this.url = url;
- }
-
- public List<ExecutionNode> connect(){
- return this.nodes;
- }
-
- public List<ExecutionNode> getNodes() {
- return nodes;
- }
-
- public void setNodes(List<ExecutionNode> nodes) {
- this.nodes = nodes;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
-
-}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeClientConnectCommand.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeClientConnectCommand.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeClientConnectCommand.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -4,7 +4,7 @@
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.runtime.impl.ExecutionResultImpl;
-import org.drools.services.generic.NodeData;
+import org.drools.services.generic.ExecutionNodeData;
public class ExecutionNodeClientConnectCommand
implements
@@ -21,7 +21,7 @@
public Integer execute(Context context) {
- NodeData data = (NodeData) context.get( NodeData.NODE_DATA );
+ ExecutionNodeData data = (ExecutionNodeData) context.get( ExecutionNodeData.NODE_DATA );
Integer sessionId = data.getSessionIdCounter().getAndIncrement();
if ( this.outIdentifier != null ) {
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeContext.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeContext.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeContext.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -2,20 +2,20 @@
import org.drools.command.Context;
import org.drools.command.ContextManager;
-import org.drools.services.generic.NodeData;
+import org.drools.services.generic.ExecutionNodeData;
public class ExecutionNodeContext
implements
Context {
private Context context;
- private NodeData data;
+ private ExecutionNodeData data;
public ExecutionNodeContext(Context context,
- NodeData data) {
+ ExecutionNodeData data) {
this.data = data;
}
- public NodeData getServiceManagerData() {
+ public ExecutionNodeData getServiceManagerData() {
return this.data;
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/LookupCommand.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/LookupCommand.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/LookupCommand.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -4,7 +4,7 @@
import org.drools.command.impl.GenericCommand;
import org.drools.command.impl.KnowledgeCommandContext;
import org.drools.runtime.impl.ExecutionResultImpl;
-import org.drools.services.generic.NodeData;
+import org.drools.services.generic.ExecutionNodeData;
public class LookupCommand
implements
@@ -25,7 +25,7 @@
}
public String execute(Context context) {
- NodeData data = (NodeData) context.get( NodeData.NODE_DATA );
+ ExecutionNodeData data = (ExecutionNodeData) context.get( ExecutionNodeData.NODE_DATA );
String instanceId = (String) data.getRoot().get( identifier );
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/RegisterCommand.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/RegisterCommand.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/RegisterCommand.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -2,7 +2,7 @@
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
-import org.drools.services.generic.NodeData;
+import org.drools.services.generic.ExecutionNodeData;
public class RegisterCommand
implements
@@ -21,7 +21,7 @@
}
public Void execute(Context context) {
- NodeData data = (NodeData) context.get( NodeData.NODE_DATA );
+ ExecutionNodeData data = (ExecutionNodeData) context.get( ExecutionNodeData.NODE_DATA );
data.getRoot().set( identifier,
type + ":" + instanceId );
Copied: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.java (from rev 31991, labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/NodeData.java)
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.java (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -0,0 +1,67 @@
+package org.drools.services.generic;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.drools.command.Context;
+import org.drools.command.ContextManager;
+import org.drools.command.impl.ContextImpl;
+import org.drools.vsm.ContextManagerImpl;
+
+public class ExecutionNodeData {
+ private ContextManager contextManager;
+
+ private Context root;
+ private Context temp;
+
+ public static String ROOT = "ROOT";
+ public static String TEMP = "__TEMP__";
+ public static String NODE_DATA = "__NodeData__";
+
+ private AtomicInteger sessionIdCounter = new AtomicInteger();
+
+ public ExecutionNodeData() {
+ // Setup ROOT context, this will hold all long lived intances and instanceIds
+ this.contextManager = new ContextManagerImpl();
+
+ this.root = new ContextImpl( ROOT,
+ this.contextManager );
+ ((ContextManagerImpl) this.contextManager).addContext( this.root );
+ this.root.set( NODE_DATA,
+ this );
+ // Setup TEMP context, this will hold all short lived instanceId and instances
+ // TODO: TEMP context should have a time/utilisation eviction queue added
+ this.temp = new ContextImpl( TEMP,
+ this.contextManager,
+ this.root );
+ ((ContextManagerImpl) this.contextManager).addContext( this.temp );
+ }
+
+ public AtomicInteger getSessionIdCounter() {
+ return sessionIdCounter;
+ }
+
+ public ContextManager getContextManager() {
+ return contextManager;
+ }
+
+ public void setContextManager(ContextManager contextManager) {
+ this.contextManager = contextManager;
+ }
+
+ public Context getRoot() {
+ return root;
+ }
+
+ public void setRoot(Context root) {
+ this.root = root;
+ }
+
+ public Context getTemp() {
+ return temp;
+ }
+
+ public void setTemp(Context temp) {
+ this.temp = temp;
+ }
+
+}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericConnector.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericConnector.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -9,5 +9,7 @@
Message write(Message msg);
//void write(Message msg);
+ String getId();
+ void setSession(Object object);
}
\ No newline at end of file
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericMessageHandlerImpl.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericMessageHandlerImpl.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericMessageHandlerImpl.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -12,9 +12,9 @@
public class GenericMessageHandlerImpl implements GenericMessageHandler {
private SystemEventListener systemEventListener;
- private NodeData data;
+ private ExecutionNodeData data;
- public GenericMessageHandlerImpl(NodeData data,
+ public GenericMessageHandlerImpl(ExecutionNodeData data,
SystemEventListener systemEventListener) {
this.systemEventListener = systemEventListener;
this.data = data;
Deleted: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/NodeData.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/NodeData.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/NodeData.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -1,67 +0,0 @@
-package org.drools.services.generic;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.drools.command.Context;
-import org.drools.command.ContextManager;
-import org.drools.command.impl.ContextImpl;
-import org.drools.vsm.ContextManagerImpl;
-
-public class NodeData {
- private ContextManager contextManager;
-
- private Context root;
- private Context temp;
-
- public static String ROOT = "ROOT";
- public static String TEMP = "__TEMP__";
- public static String NODE_DATA = "__NodeData__";
-
- private AtomicInteger sessionIdCounter = new AtomicInteger();
-
- public NodeData() {
- // Setup ROOT context, this will hold all long lived intances and instanceIds
- this.contextManager = new ContextManagerImpl();
-
- this.root = new ContextImpl( ROOT,
- this.contextManager );
- ((ContextManagerImpl) this.contextManager).addContext( this.root );
- this.root.set( NODE_DATA,
- this );
- // Setup TEMP context, this will hold all short lived instanceId and instances
- // TODO: TEMP context should have a time/utilisation eviction queue added
- this.temp = new ContextImpl( TEMP,
- this.contextManager,
- this.root );
- ((ContextManagerImpl) this.contextManager).addContext( this.temp );
- }
-
- public AtomicInteger getSessionIdCounter() {
- return sessionIdCounter;
- }
-
- public ContextManager getContextManager() {
- return contextManager;
- }
-
- public void setContextManager(ContextManager contextManager) {
- this.contextManager = contextManager;
- }
-
- public Context getRoot() {
- return root;
- }
-
- public void setRoot(Context root) {
- this.root = root;
- }
-
- public Context getTemp() {
- return temp;
- }
-
- public void setTemp(Context temp) {
- this.temp = temp;
- }
-
-}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/MinaConnector.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/MinaConnector.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/MinaConnector.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -19,6 +19,8 @@
implements
GenericConnector,
GenericIoWriter {
+
+
protected IoSession session;
protected final String name;
@@ -109,4 +111,12 @@
return returnMessage;
}
+
+ public String getId() {
+ return String.valueOf(session.getId());
+ }
+
+ public void setSession(Object object) {
+ this.session = (IoSession) object;
+ }
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/RemoteExecutionNodeTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/RemoteExecutionNodeTest.java 2010-03-10 17:53:10 UTC (rev 32021)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/RemoteExecutionNodeTest.java 2010-03-10 18:50:20 UTC (rev 32022)
@@ -28,7 +28,7 @@
import org.drools.SystemEventListenerFactory;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.SocketAcceptor;
-import org.drools.services.generic.NodeData;
+import org.drools.services.generic.ExecutionNodeData;
import java.net.SocketAddress;
import java.net.InetSocketAddress;
import org.drools.services.RemoteExecutionNodeConnection;
@@ -52,7 +52,7 @@
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
- NodeData serverData = new NodeData();
+ ExecutionNodeData serverData = new ExecutionNodeData();
// setup Server
SocketAcceptor acceptor = new NioSocketAcceptor();
acceptor.setHandler( new MinaIoHandler( SystemEventListenerFactory.getSystemEventListener(),
More information about the jboss-svn-commits
mailing list