[jboss-svn-commits] JBL Code SVN: r32252 - in labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src: main/java/org/drools/services/command and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Mar 27 11:01:58 EDT 2010
Author: salaboy21
Date: 2010-03-27 11:01:57 -0400 (Sat, 27 Mar 2010)
New Revision: 32252
Added:
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalNodeConnector.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/NodeConnector.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteNodeConnector.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericServiceConnector.java
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/remote/mina/MinaServiceConnector.java
Removed:
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionNodeConnection.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalExecutionNodeConnection.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteExecutionNodeConnection.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.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/remote/mina/MinaConnector.java
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/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/GenericMessageHandlerImpl.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/DirectoryLookupProviderRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseProviderRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderProviderRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/StatefulKnowledgeSessionRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/WorkItemManagerRemoteClient.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/ExecutionNodeBaseTest.java
labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/LocalExecutionNodeTest.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 names
Deleted: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionNodeConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionNodeConnection.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionNodeConnection.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -1,28 +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;
-
-/**
- *
- * @author salaboy
- */
-public interface ExecutionNodeConnection {
- public ExecutionNode connect();
- public void disconnect();
-
-}
Deleted: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalExecutionNodeConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalExecutionNodeConnection.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalExecutionNodeConnection.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -1,49 +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 org.drools.KnowledgeBaseFactoryService;
-import org.drools.builder.KnowledgeBuilderFactoryService;
-import org.drools.services.local.KnowledgeBaseProviderLocalClient;
-import org.drools.services.local.KnowledgeBuilderProviderLocalClient;
-/**
- *
- * @author salaboy
- */
-public class LocalExecutionNodeConnection implements ExecutionNodeConnection {
-
-
-
- public LocalExecutionNodeConnection() {
- }
-
-
- public ExecutionNode connect() {
- ExecutionNode node = new ExecutionNode();
- node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderLocalClient() );
- node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderLocalClient() );
-
- return node;
- }
-
- public void disconnect() {
-
- }
-
-
-
-}
Copied: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalNodeConnector.java (from rev 31993, labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalExecutionNodeConnection.java)
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalNodeConnector.java (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/LocalNodeConnector.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -0,0 +1,49 @@
+/*
+ * 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 org.drools.KnowledgeBaseFactoryService;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.services.local.KnowledgeBaseProviderLocalClient;
+import org.drools.services.local.KnowledgeBuilderProviderLocalClient;
+/**
+ *
+ * @author salaboy
+ */
+public class LocalNodeConnector implements NodeConnector {
+
+
+
+ public LocalNodeConnector() {
+ }
+
+
+ public ExecutionNode connect() {
+ ExecutionNode node = new ExecutionNode();
+ node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderLocalClient() );
+ node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderLocalClient() );
+
+ return node;
+ }
+
+ public void disconnect() {
+
+ }
+
+
+
+}
Copied: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/NodeConnector.java (from rev 31993, labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/ExecutionNodeConnection.java)
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/NodeConnector.java (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/NodeConnector.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -0,0 +1,28 @@
+/*
+ * 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;
+
+/**
+ *
+ * @author salaboy
+ */
+public interface NodeConnector {
+ public ExecutionNode connect();
+ public void disconnect();
+
+}
Deleted: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteExecutionNodeConnection.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteExecutionNodeConnection.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteExecutionNodeConnection.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -1,86 +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;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.drools.KnowledgeBaseFactoryService;
-import org.drools.builder.DirectoryLookupFactoryService;
-import org.drools.builder.KnowledgeBuilderFactoryService;
-import org.drools.services.generic.GenericConnector;
-import org.drools.services.remote.DirectoryLookupProviderRemoteClient;
-import org.drools.services.remote.KnowledgeBaseProviderRemoteClient;
-import org.drools.services.remote.KnowledgeBuilderProviderRemoteClient;
-
-/**
- *
- * @author salaboy
- */
-public class RemoteExecutionNodeConnection implements ExecutionNodeConnection {
-
- private String name;
- public GenericConnector client;
- public AtomicInteger counter;
- private int sessionId = -1;
-
- public RemoteExecutionNodeConnection(String name, GenericConnector connector) {
- this.name = name;
- this.client = connector;
- this.counter = new AtomicInteger();
- }
-
- public ExecutionNode connect() {
-
- if (client.connect()) {
-
- ExecutionNode node = new ExecutionNode();
- node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(this));
- node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(this));
- node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(this));
- return node;
- }
- return null;
- }
-
- public void disconnect() {
- client.disconnect();
- }
-
- public GenericConnector getClient() {
- return client;
- }
-
- public void setClient(GenericConnector client) {
- this.client = client;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getSessionId() {
- return sessionId;
- }
-
- public int getNextId() {
- return this.counter.incrementAndGet();
- }
-}
Copied: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteNodeConnector.java (from rev 32165, labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteExecutionNodeConnection.java)
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteNodeConnector.java (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/RemoteNodeConnector.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -0,0 +1,86 @@
+/*
+ * 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;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.drools.KnowledgeBaseFactoryService;
+import org.drools.builder.DirectoryLookupFactoryService;
+import org.drools.builder.KnowledgeBuilderFactoryService;
+import org.drools.services.generic.GenericServiceConnector;
+import org.drools.services.remote.DirectoryLookupProviderRemoteClient;
+import org.drools.services.remote.KnowledgeBaseProviderRemoteClient;
+import org.drools.services.remote.KnowledgeBuilderProviderRemoteClient;
+
+/**
+ *
+ * @author salaboy
+ */
+public class RemoteNodeConnector implements NodeConnector {
+
+ private String name;
+ public GenericServiceConnector client;
+ public AtomicInteger counter;
+ private int sessionId = -1;
+
+ public RemoteNodeConnector(String name, GenericServiceConnector connector) {
+ this.name = name;
+ this.client = connector;
+ this.counter = new AtomicInteger();
+ }
+
+ public ExecutionNode connect() {
+
+ if (client.connect()) {
+
+ ExecutionNode node = new ExecutionNode();
+ node.set(KnowledgeBuilderFactoryService.class, new KnowledgeBuilderProviderRemoteClient(this));
+ node.set(KnowledgeBaseFactoryService.class, new KnowledgeBaseProviderRemoteClient(this));
+ node.set(DirectoryLookupFactoryService.class, new DirectoryLookupProviderRemoteClient(this));
+ return node;
+ }
+ return null;
+ }
+
+ public void disconnect() {
+ client.disconnect();
+ }
+
+ public GenericServiceConnector getClient() {
+ return client;
+ }
+
+ public void setClient(GenericServiceConnector client) {
+ this.client = client;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getSessionId() {
+ return sessionId;
+ }
+
+ public int getNextId() {
+ return this.counter.incrementAndGet();
+ }
+}
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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeClientConnectCommand.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -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.ExecutionNodeData;
+import org.drools.services.generic.NodeData;
public class ExecutionNodeClientConnectCommand
implements
@@ -21,7 +21,7 @@
public Integer execute(Context context) {
- ExecutionNodeData data = (ExecutionNodeData) context.get( ExecutionNodeData.NODE_DATA );
+ NodeData data = (NodeData) context.get( NodeData.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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/ExecutionNodeContext.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -2,20 +2,20 @@
import org.drools.command.Context;
import org.drools.command.ContextManager;
-import org.drools.services.generic.ExecutionNodeData;
+import org.drools.services.generic.NodeData;
public class ExecutionNodeContext
implements
Context {
private Context context;
- private ExecutionNodeData data;
+ private NodeData data;
public ExecutionNodeContext(Context context,
- ExecutionNodeData data) {
+ NodeData data) {
this.data = data;
}
- public ExecutionNodeData getServiceManagerData() {
+ public NodeData 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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/LookupCommand.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -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.ExecutionNodeData;
+import org.drools.services.generic.NodeData;
public class LookupCommand
implements
@@ -25,7 +25,7 @@
}
public String execute(Context context) {
- ExecutionNodeData data = (ExecutionNodeData) context.get( ExecutionNodeData.NODE_DATA );
+ NodeData data = (NodeData) context.get( NodeData.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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/command/RegisterCommand.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -2,7 +2,7 @@
import org.drools.command.Context;
import org.drools.command.impl.GenericCommand;
-import org.drools.services.generic.ExecutionNodeData;
+import org.drools.services.generic.NodeData;
public class RegisterCommand
implements
@@ -21,7 +21,7 @@
}
public Void execute(Context context) {
- ExecutionNodeData data = (ExecutionNodeData) context.get( ExecutionNodeData.NODE_DATA );
+ NodeData data = (NodeData) context.get( NodeData.NODE_DATA );
data.getRoot().set( identifier,
type + ":" + instanceId );
Deleted: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/ExecutionNodeData.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -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.services.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;
- }
-
-}
Deleted: 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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericConnector.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -1,15 +0,0 @@
-package org.drools.services.generic;
-
-public interface GenericConnector extends GenericIoWriter {
-
- boolean connect();
-
- void disconnect();
-
- 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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericMessageHandlerImpl.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -12,9 +12,9 @@
public class GenericMessageHandlerImpl implements GenericMessageHandler {
private SystemEventListener systemEventListener;
- private ExecutionNodeData data;
+ private NodeData data;
- public GenericMessageHandlerImpl(ExecutionNodeData data,
+ public GenericMessageHandlerImpl(NodeData data,
SystemEventListener systemEventListener) {
this.systemEventListener = systemEventListener;
this.data = data;
Copied: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericServiceConnector.java (from rev 32022, 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/GenericServiceConnector.java (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/GenericServiceConnector.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -0,0 +1,15 @@
+package org.drools.services.generic;
+
+public interface GenericServiceConnector extends GenericIoWriter {
+
+ boolean connect();
+
+ void disconnect();
+
+ Message write(Message msg);
+
+ //void write(Message msg);
+ String getId();
+
+ void setSession(Object object);
+}
\ No newline at end of file
Copied: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/NodeData.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/NodeData.java (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/generic/NodeData.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -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.services.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/DirectoryLookupProviderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/DirectoryLookupProviderRemoteClient.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/DirectoryLookupProviderRemoteClient.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -25,7 +25,7 @@
import org.drools.runtime.CommandExecutor;
import org.drools.runtime.ExecutionResults;
import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.drools.services.command.LookupCommand;
import org.drools.services.command.RegisterCommand;
import org.drools.services.generic.Message;
@@ -37,10 +37,10 @@
*/
public class DirectoryLookupProviderRemoteClient implements DirectoryLookupFactoryService {
- private RemoteExecutionNodeConnection nodeConnection;
+ private RemoteNodeConnector nodeConnection;
private MessageSession messageSession;
- public DirectoryLookupProviderRemoteClient(RemoteExecutionNodeConnection nodeConnection) {
+ public DirectoryLookupProviderRemoteClient(RemoteNodeConnector nodeConnection) {
this.nodeConnection = nodeConnection;
this.messageSession = new MessageSession();
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseProviderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseProviderRemoteClient.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseProviderRemoteClient.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -11,15 +11,15 @@
import org.drools.command.SetVariableCommand;
import org.drools.runtime.Environment;
import org.drools.runtime.KnowledgeSessionConfiguration;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.drools.services.generic.Message;
public class KnowledgeBaseProviderRemoteClient
implements
KnowledgeBaseFactoryService {
- private RemoteExecutionNodeConnection nodeConnection;
+ private RemoteNodeConnector nodeConnection;
- public KnowledgeBaseProviderRemoteClient(RemoteExecutionNodeConnection nodeConnection) {
+ public KnowledgeBaseProviderRemoteClient(RemoteNodeConnector nodeConnection) {
this.nodeConnection = nodeConnection;
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseRemoteClient.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBaseRemoteClient.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -18,7 +18,7 @@
import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.runtime.StatefulKnowledgeSession;
import org.drools.runtime.StatelessKnowledgeSession;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.drools.services.generic.CollectionClient;
import org.drools.services.generic.Message;
@@ -26,11 +26,11 @@
implements
KnowledgeBase {
- private RemoteExecutionNodeConnection nodeConnection;
+ private RemoteNodeConnector nodeConnection;
private String instanceId;
public KnowledgeBaseRemoteClient(String instanceId,
- RemoteExecutionNodeConnection nodeConnection) {
+ RemoteNodeConnector nodeConnection) {
this.instanceId = instanceId;
this.nodeConnection = nodeConnection;
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderProviderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderProviderRemoteClient.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderProviderRemoteClient.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -14,15 +14,15 @@
import org.drools.command.FinishedCommand;
import org.drools.command.SetVariableCommand;
import org.drools.command.builder.NewKnowledgeBuilderCommand;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.drools.services.generic.Message;
public class KnowledgeBuilderProviderRemoteClient
implements
KnowledgeBuilderFactoryService {
- private RemoteExecutionNodeConnection nodeConnection;
+ private RemoteNodeConnector nodeConnection;
- public KnowledgeBuilderProviderRemoteClient(RemoteExecutionNodeConnection nodeConnection) {
+ public KnowledgeBuilderProviderRemoteClient(RemoteNodeConnector nodeConnection) {
this.nodeConnection = nodeConnection;
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderRemoteClient.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/KnowledgeBuilderRemoteClient.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -15,18 +15,18 @@
import org.drools.definition.KnowledgePackage;
import org.drools.io.Resource;
import org.drools.runtime.ExecutionResults;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.drools.services.generic.CollectionClient;
import org.drools.services.generic.Message;
public class KnowledgeBuilderRemoteClient
implements
KnowledgeBuilder {
- private RemoteExecutionNodeConnection nodeConnection;
+ private RemoteNodeConnector nodeConnection;
private String instanceId;
public KnowledgeBuilderRemoteClient(String instanceId,
- RemoteExecutionNodeConnection nodeConnection) {
+ RemoteNodeConnector nodeConnection) {
this.instanceId = instanceId;
this.nodeConnection = nodeConnection;
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/StatefulKnowledgeSessionRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/StatefulKnowledgeSessionRemoteClient.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/StatefulKnowledgeSessionRemoteClient.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -28,7 +28,7 @@
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.QueryResults;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.drools.time.SessionClock;
import org.drools.services.generic.Message;
@@ -36,11 +36,11 @@
implements
StatefulKnowledgeSession {
- private RemoteExecutionNodeConnection nodeConnection;
+ private RemoteNodeConnector nodeConnection;
private String instanceId;
public StatefulKnowledgeSessionRemoteClient(String instanceId,
- RemoteExecutionNodeConnection nodeConnection) {
+ RemoteNodeConnector nodeConnection) {
this.instanceId = instanceId;
this.nodeConnection = nodeConnection;
}
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/WorkItemManagerRemoteClient.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/WorkItemManagerRemoteClient.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/WorkItemManagerRemoteClient.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -7,7 +7,7 @@
import org.drools.command.runtime.process.CompleteWorkItemCommand;
import org.drools.runtime.process.WorkItemHandler;
import org.drools.runtime.process.WorkItemManager;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.drools.services.generic.Message;
/**
@@ -19,7 +19,7 @@
private static final long serialVersionUID = 1L;
- private RemoteExecutionNodeConnection nodeConnection;
+ private RemoteNodeConnector nodeConnection;
private String instanceId;
public void abortWorkItem(long id) {
@@ -47,7 +47,7 @@
throw new UnsupportedOperationException("Not supported yet.");
}
- public void setNodeConnection(RemoteExecutionNodeConnection nodeConnection) {
+ public void setNodeConnection(RemoteNodeConnector nodeConnection) {
this.nodeConnection = nodeConnection;
}
Deleted: 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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/MinaConnector.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -1,122 +0,0 @@
-package org.drools.services.remote.mina;
-
-import java.net.SocketAddress;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.mina.core.future.ConnectFuture;
-import org.apache.mina.core.session.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
-import org.apache.mina.transport.socket.SocketConnector;
-import org.drools.SystemEventListener;
-import org.drools.services.generic.GenericConnector;
-import org.drools.services.generic.GenericIoWriter;
-import org.drools.services.generic.Message;
-import org.drools.services.generic.MessageResponseHandler;
-import org.drools.services.responsehandlers.BlockingMessageResponseHandler;
-
-public class MinaConnector
- implements
- GenericConnector,
- GenericIoWriter {
-
-
- protected IoSession session;
-
- protected final String name;
- protected AtomicInteger counter;
- protected SocketConnector connector;
- protected SocketAddress address;
- protected SystemEventListener eventListener;
-
- public MinaConnector(String name,
- SocketConnector connector,
- SocketAddress address,
- SystemEventListener eventListener) {
- if ( name == null ) {
- throw new IllegalArgumentException( "Name can not be null" );
- }
- this.name = name;
- this.counter = new AtomicInteger();
- this.address = address;
- this.connector = connector;
- this.eventListener = eventListener;
- }
-
- /* (non-Javadoc)
- * @see org.drools.vsm.mina.Messenger#connect()
- */
- public boolean connect() {
- if ( session != null && session.isConnected() ) {
- throw new IllegalStateException( "Already connected. Disconnect first." );
- }
-
- try {
- this.connector.getFilterChain().addLast( "codec",
- new ProtocolCodecFilter( new ObjectSerializationCodecFactory() ) );
-
- ConnectFuture future1 = this.connector.connect( this.address );
- future1.await( 2000 );
- if ( !future1.isConnected() ) {
- eventListener.info( "unable to connect : " + address + " : " + future1.getException() );
- return false;
- }
- eventListener.info( "connected : " + address );
- this.session = future1.getSession();
- return true;
- } catch ( Exception e ) {
- e.printStackTrace();
- return false;
- }
- }
-
- /* (non-Javadoc)
- * @see org.drools.vsm.mina.Messenger#disconnect()
- */
- public void disconnect() {
- if ( session != null && session.isConnected() ) {
- session.close();
- session.getCloseFuture().join();
- }
- }
-
- private void addResponseHandler(int id,
- MessageResponseHandler responseHandler) {
- ((MinaIoHandler) this.connector.getHandler()).addResponseHandler( id,
- responseHandler );
- }
-
- public void write(Message msg,
- MessageResponseHandler responseHandler) {
- if ( responseHandler != null ) {
- addResponseHandler( msg.getResponseId(),
- responseHandler );
- }
- this.session.write( msg );
- }
-
- public Message write(Message msg) {
- BlockingMessageResponseHandler responseHandler = new BlockingMessageResponseHandler();
-
- if ( responseHandler != null ) {
- addResponseHandler( msg.getResponseId(),
- responseHandler );
- }
- this.session.write( msg );
-
- Message returnMessage = responseHandler.getMessage();
- if ( responseHandler.getError() != null ) {
- throw responseHandler.getError();
- }
-
- return returnMessage;
- }
-
- public String getId() {
- return String.valueOf(session.getId());
- }
-
- public void setSession(Object object) {
- this.session = (IoSession) object;
- }
-}
Copied: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/MinaServiceConnector.java (from rev 32022, 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/MinaServiceConnector.java (rev 0)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/main/java/org/drools/services/remote/mina/MinaServiceConnector.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -0,0 +1,122 @@
+package org.drools.services.remote.mina;
+
+import java.net.SocketAddress;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.mina.core.future.ConnectFuture;
+import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.codec.serialization.ObjectSerializationCodecFactory;
+import org.apache.mina.transport.socket.SocketConnector;
+import org.drools.SystemEventListener;
+import org.drools.services.generic.GenericServiceConnector;
+import org.drools.services.generic.GenericIoWriter;
+import org.drools.services.generic.Message;
+import org.drools.services.generic.MessageResponseHandler;
+import org.drools.services.responsehandlers.BlockingMessageResponseHandler;
+
+public class MinaServiceConnector
+ implements
+ GenericServiceConnector,
+ GenericIoWriter {
+
+
+ protected IoSession session;
+
+ protected final String name;
+ protected AtomicInteger counter;
+ protected SocketConnector connector;
+ protected SocketAddress address;
+ protected SystemEventListener eventListener;
+
+ public MinaServiceConnector(String name,
+ SocketConnector connector,
+ SocketAddress address,
+ SystemEventListener eventListener) {
+ if ( name == null ) {
+ throw new IllegalArgumentException( "Name can not be null" );
+ }
+ this.name = name;
+ this.counter = new AtomicInteger();
+ this.address = address;
+ this.connector = connector;
+ this.eventListener = eventListener;
+ }
+
+ /* (non-Javadoc)
+ * @see org.drools.vsm.mina.Messenger#connect()
+ */
+ public boolean connect() {
+ if ( session != null && session.isConnected() ) {
+ throw new IllegalStateException( "Already connected. Disconnect first." );
+ }
+
+ try {
+ this.connector.getFilterChain().addLast( "codec",
+ new ProtocolCodecFilter( new ObjectSerializationCodecFactory() ) );
+
+ ConnectFuture future1 = this.connector.connect( this.address );
+ future1.await( 2000 );
+ if ( !future1.isConnected() ) {
+ eventListener.info( "unable to connect : " + address + " : " + future1.getException() );
+ return false;
+ }
+ eventListener.info( "connected : " + address );
+ this.session = future1.getSession();
+ return true;
+ } catch ( Exception e ) {
+ e.printStackTrace();
+ return false;
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.drools.vsm.mina.Messenger#disconnect()
+ */
+ public void disconnect() {
+ if ( session != null && session.isConnected() ) {
+ session.close();
+ session.getCloseFuture().join();
+ }
+ }
+
+ private void addResponseHandler(int id,
+ MessageResponseHandler responseHandler) {
+ ((MinaIoHandler) this.connector.getHandler()).addResponseHandler( id,
+ responseHandler );
+ }
+
+ public void write(Message msg,
+ MessageResponseHandler responseHandler) {
+ if ( responseHandler != null ) {
+ addResponseHandler( msg.getResponseId(),
+ responseHandler );
+ }
+ this.session.write( msg );
+ }
+
+ public Message write(Message msg) {
+ BlockingMessageResponseHandler responseHandler = new BlockingMessageResponseHandler();
+
+ if ( responseHandler != null ) {
+ addResponseHandler( msg.getResponseId(),
+ responseHandler );
+ }
+ this.session.write( msg );
+
+ Message returnMessage = responseHandler.getMessage();
+ if ( responseHandler.getError() != null ) {
+ throw responseHandler.getError();
+ }
+
+ 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/ExecutionNodeBaseTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/ExecutionNodeBaseTest.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/ExecutionNodeBaseTest.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -69,7 +69,8 @@
str += "end \n";
- KnowledgeBuilder kbuilder = node.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
+ KnowledgeBuilder kbuilder =
+ node.get(KnowledgeBuilderFactoryService.class).newKnowledgeBuilder();
kbuilder.add( ResourceFactory.newByteArrayResource( str.getBytes() ),
ResourceType.DRL );
@@ -77,7 +78,8 @@
System.out.println( "Errors: " + kbuilder.getErrors() );
}
- KnowledgeBase kbase = node.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
+ KnowledgeBase kbase =
+ node.get(KnowledgeBaseFactoryService.class).newKnowledgeBase();
Assert.assertNotNull(kbase);
kbase.addKnowledgePackages( kbuilder.getKnowledgePackages() );
Modified: labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/LocalExecutionNodeTest.java
===================================================================
--- labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/LocalExecutionNodeTest.java 2010-03-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/LocalExecutionNodeTest.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -17,7 +17,7 @@
package org.drools.service;
-import org.drools.services.LocalExecutionNodeConnection;
+import org.drools.services.LocalNodeConnector;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -38,7 +38,7 @@
@Before
public void configureNode() {
- node = new LocalExecutionNodeConnection().connect();
+ node = new LocalNodeConnector().connect();
}
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-27 09:51:24 UTC (rev 32251)
+++ labs/jbossrules/branches/salaboy_ServiceAPIs/drools-services/src/test/java/org/drools/service/RemoteExecutionNodeTest.java 2010-03-27 15:01:57 UTC (rev 32252)
@@ -17,9 +17,9 @@
package org.drools.service;
-import org.drools.services.ExecutionNodeConnection;
-import org.drools.services.remote.mina.MinaConnector;
-import org.drools.services.generic.GenericConnector;
+import org.drools.services.NodeConnector;
+import org.drools.services.remote.mina.MinaServiceConnector;
+import org.drools.services.generic.GenericServiceConnector;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import java.io.IOException;
import org.drools.services.remote.mina.MinaAcceptor;
@@ -28,10 +28,10 @@
import org.drools.SystemEventListenerFactory;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
import org.apache.mina.transport.socket.SocketAcceptor;
-import org.drools.services.generic.ExecutionNodeData;
+import org.drools.services.generic.NodeData;
import java.net.SocketAddress;
import java.net.InetSocketAddress;
-import org.drools.services.RemoteExecutionNodeConnection;
+import org.drools.services.RemoteNodeConnector;
import org.junit.After;
import org.junit.Before;
@@ -41,7 +41,7 @@
*/
public class RemoteExecutionNodeTest extends ExecutionNodeBaseTest{
private MinaAcceptor server;
- private ExecutionNodeConnection nodeConnection;
+ private NodeConnector nodeConnection;
public RemoteExecutionNodeTest() {
}
@@ -52,11 +52,11 @@
SocketAddress address = new InetSocketAddress( "127.0.0.1",
9123 );
- ExecutionNodeData serverData = new ExecutionNodeData();
+ NodeData nodeData = new NodeData();
// setup Server
SocketAcceptor acceptor = new NioSocketAcceptor();
acceptor.setHandler( new MinaIoHandler( SystemEventListenerFactory.getSystemEventListener(),
- new GenericMessageHandlerImpl( serverData,
+ new GenericMessageHandlerImpl( nodeData,
SystemEventListenerFactory.getSystemEventListener() ) ) );
this.server = new MinaAcceptor( acceptor,
address );
@@ -65,12 +65,12 @@
// setup Client
NioSocketConnector clientConnector = new NioSocketConnector();
clientConnector.setHandler( new MinaIoHandler( SystemEventListenerFactory.getSystemEventListener() ) );
- GenericConnector minaClient = new MinaConnector( "client 1",
+ GenericServiceConnector minaClient = new MinaServiceConnector( "client 1",
clientConnector,
address,
SystemEventListenerFactory.getSystemEventListener() );
- nodeConnection = new RemoteExecutionNodeConnection("client 1", minaClient);
+ nodeConnection = new RemoteNodeConnector("client 1", minaClient);
node = nodeConnection.connect();
}
More information about the jboss-svn-commits
mailing list